From 20ebfd079f1331af5cc4f0edea35163b5b35612d Mon Sep 17 00:00:00 2001 From: vulcandth Date: Wed, 28 Dec 2022 21:47:27 -0600 Subject: [PATCH 01/53] Add table assertion to `TrainerDataPointers` (#403) * Add table assertion to `TrainerDataPointers` * Add table assertion to `TrainerNamePointers` --- data/trainers/name_pointers.asm | 2 ++ data/trainers/parties.asm | 2 ++ 2 files changed, 4 insertions(+) diff --git a/data/trainers/name_pointers.asm b/data/trainers/name_pointers.asm index 6317f54ae..914fe9d4f 100644 --- a/data/trainers/name_pointers.asm +++ b/data/trainers/name_pointers.asm @@ -2,6 +2,7 @@ TrainerNamePointers: ; These are only used for trainers' defeat speeches. ; They were originally shortened variants of the trainer class names ; in the Japanese versions, but are now redundant with TrainerNames. + table_width 2, TrainerNamePointers dw .YoungsterName dw .BugCatcherName dw .LassName @@ -49,6 +50,7 @@ TrainerNamePointers: dw wTrainerName dw wTrainerName dw wTrainerName + assert_table_length NUM_TRAINERS .YoungsterName: db "YOUNGSTER@" .BugCatcherName: db "BUG CATCHER@" diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index dddcf653b..b2ad5e080 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -1,4 +1,5 @@ TrainerDataPointers: + table_width 2, TrainerDataPointers dw YoungsterData dw BugCatcherData dw LassData @@ -46,6 +47,7 @@ TrainerDataPointers: dw ChannelerData dw AgathaData dw LanceData + assert_table_length NUM_TRAINERS ; if first byte != $FF, then ; first byte is level (of all pokemon on this team) From e076ee0a40b2a21183e2cc535519e64b706b5407 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Wed, 28 Dec 2022 21:48:55 -0600 Subject: [PATCH 02/53] Add list assertion to TrainerNames --- data/trainers/names.asm | 96 +++++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 47 deletions(-) diff --git a/data/trainers/names.asm b/data/trainers/names.asm index d8e1f550f..dc6ded77b 100644 --- a/data/trainers/names.asm +++ b/data/trainers/names.asm @@ -1,48 +1,50 @@ TrainerNames:: - db "YOUNGSTER@" - db "BUG CATCHER@" - db "LASS@" - db "SAILOR@" - db "JR.TRAINER♂@" - db "JR.TRAINER♀@" - db "POKéMANIAC@" - db "SUPER NERD@" - db "HIKER@" - db "BIKER@" - db "BURGLAR@" - db "ENGINEER@" - db "JUGGLER@" - db "FISHERMAN@" - db "SWIMMER@" - db "CUE BALL@" - db "GAMBLER@" - db "BEAUTY@" - db "PSYCHIC@" - db "ROCKER@" - db "JUGGLER@" - db "TAMER@" - db "BIRD KEEPER@" - db "BLACKBELT@" - db "RIVAL1@" - db "PROF.OAK@" - db "CHIEF@" - db "SCIENTIST@" - db "GIOVANNI@" - db "ROCKET@" - db "COOLTRAINER♂@" - db "COOLTRAINER♀@" - db "BRUNO@" - db "BROCK@" - db "MISTY@" - db "LT.SURGE@" - db "ERIKA@" - db "KOGA@" - db "BLAINE@" - db "SABRINA@" - db "GENTLEMAN@" - db "RIVAL2@" - db "RIVAL3@" - db "LORELEI@" - db "CHANNELER@" - db "AGATHA@" - db "LANCE@" + list_start TrainerNames + li "YOUNGSTER" + li "BUG CATCHER" + li "LASS" + li "SAILOR" + li "JR.TRAINER♂" + li "JR.TRAINER♀" + li "POKéMANIAC" + li "SUPER NERD" + li "HIKER" + li "BIKER" + li "BURGLAR" + li "ENGINEER" + li "JUGGLER" + li "FISHERMAN" + li "SWIMMER" + li "CUE BALL" + li "GAMBLER" + li "BEAUTY" + li "PSYCHIC" + li "ROCKER" + li "JUGGLER" + li "TAMER" + li "BIRD KEEPER" + li "BLACKBELT" + li "RIVAL1" + li "PROF.OAK" + li "CHIEF" + li "SCIENTIST" + li "GIOVANNI" + li "ROCKET" + li "COOLTRAINER♂" + li "COOLTRAINER♀" + li "BRUNO" + li "BROCK" + li "MISTY" + li "LT.SURGE" + li "ERIKA" + li "KOGA" + li "BLAINE" + li "SABRINA" + li "GENTLEMAN" + li "RIVAL2" + li "RIVAL3" + li "LORELEI" + li "CHANNELER" + li "AGATHA" + li "LANCE" + assert_list_length NUM_TRAINERS From 5c4795d5bc19edd872adf7b17d0c6264eecd6459 Mon Sep 17 00:00:00 2001 From: SatoMew Date: Sun, 26 Feb 2023 16:14:21 +0000 Subject: [PATCH 03/53] Complete and improve debug name labels (#408) --- engine/debug/debug_menu.asm | 10 ++++++---- engine/menus/main_menu.asm | 1 + engine/movie/oak_speech/oak_speech.asm | 10 ++++++---- engine/movie/title.asm | 23 ++++++++++++++--------- home/init.asm | 2 +- 5 files changed, 28 insertions(+), 18 deletions(-) diff --git a/engine/debug/debug_menu.asm b/engine/debug/debug_menu.asm index f22971294..907acb8a1 100644 --- a/engine/debug/debug_menu.asm +++ b/engine/debug/debug_menu.asm @@ -2,12 +2,14 @@ DebugMenu: IF DEF(_DEBUG) call ClearScreen - ld hl, DebugPlayerName + ; These debug names are used for TestBattle. + ; StartNewGameDebug uses the debug names from PrepareOakSpeech. + ld hl, DebugBattlePlayerName ld de, wPlayerName ld bc, NAME_LENGTH call CopyData - ld hl, DebugRivalName + ld hl, DebugBattleRivalName ld de, wRivalName ld bc, NAME_LENGTH call CopyData @@ -57,10 +59,10 @@ IF DEF(_DEBUG) set 1, [hl] jp StartNewGameDebug -DebugPlayerName: +DebugBattlePlayerName: db "Tom@" -DebugRivalName: +DebugBattleRivalName: db "Juerry@" DebugMenuOptions: diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index d94c65eb4..024def28c 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -309,6 +309,7 @@ LinkCanceledText: StartNewGame: ld hl, wd732 res 1, [hl] + ; fallthrough StartNewGameDebug: call OakSpeech ld c, 20 diff --git a/engine/movie/oak_speech/oak_speech.asm b/engine/movie/oak_speech/oak_speech.asm index 93cdfaab9..3a08372d7 100644 --- a/engine/movie/oak_speech/oak_speech.asm +++ b/engine/movie/oak_speech/oak_speech.asm @@ -1,4 +1,4 @@ -SetDefaultNames: +PrepareOakSpeech: ld a, [wLetterPrintingDelayFlags] push af ld a, [wOptions] @@ -22,11 +22,13 @@ SetDefaultNames: ld a, [wOptionsInitialized] and a call z, InitOptions - ld hl, NintenText + ; These debug names are used for StartNewGameDebug. + ; TestBattle uses the debug names from DebugMenu. + ld hl, DebugNewGamePlayerName ld de, wPlayerName ld bc, NAME_LENGTH call CopyData - ld hl, SonyText + ld hl, DebugNewGameRivalName ld de, wRivalName ld bc, NAME_LENGTH jp CopyData @@ -40,7 +42,7 @@ OakSpeech: call PlayMusic call ClearScreen call LoadTextBoxTilePatterns - call SetDefaultNames + call PrepareOakSpeech predef InitPlayerData2 ld hl, wNumBoxItems ld a, POTION diff --git a/engine/movie/title.asm b/engine/movie/title.asm index 1ee0cc250..ad5f6ebf5 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -1,15 +1,17 @@ -; copy text of fixed length NAME_LENGTH (like player name, rival name, mon names, ...) -CopyFixedLengthText: +CopyDebugName: ld bc, NAME_LENGTH jp CopyData -SetDefaultNamesBeforeTitlescreen:: - ld hl, NintenText +PrepareTitleScreen:: + ; These debug names are already copied later in PrepareOakSpeech. + ; Removing the unused copies below has no apparent impact. + ; CopyDebugName can also be safely deleted afterwards. + ld hl, DebugNewGamePlayerName ld de, wPlayerName - call CopyFixedLengthText - ld hl, SonyText + call CopyDebugName + ld hl, DebugNewGameRivalName ld de, wRivalName - call CopyFixedLengthText + call CopyDebugName xor a ldh [hWY], a ld [wLetterPrintingDelayFlags], a @@ -405,5 +407,8 @@ IF DEF(_BLUE) db $61,$62,$63,$64,$65,$66,$67,$68,"@" ; "Blue Version" ENDC -NintenText: db "NINTEN@" -SonyText: db "SONY@" +DebugNewGamePlayerName: + db "NINTEN@" + +DebugNewGameRivalName: + db "SONY@" diff --git a/home/init.asm b/home/init.asm index 81e75586f..db21efbc5 100644 --- a/home/init.asm +++ b/home/init.asm @@ -116,7 +116,7 @@ DEF rLCDC_DEFAULT EQU %11100011 ld a, rLCDC_DEFAULT ldh [rLCDC], a - jp SetDefaultNamesBeforeTitlescreen + jp PrepareTitleScreen ClearVram:: ld hl, VRAM_Begin From a76ae055cc306f922e84d546b2f54f32e35a6a11 Mon Sep 17 00:00:00 2001 From: RainbowMetalPigeon <118711812+RainbowMetalPigeon@users.noreply.github.com> Date: Sat, 25 Mar 2023 20:28:55 -0700 Subject: [PATCH 04/53] Dex weights are in tenths of a pound --- data/pokemon/dex_entries.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index c99087e25..ceb431b76 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -194,7 +194,7 @@ PokedexEntryPointers: ; string: species name ; height in feet, inches -; weight in pounds +; weight in tenths of a pound ; text entry RhydonDexEntry: From 17eaf761e38cea827320f984cfaaa1527276ab15 Mon Sep 17 00:00:00 2001 From: Vortyne <104168801+Vortyne@users.noreply.github.com> Date: Sat, 25 Mar 2023 23:31:59 -0400 Subject: [PATCH 05/53] Name some unnamed animation constants (#396) --- constants/move_constants.asm | 14 +++++++------- data/moves/animations.asm | 4 ++-- engine/battle/core.asm | 4 ++-- engine/battle/effects.asm | 16 ++++++++-------- engine/battle/trainer_ai.asm | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/constants/move_constants.asm b/constants/move_constants.asm index 570be95e2..3376c1aff 100644 --- a/constants/move_constants.asm +++ b/constants/move_constants.asm @@ -178,14 +178,14 @@ DEF NUM_ATTACKS EQU const_value - 1 const SHOWPIC_ANIM const STATUS_AFFECTED_ANIM const ANIM_A8 - const ANIM_A9 + const ENEMY_HUD_SHAKE_ANIM const TRADE_BALL_DROP_ANIM const TRADE_BALL_SHAKE_ANIM const TRADE_BALL_TILT_ANIM const TRADE_BALL_POOF_ANIM const XSTATITEM_ANIM ; use X Attack/Defense/Speed/Special - const ANIM_AF - const ANIM_B0 + const XSTATITEM_DUPLICATE_ANIM + const SHRINKING_SQUARE_ANIM const ANIM_B1 const ANIM_B2 const ANIM_B3 @@ -197,18 +197,18 @@ DEF NUM_ATTACKS EQU const_value - 1 const ANIM_B9 const BURN_PSN_ANIM ; Plays when a monster is burned or poisoned const ANIM_BB - const ANIM_BC + const SLP_PLAYER_ANIM const SLP_ANIM ; sleeping monster - const ANIM_BE + const CONF_PLAYER_ANIM const CONF_ANIM ; confused monster - const ANIM_C0 + const SLIDE_DOWN_ANIM const TOSS_ANIM ; toss Poké Ball const SHAKE_ANIM ; shaking Poké Ball when catching monster const POOF_ANIM ; puff of smoke const BLOCKBALL_ANIM ; trainer knocks away Poké Ball const GREATTOSS_ANIM ; toss Great Ball const ULTRATOSS_ANIM ; toss Ultra Ball or Master Ball - const ANIM_C7 + const SHAKE_SCREEN_ANIM const HIDEPIC_ANIM ; monster disappears const ROCK_ANIM ; throw rock const BAIT_ANIM ; throw bait diff --git a/data/moves/animations.asm b/data/moves/animations.asm index 0a8db8f58..29a784776 100644 --- a/data/moves/animations.asm +++ b/data/moves/animations.asm @@ -192,7 +192,7 @@ AttackAnimationPointers: dw SleepEnemyAnim dw ConfusedPlayerAnim dw ConfusedEnemyAnim - dw FaintAnim + dw SlideDownAnim dw BallTossAnim dw BallShakeAnim dw BallPoofAnim @@ -1263,7 +1263,7 @@ BallBlockAnim: battle_anim NO_MOVE, SUBANIM_0_BALL_BLOCK, 0, 3 db -1 ; end -FaintAnim: +SlideDownAnim: battle_anim DIG, SE_SLIDE_MON_DOWN db -1 ; end diff --git a/engine/battle/core.asm b/engine/battle/core.asm index f84b759c5..4a0263e21 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -3327,7 +3327,7 @@ CheckPlayerStatusConditions: ; fast asleep xor a ld [wAnimationType], a - ld a, SLP_ANIM - 1 + ld a, SLP_PLAYER_ANIM call PlayMoveAnimation ld hl, FastAsleepText call PrintText @@ -3411,7 +3411,7 @@ CheckPlayerStatusConditions: call PrintText xor a ld [wAnimationType], a - ld a, CONF_ANIM - 1 + ld a, CONF_PLAYER_ANIM call PlayMoveAnimation call BattleRandom cp 50 percent + 1 ; chance to hurt itself diff --git a/engine/battle/effects.asm b/engine/battle/effects.asm index c68d67317..aaaf20d0a 100644 --- a/engine/battle/effects.asm +++ b/engine/battle/effects.asm @@ -123,12 +123,12 @@ PoisonEffect: dec de ldh a, [hWhoseTurn] and a - ld b, ANIM_C7 + ld b, SHAKE_SCREEN_ANIM ld hl, wPlayerBattleStatus3 ld a, [de] ld de, wPlayerToxicCounter jr nz, .ok - ld b, ANIM_A9 + ld b, ENEMY_HUD_SHAKE_ANIM ld hl, wEnemyBattleStatus3 ld de, wEnemyToxicCounter .ok @@ -232,14 +232,14 @@ FreezeBurnParalyzeEffect: ld a, 1 << PAR ld [wEnemyMonStatus], a call QuarterSpeedDueToParalysis ; quarter speed of affected mon - ld a, ANIM_A9 + ld a, ENEMY_HUD_SHAKE_ANIM call PlayBattleAnimation jp PrintMayNotAttackText ; print paralysis text .burn1 ld a, 1 << BRN ld [wEnemyMonStatus], a call HalveAttackDueToBurn ; halve attack of affected mon - ld a, ANIM_A9 + ld a, ENEMY_HUD_SHAKE_ANIM call PlayBattleAnimation ld hl, BurnedText jp PrintText @@ -247,7 +247,7 @@ FreezeBurnParalyzeEffect: call ClearHyperBeam ; resets hyper beam (recharge) condition from target ld a, 1 << FRZ ld [wEnemyMonStatus], a - ld a, ANIM_A9 + ld a, ENEMY_HUD_SHAKE_ANIM call PlayBattleAnimation ld hl, FrozenText jp PrintText @@ -802,7 +802,7 @@ ThrashPetalDanceEffect: inc a ld [de], a ; set thrash/petal dance counter to 2 or 3 at random ldh a, [hWhoseTurn] - add ANIM_B0 + add SHRINKING_SQUARE_ANIM jp PlayBattleAnimation2 SwitchAndTeleportEffect: @@ -1002,7 +1002,7 @@ ChargeEffect: jr z, .chargeEffect ld hl, wEnemyBattleStatus1 ld de, wEnemyMoveEffect - ld b, ANIM_AF + ld b, XSTATITEM_DUPLICATE_ANIM .chargeEffect set CHARGING_UP, [hl] ld a, [de] @@ -1016,7 +1016,7 @@ ChargeEffect: cp DIG jr nz, .notDigOrFly set INVULNERABLE, [hl] ; mon is now invulnerable to typical attacks (fly/dig) - ld b, ANIM_C0 + ld b, SLIDE_DOWN_ANIM .notDigOrFly xor a ld [wAnimationType], a diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index 2ef60f5b4..e21a3492c 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -713,7 +713,7 @@ AIIncreaseStat: ld a, [hl] push af push hl - ld a, ANIM_AF + ld a, XSTATITEM_DUPLICATE_ANIM ld [hli], a ld [hl], b callfar StatModifierUpEffect From 1b9540cc49f76626445d2cb5744be1e81c709ca8 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Tue, 25 Apr 2023 19:40:00 -0500 Subject: [PATCH 06/53] Update `EndBug` to v9. --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9b3efa30c..44317b8b2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -69,9 +69,8 @@ jobs: - name: Update symbols if: ${{ github.event_name == 'push' && github.repository_owner == 'pret' }} - uses: EndBug/add-and-commit@v7 + uses: EndBug/add-and-commit@v9 with: - branch: symbols cwd: "./symbols" add: "*.sym" message: ${{ github.event.commits[0].message }} From d3128b9a7ffab9d4d9b615acf9527ee2f1744749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20Unneb=C3=A4ck?= Date: Wed, 10 May 2023 22:49:45 +0800 Subject: [PATCH 07/53] Make wCurrentBoxNum a byte instead of word (#414) --- ram/wram.asm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ram/wram.asm b/ram/wram.asm index 4923ebca0..ac382f79f 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -1896,7 +1896,9 @@ wBoxItems:: ds PC_ITEM_CAPACITY * 2 + 1 ; bits 0-6: box number ; bit 7: whether the player has changed boxes before -wCurrentBoxNum:: dw +wCurrentBoxNum:: db + + ds 1 ; number of HOF teams wNumHoFTeams:: db From d001ced41b53271373753de835a9c3b3413dc318 Mon Sep 17 00:00:00 2001 From: vulcandth Date: Thu, 13 Jul 2023 20:27:56 -0500 Subject: [PATCH 08/53] Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified. --- constants/sprite_constants.asm | 4 +- data/items/marts.asm | 32 +- data/maps/objects/AgathasRoom.asm | 5 +- data/maps/objects/BikeShop.asm | 11 +- data/maps/objects/BillsHouse.asm | 11 +- data/maps/objects/BluesHouse.asm | 11 +- data/maps/objects/BrunosRoom.asm | 5 +- data/maps/objects/CeladonChiefHouse.asm | 11 +- data/maps/objects/CeladonCity.asm | 47 +- data/maps/objects/CeladonDiner.asm | 17 +- data/maps/objects/CeladonGym.asm | 26 +- data/maps/objects/CeladonHotel.asm | 11 +- data/maps/objects/CeladonMansion1F.asm | 16 +- data/maps/objects/CeladonMansion2F.asm | 2 +- data/maps/objects/CeladonMansion3F.asm | 22 +- data/maps/objects/CeladonMansionRoof.asm | 2 +- data/maps/objects/CeladonMansionRoofHouse.asm | 8 +- data/maps/objects/CeladonMart1F.asm | 9 +- data/maps/objects/CeladonMart2F.asm | 16 +- data/maps/objects/CeladonMart3F.asm | 41 +- data/maps/objects/CeladonMart4F.asm | 13 +- data/maps/objects/CeladonMart5F.asm | 16 +- data/maps/objects/CeladonMartElevator.asm | 2 +- data/maps/objects/CeladonMartRoof.asm | 16 +- data/maps/objects/CeladonPokecenter.asm | 14 +- data/maps/objects/CeruleanBadgeHouse.asm | 5 +- data/maps/objects/CeruleanCave1F.asm | 11 +- data/maps/objects/CeruleanCave2F.asm | 11 +- data/maps/objects/CeruleanCaveB1F.asm | 11 +- data/maps/objects/CeruleanCity.asm | 47 +- data/maps/objects/CeruleanGym.asm | 14 +- data/maps/objects/CeruleanMart.asm | 11 +- data/maps/objects/CeruleanPokecenter.asm | 14 +- data/maps/objects/CeruleanTradeHouse.asm | 8 +- data/maps/objects/CeruleanTrashedHouse.asm | 10 +- data/maps/objects/ChampionsRoom.asm | 8 +- data/maps/objects/CinnabarGym.asm | 29 +- data/maps/objects/CinnabarIsland.asm | 18 +- data/maps/objects/CinnabarLab.asm | 13 +- data/maps/objects/CinnabarLabFossilRoom.asm | 8 +- .../maps/objects/CinnabarLabMetronomeRoom.asm | 14 +- data/maps/objects/CinnabarLabTradeRoom.asm | 11 +- data/maps/objects/CinnabarMart.asm | 11 +- data/maps/objects/CinnabarPokecenter.asm | 14 +- data/maps/objects/Colosseum.asm | 5 +- data/maps/objects/CopycatsHouse1F.asm | 11 +- data/maps/objects/CopycatsHouse2F.asm | 21 +- data/maps/objects/Daycare.asm | 5 +- data/maps/objects/DiglettsCaveRoute11.asm | 5 +- data/maps/objects/DiglettsCaveRoute2.asm | 5 +- data/maps/objects/FightingDojo.asm | 23 +- .../objects/FuchsiaBillsGrandpasHouse.asm | 11 +- data/maps/objects/FuchsiaCity.asm | 60 +- data/maps/objects/FuchsiaGoodRodHouse.asm | 5 +- data/maps/objects/FuchsiaGym.asm | 26 +- data/maps/objects/FuchsiaMart.asm | 11 +- data/maps/objects/FuchsiaMeetingRoom.asm | 11 +- data/maps/objects/FuchsiaPokecenter.asm | 14 +- data/maps/objects/GameCorner.asm | 37 +- data/maps/objects/GameCornerPrizeRoom.asm | 14 +- data/maps/objects/HallOfFame.asm | 5 +- data/maps/objects/IndigoPlateauLobby.asm | 17 +- data/maps/objects/LancesRoom.asm | 5 +- data/maps/objects/LavenderCuboneHouse.asm | 8 +- data/maps/objects/LavenderMart.asm | 11 +- data/maps/objects/LavenderPokecenter.asm | 14 +- data/maps/objects/LavenderTown.asm | 23 +- data/maps/objects/LoreleisRoom.asm | 5 +- data/maps/objects/MrFujisHouse.asm | 20 +- data/maps/objects/MrPsychicsHouse.asm | 5 +- data/maps/objects/MtMoon1F.asm | 44 +- data/maps/objects/MtMoonB2F.asm | 29 +- data/maps/objects/MtMoonPokecenter.asm | 20 +- data/maps/objects/Museum1F.asm | 17 +- data/maps/objects/Museum2F.asm | 21 +- data/maps/objects/NameRatersHouse.asm | 5 +- data/maps/objects/OaksLab.asm | 35 +- data/maps/objects/PalletTown.asm | 19 +- data/maps/objects/PewterCity.asm | 31 +- data/maps/objects/PewterGym.asm | 11 +- data/maps/objects/PewterMart.asm | 11 +- data/maps/objects/PewterNidoranHouse.asm | 11 +- data/maps/objects/PewterPokecenter.asm | 14 +- data/maps/objects/PewterSpeechHouse.asm | 8 +- data/maps/objects/PokemonFanClub.asm | 26 +- data/maps/objects/PokemonMansion1F.asm | 11 +- data/maps/objects/PokemonMansion2F.asm | 14 +- data/maps/objects/PokemonMansion3F.asm | 17 +- data/maps/objects/PokemonMansionB1F.asm | 26 +- data/maps/objects/PokemonTower1F.asm | 17 +- data/maps/objects/PokemonTower2F.asm | 8 +- data/maps/objects/PokemonTower3F.asm | 14 +- data/maps/objects/PokemonTower4F.asm | 20 +- data/maps/objects/PokemonTower5F.asm | 20 +- data/maps/objects/PokemonTower6F.asm | 17 +- data/maps/objects/PokemonTower7F.asm | 14 +- data/maps/objects/PowerPlant.asm | 44 +- data/maps/objects/RedsHouse1F.asm | 7 +- data/maps/objects/RockTunnel1F.asm | 25 +- data/maps/objects/RockTunnelB1F.asm | 26 +- data/maps/objects/RockTunnelPokecenter.asm | 14 +- data/maps/objects/RocketHideoutB1F.asm | 23 +- data/maps/objects/RocketHideoutB2F.asm | 17 +- data/maps/objects/RocketHideoutB3F.asm | 14 +- data/maps/objects/RocketHideoutB4F.asm | 29 +- data/maps/objects/RocketHideoutElevator.asm | 2 +- data/maps/objects/Route1.asm | 10 +- data/maps/objects/Route10.asm | 28 +- data/maps/objects/Route11.asm | 34 +- data/maps/objects/Route11Gate1F.asm | 5 +- data/maps/objects/Route11Gate2F.asm | 12 +- data/maps/objects/Route12.asm | 36 +- data/maps/objects/Route12Gate1F.asm | 5 +- data/maps/objects/Route12Gate2F.asm | 9 +- data/maps/objects/Route12SuperRodHouse.asm | 5 +- data/maps/objects/Route13.asm | 38 +- data/maps/objects/Route14.asm | 34 +- data/maps/objects/Route15.asm | 37 +- data/maps/objects/Route15Gate1F.asm | 5 +- data/maps/objects/Route15Gate2F.asm | 7 +- data/maps/objects/Route16.asm | 27 +- data/maps/objects/Route16FlyHouse.asm | 8 +- data/maps/objects/Route16Gate1F.asm | 8 +- data/maps/objects/Route16Gate2F.asm | 12 +- data/maps/objects/Route17.asm | 44 +- data/maps/objects/Route18.asm | 15 +- data/maps/objects/Route18Gate1F.asm | 5 +- data/maps/objects/Route18Gate2F.asm | 9 +- data/maps/objects/Route19.asm | 34 +- data/maps/objects/Route2.asm | 12 +- data/maps/objects/Route20.asm | 36 +- data/maps/objects/Route21.asm | 29 +- data/maps/objects/Route22.asm | 10 +- data/maps/objects/Route22Gate.asm | 5 +- data/maps/objects/Route23.asm | 25 +- data/maps/objects/Route24.asm | 26 +- data/maps/objects/Route25.asm | 34 +- data/maps/objects/Route2Gate.asm | 8 +- data/maps/objects/Route2TradeHouse.asm | 8 +- data/maps/objects/Route3.asm | 31 +- data/maps/objects/Route4.asm | 17 +- data/maps/objects/Route5.asm | 2 +- data/maps/objects/Route5Gate.asm | 5 +- data/maps/objects/Route6.asm | 22 +- data/maps/objects/Route6Gate.asm | 5 +- data/maps/objects/Route7.asm | 2 +- data/maps/objects/Route7Gate.asm | 5 +- data/maps/objects/Route8.asm | 31 +- data/maps/objects/Route8Gate.asm | 5 +- data/maps/objects/Route9.asm | 34 +- data/maps/objects/SSAnne1F.asm | 8 +- data/maps/objects/SSAnne1FRooms.asm | 35 +- data/maps/objects/SSAnne2F.asm | 8 +- data/maps/objects/SSAnne2FRooms.asm | 41 +- data/maps/objects/SSAnne3F.asm | 5 +- data/maps/objects/SSAnneB1FRooms.asm | 29 +- data/maps/objects/SSAnneBow.asm | 17 +- data/maps/objects/SSAnneCaptainsRoom.asm | 9 +- data/maps/objects/SSAnneKitchen.asm | 23 +- data/maps/objects/SafariZoneCenter.asm | 9 +- .../objects/SafariZoneCenterRestHouse.asm | 8 +- data/maps/objects/SafariZoneEast.asm | 20 +- data/maps/objects/SafariZoneEastRestHouse.asm | 11 +- data/maps/objects/SafariZoneGate.asm | 8 +- data/maps/objects/SafariZoneNorth.asm | 18 +- .../maps/objects/SafariZoneNorthRestHouse.asm | 11 +- data/maps/objects/SafariZoneSecretHouse.asm | 5 +- data/maps/objects/SafariZoneWest.asm | 22 +- data/maps/objects/SafariZoneWestRestHouse.asm | 11 +- data/maps/objects/SaffronCity.asm | 67 +- data/maps/objects/SaffronGym.asm | 29 +- data/maps/objects/SaffronMart.asm | 11 +- data/maps/objects/SaffronPidgeyHouse.asm | 14 +- data/maps/objects/SaffronPokecenter.asm | 14 +- data/maps/objects/SeafoamIslands1F.asm | 8 +- data/maps/objects/SeafoamIslandsB1F.asm | 8 +- data/maps/objects/SeafoamIslandsB2F.asm | 8 +- data/maps/objects/SeafoamIslandsB3F.asm | 20 +- data/maps/objects/SeafoamIslandsB4F.asm | 15 +- data/maps/objects/SilphCo10F.asm | 20 +- data/maps/objects/SilphCo11F.asm | 17 +- data/maps/objects/SilphCo1F.asm | 5 +- data/maps/objects/SilphCo2F.asm | 17 +- data/maps/objects/SilphCo3F.asm | 14 +- data/maps/objects/SilphCo4F.asm | 23 +- data/maps/objects/SilphCo5F.asm | 35 +- data/maps/objects/SilphCo6F.asm | 32 +- data/maps/objects/SilphCo7F.asm | 35 +- data/maps/objects/SilphCo8F.asm | 14 +- data/maps/objects/SilphCo9F.asm | 14 +- data/maps/objects/SilphCoElevator.asm | 2 +- data/maps/objects/TradeCenter.asm | 5 +- data/maps/objects/UndergroundPathRoute5.asm | 5 +- data/maps/objects/UndergroundPathRoute6.asm | 5 +- data/maps/objects/UndergroundPathRoute7.asm | 5 +- .../objects/UndergroundPathRoute7Copy.asm | 8 +- data/maps/objects/UndergroundPathRoute8.asm | 5 +- data/maps/objects/VermilionCity.asm | 34 +- data/maps/objects/VermilionGym.asm | 17 +- data/maps/objects/VermilionMart.asm | 11 +- data/maps/objects/VermilionOldRodHouse.asm | 5 +- data/maps/objects/VermilionPidgeyHouse.asm | 11 +- data/maps/objects/VermilionPokecenter.asm | 14 +- data/maps/objects/VermilionTradeHouse.asm | 5 +- data/maps/objects/VictoryRoad1F.asm | 23 +- data/maps/objects/VictoryRoad2F.asm | 41 +- data/maps/objects/VictoryRoad3F.asm | 32 +- data/maps/objects/ViridianCity.asm | 35 +- data/maps/objects/ViridianForest.asm | 38 +- data/maps/objects/ViridianForestNorthGate.asm | 8 +- data/maps/objects/ViridianForestSouthGate.asm | 8 +- data/maps/objects/ViridianGym.asm | 35 +- data/maps/objects/ViridianMart.asm | 11 +- data/maps/objects/ViridianNicknameHouse.asm | 14 +- data/maps/objects/ViridianPokecenter.asm | 14 +- data/maps/objects/ViridianSchoolHouse.asm | 8 +- data/maps/objects/WardensHouse.asm | 15 +- data/maps/sprite_sets.asm | 6 +- data/sprites/sprites.asm | 4 +- data/text/text_3.asm | 4 +- engine/events/hidden_objects/safari_game.asm | 2 +- engine/items/item_effects.asm | 2 +- engine/overworld/auto_movement.asm | 4 +- engine/overworld/ledges.asm | 2 +- engine/overworld/player_state.asm | 4 +- gfx/sprites.asm | 4 +- gfx/sprites/{erika.png => silph_worker_f.png} | Bin .../{silph_worker.png => silph_worker_m.png} | Bin home/overworld.asm | 2 +- home/text.asm | 2 +- macros/const.asm | 5 + macros/scripts/maps.asm | 24 +- scripts/AgathasRoom.asm | 46 +- scripts/BikeShop.asm | 79 +- scripts/BillsHouse.asm | 146 ++-- scripts/BluesHouse.asm | 42 +- scripts/BrunosRoom.asm | 44 +- scripts/CeladonChiefHouse.asm | 19 +- scripts/CeladonCity.asm | 131 ++-- scripts/CeladonDiner.asm | 53 +- scripts/CeladonGym.asm | 94 +-- scripts/CeladonHotel.asm | 19 +- scripts/CeladonMansion1F.asm | 31 +- scripts/CeladonMansion2F.asm | 7 +- scripts/CeladonMansion3F.asm | 55 +- scripts/CeladonMansionRoof.asm | 7 +- scripts/CeladonMansionRoofHouse.asm | 11 +- scripts/CeladonMart1F.asm | 19 +- scripts/CeladonMart2F.asm | 23 +- scripts/CeladonMart3F.asm | 112 ++- scripts/CeladonMart4F.asm | 21 +- scripts/CeladonMart5F.asm | 23 +- scripts/CeladonMartElevator.asm | 5 +- scripts/CeladonMartRoof.asm | 99 +-- scripts/CeladonPokecenter.asm | 21 +- scripts/CeruleanBadgeHouse.asm | 85 ++- scripts/CeruleanCave1F.asm | 7 +- scripts/CeruleanCave2F.asm | 7 +- scripts/CeruleanCaveB1F.asm | 16 +- scripts/CeruleanCity.asm | 251 ++++--- scripts/CeruleanGym.asm | 90 +-- scripts/CeruleanMart.asm | 15 +- scripts/CeruleanPokecenter.asm | 21 +- scripts/CeruleanTradeHouse.asm | 11 +- scripts/CeruleanTrashedHouse.asm | 29 +- scripts/ChampionsRoom.asm | 190 ++--- scripts/CinnabarGym.asm | 328 ++++---- scripts/CinnabarIsland.asm | 56 +- scripts/CinnabarLab.asm | 31 +- scripts/CinnabarLabFossilRoom.asm | 55 +- scripts/CinnabarLabMetronomeRoom.asm | 52 +- scripts/CinnabarLabTradeRoom.asm | 19 +- scripts/CinnabarMart.asm | 15 +- scripts/CinnabarPokecenter.asm | 21 +- scripts/Colosseum.asm | 7 +- scripts/CopycatsHouse1F.asm | 19 +- scripts/CopycatsHouse2F.asm | 79 +- scripts/Daycare.asm | 97 +-- scripts/DiglettsCave.asm | 1 + scripts/DiglettsCaveRoute11.asm | 7 +- scripts/DiglettsCaveRoute2.asm | 7 +- scripts/FightingDojo.asm | 178 ++--- scripts/FuchsiaBillsGrandpasHouse.asm | 19 +- scripts/FuchsiaCity.asm | 171 ++--- scripts/FuchsiaGoodRodHouse.asm | 37 +- scripts/FuchsiaGym.asm | 194 ++--- scripts/FuchsiaMart.asm | 15 +- scripts/FuchsiaMeetingRoom.asm | 19 +- scripts/FuchsiaPokecenter.asm | 21 +- scripts/GameCorner.asm | 372 ++++----- scripts/GameCornerPrizeRoom.asm | 21 +- scripts/HallOfFame.asm | 38 +- scripts/IndigoPlateau.asm | 1 + scripts/IndigoPlateauLobby.asm | 23 +- scripts/LancesRoom.asm | 52 +- scripts/LavenderCuboneHouse.asm | 23 +- scripts/LavenderMart.asm | 17 +- scripts/LavenderPokecenter.asm | 21 +- scripts/LavenderTown.asm | 65 +- scripts/LoreleisRoom.asm | 56 +- scripts/MrFujisHouse.asm | 81 +- scripts/MrPsychicsHouse.asm | 29 +- scripts/MtMoon1F.asm | 152 ++-- scripts/MtMoonB1F.asm | 7 +- scripts/MtMoonB2F.asm | 270 +++---- scripts/MtMoonPokecenter.asm | 51 +- scripts/Museum1F.asm | 194 ++--- scripts/Museum2F.asm | 45 +- scripts/NameRatersHouse.asm | 86 +-- scripts/OaksLab.asm | 711 +++++++++--------- scripts/PalletTown.asm | 116 +-- scripts/PewterCity.asm | 198 ++--- scripts/PewterGym.asm | 90 +-- scripts/PewterMart.asm | 19 +- scripts/PewterNidoranHouse.asm | 19 +- scripts/PewterPokecenter.asm | 35 +- scripts/PewterSpeechHouse.asm | 13 +- scripts/PokemonFanClub.asm | 124 ++- scripts/PokemonMansion1F.asm | 64 +- scripts/PokemonMansion2F.asm | 75 +- scripts/PokemonMansion3F.asm | 60 +- scripts/PokemonMansionB1F.asm | 64 +- scripts/PokemonTower1F.asm | 31 +- scripts/PokemonTower2F.asm | 98 +-- scripts/PokemonTower3F.asm | 64 +- scripts/PokemonTower4F.asm | 68 +- scripts/PokemonTower5F.asm | 108 +-- scripts/PokemonTower6F.asm | 130 ++-- scripts/PokemonTower7F.asm | 158 ++-- scripts/PowerPlant.asm | 100 +-- scripts/RedsHouse1F.asm | 39 +- scripts/RedsHouse2F.asm | 12 +- scripts/RockTunnel1F.asm | 154 ++-- scripts/RockTunnelB1F.asm | 152 ++-- scripts/RockTunnelPokecenter.asm | 21 +- scripts/RocketHideoutB1F.asm | 126 ++-- scripts/RocketHideoutB2F.asm | 46 +- scripts/RocketHideoutB3F.asm | 54 +- scripts/RocketHideoutB4F.asm | 142 ++-- scripts/RocketHideoutElevator.asm | 35 +- scripts/Route1.asm | 41 +- scripts/Route10.asm | 133 ++-- scripts/Route11.asm | 194 ++--- scripts/Route11Gate1F.asm | 7 +- scripts/Route11Gate2F.asm | 45 +- scripts/Route12.asm | 190 ++--- scripts/Route12Gate1F.asm | 7 +- scripts/Route12Gate2F.asm | 49 +- scripts/Route12SuperRodHouse.asm | 37 +- scripts/Route13.asm | 206 ++--- scripts/Route14.asm | 194 ++--- scripts/Route15.asm | 196 ++--- scripts/Route15Gate1F.asm | 7 +- scripts/Route15Gate2F.asm | 21 +- scripts/Route16.asm | 164 ++-- scripts/Route16FlyHouse.asm | 39 +- scripts/Route16Gate1F.asm | 82 +- scripts/Route16Gate2F.asm | 41 +- scripts/Route17.asm | 224 +++--- scripts/Route18.asm | 74 +- scripts/Route18Gate1F.asm | 74 +- scripts/Route18Gate2F.asm | 25 +- scripts/Route19.asm | 194 ++--- scripts/Route2.asm | 17 +- scripts/Route20.asm | 229 +++--- scripts/Route21.asm | 170 ++--- scripts/Route22.asm | 274 +++---- scripts/Route22Gate.asm | 60 +- scripts/Route23.asm | 108 +-- scripts/Route24.asm | 198 ++--- scripts/Route25.asm | 186 ++--- scripts/Route2Gate.asm | 17 +- scripts/Route2TradeHouse.asm | 11 +- scripts/Route3.asm | 162 ++-- scripts/Route4.asm | 48 +- scripts/Route5.asm | 7 +- scripts/Route5Gate.asm | 79 +- scripts/Route6.asm | 118 +-- scripts/Route6Gate.asm | 36 +- scripts/Route7.asm | 7 +- scripts/Route7Gate.asm | 36 +- scripts/Route8.asm | 176 ++--- scripts/Route8Gate.asm | 36 +- scripts/Route9.asm | 178 ++--- scripts/SSAnne1F.asm | 13 +- scripts/SSAnne1FRooms.asm | 118 +-- scripts/SSAnne2F.asm | 138 ++-- scripts/SSAnne2FRooms.asm | 154 ++-- scripts/SSAnne3F.asm | 7 +- scripts/SSAnneB1F.asm | 1 + scripts/SSAnneB1FRooms.asm | 134 ++-- scripts/SSAnneBow.asm | 62 +- scripts/SSAnneCaptainsRoom.asm | 59 +- scripts/SSAnneKitchen.asm | 65 +- scripts/SafariZoneCenter.asm | 15 +- scripts/SafariZoneCenterRestHouse.asm | 13 +- scripts/SafariZoneEast.asm | 27 +- scripts/SafariZoneEastRestHouse.asm | 19 +- scripts/SafariZoneGate.asm | 171 ++--- scripts/SafariZoneNorth.asm | 35 +- scripts/SafariZoneNorthRestHouse.asm | 19 +- scripts/SafariZoneSecretHouse.asm | 29 +- scripts/SafariZoneWest.asm | 33 +- scripts/SafariZoneWestRestHouse.asm | 19 +- scripts/SaffronCity.asm | 143 ++-- scripts/SaffronGym.asm | 210 +++--- scripts/SaffronMart.asm | 15 +- scripts/SaffronPidgeyHouse.asm | 25 +- scripts/SaffronPokecenter.asm | 21 +- scripts/SeafoamIslands1F.asm | 5 +- scripts/SeafoamIslandsB1F.asm | 5 +- scripts/SeafoamIslandsB2F.asm | 5 +- scripts/SeafoamIslandsB3F.asm | 41 +- scripts/SeafoamIslandsB4F.asm | 67 +- scripts/SilphCo10F.asm | 84 ++- scripts/SilphCo11F.asm | 238 +++--- scripts/SilphCo1F.asm | 7 +- scripts/SilphCo2F.asm | 156 ++-- scripts/SilphCo3F.asm | 88 +-- scripts/SilphCo4F.asm | 124 +-- scripts/SilphCo5F.asm | 152 ++-- scripts/SilphCo6F.asm | 180 ++--- scripts/SilphCo7F.asm | 356 ++++----- scripts/SilphCo8F.asm | 112 +-- scripts/SilphCo9F.asm | 146 ++-- scripts/SilphCoElevator.asm | 17 +- scripts/TradeCenter.asm | 9 +- scripts/UndergroundPathNorthSouth.asm | 1 + scripts/UndergroundPathRoute5.asm | 5 +- scripts/UndergroundPathRoute6.asm | 7 +- scripts/UndergroundPathRoute7.asm | 7 +- scripts/UndergroundPathRoute7Copy.asm | 21 +- scripts/UndergroundPathRoute8.asm | 7 +- scripts/UndergroundPathWestEast.asm | 1 + scripts/VermilionCity.asm | 186 ++--- scripts/VermilionDock.asm | 45 +- scripts/VermilionGym.asm | 166 ++-- scripts/VermilionMart.asm | 15 +- scripts/VermilionOldRodHouse.asm | 49 +- scripts/VermilionPidgeyHouse.asm | 19 +- scripts/VermilionPokecenter.asm | 21 +- scripts/VermilionTradeHouse.asm | 5 +- scripts/VictoryRoad1F.asm | 60 +- scripts/VictoryRoad2F.asm | 152 ++-- scripts/VictoryRoad3F.asm | 124 +-- scripts/ViridianCity.asm | 234 +++--- scripts/ViridianForest.asm | 116 +-- scripts/ViridianForestNorthGate.asm | 13 +- scripts/ViridianForestSouthGate.asm | 13 +- scripts/ViridianGym.asm | 244 +++--- scripts/ViridianMart.asm | 68 +- scripts/ViridianNicknameHouse.asm | 29 +- scripts/ViridianPokecenter.asm | 21 +- scripts/ViridianSchoolHouse.asm | 13 +- scripts/WardensHouse.asm | 88 +-- text/AgathasRoom.asm | 2 +- text/BikeShop.asm | 18 +- text/BillsHouse.asm | 12 +- text/BluesHouse.asm | 8 +- text/BrunosRoom.asm | 2 +- text/CeladonChiefHouse.asm | 6 +- text/CeladonCity.asm | 40 +- text/CeladonDiner.asm | 16 +- text/CeladonGym.asm | 12 +- text/CeladonHotel.asm | 6 +- text/CeladonMansion1F.asm | 10 +- text/CeladonMansion2F.asm | 2 +- text/CeladonMansion3F.asm | 18 +- text/CeladonMansionRoof.asm | 2 +- text/CeladonMansionRoofHouse.asm | 2 +- text/CeladonMart1F.asm | 6 +- text/CeladonMart2F.asm | 6 +- text/CeladonMart3F.asm | 30 +- text/CeladonMart4F.asm | 6 +- text/CeladonMart5F.asm | 6 +- text/CeladonMartRoof.asm | 32 +- text/CeladonPokecenter.asm | 4 +- text/CeruleanBadgeHouse.asm | 22 +- text/CeruleanCity.asm | 54 +- text/CeruleanGym.asm | 16 +- text/CeruleanMart.asm | 4 +- text/CeruleanPokecenter.asm | 4 +- text/CeruleanTradeHouse.asm | 2 +- text/CeruleanTrashedHouse.asm | 8 +- text/ChampionsRoom.asm | 16 +- text/CinnabarGym.asm | 60 +- text/CinnabarIsland.asm | 12 +- text/CinnabarLab.asm | 10 +- text/CinnabarLabFossilRoom.asm | 8 +- text/CinnabarLabMetronomeRoom.asm | 14 +- text/CinnabarLabTradeRoom.asm | 2 +- text/CinnabarMart.asm | 4 +- text/CinnabarPokecenter.asm | 4 +- text/CopycatsHouse1F.asm | 6 +- text/CopycatsHouse2F.asm | 22 +- text/Daycare.asm | 16 +- text/Daycare_2.asm | 14 +- text/DiglettsCaveRoute11.asm | 2 +- text/DiglettsCaveRoute2.asm | 2 +- text/FightingDojo.asm | 38 +- text/FuchsiaBillsGrandpasHouse.asm | 6 +- text/FuchsiaCity.asm | 36 +- text/FuchsiaGoodRodHouse.asm | 10 +- text/FuchsiaGym.asm | 4 +- text/FuchsiaGym_2.asm | 50 +- text/FuchsiaMart.asm | 4 +- text/FuchsiaMeetingRoom.asm | 6 +- text/FuchsiaPokecenter.asm | 4 +- text/GameCorner.asm | 60 +- text/GameCornerPrizeRoom.asm | 4 +- text/HallOfFame.asm | 2 +- text/IndigoPlateauLobby.asm | 4 +- text/LancesRoom.asm | 6 +- text/LavenderCuboneHouse.asm | 6 +- text/LavenderMart.asm | 6 +- text/LavenderPokecenter.asm | 4 +- text/LavenderTown.asm | 18 +- text/LoreleisRoom.asm | 8 +- text/MrFujisHouse.asm | 24 +- text/MrPsychicsHouse.asm | 8 +- text/MtMoon1F.asm | 44 +- text/MtMoonB1F.asm | 2 +- text/MtMoonB2F.asm | 42 +- text/MtMoonPokecenter.asm | 14 +- text/Museum1F.asm | 32 +- text/Museum2F.asm | 14 +- text/NameRatersHouse.asm | 14 +- text/OaksLab.asm | 76 +- text/PalletTown.asm | 16 +- text/PewterCity.asm | 32 +- text/PewterGym.asm | 2 +- text/PewterGym_2.asm | 20 +- text/PewterMart.asm | 4 +- text/PewterNidoranHouse.asm | 6 +- text/PewterPokecenter.asm | 4 +- text/PewterSpeechHouse.asm | 4 +- text/PokemonFanClub.asm | 33 +- text/PokemonMansion1F.asm | 12 +- text/PokemonMansion2F.asm | 16 +- text/PokemonMansion3F.asm | 14 +- text/PokemonMansionB1F.asm | 14 +- text/PokemonTower1F.asm | 10 +- text/PokemonTower2F.asm | 10 +- text/PokemonTower3F.asm | 18 +- text/PokemonTower4F.asm | 18 +- text/PokemonTower5F.asm | 28 +- text/PokemonTower6F.asm | 24 +- text/PokemonTower7F.asm | 20 +- text/PowerPlant.asm | 4 +- text/RedsHouse1F.asm | 10 +- text/RockTunnel1F.asm | 44 +- text/RockTunnelB1F.asm | 40 +- text/RockTunnelB1F_2.asm | 8 +- text/RockTunnelPokecenter.asm | 4 +- text/RocketHideoutB1F.asm | 30 +- text/RocketHideoutB2F.asm | 6 +- text/RocketHideoutB3F.asm | 6 +- text/RocketHideoutB4F.asm | 24 +- text/RocketHideoutElevator.asm | 2 +- text/Route1.asm | 12 +- text/Route10.asm | 41 +- text/Route11.asm | 50 +- text/Route11Gate1F.asm | 2 +- text/Route11Gate2F.asm | 8 +- text/Route11_2.asm | 12 +- text/Route12.asm | 52 +- text/Route12Gate1F.asm | 2 +- text/Route12Gate2F.asm | 12 +- text/Route12SuperRodHouse.asm | 12 +- text/Route13.asm | 66 +- text/Route14.asm | 62 +- text/Route15.asm | 62 +- text/Route15Gate1F.asm | 2 +- text/Route15Gate2F.asm | 4 +- text/Route16.asm | 44 +- text/Route16FlyHouse.asm | 10 +- text/Route16Gate1F.asm | 8 +- text/Route16Gate2F.asm | 8 +- text/Route17.asm | 72 +- text/Route18.asm | 22 +- text/Route18Gate1F.asm | 6 +- text/Route18Gate2F.asm | 4 +- text/Route19.asm | 62 +- text/Route2.asm | 4 +- text/Route20.asm | 63 +- text/Route21.asm | 54 +- text/Route22.asm | 10 +- text/Route22Gate.asm | 6 +- text/Route23.asm | 8 +- text/Route24.asm | 16 +- text/Route24_2.asm | 34 +- text/Route25.asm | 56 +- text/Route2Gate.asm | 4 +- text/Route2TradeHouse.asm | 2 +- text/Route3.asm | 50 +- text/Route4.asm | 12 +- text/Route5.asm | 2 +- text/Route6.asm | 36 +- text/Route7.asm | 2 +- text/Route8.asm | 56 +- text/Route9.asm | 56 +- text/SSAnne1F.asm | 4 +- text/SSAnne1FRooms.asm | 36 +- text/SSAnne2F.asm | 10 +- text/SSAnne2FRooms.asm | 38 +- text/SSAnne3F.asm | 2 +- text/SSAnneB1FRooms.asm | 40 +- text/SSAnneBow.asm | 18 +- text/SSAnneCaptainsRoom.asm | 14 +- text/SSAnneKitchen.asm | 20 +- text/SafariZoneCenter.asm | 4 +- text/SafariZoneCenterRestHouse.asm | 4 +- text/SafariZoneEast.asm | 6 +- text/SafariZoneEastRestHouse.asm | 6 +- text/SafariZoneGate.asm | 26 +- text/SafariZoneNorth.asm | 10 +- text/SafariZoneNorthRestHouse.asm | 6 +- text/SafariZoneSecretHouse.asm | 8 +- text/SafariZoneWest.asm | 8 +- text/SafariZoneWestRestHouse.asm | 6 +- text/SaffronCity.asm | 46 +- text/SaffronGates.asm | 8 +- text/SaffronGym.asm | 58 +- text/SaffronMart.asm | 4 +- text/SaffronPidgeyHouse.asm | 8 +- text/SaffronPokecenter.asm | 4 +- text/SeafoamIslandsB4F.asm | 6 +- text/SilphCo10F.asm | 16 +- text/SilphCo11F.asm | 30 +- text/SilphCo1F.asm | 2 +- text/SilphCo2F.asm | 32 +- text/SilphCo3F.asm | 16 +- text/SilphCo4F.asm | 22 +- text/SilphCo5F.asm | 18 +- text/SilphCo5F_2.asm | 16 +- text/SilphCo6F.asm | 38 +- text/SilphCo7F.asm | 54 +- text/SilphCo8F.asm | 22 +- text/SilphCo9F.asm | 24 +- text/UndergroundPathRoute6.asm | 2 +- text/UndergroundPathRoute7.asm | 2 +- text/UndergroundPathRoute7Copy.asm | 8 +- text/UndergroundPathRoute8.asm | 2 +- text/VermilionCity.asm | 34 +- text/VermilionDock.asm | 2 +- text/VermilionGym.asm | 2 +- text/VermilionGym_2.asm | 32 +- text/VermilionMart.asm | 4 +- text/VermilionOldRodHouse.asm | 12 +- text/VermilionPidgeyHouse.asm | 6 +- text/VermilionPokecenter.asm | 4 +- text/VictoryRoad1F.asm | 12 +- text/VictoryRoad2F.asm | 32 +- text/VictoryRoad3F.asm | 24 +- text/ViridianCity.asm | 44 +- text/ViridianForest.asm | 34 +- text/ViridianForestNorthGate.asm | 4 +- text/ViridianForestSouthGate.asm | 4 +- text/ViridianGym.asm | 62 +- text/ViridianMart.asm | 10 +- text/ViridianNicknameHouse.asm | 8 +- text/ViridianPokecenter.asm | 4 +- text/ViridianSchoolHouse.asm | 4 +- text/WardensHouse.asm | 22 +- 664 files changed, 13276 insertions(+), 11612 deletions(-) rename gfx/sprites/{erika.png => silph_worker_f.png} (100%) rename gfx/sprites/{silph_worker.png => silph_worker_m.png} (100%) diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 700ec47a5..346ad0e49 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -28,7 +28,7 @@ const SPRITE_ROCKET ; $18 const SPRITE_CHANNELER ; $19 const SPRITE_WAITER ; $1a - const SPRITE_ERIKA ; $1b + const SPRITE_SILPH_WORKER_F ; $1b const SPRITE_MIDDLE_AGED_WOMAN ; $1c const SPRITE_BRUNETTE_GIRL ; $1d const SPRITE_LANCE ; $1e @@ -45,7 +45,7 @@ const SPRITE_NURSE ; $29 const SPRITE_LINK_RECEPTIONIST ; $2a const SPRITE_SILPH_PRESIDENT ; $2b - const SPRITE_SILPH_WORKER ; $2c + const SPRITE_SILPH_WORKER_M ; $2c const SPRITE_WARDEN ; $2d const SPRITE_CAPTAIN ; $2e const SPRITE_FISHER ; $2f diff --git a/data/items/marts.asm b/data/items/marts.asm index c6a80de57..fbd0829a5 100644 --- a/data/items/marts.asm +++ b/data/items/marts.asm @@ -1,50 +1,50 @@ ; mart inventories are below ; they are texts -ViridianCashierText:: +ViridianMartClerkText:: script_mart POKE_BALL, ANTIDOTE, PARLYZ_HEAL, BURN_HEAL -PewterCashierText:: +PewterMartClerkText:: script_mart POKE_BALL, POTION, ESCAPE_ROPE, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL -CeruleanCashierText:: +CeruleanMartClerkText:: script_mart POKE_BALL, POTION, REPEL, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL -BikeShopCashierText:: ; unreferenced +UnusedBikeShopClerkText:: ; unreferenced script_mart BICYCLE -VermilionCashierText:: +VermilionMartClerkText:: script_mart POKE_BALL, SUPER_POTION, ICE_HEAL, AWAKENING, PARLYZ_HEAL, REPEL -LavenderCashierText:: +LavenderMartClerkText:: script_mart GREAT_BALL, SUPER_POTION, REVIVE, ESCAPE_ROPE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, PARLYZ_HEAL -CeladonMart2Clerk1Text:: +CeladonMart2FClerk1Text:: script_mart GREAT_BALL, SUPER_POTION, REVIVE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, AWAKENING, PARLYZ_HEAL -CeladonMart2Clerk2Text:: +CeladonMart2FClerk2Text:: script_mart TM_DOUBLE_TEAM, TM_REFLECT, TM_RAZOR_WIND, TM_HORN_DRILL, TM_EGG_BOMB, TM_MEGA_PUNCH, TM_MEGA_KICK, TM_TAKE_DOWN, TM_SUBMISSION -CeladonMart4ClerkText:: +CeladonMart4FClerkText:: script_mart POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE -CeladonMart5Clerk1Text:: +CeladonMart5FClerk1Text:: script_mart X_ACCURACY, GUARD_SPEC, DIRE_HIT, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL -CeladonMart5Clerk2Text:: +CeladonMart5FClerk2Text:: script_mart HP_UP, PROTEIN, IRON, CARBOS, CALCIUM -FuchsiaCashierText:: +FuchsiaMartClerkText:: script_mart ULTRA_BALL, GREAT_BALL, SUPER_POTION, REVIVE, FULL_HEAL, SUPER_REPEL -UnusedCashierText:: ; unreferenced +UnusedMartClerkText:: ; unreferenced script_mart GREAT_BALL, HYPER_POTION, SUPER_POTION, FULL_HEAL, REVIVE -CinnabarCashierText:: +CinnabarMartClerkText:: script_mart ULTRA_BALL, GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE -SaffronCashierText:: +SaffronMartClerkText:: script_mart GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE -IndigoCashierText:: +IndigoPlateauLobbyClerkText:: script_mart ULTRA_BALL, GREAT_BALL, FULL_RESTORE, MAX_POTION, FULL_HEAL, REVIVE, MAX_REPEL diff --git a/data/maps/objects/AgathasRoom.asm b/data/maps/objects/AgathasRoom.asm index afccd1be9..6cd6f21da 100644 --- a/data/maps/objects/AgathasRoom.asm +++ b/data/maps/objects/AgathasRoom.asm @@ -1,3 +1,6 @@ + object_const_def + const AGATHASROOM_AGATHA + AgathasRoom_Object: db $0 ; border block @@ -10,6 +13,6 @@ AgathasRoom_Object: def_bg_events def_object_events - object_event 5, 2, SPRITE_AGATHA, STAY, DOWN, 1, OPP_AGATHA, 1 + object_event 5, 2, SPRITE_AGATHA, STAY, DOWN, TEXT_AGATHASROOM_AGATHA, OPP_AGATHA, 1 def_warps_to AGATHAS_ROOM diff --git a/data/maps/objects/BikeShop.asm b/data/maps/objects/BikeShop.asm index 1fa8f6e6f..450d7a3a7 100644 --- a/data/maps/objects/BikeShop.asm +++ b/data/maps/objects/BikeShop.asm @@ -1,3 +1,8 @@ + object_const_def + const BIKESHOP_CLERK + const BIKESHOP_MIDDLE_AGED_WOMAN + const BIKESHOP_YOUNGSTER + BikeShop_Object: db $e ; border block @@ -8,8 +13,8 @@ BikeShop_Object: def_bg_events def_object_events - object_event 6, 2, SPRITE_BIKE_SHOP_CLERK, STAY, NONE, 1 ; person - object_event 5, 6, SPRITE_MIDDLE_AGED_WOMAN, WALK, UP_DOWN, 2 ; person - object_event 1, 3, SPRITE_YOUNGSTER, STAY, UP, 3 ; person + object_event 6, 2, SPRITE_BIKE_SHOP_CLERK, STAY, NONE, TEXT_BIKESHOP_CLERK + object_event 5, 6, SPRITE_MIDDLE_AGED_WOMAN, WALK, UP_DOWN, TEXT_BIKESHOP_MIDDLE_AGED_WOMAN + object_event 1, 3, SPRITE_YOUNGSTER, STAY, UP, TEXT_BIKESHOP_YOUNGSTER def_warps_to BIKE_SHOP diff --git a/data/maps/objects/BillsHouse.asm b/data/maps/objects/BillsHouse.asm index db8f8433b..198e6d9ef 100644 --- a/data/maps/objects/BillsHouse.asm +++ b/data/maps/objects/BillsHouse.asm @@ -1,3 +1,8 @@ + object_const_def + const BILLSHOUSE_BILL_POKEMON + const BILLSHOUSE_BILL1 + const BILLSHOUSE_BILL2 + BillsHouse_Object: db $d ; border block @@ -8,8 +13,8 @@ BillsHouse_Object: def_bg_events def_object_events - object_event 6, 5, SPRITE_MONSTER, STAY, NONE, 1 ; person - object_event 4, 4, SPRITE_SUPER_NERD, STAY, NONE, 2 ; person - object_event 6, 5, SPRITE_SUPER_NERD, STAY, NONE, 3 ; person + object_event 6, 5, SPRITE_MONSTER, STAY, NONE, TEXT_BILLSHOUSE_BILL_POKEMON + object_event 4, 4, SPRITE_SUPER_NERD, STAY, NONE, TEXT_BILLSHOUSE_BILL_SS_TICKET + object_event 6, 5, SPRITE_SUPER_NERD, STAY, NONE, TEXT_BILLSHOUSE_BILL_CHECK_OUT_MY_RARE_POKEMON def_warps_to BILLS_HOUSE diff --git a/data/maps/objects/BluesHouse.asm b/data/maps/objects/BluesHouse.asm index ac200b283..9633c1d05 100644 --- a/data/maps/objects/BluesHouse.asm +++ b/data/maps/objects/BluesHouse.asm @@ -1,3 +1,8 @@ + object_const_def + const BLUESHOUSE_DAISY1 + const BLUESHOUSE_DAISY2 + const BLUESHOUSE_TOWN_MAP + BluesHouse_Object: db $a ; border block @@ -8,8 +13,8 @@ BluesHouse_Object: def_bg_events def_object_events - object_event 2, 3, SPRITE_DAISY, STAY, RIGHT, 1 - object_event 6, 4, SPRITE_DAISY, WALK, UP_DOWN, 2, 0 - object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, 3, 0 + object_event 2, 3, SPRITE_DAISY, STAY, RIGHT, TEXT_BLUESHOUSE_DAISY_SITTING + object_event 6, 4, SPRITE_DAISY, WALK, UP_DOWN, TEXT_BLUESHOUSE_DAISY_WALKING, 0 + object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, TEXT_BLUESHOUSE_TOWN_MAP, 0 def_warps_to BLUES_HOUSE diff --git a/data/maps/objects/BrunosRoom.asm b/data/maps/objects/BrunosRoom.asm index 1e8a0a277..e4cd56925 100644 --- a/data/maps/objects/BrunosRoom.asm +++ b/data/maps/objects/BrunosRoom.asm @@ -1,3 +1,6 @@ + object_const_def + const BRUNOSROOM_BRUNO + BrunosRoom_Object: db $3 ; border block @@ -10,6 +13,6 @@ BrunosRoom_Object: def_bg_events def_object_events - object_event 5, 2, SPRITE_BRUNO, STAY, DOWN, 1, OPP_BRUNO, 1 + object_event 5, 2, SPRITE_BRUNO, STAY, DOWN, TEXT_BRUNOSROOM_BRUNO, OPP_BRUNO, 1 def_warps_to BRUNOS_ROOM diff --git a/data/maps/objects/CeladonChiefHouse.asm b/data/maps/objects/CeladonChiefHouse.asm index 8bec11b09..8fe27f685 100644 --- a/data/maps/objects/CeladonChiefHouse.asm +++ b/data/maps/objects/CeladonChiefHouse.asm @@ -1,3 +1,8 @@ + object_const_def + const CELADONCHIEFHOUSE_CHIEF + const CELADONCHIEFHOUSE_ROCKET + const CELADONCHIEFHOUSE_SAILOR + CeladonChiefHouse_Object: db $f ; border block @@ -8,8 +13,8 @@ CeladonChiefHouse_Object: def_bg_events def_object_events - object_event 4, 2, SPRITE_GRAMPS, STAY, DOWN, 1 ; person - object_event 1, 4, SPRITE_ROCKET, WALK, ANY_DIR, 2 ; person - object_event 5, 6, SPRITE_SAILOR, STAY, LEFT, 3 ; person + object_event 4, 2, SPRITE_GRAMPS, STAY, DOWN, TEXT_CELADONCHIEFHOUSE_CHIEF + object_event 1, 4, SPRITE_ROCKET, WALK, ANY_DIR, TEXT_CELADONCHIEFHOUSE_ROCKET + object_event 5, 6, SPRITE_SAILOR, STAY, LEFT, TEXT_CELADONCHIEFHOUSE_SAILOR def_warps_to CELADON_CHIEF_HOUSE diff --git a/data/maps/objects/CeladonCity.asm b/data/maps/objects/CeladonCity.asm index 1644335bf..6975bf6be 100644 --- a/data/maps/objects/CeladonCity.asm +++ b/data/maps/objects/CeladonCity.asm @@ -1,3 +1,14 @@ + object_const_def + const CELADONCITY_LITTLE_GIRL + const CELADONCITY_GRAMPS1 + const CELADONCITY_GIRL + const CELADONCITY_GRAMPS2 + const CELADONCITY_GRAMPS3 + const CELADONCITY_FISHER + const CELADONCITY_POLIWRATH + const CELADONCITY_ROCKET1 + const CELADONCITY_ROCKET2 + CeladonCity_Object: db $f ; border block @@ -17,25 +28,25 @@ CeladonCity_Object: warp_event 43, 27, CELADON_HOTEL, 1 def_bg_events - bg_event 27, 15, 10 ; CeladonCityText10 - bg_event 19, 15, 11 ; CeladonCityText11 - bg_event 42, 9, 12 ; PokeCenterSignText - bg_event 13, 29, 13 ; CeladonCityText13 - bg_event 21, 9, 14 ; CeladonCityText14 - bg_event 12, 13, 15 ; CeladonCityText15 - bg_event 39, 21, 16 ; CeladonCityText16 - bg_event 33, 21, 17 ; CeladonCityText17 - bg_event 27, 21, 18 ; CeladonCityText18 + bg_event 27, 15, TEXT_CELADONCITY_TRAINER_TIPS1 + bg_event 19, 15, TEXT_CELADONCITY_SIGN + bg_event 42, 9, TEXT_CELADONCITY_POKECENTER_SIGN + bg_event 13, 29, TEXT_CELADONCITY_GYM_SIGN + bg_event 21, 9, TEXT_CELADONCITY_MANSION_SIGN + bg_event 12, 13, TEXT_CELADONCITY_DEPTSTORE_SIGN + bg_event 39, 21, TEXT_CELADONCITY_TRAINER_TIPS2 + bg_event 33, 21, TEXT_CELADONCITY_PRIZEEXCHANGE_SIGN + bg_event 27, 21, TEXT_CELADONCITY_GAMECORNER_SIGN def_object_events - object_event 8, 17, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, 1 ; person - object_event 11, 28, SPRITE_GRAMPS, STAY, UP, 2 ; person - object_event 14, 19, SPRITE_GIRL, WALK, UP_DOWN, 3 ; person - object_event 25, 22, SPRITE_GRAMPS, STAY, DOWN, 4 ; person - object_event 22, 16, SPRITE_GRAMPS, STAY, DOWN, 5 ; person - object_event 32, 12, SPRITE_FISHER, STAY, LEFT, 6 ; person - object_event 30, 12, SPRITE_MONSTER, STAY, RIGHT, 7 ; person - object_event 32, 29, SPRITE_ROCKET, WALK, LEFT_RIGHT, 8 ; person - object_event 42, 14, SPRITE_ROCKET, WALK, LEFT_RIGHT, 9 ; person + object_event 8, 17, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, TEXT_CELADONCITY_LITTLE_GIRL + object_event 11, 28, SPRITE_GRAMPS, STAY, UP, TEXT_CELADONCITY_GRAMPS1 + object_event 14, 19, SPRITE_GIRL, WALK, UP_DOWN, TEXT_CELADONCITY_GIRL + object_event 25, 22, SPRITE_GRAMPS, STAY, DOWN, TEXT_CELADONCITY_GRAMPS2 + object_event 22, 16, SPRITE_GRAMPS, STAY, DOWN, TEXT_CELADONCITY_GRAMPS3 + object_event 32, 12, SPRITE_FISHER, STAY, LEFT, TEXT_CELADONCITY_FISHER + object_event 30, 12, SPRITE_MONSTER, STAY, RIGHT, TEXT_CELADONCITY_POLIWRATH + object_event 32, 29, SPRITE_ROCKET, WALK, LEFT_RIGHT, TEXT_CELADONCITY_ROCKET1 + object_event 42, 14, SPRITE_ROCKET, WALK, LEFT_RIGHT, TEXT_CELADONCITY_ROCKET2 def_warps_to CELADON_CITY diff --git a/data/maps/objects/CeladonDiner.asm b/data/maps/objects/CeladonDiner.asm index 33ea922b3..98363688c 100644 --- a/data/maps/objects/CeladonDiner.asm +++ b/data/maps/objects/CeladonDiner.asm @@ -1,3 +1,10 @@ + object_const_def + const CELADONDINER_COOK + const CELADONDINER_MIDDLE_AGED_WOMAN + const CELADONDINER_MIDDLE_AGED_MAN + const CELADONDINER_FISHER + const CELADONDINER_GYM_GUIDE + CeladonDiner_Object: db $f ; border block @@ -8,10 +15,10 @@ CeladonDiner_Object: def_bg_events def_object_events - object_event 8, 5, SPRITE_COOK, WALK, LEFT_RIGHT, 1 ; person - object_event 7, 2, SPRITE_MIDDLE_AGED_WOMAN, STAY, NONE, 2 ; person - object_event 1, 4, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, 3 ; person - object_event 5, 3, SPRITE_FISHER, STAY, RIGHT, 4 ; person - object_event 0, 1, SPRITE_GYM_GUIDE, STAY, DOWN, 5 ; person + object_event 8, 5, SPRITE_COOK, WALK, LEFT_RIGHT, TEXT_CELADONDINER_COOK + object_event 7, 2, SPRITE_MIDDLE_AGED_WOMAN, STAY, NONE, TEXT_CELADONDINER_MIDDLE_AGED_WOMAN + object_event 1, 4, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, TEXT_CELADONDINER_MIDDLE_AGED_MAN + object_event 5, 3, SPRITE_FISHER, STAY, RIGHT, TEXT_CELADONDINER_FISHER + object_event 0, 1, SPRITE_GYM_GUIDE, STAY, DOWN, TEXT_CELADONDINER_GYM_GUIDE def_warps_to CELADON_DINER diff --git a/data/maps/objects/CeladonGym.asm b/data/maps/objects/CeladonGym.asm index 294e727d0..bb4ad61c5 100644 --- a/data/maps/objects/CeladonGym.asm +++ b/data/maps/objects/CeladonGym.asm @@ -1,3 +1,13 @@ + object_const_def + const CELADONGYM_ERIKA + const CELADONGYM_COOLTRAINER_F1 + const CELADONGYM_BEAUTY1 + const CELADONGYM_COOLTRAINER_F2 + const CELADONGYM_BEAUTY2 + const CELADONGYM_COOLTRAINER_F3 + const CELADONGYM_BEAUTY3 + const CELADONGYM_COOLTRAINER_F4 + CeladonGym_Object: db $3 ; border block @@ -8,13 +18,13 @@ CeladonGym_Object: def_bg_events def_object_events - object_event 4, 3, SPRITE_ERIKA, STAY, DOWN, 1, OPP_ERIKA, 1 - object_event 2, 11, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_LASS, 17 - object_event 7, 10, SPRITE_BEAUTY, STAY, LEFT, 3, OPP_BEAUTY, 1 - object_event 9, 5, SPRITE_COOLTRAINER_F, STAY, DOWN, 4, OPP_JR_TRAINER_F, 11 - object_event 1, 5, SPRITE_BEAUTY, STAY, DOWN, 5, OPP_BEAUTY, 2 - object_event 6, 3, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_LASS, 18 - object_event 3, 3, SPRITE_BEAUTY, STAY, DOWN, 7, OPP_BEAUTY, 3 - object_event 5, 3, SPRITE_COOLTRAINER_F, STAY, DOWN, 8, OPP_COOLTRAINER_F, 1 + object_event 4, 3, SPRITE_SILPH_WORKER_F, STAY, DOWN, TEXT_CELADONGYM_ERIKA, OPP_ERIKA, 1 + object_event 2, 11, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_CELADONGYM_COOLTRAINER_F1, OPP_LASS, 17 + object_event 7, 10, SPRITE_BEAUTY, STAY, LEFT, TEXT_CELADONGYM_BEAUTY1, OPP_BEAUTY, 1 + object_event 9, 5, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_CELADONGYM_COOLTRAINER_F2, OPP_JR_TRAINER_F, 11 + object_event 1, 5, SPRITE_BEAUTY, STAY, DOWN, TEXT_CELADONGYM_BEAUTY2, OPP_BEAUTY, 2 + object_event 6, 3, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_CELADONGYM_COOLTRAINER_F3, OPP_LASS, 18 + object_event 3, 3, SPRITE_BEAUTY, STAY, DOWN, TEXT_CELADONGYM_BEAUTY3, OPP_BEAUTY, 3 + object_event 5, 3, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_CELADONGYM_COOLTRAINER_F4, OPP_COOLTRAINER_F, 1 def_warps_to CELADON_GYM diff --git a/data/maps/objects/CeladonHotel.asm b/data/maps/objects/CeladonHotel.asm index 13aaff645..700361ce9 100644 --- a/data/maps/objects/CeladonHotel.asm +++ b/data/maps/objects/CeladonHotel.asm @@ -1,3 +1,8 @@ + object_const_def + const CELADONHOTEL_GRANNY + const CELADONHOTEL_BEAUTY + const CELADONHOTEL_SUPER_NERD + CeladonHotel_Object: db $0 ; border block @@ -8,8 +13,8 @@ CeladonHotel_Object: def_bg_events def_object_events - object_event 3, 1, SPRITE_GRANNY, STAY, DOWN, 1 ; person - object_event 2, 4, SPRITE_BEAUTY, STAY, NONE, 2 ; person - object_event 8, 4, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 3 ; person + object_event 3, 1, SPRITE_GRANNY, STAY, DOWN, TEXT_CELADONHOTEL_GRANNY + object_event 2, 4, SPRITE_BEAUTY, STAY, NONE, TEXT_CELADONHOTEL_BEAUTY + object_event 8, 4, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, TEXT_CELADONHOTEL_SUPER_NERD def_warps_to CELADON_HOTEL diff --git a/data/maps/objects/CeladonMansion1F.asm b/data/maps/objects/CeladonMansion1F.asm index 4966c903a..6161cf0a4 100644 --- a/data/maps/objects/CeladonMansion1F.asm +++ b/data/maps/objects/CeladonMansion1F.asm @@ -1,3 +1,9 @@ + object_const_def + const CELADONMANSION1F_MEOWTH + const CELADONMANSION1F_GRANNY + const CELADONMANSION1F_CLEFAIRY + const CELADONMANSION1F_NIDORANF + CeladonMansion1F_Object: db $f ; border block @@ -9,12 +15,12 @@ CeladonMansion1F_Object: warp_event 2, 1, CELADON_MANSION_2F, 3 def_bg_events - bg_event 4, 9, 5 ; CeladonMansion1Text5 + bg_event 4, 9, TEXT_CELADONMANSION1F_MANAGERS_SUITE_SIGN def_object_events - object_event 0, 5, SPRITE_MONSTER, STAY, RIGHT, 1 ; person - object_event 1, 5, SPRITE_GRANNY, STAY, DOWN, 2 ; person - object_event 1, 8, SPRITE_FAIRY, WALK, LEFT_RIGHT, 3 ; person - object_event 4, 4, SPRITE_MONSTER, WALK, UP_DOWN, 4 ; person + object_event 0, 5, SPRITE_MONSTER, STAY, RIGHT, TEXT_CELADONMANSION1F_MEOWTH + object_event 1, 5, SPRITE_GRANNY, STAY, DOWN, TEXT_CELADONMANSION1F_GRANNY + object_event 1, 8, SPRITE_FAIRY, WALK, LEFT_RIGHT, TEXT_CELADONMANSION1F_CLEFAIRY + object_event 4, 4, SPRITE_MONSTER, WALK, UP_DOWN, TEXT_CELADONMANSION1F_NIDORANF def_warps_to CELADON_MANSION_1F diff --git a/data/maps/objects/CeladonMansion2F.asm b/data/maps/objects/CeladonMansion2F.asm index c2546d722..07ba173d1 100644 --- a/data/maps/objects/CeladonMansion2F.asm +++ b/data/maps/objects/CeladonMansion2F.asm @@ -8,7 +8,7 @@ CeladonMansion2F_Object: warp_event 4, 1, CELADON_MANSION_3F, 4 def_bg_events - bg_event 4, 9, 1 ; CeladonMansion2Text1 + bg_event 4, 9, TEXT_CELADONMANSION2F_MEETING_ROOM_SIGN def_object_events diff --git a/data/maps/objects/CeladonMansion3F.asm b/data/maps/objects/CeladonMansion3F.asm index b4f9c37bf..5d2c1e999 100644 --- a/data/maps/objects/CeladonMansion3F.asm +++ b/data/maps/objects/CeladonMansion3F.asm @@ -1,3 +1,9 @@ + object_const_def + const CELADONMANSION3F_PROGRAMMER + const CELADONMANSION3F_GRAPHIC_ARTIST + const CELADONMANSION3F_WRITER + const CELADONMANSION3F_GAME_DESIGNER + CeladonMansion3F_Object: db $f ; border block @@ -8,15 +14,15 @@ CeladonMansion3F_Object: warp_event 4, 1, CELADON_MANSION_2F, 4 def_bg_events - bg_event 1, 3, 5 ; CeladonMansion3Text5 - bg_event 4, 3, 6 ; CeladonMansion3Text6 - bg_event 1, 6, 7 ; CeladonMansion3Text7 - bg_event 4, 9, 8 ; CeladonMansion3Text8 + bg_event 1, 3, TEXT_CELADONMANSION3F_GAME_PROGRAM_PC + bg_event 4, 3, TEXT_CELADONMANSION3F_PLAYING_GAME_PC + bg_event 1, 6, TEXT_CELADONMANSION3F_GAME_SCRIPT_PC + bg_event 4, 9, TEXT_CELADONMANSION3F_DEV_ROOM_SIGN def_object_events - object_event 0, 4, SPRITE_BIKE_SHOP_CLERK, STAY, UP, 1 ; person - object_event 3, 4, SPRITE_CLERK, STAY, UP, 2 ; person - object_event 0, 7, SPRITE_SUPER_NERD, STAY, UP, 3 ; person - object_event 2, 3, SPRITE_SILPH_WORKER, STAY, NONE, 4 ; person + object_event 0, 4, SPRITE_BIKE_SHOP_CLERK, STAY, UP, TEXT_CELADONMANSION3F_PROGRAMMER + object_event 3, 4, SPRITE_CLERK, STAY, UP, TEXT_CELADONMANSION3F_GRAPHIC_ARTIST + object_event 0, 7, SPRITE_SUPER_NERD, STAY, UP, TEXT_CELADONMANSION3F_WRITER + object_event 2, 3, SPRITE_SILPH_WORKER_M, STAY, NONE, TEXT_CELADONMANSION3F_GAME_DESIGNER def_warps_to CELADON_MANSION_3F diff --git a/data/maps/objects/CeladonMansionRoof.asm b/data/maps/objects/CeladonMansionRoof.asm index e28249e2c..e347849b1 100644 --- a/data/maps/objects/CeladonMansionRoof.asm +++ b/data/maps/objects/CeladonMansionRoof.asm @@ -7,7 +7,7 @@ CeladonMansionRoof_Object: warp_event 2, 7, CELADON_MANSION_ROOF_HOUSE, 1 def_bg_events - bg_event 3, 7, 1 ; CeladonMansion4Text1 + bg_event 3, 7, TEXT_CELADONMANSIONROOF_HOUSE_SIGN def_object_events diff --git a/data/maps/objects/CeladonMansionRoofHouse.asm b/data/maps/objects/CeladonMansionRoofHouse.asm index c5111a763..4ee9494bd 100644 --- a/data/maps/objects/CeladonMansionRoofHouse.asm +++ b/data/maps/objects/CeladonMansionRoofHouse.asm @@ -1,3 +1,7 @@ + object_const_def + const CELADONMANSION_ROOF_HOUSE_HIKER + const CELADONMANSION_ROOF_HOUSE_EEVEE_POKEBALL + CeladonMansionRoofHouse_Object: db $a ; border block @@ -8,7 +12,7 @@ CeladonMansionRoofHouse_Object: def_bg_events def_object_events - object_event 2, 2, SPRITE_HIKER, STAY, DOWN, 1 ; person - object_event 4, 3, SPRITE_POKE_BALL, STAY, NONE, 2 ; person + object_event 2, 2, SPRITE_HIKER, STAY, DOWN, TEXT_CELADONMANSION_ROOF_HOUSE_HIKER + object_event 4, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_CELADONMANSION_ROOF_HOUSE_EEVEE_POKEBALL def_warps_to CELADON_MANSION_ROOF_HOUSE diff --git a/data/maps/objects/CeladonMart1F.asm b/data/maps/objects/CeladonMart1F.asm index d7f8924fa..6ec1e35d9 100644 --- a/data/maps/objects/CeladonMart1F.asm +++ b/data/maps/objects/CeladonMart1F.asm @@ -1,3 +1,6 @@ + object_const_def + const CELADONMART1F_RECEPTIONIST + CeladonMart1F_Object: db $f ; border block @@ -10,10 +13,10 @@ CeladonMart1F_Object: warp_event 1, 1, CELADON_MART_ELEVATOR, 1 def_bg_events - bg_event 11, 4, 2 ; CeladonMart1Text2 - bg_event 14, 1, 3 ; CeladonMart1Text3 + bg_event 11, 4, TEXT_CELADONMART1F_DIRECTORY_SIGN + bg_event 14, 1, TEXT_CELADONMART1F_CURRENT_FLOOR_SIGN def_object_events - object_event 8, 3, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 1 ; person + object_event 8, 3, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_CELADONMART1F_RECEPTIONIST def_warps_to CELADON_MART_1F diff --git a/data/maps/objects/CeladonMart2F.asm b/data/maps/objects/CeladonMart2F.asm index 9eaa16057..520523839 100644 --- a/data/maps/objects/CeladonMart2F.asm +++ b/data/maps/objects/CeladonMart2F.asm @@ -1,3 +1,9 @@ + object_const_def + const CELADONMART2F_CLERK1 + const CELADONMART2F_CLERK2 + const CELADONMART2F_MIDDLE_AGED_MAN + const CELADONMART2F_GIRL + CeladonMart2F_Object: db $f ; border block @@ -7,12 +13,12 @@ CeladonMart2F_Object: warp_event 1, 1, CELADON_MART_ELEVATOR, 1 def_bg_events - bg_event 14, 1, 5 ; CeladonMart2Text5 + bg_event 14, 1, TEXT_CELADONMART2F_CURRENT_FLOOR_SIGN def_object_events - object_event 5, 3, SPRITE_CLERK, STAY, DOWN, 1 ; person - object_event 6, 3, SPRITE_CLERK, STAY, DOWN, 2 ; person - object_event 19, 5, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 3 ; person - object_event 14, 4, SPRITE_GIRL, WALK, UP_DOWN, 4 ; person + object_event 5, 3, SPRITE_CLERK, STAY, DOWN, TEXT_CELADONMART2F_CLERK1 + object_event 6, 3, SPRITE_CLERK, STAY, DOWN, TEXT_CELADONMART2F_CLERK2 + object_event 19, 5, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, TEXT_CELADONMART2F_MIDDLE_AGED_MAN + object_event 14, 4, SPRITE_GIRL, WALK, UP_DOWN, TEXT_CELADONMART2F_GIRL def_warps_to CELADON_MART_2F diff --git a/data/maps/objects/CeladonMart3F.asm b/data/maps/objects/CeladonMart3F.asm index 85f0cf1c1..e0e3f7be8 100644 --- a/data/maps/objects/CeladonMart3F.asm +++ b/data/maps/objects/CeladonMart3F.asm @@ -1,3 +1,10 @@ + object_const_def + const CELADONMART3F_CLERK + const CELADONMART3F_GAMEBOY_KID1 + const CELADONMART3F_GAMEBOY_KID2 + const CELADONMART3F_GAMEBOY_KID3 + const CELADONMART3F_LITTLE_BOY + CeladonMart3F_Object: db $f ; border block @@ -7,24 +14,24 @@ CeladonMart3F_Object: warp_event 1, 1, CELADON_MART_ELEVATOR, 1 def_bg_events - bg_event 2, 4, 6 ; CeladonMart3Text6 - bg_event 3, 4, 7 ; CeladonMart3Text7 - bg_event 5, 4, 8 ; CeladonMart3Text8 - bg_event 6, 4, 9 ; CeladonMart3Text9 - bg_event 2, 6, 10 ; CeladonMart3Text10 - bg_event 3, 6, 11 ; CeladonMart3Text11 - bg_event 5, 6, 12 ; CeladonMart3Text12 - bg_event 6, 6, 13 ; CeladonMart3Text13 - bg_event 14, 1, 14 ; CeladonMart3Text14 - bg_event 4, 1, 15 ; CeladonMart3Text15 - bg_event 6, 1, 16 ; CeladonMart3Text16 - bg_event 10, 1, 17 ; CeladonMart3Text17 + bg_event 2, 4, TEXT_CELADONMART3F_SNES1 + bg_event 3, 4, TEXT_CELADONMART3F_RPG + bg_event 5, 4, TEXT_CELADONMART3F_SNES2 + bg_event 6, 4, TEXT_CELADONMART3F_SPORTS_GAME + bg_event 2, 6, TEXT_CELADONMART3F_SNES3 + bg_event 3, 6, TEXT_CELADONMART3F_PUZZLE_GAME + bg_event 5, 6, TEXT_CELADONMART3F_SNES4 + bg_event 6, 6, TEXT_CELADONMART3F_FIGHTING_GAME + bg_event 14, 1, TEXT_CELADONMART3F_CURRENT_FLOOR_SIGN + bg_event 4, 1, TEXT_CELADONMART3F_POKEMON_POSTER1 + bg_event 6, 1, TEXT_CELADONMART3F_POKEMON_POSTER2 + bg_event 10, 1, TEXT_CELADONMART3F_POKEMON_POSTER3 def_object_events - object_event 16, 5, SPRITE_CLERK, STAY, NONE, 1 ; person - object_event 11, 6, SPRITE_GAMEBOY_KID, STAY, RIGHT, 2 ; person - object_event 7, 2, SPRITE_GAMEBOY_KID, STAY, DOWN, 3 ; person - object_event 8, 2, SPRITE_GAMEBOY_KID, STAY, DOWN, 4 ; person - object_event 2, 5, SPRITE_LITTLE_BOY, STAY, UP, 5 ; person + object_event 16, 5, SPRITE_CLERK, STAY, NONE, TEXT_CELADONMART3F_CLERK + object_event 11, 6, SPRITE_GAMEBOY_KID, STAY, RIGHT, TEXT_CELADONMART3F_GAMEBOY_KID1 + object_event 7, 2, SPRITE_GAMEBOY_KID, STAY, DOWN, TEXT_CELADONMART3F_GAMEBOY_KID2 + object_event 8, 2, SPRITE_GAMEBOY_KID, STAY, DOWN, TEXT_CELADONMART3F_GAMEBOY_KID3 + object_event 2, 5, SPRITE_LITTLE_BOY, STAY, UP, TEXT_CELADONMART3F_LITTLE_BOY def_warps_to CELADON_MART_3F diff --git a/data/maps/objects/CeladonMart4F.asm b/data/maps/objects/CeladonMart4F.asm index 7f1886924..6ee17f192 100644 --- a/data/maps/objects/CeladonMart4F.asm +++ b/data/maps/objects/CeladonMart4F.asm @@ -1,3 +1,8 @@ + object_const_def + const CELADONMART4F_CLERK + const CELADONMART4F_SUPER_NERD + const CELADONMART4F_YOUNGSTER + CeladonMart4F_Object: db $f ; border block @@ -7,11 +12,11 @@ CeladonMart4F_Object: warp_event 1, 1, CELADON_MART_ELEVATOR, 1 def_bg_events - bg_event 14, 1, 4 ; CeladonMart4Text4 + bg_event 14, 1, TEXT_CELADONMART4F_CURRENT_FLOOR_SIGN def_object_events - object_event 5, 7, SPRITE_CLERK, STAY, NONE, 1 ; person - object_event 15, 5, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 2 ; person - object_event 5, 2, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 3 ; person + object_event 5, 7, SPRITE_CLERK, STAY, NONE, TEXT_CELADONMART4F_CLERK + object_event 15, 5, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, TEXT_CELADONMART4F_SUPER_NERD + object_event 5, 2, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, TEXT_CELADONMART4F_YOUNGSTER def_warps_to CELADON_MART_4F diff --git a/data/maps/objects/CeladonMart5F.asm b/data/maps/objects/CeladonMart5F.asm index 35cb45b87..916d2756c 100644 --- a/data/maps/objects/CeladonMart5F.asm +++ b/data/maps/objects/CeladonMart5F.asm @@ -1,3 +1,9 @@ + object_const_def + const CELADONMART5F_GENTLEMAN + const CELADONMART5F_SAILOR + const CELADONMART5F_CLERK1 + const CELADONMART5F_CLERK2 + CeladonMart5F_Object: db $f ; border block @@ -7,12 +13,12 @@ CeladonMart5F_Object: warp_event 1, 1, CELADON_MART_ELEVATOR, 1 def_bg_events - bg_event 14, 1, 5 ; CeladonMart5Text5 + bg_event 14, 1, TEXT_CELADONMART5F_CURRENT_FLOOR_SIGN def_object_events - object_event 14, 5, SPRITE_GENTLEMAN, WALK, UP_DOWN, 1 ; person - object_event 2, 6, SPRITE_SAILOR, STAY, NONE, 2 ; person - object_event 5, 3, SPRITE_CLERK, STAY, DOWN, 3 ; person - object_event 6, 3, SPRITE_CLERK, STAY, DOWN, 4 ; person + object_event 14, 5, SPRITE_GENTLEMAN, WALK, UP_DOWN, TEXT_CELADONMART5F_GENTLEMAN + object_event 2, 6, SPRITE_SAILOR, STAY, NONE, TEXT_CELADONMART5F_SAILOR + object_event 5, 3, SPRITE_CLERK, STAY, DOWN, TEXT_CELADONMART5F_CLERK1 + object_event 6, 3, SPRITE_CLERK, STAY, DOWN, TEXT_CELADONMART5F_CLERK2 def_warps_to CELADON_MART_5F diff --git a/data/maps/objects/CeladonMartElevator.asm b/data/maps/objects/CeladonMartElevator.asm index c24e48dfd..0ced06ce9 100644 --- a/data/maps/objects/CeladonMartElevator.asm +++ b/data/maps/objects/CeladonMartElevator.asm @@ -6,7 +6,7 @@ CeladonMartElevator_Object: warp_event 2, 3, CELADON_MART_1F, 6 def_bg_events - bg_event 3, 0, 1 ; CeladonMartElevatorText1 + bg_event 3, 0, TEXT_CELADONMARTELEVATOR def_object_events diff --git a/data/maps/objects/CeladonMartRoof.asm b/data/maps/objects/CeladonMartRoof.asm index f56a0b0df..e686567c7 100644 --- a/data/maps/objects/CeladonMartRoof.asm +++ b/data/maps/objects/CeladonMartRoof.asm @@ -1,3 +1,7 @@ + object_const_def + const CELADONMARTROOF_SUPER_NERD + const CELADONMARTROOF_LITTLE_GIRL + CeladonMartRoof_Object: db $42 ; border block @@ -5,13 +9,13 @@ CeladonMartRoof_Object: warp_event 15, 2, CELADON_MART_5F, 1 def_bg_events - bg_event 10, 1, 3 ; CeladonMartRoofText3 - bg_event 11, 1, 4 ; CeladonMartRoofText4 - bg_event 12, 2, 5 ; CeladonMartRoofText5 - bg_event 13, 2, 6 ; CeladonMartRoofText6 + bg_event 10, 1, TEXT_CELADONMARTROOF_VENDING_MACHINE1 + bg_event 11, 1, TEXT_CELADONMARTROOF_VENDING_MACHINE2 + bg_event 12, 2, TEXT_CELADONMARTROOF_VENDING_MACHINE3 + bg_event 13, 2, TEXT_CELADONMARTROOF_CURRENT_FLOOR_SIGN def_object_events - object_event 10, 4, SPRITE_SUPER_NERD, STAY, LEFT, 1 ; person - object_event 5, 5, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, 2 ; person + object_event 10, 4, SPRITE_SUPER_NERD, STAY, LEFT, TEXT_CELADONMARTROOF_SUPER_NERD + object_event 5, 5, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, TEXT_CELADONMARTROOF_LITTLE_GIRL def_warps_to CELADON_MART_ROOF diff --git a/data/maps/objects/CeladonPokecenter.asm b/data/maps/objects/CeladonPokecenter.asm index 40c466a0f..4709203b7 100644 --- a/data/maps/objects/CeladonPokecenter.asm +++ b/data/maps/objects/CeladonPokecenter.asm @@ -1,3 +1,9 @@ + object_const_def + const CELADONPOKECENTER_NURSE + const CELADONPOKECENTER_GENTLEMAN + const CELADONPOKECENTER_BEAUTY + const CELADONPOKECENTER_LINK_RECEPTIONIST + CeladonPokecenter_Object: db $0 ; border block @@ -8,9 +14,9 @@ CeladonPokecenter_Object: def_bg_events def_object_events - object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person - object_event 7, 3, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 2 ; person - object_event 10, 5, SPRITE_BEAUTY, WALK, ANY_DIR, 3 ; person - object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person + object_event 3, 1, SPRITE_NURSE, STAY, DOWN, TEXT_CELADONPOKECENTER_NURSE + object_event 7, 3, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, TEXT_CELADONPOKECENTER_GENTLEMAN + object_event 10, 5, SPRITE_BEAUTY, WALK, ANY_DIR, TEXT_CELADONPOKECENTER_BEAUTY + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_CELADONPOKECENTER_LINK_RECEPTIONIST def_warps_to CELADON_POKECENTER diff --git a/data/maps/objects/CeruleanBadgeHouse.asm b/data/maps/objects/CeruleanBadgeHouse.asm index 145dde810..1fec6ac8e 100644 --- a/data/maps/objects/CeruleanBadgeHouse.asm +++ b/data/maps/objects/CeruleanBadgeHouse.asm @@ -1,3 +1,6 @@ + object_const_def + const CERULEANBADGEHOUSE_MIDDLE_AGED_MAN + CeruleanBadgeHouse_Object: db $c ; border block @@ -9,6 +12,6 @@ CeruleanBadgeHouse_Object: def_bg_events def_object_events - object_event 5, 3, SPRITE_MIDDLE_AGED_MAN, STAY, RIGHT, 1 ; person + object_event 5, 3, SPRITE_MIDDLE_AGED_MAN, STAY, RIGHT, TEXT_CERULEANBADGEHOUSE_MIDDLE_AGED_MAN def_warps_to CERULEAN_BADGE_HOUSE diff --git a/data/maps/objects/CeruleanCave1F.asm b/data/maps/objects/CeruleanCave1F.asm index b858a40fb..777805d4e 100644 --- a/data/maps/objects/CeruleanCave1F.asm +++ b/data/maps/objects/CeruleanCave1F.asm @@ -1,3 +1,8 @@ + object_const_def + const CERULEANCAVE1F_FULL_RESTORE + const CERULEANCAVE1F_MAX_ELIXER + const CERULEANCAVE1F_NUGGET + CeruleanCave1F_Object: db $7d ; border block @@ -15,8 +20,8 @@ CeruleanCave1F_Object: def_bg_events def_object_events - object_event 7, 13, SPRITE_POKE_BALL, STAY, NONE, 1, FULL_RESTORE - object_event 19, 3, SPRITE_POKE_BALL, STAY, NONE, 2, MAX_ELIXER - object_event 5, 0, SPRITE_POKE_BALL, STAY, NONE, 3, NUGGET + object_event 7, 13, SPRITE_POKE_BALL, STAY, NONE, TEXT_CERULEANCAVE1F_FULL_RESTORE, FULL_RESTORE + object_event 19, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_CERULEANCAVE1F_MAX_ELIXER, MAX_ELIXER + object_event 5, 0, SPRITE_POKE_BALL, STAY, NONE, TEXT_CERULEANCAVE1F_NUGGET, NUGGET def_warps_to CERULEAN_CAVE_1F diff --git a/data/maps/objects/CeruleanCave2F.asm b/data/maps/objects/CeruleanCave2F.asm index 18765fe82..6eea42a0c 100644 --- a/data/maps/objects/CeruleanCave2F.asm +++ b/data/maps/objects/CeruleanCave2F.asm @@ -1,3 +1,8 @@ + object_const_def + const CERULEANCAVE2F_PP_UP + const CERULEANCAVE2F_ULTRA_BALL + const CERULEANCAVE2F_FULL_RESTORE + CeruleanCave2F_Object: db $7d ; border block @@ -12,8 +17,8 @@ CeruleanCave2F_Object: def_bg_events def_object_events - object_event 29, 9, SPRITE_POKE_BALL, STAY, NONE, 1, PP_UP - object_event 4, 15, SPRITE_POKE_BALL, STAY, NONE, 2, ULTRA_BALL - object_event 13, 6, SPRITE_POKE_BALL, STAY, NONE, 3, FULL_RESTORE + object_event 29, 9, SPRITE_POKE_BALL, STAY, NONE, TEXT_CERULEANCAVE2F_PP_UP, PP_UP + object_event 4, 15, SPRITE_POKE_BALL, STAY, NONE, TEXT_CERULEANCAVE2F_ULTRA_BALL, ULTRA_BALL + object_event 13, 6, SPRITE_POKE_BALL, STAY, NONE, TEXT_CERULEANCAVE2F_FULL_RESTORE, FULL_RESTORE def_warps_to CERULEAN_CAVE_2F diff --git a/data/maps/objects/CeruleanCaveB1F.asm b/data/maps/objects/CeruleanCaveB1F.asm index 5173fee61..81e2b880c 100644 --- a/data/maps/objects/CeruleanCaveB1F.asm +++ b/data/maps/objects/CeruleanCaveB1F.asm @@ -1,3 +1,8 @@ + object_const_def + const CERULEANCAVE_B1F_MEWTWO + const CERULEANCAVE_B1F_ULTRA_BALL + const CERULEANCAVE_B1F_MAX_REVIVE + CeruleanCaveB1F_Object: db $7d ; border block @@ -7,8 +12,8 @@ CeruleanCaveB1F_Object: def_bg_events def_object_events - object_event 27, 13, SPRITE_MONSTER, STAY, DOWN, 1, MEWTWO, 70 - object_event 16, 9, SPRITE_POKE_BALL, STAY, NONE, 2, ULTRA_BALL - object_event 18, 1, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_REVIVE + object_event 27, 13, SPRITE_MONSTER, STAY, DOWN, TEXT_CERULEANCAVEB1F_MEWTWO, MEWTWO, 70 + object_event 16, 9, SPRITE_POKE_BALL, STAY, NONE, TEXT_CERULEANCAVEB1F_ULTRA_BALL, ULTRA_BALL + object_event 18, 1, SPRITE_POKE_BALL, STAY, NONE, TEXT_CERULEANCAVEB1F_MAX_REVIVE, MAX_REVIVE def_warps_to CERULEAN_CAVE_B1F diff --git a/data/maps/objects/CeruleanCity.asm b/data/maps/objects/CeruleanCity.asm index 23863aa0d..605aa417e 100644 --- a/data/maps/objects/CeruleanCity.asm +++ b/data/maps/objects/CeruleanCity.asm @@ -1,3 +1,16 @@ + object_const_def + const CERULEANCITY_RIVAL + const CERULEANCITY_ROCKET + const CERULEANCITY_COOLTRAINER_M + const CERULEANCITY_SUPER_NERD1 + const CERULEANCITY_SUPER_NERD2 + const CERULEANCITY_GUARD1 + const CERULEANCITY_COOLTRAINER_F1 + const CERULEANCITY_SLOWBRO + const CERULEANCITY_COOLTRAINER_F2 + const CERULEANCITY_SUPER_NERD3 + const CERULEANCITY_GUARD2 + CeruleanCity_Object: db $f ; border block @@ -14,24 +27,24 @@ CeruleanCity_Object: warp_event 9, 9, CERULEAN_BADGE_HOUSE, 1 def_bg_events - bg_event 23, 19, 12 ; CeruleanCityText12 - bg_event 17, 29, 13 ; CeruleanCityText13 - bg_event 26, 25, 14 ; MartSignText - bg_event 20, 17, 15 ; PokeCenterSignText - bg_event 11, 25, 16 ; CeruleanCityText16 - bg_event 27, 21, 17 ; CeruleanCityText17 + bg_event 23, 19, TEXT_CERULEANCITY_SIGN + bg_event 17, 29, TEXT_CERULEANCITY_TRAINER_TIPS + bg_event 26, 25, TEXT_CERULEANCITY_MART_SIGN + bg_event 20, 17, TEXT_CERULEANCITY_POKECENTER_SIGN + bg_event 11, 25, TEXT_CERULEANCITY_BIKESHOP_SIGN + bg_event 27, 21, TEXT_CERULEANCITY_GYM_SIGN def_object_events - object_event 20, 2, SPRITE_BLUE, STAY, DOWN, 1 ; person - object_event 30, 8, SPRITE_ROCKET, STAY, NONE, 2, OPP_ROCKET, 5 - object_event 31, 20, SPRITE_COOLTRAINER_M, STAY, DOWN, 3 ; person - object_event 15, 18, SPRITE_SUPER_NERD, WALK, UP_DOWN, 4 ; person - object_event 9, 21, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 5 ; person - object_event 28, 12, SPRITE_GUARD, STAY, DOWN, 6 ; person - object_event 29, 26, SPRITE_COOLTRAINER_F, STAY, LEFT, 7 ; person - object_event 28, 26, SPRITE_MONSTER, STAY, DOWN, 8 ; person - object_event 9, 27, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 9 ; person - object_event 4, 12, SPRITE_SUPER_NERD, STAY, DOWN, 10 ; person - object_event 27, 12, SPRITE_GUARD, STAY, DOWN, 11 ; person + object_event 20, 2, SPRITE_BLUE, STAY, DOWN, TEXT_CERULEANCITY_RIVAL + object_event 30, 8, SPRITE_ROCKET, STAY, NONE, TEXT_CERULEANCITY_ROCKET, OPP_ROCKET, 5 + object_event 31, 20, SPRITE_COOLTRAINER_M, STAY, DOWN, TEXT_CERULEANCITY_COOLTRAINER_M + object_event 15, 18, SPRITE_SUPER_NERD, WALK, UP_DOWN, TEXT_CERULEANCITY_SUPER_NERD1 + object_event 9, 21, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, TEXT_CERULEANCITY_SUPER_NERD2 + object_event 28, 12, SPRITE_GUARD, STAY, DOWN, TEXT_CERULEANCITY_GUARD1 + object_event 29, 26, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_CERULEANCITY_COOLTRAINER_F1 + object_event 28, 26, SPRITE_MONSTER, STAY, DOWN, TEXT_CERULEANCITY_SLOWBRO + object_event 9, 27, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, TEXT_CERULEANCITY_COOLTRAINER_F2 + object_event 4, 12, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_CERULEANCITY_SUPER_NERD3 + object_event 27, 12, SPRITE_GUARD, STAY, DOWN, TEXT_CERULEANCITY_GUARD2 def_warps_to CERULEAN_CITY diff --git a/data/maps/objects/CeruleanGym.asm b/data/maps/objects/CeruleanGym.asm index a6be4cae6..19a068700 100644 --- a/data/maps/objects/CeruleanGym.asm +++ b/data/maps/objects/CeruleanGym.asm @@ -1,3 +1,9 @@ + object_const_def + const CERULEANGYM_MISTY + const CERULEANGYM_COOLTRAINER_F + const CERULEANGYM_SWIMMER + const CERULEANGYM_GYM_GUIDE + CeruleanGym_Object: db $3 ; border block @@ -8,9 +14,9 @@ CeruleanGym_Object: def_bg_events def_object_events - object_event 4, 2, SPRITE_BRUNETTE_GIRL, STAY, DOWN, 1, OPP_MISTY, 1 - object_event 2, 3, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_JR_TRAINER_F, 1 - object_event 8, 7, SPRITE_SWIMMER, STAY, LEFT, 3, OPP_SWIMMER, 1 - object_event 7, 10, SPRITE_GYM_GUIDE, STAY, DOWN, 4 ; person + object_event 4, 2, SPRITE_BRUNETTE_GIRL, STAY, DOWN, TEXT_CERULEANGYM_MISTY, OPP_MISTY, 1 + object_event 2, 3, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_CERULEANGYM_COOLTRAINER_F, OPP_JR_TRAINER_F, 1 + object_event 8, 7, SPRITE_SWIMMER, STAY, LEFT, TEXT_CERULEANGYM_SWIMMER, OPP_SWIMMER, 1 + object_event 7, 10, SPRITE_GYM_GUIDE, STAY, DOWN, TEXT_CERULEANGYM_GYM_GUIDE def_warps_to CERULEAN_GYM diff --git a/data/maps/objects/CeruleanMart.asm b/data/maps/objects/CeruleanMart.asm index 0f5a82760..a1ab6717a 100644 --- a/data/maps/objects/CeruleanMart.asm +++ b/data/maps/objects/CeruleanMart.asm @@ -1,3 +1,8 @@ + object_const_def + const CERULEANMART_CLERK + const CERULEANMART_COOLTRAINER_M + const CERULEANMART_COOLTRAINER_F + CeruleanMart_Object: db $0 ; border block @@ -8,8 +13,8 @@ CeruleanMart_Object: def_bg_events def_object_events - object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person - object_event 3, 4, SPRITE_COOLTRAINER_M, WALK, UP_DOWN, 2 ; person - object_event 6, 2, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 3 ; person + object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, TEXT_CERULEANMART_CLERK + object_event 3, 4, SPRITE_COOLTRAINER_M, WALK, UP_DOWN, TEXT_CERULEANMART_COOLTRAINER_M + object_event 6, 2, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, TEXT_CERULEANMART_COOLTRAINER_F def_warps_to CERULEAN_MART diff --git a/data/maps/objects/CeruleanPokecenter.asm b/data/maps/objects/CeruleanPokecenter.asm index eee0a0c6f..5e1a4015d 100644 --- a/data/maps/objects/CeruleanPokecenter.asm +++ b/data/maps/objects/CeruleanPokecenter.asm @@ -1,3 +1,9 @@ + object_const_def + const CERULEANPOKECENTER_NURSE + const CERULEANPOKECENTER_SUPER_NERD + const CERULEANPOKECENTER_GENTLEMAN + const CERULEANPOKECENTER_LINK_RECEPTIONIST + CeruleanPokecenter_Object: db $0 ; border block @@ -8,9 +14,9 @@ CeruleanPokecenter_Object: def_bg_events def_object_events - object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person - object_event 10, 5, SPRITE_SUPER_NERD, WALK, ANY_DIR, 2 ; person - object_event 4, 3, SPRITE_GENTLEMAN, STAY, DOWN, 3 ; person - object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person + object_event 3, 1, SPRITE_NURSE, STAY, DOWN, TEXT_CERULEANPOKECENTER_NURSE + object_event 10, 5, SPRITE_SUPER_NERD, WALK, ANY_DIR, TEXT_CERULEANPOKECENTER_SUPER_NERD + object_event 4, 3, SPRITE_GENTLEMAN, STAY, DOWN, TEXT_CERULEANPOKECENTER_GENTLEMAN + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_CERULEANPOKECENTER_LINK_RECEPTIONIST def_warps_to CERULEAN_POKECENTER diff --git a/data/maps/objects/CeruleanTradeHouse.asm b/data/maps/objects/CeruleanTradeHouse.asm index 52984832a..c55ed6ef8 100644 --- a/data/maps/objects/CeruleanTradeHouse.asm +++ b/data/maps/objects/CeruleanTradeHouse.asm @@ -1,3 +1,7 @@ + object_const_def + const CERULEANTRADEHOUSE_GRANNY + const CERULEANTRADEHOUSE_GAMBLER + CeruleanTradeHouse_Object: db $a ; border block @@ -8,7 +12,7 @@ CeruleanTradeHouse_Object: def_bg_events def_object_events - object_event 5, 4, SPRITE_GRANNY, STAY, LEFT, 1 ; person - object_event 1, 2, SPRITE_GAMBLER, STAY, NONE, 2 ; person + object_event 5, 4, SPRITE_GRANNY, STAY, LEFT, TEXT_CERULEANTRADEHOUSE_GRANNY + object_event 1, 2, SPRITE_GAMBLER, STAY, NONE, TEXT_CERULEANTRADEHOUSE_GAMBLER def_warps_to CERULEAN_TRADE_HOUSE diff --git a/data/maps/objects/CeruleanTrashedHouse.asm b/data/maps/objects/CeruleanTrashedHouse.asm index 9dc28f087..993e66c2e 100644 --- a/data/maps/objects/CeruleanTrashedHouse.asm +++ b/data/maps/objects/CeruleanTrashedHouse.asm @@ -1,3 +1,7 @@ + object_const_def + const CERULEANTRASHEDHOUSE_FISHING_GURU + const CERULEANTRASHEDHOUSE_GIRL + CeruleanTrashedHouse_Object: db $a ; border block @@ -7,10 +11,10 @@ CeruleanTrashedHouse_Object: warp_event 3, 0, LAST_MAP, 8 def_bg_events - bg_event 3, 0, 3 ; CeruleanHouseTrashedText3 + bg_event 3, 0, TEXT_CERULEANTRASHEDHOUSE_WALL_HOLE def_object_events - object_event 2, 1, SPRITE_FISHING_GURU, STAY, DOWN, 1 ; person - object_event 5, 6, SPRITE_GIRL, WALK, LEFT_RIGHT, 2 ; person + object_event 2, 1, SPRITE_FISHING_GURU, STAY, DOWN, TEXT_CERULEANTRASHEDHOUSE_FISHING_GURU + object_event 5, 6, SPRITE_GIRL, WALK, LEFT_RIGHT, TEXT_CERULEANTRASHEDHOUSE_GIRL def_warps_to CERULEAN_TRASHED_HOUSE diff --git a/data/maps/objects/ChampionsRoom.asm b/data/maps/objects/ChampionsRoom.asm index fa5efd8fd..50bdee605 100644 --- a/data/maps/objects/ChampionsRoom.asm +++ b/data/maps/objects/ChampionsRoom.asm @@ -1,3 +1,7 @@ + object_const_def + const CHAMPIONSROOM_RIVAL + const CHAMPIONSROOM_OAK + ChampionsRoom_Object: db $3 ; border block @@ -10,7 +14,7 @@ ChampionsRoom_Object: def_bg_events def_object_events - object_event 4, 2, SPRITE_BLUE, STAY, DOWN, 1 ; person - object_event 3, 7, SPRITE_OAK, STAY, UP, 2 ; person + object_event 4, 2, SPRITE_BLUE, STAY, DOWN, TEXT_CHAMPIONSROOM_RIVAL + object_event 3, 7, SPRITE_OAK, STAY, UP, TEXT_CHAMPIONSROOM_OAK def_warps_to CHAMPIONS_ROOM diff --git a/data/maps/objects/CinnabarGym.asm b/data/maps/objects/CinnabarGym.asm index a4ed8cdae..9453d0b70 100644 --- a/data/maps/objects/CinnabarGym.asm +++ b/data/maps/objects/CinnabarGym.asm @@ -1,3 +1,14 @@ + object_const_def + const CINNABARGYM_BLAINE + const CINNABARGYM_SUPER_NERD1 + const CINNABARGYM_SUPER_NERD2 + const CINNABARGYM_SUPER_NERD3 + const CINNABARGYM_SUPER_NERD4 + const CINNABARGYM_SUPER_NERD5 + const CINNABARGYM_SUPER_NERD6 + const CINNABARGYM_SUPER_NERD7 + const CINNABARGYM_GYM_GUIDE + CinnabarGym_Object: db $2e ; border block @@ -8,14 +19,14 @@ CinnabarGym_Object: def_bg_events def_object_events - object_event 3, 3, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, 1, OPP_BLAINE, 1 - object_event 17, 2, SPRITE_SUPER_NERD, STAY, DOWN, 2, OPP_SUPER_NERD, 9 - object_event 17, 8, SPRITE_SUPER_NERD, STAY, DOWN, 3, OPP_BURGLAR, 4 - object_event 11, 4, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_SUPER_NERD, 10 - object_event 11, 8, SPRITE_SUPER_NERD, STAY, DOWN, 5, OPP_BURGLAR, 5 - object_event 11, 14, SPRITE_SUPER_NERD, STAY, DOWN, 6, OPP_SUPER_NERD, 11 - object_event 3, 14, SPRITE_SUPER_NERD, STAY, DOWN, 7, OPP_BURGLAR, 6 - object_event 3, 8, SPRITE_SUPER_NERD, STAY, DOWN, 8, OPP_SUPER_NERD, 12 - object_event 16, 13, SPRITE_GYM_GUIDE, STAY, DOWN, 9 ; person + object_event 3, 3, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, TEXT_CINNABARGYM_BLAINE, OPP_BLAINE, 1 + object_event 17, 2, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_CINNABARGYM_SUPER_NERD1, OPP_SUPER_NERD, 9 + object_event 17, 8, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_CINNABARGYM_SUPER_NERD2, OPP_BURGLAR, 4 + object_event 11, 4, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_CINNABARGYM_SUPER_NERD3, OPP_SUPER_NERD, 10 + object_event 11, 8, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_CINNABARGYM_SUPER_NERD4, OPP_BURGLAR, 5 + object_event 11, 14, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_CINNABARGYM_SUPER_NERD5, OPP_SUPER_NERD, 11 + object_event 3, 14, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_CINNABARGYM_SUPER_NERD6, OPP_BURGLAR, 6 + object_event 3, 8, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_CINNABARGYM_SUPER_NERD7, OPP_SUPER_NERD, 12 + object_event 16, 13, SPRITE_GYM_GUIDE, STAY, DOWN, TEXT_CINNABARGYM_GYM_GUIDE def_warps_to CINNABAR_GYM diff --git a/data/maps/objects/CinnabarIsland.asm b/data/maps/objects/CinnabarIsland.asm index f3ca64fb2..dd3593b34 100644 --- a/data/maps/objects/CinnabarIsland.asm +++ b/data/maps/objects/CinnabarIsland.asm @@ -1,3 +1,7 @@ + object_const_def + const CINNABARISLAND_GIRL + const CINNABARISLAND_GAMBLER + CinnabarIsland_Object: db $43 ; border block @@ -9,14 +13,14 @@ CinnabarIsland_Object: warp_event 15, 11, CINNABAR_MART, 1 def_bg_events - bg_event 9, 5, 3 ; CinnabarIslandText3 - bg_event 16, 11, 4 ; MartSignText - bg_event 12, 11, 5 ; PokeCenterSignText - bg_event 9, 11, 6 ; CinnabarIslandText6 - bg_event 13, 3, 7 ; CinnabarIslandText7 + bg_event 9, 5, TEXT_CINNABARISLAND_SIGN + bg_event 16, 11, TEXT_CINNABARISLAND_MART_SIGN + bg_event 12, 11, TEXT_CINNABARISLAND_POKECENTER_SIGN + bg_event 9, 11, TEXT_CINNABARISLAND_POKEMONLAB_SIGN + bg_event 13, 3, TEXT_CINNABARISLAND_GYM_SIGN def_object_events - object_event 12, 5, SPRITE_GIRL, WALK, LEFT_RIGHT, 1 ; person - object_event 14, 6, SPRITE_GAMBLER, STAY, NONE, 2 ; person + object_event 12, 5, SPRITE_GIRL, WALK, LEFT_RIGHT, TEXT_CINNABARISLAND_GIRL + object_event 14, 6, SPRITE_GAMBLER, STAY, NONE, TEXT_CINNABARISLAND_GAMBLER def_warps_to CINNABAR_ISLAND diff --git a/data/maps/objects/CinnabarLab.asm b/data/maps/objects/CinnabarLab.asm index 3737843c2..bced7c56f 100644 --- a/data/maps/objects/CinnabarLab.asm +++ b/data/maps/objects/CinnabarLab.asm @@ -1,3 +1,6 @@ + object_const_def + const CINNABARLAB_FISHING_GURU + CinnabarLab_Object: db $17 ; border block @@ -9,12 +12,12 @@ CinnabarLab_Object: warp_event 16, 4, CINNABAR_LAB_FOSSIL_ROOM, 1 def_bg_events - bg_event 3, 2, 2 ; Lab1Text2 - bg_event 9, 4, 3 ; Lab1Text3 - bg_event 13, 4, 4 ; Lab1Text4 - bg_event 17, 4, 5 ; Lab1Text5 + bg_event 3, 2, TEXT_CINNABARLAB_PHOTO + bg_event 9, 4, TEXT_CINNABARLAB_MEETING_ROOM_SIGN + bg_event 13, 4, TEXT_CINNABARLAB_R_AND_D_SIGN + bg_event 17, 4, TEXT_CINNABARLAB_TESTING_ROOM_SIGN def_object_events - object_event 1, 3, SPRITE_FISHING_GURU, STAY, NONE, 1 ; person + object_event 1, 3, SPRITE_FISHING_GURU, STAY, NONE, TEXT_CINNABARLAB_FISHING_GURU def_warps_to CINNABAR_LAB diff --git a/data/maps/objects/CinnabarLabFossilRoom.asm b/data/maps/objects/CinnabarLabFossilRoom.asm index 29a805f73..6ffe49124 100644 --- a/data/maps/objects/CinnabarLabFossilRoom.asm +++ b/data/maps/objects/CinnabarLabFossilRoom.asm @@ -1,3 +1,7 @@ + object_const_def + const CINNABARLABFOSSILROOM_SCIENTIST1 + const CINNABARLABFOSSILROOM_SCIENTIST2 + CinnabarLabFossilRoom_Object: db $17 ; border block @@ -8,7 +12,7 @@ CinnabarLabFossilRoom_Object: def_bg_events def_object_events - object_event 5, 2, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, 1 ; person - object_event 7, 6, SPRITE_SCIENTIST, STAY, UP, 2 ; person + object_event 5, 2, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, TEXT_CINNABARLABFOSSILROOM_SCIENTIST1 + object_event 7, 6, SPRITE_SCIENTIST, STAY, UP, TEXT_CINNABARLABFOSSILROOM_SCIENTIST2 def_warps_to CINNABAR_LAB_FOSSIL_ROOM diff --git a/data/maps/objects/CinnabarLabMetronomeRoom.asm b/data/maps/objects/CinnabarLabMetronomeRoom.asm index ceadc217d..926e9024f 100644 --- a/data/maps/objects/CinnabarLabMetronomeRoom.asm +++ b/data/maps/objects/CinnabarLabMetronomeRoom.asm @@ -1,3 +1,7 @@ + object_const_def + const CINNABARLABMETRONOMEROOM_SCIENTIST1 + const CINNABARLABMETRONOMEROOM_SCIENTIST2 + CinnabarLabMetronomeRoom_Object: db $17 ; border block @@ -6,12 +10,12 @@ CinnabarLabMetronomeRoom_Object: warp_event 3, 7, CINNABAR_LAB, 4 def_bg_events - bg_event 0, 4, 3 ; Lab3Text3 - bg_event 1, 4, 4 ; Lab3Text4 - bg_event 2, 1, 5 ; Lab3Text5 + bg_event 0, 4, TEXT_CINNABARLABMETRONOMEROOM_PC_KEYBOARD + bg_event 1, 4, TEXT_CINNABARLABMETRONOMEROOM_PC_MONITOR + bg_event 2, 1, TEXT_CINNABARLABMETRONOMEROOM_AMBER_PIPE def_object_events - object_event 7, 2, SPRITE_SCIENTIST, STAY, DOWN, 1 ; person - object_event 2, 3, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, 2 ; person + object_event 7, 2, SPRITE_SCIENTIST, STAY, DOWN, TEXT_CINNABARLABMETRONOMEROOM_SCIENTIST1 + object_event 2, 3, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, TEXT_CINNABARLABMETRONOMEROOM_SCIENTIST2 def_warps_to CINNABAR_LAB_METRONOME_ROOM diff --git a/data/maps/objects/CinnabarLabTradeRoom.asm b/data/maps/objects/CinnabarLabTradeRoom.asm index 117028219..69a944831 100644 --- a/data/maps/objects/CinnabarLabTradeRoom.asm +++ b/data/maps/objects/CinnabarLabTradeRoom.asm @@ -1,3 +1,8 @@ + object_const_def + const CINNABARLABTRADEROOM_SUPER_NERD + const CINNABARLABTRADEROOM_GRAMPS + const CINNABARLABTRADEROOM_BEAUTY + CinnabarLabTradeRoom_Object: db $17 ; border block @@ -8,8 +13,8 @@ CinnabarLabTradeRoom_Object: def_bg_events def_object_events - object_event 3, 2, SPRITE_SUPER_NERD, STAY, DOWN, 1 ; person - object_event 1, 4, SPRITE_GRAMPS, STAY, NONE, 2 ; person - object_event 5, 5, SPRITE_BEAUTY, STAY, UP, 3 ; person + object_event 3, 2, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_CINNABARLABTRADEROOM_SUPER_NERD + object_event 1, 4, SPRITE_GRAMPS, STAY, NONE, TEXT_CINNABARLABTRADEROOM_GRAMPS + object_event 5, 5, SPRITE_BEAUTY, STAY, UP, TEXT_CINNABARLABTRADEROOM_BEAUTY def_warps_to CINNABAR_LAB_TRADE_ROOM diff --git a/data/maps/objects/CinnabarMart.asm b/data/maps/objects/CinnabarMart.asm index e91d18b27..d6651e973 100644 --- a/data/maps/objects/CinnabarMart.asm +++ b/data/maps/objects/CinnabarMart.asm @@ -1,3 +1,8 @@ + object_const_def + const CINNABARMART_CLERK + const CINNABARMART_SILPH_WORKER_F + const CINNABARMART_SCIENTIST + CinnabarMart_Object: db $0 ; border block @@ -8,8 +13,8 @@ CinnabarMart_Object: def_bg_events def_object_events - object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person - object_event 6, 2, SPRITE_ERIKA, STAY, NONE, 2 ; person - object_event 3, 4, SPRITE_SCIENTIST, STAY, NONE, 3 ; person + object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, TEXT_CINNABARMART_CLERK + object_event 6, 2, SPRITE_SILPH_WORKER_F, STAY, NONE, TEXT_CINNABARMART_SILPH_WORKER_F + object_event 3, 4, SPRITE_SCIENTIST, STAY, NONE, TEXT_CINNABARMART_SCIENTIST def_warps_to CINNABAR_MART diff --git a/data/maps/objects/CinnabarPokecenter.asm b/data/maps/objects/CinnabarPokecenter.asm index 75d119265..1d3b39f09 100644 --- a/data/maps/objects/CinnabarPokecenter.asm +++ b/data/maps/objects/CinnabarPokecenter.asm @@ -1,3 +1,9 @@ + object_const_def + const CINNABARPOKECENTER_NURSE + const CINNABARPOKECENTER_COOLTRAINER_F + const CINNABARPOKECENTER_GENTLEMAN + const CINNABARPOKECENTER_LINK_RECEPTIONIST + CinnabarPokecenter_Object: db $0 ; border block @@ -8,9 +14,9 @@ CinnabarPokecenter_Object: def_bg_events def_object_events - object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person - object_event 9, 4, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, 2 ; person - object_event 2, 6, SPRITE_GENTLEMAN, STAY, NONE, 3 ; person - object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person + object_event 3, 1, SPRITE_NURSE, STAY, DOWN, TEXT_CINNABARPOKECENTER_NURSE + object_event 9, 4, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, TEXT_CINNABARPOKECENTER_COOLTRAINER_F + object_event 2, 6, SPRITE_GENTLEMAN, STAY, NONE, TEXT_CINNABARPOKECENTER_GENTLEMAN + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_CINNABARPOKECENTER_LINK_RECEPTIONIST def_warps_to CINNABAR_POKECENTER diff --git a/data/maps/objects/Colosseum.asm b/data/maps/objects/Colosseum.asm index 323270581..9d6b04410 100644 --- a/data/maps/objects/Colosseum.asm +++ b/data/maps/objects/Colosseum.asm @@ -1,3 +1,6 @@ + object_const_def + const COLOSSEUM_OPPONENT + Colosseum_Object: db $e ; border block @@ -6,6 +9,6 @@ Colosseum_Object: def_bg_events def_object_events - object_event 2, 2, SPRITE_RED, STAY, 0, 1 ; person + object_event 2, 2, SPRITE_RED, STAY, ANY_DIR, TEXT_COLOSSEUM_OPPONENT def_warps_to COLOSSEUM diff --git a/data/maps/objects/CopycatsHouse1F.asm b/data/maps/objects/CopycatsHouse1F.asm index 0a3705f48..e82bd7808 100644 --- a/data/maps/objects/CopycatsHouse1F.asm +++ b/data/maps/objects/CopycatsHouse1F.asm @@ -1,3 +1,8 @@ + object_const_def + const COPYCATSHOUSE1F_MIDDLE_AGED_WOMAN + const COPYCATSHOUSE1F_MIDDLE_AGED_MAN + const COPYCATSHOUSE1F_CHANSEY + CopycatsHouse1F_Object: db $a ; border block @@ -9,8 +14,8 @@ CopycatsHouse1F_Object: def_bg_events def_object_events - object_event 2, 2, SPRITE_MIDDLE_AGED_WOMAN, STAY, DOWN, 1 ; person - object_event 5, 4, SPRITE_MIDDLE_AGED_MAN, STAY, LEFT, 2 ; person - object_event 1, 4, SPRITE_FAIRY, WALK, UP_DOWN, 3 ; person + object_event 2, 2, SPRITE_MIDDLE_AGED_WOMAN, STAY, DOWN, TEXT_COPYCATSHOUSE1F_MIDDLE_AGED_WOMAN + object_event 5, 4, SPRITE_MIDDLE_AGED_MAN, STAY, LEFT, TEXT_COPYCATSHOUSE1F_MIDDLE_AGED_MAN + object_event 1, 4, SPRITE_FAIRY, WALK, UP_DOWN, TEXT_COPYCATSHOUSE1F_CHANSEY def_warps_to COPYCATS_HOUSE_1F diff --git a/data/maps/objects/CopycatsHouse2F.asm b/data/maps/objects/CopycatsHouse2F.asm index 864490652..dbc9918da 100644 --- a/data/maps/objects/CopycatsHouse2F.asm +++ b/data/maps/objects/CopycatsHouse2F.asm @@ -1,3 +1,10 @@ + object_const_def + const COPYCATSHOUSE2F_COPYCAT + const COPYCATSHOUSE2F_DODUO + const COPYCATSHOUSE2F_MONSTER + const COPYCATSHOUSE2F_BIRD + const COPYCATSHOUSE2F_FAIRY + CopycatsHouse2F_Object: db $a ; border block @@ -5,14 +12,14 @@ CopycatsHouse2F_Object: warp_event 7, 1, COPYCATS_HOUSE_1F, 3 def_bg_events - bg_event 3, 5, 6 ; CopycatsHouse2FText6 - bg_event 0, 1, 7 ; CopycatsHouse2FText7 + bg_event 3, 5, TEXT_COPYCATSHOUSE2F_SNES + bg_event 0, 1, TEXT_COPYCATSHOUSE2F_PC def_object_events - object_event 4, 3, SPRITE_BRUNETTE_GIRL, WALK, ANY_DIR, 1 ; person - object_event 4, 6, SPRITE_BIRD, WALK, LEFT_RIGHT, 2 ; person - object_event 5, 1, SPRITE_MONSTER, STAY, DOWN, 3 ; person - object_event 2, 0, SPRITE_BIRD, STAY, DOWN, 4 ; person - object_event 1, 6, SPRITE_FAIRY, STAY, RIGHT, 5 ; person + object_event 4, 3, SPRITE_BRUNETTE_GIRL, WALK, ANY_DIR, TEXT_COPYCATSHOUSE2F_COPYCAT + object_event 4, 6, SPRITE_BIRD, WALK, LEFT_RIGHT, TEXT_COPYCATSHOUSE2F_DODUO + object_event 5, 1, SPRITE_MONSTER, STAY, DOWN, TEXT_COPYCATSHOUSE2F_MONSTER + object_event 2, 0, SPRITE_BIRD, STAY, DOWN, TEXT_COPYCATSHOUSE2F_BIRD + object_event 1, 6, SPRITE_FAIRY, STAY, RIGHT, TEXT_COPYCATSHOUSE2F_FAIRY def_warps_to COPYCATS_HOUSE_2F diff --git a/data/maps/objects/Daycare.asm b/data/maps/objects/Daycare.asm index f3ece1a99..78060a94a 100644 --- a/data/maps/objects/Daycare.asm +++ b/data/maps/objects/Daycare.asm @@ -1,3 +1,6 @@ + object_const_def + const DAYCARE_GENTLEMAN + Daycare_Object: db $a ; border block @@ -8,6 +11,6 @@ Daycare_Object: def_bg_events def_object_events - object_event 2, 3, SPRITE_GENTLEMAN, STAY, RIGHT, 1 ; person + object_event 2, 3, SPRITE_GENTLEMAN, STAY, RIGHT, TEXT_DAYCARE_GENTLEMAN def_warps_to DAYCARE diff --git a/data/maps/objects/DiglettsCaveRoute11.asm b/data/maps/objects/DiglettsCaveRoute11.asm index a0aa3ddb7..509566935 100644 --- a/data/maps/objects/DiglettsCaveRoute11.asm +++ b/data/maps/objects/DiglettsCaveRoute11.asm @@ -1,3 +1,6 @@ + object_const_def + const DIGLETTSCAVEROUTE11_GAMBLER + DiglettsCaveRoute11_Object: db $7d ; border block @@ -9,6 +12,6 @@ DiglettsCaveRoute11_Object: def_bg_events def_object_events - object_event 2, 3, SPRITE_GAMBLER, STAY, NONE, 1 ; person + object_event 2, 3, SPRITE_GAMBLER, STAY, NONE, TEXT_DIGLETTSCAVEROUTE11_GAMBLER def_warps_to DIGLETTS_CAVE_ROUTE_11 diff --git a/data/maps/objects/DiglettsCaveRoute2.asm b/data/maps/objects/DiglettsCaveRoute2.asm index c8dc05619..97b975c02 100644 --- a/data/maps/objects/DiglettsCaveRoute2.asm +++ b/data/maps/objects/DiglettsCaveRoute2.asm @@ -1,3 +1,6 @@ + object_const_def + const DIGLETTSCAVEROUTE2_FISHING_GURU + DiglettsCaveRoute2_Object: db $7d ; border block @@ -9,6 +12,6 @@ DiglettsCaveRoute2_Object: def_bg_events def_object_events - object_event 3, 3, SPRITE_FISHING_GURU, STAY, NONE, 1 ; person + object_event 3, 3, SPRITE_FISHING_GURU, STAY, NONE, TEXT_DIGLETTSCAVEROUTE2_FISHING_GURU def_warps_to DIGLETTS_CAVE_ROUTE_2 diff --git a/data/maps/objects/FightingDojo.asm b/data/maps/objects/FightingDojo.asm index 808abf712..15ce598f1 100644 --- a/data/maps/objects/FightingDojo.asm +++ b/data/maps/objects/FightingDojo.asm @@ -1,3 +1,12 @@ + object_const_def + const FIGHTINGDOJO_KARATE_MASTER + const FIGHTINGDOJO_BLACKBELT1 + const FIGHTINGDOJO_BLACKBELT2 + const FIGHTINGDOJO_BLACKBELT3 + const FIGHTINGDOJO_BLACKBELT4 + const FIGHTINGDOJO_HITMONLEE_POKE_BALL + const FIGHTINGDOJO_HITMONCHAN_POKE_BALL + FightingDojo_Object: db $3 ; border block @@ -8,12 +17,12 @@ FightingDojo_Object: def_bg_events def_object_events - object_event 5, 3, SPRITE_HIKER, STAY, DOWN, 1, OPP_BLACKBELT, 1 - object_event 3, 4, SPRITE_HIKER, STAY, RIGHT, 2, OPP_BLACKBELT, 2 - object_event 3, 6, SPRITE_HIKER, STAY, RIGHT, 3, OPP_BLACKBELT, 3 - object_event 5, 5, SPRITE_HIKER, STAY, LEFT, 4, OPP_BLACKBELT, 4 - object_event 5, 7, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 5 - object_event 4, 1, SPRITE_POKE_BALL, STAY, NONE, 6 ; person - object_event 5, 1, SPRITE_POKE_BALL, STAY, NONE, 7 ; person + object_event 5, 3, SPRITE_HIKER, STAY, DOWN, 1, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_KARATE_MASTER + object_event 3, 4, SPRITE_HIKER, STAY, RIGHT, 2, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_BLACKBELT1 + object_event 3, 6, SPRITE_HIKER, STAY, RIGHT, 3, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_BLACKBELT2 + object_event 5, 5, SPRITE_HIKER, STAY, LEFT, 4, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_BLACKBELT3 + object_event 5, 7, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_BLACKBELT4 + object_event 4, 1, SPRITE_POKE_BALL, STAY, NONE, TEXT_FIGHTINGDOJO_HITMONLEE_POKE_BALL + object_event 5, 1, SPRITE_POKE_BALL, STAY, NONE, TEXT_FIGHTINGDOJO_HITMONCHAN_POKE_BALL def_warps_to FIGHTING_DOJO diff --git a/data/maps/objects/FuchsiaBillsGrandpasHouse.asm b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm index 2369e7d07..3d9bc1438 100644 --- a/data/maps/objects/FuchsiaBillsGrandpasHouse.asm +++ b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm @@ -1,3 +1,8 @@ + object_const_def + const FUCHSIABILLSGRANDPASHOUSE_MIDDLE_AGED_WOMAN + const FUCHSIABILLSGRANDPASHOUSE_BILLS_GRANDPA + const FUCHSIABILLSGRANDPASHOUSE_YOUNGSTER + FuchsiaBillsGrandpasHouse_Object: db $a ; border block @@ -8,8 +13,8 @@ FuchsiaBillsGrandpasHouse_Object: def_bg_events def_object_events - object_event 2, 3, SPRITE_MIDDLE_AGED_WOMAN, STAY, RIGHT, 1 ; person - object_event 7, 2, SPRITE_GAMBLER, STAY, UP, 2 ; person - object_event 5, 5, SPRITE_YOUNGSTER, STAY, NONE, 3 ; person + object_event 2, 3, SPRITE_MIDDLE_AGED_WOMAN, STAY, RIGHT, TEXT_FUCHSIABILLSGRANDPASHOUSE_MIDDLE_AGED_WOMAN + object_event 7, 2, SPRITE_GAMBLER, STAY, UP, TEXT_FUCHSIABILLSGRANDPASHOUSE_BILLS_GRANDPA + object_event 5, 5, SPRITE_YOUNGSTER, STAY, NONE, TEXT_FUCHSIABILLSGRANDPASHOUSE_YOUNGSTER def_warps_to FUCHSIA_BILLS_GRANDPAS_HOUSE diff --git a/data/maps/objects/FuchsiaCity.asm b/data/maps/objects/FuchsiaCity.asm index c8ff36e69..7e4201ff5 100644 --- a/data/maps/objects/FuchsiaCity.asm +++ b/data/maps/objects/FuchsiaCity.asm @@ -1,3 +1,15 @@ + object_const_def + const FUCHSIACITY_YOUNGSTER1 + const FUCHSIACITY_GAMBLER + const FUCHSIACITY_ERIK + const FUCHSIACITY_YOUNGSTER2 + const FUCHSIACITY_CHANSEY + const FUCHSIACITY_VOLTORB + const FUCHSIACITY_KANGASKHAN + const FUCHSIACITY_SLOWPOKE + const FUCHSIACITY_LAPRAS + const FUCHSIACITY_FOSSIL + FuchsiaCity_Object: db $f ; border block @@ -13,31 +25,31 @@ FuchsiaCity_Object: warp_event 31, 24, FUCHSIA_GOOD_ROD_HOUSE, 1 def_bg_events - bg_event 15, 23, 11 ; FuchsiaCityText11 - bg_event 25, 15, 12 ; FuchsiaCityText12 - bg_event 17, 5, 13 ; FuchsiaCityText13 - bg_event 6, 13, 14 ; MartSignText - bg_event 20, 27, 15 ; PokeCenterSignText - bg_event 27, 29, 16 ; FuchsiaCityText16 - bg_event 21, 15, 17 ; FuchsiaCityText17 - bg_event 5, 29, 18 ; FuchsiaCityText18 - bg_event 33, 7, 19 ; FuchsiaCityText19 - bg_event 27, 7, 20 ; FuchsiaCityText20 - bg_event 13, 7, 21 ; FuchsiaCityText21 - bg_event 31, 13, 22 ; FuchsiaCityText22 - bg_event 13, 15, 23 ; FuchsiaCityText23 - bg_event 7, 7, 24 ; FuchsiaCityText24 + bg_event 15, 23, TEXT_FUCHSIACITY_SIGN1 + bg_event 25, 15, TEXT_FUCHSIACITY_SIGN2 + bg_event 17, 5, TEXT_FUCHSIACITY_SAFARI_GAME_SIGN + bg_event 6, 13, TEXT_FUCHSIACITY_MART_SIGN + bg_event 20, 27, TEXT_FUCHSIACITY_POKECENTER_SIGN + bg_event 27, 29, TEXT_FUCHSIACITY_WARDENS_HOME_SIGN + bg_event 21, 15, TEXT_FUCHSIACITY_SAFARI_ZONE_SIGN + bg_event 5, 29, TEXT_FUCHSIACITY_GYM_SIGN + bg_event 33, 7, TEXT_FUCHSIACITY_CHANSEY_SIGN + bg_event 27, 7, TEXT_FUCHSIACITY_VOLTORB_SIGN + bg_event 13, 7, TEXT_FUCHSIACITY_KANGASKHAN_SIGN + bg_event 31, 13, TEXT_FUCHSIACITY_SLOWPOKE_SIGN + bg_event 13, 15, TEXT_FUCHSIACITY_LAPRAS_SIGN + bg_event 7, 7, TEXT_FUCHSIACITY_FOSSIL_SIGN def_object_events - object_event 10, 12, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person - object_event 28, 17, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 2 ; person - object_event 30, 14, SPRITE_FISHER, STAY, DOWN, 3 ; person - object_event 24, 8, SPRITE_YOUNGSTER, STAY, UP, 4 ; person - object_event 31, 5, SPRITE_FAIRY, WALK, ANY_DIR, 5 ; person - object_event 25, 6, SPRITE_POKE_BALL, STAY, NONE, 6 ; person - object_event 12, 6, SPRITE_MONSTER, WALK, LEFT_RIGHT, 7 ; person - object_event 30, 12, SPRITE_MONSTER, WALK, LEFT_RIGHT, 8 ; person - object_event 8, 17, SPRITE_SEEL, WALK, ANY_DIR, 9 ; person - object_event 6, 5, SPRITE_FOSSIL, STAY, NONE, 10 ; person + object_event 10, 12, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, TEXT_FUCHSIACITY_YOUNGSTER1 + object_event 28, 17, SPRITE_GAMBLER, WALK, LEFT_RIGHT, TEXT_FUCHSIACITY_GAMBLER + object_event 30, 14, SPRITE_FISHER, STAY, DOWN, TEXT_FUCHSIACITY_ERIK + object_event 24, 8, SPRITE_YOUNGSTER, STAY, UP, TEXT_FUCHSIACITY_YOUNGSTER2 + object_event 31, 5, SPRITE_FAIRY, WALK, ANY_DIR, TEXT_FUCHSIACITY_CHANSEY + object_event 25, 6, SPRITE_POKE_BALL, STAY, NONE, TEXT_FUCHSIACITY_VOLTORB + object_event 12, 6, SPRITE_MONSTER, WALK, LEFT_RIGHT, TEXT_FUCHSIACITY_KANGASKHAN + object_event 30, 12, SPRITE_MONSTER, WALK, LEFT_RIGHT, TEXT_FUCHSIACITY_SLOWPOKE + object_event 8, 17, SPRITE_SEEL, WALK, ANY_DIR, TEXT_FUCHSIACITY_LAPRAS + object_event 6, 5, SPRITE_FOSSIL, STAY, NONE, TEXT_FUCHSIACITY_FOSSIL def_warps_to FUCHSIA_CITY diff --git a/data/maps/objects/FuchsiaGoodRodHouse.asm b/data/maps/objects/FuchsiaGoodRodHouse.asm index 483734cd4..eea49399e 100644 --- a/data/maps/objects/FuchsiaGoodRodHouse.asm +++ b/data/maps/objects/FuchsiaGoodRodHouse.asm @@ -1,3 +1,6 @@ + object_const_def + const FUCHSIAGOODRODHOUSE_FISHING_GURU + FuchsiaGoodRodHouse_Object: db $c ; border block @@ -9,6 +12,6 @@ FuchsiaGoodRodHouse_Object: def_bg_events def_object_events - object_event 5, 3, SPRITE_FISHING_GURU, STAY, RIGHT, 1 ; person + object_event 5, 3, SPRITE_FISHING_GURU, STAY, RIGHT, TEXT_FUCHSIAGOODRODHOUSE_FISHING_GURU def_warps_to FUCHSIA_GOOD_ROD_HOUSE diff --git a/data/maps/objects/FuchsiaGym.asm b/data/maps/objects/FuchsiaGym.asm index 9c39cb5ec..e3d0680a0 100644 --- a/data/maps/objects/FuchsiaGym.asm +++ b/data/maps/objects/FuchsiaGym.asm @@ -1,3 +1,13 @@ + object_const_def + const FUCHSIAGYM_KOGA + const FUCHSIAGYM_ROCKER1 + const FUCHSIAGYM_ROCKER2 + const FUCHSIAGYM_ROCKER3 + const FUCHSIAGYM_ROCKER4 + const FUCHSIAGYM_ROCKER5 + const FUCHSIAGYM_ROCKER6 + const FUCHSIAGYM_GYM_GUIDE + FuchsiaGym_Object: db $3 ; border block @@ -8,13 +18,13 @@ FuchsiaGym_Object: def_bg_events def_object_events - object_event 4, 10, SPRITE_KOGA, STAY, DOWN, 1, OPP_KOGA, 1 - object_event 8, 13, SPRITE_ROCKER, STAY, DOWN, 2, OPP_JUGGLER, 7 - object_event 7, 8, SPRITE_ROCKER, STAY, RIGHT, 3, OPP_JUGGLER, 3 - object_event 1, 12, SPRITE_ROCKER, STAY, DOWN, 4, OPP_JUGGLER, 8 - object_event 3, 5, SPRITE_ROCKER, STAY, UP, 5, OPP_TAMER, 1 - object_event 8, 2, SPRITE_ROCKER, STAY, DOWN, 6, OPP_TAMER, 2 - object_event 2, 7, SPRITE_ROCKER, STAY, LEFT, 7, OPP_JUGGLER, 4 - object_event 7, 15, SPRITE_GYM_GUIDE, STAY, DOWN, 8 ; person + object_event 4, 10, SPRITE_KOGA, STAY, DOWN, TEXT_FUCHSIAGYM_KOGA, OPP_KOGA, 1 + object_event 8, 13, SPRITE_ROCKER, STAY, DOWN, TEXT_FUCHSIAGYM_ROCKER1, OPP_JUGGLER, 7 + object_event 7, 8, SPRITE_ROCKER, STAY, RIGHT, TEXT_FUCHSIAGYM_ROCKER2, OPP_JUGGLER, 3 + object_event 1, 12, SPRITE_ROCKER, STAY, DOWN, TEXT_FUCHSIAGYM_ROCKER3, OPP_JUGGLER, 8 + object_event 3, 5, SPRITE_ROCKER, STAY, UP, TEXT_FUCHSIAGYM_ROCKER4, OPP_TAMER, 1 + object_event 8, 2, SPRITE_ROCKER, STAY, DOWN, TEXT_FUCHSIAGYM_ROCKER5, OPP_TAMER, 2 + object_event 2, 7, SPRITE_ROCKER, STAY, LEFT, TEXT_FUCHSIAGYM_ROCKER6, OPP_JUGGLER, 4 + object_event 7, 15, SPRITE_GYM_GUIDE, STAY, DOWN, TEXT_FUCHSIAGYM_GYM_GUIDE def_warps_to FUCHSIA_GYM diff --git a/data/maps/objects/FuchsiaMart.asm b/data/maps/objects/FuchsiaMart.asm index 04055fbd4..b41ba0f66 100644 --- a/data/maps/objects/FuchsiaMart.asm +++ b/data/maps/objects/FuchsiaMart.asm @@ -1,3 +1,8 @@ + object_const_def + const FUCHSIAMART_CLERK + const FUCHSIAMART_MIDDLE_AGED_MAN + const FUCHSIAMART_COOLTRAINER_F + FuchsiaMart_Object: db $0 ; border block @@ -8,8 +13,8 @@ FuchsiaMart_Object: def_bg_events def_object_events - object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person - object_event 4, 2, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 2 ; person - object_event 6, 5, SPRITE_COOLTRAINER_F, WALK, UP_DOWN, 3 ; person + object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, TEXT_FUCHSIAMART_CLERK + object_event 4, 2, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, TEXT_FUCHSIAMART_MIDDLE_AGED_MAN + object_event 6, 5, SPRITE_COOLTRAINER_F, WALK, UP_DOWN, TEXT_FUCHSIAMART_COOLTRAINER_F def_warps_to FUCHSIA_MART diff --git a/data/maps/objects/FuchsiaMeetingRoom.asm b/data/maps/objects/FuchsiaMeetingRoom.asm index 2e4ac72a0..c4670a095 100644 --- a/data/maps/objects/FuchsiaMeetingRoom.asm +++ b/data/maps/objects/FuchsiaMeetingRoom.asm @@ -1,3 +1,8 @@ + object_const_def + const FUCHSIAMEETINGROOM_SAFARI_ZONE_WORKER1 + const FUCHSIAMEETINGROOM_SAFARI_ZONE_WORKER2 + const FUCHSIAMEETINGROOM_SAFARI_ZONE_WORKER3 + FuchsiaMeetingRoom_Object: db $17 ; border block @@ -8,8 +13,8 @@ FuchsiaMeetingRoom_Object: def_bg_events def_object_events - object_event 4, 1, SPRITE_SAFARI_ZONE_WORKER, STAY, DOWN, 1 ; person - object_event 0, 2, SPRITE_SAFARI_ZONE_WORKER, STAY, UP, 2 ; person - object_event 10, 1, SPRITE_SAFARI_ZONE_WORKER, STAY, DOWN, 3 ; person + object_event 4, 1, SPRITE_SAFARI_ZONE_WORKER, STAY, DOWN, TEXT_FUCHSIAMEETINGROOM_SAFARI_ZONE_WORKER1 + object_event 0, 2, SPRITE_SAFARI_ZONE_WORKER, STAY, UP, TEXT_FUCHSIAMEETINGROOM_SAFARI_ZONE_WORKER2 + object_event 10, 1, SPRITE_SAFARI_ZONE_WORKER, STAY, DOWN, TEXT_FUCHSIAMEETINGROOM_SAFARI_ZONE_WORKER3 def_warps_to FUCHSIA_MEETING_ROOM diff --git a/data/maps/objects/FuchsiaPokecenter.asm b/data/maps/objects/FuchsiaPokecenter.asm index 84404b092..efa756437 100644 --- a/data/maps/objects/FuchsiaPokecenter.asm +++ b/data/maps/objects/FuchsiaPokecenter.asm @@ -1,3 +1,9 @@ + object_const_def + const FUCHSIAPOKECENTER_NURSE + const FUCHSIAPOKECENTER_ROCKER + const FUCHSIAPOKECENTER_COOLTRAINER_F + const FUCHSIAPOKECENTER_LINK_RECEPTIONIST + FuchsiaPokecenter_Object: db $0 ; border block @@ -8,9 +14,9 @@ FuchsiaPokecenter_Object: def_bg_events def_object_events - object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person - object_event 2, 3, SPRITE_ROCKER, STAY, NONE, 2 ; person - object_event 6, 5, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 3 ; person - object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person + object_event 3, 1, SPRITE_NURSE, STAY, DOWN, TEXT_FUCHSIAPOKECENTER_NURSE + object_event 2, 3, SPRITE_ROCKER, STAY, NONE, TEXT_FUCHSIAPOKECENTER_ROCKER + object_event 6, 5, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, TEXT_FUCHSIAPOKECENTER_COOLTRAINER_F + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_FUCHSIAPOKECENTER_LINK_RECEPTIONIST def_warps_to FUCHSIA_POKECENTER diff --git a/data/maps/objects/GameCorner.asm b/data/maps/objects/GameCorner.asm index 2b4c8f722..06277a330 100644 --- a/data/maps/objects/GameCorner.asm +++ b/data/maps/objects/GameCorner.asm @@ -1,3 +1,16 @@ + object_const_def + const GAMECORNER_BEAUTY1 + const GAMECORNER_CLERK1 + const GAMECORNER_MIDDLE_AGED_MAN1 + const GAMECORNER_BEAUTY2 + const GAMECORNER_FISHING_GURU + const GAMECORNER_MIDDLE_AGED_WOMAN + const GAMECORNER_GYM_GUIDE + const GAMECORNER_GAMBLER + const GAMECORNER_CLERK2 + const GAMECORNER_GENTLEMAN + const GAMECORNER_ROCKET + GameCorner_Object: db $f ; border block @@ -7,19 +20,19 @@ GameCorner_Object: warp_event 17, 4, ROCKET_HIDEOUT_B1F, 2 def_bg_events - bg_event 9, 4, 12 ; CeladonGameCornerText12 + bg_event 9, 4, TEXT_GAMECORNER_POSTER def_object_events - object_event 2, 6, SPRITE_BEAUTY, STAY, DOWN, 1 ; person - object_event 5, 6, SPRITE_CLERK, STAY, DOWN, 2 ; person - object_event 2, 10, SPRITE_MIDDLE_AGED_MAN, STAY, LEFT, 3 ; person - object_event 2, 13, SPRITE_BEAUTY, STAY, LEFT, 4 ; person - object_event 5, 11, SPRITE_FISHING_GURU, STAY, RIGHT, 5 ; person - object_event 8, 11, SPRITE_MIDDLE_AGED_WOMAN, STAY, LEFT, 6 ; person - object_event 8, 14, SPRITE_GYM_GUIDE, STAY, LEFT, 7 ; person - object_event 11, 15, SPRITE_GAMBLER, STAY, RIGHT, 8 ; person - object_event 14, 11, SPRITE_CLERK, STAY, LEFT, 9 ; person - object_event 17, 13, SPRITE_GENTLEMAN, STAY, RIGHT, 10 ; person - object_event 9, 5, SPRITE_ROCKET, STAY, UP, 11, OPP_ROCKET, 7 + object_event 2, 6, SPRITE_BEAUTY, STAY, DOWN, TEXT_GAMECORNER_BEAUTY1 + object_event 5, 6, SPRITE_CLERK, STAY, DOWN, TEXT_GAMECORNER_CLERK1 + object_event 2, 10, SPRITE_MIDDLE_AGED_MAN, STAY, LEFT, TEXT_GAMECORNER_MIDDLE_AGED_MAN1 + object_event 2, 13, SPRITE_BEAUTY, STAY, LEFT, TEXT_GAMECORNER_BEAUTY2 + object_event 5, 11, SPRITE_FISHING_GURU, STAY, RIGHT, TEXT_GAMECORNER_FISHING_GURU + object_event 8, 11, SPRITE_MIDDLE_AGED_WOMAN, STAY, LEFT, TEXT_GAMECORNER_MIDDLE_AGED_WOMAN + object_event 8, 14, SPRITE_GYM_GUIDE, STAY, LEFT, TEXT_GAMECORNER_GYM_GUIDE + object_event 11, 15, SPRITE_GAMBLER, STAY, RIGHT, TEXT_GAMECORNER_GAMBLER + object_event 14, 11, SPRITE_CLERK, STAY, LEFT, TEXT_GAMECORNER_CLERK2 + object_event 17, 13, SPRITE_GENTLEMAN, STAY, RIGHT, TEXT_GAMECORNER_GENTLEMAN + object_event 9, 5, SPRITE_ROCKET, STAY, UP, TEXT_GAMECORNER_ROCKET, OPP_ROCKET, 7 def_warps_to GAME_CORNER diff --git a/data/maps/objects/GameCornerPrizeRoom.asm b/data/maps/objects/GameCornerPrizeRoom.asm index b79e52ef3..145238131 100644 --- a/data/maps/objects/GameCornerPrizeRoom.asm +++ b/data/maps/objects/GameCornerPrizeRoom.asm @@ -1,3 +1,7 @@ + object_const_def + const GAMECORNERPRIZEROOM_BALDING_GUY + const GAMECORNERPRIZEROOM_GAMBLER + GameCornerPrizeRoom_Object: db $f ; border block @@ -6,12 +10,12 @@ GameCornerPrizeRoom_Object: warp_event 5, 7, LAST_MAP, 10 def_bg_events - bg_event 2, 2, 3 ; CeladonPrizeRoomText3 - bg_event 4, 2, 4 ; CeladonPrizeRoomText4 - bg_event 6, 2, 5 ; CeladonPrizeRoomText5 + bg_event 2, 2, TEXT_GAMECORNERPRIZEROOM_PRIZE_VENDOR_1 + bg_event 4, 2, TEXT_GAMECORNERPRIZEROOM_PRIZE_VENDOR_2 + bg_event 6, 2, TEXT_GAMECORNERPRIZEROOM_PRIZE_VENDOR_3 def_object_events - object_event 1, 4, SPRITE_BALDING_GUY, STAY, NONE, 1 ; person - object_event 7, 3, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 2 ; person + object_event 1, 4, SPRITE_BALDING_GUY, STAY, NONE, TEXT_GAMECORNERPRIZEROOM_BALDING_GUY + object_event 7, 3, SPRITE_GAMBLER, WALK, LEFT_RIGHT, TEXT_GAMECORNERPRIZEROOM_GAMBLER def_warps_to GAME_CORNER_PRIZE_ROOM diff --git a/data/maps/objects/HallOfFame.asm b/data/maps/objects/HallOfFame.asm index 31b9f8a2b..5c711dbe1 100644 --- a/data/maps/objects/HallOfFame.asm +++ b/data/maps/objects/HallOfFame.asm @@ -1,3 +1,6 @@ + object_const_def + const HALLOFFAME_OAK + HallOfFame_Object: db $3 ; border block @@ -8,6 +11,6 @@ HallOfFame_Object: def_bg_events def_object_events - object_event 5, 2, SPRITE_OAK, STAY, DOWN, 1 ; person + object_event 5, 2, SPRITE_OAK, STAY, DOWN, TEXT_HALLOFFAME_OAK def_warps_to HALL_OF_FAME diff --git a/data/maps/objects/IndigoPlateauLobby.asm b/data/maps/objects/IndigoPlateauLobby.asm index fd3d07bac..97ced88ba 100644 --- a/data/maps/objects/IndigoPlateauLobby.asm +++ b/data/maps/objects/IndigoPlateauLobby.asm @@ -1,3 +1,10 @@ + object_const_def + const INDIGOPLATEAULOBBY_NURSE + const INDIGOPLATEAULOBBY_GYM_GUIDE + const INDIGOPLATEAULOBBY_COOLTRAINER_F + const INDIGOPLATEAULOBBY_CLERK + const INDIGOPLATEAULOBBY_LINK_RECEPTIONIST + IndigoPlateauLobby_Object: db $0 ; border block @@ -9,10 +16,10 @@ IndigoPlateauLobby_Object: def_bg_events def_object_events - object_event 7, 5, SPRITE_NURSE, STAY, DOWN, 1 ; person - object_event 4, 9, SPRITE_GYM_GUIDE, STAY, RIGHT, 2 ; person - object_event 5, 1, SPRITE_COOLTRAINER_F, STAY, DOWN, 3 ; person - object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 4 ; person - object_event 13, 6, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 5 ; person + object_event 7, 5, SPRITE_NURSE, STAY, DOWN, TEXT_INDIGOPLATEAULOBBY_NURSE + object_event 4, 9, SPRITE_GYM_GUIDE, STAY, RIGHT, TEXT_INDIGOPLATEAULOBBY_GYM_GUIDE + object_event 5, 1, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_INDIGOPLATEAULOBBY_COOLTRAINER_F + object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, TEXT_INDIGOPLATEAULOBBY_CLERK + object_event 13, 6, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_INDIGOPLATEAULOBBY_LINK_RECEPTIONIST def_warps_to INDIGO_PLATEAU_LOBBY diff --git a/data/maps/objects/LancesRoom.asm b/data/maps/objects/LancesRoom.asm index c9334b3ae..9cd2aaf3b 100644 --- a/data/maps/objects/LancesRoom.asm +++ b/data/maps/objects/LancesRoom.asm @@ -1,3 +1,6 @@ + object_const_def + const LANCESROOM_LANCE + LancesRoom_Object: db $3 ; border block @@ -9,6 +12,6 @@ LancesRoom_Object: def_bg_events def_object_events - object_event 6, 1, SPRITE_LANCE, STAY, DOWN, 1, OPP_LANCE, 1 + object_event 6, 1, SPRITE_LANCE, STAY, DOWN, TEXT_LANCESROOM_LANCE, OPP_LANCE, 1 def_warps_to LANCES_ROOM diff --git a/data/maps/objects/LavenderCuboneHouse.asm b/data/maps/objects/LavenderCuboneHouse.asm index 35e6f8747..6ed539230 100644 --- a/data/maps/objects/LavenderCuboneHouse.asm +++ b/data/maps/objects/LavenderCuboneHouse.asm @@ -1,3 +1,7 @@ + object_const_def + const LAVENDERCUBONEHOUSE_CUBONE + const LAVENDERCUBONEHOUSE_BRUNETTE_GIRL + LavenderCuboneHouse_Object: db $a ; border block @@ -8,7 +12,7 @@ LavenderCuboneHouse_Object: def_bg_events def_object_events - object_event 3, 5, SPRITE_MONSTER, STAY, UP, 1 ; person - object_event 2, 4, SPRITE_BRUNETTE_GIRL, STAY, RIGHT, 2 ; person + object_event 3, 5, SPRITE_MONSTER, STAY, UP, TEXT_LAVENDERCUBONEHOUSE_CUBONE + object_event 2, 4, SPRITE_BRUNETTE_GIRL, STAY, RIGHT, TEXT_LAVENDERCUBONEHOUSE_BRUNETTE_GIRL def_warps_to LAVENDER_CUBONE_HOUSE diff --git a/data/maps/objects/LavenderMart.asm b/data/maps/objects/LavenderMart.asm index 28a9c2362..7302981f1 100644 --- a/data/maps/objects/LavenderMart.asm +++ b/data/maps/objects/LavenderMart.asm @@ -1,3 +1,8 @@ + object_const_def + const LAVENDERMART_CLERK + const LAVENDERMART_BALDING_GUY + const LAVENDERMART_COOLTRAINER_M + LavenderMart_Object: db $0 ; border block @@ -8,8 +13,8 @@ LavenderMart_Object: def_bg_events def_object_events - object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person - object_event 3, 4, SPRITE_BALDING_GUY, STAY, NONE, 2 ; person - object_event 7, 2, SPRITE_COOLTRAINER_M, STAY, NONE, 3 ; person + object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, TEXT_LAVENDERMART_CLERK + object_event 3, 4, SPRITE_BALDING_GUY, STAY, NONE, TEXT_LAVENDERMART_BALDING_GUY + object_event 7, 2, SPRITE_COOLTRAINER_M, STAY, NONE, TEXT_LAVENDERMART_COOLTRAINER_M def_warps_to LAVENDER_MART diff --git a/data/maps/objects/LavenderPokecenter.asm b/data/maps/objects/LavenderPokecenter.asm index 99c29528f..2fb98ec0c 100644 --- a/data/maps/objects/LavenderPokecenter.asm +++ b/data/maps/objects/LavenderPokecenter.asm @@ -1,3 +1,9 @@ + object_const_def + const LAVENDERPOKECENTER_NURSE + const LAVENDERPOKECENTER_GENTLEMAN + const LAVENDERPOKECENTER_LITTLE_GIRL + const LAVENDERPOKECENTER_LINK_RECEPTIONIST + LavenderPokecenter_Object: db $0 ; border block @@ -8,9 +14,9 @@ LavenderPokecenter_Object: def_bg_events def_object_events - object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person - object_event 5, 3, SPRITE_GENTLEMAN, STAY, NONE, 2 ; person - object_event 2, 6, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, 3 ; person - object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person + object_event 3, 1, SPRITE_NURSE, STAY, DOWN, TEXT_LAVENDERPOKECENTER_NURSE + object_event 5, 3, SPRITE_GENTLEMAN, STAY, NONE, TEXT_LAVENDERPOKECENTER_GENTLEMAN + object_event 2, 6, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, TEXT_LAVENDERPOKECENTER_LITTLE_GIRL + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_LAVENDERPOKECENTER_LINK_RECEPTIONIST def_warps_to LAVENDER_POKECENTER diff --git a/data/maps/objects/LavenderTown.asm b/data/maps/objects/LavenderTown.asm index e26017211..76df4c60f 100644 --- a/data/maps/objects/LavenderTown.asm +++ b/data/maps/objects/LavenderTown.asm @@ -1,3 +1,8 @@ + object_const_def + const LAVENDERTOWN_LITTLE_GIRL + const LAVENDERTOWN_COOLTRAINER_M + const LAVENDERTOWN_SUPER_NERD + LavenderTown_Object: db $2c ; border block @@ -10,16 +15,16 @@ LavenderTown_Object: warp_event 7, 13, NAME_RATERS_HOUSE, 1 def_bg_events - bg_event 11, 9, 4 ; LavenderTownText4 - bg_event 9, 3, 5 ; LavenderTownText5 - bg_event 16, 13, 6 ; MartSignText - bg_event 4, 5, 7 ; PokeCenterSignText - bg_event 5, 9, 8 ; LavenderTownText8 - bg_event 17, 7, 9 ; LavenderTownText9 + bg_event 11, 9, TEXT_LAVENDERTOWN_SIGN + bg_event 9, 3, TEXT_LAVENDERTOWN_SILPH_SCOPE_SIGN + bg_event 16, 13, TEXT_LAVENDERTOWN_MART_SIGN + bg_event 4, 5, TEXT_LAVENDERTOWN_POKECENTER_SIGN + bg_event 5, 9, TEXT_LAVENDERTOWN_POKEMON_HOUSE_SIGN + bg_event 17, 7, TEXT_LAVENDERTOWN_POKEMON_TOWER_SIGN def_object_events - object_event 15, 9, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, 1 ; person - object_event 9, 10, SPRITE_COOLTRAINER_M, STAY, NONE, 2 ; person - object_event 8, 7, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 3 ; person + object_event 15, 9, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, TEXT_LAVENDERTOWN_LITTLE_GIRL + object_event 9, 10, SPRITE_COOLTRAINER_M, STAY, NONE, TEXT_LAVENDERTOWN_COOLTRAINER_M + object_event 8, 7, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, TEXT_LAVENDERTOWN_SUPER_NERD def_warps_to LAVENDER_TOWN diff --git a/data/maps/objects/LoreleisRoom.asm b/data/maps/objects/LoreleisRoom.asm index 1db058e4c..3a24b23cc 100644 --- a/data/maps/objects/LoreleisRoom.asm +++ b/data/maps/objects/LoreleisRoom.asm @@ -1,3 +1,6 @@ + object_const_def + const LORELEISROOM_LORELEI + LoreleisRoom_Object: db $3 ; border block @@ -10,6 +13,6 @@ LoreleisRoom_Object: def_bg_events def_object_events - object_event 5, 2, SPRITE_LORELEI, STAY, DOWN, 1, OPP_LORELEI, 1 + object_event 5, 2, SPRITE_LORELEI, STAY, DOWN, TEXT_LORELEISROOM_LORELEI, OPP_LORELEI, 1 def_warps_to LORELEIS_ROOM diff --git a/data/maps/objects/MrFujisHouse.asm b/data/maps/objects/MrFujisHouse.asm index c84b86376..0a816d1e0 100644 --- a/data/maps/objects/MrFujisHouse.asm +++ b/data/maps/objects/MrFujisHouse.asm @@ -1,3 +1,11 @@ + object_const_def + const MRFUJISHOUSE_SUPER_NERD + const MRFUJISHOUSE_LITTLE_GIRL + const MRFUJISHOUSE_PSYDUCK + const MRFUJISHOUSE_NIDORINO + const MRFUJISHOUSE_MR_FUJI + const MRFUJISHOUSE_POKEDEX + MrFujisHouse_Object: db $a ; border block @@ -8,11 +16,11 @@ MrFujisHouse_Object: def_bg_events def_object_events - object_event 3, 5, SPRITE_SUPER_NERD, STAY, NONE, 1 ; person - object_event 6, 3, SPRITE_LITTLE_GIRL, STAY, DOWN, 2 ; person - object_event 6, 4, SPRITE_MONSTER, STAY, UP, 3 ; person - object_event 1, 3, SPRITE_MONSTER, STAY, NONE, 4 ; person - object_event 3, 1, SPRITE_MR_FUJI, STAY, NONE, 5 ; person - object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, 6 ; person + object_event 3, 5, SPRITE_SUPER_NERD, STAY, NONE, TEXT_MRFUJISHOUSE_SUPER_NERD + object_event 6, 3, SPRITE_LITTLE_GIRL, STAY, DOWN, TEXT_MRFUJISHOUSE_LITTLE_GIRL + object_event 6, 4, SPRITE_MONSTER, STAY, UP, TEXT_MRFUJISHOUSE_PSYDUCK + object_event 1, 3, SPRITE_MONSTER, STAY, NONE, TEXT_MRFUJISHOUSE_NIDORINO + object_event 3, 1, SPRITE_MR_FUJI, STAY, NONE, TEXT_MRFUJISHOUSE_MR_FUJI + object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, TEXT_MRFUJISHOUSE_POKEDEX def_warps_to MR_FUJIS_HOUSE diff --git a/data/maps/objects/MrPsychicsHouse.asm b/data/maps/objects/MrPsychicsHouse.asm index c5180c6f4..f7c009e62 100644 --- a/data/maps/objects/MrPsychicsHouse.asm +++ b/data/maps/objects/MrPsychicsHouse.asm @@ -1,3 +1,6 @@ + object_const_def + const MRPSYCHICSHOUSE_MR_PSYCHIC + MrPsychicsHouse_Object: db $a ; border block @@ -8,6 +11,6 @@ MrPsychicsHouse_Object: def_bg_events def_object_events - object_event 5, 3, SPRITE_FISHING_GURU, STAY, LEFT, 1 ; person + object_event 5, 3, SPRITE_FISHING_GURU, STAY, LEFT, TEXT_MRPSYCHICSHOUSE_MR_PSYCHIC def_warps_to MR_PSYCHICS_HOUSE diff --git a/data/maps/objects/MtMoon1F.asm b/data/maps/objects/MtMoon1F.asm index 4a6c095d5..bc697395b 100644 --- a/data/maps/objects/MtMoon1F.asm +++ b/data/maps/objects/MtMoon1F.asm @@ -1,3 +1,19 @@ + object_const_def + const MTMOON1F_HIKER + const MTMOON1F_YOUNGSTER1 + const MTMOON1F_COOLTRAINER_F1 + const MTMOON1F_SUPER_NERD + const MTMOON1F_COOLTRAINER_F2 + const MTMOON1F_YOUNGSTER2 + const MTMOON1F_YOUNGSTER3 + const MTMOON1F_POTION1 + const MTMOON1F_MOON_STONE + const MTMOON1F_RARE_CANDY + const MTMOON1F_ESCAPE_ROPE + const MTMOON1F_POTION2 + const MTMOON1F_TM_WATER_GUN + const MTMOON1F_BEWARE_ZUBAT_SIGN + MtMoon1F_Object: db $3 ; border block @@ -9,21 +25,21 @@ MtMoon1F_Object: warp_event 25, 15, MT_MOON_B1F, 4 def_bg_events - bg_event 15, 23, 14 ; MtMoon1Text14 + bg_event 15, 23, TEXT_MTMOON1F_BEWARE_ZUBAT_SIGN def_object_events - object_event 5, 6, SPRITE_HIKER, STAY, DOWN, 1, OPP_HIKER, 1 - object_event 12, 16, SPRITE_YOUNGSTER, STAY, RIGHT, 2, OPP_YOUNGSTER, 3 - object_event 30, 4, SPRITE_COOLTRAINER_F, STAY, DOWN, 3, OPP_LASS, 5 - object_event 24, 31, SPRITE_SUPER_NERD, STAY, UP, 4, OPP_SUPER_NERD, 1 - object_event 16, 23, SPRITE_COOLTRAINER_F, STAY, DOWN, 5, OPP_LASS, 6 - object_event 7, 22, SPRITE_YOUNGSTER, STAY, DOWN, 6, OPP_BUG_CATCHER, 7 - object_event 30, 27, SPRITE_YOUNGSTER, STAY, RIGHT, 7, OPP_BUG_CATCHER, 8 - object_event 2, 20, SPRITE_POKE_BALL, STAY, NONE, 8, POTION - object_event 2, 2, SPRITE_POKE_BALL, STAY, NONE, 9, MOON_STONE - object_event 35, 31, SPRITE_POKE_BALL, STAY, NONE, 10, RARE_CANDY - object_event 36, 23, SPRITE_POKE_BALL, STAY, NONE, 11, ESCAPE_ROPE - object_event 20, 33, SPRITE_POKE_BALL, STAY, NONE, 12, POTION - object_event 5, 32, SPRITE_POKE_BALL, STAY, NONE, 13, TM_WATER_GUN + object_event 5, 6, SPRITE_HIKER, STAY, DOWN, TEXT_MTMOON1F_HIKER, OPP_HIKER, 1 + object_event 12, 16, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_MTMOON1F_YOUNGSTER1, OPP_YOUNGSTER, 3 + object_event 30, 4, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_MTMOON1F_COOLTRAINER_F1, OPP_LASS, 5 + object_event 24, 31, SPRITE_SUPER_NERD, STAY, UP, TEXT_MTMOON1F_SUPER_NERD, OPP_SUPER_NERD, 1 + object_event 16, 23, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_MTMOON1F_COOLTRAINER_F2, OPP_LASS, 6 + object_event 7, 22, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_MTMOON1F_YOUNGSTER2, OPP_BUG_CATCHER, 7 + object_event 30, 27, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_MTMOON1F_YOUNGSTER3, OPP_BUG_CATCHER, 8 + object_event 2, 20, SPRITE_POKE_BALL, STAY, NONE, TEXT_MTMOON1F_POTION1, POTION + object_event 2, 2, SPRITE_POKE_BALL, STAY, NONE, TEXT_MTMOON1F_MOON_STONE, MOON_STONE + object_event 35, 31, SPRITE_POKE_BALL, STAY, NONE, TEXT_MTMOON1F_RARE_CANDY, RARE_CANDY + object_event 36, 23, SPRITE_POKE_BALL, STAY, NONE, TEXT_MTMOON1F_ESCAPE_ROPE, ESCAPE_ROPE + object_event 20, 33, SPRITE_POKE_BALL, STAY, NONE, TEXT_MTMOON1F_POTION2, POTION + object_event 5, 32, SPRITE_POKE_BALL, STAY, NONE, TEXT_MTMOON1F_TM_WATER_GUN, TM_WATER_GUN def_warps_to MT_MOON_1F diff --git a/data/maps/objects/MtMoonB2F.asm b/data/maps/objects/MtMoonB2F.asm index 43c7db885..5f3bbf763 100644 --- a/data/maps/objects/MtMoonB2F.asm +++ b/data/maps/objects/MtMoonB2F.asm @@ -1,3 +1,14 @@ + object_const_def + const MTMOONB2F_SUPER_NERD + const MTMOONB2F_ROCKET1 + const MTMOONB2F_ROCKET2 + const MTMOONB2F_ROCKET3 + const MTMOONB2F_ROCKET4 + const MTMOONB2F_DOME_FOSSIL + const MTMOONB2F_HELIX_FOSSIL + const MTMOONB2F_HP_UP + const MTMOONB2F_TM_MEGA_PUNCH + MtMoonB2F_Object: db $3 ; border block @@ -10,14 +21,14 @@ MtMoonB2F_Object: def_bg_events def_object_events - object_event 12, 8, SPRITE_SUPER_NERD, STAY, RIGHT, 1, OPP_SUPER_NERD, 2 - object_event 11, 16, SPRITE_ROCKET, STAY, DOWN, 2, OPP_ROCKET, 1 - object_event 15, 22, SPRITE_ROCKET, STAY, DOWN, 3, OPP_ROCKET, 2 - object_event 29, 11, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 3 - object_event 29, 17, SPRITE_ROCKET, STAY, LEFT, 5, OPP_ROCKET, 4 - object_event 12, 6, SPRITE_FOSSIL, STAY, NONE, 6 ; person - object_event 13, 6, SPRITE_FOSSIL, STAY, NONE, 7 ; person - object_event 25, 21, SPRITE_POKE_BALL, STAY, NONE, 8, HP_UP - object_event 29, 5, SPRITE_POKE_BALL, STAY, NONE, 9, TM_MEGA_PUNCH + object_event 12, 8, SPRITE_SUPER_NERD, STAY, RIGHT, TEXT_MTMOONB2F_SUPER_NERD, OPP_SUPER_NERD, 2 + object_event 11, 16, SPRITE_ROCKET, STAY, DOWN, TEXT_MTMOONB2F_ROCKET1, OPP_ROCKET, 1 + object_event 15, 22, SPRITE_ROCKET, STAY, DOWN, TEXT_MTMOONB2F_ROCKET2, OPP_ROCKET, 2 + object_event 29, 11, SPRITE_ROCKET, STAY, UP, TEXT_MTMOONB2F_ROCKET3, OPP_ROCKET, 3 + object_event 29, 17, SPRITE_ROCKET, STAY, LEFT, TEXT_MTMOONB2F_ROCKET4, OPP_ROCKET, 4 + object_event 12, 6, SPRITE_FOSSIL, STAY, NONE, TEXT_MTMOONB2F_DOME_FOSSIL + object_event 13, 6, SPRITE_FOSSIL, STAY, NONE, TEXT_MTMOONB2F_HELIX_FOSSIL + object_event 25, 21, SPRITE_POKE_BALL, STAY, NONE, TEXT_MTMOONB2F_HP_UP, HP_UP + object_event 29, 5, SPRITE_POKE_BALL, STAY, NONE, TEXT_MTMOONB2F_TM_MEGA_PUNCH, TM_MEGA_PUNCH def_warps_to MT_MOON_B2F diff --git a/data/maps/objects/MtMoonPokecenter.asm b/data/maps/objects/MtMoonPokecenter.asm index 382c67dd5..28049feff 100644 --- a/data/maps/objects/MtMoonPokecenter.asm +++ b/data/maps/objects/MtMoonPokecenter.asm @@ -1,3 +1,11 @@ + object_const_def + const MTMOONPOKECENTER_NURSE + const MTMOONPOKECENTER_YOUNGSTER + const MTMOONPOKECENTER_GENTLEMAN + const MTMOONPOKECENTER_MAGIKARP_SALESMAN + const MTMOONPOKECENTER_CLIPBOARD + const MTMOONPOKECENTER_LINK_RECEPTIONIST + MtMoonPokecenter_Object: db $0 ; border block @@ -8,11 +16,11 @@ MtMoonPokecenter_Object: def_bg_events def_object_events - object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person - object_event 4, 3, SPRITE_YOUNGSTER, STAY, UP, 2 ; person - object_event 7, 3, SPRITE_GENTLEMAN, STAY, UP, 3 ; person - object_event 10, 6, SPRITE_MIDDLE_AGED_MAN, WALK, LEFT_RIGHT, 4 ; person - object_event 7, 2, SPRITE_CLIPBOARD, STAY, NONE, 5 ; person - object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 6 ; person + object_event 3, 1, SPRITE_NURSE, STAY, DOWN, TEXT_MTMOONPOKECENTER_NURSE + object_event 4, 3, SPRITE_YOUNGSTER, STAY, UP, TEXT_MTMOONPOKECENTER_YOUNGSTER + object_event 7, 3, SPRITE_GENTLEMAN, STAY, UP, TEXT_MTMOONPOKECENTER_GENTLEMAN + object_event 10, 6, SPRITE_MIDDLE_AGED_MAN, WALK, LEFT_RIGHT, TEXT_MTMOONPOKECENTER_MAGIKARP_SALESMAN + object_event 7, 2, SPRITE_CLIPBOARD, STAY, NONE, TEXT_MTMOONPOKECENTER_CLIPBOARD + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_MTMOONPOKECENTER_LINK_RECEPTIONIST def_warps_to MT_MOON_POKECENTER diff --git a/data/maps/objects/Museum1F.asm b/data/maps/objects/Museum1F.asm index edbe63c9b..d33151a62 100644 --- a/data/maps/objects/Museum1F.asm +++ b/data/maps/objects/Museum1F.asm @@ -1,3 +1,10 @@ + object_const_def + const MUSEUM1F_SCIENTIST1 + const MUSEUM1F_GAMBLER + const MUSEUM1F_SCIENTIST2 + const MUSEUM1F_SCIENTIST3 + const MUSEUM1F_OLD_AMBER + Museum1F_Object: db $a ; border block @@ -11,10 +18,10 @@ Museum1F_Object: def_bg_events def_object_events - object_event 12, 4, SPRITE_SCIENTIST, STAY, LEFT, 1 ; person - object_event 1, 4, SPRITE_GAMBLER, STAY, NONE, 2 ; person - object_event 15, 2, SPRITE_SCIENTIST, STAY, DOWN, 3 ; person - object_event 17, 4, SPRITE_SCIENTIST, STAY, NONE, 4 ; person - object_event 16, 2, SPRITE_OLD_AMBER, STAY, NONE, 5 ; person + object_event 12, 4, SPRITE_SCIENTIST, STAY, LEFT, TEXT_MUSEUM1F_SCIENTIST1 + object_event 1, 4, SPRITE_GAMBLER, STAY, NONE, TEXT_MUSEUM1F_GAMBLER + object_event 15, 2, SPRITE_SCIENTIST, STAY, DOWN, TEXT_MUSEUM1F_SCIENTIST2 + object_event 17, 4, SPRITE_SCIENTIST, STAY, NONE, TEXT_MUSEUM1F_SCIENTIST3 + object_event 16, 2, SPRITE_OLD_AMBER, STAY, NONE, TEXT_MUSEUM1F_OLD_AMBER def_warps_to MUSEUM_1F diff --git a/data/maps/objects/Museum2F.asm b/data/maps/objects/Museum2F.asm index 061833ca4..e3c271172 100644 --- a/data/maps/objects/Museum2F.asm +++ b/data/maps/objects/Museum2F.asm @@ -1,3 +1,10 @@ + object_const_def + const MUSEUM2F_YOUNGSTER + const MUSEUM2F_GRAMPS + const MUSEUM2F_SCIENTIST + const MUSEUM2F_BRUNETTE_GIRL + const MUSEUM2F_HIKER + Museum2F_Object: db $a ; border block @@ -5,14 +12,14 @@ Museum2F_Object: warp_event 7, 7, MUSEUM_1F, 5 def_bg_events - bg_event 11, 2, 6 ; Museum2FText6 - bg_event 2, 5, 7 ; Museum2FText7 + bg_event 11, 2, TEXT_MUSEUM2F_SPACE_SHUTTLE_SIGN + bg_event 2, 5, TEXT_MUSEUM2F_MOON_STONE_SIGN def_object_events - object_event 1, 7, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person - object_event 0, 5, SPRITE_GRAMPS, STAY, DOWN, 2 ; person - object_event 7, 5, SPRITE_SCIENTIST, STAY, DOWN, 3 ; person - object_event 11, 5, SPRITE_BRUNETTE_GIRL, STAY, NONE, 4 ; person - object_event 12, 5, SPRITE_HIKER, STAY, DOWN, 5 ; person + object_event 1, 7, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, TEXT_MUSEUM2F_YOUNGSTER + object_event 0, 5, SPRITE_GRAMPS, STAY, DOWN, TEXT_MUSEUM2F_GRAMPS + object_event 7, 5, SPRITE_SCIENTIST, STAY, DOWN, TEXT_MUSEUM2F_SCIENTIST + object_event 11, 5, SPRITE_BRUNETTE_GIRL, STAY, NONE, TEXT_MUSEUM2F_BRUNETTE_GIRL + object_event 12, 5, SPRITE_HIKER, STAY, DOWN, TEXT_MUSEUM2F_HIKER def_warps_to MUSEUM_2F diff --git a/data/maps/objects/NameRatersHouse.asm b/data/maps/objects/NameRatersHouse.asm index 0568af764..0b6375e91 100644 --- a/data/maps/objects/NameRatersHouse.asm +++ b/data/maps/objects/NameRatersHouse.asm @@ -1,3 +1,6 @@ + object_const_def + const NAMERATERSHOUSE_NAME_RATER + NameRatersHouse_Object: db $a ; border block @@ -8,6 +11,6 @@ NameRatersHouse_Object: def_bg_events def_object_events - object_event 5, 3, SPRITE_SILPH_PRESIDENT, STAY, LEFT, 1 ; person + object_event 5, 3, SPRITE_SILPH_PRESIDENT, STAY, LEFT, TEXT_NAMERATERSHOUSE_NAME_RATER def_warps_to NAME_RATERS_HOUSE diff --git a/data/maps/objects/OaksLab.asm b/data/maps/objects/OaksLab.asm index 7fc869ef4..f800e880c 100644 --- a/data/maps/objects/OaksLab.asm +++ b/data/maps/objects/OaksLab.asm @@ -1,3 +1,16 @@ + object_const_def + const OAKSLAB_RIVAL + const OAKSLAB_CHARMANDER_POKE_BALL + const OAKSLAB_SQUIRTLE_POKE_BALL + const OAKSLAB_BULBASAUR_POKE_BALL + const OAKSLAB_OAK1 + const OAKSLAB_POKEDEX1 + const OAKSLAB_POKEDEX2 + const OAKSLAB_OAK2 + const OAKSLAB_GIRL + const OAKSLAB_SCIENTIST1 + const OAKSLAB_SCIENTIST2 + OaksLab_Object: db $3 ; border block @@ -8,16 +21,16 @@ OaksLab_Object: def_bg_events def_object_events - object_event 4, 3, SPRITE_BLUE, STAY, NONE, 1, OPP_RIVAL1, 1 - object_event 6, 3, SPRITE_POKE_BALL, STAY, NONE, 2 ; person - object_event 7, 3, SPRITE_POKE_BALL, STAY, NONE, 3 ; person - object_event 8, 3, SPRITE_POKE_BALL, STAY, NONE, 4 ; person - object_event 5, 2, SPRITE_OAK, STAY, DOWN, 5 ; person - object_event 2, 1, SPRITE_POKEDEX, STAY, NONE, 6 ; person - object_event 3, 1, SPRITE_POKEDEX, STAY, NONE, 7 ; person - object_event 5, 10, SPRITE_OAK, STAY, UP, 8 ; person - object_event 1, 9, SPRITE_GIRL, WALK, UP_DOWN, 9 ; person - object_event 2, 10, SPRITE_SCIENTIST, STAY, NONE, 10 ; person - object_event 8, 10, SPRITE_SCIENTIST, STAY, NONE, 11 ; person + object_event 4, 3, SPRITE_BLUE, STAY, NONE, TEXT_OAKSLAB_RIVAL, OPP_RIVAL1, 1 + object_event 6, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_OAKSLAB_CHARMANDER_POKE_BALL + object_event 7, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_OAKSLAB_SQUIRTLE_POKE_BALL + object_event 8, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_OAKSLAB_BULBASAUR_POKE_BALL + object_event 5, 2, SPRITE_OAK, STAY, DOWN, TEXT_OAKSLAB_OAK1 + object_event 2, 1, SPRITE_POKEDEX, STAY, NONE, TEXT_OAKSLAB_POKEDEX1 + object_event 3, 1, SPRITE_POKEDEX, STAY, NONE, TEXT_OAKSLAB_POKEDEX2 + object_event 5, 10, SPRITE_OAK, STAY, UP, TEXT_OAKSLAB_OAK2 + object_event 1, 9, SPRITE_GIRL, WALK, UP_DOWN, TEXT_OAKSLAB_GIRL + object_event 2, 10, SPRITE_SCIENTIST, STAY, NONE, TEXT_OAKSLAB_SCIENTIST1 + object_event 8, 10, SPRITE_SCIENTIST, STAY, NONE, TEXT_OAKSLAB_SCIENTIST2 def_warps_to OAKS_LAB diff --git a/data/maps/objects/PalletTown.asm b/data/maps/objects/PalletTown.asm index 1343f0cdf..793ec1641 100644 --- a/data/maps/objects/PalletTown.asm +++ b/data/maps/objects/PalletTown.asm @@ -1,3 +1,8 @@ + object_const_def + const PALLETTOWN_OAK + const PALLETTOWN_GIRL + const PALLETTOWN_FISHER + PalletTown_Object: db $b ; border block @@ -7,14 +12,14 @@ PalletTown_Object: warp_event 12, 11, OAKS_LAB, 2 def_bg_events - bg_event 13, 13, 4 ; PalletTownText4 - bg_event 7, 9, 5 ; PalletTownText5 - bg_event 3, 5, 6 ; PalletTownText6 - bg_event 11, 5, 7 ; PalletTownText7 + bg_event 13, 13, TEXT_PALLETTOWN_OAKSLAB_SIGN + bg_event 7, 9, TEXT_PALLETTOWN_SIGN + bg_event 3, 5, TEXT_PALLETTOWN_PLAYERSHOUSE_SIGN + bg_event 11, 5, TEXT_PALLETTOWN_RIVALSHOUSE_SIGN def_object_events - object_event 8, 5, SPRITE_OAK, STAY, NONE, 1 ; person - object_event 3, 8, SPRITE_GIRL, WALK, ANY_DIR, 2 ; person - object_event 11, 14, SPRITE_FISHER, WALK, ANY_DIR, 3 ; person + object_event 8, 5, SPRITE_OAK, STAY, NONE, TEXT_PALLETTOWN_OAK + object_event 3, 8, SPRITE_GIRL, WALK, ANY_DIR, TEXT_PALLETTOWN_GIRL + object_event 11, 14, SPRITE_FISHER, WALK, ANY_DIR, TEXT_PALLETTOWN_FISHER def_warps_to PALLET_TOWN diff --git a/data/maps/objects/PewterCity.asm b/data/maps/objects/PewterCity.asm index 4a8e2323d..b734ee401 100644 --- a/data/maps/objects/PewterCity.asm +++ b/data/maps/objects/PewterCity.asm @@ -1,3 +1,10 @@ + object_const_def + const PEWTERCITY_COOLTRAINER_F + const PEWTERCITY_COOLTRAINER_M + const PEWTERCITY_SUPER_NERD1 + const PEWTERCITY_SUPER_NERD2 + const PEWTERCITY_YOUNGSTER + PewterCity_Object: db $a ; border block @@ -11,19 +18,19 @@ PewterCity_Object: warp_event 13, 25, PEWTER_POKECENTER, 1 def_bg_events - bg_event 19, 29, 6 ; PewterCityText6 - bg_event 33, 19, 7 ; PewterCityText7 - bg_event 24, 17, 8 ; MartSignText - bg_event 14, 25, 9 ; PokeCenterSignText - bg_event 15, 9, 10 ; PewterCityText10 - bg_event 11, 17, 11 ; PewterCityText11 - bg_event 25, 23, 12 ; PewterCityText12 + bg_event 19, 29, TEXT_PEWTERCITY_TRAINER_TIPS + bg_event 33, 19, TEXT_PEWTERCITY_POLICE_NOTICE_SIGN + bg_event 24, 17, TEXT_PEWTERCITY_MART_SIGN + bg_event 14, 25, TEXT_PEWTERCITY_POKECENTER_SIGN + bg_event 15, 9, TEXT_PEWTERCITY_MUSEUM_SIGN + bg_event 11, 17, TEXT_PEWTERCITY_GYM_SIGN + bg_event 25, 23, TEXT_PEWTERCITY_SIGN def_object_events - object_event 8, 15, SPRITE_COOLTRAINER_F, STAY, NONE, 1 ; person - object_event 17, 25, SPRITE_COOLTRAINER_M, STAY, NONE, 2 ; person - object_event 27, 17, SPRITE_SUPER_NERD, STAY, NONE, 3 ; person - object_event 26, 25, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 4 ; person - object_event 35, 16, SPRITE_YOUNGSTER, STAY, DOWN, 5 ; person + object_event 8, 15, SPRITE_COOLTRAINER_F, STAY, NONE, TEXT_PEWTERCITY_COOLTRAINER_F + object_event 17, 25, SPRITE_COOLTRAINER_M, STAY, NONE, TEXT_PEWTERCITY_COOLTRAINER_M + object_event 27, 17, SPRITE_SUPER_NERD, STAY, NONE, TEXT_PEWTERCITY_SUPER_NERD1 + object_event 26, 25, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, TEXT_PEWTERCITY_SUPER_NERD2 + object_event 35, 16, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_PEWTERCITY_YOUNGSTER def_warps_to PEWTER_CITY diff --git a/data/maps/objects/PewterGym.asm b/data/maps/objects/PewterGym.asm index cfaeefbf7..ee82ed21d 100644 --- a/data/maps/objects/PewterGym.asm +++ b/data/maps/objects/PewterGym.asm @@ -1,3 +1,8 @@ + object_const_def + const PEWTERGYM_BROCK + const PEWTERGYM_COOLTRAINER_M + const PEWTERGYM_GYM_GUIDE + PewterGym_Object: db $3 ; border block @@ -8,8 +13,8 @@ PewterGym_Object: def_bg_events def_object_events - object_event 4, 1, SPRITE_SUPER_NERD, STAY, DOWN, 1, OPP_BROCK, 1 - object_event 3, 6, SPRITE_COOLTRAINER_M, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1 - object_event 7, 10, SPRITE_GYM_GUIDE, STAY, DOWN, 3 ; person + object_event 4, 1, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_PEWTERGYM_BROCK, OPP_BROCK, 1 + object_event 3, 6, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_PEWTERGYM_COOLTRAINER_M, OPP_JR_TRAINER_M, 1 + object_event 7, 10, SPRITE_GYM_GUIDE, STAY, DOWN, TEXT_PEWTERGYM_GYM_GUIDE def_warps_to PEWTER_GYM diff --git a/data/maps/objects/PewterMart.asm b/data/maps/objects/PewterMart.asm index ad804c6b1..e5fc199b2 100644 --- a/data/maps/objects/PewterMart.asm +++ b/data/maps/objects/PewterMart.asm @@ -1,3 +1,8 @@ + object_const_def + const PEWTERMART_CLERK + const PEWTERMART_YOUNGSTER + const PEWTERMART_SUPER_NERD + PewterMart_Object: db $0 ; border block @@ -8,8 +13,8 @@ PewterMart_Object: def_bg_events def_object_events - object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person - object_event 3, 3, SPRITE_YOUNGSTER, WALK, UP_DOWN, 2 ; person - object_event 5, 5, SPRITE_SUPER_NERD, STAY, NONE, 3 ; person + object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, TEXT_PEWTERMART_CLERK + object_event 3, 3, SPRITE_YOUNGSTER, WALK, UP_DOWN, TEXT_PEWTERMART_YOUNGSTER + object_event 5, 5, SPRITE_SUPER_NERD, STAY, NONE, TEXT_PEWTERMART_SUPER_NERD def_warps_to PEWTER_MART diff --git a/data/maps/objects/PewterNidoranHouse.asm b/data/maps/objects/PewterNidoranHouse.asm index 93924d014..d14ee3454 100644 --- a/data/maps/objects/PewterNidoranHouse.asm +++ b/data/maps/objects/PewterNidoranHouse.asm @@ -1,3 +1,8 @@ + object_const_def + const PEWTERNIDORANHOUSE_NIDORAN + const PEWTERNIDORANHOUSE_LITTLE_BOY + const PEWTERNIDORANHOUSE_MIDDLE_AGED_MAN + PewterNidoranHouse_Object: db $a ; border block @@ -8,8 +13,8 @@ PewterNidoranHouse_Object: def_bg_events def_object_events - object_event 4, 5, SPRITE_MONSTER, STAY, LEFT, 1 ; person - object_event 3, 5, SPRITE_LITTLE_BOY, STAY, RIGHT, 2 ; person - object_event 1, 2, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 3 ; person + object_event 4, 5, SPRITE_MONSTER, STAY, LEFT, PEWTERNIDORANHOUSE_NIDORAN + object_event 3, 5, SPRITE_LITTLE_BOY, STAY, RIGHT, PEWTERNIDORANHOUSE_LITTLE_BOY + object_event 1, 2, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, PEWTERNIDORANHOUSE_MIDDLE_AGED_MAN def_warps_to PEWTER_NIDORAN_HOUSE diff --git a/data/maps/objects/PewterPokecenter.asm b/data/maps/objects/PewterPokecenter.asm index 9d9e8e587..3b3e9cd9b 100644 --- a/data/maps/objects/PewterPokecenter.asm +++ b/data/maps/objects/PewterPokecenter.asm @@ -1,3 +1,9 @@ + object_const_def + const PEWTERPOKECENTER_NURSE + const PEWTERPOKECENTER_GENTLEMAN + const PEWTERPOKECENTER_JIGGLYPUFF + const PEWTERPOKECENTER_LINK_RECEPTIONIST + PewterPokecenter_Object: db $0 ; border block @@ -8,9 +14,9 @@ PewterPokecenter_Object: def_bg_events def_object_events - object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person - object_event 11, 7, SPRITE_GENTLEMAN, STAY, LEFT, 2 ; person - object_event 1, 3, SPRITE_FAIRY, STAY, DOWN, 3 ; person - object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person + object_event 3, 1, SPRITE_NURSE, STAY, DOWN, TEXT_PEWTERPOKECENTER_NURSE + object_event 11, 7, SPRITE_GENTLEMAN, STAY, LEFT, TEXT_PEWTERPOKECENTER_GENTLEMAN + object_event 1, 3, SPRITE_FAIRY, STAY, DOWN, TEXT_PEWTERPOKECENTER_JIGGLYPUFF + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_PEWTERPOKECENTER_LINK_RECEPTIONIST def_warps_to PEWTER_POKECENTER diff --git a/data/maps/objects/PewterSpeechHouse.asm b/data/maps/objects/PewterSpeechHouse.asm index a6896c430..0e892b601 100644 --- a/data/maps/objects/PewterSpeechHouse.asm +++ b/data/maps/objects/PewterSpeechHouse.asm @@ -1,3 +1,7 @@ + object_const_def + const PEWTERSPEECHHOUSE_GAMBLER + const PEWTERSPEECHHOUSE_YOUNGSTER + PewterSpeechHouse_Object: db $a ; border block @@ -8,7 +12,7 @@ PewterSpeechHouse_Object: def_bg_events def_object_events - object_event 2, 3, SPRITE_GAMBLER, STAY, RIGHT, 1 ; person - object_event 4, 5, SPRITE_YOUNGSTER, STAY, NONE, 2 ; person + object_event 2, 3, SPRITE_GAMBLER, STAY, RIGHT, TEXT_PEWTERSPEECHHOUSE_GAMBLER + object_event 4, 5, SPRITE_YOUNGSTER, STAY, NONE, TEXT_PEWTERSPEECHHOUSE_YOUNGSTER def_warps_to PEWTER_SPEECH_HOUSE diff --git a/data/maps/objects/PokemonFanClub.asm b/data/maps/objects/PokemonFanClub.asm index c7d815f2e..5ee899d3d 100644 --- a/data/maps/objects/PokemonFanClub.asm +++ b/data/maps/objects/PokemonFanClub.asm @@ -1,3 +1,13 @@ + object_const_def + const POKEMONFANCLUB_PIKACHU_FAN + const POKEMONFANCLUB_SEEL_FAN + const POKEMONFANCLUB_PIKACHU + const POKEMONFANCLUB_SEEL + const POKEMONFANCLUB_CHAIRMAN + const POKEMONFANCLUB_RECEPTIONIST + const POKEMONFANCLUB_SIGN_1 + const POKEMONFANCLUB_SIGN_2 + PokemonFanClub_Object: db $d ; border block @@ -6,15 +16,15 @@ PokemonFanClub_Object: warp_event 3, 7, LAST_MAP, 2 def_bg_events - bg_event 1, 0, 7 ; FanClubText7 - bg_event 6, 0, 8 ; FanClubText8 + bg_event 1, 0, TEXT_POKEMONFANCLUB_SIGN_1 + bg_event 6, 0, TEXT_POKEMONFANCLUB_SIGN_2 def_object_events - object_event 6, 3, SPRITE_FISHER, STAY, LEFT, 1 ; person - object_event 1, 3, SPRITE_GIRL, STAY, RIGHT, 2 ; person - object_event 6, 4, SPRITE_FAIRY, STAY, LEFT, 3 ; person - object_event 1, 4, SPRITE_SEEL, STAY, RIGHT, 4 ; person - object_event 3, 1, SPRITE_GENTLEMAN, STAY, DOWN, 5 ; person - object_event 5, 1, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 6 ; person + object_event 6, 3, SPRITE_FISHER, STAY, LEFT, TEXT_POKEMONFANCLUB_PIKACHU_FAN + object_event 1, 3, SPRITE_GIRL, STAY, RIGHT, TEXT_POKEMONFANCLUB_SEEL_FAN + object_event 6, 4, SPRITE_FAIRY, STAY, LEFT, TEXT_POKEMONFANCLUB_PIKACHU + object_event 1, 4, SPRITE_SEEL, STAY, RIGHT, TEXT_POKEMONFANCLUB_SEEL + object_event 3, 1, SPRITE_GENTLEMAN, STAY, DOWN, TEXT_POKEMONFANCLUB_CHAIRMAN + object_event 5, 1, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_POKEMONFANCLUB_RECEPTIONIST def_warps_to POKEMON_FAN_CLUB diff --git a/data/maps/objects/PokemonMansion1F.asm b/data/maps/objects/PokemonMansion1F.asm index 5568f7fe0..3fb8780ea 100644 --- a/data/maps/objects/PokemonMansion1F.asm +++ b/data/maps/objects/PokemonMansion1F.asm @@ -1,3 +1,8 @@ + object_const_def + const POKEMONMANSION1F_SCIENTIST + const POKEMONMANSION1F_ESCAPE_ROPE + const POKEMONMANSION1F_CARBOS + PokemonMansion1F_Object: db $2e ; border block @@ -14,8 +19,8 @@ PokemonMansion1F_Object: def_bg_events def_object_events - object_event 17, 17, SPRITE_SCIENTIST, STAY, LEFT, 1, OPP_SCIENTIST, 4 - object_event 14, 3, SPRITE_POKE_BALL, STAY, NONE, 2, ESCAPE_ROPE - object_event 18, 21, SPRITE_POKE_BALL, STAY, NONE, 3, CARBOS + object_event 17, 17, SPRITE_SCIENTIST, STAY, LEFT, TEXT_POKEMONMANSION1F_SCIENTIST, OPP_SCIENTIST, 4 + object_event 14, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONMANSION1F_ESCAPE_ROPE, ESCAPE_ROPE + object_event 18, 21, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONMANSION1F_CARBOS, CARBOS def_warps_to POKEMON_MANSION_1F diff --git a/data/maps/objects/PokemonMansion2F.asm b/data/maps/objects/PokemonMansion2F.asm index 52b658850..a4b71d2c9 100644 --- a/data/maps/objects/PokemonMansion2F.asm +++ b/data/maps/objects/PokemonMansion2F.asm @@ -1,3 +1,9 @@ + object_const_def + const POKEMONMANSION2F_SUPER_NERD + const POKEMONMANSION2F_CALCIUM + const POKEMONMANSION2F_DIARY1 + const POKEMONMANSION2F_DIARY2 + PokemonMansion2F_Object: db $1 ; border block @@ -10,9 +16,9 @@ PokemonMansion2F_Object: def_bg_events def_object_events - object_event 3, 17, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 7 - object_event 28, 7, SPRITE_POKE_BALL, STAY, NONE, 2, CALCIUM - object_event 18, 2, SPRITE_POKEDEX, STAY, NONE, 3 ; person - object_event 3, 22, SPRITE_POKEDEX, STAY, NONE, 4 ; person + object_event 3, 17, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, TEXT_POKEMONMANSION2F_SUPER_NERD, OPP_BURGLAR, 7 + object_event 28, 7, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONMANSION2F_CALCIUM, CALCIUM + object_event 18, 2, SPRITE_POKEDEX, STAY, NONE, TEXT_POKEMONMANSION2F_DIARY1 + object_event 3, 22, SPRITE_POKEDEX, STAY, NONE, TEXT_POKEMONMANSION2F_DIARY2 def_warps_to POKEMON_MANSION_2F diff --git a/data/maps/objects/PokemonMansion3F.asm b/data/maps/objects/PokemonMansion3F.asm index b67e13bcd..a9ebedc98 100644 --- a/data/maps/objects/PokemonMansion3F.asm +++ b/data/maps/objects/PokemonMansion3F.asm @@ -1,3 +1,10 @@ + object_const_def + const POKEMONMANSION3F_SUPER_NERD + const POKEMONMANSION3F_SCIENTIST + const POKEMONMANSION3F_MAX_POTION + const POKEMONMANSION3F_IRON + const POKEMONMANSION3F_DIARY + PokemonMansion3F_Object: db $1 ; border block @@ -9,10 +16,10 @@ PokemonMansion3F_Object: def_bg_events def_object_events - object_event 5, 11, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 8 - object_event 20, 11, SPRITE_SCIENTIST, STAY, LEFT, 2, OPP_SCIENTIST, 12 - object_event 1, 16, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_POTION - object_event 25, 5, SPRITE_POKE_BALL, STAY, NONE, 4, IRON - object_event 6, 12, SPRITE_POKEDEX, STAY, NONE, 5 ; person + object_event 5, 11, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, TEXT_POKEMONMANSION3F_SUPER_NERD, OPP_BURGLAR, 8 + object_event 20, 11, SPRITE_SCIENTIST, STAY, LEFT, TEXT_POKEMONMANSION3F_SCIENTIST, OPP_SCIENTIST, 12 + object_event 1, 16, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONMANSION3F_MAX_POTION, MAX_POTION + object_event 25, 5, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONMANSION3F_IRON, IRON + object_event 6, 12, SPRITE_POKEDEX, STAY, NONE, TEXT_POKEMONMANSION3F_DIARY def_warps_to POKEMON_MANSION_3F diff --git a/data/maps/objects/PokemonMansionB1F.asm b/data/maps/objects/PokemonMansionB1F.asm index 12692e811..5d70db705 100644 --- a/data/maps/objects/PokemonMansionB1F.asm +++ b/data/maps/objects/PokemonMansionB1F.asm @@ -1,3 +1,13 @@ + object_const_def + const POKEMONMANSIONB1F_BURGLAR + const POKEMONMANSIONB1F_SCIENTIST + const POKEMONMANSIONB1F_RARE_CANDY + const POKEMONMANSIONB1F_FULL_RESTORE + const POKEMONMANSIONB1F_TM_BLIZZARD + const POKEMONMANSIONB1F_TM_SOLARBEAM + const POKEMONMANSIONB1F_DIARY + const POKEMONMANSIONB1F_SECRET_KEY + PokemonMansionB1F_Object: db $1 ; border block @@ -7,13 +17,13 @@ PokemonMansionB1F_Object: def_bg_events def_object_events - object_event 16, 23, SPRITE_SUPER_NERD, STAY, NONE, 1, OPP_BURGLAR, 9 - object_event 27, 11, SPRITE_SCIENTIST, STAY, DOWN, 2, OPP_SCIENTIST, 13 - object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 3, RARE_CANDY - object_event 1, 22, SPRITE_POKE_BALL, STAY, NONE, 4, FULL_RESTORE - object_event 19, 25, SPRITE_POKE_BALL, STAY, NONE, 5, TM_BLIZZARD - object_event 5, 4, SPRITE_POKE_BALL, STAY, NONE, 6, TM_SOLARBEAM - object_event 16, 20, SPRITE_POKEDEX, STAY, NONE, 7 ; person - object_event 5, 13, SPRITE_POKE_BALL, STAY, NONE, 8, SECRET_KEY + object_event 16, 23, SPRITE_SUPER_NERD, STAY, NONE, TEXT_POKEMONMANSIONB1F_BURGLAR, OPP_BURGLAR, 9 + object_event 27, 11, SPRITE_SCIENTIST, STAY, DOWN, TEXT_POKEMONMANSIONB1F_SCIENTIST, OPP_SCIENTIST, 13 + object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONMANSIONB1F_RARE_CANDY, RARE_CANDY + object_event 1, 22, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONMANSIONB1F_FULL_RESTORE, FULL_RESTORE + object_event 19, 25, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONMANSIONB1F_TM_BLIZZARD, TM_BLIZZARD + object_event 5, 4, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONMANSIONB1F_TM_SOLARBEAM, TM_SOLARBEAM + object_event 16, 20, SPRITE_POKEDEX, STAY, NONE, TEXT_POKEMONMANSIONB1F_DIARY + object_event 5, 13, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONMANSIONB1F_SECRET_KEY, SECRET_KEY def_warps_to POKEMON_MANSION_B1F diff --git a/data/maps/objects/PokemonTower1F.asm b/data/maps/objects/PokemonTower1F.asm index bacf72449..0f8c64c3d 100644 --- a/data/maps/objects/PokemonTower1F.asm +++ b/data/maps/objects/PokemonTower1F.asm @@ -1,3 +1,10 @@ + object_const_def + const POKEMONTOWER1F_RECEPTIONIST + const POKEMONTOWER1F_MIDDLE_AGED_WOMAN + const POKEMONTOWER1F_BALDING_GUY + const POKEMONTOWER1F_GIRL + const POKEMONTOWER1F_CHANNELER + PokemonTower1F_Object: db $1 ; border block @@ -9,10 +16,10 @@ PokemonTower1F_Object: def_bg_events def_object_events - object_event 15, 13, SPRITE_LINK_RECEPTIONIST, STAY, UP, 1 ; person - object_event 6, 8, SPRITE_MIDDLE_AGED_WOMAN, STAY, NONE, 2 ; person - object_event 8, 12, SPRITE_BALDING_GUY, STAY, NONE, 3 ; person - object_event 13, 7, SPRITE_GIRL, STAY, NONE, 4 ; person - object_event 17, 7, SPRITE_CHANNELER, STAY, LEFT, 5 ; person + object_event 15, 13, SPRITE_LINK_RECEPTIONIST, STAY, UP, TEXT_POKEMONTOWER1F_RECEPTIONIST + object_event 6, 8, SPRITE_MIDDLE_AGED_WOMAN, STAY, NONE, TEXT_POKEMONTOWER1F_MIDDLE_AGED_WOMAN + object_event 8, 12, SPRITE_BALDING_GUY, STAY, NONE, TEXT_POKEMONTOWER1F_BALDING_GUY + object_event 13, 7, SPRITE_GIRL, STAY, NONE, TEXT_POKEMONTOWER1F_GIRL + object_event 17, 7, SPRITE_CHANNELER, STAY, LEFT, TEXT_POKEMONTOWER1F_CHANNELER def_warps_to POKEMON_TOWER_1F diff --git a/data/maps/objects/PokemonTower2F.asm b/data/maps/objects/PokemonTower2F.asm index e0635b68b..ecdbc20ae 100644 --- a/data/maps/objects/PokemonTower2F.asm +++ b/data/maps/objects/PokemonTower2F.asm @@ -1,3 +1,7 @@ + object_const_def + const POKEMONTOWER2F_RIVAL + const POKEMONTOWER2F_CHANNELER + PokemonTower2F_Object: db $1 ; border block @@ -8,7 +12,7 @@ PokemonTower2F_Object: def_bg_events def_object_events - object_event 14, 5, SPRITE_BLUE, STAY, NONE, 1 ; person - object_event 3, 7, SPRITE_CHANNELER, STAY, RIGHT, 2 ; person + object_event 14, 5, SPRITE_BLUE, STAY, NONE, TEXT_POKEMONTOWER2F_RIVAL + object_event 3, 7, SPRITE_CHANNELER, STAY, RIGHT, TEXT_POKEMONTOWER2F_CHANNELER def_warps_to POKEMON_TOWER_2F diff --git a/data/maps/objects/PokemonTower3F.asm b/data/maps/objects/PokemonTower3F.asm index 6b49d9679..2a5c9b8d6 100644 --- a/data/maps/objects/PokemonTower3F.asm +++ b/data/maps/objects/PokemonTower3F.asm @@ -1,3 +1,9 @@ + object_const_def + const POKEMONTOWER3F_CHANNELER1 + const POKEMONTOWER3F_CHANNELER2 + const POKEMONTOWER3F_CHANNELER3 + const POKEMONTOWER3F_ESCAPE_ROPE + PokemonTower3F_Object: db $1 ; border block @@ -8,9 +14,9 @@ PokemonTower3F_Object: def_bg_events def_object_events - object_event 12, 3, SPRITE_CHANNELER, STAY, LEFT, 1, OPP_CHANNELER, 5 - object_event 9, 8, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 6 - object_event 10, 13, SPRITE_CHANNELER, STAY, DOWN, 3, OPP_CHANNELER, 8 - object_event 12, 1, SPRITE_POKE_BALL, STAY, NONE, 4, ESCAPE_ROPE + object_event 12, 3, SPRITE_CHANNELER, STAY, LEFT, TEXT_POKEMONTOWER3F_CHANNELER1, OPP_CHANNELER, 5 + object_event 9, 8, SPRITE_CHANNELER, STAY, DOWN, TEXT_POKEMONTOWER3F_CHANNELER2, OPP_CHANNELER, 6 + object_event 10, 13, SPRITE_CHANNELER, STAY, DOWN, TEXT_POKEMONTOWER3F_CHANNELER3, OPP_CHANNELER, 8 + object_event 12, 1, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONTOWER3F_ESCAPE_ROPE, ESCAPE_ROPE def_warps_to POKEMON_TOWER_3F diff --git a/data/maps/objects/PokemonTower4F.asm b/data/maps/objects/PokemonTower4F.asm index 3bc31e708..ad8175ebd 100644 --- a/data/maps/objects/PokemonTower4F.asm +++ b/data/maps/objects/PokemonTower4F.asm @@ -1,3 +1,11 @@ + object_const_def + const POKEMONTOWER4F_CHANNELER1 + const POKEMONTOWER4F_CHANNELER2 + const POKEMONTOWER4F_CHANNELER3 + const POKEMONTOWER4F_ELIXER + const POKEMONTOWER4F_AWAKENING + const POKEMONTOWER4F_HP_UP + PokemonTower4F_Object: db $1 ; border block @@ -8,11 +16,11 @@ PokemonTower4F_Object: def_bg_events def_object_events - object_event 5, 10, SPRITE_CHANNELER, STAY, RIGHT, 1, OPP_CHANNELER, 9 - object_event 15, 7, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 10 - object_event 14, 12, SPRITE_CHANNELER, STAY, LEFT, 3, OPP_CHANNELER, 12 - object_event 12, 10, SPRITE_POKE_BALL, STAY, NONE, 4, ELIXER - object_event 9, 10, SPRITE_POKE_BALL, STAY, NONE, 5, AWAKENING - object_event 12, 16, SPRITE_POKE_BALL, STAY, NONE, 6, HP_UP + object_event 5, 10, SPRITE_CHANNELER, STAY, RIGHT, TEXT_POKEMONTOWER4F_CHANNELER1, OPP_CHANNELER, 9 + object_event 15, 7, SPRITE_CHANNELER, STAY, DOWN, TEXT_POKEMONTOWER4F_CHANNELER2, OPP_CHANNELER, 10 + object_event 14, 12, SPRITE_CHANNELER, STAY, LEFT, TEXT_POKEMONTOWER4F_CHANNELER3, OPP_CHANNELER, 12 + object_event 12, 10, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONTOWER4F_ELIXER, ELIXER + object_event 9, 10, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONTOWER4F_AWAKENING, AWAKENING + object_event 12, 16, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONTOWER4F_HP_UP, HP_UP def_warps_to POKEMON_TOWER_4F diff --git a/data/maps/objects/PokemonTower5F.asm b/data/maps/objects/PokemonTower5F.asm index 99bbe8f07..be27f3c1b 100644 --- a/data/maps/objects/PokemonTower5F.asm +++ b/data/maps/objects/PokemonTower5F.asm @@ -1,3 +1,11 @@ + object_const_def + const POKEMONTOWER5F_CHANNELER1 + const POKEMONTOWER5F_CHANNELER2 + const POKEMONTOWER5F_CHANNELER3 + const POKEMONTOWER5F_CHANNELER4 + const POKEMONTOWER5F_CHANNELER5 + const POKEMONTOWER5F_NUGGET + PokemonTower5F_Object: db $1 ; border block @@ -8,11 +16,11 @@ PokemonTower5F_Object: def_bg_events def_object_events - object_event 12, 8, SPRITE_CHANNELER, STAY, NONE, 1 ; person - object_event 17, 7, SPRITE_CHANNELER, STAY, LEFT, 2, OPP_CHANNELER, 14 - object_event 14, 3, SPRITE_CHANNELER, STAY, LEFT, 3, OPP_CHANNELER, 16 - object_event 6, 10, SPRITE_CHANNELER, STAY, RIGHT, 4, OPP_CHANNELER, 17 - object_event 9, 16, SPRITE_CHANNELER, STAY, RIGHT, 5, OPP_CHANNELER, 18 - object_event 6, 14, SPRITE_POKE_BALL, STAY, NONE, 6, NUGGET + object_event 12, 8, SPRITE_CHANNELER, STAY, NONE, TEXT_POKEMONTOWER5F_CHANNELER1 + object_event 17, 7, SPRITE_CHANNELER, STAY, LEFT, TEXT_POKEMONTOWER5F_CHANNELER2, OPP_CHANNELER, 14 + object_event 14, 3, SPRITE_CHANNELER, STAY, LEFT, TEXT_POKEMONTOWER5F_CHANNELER3, OPP_CHANNELER, 16 + object_event 6, 10, SPRITE_CHANNELER, STAY, RIGHT, TEXT_POKEMONTOWER5F_CHANNELER4, OPP_CHANNELER, 17 + object_event 9, 16, SPRITE_CHANNELER, STAY, RIGHT, TEXT_POKEMONTOWER5F_CHANNELER5, OPP_CHANNELER, 18 + object_event 6, 14, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONTOWER5F_NUGGET, NUGGET def_warps_to POKEMON_TOWER_5F diff --git a/data/maps/objects/PokemonTower6F.asm b/data/maps/objects/PokemonTower6F.asm index fa828b161..96e0b5b5f 100644 --- a/data/maps/objects/PokemonTower6F.asm +++ b/data/maps/objects/PokemonTower6F.asm @@ -1,3 +1,10 @@ + object_const_def + const POKEMONTOWER6F_CHANNELER1 + const POKEMONTOWER6F_CHANNELER2 + const POKEMONTOWER6F_CHANNELER3 + const POKEMONTOWER6F_RARE_CANDY + const POKEMONTOWER6F_X_ACCURACY + PokemonTower6F_Object: db $1 ; border block @@ -8,10 +15,10 @@ PokemonTower6F_Object: def_bg_events def_object_events - object_event 12, 10, SPRITE_CHANNELER, STAY, RIGHT, 1, OPP_CHANNELER, 19 - object_event 9, 5, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 20 - object_event 16, 5, SPRITE_CHANNELER, STAY, LEFT, 3, OPP_CHANNELER, 21 - object_event 6, 8, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY - object_event 14, 14, SPRITE_POKE_BALL, STAY, NONE, 5, X_ACCURACY + object_event 12, 10, SPRITE_CHANNELER, STAY, RIGHT, TEXT_POKEMONTOWER6F_CHANNELER1, OPP_CHANNELER, 19 + object_event 9, 5, SPRITE_CHANNELER, STAY, DOWN, TEXT_POKEMONTOWER6F_CHANNELER2, OPP_CHANNELER, 20 + object_event 16, 5, SPRITE_CHANNELER, STAY, LEFT, TEXT_POKEMONTOWER6F_CHANNELER3, OPP_CHANNELER, 21 + object_event 6, 8, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONTOWER6F_RARE_CANDY, RARE_CANDY + object_event 14, 14, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONTOWER6F_X_ACCURACY, X_ACCURACY def_warps_to POKEMON_TOWER_6F diff --git a/data/maps/objects/PokemonTower7F.asm b/data/maps/objects/PokemonTower7F.asm index 328588ed7..9f72f3edd 100644 --- a/data/maps/objects/PokemonTower7F.asm +++ b/data/maps/objects/PokemonTower7F.asm @@ -1,3 +1,9 @@ + object_const_def + const POKEMONTOWER7F_ROCKET1 + const POKEMONTOWER7F_ROCKET2 + const POKEMONTOWER7F_ROCKET3 + const POKEMONTOWER7F_MR_FUJI + PokemonTower7F_Object: db $1 ; border block @@ -7,9 +13,9 @@ PokemonTower7F_Object: def_bg_events def_object_events - object_event 9, 11, SPRITE_ROCKET, STAY, RIGHT, 1, OPP_ROCKET, 19 - object_event 12, 9, SPRITE_ROCKET, STAY, LEFT, 2, OPP_ROCKET, 20 - object_event 9, 7, SPRITE_ROCKET, STAY, RIGHT, 3, OPP_ROCKET, 21 - object_event 10, 3, SPRITE_MR_FUJI, STAY, DOWN, 4 ; person + object_event 9, 11, SPRITE_ROCKET, STAY, RIGHT, TEXT_POKEMONTOWER7F_ROCKET1, OPP_ROCKET, 19 + object_event 12, 9, SPRITE_ROCKET, STAY, LEFT, TEXT_POKEMONTOWER7F_ROCKET2, OPP_ROCKET, 20 + object_event 9, 7, SPRITE_ROCKET, STAY, RIGHT, TEXT_POKEMONTOWER7F_ROCKET3, OPP_ROCKET, 21 + object_event 10, 3, SPRITE_MR_FUJI, STAY, DOWN, TEXT_POKEMONTOWER7F_MR_FUJI def_warps_to POKEMON_TOWER_7F diff --git a/data/maps/objects/PowerPlant.asm b/data/maps/objects/PowerPlant.asm index 419adc01d..df3bca012 100644 --- a/data/maps/objects/PowerPlant.asm +++ b/data/maps/objects/PowerPlant.asm @@ -1,3 +1,19 @@ + object_const_def + const POWERPLANT_VOLTORB1 + const POWERPLANT_VOLTORB2 + const POWERPLANT_VOLTORB3 + const POWERPLANT_ELECTRODE1 + const POWERPLANT_VOLTORB4 + const POWERPLANT_VOLTORB5 + const POWERPLANT_ELECTRODE2 + const POWERPLANT_VOLTORB6 + const POWERPLANT_ZAPDOS + const POWERPLANT_CARBOS + const POWERPLANT_HP_UP + const POWERPLANT_RARE_CANDY + const POWERPLANT_TM_THUNDER + const POWERPLANT_TM_REFLECT + PowerPlant_Object: db $2e ; border block @@ -9,19 +25,19 @@ PowerPlant_Object: def_bg_events def_object_events - object_event 9, 20, SPRITE_POKE_BALL, STAY, NONE, 1, VOLTORB, 40 - object_event 32, 18, SPRITE_POKE_BALL, STAY, NONE, 2, VOLTORB, 40 - object_event 21, 25, SPRITE_POKE_BALL, STAY, NONE, 3, VOLTORB, 40 - object_event 25, 18, SPRITE_POKE_BALL, STAY, NONE, 4, ELECTRODE, 43 - object_event 23, 34, SPRITE_POKE_BALL, STAY, NONE, 5, VOLTORB, 40 - object_event 26, 28, SPRITE_POKE_BALL, STAY, NONE, 6, VOLTORB, 40 - object_event 21, 14, SPRITE_POKE_BALL, STAY, NONE, 7, ELECTRODE, 43 - object_event 37, 32, SPRITE_POKE_BALL, STAY, NONE, 8, VOLTORB, 40 - object_event 4, 9, SPRITE_BIRD, STAY, UP, 9, ZAPDOS, 50 - object_event 7, 25, SPRITE_POKE_BALL, STAY, NONE, 10, CARBOS - object_event 28, 3, SPRITE_POKE_BALL, STAY, NONE, 11, HP_UP - object_event 34, 3, SPRITE_POKE_BALL, STAY, NONE, 12, RARE_CANDY - object_event 26, 32, SPRITE_POKE_BALL, STAY, NONE, 13, TM_THUNDER - object_event 20, 32, SPRITE_POKE_BALL, STAY, NONE, 14, TM_REFLECT + object_event 9, 20, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_VOLTORB1, VOLTORB, 40 + object_event 32, 18, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_VOLTORB2, VOLTORB, 40 + object_event 21, 25, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_VOLTORB3, VOLTORB, 40 + object_event 25, 18, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_ELECTRODE1, ELECTRODE, 43 + object_event 23, 34, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_VOLTORB4, VOLTORB, 40 + object_event 26, 28, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_VOLTORB5, VOLTORB, 40 + object_event 21, 14, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_ELECTRODE2, ELECTRODE, 43 + object_event 37, 32, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_VOLTORB6, VOLTORB, 40 + object_event 4, 9, SPRITE_BIRD, STAY, UP, TEXT_POWERPLANT_ZAPDOS, ZAPDOS, 50 + object_event 7, 25, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_CARBOS, CARBOS + object_event 28, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_HP_UP, HP_UP + object_event 34, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_RARE_CANDY, RARE_CANDY + object_event 26, 32, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_TM_THUNDER, TM_THUNDER + object_event 20, 32, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_TM_REFLECT, TM_REFLECT def_warps_to POWER_PLANT diff --git a/data/maps/objects/RedsHouse1F.asm b/data/maps/objects/RedsHouse1F.asm index c8a2da554..9b259a991 100644 --- a/data/maps/objects/RedsHouse1F.asm +++ b/data/maps/objects/RedsHouse1F.asm @@ -1,3 +1,6 @@ + object_const_def + const REDSHOUSE1F_MOM + RedsHouse1F_Object: db $a ; border block @@ -7,9 +10,9 @@ RedsHouse1F_Object: warp_event 7, 1, REDS_HOUSE_2F, 1 def_bg_events - bg_event 3, 1, 2 ; RedsHouse1FTVText + bg_event 3, 1, TEXT_REDSHOUSE1F_TV def_object_events - object_event 5, 4, SPRITE_MOM, STAY, LEFT, 1 + object_event 5, 4, SPRITE_MOM, STAY, LEFT, TEXT_REDSHOUSE1F_MOM def_warps_to REDS_HOUSE_1F diff --git a/data/maps/objects/RockTunnel1F.asm b/data/maps/objects/RockTunnel1F.asm index 385214a4d..57726be8c 100644 --- a/data/maps/objects/RockTunnel1F.asm +++ b/data/maps/objects/RockTunnel1F.asm @@ -1,3 +1,12 @@ + object_const_def + const ROCKTUNNEL1F_HIKER1 + const ROCKTUNNEL1F_HIKER2 + const ROCKTUNNEL1F_HIKER3 + const ROCKTUNNEL1F_SUPER_NERD + const ROCKTUNNEL1F_COOLTRAINER_F1 + const ROCKTUNNEL1F_COOLTRAINER_F2 + const ROCKTUNNEL1F_COOLTRAINER_F3 + RockTunnel1F_Object: db $3 ; border block @@ -12,15 +21,15 @@ RockTunnel1F_Object: warp_event 37, 17, ROCK_TUNNEL_B1F, 4 def_bg_events - bg_event 11, 29, 8 ; RockTunnel1Text8 + bg_event 11, 29, TEXT_ROCKTUNNEL1F_SIGN def_object_events - object_event 7, 5, SPRITE_HIKER, STAY, DOWN, 1, OPP_HIKER, 12 - object_event 5, 16, SPRITE_HIKER, STAY, DOWN, 2, OPP_HIKER, 13 - object_event 17, 15, SPRITE_HIKER, STAY, LEFT, 3, OPP_HIKER, 14 - object_event 23, 8, SPRITE_SUPER_NERD, STAY, LEFT, 4, OPP_POKEMANIAC, 7 - object_event 37, 21, SPRITE_COOLTRAINER_F, STAY, LEFT, 5, OPP_JR_TRAINER_F, 17 - object_event 22, 24, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_JR_TRAINER_F, 18 - object_event 32, 24, SPRITE_COOLTRAINER_F, STAY, RIGHT, 7, OPP_JR_TRAINER_F, 19 + object_event 7, 5, SPRITE_HIKER, STAY, DOWN, TEXT_ROCKTUNNEL1F_HIKER1, OPP_HIKER, 12 + object_event 5, 16, SPRITE_HIKER, STAY, DOWN, TEXT_ROCKTUNNEL1F_HIKER2, OPP_HIKER, 13 + object_event 17, 15, SPRITE_HIKER, STAY, LEFT, TEXT_ROCKTUNNEL1F_HIKER3, OPP_HIKER, 14 + object_event 23, 8, SPRITE_SUPER_NERD, STAY, LEFT, TEXT_ROCKTUNNEL1F_SUPER_NERD, OPP_POKEMANIAC, 7 + object_event 37, 21, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROCKTUNNEL1F_COOLTRAINER_F1, OPP_JR_TRAINER_F, 17 + object_event 22, 24, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_ROCKTUNNEL1F_COOLTRAINER_F2, OPP_JR_TRAINER_F, 18 + object_event 32, 24, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROCKTUNNEL1F_COOLTRAINER_F3, OPP_JR_TRAINER_F, 19 def_warps_to ROCK_TUNNEL_1F diff --git a/data/maps/objects/RockTunnelB1F.asm b/data/maps/objects/RockTunnelB1F.asm index a34a1a255..c0905cbc2 100644 --- a/data/maps/objects/RockTunnelB1F.asm +++ b/data/maps/objects/RockTunnelB1F.asm @@ -1,3 +1,13 @@ + object_const_def + const ROCKTUNNELB1F_COOLTRAINER_F1 + const ROCKTUNNELB1F_HIKER1 + const ROCKTUNNELB1F_SUPER_NERD1 + const ROCKTUNNELB1F_SUPER_NERD2 + const ROCKTUNNELB1F_HIKER2 + const ROCKTUNNELB1F_COOLTRAINER_F2 + const ROCKTUNNELB1F_HIKER3 + const ROCKTUNNELB1F_SUPER_NERD3 + RockTunnelB1F_Object: db $3 ; border block @@ -10,13 +20,13 @@ RockTunnelB1F_Object: def_bg_events def_object_events - object_event 11, 13, SPRITE_COOLTRAINER_F, STAY, DOWN, 1, OPP_JR_TRAINER_F, 9 - object_event 6, 10, SPRITE_HIKER, STAY, DOWN, 2, OPP_HIKER, 9 - object_event 3, 5, SPRITE_SUPER_NERD, STAY, DOWN, 3, OPP_POKEMANIAC, 3 - object_event 20, 21, SPRITE_SUPER_NERD, STAY, RIGHT, 4, OPP_POKEMANIAC, 4 - object_event 30, 10, SPRITE_HIKER, STAY, DOWN, 5, OPP_HIKER, 10 - object_event 14, 28, SPRITE_COOLTRAINER_F, STAY, RIGHT, 6, OPP_JR_TRAINER_F, 10 - object_event 33, 5, SPRITE_HIKER, STAY, RIGHT, 7, OPP_HIKER, 11 - object_event 26, 30, SPRITE_SUPER_NERD, STAY, DOWN, 8, OPP_POKEMANIAC, 5 + object_event 11, 13, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_ROCKTUNNELB1F_COOLTRAINER_F1, OPP_JR_TRAINER_F, 9 + object_event 6, 10, SPRITE_HIKER, STAY, DOWN, TEXT_ROCKTUNNELB1F_HIKER1, OPP_HIKER, 9 + object_event 3, 5, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_ROCKTUNNELB1F_SUPER_NERD1, OPP_POKEMANIAC, 3 + object_event 20, 21, SPRITE_SUPER_NERD, STAY, RIGHT, TEXT_ROCKTUNNELB1F_SUPER_NERD2, OPP_POKEMANIAC, 4 + object_event 30, 10, SPRITE_HIKER, STAY, DOWN, TEXT_ROCKTUNNELB1F_HIKER2, OPP_HIKER, 10 + object_event 14, 28, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROCKTUNNELB1F_COOLTRAINER_F2, OPP_JR_TRAINER_F, 10 + object_event 33, 5, SPRITE_HIKER, STAY, RIGHT, TEXT_ROCKTUNNELB1F_HIKER3, OPP_HIKER, 11 + object_event 26, 30, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_ROCKTUNNELB1F_SUPER_NERD3, OPP_POKEMANIAC, 5 def_warps_to ROCK_TUNNEL_B1F diff --git a/data/maps/objects/RockTunnelPokecenter.asm b/data/maps/objects/RockTunnelPokecenter.asm index 27c222529..810fea0ba 100644 --- a/data/maps/objects/RockTunnelPokecenter.asm +++ b/data/maps/objects/RockTunnelPokecenter.asm @@ -1,3 +1,9 @@ + object_const_def + const ROCKTUNNELPOKECENTER_NURSE + const ROCKTUNNELPOKECENTER_GENTLEMAN + const ROCKTUNNELPOKECENTER_FISHER + const ROCKTUNNELPOKECENTER_LINK_RECEPTIONIST + RockTunnelPokecenter_Object: db $0 ; border block @@ -8,9 +14,9 @@ RockTunnelPokecenter_Object: def_bg_events def_object_events - object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person - object_event 7, 3, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 2 ; person - object_event 2, 5, SPRITE_FISHER, STAY, NONE, 3 ; person - object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person + object_event 3, 1, SPRITE_NURSE, STAY, DOWN, TEXT_ROCKTUNNELPOKECENTER_NURSE + object_event 7, 3, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, TEXT_ROCKTUNNELPOKECENTER_GENTLEMAN + object_event 2, 5, SPRITE_FISHER, STAY, NONE, TEXT_ROCKTUNNELPOKECENTER_FISHER + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_ROCKTUNNELPOKECENTER_LINK_RECEPTIONIST def_warps_to ROCK_TUNNEL_POKECENTER diff --git a/data/maps/objects/RocketHideoutB1F.asm b/data/maps/objects/RocketHideoutB1F.asm index 25750eb0a..7d7209605 100644 --- a/data/maps/objects/RocketHideoutB1F.asm +++ b/data/maps/objects/RocketHideoutB1F.asm @@ -1,3 +1,12 @@ + object_const_def + const ROCKETHIDEOUTB1F_ROCKET1 + const ROCKETHIDEOUTB1F_ROCKET2 + const ROCKETHIDEOUTB1F_ROCKET3 + const ROCKETHIDEOUTB1F_ROCKET4 + const ROCKETHIDEOUTB1F_ROCKET5 + const ROCKETHIDEOUTB1F_ESCAPE_ROPE + const ROCKETHIDEOUTB1F_HYPER_POTION + RocketHideoutB1F_Object: db $2e ; border block @@ -11,12 +20,12 @@ RocketHideoutB1F_Object: def_bg_events def_object_events - object_event 26, 8, SPRITE_ROCKET, STAY, LEFT, 1, OPP_ROCKET, 8 - object_event 12, 6, SPRITE_ROCKET, STAY, RIGHT, 2, OPP_ROCKET, 9 - object_event 18, 17, SPRITE_ROCKET, STAY, DOWN, 3, OPP_ROCKET, 10 - object_event 15, 25, SPRITE_ROCKET, STAY, RIGHT, 4, OPP_ROCKET, 11 - object_event 28, 18, SPRITE_ROCKET, STAY, LEFT, 5, OPP_ROCKET, 12 - object_event 11, 14, SPRITE_POKE_BALL, STAY, NONE, 6, ESCAPE_ROPE - object_event 9, 17, SPRITE_POKE_BALL, STAY, NONE, 7, HYPER_POTION + object_event 26, 8, SPRITE_ROCKET, STAY, LEFT, TEXT_ROCKETHIDEOUTB1F_ROCKET1, OPP_ROCKET, 8 + object_event 12, 6, SPRITE_ROCKET, STAY, RIGHT, TEXT_ROCKETHIDEOUTB1F_ROCKET2, OPP_ROCKET, 9 + object_event 18, 17, SPRITE_ROCKET, STAY, DOWN, TEXT_ROCKETHIDEOUTB1F_ROCKET3, OPP_ROCKET, 10 + object_event 15, 25, SPRITE_ROCKET, STAY, RIGHT, TEXT_ROCKETHIDEOUTB1F_ROCKET4, OPP_ROCKET, 11 + object_event 28, 18, SPRITE_ROCKET, STAY, LEFT, TEXT_ROCKETHIDEOUTB1F_ROCKET5, OPP_ROCKET, 12 + object_event 11, 14, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB1F_ESCAPE_ROPE, ESCAPE_ROPE + object_event 9, 17, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB1F_HYPER_POTION, HYPER_POTION def_warps_to ROCKET_HIDEOUT_B1F diff --git a/data/maps/objects/RocketHideoutB2F.asm b/data/maps/objects/RocketHideoutB2F.asm index e118fb589..9808f58b1 100644 --- a/data/maps/objects/RocketHideoutB2F.asm +++ b/data/maps/objects/RocketHideoutB2F.asm @@ -1,3 +1,10 @@ + object_const_def + const ROCKETHIDEOUTB2F_ROCKET + const ROCKETHIDEOUTB2F_MOON_STONE + const ROCKETHIDEOUTB2F_NUGGET + const ROCKETHIDEOUTB2F_TM_HORN_DRILL + const ROCKETHIDEOUTB2F_SUPER_POTION + RocketHideoutB2F_Object: db $2e ; border block @@ -11,10 +18,10 @@ RocketHideoutB2F_Object: def_bg_events def_object_events - object_event 20, 12, SPRITE_ROCKET, STAY, DOWN, 1, OPP_ROCKET, 13 - object_event 1, 11, SPRITE_POKE_BALL, STAY, NONE, 2, MOON_STONE - object_event 16, 8, SPRITE_POKE_BALL, STAY, NONE, 3, NUGGET - object_event 6, 12, SPRITE_POKE_BALL, STAY, NONE, 4, TM_HORN_DRILL - object_event 3, 21, SPRITE_POKE_BALL, STAY, NONE, 5, SUPER_POTION + object_event 20, 12, SPRITE_ROCKET, STAY, DOWN, TEXT_ROCKETHIDEOUTB2F_ROCKET, OPP_ROCKET, 13 + object_event 1, 11, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB2F_MOON_STONE, MOON_STONE + object_event 16, 8, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB2F_NUGGET, NUGGET + object_event 6, 12, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB2F_TM_HORN_DRILL, TM_HORN_DRILL + object_event 3, 21, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB2F_SUPER_POTION, SUPER_POTION def_warps_to ROCKET_HIDEOUT_B2F diff --git a/data/maps/objects/RocketHideoutB3F.asm b/data/maps/objects/RocketHideoutB3F.asm index b679f87cb..ee02d8094 100644 --- a/data/maps/objects/RocketHideoutB3F.asm +++ b/data/maps/objects/RocketHideoutB3F.asm @@ -1,3 +1,9 @@ + object_const_def + const ROCKETHIDEOUTB3F_ROCKET1 + const ROCKETHIDEOUTB3F_ROCKET2 + const ROCKETHIDEOUTB3F_TM_DOUBLE_EDGE + const ROCKETHIDEOUTB3F_RARE_CANDY + RocketHideoutB3F_Object: db $2e ; border block @@ -8,9 +14,9 @@ RocketHideoutB3F_Object: def_bg_events def_object_events - object_event 10, 22, SPRITE_ROCKET, STAY, RIGHT, 1, OPP_ROCKET, 14 - object_event 26, 12, SPRITE_ROCKET, STAY, UP, 2, OPP_ROCKET, 15 - object_event 26, 17, SPRITE_POKE_BALL, STAY, NONE, 3, TM_DOUBLE_EDGE - object_event 20, 14, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY + object_event 10, 22, SPRITE_ROCKET, STAY, RIGHT, TEXT_ROCKETHIDEOUTB3F_ROCKET1, OPP_ROCKET, 14 + object_event 26, 12, SPRITE_ROCKET, STAY, UP, TEXT_ROCKETHIDEOUTB3F_ROCKET2, OPP_ROCKET, 15 + object_event 26, 17, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB3F_TM_DOUBLE_EDGE, TM_DOUBLE_EDGE + object_event 20, 14, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB3F_RARE_CANDY, RARE_CANDY def_warps_to ROCKET_HIDEOUT_B3F diff --git a/data/maps/objects/RocketHideoutB4F.asm b/data/maps/objects/RocketHideoutB4F.asm index ecae529cc..939b5c934 100644 --- a/data/maps/objects/RocketHideoutB4F.asm +++ b/data/maps/objects/RocketHideoutB4F.asm @@ -1,3 +1,14 @@ + object_const_def + const ROCKETHIDEOUTB4F_GIOVANNI + const ROCKETHIDEOUTB4F_ROCKET1 + const ROCKETHIDEOUTB4F_ROCKET2 + const ROCKETHIDEOUTB4F_ROCKET3 + const ROCKETHIDEOUTB4F_HP_UP + const ROCKETHIDEOUTB4F_TM_RAZOR_WIND + const ROCKETHIDEOUTB4F_IRON + const ROCKETHIDEOUTB4F_SLIPH_SCOPE + const ROCKETHIDEOUTB4F_LIFT_KEY + RocketHideoutB4F_Object: db $2e ; border block @@ -9,14 +20,14 @@ RocketHideoutB4F_Object: def_bg_events def_object_events - object_event 25, 3, SPRITE_GIOVANNI, STAY, DOWN, 1, OPP_GIOVANNI, 1 - object_event 23, 12, SPRITE_ROCKET, STAY, DOWN, 2, OPP_ROCKET, 16 - object_event 26, 12, SPRITE_ROCKET, STAY, DOWN, 3, OPP_ROCKET, 17 - object_event 11, 2, SPRITE_ROCKET, STAY, DOWN, 4, OPP_ROCKET, 18 - object_event 10, 12, SPRITE_POKE_BALL, STAY, NONE, 5, HP_UP - object_event 9, 4, SPRITE_POKE_BALL, STAY, NONE, 6, TM_RAZOR_WIND - object_event 12, 20, SPRITE_POKE_BALL, STAY, NONE, 7, IRON - object_event 25, 2, SPRITE_POKE_BALL, STAY, NONE, 8, SILPH_SCOPE - object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 9, LIFT_KEY + object_event 25, 3, SPRITE_GIOVANNI, STAY, DOWN, TEXT_ROCKETHIDEOUTB4F_GIOVANNI, OPP_GIOVANNI, 1 + object_event 23, 12, SPRITE_ROCKET, STAY, DOWN, TEXT_ROCKETHIDEOUTB4F_ROCKET1, OPP_ROCKET, 16 + object_event 26, 12, SPRITE_ROCKET, STAY, DOWN, TEXT_ROCKETHIDEOUTB4F_ROCKET2, OPP_ROCKET, 17 + object_event 11, 2, SPRITE_ROCKET, STAY, DOWN, TEXT_ROCKETHIDEOUTB4F_ROCKET3, OPP_ROCKET, 18 + object_event 10, 12, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB4F_HP_UP, HP_UP + object_event 9, 4, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB4F_TM_RAZOR_WIND, TM_RAZOR_WIND + object_event 12, 20, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB4F_IRON, IRON + object_event 25, 2, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB4F_SILPH_SCOPE, SILPH_SCOPE + object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB4F_LIFT_KEY, LIFT_KEY def_warps_to ROCKET_HIDEOUT_B4F diff --git a/data/maps/objects/RocketHideoutElevator.asm b/data/maps/objects/RocketHideoutElevator.asm index d31ec51be..92255d886 100644 --- a/data/maps/objects/RocketHideoutElevator.asm +++ b/data/maps/objects/RocketHideoutElevator.asm @@ -6,7 +6,7 @@ RocketHideoutElevator_Object: warp_event 3, 1, ROCKET_HIDEOUT_B1F, 5 def_bg_events - bg_event 1, 1, 1 ; RocketHideoutElevatorText1 + bg_event 1, 1, TEXT_ROCKETHIDEOUTELEVATOR def_object_events diff --git a/data/maps/objects/Route1.asm b/data/maps/objects/Route1.asm index b4ae442cd..bb6bcf630 100644 --- a/data/maps/objects/Route1.asm +++ b/data/maps/objects/Route1.asm @@ -1,14 +1,18 @@ + object_const_def + const ROUTE1_YOUNGSTER1 + const ROUTE1_YOUNGSTER2 + Route1_Object: db $b ; border block def_warp_events def_bg_events - bg_event 9, 27, 3 ; Route1Text3 + bg_event 9, 27, TEXT_ROUTE1_SIGN def_object_events - object_event 5, 24, SPRITE_YOUNGSTER, WALK, UP_DOWN, 1 ; person - object_event 15, 13, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 2 ; person + object_event 5, 24, SPRITE_YOUNGSTER, WALK, UP_DOWN, TEXT_ROUTE1_YOUNGSTER1 + object_event 15, 13, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, TEXT_ROUTE1_YOUNGSTER2 def_warps_to ROUTE_1 diff --git a/data/maps/objects/Route10.asm b/data/maps/objects/Route10.asm index 01eae9cfe..031ae5217 100644 --- a/data/maps/objects/Route10.asm +++ b/data/maps/objects/Route10.asm @@ -1,3 +1,11 @@ + object_const_def + const ROUTE10_SUPER_NERD1 + const ROUTE10_HIKER1 + const ROUTE10_SUPER_NERD2 + const ROUTE10_COOLTRAINER_F1 + const ROUTE10_HIKER2 + const ROUTE10_COOLTRAINER_F2 + Route10_Object: db $2c ; border block @@ -8,17 +16,17 @@ Route10_Object: warp_event 6, 39, POWER_PLANT, 1 def_bg_events - bg_event 7, 19, 7 ; Route10Text7 - bg_event 12, 19, 8 ; PokeCenterSignText - bg_event 9, 55, 9 ; Route10Text9 - bg_event 5, 41, 10 ; Route10Text10 + bg_event 7, 19, TEXT_ROUTE10_ROCKTUNNEL_NORTH_SIGN + bg_event 12, 19, TEXT_ROUTE10_POKECENTER_SIGN + bg_event 9, 55, TEXT_ROUTE10_ROCKTUNNEL_SOUTH_SIGN + bg_event 5, 41, TEXT_ROUTE10_POWERPLANT_SIGN def_object_events - object_event 10, 44, SPRITE_SUPER_NERD, STAY, LEFT, 1, OPP_POKEMANIAC, 1 - object_event 3, 57, SPRITE_HIKER, STAY, UP, 2, OPP_HIKER, 7 - object_event 14, 64, SPRITE_SUPER_NERD, STAY, LEFT, 3, OPP_POKEMANIAC, 2 - object_event 7, 25, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_JR_TRAINER_F, 7 - object_event 3, 61, SPRITE_HIKER, STAY, DOWN, 5, OPP_HIKER, 8 - object_event 7, 54, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_JR_TRAINER_F, 8 + object_event 10, 44, SPRITE_SUPER_NERD, STAY, LEFT, TEXT_ROUTE10_SUPER_NERD1, OPP_POKEMANIAC, 1 + object_event 3, 57, SPRITE_HIKER, STAY, UP, TEXT_ROUTE10_HIKER1, OPP_HIKER, 7 + object_event 14, 64, SPRITE_SUPER_NERD, STAY, LEFT, TEXT_ROUTE10_SUPER_NERD2, OPP_POKEMANIAC, 2 + object_event 7, 25, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE10_COOLTRAINER_F1, OPP_JR_TRAINER_F, 7 + object_event 3, 61, SPRITE_HIKER, STAY, DOWN, TEXT_ROUTE10_HIKER2, OPP_HIKER, 8 + object_event 7, 54, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_ROUTE10_COOLTRAINER_F2, OPP_JR_TRAINER_F, 8 def_warps_to ROUTE_10 diff --git a/data/maps/objects/Route11.asm b/data/maps/objects/Route11.asm index 6238a067b..264872160 100644 --- a/data/maps/objects/Route11.asm +++ b/data/maps/objects/Route11.asm @@ -1,3 +1,15 @@ + object_const_def + const ROUTE11_GAMBLER1 + const ROUTE11_GAMBLER2 + const ROUTE11_YOUNGSTER1 + const ROUTE11_SUPER_NERD1 + const ROUTE11_YOUNGSTER2 + const ROUTE11_GAMBLER3 + const ROUTE11_GAMBLER4 + const ROUTE11_YOUNGSTER3 + const ROUTE11_SUPER_NERD2 + const ROUTE11_YOUNGSTER4 + Route11_Object: db $f ; border block @@ -9,18 +21,18 @@ Route11_Object: warp_event 4, 5, DIGLETTS_CAVE_ROUTE_11, 1 def_bg_events - bg_event 1, 5, 11 ; Route11Text11 + bg_event 1, 5, TEXT_ROUTE11_DIGLETTSCAVE_SIGN def_object_events - object_event 10, 14, SPRITE_GAMBLER, STAY, DOWN, 1, OPP_GAMBLER, 1 - object_event 26, 9, SPRITE_GAMBLER, STAY, DOWN, 2, OPP_GAMBLER, 2 - object_event 13, 5, SPRITE_YOUNGSTER, STAY, LEFT, 3, OPP_YOUNGSTER, 9 - object_event 36, 11, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_ENGINEER, 2 - object_event 22, 4, SPRITE_YOUNGSTER, STAY, UP, 5, OPP_YOUNGSTER, 10 - object_event 45, 7, SPRITE_GAMBLER, STAY, DOWN, 6, OPP_GAMBLER, 3 - object_event 33, 3, SPRITE_GAMBLER, STAY, UP, 7, OPP_GAMBLER, 4 - object_event 43, 5, SPRITE_YOUNGSTER, STAY, RIGHT, 8, OPP_YOUNGSTER, 11 - object_event 45, 16, SPRITE_SUPER_NERD, STAY, LEFT, 9, OPP_ENGINEER, 3 - object_event 22, 12, SPRITE_YOUNGSTER, STAY, UP, 10, OPP_YOUNGSTER, 12 + object_event 10, 14, SPRITE_GAMBLER, STAY, DOWN, TEXT_ROUTE11_GAMBLER1, OPP_GAMBLER, 1 + object_event 26, 9, SPRITE_GAMBLER, STAY, DOWN, TEXT_ROUTE11_GAMBLER2, OPP_GAMBLER, 2 + object_event 13, 5, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE11_YOUNGSTER1, OPP_YOUNGSTER, 9 + object_event 36, 11, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_ROUTE11_SUPER_NERD1, OPP_ENGINEER, 2 + object_event 22, 4, SPRITE_YOUNGSTER, STAY, UP, TEXT_ROUTE11_YOUNGSTER2, OPP_YOUNGSTER, 10 + object_event 45, 7, SPRITE_GAMBLER, STAY, DOWN, TEXT_ROUTE11_GAMBLER3, OPP_GAMBLER, 3 + object_event 33, 3, SPRITE_GAMBLER, STAY, UP, TEXT_ROUTE11_GAMBLER4, OPP_GAMBLER, 4 + object_event 43, 5, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE11_YOUNGSTER3, OPP_YOUNGSTER, 11 + object_event 45, 16, SPRITE_SUPER_NERD, STAY, LEFT, TEXT_ROUTE11_SUPER_NERD2, OPP_ENGINEER, 3 + object_event 22, 12, SPRITE_YOUNGSTER, STAY, UP, TEXT_ROUTE11_YOUNGSTER4, OPP_YOUNGSTER, 12 def_warps_to ROUTE_11 diff --git a/data/maps/objects/Route11Gate1F.asm b/data/maps/objects/Route11Gate1F.asm index ea40cc90d..56d2e7f7f 100644 --- a/data/maps/objects/Route11Gate1F.asm +++ b/data/maps/objects/Route11Gate1F.asm @@ -1,3 +1,6 @@ + object_const_def + const ROUTE11GATE1F_GUARD + Route11Gate1F_Object: db $a ; border block @@ -11,6 +14,6 @@ Route11Gate1F_Object: def_bg_events def_object_events - object_event 4, 1, SPRITE_GUARD, STAY, NONE, 1 ; person + object_event 4, 1, SPRITE_GUARD, STAY, NONE, TEXT_ROUTE11GATE1F_GUARD def_warps_to ROUTE_11_GATE_1F diff --git a/data/maps/objects/Route11Gate2F.asm b/data/maps/objects/Route11Gate2F.asm index ad257fbbe..7e76288ae 100644 --- a/data/maps/objects/Route11Gate2F.asm +++ b/data/maps/objects/Route11Gate2F.asm @@ -1,3 +1,7 @@ + object_const_def + const ROUTE11GATE2F_YOUNGSTER + const ROUTE11GATE2F_OAKS_AIDE + Route11Gate2F_Object: db $a ; border block @@ -5,11 +9,11 @@ Route11Gate2F_Object: warp_event 7, 7, ROUTE_11_GATE_1F, 5 def_bg_events - bg_event 1, 2, 3 ; Route11GateUpstairsText3 - bg_event 6, 2, 4 ; Route11GateUpstairsText4 + bg_event 1, 2, TEXT_ROUTE11GATE2F_LEFT_BINOCULARS + bg_event 6, 2, TEXT_ROUTE11GATE2F_RIGHT_BINOCULARS def_object_events - object_event 4, 2, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person - object_event 2, 6, SPRITE_SCIENTIST, STAY, NONE, 2 ; person + object_event 4, 2, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, TEXT_ROUTE11GATE2F_YOUNGSTER + object_event 2, 6, SPRITE_SCIENTIST, STAY, NONE, TEXT_ROUTE11GATE2F_OAKS_AIDE def_warps_to ROUTE_11_GATE_2F diff --git a/data/maps/objects/Route12.asm b/data/maps/objects/Route12.asm index e7fc92f16..4884a6f92 100644 --- a/data/maps/objects/Route12.asm +++ b/data/maps/objects/Route12.asm @@ -1,3 +1,15 @@ + object_const_def + const ROUTE12_SNORLAX + const ROUTE12_FISHER1 + const ROUTE12_FISHER2 + const ROUTE12_COOLTRAINER_M + const ROUTE12_SUPER_NERD + const ROUTE12_FISHER3 + const ROUTE12_FISHER4 + const ROUTE12_FISHER5 + const ROUTE12_TM_PAY_DAY + const ROUTE12_IRON + Route12_Object: db $43 ; border block @@ -8,19 +20,19 @@ Route12_Object: warp_event 11, 77, ROUTE_12_SUPER_ROD_HOUSE, 1 def_bg_events - bg_event 13, 13, 11 ; Route12Text11 - bg_event 11, 63, 12 ; Route12Text12 + bg_event 13, 13, TEXT_ROUTE12_SIGN + bg_event 11, 63, TEXT_ROUTE12_SPORT_FISHING_SIGN def_object_events - object_event 10, 62, SPRITE_SNORLAX, STAY, DOWN, 1 ; person - object_event 14, 31, SPRITE_FISHER, STAY, LEFT, 2, OPP_FISHER, 3 - object_event 5, 39, SPRITE_FISHER, STAY, UP, 3, OPP_FISHER, 4 - object_event 11, 92, SPRITE_COOLTRAINER_M, STAY, LEFT, 4, OPP_JR_TRAINER_M, 9 - object_event 14, 76, SPRITE_SUPER_NERD, STAY, UP, 5, OPP_ROCKER, 2 - object_event 12, 40, SPRITE_FISHER, STAY, LEFT, 6, OPP_FISHER, 5 - object_event 9, 52, SPRITE_FISHER, STAY, RIGHT, 7, OPP_FISHER, 6 - object_event 6, 87, SPRITE_FISHER, STAY, DOWN, 8, OPP_FISHER, 11 - object_event 14, 35, SPRITE_POKE_BALL, STAY, NONE, 9, TM_PAY_DAY - object_event 5, 89, SPRITE_POKE_BALL, STAY, NONE, 10, IRON + object_event 10, 62, SPRITE_SNORLAX, STAY, DOWN, TEXT_ROUTE12_SNORLAX + object_event 14, 31, SPRITE_FISHER, STAY, LEFT, TEXT_ROUTE12_FISHER1, OPP_FISHER, 3 + object_event 5, 39, SPRITE_FISHER, STAY, UP, TEXT_ROUTE12_FISHER2, OPP_FISHER, 4 + object_event 11, 92, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE12_COOLTRAINER_M, OPP_JR_TRAINER_M, 9 + object_event 14, 76, SPRITE_SUPER_NERD, STAY, UP, TEXT_ROUTE12_SUPER_NERD, OPP_ROCKER, 2 + object_event 12, 40, SPRITE_FISHER, STAY, LEFT, TEXT_ROUTE12_FISHER3, OPP_FISHER, 5 + object_event 9, 52, SPRITE_FISHER, STAY, RIGHT, TEXT_ROUTE12_FISHER4, OPP_FISHER, 6 + object_event 6, 87, SPRITE_FISHER, STAY, DOWN, TEXT_ROUTE12_FISHER5, OPP_FISHER, 11 + object_event 14, 35, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE12_TM_PAY_DAY, TM_PAY_DAY + object_event 5, 89, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE12_IRON, IRON def_warps_to ROUTE_12 diff --git a/data/maps/objects/Route12Gate1F.asm b/data/maps/objects/Route12Gate1F.asm index 67cd4a25c..eef1a37d1 100644 --- a/data/maps/objects/Route12Gate1F.asm +++ b/data/maps/objects/Route12Gate1F.asm @@ -1,3 +1,6 @@ + object_const_def + const ROUTE12GATE1F_GUARD + Route12Gate1F_Object: db $a ; border block @@ -11,6 +14,6 @@ Route12Gate1F_Object: def_bg_events def_object_events - object_event 1, 3, SPRITE_GUARD, STAY, NONE, 1 ; person + object_event 1, 3, SPRITE_GUARD, STAY, NONE, TEXT_ROUTE12GATE1F_GUARD def_warps_to ROUTE_12_GATE_1F diff --git a/data/maps/objects/Route12Gate2F.asm b/data/maps/objects/Route12Gate2F.asm index 13501b5c2..a3fc5c80f 100644 --- a/data/maps/objects/Route12Gate2F.asm +++ b/data/maps/objects/Route12Gate2F.asm @@ -1,3 +1,6 @@ + object_const_def + const ROUTE12GATE2F_BRUNETTE_GIRL + Route12Gate2F_Object: db $a ; border block @@ -5,10 +8,10 @@ Route12Gate2F_Object: warp_event 7, 7, ROUTE_12_GATE_1F, 5 def_bg_events - bg_event 1, 2, 2 ; Route12GateUpstairsText2 - bg_event 6, 2, 3 ; Route12GateUpstairsText3 + bg_event 1, 2, TEXT_ROUTE12GATE2F_LEFT_BINOCULARS + bg_event 6, 2, TEXT_ROUTE12GATE2F_RIGHT_BINOCULARS def_object_events - object_event 3, 4, SPRITE_BRUNETTE_GIRL, WALK, UP_DOWN, 1 ; person + object_event 3, 4, SPRITE_BRUNETTE_GIRL, WALK, UP_DOWN, TEXT_ROUTE12GATE2F_BRUNETTE_GIRL def_warps_to ROUTE_12_GATE_2F diff --git a/data/maps/objects/Route12SuperRodHouse.asm b/data/maps/objects/Route12SuperRodHouse.asm index 14b7747a4..b9899c675 100644 --- a/data/maps/objects/Route12SuperRodHouse.asm +++ b/data/maps/objects/Route12SuperRodHouse.asm @@ -1,3 +1,6 @@ + object_const_def + const ROUTE12SUPERRODHOUSE_FISHING_GURU + Route12SuperRodHouse_Object: db $a ; border block @@ -8,6 +11,6 @@ Route12SuperRodHouse_Object: def_bg_events def_object_events - object_event 2, 4, SPRITE_FISHING_GURU, STAY, RIGHT, 1 ; person + object_event 2, 4, SPRITE_FISHING_GURU, STAY, RIGHT, TEXT_ROUTE12SUPERRODHOUSE_FISHING_GURU def_warps_to ROUTE_12_SUPER_ROD_HOUSE diff --git a/data/maps/objects/Route13.asm b/data/maps/objects/Route13.asm index a33975730..ef9d12761 100644 --- a/data/maps/objects/Route13.asm +++ b/data/maps/objects/Route13.asm @@ -1,23 +1,35 @@ + object_const_def + const ROUTE13_COOLTRAINER_M1 + const ROUTE13_COOLTRAINER_F1 + const ROUTE13_COOLTRAINER_F2 + const ROUTE13_COOLTRAINER_F3 + const ROUTE13_COOLTRAINER_F4 + const ROUTE13_COOLTRAINER_M2 + const ROUTE13_BEAUTY1 + const ROUTE13_BEAUTY2 + const ROUTE13_BIKER + const ROUTE13_COOLTRAINER_M3 + Route13_Object: db $43 ; border block def_warp_events def_bg_events - bg_event 15, 13, 11 ; Route13Text11 - bg_event 33, 5, 12 ; Route13Text12 - bg_event 31, 11, 13 ; Route13Text13 + bg_event 15, 13, TEXT_ROUTE13_TRAINER_TIPS1 + bg_event 33, 5, TEXT_ROUTE13_TRAINER_TIPS2 + bg_event 31, 11, TEXT_ROUTE13_SIGN def_object_events - object_event 49, 10, SPRITE_COOLTRAINER_M, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 1 - object_event 48, 10, SPRITE_COOLTRAINER_F, STAY, DOWN, 2, OPP_JR_TRAINER_F, 12 - object_event 27, 9, SPRITE_COOLTRAINER_F, STAY, DOWN, 3, OPP_JR_TRAINER_F, 13 - object_event 23, 10, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_JR_TRAINER_F, 14 - object_event 50, 5, SPRITE_COOLTRAINER_F, STAY, DOWN, 5, OPP_JR_TRAINER_F, 15 - object_event 12, 4, SPRITE_COOLTRAINER_M, STAY, RIGHT, 6, OPP_BIRD_KEEPER, 2 - object_event 33, 6, SPRITE_BEAUTY, STAY, DOWN, 7, OPP_BEAUTY, 4 - object_event 32, 6, SPRITE_BEAUTY, STAY, DOWN, 8, OPP_BEAUTY, 5 - object_event 10, 7, SPRITE_BIKER, STAY, UP, 9, OPP_BIKER, 1 - object_event 7, 13, SPRITE_COOLTRAINER_M, STAY, UP, 10, OPP_BIRD_KEEPER, 3 + object_event 49, 10, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_ROUTE13_COOLTRAINER_M1, OPP_BIRD_KEEPER, 1 + object_event 48, 10, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_ROUTE13_COOLTRAINER_F1, OPP_JR_TRAINER_F, 12 + object_event 27, 9, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_ROUTE13_COOLTRAINER_F2, OPP_JR_TRAINER_F, 13 + object_event 23, 10, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE13_COOLTRAINER_F3, OPP_JR_TRAINER_F, 14 + object_event 50, 5, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_ROUTE13_COOLTRAINER_F4, OPP_JR_TRAINER_F, 15 + object_event 12, 4, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_ROUTE13_COOLTRAINER_M2, OPP_BIRD_KEEPER, 2 + object_event 33, 6, SPRITE_BEAUTY, STAY, DOWN, TEXT_ROUTE13_BEAUTY1, OPP_BEAUTY, 4 + object_event 32, 6, SPRITE_BEAUTY, STAY, DOWN, TEXT_ROUTE13_BEAUTY2, OPP_BEAUTY, 5 + object_event 10, 7, SPRITE_BIKER, STAY, UP, TEXT_ROUTE13_BIKER, OPP_BIKER, 1 + object_event 7, 13, SPRITE_COOLTRAINER_M, STAY, UP, TEXT_ROUTE13_COOLTRAINER_M3, OPP_BIRD_KEEPER, 3 def_warps_to ROUTE_13 diff --git a/data/maps/objects/Route14.asm b/data/maps/objects/Route14.asm index b92446466..0ca3a40a7 100644 --- a/data/maps/objects/Route14.asm +++ b/data/maps/objects/Route14.asm @@ -1,21 +1,33 @@ + object_const_def + const ROUTE14_COOLTRAINER_M1 + const ROUTE14_COOLTRAINER_M2 + const ROUTE14_COOLTRAINER_M3 + const ROUTE14_COOLTRAINER_M4 + const ROUTE14_COOLTRAINER_M5 + const ROUTE14_COOLTRAINER_M6 + const ROUTE14_BIKER1 + const ROUTE14_BIKER2 + const ROUTE14_BIKER3 + const ROUTE14_BIKER4 + Route14_Object: db $43 ; border block def_warp_events def_bg_events - bg_event 17, 13, 11 ; Route14Text11 + bg_event 17, 13, TEXT_ROUTE14_SIGN def_object_events - object_event 4, 4, SPRITE_COOLTRAINER_M, STAY, DOWN, 1, OPP_BIRD_KEEPER, 14 - object_event 15, 6, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_BIRD_KEEPER, 15 - object_event 12, 11, SPRITE_COOLTRAINER_M, STAY, DOWN, 3, OPP_BIRD_KEEPER, 16 - object_event 14, 15, SPRITE_COOLTRAINER_M, STAY, UP, 4, OPP_BIRD_KEEPER, 17 - object_event 15, 31, SPRITE_COOLTRAINER_M, STAY, LEFT, 5, OPP_BIRD_KEEPER, 4 - object_event 6, 49, SPRITE_COOLTRAINER_M, STAY, UP, 6, OPP_BIRD_KEEPER, 5 - object_event 5, 39, SPRITE_BIKER, STAY, DOWN, 7, OPP_BIKER, 13 - object_event 4, 30, SPRITE_BIKER, STAY, RIGHT, 8, OPP_BIKER, 14 - object_event 15, 30, SPRITE_BIKER, STAY, LEFT, 9, OPP_BIKER, 15 - object_event 4, 31, SPRITE_BIKER, STAY, RIGHT, 10, OPP_BIKER, 2 + object_event 4, 4, SPRITE_COOLTRAINER_M, STAY, DOWN, TEXT_ROUTE14_COOLTRAINER_M1, OPP_BIRD_KEEPER, 14 + object_event 15, 6, SPRITE_COOLTRAINER_M, STAY, DOWN, TEXT_ROUTE14_COOLTRAINER_M2, OPP_BIRD_KEEPER, 15 + object_event 12, 11, SPRITE_COOLTRAINER_M, STAY, DOWN, TEXT_ROUTE14_COOLTRAINER_M3, OPP_BIRD_KEEPER, 16 + object_event 14, 15, SPRITE_COOLTRAINER_M, STAY, UP, TEXT_ROUTE14_COOLTRAINER_M4, OPP_BIRD_KEEPER, 17 + object_event 15, 31, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE14_COOLTRAINER_M5, OPP_BIRD_KEEPER, 4 + object_event 6, 49, SPRITE_COOLTRAINER_M, STAY, UP, TEXT_ROUTE14_COOLTRAINER_M6, OPP_BIRD_KEEPER, 5 + object_event 5, 39, SPRITE_BIKER, STAY, DOWN, TEXT_ROUTE14_BIKER1, OPP_BIKER, 13 + object_event 4, 30, SPRITE_BIKER, STAY, RIGHT, TEXT_ROUTE14_BIKER2, OPP_BIKER, 14 + object_event 15, 30, SPRITE_BIKER, STAY, LEFT, TEXT_ROUTE14_BIKER3, OPP_BIKER, 15 + object_event 4, 31, SPRITE_BIKER, STAY, RIGHT, TEXT_ROUTE14_BIKER4, OPP_BIKER, 2 def_warps_to ROUTE_14 diff --git a/data/maps/objects/Route15.asm b/data/maps/objects/Route15.asm index 93a74966c..d04c305c2 100644 --- a/data/maps/objects/Route15.asm +++ b/data/maps/objects/Route15.asm @@ -1,3 +1,16 @@ + object_const_def + const ROUTE15_COOLTRAINER_F1 + const ROUTE15_COOLTRAINER_F2 + const ROUTE15_COOLTRAINER_M1 + const ROUTE15_COOLTRAINER_M2 + const ROUTE15_BEAUTY1 + const ROUTE15_BEAUTY2 + const ROUTE15_BIKER1 + const ROUTE15_BIKER2 + const ROUTE15_COOLTRAINER_F3 + const ROUTE15_COOLTRAINER_F4 + const ROUTE15_TM_RAGE + Route15_Object: db $43 ; border block @@ -8,19 +21,19 @@ Route15_Object: warp_event 14, 9, ROUTE_15_GATE_1F, 4 def_bg_events - bg_event 39, 9, 12 ; Route15Text12 + bg_event 39, 9, TEXT_ROUTE15_SIGN def_object_events - object_event 41, 11, SPRITE_COOLTRAINER_F, STAY, DOWN, 1, OPP_JR_TRAINER_F, 20 - object_event 53, 10, SPRITE_COOLTRAINER_F, STAY, LEFT, 2, OPP_JR_TRAINER_F, 21 - object_event 31, 13, SPRITE_COOLTRAINER_M, STAY, UP, 3, OPP_BIRD_KEEPER, 6 - object_event 35, 13, SPRITE_COOLTRAINER_M, STAY, UP, 4, OPP_BIRD_KEEPER, 7 - object_event 53, 11, SPRITE_BEAUTY, STAY, DOWN, 5, OPP_BEAUTY, 9 - object_event 41, 10, SPRITE_BEAUTY, STAY, RIGHT, 6, OPP_BEAUTY, 10 - object_event 48, 10, SPRITE_BIKER, STAY, DOWN, 7, OPP_BIKER, 3 - object_event 46, 10, SPRITE_BIKER, STAY, DOWN, 8, OPP_BIKER, 4 - object_event 37, 5, SPRITE_COOLTRAINER_F, STAY, RIGHT, 9, OPP_JR_TRAINER_F, 22 - object_event 18, 13, SPRITE_COOLTRAINER_F, STAY, UP, 10, OPP_JR_TRAINER_F, 23 - object_event 18, 5, SPRITE_POKE_BALL, STAY, NONE, 11, TM_RAGE + object_event 41, 11, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_ROUTE15_COOLTRAINER_F1, OPP_JR_TRAINER_F, 20 + object_event 53, 10, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE15_COOLTRAINER_F2, OPP_JR_TRAINER_F, 21 + object_event 31, 13, SPRITE_COOLTRAINER_M, STAY, UP, TEXT_ROUTE15_COOLTRAINER_M1, OPP_BIRD_KEEPER, 6 + object_event 35, 13, SPRITE_COOLTRAINER_M, STAY, UP, TEXT_ROUTE15_COOLTRAINER_M2, OPP_BIRD_KEEPER, 7 + object_event 53, 11, SPRITE_BEAUTY, STAY, DOWN, TEXT_ROUTE15_BEAUTY1, OPP_BEAUTY, 9 + object_event 41, 10, SPRITE_BEAUTY, STAY, RIGHT, TEXT_ROUTE15_BEAUTY2, OPP_BEAUTY, 10 + object_event 48, 10, SPRITE_BIKER, STAY, DOWN, TEXT_ROUTE15_BIKER1, OPP_BIKER, 3 + object_event 46, 10, SPRITE_BIKER, STAY, DOWN, TEXT_ROUTE15_BIKER2, OPP_BIKER, 4 + object_event 37, 5, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE15_COOLTRAINER_F3, OPP_JR_TRAINER_F, 22 + object_event 18, 13, SPRITE_COOLTRAINER_F, STAY, UP, TEXT_ROUTE15_COOLTRAINER_F4, OPP_JR_TRAINER_F, 23 + object_event 18, 5, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE15_TM_RAGE, TM_RAGE def_warps_to ROUTE_15 diff --git a/data/maps/objects/Route15Gate1F.asm b/data/maps/objects/Route15Gate1F.asm index 3bc02f2fb..7285c23e4 100644 --- a/data/maps/objects/Route15Gate1F.asm +++ b/data/maps/objects/Route15Gate1F.asm @@ -1,3 +1,6 @@ + object_const_def + const ROUTE15GATE1F_GUARD + Route15Gate1F_Object: db $a ; border block @@ -11,6 +14,6 @@ Route15Gate1F_Object: def_bg_events def_object_events - object_event 4, 1, SPRITE_GUARD, STAY, NONE, 1 ; person + object_event 4, 1, SPRITE_GUARD, STAY, NONE, TEXT_ROUTE15GATE1F_GUARD def_warps_to ROUTE_15_GATE_1F diff --git a/data/maps/objects/Route15Gate2F.asm b/data/maps/objects/Route15Gate2F.asm index 39b5c64ae..b2b17285a 100644 --- a/data/maps/objects/Route15Gate2F.asm +++ b/data/maps/objects/Route15Gate2F.asm @@ -1,3 +1,6 @@ + object_const_def + const ROUTE15GATE2F_OAKS_AIDE + Route15Gate2F_Object: db $a ; border block @@ -5,9 +8,9 @@ Route15Gate2F_Object: warp_event 7, 7, ROUTE_15_GATE_1F, 5 def_bg_events - bg_event 6, 2, 2 ; Route15GateUpstairsText2 + bg_event 6, 2, TEXT_ROUTE15GATE2F_BINOCULARS def_object_events - object_event 4, 2, SPRITE_SCIENTIST, STAY, DOWN, 1 + object_event 4, 2, SPRITE_SCIENTIST, STAY, DOWN, TEXT_ROUTE15GATE2F_OAKS_AIDE def_warps_to ROUTE_15_GATE_2F diff --git a/data/maps/objects/Route16.asm b/data/maps/objects/Route16.asm index b1e626514..0eff9b2e0 100644 --- a/data/maps/objects/Route16.asm +++ b/data/maps/objects/Route16.asm @@ -1,3 +1,12 @@ + object_const_def + const ROUTE16_BIKER1 + const ROUTE16_BIKER2 + const ROUTE16_BIKER3 + const ROUTE16_BIKER4 + const ROUTE16_BIKER5 + const ROUTE16_BIKER6 + const ROUTE16_SNORLAX + Route16_Object: db $f ; border block @@ -13,16 +22,16 @@ Route16_Object: warp_event 7, 5, ROUTE_16_FLY_HOUSE, 1 def_bg_events - bg_event 27, 11, 8 ; Route16Text8 - bg_event 5, 17, 9 ; Route16Text9 + bg_event 27, 11, TEXT_ROUTE16_CYCLING_ROAD_SIGN + bg_event 5, 17, TEXT_ROUTE16_SIGN def_object_events - object_event 17, 12, SPRITE_BIKER, STAY, LEFT, 1, OPP_BIKER, 5 - object_event 14, 13, SPRITE_BIKER, STAY, RIGHT, 2, OPP_CUE_BALL, 1 - object_event 11, 12, SPRITE_BIKER, STAY, UP, 3, OPP_CUE_BALL, 2 - object_event 9, 11, SPRITE_BIKER, STAY, LEFT, 4, OPP_BIKER, 6 - object_event 6, 10, SPRITE_BIKER, STAY, RIGHT, 5, OPP_CUE_BALL, 3 - object_event 3, 12, SPRITE_BIKER, STAY, RIGHT, 6, OPP_BIKER, 7 - object_event 26, 10, SPRITE_SNORLAX, STAY, DOWN, 7 ; person + object_event 17, 12, SPRITE_BIKER, STAY, LEFT, TEXT_ROUTE16_BIKER1, OPP_BIKER, 5 + object_event 14, 13, SPRITE_BIKER, STAY, RIGHT, TEXT_ROUTE16_BIKER2, OPP_CUE_BALL, 1 + object_event 11, 12, SPRITE_BIKER, STAY, UP, TEXT_ROUTE16_BIKER3, OPP_CUE_BALL, 2 + object_event 9, 11, SPRITE_BIKER, STAY, LEFT, TEXT_ROUTE16_BIKER4, OPP_BIKER, 6 + object_event 6, 10, SPRITE_BIKER, STAY, RIGHT, TEXT_ROUTE16_BIKER5, OPP_CUE_BALL, 3 + object_event 3, 12, SPRITE_BIKER, STAY, RIGHT, TEXT_ROUTE16_BIKER6, OPP_BIKER, 7 + object_event 26, 10, SPRITE_SNORLAX, STAY, DOWN, TEXT_ROUTE16_SNORLAX def_warps_to ROUTE_16 diff --git a/data/maps/objects/Route16FlyHouse.asm b/data/maps/objects/Route16FlyHouse.asm index dc767dbf5..be2f19d40 100644 --- a/data/maps/objects/Route16FlyHouse.asm +++ b/data/maps/objects/Route16FlyHouse.asm @@ -1,3 +1,7 @@ + object_const_def + const ROUTE16FLYHOUSE_BRUNETTE_GIRL + const ROUTE16FLYHOUSE_FEAROW + Route16FlyHouse_Object: db $a ; border block @@ -8,7 +12,7 @@ Route16FlyHouse_Object: def_bg_events def_object_events - object_event 2, 3, SPRITE_BRUNETTE_GIRL, STAY, RIGHT, 1 ; person - object_event 6, 4, SPRITE_BIRD, WALK, ANY_DIR, 2 ; person + object_event 2, 3, SPRITE_BRUNETTE_GIRL, STAY, RIGHT, TEXT_ROUTE16FLYHOUSE_BRUNETTE_GIRL + object_event 6, 4, SPRITE_BIRD, WALK, ANY_DIR, TEXT_ROUTE16FLYHOUSE_FEAROW def_warps_to ROUTE_16_FLY_HOUSE diff --git a/data/maps/objects/Route16Gate1F.asm b/data/maps/objects/Route16Gate1F.asm index 7aeeb6192..d703a6e01 100644 --- a/data/maps/objects/Route16Gate1F.asm +++ b/data/maps/objects/Route16Gate1F.asm @@ -1,3 +1,7 @@ + object_const_def + const ROUTE16GATE1F_GUARD + const ROUTE16GATE1F_GAMBLER + Route16Gate1F_Object: db $a ; border block @@ -15,7 +19,7 @@ Route16Gate1F_Object: def_bg_events def_object_events - object_event 4, 5, SPRITE_GUARD, STAY, DOWN, 1 ; person - object_event 4, 3, SPRITE_GAMBLER, STAY, NONE, 2 ; person + object_event 4, 5, SPRITE_GUARD, STAY, DOWN, TEXT_ROUTE16GATE1F_GUARD + object_event 4, 3, SPRITE_GAMBLER, STAY, NONE, TEXT_ROUTE16GATE1F_GAMBLER def_warps_to ROUTE_16_GATE_1F diff --git a/data/maps/objects/Route16Gate2F.asm b/data/maps/objects/Route16Gate2F.asm index f687fab0f..421b5caa0 100644 --- a/data/maps/objects/Route16Gate2F.asm +++ b/data/maps/objects/Route16Gate2F.asm @@ -1,3 +1,7 @@ + object_const_def + const ROUTE16GATE2F_LITTLE_BOY + const ROUTE16GATE2F_LITTLE_GIRL + Route16Gate2F_Object: db $a ; border block @@ -5,11 +9,11 @@ Route16Gate2F_Object: warp_event 7, 7, ROUTE_16_GATE_1F, 9 def_bg_events - bg_event 1, 2, 3 ; Route16GateUpstairsText3 - bg_event 6, 2, 4 ; Route16GateUpstairsText4 + bg_event 1, 2, TEXT_ROUTE16GATE2F_LEFT_BINOCULARS + bg_event 6, 2, TEXT_ROUTE16GATE2F_RIGHT_BINOCULARS def_object_events - object_event 4, 2, SPRITE_LITTLE_BOY, STAY, NONE, 1 ; person - object_event 2, 5, SPRITE_LITTLE_GIRL, WALK, LEFT_RIGHT, 2 ; person + object_event 4, 2, SPRITE_LITTLE_BOY, STAY, NONE, TEXT_ROUTE16GATE2F_LITTLE_BOY + object_event 2, 5, SPRITE_LITTLE_GIRL, WALK, LEFT_RIGHT, TEXT_ROUTE16GATE2F_LITTLE_GIRL def_warps_to ROUTE_16_GATE_2F diff --git a/data/maps/objects/Route17.asm b/data/maps/objects/Route17.asm index 48d889265..2f1dbeb1b 100644 --- a/data/maps/objects/Route17.asm +++ b/data/maps/objects/Route17.asm @@ -1,26 +1,38 @@ + object_const_def + const ROUTE17_BIKER1 + const ROUTE17_BIKER2 + const ROUTE17_BIKER3 + const ROUTE17_BIKER4 + const ROUTE17_BIKER5 + const ROUTE17_BIKER6 + const ROUTE17_BIKER7 + const ROUTE17_BIKER8 + const ROUTE17_BIKER9 + const ROUTE17_BIKER10 + Route17_Object: db $43 ; border block def_warp_events def_bg_events - bg_event 9, 51, 11 ; Route17Text11 - bg_event 9, 63, 12 ; Route17Text12 - bg_event 9, 75, 13 ; Route17Text13 - bg_event 9, 87, 14 ; Route17Text14 - bg_event 9, 111, 15 ; Route17Text15 - bg_event 9, 141, 16 ; Route17Text16 + bg_event 9, 51, TEXT_ROUTE17_NOTICE_SIGN1 + bg_event 9, 63, TEXT_ROUTE17_TRAINER_TIPS1 + bg_event 9, 75, TEXT_ROUTE17_TRAINER_TIPS2 + bg_event 9, 87, TEXT_ROUTE17_SIGN + bg_event 9, 111, TEXT_ROUTE17_NOTICE_SIGN2 + bg_event 9, 141, TEXT_ROUTE17_CYCLING_ROAD_ENDS_SIGN def_object_events - object_event 12, 19, SPRITE_BIKER, STAY, LEFT, 1, OPP_CUE_BALL, 4 - object_event 11, 16, SPRITE_BIKER, STAY, RIGHT, 2, OPP_CUE_BALL, 5 - object_event 4, 18, SPRITE_BIKER, STAY, UP, 3, OPP_BIKER, 8 - object_event 7, 32, SPRITE_BIKER, STAY, LEFT, 4, OPP_BIKER, 9 - object_event 14, 34, SPRITE_BIKER, STAY, RIGHT, 5, OPP_BIKER, 10 - object_event 17, 58, SPRITE_BIKER, STAY, LEFT, 6, OPP_CUE_BALL, 6 - object_event 2, 68, SPRITE_BIKER, STAY, RIGHT, 7, OPP_CUE_BALL, 7 - object_event 14, 98, SPRITE_BIKER, STAY, RIGHT, 8, OPP_CUE_BALL, 8 - object_event 5, 98, SPRITE_BIKER, STAY, LEFT, 9, OPP_BIKER, 11 - object_event 10, 118, SPRITE_BIKER, STAY, DOWN, 10, OPP_BIKER, 12 + object_event 12, 19, SPRITE_BIKER, STAY, LEFT, TEXT_ROUTE17_BIKER1, OPP_CUE_BALL, 4 + object_event 11, 16, SPRITE_BIKER, STAY, RIGHT, TEXT_ROUTE17_BIKER2, OPP_CUE_BALL, 5 + object_event 4, 18, SPRITE_BIKER, STAY, UP, TEXT_ROUTE17_BIKER3, OPP_BIKER, 8 + object_event 7, 32, SPRITE_BIKER, STAY, LEFT, TEXT_ROUTE17_BIKER4, OPP_BIKER, 9 + object_event 14, 34, SPRITE_BIKER, STAY, RIGHT, TEXT_ROUTE17_BIKER5, OPP_BIKER, 10 + object_event 17, 58, SPRITE_BIKER, STAY, LEFT, TEXT_ROUTE17_BIKER6, OPP_CUE_BALL, 6 + object_event 2, 68, SPRITE_BIKER, STAY, RIGHT, TEXT_ROUTE17_BIKER7, OPP_CUE_BALL, 7 + object_event 14, 98, SPRITE_BIKER, STAY, RIGHT, TEXT_ROUTE17_BIKER8, OPP_CUE_BALL, 8 + object_event 5, 98, SPRITE_BIKER, STAY, LEFT, TEXT_ROUTE17_BIKER9, OPP_BIKER, 11 + object_event 10, 118, SPRITE_BIKER, STAY, DOWN, TEXT_ROUTE17_BIKER10, OPP_BIKER, 12 def_warps_to ROUTE_17 diff --git a/data/maps/objects/Route18.asm b/data/maps/objects/Route18.asm index 102aa4c5a..41286afca 100644 --- a/data/maps/objects/Route18.asm +++ b/data/maps/objects/Route18.asm @@ -1,3 +1,8 @@ + object_const_def + const ROUTE18_COOLTRAINER_M1 + const ROUTE18_COOLTRAINER_M2 + const ROUTE18_COOLTRAINER_M3 + Route18_Object: db $43 ; border block @@ -8,12 +13,12 @@ Route18_Object: warp_event 40, 9, ROUTE_18_GATE_1F, 4 def_bg_events - bg_event 43, 7, 4 ; Route18Text4 - bg_event 33, 5, 5 ; Route18Text5 + bg_event 43, 7, SCRIPT_ROUTE18_SIGN + bg_event 33, 5, SCRIPT_ROUTE18_CYCLING_ROAD_SIGN def_object_events - object_event 36, 11, SPRITE_COOLTRAINER_M, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 8 - object_event 40, 15, SPRITE_COOLTRAINER_M, STAY, LEFT, 2, OPP_BIRD_KEEPER, 9 - object_event 42, 13, SPRITE_COOLTRAINER_M, STAY, LEFT, 3, OPP_BIRD_KEEPER, 10 + object_event 36, 11, SPRITE_COOLTRAINER_M, STAY, RIGHT, SCRIPT_ROUTE18_COOLTRAINER_M1, OPP_BIRD_KEEPER, 8 + object_event 40, 15, SPRITE_COOLTRAINER_M, STAY, LEFT, SCRIPT_ROUTE18_COOLTRAINER_M2, OPP_BIRD_KEEPER, 9 + object_event 42, 13, SPRITE_COOLTRAINER_M, STAY, LEFT, SCRIPT_ROUTE18_COOLTRAINER_M3, OPP_BIRD_KEEPER, 10 def_warps_to ROUTE_18 diff --git a/data/maps/objects/Route18Gate1F.asm b/data/maps/objects/Route18Gate1F.asm index cc994a361..f5699ba05 100644 --- a/data/maps/objects/Route18Gate1F.asm +++ b/data/maps/objects/Route18Gate1F.asm @@ -1,3 +1,6 @@ + object_const_def + const ROUTE18GATE1F_GUARD + Route18Gate1F_Object: db $a ; border block @@ -11,6 +14,6 @@ Route18Gate1F_Object: def_bg_events def_object_events - object_event 4, 1, SPRITE_GUARD, STAY, DOWN, 1 ; person + object_event 4, 1, SPRITE_GUARD, STAY, DOWN, TEXT_ROUTE18GATE1F_GUARD def_warps_to ROUTE_18_GATE_1F diff --git a/data/maps/objects/Route18Gate2F.asm b/data/maps/objects/Route18Gate2F.asm index 5a05f82b9..92d42985f 100644 --- a/data/maps/objects/Route18Gate2F.asm +++ b/data/maps/objects/Route18Gate2F.asm @@ -1,3 +1,6 @@ + object_const_def + const ROUTE18GATE2F_YOUNGSTER + Route18Gate2F_Object: db $a ; border block @@ -5,10 +8,10 @@ Route18Gate2F_Object: warp_event 7, 7, ROUTE_18_GATE_1F, 5 def_bg_events - bg_event 1, 2, 2 ; Route18GateUpstairsText2 - bg_event 6, 2, 3 ; Route18GateUpstairsText3 + bg_event 1, 2, TEXT_ROUTE18GATE2F_LEFT_BINOCULARS + bg_event 6, 2, TEXT_ROUTE18GATE2F_RIGHT_BINOCULARS def_object_events - object_event 4, 2, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person + object_event 4, 2, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, TEXT_ROUTE18GATE2F_YOUNGSTER def_warps_to ROUTE_18_GATE_2F diff --git a/data/maps/objects/Route19.asm b/data/maps/objects/Route19.asm index 90d253f44..7c5f6f7f5 100644 --- a/data/maps/objects/Route19.asm +++ b/data/maps/objects/Route19.asm @@ -1,21 +1,33 @@ + object_const_def + const ROUTE19_COOLTRAINER_M1 + const ROUTE19_COOLTRAINER_M2 + const ROUTE19_SWIMMER1 + const ROUTE19_SWIMMER2 + const ROUTE19_SWIMMER3 + const ROUTE19_SWIMMER4 + const ROUTE19_SWIMMER5 + const ROUTE19_SWIMMER6 + const ROUTE19_SWIMMER7 + const ROUTE19_SWIMMER8 + Route19_Object: db $43 ; border block def_warp_events def_bg_events - bg_event 11, 9, 11 ; Route19Text11 + bg_event 11, 9, TEXT_ROUTE19_SIGN def_object_events - object_event 8, 7, SPRITE_COOLTRAINER_M, STAY, LEFT, 1, OPP_SWIMMER, 2 - object_event 13, 7, SPRITE_COOLTRAINER_M,STAY, LEFT, 2, OPP_SWIMMER, 3 - object_event 13, 25, SPRITE_SWIMMER, STAY, LEFT, 3, OPP_SWIMMER, 4 - object_event 4, 27, SPRITE_SWIMMER, STAY, RIGHT, 4, OPP_SWIMMER, 5 - object_event 16, 31, SPRITE_SWIMMER, STAY, UP, 5, OPP_SWIMMER, 6 - object_event 9, 11, SPRITE_SWIMMER, STAY, DOWN, 6, OPP_SWIMMER, 7 - object_event 8, 43, SPRITE_SWIMMER, STAY, LEFT, 7, OPP_BEAUTY, 12 - object_event 11, 43, SPRITE_SWIMMER, STAY, RIGHT, 8, OPP_BEAUTY, 13 - object_event 9, 42, SPRITE_SWIMMER, STAY, UP, 9, OPP_SWIMMER, 8 - object_event 10, 44, SPRITE_SWIMMER, STAY, DOWN, 10, OPP_BEAUTY, 14 + object_event 8, 7, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE19_COOLTRAINER_M1, OPP_SWIMMER, 2 + object_event 13, 7, SPRITE_COOLTRAINER_M,STAY, LEFT, TEXT_ROUTE19_COOLTRAINER_M2, OPP_SWIMMER, 3 + object_event 13, 25, SPRITE_SWIMMER, STAY, LEFT, TEXT_ROUTE19_SWIMMER1, OPP_SWIMMER, 4 + object_event 4, 27, SPRITE_SWIMMER, STAY, RIGHT, TEXT_ROUTE19_SWIMMER2, OPP_SWIMMER, 5 + object_event 16, 31, SPRITE_SWIMMER, STAY, UP, TEXT_ROUTE19_SWIMMER3, OPP_SWIMMER, 6 + object_event 9, 11, SPRITE_SWIMMER, STAY, DOWN, TEXT_ROUTE19_SWIMMER4, OPP_SWIMMER, 7 + object_event 8, 43, SPRITE_SWIMMER, STAY, LEFT, TEXT_ROUTE19_SWIMMER5, OPP_BEAUTY, 12 + object_event 11, 43, SPRITE_SWIMMER, STAY, RIGHT, TEXT_ROUTE19_SWIMMER6, OPP_BEAUTY, 13 + object_event 9, 42, SPRITE_SWIMMER, STAY, UP, TEXT_ROUTE19_SWIMMER7, OPP_SWIMMER, 8 + object_event 10, 44, SPRITE_SWIMMER, STAY, DOWN, TEXT_ROUTE19_SWIMMER8, OPP_BEAUTY, 14 def_warps_to ROUTE_19 diff --git a/data/maps/objects/Route2.asm b/data/maps/objects/Route2.asm index 6ff5c0c7d..45e4d2d08 100644 --- a/data/maps/objects/Route2.asm +++ b/data/maps/objects/Route2.asm @@ -1,3 +1,7 @@ + object_const_def + const ROUTE2_MOON_STONE + const ROUTE2_HP_UP + Route2_Object: db $f ; border block @@ -10,12 +14,12 @@ Route2_Object: warp_event 3, 43, VIRIDIAN_FOREST_SOUTH_GATE, 3 def_bg_events - bg_event 5, 65, 3 ; Route2Text3 - bg_event 11, 11, 4 ; Route2Text4 + bg_event 5, 65, TEXT_ROUTE2_SIGN + bg_event 11, 11, TEXT_ROUTE2_DIGLETTS_CAVE_SIGN def_object_events - object_event 13, 54, SPRITE_POKE_BALL, STAY, NONE, 1, MOON_STONE - object_event 13, 45, SPRITE_POKE_BALL, STAY, NONE, 2, HP_UP + object_event 13, 54, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE2_MOON_STONE, MOON_STONE + object_event 13, 45, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE2_HP_UP, HP_UP def_warps_to ROUTE_2 diff --git a/data/maps/objects/Route20.asm b/data/maps/objects/Route20.asm index bd9697c24..eaa80344c 100644 --- a/data/maps/objects/Route20.asm +++ b/data/maps/objects/Route20.asm @@ -1,3 +1,15 @@ + object_const_def + const ROUTE20_SWIMMER1 + const ROUTE20_SWIMMER2 + const ROUTE20_SWIMMER3 + const ROUTE20_SWIMMER4 + const ROUTE20_SWIMMER5 + const ROUTE20_SWIMMER6 + const ROUTE20_COOLTRAINER_M + const ROUTE20_SWIMMER7 + const ROUTE20_SWIMMER8 + const ROUTE20_SWIMMER9 + Route20_Object: db $43 ; border block @@ -6,19 +18,19 @@ Route20_Object: warp_event 58, 9, SEAFOAM_ISLANDS_1F, 3 def_bg_events - bg_event 51, 7, 11 ; Route20Text11 - bg_event 57, 11, 12 ; Route20Text12 + bg_event 51, 7, TEXT_ROUTE20_SEAFOAM_ISLANDS_WEST_SIGN + bg_event 57, 11, TEXT_ROUTE20_SEAFOAM_ISLANDS_EAST_SIGN def_object_events - object_event 87, 8, SPRITE_SWIMMER, STAY, UP, 1, OPP_SWIMMER, 9 - object_event 68, 11, SPRITE_SWIMMER, STAY, UP, 2, OPP_BEAUTY, 15 - object_event 45, 10, SPRITE_SWIMMER, STAY, DOWN, 3, OPP_BEAUTY, 6 - object_event 55, 14, SPRITE_SWIMMER, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 24 - object_event 38, 13, SPRITE_SWIMMER, STAY, DOWN, 5, OPP_SWIMMER, 10 - object_event 87, 13, SPRITE_SWIMMER, STAY, UP, 6, OPP_SWIMMER, 11 - object_event 34, 9, SPRITE_COOLTRAINER_M, STAY, UP, 7, OPP_BIRD_KEEPER, 11 - object_event 25, 7, SPRITE_SWIMMER, STAY, UP, 8, OPP_BEAUTY, 7 - object_event 24, 12, SPRITE_SWIMMER, STAY, DOWN, 9, OPP_JR_TRAINER_F, 16 - object_event 15, 8, SPRITE_SWIMMER, STAY, UP, 10, OPP_BEAUTY, 8 + object_event 87, 8, SPRITE_SWIMMER, STAY, UP, TEXT_ROUTE20_SWIMMER1, OPP_SWIMMER, 9 + object_event 68, 11, SPRITE_SWIMMER, STAY, UP, TEXT_ROUTE20_SWIMMER2, OPP_BEAUTY, 15 + object_event 45, 10, SPRITE_SWIMMER, STAY, DOWN, TEXT_ROUTE20_SWIMMER3, OPP_BEAUTY, 6 + object_event 55, 14, SPRITE_SWIMMER, STAY, RIGHT, TEXT_ROUTE20_SWIMMER4, OPP_JR_TRAINER_F, 24 + object_event 38, 13, SPRITE_SWIMMER, STAY, DOWN, TEXT_ROUTE20_SWIMMER5, OPP_SWIMMER, 10 + object_event 87, 13, SPRITE_SWIMMER, STAY, UP, TEXT_ROUTE20_SWIMMER6, OPP_SWIMMER, 11 + object_event 34, 9, SPRITE_COOLTRAINER_M, STAY, UP, TEXT_ROUTE20_COOLTRAINER_M, OPP_BIRD_KEEPER, 11 + object_event 25, 7, SPRITE_SWIMMER, STAY, UP, TEXT_ROUTE20_SWIMMER7, OPP_BEAUTY, 7 + object_event 24, 12, SPRITE_SWIMMER, STAY, DOWN, TEXT_ROUTE20_SWIMMER8, OPP_JR_TRAINER_F, 16 + object_event 15, 8, SPRITE_SWIMMER, STAY, UP, TEXT_ROUTE20_SWIMMER9, OPP_BEAUTY, 8 def_warps_to ROUTE_20 diff --git a/data/maps/objects/Route21.asm b/data/maps/objects/Route21.asm index 52012684f..94cfa5681 100644 --- a/data/maps/objects/Route21.asm +++ b/data/maps/objects/Route21.asm @@ -1,3 +1,14 @@ + object_const_def + const ROUTE21_FISHER1 + const ROUTE21_FISHER2 + const ROUTE21_SWIMMER1 + const ROUTE21_SWIMMER2 + const ROUTE21_SWIMMER3 + const ROUTE21_SWIMMER4 + const ROUTE21_SWIMMER5 + const ROUTE21_FISHER3 + const ROUTE21_FISHER4 + Route21_Object: db $43 ; border block @@ -6,14 +17,14 @@ Route21_Object: def_bg_events def_object_events - object_event 4, 24, SPRITE_FISHER, STAY, LEFT, 1, OPP_FISHER, 7 - object_event 6, 25, SPRITE_FISHER, STAY, DOWN, 2, OPP_FISHER, 9 - object_event 10, 31, SPRITE_SWIMMER, STAY, UP, 3, OPP_SWIMMER, 12 - object_event 12, 30, SPRITE_SWIMMER, STAY, RIGHT, 4, OPP_CUE_BALL, 9 - object_event 16, 63, SPRITE_SWIMMER, STAY, DOWN, 5, OPP_SWIMMER, 13 - object_event 5, 71, SPRITE_SWIMMER, STAY, RIGHT, 6, OPP_SWIMMER, 14 - object_event 15, 71, SPRITE_SWIMMER, STAY, LEFT, 7, OPP_SWIMMER, 15 - object_event 14, 56, SPRITE_FISHER, STAY, LEFT, 8, OPP_FISHER, 8 - object_event 17, 57, SPRITE_FISHER, STAY, RIGHT, 9, OPP_FISHER, 10 + object_event 4, 24, SPRITE_FISHER, STAY, LEFT, TEXT_ROUTE21_FISHER1, OPP_FISHER, 7 + object_event 6, 25, SPRITE_FISHER, STAY, DOWN, TEXT_ROUTE21_FISHER2, OPP_FISHER, 9 + object_event 10, 31, SPRITE_SWIMMER, STAY, UP, TEXT_ROUTE21_SWIMMER1, OPP_SWIMMER, 12 + object_event 12, 30, SPRITE_SWIMMER, STAY, RIGHT, TEXT_ROUTE21_SWIMMER2, OPP_CUE_BALL, 9 + object_event 16, 63, SPRITE_SWIMMER, STAY, DOWN, TEXT_ROUTE21_SWIMMER3, OPP_SWIMMER, 13 + object_event 5, 71, SPRITE_SWIMMER, STAY, RIGHT, TEXT_ROUTE21_SWIMMER4, OPP_SWIMMER, 14 + object_event 15, 71, SPRITE_SWIMMER, STAY, LEFT, TEXT_ROUTE21_SWIMMER5, OPP_SWIMMER, 15 + object_event 14, 56, SPRITE_FISHER, STAY, LEFT, TEXT_ROUTE21_FISHER3, OPP_FISHER, 8 + object_event 17, 57, SPRITE_FISHER, STAY, RIGHT, TEXT_ROUTE21_FISHER4, OPP_FISHER, 10 def_warps_to ROUTE_21 diff --git a/data/maps/objects/Route22.asm b/data/maps/objects/Route22.asm index 096d490cf..1fc18704d 100644 --- a/data/maps/objects/Route22.asm +++ b/data/maps/objects/Route22.asm @@ -1,3 +1,7 @@ + object_const_def + const ROUTE22_RIVAL1 + const ROUTE22_RIVAL2 + Route22_Object: db $2c ; border block @@ -5,10 +9,10 @@ Route22_Object: warp_event 8, 5, ROUTE_22_GATE, 1 def_bg_events - bg_event 7, 11, 3 ; Route22FrontGateText + bg_event 7, 11, TEXT_ROUTE22_POKEMON_LEAGUE_SIGN def_object_events - object_event 25, 5, SPRITE_BLUE, STAY, NONE, 1 ; person - object_event 25, 5, SPRITE_BLUE, STAY, NONE, 2 ; person + object_event 25, 5, SPRITE_BLUE, STAY, NONE, TEXT_ROUTE22_RIVAL1 + object_event 25, 5, SPRITE_BLUE, STAY, NONE, TEXT_ROUTE22_RIVAL2 def_warps_to ROUTE_22 diff --git a/data/maps/objects/Route22Gate.asm b/data/maps/objects/Route22Gate.asm index 086616cac..6ebe7d7ef 100644 --- a/data/maps/objects/Route22Gate.asm +++ b/data/maps/objects/Route22Gate.asm @@ -1,3 +1,6 @@ + object_const_def + const ROUTE22GATE_GUARD + Route22Gate_Object: db $a ; border block @@ -10,6 +13,6 @@ Route22Gate_Object: def_bg_events def_object_events - object_event 6, 2, SPRITE_GUARD, STAY, LEFT, 1 ; person + object_event 6, 2, SPRITE_GUARD, STAY, LEFT, TEXT_ROUTE22GATE_GUARD def_warps_to ROUTE_22_GATE diff --git a/data/maps/objects/Route23.asm b/data/maps/objects/Route23.asm index 4a9f65f6d..f13409a25 100644 --- a/data/maps/objects/Route23.asm +++ b/data/maps/objects/Route23.asm @@ -1,3 +1,12 @@ + object_const_def + const ROUTE23_GUARD1 + const ROUTE23_GUARD2 + const ROUTE23_SWIMMER1 + const ROUTE23_SWIMMER2 + const ROUTE23_GUARD3 + const ROUTE23_GUARD4 + const ROUTE23_GUARD5 + Route23_Object: db $f ; border block @@ -8,15 +17,15 @@ Route23_Object: warp_event 14, 31, VICTORY_ROAD_2F, 2 def_bg_events - bg_event 3, 33, 8 ; Route23Text8 + bg_event 3, 33, TEXT_ROUTE23_VICTORY_ROAD_GATE_SIGN def_object_events - object_event 4, 35, SPRITE_GUARD, STAY, DOWN, 1 ; person - object_event 10, 56, SPRITE_GUARD, STAY, DOWN, 2 ; person - object_event 8, 85, SPRITE_SWIMMER, STAY, DOWN, 3 ; person - object_event 11, 96, SPRITE_SWIMMER, STAY, DOWN, 4 ; person - object_event 12, 105, SPRITE_GUARD, STAY, DOWN, 5 ; person - object_event 8, 119, SPRITE_GUARD, STAY, DOWN, 6 ; person - object_event 8, 136, SPRITE_GUARD, STAY, DOWN, 7 ; person + object_event 4, 35, SPRITE_GUARD, STAY, DOWN, TEXT_ROUTE23_GUARD1 + object_event 10, 56, SPRITE_GUARD, STAY, DOWN, TEXT_ROUTE23_GUARD2 + object_event 8, 85, SPRITE_SWIMMER, STAY, DOWN, TEXT_ROUTE23_SWIMMER1 + object_event 11, 96, SPRITE_SWIMMER, STAY, DOWN, TEXT_ROUTE23_SWIMMER2 + object_event 12, 105, SPRITE_GUARD, STAY, DOWN, TEXT_ROUTE23_GUARD3 + object_event 8, 119, SPRITE_GUARD, STAY, DOWN, TEXT_ROUTE23_GUARD4 + object_event 8, 136, SPRITE_GUARD, STAY, DOWN, TEXT_ROUTE23_GUARD5 def_warps_to ROUTE_23 diff --git a/data/maps/objects/Route24.asm b/data/maps/objects/Route24.asm index 80dca821a..6c0b6ad6f 100644 --- a/data/maps/objects/Route24.asm +++ b/data/maps/objects/Route24.asm @@ -1,3 +1,13 @@ + object_const_def + const ROUTE24_COOLTRAINER_M1 + const ROUTE24_COOLTRAINER_M2 + const ROUTE24_COOLTRAINER_M3 + const ROUTE24_COOLTRAINER_F1 + const ROUTE24_YOUNGSTER_1 + const ROUTE24_COOLTRAINER_F2 + const ROUTE24_YOUNGSTER_2 + const ROUTE24_TM_THUNDER_WAVE + Route24_Object: db $2c ; border block @@ -6,13 +16,13 @@ Route24_Object: def_bg_events def_object_events - object_event 11, 15, SPRITE_COOLTRAINER_M, STAY, LEFT, 1, OPP_ROCKET, 6 - object_event 5, 20, SPRITE_COOLTRAINER_M, STAY, UP, 2, OPP_JR_TRAINER_M, 2 - object_event 11, 19, SPRITE_COOLTRAINER_M, STAY, LEFT, 3, OPP_JR_TRAINER_M, 3 - object_event 10, 22, SPRITE_COOLTRAINER_F, STAY, RIGHT, 4, OPP_LASS, 7 - object_event 11, 25, SPRITE_YOUNGSTER, STAY, LEFT, 5, OPP_YOUNGSTER, 4 - object_event 10, 28, SPRITE_COOLTRAINER_F, STAY, RIGHT, 6, OPP_LASS, 8 - object_event 11, 31, SPRITE_YOUNGSTER, STAY, LEFT, 7, OPP_BUG_CATCHER, 9 - object_event 10, 5, SPRITE_POKE_BALL, STAY, NONE, 8, TM_THUNDER_WAVE + object_event 11, 15, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE24_COOLTRAINER_M1, OPP_ROCKET, 6 + object_event 5, 20, SPRITE_COOLTRAINER_M, STAY, UP, TEXT_ROUTE24_COOLTRAINER_M2, OPP_JR_TRAINER_M, 2 + object_event 11, 19, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE24_COOLTRAINER_M3, OPP_JR_TRAINER_M, 3 + object_event 10, 22, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE24_COOLTRAINER_F1, OPP_LASS, 7 + object_event 11, 25, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE24_YOUNGSTER_1, OPP_YOUNGSTER, 4 + object_event 10, 28, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE24_COOLTRAINER_F2, OPP_LASS, 8 + object_event 11, 31, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE24_YOUNGSTER_2, OPP_BUG_CATCHER, 9 + object_event 10, 5, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE24_TM_THUNDER_WAVE, TM_THUNDER_WAVE def_warps_to ROUTE_24 diff --git a/data/maps/objects/Route25.asm b/data/maps/objects/Route25.asm index f0814b233..897c42984 100644 --- a/data/maps/objects/Route25.asm +++ b/data/maps/objects/Route25.asm @@ -1,3 +1,15 @@ + object_const_def + const ROUTE25_YOUNGSTER1 + const ROUTE25_YOUNGSTER2 + const ROUTE25_COOLTRAINER_M + const ROUTE25_COOLTRAINER_F1 + const ROUTE25_YOUNGSTER3 + const ROUTE25_COOLTRAINER_F2 + const ROUTE25_HIKER1 + const ROUTE25_HIKER2 + const ROUTE25_HIKER3 + const ROUTE25_TM_SEISMIC_TOSS + Route25_Object: db $2c ; border block @@ -5,18 +17,18 @@ Route25_Object: warp_event 45, 3, BILLS_HOUSE, 1 def_bg_events - bg_event 43, 3, 11 ; Route25Text11 + bg_event 43, 3, TEXT_ROUTE25_BILL_SIGN def_object_events - object_event 14, 2, SPRITE_YOUNGSTER, STAY, DOWN, 1, OPP_YOUNGSTER, 5 - object_event 18, 5, SPRITE_YOUNGSTER, STAY, UP, 2, OPP_YOUNGSTER, 6 - object_event 24, 4, SPRITE_COOLTRAINER_M, STAY, DOWN, 3, OPP_JR_TRAINER_M, 2 - object_event 18, 8, SPRITE_COOLTRAINER_F, STAY, RIGHT, 4, OPP_LASS, 9 - object_event 32, 3, SPRITE_YOUNGSTER, STAY, LEFT, 5, OPP_YOUNGSTER, 7 - object_event 37, 4, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_LASS, 10 - object_event 8, 4, SPRITE_HIKER, STAY, RIGHT, 7, OPP_HIKER, 2 - object_event 23, 9, SPRITE_HIKER, STAY, UP, 8, OPP_HIKER, 3 - object_event 13, 7, SPRITE_HIKER, STAY, RIGHT, 9, OPP_HIKER, 4 - object_event 22, 2, SPRITE_POKE_BALL, STAY, NONE, 10, TM_SEISMIC_TOSS + object_event 14, 2, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_ROUTE25_YOUNGSTER1, OPP_YOUNGSTER, 5 + object_event 18, 5, SPRITE_YOUNGSTER, STAY, UP, TEXT_ROUTE25_YOUNGSTER2, OPP_YOUNGSTER, 6 + object_event 24, 4, SPRITE_COOLTRAINER_M, STAY, DOWN, TEXT_ROUTE25_COOLTRAINER_M, OPP_JR_TRAINER_M, 2 + object_event 18, 8, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE25_COOLTRAINER_F1, OPP_LASS, 9 + object_event 32, 3, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE25_YOUNGSTER3, OPP_YOUNGSTER, 7 + object_event 37, 4, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_ROUTE25_COOLTRAINER_F2, OPP_LASS, 10 + object_event 8, 4, SPRITE_HIKER, STAY, RIGHT, TEXT_ROUTE25_HIKER1, OPP_HIKER, 2 + object_event 23, 9, SPRITE_HIKER, STAY, UP, TEXT_ROUTE25_HIKER2, OPP_HIKER, 3 + object_event 13, 7, SPRITE_HIKER, STAY, RIGHT, TEXT_ROUTE25_HIKER3, OPP_HIKER, 4 + object_event 22, 2, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE25_TM_SEISMIC_TOSS, TM_SEISMIC_TOSS def_warps_to ROUTE_25 diff --git a/data/maps/objects/Route2Gate.asm b/data/maps/objects/Route2Gate.asm index 02205d00f..acbe73e9b 100644 --- a/data/maps/objects/Route2Gate.asm +++ b/data/maps/objects/Route2Gate.asm @@ -1,3 +1,7 @@ + object_const_def + const ROUTE2_OAKS_AIDE + const ROUTE2_YOUNGSTER + Route2Gate_Object: db $a ; border block @@ -10,7 +14,7 @@ Route2Gate_Object: def_bg_events def_object_events - object_event 1, 4, SPRITE_SCIENTIST, STAY, LEFT, 1 ; person - object_event 5, 4, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 2 ; person + object_event 1, 4, SPRITE_SCIENTIST, STAY, LEFT, TEXT_ROUTE2GATE_OAKS_AIDE + object_event 5, 4, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, TEXT_ROUTE2GATE_YOUNGSTER def_warps_to ROUTE_2_GATE diff --git a/data/maps/objects/Route2TradeHouse.asm b/data/maps/objects/Route2TradeHouse.asm index 7b30b9e85..ef2785ba3 100644 --- a/data/maps/objects/Route2TradeHouse.asm +++ b/data/maps/objects/Route2TradeHouse.asm @@ -1,3 +1,7 @@ + object_const_def + const ROUTE2TRADEHOUSE_SCIENTIST + const ROUTE2TRADEHOUSE_GAMEBOY_KID + Route2TradeHouse_Object: db $a ; border block @@ -8,7 +12,7 @@ Route2TradeHouse_Object: def_bg_events def_object_events - object_event 2, 4, SPRITE_SCIENTIST, STAY, RIGHT, 1 ; person - object_event 4, 1, SPRITE_GAMEBOY_KID, STAY, DOWN, 2 ; person + object_event 2, 4, SPRITE_SCIENTIST, STAY, RIGHT, TEXT_ROUTE2TRADEHOUSE_SCIENTIST + object_event 4, 1, SPRITE_GAMEBOY_KID, STAY, DOWN, TEXT_ROUTE2TRADEHOUSE_GAMEBOY_KID def_warps_to ROUTE_2_TRADE_HOUSE diff --git a/data/maps/objects/Route3.asm b/data/maps/objects/Route3.asm index dc27fe24e..3db963ade 100644 --- a/data/maps/objects/Route3.asm +++ b/data/maps/objects/Route3.asm @@ -1,20 +1,31 @@ + object_const_def + const ROUTE3_SUPER_NERD + const ROUTE3_YOUNGSTER1 + const ROUTE3_YOUNGSTER2 + const ROUTE3_COOLTRAINER_F1 + const ROUTE3_YOUNGSTER3 + const ROUTE3_COOLTRAINER_F2 + const ROUTE3_YOUNGSTER4 + const ROUTE3_YOUNGSTER5 + const ROUTE3_COOLTRAINER_F3 + Route3_Object: db $2c ; border block def_warp_events def_bg_events - bg_event 59, 9, 10 ; Route3Text10 + bg_event 59, 9, 10 ; Route3SignText def_object_events - object_event 57, 11, SPRITE_SUPER_NERD, STAY, NONE, 1 ; person - object_event 10, 6, SPRITE_YOUNGSTER, STAY, RIGHT, 2, OPP_BUG_CATCHER, 4 - object_event 14, 4, SPRITE_YOUNGSTER, STAY, DOWN, 3, OPP_YOUNGSTER, 1 - object_event 16, 9, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_LASS, 1 - object_event 19, 5, SPRITE_YOUNGSTER, STAY, DOWN, 5, OPP_BUG_CATCHER, 5 - object_event 23, 4, SPRITE_COOLTRAINER_F, STAY, LEFT, 6, OPP_LASS, 2 - object_event 22, 9, SPRITE_YOUNGSTER, STAY, LEFT, 7, OPP_YOUNGSTER, 2 - object_event 24, 6, SPRITE_YOUNGSTER, STAY, RIGHT, 8, OPP_BUG_CATCHER, 6 - object_event 33, 10, SPRITE_COOLTRAINER_F, STAY, UP, 9, OPP_LASS, 3 + object_event 57, 11, SPRITE_SUPER_NERD, STAY, NONE, TEXT_ROUTE3_SUPER_NERD + object_event 10, 6, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE3_YOUNGSTER1, OPP_BUG_CATCHER, 4 + object_event 14, 4, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_ROUTE3_YOUNGSTER2, OPP_YOUNGSTER, 1 + object_event 16, 9, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE3_COOLTRAINER_F1, OPP_LASS, 1 + object_event 19, 5, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_ROUTE3_YOUNGSTER3, OPP_BUG_CATCHER, 5 + object_event 23, 4, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE3_COOLTRAINER_F2, OPP_LASS, 2 + object_event 22, 9, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE3_YOUNGSTER4, OPP_YOUNGSTER, 2 + object_event 24, 6, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE3_YOUNGSTER5, OPP_BUG_CATCHER, 6 + object_event 33, 10, SPRITE_COOLTRAINER_F, STAY, UP, TEXT_ROUTE3_COOLTRAINER_F3, OPP_LASS, 3 def_warps_to ROUTE_3 diff --git a/data/maps/objects/Route4.asm b/data/maps/objects/Route4.asm index 2917de1fe..b34c913d4 100644 --- a/data/maps/objects/Route4.asm +++ b/data/maps/objects/Route4.asm @@ -1,3 +1,8 @@ + object_const_def + const ROUTE4_COOLTRAINER_F1 + const ROUTE4_COOLTRAINER_F2 + const ROUTE4_TM_WHIRLWIND + Route4_Object: db $2c ; border block @@ -7,13 +12,13 @@ Route4_Object: warp_event 24, 5, MT_MOON_B1F, 8 def_bg_events - bg_event 12, 5, 4 ; PokeCenterSignText - bg_event 17, 7, 5 ; Route4Text5 - bg_event 27, 7, 6 ; Route4Text6 + bg_event 12, 5, TEXT_ROUTE4_POKECENTER_SIGN + bg_event 17, 7, TEXT_ROUTE4_MT_MOON_SIGN + bg_event 27, 7, TEXT_ROUTE4_SIGN def_object_events - object_event 9, 8, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, 1 ; person - object_event 63, 3, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_LASS, 4 - object_event 57, 3, SPRITE_POKE_BALL, STAY, NONE, 3, TM_WHIRLWIND + object_event 9, 8, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, TEXT_ROUTE4_COOLTRAINER_F1 + object_event 63, 3, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE4_COOLTRAINER_F2, OPP_LASS, 4 + object_event 57, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE4_TM_WHIRLWIND, TM_WHIRLWIND def_warps_to ROUTE_4 diff --git a/data/maps/objects/Route5.asm b/data/maps/objects/Route5.asm index 2e91a7c67..5165bc5de 100644 --- a/data/maps/objects/Route5.asm +++ b/data/maps/objects/Route5.asm @@ -9,7 +9,7 @@ Route5_Object: warp_event 10, 21, DAYCARE, 1 def_bg_events - bg_event 17, 29, 1 ; Route5Text1 + bg_event 17, 29, TEXT_ROUTE5_UNDERGROUND_PATH_SIGN def_object_events diff --git a/data/maps/objects/Route5Gate.asm b/data/maps/objects/Route5Gate.asm index de4ddab29..87b7b5f28 100644 --- a/data/maps/objects/Route5Gate.asm +++ b/data/maps/objects/Route5Gate.asm @@ -1,3 +1,6 @@ + object_const_def + const ROUTE5GATE_GUARD + Route5Gate_Object: db $a ; border block @@ -10,6 +13,6 @@ Route5Gate_Object: def_bg_events def_object_events - object_event 1, 3, SPRITE_GUARD, STAY, RIGHT, 1 ; person + object_event 1, 3, SPRITE_GUARD, STAY, RIGHT, TEXT_ROUTE5GATE_GUARD def_warps_to ROUTE_5_GATE diff --git a/data/maps/objects/Route6.asm b/data/maps/objects/Route6.asm index 33748f0fa..461ccf27b 100644 --- a/data/maps/objects/Route6.asm +++ b/data/maps/objects/Route6.asm @@ -1,3 +1,11 @@ + object_const_def + const ROUTE6_COOLTRAINER_M1 + const ROUTE6_COOLTRAINER_F1 + const ROUTE6_YOUNGSTER_1 + const ROUTE6_COOLTRAINER_M2 + const ROUTE6_COOLTRAINER_F2 + const ROUTE6_YOUNGSTER_2 + Route6_Object: db $f ; border block @@ -8,14 +16,14 @@ Route6_Object: warp_event 17, 13, UNDERGROUND_PATH_ROUTE_6, 1 def_bg_events - bg_event 19, 15, 7 ; Route6Text7 + bg_event 19, 15, TEXT_ROUTE6_UNDERGROUND_PATH_SIGN def_object_events - object_event 10, 21, SPRITE_COOLTRAINER_M, STAY, RIGHT, 1, OPP_JR_TRAINER_M, 4 - object_event 11, 21, SPRITE_COOLTRAINER_F, STAY, LEFT, 2, OPP_JR_TRAINER_F, 2 - object_event 0, 15, SPRITE_YOUNGSTER, STAY, RIGHT, 3, OPP_BUG_CATCHER, 10 - object_event 11, 31, SPRITE_COOLTRAINER_M, STAY, LEFT, 4, OPP_JR_TRAINER_M, 5 - object_event 11, 30, SPRITE_COOLTRAINER_F, STAY, LEFT, 5, OPP_JR_TRAINER_F, 3 - object_event 19, 26, SPRITE_YOUNGSTER, STAY, LEFT, 6, OPP_BUG_CATCHER, 11 + object_event 10, 21, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_ROUTE6_COOLTRAINER_M1, OPP_JR_TRAINER_M, 4 + object_event 11, 21, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE6_COOLTRAINER_F1, OPP_JR_TRAINER_F, 2 + object_event 0, 15, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE6_YOUNGSTER_1, OPP_BUG_CATCHER, 10 + object_event 11, 31, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE6_COOLTRAINER_M2, OPP_JR_TRAINER_M, 5 + object_event 11, 30, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE6_COOLTRAINER_F2, OPP_JR_TRAINER_F, 3 + object_event 19, 26, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE6_YOUNGSTER_2, OPP_BUG_CATCHER, 11 def_warps_to ROUTE_6 diff --git a/data/maps/objects/Route6Gate.asm b/data/maps/objects/Route6Gate.asm index d37213c9e..bce3596e1 100644 --- a/data/maps/objects/Route6Gate.asm +++ b/data/maps/objects/Route6Gate.asm @@ -1,3 +1,6 @@ + object_const_def + const ROUTE6GATE_GUARD + Route6Gate_Object: db $a ; border block @@ -10,6 +13,6 @@ Route6Gate_Object: def_bg_events def_object_events - object_event 6, 2, SPRITE_GUARD, STAY, LEFT, 1 ; person + object_event 6, 2, SPRITE_GUARD, STAY, LEFT, TEXT_ROUTE6GATE_GUARD def_warps_to ROUTE_6_GATE diff --git a/data/maps/objects/Route7.asm b/data/maps/objects/Route7.asm index ec5f2e8af..206ff833f 100644 --- a/data/maps/objects/Route7.asm +++ b/data/maps/objects/Route7.asm @@ -9,7 +9,7 @@ Route7_Object: warp_event 5, 13, UNDERGROUND_PATH_ROUTE_7, 1 def_bg_events - bg_event 3, 13, 1 ; Route7Text1 + bg_event 3, 13, TEXT_ROUTE7_UNDERGROUND_PATH_SIGN def_object_events diff --git a/data/maps/objects/Route7Gate.asm b/data/maps/objects/Route7Gate.asm index 8cc58d9b5..18931e9e4 100644 --- a/data/maps/objects/Route7Gate.asm +++ b/data/maps/objects/Route7Gate.asm @@ -1,3 +1,6 @@ + object_const_def + const ROUTE7GATE_GUARD + Route7Gate_Object: db $a ; border block @@ -10,6 +13,6 @@ Route7Gate_Object: def_bg_events def_object_events - object_event 3, 1, SPRITE_GUARD, STAY, DOWN, 1 ; person + object_event 3, 1, SPRITE_GUARD, STAY, DOWN, TEXT_ROUTE7GATE_GUARD def_warps_to ROUTE_7_GATE diff --git a/data/maps/objects/Route8.asm b/data/maps/objects/Route8.asm index 61faa47fd..de0a1a264 100644 --- a/data/maps/objects/Route8.asm +++ b/data/maps/objects/Route8.asm @@ -1,3 +1,14 @@ + object_const_def + const ROUTE8_SUPER_NERD1 + const ROUTE8_GAMBLER1 + const ROUTE8_SUPER_NERD2 + const ROUTE8_COOLTRAINER_F1 + const ROUTE8_SUPER_NERD3 + const ROUTE8_COOLTRAINER_F2 + const ROUTE8_COOLTRAINER_F3 + const ROUTE8_GAMBLER2 + const ROUTE8_COOLTRAINER_F4 + Route8_Object: db $2c ; border block @@ -9,17 +20,17 @@ Route8_Object: warp_event 13, 3, UNDERGROUND_PATH_ROUTE_8, 1 def_bg_events - bg_event 17, 3, 10 ; Route8Text10 + bg_event 17, 3, TEXT_ROUTE8_UNDERGROUND_SIGN def_object_events - object_event 8, 5, SPRITE_SUPER_NERD, STAY, RIGHT, 1, OPP_SUPER_NERD, 3 - object_event 13, 9, SPRITE_GAMBLER, STAY, UP, 2, OPP_GAMBLER, 5 - object_event 42, 6, SPRITE_SUPER_NERD, STAY, UP, 3, OPP_SUPER_NERD, 4 - object_event 26, 3, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_LASS, 13 - object_event 26, 4, SPRITE_SUPER_NERD, STAY, RIGHT, 5, OPP_SUPER_NERD, 5 - object_event 26, 5, SPRITE_COOLTRAINER_F, STAY, LEFT, 6, OPP_LASS, 14 - object_event 26, 6, SPRITE_COOLTRAINER_F, STAY, RIGHT, 7, OPP_LASS, 15 - object_event 46, 13, SPRITE_GAMBLER, STAY, DOWN, 8, OPP_GAMBLER, 7 - object_event 51, 12, SPRITE_COOLTRAINER_F, STAY, LEFT, 9, OPP_LASS, 16 + object_event 8, 5, SPRITE_SUPER_NERD, STAY, RIGHT, TEXT_ROUTE8_SUPER_NERD1, OPP_SUPER_NERD, 3 + object_event 13, 9, SPRITE_GAMBLER, STAY, UP, TEXT_ROUTE8_GAMBLER1, OPP_GAMBLER, 5 + object_event 42, 6, SPRITE_SUPER_NERD, STAY, UP, TEXT_ROUTE8_SUPER_NERD2, OPP_SUPER_NERD, 4 + object_event 26, 3, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE8_COOLTRAINER_F1, OPP_LASS, 13 + object_event 26, 4, SPRITE_SUPER_NERD, STAY, RIGHT, TEXT_ROUTE8_SUPER_NERD3, OPP_SUPER_NERD, 5 + object_event 26, 5, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE8_COOLTRAINER_F2, OPP_LASS, 14 + object_event 26, 6, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE8_COOLTRAINER_F3, OPP_LASS, 15 + object_event 46, 13, SPRITE_GAMBLER, STAY, DOWN, TEXT_ROUTE8_GAMBLER2, OPP_GAMBLER, 7 + object_event 51, 12, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE8_COOLTRAINER_F4, OPP_LASS, 16 def_warps_to ROUTE_8 diff --git a/data/maps/objects/Route8Gate.asm b/data/maps/objects/Route8Gate.asm index 47a249679..37000dd4d 100644 --- a/data/maps/objects/Route8Gate.asm +++ b/data/maps/objects/Route8Gate.asm @@ -1,3 +1,6 @@ + object_const_def + const ROUTE8GATE_GUARD + Route8Gate_Object: db $a ; border block @@ -10,6 +13,6 @@ Route8Gate_Object: def_bg_events def_object_events - object_event 2, 1, SPRITE_GUARD, STAY, DOWN, 1 ; person + object_event 2, 1, SPRITE_GUARD, STAY, DOWN, TEXT_ROUTE8GATE_GUARD def_warps_to ROUTE_8_GATE diff --git a/data/maps/objects/Route9.asm b/data/maps/objects/Route9.asm index a9be69be7..21c742e9a 100644 --- a/data/maps/objects/Route9.asm +++ b/data/maps/objects/Route9.asm @@ -1,21 +1,33 @@ + object_const_def + const ROUTE9_COOLTRAINER_F1 + const ROUTE9_COOLTRAINER_M1 + const ROUTE9_COOLTRAINER_M2 + const ROUTE9_COOLTRAINER_F2 + const ROUTE9_HIKER_1 + const ROUTE9_HIKER_2 + const ROUTE9_YOUNGSTER_1 + const ROUTE9_HIKER_3 + const ROUTE9_YOUNGSTER_2 + const ROUTE9_TM_TELEPORT + Route9_Object: db $2c ; border block def_warp_events def_bg_events - bg_event 25, 7, 11 ; Route9Text11 + bg_event 25, 7, TEXT_ROUTE9_SIGN def_object_events - object_event 13, 10, SPRITE_COOLTRAINER_F, STAY, LEFT, 1, OPP_JR_TRAINER_F, 5 - object_event 24, 7, SPRITE_COOLTRAINER_M, STAY, LEFT, 2, OPP_JR_TRAINER_M, 7 - object_event 31, 7, SPRITE_COOLTRAINER_M, STAY, RIGHT, 3, OPP_JR_TRAINER_M, 8 - object_event 48, 8, SPRITE_COOLTRAINER_F, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 6 - object_event 16, 15, SPRITE_HIKER, STAY, LEFT, 5, OPP_HIKER, 11 - object_event 43, 3, SPRITE_HIKER, STAY, LEFT, 6, OPP_HIKER, 6 - object_event 22, 2, SPRITE_YOUNGSTER, STAY, DOWN, 7, OPP_BUG_CATCHER, 13 - object_event 45, 15, SPRITE_HIKER, STAY, RIGHT, 8, OPP_HIKER, 5 - object_event 40, 8, SPRITE_YOUNGSTER, STAY, RIGHT, 9, OPP_BUG_CATCHER, 14 - object_event 10, 15, SPRITE_POKE_BALL, STAY, NONE, 10, TM_TELEPORT + object_event 13, 10, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE9_COOLTRAINER_F1, OPP_JR_TRAINER_F, 5 + object_event 24, 7, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE9_COOLTRAINER_M1, OPP_JR_TRAINER_M, 7 + object_event 31, 7, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_ROUTE9_COOLTRAINER_M2, OPP_JR_TRAINER_M, 8 + object_event 48, 8, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE9_COOLTRAINER_F2, OPP_JR_TRAINER_F, 6 + object_event 16, 15, SPRITE_HIKER, STAY, LEFT, TEXT_ROUTE9_HIKER_1, OPP_HIKER, 11 + object_event 43, 3, SPRITE_HIKER, STAY, LEFT, TEXT_ROUTE9_HIKER_2, OPP_HIKER, 6 + object_event 22, 2, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_ROUTE9_YOUNGSTER_1, OPP_BUG_CATCHER, 13 + object_event 45, 15, SPRITE_HIKER, STAY, RIGHT, TEXT_ROUTE9_HIKER_3, OPP_HIKER, 5 + object_event 40, 8, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE9_YOUNGSTER_2, OPP_BUG_CATCHER, 14 + object_event 10, 15, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE9_TM_TELEPORT, TM_TELEPORT def_warps_to ROUTE_9 diff --git a/data/maps/objects/SSAnne1F.asm b/data/maps/objects/SSAnne1F.asm index 61184a1b4..0a00befd4 100644 --- a/data/maps/objects/SSAnne1F.asm +++ b/data/maps/objects/SSAnne1F.asm @@ -1,3 +1,7 @@ + object_const_def + const SSANNE1F_WAITER + const SSANNE1F_SAILOR + SSAnne1F_Object: db $c ; border block @@ -17,7 +21,7 @@ SSAnne1F_Object: def_bg_events def_object_events - object_event 12, 6, SPRITE_WAITER, WALK, LEFT_RIGHT, 1 ; person - object_event 27, 5, SPRITE_SAILOR, STAY, NONE, 2 ; person + object_event 12, 6, SPRITE_WAITER, WALK, LEFT_RIGHT, TEXT_SSANNE1F_WAITER + object_event 27, 5, SPRITE_SAILOR, STAY, NONE, TEXT_SSANNE1F_SAILOR def_warps_to SS_ANNE_1F diff --git a/data/maps/objects/SSAnne1FRooms.asm b/data/maps/objects/SSAnne1FRooms.asm index 6192c31a3..c23fe124f 100644 --- a/data/maps/objects/SSAnne1FRooms.asm +++ b/data/maps/objects/SSAnne1FRooms.asm @@ -1,3 +1,16 @@ + object_const_def + const SSANNE1FROOMS_GENTLEMAN1 + const SSANNE1FROOMS_GENTLEMAN2 + const SSANNE1FROOMS_YOUNGSTER + const SSANNE1FROOMS_COOLTRAINER_F + const SSANNE1FROOMS_GIRL1 + const SSANNE1FROOMS_MIDDLE_AGED_MAN + const SSANNE1FROOMS_LITTLE_GIRL + const SSANNE1FROOMS_WIGGLYTUFF + const SSANNE1FROOMS_GIRL2 + const SSANNE1FROOMS_TM_BODY_SLAM + const SSANNE1FROOMS_GENTLEMAN3 + SSAnne1FRooms_Object: db $c ; border block @@ -12,16 +25,16 @@ SSAnne1FRooms_Object: def_bg_events def_object_events - object_event 2, 3, SPRITE_GENTLEMAN, STAY, LEFT, 1, OPP_GENTLEMAN, 1 - object_event 11, 4, SPRITE_GENTLEMAN, STAY, UP, 2, OPP_GENTLEMAN, 2 - object_event 11, 14, SPRITE_YOUNGSTER, STAY, UP, 3, OPP_YOUNGSTER, 8 - object_event 13, 11, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_LASS, 11 - object_event 22, 3, SPRITE_GIRL, WALK, UP_DOWN, 5 ; person - object_event 0, 14, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 6 ; person - object_event 2, 11, SPRITE_LITTLE_GIRL, STAY, DOWN, 7 ; person - object_event 3, 11, SPRITE_FAIRY, STAY, DOWN, 8 ; person - object_event 10, 13, SPRITE_GIRL, STAY, RIGHT, 9 ; person - object_event 12, 15, SPRITE_POKE_BALL, STAY, NONE, 10, TM_BODY_SLAM - object_event 21, 13, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 11 ; person + object_event 2, 3, SPRITE_GENTLEMAN, STAY, LEFT, TEXT_SSANNE1FROOMS_GENTLEMAN1, OPP_GENTLEMAN, 1 + object_event 11, 4, SPRITE_GENTLEMAN, STAY, UP, TEXT_SSANNE1FROOMS_GENTLEMAN2, OPP_GENTLEMAN, 2 + object_event 11, 14, SPRITE_YOUNGSTER, STAY, UP, TEXT_SSANNE1FROOMS_YOUNGSTER, OPP_YOUNGSTER, 8 + object_event 13, 11, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_SSANNE1FROOMS_COOLTRAINER_F, OPP_LASS, 11 + object_event 22, 3, SPRITE_GIRL, WALK, UP_DOWN, TEXT_SSANNE1FROOMS_GIRL1 + object_event 0, 14, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, TEXT_SSANNE1FROOMS_MIDDLE_AGED_MAN + object_event 2, 11, SPRITE_LITTLE_GIRL, STAY, DOWN, TEXT_SSANNE1FROOMS_LITTLE_GIRL + object_event 3, 11, SPRITE_FAIRY, STAY, DOWN, TEXT_SSANNE1FROOMS_WIGGLYTUFF + object_event 10, 13, SPRITE_GIRL, STAY, RIGHT, TEXT_SSANNE1FROOMS_GIRL2 + object_event 12, 15, SPRITE_POKE_BALL, STAY, NONE, TEXT_SSANNE1FROOMS_TM_BODY_SLAM, TM_BODY_SLAM + object_event 21, 13, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, TEXT_SSANNE1FROOMS_GENTLEMAN3 def_warps_to SS_ANNE_1F_ROOMS diff --git a/data/maps/objects/SSAnne2F.asm b/data/maps/objects/SSAnne2F.asm index cfd93189d..283ca70f1 100644 --- a/data/maps/objects/SSAnne2F.asm +++ b/data/maps/objects/SSAnne2F.asm @@ -1,3 +1,7 @@ + object_const_def + const SSANNE2F_WAITER + const SSANNE2F_RIVAL + SSAnne2F_Object: db $c ; border block @@ -15,7 +19,7 @@ SSAnne2F_Object: def_bg_events def_object_events - object_event 3, 7, SPRITE_WAITER, WALK, UP_DOWN, 1 ; person - object_event 36, 4, SPRITE_BLUE, STAY, DOWN, 2, OPP_RIVAL1, 1 + object_event 3, 7, SPRITE_WAITER, WALK, UP_DOWN, TEXT_SSANNE2F_WAITER + object_event 36, 4, SPRITE_BLUE, STAY, DOWN, TEXT_SSANNE2F_RIVAL, OPP_RIVAL1, 1 def_warps_to SS_ANNE_2F diff --git a/data/maps/objects/SSAnne2FRooms.asm b/data/maps/objects/SSAnne2FRooms.asm index 1a9a1cb1a..22e59bbe6 100644 --- a/data/maps/objects/SSAnne2FRooms.asm +++ b/data/maps/objects/SSAnne2FRooms.asm @@ -1,3 +1,18 @@ + object_const_def + const SSANNE2FROOMS_GENTLEMAN1 + const SSANNE2FROOMS_FISHER + const SSANNE2FROOMS_GENTLEMAN2 + const SSANNE2FROOMS_COOLTRAINER_F + const SSANNE2FROOMS_GENTLEMAN3 + const SSANNE2FROOMS_MAX_ETHER + const SSANNE2FROOMS_GENTLEMAN4 + const SSANNE2FROOMS_GRAMPS + const SSANNE2FROOMS_RARE_CANDY + const SSANNE2FROOMS_GENTLEMAN5 + const SSANNE2FROOMS_LITTLE_BOY + const SSANNE2FROOMS_BRUNETTE_GIRL + const SSANNE2FROOMS_BEAUTY + SSAnne2FRooms_Object: db $c ; border block @@ -18,18 +33,18 @@ SSAnne2FRooms_Object: def_bg_events def_object_events - object_event 10, 2, SPRITE_GENTLEMAN, STAY, RIGHT, 1, OPP_GENTLEMAN, 3 - object_event 13, 4, SPRITE_FISHER, STAY, LEFT, 2, OPP_FISHER, 1 - object_event 0, 14, SPRITE_GENTLEMAN, STAY, RIGHT, 3, OPP_GENTLEMAN, 5 - object_event 2, 11, SPRITE_COOLTRAINER_F, STAY, DOWN, 4, OPP_LASS, 12 - object_event 1, 2, SPRITE_GENTLEMAN, STAY, DOWN, 5 ; person - object_event 12, 1, SPRITE_POKE_BALL, STAY, NONE, 6, MAX_ETHER - object_event 21, 2, SPRITE_GENTLEMAN, STAY, DOWN, 7 ; person - object_event 22, 1, SPRITE_GRAMPS, STAY, DOWN, 8 ; person - object_event 0, 12, SPRITE_POKE_BALL, STAY, NONE, 9, RARE_CANDY - object_event 12, 12, SPRITE_GENTLEMAN, STAY, DOWN, 10 ; person - object_event 11, 14, SPRITE_LITTLE_BOY, STAY, NONE, 11 ; person - object_event 22, 12, SPRITE_BRUNETTE_GIRL, STAY, LEFT, 12 ; person - object_event 20, 12, SPRITE_BEAUTY, STAY, RIGHT, 13 ; person + object_event 10, 2, SPRITE_GENTLEMAN, STAY, RIGHT, TEXT_SSANNE2FROOMS_GENTLEMAN1, OPP_GENTLEMAN, 3 + object_event 13, 4, SPRITE_FISHER, STAY, LEFT, TEXT_SSANNE2FROOMS_FISHER, OPP_FISHER, 1 + object_event 0, 14, SPRITE_GENTLEMAN, STAY, RIGHT, TEXT_SSANNE2FROOMS_GENTLEMAN2, OPP_GENTLEMAN, 5 + object_event 2, 11, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_SSANNE2FROOMS_COOLTRAINER_F, OPP_LASS, 12 + object_event 1, 2, SPRITE_GENTLEMAN, STAY, DOWN, TEXT_SSANNE2FROOMS_GENTLEMAN3 + object_event 12, 1, SPRITE_POKE_BALL, STAY, NONE, TEXT_SSANNE2FROOMS_MAX_ETHER, MAX_ETHER + object_event 21, 2, SPRITE_GENTLEMAN, STAY, DOWN, TEXT_SSANNE2FROOMS_GENTLEMAN4 + object_event 22, 1, SPRITE_GRAMPS, STAY, DOWN, TEXT_SSANNE2FROOMS_GRAMPS + object_event 0, 12, SPRITE_POKE_BALL, STAY, NONE, TEXT_SSANNE2FROOMS_RARE_CANDY, RARE_CANDY + object_event 12, 12, SPRITE_GENTLEMAN, STAY, DOWN, TEXT_SSANNE2FROOMS_GENTLEMAN5 + object_event 11, 14, SPRITE_LITTLE_BOY, STAY, NONE, TEXT_SSANNE2FROOMS_LITTLE_BOY + object_event 22, 12, SPRITE_BRUNETTE_GIRL, STAY, LEFT, TEXT_SSANNE2FROOMS_BRUNETTE_GIRL + object_event 20, 12, SPRITE_BEAUTY, STAY, RIGHT, TEXT_SSANNE2FROOMS_BEAUTY def_warps_to SS_ANNE_2F_ROOMS diff --git a/data/maps/objects/SSAnne3F.asm b/data/maps/objects/SSAnne3F.asm index 09c4b5bd7..db904ad6e 100644 --- a/data/maps/objects/SSAnne3F.asm +++ b/data/maps/objects/SSAnne3F.asm @@ -1,3 +1,6 @@ + object_const_def + const SSANNE3F_SAILOR + SSAnne3F_Object: db $c ; border block @@ -8,6 +11,6 @@ SSAnne3F_Object: def_bg_events def_object_events - object_event 9, 3, SPRITE_SAILOR, WALK, LEFT_RIGHT, 1 ; person + object_event 9, 3, SPRITE_SAILOR, WALK, LEFT_RIGHT, TEXT_SSANNE3F_SAILOR def_warps_to SS_ANNE_3F diff --git a/data/maps/objects/SSAnneB1FRooms.asm b/data/maps/objects/SSAnneB1FRooms.asm index 3c7da689e..f7654fbb5 100644 --- a/data/maps/objects/SSAnneB1FRooms.asm +++ b/data/maps/objects/SSAnneB1FRooms.asm @@ -1,3 +1,16 @@ + object_const_def + const SSANNEB1FROOMS_SAILOR1 + const SSANNEB1FROOMS_SAILOR2 + const SSANNEB1FROOMS_SAILOR3 + const SSANNEB1FROOMS_SAILOR4 + const SSANNEB1FROOMS_SAILOR5 + const SSANNEB1FROOMS_FISHER + const SSANNEB1FROOMS_SUPER_NERD + const SSANNEB1FROOMS_MACHOKE + const SSANNEB1FROOMS_ETHER + const SSANNEB1FROOMS_TM_REST + const SSANNEB1FROOMS_MAX_POTION + SSAnneB1FRooms_Object: db $c ; border block @@ -16,14 +29,14 @@ SSAnneB1FRooms_Object: def_bg_events def_object_events - object_event 0, 13, SPRITE_SAILOR, STAY, DOWN, 1, OPP_SAILOR, 3 - object_event 2, 11, SPRITE_SAILOR, STAY, DOWN, 2, OPP_SAILOR, 4 - object_event 12, 3, SPRITE_SAILOR, STAY, LEFT, 3, OPP_SAILOR, 5 - object_event 22, 2, SPRITE_SAILOR, STAY, DOWN, 4, OPP_SAILOR, 6 - object_event 0, 2, SPRITE_SAILOR, STAY, RIGHT, 5, OPP_SAILOR, 7 - object_event 0, 4, SPRITE_FISHER, STAY, RIGHT, 6, OPP_FISHER, 2 - object_event 10, 13, SPRITE_SUPER_NERD, STAY, RIGHT, 7 ; person - object_event 11, 12, SPRITE_MONSTER, STAY, NONE, 8 ; person + object_event 0, 13, SPRITE_SAILOR, STAY, DOWN, TEXT_SSANNEB1FROOMS_SAILOR1, OPP_SAILOR, 3 + object_event 2, 11, SPRITE_SAILOR, STAY, DOWN, TEXT_SSANNEB1FROOMS_SAILOR2, OPP_SAILOR, 4 + object_event 12, 3, SPRITE_SAILOR, STAY, LEFT, TEXT_SSANNEB1FROOMS_SAILOR3, OPP_SAILOR, 5 + object_event 22, 2, SPRITE_SAILOR, STAY, DOWN, TEXT_SSANNEB1FROOMS_SAILOR4, OPP_SAILOR, 6 + object_event 0, 2, SPRITE_SAILOR, STAY, RIGHT, TEXT_SSANNEB1FROOMS_SAILOR5, OPP_SAILOR, 7 + object_event 0, 4, SPRITE_FISHER, STAY, RIGHT, TEXT_SSANNEB1FROOMS_FISHER, OPP_FISHER, 2 + object_event 10, 13, SPRITE_SUPER_NERD, STAY, RIGHT, TEXT_SSANNEB1FROOMS_SUPER_NERD + object_event 11, 12, SPRITE_MONSTER, STAY, NONE, TEXT_SSANNEB1FROOMS_MACHOKE object_event 20, 2, SPRITE_POKE_BALL, STAY, NONE, 9, ETHER object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 10, TM_REST object_event 12, 11, SPRITE_POKE_BALL, STAY, NONE, 11, MAX_POTION diff --git a/data/maps/objects/SSAnneBow.asm b/data/maps/objects/SSAnneBow.asm index 6374f0090..41e5c0492 100644 --- a/data/maps/objects/SSAnneBow.asm +++ b/data/maps/objects/SSAnneBow.asm @@ -1,3 +1,10 @@ + object_const_def + const SSANNEBOW_SUPER_NERD + const SSANNEBOW_SAILOR1 + const SSANNEBOW_COOLTRAINER_M + const SSANNEBOW_SAILOR2 + const SSANNEBOW_SAILOR3 + SSAnneBow_Object: db $23 ; border block @@ -8,10 +15,10 @@ SSAnneBow_Object: def_bg_events def_object_events - object_event 5, 2, SPRITE_SUPER_NERD, STAY, UP, 1 ; person - object_event 4, 9, SPRITE_SAILOR, STAY, NONE, 2 ; person - object_event 7, 11, SPRITE_COOLTRAINER_M, STAY, NONE, 3 ; person - object_event 4, 4, SPRITE_SAILOR, STAY, DOWN, 4, OPP_SAILOR, 1 - object_event 10, 8, SPRITE_SAILOR, STAY, UP, 5, OPP_SAILOR, 2 + object_event 5, 2, SPRITE_SUPER_NERD, STAY, UP, TEXT_SSANNEBOW_SUPER_NERD + object_event 4, 9, SPRITE_SAILOR, STAY, NONE, TEXT_SSANNEBOW_SAILOR1 + object_event 7, 11, SPRITE_COOLTRAINER_M, STAY, NONE, TEXT_SSANNEBOW_COOLTRAINER_M + object_event 4, 4, SPRITE_SAILOR, STAY, DOWN, TEXT_SSANNEBOW_SAILOR2, OPP_SAILOR, 1 + object_event 10, 8, SPRITE_SAILOR, STAY, UP, TEXT_SSANNEBOW_SAILOR3, OPP_SAILOR, 2 def_warps_to SS_ANNE_BOW diff --git a/data/maps/objects/SSAnneCaptainsRoom.asm b/data/maps/objects/SSAnneCaptainsRoom.asm index 195e41837..7121a7b38 100644 --- a/data/maps/objects/SSAnneCaptainsRoom.asm +++ b/data/maps/objects/SSAnneCaptainsRoom.asm @@ -1,3 +1,6 @@ + object_const_def + const SSANNECAPTAINSROOM_CAPTAIN + SSAnneCaptainsRoom_Object: db $c ; border block @@ -5,10 +8,10 @@ SSAnneCaptainsRoom_Object: warp_event 0, 7, SS_ANNE_2F, 9 def_bg_events - bg_event 4, 1, 2 ; SSAnne7Text2 - bg_event 1, 2, 3 ; SSAnne7Text3 + bg_event 4, 1, TEXT_SSANNECAPTAINSROOM_TRASH + bg_event 1, 2, TEXT_SSANNECAPTAINSROOM_SEASICK_BOOK def_object_events - object_event 4, 2, SPRITE_CAPTAIN, STAY, UP, 1 ; person + object_event 4, 2, SPRITE_CAPTAIN, STAY, UP, TEXT_SSANNECAPTAINSROOM_CAPTAIN def_warps_to SS_ANNE_CAPTAINS_ROOM diff --git a/data/maps/objects/SSAnneKitchen.asm b/data/maps/objects/SSAnneKitchen.asm index c651679e6..d44e9547d 100644 --- a/data/maps/objects/SSAnneKitchen.asm +++ b/data/maps/objects/SSAnneKitchen.asm @@ -1,3 +1,12 @@ + object_const_def + const SSANNEKITCHEN_COOK1 + const SSANNEKITCHEN_COOK2 + const SSANNEKITCHEN_COOK3 + const SSANNEKITCHEN_COOK4 + const SSANNEKITCHEN_COOK5 + const SSANNEKITCHEN_COOK6 + const SSANNEKITCHEN_COOK7 + SSAnneKitchen_Object: db $c ; border block @@ -7,12 +16,12 @@ SSAnneKitchen_Object: def_bg_events def_object_events - object_event 1, 8, SPRITE_COOK, WALK, UP_DOWN, 1 ; person - object_event 5, 8, SPRITE_COOK, WALK, UP_DOWN, 2 ; person - object_event 9, 7, SPRITE_COOK, WALK, UP_DOWN, 3 ; person - object_event 13, 6, SPRITE_COOK, STAY, NONE, 4 ; person - object_event 13, 8, SPRITE_COOK, STAY, NONE, 5 ; person - object_event 13, 10, SPRITE_COOK, STAY, NONE, 6 ; person - object_event 11, 13, SPRITE_COOK, STAY, UP, 7 ; person + object_event 1, 8, SPRITE_COOK, WALK, UP_DOWN, TEXT_SSANNEKITCHEN_COOK1 + object_event 5, 8, SPRITE_COOK, WALK, UP_DOWN, TEXT_SSANNEKITCHEN_COOK2 + object_event 9, 7, SPRITE_COOK, WALK, UP_DOWN, TEXT_SSANNEKITCHEN_COOK3 + object_event 13, 6, SPRITE_COOK, STAY, NONE, TEXT_SSANNEKITCHEN_COOK4 + object_event 13, 8, SPRITE_COOK, STAY, NONE, TEXT_SSANNEKITCHEN_COOK5 + object_event 13, 10, SPRITE_COOK, STAY, NONE, TEXT_SSANNEKITCHEN_COOK6 + object_event 11, 13, SPRITE_COOK, STAY, UP, TEXT_SSANNEKITCHEN_COOK7 def_warps_to SS_ANNE_KITCHEN diff --git a/data/maps/objects/SafariZoneCenter.asm b/data/maps/objects/SafariZoneCenter.asm index 1c8efe956..ac176e149 100644 --- a/data/maps/objects/SafariZoneCenter.asm +++ b/data/maps/objects/SafariZoneCenter.asm @@ -1,3 +1,6 @@ + object_const_def + const SAFARIZONECENTER_NUGGET + SafariZoneCenter_Object: db $0 ; border block @@ -13,10 +16,10 @@ SafariZoneCenter_Object: warp_event 17, 19, SAFARI_ZONE_CENTER_REST_HOUSE, 1 def_bg_events - bg_event 18, 20, 2 ; SafariZoneCenterText2 - bg_event 14, 22, 3 ; SafariZoneCenterText3 + bg_event 18, 20, TEXT_SAFARIZONECENTER_REST_HOUSE_SIGN + bg_event 14, 22, TEXT_SAFARIZONECENTER_TRAINER_TIPS_SIGN def_object_events - object_event 14, 10, SPRITE_POKE_BALL, STAY, NONE, 1, NUGGET + object_event 14, 10, SPRITE_POKE_BALL, STAY, NONE, TEXT_SAFARIZONECENTER_NUGGET, NUGGET def_warps_to SAFARI_ZONE_CENTER diff --git a/data/maps/objects/SafariZoneCenterRestHouse.asm b/data/maps/objects/SafariZoneCenterRestHouse.asm index ff48d19c9..06ec0d22c 100644 --- a/data/maps/objects/SafariZoneCenterRestHouse.asm +++ b/data/maps/objects/SafariZoneCenterRestHouse.asm @@ -1,3 +1,7 @@ + object_const_def + const SAFARIZONECENTERRESTHOUSE_GIRL + const SAFARIZONECENTERRESTHOUSE_SCIENTIST + SafariZoneCenterRestHouse_Object: db $a ; border block @@ -8,7 +12,7 @@ SafariZoneCenterRestHouse_Object: def_bg_events def_object_events - object_event 3, 2, SPRITE_GIRL, STAY, DOWN, 1 ; person - object_event 1, 4, SPRITE_SCIENTIST, WALK, UP_DOWN, 2 ; person + object_event 3, 2, SPRITE_GIRL, STAY, DOWN, TEXT_SAFARIZONECENTERRESTHOUSE_GIRL + object_event 1, 4, SPRITE_SCIENTIST, WALK, UP_DOWN, TEXT_SAFARIZONECENTERRESTHOUSE_SCIENTIST def_warps_to SAFARI_ZONE_CENTER_REST_HOUSE diff --git a/data/maps/objects/SafariZoneEast.asm b/data/maps/objects/SafariZoneEast.asm index 30fb40398..0b4e26b46 100644 --- a/data/maps/objects/SafariZoneEast.asm +++ b/data/maps/objects/SafariZoneEast.asm @@ -1,3 +1,9 @@ + object_const_def + const SAFARIZONEEAST_FULL_RESTORE + const SAFARIZONEEAST_MAX_RESTORE + const SAFARIZONEEAST_CARBOS + const SAFARIZONEEAST_TM_EGG_BOMB + SafariZoneEast_Object: db $0 ; border block @@ -9,14 +15,14 @@ SafariZoneEast_Object: warp_event 25, 9, SAFARI_ZONE_EAST_REST_HOUSE, 1 def_bg_events - bg_event 26, 10, 5 ; SafariZoneEastText5 - bg_event 6, 4, 6 ; SafariZoneEastText6 - bg_event 5, 23, 7 ; SafariZoneEastText7 + bg_event 26, 10, TEXT_SAFARIZONEEAST_REST_HOUSE_SIGN + bg_event 6, 4, TEXT_SAFARIZONEEAST_TRAINER_TIPS + bg_event 5, 23, TEXT_SAFARIZONEEAST_SIGN def_object_events - object_event 21, 10, SPRITE_POKE_BALL, STAY, NONE, 1, FULL_RESTORE - object_event 3, 7, SPRITE_POKE_BALL, STAY, NONE, 2, MAX_POTION - object_event 20, 13, SPRITE_POKE_BALL, STAY, NONE, 3, CARBOS - object_event 15, 12, SPRITE_POKE_BALL, STAY, NONE, 4, TM_EGG_BOMB + object_event 21, 10, SPRITE_POKE_BALL, STAY, NONE, TEXT_SAFARIZONEEAST_FULL_RESTORE, FULL_RESTORE + object_event 3, 7, SPRITE_POKE_BALL, STAY, NONE, TEXT_SAFARIZONEEAST_MAX_RESTORE, MAX_POTION + object_event 20, 13, SPRITE_POKE_BALL, STAY, NONE, TEXT_SAFARIZONEEAST_CARBOS, CARBOS + object_event 15, 12, SPRITE_POKE_BALL, STAY, NONE, TEXT_SAFARIZONEEAST_TM_EGG_BOMB, TM_EGG_BOMB def_warps_to SAFARI_ZONE_EAST diff --git a/data/maps/objects/SafariZoneEastRestHouse.asm b/data/maps/objects/SafariZoneEastRestHouse.asm index bf5066055..7c89d27ef 100644 --- a/data/maps/objects/SafariZoneEastRestHouse.asm +++ b/data/maps/objects/SafariZoneEastRestHouse.asm @@ -1,3 +1,8 @@ + object_const_def + const SAFARIZONEEASTRESTHOUSE_SCIENTIST + const SAFARIZONEEASTRESTHOUSE_ROCKER + const SAFARIZONEEASTRESTHOUSE_SILPH_WORKER_M + SafariZoneEastRestHouse_Object: db $a ; border block @@ -8,8 +13,8 @@ SafariZoneEastRestHouse_Object: def_bg_events def_object_events - object_event 1, 3, SPRITE_SCIENTIST, WALK, UP_DOWN, 1 ; person - object_event 4, 2, SPRITE_ROCKER, STAY, NONE, 2 ; person - object_event 5, 2, SPRITE_SILPH_WORKER, STAY, NONE, 3 ; person + object_event 1, 3, SPRITE_SCIENTIST, WALK, UP_DOWN, TEXT_SAFARIZONEEASTRESTHOUSE_SCIENTIST + object_event 4, 2, SPRITE_ROCKER, STAY, NONE, TEXT_SAFARIZONEEASTRESTHOUSE_ROCKER + object_event 5, 2, SPRITE_SILPH_WORKER_M, STAY, NONE, TEXT_SAFARIZONEEASTRESTHOUSE_SILPH_WORKER_M def_warps_to SAFARI_ZONE_EAST_REST_HOUSE diff --git a/data/maps/objects/SafariZoneGate.asm b/data/maps/objects/SafariZoneGate.asm index ba6f70170..c9542e69b 100644 --- a/data/maps/objects/SafariZoneGate.asm +++ b/data/maps/objects/SafariZoneGate.asm @@ -1,3 +1,7 @@ + object_const_def + const SAFARIZONEGATE_SAFARI_ZONE_WORKER1 + const SAFARIZONEGATE_SAFARI_ZONE_WORKER2 + SafariZoneGate_Object: db $a ; border block @@ -10,7 +14,7 @@ SafariZoneGate_Object: def_bg_events def_object_events - object_event 6, 2, SPRITE_SAFARI_ZONE_WORKER, STAY, LEFT, 1 ; person - object_event 1, 4, SPRITE_SAFARI_ZONE_WORKER, STAY, RIGHT, 2 ; person + object_event 6, 2, SPRITE_SAFARI_ZONE_WORKER, STAY, LEFT, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1 + object_event 1, 4, SPRITE_SAFARI_ZONE_WORKER, STAY, RIGHT, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER2 def_warps_to SAFARI_ZONE_GATE diff --git a/data/maps/objects/SafariZoneNorth.asm b/data/maps/objects/SafariZoneNorth.asm index 97dc0d55c..2ee7b17a3 100644 --- a/data/maps/objects/SafariZoneNorth.asm +++ b/data/maps/objects/SafariZoneNorth.asm @@ -1,3 +1,7 @@ + object_const_def + const SAFARIZONENORTH_PROTEIN + const SAFARIZONENORTH_TM_SKULL_BASH + SafariZoneNorth_Object: db $0 ; border block @@ -13,14 +17,14 @@ SafariZoneNorth_Object: warp_event 35, 3, SAFARI_ZONE_NORTH_REST_HOUSE, 1 def_bg_events - bg_event 36, 4, 3 ; SafariZoneNorthText3 - bg_event 4, 25, 4 ; SafariZoneNorthText4 - bg_event 13, 31, 5 ; SafariZoneNorthText5 - bg_event 19, 33, 6 ; SafariZoneNorthText6 - bg_event 26, 28, 7 ; SafariZoneNorthText7 + bg_event 36, 4, TEXT_SAFARIZONENORTH_REST_HOUSE_SIGN + bg_event 4, 25, TEXT_SAFARIZONENORTH_TRAINER_TIPS_1 + bg_event 13, 31, TEXT_SAFARIZONENORTH_SIGN + bg_event 19, 33, TEXT_SAFARIZONENORTH_TRAINER_TIPS_2 + bg_event 26, 28, TEXT_SAFARIZONENORTH_TRAINER_TIPS_3 def_object_events - object_event 25, 1, SPRITE_POKE_BALL, STAY, NONE, 1, PROTEIN - object_event 19, 7, SPRITE_POKE_BALL, STAY, NONE, 2, TM_SKULL_BASH + object_event 25, 1, SPRITE_POKE_BALL, STAY, NONE, TEXT_SAFARIZONENORTH_PROTEIN, PROTEIN + object_event 19, 7, SPRITE_POKE_BALL, STAY, NONE, TEXT_SAFARIZONENORTH_TM_SKULL_BASH, TM_SKULL_BASH def_warps_to SAFARI_ZONE_NORTH diff --git a/data/maps/objects/SafariZoneNorthRestHouse.asm b/data/maps/objects/SafariZoneNorthRestHouse.asm index 8fbacd81d..edb99c6b0 100644 --- a/data/maps/objects/SafariZoneNorthRestHouse.asm +++ b/data/maps/objects/SafariZoneNorthRestHouse.asm @@ -1,3 +1,8 @@ + object_const_def + const SAFARIZONENORTHRESTHOUSE_SCIENTIST + const SAFARIZONENORTHRESTHOUSE_SAFARI_ZONE_WORKER + const SAFARIZONENORTHRESTHOUSE_GENTLEMAN + SafariZoneNorthRestHouse_Object: db $a ; border block @@ -8,8 +13,8 @@ SafariZoneNorthRestHouse_Object: def_bg_events def_object_events - object_event 6, 3, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, 1 ; person - object_event 3, 4, SPRITE_SAFARI_ZONE_WORKER, STAY, NONE, 2 ; person - object_event 1, 5, SPRITE_GENTLEMAN, WALK, UP_DOWN, 3 ; person + object_event 6, 3, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, TEXT_SAFARIZONENORTHRESTHOUSE_SCIENTIST + object_event 3, 4, SPRITE_SAFARI_ZONE_WORKER, STAY, NONE, TEXT_SAFARIZONENORTHRESTHOUSE_SAFARI_ZONE_WORKER + object_event 1, 5, SPRITE_GENTLEMAN, WALK, UP_DOWN, TEXT_SAFARIZONENORTHRESTHOUSE_GENTLEMAN def_warps_to SAFARI_ZONE_NORTH_REST_HOUSE diff --git a/data/maps/objects/SafariZoneSecretHouse.asm b/data/maps/objects/SafariZoneSecretHouse.asm index 5d3a28c28..44ebd3422 100644 --- a/data/maps/objects/SafariZoneSecretHouse.asm +++ b/data/maps/objects/SafariZoneSecretHouse.asm @@ -1,3 +1,6 @@ + object_const_def + const SAFARIZONESECRETHOUSE_FISHING_GURU + SafariZoneSecretHouse_Object: db $17 ; border block @@ -8,6 +11,6 @@ SafariZoneSecretHouse_Object: def_bg_events def_object_events - object_event 3, 3, SPRITE_FISHING_GURU, STAY, DOWN, 1 ; person + object_event 3, 3, SPRITE_FISHING_GURU, STAY, DOWN, TEXT_SAFARIZONESECRETHOUSE_FISHING_GURU def_warps_to SAFARI_ZONE_SECRET_HOUSE diff --git a/data/maps/objects/SafariZoneWest.asm b/data/maps/objects/SafariZoneWest.asm index dca3d3a8a..284cd244c 100644 --- a/data/maps/objects/SafariZoneWest.asm +++ b/data/maps/objects/SafariZoneWest.asm @@ -1,3 +1,9 @@ + object_const_def + const SAFARIZONEWEST_MAX_POTION + const SAFARIZONEWEST_TM_DOUBLE_TEAM + const SAFARIZONEWEST_MAX_REVIVE + const SAFARIZONEWEST_GOLD_TEETH + SafariZoneWest_Object: db $0 ; border block @@ -12,15 +18,15 @@ SafariZoneWest_Object: warp_event 11, 11, SAFARI_ZONE_WEST_REST_HOUSE, 1 def_bg_events - bg_event 12, 12, 5 ; SafariZoneWestText5 - bg_event 17, 3, 6 ; SafariZoneWestText6 - bg_event 26, 4, 7 ; SafariZoneWestText7 - bg_event 24, 22, 8 ; SafariZoneWestText8 + bg_event 12, 12, TEXT_SAFARIZONEWEST_REST_HOUSE_SIGN + bg_event 17, 3, TEXT_SAFARIZONEWEST_FIND_WARDENS_TEETH_SIGN + bg_event 26, 4, TEXT_SAFARIZONEWEST_TRAINER_TIPS + bg_event 24, 22, TEXT_SAFARIZONEWEST_SIGN def_object_events - object_event 8, 20, SPRITE_POKE_BALL, STAY, NONE, 1, MAX_POTION - object_event 9, 7, SPRITE_POKE_BALL, STAY, NONE, 2, TM_DOUBLE_TEAM - object_event 18, 18, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_REVIVE - object_event 19, 7, SPRITE_POKE_BALL, STAY, NONE, 4, GOLD_TEETH + object_event 8, 20, SPRITE_POKE_BALL, STAY, NONE, TEXT_SAFARIZONEWEST_MAX_POTION, MAX_POTION + object_event 9, 7, SPRITE_POKE_BALL, STAY, NONE, TEXT_SAFARIZONEWEST_TM_DOUBLE_TEAM, TM_DOUBLE_TEAM + object_event 18, 18, SPRITE_POKE_BALL, STAY, NONE, TEXT_SAFARIZONEWEST_MAX_REVIVE, MAX_REVIVE + object_event 19, 7, SPRITE_POKE_BALL, STAY, NONE, TEXT_SAFARIZONEWEST_GOLD_TEETH, GOLD_TEETH def_warps_to SAFARI_ZONE_WEST diff --git a/data/maps/objects/SafariZoneWestRestHouse.asm b/data/maps/objects/SafariZoneWestRestHouse.asm index c63886b7d..bf2eabe2f 100644 --- a/data/maps/objects/SafariZoneWestRestHouse.asm +++ b/data/maps/objects/SafariZoneWestRestHouse.asm @@ -1,3 +1,8 @@ + object_const_def + const SAFARIZONEWESTRESTHOUSE_SCIENTIST + const SAFARIZONEWESTRESTHOUSE_COOLTRAINER_M + const SAFARIZONEWESTRESTHOUSE_SILPH_WORKER_F + SafariZoneWestRestHouse_Object: db $a ; border block @@ -8,8 +13,8 @@ SafariZoneWestRestHouse_Object: def_bg_events def_object_events - object_event 4, 4, SPRITE_SCIENTIST, WALK, ANY_DIR, 1 ; person - object_event 0, 2, SPRITE_COOLTRAINER_M, STAY, RIGHT, 2 ; person - object_event 6, 2, SPRITE_ERIKA, STAY, DOWN, 3 ; person + object_event 4, 4, SPRITE_SCIENTIST, WALK, ANY_DIR, TEXT_SAFARIZONEWESTRESTHOUSE_SCIENTIST + object_event 0, 2, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_SAFARIZONEWESTRESTHOUSE_COOLTRAINER_M + object_event 6, 2, SPRITE_SILPH_WORKER_F, STAY, DOWN, TEXT_SAFARIZONEWESTRESTHOUSE_SILPH_WORKER_F def_warps_to SAFARI_ZONE_WEST_REST_HOUSE diff --git a/data/maps/objects/SaffronCity.asm b/data/maps/objects/SaffronCity.asm index 2fddfd5e5..181b5c078 100644 --- a/data/maps/objects/SaffronCity.asm +++ b/data/maps/objects/SaffronCity.asm @@ -1,3 +1,20 @@ + object_const_def + const SAFFRONCITY_ROCKET1 + const SAFFRONCITY_ROCKET2 + const SAFFRONCITY_ROCKET3 + const SAFFRONCITY_ROCKET4 + const SAFFRONCITY_ROCKET5 + const SAFFRONCITY_ROCKET6 + const SAFFRONCITY_ROCKET7 + const SAFFRONCTIY_SCIENTIST + const SAFFRONCITY_SILPH_WORKER_M + const SAFFRONCITY_SILPH_WORKER_F + const SAFFRONCITY_GENTLEMAN + const SAFFRONCITY_PIDGEOT + const SAFFRONCITY_ROCKER + const SAFFRONCITY_ROCKET8 + const SAFFRONCITY_ROCKET9 + SaffronCity_Object: db $f ; border block @@ -12,32 +29,32 @@ SaffronCity_Object: warp_event 29, 29, MR_PSYCHICS_HOUSE, 1 def_bg_events - bg_event 17, 5, 16 ; SaffronCityText16 - bg_event 27, 5, 17 ; SaffronCityText17 - bg_event 35, 5, 18 ; SaffronCityText18 - bg_event 26, 11, 19 ; MartSignText - bg_event 39, 19, 20 ; SaffronCityText20 - bg_event 5, 21, 21 ; SaffronCityText21 - bg_event 15, 21, 22 ; SaffronCityText22 - bg_event 10, 29, 23 ; PokeCenterSignText - bg_event 27, 29, 24 ; SaffronCityText24 - bg_event 1, 19, 25 ; SaffronCityText25 + bg_event 17, 5, TEXT_SAFFRONCITY_SIGN + bg_event 27, 5, TEXT_SAFFRONCITY_FIGHTING_DOJO_SIGN + bg_event 35, 5, TEXT_SAFFRONCITY_GYM_SIGN + bg_event 26, 11, TEXT_SAFFRONCITY_MART_SIGN + bg_event 39, 19, TEXT_SAFFRONCITY_TRAINER_TIPS1 + bg_event 5, 21, TEXT_SAFFRONCITY_TRAINER_TIPS2 + bg_event 15, 21, TEXT_SAFFRONCITY_SILPH_CO_SIGN + bg_event 10, 29, TEXT_SAFFRONCITY_POKECENTER_SIGN + bg_event 27, 29, TEXT_SAFFRONCITY_MR_PSYCHICS_HOUSE_SIGN + bg_event 1, 19, TEXT_SAFFRONCITY_SILPH_CO_LATEST_PRODUCT_SIGN def_object_events - object_event 7, 6, SPRITE_ROCKET, STAY, NONE, 1 ; person - object_event 20, 8, SPRITE_ROCKET, WALK, LEFT_RIGHT, 2 ; person - object_event 34, 4, SPRITE_ROCKET, STAY, NONE, 3 ; person - object_event 13, 12, SPRITE_ROCKET, STAY, NONE, 4 ; person - object_event 11, 25, SPRITE_ROCKET, WALK, LEFT_RIGHT, 5 ; person - object_event 32, 13, SPRITE_ROCKET, WALK, LEFT_RIGHT, 6 ; person - object_event 18, 30, SPRITE_ROCKET, WALK, LEFT_RIGHT, 7 ; person - object_event 8, 14, SPRITE_SCIENTIST, WALK, ANY_DIR, 8 ; person - object_event 23, 23, SPRITE_SILPH_WORKER, STAY, NONE, 9 ; person - object_event 17, 30, SPRITE_ERIKA, WALK, LEFT_RIGHT, 10 ; person - object_event 30, 12, SPRITE_GENTLEMAN, STAY, DOWN, 11 ; person - object_event 31, 12, SPRITE_BIRD, STAY, DOWN, 12 ; person - object_event 18, 8, SPRITE_ROCKER, STAY, UP, 13 ; person - object_event 18, 22, SPRITE_ROCKET, STAY, DOWN, 14 ; person - object_event 19, 22, SPRITE_ROCKET, STAY, DOWN, 15 ; person + object_event 7, 6, SPRITE_ROCKET, STAY, NONE, TEXT_SAFFRONCITY_ROCKET1 + object_event 20, 8, SPRITE_ROCKET, WALK, LEFT_RIGHT, TEXT_SAFFRONCITY_ROCKET2 + object_event 34, 4, SPRITE_ROCKET, STAY, NONE, TEXT_SAFFRONCITY_ROCKET3 + object_event 13, 12, SPRITE_ROCKET, STAY, NONE, TEXT_SAFFRONCITY_ROCKET4 + object_event 11, 25, SPRITE_ROCKET, WALK, LEFT_RIGHT, TEXT_SAFFRONCITY_ROCKET5 + object_event 32, 13, SPRITE_ROCKET, WALK, LEFT_RIGHT, TEXT_SAFFRONCITY_ROCKET6 + object_event 18, 30, SPRITE_ROCKET, WALK, LEFT_RIGHT, TEXT_SAFFRONCITY_ROCKET7 + object_event 8, 14, SPRITE_SCIENTIST, WALK, ANY_DIR, TEXT_SAFFRONCITY_SCIENTIST + object_event 23, 23, SPRITE_SILPH_WORKER_M, STAY, NONE, TEXT_SAFFRONCITY_SILPH_WORKER_M + object_event 17, 30, SPRITE_SILPH_WORKER_F, WALK, LEFT_RIGHT, TEXT_SAFFRONCITY_SILPH_WORKER_F + object_event 30, 12, SPRITE_GENTLEMAN, STAY, DOWN, TEXT_SAFFRONCITY_GENTLEMAN + object_event 31, 12, SPRITE_BIRD, STAY, DOWN, TEXT_SAFFRONCITY_PIDGEOT + object_event 18, 8, SPRITE_ROCKER, STAY, UP, TEXT_SAFFRONCITY_ROCKER + object_event 18, 22, SPRITE_ROCKET, STAY, DOWN, TEXT_SAFFRONCITY_ROCKET8 + object_event 19, 22, SPRITE_ROCKET, STAY, DOWN, TEXT_SAFFRONCITY_ROCKET9 def_warps_to SAFFRON_CITY diff --git a/data/maps/objects/SaffronGym.asm b/data/maps/objects/SaffronGym.asm index 7c6e83e59..af4bd68e1 100644 --- a/data/maps/objects/SaffronGym.asm +++ b/data/maps/objects/SaffronGym.asm @@ -1,3 +1,14 @@ + object_const_def + const SAFFRONGYM_SABRINA + const SAFFRONGYM_CHANNELER1 + const SAFFRONGYM_YOUNGSTER1 + const SAFFRONGYM_CHANNELER2 + const SAFFRONGYM_YOUNGSTER2 + const SAFFRONGYM_CHANNELER3 + const SAFFRONGYM_YOUNGSTER3 + const SAFFRONGYM_YOUNGSTER4 + const SAFFRONGYM_GYM_GUIDE + SaffronGym_Object: db $2e ; border block @@ -38,14 +49,14 @@ SaffronGym_Object: def_bg_events def_object_events - object_event 9, 8, SPRITE_GIRL, STAY, DOWN, 1, OPP_SABRINA, 1 - object_event 10, 1, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 22 - object_event 17, 1, SPRITE_YOUNGSTER, STAY, DOWN, 3, OPP_PSYCHIC_TR, 1 - object_event 3, 7, SPRITE_CHANNELER, STAY, DOWN, 4, OPP_CHANNELER, 23 - object_event 17, 7, SPRITE_YOUNGSTER, STAY, DOWN, 5, OPP_PSYCHIC_TR, 2 - object_event 3, 13, SPRITE_CHANNELER, STAY, DOWN, 6, OPP_CHANNELER, 24 - object_event 17, 13, SPRITE_YOUNGSTER, STAY, DOWN, 7, OPP_PSYCHIC_TR, 3 - object_event 3, 1, SPRITE_YOUNGSTER, STAY, DOWN, 8, OPP_PSYCHIC_TR, 4 - object_event 10, 15, SPRITE_GYM_GUIDE, STAY, DOWN, 9 ; person + object_event 9, 8, SPRITE_GIRL, STAY, DOWN, TEXT_SAFFRONGYM_SABRINA, OPP_SABRINA, 1 + object_event 10, 1, SPRITE_CHANNELER, STAY, DOWN, TEXT_SAFFRONGYM_CHANNELER1, OPP_CHANNELER, 22 + object_event 17, 1, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_SAFFRONGYM_YOUNGSTER1, OPP_PSYCHIC_TR, 1 + object_event 3, 7, SPRITE_CHANNELER, STAY, DOWN, TEXT_SAFFRONGYM_CHANNELER2, OPP_CHANNELER, 23 + object_event 17, 7, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_SAFFRONGYM_YOUNGSTER2, OPP_PSYCHIC_TR, 2 + object_event 3, 13, SPRITE_CHANNELER, STAY, DOWN, TEXT_SAFFRONGYM_CHANNELER3, OPP_CHANNELER, 24 + object_event 17, 13, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_SAFFRONGYM_YOUNGSTER3, OPP_PSYCHIC_TR, 3 + object_event 3, 1, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_SAFFRONGYM_YOUNGSTER4, OPP_PSYCHIC_TR, 4 + object_event 10, 15, SPRITE_GYM_GUIDE, STAY, DOWN, TEXT_SAFFRONGYM_GYM_GUIDE def_warps_to SAFFRON_GYM diff --git a/data/maps/objects/SaffronMart.asm b/data/maps/objects/SaffronMart.asm index d9dd68816..7a2d9eb1e 100644 --- a/data/maps/objects/SaffronMart.asm +++ b/data/maps/objects/SaffronMart.asm @@ -1,3 +1,8 @@ + object_const_def + const SAFFRONMART_CLERK + const SAFFRONMART_SUPER_NERD + const SAFFRONMART_COOLTRAINER_F + SaffronMart_Object: db $0 ; border block @@ -8,8 +13,8 @@ SaffronMart_Object: def_bg_events def_object_events - object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person - object_event 4, 2, SPRITE_SUPER_NERD, STAY, NONE, 2 ; person - object_event 6, 5, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, 3 ; person + object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, TEXT_SAFFRONMART_CLERK + object_event 4, 2, SPRITE_SUPER_NERD, STAY, NONE, TEXT_SAFFRONMART_SUPER_NERD + object_event 6, 5, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, TEXT_SAFFRONMART_COOLTRAINER_F def_warps_to SAFFRON_MART diff --git a/data/maps/objects/SaffronPidgeyHouse.asm b/data/maps/objects/SaffronPidgeyHouse.asm index 8a5249e58..3fc0cb9d1 100644 --- a/data/maps/objects/SaffronPidgeyHouse.asm +++ b/data/maps/objects/SaffronPidgeyHouse.asm @@ -1,3 +1,9 @@ + object_const_def + const SAFFRONPIDGEYHOUSE_BRUNETTE_GIRL + const SAFFRONPIDGEYHOUSE_PIDGEY + const SAFFRONPIDGEYHOUSE_YOUNGSTER + const SAFFRONPIDGEYHOUSE_PAPER + SaffronPidgeyHouse_Object: db $a ; border block @@ -8,9 +14,9 @@ SaffronPidgeyHouse_Object: def_bg_events def_object_events - object_event 2, 3, SPRITE_BRUNETTE_GIRL, STAY, RIGHT, 1 ; person - object_event 0, 4, SPRITE_BIRD, WALK, UP_DOWN, 2 ; person - object_event 4, 1, SPRITE_YOUNGSTER, STAY, DOWN, 3 ; person - object_event 3, 3, SPRITE_PAPER, STAY, NONE, 4 ; person + object_event 2, 3, SPRITE_BRUNETTE_GIRL, STAY, RIGHT, TEXT_SAFFRONPIDGEYHOUSE_BRUNETTE_GIRL + object_event 0, 4, SPRITE_BIRD, WALK, UP_DOWN, TEXT_SAFFRONPIDGEYHOUSE_PIDGEY + object_event 4, 1, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_SAFFRONPIDGEYHOUSE_YOUNGSTER + object_event 3, 3, SPRITE_PAPER, STAY, NONE, TEXT_SAFFRONPIDGEYHOUSE_PAPER def_warps_to SAFFRON_PIDGEY_HOUSE diff --git a/data/maps/objects/SaffronPokecenter.asm b/data/maps/objects/SaffronPokecenter.asm index ca94086b5..3169ea43e 100644 --- a/data/maps/objects/SaffronPokecenter.asm +++ b/data/maps/objects/SaffronPokecenter.asm @@ -1,3 +1,9 @@ + object_const_def + const SAFFRONPOKECENTER_NURSE + const SAFFRONPOKECENTER_BEAUTY + const SAFFRONPOKECENTER_GENTLEMAN + const SAFFRONPOKECENTER_LINK_RECEPTIONIST + SaffronPokecenter_Object: db $0 ; border block @@ -8,9 +14,9 @@ SaffronPokecenter_Object: def_bg_events def_object_events - object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person - object_event 5, 5, SPRITE_BEAUTY, STAY, NONE, 2 ; person - object_event 8, 3, SPRITE_GENTLEMAN, STAY, DOWN, 3 ; person - object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person + object_event 3, 1, SPRITE_NURSE, STAY, DOWN, TEXT_SAFFRONPOKECENTER_NURSE + object_event 5, 5, SPRITE_BEAUTY, STAY, NONE, TEXT_SAFFRONPOKECENTER_BEAUTY + object_event 8, 3, SPRITE_GENTLEMAN, STAY, DOWN, TEXT_SAFFRONPOKECENTER_GENTLEMAN + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_SAFFRONPOKECENTER_LINK_RECEPTIONIST def_warps_to SAFFRON_POKECENTER diff --git a/data/maps/objects/SeafoamIslands1F.asm b/data/maps/objects/SeafoamIslands1F.asm index f5e3347b8..a90042842 100644 --- a/data/maps/objects/SeafoamIslands1F.asm +++ b/data/maps/objects/SeafoamIslands1F.asm @@ -1,3 +1,7 @@ + object_const_def + const SEAFOAMISLANDS1F_BOULDER1 + const SEAFOAMISLANDS1F_BOULDER2 + SeafoamIslands1F_Object: db $7d ; border block @@ -13,8 +17,8 @@ SeafoamIslands1F_Object: def_bg_events def_object_events - object_event 18, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person - object_event 26, 7, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person + object_event 18, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_SEAFOAMISLANDS1F_BOULDER1 + object_event 26, 7, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_SEAFOAMISLANDS1F_BOULDER2 def_warps_to SEAFOAM_ISLANDS_1F diff --git a/data/maps/objects/SeafoamIslandsB1F.asm b/data/maps/objects/SeafoamIslandsB1F.asm index 165fc440e..c941ea21f 100644 --- a/data/maps/objects/SeafoamIslandsB1F.asm +++ b/data/maps/objects/SeafoamIslandsB1F.asm @@ -1,3 +1,7 @@ + object_const_def + const SEAFOAMISLANDSB1F_BOULDER1 + const SEAFOAMISLANDSB1F_BOULDER2 + SeafoamIslandsB1F_Object: db $7d ; border block @@ -13,7 +17,7 @@ SeafoamIslandsB1F_Object: def_bg_events def_object_events - object_event 17, 6, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person - object_event 22, 6, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person + object_event 17, 6, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_SEAFOAMISLANDSB1F_BOULDER1 + object_event 22, 6, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_SEAFOAMISLANDSB1F_BOULDER2 def_warps_to SEAFOAM_ISLANDS_B1F diff --git a/data/maps/objects/SeafoamIslandsB2F.asm b/data/maps/objects/SeafoamIslandsB2F.asm index 1ab5b373f..26bf3b074 100644 --- a/data/maps/objects/SeafoamIslandsB2F.asm +++ b/data/maps/objects/SeafoamIslandsB2F.asm @@ -1,3 +1,7 @@ + object_const_def + const SEAFOAMISLANDSB2F_BOULDER1 + const SEAFOAMISLANDSB2F_BOULDER2 + SeafoamIslandsB2F_Object: db $7d ; border block @@ -13,7 +17,7 @@ SeafoamIslandsB2F_Object: def_bg_events def_object_events - object_event 18, 6, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person - object_event 23, 6, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person + object_event 18, 6, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_SEAFOAMISLANDSB2F_BOULDER1 + object_event 23, 6, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_SEAFOAMISLANDSB2F_BOULDER2 def_warps_to SEAFOAM_ISLANDS_B2F diff --git a/data/maps/objects/SeafoamIslandsB3F.asm b/data/maps/objects/SeafoamIslandsB3F.asm index 4657a80a3..667e6ff7e 100644 --- a/data/maps/objects/SeafoamIslandsB3F.asm +++ b/data/maps/objects/SeafoamIslandsB3F.asm @@ -1,3 +1,11 @@ + object_const_def + const SEAFOAMISLANDSB3F_BOULDER1 + const SEAFOAMISLANDSB3F_BOULDER2 + const SEAFOAMISLANDSB3F_BOULDER3 + const SEAFOAMISLANDSB3F_BOULDER4 + const SEAFOAMISLANDSB3F_BOULDER5 + const SEAFOAMISLANDSB3F_BOULDER6 + SeafoamIslandsB3F_Object: db $7d ; border block @@ -13,11 +21,11 @@ SeafoamIslandsB3F_Object: def_bg_events def_object_events - object_event 5, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person - object_event 3, 15, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person - object_event 8, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person - object_event 9, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 4 ; person - object_event 18, 6, SPRITE_BOULDER, STAY, NONE, 5 ; person - object_event 19, 6, SPRITE_BOULDER, STAY, NONE, 6 ; person + object_event 5, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_SEAFOAMISLANDSB3F_BOULDER1 + object_event 3, 15, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_SEAFOAMISLANDSB3F_BOULDER2 + object_event 8, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_SEAFOAMISLANDSB3F_BOULDER3 + object_event 9, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_SEAFOAMISLANDSB3F_BOULDER4 + object_event 18, 6, SPRITE_BOULDER, STAY, NONE, TEXT_SEAFOAMISLANDSB3F_BOULDER5 + object_event 19, 6, SPRITE_BOULDER, STAY, NONE, TEXT_SEAFOAMISLANDSB3F_BOULDER6 def_warps_to SEAFOAM_ISLANDS_B3F diff --git a/data/maps/objects/SeafoamIslandsB4F.asm b/data/maps/objects/SeafoamIslandsB4F.asm index c6e769e0a..0948200d9 100644 --- a/data/maps/objects/SeafoamIslandsB4F.asm +++ b/data/maps/objects/SeafoamIslandsB4F.asm @@ -1,3 +1,8 @@ + object_const_def + const SEAFOAMISLANDSB4F_BOULDER1 + const SEAFOAMISLANDSB4F_BOULDER2 + const SEAFOAMISLANDSB4F_ARTICUNO + SeafoamIslandsB4F_Object: db $7d ; border block @@ -8,12 +13,12 @@ SeafoamIslandsB4F_Object: warp_event 25, 4, SEAFOAM_ISLANDS_B3F, 3 def_bg_events - bg_event 9, 15, 4 ; SeafoamIslands5Text4 - bg_event 23, 1, 5 ; SeafoamIslands5Text5 + bg_event 9, 15, TEXT_SEAFOAMISLANDSB4F_BOULDERS_SIGN + bg_event 23, 1, TEXT_SEAFOAMISLANDSB4F_DANGER_SIGN def_object_events - object_event 4, 15, SPRITE_BOULDER, STAY, NONE, 1 ; person - object_event 5, 15, SPRITE_BOULDER, STAY, NONE, 2 ; person - object_event 6, 1, SPRITE_BIRD, STAY, DOWN, 3, ARTICUNO, 50 + object_event 4, 15, SPRITE_BOULDER, STAY, NONE, TEXT_SEAFOAMISLANDSB4F_BOULDER1 + object_event 5, 15, SPRITE_BOULDER, STAY, NONE, TEXT_SEAFOAMISLANDSB4F_BOULDER2 + object_event 6, 1, SPRITE_BIRD, STAY, DOWN, TEXT_SEAFOAMISLANDSB4F_ARTICUNO, ARTICUNO, 50 def_warps_to SEAFOAM_ISLANDS_B4F diff --git a/data/maps/objects/SilphCo10F.asm b/data/maps/objects/SilphCo10F.asm index 202494255..6904165a7 100644 --- a/data/maps/objects/SilphCo10F.asm +++ b/data/maps/objects/SilphCo10F.asm @@ -1,3 +1,11 @@ + object_const_def + const SILPHCO10F_ROCKET + const SILPHCO10F_SCIENTIST + const SILPHCO10F_SILPH_WORKER_F + const SILPHCO10F_TM_EARTHQUAKE + const SILPHCO10F_RARE_CANDY + const SILPHCO10F_CARBOS + SilphCo10F_Object: db $2e ; border block @@ -12,11 +20,11 @@ SilphCo10F_Object: def_bg_events def_object_events - object_event 1, 9, SPRITE_ROCKET, STAY, RIGHT, 1, OPP_ROCKET, 39 - object_event 10, 2, SPRITE_SCIENTIST, STAY, LEFT, 2, OPP_SCIENTIST, 11 - object_event 9, 15, SPRITE_ERIKA, WALK, ANY_DIR, 3 ; person - object_event 2, 12, SPRITE_POKE_BALL, STAY, NONE, 4, TM_EARTHQUAKE - object_event 4, 14, SPRITE_POKE_BALL, STAY, NONE, 5, RARE_CANDY - object_event 5, 11, SPRITE_POKE_BALL, STAY, NONE, 6, CARBOS + object_event 1, 9, SPRITE_ROCKET, STAY, RIGHT, TEXT_SILPHCO10F_ROCKET, OPP_ROCKET, 39 + object_event 10, 2, SPRITE_SCIENTIST, STAY, LEFT, TEXT_SILPHCO10F_SCIENTIST, OPP_SCIENTIST, 11 + object_event 9, 15, SPRITE_SILPH_WORKER_F, WALK, ANY_DIR, TEXT_SILPHCO10F_SILPH_WORKER_F + object_event 2, 12, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO10F_TM_EARTHQUAKE, TM_EARTHQUAKE + object_event 4, 14, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO10F_RARE_CANDY, RARE_CANDY + object_event 5, 11, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO10F_CARBOS, CARBOS def_warps_to SILPH_CO_10F diff --git a/data/maps/objects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm index 9651c32ba..1ee5ffe6a 100644 --- a/data/maps/objects/SilphCo11F.asm +++ b/data/maps/objects/SilphCo11F.asm @@ -1,3 +1,10 @@ + object_const_def + const SILPHCO11F_SILPH_PRESIDENT + const SILPHCO11F_BEAUTY + const SILPHCO11F_GIOVANNI + const SILPHCO11F_ROCKET1 + const SILPHCO11F_ROCKET2 + SilphCo11F_Object: db $d ; border block @@ -10,10 +17,10 @@ SilphCo11F_Object: def_bg_events def_object_events - object_event 7, 5, SPRITE_SILPH_PRESIDENT, STAY, DOWN, 1 ; person - object_event 10, 5, SPRITE_BEAUTY, STAY, DOWN, 2 ; person - object_event 6, 9, SPRITE_GIOVANNI, STAY, DOWN, 3, OPP_GIOVANNI, 2 - object_event 3, 16, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 41 - object_event 15, 9, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 40 + object_event 7, 5, SPRITE_SILPH_PRESIDENT, STAY, DOWN, TEXT_SILPHCO11F_SILPH_PRESIDENT + object_event 10, 5, SPRITE_BEAUTY, STAY, DOWN, TEXT_SILPHCO11F_BEAUTY + object_event 6, 9, SPRITE_GIOVANNI, STAY, DOWN, TEXT_SILPHCO11F_GIOVANNI, OPP_GIOVANNI, 2 + object_event 3, 16, SPRITE_ROCKET, STAY, UP, TEXT_SILPHCO11F_ROCKET1, OPP_ROCKET, 41 + object_event 15, 9, SPRITE_ROCKET, STAY, UP, TEXT_SILPHCO11F_ROCKET2, OPP_ROCKET, 40 def_warps_to SILPH_CO_11F diff --git a/data/maps/objects/SilphCo1F.asm b/data/maps/objects/SilphCo1F.asm index 605edd9da..3d1873b53 100644 --- a/data/maps/objects/SilphCo1F.asm +++ b/data/maps/objects/SilphCo1F.asm @@ -1,3 +1,6 @@ + object_const_def + const SILPHCO1F_LINK_RECEPTIONIST + SilphCo1F_Object: db $2e ; border block @@ -11,6 +14,6 @@ SilphCo1F_Object: def_bg_events def_object_events - object_event 4, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 1 ; person + object_event 4, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_SILPHCO1F_LINK_RECEPTIONIST def_warps_to SILPH_CO_1F diff --git a/data/maps/objects/SilphCo2F.asm b/data/maps/objects/SilphCo2F.asm index 3ee8de9c7..b618708ad 100644 --- a/data/maps/objects/SilphCo2F.asm +++ b/data/maps/objects/SilphCo2F.asm @@ -1,3 +1,10 @@ + object_const_def + const SILPHCO2F_SILPH_WORKER_F + const SILPHCO2F_SCIENTIST1 + const SILPHCO2F_SCIENTIST2 + const SILPHCO2F_ROCKET1 + const SILPHCO2F_ROCKET2 + SilphCo2F_Object: db $2e ; border block @@ -13,10 +20,10 @@ SilphCo2F_Object: def_bg_events def_object_events - object_event 10, 1, SPRITE_ERIKA, STAY, UP, 1 ; person - object_event 5, 12, SPRITE_SCIENTIST, STAY, DOWN, 2, OPP_SCIENTIST, 2 - object_event 24, 13, SPRITE_SCIENTIST, STAY, LEFT, 3, OPP_SCIENTIST, 3 - object_event 16, 11, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 23 - object_event 24, 7, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 24 + object_event 10, 1, SPRITE_SILPH_WORKER_F, STAY, UP, TEXT_SILPHCO2F_SILPH_WORKER_F + object_event 5, 12, SPRITE_SCIENTIST, STAY, DOWN, TEXT_SILPHCO2F_SCIENTIST1, OPP_SCIENTIST, 2 + object_event 24, 13, SPRITE_SCIENTIST, STAY, LEFT, TEXT_SILPHCO2F_SCIENTIST2, OPP_SCIENTIST, 3 + object_event 16, 11, SPRITE_ROCKET, STAY, UP, TEXT_SILPHCO2F_ROCKET1, OPP_ROCKET, 23 + object_event 24, 7, SPRITE_ROCKET, STAY, UP, TEXT_SILPHCO2F_ROCKET2, OPP_ROCKET, 24 def_warps_to SILPH_CO_2F diff --git a/data/maps/objects/SilphCo3F.asm b/data/maps/objects/SilphCo3F.asm index 6b050aadb..f22eee828 100644 --- a/data/maps/objects/SilphCo3F.asm +++ b/data/maps/objects/SilphCo3F.asm @@ -1,3 +1,9 @@ + object_const_def + const SILPHCO3F_SILPH_WORKER_M + const SILPHCO3F_ROCKET + const SILPHCO3F_SCIENTIST + const SILPHCO3F_HYPER_POTION + SilphCo3F_Object: db $2e ; border block @@ -16,9 +22,9 @@ SilphCo3F_Object: def_bg_events def_object_events - object_event 24, 8, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person - object_event 20, 7, SPRITE_ROCKET, STAY, LEFT, 2, OPP_ROCKET, 25 - object_event 7, 9, SPRITE_SCIENTIST, STAY, DOWN, 3, OPP_SCIENTIST, 4 - object_event 8, 5, SPRITE_POKE_BALL, STAY, NONE, 4, HYPER_POTION + object_event 24, 8, SPRITE_SILPH_WORKER_M, STAY, NONE, TEXT_SILPHCO3F_SILPH_WORKER_M + object_event 20, 7, SPRITE_ROCKET, STAY, LEFT, TEXT_SILPHCO3F_ROCKET, OPP_ROCKET, 25 + object_event 7, 9, SPRITE_SCIENTIST, STAY, DOWN, TEXT_SILPHCO3F_SCIENTIST, OPP_SCIENTIST, 4 + object_event 8, 5, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO3F_HYPER_POTION, HYPER_POTION def_warps_to SILPH_CO_3F diff --git a/data/maps/objects/SilphCo4F.asm b/data/maps/objects/SilphCo4F.asm index 7dbc12ca9..cf471cb46 100644 --- a/data/maps/objects/SilphCo4F.asm +++ b/data/maps/objects/SilphCo4F.asm @@ -1,3 +1,12 @@ + object_const_def + const SILPHCO4F_SILPH_WORKER_M + const SILPHCO4F_ROCKET1 + const SILPHCO4F_SCIENTIST + const SILPHCO4F_ROCKET2 + const SILPHCO4F_FULL_HEAL + const SILPHCO4F_MAX_REVIVE + const SILPHCO4F_ESCAPE_ROPE + SilphCo4F_Object: db $2e ; border block @@ -13,12 +22,12 @@ SilphCo4F_Object: def_bg_events def_object_events - object_event 6, 2, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person - object_event 9, 14, SPRITE_ROCKET, STAY, RIGHT, 2, OPP_ROCKET, 26 - object_event 14, 6, SPRITE_SCIENTIST, STAY, LEFT, 3, OPP_SCIENTIST, 5 - object_event 26, 10, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 27 - object_event 3, 9, SPRITE_POKE_BALL, STAY, NONE, 5, FULL_HEAL - object_event 4, 7, SPRITE_POKE_BALL, STAY, NONE, 6, MAX_REVIVE - object_event 5, 8, SPRITE_POKE_BALL, STAY, NONE, 7, ESCAPE_ROPE + object_event 6, 2, SPRITE_SILPH_WORKER_M, STAY, NONE, TEXT_SILPHCO4F_SILPH_WORKER_M + object_event 9, 14, SPRITE_ROCKET, STAY, RIGHT, TEXT_SILPHCO4F_ROCKET1, OPP_ROCKET, 26 + object_event 14, 6, SPRITE_SCIENTIST, STAY, LEFT, TEXT_SILPHCO4F_SCIENTIST, OPP_SCIENTIST, 5 + object_event 26, 10, SPRITE_ROCKET, STAY, UP, TEXT_SILPHCO4F_ROCKET2, OPP_ROCKET, 27 + object_event 3, 9, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO4F_FULL_HEAL, FULL_HEAL + object_event 4, 7, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO4F_MAX_REVIVE, MAX_REVIVE + object_event 5, 8, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO4F_ESCAPE_ROPE, ESCAPE_ROPE def_warps_to SILPH_CO_4F diff --git a/data/maps/objects/SilphCo5F.asm b/data/maps/objects/SilphCo5F.asm index 7910f4732..c6cc7e34f 100644 --- a/data/maps/objects/SilphCo5F.asm +++ b/data/maps/objects/SilphCo5F.asm @@ -1,3 +1,16 @@ + object_const_def + const SILPHCO5F_SILPH_WORKER_M + const SILPHCO5F_ROCKET1 + const SILPHCO5F_SCIENTIST + const SILPHCO5F_ROCKER + const SILPHCO5F_ROCKET2 + const SILPHCO5F_TM_TAKE_DOWN + const SILPHCO5F_PROTEIN + const SILPHCO5F_CARD_KEY + const SILPHCO5F_POKEMON_REPORT1 + const SILPHCO5F_POKEMON_REPORT2 + const SILPHCO5F_POKEMON_REPORT3 + SilphCo5F_Object: db $2e ; border block @@ -13,16 +26,16 @@ SilphCo5F_Object: def_bg_events def_object_events - object_event 13, 9, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person - object_event 8, 16, SPRITE_ROCKET, STAY, RIGHT, 2, OPP_ROCKET, 28 - object_event 8, 3, SPRITE_SCIENTIST, STAY, RIGHT, 3, OPP_SCIENTIST, 6 - object_event 18, 10, SPRITE_ROCKER, STAY, UP, 4, OPP_JUGGLER, 1 - object_event 28, 4, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 29 - object_event 2, 13, SPRITE_POKE_BALL, STAY, NONE, 6, TM_TAKE_DOWN - object_event 4, 6, SPRITE_POKE_BALL, STAY, NONE, 7, PROTEIN - object_event 21, 16, SPRITE_POKE_BALL, STAY, NONE, 8, CARD_KEY - object_event 22, 12, SPRITE_CLIPBOARD, STAY, NONE, 9 ; person - object_event 25, 10, SPRITE_CLIPBOARD, STAY, NONE, 10 ; person - object_event 24, 6, SPRITE_CLIPBOARD, STAY, NONE, 11 ; person + object_event 13, 9, SPRITE_SILPH_WORKER_M, STAY, NONE, TEXT_SILPHCO5F_SILPH_WORKER_M + object_event 8, 16, SPRITE_ROCKET, STAY, RIGHT, TEXT_SILPHCO5F_ROCKET1, OPP_ROCKET, 28 + object_event 8, 3, SPRITE_SCIENTIST, STAY, RIGHT, TEXT_SILPHCO5F_SCIENTIST, OPP_SCIENTIST, 6 + object_event 18, 10, SPRITE_ROCKER, STAY, UP, TEXT_SILPHCO5F_ROCKER, OPP_JUGGLER, 1 + object_event 28, 4, SPRITE_ROCKET, STAY, UP, TEXT_SILPHCO5F_ROCKET2, OPP_ROCKET, 29 + object_event 2, 13, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO5F_TM_TAKE_DOWN, TM_TAKE_DOWN + object_event 4, 6, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO5F_PROTEIN, PROTEIN + object_event 21, 16, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO5F_CARD_KEY, CARD_KEY + object_event 22, 12, SPRITE_CLIPBOARD, STAY, NONE, TEXT_SILPHCO5F_POKEMON_REPORT1 + object_event 25, 10, SPRITE_CLIPBOARD, STAY, NONE, TEXT_SILPHCO5F_POKEMON_REPORT2 + object_event 24, 6, SPRITE_CLIPBOARD, STAY, NONE, TEXT_SILPHCO5F_POKEMON_REPORT3 def_warps_to SILPH_CO_5F diff --git a/data/maps/objects/SilphCo6F.asm b/data/maps/objects/SilphCo6F.asm index 2495790d2..5dc9c87ba 100644 --- a/data/maps/objects/SilphCo6F.asm +++ b/data/maps/objects/SilphCo6F.asm @@ -1,3 +1,15 @@ + object_const_def + const SILPHCO6F_SILPH_WORKER_M1 + const SILPHCO6F_SILPH_WORKER_M2 + const SILPHCO6F_SILPH_WORKER_F1 + const SILPHCO6F_SILPH_WORKER_F2 + const SILPHCO6F_SILPH_WORKER_M3 + const SILPHCO6F_ROCKET1 + const SILPHCO6F_SCIENTIST + const SILPHCO6F_ROCKET2 + const SILPHCO6F_HP_UP + const SILPHCO6F_X_ACCURACY + SilphCo6F_Object: db $2e ; border block @@ -11,15 +23,15 @@ SilphCo6F_Object: def_bg_events def_object_events - object_event 10, 6, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person - object_event 20, 6, SPRITE_SILPH_WORKER, STAY, NONE, 2 ; person - object_event 21, 6, SPRITE_ERIKA, STAY, DOWN, 3 ; person - object_event 11, 10, SPRITE_ERIKA, STAY, RIGHT, 4 ; person - object_event 18, 13, SPRITE_SILPH_WORKER, STAY, UP, 5 ; person - object_event 17, 3, SPRITE_ROCKET, STAY, RIGHT, 6, OPP_ROCKET, 30 - object_event 7, 8, SPRITE_SCIENTIST, STAY, DOWN, 7, OPP_SCIENTIST, 7 - object_event 14, 15, SPRITE_ROCKET, STAY, LEFT, 8, OPP_ROCKET, 31 - object_event 3, 12, SPRITE_POKE_BALL, STAY, NONE, 9, HP_UP - object_event 2, 15, SPRITE_POKE_BALL, STAY, NONE, 10, X_ACCURACY + object_event 10, 6, SPRITE_SILPH_WORKER_M, STAY, NONE, TEXT_SILPHCO6F_SILPH_WORKER_M1 + object_event 20, 6, SPRITE_SILPH_WORKER_M, STAY, NONE, TEXT_SILPHCO6F_SILPH_WORKER_M2 + object_event 21, 6, SPRITE_SILPH_WORKER_F, STAY, DOWN, TEXT_SILPHCO6F_SILPH_WORKER_F1 + object_event 11, 10, SPRITE_SILPH_WORKER_F, STAY, RIGHT, TEXT_SILPHCO6F_SILPH_WORKER_F2 + object_event 18, 13, SPRITE_SILPH_WORKER_M, STAY, UP, TEXT_SILPHCO6F_SILPH_WORKER_M3 + object_event 17, 3, SPRITE_ROCKET, STAY, RIGHT, TEXT_SILPHCO6F_ROCKET1, OPP_ROCKET, 30 + object_event 7, 8, SPRITE_SCIENTIST, STAY, DOWN, TEXT_SILPHCO6F_SCIENTIST, OPP_SCIENTIST, 7 + object_event 14, 15, SPRITE_ROCKET, STAY, LEFT, TEXT_SILPHCO6F_ROCKET2, OPP_ROCKET, 31 + object_event 3, 12, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO6F_HP_UP, HP_UP + object_event 2, 15, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO6F_X_ACCURACY, X_ACCURACY def_warps_to SILPH_CO_6F diff --git a/data/maps/objects/SilphCo7F.asm b/data/maps/objects/SilphCo7F.asm index b7854e3cf..2d5ed33c5 100644 --- a/data/maps/objects/SilphCo7F.asm +++ b/data/maps/objects/SilphCo7F.asm @@ -1,3 +1,16 @@ + object_const_def + const SILPHCO7F_SILPH_WORKER_M1 + const SILPHCO7F_SILPH_WORKER_M2 + const SILPHCO7F_SILPH_WORKER_M3 + const SILPHCO7F_SILPH_WORKER_M4 + const SILPHCO7F_ROCKET1 + const SILPHCO7F_SCIENTIST + const SILPHCO7F_ROCKET2 + const SILPHCO7F_ROCKET3 + const SILPHCO7F_RIVAL + const SILPHCO7F_CALCIUM + const SILPHCO7F_TM_SWORDS_DANCE + SilphCo7F_Object: db $2e ; border block @@ -12,16 +25,16 @@ SilphCo7F_Object: def_bg_events def_object_events - object_event 1, 5, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person - object_event 13, 13, SPRITE_SILPH_WORKER, STAY, UP, 2 ; person - object_event 7, 10, SPRITE_SILPH_WORKER, STAY, NONE, 3 ; person - object_event 10, 8, SPRITE_ERIKA, STAY, NONE, 4 ; person - object_event 13, 1, SPRITE_ROCKET, STAY, DOWN, 5, OPP_ROCKET, 32 - object_event 2, 13, SPRITE_SCIENTIST, STAY, DOWN, 6, OPP_SCIENTIST, 8 - object_event 20, 2, SPRITE_ROCKET, STAY, LEFT, 7, OPP_ROCKET, 33 - object_event 19, 14, SPRITE_ROCKET, STAY, RIGHT, 8, OPP_ROCKET, 34 - object_event 3, 7, SPRITE_BLUE, STAY, UP, 9 ; person - object_event 1, 9, SPRITE_POKE_BALL, STAY, NONE, 10, CALCIUM - object_event 24, 11, SPRITE_POKE_BALL, STAY, NONE, 11, TM_SWORDS_DANCE + object_event 1, 5, SPRITE_SILPH_WORKER_M, STAY, NONE, TEXT_SILPHCO7F_SILPH_WORKER_M1 + object_event 13, 13, SPRITE_SILPH_WORKER_M, STAY, UP, TEXT_SILPHCO7F_SILPH_WORKER_M2 + object_event 7, 10, SPRITE_SILPH_WORKER_M, STAY, NONE, TEXT_SILPHCO7F_SILPH_WORKER_M3 + object_event 10, 8, SPRITE_SILPH_WORKER_F, STAY, NONE, TEXT_SILPHCO7F_SILPH_WORKER_M4 + object_event 13, 1, SPRITE_ROCKET, STAY, DOWN, TEXT_SILPHCO7F_ROCKET1, OPP_ROCKET, 32 + object_event 2, 13, SPRITE_SCIENTIST, STAY, DOWN, TEXT_SILPHCO7F_SCIENTIST, OPP_SCIENTIST, 8 + object_event 20, 2, SPRITE_ROCKET, STAY, LEFT, TEXT_SILPHCO7F_ROCKET2, OPP_ROCKET, 33 + object_event 19, 14, SPRITE_ROCKET, STAY, RIGHT, TEXT_SILPHCO7F_ROCKET3, OPP_ROCKET, 34 + object_event 3, 7, SPRITE_BLUE, STAY, UP, TEXT_SILPHCO7F_RIVAL + object_event 1, 9, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO7F_CALCIUM, CALCIUM + object_event 24, 11, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO7F_TM_SWORDS_DANCE, TM_SWORDS_DANCE def_warps_to SILPH_CO_7F diff --git a/data/maps/objects/SilphCo8F.asm b/data/maps/objects/SilphCo8F.asm index ded214002..7f0bbc784 100644 --- a/data/maps/objects/SilphCo8F.asm +++ b/data/maps/objects/SilphCo8F.asm @@ -1,3 +1,9 @@ + object_const_def + const SILPHCO8F_SILPH_WORKER_M + const SILPHCO8F_ROCKET1 + const SILPHCO8F_SCIENTIST + const SILPHCO8F_ROCKET2 + SilphCo8F_Object: db $2e ; border block @@ -13,9 +19,9 @@ SilphCo8F_Object: def_bg_events def_object_events - object_event 4, 2, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person - object_event 19, 2, SPRITE_ROCKET, STAY, LEFT, 2, OPP_ROCKET, 35 - object_event 10, 2, SPRITE_SCIENTIST, STAY, DOWN, 3, OPP_SCIENTIST, 9 - object_event 12, 15, SPRITE_ROCKET, STAY, RIGHT, 4, OPP_ROCKET, 36 + object_event 4, 2, SPRITE_SILPH_WORKER_M, STAY, NONE, TEXT_SILPHCO8F_SILPH_WORKER_M + object_event 19, 2, SPRITE_ROCKET, STAY, LEFT, TEXT_SILPHCO8F_ROCKET1, OPP_ROCKET, 35 + object_event 10, 2, SPRITE_SCIENTIST, STAY, DOWN, TEXT_SILPHCO8F_SCIENTIST, OPP_SCIENTIST, 9 + object_event 12, 15, SPRITE_ROCKET, STAY, RIGHT, TEXT_SILPHCO8F_ROCKET2, OPP_ROCKET, 36 def_warps_to SILPH_CO_8F diff --git a/data/maps/objects/SilphCo9F.asm b/data/maps/objects/SilphCo9F.asm index 261df23c3..59cb2c5bc 100644 --- a/data/maps/objects/SilphCo9F.asm +++ b/data/maps/objects/SilphCo9F.asm @@ -1,3 +1,9 @@ + object_const_def + const SILPHCO9F_NURSE + const SILPHCO9F_ROCKET1 + const SILPHCO9F_SCIENTIST + const SILPHCO9F_ROCKET2 + SilphCo9F_Object: db $2e ; border block @@ -11,9 +17,9 @@ SilphCo9F_Object: def_bg_events def_object_events - object_event 3, 14, SPRITE_NURSE, STAY, DOWN, 1 ; person - object_event 2, 4, SPRITE_ROCKET, STAY, UP, 2, OPP_ROCKET, 37 - object_event 21, 13, SPRITE_SCIENTIST, STAY, DOWN, 3, OPP_SCIENTIST, 10 - object_event 13, 16, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 38 + object_event 3, 14, SPRITE_NURSE, STAY, DOWN, TEXT_SILPHCO9F_NURSE + object_event 2, 4, SPRITE_ROCKET, STAY, UP, TEXT_SILPHCO9F_ROCKET1, OPP_ROCKET, 37 + object_event 21, 13, SPRITE_SCIENTIST, STAY, DOWN, TEXT_SILPHCO9F_SCIENTIST, OPP_SCIENTIST, 10 + object_event 13, 16, SPRITE_ROCKET, STAY, UP, TEXT_SILPHCO9F_ROCKET2, OPP_ROCKET, 38 def_warps_to SILPH_CO_9F diff --git a/data/maps/objects/SilphCoElevator.asm b/data/maps/objects/SilphCoElevator.asm index 1451fccdf..6a8f3572a 100644 --- a/data/maps/objects/SilphCoElevator.asm +++ b/data/maps/objects/SilphCoElevator.asm @@ -6,7 +6,7 @@ SilphCoElevator_Object: warp_event 2, 3, UNUSED_MAP_ED, 1 def_bg_events - bg_event 3, 0, 1 ; SilphCoElevatorText1 + bg_event 3, 0, TEXT_SILPHCOELEVATOR_ELEVATOR def_object_events diff --git a/data/maps/objects/TradeCenter.asm b/data/maps/objects/TradeCenter.asm index 9bc1f72d2..edc3e0b54 100644 --- a/data/maps/objects/TradeCenter.asm +++ b/data/maps/objects/TradeCenter.asm @@ -1,3 +1,6 @@ + object_const_def + const TRADECENTER_OPPONENT + TradeCenter_Object: db $e ; border block @@ -6,6 +9,6 @@ TradeCenter_Object: def_bg_events def_object_events - object_event 2, 2, SPRITE_RED, STAY, 0, 1 ; person + object_event 2, 2, SPRITE_RED, STAY, 0, TEXT_TRADECENTER_OPPONENT def_warps_to TRADE_CENTER diff --git a/data/maps/objects/UndergroundPathRoute5.asm b/data/maps/objects/UndergroundPathRoute5.asm index 7ffaeffcf..56402b41b 100644 --- a/data/maps/objects/UndergroundPathRoute5.asm +++ b/data/maps/objects/UndergroundPathRoute5.asm @@ -1,3 +1,6 @@ + object_const_def + const UNDERGROUNDPATHROUTE5_LITTLE_GIRL + UndergroundPathRoute5_Object: db $a ; border block @@ -9,6 +12,6 @@ UndergroundPathRoute5_Object: def_bg_events def_object_events - object_event 2, 3, SPRITE_LITTLE_GIRL, STAY, NONE, 1 ; person + object_event 2, 3, SPRITE_LITTLE_GIRL, STAY, NONE, TEXT_UNDERGROUNDPATHROUTE5_LITTLE_GIRL def_warps_to UNDERGROUND_PATH_ROUTE_5 diff --git a/data/maps/objects/UndergroundPathRoute6.asm b/data/maps/objects/UndergroundPathRoute6.asm index cee23de3d..a1ac3acf0 100644 --- a/data/maps/objects/UndergroundPathRoute6.asm +++ b/data/maps/objects/UndergroundPathRoute6.asm @@ -1,3 +1,6 @@ + object_const_def + const UNDERGROUNDPATHROUTE6_GIRL + UndergroundPathRoute6_Object: db $a ; border block @@ -9,6 +12,6 @@ UndergroundPathRoute6_Object: def_bg_events def_object_events - object_event 2, 3, SPRITE_GIRL, STAY, NONE, 1 ; person + object_event 2, 3, SPRITE_GIRL, STAY, NONE, TEXT_UNDERGROUNDPATHROUTE6_GIRL def_warps_to UNDERGROUND_PATH_ROUTE_6 diff --git a/data/maps/objects/UndergroundPathRoute7.asm b/data/maps/objects/UndergroundPathRoute7.asm index 47ae45f9f..d7772f6cd 100644 --- a/data/maps/objects/UndergroundPathRoute7.asm +++ b/data/maps/objects/UndergroundPathRoute7.asm @@ -1,3 +1,6 @@ + object_const_def + const UNDERGROUNDPATHROUTE7_MIDDLE_AGED_MAN + UndergroundPathRoute7_Object: db $a ; border block @@ -9,6 +12,6 @@ UndergroundPathRoute7_Object: def_bg_events def_object_events - object_event 2, 4, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 1 ; person + object_event 2, 4, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, TEXT_UNDERGROUNDPATHROUTE7_MIDDLE_AGED_MAN def_warps_to UNDERGROUND_PATH_ROUTE_7 diff --git a/data/maps/objects/UndergroundPathRoute7Copy.asm b/data/maps/objects/UndergroundPathRoute7Copy.asm index b4e7e7fd9..9c3841cb3 100644 --- a/data/maps/objects/UndergroundPathRoute7Copy.asm +++ b/data/maps/objects/UndergroundPathRoute7Copy.asm @@ -1,3 +1,7 @@ + object_const_def + const UNDERGROUNDPATHROUTE7COPY_UNUSED_GIRL + const UNDERGROUNDPATHROUTE7COPY_UNUSED_MIDDLE_AGED_MAN + UndergroundPathRoute7Copy_Object: db $a ; border block @@ -9,7 +13,7 @@ UndergroundPathRoute7Copy_Object: def_bg_events def_object_events - object_event 3, 2, SPRITE_GIRL, STAY, NONE, 1 ; person - object_event 2, 4, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 2 ; person + object_event 3, 2, SPRITE_GIRL, STAY, NONE, TEXT_UNDERGROUNDPATHROUTE7COPY_UNUSED_GIRL + object_event 2, 4, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, TEXT_UNDERGROUNDPATHROUTE7COPY_UNUSED_MIDDLE_AGED_MAN def_warps_to UNDERGROUND_PATH_ROUTE_7_COPY diff --git a/data/maps/objects/UndergroundPathRoute8.asm b/data/maps/objects/UndergroundPathRoute8.asm index c36b1d427..751690f43 100644 --- a/data/maps/objects/UndergroundPathRoute8.asm +++ b/data/maps/objects/UndergroundPathRoute8.asm @@ -1,3 +1,6 @@ + object_const_def + const UNDERGROUNDPATHROUTE8_GIRL + UndergroundPathRoute8_Object: db $a ; border block @@ -9,6 +12,6 @@ UndergroundPathRoute8_Object: def_bg_events def_object_events - object_event 3, 4, SPRITE_GIRL, STAY, NONE, 1 ; person + object_event 3, 4, SPRITE_GIRL, STAY, NONE, TEXT_UNDERGROUNDPATHROUTE8_GIRL def_warps_to UNDERGROUND_PATH_ROUTE_8 diff --git a/data/maps/objects/VermilionCity.asm b/data/maps/objects/VermilionCity.asm index ca652afcd..1146d2b88 100644 --- a/data/maps/objects/VermilionCity.asm +++ b/data/maps/objects/VermilionCity.asm @@ -1,3 +1,11 @@ + object_const_def + const VERMILIONCITY_BEAUTY + const VERMILIONCITY_GAMBLER1 + const VERMILIONCITY_SAILOR1 + const VERMILIONCITY_GAMBLER2 + const VERMILIONCITY_MACHOP + const VERMILIONCITY_SAILOR2 + VermilionCity_Object: db $43 ; border block @@ -13,20 +21,20 @@ VermilionCity_Object: warp_event 7, 3, VERMILION_OLD_ROD_HOUSE, 1 def_bg_events - bg_event 27, 3, 7 ; VermilionCityText7 - bg_event 37, 13, 8 ; VermilionCityText8 - bg_event 24, 13, 9 ; MartSignText - bg_event 12, 3, 10 ; PokeCenterSignText - bg_event 7, 13, 11 ; VermilionCityText11 - bg_event 7, 19, 12 ; VermilionCityText12 - bg_event 29, 15, 13 ; VermilionCityText13 + bg_event 27, 3, TEXT_VERMILIONCITY_SIGN + bg_event 37, 13, TEXT_VERMILIONCITY_NOTICE_SIGN + bg_event 24, 13, TEXT_VERMILIONCITY_MART_SIGN + bg_event 12, 3, TEXT_VERMILIONCITY_POKECENTER_SIGN + bg_event 7, 13, TEXT_VERMILIONCITY_POKEMON_FAN_CLUB_SIGN + bg_event 7, 19, TEXT_VERMILIONCITY_GYM_SIGN + bg_event 29, 15, TEXT_VERMILIONCITY_HARBOR_SIGN def_object_events - object_event 19, 7, SPRITE_BEAUTY, WALK, LEFT_RIGHT, 1 ; person - object_event 14, 6, SPRITE_GAMBLER, STAY, NONE, 2 ; person - object_event 19, 30, SPRITE_SAILOR, STAY, UP, 3 ; person - object_event 30, 7, SPRITE_GAMBLER, STAY, NONE, 4 ; person - object_event 29, 9, SPRITE_MONSTER, WALK, UP_DOWN, 5 ; person - object_event 25, 27, SPRITE_SAILOR, WALK, LEFT_RIGHT, 6 ; person + object_event 19, 7, SPRITE_BEAUTY, WALK, LEFT_RIGHT, TEXT_VERMILIONCITY_BEAUTY + object_event 14, 6, SPRITE_GAMBLER, STAY, NONE, TEXT_VERMILIONCITY_GAMBLER1 + object_event 19, 30, SPRITE_SAILOR, STAY, UP, TEXT_VERMILIONCITY_SAILOR1 + object_event 30, 7, SPRITE_GAMBLER, STAY, NONE, TEXT_VERMILIONCITY_GAMBLER2 + object_event 29, 9, SPRITE_MONSTER, WALK, UP_DOWN, TEXT_VERMILIONCITY_MACHOP + object_event 25, 27, SPRITE_SAILOR, WALK, LEFT_RIGHT, TEXT_VERMILIONCITY_SAILOR2 def_warps_to VERMILION_CITY diff --git a/data/maps/objects/VermilionGym.asm b/data/maps/objects/VermilionGym.asm index a91c66ca3..0defc08f8 100644 --- a/data/maps/objects/VermilionGym.asm +++ b/data/maps/objects/VermilionGym.asm @@ -1,3 +1,10 @@ + object_const_def + const VERMILIONGYM_LT_SURGE + const VERMILIONGYM_GENTLEMAN + const VERMILIONGYM_SUPER_NERD + const VERMILIONGYM_SAILOR + const VERMILIONGYM_GYM_GUIDE + VermilionGym_Object: db $3 ; border block @@ -8,10 +15,10 @@ VermilionGym_Object: def_bg_events def_object_events - object_event 5, 1, SPRITE_ROCKER, STAY, DOWN, 1, OPP_LT_SURGE, 1 - object_event 9, 6, SPRITE_GENTLEMAN, STAY, LEFT, 2, OPP_GENTLEMAN, 3 - object_event 3, 8, SPRITE_SUPER_NERD, STAY, LEFT, 3, OPP_ROCKER, 1 - object_event 0, 10, SPRITE_SAILOR, STAY, RIGHT, 4, OPP_SAILOR, 8 - object_event 4, 14, SPRITE_GYM_GUIDE, STAY, DOWN, 5 ; person + object_event 5, 1, SPRITE_ROCKER, STAY, DOWN, TEXT_VERMILIONGYM_LT_SURGE, OPP_LT_SURGE, 1 + object_event 9, 6, SPRITE_GENTLEMAN, STAY, LEFT, TEXT_VERMILIONGYM_GENTLEMAN, OPP_GENTLEMAN, 3 + object_event 3, 8, SPRITE_SUPER_NERD, STAY, LEFT, TEXT_VERMILIONGYM_SUPER_NERD, OPP_ROCKER, 1 + object_event 0, 10, SPRITE_SAILOR, STAY, RIGHT, TEXT_VERMILIONGYM_SAILOR, OPP_SAILOR, 8 + object_event 4, 14, SPRITE_GYM_GUIDE, STAY, DOWN, TEXT_VERMILIONGYM_GYM_GUIDE def_warps_to VERMILION_GYM diff --git a/data/maps/objects/VermilionMart.asm b/data/maps/objects/VermilionMart.asm index 19d65e3b2..7cab5e7a2 100644 --- a/data/maps/objects/VermilionMart.asm +++ b/data/maps/objects/VermilionMart.asm @@ -1,3 +1,8 @@ + object_const_def + const VERMILIONMART_CLERK + const VERMILIONMART_COOLTRAINER_M + const VERMILIONMART_COOLTRAINER_F + VermilionMart_Object: db $0 ; border block @@ -8,8 +13,8 @@ VermilionMart_Object: def_bg_events def_object_events - object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person - object_event 5, 6, SPRITE_COOLTRAINER_M, STAY, NONE, 2 ; person - object_event 3, 3, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 3 ; person + object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, TEXT_VERMILIONMART_CLERK + object_event 5, 6, SPRITE_COOLTRAINER_M, STAY, NONE, TEXT_VERMILIONMART_COOLTRAINER_M + object_event 3, 3, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, TEXT_VERMILIONMART_COOLTRAINER_F def_warps_to VERMILION_MART diff --git a/data/maps/objects/VermilionOldRodHouse.asm b/data/maps/objects/VermilionOldRodHouse.asm index a0767f204..3efb3956f 100644 --- a/data/maps/objects/VermilionOldRodHouse.asm +++ b/data/maps/objects/VermilionOldRodHouse.asm @@ -1,3 +1,6 @@ + object_const_def + const VERMILIONOLDRODHOUSE_FISHING_GURU + VermilionOldRodHouse_Object: db $a ; border block @@ -8,6 +11,6 @@ VermilionOldRodHouse_Object: def_bg_events def_object_events - object_event 2, 4, SPRITE_FISHING_GURU, STAY, RIGHT, 1 ; person + object_event 2, 4, SPRITE_FISHING_GURU, STAY, RIGHT, TEXT_VERMILIONOLDRODHOUSE_FISHING_GURU def_warps_to VERMILION_OLD_ROD_HOUSE diff --git a/data/maps/objects/VermilionPidgeyHouse.asm b/data/maps/objects/VermilionPidgeyHouse.asm index ce8d3f3e6..6ffd90642 100644 --- a/data/maps/objects/VermilionPidgeyHouse.asm +++ b/data/maps/objects/VermilionPidgeyHouse.asm @@ -1,3 +1,8 @@ + object_const_def + const VERMILIONPIDGEYHOUSE_YOUNGSTER + const VERMILIONPIDGEYHOUSE_PIDGEY + const VERMILIONPIDGEYHOUSE_LETTER + VermilionPidgeyHouse_Object: db $a ; border block @@ -8,8 +13,8 @@ VermilionPidgeyHouse_Object: def_bg_events def_object_events - object_event 5, 3, SPRITE_YOUNGSTER, STAY, LEFT, 1 ; person - object_event 3, 5, SPRITE_BIRD, WALK, LEFT_RIGHT, 2 ; person - object_event 4, 3, SPRITE_PAPER, STAY, NONE, 3 ; person + object_event 5, 3, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_VERMILIONPIDGEYHOUSE_YOUNGSTER + object_event 3, 5, SPRITE_BIRD, WALK, LEFT_RIGHT, TEXT_VERMILIONPIDGEYHOUSE_PIDGEY + object_event 4, 3, SPRITE_PAPER, STAY, NONE, TEXT_VERMILIONPIDGEYHOUSE_LETTER def_warps_to VERMILION_PIDGEY_HOUSE diff --git a/data/maps/objects/VermilionPokecenter.asm b/data/maps/objects/VermilionPokecenter.asm index f88552b4b..5793aae08 100644 --- a/data/maps/objects/VermilionPokecenter.asm +++ b/data/maps/objects/VermilionPokecenter.asm @@ -1,3 +1,9 @@ + object_const_def + const VERMILIONPOKECENTER_NURSE + const VERMILIONPOKECENTER_FISHING_GURU + const VERMILIONPOKECENTER_SAILOR + const VERMILIONPOKECENTER_LINK_RECEPTIONIST + VermilionPokecenter_Object: db $0 ; border block @@ -8,9 +14,9 @@ VermilionPokecenter_Object: def_bg_events def_object_events - object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person - object_event 10, 5, SPRITE_FISHING_GURU, STAY, NONE, 2 ; person - object_event 5, 4, SPRITE_SAILOR, STAY, NONE, 3 ; person - object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person + object_event 3, 1, SPRITE_NURSE, STAY, DOWN, TEXT_VERMILIONPOKECENTER_NURSE + object_event 10, 5, SPRITE_FISHING_GURU, STAY, NONE, TEXT_VERMILIONPOKECENTER_FISHING_GURU + object_event 5, 4, SPRITE_SAILOR, STAY, NONE, TEXT_VERMILIONPOKECENTER_SAILOR + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_VERMILIONPOKECENTER_LINK_RECEPTIONIST def_warps_to VERMILION_POKECENTER diff --git a/data/maps/objects/VermilionTradeHouse.asm b/data/maps/objects/VermilionTradeHouse.asm index 299e5093e..3d83357c6 100644 --- a/data/maps/objects/VermilionTradeHouse.asm +++ b/data/maps/objects/VermilionTradeHouse.asm @@ -1,3 +1,6 @@ + object_const_def + const VERMILIONTRADEHOUSE_LITTLE_GIRL + VermilionTradeHouse_Object: db $a ; border block @@ -8,6 +11,6 @@ VermilionTradeHouse_Object: def_bg_events def_object_events - object_event 3, 5, SPRITE_LITTLE_GIRL, STAY, UP, 1 ; person + object_event 3, 5, SPRITE_LITTLE_GIRL, STAY, UP, TEXT_VERMILIONTRADEHOUSE_LITTLE_GIRL def_warps_to VERMILION_TRADE_HOUSE diff --git a/data/maps/objects/VictoryRoad1F.asm b/data/maps/objects/VictoryRoad1F.asm index d923948a1..40295c811 100644 --- a/data/maps/objects/VictoryRoad1F.asm +++ b/data/maps/objects/VictoryRoad1F.asm @@ -1,3 +1,12 @@ + object_const_def + const VICTORYROAD1F_COOLTRAINER_F + const VICTORYROAD1F_COOLTRAINER_M + const VICTORYROAD1F_TM_SKY_ATTACK + const VICTORYROAD1F_RARE_CANDY + const VICTORYROAD1F_BOULDER1 + const VICTORYROAD1F_BOULDER2 + const VICTORYROAD1F_BOULDER3 + VictoryRoad1F_Object: db $7d ; border block @@ -9,12 +18,12 @@ VictoryRoad1F_Object: def_bg_events def_object_events - object_event 7, 5, SPRITE_COOLTRAINER_F, STAY, RIGHT, 1, OPP_COOLTRAINER_F, 5 - object_event 3, 2, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_COOLTRAINER_M, 5 - object_event 11, 0, SPRITE_POKE_BALL, STAY, NONE, 3, TM_SKY_ATTACK - object_event 9, 2, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY - object_event 5, 15, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person - object_event 14, 2, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person - object_event 2, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person + object_event 7, 5, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_VICTORYROAD1F_COOLTRAINER_F, OPP_COOLTRAINER_F, 5 + object_event 3, 2, SPRITE_COOLTRAINER_M, STAY, DOWN, TEXT_VICTORYROAD1F_COOLTRAINER_M, OPP_COOLTRAINER_M, 5 + object_event 11, 0, SPRITE_POKE_BALL, STAY, NONE, TEXT_VICTORYROAD1F_TM_SKY_ATTACK, TM_SKY_ATTACK + object_event 9, 2, SPRITE_POKE_BALL, STAY, NONE, TEXT_VICTORYROAD1F_RARE_CANDY, RARE_CANDY + object_event 5, 15, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_VICTORYROAD1F_BOULDER1 + object_event 14, 2, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_VICTORYROAD1F_BOULDER2 + object_event 2, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_VICTORYROAD1F_BOULDER3 def_warps_to VICTORY_ROAD_1F diff --git a/data/maps/objects/VictoryRoad2F.asm b/data/maps/objects/VictoryRoad2F.asm index 36357e072..09fc44589 100644 --- a/data/maps/objects/VictoryRoad2F.asm +++ b/data/maps/objects/VictoryRoad2F.asm @@ -1,3 +1,18 @@ + object_const_def + const VICTORYROAD2F_HIKER + const VICTORYROAD2F_SUPER_NERD1 + const VICTORYROAD2F_COOLTRAINER_M + const VICTORYROAD2F_SUPER_NERD2 + const VICTORYROAD2F_SUPER_NERD3 + const VICTORYROAD2F_MOLTRES + const VICTORYROAD2F_TM_SUBMISSION + const VICTORYROAD2F_FULL_HEAL + const VICTORYROAD2F_TM_MEGA_KICK + const VICTORYROAD2F_GUARD_SPEC + const VICTORYROAD2F_BOULDER1 + const VICTORYROAD2F_BOULDER2 + const VICTORYROAD2F_BOULDER3 + VictoryRoad2F_Object: db $7d ; border block @@ -13,18 +28,18 @@ VictoryRoad2F_Object: def_bg_events def_object_events - object_event 12, 9, SPRITE_HIKER, STAY, LEFT, 1, OPP_BLACKBELT, 9 - object_event 21, 13, SPRITE_SUPER_NERD, STAY, LEFT, 2, OPP_JUGGLER, 2 - object_event 19, 8, SPRITE_COOLTRAINER_M, STAY, DOWN, 3, OPP_TAMER, 5 - object_event 4, 2, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_POKEMANIAC, 6 - object_event 26, 3, SPRITE_SUPER_NERD, STAY, LEFT, 5, OPP_JUGGLER, 5 - object_event 11, 5, SPRITE_BIRD, STAY, UP, 6, MOLTRES, 50 - object_event 27, 5, SPRITE_POKE_BALL, STAY, NONE, 7, TM_SUBMISSION - object_event 18, 9, SPRITE_POKE_BALL, STAY, NONE, 8, FULL_HEAL - object_event 9, 11, SPRITE_POKE_BALL, STAY, NONE, 9, TM_MEGA_KICK - object_event 11, 0, SPRITE_POKE_BALL, STAY, NONE, 10, GUARD_SPEC - object_event 4, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 11 ; person - object_event 5, 5, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person - object_event 23, 16, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 13 ; person + object_event 12, 9, SPRITE_HIKER, STAY, LEFT, TEXT_VICTORYROAD2F_HIKER, OPP_BLACKBELT, 9 + object_event 21, 13, SPRITE_SUPER_NERD, STAY, LEFT, TEXT_VICTORYROAD2F_SUPER_NERD1, OPP_JUGGLER, 2 + object_event 19, 8, SPRITE_COOLTRAINER_M, STAY, DOWN, TEXT_VICTORYROAD2F_COOLTRAINER_M, OPP_TAMER, 5 + object_event 4, 2, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_VICTORYROAD2F_SUPER_NERD2, OPP_POKEMANIAC, 6 + object_event 26, 3, SPRITE_SUPER_NERD, STAY, LEFT, TEXT_VICTORYROAD2F_SUPER_NERD3, OPP_JUGGLER, 5 + object_event 11, 5, SPRITE_BIRD, STAY, UP, TEXT_VICTORYROAD2F_MOLTRES, MOLTRES, 50 + object_event 27, 5, SPRITE_POKE_BALL, STAY, NONE, TEXT_VICTORYROAD2F_TM_SUBMISSION, TM_SUBMISSION + object_event 18, 9, SPRITE_POKE_BALL, STAY, NONE, TEXT_VICTORYROAD2F_FULL_HEAL, FULL_HEAL + object_event 9, 11, SPRITE_POKE_BALL, STAY, NONE, TEXT_VICTORYROAD2F_TM_MEGA_KICK, TM_MEGA_KICK + object_event 11, 0, SPRITE_POKE_BALL, STAY, NONE, TEXT_VICTORYROAD2F_GUARD_SPEC, GUARD_SPEC + object_event 4, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_VICTORYROAD2F_BOULDER1 + object_event 5, 5, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_VICTORYROAD2F_BOULDER2 + object_event 23, 16, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_VICTORYROAD2F_BOULDER3 def_warps_to VICTORY_ROAD_2F diff --git a/data/maps/objects/VictoryRoad3F.asm b/data/maps/objects/VictoryRoad3F.asm index 8ee978782..ad6b4df10 100644 --- a/data/maps/objects/VictoryRoad3F.asm +++ b/data/maps/objects/VictoryRoad3F.asm @@ -1,3 +1,15 @@ + object_const_def + const VICTORYROAD3F_COOLTRAINER_M1 + const VICTORYROAD3F_COOLTRAINER_F1 + const VICTORYROAD3F_COOLTRAINER_M2 + const VICTORYROAD3F_COOLTRAINER_F2 + const VICTORYROAD3F_MAX_REVIVE + const VICTORYROAD3F_TM_EXPLOSION + const VICTORYROAD3F_BOULDER1 + const VICTORYROAD3F_BOULDER2 + const VICTORYROAD3F_BOULDER3 + const VICTORYROAD3F_BOULDER4 + VictoryRoad3F_Object: db $7d ; border block @@ -10,15 +22,15 @@ VictoryRoad3F_Object: def_bg_events def_object_events - object_event 28, 5, SPRITE_COOLTRAINER_M, STAY, LEFT, 1, OPP_COOLTRAINER_M, 2 - object_event 7, 13, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_COOLTRAINER_F, 2 - object_event 6, 14, SPRITE_COOLTRAINER_M, STAY, LEFT, 3, OPP_COOLTRAINER_M, 3 - object_event 13, 3, SPRITE_COOLTRAINER_F, STAY, RIGHT, 4, OPP_COOLTRAINER_F, 3 - object_event 26, 5, SPRITE_POKE_BALL, STAY, NONE, 5, MAX_REVIVE - object_event 7, 7, SPRITE_POKE_BALL, STAY, NONE, 6, TM_EXPLOSION - object_event 22, 3, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person - object_event 13, 12, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 8 ; person - object_event 24, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 9 ; person - object_event 22, 15, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 10 ; person + object_event 28, 5, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_VICTORYROAD3F_COOLTRAINER_M1, OPP_COOLTRAINER_M, 2 + object_event 7, 13, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_VICTORYROAD3F_COOLTRAINER_F1, OPP_COOLTRAINER_F, 2 + object_event 6, 14, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_VICTORYROAD3F_COOLTRAINER_M2, OPP_COOLTRAINER_M, 3 + object_event 13, 3, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_VICTORYROAD3F_COOLTRAINER_F2, OPP_COOLTRAINER_F, 3 + object_event 26, 5, SPRITE_POKE_BALL, STAY, NONE, TEXT_VICTORYROAD3F_MAX_REVIVE, MAX_REVIVE + object_event 7, 7, SPRITE_POKE_BALL, STAY, NONE, TEXT_VICTORYROAD3F_TM_EXPLOSION, TM_EXPLOSION + object_event 22, 3, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_VICTORYROAD3F_BOULDER1 + object_event 13, 12, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_VICTORYROAD3F_BOULDER2 + object_event 24, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_VICTORYROAD3F_BOULDER3 + object_event 22, 15, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_VICTORYROAD3F_BOULDER4 def_warps_to VICTORY_ROAD_3F diff --git a/data/maps/objects/ViridianCity.asm b/data/maps/objects/ViridianCity.asm index 56bf73902..b3a64f364 100644 --- a/data/maps/objects/ViridianCity.asm +++ b/data/maps/objects/ViridianCity.asm @@ -1,3 +1,12 @@ + object_const_def + const VIRIDIANCITY_YOUNGSTER1 + const VIRIDIANCITY_GAMBLER1 + const VIRIDIANCITY_YOUNGSTER2 + const VIRIDIANCITY_GIRL + const VIRIDIANCITY_OLD_MAN_SLEEPY + const VIRIDIANCITY_FISHER + const VIRIDIANCITY_OLD_MAN + ViridianCity_Object: db $f ; border block @@ -9,20 +18,20 @@ ViridianCity_Object: warp_event 32, 7, VIRIDIAN_GYM, 1 def_bg_events - bg_event 17, 17, 8 ; ViridianCityText8 - bg_event 19, 1, 9 ; ViridianCityText9 - bg_event 21, 29, 10 ; ViridianCityText10 - bg_event 30, 19, 11 ; MartSignText - bg_event 24, 25, 12 ; PokeCenterSignText - bg_event 27, 7, 13 ; ViridianCityText13 + bg_event 17, 17, TEXT_VIRIDIANCITY_SIGN + bg_event 19, 1, TEXT_VIRIDIANCITY_TRAINER_TIPS1 + bg_event 21, 29, TEXT_VIRIDIANCITY_TRAINER_TIPS2 + bg_event 30, 19, TEXT_VIRIDIANCITY_MART_SIGN + bg_event 24, 25, TEXT_VIRIDIANCITY_POKECENTER_SIGN + bg_event 27, 7, TEXT_VIRIDIANCITY_GYM_SIGN def_object_events - object_event 13, 20, SPRITE_YOUNGSTER, WALK, ANY_DIR, 1 ; person - object_event 30, 8, SPRITE_GAMBLER, STAY, NONE, 2 ; person - object_event 30, 25, SPRITE_YOUNGSTER, WALK, ANY_DIR, 3 ; person - object_event 17, 9, SPRITE_GIRL, STAY, RIGHT, 4 ; person - object_event 18, 9, SPRITE_GAMBLER_ASLEEP, STAY, NONE, 5 ; person - object_event 6, 23, SPRITE_FISHER, STAY, DOWN, 6 ; person - object_event 17, 5, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 7 ; person + object_event 13, 20, SPRITE_YOUNGSTER, WALK, ANY_DIR, TEXT_VIRIDIANCITY_YOUNGSTER1 + object_event 30, 8, SPRITE_GAMBLER, STAY, NONE, TEXT_VIRIDIANCITY_GAMBLER1 + object_event 30, 25, SPRITE_YOUNGSTER, WALK, ANY_DIR, TEXT_VIRIDIANCITY_YOUNGSTER2 + object_event 17, 9, SPRITE_GIRL, STAY, RIGHT, TEXT_VIRIDIANCITY_GIRL + object_event 18, 9, SPRITE_GAMBLER_ASLEEP, STAY, NONE, TEXT_VIRIDIANCITY_OLD_MAN_SLEEPY + object_event 6, 23, SPRITE_FISHER, STAY, DOWN, TEXT_VIRIDIANCITY_FISHER + object_event 17, 5, SPRITE_GAMBLER, WALK, LEFT_RIGHT, TEXT_VIRIDIANCITY_OLD_MAN def_warps_to VIRIDIAN_CITY diff --git a/data/maps/objects/ViridianForest.asm b/data/maps/objects/ViridianForest.asm index 7a0a644cc..ca3fc30bc 100644 --- a/data/maps/objects/ViridianForest.asm +++ b/data/maps/objects/ViridianForest.asm @@ -1,3 +1,13 @@ + object_const_def + const VIRIDIANFOREST_YOUNGSTER1 + const VIRIDIANFOREST_YOUNGSTER2 + const VIRIDIANFOREST_YOUNGSTER3 + const VIRIDIANFOREST_YOUNGSTER4 + const VIRIDIANFOREST_ANTIDOTE + const VIRIDIANFOREST_POTION + const VIRIDIANFOREST_POKE_BALL + const VIRIDIANFOREST_YOUNGSTER5 + ViridianForest_Object: db $3 ; border block @@ -10,21 +20,21 @@ ViridianForest_Object: warp_event 18, 47, VIRIDIAN_FOREST_SOUTH_GATE, 2 def_bg_events - bg_event 24, 40, 9 ; ViridianForestText9 - bg_event 16, 32, 10 ; ViridianForestText10 - bg_event 26, 17, 11 ; ViridianForestText11 - bg_event 4, 24, 12 ; ViridianForestText12 - bg_event 18, 45, 13 ; ViridianForestText13 - bg_event 2, 1, 14 ; ViridianForestText14 + bg_event 24, 40, TEXT_VIRIDIANFOREST_TRAINER_TIPS1 + bg_event 16, 32, TEXT_VIRIDIANFOREST_USE_ANTIDOTE_SIGN + bg_event 26, 17, TEXT_VIRIDIANFOREST_TRAINER_TIPS2 + bg_event 4, 24, TEXT_VIRIDIANFOREST_TRAINER_TIPS3 + bg_event 18, 45, TEXT_VIRIDIANFOREST_TRAINER_TIPS4 + bg_event 2, 1, TEXT_VIRIDIANFOREST_LEAVING_SIGN def_object_events - object_event 16, 43, SPRITE_YOUNGSTER, STAY, NONE, 1 ; person - object_event 30, 33, SPRITE_YOUNGSTER, STAY, LEFT, 2, OPP_BUG_CATCHER, 1 - object_event 30, 19, SPRITE_YOUNGSTER, STAY, LEFT, 3, OPP_BUG_CATCHER, 2 - object_event 2, 18, SPRITE_YOUNGSTER, STAY, LEFT, 4, OPP_BUG_CATCHER, 3 - object_event 25, 11, SPRITE_POKE_BALL, STAY, NONE, 5, ANTIDOTE - object_event 12, 29, SPRITE_POKE_BALL, STAY, NONE, 6, POTION - object_event 1, 31, SPRITE_POKE_BALL, STAY, NONE, 7, POKE_BALL - object_event 27, 40, SPRITE_YOUNGSTER, STAY, NONE, 8 ; person + object_event 16, 43, SPRITE_YOUNGSTER, STAY, NONE, TEXT_VIRIDIANFOREST_YOUNGSTER1 + object_event 30, 33, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_VIRIDIANFOREST_YOUNGSTER2, OPP_BUG_CATCHER, 1 + object_event 30, 19, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_VIRIDIANFOREST_YOUNGSTER3, OPP_BUG_CATCHER, 2 + object_event 2, 18, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_VIRIDIANFOREST_YOUNGSTER4, OPP_BUG_CATCHER, 3 + object_event 25, 11, SPRITE_POKE_BALL, STAY, NONE, TEXT_VIRIDIANFOREST_ANTIDOTE, ANTIDOTE + object_event 12, 29, SPRITE_POKE_BALL, STAY, NONE, TEXT_VIRIDIANFOREST_POTION, POTION + object_event 1, 31, SPRITE_POKE_BALL, STAY, NONE, TEXT_VIRIDIANFOREST_POKE_BALL, POKE_BALL + object_event 27, 40, SPRITE_YOUNGSTER, STAY, NONE, TEXT_VIRIDIANFOREST_YOUNGSTER5 def_warps_to VIRIDIAN_FOREST diff --git a/data/maps/objects/ViridianForestNorthGate.asm b/data/maps/objects/ViridianForestNorthGate.asm index fcb0fc2b7..bd804359c 100644 --- a/data/maps/objects/ViridianForestNorthGate.asm +++ b/data/maps/objects/ViridianForestNorthGate.asm @@ -1,3 +1,7 @@ + object_const_def + const VIRIDIANFORESTNORTHGATE_SUPER_NERD + const VIRIDIANFORESTNORTHGATE_GRAMPS + ViridianForestNorthGate_Object: db $a ; border block @@ -10,7 +14,7 @@ ViridianForestNorthGate_Object: def_bg_events def_object_events - object_event 3, 2, SPRITE_SUPER_NERD, STAY, NONE, 1 ; person - object_event 2, 5, SPRITE_GRAMPS, STAY, NONE, 2 ; person + object_event 3, 2, SPRITE_SUPER_NERD, STAY, NONE, TEXT_VIRIDIANFORESTNORTHGATE_SUPER_NERD + object_event 2, 5, SPRITE_GRAMPS, STAY, NONE, TEXT_VIRIDIANFORESTNORTHGATE_GRAMPS def_warps_to VIRIDIAN_FOREST_NORTH_GATE diff --git a/data/maps/objects/ViridianForestSouthGate.asm b/data/maps/objects/ViridianForestSouthGate.asm index e5dad809c..15ada6fff 100644 --- a/data/maps/objects/ViridianForestSouthGate.asm +++ b/data/maps/objects/ViridianForestSouthGate.asm @@ -1,3 +1,7 @@ + object_const_def + const VIRIDIANFORESTSOUTHGATE_GIRL + const VIRIDIANFORESTSOUTHGATE_LITTLE_GIRL + ViridianForestSouthGate_Object: db $a ; border block @@ -10,7 +14,7 @@ ViridianForestSouthGate_Object: def_bg_events def_object_events - object_event 8, 4, SPRITE_GIRL, STAY, LEFT, 1 ; person - object_event 2, 4, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, 2 ; person + object_event 8, 4, SPRITE_GIRL, STAY, LEFT, TEXT_VIRIDIANFORESTSOUTHGATE_GIRL + object_event 2, 4, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, TEXT_VIRIDIANFORESTSOUTHGATE_LITTLE_GIRL def_warps_to VIRIDIAN_FOREST_SOUTH_GATE diff --git a/data/maps/objects/ViridianGym.asm b/data/maps/objects/ViridianGym.asm index 735cecf44..d58736dab 100644 --- a/data/maps/objects/ViridianGym.asm +++ b/data/maps/objects/ViridianGym.asm @@ -1,3 +1,16 @@ + object_const_def + const VIRIDIANGYM_GIOVANNI + const VIRIDIANGYM_COOLTRAINER_M1 + const VIRIDIANGYM_HIKER1 + const VIRIDIANGYM_ROCKER1 + const VIRIDIANGYM_HIKER2 + const VIRIDIANGYM_COOLTRAINER_M2 + const VIRIDIANGYM_HIKER3 + const VIRIDIANGYM_ROCKER2 + const VIRIDIANGYM_COOLTRAINER_M3 + const VIRIDIANGYM_GYM_GUIDE + const VIRIDIANGYM_REVIVE + ViridianGym_Object: db $3 ; border block @@ -8,16 +21,16 @@ ViridianGym_Object: def_bg_events def_object_events - object_event 2, 1, SPRITE_GIOVANNI, STAY, DOWN, 1, OPP_GIOVANNI, 3 - object_event 12, 7, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_COOLTRAINER_M, 9 - object_event 11, 11, SPRITE_HIKER, STAY, UP, 3, OPP_BLACKBELT, 6 - object_event 10, 7, SPRITE_ROCKER, STAY, DOWN, 4, OPP_TAMER, 3 - object_event 3, 7, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 7 - object_event 13, 5, SPRITE_COOLTRAINER_M, STAY, RIGHT, 6, OPP_COOLTRAINER_M, 10 - object_event 10, 1, SPRITE_HIKER, STAY, DOWN, 7, OPP_BLACKBELT, 8 - object_event 2, 16, SPRITE_ROCKER, STAY, RIGHT, 8, OPP_TAMER, 4 - object_event 6, 5, SPRITE_COOLTRAINER_M, STAY, DOWN, 9, OPP_COOLTRAINER_M, 1 - object_event 16, 15, SPRITE_GYM_GUIDE, STAY, DOWN, 10 ; person - object_event 16, 9, SPRITE_POKE_BALL, STAY, NONE, 11, REVIVE + object_event 2, 1, SPRITE_GIOVANNI, STAY, DOWN, TEXT_VIRIDIANGYM_GIOVANNI, OPP_GIOVANNI, 3 + object_event 12, 7, SPRITE_COOLTRAINER_M, STAY, DOWN, TEXT_VIRIDIANGYM_COOLTRAINER_M1, OPP_COOLTRAINER_M, 9 + object_event 11, 11, SPRITE_HIKER, STAY, UP, TEXT_VIRIDIANGYM_HIKER1, OPP_BLACKBELT, 6 + object_event 10, 7, SPRITE_ROCKER, STAY, DOWN, TEXT_VIRIDIANGYM_ROCKER1, OPP_TAMER, 3 + object_event 3, 7, SPRITE_HIKER, STAY, LEFT, TEXT_VIRIDIANGYM_HIKER2, OPP_BLACKBELT, 7 + object_event 13, 5, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_VIRIDIANGYM_COOLTRAINER_M2, OPP_COOLTRAINER_M, 10 + object_event 10, 1, SPRITE_HIKER, STAY, DOWN, TEXT_VIRIDIANGYM_HIKER3, OPP_BLACKBELT, 8 + object_event 2, 16, SPRITE_ROCKER, STAY, RIGHT, TEXT_VIRIDIANGYM_ROCKER2, OPP_TAMER, 4 + object_event 6, 5, SPRITE_COOLTRAINER_M, STAY, DOWN, TEXT_VIRIDIANGYM_COOLTRAINER_M3, OPP_COOLTRAINER_M, 1 + object_event 16, 15, SPRITE_GYM_GUIDE, STAY, DOWN, TEXT_VIRIDIANGYM_GYM_GUIDE + object_event 16, 9, SPRITE_POKE_BALL, STAY, NONE, TEXT_VIRIDIANGYM_REVIVE, REVIVE def_warps_to VIRIDIAN_GYM diff --git a/data/maps/objects/ViridianMart.asm b/data/maps/objects/ViridianMart.asm index 291dd00f1..05d8048ed 100644 --- a/data/maps/objects/ViridianMart.asm +++ b/data/maps/objects/ViridianMart.asm @@ -1,3 +1,8 @@ + object_const_def + const VIRIDIANMART_CLERK + const VIRIDIANMART_YOUNGSTER + const VIRIDIANMART_COOLTRAINER_M + ViridianMart_Object: db $0 ; border block @@ -8,8 +13,8 @@ ViridianMart_Object: def_bg_events def_object_events - object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person - object_event 5, 5, SPRITE_YOUNGSTER, WALK, UP_DOWN, 2 ; person - object_event 3, 3, SPRITE_COOLTRAINER_M, STAY, NONE, 3 ; person + object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, TEXT_VIRIDIANMART_CLERK + object_event 5, 5, SPRITE_YOUNGSTER, WALK, UP_DOWN, TEXT_VIRIDIANMART_YOUNGSTER + object_event 3, 3, SPRITE_COOLTRAINER_M, STAY, NONE, TEXT_VIRIDIANMART_COOLTRAINER_M def_warps_to VIRIDIAN_MART diff --git a/data/maps/objects/ViridianNicknameHouse.asm b/data/maps/objects/ViridianNicknameHouse.asm index 2f3befb24..29e1873c4 100644 --- a/data/maps/objects/ViridianNicknameHouse.asm +++ b/data/maps/objects/ViridianNicknameHouse.asm @@ -1,3 +1,9 @@ + object_const_def + const VIRIDIANNICKNAMEHOUSE_BALDING_GUY + const VIRIDIANNICKNAMEHOUSE_LITTLE_GIRL + const VIRIDIANNICKNAMEHOUSE_SPEAROW + const VIRIDIANNICKNAMEHOUSE_SPEARY_SIGN + ViridianNicknameHouse_Object: db $a ; border block @@ -8,9 +14,9 @@ ViridianNicknameHouse_Object: def_bg_events def_object_events - object_event 5, 3, SPRITE_BALDING_GUY, STAY, NONE, 1 ; person - object_event 1, 4, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, 2 ; person - object_event 5, 5, SPRITE_BIRD, WALK, LEFT_RIGHT, 3 ; person - object_event 4, 0, SPRITE_CLIPBOARD, STAY, NONE, 4 ; person + object_event 5, 3, SPRITE_BALDING_GUY, STAY, NONE, TEXT_VIRIDIANNICKNAMEHOUSE_BALDING_GUY + object_event 1, 4, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, TEXT_VIRIDIANNICKNAMEHOUSE_LITTLE_GIRL + object_event 5, 5, SPRITE_BIRD, WALK, LEFT_RIGHT, TEXT_VIRIDIANNICKNAMEHOUSE_SPEAROW + object_event 4, 0, SPRITE_CLIPBOARD, STAY, NONE, TEXT_VIRIDIANNICKNAMEHOUSE_SPEARY_SIGN def_warps_to VIRIDIAN_NICKNAME_HOUSE diff --git a/data/maps/objects/ViridianPokecenter.asm b/data/maps/objects/ViridianPokecenter.asm index 618f57983..e4b564fa7 100644 --- a/data/maps/objects/ViridianPokecenter.asm +++ b/data/maps/objects/ViridianPokecenter.asm @@ -1,3 +1,9 @@ + object_const_def + const VIRIDIANPOKECENTER_NURSE + const VIRIDIANPOKECENTER_GENTLEMAN + const VIRIDIANPOKECENTER_COOLTRAINER_M + const VIRIDIANPOKECENTER_LINK_RECEPTIONIST + ViridianPokecenter_Object: db $0 ; border block @@ -8,9 +14,9 @@ ViridianPokecenter_Object: def_bg_events def_object_events - object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person - object_event 10, 5, SPRITE_GENTLEMAN, WALK, UP_DOWN, 2 ; person - object_event 4, 3, SPRITE_COOLTRAINER_M, STAY, NONE, 3 ; person - object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person + object_event 3, 1, SPRITE_NURSE, STAY, DOWN, TEXT_VIRIDIANPOKECENTER_NURSE + object_event 10, 5, SPRITE_GENTLEMAN, WALK, UP_DOWN, TEXT_VIRIDIANPOKECENTER_GENTLEMAN + object_event 4, 3, SPRITE_COOLTRAINER_M, STAY, NONE, TEXT_VIRIDIANPOKECENTER_COOLTRAINER_M + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_VIRIDIANPOKECENTER_LINK_RECEPTIONIST def_warps_to VIRIDIAN_POKECENTER diff --git a/data/maps/objects/ViridianSchoolHouse.asm b/data/maps/objects/ViridianSchoolHouse.asm index 745bf72b1..a389cb9d5 100644 --- a/data/maps/objects/ViridianSchoolHouse.asm +++ b/data/maps/objects/ViridianSchoolHouse.asm @@ -1,3 +1,7 @@ + object_const_def + const VIRIDIANSCHOOLHOUSE_BRUNETTE_GIRL + const VIRIDIANSCHOOLHOUSE_COOLTRAINER_F + ViridianSchoolHouse_Object: db $a ; border block @@ -8,7 +12,7 @@ ViridianSchoolHouse_Object: def_bg_events def_object_events - object_event 3, 5, SPRITE_BRUNETTE_GIRL, STAY, UP, 1 ; person - object_event 4, 1, SPRITE_COOLTRAINER_F, STAY, DOWN, 2 ; person + object_event 3, 5, SPRITE_BRUNETTE_GIRL, STAY, UP, TEXT_VIRIDIANSCHOOLHOUSE_BRUNETTE_GIRL + object_event 4, 1, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_VIRIDIANSCHOOLHOUSE_COOLTRAINER_F def_warps_to VIRIDIAN_SCHOOL_HOUSE diff --git a/data/maps/objects/WardensHouse.asm b/data/maps/objects/WardensHouse.asm index 63e461c48..40aee76dc 100644 --- a/data/maps/objects/WardensHouse.asm +++ b/data/maps/objects/WardensHouse.asm @@ -1,3 +1,8 @@ + object_const_def + const WARDENSHOUSE_WARDEN + const WARDENSHOUSE_RARE_CANDY + const WARDENSHOUSE_BOULDER + WardensHouse_Object: db $17 ; border block @@ -6,12 +11,12 @@ WardensHouse_Object: warp_event 5, 7, LAST_MAP, 4 def_bg_events - bg_event 4, 3, 4 ; FuchsiaHouse2Text4 - bg_event 5, 3, 5 ; FuchsiaHouse2Text5 + bg_event 4, 3, TEXT_WARDENSHOUSE_DISPLAY_LEFT + bg_event 5, 3, TEXT_WARDENSHOUSE_DISPLAY_RIGHT def_object_events - object_event 2, 3, SPRITE_WARDEN, STAY, NONE, 1 ; person - object_event 8, 3, SPRITE_POKE_BALL, STAY, NONE, 2, RARE_CANDY - object_event 8, 4, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person + object_event 2, 3, SPRITE_WARDEN, STAY, NONE, TEXT_WARDENSHOUSE_WARDEN + object_event 8, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_WARDENSHOUSE_RARE_CANDY, RARE_CANDY + object_event 8, 4, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_WARDENSHOUSE_BOULDER def_warps_to WARDENS_HOUSE diff --git a/data/maps/sprite_sets.asm b/data/maps/sprite_sets.asm index 76ddee343..0bf49db6a 100644 --- a/data/maps/sprite_sets.asm +++ b/data/maps/sprite_sets.asm @@ -146,8 +146,8 @@ SpriteSets: ; SPRITESET_SAFFRON db SPRITE_ROCKET db SPRITE_SCIENTIST - db SPRITE_SILPH_WORKER - db SPRITE_ERIKA + db SPRITE_SILPH_WORKER_M + db SPRITE_SILPH_WORKER_F db SPRITE_GENTLEMAN db SPRITE_BIRD db SPRITE_ROCKER @@ -172,7 +172,7 @@ SpriteSets: ; SPRITESET_CYCLING_ROAD db SPRITE_BIKER db SPRITE_COOLTRAINER_M - db SPRITE_SILPH_WORKER + db SPRITE_SILPH_WORKER_M db SPRITE_FISHER db SPRITE_ROCKER db SPRITE_HIKER diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm index 72715087d..612ce10c1 100644 --- a/data/sprites/sprites.asm +++ b/data/sprites/sprites.asm @@ -33,7 +33,7 @@ SpriteSheetPointerTable: overworld_sprite RocketSprite, 12 ; SPRITE_ROCKET overworld_sprite ChannelerSprite, 12 ; SPRITE_CHANNELER overworld_sprite WaiterSprite, 12 ; SPRITE_WAITER - overworld_sprite ErikaSprite, 12 ; SPRITE_ERIKA + overworld_sprite SilphWorkerFSprite, 12 ; SPRITE_SILPH_WORKER_F overworld_sprite MiddleAgedWomanSprite, 12 ; SPRITE_MIDDLE_AGED_WOMAN overworld_sprite BrunetteGirlSprite, 12 ; SPRITE_BRUNETTE_GIRL overworld_sprite LanceSprite, 12 ; SPRITE_LANCE @@ -50,7 +50,7 @@ SpriteSheetPointerTable: overworld_sprite NurseSprite, 12 ; SPRITE_NURSE overworld_sprite LinkReceptionistSprite, 12 ; SPRITE_LINK_RECEPTIONIST overworld_sprite SilphPresidentSprite, 12 ; SPRITE_SILPH_PRESIDENT - overworld_sprite SilphWorkerSprite, 12 ; SPRITE_SILPH_WORKER + overworld_sprite SilphWorkerMSprite, 12 ; SPRITE_SILPH_WORKER_M overworld_sprite WardenSprite, 12 ; SPRITE_WARDEN overworld_sprite CaptainSprite, 12 ; SPRITE_CAPTAIN overworld_sprite FisherSprite, 12 ; SPRITE_FISHER diff --git a/data/text/text_3.asm b/data/text/text_3.asm index daae6fb5d..1d40d6b7a 100644 --- a/data/text/text_3.asm +++ b/data/text/text_3.asm @@ -321,10 +321,10 @@ _DreamWasEatenText:: line "dream was eaten!" prompt -_TradeCenterText1:: +_TradeCenterOpponentText:: text "!" done -_ColosseumText1:: +_ColosseumOpponentText:: text "!" done diff --git a/engine/events/hidden_objects/safari_game.asm b/engine/events/hidden_objects/safari_game.asm index ea00be5a3..6fac1afa9 100644 --- a/engine/events/hidden_objects/safari_game.asm +++ b/engine/events/hidden_objects/safari_game.asm @@ -49,7 +49,7 @@ SafariZoneGameOver: ldh [hWarpDestinationMap], a ld a, $3 ld [wDestinationWarpID], a - ld a, $5 + ld a, SCRIPT_SAFARIZONEGATE_LEAVING_SAFARI ld [wSafariZoneGateCurScript], a SetEvent EVENT_SAFARI_GAME_OVER ld a, 1 diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index a89031b47..466b14230 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1507,7 +1507,7 @@ ItemUseEscapeRope: ResetEvent EVENT_IN_SAFARI_ZONE xor a ld [wNumSafariBalls], a - ld [wSafariZoneGateCurScript], a + ld [wSafariZoneGateCurScript], a ; SCRIPT_SAFARIZONEGATE_DEFAULT inc a ld [wEscapedFromBattle], a ld [wActionResultOrTookBattleTurn], a ; item used diff --git a/engine/overworld/auto_movement.asm b/engine/overworld/auto_movement.asm index 9c078f084..75816886e 100644 --- a/engine/overworld/auto_movement.asm +++ b/engine/overworld/auto_movement.asm @@ -3,7 +3,7 @@ PlayerStepOutFromDoor:: res 1, [hl] call IsPlayerStandingOnDoorTile jr nc, .notStandingOnDoor - ld a, $fc + ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ld hl, wd736 set 1, [hl] @@ -81,7 +81,7 @@ PalletMovementScript_OakMoveLeft: .done ld hl, wFlags_D733 set 1, [hl] - ld a, $fc + ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ret diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm index f01ae5efc..89e4ef579 100644 --- a/engine/overworld/ledges.asm +++ b/engine/overworld/ledges.asm @@ -39,7 +39,7 @@ HandleLedges:: ldh a, [hJoyHeld] and e ret z - ld a, $ff + ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ld hl, wd736 set 6, [hl] ; jumping down ledge diff --git a/engine/overworld/player_state.asm b/engine/overworld/player_state.asm index 8d652cdfd..80b132ac3 100644 --- a/engine/overworld/player_state.asm +++ b/engine/overworld/player_state.asm @@ -56,12 +56,12 @@ CheckForceBikeOrSurf:: jr nz, .loop ; incorrect x-coord, check next item ld a, [wCurMap] cp SEAFOAM_ISLANDS_B3F - ld a, $2 + ld a, SCRIPT_SEAFOAMISLANDSB3F_MOVE_OBJECT ld [wSeafoamIslandsB3FCurScript], a jr z, .forceSurfing ld a, [wCurMap] cp SEAFOAM_ISLANDS_B4F - ld a, $2 + ld a, SCRIPT_SEAFOAMISLANDSB4F_MOVE_OBJECT ld [wSeafoamIslandsB4FCurScript], a jr z, .forceSurfing ;force bike riding diff --git a/gfx/sprites.asm b/gfx/sprites.asm index 4bcf678c2..d4ad14cfe 100644 --- a/gfx/sprites.asm +++ b/gfx/sprites.asm @@ -12,7 +12,7 @@ GrannySprite:: INCBIN "gfx/sprites/granny.2bpp" NurseSprite:: INCBIN "gfx/sprites/nurse.2bpp" LinkReceptionistSprite:: INCBIN "gfx/sprites/link_receptionist.2bpp" SilphPresidentSprite:: INCBIN "gfx/sprites/silph_president.2bpp" -SilphWorkerSprite:: INCBIN "gfx/sprites/silph_worker.2bpp" +SilphWorkerMSprite:: INCBIN "gfx/sprites/silph_worker_m.2bpp" WardenSprite:: INCBIN "gfx/sprites/warden.2bpp" CaptainSprite:: INCBIN "gfx/sprites/captain.2bpp" FisherSprite:: INCBIN "gfx/sprites/fisher.2bpp" @@ -58,7 +58,7 @@ GiovanniSprite:: INCBIN "gfx/sprites/giovanni.2bpp" RocketSprite:: INCBIN "gfx/sprites/rocket.2bpp" ChannelerSprite:: INCBIN "gfx/sprites/channeler.2bpp" WaiterSprite:: INCBIN "gfx/sprites/waiter.2bpp" -ErikaSprite:: INCBIN "gfx/sprites/erika.2bpp" +SilphWorkerFSprite:: INCBIN "gfx/sprites/silph_worker_f.2bpp" MiddleAgedWomanSprite:: INCBIN "gfx/sprites/middle_aged_woman.2bpp" BrunetteGirlSprite:: INCBIN "gfx/sprites/brunette_girl.2bpp" LanceSprite:: INCBIN "gfx/sprites/lance.2bpp" diff --git a/gfx/sprites/erika.png b/gfx/sprites/silph_worker_f.png similarity index 100% rename from gfx/sprites/erika.png rename to gfx/sprites/silph_worker_f.png diff --git a/gfx/sprites/silph_worker.png b/gfx/sprites/silph_worker_m.png similarity index 100% rename from gfx/sprites/silph_worker.png rename to gfx/sprites/silph_worker_m.png diff --git a/home/overworld.asm b/home/overworld.asm index a4e547bfb..be1e6b244 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -5,7 +5,7 @@ HandleMidJump:: EnterMap:: ; Load a new map. - ld a, $ff + ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a call LoadMapData farcall ClearVariablesOnEnterMap diff --git a/home/text.asm b/home/text.asm index b1f5e55c0..836f3986d 100644 --- a/home/text.asm +++ b/home/text.asm @@ -547,7 +547,7 @@ TextCommandSounds:: db TX_SOUND_GET_KEY_ITEM, SFX_GET_KEY_ITEM db TX_SOUND_DEX_PAGE_ADDED, SFX_DEX_PAGE_ADDED db TX_SOUND_CRY_NIDORINA, NIDORINA ; used in OakSpeech - db TX_SOUND_CRY_PIDGEOT, PIDGEOT ; used in SaffronCityText12 + db TX_SOUND_CRY_PIDGEOT, PIDGEOT ; used in SaffronCityPidgeotText db TX_SOUND_CRY_DEWGONG, DEWGONG ; unused TextCommand_DOTS:: diff --git a/macros/const.asm b/macros/const.asm index 7c7f85918..e0a84404b 100644 --- a/macros/const.asm +++ b/macros/const.asm @@ -39,6 +39,11 @@ MACRO const_next endc ENDM +MACRO dw_const + dw \1 + const \2 +ENDM + MACRO rb_skip IF _NARG == 1 rsset _RS + \1 diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index 5c1a8ad56..c5f0d1d0d 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -29,6 +29,12 @@ MACRO object_event ELSE db \6 ENDC + ; items and trainers don't use a typical text id + IF _NARG > 6 + REDEF _OBJECT_EVENT_{d:{_NUM_OBJECT_EVENTS}}_TEXT_ID EQUS "0" + ELSE + REDEF _OBJECT_EVENT_{d:{_NUM_OBJECT_EVENTS}}_TEXT_ID EQUS "\6" + ENDC DEF {_NUM_OBJECT_EVENTS} += 1 ENDM @@ -60,12 +66,22 @@ ENDM ;\3 sign id MACRO bg_event db \2, \1, \3 + REDEF _BG_EVENT_{d:{_NUM_BG_EVENTS}}_TEXT_ID EQUS "\3" DEF {_NUM_BG_EVENTS} += 1 ENDM ;\1 source map MACRO def_warps_to - FOR n, _NUM_WARP_EVENTS + ; text ID values are significant (see DisplayTextID in home/text_scripts.asm) + FOR n, {_NUM_BG_EVENTS} + ASSERT {_BG_EVENT_{d:n}_TEXT_ID} > {_NUM_OBJECT_EVENTS}, \ + "A bg_event has text ID {_BG_EVENT_{d:n}_TEXT_ID} expected for an object_event ({d:{_NUM_OBJECT_EVENTS}} or below)" + ENDR + FOR n, {_NUM_OBJECT_EVENTS} + ASSERT {_OBJECT_EVENT_{d:n}_TEXT_ID} <= {_NUM_OBJECT_EVENTS}, \ + "An object_event has text ID {_OBJECT_EVENT_{d:n}_TEXT_ID} expected for a bg_event (above {d:{_NUM_OBJECT_EVENTS}})" + ENDR + FOR n, {_NUM_WARP_EVENTS} warp_to _WARP_{d:n}_X, _WARP_{d:n}_Y, \1_WIDTH ENDR ENDM @@ -208,3 +224,9 @@ MACRO connection db _y, _x dw wOverworldMap + _win ENDM + +DEF def_script_pointers EQUS "const_def" + +DEF def_text_pointers EQUS "const_def 1" + +DEF object_const_def EQUS "const_def 1" diff --git a/scripts/AgathasRoom.asm b/scripts/AgathasRoom.asm index abe22a4f6..cf5254ac0 100644 --- a/scripts/AgathasRoom.asm +++ b/scripts/AgathasRoom.asm @@ -26,18 +26,19 @@ AgathaShowOrHideExitBlock: predef_jump ReplaceTileBlock ResetAgathaScript: - xor a + xor a ; SCRIPT_AGATHASROOM_DEFAULT ld [wAgathasRoomCurScript], a ret AgathasRoom_ScriptPointers: - dw AgathaScript0 - dw DisplayEnemyTrainerTextAndStartBattle - dw AgathaScript2 - dw AgathaScript3 - dw AgathaScript4 - -AgathaScript4: + def_script_pointers + dw_const AgathasRoomDefaultScript, SCRIPT_AGATHASROOM_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_AGATHASROOM_AGATHA_START_BATTLE + dw_const AgathasRoomAgathaEndBattleScript, SCRIPT_AGATHASROOM_AGATHA_END_BATTLE + dw_const AgathasRoomPlayerIsMovingScript, SCRIPT_AGATHASROOM_PLAYER_IS_MOVING + dw_const AgathasRoomNoopScript, SCRIPT_AGATHASROOM_NOOP + +AgathasRoomNoopScript: ret AgathaScriptWalkIntoRoom: @@ -53,12 +54,12 @@ AgathaScriptWalkIntoRoom: ld a, $6 ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld a, $3 + ld a, SCRIPT_AGATHASROOM_PLAYER_IS_MOVING ld [wAgathasRoomCurScript], a ld [wCurMapScript], a ret -AgathaScript0: +AgathasRoomDefaultScript: ld hl, AgathaEntranceCoords call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers @@ -73,15 +74,15 @@ AgathaScript0: CheckAndSetEvent EVENT_AUTOWALKED_INTO_AGATHAS_ROOM jr z, AgathaScriptWalkIntoRoom .stopPlayerFromLeaving - ld a, $2 + ld a, TEXT_AGATHASROOM_AGATHA_DONT_RUN_AWAY ldh [hSpriteIndexOrTextID], a - call DisplayTextID ; "Don't run away!" + call DisplayTextID ld a, D_UP ld [wSimulatedJoypadStatesEnd], a ld a, $1 ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld a, $3 + ld a, SCRIPT_AGATHASROOM_PLAYER_IS_MOVING ld [wAgathasRoomCurScript], a ld [wCurMapScript], a ret @@ -93,7 +94,7 @@ AgathaEntranceCoords: dbmapcoord 5, 11 db -1 ; end -AgathaScript3: +AgathasRoomPlayerIsMovingScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -104,21 +105,22 @@ AgathaScript3: ld [wCurMapScript], a ret -AgathaScript2: +AgathasRoomAgathaEndBattleScript: call EndTrainerBattle ld a, [wIsInBattle] cp $ff jp z, ResetAgathaScript - ld a, $1 + ld a, TEXT_AGATHASROOM_AGATHA ldh [hSpriteIndexOrTextID], a call DisplayTextID - ld a, $1 + ld a, SCRIPT_CHAMPIONSROOM_PLAYER_ENTERS ld [wChampionsRoomCurScript], a ret AgathasRoom_TextPointers: - dw AgathaText1 - dw AgathaDontRunAwayText + def_text_pointers + dw_const AgathasRoomAgathaText, TEXT_AGATHASROOM_AGATHA + dw_const AgathasRoomAgathaDontRunAwayText, TEXT_AGATHASROOM_AGATHA_DONT_RUN_AWAY AgathasRoomTrainerHeaders: def_trainers @@ -126,7 +128,7 @@ AgathasRoomTrainerHeader0: trainer EVENT_BEAT_AGATHAS_ROOM_TRAINER_0, 0, AgathaBeforeBattleText, AgathaEndBattleText, AgathaAfterBattleText db -1 ; end -AgathaText1: +AgathasRoomAgathaText: text_asm ld hl, AgathasRoomTrainerHeader0 call TalkToTrainer @@ -144,6 +146,6 @@ AgathaAfterBattleText: text_far _AgathaAfterBattleText text_end -AgathaDontRunAwayText: - text_far _AgathaDontRunAwayText +AgathasRoomAgathaDontRunAwayText: + text_far _AgathasRoomAgathaDontRunAwayText text_end diff --git a/scripts/BikeShop.asm b/scripts/BikeShop.asm index f5f0539ed..3321a23e7 100644 --- a/scripts/BikeShop.asm +++ b/scripts/BikeShop.asm @@ -2,22 +2,23 @@ BikeShop_Script: jp EnableAutoTextBoxDrawing BikeShop_TextPointers: - dw BikeShopText1 - dw BikeShopText2 - dw BikeShopText3 + def_text_pointers + dw_const BikeShopClerkText, TEXT_BIKESHOP_CLERK + dw_const BikeShopMiddleAgedWomanText, TEXT_BIKESHOP_MIDDLE_AGED_WOMAN + dw_const BikeShopYoungsterText, TEXT_BIKESHOP_YOUNGSTER -BikeShopText1: +BikeShopClerkText: text_asm CheckEvent EVENT_GOT_BICYCLE - jr z, .asm_260d4 - ld hl, BikeShopText_1d82f + jr z, .dontHaveBike + ld hl, BikeShopClerkHowDoYouLikeYourBicycleText call PrintText jp .Done -.asm_260d4 +.dontHaveBike ld b, BIKE_VOUCHER call IsItemInBag - jr z, .asm_41190 - ld hl, BikeShopText_1d81f + jr z, .dontHaveVoucher + ld hl, BikeShopClerkOhThatsAVoucherText call PrintText lb bc, BICYCLE, 1 call GiveItem @@ -26,15 +27,15 @@ BikeShopText1: ldh [hItemToRemoveID], a farcall RemoveItemByID SetEvent EVENT_GOT_BICYCLE - ld hl, BikeShopText_1d824 + ld hl, BikeShopExchangedVoucherText call PrintText jr .Done .BagFull - ld hl, BikeShopText_1d834 + ld hl, BikeShopBagFullText call PrintText jr .Done -.asm_41190 - ld hl, BikeShopText_1d810 +.dontHaveVoucher + ld hl, BikeShopClerkWelcomeText call PrintText xor a ld [wCurrentMenuItem], a @@ -60,7 +61,7 @@ BikeShopText1: hlcoord 8, 3 ld de, BikeShopMenuPrice call PlaceString - ld hl, BikeShopText_1d815 + ld hl, BikeShopClerkDoYouLikeItText call PrintText call HandleMenuInput bit BIT_B_BUTTON, a @@ -85,24 +86,24 @@ BikeShopMenuText: BikeShopMenuPrice: db "¥1000000@" -BikeShopText_1d810: - text_far _BikeShopText_1d810 +BikeShopClerkWelcomeText: + text_far _BikeShopClerkWelcomeText text_end -BikeShopText_1d815: - text_far _BikeShopText_1d815 +BikeShopClerkDoYouLikeItText: + text_far _BikeShopClerkDoYouLikeItText text_end BikeShopCantAffordText: text_far _BikeShopCantAffordText text_end -BikeShopText_1d81f: - text_far _BikeShopText_1d81f +BikeShopClerkOhThatsAVoucherText: + text_far _BikeShopClerkOhThatsAVoucherText text_end -BikeShopText_1d824: - text_far _BikeShopText_1d824 +BikeShopExchangedVoucherText: + text_far _BikeShopExchangedVoucherText sound_get_key_item text_end @@ -110,38 +111,38 @@ BikeShopComeAgainText: text_far _BikeShopComeAgainText text_end -BikeShopText_1d82f: - text_far _BikeShopText_1d82f +BikeShopClerkHowDoYouLikeYourBicycleText: + text_far _BikeShopClerkHowDoYouLikeYourBicycleText text_end -BikeShopText_1d834: - text_far _BikeShopText_1d834 +BikeShopBagFullText: + text_far _BikeShopBagFullText text_end -BikeShopText2: +BikeShopMiddleAgedWomanText: text_asm - ld hl, BikeShopText_1d843 + ld hl, .Text call PrintText jp TextScriptEnd -BikeShopText_1d843: - text_far _BikeShopText_1d843 +.Text: + text_far _BikeShopMiddleAgedWomanText text_end -BikeShopText3: +BikeShopYoungsterText: text_asm CheckEvent EVENT_GOT_BICYCLE - ld hl, BikeShopText_1d861 - jr nz, .asm_34d2d - ld hl, BikeShopText_1d85c -.asm_34d2d + ld hl, .CoolBikeText + jr nz, .gotBike + ld hl, .TheseBikesAreExpensiveText +.gotBike call PrintText jp TextScriptEnd -BikeShopText_1d85c: - text_far _BikeShopText_1d85c +.TheseBikesAreExpensiveText: + text_far _BikeShopYoungsterTheseBikesAreExpensiveText text_end -BikeShopText_1d861: - text_far _BikeShopText_1d861 +.CoolBikeText: + text_far _BikeShopYoungsterCoolBikeText text_end diff --git a/scripts/BillsHouse.asm b/scripts/BillsHouse.asm index 2085f417e..b6257d4f0 100644 --- a/scripts/BillsHouse.asm +++ b/scripts/BillsHouse.asm @@ -5,38 +5,39 @@ BillsHouse_Script: jp CallFunctionInTable BillsHouse_ScriptPointers: - dw BillsHouseScript0 - dw BillsHouseScript1 - dw BillsHouseScript2 - dw BillsHouseScript3 - dw BillsHouseScript4 - dw BillsHouseScript5 - -BillsHouseScript0: + def_script_pointers + dw_const BillsHouseDefaultScript, SCRIPT_BILLSHOUSE_DEFAULT + dw_const BillsHousePokemonWalkToMachineScript, SCRIPT_BILLSHOUSE_POKEMON_WALK_TO_MACHINE + dw_const BillsHousePokemonEntersMachineScript, SCRIPT_BILLSHOUSE_POKEMON_ENTERS_MACHINE + dw_const BillsHouseBillExitsMachineScript, SCRIPT_BILLSHOUSE_BILL_EXITS_MACHINE + dw_const BillsHouseCleanupScript, SCRIPT_BILLSHOUSE_CLEANUP + dw_const BillsHousePCScript, SCRIPT_BILLSHOUSE_PC + +BillsHouseDefaultScript: ret -BillsHouseScript1: +BillsHousePokemonWalkToMachineScript: ld a, [wSpritePlayerStateData1FacingDirection] and a ; cp SPRITE_FACING_DOWN - ld de, MovementData_1e79c + ld de, .PokemonWalkToMachineMovement jr nz, .notDown - ld de, MovementData_1e7a0 + ld de, .PokemonWalkAroundPlayerMovement .notDown - ld a, $1 + ld a, BILLSHOUSE_BILL_POKEMON ldh [hSpriteIndex], a call MoveSprite - ld a, $2 + ld a, SCRIPT_BILLSHOUSE_POKEMON_ENTERS_MACHINE ld [wBillsHouseCurScript], a ret -MovementData_1e79c: +.PokemonWalkToMachineMovement: db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP db -1 ; end ; make Bill walk around the player -MovementData_1e7a0: +.PokemonWalkAroundPlayerMovement: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP @@ -44,7 +45,7 @@ MovementData_1e7a0: db NPC_MOVEMENT_UP db -1 ; end -BillsHouseScript2: +BillsHousePokemonEntersMachineScript: ld a, [wd730] bit 0, a ret nz @@ -54,16 +55,16 @@ BillsHouseScript2: SetEvent EVENT_BILL_SAID_USE_CELL_SEPARATOR xor a ld [wJoyIgnore], a - ld a, $3 + ld a, SCRIPT_BILLSHOUSE_BILL_EXITS_MACHINE ld [wBillsHouseCurScript], a ret -BillsHouseScript3: +BillsHouseBillExitsMachineScript: CheckEvent EVENT_USED_CELL_SEPARATOR_ON_BILL ret z - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a - ld a, $2 + ld a, BILLSHOUSE_BILL1 ld [wSpriteIndex], a ld a, $c ldh [hSpriteScreenYCoord], a @@ -79,15 +80,15 @@ BillsHouseScript3: predef ShowObject ld c, 8 call DelayFrames - ld a, $2 + ld a, BILLSHOUSE_BILL1 ldh [hSpriteIndex], a - ld de, MovementData_1e807 + ld de, BillExitMachineMovement call MoveSprite - ld a, $4 + ld a, SCRIPT_BILLSHOUSE_CLEANUP ld [wBillsHouseCurScript], a ret -MovementData_1e807: +BillExitMachineMovement: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT @@ -95,7 +96,7 @@ MovementData_1e807: db NPC_MOVEMENT_DOWN db -1 ; end -BillsHouseScript4: +BillsHouseCleanupScript: ld a, [wd730] bit 0, a ret nz @@ -103,70 +104,71 @@ BillsHouseScript4: ld [wJoyIgnore], a SetEvent EVENT_MET_BILL_2 ; this event seems redundant SetEvent EVENT_MET_BILL - ld a, $0 + ld a, SCRIPT_BILLSHOUSE_DEFAULT ld [wBillsHouseCurScript], a ret -BillsHouseScript5: - ld a, $4 +BillsHousePCScript: + ld a, TEXT_BILLSHOUSE_ACTIVATE_PC ldh [hSpriteIndexOrTextID], a call DisplayTextID - ld a, $0 + ld a, SCRIPT_BILLSHOUSE_DEFAULT ld [wBillsHouseCurScript], a ret BillsHouse_TextPointers: - dw BillsHouseText1 - dw BillsHouseText2 - dw BillsHouseText3 - dw BillsHouseText4 + def_text_pointers + dw_const BillsHouseBillPokemonText, TEXT_BILLSHOUSE_BILL_POKEMON + dw_const BillsHouseBillSSTicketText, TEXT_BILLSHOUSE_BILL_SS_TICKET + dw_const BillsHouseBillCheckOutMyRarePokemonText, TEXT_BILLSHOUSE_BILL_CHECK_OUT_MY_RARE_POKEMON + dw_const BillsHouseActivatePCScript, TEXT_BILLSHOUSE_ACTIVATE_PC -BillsHouseText4: +BillsHouseActivatePCScript: script_bills_pc -BillsHouseText1: +BillsHouseBillPokemonText: text_asm - ld hl, BillsHouseText_1e865 + ld hl, .ImNotAPokemonText call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a - jr nz, .asm_1e85a -.asm_1e84d - ld hl, BillsHouseText_1e86a + jr nz, .answered_no +.use_machine + ld hl, .UseSeparationSystemText call PrintText - ld a, $1 + ld a, SCRIPT_BILLSHOUSE_POKEMON_WALK_TO_MACHINE ld [wBillsHouseCurScript], a - jr .asm_1e862 -.asm_1e85a - ld hl, BillsHouseText_1e86f + jr .text_script_end +.answered_no + ld hl, .NoYouGottaHelpText call PrintText - jr .asm_1e84d -.asm_1e862 + jr .use_machine +.text_script_end jp TextScriptEnd -BillsHouseText_1e865: - text_far _BillsHouseText_1e865 +.ImNotAPokemonText: + text_far _BillsHouseBillImNotAPokemonText text_end -BillsHouseText_1e86a: - text_far _BillsHouseText_1e86a +.UseSeparationSystemText: + text_far _BillsHouseBillUseSeparationSystemText text_end -BillsHouseText_1e86f: - text_far _BillsHouseText_1e86f +.NoYouGottaHelpText: + text_far _BillsHouseBillNoYouGottaHelpText text_end -BillsHouseText2: +BillsHouseBillSSTicketText: text_asm CheckEvent EVENT_GOT_SS_TICKET - jr nz, .asm_1e8a9 - ld hl, BillThankYouText + jr nz, .got_ss_ticket + ld hl, .ThankYouText call PrintText lb bc, S_S_TICKET, 1 call GiveItem - jr nc, .BagFull - ld hl, SSTicketReceivedText + jr nc, .bag_full + ld hl, .SSTicketReceivedText call PrintText SetEvent EVENT_GOT_SS_TICKET ld a, HS_CERULEAN_GUARD_1 @@ -175,40 +177,40 @@ BillsHouseText2: ld a, HS_CERULEAN_GUARD_2 ld [wMissableObjectIndex], a predef HideObject -.asm_1e8a9 - ld hl, BillsHouseText_1e8cb +.got_ss_ticket + ld hl, .WhyDontYouGoInsteadOfMeText call PrintText - jr .asm_1e8b7 -.BagFull - ld hl, SSTicketNoRoomText + jr .text_script_end +.bag_full + ld hl, .SSTicketNoRoomText call PrintText -.asm_1e8b7 +.text_script_end jp TextScriptEnd -BillThankYouText: - text_far _BillThankYouText +.ThankYouText: + text_far _BillsHouseBillThankYouText text_end -SSTicketReceivedText: +.SSTicketReceivedText: text_far _SSTicketReceivedText sound_get_key_item text_promptbutton text_end -SSTicketNoRoomText: +.SSTicketNoRoomText: text_far _SSTicketNoRoomText text_end -BillsHouseText_1e8cb: - text_far _BillsHouseText_1e8cb +.WhyDontYouGoInsteadOfMeText: + text_far _BillsHouseBillWhyDontYouGoInsteadOfMeText text_end -BillsHouseText3: +BillsHouseBillCheckOutMyRarePokemonText: text_asm - ld hl, BillsHouseText_1e8da + ld hl, .Text call PrintText jp TextScriptEnd -BillsHouseText_1e8da: - text_far _BillsHouseText_1e8da +.Text: + text_far _BillsHouseBillCheckOutMyRarePokemonText text_end diff --git a/scripts/BluesHouse.asm b/scripts/BluesHouse.asm index 1ab0fd063..0a16abbf6 100644 --- a/scripts/BluesHouse.asm +++ b/scripts/BluesHouse.asm @@ -5,22 +5,24 @@ BluesHouse_Script: jp CallFunctionInTable BluesHouse_ScriptPointers: - dw BluesHouseScript0 - dw BluesHouseScript1 + def_script_pointers + dw_const BluesHouseDefaultScript, SCRIPT_BLUESHOUSE_DEFAULT + dw_const BluesHouseNoopScript, SCRIPT_BLUESHOUSE_NOOP -BluesHouseScript0: +BluesHouseDefaultScript: SetEvent EVENT_ENTERED_BLUES_HOUSE - ld a, $1 + ld a, SCRIPT_BLUESHOUSE_NOOP ld [wBluesHouseCurScript], a ret -BluesHouseScript1: +BluesHouseNoopScript: ret BluesHouse_TextPointers: - dw BluesHouseDaisySittingText - dw BluesHouseDaisyWalkingText - dw BluesHouseTownMapText + def_text_pointers + dw_const BluesHouseDaisySittingText, TEXT_BLUESHOUSE_DAISY_SITTING + dw_const BluesHouseDaisyWalkingText, TEXT_BLUESHOUSE_DAISY_WALKING + dw_const BluesHouseTownMapText, TEXT_BLUESHOUSE_TOWN_MAP BluesHouseDaisySittingText: text_asm @@ -28,12 +30,12 @@ BluesHouseDaisySittingText: jr nz, .got_town_map CheckEvent EVENT_GOT_POKEDEX jr nz, .give_town_map - ld hl, DaisyInitialText + ld hl, BluesHouseDaisyRivalAtLabText call PrintText jr .done .give_town_map - ld hl, DaisyOfferMapText + ld hl, BluesHouseDaisyOfferMapText call PrintText lb bc, TOWN_MAP, 1 call GiveItem @@ -47,22 +49,22 @@ BluesHouseDaisySittingText: jr .done .got_town_map - ld hl, DaisyUseMapText + ld hl, BluesHouseDaisyUseMapText call PrintText jr .done .bag_full - ld hl, DaisyBagFullText + ld hl, BluesHouseDaisyBagFullText call PrintText .done jp TextScriptEnd -DaisyInitialText: - text_far _DaisyInitialText +BluesHouseDaisyRivalAtLabText: + text_far _BluesHouseDaisyRivalAtLabText text_end -DaisyOfferMapText: - text_far _DaisyOfferMapText +BluesHouseDaisyOfferMapText: + text_far _BluesHouseDaisyOfferMapText text_end GotMapText: @@ -70,12 +72,12 @@ GotMapText: sound_get_key_item text_end -DaisyBagFullText: - text_far _DaisyBagFullText +BluesHouseDaisyBagFullText: + text_far _BluesHouseDaisyBagFullText text_end -DaisyUseMapText: - text_far _DaisyUseMapText +BluesHouseDaisyUseMapText: + text_far _BluesHouseDaisyUseMapText text_end BluesHouseDaisyWalkingText: diff --git a/scripts/BrunosRoom.asm b/scripts/BrunosRoom.asm index ca8f5418b..2a4ed6e66 100644 --- a/scripts/BrunosRoom.asm +++ b/scripts/BrunosRoom.asm @@ -26,18 +26,19 @@ BrunoShowOrHideExitBlock: predef_jump ReplaceTileBlock ResetBrunoScript: - xor a + xor a ; SCRIPT_BRUNOSROOM_DEFAULT ld [wBrunosRoomCurScript], a ret BrunosRoom_ScriptPointers: - dw BrunoScript0 - dw DisplayEnemyTrainerTextAndStartBattle - dw BrunoScript2 - dw BrunoScript3 - dw BrunoScript4 - -BrunoScript4: + def_script_pointers + dw_const BrunosRoomDefaultScript, SCRIPT_BRUNOSROOM_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_BRUNOSROOM_BRUNO_START_BATTLE + dw_const BrunosRoomBrunoEndBattleScript, SCRIPT_BRUNOSROOM_BRUNO_END_BATTLE + dw_const BrunosRoomPlayerIsMovingScript, SCRIPT_BRUNOSROOM_PLAYER_IS_MOVING + dw_const BrunosRoomNoopScript, SCRIPT_BRUNOSROOM_NOOP + +BrunosRoomNoopScript: ret BrunoScriptWalkIntoRoom: @@ -53,12 +54,12 @@ BrunoScriptWalkIntoRoom: ld a, $6 ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld a, $3 + ld a, SCRIPT_BRUNOSROOM_PLAYER_IS_MOVING ld [wBrunosRoomCurScript], a ld [wCurMapScript], a ret -BrunoScript0: +BrunosRoomDefaultScript: ld hl, BrunoEntranceCoords call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers @@ -73,7 +74,7 @@ BrunoScript0: CheckAndSetEvent EVENT_AUTOWALKED_INTO_BRUNOS_ROOM jr z, BrunoScriptWalkIntoRoom .stopPlayerFromLeaving - ld a, $2 + ld a, TEXT_BRUNOSROOM_BRUNO_DONT_RUN_AWAY ldh [hSpriteIndexOrTextID], a call DisplayTextID ; "Don't run away!" ld a, D_UP @@ -81,7 +82,7 @@ BrunoScript0: ld a, $1 ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld a, $3 + ld a, SCRIPT_BRUNOSROOM_PLAYER_IS_MOVING ld [wBrunosRoomCurScript], a ld [wCurMapScript], a ret @@ -93,29 +94,30 @@ BrunoEntranceCoords: dbmapcoord 5, 11 db -1 ; end -BrunoScript3: +BrunosRoomPlayerIsMovingScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz call Delay3 - xor a + xor a ; SCRIPT_BRUNOSROOM_DEFAULT ld [wJoyIgnore], a ld [wBrunosRoomCurScript], a ld [wCurMapScript], a ret -BrunoScript2: +BrunosRoomBrunoEndBattleScript: call EndTrainerBattle ld a, [wIsInBattle] cp $ff jp z, ResetBrunoScript - ld a, $1 + ld a, TEXT_BRUNOSROOM_BRUNO ldh [hSpriteIndexOrTextID], a jp DisplayTextID BrunosRoom_TextPointers: - dw BrunoText1 - dw BrunoDontRunAwayText + def_text_pointers + dw_const BrunosRoomBrunoText, TEXT_BRUNOSROOM_BRUNO + dw_const BrunosRoomBrunoDontRunAwayText, TEXT_BRUNOSROOM_BRUNO_DONT_RUN_AWAY BrunosRoomTrainerHeaders: def_trainers @@ -123,7 +125,7 @@ BrunosRoomTrainerHeader0: trainer EVENT_BEAT_BRUNOS_ROOM_TRAINER_0, 0, BrunoBeforeBattleText, BrunoEndBattleText, BrunoAfterBattleText db -1 ; end -BrunoText1: +BrunosRoomBrunoText: text_asm ld hl, BrunosRoomTrainerHeader0 call TalkToTrainer @@ -141,6 +143,6 @@ BrunoAfterBattleText: text_far _BrunoAfterBattleText text_end -BrunoDontRunAwayText: - text_far _BrunoDontRunAwayText +BrunosRoomBrunoDontRunAwayText: + text_far _BrunosRoomBrunoDontRunAwayText text_end diff --git a/scripts/CeladonChiefHouse.asm b/scripts/CeladonChiefHouse.asm index ad604b980..86e3a004a 100644 --- a/scripts/CeladonChiefHouse.asm +++ b/scripts/CeladonChiefHouse.asm @@ -3,18 +3,19 @@ CeladonChiefHouse_Script: ret CeladonChiefHouse_TextPointers: - dw CeladonHouseText1 - dw CeladonHouseText2 - dw CeladonHouseText3 + def_text_pointers + dw_const CeladonChiefHouseChiefText, TEXT_CELADONCHIEFHOUSE_CHIEF + dw_const CeladonChiefHouseRocketText, TEXT_CELADONCHIEFHOUSE_ROCKET + dw_const CeladonChiefHouseSailorText, TEXT_CELADONCHIEFHOUSE_SAILOR -CeladonHouseText1: - text_far _CeladonHouseText1 +CeladonChiefHouseChiefText: + text_far _CeladonChiefHouseChiefText text_end -CeladonHouseText2: - text_far _CeladonHouseText2 +CeladonChiefHouseRocketText: + text_far _CeladonChiefHouseRocketText text_end -CeladonHouseText3: - text_far _CeladonHouseText3 +CeladonChiefHouseSailorText: + text_far _CeladonChiefHouseSailorText text_end diff --git a/scripts/CeladonCity.asm b/scripts/CeladonCity.asm index bd0228d8a..ee62c78ba 100644 --- a/scripts/CeladonCity.asm +++ b/scripts/CeladonCity.asm @@ -5,128 +5,129 @@ CeladonCity_Script: ret CeladonCity_TextPointers: - dw CeladonCityText1 - dw CeladonCityText2 - dw CeladonCityText3 - dw CeladonCityText4 - dw CeladonCityText5 - dw CeladonCityText6 - dw CeladonCityText7 - dw CeladonCityText8 - dw CeladonCityText9 - dw CeladonCityText10 - dw CeladonCityText11 - dw PokeCenterSignText - dw CeladonCityText13 - dw CeladonCityText14 - dw CeladonCityText15 - dw CeladonCityText16 - dw CeladonCityText17 - dw CeladonCityText18 + def_text_pointers + dw_const CeladonCityLittleGirlText, TEXT_CELADONCITY_LITTLE_GIRL + dw_const CeladonCityGramps1Text, TEXT_CELADONCITY_GRAMPS1 + dw_const CeladonCityGirlText, TEXT_CELADONCITY_GIRL + dw_const CeladonCityGramps2Text, TEXT_CELADONCITY_GRAMPS2 + dw_const CeladonCityGramps3Text, TEXT_CELADONCITY_GRAMPS3 + dw_const CeladonCityFisherText, TEXT_CELADONCITY_FISHER + dw_const CeladonCityPoliwrathText, TEXT_CELADONCITY_POLIWRATH + dw_const CeladonCityRocket1Text, TEXT_CELADONCITY_ROCKET1 + dw_const CeladonCityRocket2Text, TEXT_CELADONCITY_ROCKET2 + dw_const CeladonCityTrainerTips1Text, TEXT_CELADONCITY_TRAINER_TIPS1 + dw_const CeladonCitySignText, TEXT_CELADONCITY_SIGN + dw_const PokeCenterSignText, TEXT_CELADONCITY_POKECENTER_SIGN + dw_const CeladonCityGymSignText, TEXT_CELADONCITY_GYM_SIGN + dw_const CeladonCityMansionSignText, TEXT_CELADONCITY_MANSION_SIGN + dw_const CeladonCityDeptStoreSignText, TEXT_CELADONCITY_DEPTSTORE_SIGN + dw_const CeladonCityTrainerTips2Text, TEXT_CELADONCITY_TRAINER_TIPS2 + dw_const CeladonCityPrizeExchangeSignText, TEXT_CELADONCITY_PRIZEEXCHANGE_SIGN + dw_const CeladonCityGameCornerSignText, TEXT_CELADONCITY_GAMECORNER_SIGN -CeladonCityText1: - text_far _CeladonCityText1 +CeladonCityLittleGirlText: + text_far _CeladonCityLittleGirlText text_end -CeladonCityText2: - text_far _CeladonCityText2 +CeladonCityGramps1Text: + text_far _CeladonCityGramps1Text text_end -CeladonCityText3: - text_far _CeladonCityText3 +CeladonCityGirlText: + text_far _CeladonCityGirlText text_end -CeladonCityText4: - text_far _CeladonCityText4 +CeladonCityGramps2Text: + text_far _CeladonCityGramps2Text text_end -CeladonCityText5: +CeladonCityGramps3Text: text_asm CheckEvent EVENT_GOT_TM41 - jr nz, .asm_7053f - ld hl, TM41PreText + jr nz, .gotTM41 + ld hl, .Text call PrintText lb bc, TM_SOFTBOILED, 1 call GiveItem jr c, .Success - ld hl, TM41NoRoomText + ld hl, .TM41NoRoomText call PrintText jr .Done .Success - ld hl, ReceivedTM41Text + ld hl, .ReceivedTM41Text call PrintText SetEvent EVENT_GOT_TM41 jr .Done -.asm_7053f - ld hl, TM41ExplanationText +.gotTM41 + ld hl, .TM41ExplanationText call PrintText .Done jp TextScriptEnd -TM41PreText: - text_far _TM41PreText +.Text: + text_far _CeledonCityGramps3Text text_end -ReceivedTM41Text: - text_far _ReceivedTM41Text +.ReceivedTM41Text: + text_far _CeledonCityGramps3ReceivedTM41Text sound_get_item_1 text_end -TM41ExplanationText: - text_far _TM41ExplanationText +.TM41ExplanationText: + text_far _CeledonCityGramps3TM41ExplanationText text_end -TM41NoRoomText: - text_far _TM41NoRoomText +.TM41NoRoomText: + text_far _CeledonCityGramps3TM41NoRoomText text_end -CeladonCityText6: - text_far _CeladonCityText6 +CeladonCityFisherText: + text_far _CeladonCityFisherText text_end -CeladonCityText7: - text_far _CeladonCityText7 +CeladonCityPoliwrathText: + text_far _CeladonCityPoliwrathText text_asm ld a, POLIWRATH call PlayCry jp TextScriptEnd -CeladonCityText8: - text_far _CeladonCityText8 +CeladonCityRocket1Text: + text_far _CeladonCityRocket1Text text_end -CeladonCityText9: - text_far _CeladonCityText9 +CeladonCityRocket2Text: + text_far _CeladonCityRocket2Text text_end -CeladonCityText10: - text_far _CeladonCityText10 +CeladonCityTrainerTips1Text: + text_far _CeladonCityTrainerTips1Text text_end -CeladonCityText11: - text_far _CeladonCityText11 +CeladonCitySignText: + text_far _CeladonCitySignText text_end -CeladonCityText13: - text_far _CeladonCityText13 +CeladonCityGymSignText: + text_far _CeladonCityGymSignText text_end -CeladonCityText14: - text_far _CeladonCityText14 +CeladonCityMansionSignText: + text_far _CeladonCityMansionSignText text_end -CeladonCityText15: - text_far _CeladonCityText15 +CeladonCityDeptStoreSignText: + text_far _CeladonCityDeptStoreSignText text_end -CeladonCityText16: - text_far _CeladonCityText16 +CeladonCityTrainerTips2Text: + text_far _CeladonCityTrainerTips2Text text_end -CeladonCityText17: - text_far _CeladonCityText17 +CeladonCityPrizeExchangeSignText: + text_far _CeladonCityPrizeExchangeSignText text_end -CeladonCityText18: - text_far _CeladonCityText18 +CeladonCityGameCornerSignText: + text_far _CeladonCityGameCornerSignText text_end diff --git a/scripts/CeladonDiner.asm b/scripts/CeladonDiner.asm index e95035f06..ca54af4f1 100644 --- a/scripts/CeladonDiner.asm +++ b/scripts/CeladonDiner.asm @@ -3,64 +3,65 @@ CeladonDiner_Script: ret CeladonDiner_TextPointers: - dw CeladonDinerText1 - dw CeladonDinerText2 - dw CeladonDinerText3 - dw CeladonDinerText4 - dw CeladonDinerText5 + def_text_pointers + dw_const CeladonDinerCookText, TEXT_CELADONDINER_COOK + dw_const CeladonDinerMiddleAgedWomanText, TEXT_CELADONDINER_MIDDLE_AGED_WOMAN + dw_const CeladonDinerMiddleAgedManText, TEXT_CELADONDINER_MIDDLE_AGED_MAN + dw_const CeladonDinerFisherText, TEXT_CELADONDINER_FISHER + dw_const CeladonDinerGymGuideText, TEXT_CELADONDINER_GYM_GUIDE -CeladonDinerText1: - text_far _CeladonDinerText1 +CeladonDinerCookText: + text_far _CeladonDinerCookText text_end -CeladonDinerText2: - text_far _CeladonDinerText2 +CeladonDinerMiddleAgedWomanText: + text_far _CeladonDinerMiddleAgedWomanText text_end -CeladonDinerText3: - text_far _CeladonDinerText3 +CeladonDinerMiddleAgedManText: + text_far _CeladonDinerMiddleAgedManText text_end -CeladonDinerText4: - text_far _CeladonDinerText4 +CeladonDinerFisherText: + text_far _CeladonDinerFisherText text_end -CeladonDinerText5: +CeladonDinerGymGuideText: text_asm CheckEvent EVENT_GOT_COIN_CASE jr nz, .got_item - ld hl, CeladonDinerText_491a7 + ld hl, .ImFlatOutBustedText call PrintText lb bc, COIN_CASE, 1 call GiveItem jr nc, .bag_full SetEvent EVENT_GOT_COIN_CASE - ld hl, ReceivedCoinCaseText + ld hl, .ReceivedCoinCaseText call PrintText jr .done .bag_full - ld hl, CoinCaseNoRoomText + ld hl, .CoinCaseNoRoomText call PrintText jr .done .got_item - ld hl, CeladonDinerText_491b7 + ld hl, .WinItBackText call PrintText .done jp TextScriptEnd -CeladonDinerText_491a7: - text_far _CeladonDinerText_491a7 +.ImFlatOutBustedText: + text_far _CeladonDinerGymGuideImFlatOutBustedText text_end -ReceivedCoinCaseText: - text_far _ReceivedCoinCaseText +.ReceivedCoinCaseText: + text_far _CeladonDinerGymGuideReceivedCoinCaseText sound_get_key_item text_end -CoinCaseNoRoomText: - text_far _CoinCaseNoRoomText +.CoinCaseNoRoomText: + text_far _CeladonDinerGymGuideCoinCaseNoRoomText text_end -CeladonDinerText_491b7: - text_far _CeladonDinerText_491b7 +.WinItBackText: + text_far _CeladonDinerGymGuideWinItBackText text_end diff --git a/scripts/CeladonGym.asm b/scripts/CeladonGym.asm index 2ffa1995c..0195d0b9e 100644 --- a/scripts/CeladonGym.asm +++ b/scripts/CeladonGym.asm @@ -23,40 +23,41 @@ CeladonGym_Script: db "ERIKA@" CeladonGymResetScripts: - xor a + xor a ; SCRIPT_CELADONGYM_DEFAULT ld [wJoyIgnore], a ld [wCeladonGymCurScript], a ld [wCurMapScript], a ret CeladonGym_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw CeladonGymErikaPostBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_CELADONGYM_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_CELADONGYM_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_CELADONGYM_END_BATTLE + dw_const CeladonGymErikaPostBattleScript, SCRIPT_CELADONGYM_ERIKA_POST_BATTLE -CeladonGymErikaPostBattle: +CeladonGymErikaPostBattleScript: ld a, [wIsInBattle] cp $ff jp z, CeladonGymResetScripts - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a CeladonGymReceiveTM21: - ld a, $9 + ld a, TEXT_CELADONGYM_RAINBOWBADGE_INFO ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_ERIKA lb bc, TM_MEGA_DRAIN, 1 call GiveItem jr nc, .BagFull - ld a, $a + ld a, TEXT_CELADONGYM_RECEIVED_TM21 ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM21 jr .gymVictory .BagFull - ld a, $b + ld a, TEXT_CELADONGYM_TM21_NO_ROOM ldh [hSpriteIndexOrTextID], a call DisplayTextID .gymVictory @@ -71,17 +72,18 @@ CeladonGymReceiveTM21: jp CeladonGymResetScripts CeladonGym_TextPointers: - dw ErikaText - dw CeladonGymTrainerText1 - dw CeladonGymTrainerText2 - dw CeladonGymTrainerText3 - dw CeladonGymTrainerText4 - dw CeladonGymTrainerText5 - dw CeladonGymTrainerText6 - dw CeladonGymTrainerText7 - dw ErikaRainbowBadgeInfoText - dw ReceivedTM21Text - dw TM21NoRoomText + def_text_pointers + dw_const CeladonGymErikaText, TEXT_CELADONGYM_ERIKA + dw_const CeladonGymCooltrainerF1Text, TEXT_CELADONGYM_COOLTRAINER_F1 + dw_const CeladonGymBeauty1Text, TEXT_CELADONGYM_BEAUTY1 + dw_const CeladonGymCooltrainerF2Text, TEXT_CELADONGYM_COOLTRAINER_F2 + dw_const CeladonGymBeauty2Text, TEXT_CELADONGYM_BEAUTY2 + dw_const CeladonGymCooltrainerF3Text, TEXT_CELADONGYM_COOLTRAINER_F3 + dw_const CeladonGymBeauty3Text, TEXT_CELADONGYM_BEAUTY3 + dw_const CeladonGymCooltrainerF4Text, TEXT_CELADONGYM_COOLTRAINER_F4 + dw_const CeladonGymRainbowBadgeInfoText, TEXT_CELADONGYM_RAINBOWBADGE_INFO + dw_const CeladonGymReceivedTM21Text, TEXT_CELADONGYM_RECEIVED_TM21 + dw_const CeladonGymTM21NoRoomText, TEXT_CELADONGYM_TM21_NO_ROOM CeladonGymTrainerHeaders: def_trainers 2 @@ -101,7 +103,7 @@ CeladonGymTrainerHeader6: trainer EVENT_BEAT_CELADON_GYM_TRAINER_6, 3, CeladonGymBattleText8, CeladonGymEndBattleText8, CeladonGymAfterBattleText8 db -1 ; end -ErikaText: +CeladonGymErikaText: text_asm CheckEvent EVENT_BEAT_ERIKA jr z, .beforeBeat @@ -111,17 +113,17 @@ ErikaText: call DisableWaitingAfterTextDisplay jr .done .afterBeat - ld hl, ErikaPostBattleAdviceText + ld hl, .PostBattleAdviceText call PrintText jr .done .beforeBeat - ld hl, ErikaPreBattleText + ld hl, .PreBattleText call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, ReceivedRainbowBadgeText - ld de, ReceivedRainbowBadgeText + ld hl, .ReceivedRainbowBadgeText + ld de, .ReceivedRainbowBadgeText call SaveEndBattleTextPointers ldh a, [hSpriteIndex] ld [wSpriteIndex], a @@ -129,39 +131,39 @@ ErikaText: call InitBattleEnemyParameters ld a, $4 ld [wGymLeaderNo], a - ld a, $3 + ld a, SCRIPT_CELADONGYM_ERIKA_POST_BATTLE ld [wCeladonGymCurScript], a ld [wCurMapScript], a .done jp TextScriptEnd -ErikaPreBattleText: - text_far _ErikaPreBattleText +.PreBattleText: + text_far _CeladonGymErikaPreBattleText text_end -ReceivedRainbowBadgeText: - text_far _ReceivedRainbowBadgeText +.ReceivedRainbowBadgeText: + text_far _CeladonGymErikaReceivedRainbowBadgeText text_end -ErikaPostBattleAdviceText: - text_far _ErikaPostBattleAdviceText +.PostBattleAdviceText: + text_far _CeladonGymErikaPostBattleAdviceText text_end -ErikaRainbowBadgeInfoText: - text_far _ErikaRainbowBadgeInfoText +CeladonGymRainbowBadgeInfoText: + text_far _CeladonGymRainbowBadgeInfoText text_end -ReceivedTM21Text: - text_far _ReceivedTM21Text +CeladonGymReceivedTM21Text: + text_far _CeladonGymReceivedTM21Text sound_get_item_1 text_far _TM21ExplanationText text_end -TM21NoRoomText: - text_far _TM21NoRoomText +CeladonGymTM21NoRoomText: + text_far _CeladonGymTM21NoRoomText text_end -CeladonGymTrainerText1: +CeladonGymCooltrainerF1Text: text_asm ld hl, CeladonGymTrainerHeader0 call TalkToTrainer @@ -179,7 +181,7 @@ CeladonGymAfterBattleText2: text_far _CeladonGymAfterBattleText2 text_end -CeladonGymTrainerText2: +CeladonGymBeauty1Text: text_asm ld hl, CeladonGymTrainerHeader1 call TalkToTrainer @@ -197,7 +199,7 @@ CeladonGymAfterBattleText3: text_far _CeladonGymAfterBattleText3 text_end -CeladonGymTrainerText3: +CeladonGymCooltrainerF2Text: text_asm ld hl, CeladonGymTrainerHeader2 call TalkToTrainer @@ -215,7 +217,7 @@ CeladonGymAfterBattleText4: text_far _CeladonGymAfterBattleText4 text_end -CeladonGymTrainerText4: +CeladonGymBeauty2Text: text_asm ld hl, CeladonGymTrainerHeader3 call TalkToTrainer @@ -233,7 +235,7 @@ CeladonGymAfterBattleText5: text_far _CeladonGymAfterBattleText5 text_end -CeladonGymTrainerText5: +CeladonGymCooltrainerF3Text: text_asm ld hl, CeladonGymTrainerHeader4 call TalkToTrainer @@ -251,7 +253,7 @@ CeladonGymAfterBattleText6: text_far _CeladonGymAfterBattleText6 text_end -CeladonGymTrainerText6: +CeladonGymBeauty3Text: text_asm ld hl, CeladonGymTrainerHeader5 call TalkToTrainer @@ -269,7 +271,7 @@ CeladonGymAfterBattleText7: text_far _CeladonGymAfterBattleText7 text_end -CeladonGymTrainerText7: +CeladonGymCooltrainerF4Text: text_asm ld hl, CeladonGymTrainerHeader6 call TalkToTrainer diff --git a/scripts/CeladonHotel.asm b/scripts/CeladonHotel.asm index 2cdd95b08..1bb90965c 100644 --- a/scripts/CeladonHotel.asm +++ b/scripts/CeladonHotel.asm @@ -2,18 +2,19 @@ CeladonHotel_Script: jp EnableAutoTextBoxDrawing CeladonHotel_TextPointers: - dw CeladonHotelText1 - dw CeladonHotelText2 - dw CeladonHotelText3 + def_text_pointers + dw_const CeladonHotelGrannyText, TEXT_CELADONHOTEL_GRANNY + dw_const CeladonHotelBeautyText, TEXT_CELADONHOTEL_BEAUTY + dw_const CeladonHotelSuperNerdText, TEXT_CELADONHOTEL_SUPER_NERD -CeladonHotelText1: - text_far _CeladonHotelText1 +CeladonHotelGrannyText: + text_far _CeladonHotelGrannyText text_end -CeladonHotelText2: - text_far _CeladonHotelText2 +CeladonHotelBeautyText: + text_far _CeladonHotelBeautyText text_end -CeladonHotelText3: - text_far _CeladonHotelText3 +CeladonHotelSuperNerdText: + text_far _CeladonHotelSuperNerdText text_end diff --git a/scripts/CeladonMansion1F.asm b/scripts/CeladonMansion1F.asm index fa901ff93..4ef67258b 100644 --- a/scripts/CeladonMansion1F.asm +++ b/scripts/CeladonMansion1F.asm @@ -2,38 +2,39 @@ CeladonMansion1F_Script: jp EnableAutoTextBoxDrawing CeladonMansion1F_TextPointers: - dw CeladonMansion1Text1 - dw CeladonMansion1Text2 - dw CeladonMansion1Text3 - dw CeladonMansion1Text4 - dw CeladonMansion1Text5 + def_text_pointers + dw_const CeladonMansion1FMeowthText, TEXT_CELADONMANSION1F_MEOWTH + dw_const CeladonMansion1FGrannyText, TEXT_CELADONMANSION1F_GRANNY + dw_const CeladonMansion1FClefairyText, TEXT_CELADONMANSION1F_CLEFAIRY + dw_const CeladonMansion1FNidoranFText, TEXT_CELADONMANSION1F_NIDORANF + dw_const CeladonMansion1FManagersSuiteSignText, TEXT_CELADONMANSION1F_MANAGERS_SUITE_SIGN CeladonMansion1_PlayCryScript: call PlayCry jp TextScriptEnd -CeladonMansion1Text1: - text_far _CeladonMansion1Text1 +CeladonMansion1FMeowthText: + text_far _CeladonMansion1FMeowthText text_asm ld a, MEOWTH jp CeladonMansion1_PlayCryScript -CeladonMansion1Text2: - text_far _CeladonMansion1Text2 +CeladonMansion1FGrannyText: + text_far _CeladonMansion1FGrannyText text_end -CeladonMansion1Text3: - text_far _CeladonMansion1Text3 +CeladonMansion1FClefairyText: + text_far _CeladonMansion1FClefairyText text_asm ld a, CLEFAIRY jp CeladonMansion1_PlayCryScript -CeladonMansion1Text4: - text_far _CeladonMansion1Text4 +CeladonMansion1FNidoranFText: + text_far _CeladonMansion1FNidoranFText text_asm ld a, NIDORAN_F jp CeladonMansion1_PlayCryScript -CeladonMansion1Text5: - text_far _CeladonMansion1Text5 +CeladonMansion1FManagersSuiteSignText: + text_far _CeladonMansion1FManagersSuiteSignText text_end diff --git a/scripts/CeladonMansion2F.asm b/scripts/CeladonMansion2F.asm index 8f83e86a7..67ec71c4f 100644 --- a/scripts/CeladonMansion2F.asm +++ b/scripts/CeladonMansion2F.asm @@ -3,8 +3,9 @@ CeladonMansion2F_Script: ret CeladonMansion2F_TextPointers: - dw CeladonMansion2Text1 + def_text_pointers + dw_const CeladonMansion2FMeetingRoomSignText, TEXT_CELADONMANSION2F_MEETING_ROOM_SIGN -CeladonMansion2Text1: - text_far _CeladonMansion2Text1 +CeladonMansion2FMeetingRoomSignText: + text_far _CeladonMansion2FMeetingRoomSignText text_end diff --git a/scripts/CeladonMansion3F.asm b/scripts/CeladonMansion3F.asm index f89727930..e977bb620 100644 --- a/scripts/CeladonMansion3F.asm +++ b/scripts/CeladonMansion3F.asm @@ -2,28 +2,29 @@ CeladonMansion3F_Script: jp EnableAutoTextBoxDrawing CeladonMansion3F_TextPointers: - dw ProgrammerText - dw GraphicArtistText - dw WriterText - dw DirectorText - dw GameFreakPCText1 - dw GameFreakPCText2 - dw GameFreakPCText3 - dw GameFreakSignText + def_text_pointers + dw_const CeladonMansion3FProgrammerText, TEXT_CELADONMANSION3F_PROGRAMMER + dw_const CeladonMansion3FGraphicArtistText, TEXT_CELADONMANSION3F_GRAPHIC_ARTIST + dw_const CeladonMansion3FWriterText, TEXT_CELADONMANSION3F_WRITER + dw_const CeladonMansion3FGameDesignerText, TEXT_CELADONMANSION3F_GAME_DESIGNER + dw_const CeladonMansion3FGameProgramPCText, TEXT_CELADONMANSION3F_GAME_PROGRAM_PC + dw_const CeladonMansion3FPlayingGamePCText, TEXT_CELADONMANSION3F_PLAYING_GAME_PC + dw_const CeladonMansion3FGameScriptPCText, TEXT_CELADONMANSION3F_GAME_SCRIPT_PC + dw_const CeladonMansion3FDevRoomSignText, TEXT_CELADONMANSION3F_DEV_ROOM_SIGN -ProgrammerText: - text_far _ProgrammerText +CeladonMansion3FProgrammerText: + text_far _CeladonMansion3FProgrammerText text_end -GraphicArtistText: - text_far _GraphicArtistText +CeladonMansion3FGraphicArtistText: + text_far _CeladonMansion3FGraphicArtistText text_end -WriterText: - text_far _WriterText +CeladonMansion3FWriterText: + text_far _CeladonMansion3FWriterText text_end -DirectorText: +CeladonMansion3FGameDesignerText: text_asm ld hl, wPokedexOwned ld b, wPokedexOwnedEnd - wPokedexOwned @@ -31,7 +32,7 @@ DirectorText: ld a, [wNumSetBits] cp NUM_POKEMON - 1 ; discount Mew jr nc, .completed_dex - ld hl, .GameDesignerText + ld hl, .Text jr .done .completed_dex ld hl, .CompletedDexText @@ -39,12 +40,12 @@ DirectorText: call PrintText jp TextScriptEnd -.GameDesignerText: - text_far _GameDesignerText +.Text: + text_far _CeladonMansion3FGameDesignerText text_end .CompletedDexText: - text_far _CompletedDexText + text_far _CeladonMansion3FGameDesignerCompletedDexText text_promptbutton text_asm callfar DisplayDiploma @@ -52,18 +53,18 @@ DirectorText: ld [wDoNotWaitForButtonPressAfterDisplayingText], a jp TextScriptEnd -GameFreakPCText1: - text_far _CeladonMansion3Text5 +CeladonMansion3FGameProgramPCText: + text_far _CeladonMansion3FGameProgramPCText text_end -GameFreakPCText2: - text_far _CeladonMansion3Text6 +CeladonMansion3FPlayingGamePCText: + text_far _CeladonMansion3FPlayingGamePCText text_end -GameFreakPCText3: - text_far _CeladonMansion3Text7 +CeladonMansion3FGameScriptPCText: + text_far _CeladonMansion3FGameScriptPCText text_end -GameFreakSignText: - text_far _CeladonMansion3Text8 +CeladonMansion3FDevRoomSignText: + text_far _CeladonMansion3FDevRoomSignText text_end diff --git a/scripts/CeladonMansionRoof.asm b/scripts/CeladonMansionRoof.asm index 860fcbdf7..0c39288ce 100644 --- a/scripts/CeladonMansionRoof.asm +++ b/scripts/CeladonMansionRoof.asm @@ -2,8 +2,9 @@ CeladonMansionRoof_Script: jp EnableAutoTextBoxDrawing CeladonMansionRoof_TextPointers: - dw CeladonMansion4Text1 + def_text_pointers + dw_const CeladonMansionRoofHouseSignText, TEXT_CELADONMANSIONROOF_HOUSE_SIGN -CeladonMansion4Text1: - text_far _CeladonMansion4Text1 +CeladonMansionRoofHouseSignText: + text_far _CeladonMansionRoofHouseSignText text_end diff --git a/scripts/CeladonMansionRoofHouse.asm b/scripts/CeladonMansionRoofHouse.asm index bd564dccb..d3c032908 100644 --- a/scripts/CeladonMansionRoofHouse.asm +++ b/scripts/CeladonMansionRoofHouse.asm @@ -2,14 +2,15 @@ CeladonMansionRoofHouse_Script: jp EnableAutoTextBoxDrawing CeladonMansionRoofHouse_TextPointers: - dw CeladonMansion5Text1 - dw CeladonMansion5Text2 + def_text_pointers + dw_const CeladonMansionRoofHouseHikerText, TEXT_CELADONMANSION_ROOF_HOUSE_HIKER + dw_const CeladonMansionRoofHouseEeveePokeballText, TEXT_CELADONMANSION_ROOF_HOUSE_EEVEE_POKEBALL -CeladonMansion5Text1: - text_far _CeladonMansion5Text1 +CeladonMansionRoofHouseHikerText: + text_far _CeladonMansionRoofHouseHikerText text_end -CeladonMansion5Text2: +CeladonMansionRoofHouseEeveePokeballText: text_asm lb bc, EEVEE, 25 call GivePokemon diff --git a/scripts/CeladonMart1F.asm b/scripts/CeladonMart1F.asm index dca3c7967..9bdc031d0 100644 --- a/scripts/CeladonMart1F.asm +++ b/scripts/CeladonMart1F.asm @@ -2,18 +2,19 @@ CeladonMart1F_Script: jp EnableAutoTextBoxDrawing CeladonMart1F_TextPointers: - dw CeladonMart1Text1 - dw CeladonMart1Text2 - dw CeladonMart1Text3 + def_text_pointers + dw_const CeladonMart1FReceptionistText, TEXT_CELADONMART1F_RECEPTIONIST + dw_const CeladonMart1FDirectorySignText, TEXT_CELADONMART1F_DIRECTORY_SIGN + dw_const CeladonMart1FCurrentFloorSignText, TEXT_CELADONMART1F_CURRENT_FLOOR_SIGN -CeladonMart1Text1: - text_far _CeladonMart1Text1 +CeladonMart1FReceptionistText: + text_far _CeladonMart1FReceptionistText text_end -CeladonMart1Text2: - text_far _CeladonMart1Text2 +CeladonMart1FDirectorySignText: + text_far _CeladonMart1FDirectorySignText text_end -CeladonMart1Text3: - text_far _CeladonMart1Text3 +CeladonMart1FCurrentFloorSignText: + text_far _CeladonMart1FCurrentFloorSignText text_end diff --git a/scripts/CeladonMart2F.asm b/scripts/CeladonMart2F.asm index 118271283..fc17424e6 100644 --- a/scripts/CeladonMart2F.asm +++ b/scripts/CeladonMart2F.asm @@ -2,20 +2,21 @@ CeladonMart2F_Script: jp EnableAutoTextBoxDrawing CeladonMart2F_TextPointers: - dw CeladonMart2Clerk1Text - dw CeladonMart2Clerk2Text - dw CeladonMart2Text3 - dw CeladonMart2Text4 - dw CeladonMart2Text5 + def_text_pointers + dw_const CeladonMart2FClerk1Text, TEXT_CELADONMART2F_CLERK1 + dw_const CeladonMart2FClerk2Text, TEXT_CELADONMART2F_CLERK2 + dw_const CeladonMart2FMiddleAgedManText, TEXT_CELADONMART2F_MIDDLE_AGED_MAN + dw_const CeladonMart2FGirlText, TEXT_CELADONMART2F_GIRL + dw_const CeladonMart2FCurrentFloorSignText, TEXT_CELADONMART2F_CURRENT_FLOOR_SIGN -CeladonMart2Text3: - text_far _CeladonMart2Text3 +CeladonMart2FMiddleAgedManText: + text_far _CeladonMart2FMiddleAgedManText text_end -CeladonMart2Text4: - text_far _CeladonMart2Text4 +CeladonMart2FGirlText: + text_far _CeladonMart2FGirlText text_end -CeladonMart2Text5: - text_far _CeladonMart2Text5 +CeladonMart2FCurrentFloorSignText: + text_far _CeladonMart2FCurrentFloorSignText text_end diff --git a/scripts/CeladonMart3F.asm b/scripts/CeladonMart3F.asm index 550819823..bf3547641 100644 --- a/scripts/CeladonMart3F.asm +++ b/scripts/CeladonMart3F.asm @@ -2,107 +2,103 @@ CeladonMart3F_Script: jp EnableAutoTextBoxDrawing CeladonMart3F_TextPointers: - dw CeladonMart3Text1 - dw CeladonMart3Text2 - dw CeladonMart3Text3 - dw CeladonMart3Text4 - dw CeladonMart3Text5 - dw CeladonMart3Text6 - dw CeladonMart3Text7 - dw CeladonMart3Text8 - dw CeladonMart3Text9 - dw CeladonMart3Text10 - dw CeladonMart3Text11 - dw CeladonMart3Text12 - dw CeladonMart3Text13 - dw CeladonMart3Text14 - dw CeladonMart3Text15 - dw CeladonMart3Text16 - dw CeladonMart3Text17 - -CeladonMart3Text1: + def_text_pointers + dw_const CeladonMart3FClerkText, TEXT_CELADONMART3F_CLERK + dw_const CeladonMart3FGameBoyKid1Text, TEXT_CELADONMART3F_GAMEBOY_KID1 + dw_const CeladonMart3FGameBoyKid2Text, TEXT_CELADONMART3F_GAMEBOY_KID2 + dw_const CeladonMart3FGameBoyKid3Text, TEXT_CELADONMART3F_GAMEBOY_KID3 + dw_const CeladonMart3FLittleBoyText, TEXT_CELADONMART3F_LITTLE_BOY + dw_const CeladonMart3FSNESText, TEXT_CELADONMART3F_SNES1 + dw_const CeladonMart3FRPGText, TEXT_CELADONMART3F_RPG + dw_const CeladonMart3FSNESText, TEXT_CELADONMART3F_SNES2 + dw_const CeladonMart3FSportsGameText, TEXT_CELADONMART3F_SPORTS_GAME + dw_const CeladonMart3FSNESText, TEXT_CELADONMART3F_SNES3 + dw_const CeladonMart3FPuzzleGameText, TEXT_CELADONMART3F_PUZZLE_GAME + dw_const CeladonMart3FSNESText, TEXT_CELADONMART3F_SNES4 + dw_const CeladonMart3FFightingGameText, TEXT_CELADONMART3F_FIGHTING_GAME + dw_const CeladonMart3FCurrentFloorSignText, TEXT_CELADONMART3F_CURRENT_FLOOR_SIGN + dw_const CeladonMart3FPokemonPosterText, TEXT_CELADONMART3F_POKEMON_POSTER1 + dw_const CeladonMart3FPokemonPosterText, TEXT_CELADONMART3F_POKEMON_POSTER2 + dw_const CeladonMart3FPokemonPosterText, TEXT_CELADONMART3F_POKEMON_POSTER3 + +CeladonMart3FClerkText: text_asm CheckEvent EVENT_GOT_TM18 jr nz, .got_item - ld hl, TM18PreReceiveText + ld hl, .TM18PreReceiveText call PrintText lb bc, TM_COUNTER, 1 call GiveItem jr nc, .bag_full SetEvent EVENT_GOT_TM18 - ld hl, ReceivedTM18Text + ld hl, .ReceivedTM18Text jr .done .bag_full - ld hl, TM18NoRoomText + ld hl, .TM18NoRoomText jr .done .got_item - ld hl, TM18ExplanationText + ld hl, .TM18ExplanationText .done call PrintText jp TextScriptEnd -TM18PreReceiveText: - text_far _TM18PreReceiveText +.TM18PreReceiveText: + text_far _CeladonMart3FClerkTM18PreReceiveText text_end -ReceivedTM18Text: - text_far _ReceivedTM18Text +.ReceivedTM18Text: + text_far _CeladonMart3FClerkReceivedTM18Text sound_get_item_1 text_end -TM18ExplanationText: - text_far _TM18ExplanationText +.TM18ExplanationText: + text_far _CeladonMart3FClerkTM18ExplanationText text_end -TM18NoRoomText: - text_far _TM18NoRoomText +.TM18NoRoomText: + text_far _CeladonMart3FClerkTM18NoRoomText text_end -CeladonMart3Text2: - text_far _CeladonMart3Text2 +CeladonMart3FGameBoyKid1Text: + text_far _CeladonMart3FGameBoyKid1Text text_end -CeladonMart3Text3: - text_far _CeladonMart3Text3 +CeladonMart3FGameBoyKid2Text: + text_far _CeladonMart3FGameBoyKid2Text text_end -CeladonMart3Text4: - text_far _CeladonMart3Text4 +CeladonMart3FGameBoyKid3Text: + text_far _CeladonMart3FGameBoyKid3Text text_end -CeladonMart3Text5: - text_far _CeladonMart3Text5 +CeladonMart3FLittleBoyText: + text_far _CeladonMart3FLittleBoyText text_end -CeladonMart3Text12: -CeladonMart3Text10: -CeladonMart3Text8: -CeladonMart3Text6: - text_far _CeladonMart3Text6 +CeladonMart3FSNESText: + text_far _CeladonMart3FSNESText text_end -CeladonMart3Text7: - text_far _CeladonMart3Text7 +CeladonMart3FRPGText: + text_far _CeladonMart3FRPGText text_end -CeladonMart3Text9: - text_far _CeladonMart3Text9 +CeladonMart3FSportsGameText: + text_far _CeladonMart3FSportsGameText text_end -CeladonMart3Text11: - text_far _CeladonMart3Text11 +CeladonMart3FPuzzleGameText: + text_far _CeladonMart3FPuzzleGameText text_end -CeladonMart3Text13: - text_far _CeladonMart3Text13 +CeladonMart3FFightingGameText: + text_far _CeladonMart3FFightingGameText text_end -CeladonMart3Text14: - text_far _CeladonMart3Text14 +CeladonMart3FCurrentFloorSignText: + text_far _CeladonMart3FCurrentFloorSignText text_end -CeladonMart3Text17: -CeladonMart3Text16: -CeladonMart3Text15: - text_far _CeladonMart3Text15 +CeladonMart3FPokemonPosterText: + text_far _CeladonMart3FPokemonPosterText text_end diff --git a/scripts/CeladonMart4F.asm b/scripts/CeladonMart4F.asm index 1365dd0d4..13a98cbe4 100644 --- a/scripts/CeladonMart4F.asm +++ b/scripts/CeladonMart4F.asm @@ -2,19 +2,20 @@ CeladonMart4F_Script: jp EnableAutoTextBoxDrawing CeladonMart4F_TextPointers: - dw CeladonMart4ClerkText - dw CeladonMart4Text2 - dw CeladonMart4Text3 - dw CeladonMart4Text4 + def_text_pointers + dw_const CeladonMart4FClerkText, TEXT_CELADONMART4F_CLERK + dw_const CeladonMart4FSuperNerdText, TEXT_CELADONMART4F_SUPER_NERD + dw_const CeladonMart4FYoungsterText, TEXT_CELADONMART4F_YOUNGSTER + dw_const CeladonMart4FCurrentFloorSignText, TEXT_CELADONMART4F_CURRENT_FLOOR_SIGN -CeladonMart4Text2: - text_far _CeladonMart4Text2 +CeladonMart4FSuperNerdText: + text_far _CeladonMart4FSuperNerdText text_end -CeladonMart4Text3: - text_far _CeladonMart4Text3 +CeladonMart4FYoungsterText: + text_far _CeladonMart4FYoungsterText text_end -CeladonMart4Text4: - text_far _CeladonMart4Text4 +CeladonMart4FCurrentFloorSignText: + text_far _CeladonMart4FCurrentFloorSignText text_end diff --git a/scripts/CeladonMart5F.asm b/scripts/CeladonMart5F.asm index 91748706f..f3fc5036e 100644 --- a/scripts/CeladonMart5F.asm +++ b/scripts/CeladonMart5F.asm @@ -2,20 +2,21 @@ CeladonMart5F_Script: jp EnableAutoTextBoxDrawing CeladonMart5F_TextPointers: - dw CeladonMart5Text1 - dw CeladonMart5Text2 - dw CeladonMart5Clerk1Text - dw CeladonMart5Clerk2Text - dw CeladonMart5Text5 + def_text_pointers + dw_const CeladonMart5FGentlemanText, TEXT_CELADONMART5F_GENTLEMAN + dw_const CeladonMart5FSailorText, TEXT_CELADONMART5F_SAILOR + dw_const CeladonMart5FClerk1Text, TEXT_CELADONMART5F_CLERK1 + dw_const CeladonMart5FClerk2Text, TEXT_CELADONMART5F_CLERK2 + dw_const CeladonMart5FCurrentFloorSignText, TEXT_CELADONMART5F_CURRENT_FLOOR_SIGN -CeladonMart5Text1: - text_far _CeladonMart5Text1 +CeladonMart5FGentlemanText: + text_far _CeladonMart5FGentlemanText text_end -CeladonMart5Text2: - text_far _CeladonMart5Text2 +CeladonMart5FSailorText: + text_far _CeladonMart5FSailorText text_end -CeladonMart5Text5: - text_far _CeladonMart5Text5 +CeladonMart5FCurrentFloorSignText: + text_far _CeladonMart5FCurrentFloorSignText text_end diff --git a/scripts/CeladonMartElevator.asm b/scripts/CeladonMartElevator.asm index b657b3f9c..c13ecd73f 100644 --- a/scripts/CeladonMartElevator.asm +++ b/scripts/CeladonMartElevator.asm @@ -62,9 +62,10 @@ CeladonMartElevatorScript_48654: farjp ShakeElevator CeladonMartElevator_TextPointers: - dw CeladonMartElevatorText1 + def_text_pointers + dw_const CeladonMartElevatorText, TEXT_CELADONMARTELEVATOR -CeladonMartElevatorText1: +CeladonMartElevatorText: text_asm call CeladonMartElevatorScript_48631 ld hl, CeladonMartElevatorWarpMaps diff --git a/scripts/CeladonMartRoof.asm b/scripts/CeladonMartRoof.asm index 37b8671ef..1edc39faa 100644 --- a/scripts/CeladonMartRoof.asm +++ b/scripts/CeladonMartRoof.asm @@ -43,7 +43,7 @@ CeladonMartRoofDrinkList: CeladonMartRoofScript_GiveDrinkToGirl: ld hl, wd730 set 6, [hl] - ld hl, CeladonMartRoofText_484ee + ld hl, CeladonMartRoofLittleGirlGiveHerWhichDrinkText call PrintText xor a ld [wCurrentMenuItem], a @@ -87,99 +87,99 @@ CeladonMartRoofScript_GiveDrinkToGirl: ; gave Lemonade CheckEvent EVENT_GOT_TM49 jr nz, .alreadyGaveDrink - ld hl, CeladonMartRoofText_48515 + ld hl, CeladonMartRoofLittleGirlYayLemonadeText call PrintText call RemoveItemByIDBank12 lb bc, TM_TRI_ATTACK, 1 call GiveItem jr nc, .bagFull - ld hl, ReceivedTM49Text + ld hl, CeladonMartRoofLittleGirlReceivedTM49Text call PrintText SetEvent EVENT_GOT_TM49 ret .gaveSodaPop CheckEvent EVENT_GOT_TM48 jr nz, .alreadyGaveDrink - ld hl, CeladonMartRoofText_48504 + ld hl, CeladonMartRoofLittleGirlYaySodaPopText call PrintText call RemoveItemByIDBank12 lb bc, TM_ROCK_SLIDE, 1 call GiveItem jr nc, .bagFull - ld hl, CeladonMartRoofText_4850a + ld hl, CeladonMartRoofLittleGirlReceivedTM48Text call PrintText SetEvent EVENT_GOT_TM48 ret .gaveFreshWater CheckEvent EVENT_GOT_TM13 jr nz, .alreadyGaveDrink - ld hl, CeladonMartRoofText_484f3 + ld hl, CeladonMartRoofLittleGirlYayFreshWaterText call PrintText call RemoveItemByIDBank12 lb bc, TM_ICE_BEAM, 1 call GiveItem jr nc, .bagFull - ld hl, CeladonMartRoofText_484f9 + ld hl, CeladonMartRoofLittleGirlReceivedTM13Text call PrintText SetEvent EVENT_GOT_TM13 ret .bagFull - ld hl, CeladonMartRoofText_48526 + ld hl, CeladonMartRoofLittleGirlNoRoomText jp PrintText .alreadyGaveDrink - ld hl, CeladonMartRoofText_4852c + ld hl, CeladonMartRoofLittleGirlImNotThirstyText jp PrintText RemoveItemByIDBank12: farjp RemoveItemByID -CeladonMartRoofText_484ee: - text_far _CeladonMartRoofText_484ee +CeladonMartRoofLittleGirlGiveHerWhichDrinkText: + text_far _CeladonMartRoofLittleGirlGiveHerWhichDrinkText text_end -CeladonMartRoofText_484f3: - text_far _CeladonMartRoofText_484f3 +CeladonMartRoofLittleGirlYayFreshWaterText: + text_far _CeladonMartRoofLittleGirlYayFreshWaterText text_waitbutton text_end -CeladonMartRoofText_484f9: - text_far _CeladonMartRoofText_484f9 +CeladonMartRoofLittleGirlReceivedTM13Text: + text_far _CeladonMartRoofLittleGirlReceivedTM13Text sound_get_item_1 - text_far _CeladonMartRoofText_484fe + text_far _CeladonMartRoofLittleGirlTM13ExplanationText text_waitbutton text_end -CeladonMartRoofText_48504: - text_far _CeladonMartRoofText_48504 +CeladonMartRoofLittleGirlYaySodaPopText: + text_far _CeladonMartRoofLittleGirlYaySodaPopText text_waitbutton text_end -CeladonMartRoofText_4850a: - text_far _CeladonMartRoofText_4850a +CeladonMartRoofLittleGirlReceivedTM48Text: + text_far _CeladonMartRoofLittleGirlReceivedTM48Text sound_get_item_1 - text_far _CeladonMartRoofText_4850f + text_far _CeladonMartRoofLittleGirlTM48ExplanationText text_waitbutton text_end -CeladonMartRoofText_48515: - text_far _CeladonMartRoofText_48515 +CeladonMartRoofLittleGirlYayLemonadeText: + text_far _CeladonMartRoofLittleGirlYayLemonadeText text_waitbutton text_end -ReceivedTM49Text: - text_far _ReceivedTM49Text +CeladonMartRoofLittleGirlReceivedTM49Text: + text_far _CeladonMartRoofLittleGirlReceivedTM49Text sound_get_item_1 - text_far _CeladonMartRoofText_48520 + text_far _CeladonMartRoofLittleGirlTM49ExplanationText text_waitbutton text_end -CeladonMartRoofText_48526: - text_far _CeladonMartRoofText_48526 +CeladonMartRoofLittleGirlNoRoomText: + text_far _CeladonMartRoofLittleGirlNoRoomText text_waitbutton text_end -CeladonMartRoofText_4852c: - text_far _CeladonMartRoofText_4852c +CeladonMartRoofLittleGirlImNotThirstyText: + text_far _CeladonMartRoofLittleGirlImNotThirstyText text_waitbutton text_end @@ -206,18 +206,19 @@ CeladonMartRoofScript_PrintDrinksInBag: jr .loop CeladonMartRoof_TextPointers: - dw CeladonMartRoofText1 - dw CeladonMartRoofText2 - dw CeladonMartRoofText5 - dw CeladonMartRoofText5 - dw CeladonMartRoofText5 - dw CeladonMartRoofText6 - -CeladonMartRoofText1: - text_far _CeladonMartRoofText1 + def_text_pointers + dw_const CeladonMartRoofSuperNerdText, TEXT_CELADONMARTROOF_SUPER_NERD + dw_const CeladonMartRoofLittleGirlText, TEXT_CELADONMARTROOF_LITTLE_GIRL + dw_const CeladonMartRoofVendingMachineText, TEXT_CELADONMARTROOF_VENDING_MACHINE1 + dw_const CeladonMartRoofVendingMachineText, TEXT_CELADONMARTROOF_VENDING_MACHINE2 + dw_const CeladonMartRoofVendingMachineText, TEXT_CELADONMARTROOF_VENDING_MACHINE3 + dw_const CeladonMartRoofCurrentFloorSignText, TEXT_CELADONMARTROOF_CURRENT_FLOOR_SIGN + +CeladonMartRoofSuperNerdText: + text_far _CeladonMartRoofSuperNerdText text_end -CeladonMartRoofText2: +CeladonMartRoofLittleGirlText: text_asm call CeladonMartRoofScript_GetDrinksInBag ld a, [wFilteredBagItemsCount] @@ -225,7 +226,7 @@ CeladonMartRoofText2: jr z, .noDrinksInBag ld a, 1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, CeladonMartRoofText4 + ld hl, .GiveHerADrinkText call PrintText call YesNoChoice ld a, [wCurrentMenuItem] @@ -234,22 +235,22 @@ CeladonMartRoofText2: call CeladonMartRoofScript_GiveDrinkToGirl jr .done .noDrinksInBag - ld hl, CeladonMartRoofText3 + ld hl, .ImThirstyText call PrintText .done jp TextScriptEnd -CeladonMartRoofText3: - text_far _CeladonMartRoofText_48598 +.ImThirstyText: + text_far _CeladonMartRoofLittleGirlImThirstyText text_end -CeladonMartRoofText4: - text_far _CeladonMartRoofText4 +.GiveHerADrinkText: + text_far _CeladonMartRoofLittleGirlGiveHerADrinkText text_end -CeladonMartRoofText5: +CeladonMartRoofVendingMachineText: script_vending_machine -CeladonMartRoofText6: - text_far _CeladonMartRoofText6 +CeladonMartRoofCurrentFloorSignText: + text_far _CeladonMartRoofCurrentFloorSignText text_end diff --git a/scripts/CeladonPokecenter.asm b/scripts/CeladonPokecenter.asm index 0f28e1b2d..f2b0bf65f 100644 --- a/scripts/CeladonPokecenter.asm +++ b/scripts/CeladonPokecenter.asm @@ -3,21 +3,22 @@ CeladonPokecenter_Script: jp EnableAutoTextBoxDrawing CeladonPokecenter_TextPointers: - dw CeladonHealNurseText - dw CeladonPokecenterText2 - dw CeladonPokecenterText3 - dw CeladonTradeNurseText + def_text_pointers + dw_const CeladonPokecenterNurseText, TEXT_CELADONPOKECENTER_NURSE + dw_const CeladonPokecenterGentlemanText, TEXT_CELADONPOKECENTER_GENTLEMAN + dw_const CeladonPokecenterBeautyText, TEXT_CELADONPOKECENTER_BEAUTY + dw_const CeladonPokecenterLinkReceptionistText, TEXT_CELADONPOKECENTER_LINK_RECEPTIONIST -CeladonTradeNurseText: +CeladonPokecenterLinkReceptionistText: script_cable_club_receptionist -CeladonHealNurseText: +CeladonPokecenterNurseText: script_pokecenter_nurse -CeladonPokecenterText2: - text_far _CeladonPokecenterText2 +CeladonPokecenterGentlemanText: + text_far _CeladonPokecenterGentlemanText text_end -CeladonPokecenterText3: - text_far _CeladonPokecenterText3 +CeladonPokecenterBeautyText: + text_far _CeladonPokecenterBeautyText text_end diff --git a/scripts/CeruleanBadgeHouse.asm b/scripts/CeruleanBadgeHouse.asm index 5e35b0797..de457ab80 100644 --- a/scripts/CeruleanBadgeHouse.asm +++ b/scripts/CeruleanBadgeHouse.asm @@ -6,19 +6,20 @@ CeruleanBadgeHouse_Script: ret CeruleanBadgeHouse_TextPointers: - dw CeruleanHouse2Text1 + def_text_pointers + dw_const CeruleanBadgeHouseMiddleAgedManText, TEXT_CERULEANBADGEHOUSE_MIDDLE_AGED_MAN -CeruleanHouse2Text1: +CeruleanBadgeHouseMiddleAgedManText: text_asm - ld hl, CeruleanHouse2Text_74e77 + ld hl, .Text call PrintText xor a ld [wCurrentMenuItem], a ld [wListScrollOffset], a .asm_74e23 - ld hl, CeruleanHouse2Text_74e7c + ld hl, .WhichBadgeText call PrintText - ld hl, BadgeItemList + ld hl, .BadgeItemList call LoadItemList ld hl, wItemList ld a, l @@ -32,7 +33,7 @@ CeruleanHouse2Text1: ld [wListMenuID], a call DisplayListMenuID jr c, .asm_74e60 - ld hl, TextPointers_74e86 + ld hl, CeruleanBadgeHouseBadgeTextPointers ld a, [wcf91] sub BOULDERBADGE add a @@ -47,12 +48,13 @@ CeruleanHouse2Text1: .asm_74e60 xor a ld [wListScrollOffset], a - ld hl, CeruleanHouse2Text_74e81 + ld hl, .VisitAnyTimeText call PrintText jp TextScriptEnd -BadgeItemList: - db 8 ; # +.BadgeItemList: + table_width 1, .BadgeItemList + db NUM_BADGES db BOULDERBADGE db CASCADEBADGE db THUNDERBADGE @@ -62,57 +64,60 @@ BadgeItemList: db VOLCANOBADGE db EARTHBADGE db -1 ; end + assert_table_length NUM_BADGES + 2 -CeruleanHouse2Text_74e77: - text_far _CeruleanHouse2Text_74e77 +.Text: + text_far _CeruleanBadgeHouseMiddleAgedManText text_end -CeruleanHouse2Text_74e7c: - text_far _CeruleanHouse2Text_74e7c +.WhichBadgeText: + text_far _CeruleanBadgeHouseMiddleAgedManWhichBadgeText text_end -CeruleanHouse2Text_74e81: - text_far _CeruleanHouse2Text_74e81 +.VisitAnyTimeText: + text_far _CeruleanBadgeHouseMiddleAgedManVisitAnyTimeText text_end -TextPointers_74e86: - dw CeruleanHouse2Text_74e96 - dw CeruleanHouse2Text_74e9b - dw CeruleanHouse2Text_74ea0 - dw CeruleanHouse2Text_74ea5 - dw CeruleanHouse2Text_74eaa - dw CeruleanHouse2Text_74eaf - dw CeruleanHouse2Text_74eb4 - dw CeruleanHouse2Text_74eb9 +CeruleanBadgeHouseBadgeTextPointers: + table_width 2, CeruleanBadgeHouseBadgeTextPointers + dw CeruleanBadgeHouseBoulderBadgeText + dw CeruleanBadgeHouseCascadeBadgeText + dw CeruleanBadgeHouseThunderBadgeText + dw CeruleanBadgeHouseRainbowBadgeText + dw CeruleanBadgeHouseSoulBadgeText + dw CeruleanBadgeHouseMarshBadgeText + dw CeruleanBadgeHouseVolcanoBadgeText + dw CeruleanBadgeHouseEarthBadgeText + assert_table_length NUM_BADGES -CeruleanHouse2Text_74e96: - text_far _CeruleanHouse2Text_74e96 +CeruleanBadgeHouseBoulderBadgeText: + text_far _CeruleanBadgeHouseBoulderBadgeText text_end -CeruleanHouse2Text_74e9b: - text_far _CeruleanHouse2Text_74e9b +CeruleanBadgeHouseCascadeBadgeText: + text_far _CeruleanBadgeHouseCascadeBadgeText text_end -CeruleanHouse2Text_74ea0: - text_far _CeruleanHouse2Text_74ea0 +CeruleanBadgeHouseThunderBadgeText: + text_far _CeruleanBadgeHouseThunderBadgeText text_end -CeruleanHouse2Text_74ea5: - text_far _CeruleanHouse2Text_74ea5 +CeruleanBadgeHouseRainbowBadgeText: + text_far _CeruleanBadgeHouseRainbowBadgeText text_end -CeruleanHouse2Text_74eaa: - text_far _CeruleanHouse2Text_74eaa +CeruleanBadgeHouseSoulBadgeText: + text_far _CeruleanBadgeHouseSoulBadgeText text_end -CeruleanHouse2Text_74eaf: - text_far _CeruleanHouse2Text_74eaf +CeruleanBadgeHouseMarshBadgeText: + text_far _CeruleanBadgeHouseMarshBadgeText text_end -CeruleanHouse2Text_74eb4: - text_far _CeruleanHouse2Text_74eb4 +CeruleanBadgeHouseVolcanoBadgeText: + text_far _CeruleanBadgeHouseVolcanoBadgeText text_end -CeruleanHouse2Text_74eb9: - text_far _CeruleanHouse2Text_74eb9 +CeruleanBadgeHouseEarthBadgeText: + text_far _CeruleanBadgeHouseEarthBadgeText text_end diff --git a/scripts/CeruleanCave1F.asm b/scripts/CeruleanCave1F.asm index 6f5c7b135..d340f6898 100644 --- a/scripts/CeruleanCave1F.asm +++ b/scripts/CeruleanCave1F.asm @@ -2,6 +2,7 @@ CeruleanCave1F_Script: jp EnableAutoTextBoxDrawing CeruleanCave1F_TextPointers: - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText + def_text_pointers + dw_const PickUpItemText, TEXT_CERULEANCAVE1F_FULL_RESTORE + dw_const PickUpItemText, TEXT_CERULEANCAVE1F_MAX_ELIXER + dw_const PickUpItemText, TEXT_CERULEANCAVE1F_NUGGET diff --git a/scripts/CeruleanCave2F.asm b/scripts/CeruleanCave2F.asm index 1bc8457b6..de4233433 100644 --- a/scripts/CeruleanCave2F.asm +++ b/scripts/CeruleanCave2F.asm @@ -2,6 +2,7 @@ CeruleanCave2F_Script: jp EnableAutoTextBoxDrawing CeruleanCave2F_TextPointers: - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText + def_text_pointers + dw_const PickUpItemText, TEXT_CERULEANCAVE2F_PP_UP + dw_const PickUpItemText, TEXT_CERULEANCAVE2F_ULTRA_BALL + dw_const PickUpItemText, TEXT_CERULEANCAVE2F_FULL_RESTORE diff --git a/scripts/CeruleanCaveB1F.asm b/scripts/CeruleanCaveB1F.asm index 0c0ce7665..f35ee1e6b 100644 --- a/scripts/CeruleanCaveB1F.asm +++ b/scripts/CeruleanCaveB1F.asm @@ -8,14 +8,16 @@ CeruleanCaveB1F_Script: ret CeruleanCaveB1F_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_CERULEANCAVEB1F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_CERULEANCAVEB1F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_CERULEANCAVEB1F_END_BATTLE CeruleanCaveB1F_TextPointers: - dw MewtwoText - dw PickUpItemText - dw PickUpItemText + def_text_pointers + dw_const CeruleanCaveB1FMewtwoText, TEXT_CERULEANCAVEB1F_MEWTWO + dw_const PickUpItemText, TEXT_CERULEANCAVEB1F_ULTRA_BALL + dw_const PickUpItemText, TEXT_CERULEANCAVEB1F_MAX_REVIVE CeruleanCaveB1FTrainerHeaders: def_trainers @@ -23,7 +25,7 @@ MewtwoTrainerHeader: trainer EVENT_BEAT_MEWTWO, 0, MewtwoBattleText, MewtwoBattleText, MewtwoBattleText db -1 ; end -MewtwoText: +CeruleanCaveB1FMewtwoText: text_asm ld hl, MewtwoTrainerHeader call TalkToTrainer diff --git a/scripts/CeruleanCity.asm b/scripts/CeruleanCity.asm index ae4350cd2..6e480285e 100644 --- a/scripts/CeruleanCity.asm +++ b/scripts/CeruleanCity.asm @@ -5,7 +5,7 @@ CeruleanCity_Script: jp CallFunctionInTable CeruleanCityScript_1948c: - xor a + xor a ; SCRIPT_CERULEANCITY_DEFAULT ld [wJoyIgnore], a ld [wCeruleanCityCurScript], a ld a, HS_CERULEAN_RIVAL @@ -13,28 +13,29 @@ CeruleanCityScript_1948c: predef_jump HideObject CeruleanCity_ScriptPointers: - dw CeruleanCityScript0 - dw CeruleanCityScript1 - dw CeruleanCityScript2 - dw CeruleanCityScript3 - dw CeruleanCityScript4 - -CeruleanCityScript4: + def_script_pointers + dw_const CeruleanCityDefaultScript, SCRIPT_CERULEANCITY_DEFAULT + dw_const CeruleanCityRivalBattleScript, SCRIPT_CERULEANCITY_RIVAL_BATTLE + dw_const CeruleanCityRivalDefeatedScript, SCRIPT_CERULEANCITY_RIVAL_DEFEATED + dw_const CeruleanCityRivalCleanupScript, SCRIPT_CERULEANCITY_RIVAL_CLEANUP + dw_const CeruleanCityRocketDefeatedScript, SCRIPT_CERULEANCITY_ROCKET_DEFEATED + +CeruleanCityRocketDefeatedScript: ld a, [wIsInBattle] cp $ff jp z, CeruleanCityScript_1948c - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a SetEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF - ld a, $2 + ld a, TEXT_CERULEANCITY_ROCKET ldh [hSpriteIndexOrTextID], a call DisplayTextID - xor a + xor a ; SCRIPT_CERULEANCITY_DEFAULT ld [wJoyIgnore], a ld [wCeruleanCityCurScript], a ret -CeruleanCityScript0: +CeruleanCityDefaultScript: IF DEF(_DEBUG) call DebugPressedOrHeldB ret nz @@ -56,7 +57,7 @@ ENDC ld a, b ld [wSprite02StateData1FacingDirection], a call Delay3 - ld a, $2 + ld a, TEXT_CERULEANCITY_ROCKET ldh [hSpriteIndexOrTextID], a jp DisplayTextID .skipRocketThiefEncounter @@ -77,12 +78,12 @@ ENDC call PlayMusic xor a ldh [hJoyHeld], a - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ld a, [wXCoord] cp 20 ; is the player standing on the right side of the bridge? jr z, .playerOnRightSideOfBridge - ld a, $1 + ld a, CERULEANCITY_RIVAL ldh [hSpriteIndex], a ld a, SPRITESTATEDATA2_MAPX ldh [hSpriteDataOffset], a @@ -93,10 +94,10 @@ ENDC ld [wMissableObjectIndex], a predef ShowObject ld de, CeruleanCityMovement1 - ld a, $1 + ld a, CERULEANCITY_RIVAL ldh [hSpriteIndex], a call MoveSprite - ld a, $1 + ld a, SCRIPT_CERULEANCITY_RIVAL_BATTLE ld [wCeruleanCityCurScript], a ret @@ -117,26 +118,26 @@ CeruleanCityMovement1: db -1 ; end CeruleanCityScript_1955d: - ld a, 1 + ld a, CERULEANCITY_RIVAL ldh [hSpriteIndex], a xor a ; SPRITE_FACING_DOWN ldh [hSpriteFacingDirection], a jp SetSpriteFacingDirectionAndDelay ; face object -CeruleanCityScript1: +CeruleanCityRivalBattleScript: ld a, [wd730] bit 0, a ret nz xor a ld [wJoyIgnore], a - ld a, $1 + ld a, TEXT_CERULEANCITY_RIVAL ldh [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, CeruleanCityText_1966d - ld de, CeruleanCityText_19672 + ld hl, CeruleanCityRivalDefeatedText + ld de, CeruleanCityRivalVictoryText call SaveEndBattleTextPointers ld a, OPP_RIVAL1 ld [wCurOpponent], a @@ -160,26 +161,26 @@ CeruleanCityScript1: xor a ldh [hJoyHeld], a call CeruleanCityScript_1955d - ld a, $2 + ld a, SCRIPT_CERULEANCITY_RIVAL_DEFEATED ld [wCeruleanCityCurScript], a ret -CeruleanCityScript2: +CeruleanCityRivalDefeatedScript: ld a, [wIsInBattle] cp $ff jp z, CeruleanCityScript_1948c call CeruleanCityScript_1955d - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a SetEvent EVENT_BEAT_CERULEAN_RIVAL - ld a, $1 + ld a, TEXT_CERULEANCITY_RIVAL ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound farcall Music_RivalAlternateStart - ld a, $1 + ld a, CERULEANCITY_RIVAL ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF ld a, [wXCoord] @@ -190,10 +191,10 @@ CeruleanCityScript2: .playerOnRightSideOfBridge ld de, CeruleanCityMovement3 .skip - ld a, $1 + ld a, CERULEANCITY_RIVAL ldh [hSpriteIndex], a call MoveSprite - ld a, $3 + ld a, SCRIPT_CERULEANCITY_RIVAL_CLEANUP ld [wCeruleanCityCurScript], a ret @@ -217,7 +218,7 @@ CeruleanCityMovement4: db NPC_MOVEMENT_DOWN db -1 ; end -CeruleanCityScript3: +CeruleanCityRivalCleanupScript: ld a, [wd730] bit 0, a ret nz @@ -227,233 +228,233 @@ CeruleanCityScript3: xor a ld [wJoyIgnore], a call PlayDefaultMusic - ld a, $0 + ld a, SCRIPT_CERULEANCITY_DEFAULT ld [wCeruleanCityCurScript], a ret CeruleanCity_TextPointers: - dw CeruleanCityText1 - dw CeruleanCityText2 - dw CeruleanCityText3 - dw CeruleanCityText4 - dw CeruleanCityText5 - dw CeruleanCityText6 - dw CeruleanCityText7 - dw CeruleanCityText8 - dw CeruleanCityText9 - dw CeruleanCityText10 - dw CeruleanCityText11 - dw CeruleanCityText12 - dw CeruleanCityText13 - dw MartSignText - dw PokeCenterSignText - dw CeruleanCityText16 - dw CeruleanCityText17 - -CeruleanCityText1: + def_text_pointers + dw_const CeruleanCityRivalText, TEXT_CERULEANCITY_RIVAL + dw_const CeruleanCityRocketText, TEXT_CERULEANCITY_ROCKET + dw_const CeruleanCityCooltrainerMText, TEXT_CERULEANCITY_COOLTRAINER_M + dw_const CeruleanCitySuperNerd1Text, TEXT_CERULEANCITY_SUPER_NERD1 + dw_const CeruleanCitySuperNerd2Text, TEXT_CERULEANCITY_SUPER_NERD2 + dw_const CeruleanCityGuardText, TEXT_CERULEANCITY_GUARD1 + dw_const CeruleanCityCooltrainerF1Text, TEXT_CERULEANCITY_COOLTRAINER_F1 + dw_const CeruleanCitySlowbroText, TEXT_CERULEANCITY_SLOWBRO + dw_const CeruleanCityCooltrainerF2Text, TEXT_CERULEANCITY_COOLTRAINER_F2 + dw_const CeruleanCitySuperNerd3Text, TEXT_CERULEANCITY_SUPER_NERD3 + dw_const CeruleanCityGuardText, TEXT_CERULEANCITY_GUARD2 + dw_const CeruleanCitySignText, TEXT_CERULEANCITY_SIGN + dw_const CeruleanCityTrainerTipsText, TEXT_CERULEANCITY_TRAINER_TIPS + dw_const MartSignText, TEXT_CERULEANCITY_MART_SIGN + dw_const PokeCenterSignText, TEXT_CERULEANCITY_POKECENTER_SIGN + dw_const CeruleanCityBikeShopSign, TEXT_CERULEANCITY_BIKESHOP_SIGN + dw_const CeruleanCityGymSign, TEXT_CERULEANCITY_GYM_SIGN + +CeruleanCityRivalText: text_asm CheckEvent EVENT_BEAT_CERULEAN_RIVAL ; do pre-battle text - jr z, .PreBattleText + jr z, .PreBattle ; or talk about bill - ld hl, CeruleanCityText_19677 + ld hl, CeruleanCityRivalIWentToBillsText call PrintText jr .end -.PreBattleText - ld hl, CeruleanCityText_19668 +.PreBattle + ld hl, .PreBattleText call PrintText .end jp TextScriptEnd -CeruleanCityText_19668: - text_far _CeruleanCityText_19668 +.PreBattleText: + text_far _CeruleanCityRivalPreBattleText text_end -CeruleanCityText_1966d: - text_far _CeruleanCityText_1966d +CeruleanCityRivalDefeatedText: + text_far _CeruleanCityRivalDefeatedText text_end -CeruleanCityText_19672: - text_far _CeruleanCityText_19672 +CeruleanCityRivalVictoryText: + text_far _CeruleanCityRivalVictoryText text_end -CeruleanCityText_19677: - text_far _CeruleanCityText_19677 +CeruleanCityRivalIWentToBillsText: + text_far _CeruleanCityRivalIWentToBillsText text_end -CeruleanCityText2: +CeruleanCityRocketText: text_asm CheckEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF jr nz, .beatRocketThief - ld hl, CeruleanCityText_196d9 + ld hl, .Text call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, CeruleanCityText_196ee - ld de, CeruleanCityText_196ee + ld hl, .IGiveUpText + ld de, .IGiveUpText call SaveEndBattleTextPointers ldh a, [hSpriteIndexOrTextID] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters - ld a, $4 + ld a, SCRIPT_CERULEANCITY_ROCKET_DEFEATED ld [wCeruleanCityCurScript], a jp TextScriptEnd .beatRocketThief - ld hl, CeruleanCityText_196f3 + ld hl, .IllReturnTheTMText call PrintText lb bc, TM_DIG, 1 call GiveItem jr c, .Success - ld hl, TM28NoRoomText + ld hl, .TM28NoRoomText call PrintText jr .Done .Success ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, ReceivedTM28Text + ld hl, .ReceivedTM28Text call PrintText farcall CeruleanHideRocket .Done jp TextScriptEnd -CeruleanCityText_196d9: - text_far _CeruleanCityText_196d9 +.Text: + text_far _CeruleanCityRocketText text_end -ReceivedTM28Text: - text_far _ReceivedTM28Text +.ReceivedTM28Text: + text_far _CeruleanCityRocketReceivedTM28Text sound_get_item_1 - text_far _ReceivedTM28Text2 + text_far _CeruleanCityRocketIBetterGetMovingText text_waitbutton text_end -TM28NoRoomText: - text_far _TM28NoRoomText +.TM28NoRoomText: + text_far _CeruleanCityRocketTM28NoRoomText text_end -CeruleanCityText_196ee: - text_far _CeruleanCityText_196ee +.IGiveUpText: + text_far _CeruleanCityRocketIGiveUpText text_end -CeruleanCityText_196f3: - text_far _CeruleanCityText_196f3 +.IllReturnTheTMText: + text_far _CeruleanCityRocketIllReturnTheTMText text_end -CeruleanCityText3: - text_far _CeruleanCityText3 +CeruleanCityCooltrainerMText: + text_far _CeruleanCityCooltrainerMText text_end -CeruleanCityText4: - text_far _CeruleanCityText4 +CeruleanCitySuperNerd1Text: + text_far _CeruleanCitySuperNerd1Text text_end -CeruleanCityText5: - text_far _CeruleanCityText5 +CeruleanCitySuperNerd2Text: + text_far _CeruleanCitySuperNerd2Text text_end -CeruleanCityText11: -CeruleanCityText6: - text_far _CeruleanCityText6 +CeruleanCityGuardText: + text_far _CeruleanCityGuardText text_end -CeruleanCityText7: +CeruleanCityCooltrainerF1Text: text_asm ldh a, [hRandomAdd] cp 180 ; 76/256 chance of 1st dialogue jr c, .notFirstText - ld hl, CeruleanCityText_19730 + ld hl, .SlowbroUseSonicboomText call PrintText jr .end .notFirstText cp 100 ; 80/256 chance of 2nd dialogue jr c, .notSecondText - ld hl, CeruleanCityText_19735 + ld hl, .SlowbroPunchText call PrintText jr .end .notSecondText ; 100/256 chance of 3rd dialogue - ld hl, CeruleanCityText_1973a + ld hl, .SlowbroWithdrawText call PrintText .end jp TextScriptEnd -CeruleanCityText_19730: - text_far _CeruleanCityText_19730 +.SlowbroUseSonicboomText: + text_far _CeruleanCityCooltrainerF1SlowbroUseSonicboomText text_end -CeruleanCityText_19735: - text_far _CeruleanCityText_19735 +.SlowbroPunchText: + text_far _CeruleanCityCooltrainerF1SlowbroPunchText text_end -CeruleanCityText_1973a: - text_far _CeruleanCityText_1973a +.SlowbroWithdrawText: + text_far _CeruleanCityCooltrainerF1SlowbroWithdrawText text_end -CeruleanCityText8: +CeruleanCitySlowbroText: text_asm ldh a, [hRandomAdd] cp 180 ; 76/256 chance of 1st dialogue jr c, .notFirstText - ld hl, CeruleanCityText_1976f + ld hl, .TookASnoozeText call PrintText jr .end .notFirstText cp 120 ; 60/256 chance of 2nd dialogue jr c, .notSecondText - ld hl, CeruleanCityText_19774 + ld hl, .IsLoafingAroundText call PrintText jr .end .notSecondText cp 60 ; 60/256 chance of 3rd dialogue jr c, .notThirdText - ld hl, CeruleanCityText_19779 + ld hl, .TurnedAwayText call PrintText jr .end .notThirdText ; 60/256 chance of 4th dialogue - ld hl, CeruleanCityText_1977e + ld hl, .IgnoredOrdersText call PrintText .end jp TextScriptEnd -CeruleanCityText_1976f: - text_far _CeruleanCityText_1976f +.TookASnoozeText: + text_far _CeruleanCitySlowbroTookASnoozeText text_end -CeruleanCityText_19774: - text_far _CeruleanCityText_19774 +.IsLoafingAroundText: + text_far _CeruleanCitySlowbroIsLoafingAroundText text_end -CeruleanCityText_19779: - text_far _CeruleanCityText_19779 +.TurnedAwayText: + text_far _CeruleanCitySlowbroTurnedAwayText text_end -CeruleanCityText_1977e: - text_far _CeruleanCityText_1977e +.IgnoredOrdersText: + text_far _CeruleanCitySlowbroIgnoredOrdersText text_end -CeruleanCityText9: - text_far _CeruleanCityText9 +CeruleanCityCooltrainerF2Text: + text_far _CeruleanCityCooltrainerF2Text text_end -CeruleanCityText10: - text_far _CeruleanCityText10 +CeruleanCitySuperNerd3Text: + text_far _CeruleanCitySuperNerd3Text text_end -CeruleanCityText12: - text_far _CeruleanCityText12 +CeruleanCitySignText: + text_far _CeruleanCitySignText text_end -CeruleanCityText13: - text_far _CeruleanCityText13 +CeruleanCityTrainerTipsText: + text_far _CeruleanCityTrainerTipsText text_end -CeruleanCityText16: - text_far _CeruleanCityText16 +CeruleanCityBikeShopSign: + text_far _CeruleanCityBikeShopSign text_end -CeruleanCityText17: - text_far _CeruleanCityText17 +CeruleanCityGymSign: + text_far _CeruleanCityGymSign text_end diff --git a/scripts/CeruleanGym.asm b/scripts/CeruleanGym.asm index 798716e3d..8e6694ea1 100644 --- a/scripts/CeruleanGym.asm +++ b/scripts/CeruleanGym.asm @@ -23,40 +23,41 @@ CeruleanGym_Script: db "MISTY@" CeruleanGymResetScripts: - xor a + xor a ; SCRIPT_CERULEANGYM_DEFAULT ld [wJoyIgnore], a ld [wCeruleanGymCurScript], a ld [wCurMapScript], a ret CeruleanGym_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw CeruleanGymMistyPostBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_CERULEANGYM_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_CERULEANGYM_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_CERULEANGYM_END_BATTLE + dw_const CeruleanGymMistyPostBattleScript, SCRIPT_CERULEANGYM_MISTY_POST_BATTLE -CeruleanGymMistyPostBattle: +CeruleanGymMistyPostBattleScript: ld a, [wIsInBattle] cp $ff jp z, CeruleanGymResetScripts - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a CeruleanGymReceiveTM11: - ld a, $5 + ld a, TEXT_CERULEANGYM_MISTY_CASCADE_BADGE_INFO ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_MISTY lb bc, TM_BUBBLEBEAM, 1 call GiveItem jr nc, .BagFull - ld a, $6 + ld a, TEXT_CERULEANGYM_MISTY_RECEIVED_TM11 ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM11 jr .gymVictory .BagFull - ld a, $7 + ld a, TEXT_CERULEANGYM_MISTY_TM11_NO_ROOM ldh [hSpriteIndexOrTextID], a call DisplayTextID .gymVictory @@ -71,13 +72,14 @@ CeruleanGymReceiveTM11: jp CeruleanGymResetScripts CeruleanGym_TextPointers: - dw MistyText - dw CeruleanGymTrainerText1 - dw CeruleanGymTrainerText2 - dw CeruleanGymGuideText - dw MistyCascadeBadgeInfoText - dw ReceivedTM11Text - dw TM11NoRoomText + def_text_pointers + dw_const CeruleanGymMistyText, TEXT_CERULEANGYM_MISTY + dw_const CeruleanGymCooltrainerFText, TEXT_CERULEANGYM_COOLTRAINER_F + dw_const CeruleanGymSwimmerText, TEXT_CERULEANGYM_SWIMMER + dw_const CeruleanGymGymGuideText, TEXT_CERULEANGYM_GYM_GUIDE + dw_const CeruleanGymMistyCascadeBadgeInfoText, TEXT_CERULEANGYM_MISTY_CASCADE_BADGE_INFO + dw_const CeruleanGymMistyReceivedTM11Text, TEXT_CERULEANGYM_MISTY_RECEIVED_TM11 + dw_const CeruleanGymMistyTM11NoRoomText, TEXT_CERULEANGYM_MISTY_TM11_NO_ROOM CeruleanGymTrainerHeaders: def_trainers 2 @@ -87,7 +89,7 @@ CeruleanGymTrainerHeader1: trainer EVENT_BEAT_CERULEAN_GYM_TRAINER_1, 3, CeruleanGymBattleText2, CeruleanGymEndBattleText2, CeruleanGymAfterBattleText2 db -1 ; end -MistyText: +CeruleanGymMistyText: text_asm CheckEvent EVENT_BEAT_MISTY jr z, .beforeBeat @@ -97,17 +99,17 @@ MistyText: call DisableWaitingAfterTextDisplay jr .done .afterBeat - ld hl, TM11ExplanationText + ld hl, .TM11ExplanationText call PrintText jr .done .beforeBeat - ld hl, MistyPreBattleText + ld hl, .PreBattleText call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, ReceivedCascadeBadgeText - ld de, ReceivedCascadeBadgeText + ld hl, CeruleanGymMistyReceivedCascadeBadgeText + ld de, CeruleanGymMistyReceivedCascadeBadgeText call SaveEndBattleTextPointers ldh a, [hSpriteIndex] ld [wSpriteIndex], a @@ -117,39 +119,39 @@ MistyText: ld [wGymLeaderNo], a xor a ldh [hJoyHeld], a - ld a, $3 + ld a, SCRIPT_CERULEANGYM_MISTY_POST_BATTLE ld [wCeruleanGymCurScript], a .done jp TextScriptEnd -MistyPreBattleText: - text_far _MistyPreBattleText +.PreBattleText: + text_far _CeruleanGymMistyPreBattleText text_end -TM11ExplanationText: - text_far _TM11ExplanationText +.TM11ExplanationText: + text_far _CeruleanGymMistyTM11ExplanationText text_end -MistyCascadeBadgeInfoText: - text_far _MistyCascadeBadgeInfoText +CeruleanGymMistyCascadeBadgeInfoText: + text_far _CeruleanGymMistyCascadeBadgeInfoText text_end -ReceivedTM11Text: - text_far _ReceivedTM11Text +CeruleanGymMistyReceivedTM11Text: + text_far _CeruleanGymMistyReceivedTM11Text sound_get_item_1 text_end -TM11NoRoomText: - text_far _TM11NoRoomText +CeruleanGymMistyTM11NoRoomText: + text_far _CeruleanGymMistyTM11NoRoomText text_end -ReceivedCascadeBadgeText: - text_far _ReceivedCascadeBadgeText +CeruleanGymMistyReceivedCascadeBadgeText: + text_far _CeruleanGymMistyReceivedCascadeBadgeText sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded text_promptbutton text_end -CeruleanGymTrainerText1: +CeruleanGymCooltrainerFText: text_asm ld hl, CeruleanGymTrainerHeader0 call TalkToTrainer @@ -167,7 +169,7 @@ CeruleanGymAfterBattleText1: text_far _CeruleanGymAfterBattleText1 text_end -CeruleanGymTrainerText2: +CeruleanGymSwimmerText: text_asm ld hl, CeruleanGymTrainerHeader1 call TalkToTrainer @@ -185,23 +187,23 @@ CeruleanGymAfterBattleText2: text_far _CeruleanGymAfterBattleText2 text_end -CeruleanGymGuideText: +CeruleanGymGymGuideText: text_asm CheckEvent EVENT_BEAT_MISTY jr nz, .afterBeat - ld hl, CeruleanGymGuidePreBattleText + ld hl, .ChampInMakingText call PrintText jr .done .afterBeat - ld hl, CeruleanGymGuidePostBattleText + ld hl, .BeatMistyText call PrintText .done jp TextScriptEnd -CeruleanGymGuidePreBattleText: - text_far _CeruleanGymGuidePreBattleText +.ChampInMakingText: + text_far _CeruleanGymGymGuideChampInMakingText text_end -CeruleanGymGuidePostBattleText: - text_far _CeruleanGymGuidePostBattleText +.BeatMistyText: + text_far _CeruleanGymGymGuideBeatMistyText text_end diff --git a/scripts/CeruleanMart.asm b/scripts/CeruleanMart.asm index beb0fa1b3..57907e6f8 100644 --- a/scripts/CeruleanMart.asm +++ b/scripts/CeruleanMart.asm @@ -2,14 +2,15 @@ CeruleanMart_Script: jp EnableAutoTextBoxDrawing CeruleanMart_TextPointers: - dw CeruleanCashierText - dw CeruleanMartText2 - dw CeruleanMartText3 + def_text_pointers + dw_const CeruleanMartClerkText, TEXT_CERULEANMART_CLERK + dw_const CeruleanMartCooltrainerMText, TEXT_CERULEANMART_COOLTRAINER_M + dw_const CeruleanMartCooltrainerFText, TEXT_CERULEANMART_COOLTRAINER_F -CeruleanMartText2: - text_far _CeruleanMartText2 +CeruleanMartCooltrainerMText: + text_far _CeruleanMartCooltrainerMText text_end -CeruleanMartText3: - text_far _CeruleanMartText3 +CeruleanMartCooltrainerFText: + text_far _CeruleanMartCooltrainerFText text_end diff --git a/scripts/CeruleanPokecenter.asm b/scripts/CeruleanPokecenter.asm index 680640f45..e143efb22 100644 --- a/scripts/CeruleanPokecenter.asm +++ b/scripts/CeruleanPokecenter.asm @@ -3,21 +3,22 @@ CeruleanPokecenter_Script: jp EnableAutoTextBoxDrawing CeruleanPokecenter_TextPointers: - dw CeruleanHealNurseText - dw CeruleanPokecenterText2 - dw CeruleanPokecenterText3 - dw CeruleanTradeNurseText + def_text_pointers + dw_const CeruleanPokecenterNurseText, TEXT_CERULEANPOKECENTER_NURSE + dw_const CeruleanPokecenterSuperNerdText, TEXT_CERULEANPOKECENTER_SUPER_NERD + dw_const CeruleanPokecenterGentlemanText, TEXT_CERULEANPOKECENTER_GENTLEMAN + dw_const CeruleanPokecenterLinkReceptionistText, TEXT_CERULEANPOKECENTER_LINK_RECEPTIONIST -CeruleanTradeNurseText: +CeruleanPokecenterLinkReceptionistText: script_cable_club_receptionist -CeruleanHealNurseText: +CeruleanPokecenterNurseText: script_pokecenter_nurse -CeruleanPokecenterText2: - text_far _CeruleanPokecenterText2 +CeruleanPokecenterSuperNerdText: + text_far _CeruleanPokecenterSuperNerdText text_end -CeruleanPokecenterText3: - text_far _CeruleanPokecenterText3 +CeruleanPokecenterGentlemanText: + text_far _CeruleanPokecenterGentlemanText text_end diff --git a/scripts/CeruleanTradeHouse.asm b/scripts/CeruleanTradeHouse.asm index 66952cd40..d23016930 100644 --- a/scripts/CeruleanTradeHouse.asm +++ b/scripts/CeruleanTradeHouse.asm @@ -2,14 +2,15 @@ CeruleanTradeHouse_Script: jp EnableAutoTextBoxDrawing CeruleanTradeHouse_TextPointers: - dw CeruleanHouse1Text1 - dw CeruleanHouse1Text2 + def_text_pointers + dw_const CeruleanTradeHouseGrannyText, TEXT_CERULEANTRADEHOUSE_GRANNY + dw_const CeruleanTradeHouseGamblerText, TEXT_CERULEANTRADEHOUSE_GAMBLER -CeruleanHouse1Text1: - text_far _CeruleanHouse1Text1 +CeruleanTradeHouseGrannyText: + text_far _CeruleanTradeHouseGrannyText text_end -CeruleanHouse1Text2: +CeruleanTradeHouseGamblerText: text_asm ld a, TRADE_FOR_LOLA ld [wWhichTrade], a diff --git a/scripts/CeruleanTrashedHouse.asm b/scripts/CeruleanTrashedHouse.asm index d11c77218..f15cddc86 100644 --- a/scripts/CeruleanTrashedHouse.asm +++ b/scripts/CeruleanTrashedHouse.asm @@ -3,37 +3,38 @@ CeruleanTrashedHouse_Script: ret CeruleanTrashedHouse_TextPointers: - dw CeruleanHouseTrashedText1 - dw CeruleanHouseTrashedText2 - dw CeruleanHouseTrashedText3 + def_text_pointers + dw_const CeruleanTrashedHouseFishingGuruText, TEXT_CERULEANTRASHEDHOUSE_FISHING_GURU + dw_const CeruleanTrashedHouseGirlText, TEXT_CERULEANTRASHEDHOUSE_GIRL + dw_const CeruleanTrashedHouseWallHoleText, TEXT_CERULEANTRASHEDHOUSE_WALL_HOLE -CeruleanHouseTrashedText1: +CeruleanTrashedHouseFishingGuruText: text_asm ld b, TM_DIG predef GetQuantityOfItemInBag and b jr z, .no_dig_tm - ld hl, CeruleanHouseTrashedText_1d6b0 + ld hl, .WhatsLostIsLostText call PrintText jr .done .no_dig_tm - ld hl, CeruleanHouseTrashedText_1d6ab + ld hl, .TheyStoleATMText call PrintText .done jp TextScriptEnd -CeruleanHouseTrashedText_1d6ab: - text_far _CeruleanTrashedText_1d6ab +.TheyStoleATMText: + text_far _CeruleanTrashedHouseFishingGuruTheyStoleATMText text_end -CeruleanHouseTrashedText_1d6b0: - text_far _CeruleanTrashedText_1d6b0 +.WhatsLostIsLostText: + text_far _CeruleanTrashedHouseFishingGuruWhatsLostIsLostText text_end -CeruleanHouseTrashedText2: - text_far _CeruleanHouseTrashedText2 +CeruleanTrashedHouseGirlText: + text_far _CeruleanTrashedHouseGirlText text_end -CeruleanHouseTrashedText3: - text_far _CeruleanHouseTrashedText3 +CeruleanTrashedHouseWallHoleText: + text_far _CeruleanTrashedHouseWallHoleText text_end diff --git a/scripts/ChampionsRoom.asm b/scripts/ChampionsRoom.asm index 11f99ee15..0837ae52b 100644 --- a/scripts/ChampionsRoom.asm +++ b/scripts/ChampionsRoom.asm @@ -4,48 +4,49 @@ ChampionsRoom_Script: ld a, [wChampionsRoomCurScript] jp CallFunctionInTable -ResetGaryScript: - xor a +ResetRivalScript: + xor a ; SCENE_CHAMPIONSROOM_DEFAULT ld [wJoyIgnore], a ld [wChampionsRoomCurScript], a ret ChampionsRoom_ScriptPointers: - dw GaryScript0 - dw GaryScript1 - dw GaryScript2 - dw GaryScript3 - dw GaryScript4 - dw GaryScript5 - dw GaryScript6 - dw GaryScript7 - dw GaryScript8 - dw GaryScript9 - dw GaryScript10 + def_script_pointers + dw_const ChampionsRoomDefaultScript, SCRIPT_CHAMPIONSROOM_DEFAULT + dw_const ChampionsRoomPlayerEntersScript, SCRIPT_CHAMPIONSROOM_PLAYER_ENTERS + dw_const ChampionsRoomRivalReadyToBattleScript, SCRIPT_CHAMPIONSROOM_RIVAL_READY_TO_BATTLE + dw_const ChampionsRoomRivalDefeatedScript, SCRIPT_CHAMPIONSROOM_RIVAL_DEFEATED + dw_const ChampionsRoomOakArrivesScript, SCRIPT_CHAMPIONSROOM_OAK_ARRIVES + dw_const ChampionsRoomOakCongratulatesPlayerScript, SCRIPT_CHAMPIONSROOM_OAK_CONGRATULATES_PLAYER + dw_const ChampionsRoomOakDisappointedWithRivalScript, SCRIPT_CHAMPIONSROOM_OAK_DISAPPOINTED_WITH_RIVAL + dw_const ChampionsRoomOakComeWithMeScript, SCRIPT_CHAMPIONSROOM_OAK_COME_WITH_ME + dw_const ChampionsRoomOakExitsScript, SCRIPT_CHAMPIONSROOM_OAK_EXITS + dw_const ChampionsRoomPlayerFollowsOakScript, SCRIPT_CHAMPIONSROOM_PLAYER_FOLLOWS_OAK + dw_const ChampionsRoomCleanupScript, SCRIPT_CHAMPIONSROOM_CLEANUP_SCRIPT -GaryScript0: +ChampionsRoomDefaultScript: ret -GaryScript1: - ld a, $ff +ChampionsRoomPlayerEntersScript: + ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ld hl, wSimulatedJoypadStatesEnd - ld de, GaryEntrance_RLEMovement + ld de, RivalEntrance_RLEMovement call DecodeRLEList dec a ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld a, $2 + ld a, SCRIPT_CHAMPIONSROOM_RIVAL_READY_TO_BATTLE ld [wChampionsRoomCurScript], a ret -GaryEntrance_RLEMovement: +RivalEntrance_RLEMovement: db D_UP, 1 db D_RIGHT, 1 db D_UP, 3 db -1 ; end -GaryScript2: +ChampionsRoomRivalReadyToBattleScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -54,15 +55,15 @@ GaryScript2: ld [wJoyIgnore], a ld hl, wOptions res 7, [hl] ; Turn on battle animations to make the battle feel more epic. - ld a, $1 + ld a, TEXT_CHAMPIONSROOM_RIVAL ldh [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, GaryDefeatedText - ld de, GaryVictoryText + ld hl, RivalDefeatedText + ld de, RivalVictoryText call SaveEndBattleTextPointers ld a, OPP_RIVAL3 ld [wCurOpponent], a @@ -85,44 +86,44 @@ GaryScript2: xor a ldh [hJoyHeld], a - ld a, $3 + ld a, SCRIPT_CHAMPIONSROOM_RIVAL_DEFEATED ld [wChampionsRoomCurScript], a ret -GaryScript3: +ChampionsRoomRivalDefeatedScript: ld a, [wIsInBattle] cp $ff - jp z, ResetGaryScript + jp z, ResetRivalScript call UpdateSprites SetEvent EVENT_BEAT_CHAMPION_RIVAL - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a - ld a, $1 + ld a, TEXT_CHAMPIONSROOM_RIVAL ldh [hSpriteIndexOrTextID], a - call GaryScript_760c8 - ld a, $1 + call RivalScript_760c8 + ld a, CHAMPIONSROOM_RIVAL ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF - ld a, $4 + ld a, SCRIPT_CHAMPIONSROOM_OAK_ARRIVES ld [wChampionsRoomCurScript], a ret -GaryScript4: +ChampionsRoomOakArrivesScript: farcall Music_Cities1AlternateTempo - ld a, $2 + ld a, TEXT_CHAMPIONSROOM_OAK ldh [hSpriteIndexOrTextID], a - call GaryScript_760c8 - ld a, $2 + call RivalScript_760c8 + ld a, CHAMPIONSROOM_OAK ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF ld de, OakEntranceAfterVictoryMovement - ld a, $2 + ld a, CHAMPIONSROOM_OAK ldh [hSpriteIndex], a call MoveSprite ld a, HS_CHAMPIONS_ROOM_OAK ld [wMissableObjectIndex], a predef ShowObject - ld a, $5 + ld a, SCRIPT_CHAMPIONSROOM_OAK_CONGRATULATES_PLAYER ld [wChampionsRoomCurScript], a ret @@ -134,165 +135,166 @@ OakEntranceAfterVictoryMovement: db NPC_MOVEMENT_UP db -1 ; end -GaryScript5: +ChampionsRoomOakCongratulatesPlayerScript: ld a, [wd730] bit 0, a ret nz ld a, PLAYER_DIR_LEFT ld [wPlayerMovingDirection], a - ld a, $1 + ld a, CHAMPIONSROOM_RIVAL ldh [hSpriteIndex], a ld a, SPRITE_FACING_LEFT ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay - ld a, $2 + ld a, CHAMPIONSROOM_OAK ldh [hSpriteIndex], a xor a ; SPRITE_FACING_DOWN ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay - ld a, $3 + ld a, TEXT_CHAMPIONSROOM_OAK_CONGRATULATES_PLAYER ldh [hSpriteIndexOrTextID], a - call GaryScript_760c8 - ld a, $6 + call RivalScript_760c8 + ld a, SCRIPT_CHAMPIONSROOM_OAK_DISAPPOINTED_WITH_RIVAL ld [wChampionsRoomCurScript], a ret -GaryScript6: - ld a, $2 +ChampionsRoomOakDisappointedWithRivalScript: + ld a, CHAMPIONSROOM_OAK ldh [hSpriteIndex], a ld a, SPRITE_FACING_RIGHT ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay - ld a, $4 + ld a, TEXT_CHAMPIONSROOM_OAK_DISAPPOINTED_WITH_RIVAL ldh [hSpriteIndexOrTextID], a - call GaryScript_760c8 - ld a, $7 + call RivalScript_760c8 + ld a, SCRIPT_CHAMPIONSROOM_OAK_COME_WITH_ME ld [wChampionsRoomCurScript], a ret -GaryScript7: - ld a, $2 +ChampionsRoomOakComeWithMeScript: + ld a, CHAMPIONSROOM_OAK ldh [hSpriteIndex], a xor a ; SPRITE_FACING_DOWN ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay - ld a, $5 + ld a, TEXT_CHAMPIONSROOM_OAK_COME_WITH_ME ldh [hSpriteIndexOrTextID], a - call GaryScript_760c8 - ld de, OakExitGaryRoomMovement - ld a, $2 + call RivalScript_760c8 + ld de, OakExitChampionsRoomMovement + ld a, CHAMPIONSROOM_OAK ldh [hSpriteIndex], a call MoveSprite - ld a, $8 + ld a, SCRIPT_CHAMPIONSROOM_OAK_EXITS ld [wChampionsRoomCurScript], a ret -OakExitGaryRoomMovement: +OakExitChampionsRoomMovement: db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP db -1 ; end -GaryScript8: +ChampionsRoomOakExitsScript: ld a, [wd730] bit 0, a ret nz ld a, HS_CHAMPIONS_ROOM_OAK ld [wMissableObjectIndex], a predef HideObject - ld a, $9 + ld a, SCRIPT_CHAMPIONSROOM_PLAYER_FOLLOWS_OAK ld [wChampionsRoomCurScript], a ret -GaryScript9: - ld a, $ff +ChampionsRoomPlayerFollowsOakScript: + ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ld hl, wSimulatedJoypadStatesEnd - ld de, WalkToHallOfFame_RLEMovment + ld de, WalkToHallOfFame_RLEMovement call DecodeRLEList dec a ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld a, $a + ld a, SCRIPT_CHAMPIONSROOM_CLEANUP_SCRIPT ld [wChampionsRoomCurScript], a ret -WalkToHallOfFame_RLEMovment: +WalkToHallOfFame_RLEMovement: db D_UP, 4 db D_LEFT, 1 db -1 ; end -GaryScript10: +ChampionsRoomCleanupScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz xor a ld [wJoyIgnore], a - ld a, $0 + ld a, SCRIPT_CHAMPIONSROOM_DEFAULT ld [wChampionsRoomCurScript], a ret -GaryScript_760c8: - ld a, $f0 +RivalScript_760c8: + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a call DisplayTextID - ld a, $ff + ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ret ChampionsRoom_TextPointers: - dw GaryText1 - dw GaryText2 - dw GaryText3 - dw GaryText4 - dw GaryText5 + def_text_pointers + dw_const ChampionsRoomRivalText, TEXT_CHAMPIONSROOM_RIVAL + dw_const ChampionsRoomOakText, TEXT_CHAMPIONSROOM_OAK + dw_const ChampionsRoomOakCongratulatesPlayerText, TEXT_CHAMPIONSROOM_OAK_CONGRATULATES_PLAYER + dw_const ChampionsRoomOakDisappointedWithRivalText, TEXT_CHAMPIONSROOM_OAK_DISAPPOINTED_WITH_RIVAL + dw_const ChampionsRoomOakComeWithMeText, TEXT_CHAMPIONSROOM_OAK_COME_WITH_ME -GaryText1: +ChampionsRoomRivalText: text_asm CheckEvent EVENT_BEAT_CHAMPION_RIVAL - ld hl, GaryChampionIntroText + ld hl, .IntroText jr z, .printText - ld hl, GaryText_76103 + ld hl, ChampionsRoomRivalAfterBattleText .printText call PrintText jp TextScriptEnd -GaryChampionIntroText: - text_far _GaryChampionIntroText +.IntroText: + text_far _ChampionsRoomRivalIntroText text_end -GaryDefeatedText: - text_far _GaryDefeatedText +RivalDefeatedText: + text_far _RivalDefeatedText text_end -GaryVictoryText: - text_far _GaryVictoryText +RivalVictoryText: + text_far _RivalVictoryText text_end -GaryText_76103: - text_far _GaryText_76103 +ChampionsRoomRivalAfterBattleText: + text_far _ChampionsRoomRivalAfterBattleText text_end -GaryText2: - text_far _GaryText2 +ChampionsRoomOakText: + text_far _ChampionsRoomOakText text_end -GaryText3: +ChampionsRoomOakCongratulatesPlayerText: text_asm ld a, [wPlayerStarter] ld [wd11e], a call GetMonName - ld hl, GaryText_76120 + ld hl, .Text call PrintText jp TextScriptEnd -GaryText_76120: - text_far _GaryText_76120 +.Text: + text_far _ChampionsRoomOakCongratulatesPlayerText text_end -GaryText4: - text_far _GaryText_76125 +ChampionsRoomOakDisappointedWithRivalText: + text_far _ChampionsRoomOakDisappointedWithRivalText text_end -GaryText5: - text_far _GaryText_7612a +ChampionsRoomOakComeWithMeText: + text_far _ChampionsRoomOakComeWithMeText text_end diff --git a/scripts/CinnabarGym.asm b/scripts/CinnabarGym.asm index 370a875f3..af7646be6 100644 --- a/scripts/CinnabarGym.asm +++ b/scripts/CinnabarGym.asm @@ -30,7 +30,7 @@ CinnabarGymSetMapAndTiles: db "BLAINE@" CinnabarGymResetScripts: - xor a + xor a ; SCRIPT_CINNABARGYM_DEFAULT ld [wJoyIgnore], a ld [wCinnabarGymCurScript], a ld [wCurMapScript], a @@ -43,29 +43,30 @@ CinnabarGymSetTrainerHeader: ret CinnabarGym_ScriptPointers: - dw CinnabarGymScript0 - dw CinnabarGymScript1 - dw CinnabarGymScript2 - dw CinnabarGymBlainePostBattle + def_script_pointers + dw_const CinnabarGymDefaultScript, SCRIPT_CINNABARGYM_DEFAULT + dw_const CinnabarGymGetOpponentTextScript, SCRIPT_CINNABARGYM_GET_OPPONENT_TEXT + dw_const CinnabarGymOpenGateScript, SCRIPT_CINNABARGYM_OPEN_GATE + dw_const CinnabarGymBlainePostBattleScript, SCRIPT_CINNABARGYM_BLAINE_POST_BATTLE -CinnabarGymScript0: +CinnabarGymDefaultScript: ld a, [wOpponentAfterWrongAnswer] and a ret z ldh [hSpriteIndex], a - cp $4 - jr nz, .asm_757c3 + cp CINNABARGYM_SUPER_NERD3 + jr nz, .not_super_nerd3 ld a, PLAYER_DIR_DOWN ld [wPlayerMovingDirection], a ld de, MovementNpcToLeftAndUp jr .MoveSprite -.asm_757c3 +.not_super_nerd3 ld de, MovementNpcToLeft ld a, PLAYER_DIR_RIGHT ld [wPlayerMovingDirection], a .MoveSprite call MoveSprite - ld a, $1 + ld a, SCRIPT_CINNABARGYM_GET_OPPONENT_TEXT ld [wCinnabarGymCurScript], a ld [wCurMapScript], a ret @@ -79,7 +80,7 @@ MovementNpcToLeft: db NPC_MOVEMENT_LEFT db -1 ; end -CinnabarGymScript1: +CinnabarGymGetOpponentTextScript: ld a, [wd730] bit 0, a ret nz @@ -93,7 +94,7 @@ CinnabarGymScript1: CinnabarGymFlagAction: predef_jump FlagActionPredef -CinnabarGymScript2: +CinnabarGymOpenGateScript: ld a, [wIsInBattle] cp $ff jp z, CinnabarGymResetScripts @@ -130,33 +131,33 @@ CinnabarGymScript2: xor a ld [wJoyIgnore], a ld [wOpponentAfterWrongAnswer], a - ld a, $0 + ld a, SCRIPT_CINNABARGYM_DEFAULT ld [wCinnabarGymCurScript], a ld [wCurMapScript], a ret -CinnabarGymBlainePostBattle: +CinnabarGymBlainePostBattleScript: ld a, [wIsInBattle] cp $ff jp z, CinnabarGymResetScripts - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ; fallthrough CinnabarGymReceiveTM38: - ld a, $a + ld a, TEXT_CINNABARGYM_BLAINE_VOLCANO_BADGE_INFO ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_BLAINE lb bc, TM_FIRE_BLAST, 1 call GiveItem jr nc, .BagFull - ld a, $b + ld a, TEXT_CINNABARGYM_BLAINE_RECEIVED_TM38 ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM38 jr .gymVictory .BagFull - ld a, $c + ld a, TEXT_CINNABARGYM_BLAINE_TM38_NO_ROOM ldh [hSpriteIndexOrTextID], a call DisplayTextID .gymVictory @@ -174,20 +175,21 @@ CinnabarGymReceiveTM38: jp CinnabarGymResetScripts CinnabarGym_TextPointers: - dw BlaineText - dw CinnabarGymTrainerText1 - dw CinnabarGymTrainerText2 - dw CinnabarGymTrainerText3 - dw CinnabarGymTrainerText4 - dw CinnabarGymTrainerText5 - dw CinnabarGymTrainerText6 - dw CinnabarGymTrainerText7 - dw CinnabarGymGuideText - dw BlaineVolcanoBadgeInfoText - dw ReceivedTM38Text - dw TM38NoRoomText - -CinnabarGymScript_758b7: + def_text_pointers + dw_const CinnabarGymBlaineText, TEXT_CINNABARGYM_BLAINE + dw_const CinnabarGymSuperNerd1, TEXT_CINNABARGYM_SUPER_NERD1 + dw_const CinnabarGymSuperNerd2, TEXT_CINNABARGYM_SUPER_NERD2 + dw_const CinnabarGymSuperNerd3, TEXT_CINNABARGYM_SUPER_NERD3 + dw_const CinnabarGymSuperNerd4, TEXT_CINNABARGYM_SUPER_NERD4 + dw_const CinnabarGymSuperNerd5, TEXT_CINNABARGYM_SUPER_NERD5 + dw_const CinnabarGymSuperNerd6, TEXT_CINNABARGYM_SUPER_NERD6 + dw_const CinnabarGymSuperNerd7, TEXT_CINNABARGYM_SUPER_NERD7 + dw_const CinnabarGymGymGuideText, TEXT_CINNABARGYM_GYM_GUIDE + dw_const CinnabarGymBlaineVolcanoBadgeInfoText, TEXT_CINNABARGYM_BLAINE_VOLCANO_BADGE_INFO + dw_const CinnabarGymBlaineReceivedTM38Text, TEXT_CINNABARGYM_BLAINE_RECEIVED_TM38 + dw_const CinnabarGymBlaineTM38NoRoomText, TEXT_CINNABARGYM_BLAINE_TM38_NO_ROOM + +CinnabarGymStartBattleScript: ldh a, [hSpriteIndexOrTextID] ld [wSpriteIndex], a call EngageMapTrainer @@ -196,18 +198,18 @@ CinnabarGymScript_758b7: set 6, [hl] set 7, [hl] ld a, [wSpriteIndex] - cp $1 - jr z, .asm_758d4 - ld a, $2 - jr .asm_758d6 -.asm_758d4 - ld a, $3 -.asm_758d6 + cp CINNABARGYM_BLAINE + jr z, .blaine + ld a, SCRIPT_CINNABARGYM_OPEN_GATE + jr .not_blaine +.blaine + ld a, SCRIPT_CINNABARGYM_BLAINE_POST_BATTLE +.not_blaine ld [wCinnabarGymCurScript], a ld [wCurMapScript], a jp TextScriptEnd -BlaineText: +CinnabarGymBlaineText: text_asm CheckEvent EVENT_BEAT_BLAINE jr z, .beforeBeat @@ -217,259 +219,259 @@ BlaineText: call DisableWaitingAfterTextDisplay jp TextScriptEnd .afterBeat - ld hl, BlainePostBattleAdviceText + ld hl, .PostBattleAdviceText call PrintText jp TextScriptEnd .beforeBeat - ld hl, BlainePreBattleText + ld hl, .PreBattleText call PrintText - ld hl, ReceivedVolcanoBadgeText - ld de, ReceivedVolcanoBadgeText + ld hl, .ReceivedVolcanoBadgeText + ld de, .ReceivedVolcanoBadgeText call SaveEndBattleTextPointers ld a, $7 ld [wGymLeaderNo], a - jp CinnabarGymScript_758b7 + jp CinnabarGymStartBattleScript -BlainePreBattleText: - text_far _BlainePreBattleText +.PreBattleText: + text_far _CinnabarGymBlainePreBattleText text_end -ReceivedVolcanoBadgeText: - text_far _ReceivedVolcanoBadgeText +.ReceivedVolcanoBadgeText: + text_far _CinnabarGymBlaineReceivedVolcanoBadgeText sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded text_waitbutton text_end -BlainePostBattleAdviceText: - text_far _BlainePostBattleAdviceText +.PostBattleAdviceText: + text_far _CinnabarGymBlainePostBattleAdviceText text_end -BlaineVolcanoBadgeInfoText: - text_far _BlaineVolcanoBadgeInfoText +CinnabarGymBlaineVolcanoBadgeInfoText: + text_far _CinnabarGymBlaineVolcanoBadgeInfoText text_end -ReceivedTM38Text: - text_far _ReceivedTM38Text +CinnabarGymBlaineReceivedTM38Text: + text_far _CinnabarGymBlaineReceivedTM38Text sound_get_item_1 - text_far _TM38ExplanationText + text_far _CinnabarGymBlaineTM38ExplanationText text_end -TM38NoRoomText: - text_far _TM38NoRoomText +CinnabarGymBlaineTM38NoRoomText: + text_far _CinnabarGymBlaineTM38NoRoomText text_end -CinnabarGymTrainerText1: +CinnabarGymSuperNerd1: text_asm call CinnabarGymSetTrainerHeader CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_0 - jr nz, .asm_46bb4 - ld hl, CinnabarGymBattleText2 + jr nz, .defeated + ld hl, .BattleText call PrintText - ld hl, CinnabarGymEndBattleText2 - ld de, CinnabarGymEndBattleText2 + ld hl, .EndBattleText + ld de, .EndBattleText call SaveEndBattleTextPointers - jp CinnabarGymScript_758b7 -.asm_46bb4 - ld hl, CinnabarGymAfterBattleText2 + jp CinnabarGymStartBattleScript +.defeated + ld hl, .AfterBattleText call PrintText jp TextScriptEnd -CinnabarGymBattleText2: - text_far _CinnabarGymBattleText2 +.BattleText: + text_far _CinnabarGymSuperNerd1BattleText text_end -CinnabarGymEndBattleText2: - text_far _CinnabarGymEndBattleText2 +.EndBattleText: + text_far _CinnabarGymSuperNerd1EndBattleText text_end -CinnabarGymAfterBattleText2: - text_far _CinnabarGymAfterBattleText2 +.AfterBattleText: + text_far _CinnabarGymSuperNerd1AfterBattleText text_end -CinnabarGymTrainerText2: +CinnabarGymSuperNerd2: text_asm call CinnabarGymSetTrainerHeader CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_1 - jr nz, .asm_4b406 - ld hl, CinnabarGymBattleText1 + jr nz, .defeated + ld hl, .BattleText call PrintText - ld hl, CinnabarGymEndBattleText1 - ld de, CinnabarGymEndBattleText1 + ld hl, .EndBattleText + ld de, .EndBattleText call SaveEndBattleTextPointers - jp CinnabarGymScript_758b7 -.asm_4b406 - ld hl, CinnabarGymAfterBattleText1 + jp CinnabarGymStartBattleScript +.defeated + ld hl, .AfterBattleText call PrintText jp TextScriptEnd -CinnabarGymBattleText1: - text_far _CinnabarGymBattleText1 +.BattleText: + text_far _CinnabarGymSuperNerd2BattleText text_end -CinnabarGymEndBattleText1: - text_far _CinnabarGymEndBattleText1 +.EndBattleText: + text_far _CinnabarGymSuperNerd2EndBattleText text_end -CinnabarGymAfterBattleText1: - text_far _CinnabarGymAfterBattleText1 +.AfterBattleText: + text_far _CinnabarGymSuperNerd2AfterBattleText text_end -CinnabarGymTrainerText3: +CinnabarGymSuperNerd3: text_asm call CinnabarGymSetTrainerHeader CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_2 - jr nz, .afterBeat - ld hl, CinnabarGymBattleText3 + jr nz, .defeated + ld hl, .BattleText call PrintText - ld hl, CinnabarGymEndBattleText3 - ld de, CinnabarGymEndBattleText3 + ld hl, .EndBattleText + ld de, .EndBattleText call SaveEndBattleTextPointers - jp CinnabarGymScript_758b7 -.afterBeat - ld hl, CinnabarGymAfterBattleText3 + jp CinnabarGymStartBattleScript +.defeated + ld hl, .AfterBattleText call PrintText jp TextScriptEnd -CinnabarGymBattleText3: - text_far _CinnabarGymBattleText3 +.BattleText: + text_far _CinnabarGymSuperNerd3BattleText text_end -CinnabarGymEndBattleText3: - text_far _CinnabarGymEndBattleText3 +.EndBattleText: + text_far _CinnabarGymSuperNerd3EndBattleText text_end -CinnabarGymAfterBattleText3: - text_far _CinnabarGymAfterBattleText3 +.AfterBattleText: + text_far _CinnabarGymSuperNerd3AfterBattleText text_end -CinnabarGymTrainerText4: +CinnabarGymSuperNerd4: text_asm call CinnabarGymSetTrainerHeader CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_3 - jr nz, .afterBeat - ld hl, CinnabarGymBattleText4 + jr nz, .defeated + ld hl, .BattleText call PrintText - ld hl, CinnabarGymEndBattleText4 - ld de, CinnabarGymEndBattleText4 + ld hl, .EndBattleText + ld de, .EndBattleText call SaveEndBattleTextPointers - jp CinnabarGymScript_758b7 -.afterBeat - ld hl, CinnabarGymAfterBattleText4 + jp CinnabarGymStartBattleScript +.defeated + ld hl, .AfterBattleText call PrintText jp TextScriptEnd -CinnabarGymBattleText4: - text_far _CinnabarGymBattleText4 +.BattleText: + text_far _CinnabarGymSuperNerd4BattleText text_end -CinnabarGymEndBattleText4: - text_far _CinnabarGymEndBattleText4 +.EndBattleText: + text_far _CinnabarGymSuperNerd4EndBattleText text_end -CinnabarGymAfterBattleText4: - text_far _CinnabarGymAfterBattleText4 +.AfterBattleText: + text_far _CinnabarGymSuperNerd4AfterBattleText text_end -CinnabarGymTrainerText5: +CinnabarGymSuperNerd5: text_asm call CinnabarGymSetTrainerHeader CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_4 - jr nz, .afterBeat - ld hl, CinnabarGymBattleText5 + jr nz, .defeated + ld hl, .BattleText call PrintText - ld hl, CinnabarGymEndBattleText5 - ld de, CinnabarGymEndBattleText5 + ld hl, .EndBattleText + ld de, .EndBattleText call SaveEndBattleTextPointers - jp CinnabarGymScript_758b7 -.afterBeat - ld hl, CinnabarGymAfterBattleText5 + jp CinnabarGymStartBattleScript +.defeated + ld hl, .AfterBattleText call PrintText jp TextScriptEnd -CinnabarGymBattleText5: - text_far _CinnabarGymBattleText5 +.BattleText: + text_far _CinnabarGymSuperNerd5BattleText text_end -CinnabarGymEndBattleText5: - text_far _CinnabarGymEndBattleText5 +.EndBattleText: + text_far _CinnabarGymSuperNerd5EndBattleText text_end -CinnabarGymAfterBattleText5: - text_far _CinnabarGymAfterBattleText5 +.AfterBattleText: + text_far _CinnabarGymSuperNerd5AfterBattleText text_end -CinnabarGymTrainerText6: +CinnabarGymSuperNerd6: text_asm call CinnabarGymSetTrainerHeader CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_5 - jr nz, .afterBeat - ld hl, CinnabarGymBattleText6 + jr nz, .defeated + ld hl, .BattleText call PrintText - ld hl, CinnabarGymEndBattleText6 - ld de, CinnabarGymEndBattleText6 + ld hl, .EndBattleText + ld de, .EndBattleText call SaveEndBattleTextPointers - jp CinnabarGymScript_758b7 -.afterBeat - ld hl, CinnabarGymAfterBattleText6 + jp CinnabarGymStartBattleScript +.defeated + ld hl, .AfterBattleText call PrintText jp TextScriptEnd -CinnabarGymBattleText6: - text_far _CinnabarGymBattleText6 +.BattleText: + text_far _CinnabarGymSuperNerd6BattleText text_end -CinnabarGymEndBattleText6: - text_far _CinnabarGymEndBattleText6 +.EndBattleText: + text_far _CinnabarGymSuperNerd6EndBattleText text_end -CinnabarGymAfterBattleText6: - text_far _CinnabarGymAfterBattleText6 +.AfterBattleText: + text_far _CinnabarGymSuperNerd6AfterBattleText text_end -CinnabarGymTrainerText7: +CinnabarGymSuperNerd7: text_asm call CinnabarGymSetTrainerHeader CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_6 - jr nz, .afterBeat - ld hl, CinnabarGymBattleText7 + jr nz, .defeated + ld hl, .BattleText call PrintText - ld hl, CinnabarGymEndBattleText7 - ld de, CinnabarGymEndBattleText7 + ld hl, .EndBattleText + ld de, .EndBattleText call SaveEndBattleTextPointers - jp CinnabarGymScript_758b7 -.afterBeat - ld hl, CinnabarGymAfterBattleText7 + jp CinnabarGymStartBattleScript +.defeated + ld hl, .AfterBattleText call PrintText jp TextScriptEnd -CinnabarGymBattleText7: - text_far _CinnabarGymBattleText7 +.BattleText: + text_far _CinnabarGymSuperNerd7BattleText text_end -CinnabarGymEndBattleText7: - text_far _CinnabarGymEndBattleText7 +.EndBattleText: + text_far _CinnabarGymSuperNerd7EndBattleText text_end -CinnabarGymAfterBattleText7: - text_far _CinnabarGymAfterBattleText7 +.AfterBattleText: + text_far _CinnabarGymSuperNerd7AfterBattleText text_end -CinnabarGymGuideText: +CinnabarGymGymGuideText: text_asm CheckEvent EVENT_BEAT_BLAINE jr nz, .afterBeat - ld hl, CinnabarGymGuidePreBattleText + ld hl, .ChampInMakingText jr .done .afterBeat - ld hl, CinnabarGymGuidePostBattleText + ld hl, .BeatBlaineText .done call PrintText jp TextScriptEnd -CinnabarGymGuidePreBattleText: - text_far _CinnabarGymGuidePreBattleText +.ChampInMakingText: + text_far _CinnabarGymGymGuideChampInMakingText text_end -CinnabarGymGuidePostBattleText: - text_far _CinnabarGymGuidePostBattleText +.BeatBlaineText: + text_far _CinnabarGymGymGuideBeatBlaineText text_end diff --git a/scripts/CinnabarIsland.asm b/scripts/CinnabarIsland.asm index a1b20cd39..aca1b995c 100644 --- a/scripts/CinnabarIsland.asm +++ b/scripts/CinnabarIsland.asm @@ -9,10 +9,11 @@ CinnabarIsland_Script: jp CallFunctionInTable CinnabarIsland_ScriptPointers: - dw CinnabarIslandScript0 - dw CinnabarIslandScript1 + def_script_pointers + dw_const CinnabarIslandDefaultScript, SCRIPT_CINNABARISLAND_DEFAULT + dw_const CinnabarIslandPlayerMovingScript, SCRIPT_CINNABARISLAND_PLAYER_MOVING -CinnabarIslandScript0: +CinnabarIslandDefaultScript: ld b, SECRET_KEY call IsItemInBag ret nz @@ -24,7 +25,7 @@ CinnabarIslandScript0: ret nz ld a, PLAYER_DIR_UP ld [wPlayerMovingDirection], a - ld a, $8 + ld a, TEXT_CINNABARISLAND_DOOR_IS_LOCKED ldh [hSpriteIndexOrTextID], a call DisplayTextID xor a @@ -37,49 +38,50 @@ CinnabarIslandScript0: xor a ld [wSpritePlayerStateData1FacingDirection], a ld [wJoyIgnore], a - ld a, $1 + ld a, SCRIPT_CINNABARISLAND_PLAYER_MOVING ld [wCinnabarIslandCurScript], a ret -CinnabarIslandScript1: +CinnabarIslandPlayerMovingScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz call Delay3 - ld a, $0 + ld a, SCRIPT_CINNABARISLAND_DEFAULT ld [wCinnabarIslandCurScript], a ret CinnabarIsland_TextPointers: - dw CinnabarIslandText1 - dw CinnabarIslandText2 - dw CinnabarIslandText3 - dw MartSignText - dw PokeCenterSignText - dw CinnabarIslandText6 - dw CinnabarIslandText7 - dw CinnabarIslandText8 + def_text_pointers + dw_const CinnabarIslandGirlText, TEXT_CINNABARISLAND_GIRL + dw_const CinnabarIslandGamblerText, TEXT_CINNABARISLAND_GAMBLER + dw_const CinnabarIslandSignText, TEXT_CINNABARISLAND_SIGN + dw_const MartSignText, TEXT_CINNABARISLAND_MART_SIGN + dw_const PokeCenterSignText, TEXT_CINNABARISLAND_POKECENTER_SIGN + dw_const CinnabarIslandPokemonLabSignText, TEXT_CINNABARISLAND_POKEMONLAB_SIGN + dw_const CinnabarIslandGymSignText, TEXT_CINNABARISLAND_GYM_SIGN + dw_const CinnabarIslandDoorIsLockedText, TEXT_CINNABARISLAND_DOOR_IS_LOCKED -CinnabarIslandText8: - text_far _CinnabarIslandText8 +CinnabarIslandDoorIsLockedText: + text_far _CinnabarIslandDoorIsLockedText text_end -CinnabarIslandText1: - text_far _CinnabarIslandText1 +CinnabarIslandGirlText: + text_far _CinnabarIslandGirlText text_end -CinnabarIslandText2: - text_far _CinnabarIslandText2 +CinnabarIslandGamblerText: + text_far _CinnabarIslandGamblerText text_end -CinnabarIslandText3: - text_far _CinnabarIslandText3 +CinnabarIslandSignText: + text_far _CinnabarIslandSignText text_end -CinnabarIslandText6: - text_far _CinnabarIslandText6 +CinnabarIslandPokemonLabSignText: + text_far _CinnabarIslandPokemonLabSignText text_end -CinnabarIslandText7: - text_far _CinnabarIslandText7 +CinnabarIslandGymSignText: + text_far _CinnabarIslandGymSignText text_end diff --git a/scripts/CinnabarLab.asm b/scripts/CinnabarLab.asm index 2f4be7f29..baf9b40a0 100644 --- a/scripts/CinnabarLab.asm +++ b/scripts/CinnabarLab.asm @@ -3,28 +3,29 @@ CinnabarLab_Script: ret CinnabarLab_TextPointers: - dw Lab1Text1 - dw Lab1Text2 - dw Lab1Text3 - dw Lab1Text4 - dw Lab1Text5 + def_text_pointers + dw_const CinnabarLabFishingGuruText, TEXT_CINNABARLAB_FISHING_GURU + dw_const CinnabarLabPhotoText, TEXT_CINNABARLAB_PHOTO + dw_const CinnabarLabMeetingRoomSignText, TEXT_CINNABARLAB_MEETING_ROOM_SIGN + dw_const CinnabarLabRAndDSignText, TEXT_CINNABARLAB_R_AND_D_SIGN + dw_const CinnabarLabTestingRoomSignText, TEXT_CINNABARLAB_TESTING_ROOM_SIGN -Lab1Text1: - text_far _Lab1Text1 +CinnabarLabFishingGuruText: + text_far _CinnabarLabFishingGuruText text_end -Lab1Text2: - text_far _Lab1Text2 +CinnabarLabPhotoText: + text_far _CinnabarLabPhotoText text_end -Lab1Text3: - text_far _Lab1Text3 +CinnabarLabMeetingRoomSignText: + text_far _CinnabarLabMeetingRoomSignText text_end -Lab1Text4: - text_far _Lab1Text4 +CinnabarLabRAndDSignText: + text_far _CinnabarLabRAndDSignText text_end -Lab1Text5: - text_far _Lab1Text5 +CinnabarLabTestingRoomSignText: + text_far _CinnabarLabTestingRoomSignText text_end diff --git a/scripts/CinnabarLabFossilRoom.asm b/scripts/CinnabarLabFossilRoom.asm index 2c388119b..4a2ff51fa 100644 --- a/scripts/CinnabarLabFossilRoom.asm +++ b/scripts/CinnabarLabFossilRoom.asm @@ -2,8 +2,9 @@ CinnabarLabFossilRoom_Script: jp EnableAutoTextBoxDrawing CinnabarLabFossilRoom_TextPointers: - dw Lab4Text1 - dw Lab4Text2 + def_text_pointers + dw_const CinnabarLabFossilRoomScientist1Text, TEXT_CINNABARLABFOSSILROOM_SCIENTIST1 + dw_const CinnabarLabFossilRoomScientist2Text, TEXT_CINNABARLABFOSSILROOM_SCIENTIST2 Lab4Script_GetFossilsInBag: ; construct a list of all fossils in the player's bag @@ -46,59 +47,59 @@ FossilsList: db OLD_AMBER db 0 ; end -Lab4Text1: +CinnabarLabFossilRoomScientist1Text: text_asm CheckEvent EVENT_GAVE_FOSSIL_TO_LAB - jr nz, .asm_75d96 - ld hl, Lab4Text_75dc6 + jr nz, .check_done_reviving + ld hl, .Text call PrintText call Lab4Script_GetFossilsInBag ld a, [wFilteredBagItemsCount] and a - jr z, .asm_75d8d + jr z, .no_fossils farcall GiveFossilToCinnabarLab - jr .asm_75d93 -.asm_75d8d - ld hl, Lab4Text_75dcb + jr .done +.no_fossils + ld hl, .NoFossilsText call PrintText -.asm_75d93 +.done jp TextScriptEnd -.asm_75d96 +.check_done_reviving CheckEventAfterBranchReuseA EVENT_LAB_STILL_REVIVING_FOSSIL, EVENT_GAVE_FOSSIL_TO_LAB - jr z, .asm_75da2 - ld hl, Lab4Text_75dd0 + jr z, .done_reviving + ld hl, .GoForAWalkText call PrintText - jr .asm_75d93 -.asm_75da2 + jr .done +.done_reviving call LoadFossilItemAndMonNameBank1D - ld hl, Lab4Text_75dd5 + ld hl, .FossilIsBackToLifeText call PrintText SetEvent EVENT_LAB_HANDING_OVER_FOSSIL_MON ld a, [wFossilMon] ld b, a ld c, 30 call GivePokemon - jr nc, .asm_75d93 + jr nc, .done ResetEvents EVENT_GAVE_FOSSIL_TO_LAB, EVENT_LAB_STILL_REVIVING_FOSSIL, EVENT_LAB_HANDING_OVER_FOSSIL_MON - jr .asm_75d93 + jr .done -Lab4Text_75dc6: - text_far _Lab4Text_75dc6 +.Text: + text_far _CinnabarLabFossilRoomScientist1Text text_end -Lab4Text_75dcb: - text_far _Lab4Text_75dcb +.NoFossilsText: + text_far _CinnabarLabFossilRoomScientist1NoFossilsText text_end -Lab4Text_75dd0: - text_far _Lab4Text_75dd0 +.GoForAWalkText: + text_far _CinnabarLabFossilRoomScientist1GoForAWalkText text_end -Lab4Text_75dd5: - text_far _Lab4Text_75dd5 +.FossilIsBackToLifeText: + text_far _CinnabarLabFossilRoomScientist1FossilIsBackToLifeText text_end -Lab4Text2: +CinnabarLabFossilRoomScientist2Text: text_asm ld a, TRADE_FOR_SAILOR ld [wWhichTrade], a diff --git a/scripts/CinnabarLabMetronomeRoom.asm b/scripts/CinnabarLabMetronomeRoom.asm index b43f98e2d..8375eb395 100644 --- a/scripts/CinnabarLabMetronomeRoom.asm +++ b/scripts/CinnabarLabMetronomeRoom.asm @@ -2,61 +2,61 @@ CinnabarLabMetronomeRoom_Script: jp EnableAutoTextBoxDrawing CinnabarLabMetronomeRoom_TextPointers: - dw Lab3Text1 - dw Lab3Text2 - dw Lab3Text3 - dw Lab3Text4 - dw Lab3Text5 - -Lab3Text1: + def_text_pointers + dw_const CinnabarLabMetronomeRoomScientist1Text, TEXT_CINNABARLABMETRONOMEROOM_SCIENTIST1 + dw_const CinnabarLabMetronomeRoomScientist2Text, TEXT_CINNABARLABMETRONOMEROOM_SCIENTIST2 + dw_const CinnabarLabMetronomeRoomPCText, TEXT_CINNABARLABMETRONOMEROOM_PC_KEYBOARD + dw_const CinnabarLabMetronomeRoomPCText, TEXT_CINNABARLABMETRONOMEROOM_PC_MONITOR + dw_const CinnabarLabMetronomeRoomAmberPipeText, TEXT_CINNABARLABMETRONOMEROOM_AMBER_PIPE + +CinnabarLabMetronomeRoomScientist1Text: text_asm CheckEvent EVENT_GOT_TM35 jr nz, .got_item - ld hl, TM35PreReceiveText + ld hl, .Text call PrintText lb bc, TM_METRONOME, 1 call GiveItem jr nc, .bag_full - ld hl, ReceivedTM35Text + ld hl, .ReceivedTM35Text call PrintText SetEvent EVENT_GOT_TM35 jr .done .bag_full - ld hl, TM35NoRoomText + ld hl, .TM35NoRoomText call PrintText jr .done .got_item - ld hl, TM35ExplanationText + ld hl, .TM35ExplanationText call PrintText .done jp TextScriptEnd -TM35PreReceiveText: - text_far _TM35PreReceiveText +.Text: + text_far _CinnabarLabMetronomeRoomScientist1Text text_end -ReceivedTM35Text: - text_far _ReceivedTM35Text +.ReceivedTM35Text: + text_far _CinnabarLabMetronomeRoomScientist1ReceivedTM35Text sound_get_item_1 text_end -TM35ExplanationText: - text_far _TM35ExplanationText +.TM35ExplanationText: + text_far _CinnabarLabMetronomeRoomScientist1TM35ExplanationText text_end -TM35NoRoomText: - text_far _TM35NoRoomText +.TM35NoRoomText: + text_far _CinnabarLabMetronomeRoomScientist1TM35NoRoomText text_end -Lab3Text2: - text_far _Lab3Text2 +CinnabarLabMetronomeRoomScientist2Text: + text_far _CinnabarLabMetronomeRoomScientist2Text text_end -Lab3Text4: -Lab3Text3: - text_far _Lab3Text3 +CinnabarLabMetronomeRoomPCText: + text_far _CinnabarLabMetronomeRoomPCText text_end -Lab3Text5: - text_far _Lab3Text5 +CinnabarLabMetronomeRoomAmberPipeText: + text_far _CinnabarLabMetronomeRoomAmberPipeText text_end diff --git a/scripts/CinnabarLabTradeRoom.asm b/scripts/CinnabarLabTradeRoom.asm index 1f8710bea..ad40f2fe4 100644 --- a/scripts/CinnabarLabTradeRoom.asm +++ b/scripts/CinnabarLabTradeRoom.asm @@ -2,24 +2,25 @@ CinnabarLabTradeRoom_Script: jp EnableAutoTextBoxDrawing CinnabarLabTradeRoom_TextPointers: - dw Lab2Text1 - dw Lab2Text2 - dw Lab2Text3 + def_text_pointers + dw_const CinnabarLabTradeRoomSuperNerdText, TEXT_CINNABARLABTRADEROOM_SUPER_NERD + dw_const CinnabarLabTradeRoomGrampsText, TEXT_CINNABARLABTRADEROOM_GRAMPS + dw_const CinnabarLabTradeRoomBeautyText, TEXT_CINNABARLABTRADEROOM_BEAUTY -Lab2Text1: - text_far _Lab2Text1 +CinnabarLabTradeRoomSuperNerdText: + text_far _CinnabarLabTradeRoomSuperNerdText text_end -Lab2Text2: +CinnabarLabTradeRoomGrampsText: text_asm ld a, TRADE_FOR_DORIS ld [wWhichTrade], a - jr Lab2DoTrade + jr CinnabarLabTradeRoomDoTrade -Lab2Text3: +CinnabarLabTradeRoomBeautyText: text_asm ld a, TRADE_FOR_CRINKLES ld [wWhichTrade], a -Lab2DoTrade: +CinnabarLabTradeRoomDoTrade: predef DoInGameTradeDialogue jp TextScriptEnd diff --git a/scripts/CinnabarMart.asm b/scripts/CinnabarMart.asm index e614bd294..29b8b7ae0 100644 --- a/scripts/CinnabarMart.asm +++ b/scripts/CinnabarMart.asm @@ -2,14 +2,15 @@ CinnabarMart_Script: jp EnableAutoTextBoxDrawing CinnabarMart_TextPointers: - dw CinnabarCashierText - dw CinnabarMartText2 - dw CinnabarMartText3 + def_text_pointers + dw_const CinnabarMartClerkText, TEXT_CINNABARMART_CLERK + dw_const CinnabarMartSilphWorkerFText, TEXT_CINNABARMART_SILPH_WORKER_F + dw_const CinnabarMartScientistText, TEXT_CINNABARMART_SCIENTIST -CinnabarMartText2: - text_far _CinnabarMartText2 +CinnabarMartSilphWorkerFText: + text_far _CinnabarMartSilphWorkerFText text_end -CinnabarMartText3: - text_far _CinnabarMartText3 +CinnabarMartScientistText: + text_far _CinnabarMartScientistText text_end diff --git a/scripts/CinnabarPokecenter.asm b/scripts/CinnabarPokecenter.asm index 9396f8517..736d4a8c2 100644 --- a/scripts/CinnabarPokecenter.asm +++ b/scripts/CinnabarPokecenter.asm @@ -3,21 +3,22 @@ CinnabarPokecenter_Script: jp EnableAutoTextBoxDrawing CinnabarPokecenter_TextPointers: - dw CinnabarHealNurseText - dw CinnabarPokecenterText2 - dw CinnabarPokecenterText3 - dw CinnabarTradeNurseText + def_text_pointers + dw_const CinnabarPokecenterNurseText, TEXT_CINNABARPOKECENTER_NURSE + dw_const CinnabarPokecenterCooltrainerFText, TEXT_CINNABARPOKECENTER_COOLTRAINER_F + dw_const CinnabarPokecenterGentlemanText, TEXT_CINNABARPOKECENTER_GENTLEMAN + dw_const CinnabarPokecenterLinkReceptionistText, TEXT_CINNABARPOKECENTER_LINK_RECEPTIONIST -CinnabarHealNurseText: +CinnabarPokecenterNurseText: script_pokecenter_nurse -CinnabarPokecenterText2: - text_far _CinnabarPokecenterText2 +CinnabarPokecenterCooltrainerFText: + text_far _CinnabarPokecenterCooltrainerFText text_end -CinnabarPokecenterText3: - text_far _CinnabarPokecenterText3 +CinnabarPokecenterGentlemanText: + text_far _CinnabarPokecenterGentlemanText text_end -CinnabarTradeNurseText: +CinnabarPokecenterLinkReceptionistText: script_cable_club_receptionist diff --git a/scripts/Colosseum.asm b/scripts/Colosseum.asm index 83d41bdcb..4aaa42367 100644 --- a/scripts/Colosseum.asm +++ b/scripts/Colosseum.asm @@ -2,8 +2,9 @@ Colosseum_Script: jp TradeCenter_Script Colosseum_TextPointers: - dw ColosseumText1 + def_text_pointers + dw_const ColosseumOpponentText, TEXT_COLOSSEUM_OPPONENT -ColosseumText1: - text_far _ColosseumText1 +ColosseumOpponentText: + text_far _ColosseumOpponentText text_end diff --git a/scripts/CopycatsHouse1F.asm b/scripts/CopycatsHouse1F.asm index fc5ff3cf3..b321c49b3 100644 --- a/scripts/CopycatsHouse1F.asm +++ b/scripts/CopycatsHouse1F.asm @@ -2,20 +2,21 @@ CopycatsHouse1F_Script: jp EnableAutoTextBoxDrawing CopycatsHouse1F_TextPointers: - dw CopycatsHouse1FText1 - dw CopycatsHouse1FText2 - dw CopycatsHouse1FText3 + def_text_pointers + dw_const CopycatsHouse1FMiddleAgedWomanText, TEXT_COPYCATSHOUSE1F_MIDDLE_AGED_WOMAN + dw_const CopycatsHouse1FMiddleAgedManText, TEXT_COPYCATSHOUSE1F_MIDDLE_AGED_MAN + dw_const CopycatsHouse1FChanseyText, TEXT_COPYCATSHOUSE1F_CHANSEY -CopycatsHouse1FText1: - text_far _CopycatsHouse1FText1 +CopycatsHouse1FMiddleAgedWomanText: + text_far _CopycatsHouse1FMiddleAgedWomanText text_end -CopycatsHouse1FText2: - text_far _CopycatsHouse1FText2 +CopycatsHouse1FMiddleAgedManText: + text_far _CopycatsHouse1FMiddleAgedManText text_end -CopycatsHouse1FText3: - text_far _CopycatsHouse1FText3 +CopycatsHouse1FChanseyText: + text_far _CopycatsHouse1FChanseyText text_asm ld a, CHANSEY call PlayCry diff --git a/scripts/CopycatsHouse2F.asm b/scripts/CopycatsHouse2F.asm index ef0742abd..85da9a635 100644 --- a/scripts/CopycatsHouse2F.asm +++ b/scripts/CopycatsHouse2F.asm @@ -2,31 +2,32 @@ CopycatsHouse2F_Script: jp EnableAutoTextBoxDrawing CopycatsHouse2F_TextPointers: - dw CopycatsHouse2FText1 - dw CopycatsHouse2FText2 - dw CopycatsHouse2FText3 - dw CopycatsHouse2FText4 - dw CopycatsHouse2FText5 - dw CopycatsHouse2FText6 - dw CopycatsHouse2FText7 + def_text_pointers + dw_const CopycatsHouse2FCopycatText, TEXT_COPYCATSHOUSE2F_COPYCAT + dw_const CopycatsHouse2FDoduoText, TEXT_COPYCATSHOUSE2F_DODUO + dw_const CopycatsHouse2FRareDollText, TEXT_COPYCATSHOUSE2F_MONSTER + dw_const CopycatsHouse2FRareDollText, TEXT_COPYCATSHOUSE2F_BIRD + dw_const CopycatsHouse2FRareDollText, TEXT_COPYCATSHOUSE2F_FAIRY + dw_const CopycatsHouse2FSNESText, TEXT_COPYCATSHOUSE2F_SNES + dw_const CopycatsHouse2FPCText, TEXT_COPYCATSHOUSE2F_PC -CopycatsHouse2FText1: +CopycatsHouse2FCopycatText: text_asm CheckEvent EVENT_GOT_TM31 jr nz, .got_item ld a, TRUE ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, CopycatsHouse2FText_5ccd4 + ld hl, .DoYouLikePokemonText call PrintText ld b, POKE_DOLL call IsItemInBag jr z, .done - ld hl, TM31PreReceiveText + ld hl, .TM31PreReceiveText call PrintText lb bc, TM_MIMIC, 1 call GiveItem jr nc, .bag_full - ld hl, ReceivedTM31Text + ld hl, .ReceivedTM31Text call PrintText ld a, POKE_DOLL ldh [hItemToRemoveID], a @@ -34,69 +35,67 @@ CopycatsHouse2FText1: SetEvent EVENT_GOT_TM31 jr .done .bag_full - ld hl, TM31NoRoomText + ld hl, .TM31NoRoomText call PrintText jr .done .got_item - ld hl, TM31ExplanationText2 + ld hl, .TM31Explanation2Text call PrintText .done jp TextScriptEnd -CopycatsHouse2FText_5ccd4: - text_far _CopycatsHouse2FText_5ccd4 +.DoYouLikePokemonText: + text_far _CopycatsHouse2FCopycatDoYouLikePokemonText text_end -TM31PreReceiveText: - text_far _TM31PreReceiveText +.TM31PreReceiveText: + text_far _CopycatsHouse2FCopycatTM31PreReceiveText text_end -ReceivedTM31Text: - text_far _ReceivedTM31Text +.ReceivedTM31Text: + text_far _CopycatsHouse2FCopycatReceivedTM31Text sound_get_item_1 -TM31ExplanationText1: - text_far _TM31ExplanationText1 +.TM31Explanation1Text: + text_far _CopycatsHouse2FCopycatTM31Explanation1Text text_waitbutton text_end -TM31ExplanationText2: - text_far _TM31ExplanationText2 +.TM31Explanation2Text: + text_far _CopycatsHouse2FCopycatTM31Explanation2Text text_end -TM31NoRoomText: - text_far _TM31NoRoomText +.TM31NoRoomText: + text_far _CopycatsHouse2FCopycatTM31NoRoomText text_waitbutton text_end -CopycatsHouse2FText2: - text_far _CopycatsHouse2FText2 +CopycatsHouse2FDoduoText: + text_far _CopycatsHouse2FDoduoText text_end -CopycatsHouse2FText5: -CopycatsHouse2FText4: -CopycatsHouse2FText3: - text_far _CopycatsHouse2FText3 +CopycatsHouse2FRareDollText: + text_far _CopycatsHouse2FRareDollText text_end -CopycatsHouse2FText6: - text_far _CopycatsHouse2FText6 +CopycatsHouse2FSNESText: + text_far _CopycatsHouse2FSNESText text_end -CopycatsHouse2FText7: +CopycatsHouse2FPCText: text_asm ld a, [wSpritePlayerStateData1FacingDirection] cp SPRITE_FACING_UP - ld hl, CopycatsHouse2FText_5cd1c + ld hl, .CantSeeText jr nz, .notUp - ld hl, CopycatsHouse2FText_5cd17 + ld hl, .MySecretsText .notUp call PrintText jp TextScriptEnd -CopycatsHouse2FText_5cd17: - text_far _CopycatsHouse2FText_5cd17 +.MySecretsText: + text_far _CopycatsHouse2FPCMySecretsText text_end -CopycatsHouse2FText_5cd1c: - text_far _CopycatsHouse2FText_5cd1c +.CantSeeText: + text_far _CopycatsHouse2FPCCantSeeText text_end diff --git a/scripts/Daycare.asm b/scripts/Daycare.asm index 481d7e14c..a3e9e286e 100644 --- a/scripts/Daycare.asm +++ b/scripts/Daycare.asm @@ -2,26 +2,27 @@ Daycare_Script: jp EnableAutoTextBoxDrawing Daycare_TextPointers: - dw DayCareMText1 + def_text_pointers + dw_const DaycareGentlemanText, TEXT_DAYCARE_GENTLEMAN -DayCareMText1: +DaycareGentlemanText: text_asm call SaveScreenTilesToBuffer2 ld a, [wDayCareInUse] and a jp nz, .daycareInUse - ld hl, DayCareIntroText + ld hl, .IntroText call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a - ld hl, DayCareComeAgainText + ld hl, .ComeAgainText jp nz, .done ld a, [wPartyCount] dec a - ld hl, DayCareOnlyHaveOneMonText + ld hl, .OnlyHaveOneMonText jp z, .done - ld hl, DayCareWhichMonText + ld hl, .WhichMonText call PrintText xor a ld [wUpdateSpritesEnabled], a @@ -33,17 +34,17 @@ DayCareMText1: call RestoreScreenTilesAndReloadTilePatterns call LoadGBPal pop af - ld hl, DayCareAllRightThenText + ld hl, .AllRightThenText jp c, .done callfar KnowsHMMove - ld hl, DayCareCantAcceptMonWithHMText + ld hl, .CantAcceptMonWithHMText jp c, .done xor a ld [wPartyAndBillsPCSavedMenuItem], a ld a, [wWhichPokemon] ld hl, wPartyMonNicks call GetPartyMonName - ld hl, DayCareWillLookAfterMonText + ld hl, .WillLookAfterMonText call PrintText ld a, 1 ld [wDayCareInUse], a @@ -55,7 +56,7 @@ DayCareMText1: call RemovePokemon ld a, [wcf91] call PlayCry - ld hl, DayCareComeSeeMeInAWhileText + ld hl, .ComeSeeMeInAWhileText jp .done .daycareInUse @@ -89,20 +90,20 @@ DayCareMText1: ld [wDayCareStartLevel], a cp d ld [hl], d - ld hl, DayCareMonNeedsMoreTimeText + ld hl, .MonNeedsMoreTimeText jr z, .next ld a, [wDayCareStartLevel] ld b, a ld a, d sub b ld [wDayCareNumLevelsGrown], a - ld hl, DayCareMonHasGrownText + ld hl, .MonHasGrownText .next call PrintText ld a, [wPartyCount] cp PARTY_LENGTH - ld hl, DayCareNoRoomForMonText + ld hl, .NoRoomForMonText jp z, .leaveMonInDayCare ld de, wDayCareTotalCost xor a @@ -127,13 +128,13 @@ DayCareMText1: pop hl dec b jr nz, .calcPriceLoop - ld hl, DayCareOweMoneyText + ld hl, .OweMoneyText call PrintText ld a, MONEY_BOX ld [wTextBoxID], a call DisplayTextBoxID call YesNoChoice - ld hl, DayCareAllRightThenText + ld hl, .AllRightThenText ld a, [wCurrentMenuItem] and a jp nz, .leaveMonInDayCare @@ -145,7 +146,7 @@ DayCareMText1: ldh [hMoney + 2], a call HasEnoughMoney jr nc, .enoughMoney - ld hl, DayCareNotEnoughMoneyText + ld hl, .NotEnoughMoneyText jp .leaveMonInDayCare .enoughMoney @@ -162,7 +163,7 @@ DayCareMText1: ld a, MONEY_BOX ld [wTextBoxID], a call DisplayTextBoxID - ld hl, DayCareHeresYourMonText + ld hl, .HeresYourMonText call PrintText ld a, DAYCARE_TO_PARTY ld [wMoveMonType], a @@ -199,7 +200,7 @@ DayCareMText1: ld a, [wcf91] call PlayCry - ld hl, DayCareGotMonBackText + ld hl, .GotMonBackText jr .done .leaveMonInDayCare @@ -210,60 +211,60 @@ DayCareMText1: call PrintText jp TextScriptEnd -DayCareIntroText: - text_far _DayCareIntroText +.IntroText: + text_far _DaycareGentlemanIntroText text_end -DayCareWhichMonText: - text_far _DayCareWhichMonText +.WhichMonText: + text_far _DaycareGentlemanWhichMonText text_end -DayCareWillLookAfterMonText: - text_far _DayCareWillLookAfterMonText +.WillLookAfterMonText: + text_far _DaycareGentlemanWillLookAfterMonText text_end -DayCareComeSeeMeInAWhileText: - text_far _DayCareComeSeeMeInAWhileText +.ComeSeeMeInAWhileText: + text_far _DaycareGentlemanComeSeeMeInAWhileText text_end -DayCareMonHasGrownText: - text_far _DayCareMonHasGrownText +.MonHasGrownText: + text_far _DaycareGentlemanMonHasGrownText text_end -DayCareOweMoneyText: - text_far _DayCareOweMoneyText +.OweMoneyText: + text_far _DaycareGentlemanOweMoneyText text_end -DayCareGotMonBackText: - text_far _DayCareGotMonBackText +.GotMonBackText: + text_far _DaycareGentlemanGotMonBackText text_end -DayCareMonNeedsMoreTimeText: - text_far _DayCareMonNeedsMoreTimeText +.MonNeedsMoreTimeText: + text_far _DaycareGentlemanMonNeedsMoreTimeText text_end -DayCareAllRightThenText: - text_far _DayCareAllRightThenText -DayCareComeAgainText: - text_far _DayCareComeAgainText +.AllRightThenText: + text_far _DaycareGentlemanAllRightThenText +.ComeAgainText: + text_far _DaycareGentlemanComeAgainText text_end -DayCareNoRoomForMonText: - text_far _DayCareNoRoomForMonText +.NoRoomForMonText: + text_far _DaycareGentlemanNoRoomForMonText text_end -DayCareOnlyHaveOneMonText: - text_far _DayCareOnlyHaveOneMonText +.OnlyHaveOneMonText: + text_far _DaycareGentlemanOnlyHaveOneMonText text_end -DayCareCantAcceptMonWithHMText: - text_far _DayCareCantAcceptMonWithHMText +.CantAcceptMonWithHMText: + text_far _DaycareGentlemanCantAcceptMonWithHMText text_end -DayCareHeresYourMonText: - text_far _DayCareHeresYourMonText +.HeresYourMonText: + text_far _DaycareGentlemanHeresYourMonText text_end -DayCareNotEnoughMoneyText: - text_far _DayCareNotEnoughMoneyText +.NotEnoughMoneyText: + text_far _DaycareGentlemanNotEnoughMoneyText text_end diff --git a/scripts/DiglettsCave.asm b/scripts/DiglettsCave.asm index f9f2e590c..96a607918 100644 --- a/scripts/DiglettsCave.asm +++ b/scripts/DiglettsCave.asm @@ -2,5 +2,6 @@ DiglettsCave_Script: jp EnableAutoTextBoxDrawing DiglettsCave_TextPointers: + def_text_pointers text_end ; unused diff --git a/scripts/DiglettsCaveRoute11.asm b/scripts/DiglettsCaveRoute11.asm index 648fe2bc0..826d64b2b 100644 --- a/scripts/DiglettsCaveRoute11.asm +++ b/scripts/DiglettsCaveRoute11.asm @@ -5,8 +5,9 @@ DiglettsCaveRoute11_Script: ret DiglettsCaveRoute11_TextPointers: - dw DiglettsCaveEntranceRoute11Text1 + def_text_pointers + dw_const DiglettsCaveRoute11GamblerText, TEXT_DIGLETTSCAVEROUTE11_GAMBLER -DiglettsCaveEntranceRoute11Text1: - text_far _DiglettsCaveEntRoute11Text1 +DiglettsCaveRoute11GamblerText: + text_far _DiglettsCaveRoute11GamblerText text_end diff --git a/scripts/DiglettsCaveRoute2.asm b/scripts/DiglettsCaveRoute2.asm index 32f17d659..46b294528 100644 --- a/scripts/DiglettsCaveRoute2.asm +++ b/scripts/DiglettsCaveRoute2.asm @@ -4,8 +4,9 @@ DiglettsCaveRoute2_Script: jp EnableAutoTextBoxDrawing DiglettsCaveRoute2_TextPointers: - dw DiglettsCaveRoute2Text1 + def_text_pointers + dw_const DiglettsCaveRoute2FishingGuruText, TEXT_DIGLETTSCAVEROUTE2_FISHING_GURU -DiglettsCaveRoute2Text1: - text_far _DiglettsCaveRoute2Text1 +DiglettsCaveRoute2FishingGuruText: + text_far _DiglettsCaveRoute2FishingGuruText text_end diff --git a/scripts/FightingDojo.asm b/scripts/FightingDojo.asm index fc9f68ea2..fb9847d1d 100644 --- a/scripts/FightingDojo.asm +++ b/scripts/FightingDojo.asm @@ -8,19 +8,20 @@ FightingDojo_Script: ret FightingDojoScript_5cd70: - xor a + xor a ; SCRIPT_FIGHTINGDOJO_DEFAULT ld [wJoyIgnore], a ld [wFightingDojoCurScript], a ld [wCurMapScript], a ret FightingDojo_ScriptPointers: - dw FightingDojoScript1 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw FightingDojoScript3 + def_script_pointers + dw_const FightingDojoDefaultScript, SCRIPT_FIGHTINGDOJO_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_FIGHTINGDOJO_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_FIGHTINGDOJO_END_BATTLE + dw_const FightingDojoKarateMasterPostBattleScript, SCRIPT_FIGHTINGDOJO_KARATE_MASTER_POST_BATTLE -FightingDojoScript1: +FightingDojoDefaultScript: CheckEvent EVENT_DEFEATED_FIGHTING_DOJO ret nz call CheckFightingMapTrainers @@ -42,17 +43,17 @@ FightingDojoScript1: ld [wcf0d], a ld a, PLAYER_DIR_RIGHT ld [wPlayerMovingDirection], a - ld a, $1 + ld a, FIGHTINGDOJO_KARATE_MASTER ldh [hSpriteIndex], a ld a, SPRITE_FACING_LEFT ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay - ld a, $1 + ld a, TEXT_FIGHTINGDOJO_KARATE_MASTER ldh [hSpriteIndexOrTextID], a call DisplayTextID ret -FightingDojoScript3: +FightingDojoKarateMasterPostBattleScript: ld a, [wIsInBattle] cp $ff jp z, FightingDojoScript_5cd70 @@ -61,179 +62,179 @@ FightingDojoScript3: jr z, .asm_5cde4 ld a, PLAYER_DIR_RIGHT ld [wPlayerMovingDirection], a - ld a, $1 + ld a, FIGHTINGDOJO_KARATE_MASTER ldh [hSpriteIndex], a ld a, SPRITE_FACING_LEFT ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay .asm_5cde4 - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a SetEventRange EVENT_BEAT_KARATE_MASTER, EVENT_BEAT_FIGHTING_DOJO_TRAINER_3 - ld a, $8 + ld a, TEXT_FIGHTINGDOJO_KARATE_MASTER_I_WILL_GIVE_YOU_A_POKEMON ldh [hSpriteIndexOrTextID], a call DisplayTextID - xor a + xor a ; SCRIPT_FIGHTINGDOJO_DEFAULT ld [wJoyIgnore], a ld [wFightingDojoCurScript], a ld [wCurMapScript], a ret FightingDojo_TextPointers: - dw FightingDojoText1 - dw FightingDojoText2 - dw FightingDojoText3 - dw FightingDojoText4 - dw FightingDojoText5 - dw FightingDojoText6 - dw FightingDojoText7 - dw FightingDojoText8 + def_text_pointers + dw_const FightingDojoKarateMasterText, TEXT_FIGHTINGDOJO_KARATE_MASTER + dw_const FightingDojoBlackbelt1Text, TEXT_FIGHTINGDOJO_BLACKBELT1 + dw_const FightingDojoBlackbelt2Text, TEXT_FIGHTINGDOJO_BLACKBELT2 + dw_const FightingDojoBlackbelt3Text, TEXT_FIGHTINGDOJO_BLACKBELT3 + dw_const FightingDojoBlackbelt4Text, TEXT_FIGHTINGDOJO_BLACKBELT4 + dw_const FightingDojoHitmonleePokeBallText, TEXT_FIGHTINGDOJO_HITMONLEE_POKE_BALL + dw_const FightingDojoHitmonchanPokeBallText, TEXT_FIGHTINGDOJO_HITMONCHAN_POKE_BALL + dw_const FightingDojoKarateMasterText.IWillGiveYouAPokemonText, TEXT_FIGHTINGDOJO_KARATE_MASTER_I_WILL_GIVE_YOU_A_POKEMON FightingDojoTrainerHeaders: def_trainers 2 FightingDojoTrainerHeader0: - trainer EVENT_BEAT_FIGHTING_DOJO_TRAINER_0, 4, FightingDojoBattleText1, FightingDojoEndBattleText1, FightingDojoAfterBattleText1 + trainer EVENT_BEAT_FIGHTING_DOJO_TRAINER_0, 4, FightingDojoBlackbelt1BattleText, FightingDojoBlackbelt1EndBattleText, FightingDojoBlackbelt1AfterBattleText FightingDojoTrainerHeader1: - trainer EVENT_BEAT_FIGHTING_DOJO_TRAINER_1, 4, FightingDojoBattleText2, FightingDojoEndBattleText2, FightingDojoAfterBattleText2 + trainer EVENT_BEAT_FIGHTING_DOJO_TRAINER_1, 4, FightingDojoBlackbelt2BattleText, FightingDojoBlackbelt2EndBattleText, FightingDojoBlackbelt2AfterBattleText FightingDojoTrainerHeader2: - trainer EVENT_BEAT_FIGHTING_DOJO_TRAINER_2, 3, FightingDojoBattleText3, FightingDojoEndBattleText3, FightingDojoAfterBattleText3 + trainer EVENT_BEAT_FIGHTING_DOJO_TRAINER_2, 3, FightingDojoBlackbelt3BattleText, FightingDojoBlackbelt3EndBattleText, FightingDojoBlackbelt3AfterBattleText FightingDojoTrainerHeader3: - trainer EVENT_BEAT_FIGHTING_DOJO_TRAINER_3, 3, FightingDojoBattleText4, FightingDojoEndBattleText4, FightingDojoAfterBattleText4 + trainer EVENT_BEAT_FIGHTING_DOJO_TRAINER_3, 3, FightingDojoBlackbelt4BattleText, FightingDojoBlackbelt4EndBattleText, FightingDojoBlackbelt4AfterBattleText db -1 ; end -FightingDojoText1: +FightingDojoKarateMasterText: text_asm CheckEvent EVENT_DEFEATED_FIGHTING_DOJO - jp nz, .continue1 + jp nz, .defeated_dojo CheckEventReuseA EVENT_BEAT_KARATE_MASTER - jp nz, .continue2 - ld hl, FightingDojoText_5ce8e + jp nz, .defeated_master + ld hl, .Text call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, FightingDojoText_5ce93 - ld de, FightingDojoText_5ce93 + ld hl, .DefeatedText + ld de, .DefeatedText call SaveEndBattleTextPointers ldh a, [hSpriteIndexOrTextID] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters - ld a, $3 + ld a, SCRIPT_FIGHTINGDOJO_KARATE_MASTER_POST_BATTLE ld [wFightingDojoCurScript], a ld [wCurMapScript], a - jr .asm_9dba4 -.continue1 - ld hl, FightingDojoText_5ce9d + jr .end +.defeated_dojo + ld hl, .StayAndTrainWithUsText call PrintText - jr .asm_9dba4 -.continue2 - ld hl, FightingDojoText8 + jr .end +.defeated_master + ld hl, .IWillGiveYouAPokemonText call PrintText -.asm_9dba4 +.end jp TextScriptEnd -FightingDojoText_5ce8e: - text_far _FightingDojoText_5ce8e +.Text: + text_far _FightingDojoKarateMasterText text_end -FightingDojoText_5ce93: - text_far _FightingDojoText_5ce93 +.DefeatedText: + text_far _FightingDojoKarateMasterDefeatedText text_end -FightingDojoText8: - text_far _FightingDojoText_5ce98 +.IWillGiveYouAPokemonText: + text_far _FightingDojoKarateMasterIWillGiveYouAPokemonText text_end -FightingDojoText_5ce9d: - text_far _FightingDojoText_5ce9d +.StayAndTrainWithUsText: + text_far _FightingDojoKarateMasterStayAndTrainWithUsText text_end -FightingDojoText2: +FightingDojoBlackbelt1Text: text_asm ld hl, FightingDojoTrainerHeader0 call TalkToTrainer jp TextScriptEnd -FightingDojoBattleText1: - text_far _FightingDojoBattleText1 +FightingDojoBlackbelt1BattleText: + text_far _FightingDojoBlackbelt1BattleText text_end -FightingDojoEndBattleText1: - text_far _FightingDojoEndBattleText1 +FightingDojoBlackbelt1EndBattleText: + text_far _FightingDojoBlackbelt1EndBattleText text_end -FightingDojoAfterBattleText1: - text_far _FightingDojoAfterBattleText1 +FightingDojoBlackbelt1AfterBattleText: + text_far _FightingDojoBlackbelt1AfterBattleText text_end -FightingDojoText3: +FightingDojoBlackbelt2Text: text_asm ld hl, FightingDojoTrainerHeader1 call TalkToTrainer jp TextScriptEnd -FightingDojoBattleText2: - text_far _FightingDojoBattleText2 +FightingDojoBlackbelt2BattleText: + text_far _FightingDojoBlackbelt2BattleText text_end -FightingDojoEndBattleText2: - text_far _FightingDojoEndBattleText2 +FightingDojoBlackbelt2EndBattleText: + text_far _FightingDojoBlackbelt2EndBattleText text_end -FightingDojoAfterBattleText2: - text_far _FightingDojoAfterBattleText2 +FightingDojoBlackbelt2AfterBattleText: + text_far _FightingDojoBlackbelt2AfterBattleText text_end -FightingDojoText4: +FightingDojoBlackbelt3Text: text_asm ld hl, FightingDojoTrainerHeader2 call TalkToTrainer jp TextScriptEnd -FightingDojoBattleText3: - text_far _FightingDojoBattleText3 +FightingDojoBlackbelt3BattleText: + text_far _FightingDojoBlackbelt3BattleText text_end -FightingDojoEndBattleText3: - text_far _FightingDojoEndBattleText3 +FightingDojoBlackbelt3EndBattleText: + text_far _FightingDojoBlackbelt3EndBattleText text_end -FightingDojoAfterBattleText3: - text_far _FightingDojoAfterBattleText3 +FightingDojoBlackbelt3AfterBattleText: + text_far _FightingDojoBlackbelt3AfterBattleText text_end -FightingDojoText5: +FightingDojoBlackbelt4Text: text_asm ld hl, FightingDojoTrainerHeader3 call TalkToTrainer jp TextScriptEnd -FightingDojoBattleText4: - text_far _FightingDojoBattleText4 +FightingDojoBlackbelt4BattleText: + text_far _FightingDojoBlackbelt4BattleText text_end -FightingDojoEndBattleText4: - text_far _FightingDojoEndBattleText4 +FightingDojoBlackbelt4EndBattleText: + text_far _FightingDojoBlackbelt4EndBattleText text_end -FightingDojoAfterBattleText4: - text_far _FightingDojoAfterBattleText4 +FightingDojoBlackbelt4AfterBattleText: + text_far _FightingDojoBlackbelt4AfterBattleText text_end -FightingDojoText6: -; Hitmonlee Poké Ball +FightingDojoHitmonleePokeBallText: text_asm CheckEitherEventSet EVENT_GOT_HITMONLEE, EVENT_GOT_HITMONCHAN jr z, .GetMon - ld hl, OtherHitmonText + ld hl, FightingDojoBetterNotGetGreedyText call PrintText jr .done .GetMon ld a, HITMONLEE call DisplayPokedex - ld hl, WantHitmonleeText + ld hl, .Text call PrintText call YesNoChoice ld a, [wCurrentMenuItem] @@ -253,22 +254,21 @@ FightingDojoText6: .done jp TextScriptEnd -WantHitmonleeText: - text_far _WantHitmonleeText +.Text: + text_far _FightingDojoHitmonleePokeBallText text_end -FightingDojoText7: -; Hitmonchan Poké Ball +FightingDojoHitmonchanPokeBallText: text_asm CheckEitherEventSet EVENT_GOT_HITMONLEE, EVENT_GOT_HITMONCHAN jr z, .GetMon - ld hl, OtherHitmonText + ld hl, FightingDojoBetterNotGetGreedyText call PrintText jr .done .GetMon ld a, HITMONCHAN call DisplayPokedex - ld hl, WantHitmonchanText + ld hl, .Text call PrintText call YesNoChoice ld a, [wCurrentMenuItem] @@ -288,10 +288,10 @@ FightingDojoText7: .done jp TextScriptEnd -WantHitmonchanText: - text_far _WantHitmonchanText +.Text: + text_far _FightingDojoHitmonchanPokeBallText text_end -OtherHitmonText: - text_far _OtherHitmonText +FightingDojoBetterNotGetGreedyText: + text_far _FightingDojoBetterNotGetGreedyText text_end diff --git a/scripts/FuchsiaBillsGrandpasHouse.asm b/scripts/FuchsiaBillsGrandpasHouse.asm index 69ce1cf18..cd9edfae7 100644 --- a/scripts/FuchsiaBillsGrandpasHouse.asm +++ b/scripts/FuchsiaBillsGrandpasHouse.asm @@ -3,18 +3,19 @@ FuchsiaBillsGrandpasHouse_Script: ret FuchsiaBillsGrandpasHouse_TextPointers: - dw FuchsiaHouse1Text1 - dw FuchsiaHouse1Text2 - dw FuchsiaHouse1Text3 + def_text_pointers + dw_const FuchsiaBillsGrandpasHouseMiddleAgedWomanText, TEXT_FUCHSIABILLSGRANDPASHOUSE_MIDDLE_AGED_WOMAN + dw_const FuchsiaBillsGrandpasHouseBillsGrandpaText, TEXT_FUCHSIABILLSGRANDPASHOUSE_BILLS_GRANDPA + dw_const FuchsiaBillsGrandpasHouseYoungsterText, TEXT_FUCHSIABILLSGRANDPASHOUSE_YOUNGSTER -FuchsiaHouse1Text1: - text_far _FuchsiaHouse1Text1 +FuchsiaBillsGrandpasHouseMiddleAgedWomanText: + text_far _FuchsiaBillsGrandpasHouseMiddleAgedWomanText text_end -FuchsiaHouse1Text2: - text_far _FuchsiaHouse1Text2 +FuchsiaBillsGrandpasHouseBillsGrandpaText: + text_far _FuchsiaBillsGrandpasHouseBillsGrandpaText text_end -FuchsiaHouse1Text3: - text_far _FuchsiaHouse1Text3 +FuchsiaBillsGrandpasHouseYoungsterText: + text_far _FuchsiaBillsGrandpasHouseYoungsterText text_end diff --git a/scripts/FuchsiaCity.asm b/scripts/FuchsiaCity.asm index ac9f273bb..8f1f96902 100644 --- a/scripts/FuchsiaCity.asm +++ b/scripts/FuchsiaCity.asm @@ -2,168 +2,163 @@ FuchsiaCity_Script: jp EnableAutoTextBoxDrawing FuchsiaCity_TextPointers: - dw FuchsiaCityText1 - dw FuchsiaCityText2 - dw FuchsiaCityText3 - dw FuchsiaCityText4 - dw FuchsiaCityText5 - dw FuchsiaCityText6 - dw FuchsiaCityText7 - dw FuchsiaCityText8 - dw FuchsiaCityText9 - dw FuchsiaCityText10 - dw FuchsiaCityText11 - dw FuchsiaCityText12 - dw FuchsiaCityText13 - dw MartSignText - dw PokeCenterSignText - dw FuchsiaCityText16 - dw FuchsiaCityText17 - dw FuchsiaCityText18 - dw FuchsiaCityText19 - dw FuchsiaCityText20 - dw FuchsiaCityText21 - dw FuchsiaCityText22 - dw FuchsiaCityText23 - dw FuchsiaCityText24 + def_text_pointers + dw_const FuchsiaCityYoungster1Text, TEXT_FUCHSIACITY_YOUNGSTER1 + dw_const FuchsiaCityGamblerText, TEXT_FUCHSIACITY_GAMBLER + dw_const FuchsiaCityErikText, TEXT_FUCHSIACITY_ERIK + dw_const FuchsiaCityYoungster2Text, TEXT_FUCHSIACITY_YOUNGSTER2 + dw_const FuchsiaCityPokemonText, TEXT_FUCHSIACITY_CHANSEY + dw_const FuchsiaCityPokemonText, TEXT_FUCHSIACITY_VOLTORB + dw_const FuchsiaCityPokemonText, TEXT_FUCHSIACITY_KANGASKHAN + dw_const FuchsiaCityPokemonText, TEXT_FUCHSIACITY_SLOWPOKE + dw_const FuchsiaCityPokemonText, TEXT_FUCHSIACITY_LAPRAS + dw_const FuchsiaCityPokemonText, TEXT_FUCHSIACITY_FOSSIL + dw_const FuchsiaCitySignText, TEXT_FUCHSIACITY_SIGN1 + dw_const FuchsiaCitySignText, TEXT_FUCHSIACITY_SIGN2 + dw_const FuchsiaCitySafariGameSignText, TEXT_FUCHSIACITY_SAFARI_GAME_SIGN + dw_const MartSignText, TEXT_FUCHSIACITY_MART_SIGN + dw_const PokeCenterSignText, TEXT_FUCHSIACITY_POKECENTER_SIGN + dw_const FuchsiaCityWardensHomeSignText, TEXT_FUCHSIACITY_WARDENS_HOME_SIGN + dw_const FuchsiaCitySafariZoneSignText, TEXT_FUCHSIACITY_SAFARI_ZONE_SIGN + dw_const FuchsiaCityGymSignText, TEXT_FUCHSIACITY_GYM_SIGN + dw_const FuchsiaCityChanseySignText, TEXT_FUCHSIACITY_CHANSEY_SIGN + dw_const FuchsiaCityVoltorbSignText, TEXT_FUCHSIACITY_VOLTORB_SIGN + dw_const FuchsiaCityKangaskhanSignText, TEXT_FUCHSIACITY_KANGASKHAN_SIGN + dw_const FuchsiaCitySlowpokeSignText, TEXT_FUCHSIACITY_SLOWPOKE_SIGN + dw_const FuchsiaCityLaprasSignText, TEXT_FUCHSIACITY_LAPRAS_SIGN + dw_const FuchsiaCityFossilSignText, TEXT_FUCHSIACITY_FOSSIL_SIGN -FuchsiaCityText1: - text_far _FuchsiaCityText1 +FuchsiaCityYoungster1Text: + text_far _FuchsiaCityYoungster1Text text_end -FuchsiaCityText2: - text_far _FuchsiaCityText2 +FuchsiaCityGamblerText: + text_far _FuchsiaCityGamblerText text_end -FuchsiaCityText3: - text_far _FuchsiaCityText3 +FuchsiaCityErikText: + text_far _FuchsiaCityErikText text_end -FuchsiaCityText4: - text_far _FuchsiaCityText4 +FuchsiaCityYoungster2Text: + text_far _FuchsiaCityYoungster2Text text_end -FuchsiaCityText5: -FuchsiaCityText6: -FuchsiaCityText7: -FuchsiaCityText8: -FuchsiaCityText9: -FuchsiaCityText10: - text_far _FuchsiaCityText5 +FuchsiaCityPokemonText: + text_far _FuchsiaCityPokemonText text_end -FuchsiaCityText12: -FuchsiaCityText11: - text_far _FuchsiaCityText11 +FuchsiaCitySignText: + text_far _FuchsiaCitySignText text_end -FuchsiaCityText13: - text_far _FuchsiaCityText13 +FuchsiaCitySafariGameSignText: + text_far _FuchsiaCitySafariGameSignText text_end -FuchsiaCityText16: - text_far _FuchsiaCityText16 +FuchsiaCityWardensHomeSignText: + text_far _FuchsiaCityWardensHomeSignText text_end -FuchsiaCityText17: - text_far _FuchsiaCityText17 +FuchsiaCitySafariZoneSignText: + text_far _FuchsiaCitySafariZoneSignText text_end -FuchsiaCityText18: - text_far _FuchsiaCityText18 +FuchsiaCityGymSignText: + text_far _FuchsiaCityGymSignText text_end -FuchsiaCityText19: +FuchsiaCityChanseySignText: text_asm - ld hl, FuchsiaCityChanseyText + ld hl, .Text call PrintText ld a, CHANSEY call DisplayPokedex jp TextScriptEnd -FuchsiaCityChanseyText: - text_far _FuchsiaCityChanseyText +.Text: + text_far _FuchsiaCityChanseySignText text_end -FuchsiaCityText20: +FuchsiaCityVoltorbSignText: text_asm - ld hl, FuchsiaCityVoltorbText + ld hl, .Text call PrintText ld a, VOLTORB call DisplayPokedex jp TextScriptEnd -FuchsiaCityVoltorbText: - text_far _FuchsiaCityVoltorbText +.Text: + text_far _FuchsiaCityVoltorbSignText text_end -FuchsiaCityText21: +FuchsiaCityKangaskhanSignText: text_asm - ld hl, FuchsiaCityKangaskhanText + ld hl, .Text call PrintText ld a, KANGASKHAN call DisplayPokedex jp TextScriptEnd -FuchsiaCityKangaskhanText: - text_far _FuchsiaCityKangaskhanText +.Text: + text_far _FuchsiaCityKangaskhanSignText text_end -FuchsiaCityText22: +FuchsiaCitySlowpokeSignText: text_asm - ld hl, FuchsiaCitySlowpokeText + ld hl, .Text call PrintText ld a, SLOWPOKE call DisplayPokedex jp TextScriptEnd -FuchsiaCitySlowpokeText: - text_far _FuchsiaCitySlowpokeText +.Text: + text_far _FuchsiaCitySlowpokeSignText text_end -FuchsiaCityText23: +FuchsiaCityLaprasSignText: text_asm - ld hl, FuchsiaCityLaprasText + ld hl, .Text call PrintText ld a, LAPRAS call DisplayPokedex jp TextScriptEnd -FuchsiaCityLaprasText: - text_far _FuchsiaCityLaprasText +.Text: + text_far _FuchsiaCityLaprasSignText text_end -FuchsiaCityText24: +FuchsiaCityFossilSignText: text_asm CheckEvent EVENT_GOT_DOME_FOSSIL - jr nz, .asm_3b4e8 + jr nz, .got_dome_fossil CheckEventReuseA EVENT_GOT_HELIX_FOSSIL - jr nz, .asm_667d5 - ld hl, FuchsiaCityText_19b2a + jr nz, .got_helix_fossil + ld hl, .UndeterminedText call PrintText - jr .asm_4343f -.asm_3b4e8 - ld hl, FuchsiaCityOmanyteText + jr .done +.got_dome_fossil + ld hl, .OmanyteText call PrintText ld a, OMANYTE - jr .asm_81556 -.asm_667d5 - ld hl, FuchsiaCityKabutoText + jr .display +.got_helix_fossil + ld hl, .KabutoText call PrintText ld a, KABUTO -.asm_81556 +.display call DisplayPokedex -.asm_4343f +.done jp TextScriptEnd -FuchsiaCityOmanyteText: - text_far _FuchsiaCityOmanyteText +.OmanyteText: + text_far _FuchsiaCityFossilSignOmanyteText text_end -FuchsiaCityKabutoText: - text_far _FuchsiaCityKabutoText +.KabutoText: + text_far _FuchsiaCityFossilSignKabutoText text_end -FuchsiaCityText_19b2a: - text_far _FuchsiaCityText_19b2a +.UndeterminedText: + text_far _FuchsiaCityFossilSignUndeterminedText text_end diff --git a/scripts/FuchsiaGoodRodHouse.asm b/scripts/FuchsiaGoodRodHouse.asm index 28f6d056b..4bfd49ae6 100644 --- a/scripts/FuchsiaGoodRodHouse.asm +++ b/scripts/FuchsiaGoodRodHouse.asm @@ -2,14 +2,15 @@ FuchsiaGoodRodHouse_Script: jp EnableAutoTextBoxDrawing FuchsiaGoodRodHouse_TextPointers: - dw FuchsiaHouse3Text1 + def_text_pointers + dw_const FuchsiaGoodRodHouseFishingGuruText, TEXT_FUCHSIAGOODRODHOUSE_FISHING_GURU -FuchsiaHouse3Text1: +FuchsiaGoodRodHouseFishingGuruText: text_asm ld a, [wd728] bit 4, a ; got good rod? jr nz, .got_item - ld hl, FuchsiaHouse3Text_561bd + ld hl, .Text call PrintText call YesNoChoice ld a, [wCurrentMenuItem] @@ -20,30 +21,30 @@ FuchsiaHouse3Text1: jr nc, .bag_full ld hl, wd728 set 4, [hl] ; got good rod - ld hl, FuchsiaHouse3Text_561c2 + ld hl, .ReceivedGoodRodText jr .done .bag_full - ld hl, FuchsiaHouse3Text_5621c + ld hl, .NoRoomText jr .done .refused - ld hl, FuchsiaHouse3Text_56212 + ld hl, .ThatsSoDisappointingText jr .done .got_item - ld hl, FuchsiaHouse3Text_56217 + ld hl, .HowAreTheFishText .done call PrintText jp TextScriptEnd -FuchsiaHouse3Text_561bd: - text_far _FuchsiaHouse3Text_561bd +.Text: + text_far _FuchsiaGoodRodHouseFishingGuruText text_end -FuchsiaHouse3Text_561c2: - text_far _FuchsiaHouse3Text_561c2 +.ReceivedGoodRodText: + text_far _FuchsiaGoodRodHouseFishingGuruReceivedGoodRodText sound_get_item_1 text_end -UnusedText_561c8: +.UnusedText: para "つり　こそ" line "おとこの　ロマン　だ！" @@ -53,14 +54,14 @@ UnusedText_561c8: line "もっと　いいもんが　つれるんじゃ！" done -FuchsiaHouse3Text_56212: - text_far _FuchsiaHouse3Text_56212 +.ThatsSoDisappointingText: + text_far _FuchsiaGoodRodHouseFishingGuruThatsSoDisappointingText text_end -FuchsiaHouse3Text_56217: - text_far _FuchsiaHouse3Text_56217 +.HowAreTheFishText: + text_far _FuchsiaGoodRodHouseFishingGuruHowAreTheFishText text_end -FuchsiaHouse3Text_5621c: - text_far _FuchsiaHouse3Text_5621c +.NoRoomText: + text_far _FuchsiaGoodRodHouseFishingGuruNoRoomText text_end diff --git a/scripts/FuchsiaGym.asm b/scripts/FuchsiaGym.asm index 8dc93d22f..1c0f02dfa 100644 --- a/scripts/FuchsiaGym.asm +++ b/scripts/FuchsiaGym.asm @@ -25,40 +25,41 @@ FuchsiaGym_Script: db "KOGA@" FuchsiaGymResetScripts: - xor a + xor a ; SCRIPT_FUCHSIAGYM_DEFAULT ld [wJoyIgnore], a ld [wFuchsiaGymCurScript], a ld [wCurMapScript], a ret FuchsiaGym_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw FuchsiaGymKogaPostBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_FUCHSIAGYM_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_FUCHSIAGYM_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_FUCHSIAGYM_END_BATTLE + dw_const FuchsiaGymKogaPostBattleScript, SCRIPT_FUCHSIAGYM_KOGA_POST_BATTLE -FuchsiaGymKogaPostBattle: +FuchsiaGymKogaPostBattleScript: ld a, [wIsInBattle] cp $ff jp z, FuchsiaGymResetScripts - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ; fallthrough FuchsiaGymReceiveTM06: - ld a, $9 + ld a, TEXT_FUCHSIAGYM_KOGA_SOUL_BADGE_INFO ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_KOGA lb bc, TM_TOXIC, 1 call GiveItem jr nc, .BagFull - ld a, $a + ld a, TEXT_FUCHSIAGYM_KOGA_RECEIVED_TM06 ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM06 jr .gymVictory .BagFull - ld a, $b + ld a, TEXT_FUCHSIAGYM_KOGA_TM06_NO_ROOM ldh [hSpriteIndexOrTextID], a call DisplayTextID .gymVictory @@ -73,35 +74,36 @@ FuchsiaGymReceiveTM06: jp FuchsiaGymResetScripts FuchsiaGym_TextPointers: - dw KogaText - dw FuchsiaGymTrainerText1 - dw FuchsiaGymTrainerText2 - dw FuchsiaGymTrainerText3 - dw FuchsiaGymTrainerText4 - dw FuchsiaGymTrainerText5 - dw FuchsiaGymTrainerText6 - dw FuchsiaGymGuideText - dw KogaSoulBadgeInfoText - dw ReceivedTM06Text - dw TM06NoRoomText + def_text_pointers + dw_const FuchsiaGymKogaText, TEXT_FUCHSIAGYM_KOGA + dw_const FuchsiaGymRocker1Text, TEXT_FUCHSIAGYM_ROCKER1 + dw_const FuchsiaGymRocker2Text, TEXT_FUCHSIAGYM_ROCKER2 + dw_const FuchsiaGymRocker3Text, TEXT_FUCHSIAGYM_ROCKER3 + dw_const FuchsiaGymRocker4Text, TEXT_FUCHSIAGYM_ROCKER4 + dw_const FuchsiaGymRocker5Text, TEXT_FUCHSIAGYM_ROCKER5 + dw_const FuchsiaGymRocker6Text, TEXT_FUCHSIAGYM_ROCKER6 + dw_const FuchsiaGymGymGuideText, TEXT_FUCHSIAGYM_GYM_GUIDE + dw_const FuchsiaGymKogaSoulBadgeInfoText, TEXT_FUCHSIAGYM_KOGA_SOUL_BADGE_INFO + dw_const FuchsiaGymKogaReceivedTM06Text, TEXT_FUCHSIAGYM_KOGA_RECEIVED_TM06 + dw_const FuchsiaGymKogaTM06NoRoomText, TEXT_FUCHSIAGYM_KOGA_TM06_NO_ROOM FuchsiaGymTrainerHeaders: def_trainers 2 FuchsiaGymTrainerHeader0: - trainer EVENT_BEAT_FUCHSIA_GYM_TRAINER_0, 2, FuchsiaGymBattleText1, FuchsiaGymEndBattleText1, FuchsiaGymAfterBattleText1 + trainer EVENT_BEAT_FUCHSIA_GYM_TRAINER_0, 2, FuchsiaGymRocker1BattleText, FuchsiaGymRocker1EndBattleText, FuchsiaGymRocker1AfterBattleText FuchsiaGymTrainerHeader1: - trainer EVENT_BEAT_FUCHSIA_GYM_TRAINER_1, 2, FuchsiaGymBattleText2, FuchsiaGymEndBattleText2, FuchsiaGymAfterBattleText2 + trainer EVENT_BEAT_FUCHSIA_GYM_TRAINER_1, 2, FuchsiaGymRocker2BattleText, FuchsiaGymRocker2EndBattleText, FuchsiaGymRocker2AfterBattleText FuchsiaGymTrainerHeader2: - trainer EVENT_BEAT_FUCHSIA_GYM_TRAINER_2, 4, FuchsiaGymBattleText3, FuchsiaGymEndBattleText3, FuchsiaGymAfterBattleText3 + trainer EVENT_BEAT_FUCHSIA_GYM_TRAINER_2, 4, FuchsiaGymRocker3BattleText, FuchsiaGymRocker3EndBattleText, FuchsiaGymRocker3AfterBattleText FuchsiaGymTrainerHeader3: - trainer EVENT_BEAT_FUCHSIA_GYM_TRAINER_3, 2, FuchsiaGymBattleText4, FuchsiaGymEndBattleText4, FuchsiaGymAfterBattleText4 + trainer EVENT_BEAT_FUCHSIA_GYM_TRAINER_3, 2, FuchsiaGymRocker4BattleText, FuchsiaGymRocker4EndBattleText, FuchsiaGymRocker4AfterBattleText FuchsiaGymTrainerHeader4: - trainer EVENT_BEAT_FUCHSIA_GYM_TRAINER_4, 2, FuchsiaGymBattleText5, FuchsiaGymEndBattleText5, FuchsiaGymAfterBattleText5 + trainer EVENT_BEAT_FUCHSIA_GYM_TRAINER_4, 2, FuchsiaGymRocker5BattleText, FuchsiaGymRocker5EndBattleText, FuchsiaGymRocker5AfterBattleText FuchsiaGymTrainerHeader5: - trainer EVENT_BEAT_FUCHSIA_GYM_TRAINER_5, 2, FuchsiaGymBattleText6, FuchsiaGymEndBattleText6, FuchsiaGymAfterBattleText6 + trainer EVENT_BEAT_FUCHSIA_GYM_TRAINER_5, 2, FuchsiaGymRocker6BattleText, FuchsiaGymRocker6EndBattleText, FuchsiaGymRocker6AfterBattleText db -1 ; end -KogaText: +FuchsiaGymKogaText: text_asm CheckEvent EVENT_BEAT_KOGA jr z, .beforeBeat @@ -111,17 +113,17 @@ KogaText: call DisableWaitingAfterTextDisplay jr .done .afterBeat - ld hl, KogaPostBattleAdviceText + ld hl, .PostBattleAdviceText call PrintText jr .done .beforeBeat - ld hl, KogaBeforeBattleText + ld hl, .BeforeBattleText call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, ReceivedSoulBadgeText - ld de, ReceivedSoulBadgeText + ld hl, .ReceivedSoulBadgeText + ld de, .ReceivedSoulBadgeText call SaveEndBattleTextPointers ldh a, [hSpriteIndex] ld [wSpriteIndex], a @@ -131,161 +133,159 @@ KogaText: ld [wGymLeaderNo], a xor a ldh [hJoyHeld], a - ld a, $3 + ld a, SCRIPT_FUCHSIAGYM_KOGA_POST_BATTLE ld [wFuchsiaGymCurScript], a .done jp TextScriptEnd -KogaBeforeBattleText: - text_far _KogaBeforeBattleText +.BeforeBattleText: + text_far _FuchsiaGymKogaBeforeBattleText text_end -ReceivedSoulBadgeText: - text_far _ReceivedSoulBadgeText +.ReceivedSoulBadgeText: + text_far _FuchsiaGymKogaReceivedSoulBadgeText text_end -KogaPostBattleAdviceText: - text_far _KogaPostBattleAdviceText +.PostBattleAdviceText: + text_far _FuchsiaGymKogaPostBattleAdviceText text_end -KogaSoulBadgeInfoText: - text_far _KogaSoulBadgeInfoText +FuchsiaGymKogaSoulBadgeInfoText: + text_far _FuchsiaGymKogaSoulBadgeInfoText text_end -ReceivedTM06Text: - text_far _ReceivedTM06Text +FuchsiaGymKogaReceivedTM06Text: + text_far _FuchsiaGymKogaReceivedTM06Text sound_get_key_item - -TM06ExplanationText: - text_far _TM06ExplanationText + text_far _FuchsiaGymKogaTM06ExplanationText text_end -TM06NoRoomText: - text_far _TM06NoRoomText +FuchsiaGymKogaTM06NoRoomText: + text_far _FuchsiaGymKogaTM06NoRoomText text_end -FuchsiaGymTrainerText1: +FuchsiaGymRocker1Text: text_asm ld hl, FuchsiaGymTrainerHeader0 call TalkToTrainer jp TextScriptEnd -FuchsiaGymBattleText1: - text_far _FuchsiaGymBattleText1 +FuchsiaGymRocker1BattleText: + text_far _FuchsiaGymRocker1BattleText text_end -FuchsiaGymEndBattleText1: - text_far _FuchsiaGymEndBattleText1 +FuchsiaGymRocker1EndBattleText: + text_far _FuchsiaGymRocker1EndBattleText text_end -FuchsiaGymAfterBattleText1: - text_far _FuchsiaGymAfterBattleText1 +FuchsiaGymRocker1AfterBattleText: + text_far _FuchsiaGymRocker1AfterBattleText text_end -FuchsiaGymTrainerText2: +FuchsiaGymRocker2Text: text_asm ld hl, FuchsiaGymTrainerHeader1 call TalkToTrainer jp TextScriptEnd -FuchsiaGymBattleText2: - text_far _FuchsiaGymBattleText2 +FuchsiaGymRocker2BattleText: + text_far _FuchsiaGymRocker2BattleText text_end -FuchsiaGymEndBattleText2: - text_far _FuchsiaGymEndBattleText2 +FuchsiaGymRocker2EndBattleText: + text_far _FuchsiaGymRocker2EndBattleText text_end -FuchsiaGymAfterBattleText2: - text_far _FuchsiaGymAfterBattleText2 +FuchsiaGymRocker2AfterBattleText: + text_far _FuchsiaGymRocker2AfterBattleText text_end -FuchsiaGymTrainerText3: +FuchsiaGymRocker3Text: text_asm ld hl, FuchsiaGymTrainerHeader2 call TalkToTrainer jp TextScriptEnd -FuchsiaGymBattleText3: - text_far _FuchsiaGymBattleText3 +FuchsiaGymRocker3BattleText: + text_far _FuchsiaGymRocker3BattleText text_end -FuchsiaGymEndBattleText3: - text_far _FuchsiaGymEndBattleText3 +FuchsiaGymRocker3EndBattleText: + text_far _FuchsiaGymRocker3EndBattleText text_end -FuchsiaGymAfterBattleText3: - text_far _FuchsiaGymAfterBattleText3 +FuchsiaGymRocker3AfterBattleText: + text_far _FuchsiaGymRocker3AfterBattleText text_end -FuchsiaGymTrainerText4: +FuchsiaGymRocker4Text: text_asm ld hl, FuchsiaGymTrainerHeader3 call TalkToTrainer jp TextScriptEnd -FuchsiaGymBattleText4: - text_far _FuchsiaGymBattleText4 +FuchsiaGymRocker4BattleText: + text_far _FuchsiaGymRocker4BattleText text_end -FuchsiaGymEndBattleText4: - text_far _FuchsiaGymEndBattleText4 +FuchsiaGymRocker4EndBattleText: + text_far _FuchsiaGymRocker4EndBattleText text_end -FuchsiaGymAfterBattleText4: - text_far _FuchsiaGymAfterBattleText4 +FuchsiaGymRocker4AfterBattleText: + text_far _FuchsiaGymRocker4AfterBattleText text_end -FuchsiaGymTrainerText5: +FuchsiaGymRocker5Text: text_asm ld hl, FuchsiaGymTrainerHeader4 call TalkToTrainer jp TextScriptEnd -FuchsiaGymBattleText5: - text_far _FuchsiaGymBattleText5 +FuchsiaGymRocker5BattleText: + text_far _FuchsiaGymRocker5BattleText text_end -FuchsiaGymEndBattleText5: - text_far _FuchsiaGymEndBattleText5 +FuchsiaGymRocker5EndBattleText: + text_far _FuchsiaGymRocker5EndBattleText text_end -FuchsiaGymAfterBattleText5: - text_far _FuchsiaGymAfterBattleText5 +FuchsiaGymRocker5AfterBattleText: + text_far _FuchsiaGymRocker5AfterBattleText text_end -FuchsiaGymTrainerText6: +FuchsiaGymRocker6Text: text_asm ld hl, FuchsiaGymTrainerHeader5 call TalkToTrainer jp TextScriptEnd -FuchsiaGymBattleText6: - text_far _FuchsiaGymBattleText6 +FuchsiaGymRocker6BattleText: + text_far _FuchsiaGymRocker6BattleText text_end -FuchsiaGymEndBattleText6: - text_far _FuchsiaGymEndBattleText6 +FuchsiaGymRocker6EndBattleText: + text_far _FuchsiaGymRocker6EndBattleText text_end -FuchsiaGymAfterBattleText6: - text_far _FuchsiaGymAfterBattleText6 +FuchsiaGymRocker6AfterBattleText: + text_far _FuchsiaGymRocker6AfterBattleText text_end -FuchsiaGymGuideText: +FuchsiaGymGymGuideText: text_asm CheckEvent EVENT_BEAT_KOGA - ld hl, FuchsiaGymGuidePostBattleText + ld hl, .BeatKogaText jr nz, .afterBeat - ld hl, FuchsiaGymGuidePreBattleText + ld hl, .ChampInMakingText .afterBeat call PrintText jp TextScriptEnd -FuchsiaGymGuidePreBattleText: - text_far _FuchsiaGymGuidePreBattleText +.ChampInMakingText: + text_far _FuchsiaGymGymGuideChampInMakingText text_end -FuchsiaGymGuidePostBattleText: - text_far _FuchsiaGymGuidePostBattleText +.BeatKogaText: + text_far _FuchsiaGymGymGuideBeatKogaText text_end diff --git a/scripts/FuchsiaMart.asm b/scripts/FuchsiaMart.asm index e6d64c53f..abb613028 100644 --- a/scripts/FuchsiaMart.asm +++ b/scripts/FuchsiaMart.asm @@ -2,14 +2,15 @@ FuchsiaMart_Script: jp EnableAutoTextBoxDrawing FuchsiaMart_TextPointers: - dw FuchsiaCashierText - dw FuchsiaMartText2 - dw FuchsiaMartText3 + def_text_pointers + dw_const FuchsiaMartClerkText, TEXT_FUCHSIAMART_CLERK + dw_const FuchsiaMartMiddleAgedManText, TEXT_FUCHSIAMART_MIDDLE_AGED_MAN + dw_const FuchsiaMartCooltrainerFText, TEXT_FUCHSIAMART_COOLTRAINER_F -FuchsiaMartText2: - text_far _FuchsiaMartText2 +FuchsiaMartMiddleAgedManText: + text_far _FuchsiaMartMiddleAgedManText text_end -FuchsiaMartText3: - text_far _FuchsiaMartText3 +FuchsiaMartCooltrainerFText: + text_far _FuchsiaMartCooltrainerFText text_end diff --git a/scripts/FuchsiaMeetingRoom.asm b/scripts/FuchsiaMeetingRoom.asm index 4fc05b1f0..b0ca9356f 100644 --- a/scripts/FuchsiaMeetingRoom.asm +++ b/scripts/FuchsiaMeetingRoom.asm @@ -3,18 +3,19 @@ FuchsiaMeetingRoom_Script: ret FuchsiaMeetingRoom_TextPointers: - dw FuchsiaMeetingRoomText1 - dw FuchsiaMeetingRoomText2 - dw FuchsiaMeetingRoomText3 + def_text_pointers + dw_const FuchsiaMeetingRoomSafariZoneWorker1, TEXT_FUCHSIAMEETINGROOM_SAFARI_ZONE_WORKER1 + dw_const FuchsiaMeetingRoomSafariZoneWorker2, TEXT_FUCHSIAMEETINGROOM_SAFARI_ZONE_WORKER2 + dw_const FuchsiaMeetingRoomSafariZoneWorker3, TEXT_FUCHSIAMEETINGROOM_SAFARI_ZONE_WORKER3 -FuchsiaMeetingRoomText1: - text_far _FuchsiaMeetingRoomText1 +FuchsiaMeetingRoomSafariZoneWorker1: + text_far _FuchsiaMeetingRoomSafariZoneWorker1 text_end -FuchsiaMeetingRoomText2: - text_far _FuchsiaMeetingRoomText2 +FuchsiaMeetingRoomSafariZoneWorker2: + text_far _FuchsiaMeetingRoomSafariZoneWorker2 text_end -FuchsiaMeetingRoomText3: - text_far _FuchsiaMeetingRoomText3 +FuchsiaMeetingRoomSafariZoneWorker3: + text_far _FuchsiaMeetingRoomSafariZoneWorker3 text_end diff --git a/scripts/FuchsiaPokecenter.asm b/scripts/FuchsiaPokecenter.asm index 788ee24b1..7c0d3def1 100644 --- a/scripts/FuchsiaPokecenter.asm +++ b/scripts/FuchsiaPokecenter.asm @@ -3,21 +3,22 @@ FuchsiaPokecenter_Script: jp EnableAutoTextBoxDrawing FuchsiaPokecenter_TextPointers: - dw FuchsiaHealNurseText - dw FuchsiaPokecenterText2 - dw FuchsiaPokecenterText3 - dw FuchsiaTradeNurseText + def_text_pointers + dw_const FuchsiaPokecenterNurseText, TEXT_FUCHSIAPOKECENTER_NURSE + dw_const FuchsiaPokecenterRockerText, TEXT_FUCHSIAPOKECENTER_ROCKER + dw_const FuchsiaPokecenterCooltrainerFText, TEXT_FUCHSIAPOKECENTER_COOLTRAINER_F + dw_const FuchsiaPokecenterLinkReceptionistText, TEXT_FUCHSIAPOKECENTER_LINK_RECEPTIONIST -FuchsiaHealNurseText: +FuchsiaPokecenterNurseText: script_pokecenter_nurse -FuchsiaPokecenterText2: - text_far _FuchsiaPokecenterText1 +FuchsiaPokecenterRockerText: + text_far _FuchsiaPokecenterRockerText text_end -FuchsiaPokecenterText3: - text_far _FuchsiaPokecenterText3 +FuchsiaPokecenterCooltrainerFText: + text_far _FuchsiaPokecenterCooltrainerFText text_end -FuchsiaTradeNurseText: +FuchsiaPokecenterLinkReceptionistText: script_cable_club_receptionist diff --git a/scripts/GameCorner.asm b/scripts/GameCorner.asm index 04c8504eb..3944a2f97 100644 --- a/scripts/GameCorner.asm +++ b/scripts/GameCorner.asm @@ -1,12 +1,12 @@ GameCorner_Script: - call CeladonGameCornerScript_48bcf - call CeladonGameCornerScript_48bec + call GameCornerSelectLuckySlotMachine + call GameCornerSetRocketHideoutDoorTile call EnableAutoTextBoxDrawing ld hl, GameCorner_ScriptPointers ld a, [wGameCornerCurScript] jp CallFunctionInTable -CeladonGameCornerScript_48bcf: +GameCornerSelectLuckySlotMachine: ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] @@ -23,7 +23,7 @@ CeladonGameCornerScript_48bcf: ld [wLuckySlotHiddenObjectIndex], a ret -CeladonGameCornerScript_48bec: +GameCornerSetRocketHideoutDoorTile: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] @@ -35,53 +35,54 @@ CeladonGameCornerScript_48bec: lb bc, 2, 8 predef_jump ReplaceTileBlock -CeladonGameCornerScript_48c07: - xor a +GameCornerReenterMapAfterPlayerLoss: + xor a ; SCRIPT_GAMECORNER_DEFAULT ld [wJoyIgnore], a ld [wGameCornerCurScript], a ld [wCurMapScript], a ret GameCorner_ScriptPointers: - dw CeladonGameCornerScript0 - dw CeladonGameCornerScript1 - dw CeladonGameCornerScript2 + def_script_pointers + dw_const GameCornerDefaultScript, SCRIPT_GAMECORNER_DEFAULT + dw_const GameCornerRocketBattleScript, SCRIPT_GAMECORNER_ROCKET_BATTLE + dw_const GameCornerRocketExitScript, SCRIPT_GAMECORNER_ROCKET_EXIT -CeladonGameCornerScript0: +GameCornerDefaultScript: ret -CeladonGameCornerScript1: +GameCornerRocketBattleScript: ld a, [wIsInBattle] cp $ff - jp z, CeladonGameCornerScript_48c07 - ld a, $f0 + jp z, GameCornerReenterMapAfterPlayerLoss + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a - ld a, $d + ld a, TEXT_GAMECORNER_ROCKET_AFTER_BATTLE ldh [hSpriteIndexOrTextID], a call DisplayTextID - ld a, $b + ld a, GAMECORNER_ROCKET ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF - ld de, MovementData_48c5a + ld de, GameCornerMovement_Grunt_WalkAroundPlayer ld a, [wYCoord] cp 6 jr nz, .asm_48c43 - ld de, MovementData_48c63 + ld de, GameCornerMovement_Grunt_WalkDirect jr .asm_48c4d .asm_48c43 ld a, [wXCoord] cp 8 jr nz, .asm_48c4d - ld de, MovementData_48c63 + ld de, GameCornerMovement_Grunt_WalkDirect .asm_48c4d - ld a, $b + ld a, GAMECORNER_ROCKET ldh [hSpriteIndex], a call MoveSprite - ld a, $2 + ld a, SCRIPT_GAMECORNER_ROCKET_EXIT ld [wGameCornerCurScript], a ret -MovementData_48c5a: +GameCornerMovement_Grunt_WalkAroundPlayer: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT @@ -92,7 +93,7 @@ MovementData_48c5a: db NPC_MOVEMENT_RIGHT db -1 ; end -MovementData_48c63: +GameCornerMovement_Grunt_WalkDirect: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT @@ -100,7 +101,7 @@ MovementData_48c63: db NPC_MOVEMENT_RIGHT db -1 ; end -CeladonGameCornerScript2: +GameCornerRocketExitScript: ld a, [wd730] bit 0, a ret nz @@ -112,53 +113,60 @@ CeladonGameCornerScript2: ld hl, wCurrentMapScriptFlags set 5, [hl] set 6, [hl] - ld a, $0 + ld a, SCRIPT_GAMECORNER_DEFAULT ld [wGameCornerCurScript], a ret GameCorner_TextPointers: - dw CeladonGameCornerText1 - dw CeladonGameCornerText2 - dw CeladonGameCornerText3 - dw CeladonGameCornerText4 - dw CeladonGameCornerText5 - dw CeladonGameCornerText6 - dw CeladonGameCornerText7 - dw CeladonGameCornerText8 - dw CeladonGameCornerText9 - dw CeladonGameCornerText10 - dw CeladonGameCornerText11 - dw CeladonGameCornerText12 - dw CeladonGameCornerText13 - -CeladonGameCornerText1: - text_far _CeladonGameCornerText1 + def_text_pointers + dw_const GameCornerBeauty1Text, TEXT_GAMECORNER_BEAUTY1 + dw_const GameCornerClerk1Text, TEXT_GAMECORNER_CLERK1 + dw_const GameCornerMiddleAgedMan1Text, TEXT_GAMECORNER_MIDDLE_AGED_MAN1 + dw_const GameCornerBeauty2Text, TEXT_GAMECORNER_BEAUTY2 + dw_const GameCornerFishingGuruText, TEXT_GAMECORNER_FISHING_GURU + dw_const GameCornerMiddleAgedWomanText, TEXT_GAMECORNER_MIDDLE_AGED_WOMAN + dw_const GameCornerGymGuideText, TEXT_GAMECORNER_GYM_GUIDE + dw_const GameCornerGamblerText, TEXT_GAMECORNER_GAMBLER + dw_const GameCornerClerk2Text, TEXT_GAMECORNER_CLERK2 + dw_const GameCornerGentlemanText, TEXT_GAMECORNER_GENTLEMAN + dw_const GameCornerRocketText, TEXT_GAMECORNER_ROCKET + dw_const GameCornerPosterText, TEXT_GAMECORNER_POSTER + dw_const GameCornerRocketAfterBattleText, TEXT_GAMECORNER_ROCKET_AFTER_BATTLE + +GameCornerBeauty1Text: + text_far _GameCornerBeauty1Text text_end -CeladonGameCornerText2: +GameCornerClerk1Text: text_asm - call CeladonGameCornerScript_48f1e - ld hl, CeladonGameCornerText_48d22 + ; Show player's coins + call GameCornerDrawCoinBox + ld hl, .DoYouNeedSomeGameCoins call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a - jr nz, .asm_48d0f + jr nz, .declined + ; Can only get more coins if you + ; - have the Coin Case ld b, COIN_CASE call IsItemInBag - jr z, .asm_48d19 + jr z, .no_coin_case + ; - have room in the Coin Case for at least 9 coins call Has9990Coins - jr nc, .asm_48d14 + jr nc, .coin_case_full + ; - have at least 1000 yen xor a ldh [hMoney], a ldh [hMoney + 2], a ld a, $10 ldh [hMoney + 1], a call HasEnoughMoney - jr nc, .asm_48cdb - ld hl, CeladonGameCornerText_48d31 - jr .asm_48d1c -.asm_48cdb + jr nc, .buy_coins + ld hl, .CantAffordTheCoins + jr .print_ret +.buy_coins + ; Spend 1000 yen xor a ldh [hMoney], a ldh [hMoney + 2], a @@ -168,6 +176,7 @@ CeladonGameCornerText2: ld de, wPlayerMoney + 2 ld c, $3 predef SubBCDPredef + ; Receive 50 coins xor a ldh [hUnusedCoinsByte], a ldh [hCoins], a @@ -177,64 +186,65 @@ CeladonGameCornerText2: ld hl, hCoins + 1 ld c, $2 predef AddBCDPredef - call CeladonGameCornerScript_48f1e - ld hl, CeladonGameCornerText_48d27 - jr .asm_48d1c -.asm_48d0f - ld hl, CeladonGameCornerText_48d2c - jr .asm_48d1c -.asm_48d14 - ld hl, CeladonGameCornerText_48d36 - jr .asm_48d1c -.asm_48d19 - ld hl, CeladonGameCornerText_48d3b -.asm_48d1c + ; Update display + call GameCornerDrawCoinBox + ld hl, .ThanksHereAre50Coins + jr .print_ret +.declined + ld hl, .PleaseComePlaySometime + jr .print_ret +.coin_case_full + ld hl, .CoinCaseIsFull + jr .print_ret +.no_coin_case + ld hl, .DontHaveCoinCase +.print_ret call PrintText jp TextScriptEnd -CeladonGameCornerText_48d22: - text_far _CeladonGameCornerText_48d22 +.DoYouNeedSomeGameCoins: + text_far _GameCornerClerk1DoYouNeedSomeGameCoinsText text_end -CeladonGameCornerText_48d27: - text_far _CeladonGameCornerText_48d27 +.ThanksHereAre50Coins: + text_far _GameCornerClerk1ThanksHereAre50CoinsText text_end -CeladonGameCornerText_48d2c: - text_far _CeladonGameCornerText_48d2c +.PleaseComePlaySometime: + text_far _GameCornerClerk1PleaseComePlaySometimeText text_end -CeladonGameCornerText_48d31: - text_far _CeladonGameCornerText_48d31 +.CantAffordTheCoins: + text_far _GameCornerClerk1CantAffordTheCoinsText text_end -CeladonGameCornerText_48d36: - text_far _CeladonGameCornerText_48d36 +.CoinCaseIsFull: + text_far _GameCornerClerk1CoinCaseIsFullText text_end -CeladonGameCornerText_48d3b: - text_far _CeladonGameCornerText_48d3b +.DontHaveCoinCase: + text_far _GameCornerClerk1DontHaveCoinCaseText text_end -CeladonGameCornerText3: - text_far _CeladonGameCornerText3 +GameCornerMiddleAgedMan1Text: + text_far _GameCornerMiddleAgedMan1Text text_end -CeladonGameCornerText4: - text_far _CeladonGameCornerText4 +GameCornerBeauty2Text: + text_far _GameCornerBeauty2Text text_end -CeladonGameCornerText5: +GameCornerFishingGuruText: text_asm CheckEvent EVENT_GOT_10_COINS - jr nz, .asm_48d89 - ld hl, CeladonGameCornerText_48d9c + jr nz, .alreadyGotNpcCoins + ld hl, .WantToPlayText call PrintText ld b, COIN_CASE call IsItemInBag - jr z, .asm_48d93 + jr z, .dontHaveCoinCase call Has9990Coins - jr nc, .asm_48d8e + jr nc, .coinCaseFull xor a ldh [hUnusedCoinsByte], a ldh [hCoins], a @@ -247,74 +257,74 @@ CeladonGameCornerText5: SetEvent EVENT_GOT_10_COINS ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, Received10CoinsText - jr .asm_48d96 -.asm_48d89 - ld hl, CeladonGameCornerText_48dac - jr .asm_48d96 -.asm_48d8e - ld hl, CeladonGameCornerText_48da7 - jr .asm_48d96 -.asm_48d93 - ld hl, CeladonGameCornerText_48f19 -.asm_48d96 + ld hl, .Received10CoinsText + jr .print_ret +.alreadyGotNpcCoins + ld hl, .WinsComeAndGoText + jr .print_ret +.coinCaseFull + ld hl, .DontNeedMyCoinsText + jr .print_ret +.dontHaveCoinCase + ld hl, GameCornerOopsForgotCoinCaseText +.print_ret call PrintText jp TextScriptEnd -CeladonGameCornerText_48d9c: - text_far _CeladonGameCornerText_48d9c +.WantToPlayText: + text_far _GameCornerFishingGuruWantToPlayText text_end -Received10CoinsText: - text_far _Received10CoinsText +.Received10CoinsText: + text_far _GameCornerFishingGuruReceived10CoinsText sound_get_item_1 text_end -CeladonGameCornerText_48da7: - text_far _CeladonGameCornerText_48da7 +.DontNeedMyCoinsText: + text_far _GameCornerFishingGuruDontNeedMyCoinsText text_end -CeladonGameCornerText_48dac: - text_far _CeladonGameCornerText_48dac +.WinsComeAndGoText: + text_far _GameCornerFishingGuruWinsComeAndGoText text_end -CeladonGameCornerText6: - text_far _CeladonGameCornerText6 +GameCornerMiddleAgedWomanText: + text_far _GameCornerMiddleAgedWomanText text_end -CeladonGameCornerText7: +GameCornerGymGuideText: text_asm CheckEvent EVENT_BEAT_ERIKA - ld hl, CeladonGameCornerText_48dca - jr z, .asm_48dc4 - ld hl, CeladonGameCornerText_48dcf -.asm_48dc4 + ld hl, GameCornerGymGuideChampInMakingText + jr z, .not_defeated + ld hl, GameCornerGymGuideTheyOfferRarePokemonText +.not_defeated call PrintText jp TextScriptEnd -CeladonGameCornerText_48dca: - text_far _CeladonGameCornerText_48dca +GameCornerGymGuideChampInMakingText: + text_far _GameCornerGymGuideChampInMakingText text_end -CeladonGameCornerText_48dcf: - text_far _CeladonGameCornerText_48dcf +GameCornerGymGuideTheyOfferRarePokemonText: + text_far _GameCornerGymGuideTheyOfferRarePokemonText text_end -CeladonGameCornerText8: - text_far _CeladonGameCornerText8 +GameCornerGamblerText: + text_far _GameCornerGamblerText text_end -CeladonGameCornerText9: +GameCornerClerk2Text: text_asm CheckEvent EVENT_GOT_20_COINS_2 - jr nz, .asm_48e13 - ld hl, CeladonGameCornerText_48e26 + jr nz, .alreadyGotNpcCoins + ld hl, .WantSomeCoinsText call PrintText ld b, COIN_CASE call IsItemInBag - jr z, .asm_48e1d + jr z, .dontHaveCoinCase call Has9990Coins - jr nc, .asm_48e18 + jr nc, .coinCaseFull xor a ldh [hUnusedCoinsByte], a ldh [hCoins], a @@ -325,48 +335,48 @@ CeladonGameCornerText9: ld c, $2 predef AddBCDPredef SetEvent EVENT_GOT_20_COINS_2 - ld hl, Received20CoinsText - jr .asm_48e20 -.asm_48e13 - ld hl, CeladonGameCornerText_48e36 - jr .asm_48e20 -.asm_48e18 - ld hl, CeladonGameCornerText_48e31 - jr .asm_48e20 -.asm_48e1d - ld hl, CeladonGameCornerText_48f19 -.asm_48e20 + ld hl, .Received20CoinsText + jr .print_ret +.alreadyGotNpcCoins + ld hl, .INeedMoreCoinsText + jr .print_ret +.coinCaseFull + ld hl, .YouHaveLotsOfCoinsText + jr .print_ret +.dontHaveCoinCase + ld hl, GameCornerOopsForgotCoinCaseText +.print_ret call PrintText jp TextScriptEnd -CeladonGameCornerText_48e26: - text_far _CeladonGameCornerText_48e26 +.WantSomeCoinsText: + text_far _GameCornerClerk2WantSomeCoinsText text_end -Received20CoinsText: - text_far _Received20CoinsText +.Received20CoinsText: + text_far _GameCornerClerk2Received20CoinsText sound_get_item_1 text_end -CeladonGameCornerText_48e31: - text_far _CeladonGameCornerText_48e31 +.YouHaveLotsOfCoinsText: + text_far _GameCornerClerk2YouHaveLotsOfCoinsText text_end -CeladonGameCornerText_48e36: - text_far _CeladonGameCornerText_48e36 +.INeedMoreCoinsText: + text_far _GameCornerClerk2INeedMoreCoinsText text_end -CeladonGameCornerText10: +GameCornerGentlemanText: text_asm CheckEvent EVENT_GOT_20_COINS - jr nz, .asm_48e75 - ld hl, CeladonGameCornerText_48e88 + jr nz, .alreadyGotNpcCoins + ld hl, .ThrowingMeOffText call PrintText ld b, COIN_CASE call IsItemInBag - jr z, .asm_48e7f + jr z, .dontHaveCoinCase call Has9990Coins - jr z, .asm_48e7a + jr z, .coinCaseFull xor a ldh [hUnusedCoinsByte], a ldh [hCoins], a @@ -377,46 +387,46 @@ CeladonGameCornerText10: ld c, $2 predef AddBCDPredef SetEvent EVENT_GOT_20_COINS - ld hl, CeladonGameCornerText_48e8d - jr .asm_48e82 -.asm_48e75 - ld hl, CeladonGameCornerText_48e98 - jr .asm_48e82 -.asm_48e7a - ld hl, CeladonGameCornerText_48e93 - jr .asm_48e82 -.asm_48e7f - ld hl, CeladonGameCornerText_48f19 -.asm_48e82 + ld hl, .Received20CoinsText + jr .print_ret +.alreadyGotNpcCoins + ld hl, .CloselyWatchTheReelsText + jr .print_ret +.coinCaseFull + ld hl, .YouGotYourOwnCoinsText + jr .print_ret +.dontHaveCoinCase + ld hl, GameCornerOopsForgotCoinCaseText +.print_ret call PrintText jp TextScriptEnd -CeladonGameCornerText_48e88: - text_far _CeladonGameCornerText_48e88 +.ThrowingMeOffText: + text_far _GameCornerGentlemanThrowingMeOffText text_end -CeladonGameCornerText_48e8d: - text_far _CeladonGameCornerText_48e8d +.Received20CoinsText: + text_far _GameCornerGentlemanReceived20CoinsText sound_get_item_1 text_end -CeladonGameCornerText_48e93: - text_far _CeladonGameCornerText_48e93 +.YouGotYourOwnCoinsText: + text_far _GameCornerGentlemanYouGotYourOwnCoinsText text_end -CeladonGameCornerText_48e98: - text_far _CeladonGameCornerText_48e98 +.CloselyWatchTheReelsText: + text_far _GameCornerGentlemanCloselyWatchTheReelsText text_end -CeladonGameCornerText11: +GameCornerRocketText: text_asm - ld hl, CeladonGameCornerText_48ece + ld hl, .ImGuardingThisPosterText call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, CeladonGameCornerText_48ed3 - ld de, CeladonGameCornerText_48ed3 + ld hl, .BattleEndText + ld de, .BattleEndText call SaveEndBattleTextPointers ldh a, [hSpriteIndex] ld [wSpriteIndex], a @@ -426,27 +436,27 @@ CeladonGameCornerText11: ldh [hJoyHeld], a ldh [hJoyPressed], a ldh [hJoyReleased], a - ld a, $1 + ld a, SCRIPT_GAMECORNER_ROCKET_BATTLE ld [wGameCornerCurScript], a jp TextScriptEnd -CeladonGameCornerText_48ece: - text_far _CeladonGameCornerText_48ece +.ImGuardingThisPosterText: + text_far _GameCornerRocketImGuardingThisPosterText text_end -CeladonGameCornerText_48ed3: - text_far _CeladonGameCornerText_48ed3 +.BattleEndText: + text_far _GameCornerRocketBattleEndText text_end -CeladonGameCornerText13: - text_far _CeladonGameCornerText_48ed8 +GameCornerRocketAfterBattleText: + text_far _GameCornerRocketAfterBattleText text_end -CeladonGameCornerText12: +GameCornerPosterText: text_asm ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, CeladonGameCornerText_48f09 + ld hl, .SwitchBehindPosterText call PrintText call WaitForSoundToFinish ld a, SFX_GO_INSIDE @@ -459,19 +469,19 @@ CeladonGameCornerText12: predef ReplaceTileBlock jp TextScriptEnd -CeladonGameCornerText_48f09: - text_far _CeladonGameCornerText_48f09 +.SwitchBehindPosterText: + text_far _GameCornerPosterSwitchBehindPosterText text_asm ld a, SFX_SWITCH call PlaySound call WaitForSoundToFinish jp TextScriptEnd -CeladonGameCornerText_48f19: - text_far _CeladonGameCornerText_48f19 +GameCornerOopsForgotCoinCaseText: + text_far _GameCornerOopsForgotCoinCaseText text_end -CeladonGameCornerScript_48f1e: +GameCornerDrawCoinBox: ld hl, wd730 set 6, [hl] hlcoord 11, 0 diff --git a/scripts/GameCornerPrizeRoom.asm b/scripts/GameCornerPrizeRoom.asm index c8dddf719..443e02609 100644 --- a/scripts/GameCornerPrizeRoom.asm +++ b/scripts/GameCornerPrizeRoom.asm @@ -2,19 +2,20 @@ GameCornerPrizeRoom_Script: jp EnableAutoTextBoxDrawing GameCornerPrizeRoom_TextPointers: - dw CeladonPrizeRoomText1 - dw CeladonPrizeRoomText2 - dw CeladonPrizeRoomText3 - dw CeladonPrizeRoomText3 - dw CeladonPrizeRoomText3 + def_text_pointers + dw_const GameCornerPrizeRoomBaldingGuyText, TEXT_GAMECORNERPRIZEROOM_BALDING_GUY + dw_const GameCornerPrizeRoomGamblerText, TEXT_GAMECORNERPRIZEROOM_GAMBLER + dw_const GameCornerPRizeRoomPrizeVendorText, TEXT_GAMECORNERPRIZEROOM_PRIZE_VENDOR_1 + dw_const GameCornerPRizeRoomPrizeVendorText, TEXT_GAMECORNERPRIZEROOM_PRIZE_VENDOR_2 + dw_const GameCornerPRizeRoomPrizeVendorText, TEXT_GAMECORNERPRIZEROOM_PRIZE_VENDOR_3 -CeladonPrizeRoomText1: - text_far _CeladonPrizeRoomText1 +GameCornerPrizeRoomBaldingGuyText: + text_far _GameCornerPrizeRoomBaldingGuyText text_end -CeladonPrizeRoomText2: - text_far _CeladonPrizeRoomText2 +GameCornerPrizeRoomGamblerText: + text_far _GameCornerPrizeRoomGamblerText text_end -CeladonPrizeRoomText3: +GameCornerPRizeRoomPrizeVendorText: script_prize_vendor diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm index 45cef29c0..9fc7da185 100644 --- a/scripts/HallOfFame.asm +++ b/scripts/HallOfFame.asm @@ -11,15 +11,16 @@ HallofFameRoomScript_5a4aa: ret HallOfFame_ScriptPointers: - dw HallofFameRoomScript0 - dw HallofFameRoomScript1 - dw HallofFameRoomScript2 - dw HallofFameRoomScript3 + def_script_pointers + dw_const HallOfFameDefaultScript, SCRIPT_HALLOFFAME_DEFAULT + dw_const HallOfFameOakCongratulationsScript, SCRIPT_HALLOFFAME_OAK_CONGRATULATIONS + dw_const HallOfFameResetEventsAndSaveScript, SCRIPT_HALLOFFAME_RESET_EVENTS_AND_SAVE + dw_const HallOfFameNoopScript, SCRIPT_HALLOFFAME_NOOP -HallofFameRoomScript3: +HallOfFameNoopScript: ret -HallofFameRoomScript2: +HallOfFameResetEventsAndSaveScript: call Delay3 ld a, [wLetterPrintingDelayFlags] push af @@ -32,7 +33,7 @@ HallofFameRoomScript2: res 1, [hl] inc hl set 0, [hl] - xor a + xor a ; SCRIPT_*_DEFAULT ld hl, wLoreleisRoomCurScript ld [hli], a ; wLoreleisRoomCurScript ld [hli], a ; wBrunosRoomCurScript @@ -55,8 +56,8 @@ HallofFameRoomScript2: call WaitForTextScrollButtonPress jp Init -HallofFameRoomScript0: - ld a, $ff +HallOfFameDefaultScript: + ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ld hl, wSimulatedJoypadStatesEnd ld de, RLEMovement5a528 @@ -64,7 +65,7 @@ HallofFameRoomScript0: dec a ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld a, $1 + ld a, SCRIPT_HALLOFFAME_OAK_CONGRATULATIONS ld [wHallOfFameCurScript], a ret @@ -72,13 +73,13 @@ RLEMovement5a528: db D_UP, 5 db -1 ; end -HallofFameRoomScript1: +HallOfFameOakCongratulationsScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz ld a, PLAYER_DIR_RIGHT ld [wPlayerMovingDirection], a - ld a, $1 + ld a, HALLOFFAME_OAK ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF ld a, SPRITE_FACING_LEFT @@ -89,21 +90,22 @@ HallofFameRoomScript1: ld [wJoyIgnore], a inc a ; PLAYER_DIR_RIGHT ld [wPlayerMovingDirection], a - ld a, $1 + ld a, TEXT_HALLOFFAME_OAK ldh [hSpriteIndexOrTextID], a call DisplayTextID - ld a, $ff + ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ld a, HS_CERULEAN_CAVE_GUY ld [wMissableObjectIndex], a predef HideObject - ld a, $2 + ld a, SCRIPT_HALLOFFAME_RESET_EVENTS_AND_SAVE ld [wHallOfFameCurScript], a ret HallOfFame_TextPointers: - dw HallofFameRoomText1 + def_text_pointers + dw_const HallOfFameOakText, TEXT_HALLOFFAME_OAK -HallofFameRoomText1: - text_far _HallofFameRoomText1 +HallOfFameOakText: + text_far _HallOfFameOakText text_end diff --git a/scripts/IndigoPlateau.asm b/scripts/IndigoPlateau.asm index 86f38b2ae..9ec2c5a3d 100644 --- a/scripts/IndigoPlateau.asm +++ b/scripts/IndigoPlateau.asm @@ -2,3 +2,4 @@ IndigoPlateau_Script: ret IndigoPlateau_TextPointers: + def_text_pointers diff --git a/scripts/IndigoPlateauLobby.asm b/scripts/IndigoPlateauLobby.asm index d5c895361..8f69fd58a 100644 --- a/scripts/IndigoPlateauLobby.asm +++ b/scripts/IndigoPlateauLobby.asm @@ -15,22 +15,23 @@ IndigoPlateauLobby_Script: ret IndigoPlateauLobby_TextPointers: - dw IndigoHealNurseText - dw IndigoPlateauLobbyText2 - dw IndigoPlateauLobbyText3 - dw IndigoCashierText - dw IndigoTradeNurseText + def_text_pointers + dw_const IndigoPlateauLobbyNurseText, TEXT_INDIGOPLATEAULOBBY_NURSE + dw_const IndigoPlateauLobbyGymGuideText, TEXT_INDIGOPLATEAULOBBY_GYM_GUIDE + dw_const IndigoPlateauLobbyCooltrainerFText, TEXT_INDIGOPLATEAULOBBY_COOLTRAINER_F + dw_const IndigoPlateauLobbyClerkText, TEXT_INDIGOPLATEAULOBBY_CLERK + dw_const IndigoPlateauLobbyLinkReceptionistText, TEXT_INDIGOPLATEAULOBBY_LINK_RECEPTIONIST -IndigoHealNurseText: +IndigoPlateauLobbyNurseText: script_pokecenter_nurse -IndigoPlateauLobbyText2: - text_far _IndigoPlateauLobbyText2 +IndigoPlateauLobbyGymGuideText: + text_far _IndigoPlateauLobbyGymGuideText text_end -IndigoPlateauLobbyText3: - text_far _IndigoPlateauLobbyText3 +IndigoPlateauLobbyCooltrainerFText: + text_far _IndigoPlateauLobbyCooltrainerFText text_end -IndigoTradeNurseText: +IndigoPlateauLobbyLinkReceptionistText: script_cable_club_receptionist diff --git a/scripts/LancesRoom.asm b/scripts/LancesRoom.asm index 9c3164169..fd1401c28 100644 --- a/scripts/LancesRoom.asm +++ b/scripts/LancesRoom.asm @@ -36,21 +36,22 @@ LanceShowOrHideEntranceBlocks: predef_jump ReplaceTileBlock ResetLanceScript: - xor a + xor a ; SCRIPT_LANCESROOM_DEFAULT ld [wLancesRoomCurScript], a ret LancesRoom_ScriptPointers: - dw LanceScript0 - dw DisplayEnemyTrainerTextAndStartBattle - dw LanceScript2 - dw LanceScript3 - dw LanceScript4 - -LanceScript4: + def_script_pointers + dw_const LancesRoomDefaultScript, SCRIPT_LANCESROOM_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_LANCESROOM_LANCE_START_BATTLE + dw_const LancesRoomLanceEndBattleScript, SCRIPT_LANCESROOM_LANCE_END_BATTLE + dw_const LancesRoomPlayerIsMovingScript, SCRIPT_LANCESROOM_PLAYER_IS_MOVING + dw_const LancesRoomNoopScript, SCRIPT_LANCESROOM_NOOP + +LancesRoomNoopScript: ret -LanceScript0: +LancesRoomDefaultScript: CheckEvent EVENT_BEAT_LANCE ret nz ld hl, LanceTriggerMovementCoords @@ -61,7 +62,7 @@ LanceScript0: ld a, [wCoordIndex] cp $3 ; Is player standing next to Lance's sprite? jr nc, .notStandingNextToLance - ld a, $1 + ld a, TEXT_LANCESROOM_LANCE ldh [hSpriteIndexOrTextID], a jp DisplayTextID .notStandingNextToLance @@ -83,18 +84,18 @@ LanceTriggerMovementCoords: dbmapcoord 24, 16 db -1 ; end -LanceScript2: +LancesRoomLanceEndBattleScript: call EndTrainerBattle ld a, [wIsInBattle] cp $ff jp z, ResetLanceScript - ld a, $1 + ld a, TEXT_LANCESROOM_LANCE ldh [hSpriteIndexOrTextID], a jp DisplayTextID WalkToLance: ; Moves the player down the hallway to Lance's room. - ld a, $ff + ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ld hl, wSimulatedJoypadStatesEnd ld de, WalkToLance_RLEList @@ -102,7 +103,7 @@ WalkToLance: dec a ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld a, $3 + ld a, SCRIPT_LANCESROOM_PLAYER_IS_MOVING ld [wLancesRoomCurScript], a ld [wCurMapScript], a ret @@ -114,42 +115,43 @@ WalkToLance_RLEList: db D_LEFT, 6 db -1 ; end -LanceScript3: +LancesRoomPlayerIsMovingScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz call Delay3 - xor a + xor a ; SCRIPT_LANCESROOM_DEFAULT ld [wJoyIgnore], a ld [wLancesRoomCurScript], a ld [wCurMapScript], a ret LancesRoom_TextPointers: - dw LanceText1 + def_text_pointers + dw_const LancesRoomLanceText, TEXT_LANCESROOM_LANCE LancesRoomTrainerHeaders: def_trainers LancesRoomTrainerHeader0: - trainer EVENT_BEAT_LANCES_ROOM_TRAINER_0, 0, LanceBeforeBattleText, LanceEndBattleText, LanceAfterBattleText + trainer EVENT_BEAT_LANCES_ROOM_TRAINER_0, 0, LancesRoomLanceBeforeBattleText, LancesRoomLanceEndBattleText, LancesRoomLanceAfterBattleText db -1 ; end -LanceText1: +LancesRoomLanceText: text_asm ld hl, LancesRoomTrainerHeader0 call TalkToTrainer jp TextScriptEnd -LanceBeforeBattleText: - text_far _LanceBeforeBattleText +LancesRoomLanceBeforeBattleText: + text_far _LancesRoomLanceBeforeBattleText text_end -LanceEndBattleText: - text_far _LanceEndBattleText +LancesRoomLanceEndBattleText: + text_far _LancesRoomLanceEndBattleText text_end -LanceAfterBattleText: - text_far _LanceAfterBattleText +LancesRoomLanceAfterBattleText: + text_far _LancesRoomLanceAfterBattleText text_asm SetEvent EVENT_BEAT_LANCE jp TextScriptEnd diff --git a/scripts/LavenderCuboneHouse.asm b/scripts/LavenderCuboneHouse.asm index 69d74edeb..030620078 100644 --- a/scripts/LavenderCuboneHouse.asm +++ b/scripts/LavenderCuboneHouse.asm @@ -3,33 +3,34 @@ LavenderCuboneHouse_Script: ret LavenderCuboneHouse_TextPointers: - dw LavenderHouse2Text1 - dw LavenderHouse2Text2 + def_text_pointers + dw_const LavenderCuboneHouseCuboneText, TEXT_LAVENDERCUBONEHOUSE_CUBONE + dw_const LavenderCuboneHouseBrunetteGirlText, TEXT_LAVENDERCUBONEHOUSE_BRUNETTE_GIRL -LavenderHouse2Text1: - text_far _LavenderHouse2Text1 +LavenderCuboneHouseCuboneText: + text_far _LavenderCuboneHouseCuboneText text_asm ld a, CUBONE call PlayCry jp TextScriptEnd -LavenderHouse2Text2: +LavenderCuboneHouseBrunetteGirlText: text_asm CheckEvent EVENT_RESCUED_MR_FUJI jr nz, .rescued_mr_fuji - ld hl, LavenderHouse2Text_1d9dc + ld hl, .PoorCubonesMotherText call PrintText jr .done .rescued_mr_fuji - ld hl, LavenderHouse2Text_1d9e1 + ld hl, .TheGhostIsGoneText call PrintText .done jp TextScriptEnd -LavenderHouse2Text_1d9dc: - text_far _LavenderHouse2Text_1d9dc +.PoorCubonesMotherText: + text_far _LavenderCuboneHouseBrunetteGirlPoorCubonesMotherText text_end -LavenderHouse2Text_1d9e1: - text_far _LavenderHouse2Text_1d9e1 +.TheGhostIsGoneText: + text_far _LavenderCuboneHouseBrunetteGirlGhostIsGoneText text_end diff --git a/scripts/LavenderMart.asm b/scripts/LavenderMart.asm index 2b67aaa69..15da1bfc3 100644 --- a/scripts/LavenderMart.asm +++ b/scripts/LavenderMart.asm @@ -2,15 +2,16 @@ LavenderMart_Script: jp EnableAutoTextBoxDrawing LavenderMart_TextPointers: - dw LavenderCashierText - dw LavenderMartText2 - dw LavenderMartText3 + def_text_pointers + dw_const LavenderMartClerkText, TEXT_LAVENDERMART_CLERK + dw_const LavenderMartBaldingGuyText, TEXT_LAVENDERMART_BALDING_GUY + dw_const LavenderMartCooltrainerMText, TEXT_LAVENDERMART_COOLTRAINER_M -LavenderMartText2: - text_far _LavenderMartText2 +LavenderMartBaldingGuyText: + text_far _LavenderMartBaldingGuyText text_end -LavenderMartText3: +LavenderMartCooltrainerMText: text_asm CheckEvent EVENT_RESCUED_MR_FUJI jr nz, .Nugget @@ -24,9 +25,9 @@ LavenderMartText3: jp TextScriptEnd .ReviveText - text_far _LavenderMartReviveText + text_far _LavenderMartCooltrainerMReviveText text_end .NuggetText - text_far _LavenderMartNuggetText + text_far _LavenderMartCooltrainerMNuggetText text_end diff --git a/scripts/LavenderPokecenter.asm b/scripts/LavenderPokecenter.asm index b8a1d2a5a..6bcc330be 100644 --- a/scripts/LavenderPokecenter.asm +++ b/scripts/LavenderPokecenter.asm @@ -3,21 +3,22 @@ LavenderPokecenter_Script: jp EnableAutoTextBoxDrawing LavenderPokecenter_TextPointers: - dw LavenderHealNurseText - dw LavenderPokecenterText2 - dw LavenderPokecenterText3 - dw LavenderTradeNurseText + def_text_pointers + dw_const LavenderPokecenterNurseText, TEXT_LAVENDERPOKECENTER_NURSE + dw_const LavenderPokecenterGentlemanText, TEXT_LAVENDERPOKECENTER_GENTLEMAN + dw_const LavenderPokecenterLittleGirlText, TEXT_LAVENDERPOKECENTER_LITTLE_GIRL + dw_const LavenderPokecenterLinkReceptionistText, TEXT_LAVENDERPOKECENTER_LINK_RECEPTIONIST -LavenderTradeNurseText: +LavenderPokecenterLinkReceptionistText: script_cable_club_receptionist -LavenderHealNurseText: +LavenderPokecenterNurseText: script_pokecenter_nurse -LavenderPokecenterText2: - text_far _LavenderPokecenterText2 +LavenderPokecenterGentlemanText: + text_far _LavenderPokecenterGentlemanText text_end -LavenderPokecenterText3: - text_far _LavenderPokecenterText3 +LavenderPokecenterLittleGirlText: + text_far _LavenderPokecenterLittleGirlText text_end diff --git a/scripts/LavenderTown.asm b/scripts/LavenderTown.asm index d0c662086..1c8b60009 100644 --- a/scripts/LavenderTown.asm +++ b/scripts/LavenderTown.asm @@ -2,62 +2,63 @@ LavenderTown_Script: jp EnableAutoTextBoxDrawing LavenderTown_TextPointers: - dw LavenderTownText1 - dw LavenderTownText2 - dw LavenderTownText3 - dw LavenderTownText4 - dw LavenderTownText5 - dw MartSignText - dw PokeCenterSignText - dw LavenderTownText8 - dw LavenderTownText9 - -LavenderTownText1: + def_text_pointers + dw_const LavenderTownLittleGirlText, TEXT_LAVENDERTOWN_LITTLE_GIRL + dw_const LavenderTownCooltrainerMText, TEXT_LAVENDERTOWN_COOLTRAINER_M + dw_const LavenderTownSuperNerdText, TEXT_LAVENDERTOWN_SUPER_NERD + dw_const LavenderTownSignText, TEXT_LAVENDERTOWN_SIGN + dw_const LavenderTownSilphScopeSignText, TEXT_LAVENDERTOWN_SILPH_SCOPE_SIGN + dw_const MartSignText, TEXT_LAVENDERTOWN_MART_SIGN + dw_const PokeCenterSignText, TEXT_LAVENDERTOWN_POKECENTER_SIGN + dw_const LavenderTownPokemonHouseSignText, TEXT_LAVENDERTOWN_POKEMON_HOUSE_SIGN + dw_const LavenderTownPokemonTowerSignText, TEXT_LAVENDERTOWN_POKEMON_TOWER_SIGN + +LavenderTownLittleGirlText: text_asm - ld hl, LavenderTownText_4413c + ld hl, .DoYouBelieveInGhostsText call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a - ld hl, LavenderTownText_44146 + ld hl, .HaHaGuessNotText jr nz, .got_text - ld hl, LavenderTownText_44141 + ld hl, .SoThereAreBelieversText .got_text call PrintText jp TextScriptEnd -LavenderTownText_4413c: - text_far _LavenderTownText_4413c +.DoYouBelieveInGhostsText: + text_far _LavenderTownLittleGirlDoYouBelieveInGhostsText text_end -LavenderTownText_44141: - text_far _LavenderTownText_44141 +.SoThereAreBelieversText: + text_far _LavenderTownLittleGirlSoThereAreBelieversText text_end -LavenderTownText_44146: - text_far _LavenderTownText_44146 +.HaHaGuessNotText: + text_far _LavenderTownLittleGirlHaHaGuessNotText text_end -LavenderTownText2: - text_far _LavenderTownText2 +LavenderTownCooltrainerMText: + text_far _LavenderTownCooltrainerMText text_end -LavenderTownText3: - text_far _LavenderTownText3 +LavenderTownSuperNerdText: + text_far _LavenderTownSuperNerdText text_end -LavenderTownText4: - text_far _LavenderTownText4 +LavenderTownSignText: + text_far _LavenderTownSignText text_end -LavenderTownText5: - text_far _LavenderTownText5 +LavenderTownSilphScopeSignText: + text_far _LavenderTownSilphScopeSignText text_end -LavenderTownText8: - text_far _LavenderTownText8 +LavenderTownPokemonHouseSignText: + text_far _LavenderTownPokemonHouseSignText text_end -LavenderTownText9: - text_far _LavenderTownText9 +LavenderTownPokemonTowerSignText: + text_far _LavenderTownPokemonTowerSignText text_end diff --git a/scripts/LoreleisRoom.asm b/scripts/LoreleisRoom.asm index 1f42fa2ec..c1cc2adb1 100644 --- a/scripts/LoreleisRoom.asm +++ b/scripts/LoreleisRoom.asm @@ -28,18 +28,19 @@ LoreleiShowOrHideExitBlock: predef_jump ReplaceTileBlock ResetLoreleiScript: - xor a + xor a ; SCRIPT_LORELEISROOM_DEFAULT ld [wLoreleisRoomCurScript], a ret LoreleisRoom_ScriptPointers: - dw LoreleiScript0 - dw DisplayEnemyTrainerTextAndStartBattle - dw LoreleiScript2 - dw LoreleiScript3 - dw LoreleiScript4 - -LoreleiScript4: + def_script_pointers + dw_const LoreleisRoomDefaultScript, SCRIPT_LORELEISROOM_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_LORELEISROOM_LORELEI_START_BATTLE + dw_const LoreleisRoomLoreleiEndBattleScript, SCRIPT_LORELEISROOM_LORELEI_END_BATTLE + dw_const LoreleisRoomPlayerIsMovingScript, SCRIPT_LORELEISROOM_PLAYER_IS_MOVING + dw_const LoreleisRoomNoopScript, SCRIPT_LORELEISROOM_NOOP + +LoreleisRoomNoopScript: ret LoreleiScriptWalkIntoRoom: @@ -55,12 +56,12 @@ LoreleiScriptWalkIntoRoom: ld a, $6 ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld a, $3 + ld a, SCRIPT_LORELEISROOM_PLAYER_IS_MOVING ld [wLoreleisRoomCurScript], a ld [wCurMapScript], a ret -LoreleiScript0: +LoreleisRoomDefaultScript: ld hl, LoreleiEntranceCoords call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers @@ -75,7 +76,7 @@ LoreleiScript0: CheckAndSetEvent EVENT_AUTOWALKED_INTO_LORELEIS_ROOM jr z, LoreleiScriptWalkIntoRoom .stopPlayerFromLeaving - ld a, $2 + ld a, TEXT_LORELEISROOM_DONT_RUN_AWAY ldh [hSpriteIndexOrTextID], a call DisplayTextID ; "Don't run away!" ld a, D_UP @@ -83,7 +84,7 @@ LoreleiScript0: ld a, $1 ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld a, $3 + ld a, SCRIPT_LORELEISROOM_PLAYER_IS_MOVING ld [wLoreleisRoomCurScript], a ld [wCurMapScript], a ret @@ -95,7 +96,7 @@ LoreleiEntranceCoords: dbmapcoord 5, 11 db -1 ; end -LoreleiScript3: +LoreleisRoomPlayerIsMovingScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -106,43 +107,44 @@ LoreleiScript3: ld [wCurMapScript], a ret -LoreleiScript2: +LoreleisRoomLoreleiEndBattleScript: call EndTrainerBattle ld a, [wIsInBattle] cp $ff jp z, ResetLoreleiScript - ld a, $1 + ld a, TEXT_LORELEISROOM_LORELEI ldh [hSpriteIndexOrTextID], a jp DisplayTextID LoreleisRoom_TextPointers: - dw LoreleiText1 - dw LoreleiDontRunAwayText + def_text_pointers + dw_const LoreleisRoomLoreleiText, TEXT_LORELEISROOM_LORELEI + dw_const LoreleisRoomLoreleiDontRunAwayText, TEXT_LORELEISROOM_DONT_RUN_AWAY LoreleisRoomTrainerHeaders: def_trainers LoreleisRoomTrainerHeader0: - trainer EVENT_BEAT_LORELEIS_ROOM_TRAINER_0, 0, LoreleiBeforeBattleText, LoreleiEndBattleText, LoreleiAfterBattleText + trainer EVENT_BEAT_LORELEIS_ROOM_TRAINER_0, 0, LoreleisRoomLoreleiBeforeBattleText, LoreleisRoomLoreleiEndBattleText, LoreleisRoomLoreleiAfterBattleText db -1 ; end -LoreleiText1: +LoreleisRoomLoreleiText: text_asm ld hl, LoreleisRoomTrainerHeader0 call TalkToTrainer jp TextScriptEnd -LoreleiBeforeBattleText: - text_far _LoreleiBeforeBattleText +LoreleisRoomLoreleiBeforeBattleText: + text_far _LoreleisRoomLoreleiBeforeBattleText text_end -LoreleiEndBattleText: - text_far _LoreleiEndBattleText +LoreleisRoomLoreleiEndBattleText: + text_far _LoreleisRoomLoreleiEndBattleText text_end -LoreleiAfterBattleText: - text_far _LoreleiAfterBattleText +LoreleisRoomLoreleiAfterBattleText: + text_far _LoreleisRoomLoreleiAfterBattleText text_end -LoreleiDontRunAwayText: - text_far _LoreleiDontRunAwayText +LoreleisRoomLoreleiDontRunAwayText: + text_far _LoreleisRoomLoreleiDontRunAwayText text_end diff --git a/scripts/MrFujisHouse.asm b/scripts/MrFujisHouse.asm index 3ef3017aa..cd47df0fc 100644 --- a/scripts/MrFujisHouse.asm +++ b/scripts/MrFujisHouse.asm @@ -3,110 +3,111 @@ MrFujisHouse_Script: ret MrFujisHouse_TextPointers: - dw LavenderHouse1Text1 - dw LavenderHouse1Text2 - dw LavenderHouse1Text3 - dw LavenderHouse1Text4 - dw LavenderHouse1Text5 - dw LavenderHouse1Text6 + def_text_pointers + dw_const MrFujisHouseSuperNerdText, TEXT_MRFUJISHOUSE_SUPER_NERD + dw_const MrFujisHouseLittleGirlText, TEXT_MRFUJISHOUSE_LITTLE_GIRL + dw_const MrFujisHousePsyduckText, TEXT_MRFUJISHOUSE_PSYDUCK + dw_const MrFujisHouseNidorinoText, TEXT_MRFUJISHOUSE_NIDORINO + dw_const MrFujisHouseMrFujiText, TEXT_MRFUJISHOUSE_MR_FUJI + dw_const MrFujisHouseMrFujiPokedexText, TEXT_MRFUJISHOUSE_POKEDEX -LavenderHouse1Text1: +MrFujisHouseSuperNerdText: text_asm CheckEvent EVENT_RESCUED_MR_FUJI jr nz, .rescued_mr_fuji - ld hl, LavenderHouse1Text_1d8d1 + ld hl, .MrFujiIsntHereText call PrintText jr .done .rescued_mr_fuji - ld hl, LavenderHouse1Text_1d8d6 + ld hl, .MrFujiHadBeenPrayingText call PrintText .done jp TextScriptEnd -LavenderHouse1Text_1d8d1: - text_far _LavenderHouse1Text_1d8d1 +.MrFujiIsntHereText: + text_far _MrFujisHouseSuperNerdMrFujiIsntHereText text_end -LavenderHouse1Text_1d8d6: - text_far _LavenderHouse1Text_1d8d6 +.MrFujiHadBeenPrayingText: + text_far _MrFujisHouseSuperNerdMrFujiHadBeenPrayingText text_end -LavenderHouse1Text2: +MrFujisHouseLittleGirlText: text_asm CheckEvent EVENT_RESCUED_MR_FUJI jr nz, .rescued_mr_fuji - ld hl, LavenderHouse1Text_1d8f4 + ld hl, .ThisIsMrFujisHouseText call PrintText jr .done .rescued_mr_fuji - ld hl, LavenderHouse1Text_1d8f9 + ld hl, .PokemonAreNiceToHugText call PrintText .done jp TextScriptEnd -LavenderHouse1Text_1d8f4: - text_far _LavenderHouse1Text_1d8f4 +.ThisIsMrFujisHouseText: + text_far _MrFujisHouseLittleGirlThisIsMrFujisHouseText text_end -LavenderHouse1Text_1d8f9: - text_far _LavenderHouse1Text_1d8f9 +.PokemonAreNiceToHugText: + text_far _MrFujisHouseLittleGirlPokemonAreNiceToHugText text_end -LavenderHouse1Text3: - text_far _LavenderHouse1Text3 +MrFujisHousePsyduckText: + text_far _MrFujisHousePsyduckText text_asm ld a, PSYDUCK call PlayCry jp TextScriptEnd -LavenderHouse1Text4: - text_far _LavenderHouse1Text4 +MrFujisHouseNidorinoText: + text_far _MrFujisHouseNidorinoText text_asm ld a, NIDORINO call PlayCry jp TextScriptEnd -LavenderHouse1Text5: +MrFujisHouseMrFujiText: text_asm CheckEvent EVENT_GOT_POKE_FLUTE jr nz, .got_item - ld hl, LavenderHouse1Text_1d94c + ld hl, .IThinkThisMayHelpYourQuestText call PrintText lb bc, POKE_FLUTE, 1 call GiveItem jr nc, .bag_full - ld hl, ReceivedFluteText + ld hl, .ReceivedPokeFluteText call PrintText SetEvent EVENT_GOT_POKE_FLUTE jr .done .bag_full - ld hl, FluteNoRoomText + ld hl, .PokeFluteNoRoomText call PrintText jr .done .got_item - ld hl, MrFujiAfterFluteText + ld hl, .HasMyFluteHelpedYouText call PrintText .done jp TextScriptEnd -LavenderHouse1Text_1d94c: - text_far _LavenderHouse1Text_1d94c +.IThinkThisMayHelpYourQuestText: + text_far _MrFujisHouseMrFujiIThinkThisMayHelpYourQuestText text_end -ReceivedFluteText: - text_far _ReceivedFluteText +.ReceivedPokeFluteText: + text_far _MrFujisHouseMrFujiReceivedPokeFluteText sound_get_key_item - text_far _FluteExplanationText + text_far _MrFujisHouseMrFujiPokeFluteExplanationText text_end -FluteNoRoomText: - text_far _FluteNoRoomText +.PokeFluteNoRoomText: + text_far _MrFujisHouseMrFujiPokeFluteNoRoomText text_end -MrFujiAfterFluteText: - text_far _MrFujiAfterFluteText +.HasMyFluteHelpedYouText: + text_far _MrFujisHouseMrFujiHasMyFluteHelpedYouText text_end -LavenderHouse1Text6: - text_far _LavenderHouse1Text6 +MrFujisHouseMrFujiPokedexText: + text_far _MrFujisHouseMrFujiPokedexText text_end diff --git a/scripts/MrPsychicsHouse.asm b/scripts/MrPsychicsHouse.asm index 399edfbd4..f5cb4b0d4 100644 --- a/scripts/MrPsychicsHouse.asm +++ b/scripts/MrPsychicsHouse.asm @@ -2,44 +2,45 @@ MrPsychicsHouse_Script: jp EnableAutoTextBoxDrawing MrPsychicsHouse_TextPointers: - dw SaffronHouse2Text1 + def_text_pointers + dw_const MrPsychicsHouseMrPsychicText, TEXT_MRPSYCHICSHOUSE_MR_PSYCHIC -SaffronHouse2Text1: +MrPsychicsHouseMrPsychicText: text_asm CheckEvent EVENT_GOT_TM29 jr nz, .got_item - ld hl, TM29PreReceiveText + ld hl, .YouWantedThisText call PrintText lb bc, TM_PSYCHIC_M, 1 call GiveItem jr nc, .bag_full - ld hl, ReceivedTM29Text + ld hl, .ReceivedTM29Text call PrintText SetEvent EVENT_GOT_TM29 jr .done .bag_full - ld hl, TM29NoRoomText + ld hl, .TM29NoRoomText call PrintText jr .done .got_item - ld hl, TM29ExplanationText + ld hl, .TM29ExplanationText call PrintText .done jp TextScriptEnd -TM29PreReceiveText: - text_far _TM29PreReceiveText +.YouWantedThisText: + text_far _MrPsychicsHouseMrPsychicYouWantedThisText text_end -ReceivedTM29Text: - text_far _ReceivedTM29Text +.ReceivedTM29Text: + text_far _MrPsychicsHouseMrPsychicReceivedTM29Text sound_get_item_1 text_end -TM29ExplanationText: - text_far _TM29ExplanationText +.TM29ExplanationText: + text_far _MrPsychicsHouseMrPsychicTM29ExplanationText text_end -TM29NoRoomText: - text_far _TM29NoRoomText +.TM29NoRoomText: + text_far _MrPsychicsHouseMrPsychicTM29NoRoomText text_end diff --git a/scripts/MtMoon1F.asm b/scripts/MtMoon1F.asm index d0477d2ce..43ab3e3ff 100644 --- a/scripts/MtMoon1F.asm +++ b/scripts/MtMoon1F.asm @@ -8,170 +8,172 @@ MtMoon1F_Script: ret MtMoon1F_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_MTMOON1F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_MTMOON1F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_MTMOON1F_END_BATTLE MtMoon1F_TextPointers: - dw MtMoon1Text1 - dw MtMoon1Text2 - dw MtMoon1Text3 - dw MtMoon1Text4 - dw MtMoon1Text5 - dw MtMoon1Text6 - dw MtMoon1Text7 - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw MtMoon1Text14 + def_text_pointers + dw_const MtMoon1FHikerText, TEXT_MTMOON1F_HIKER + dw_const MtMoon1FYoungster1Text, TEXT_MTMOON1F_YOUNGSTER1 + dw_const MtMoon1FCooltrainerF1Text, TEXT_MTMOON1F_COOLTRAINER_F1 + dw_const MtMoon1FSuperNerdText, TEXT_MTMOON1F_SUPER_NERD + dw_const MtMoon1FCooltrainerF2Text, TEXT_MTMOON1F_COOLTRAINER_F2 + dw_const MtMoon1FYoungster2Text, TEXT_MTMOON1F_YOUNGSTER2 + dw_const MtMoon1FYoungster3Text, TEXT_MTMOON1F_YOUNGSTER3 + dw_const PickUpItemText, TEXT_MTMOON1F_POTION1 + dw_const PickUpItemText, TEXT_MTMOON1F_MOON_STONE + dw_const PickUpItemText, TEXT_MTMOON1F_RARE_CANDY + dw_const PickUpItemText, TEXT_MTMOON1F_ESCAPE_ROPE + dw_const PickUpItemText, TEXT_MTMOON1F_POTION2 + dw_const PickUpItemText, TEXT_MTMOON1F_TM_WATER_GUN + dw_const MtMoon1FBewareZubatSign, TEXT_MTMOON1F_BEWARE_ZUBAT_SIGN MtMoon1TrainerHeaders: def_trainers MtMoon1TrainerHeader0: - trainer EVENT_BEAT_MT_MOON_1_TRAINER_0, 2, MtMoon1BattleText2, MtMoon1EndBattleText2, MtMoon1AfterBattleText2 + trainer EVENT_BEAT_MT_MOON_1_TRAINER_0, 2, MtMoon1FHikerBattleText, MtMoon1FHikerEndBattleText, MtMoon1FHikerAfterBattleText MtMoon1TrainerHeader1: - trainer EVENT_BEAT_MT_MOON_1_TRAINER_1, 3, MtMoon1BattleText3, MtMoon1EndBattleText3, MtMoon1AfterBattleText3 + trainer EVENT_BEAT_MT_MOON_1_TRAINER_1, 3, MtMoon1FYoungster1BattleText, MtMoon1FYoungster1EndBattleText, MtMoon1FYoungster1AfterBattleText MtMoon1TrainerHeader2: - trainer EVENT_BEAT_MT_MOON_1_TRAINER_2, 3, MtMoon1BattleText4, MtMoon1EndBattleText4, MtMoon1AfterBattleText4 + trainer EVENT_BEAT_MT_MOON_1_TRAINER_2, 3, MtMoon1FCooltrainerF1BattleText, MtMoon1FCooltrainerF1EndBattleText, MtMoon1FCooltrainerF1AfterBattleText MtMoon1TrainerHeader3: - trainer EVENT_BEAT_MT_MOON_1_TRAINER_3, 3, MtMoon1BattleText5, MtMoon1EndBattleText5, MtMoon1AfterBattleText5 + trainer EVENT_BEAT_MT_MOON_1_TRAINER_3, 3, MtMoon1FSuperNerdBattleText, MtMoon1FSuperNerdEndBattleText, MtMoon1FSuperNerdAfterBattleText MtMoon1TrainerHeader4: - trainer EVENT_BEAT_MT_MOON_1_TRAINER_4, 3, MtMoon1BattleText6, MtMoon1EndBattleText6, MtMoon1AfterBattleText6 + trainer EVENT_BEAT_MT_MOON_1_TRAINER_4, 3, MtMoon1FCooltrainerF2BattleText, MtMoon1FCooltrainerF2EndBattleText, MtMoon1FCooltrainerF2AfterBattleText MtMoon1TrainerHeader5: - trainer EVENT_BEAT_MT_MOON_1_TRAINER_5, 3, MtMoon1BattleText7, MtMoon1EndBattleText7, MtMoon1AfterBattleText7 + trainer EVENT_BEAT_MT_MOON_1_TRAINER_5, 3, MtMoon1FYoungster2BattleText, MtMoon1FYoungster2EndBattleText, MtMoon1FYoungster2AfterBattleText MtMoon1TrainerHeader6: - trainer EVENT_BEAT_MT_MOON_1_TRAINER_6, 3, MtMoon1BattleText8, MtMoon1EndBattleText8, MtMoon1AfterBattleText8 + trainer EVENT_BEAT_MT_MOON_1_TRAINER_6, 3, MtMoon1FYoungster3BattleText, MtMoon1FYoungster3EndBattleText, MtMoon1FYoungster3AfterBattleText db -1 ; end -MtMoon1Text1: +MtMoon1FHikerText: text_asm ld hl, MtMoon1TrainerHeader0 call TalkToTrainer jp TextScriptEnd -MtMoon1Text2: +MtMoon1FYoungster1Text: text_asm ld hl, MtMoon1TrainerHeader1 call TalkToTrainer jp TextScriptEnd -MtMoon1Text3: +MtMoon1FCooltrainerF1Text: text_asm ld hl, MtMoon1TrainerHeader2 call TalkToTrainer jp TextScriptEnd -MtMoon1Text4: +MtMoon1FSuperNerdText: text_asm ld hl, MtMoon1TrainerHeader3 call TalkToTrainer jp TextScriptEnd -MtMoon1Text5: +MtMoon1FCooltrainerF2Text: text_asm ld hl, MtMoon1TrainerHeader4 call TalkToTrainer jp TextScriptEnd -MtMoon1Text6: +MtMoon1FYoungster2Text: text_asm ld hl, MtMoon1TrainerHeader5 call TalkToTrainer jp TextScriptEnd -MtMoon1Text7: +MtMoon1FYoungster3Text: text_asm ld hl, MtMoon1TrainerHeader6 call TalkToTrainer jp TextScriptEnd -MtMoon1BattleText2: - text_far _MtMoon1BattleText2 +MtMoon1FHikerBattleText: + text_far _MtMoon1FHikerBattleText text_end -MtMoon1EndBattleText2: - text_far _MtMoon1EndBattleText2 +MtMoon1FHikerEndBattleText: + text_far _MtMoon1FHikerEndBattleText text_end -MtMoon1AfterBattleText2: - text_far _MtMoon1AfterBattleText2 +MtMoon1FHikerAfterBattleText: + text_far _MtMoon1FHikerAfterBattleText text_end -MtMoon1BattleText3: - text_far _MtMoon1BattleText3 +MtMoon1FYoungster1BattleText: + text_far _MtMoon1FYoungster1BattleText text_end -MtMoon1EndBattleText3: - text_far _MtMoon1EndBattleText3 +MtMoon1FYoungster1EndBattleText: + text_far _MtMoon1FYoungster1EndBattleText text_end -MtMoon1AfterBattleText3: - text_far _MtMoon1AfterBattleText3 +MtMoon1FYoungster1AfterBattleText: + text_far _MtMoon1FYoungster1AfterBattleText text_end -MtMoon1BattleText4: - text_far _MtMoon1BattleText4 +MtMoon1FCooltrainerF1BattleText: + text_far _MtMoon1FCooltrainerF1BattleText text_end -MtMoon1EndBattleText4: - text_far _MtMoon1EndBattleText4 +MtMoon1FCooltrainerF1EndBattleText: + text_far _MtMoon1FCooltrainerF1EndBattleText text_end -MtMoon1AfterBattleText4: - text_far _MtMoon1AfterBattleText4 +MtMoon1FCooltrainerF1AfterBattleText: + text_far _MtMoon1FCooltrainerF1AfterBattleText text_end -MtMoon1BattleText5: - text_far _MtMoon1BattleText5 +MtMoon1FSuperNerdBattleText: + text_far _MtMoon1FSuperNerdBattleText text_end -MtMoon1EndBattleText5: - text_far _MtMoon1EndBattleText5 +MtMoon1FSuperNerdEndBattleText: + text_far _MtMoon1FSuperNerdEndBattleText text_end -MtMoon1AfterBattleText5: - text_far _MtMoon1AfterBattleText5 +MtMoon1FSuperNerdAfterBattleText: + text_far _MtMoon1FSuperNerdAfterBattleText text_end -MtMoon1BattleText6: - text_far _MtMoon1BattleText6 +MtMoon1FCooltrainerF2BattleText: + text_far _MtMoon1FCooltrainerF2BattleText text_end -MtMoon1EndBattleText6: - text_far _MtMoon1EndBattleText6 +MtMoon1FCooltrainerF2EndBattleText: + text_far _MtMoon1FCooltrainerF2EndBattleText text_end -MtMoon1AfterBattleText6: - text_far _MtMoon1AfterBattleText6 +MtMoon1FCooltrainerF2AfterBattleText: + text_far _MtMoon1FCooltrainerF2AfterBattleText text_end -MtMoon1BattleText7: - text_far _MtMoon1BattleText7 +MtMoon1FYoungster2BattleText: + text_far _MtMoon1FYoungster2BattleText text_end -MtMoon1EndBattleText7: - text_far _MtMoon1EndBattleText7 +MtMoon1FYoungster2EndBattleText: + text_far _MtMoon1FYoungster2EndBattleText text_end -MtMoon1AfterBattleText7: - text_far _MtMoon1AfterBattleText7 +MtMoon1FYoungster2AfterBattleText: + text_far _MtMoon1FYoungster2AfterBattleText text_end -MtMoon1BattleText8: - text_far _MtMoon1BattleText8 +MtMoon1FYoungster3BattleText: + text_far _MtMoon1FYoungster3BattleText text_end -MtMoon1EndBattleText8: - text_far _MtMoon1EndBattleText8 +MtMoon1FYoungster3EndBattleText: + text_far _MtMoon1FYoungster3EndBattleText text_end -MtMoon1AfterBattleText8: - text_far _MtMoon1AfterBattleText8 +MtMoon1FYoungster3AfterBattleText: + text_far _MtMoon1FYoungster3AfterBattleText text_end -MtMoon1Text14: - text_far _MtMoon1Text14 +MtMoon1FBewareZubatSign: + text_far _MtMoon1FBewareZubatSign text_end diff --git a/scripts/MtMoonB1F.asm b/scripts/MtMoonB1F.asm index 06af2dd32..16ed43788 100644 --- a/scripts/MtMoonB1F.asm +++ b/scripts/MtMoonB1F.asm @@ -3,8 +3,9 @@ MtMoonB1F_Script: ret MtMoonB1F_TextPointers: - dw MtMoonText1 + def_text_pointers + dw_const MtMoonB1FUnusedText, TEXT_MTMOONB1F_UNUSED -MtMoonText1: - text_far _MtMoonText1 +MtMoonB1FUnusedText: + text_far _MtMoonB1FUnusedText text_end diff --git a/scripts/MtMoonB2F.asm b/scripts/MtMoonB2F.asm index dbfca6a32..6e2dc8455 100644 --- a/scripts/MtMoonB2F.asm +++ b/scripts/MtMoonB2F.asm @@ -37,345 +37,347 @@ CoordsData_49d37: dbmapcoord 14, 8 db -1 ; end -MtMoon3Script_49d58: - xor a +MtMoonB2FResetScripts: + xor a ; SCRIPT_MTMOONB2F_DEFAULT ld [wJoyIgnore], a ld [wMtMoonB2FCurScript], a ld [wCurMapScript], a ret MtMoonB2F_ScriptPointers: - dw MtMoon3Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw MtMoon3Script3 - dw MtMoon3Script4 - dw MtMoon3Script5 - -MtMoon3Script0: + def_script_pointers + dw_const MtMoonB2FDefaultScript, SCRIPT_MTMOONB2F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_MTMOONB2F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_MTMOONB2F_END_BATTLE + dw_const MtMoonB2FDefeatedSuperNerdScript, SCRIPT_MTMOONB2F_DEFEATED_SUPER_NERD + dw_const MtMoonB2FMoveSuperNerdScript, SCRIPT_MTMOONB2F_MOVE_SUPER_NERD + dw_const MtMoonB2FSuperNerdTakesOtherFossilScript, SCRIPT_MTMOONB2F_SUPER_NERD_TAKES_OTHER_FOSSIL + +MtMoonB2FDefaultScript: CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD - jp nz, MtMoon3Script_49d91 + jp nz, MtMoonB2FCheckGotAFossil ld a, [wYCoord] cp 8 - jp nz, MtMoon3Script_49d91 + jp nz, MtMoonB2FCheckGotAFossil ld a, [wXCoord] cp 13 - jp nz, MtMoon3Script_49d91 + jp nz, MtMoonB2FCheckGotAFossil xor a ldh [hJoyHeld], a - ld a, $1 + ld a, TEXT_MTMOONB2F_SUPER_NERD ldh [hSpriteIndexOrTextID], a jp DisplayTextID -MtMoon3Script_49d91: +MtMoonB2FCheckGotAFossil: CheckEitherEventSet EVENT_GOT_DOME_FOSSIL, EVENT_GOT_HELIX_FOSSIL jp z, CheckFightingMapTrainers ret -MtMoon3Script3: +MtMoonB2FDefeatedSuperNerdScript: ld a, [wIsInBattle] cp $ff - jp z, MtMoon3Script_49d58 + jp z, MtMoonB2FResetScripts call UpdateSprites call Delay3 SetEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD xor a ld [wJoyIgnore], a - ld a, $0 + ld a, SCRIPT_MTMOONB2F_DEFAULT ld [wMtMoonB2FCurScript], a ld [wCurMapScript], a ret -MtMoon3Script4: - ld a, $1 +MtMoonB2FMoveSuperNerdScript: + ld a, MTMOONB2F_SUPER_NERD ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF - ld hl, CoordsData_49dea + ld hl, MtMoonB2FPlayerNearDomeFossilCoords call ArePlayerCoordsInArray - jr c, .asm_49dd7 - ld hl, CoordsData_49df1 + jr c, .player_near_dome_fossil + ld hl, MtMoonB2FPlayerNearHelixFossilCoords call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers - ld de, MovementData_49df9 - jr .asm_49dda -.asm_49dd7 - ld de, MovementData_49df8 -.asm_49dda - ld a, $1 + ld de, MtMoon3FSuperNerdMoveUpMovementData + jr .continue +.player_near_dome_fossil + ld de, MtMoon3FSuperNerdMoveRightMovementData +.continue + ld a, MTMOONB2F_SUPER_NERD ldh [hSpriteIndex], a call MoveSprite - ld a, $5 + ld a, SCRIPT_MTMOONB2F_SUPER_NERD_TAKES_OTHER_FOSSIL ld [wMtMoonB2FCurScript], a ld [wCurMapScript], a ret -CoordsData_49dea: +MtMoonB2FPlayerNearDomeFossilCoords: dbmapcoord 12, 7 dbmapcoord 11, 6 dbmapcoord 12, 5 db -1 ; end -CoordsData_49df1: +MtMoonB2FPlayerNearHelixFossilCoords: dbmapcoord 13, 7 dbmapcoord 14, 6 dbmapcoord 14, 5 db -1 ; end -MovementData_49df8: +MtMoon3FSuperNerdMoveRightMovementData: db NPC_MOVEMENT_RIGHT -MovementData_49df9: +MtMoon3FSuperNerdMoveUpMovementData: db NPC_MOVEMENT_UP db -1 ; end -MtMoon3Script5: +MtMoonB2FSuperNerdTakesOtherFossilScript: ld a, [wd730] bit 0, a ret nz - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld a, $a + ld a, TEXT_MTMOONB2F_SUPER_NERD_THEN_THIS_IS_MINE ldh [hSpriteIndexOrTextID], a call DisplayTextID CheckEvent EVENT_GOT_DOME_FOSSIL - jr z, .asm_49e1d + jr z, .got_dome_fossil ld a, HS_MT_MOON_B2F_FOSSIL_2 - jr .asm_49e1f -.asm_49e1d + jr .continue +.got_dome_fossil ld a, HS_MT_MOON_B2F_FOSSIL_1 -.asm_49e1f +.continue ld [wMissableObjectIndex], a predef HideObject xor a ld [wJoyIgnore], a - ld a, $0 + ld a, SCRIPT_MTMOONB2F_DEFAULT ld [wMtMoonB2FCurScript], a ld [wCurMapScript], a ret MtMoonB2F_TextPointers: - dw MtMoon3Text1 - dw MtMoon3Text2 - dw MtMoon3Text3 - dw MtMoon3Text4 - dw MtMoon3Text5 - dw MtMoon3Text6 - dw MtMoon3Text7 - dw PickUpItemText - dw PickUpItemText - dw MtMoon3Text_49f99 + def_text_pointers + dw_const MtMoonB2FSuperNerdText, TEXT_MTMOONB2F_SUPER_NERD + dw_const MtMoonB2FRocket1Text, TEXT_MTMOONB2F_ROCKET1 + dw_const MtMoonB2FRocket2Text, TEXT_MTMOONB2F_ROCKET2 + dw_const MtMoonB2FRocket3Text, TEXT_MTMOONB2F_ROCKET3 + dw_const MtMoonB2FRocket4Text, TEXT_MTMOONB2F_ROCKET4 + dw_const MtMoonB2FDomeFossilText, TEXT_MTMOONB2F_DOME_FOSSIL + dw_const MtMoonB2FHelixFossilText, TEXT_MTMOONB2F_HELIX_FOSSIL + dw_const PickUpItemText, TEXT_MTMOONB2F_HP_UP + dw_const PickUpItemText, TEXT_MTMOONB2F_TM_MEGA_PUNCH + dw_const MtMoonB2FSuperNerdThenThisIsMineText, TEXT_MTMOONB2F_SUPER_NERD_THEN_THIS_IS_MINE MtMoon3TrainerHeaders: def_trainers 2 MtMoon3TrainerHeader0: - trainer EVENT_BEAT_MT_MOON_3_TRAINER_0, 4, MtMoon3BattleText2, MtMoon3EndBattleText2, MtMoon3AfterBattleText2 + trainer EVENT_BEAT_MT_MOON_3_TRAINER_0, 4, MtMoonB2FRocket1BattleText, MtMoonB2FRocket1EndBattleText, MtMoonB2FRocket1AfterBattleText MtMoon3TrainerHeader1: - trainer EVENT_BEAT_MT_MOON_3_TRAINER_1, 4, MtMoon3BattleText3, MtMoon3EndBattleText3, MtMoon3AfterBattleText3 + trainer EVENT_BEAT_MT_MOON_3_TRAINER_1, 4, MtMoonB2FRocket2BattleText, MtMoonB2FRocket2EndBattleText, MtMoonB2FRocket2AfterBattleText MtMoon3TrainerHeader2: - trainer EVENT_BEAT_MT_MOON_3_TRAINER_2, 4, MtMoon3BattleText4, MtMoon3EndBattleText4, MtMoon3AfterBattleText4 + trainer EVENT_BEAT_MT_MOON_3_TRAINER_2, 4, MtMoonB2FRocket3BattleText, MtMoonB2FRocket3EndBattleText, MtMoonB2FRocket3AfterBattleText MtMoon3TrainerHeader3: - trainer EVENT_BEAT_MT_MOON_3_TRAINER_3, 4, MtMoon3BattleText5, MtMoon3EndBattleText5, MtMoon3AfterBattleText5 + trainer EVENT_BEAT_MT_MOON_3_TRAINER_3, 4, MtMoonB2FRocket4BattleText, MtMoonB2FRocket4EndBattleText, MtMoonB2FRocket4AfterBattleText db -1 ; end -MtMoon3Text1: +MtMoonB2FSuperNerdText: text_asm CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD - jr z, .asm_49e8d + jr z, .beat_super_nerd ; CheckEitherEventSetReuseA EVENT_GOT_DOME_FOSSIL, EVENT_GOT_HELIX_FOSSIL and (1 << (EVENT_GOT_DOME_FOSSIL % 8)) | (1 << (EVENT_GOT_HELIX_FOSSIL % 8)) - jr nz, .asm_49eb8 - ld hl, MtMoon3Text_49f8f + jr nz, .got_a_fossil + ld hl, MtMoonB2fSuperNerdEachTakeOneText call PrintText - jr .asm_49ebe -.asm_49e8d - ld hl, MtMoon3Text_49f85 + jr .done +.beat_super_nerd + ld hl, MtMoonB2FSuperNerdTheyreBothMineText call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, MtMoon3Text_49f8a - ld de, MtMoon3Text_49f8a + ld hl, MtMoonB2FSuperNerdOkIllShareText + ld de, MtMoonB2FSuperNerdOkIllShareText call SaveEndBattleTextPointers ldh a, [hSpriteIndex] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters - ld a, $3 + ld a, SCRIPT_MTMOONB2F_DEFEATED_SUPER_NERD ld [wMtMoonB2FCurScript], a ld [wCurMapScript], a - jr .asm_49ebe -.asm_49eb8 - ld hl, MtMoon3Text_49f94 + jr .done +.got_a_fossil + ld hl, MtMoonB2FSuperNerdTheresAPokemonLabText call PrintText -.asm_49ebe +.done jp TextScriptEnd -MtMoon3Text2: +MtMoonB2FRocket1Text: text_asm ld hl, MtMoon3TrainerHeader0 call TalkToTrainer jp TextScriptEnd -MtMoon3Text3: +MtMoonB2FRocket2Text: text_asm ld hl, MtMoon3TrainerHeader1 call TalkToTrainer jp TextScriptEnd -MtMoon3Text4: +MtMoonB2FRocket3Text: text_asm ld hl, MtMoon3TrainerHeader2 call TalkToTrainer jp TextScriptEnd -MtMoon3Text5: +MtMoonB2FRocket4Text: text_asm ld hl, MtMoon3TrainerHeader3 call TalkToTrainer jp TextScriptEnd -MtMoon3Text6: +MtMoonB2FDomeFossilText: text_asm ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, MtMoon3Text_49f24 + ld hl, .YouWantText call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a - jr nz, .asm_49f21 + jr nz, .done lb bc, DOME_FOSSIL, 1 call GiveItem - jp nc, MtMoon3Script_49f76 - call MtMoon3Script_49f69 + jp nc, MtMoonB2FYouHaveNoRoomText + call MtMoonB2FReceivedFossilText ld a, HS_MT_MOON_B2F_FOSSIL_1 ld [wMissableObjectIndex], a predef HideObject SetEvent EVENT_GOT_DOME_FOSSIL - ld a, $4 + ld a, SCRIPT_MTMOONB2F_MOVE_SUPER_NERD ld [wMtMoonB2FCurScript], a ld [wCurMapScript], a -.asm_49f21 +.done jp TextScriptEnd -MtMoon3Text_49f24: - text_far _MtMoon3Text_49f24 +.YouWantText: + text_far _MtMoonB2FDomeFossilYouWantText text_end -MtMoon3Text7: +MtMoonB2FHelixFossilText: text_asm ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, MtMoon3Text_49f64 + ld hl, .YouWantText call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a - jr nz, .asm_49f61 + jr nz, .done lb bc, HELIX_FOSSIL, 1 call GiveItem - jp nc, MtMoon3Script_49f76 - call MtMoon3Script_49f69 + jp nc, MtMoonB2FYouHaveNoRoomText + call MtMoonB2FReceivedFossilText ld a, HS_MT_MOON_B2F_FOSSIL_2 ld [wMissableObjectIndex], a predef HideObject SetEvent EVENT_GOT_HELIX_FOSSIL - ld a, $4 + ld a, SCRIPT_MTMOONB2F_MOVE_SUPER_NERD ld [wMtMoonB2FCurScript], a ld [wCurMapScript], a -.asm_49f61 +.done jp TextScriptEnd -MtMoon3Text_49f64: - text_far _MtMoon3Text_49f64 +.YouWantText: + text_far _MtMoonB2FHelixFossilYouWantText text_end -MtMoon3Script_49f69: - ld hl, MtMoon3Text_49f6f +MtMoonB2FReceivedFossilText: + ld hl, .Text jp PrintText -MtMoon3Text_49f6f: - text_far _MtMoon3Text_49f6f +.Text: + text_far _MtMoonB2FReceivedFossilText sound_get_key_item text_waitbutton text_end -MtMoon3Script_49f76: - ld hl, MtMoon3Text_49f7f +MtMoonB2FYouHaveNoRoomText: + ld hl, .Text call PrintText jp TextScriptEnd -MtMoon3Text_49f7f: - text_far _MtMoon3Text_49f7f +.Text: + text_far _MtMoonB2FYouHaveNoRoomText text_waitbutton text_end -MtMoon3Text_49f85: - text_far _MtMoon3Text_49f85 +MtMoonB2FSuperNerdTheyreBothMineText: + text_far _MtMoonB2FSuperNerdTheyreBothMineText text_end -MtMoon3Text_49f8a: - text_far _MtMoon3Text_49f8a +MtMoonB2FSuperNerdOkIllShareText: + text_far _MtMoonB2FSuperNerdOkIllShareText text_end -MtMoon3Text_49f8f: - text_far _MtMoon3Text_49f8f +MtMoonB2fSuperNerdEachTakeOneText: + text_far _MtMoonB2fSuperNerdEachTakeOneText text_end -MtMoon3Text_49f94: - text_far _MtMoon3Text_49f94 +MtMoonB2FSuperNerdTheresAPokemonLabText: + text_far _MtMoonB2FSuperNerdTheresAPokemonLabText text_end -MtMoon3Text_49f99: - text_far _MtMoon3Text_49f99 +MtMoonB2FSuperNerdThenThisIsMineText: + text_far _MtMoonB2FSuperNerdThenThisIsMineText sound_get_key_item text_end -MtMoon3BattleText2: - text_far _MtMoon3BattleText2 +MtMoonB2FRocket1BattleText: + text_far _MtMoonB2FRocket1BattleText text_end -MtMoon3EndBattleText2: - text_far _MtMoon3EndBattleText2 +MtMoonB2FRocket1EndBattleText: + text_far _MtMoonB2FRocket1EndBattleText text_end -MtMoon3AfterBattleText2: - text_far _MtMoon3AfterBattleText2 +MtMoonB2FRocket1AfterBattleText: + text_far _MtMoonB2FRocket1AfterBattleText text_end -MtMoon3BattleText3: - text_far _MtMoon3BattleText3 +MtMoonB2FRocket2BattleText: + text_far _MtMoonB2FRocket2BattleText text_end -MtMoon3EndBattleText3: - text_far _MtMoon3EndBattleText3 +MtMoonB2FRocket2EndBattleText: + text_far _MtMoonB2FRocket2EndBattleText text_end -MtMoon3AfterBattleText3: - text_far _MtMoon3AfterBattleText3 +MtMoonB2FRocket2AfterBattleText: + text_far _MtMoonB2FRocket2AfterBattleText text_end -MtMoon3BattleText4: - text_far _MtMoon3BattleText4 +MtMoonB2FRocket3BattleText: + text_far _MtMoonB2FRocket3BattleText text_end -MtMoon3EndBattleText4: - text_far _MtMoon3EndBattleText4 +MtMoonB2FRocket3EndBattleText: + text_far _MtMoonB2FRocket3EndBattleText text_end -MtMoon3AfterBattleText4: - text_far _MtMoon3AfterBattleText4 +MtMoonB2FRocket3AfterBattleText: + text_far _MtMoonB2FRocket3AfterBattleText text_end -MtMoon3BattleText5: - text_far _MtMoon3BattleText5 +MtMoonB2FRocket4BattleText: + text_far _MtMoonB2FRocket4BattleText text_end -MtMoon3EndBattleText5: - text_far _MtMoon3EndBattleText5 +MtMoonB2FRocket4EndBattleText: + text_far _MtMoonB2FRocket4EndBattleText text_end -MtMoon3AfterBattleText5: - text_far _MtMoon3AfterBattleText5 +MtMoonB2FRocket4AfterBattleText: + text_far _MtMoonB2FRocket4AfterBattleText text_end diff --git a/scripts/MtMoonPokecenter.asm b/scripts/MtMoonPokecenter.asm index e4b881d15..da3d3bc5f 100644 --- a/scripts/MtMoonPokecenter.asm +++ b/scripts/MtMoonPokecenter.asm @@ -3,29 +3,30 @@ MtMoonPokecenter_Script: jp EnableAutoTextBoxDrawing MtMoonPokecenter_TextPointers: - dw MtMoonHealNurseText - dw MtMoonPokecenterText2 - dw MtMoonPokecenterText3 - dw MagikarpSalesmanText - dw MtMoonPokecenterText5 - dw MtMoonTradeNurseText + def_text_pointers + dw_const MtMoonPokecenterNurseText, TEXT_MTMOONPOKECENTER_NURSE + dw_const MtMoonPokecenterYoungsterText, TEXT_MTMOONPOKECENTER_YOUNGSTER + dw_const MtMoonPokecenterGentlemanText, TEXT_MTMOONPOKECENTER_GENTLEMAN + dw_const MtMoonPokecenterMagikarpSalesmanText, TEXT_MTMOONPOKECENTER_MAGIKARP_SALESMAN + dw_const MtMoonPokecenterClipboardText, TEXT_MTMOONPOKECENTER_CLIPBOARD + dw_const MtMoonPokecenterLinkReceptionistText, TEXT_MTMOONPOKECENTER_LINK_RECEPTIONIST -MtMoonHealNurseText: +MtMoonPokecenterNurseText: script_pokecenter_nurse -MtMoonPokecenterText2: - text_far _MtMoonPokecenterText1 +MtMoonPokecenterYoungsterText: + text_far _MtMoonPokecenterYoungsterText text_end -MtMoonPokecenterText3: - text_far _MtMoonPokecenterText3 +MtMoonPokecenterGentlemanText: + text_far _MtMoonPokecenterGentlemanText text_end -MagikarpSalesmanText: +MtMoonPokecenterMagikarpSalesmanText: text_asm CheckEvent EVENT_BOUGHT_MAGIKARP, 1 jp c, .alreadyBoughtMagikarp - ld hl, .Text1 + ld hl, .IGotADealText call PrintText ld a, MONEY_BOX ld [wTextBoxID], a @@ -61,34 +62,34 @@ MagikarpSalesmanText: SetEvent EVENT_BOUGHT_MAGIKARP jr .done .choseNo - ld hl, .RefuseText + ld hl, .NoText jr .printText .alreadyBoughtMagikarp - ld hl, .Text2 + ld hl, .NoRefundsText .printText call PrintText .done jp TextScriptEnd -.Text1 - text_far _MagikarpSalesmanText1 +.IGotADealText + text_far _MtMoonPokecenterMagikarpSalesmanIGotADealText text_end -.RefuseText - text_far _MagikarpSalesmanNoText +.NoText + text_far _MtMoonPokecenterMagikarpSalesmanNoText text_end .NoMoneyText - text_far _MagikarpSalesmanNoMoneyText + text_far _MtMoonPokecenterMagikarpSalesmanNoMoneyText text_end -.Text2 - text_far _MagikarpSalesmanText2 +.NoRefundsText + text_far _MtMoonPokecenterMagikarpSalesmanNoRefundsText text_end -MtMoonPokecenterText5: - text_far _MtMoonPokecenterText5 +MtMoonPokecenterClipboardText: + text_far _MtMoonPokecenterClipboardText text_end -MtMoonTradeNurseText: +MtMoonPokecenterLinkReceptionistText: script_cable_club_receptionist diff --git a/scripts/Museum1F.asm b/scripts/Museum1F.asm index ee3473ff9..2939f51be 100644 --- a/scripts/Museum1F.asm +++ b/scripts/Museum1F.asm @@ -8,88 +8,90 @@ Museum1F_Script: jp CallFunctionInTable Museum1F_ScriptPointers: - dw Museum1FScript0 - dw Museum1FScript1 + def_script_pointers + dw_const Museum1FDefaultScript, SCRIPT_MUSEUM1F_DEFAULT + dw_const Museum1FNoopScript, SCRIPT_MUSEUM1F_NOOP -Museum1FScript0: +Museum1FDefaultScript: ld a, [wYCoord] cp 4 ret nz ld a, [wXCoord] cp 9 - jr z, .asm_5c120 + jr z, .continue ld a, [wXCoord] cp 10 ret nz -.asm_5c120 +.continue xor a ldh [hJoyHeld], a - ld a, $1 + ld a, TEXT_MUSEUM1F_SCIENTIST1 ldh [hSpriteIndexOrTextID], a jp DisplayTextID -Museum1FScript1: +Museum1FNoopScript: ret Museum1F_TextPointers: - dw Museum1FText1 - dw Museum1FText2 - dw Museum1FText3 - dw Museum1FText4 - dw Museum1FText5 - -Museum1FText1: + def_text_pointers + dw_const Museum1FScientist1Text, TEXT_MUSEUM1F_SCIENTIST1 + dw_const Museum1FGamblerText, TEXT_MUSEUM1F_GAMBLER + dw_const Museum1FScientist2Text, TEXT_MUSEUM1F_SCIENTIST2 + dw_const Museum1FScientist3Text, TEXT_MUSEUM1F_SCIENTIST3 + dw_const Museum1FOldAmberText, TEXT_MUSEUM1F_OLD_AMBER + +Museum1FScientist1Text: text_asm ld a, [wYCoord] cp 4 - jr nz, .asm_8774b + jr nz, .not_right_of_scientist ld a, [wXCoord] cp 13 - jp z, Museum1FScript_5c1f9 - jr .asm_b8709 -.asm_8774b - cp $3 - jr nz, .asm_d49e7 + jp z, .behind_counter + jr .check_ticket +.not_right_of_scientist + cp 3 + jr nz, .not_behind_counter ld a, [wXCoord] cp 12 - jp z, Museum1FScript_5c1f9 -.asm_d49e7 + jp z, .behind_counter +.not_behind_counter CheckEvent EVENT_BOUGHT_MUSEUM_TICKET - jr nz, .asm_31a16 - ld hl, Museum1FText_5c23d + jr nz, .already_bought_ticket + ld hl, .GoToOtherSideText call PrintText - jp Museum1FScriptEnd -.asm_b8709 + jp .done +.check_ticket CheckEvent EVENT_BOUGHT_MUSEUM_TICKET - jr z, .asm_3ded4 -.asm_31a16 - ld hl, Museum1FText_5c242 + jr z, .no_ticket +.already_bought_ticket + ld hl, .TakePlentyOfTimeText call PrintText - jp Museum1FScriptEnd -.asm_3ded4 + jp .done +.no_ticket ld a, MONEY_BOX ld [wTextBoxID], a call DisplayTextBoxID xor a ldh [hJoyHeld], a - ld hl, Museum1FText_5c21f + ld hl, .WouldYouLikeToComeInText call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a - jr nz, .asm_de133 + jr nz, .deny_entry xor a ldh [hMoney], a ldh [hMoney + 1], a ld a, $50 ldh [hMoney + 2], a call HasEnoughMoney - jr nc, .asm_0f3e3 - ld hl, Museum1FText_5c229 + jr nc, .buy_ticket + ld hl, .DontHaveEnoughMoneyText call PrintText - jp .asm_de133 -.asm_0f3e3 - ld hl, Museum1FText_5c224 + jp .deny_entry +.buy_ticket + ld hl, .ThankYouText call PrintText SetEvent EVENT_BOUGHT_MUSEUM_TICKET xor a @@ -107,9 +109,9 @@ Museum1FText1: ld a, SFX_PURCHASE call PlaySoundWaitForCurrent call WaitForSoundToFinish - jr .asm_0b094 -.asm_de133 - ld hl, Museum1FText_5c21a + jr .allow_entry +.deny_entry + ld hl, .ComeAgainText call PrintText ld a, $1 ld [wSimulatedJoypadStatesIndex], a @@ -117,79 +119,79 @@ Museum1FText1: ld [wSimulatedJoypadStatesEnd], a call StartSimulatingJoypadStates call UpdateSprites - jr Museum1FScriptEnd -.asm_0b094 - ld a, $1 + jr .done +.allow_entry + ld a, SCRIPT_MUSEUM1F_NOOP ld [wMuseum1FCurScript], a - jr Museum1FScriptEnd + jr .done -Museum1FScript_5c1f9: - ld hl, Museum1FText_5c22e +.behind_counter + ld hl, .DoYouKnowWhatAmberIsText call PrintText call YesNoChoice ld a, [wCurrentMenuItem] cp $0 - jr nz, .asm_d1144 - ld hl, Museum1FText_5c233 + jr nz, .explain_amber + ld hl, .TheresALabSomewhereText call PrintText - jr Museum1FScriptEnd -.asm_d1144 - ld hl, Museum1FText_5c238 + jr .done +.explain_amber + ld hl, .AmberIsFossilizedTreeSapText call PrintText -Museum1FScriptEnd: +.done jp TextScriptEnd -Museum1FText_5c21a: - text_far _Museum1FText_5c21a +.ComeAgainText: + text_far _Museum1FScientist1ComeAgainText text_end -Museum1FText_5c21f: - text_far _Museum1FText_5c21f +.WouldYouLikeToComeInText: + text_far _Museum1FScientist1WouldYouLikeToComeInText text_end -Museum1FText_5c224: - text_far _Museum1FText_5c224 +.ThankYouText: + text_far _Museum1FScientist1ThankYouText text_end -Museum1FText_5c229: - text_far _Museum1FText_5c229 +.DontHaveEnoughMoneyText: + text_far _Museum1FScientist1DontHaveEnoughMoneyText text_end -Museum1FText_5c22e: - text_far _Museum1FText_5c22e +.DoYouKnowWhatAmberIsText: + text_far _Museum1FScientist1DoYouKnowWhatAmberIsText text_end -Museum1FText_5c233: - text_far _Museum1FText_5c233 +.TheresALabSomewhereText: + text_far _Museum1FScientist1TheresALabSomewhereText text_end -Museum1FText_5c238: - text_far _Museum1FText_5c238 +.AmberIsFossilizedTreeSapText: + text_far _Museum1FScientist1AmberIsFossilizedTreeSapText text_end -Museum1FText_5c23d: - text_far _Museum1FText_5c23d +.GoToOtherSideText: + text_far _Museum1FScientist1GoToOtherSideText text_end -Museum1FText_5c242: - text_far _Museum1FText_5c242 +.TakePlentyOfTimeText: + text_far _Museum1FScientist1TakePlentyOfTimeText text_end -Museum1FText2: +Museum1FGamblerText: text_asm - ld hl, Museum1FText_5c251 + ld hl, .Text call PrintText jp TextScriptEnd -Museum1FText_5c251: - text_far _Museum1FText_5c251 +.Text: + text_far _Museum1FGamblerText text_end -Museum1FText3: +Museum1FScientist2Text: text_asm CheckEvent EVENT_GOT_OLD_AMBER jr nz, .got_item - ld hl, Museum1FText_5c28e + ld hl, .TakeThisToAPokemonLabText call PrintText lb bc, OLD_AMBER, 1 call GiveItem @@ -198,50 +200,50 @@ Museum1FText3: ld a, HS_OLD_AMBER ld [wMissableObjectIndex], a predef HideObject - ld hl, ReceivedOldAmberText + ld hl, .ReceivedOldAmberText jr .done .bag_full - ld hl, Museum1FText_5c29e + ld hl, .YouDontHaveSpaceText jr .done .got_item - ld hl, Museum1FText_5c299 + ld hl, .GetTheOldAmberCheckText .done call PrintText jp TextScriptEnd -Museum1FText_5c28e: - text_far _Museum1FText_5c28e +.TakeThisToAPokemonLabText: + text_far _Museum1FScientist2TakeThisToAPokemonLabText text_end -ReceivedOldAmberText: - text_far _ReceivedOldAmberText +.ReceivedOldAmberText: + text_far _Museum1FScientist2ReceivedOldAmberText sound_get_item_1 text_end -Museum1FText_5c299: - text_far _Museum1FText_5c299 +.GetTheOldAmberCheckText: + text_far _Museum1FScientist2GetTheOldAmberCheckText text_end -Museum1FText_5c29e: - text_far _Museum1FText_5c29e +.YouDontHaveSpaceText: + text_far _Museum1FScientist2YouDontHaveSpaceText text_end -Museum1FText4: +Museum1FScientist3Text: text_asm - ld hl, Museum1FText_5c2ad + ld hl, .Text call PrintText jp TextScriptEnd -Museum1FText_5c2ad: - text_far _Museum1FText_5c2ad +.Text: + text_far _Museum1FScientist3Text text_end -Museum1FText5: +Museum1FOldAmberText: text_asm - ld hl, Museum1FText_5c2bc + ld hl, .Text call PrintText jp TextScriptEnd -Museum1FText_5c2bc: - text_far _Museum1FText_5c2bc +.Text: + text_far _Museum1FOldAmberText text_end diff --git a/scripts/Museum2F.asm b/scripts/Museum2F.asm index 8b1aa0bfa..28bffa0c3 100644 --- a/scripts/Museum2F.asm +++ b/scripts/Museum2F.asm @@ -2,38 +2,39 @@ Museum2F_Script: jp EnableAutoTextBoxDrawing Museum2F_TextPointers: - dw Museum2FText1 - dw Museum2FText2 - dw Museum2FText3 - dw Museum2FText4 - dw Museum2FText5 - dw Museum2FText6 - dw Museum2FText7 - -Museum2FText1: - text_far _Museum2FText1 + def_text_pointers + dw_const Museum2FYoungsterText, TEXT_MUSEUM2F_YOUNGSTER + dw_const Museum2FGrampsText, TEXT_MUSEUM2F_GRAMPS + dw_const Museum2FScientistText, TEXT_MUSEUM2F_SCIENTIST + dw_const Museum2FBrunetteGirlText, TEXT_MUSEUM2F_BRUNETTE_GIRL + dw_const Museum2FHikerText, TEXT_MUSEUM2F_HIKER + dw_const Museum2FSpaceShuttleSignText, TEXT_MUSEUM2F_SPACE_SHUTTLE_SIGN + dw_const Museum2FMoonStoneSignText, TEXT_MUSEUM2F_MOON_STONE_SIGN + +Museum2FYoungsterText: + text_far _Museum2FYoungsterText text_end -Museum2FText2: - text_far _Museum2FText2 +Museum2FGrampsText: + text_far _Museum2FGrampsText text_end -Museum2FText3: - text_far _Museum2FText3 +Museum2FScientistText: + text_far _Museum2FScientistText text_end -Museum2FText4: - text_far _Museum2FText4 +Museum2FBrunetteGirlText: + text_far _Museum2FBrunetteGirlText text_end -Museum2FText5: - text_far _Museum2FText5 +Museum2FHikerText: + text_far _Museum2FHikerText text_end -Museum2FText6: - text_far _Museum2FText6 +Museum2FSpaceShuttleSignText: + text_far _Museum2FSpaceShuttleSignText text_end -Museum2FText7: - text_far _Museum2FText7 +Museum2FMoonStoneSignText: + text_far _Museum2FMoonStoneSignText text_end diff --git a/scripts/NameRatersHouse.asm b/scripts/NameRatersHouse.asm index cecf97e74..61b10a3ed 100644 --- a/scripts/NameRatersHouse.asm +++ b/scripts/NameRatersHouse.asm @@ -1,52 +1,54 @@ NameRatersHouse_Script: jp EnableAutoTextBoxDrawing -NameRaterScript_1da15: +NameRatersHouseYesNoScript: call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a ret -NameRaterScript_1da20: +NameRatersHouseCheckMonOTScript: +; return carry if mon's OT name or OT ID do not match the player's ld hl, wPartyMonOT ld bc, NAME_LENGTH ld a, [wWhichPokemon] call AddNTimes ld de, wPlayerName ld c, NAME_LENGTH - call .asm_1da47 - jr c, .asm_1da52 + call .check_match_loop + jr c, .no_match ld hl, wPartyMon1OTID ld bc, wPartyMon2 - wPartyMon1 ld a, [wWhichPokemon] call AddNTimes ld de, wPlayerID ld c, $2 -.asm_1da47 +.check_match_loop ld a, [de] cp [hl] - jr nz, .asm_1da52 + jr nz, .no_match inc hl inc de dec c - jr nz, .asm_1da47 + jr nz, .check_match_loop and a ret -.asm_1da52 +.no_match scf ret NameRatersHouse_TextPointers: - dw NameRaterText1 + def_text_pointers + dw_const NameRatersHouseNameRaterText, TEXT_NAMERATERSHOUSE_NAME_RATER -NameRaterText1: +NameRatersHouseNameRaterText: text_asm call SaveScreenTilesToBuffer2 - ld hl, NameRaterText_1dab3 - call NameRaterScript_1da15 - jr nz, .asm_1daae - ld hl, NameRaterText_1dab8 + ld hl, .WantMeToRateText + call NameRatersHouseYesNoScript + jr nz, .did_not_rename + ld hl, .WhichPokemonText call PrintText xor a ld [wPartyMenuTypeOrMessageID], a @@ -58,50 +60,50 @@ NameRaterText1: call RestoreScreenTilesAndReloadTilePatterns call LoadGBPal pop af - jr c, .asm_1daae + jr c, .did_not_rename call GetPartyMonName2 - call NameRaterScript_1da20 - ld hl, NameRaterText_1dad1 - jr c, .asm_1daa8 - ld hl, NameRaterText_1dabd - call NameRaterScript_1da15 - jr nz, .asm_1daae - ld hl, NameRaterText_1dac2 + call NameRatersHouseCheckMonOTScript + ld hl, .ATrulyImpeccableNameText + jr c, .done + ld hl, .GiveItANiceNameText + call NameRatersHouseYesNoScript + jr nz, .did_not_rename + ld hl, .WhatShouldWeNameItText call PrintText farcall DisplayNameRaterScreen - jr c, .asm_1daae - ld hl, NameRaterText_1dac7 -.asm_1daa8 + jr c, .did_not_rename + ld hl, .PokemonHasBeenRenamedText +.done call PrintText jp TextScriptEnd -.asm_1daae - ld hl, NameRaterText_1dacc - jr .asm_1daa8 +.did_not_rename + ld hl, .ComeAnyTimeYouLikeText + jr .done -NameRaterText_1dab3: - text_far _NameRaterText_1dab3 +.WantMeToRateText: + text_far _NameRatersHouseNameRaterWantMeToRateText text_end -NameRaterText_1dab8: - text_far _NameRaterText_1dab8 +.WhichPokemonText: + text_far _NameRatersHouseNameRaterWhichPokemonText text_end -NameRaterText_1dabd: - text_far _NameRaterText_1dabd +.GiveItANiceNameText: + text_far _NameRatersHouseNameRaterGiveItANiceNameText text_end -NameRaterText_1dac2: - text_far _NameRaterText_1dac2 +.WhatShouldWeNameItText: + text_far _NameRatersHouseNameRaterWhatShouldWeNameItText text_end -NameRaterText_1dac7: - text_far _NameRaterText_1dac7 +.PokemonHasBeenRenamedText: + text_far _NameRatersHouseNameRaterPokemonHasBeenRenamedText text_end -NameRaterText_1dacc: - text_far _NameRaterText_1dacc +.ComeAnyTimeYouLikeText: + text_far _NameRatersHouseNameRaterComeAnyTimeYouLikeText text_end -NameRaterText_1dad1: - text_far _NameRaterText_1dad1 +.ATrulyImpeccableNameText: + text_far _NameRatersHouseNameRaterATrulyImpeccableNameText text_end diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm index d1755fa8c..407ee3e51 100644 --- a/scripts/OaksLab.asm +++ b/scripts/OaksLab.asm @@ -1,6 +1,6 @@ OaksLab_Script: CheckEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS_2 - call nz, OaksLabScript_1d076 + call nz, OaksLabLoadTextPointers2Script ld a, TRUE ld [wAutoTextBoxDrawingControl], a xor a @@ -10,27 +10,28 @@ OaksLab_Script: jp CallFunctionInTable OaksLab_ScriptPointers: - dw OaksLabScript0 - dw OaksLabScript1 - dw OaksLabScript2 - dw OaksLabScript3 - dw OaksLabScript4 - dw OaksLabScript5 - dw OaksLabScript6 - dw OaksLabScript7 - dw OaksLabScript8 - dw OaksLabScript9 - dw OaksLabScript10 - dw OaksLabScript11 - dw OaksLabScript12 - dw OaksLabScript13 - dw OaksLabScript14 - dw OaksLabScript15 - dw OaksLabScript16 - dw OaksLabScript17 - dw OaksLabScript18 - -OaksLabScript0: + def_script_pointers + dw_const OaksLabDefaultScript, SCRIPT_OAKSLAB_DEFAULT + dw_const OaksLabOakEntersLabScript, SCRIPT_OAKSLAB_OAK_ENTERS_LAB + dw_const OaksLabHideShowOaksScript, SCRIPT_OAKSLAB_HIDE_SHOW_OAKS + dw_const OaksLabPlayerEntersLabScript, SCRIPT_OAKSLAB_PLAYER_ENTERS_LAB + dw_const OaksLabFollowedOakScript, SCRIPT_OAKSLAB_FOLLOWED_OAK + dw_const OaksLabOakChooseMonSpeechScript, SCRIPT_OAKSLAB_OAK_CHOOSE_MON_SPEECH + dw_const OaksLabPlayerDontGoAwayScript, SCRIPT_OAKSLAB_PLAYER_DONT_GO_AWAY_SCRIPT + dw_const OaksLabPlayerForcedToWalkBackScript, SCRIPT_OAKSLAB_PLAYER_FORCED_TO_WALK_BACK_SCRIPT + dw_const OaksLabChoseStarterScript, SCRIPT_OAKSLAB_CHOSE_STARTER_SCRIPT + dw_const OaksLabRivalChoosesStarterScript, SCRIPT_OAKSLAB_RIVAL_CHOOSES_STARTER + dw_const OaksLabRivalChallengesPlayerScript, SCRIPT_OAKSLAB_RIVAL_CHALLENGES_PLAYER + dw_const OaksLabRivalStartBattleScript, SCRIPT_OAKSLAB_RIVAL_START_BATTLE + dw_const OaksLabRivalEndBattleScript, SCRIPT_OAKSLAB_RIVAL_END_BATTLE + dw_const OaksLabRivalStartsExitScript, SCRIPT_OAKSLAB_RIVAL_STARTS_EXIT + dw_const OaksLabPlayerWatchRivalExitScript, SCRIPT_OAKSLAB_PLAYER_WATCH_RIVAL_EXIT + dw_const OaksLabRivalArrivesAtOaksRequestScript, SCRIPT_OAKSLAB_RIVAL_ARRIVES_AT_OAKS_REQUEST + dw_const OaksLabOakGivesPokedexScript, SCRIPT_OAKSLAB_OAK_GIVES_POKEDEX + dw_const OaksLabRivalLeavesWithPokedexScript, SCRIPT_OAKSLAB_RIVAL_LEAVES_WITH_POKEDEX + dw_const OaksLabNoopScript, SCRIPT_OAKSLAB_NOOP + +OaksLabDefaultScript: CheckEvent EVENT_OAK_APPEARED_IN_PALLET ret z ld a, [wNPCMovementScriptFunctionNum] @@ -42,17 +43,17 @@ OaksLabScript0: ld hl, wd72e res 4, [hl] - ld a, $1 + ld a, SCRIPT_OAKSLAB_OAK_ENTERS_LAB ld [wOaksLabCurScript], a ret -OaksLabScript1: - ld a, $8 +OaksLabOakEntersLabScript: + ld a, OAKSLAB_OAK2 ldh [hSpriteIndex], a ld de, OakEntryMovement call MoveSprite - ld a, $2 + ld a, SCRIPT_OAKSLAB_HIDE_SHOW_OAKS ld [wOaksLabCurScript], a ret @@ -62,7 +63,7 @@ OakEntryMovement: db NPC_MOVEMENT_UP db -1 ; end -OaksLabScript2: +OaksLabHideShowOaksScript: ld a, [wd730] bit 0, a ret nz @@ -73,11 +74,11 @@ OaksLabScript2: ld [wMissableObjectIndex], a predef ShowObject - ld a, $3 + ld a, SCRIPT_OAKSLAB_PLAYER_ENTERS_LAB ld [wOaksLabCurScript], a ret -OaksLabScript3: +OaksLabPlayerEntersLabScript: call Delay3 ld hl, wSimulatedJoypadStatesEnd ld de, PlayerEntryMovementRLE @@ -85,18 +86,18 @@ OaksLabScript3: dec a ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld a, $1 + ld a, OAKSLAB_RIVAL ldh [hSpriteIndex], a xor a ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay - ld a, $5 + ld a, OAKSLAB_OAK1 ldh [hSpriteIndex], a xor a ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay - ld a, $4 + ld a, SCRIPT_OAKSLAB_FOLLOWED_OAK ld [wOaksLabCurScript], a ret @@ -104,13 +105,13 @@ PlayerEntryMovementRLE: db D_UP, 8 db -1 ; end -OaksLabScript4: +OaksLabFollowedOakScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz SetEvent EVENT_FOLLOWED_OAK_INTO_LAB SetEvent EVENT_FOLLOWED_OAK_INTO_LAB_2 - ld a, $1 + ld a, OAKSLAB_RIVAL ldh [hSpriteIndex], a ld a, SPRITE_FACING_UP ldh [hSpriteFacingDirection], a @@ -120,52 +121,52 @@ OaksLabScript4: res 1, [hl] call PlayDefaultMusic - ld a, $5 + ld a, SCRIPT_OAKSLAB_OAK_CHOOSE_MON_SPEECH ld [wOaksLabCurScript], a ret -OaksLabScript5: - ld a, $fc +OaksLabOakChooseMonSpeechScript: + ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a - ld a, $11 + ld a, TEXT_OAKSLAB_RIVAL_FED_UP_WITH_WAITING ldh [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 - ld a, $12 + ld a, TEXT_OAKSLAB_OAK_CHOOSE_MON ldh [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 - ld a, $13 + ld a, TEXT_OAKSLAB_RIVAL_WHAT_ABOUT_ME ldh [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 - ld a, $14 + ld a, TEXT_OAKSLAB_OAK_BE_PATIENT ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_OAK_ASKED_TO_CHOOSE_MON xor a ld [wJoyIgnore], a - ld a, $6 + ld a, SCRIPT_OAKSLAB_PLAYER_DONT_GO_AWAY_SCRIPT ld [wOaksLabCurScript], a ret -OaksLabScript6: +OaksLabPlayerDontGoAwayScript: ld a, [wYCoord] cp 6 ret nz - ld a, $5 + ld a, OAKSLAB_OAK1 ldh [hSpriteIndex], a xor a ; SPRITE_FACING_DOWN ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay - ld a, $1 + ld a, OAKSLAB_RIVAL ldh [hSpriteIndex], a - xor a + xor a ; SPRITE_FACING_DOWN ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay call UpdateSprites - ld a, $c + ld a, TEXT_OAKSLAB_OAK_DONT_GO_AWAY_YET ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 @@ -176,21 +177,21 @@ OaksLabScript6: ld a, PLAYER_DIR_UP ld [wPlayerMovingDirection], a - ld a, $7 + ld a, SCRIPT_OAKSLAB_PLAYER_FORCED_TO_WALK_BACK_SCRIPT ld [wOaksLabCurScript], a ret -OaksLabScript7: +OaksLabPlayerForcedToWalkBackScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz call Delay3 - ld a, $6 + ld a, SCRIPT_OAKSLAB_PLAYER_DONT_GO_AWAY_SCRIPT ld [wOaksLabCurScript], a ret -OaksLabScript8: +OaksLabChoseStarterScript: ld a, [wPlayerStarter] cp STARTER1 jr z, .Charmander @@ -253,7 +254,7 @@ OaksLabScript8: cp 9 ; is the player standing to the right of the table? jr nz, .moveBlue push hl - ld a, $1 + ld a, OAKSLAB_RIVAL ldh [hSpriteIndex], a ld a, SPRITESTATEDATA1_YPIXELS ldh [hSpriteDataOffset], a @@ -280,39 +281,39 @@ OaksLabScript8: db -1 ; end .moveBlue - ld a, $1 + ld a, OAKSLAB_RIVAL ldh [hSpriteIndex], a call MoveSprite - ld a, $9 + ld a, SCRIPT_OAKSLAB_RIVAL_CHOOSES_STARTER ld [wOaksLabCurScript], a ret -OaksLabScript9: +OaksLabRivalChoosesStarterScript: ld a, [wd730] bit 0, a ret nz - ld a, $fc + ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a - ld a, $1 + ld a, OAKSLAB_RIVAL ldh [hSpriteIndex], a ld a, SPRITE_FACING_UP ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay - ld a, $d + ld a, TEXT_OAKSLAB_RIVAL_ILL_TAKE_THIS_ONE ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, [wRivalStarterBallSpriteIndex] - cp $2 - jr nz, .rivalDidNotChoseBall1 + cp OAKSLAB_CHARMANDER_POKE_BALL + jr nz, .not_charmander ld a, HS_STARTER_BALL_1 jr .hideBallAndContinue -.rivalDidNotChoseBall1 - cp $3 - jr nz, .rivalChoseBall3 +.not_charmander + cp OAKSLAB_SQUIRTLE_POKE_BALL + jr nz, .not_squirtle ld a, HS_STARTER_BALL_2 jr .hideBallAndContinue -.rivalChoseBall3 +.not_squirtle ld a, HS_STARTER_BALL_3 .hideBallAndContinue ld [wMissableObjectIndex], a @@ -323,27 +324,27 @@ OaksLabScript9: ld [wcf91], a ld [wd11e], a call GetMonName - ld a, $1 + ld a, OAKSLAB_RIVAL ldh [hSpriteIndex], a ld a, SPRITE_FACING_UP ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay - ld a, $e + ld a, TEXT_OAKSLAB_RIVAL_RECEIVED_MON ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_STARTER xor a ld [wJoyIgnore], a - ld a, $a + ld a, SCRIPT_OAKSLAB_RIVAL_CHALLENGES_PLAYER ld [wOaksLabCurScript], a ret -OaksLabScript10: +OaksLabRivalChallengesPlayerScript: ld a, [wYCoord] cp 6 ret nz - ld a, $1 + ld a, OAKSLAB_RIVAL ldh [hSpriteIndex], a xor a ; SPRITE_FACING_DOWN ldh [hSpriteFacingDirection], a @@ -353,7 +354,7 @@ OaksLabScript10: ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic - ld a, $f + ld a, TEXT_OAKSLAB_RIVAL_ILL_TAKE_YOU_ON ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 @@ -367,15 +368,15 @@ OaksLabScript10: ldh [hNPCPlayerYDistance], a predef FindPathToPlayer ld de, wNPCMovementDirections2 - ld a, $1 + ld a, OAKSLAB_RIVAL ldh [hSpriteIndex], a call MoveSprite - ld a, $b + ld a, SCRIPT_OAKSLAB_RIVAL_START_BATTLE ld [wOaksLabCurScript], a ret -OaksLabScript11: +OaksLabRivalStartBattleScript: ld a, [wd730] bit 0, a ret nz @@ -385,23 +386,23 @@ OaksLabScript11: ld [wCurOpponent], a ld a, [wRivalStarter] cp STARTER2 - jr nz, .NotSquirtle + jr nz, .not_squirtle ld a, $1 jr .done -.NotSquirtle +.not_squirtle cp STARTER3 - jr nz, .Charmander + jr nz, .not_bulbasaur ld a, $2 jr .done -.Charmander +.not_bulbasaur ld a, $3 .done ld [wTrainerNo], a - ld a, $1 + ld a, OAKSLAB_RIVAL ld [wSpriteIndex], a call GetSpritePosition1 - ld hl, OaksLabText_1d3be - ld de, OaksLabText_1d3c3 + ld hl, OaksLabRivalIPickedTheWrongPokemonText + ld de, OaksLabRivalAmIGreatOrWhatText call SaveEndBattleTextPointers ld hl, wd72d set 6, [hl] @@ -410,20 +411,20 @@ OaksLabScript11: ld [wJoyIgnore], a ld a, PLAYER_DIR_UP ld [wPlayerMovingDirection], a - ld a, $c + ld a, SCRIPT_OAKSLAB_RIVAL_END_BATTLE ld [wOaksLabCurScript], a ret -OaksLabScript12: - ld a, $f0 +OaksLabRivalEndBattleScript: + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ld a, PLAYER_DIR_UP ld [wPlayerMovingDirection], a call UpdateSprites - ld a, $1 + ld a, OAKSLAB_RIVAL ld [wSpriteIndex], a call SetSpritePosition1 - ld a, $1 + ld a, OAKSLAB_RIVAL ldh [hSpriteIndex], a xor a ; SPRITE_FACING_DOWN ldh [hSpriteFacingDirection], a @@ -431,18 +432,18 @@ OaksLabScript12: predef HealParty SetEvent EVENT_BATTLED_RIVAL_IN_OAKS_LAB - ld a, $d + ld a, SCRIPT_OAKSLAB_RIVAL_STARTS_EXIT ld [wOaksLabCurScript], a ret -OaksLabScript13: +OaksLabRivalStartsExitScript: ld c, 20 call DelayFrames - ld a, $10 + ld a, TEXT_OAKSLAB_RIVAL_SMELL_YOU_LATER ldh [hSpriteIndexOrTextID], a call DisplayTextID farcall Music_RivalAlternateStart - ld a, $1 + ld a, OAKSLAB_RIVAL ldh [hSpriteIndex], a ld de, .RivalExitMovement call MoveSprite @@ -457,7 +458,7 @@ OaksLabScript13: .next ld [wNPCMovementDirections], a - ld a, $e + ld a, SCRIPT_OAKSLAB_PLAYER_WATCH_RIVAL_EXIT ld [wOaksLabCurScript], a ret @@ -470,7 +471,7 @@ OaksLabScript13: db NPC_MOVEMENT_DOWN db -1 ; end -OaksLabScript14: +OaksLabPlayerWatchRivalExitScript: ld a, [wd730] bit 0, a jr nz, .checkRivalPosition @@ -480,7 +481,7 @@ OaksLabScript14: xor a ld [wJoyIgnore], a call PlayDefaultMusic ; reset to map music - ld a, $12 + ld a, SCRIPT_OAKSLAB_NOOP ld [wOaksLabCurScript], a jr .done ; make the player keep facing the rival as he walks away @@ -506,7 +507,7 @@ OaksLabScript14: .done ret -OaksLabScript15: +OaksLabRivalArrivesAtOaksRequestScript: xor a ldh [hJoyHeld], a call EnableAutoTextBoxDrawing @@ -514,10 +515,10 @@ OaksLabScript15: ld [wNewSoundID], a call PlaySound farcall Music_RivalAlternateStart - ld a, $15 + ld a, TEXT_OAKSLAB_RIVAL_GRAMPS ldh [hSpriteIndexOrTextID], a call DisplayTextID - call OaksLabScript_1d02b + call OaksLabCalcRivalMovementScript ld a, HS_OAKS_LAB_RIVAL ld [wMissableObjectIndex], a predef ShowObject @@ -529,51 +530,51 @@ OaksLabScript15: ld a, NPC_MOVEMENT_UP call FillMemory ld [hl], $ff - ld a, $1 + ld a, OAKSLAB_RIVAL ldh [hSpriteIndex], a ld de, wNPCMovementDirections2 call MoveSprite - ld a, $10 + ld a, SCRIPT_OAKSLAB_OAK_GIVES_POKEDEX ld [wOaksLabCurScript], a ret -OaksLabScript_1cefd: - ld a, $1 +OaksLabRivalFaceUpOakFaceDownScript: + ld a, OAKSLAB_RIVAL ldh [hSpriteIndex], a ld a, SPRITE_FACING_UP ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay - ld a, $8 + ld a, OAKSLAB_OAK2 ldh [hSpriteIndex], a xor a ; SPRITE_FACING_DOWN ldh [hSpriteFacingDirection], a jp SetSpriteFacingDirectionAndDelay -OaksLabScript16: +OaksLabOakGivesPokedexScript: ld a, [wd730] bit 0, a ret nz call EnableAutoTextBoxDrawing call PlayDefaultMusic - ld a, $fc + ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a - call OaksLabScript_1cefd - ld a, $16 + call OaksLabRivalFaceUpOakFaceDownScript + ld a, TEXT_OAKSLAB_RIVAL_WHAT_DID_YOU_CALL_ME_FOR ldh [hSpriteIndexOrTextID], a call DisplayTextID call DelayFrame - call OaksLabScript_1cefd - ld a, $17 + call OaksLabRivalFaceUpOakFaceDownScript + ld a, TEXT_OAKSLAB_OAK_I_HAVE_A_REQUEST ldh [hSpriteIndexOrTextID], a call DisplayTextID call DelayFrame - call OaksLabScript_1cefd - ld a, $18 + call OaksLabRivalFaceUpOakFaceDownScript + ld a, TEXT_OAKSLAB_OAK_MY_INVENTION_POKEDEX ldh [hSpriteIndexOrTextID], a call DisplayTextID call DelayFrame - ld a, $19 + ld a, TEXT_OAKSLAB_OAK_GOT_POKEDEX ldh [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 @@ -583,17 +584,17 @@ OaksLabScript16: ld a, HS_POKEDEX_2 ld [wMissableObjectIndex], a predef HideObject - call OaksLabScript_1cefd - ld a, $1a + call OaksLabRivalFaceUpOakFaceDownScript + ld a, TEXT_OAKSLAB_OAK_THAT_WAS_MY_DREAM ldh [hSpriteIndexOrTextID], a call DisplayTextID - ld a, $1 + ld a, OAKSLAB_RIVAL ldh [hSpriteIndex], a ld a, SPRITE_FACING_RIGHT ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay call Delay3 - ld a, $1b + ld a, TEXT_OAKSLAB_RIVAL_LEAVE_IT_ALL_TO_ME ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_POKEDEX @@ -615,16 +616,16 @@ OaksLabScript16: ld [wNewSoundID], a call PlaySound farcall Music_RivalAlternateStart - ld a, $1 + ld a, OAKSLAB_RIVAL ldh [hSpriteIndex], a ld de, wNPCMovementDirections2 call MoveSprite - ld a, $11 + ld a, SCRIPT_OAKSLAB_RIVAL_LEAVES_WITH_POKEDEX ld [wOaksLabCurScript], a ret -OaksLabScript17: +OaksLabRivalLeavesWithPokedexScript: ld a, [wd730] bit 0, a ret nz @@ -638,16 +639,16 @@ OaksLabScript17: ld a, HS_ROUTE_22_RIVAL_1 ld [wMissableObjectIndex], a predef ShowObject - ld a, $5 + ld a, SCRIPT_PALLETTOWN_DAISY ld [wPalletTownCurScript], a xor a ld [wJoyIgnore], a - ld a, $12 + ld a, SCRIPT_OAKSLAB_NOOP ld [wOaksLabCurScript], a ret -OaksLabScript18: +OaksLabNoopScript: ret OaksLabScript_RemoveParcel: @@ -670,48 +671,48 @@ OaksLabScript_RemoveParcel: ld [wItemQuantity], a jp RemoveItemFromInventory -OaksLabScript_1d02b: +OaksLabCalcRivalMovementScript: ld a, $7c ldh [hSpriteScreenYCoord], a ld a, 8 ldh [hSpriteMapXCoord], a ld a, [wYCoord] cp 3 - jr nz, .asm_1d045 + jr nz, .not_below_oak ld a, $4 ld [wNPCMovementDirections2Index], a ld a, $30 ld b, 11 - jr .asm_1d068 -.asm_1d045 + jr .done +.not_below_oak cp 1 - jr nz, .asm_1d054 + jr nz, .not_above_oak ld a, $2 ld [wNPCMovementDirections2Index], a ld a, $30 ld b, 9 - jr .asm_1d068 -.asm_1d054 + jr .done +.not_above_oak ld a, $3 ld [wNPCMovementDirections2Index], a ld b, 10 ld a, [wXCoord] cp 4 - jr nz, .asm_1d066 + jr nz, .not_left_of_oak ld a, $40 - jr .asm_1d068 -.asm_1d066 + jr .done +.not_left_of_oak ld a, $20 -.asm_1d068 +.done ldh [hSpriteScreenXCoord], a ld a, b ldh [hSpriteMapYCoord], a - ld a, $1 + ld a, OAKSLAB_RIVAL ld [wSpriteIndex], a call SetSpritePosition1 ret -OaksLabScript_1d076: +OaksLabLoadTextPointers2Script: ld hl, OaksLab_TextPointers2 ld a, l ld [wMapTextPtr], a @@ -720,132 +721,133 @@ OaksLabScript_1d076: ret OaksLab_TextPointers: - dw OaksLabText1 - dw OaksLabText2 - dw OaksLabText3 - dw OaksLabText4 - dw OaksLabText5 - dw OaksLabText6 - dw OaksLabText7 - dw OaksLabText8 - dw OaksLabText9 - dw OaksLabText10 - dw OaksLabText11 - dw OaksLabText12 - dw OaksLabText13 - dw OaksLabText14 - dw OaksLabText15 - dw OaksLabText16 - dw OaksLabText17 - dw OaksLabText18 - dw OaksLabText19 - dw OaksLabText20 - dw OaksLabText21 - dw OaksLabText22 - dw OaksLabText23 - dw OaksLabText24 - dw OaksLabText25 - dw OaksLabText26 - dw OaksLabText27 + def_text_pointers + dw_const OaksLabRivalText, TEXT_OAKSLAB_RIVAL + dw_const OaksLabCharmanderPokeBallText, TEXT_OAKSLAB_CHARMANDER_POKE_BALL + dw_const OaksLabSquirtlePokeBallText, TEXT_OAKSLAB_SQUIRTLE_POKE_BALL + dw_const OaksLabBulbasaurPokeBallText, TEXT_OAKSLAB_BULBASAUR_POKE_BALL + dw_const OaksLabOak1Text, TEXT_OAKSLAB_OAK1 + dw_const OaksLabPokedexText, TEXT_OAKSLAB_POKEDEX1 + dw_const OaksLabPokedexText, TEXT_OAKSLAB_POKEDEX2 + dw_const OaksLabOak2Text, TEXT_OAKSLAB_OAK2 + dw_const OaksLabGirlText, TEXT_OAKSLAB_GIRL + dw_const OaksLabScientistText, TEXT_OAKSLAB_SCIENTIST1 + dw_const OaksLabScientistText, TEXT_OAKSLAB_SCIENTIST2 + dw_const OaksLabOakDontGoAwayYetText, TEXT_OAKSLAB_OAK_DONT_GO_AWAY_YET + dw_const OaksLabRivalIllTakeThisOneText, TEXT_OAKSLAB_RIVAL_ILL_TAKE_THIS_ONE + dw_const OaksLabRivalReceivedMonText, TEXT_OAKSLAB_RIVAL_RECEIVED_MON + dw_const OaksLabRivalIllTakeYouOnText, TEXT_OAKSLAB_RIVAL_ILL_TAKE_YOU_ON + dw_const OaksLabRivalSmellYouLaterText, TEXT_OAKSLAB_RIVAL_SMELL_YOU_LATER + dw_const OaksLabRivalFedUpWithWaitingText, TEXT_OAKSLAB_RIVAL_FED_UP_WITH_WAITING + dw_const OaksLabOakChooseMonText, TEXT_OAKSLAB_OAK_CHOOSE_MON + dw_const OaksLabRivalWhatAboutMeText, TEXT_OAKSLAB_RIVAL_WHAT_ABOUT_ME + dw_const OaksLabOakBePatientText, TEXT_OAKSLAB_OAK_BE_PATIENT + dw_const OaksLabRivalGrampsText, TEXT_OAKSLAB_RIVAL_GRAMPS + dw_const OaksLabRivalWhatDidYouCallMeForText, TEXT_OAKSLAB_RIVAL_WHAT_DID_YOU_CALL_ME_FOR + dw_const OaksLabOakIHaveARequestText, TEXT_OAKSLAB_OAK_I_HAVE_A_REQUEST + dw_const OaksLabOakMyInventionPokedexText, TEXT_OAKSLAB_OAK_MY_INVENTION_POKEDEX + dw_const OaksLabOakGotPokedexText, TEXT_OAKSLAB_OAK_GOT_POKEDEX + dw_const OaksLabOakThatWasMyDreamText, TEXT_OAKSLAB_OAK_THAT_WAS_MY_DREAM + dw_const OaksLabRivalLeaveItAllToMeText, TEXT_OAKSLAB_RIVAL_LEAVE_IT_ALL_TO_ME OaksLab_TextPointers2: - dw OaksLabText1 - dw OaksLabText2 - dw OaksLabText3 - dw OaksLabText4 - dw OaksLabText5 - dw OaksLabText6 - dw OaksLabText7 - dw OaksLabText8 - dw OaksLabText9 - dw OaksLabText10 - dw OaksLabText11 - -OaksLabText1: + dw OaksLabRivalText + dw OaksLabCharmanderPokeBallText + dw OaksLabSquirtlePokeBallText + dw OaksLabBulbasaurPokeBallText + dw OaksLabOak1Text + dw OaksLabPokedexText + dw OaksLabPokedexText + dw OaksLabOak2Text + dw OaksLabGirlText + dw OaksLabScientistText + dw OaksLabScientistText + +OaksLabRivalText: text_asm CheckEvent EVENT_FOLLOWED_OAK_INTO_LAB_2 jr nz, .beforeChooseMon - ld hl, OaksLabGaryText1 + ld hl, .GrampsIsntAroundText call PrintText jr .done .beforeChooseMon bit 2, a jr nz, .afterChooseMon - ld hl, OaksLabText40 + ld hl, .GoAheadAndChooseText call PrintText jr .done .afterChooseMon - ld hl, OaksLabText41 + ld hl, .MyPokemonLooksStrongerText call PrintText .done jp TextScriptEnd -OaksLabGaryText1: - text_far _OaksLabGaryText1 +.GrampsIsntAroundText: + text_far _OaksLabRivalGrampsIsntAroundText text_end -OaksLabText40: - text_far _OaksLabText40 +.GoAheadAndChooseText: + text_far _OaksLabRivalGoAheadAndChooseText text_end -OaksLabText41: - text_far _OaksLabText41 +.MyPokemonLooksStrongerText: + text_far _OaksLabRivalMyPokemonLooksStrongerText text_end -OaksLabText2: +OaksLabCharmanderPokeBallText: text_asm ld a, STARTER2 ld [wRivalStarterTemp], a - ld a, $3 + ld a, OAKSLAB_SQUIRTLE_POKE_BALL ld [wRivalStarterBallSpriteIndex], a ld a, STARTER1 - ld b, $2 - jr OaksLabScript_1d133 + ld b, OAKSLAB_CHARMANDER_POKE_BALL + jr OaksLabSelectedPokeBallScript -OaksLabText3: +OaksLabSquirtlePokeBallText: text_asm ld a, STARTER3 ld [wRivalStarterTemp], a - ld a, $4 + ld a, OAKSLAB_BULBASAUR_POKE_BALL ld [wRivalStarterBallSpriteIndex], a ld a, STARTER2 - ld b, $3 - jr OaksLabScript_1d133 + ld b, OAKSLAB_SQUIRTLE_POKE_BALL + jr OaksLabSelectedPokeBallScript -OaksLabText4: +OaksLabBulbasaurPokeBallText: text_asm ld a, STARTER1 ld [wRivalStarterTemp], a - ld a, $2 + ld a, OAKSLAB_CHARMANDER_POKE_BALL ld [wRivalStarterBallSpriteIndex], a ld a, STARTER3 - ld b, $4 + ld b, OAKSLAB_BULBASAUR_POKE_BALL -OaksLabScript_1d133: +OaksLabSelectedPokeBallScript: ld [wcf91], a ld [wd11e], a ld a, b ld [wSpriteIndex], a CheckEvent EVENT_GOT_STARTER - jp nz, OaksLabScript_1d22d + jp nz, OaksLabLastMonScript CheckEventReuseA EVENT_OAK_ASKED_TO_CHOOSE_MON - jr nz, OaksLabScript_1d157 - ld hl, OaksLabText39 + jr nz, OaksLabShowPokeBallPokemonScript + ld hl, OaksLabThoseArePokeBallsText call PrintText jp TextScriptEnd -OaksLabText39: - text_far _OaksLabText39 +OaksLabThoseArePokeBallsText: + text_far _OaksLabThoseArePokeBallsText text_end -OaksLabScript_1d157: - ld a, $5 +OaksLabShowPokeBallPokemonScript: + ld a, OAKSLAB_OAK1 ldh [hSpriteIndex], a ld a, SPRITESTATEDATA1_FACINGDIRECTION ldh [hSpriteDataOffset], a call GetPointerWithinSpriteStateData1 ld [hl], SPRITE_FACING_DOWN - ld a, $1 + ld a, OAKSLAB_RIVAL ldh [hSpriteIndex], a ld a, SPRITESTATEDATA1_FACINGDIRECTION ldh [hSpriteDataOffset], a @@ -860,31 +862,31 @@ OaksLabScript_1d157: ld c, 10 call DelayFrames ld a, [wSpriteIndex] - cp $2 - jr z, OaksLabLookAtCharmander - cp $3 - jr z, OaksLabLookAtSquirtle - jr OaksLabLookAtBulbasaur - -OaksLabLookAtCharmander: - ld hl, OaksLabCharmanderText + cp OAKSLAB_CHARMANDER_POKE_BALL + jr z, OaksLabYouWantCharmanderText + cp OAKSLAB_SQUIRTLE_POKE_BALL + jr z, OaksLabYouWantSquirtleText + jr OaksLabYouWantBulbasaurText + +OaksLabYouWantCharmanderText: + ld hl, .Text jr OaksLabMonChoiceMenu -OaksLabCharmanderText: - text_far _OaksLabCharmanderText +.Text: + text_far _OaksLabYouWantCharmanderText text_end -OaksLabLookAtSquirtle: - ld hl, OaksLabSquirtleText +OaksLabYouWantSquirtleText: + ld hl, .Text jr OaksLabMonChoiceMenu -OaksLabSquirtleText: - text_far _OaksLabSquirtleText +.Text: + text_far _OaksLabYouWantSquirtleText text_end -OaksLabLookAtBulbasaur: - ld hl, OaksLabBulbasaurText +OaksLabYouWantBulbasaurText: + ld hl, .Text jr OaksLabMonChoiceMenu -OaksLabBulbasaurText: - text_far _OaksLabBulbasaurText +.Text: + text_far _OaksLabYouWantBulbasaurText text_end OaksLabMonChoiceMenu: @@ -900,18 +902,18 @@ OaksLabMonChoiceMenu: ld [wd11e], a call GetMonName ld a, [wSpriteIndex] - cp $2 - jr nz, .asm_1d1db + cp OAKSLAB_CHARMANDER_POKE_BALL + jr nz, .not_charmander ld a, HS_STARTER_BALL_1 - jr .asm_1d1e5 -.asm_1d1db - cp $3 - jr nz, .asm_1d1e3 + jr .continue +.not_charmander + cp OAKSLAB_SQUIRTLE_POKE_BALL + jr nz, .not_squirtle ld a, HS_STARTER_BALL_2 - jr .asm_1d1e5 -.asm_1d1e3 + jr .continue +.not_squirtle ld a, HS_STARTER_BALL_3 -.asm_1d1e5 +.continue ld [wMissableObjectIndex], a predef HideObject ld a, $1 @@ -929,9 +931,9 @@ OaksLabMonChoiceMenu: call AddPartyMon ld hl, wd72e set 3, [hl] - ld a, $fc + ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a - ld a, $8 + ld a, SCRIPT_OAKSLAB_CHOSE_STARTER_SCRIPT ld [wOaksLabCurScript], a OaksLabMonChoiceEnd: jp TextScriptEnd @@ -945,8 +947,8 @@ OaksLabReceivedMonText: sound_get_key_item text_end -OaksLabScript_1d22d: - ld a, $5 +OaksLabLastMonScript: + ld a, OAKSLAB_OAK1 ldh [hSpriteIndex], a ld a, SPRITESTATEDATA1_FACINGDIRECTION ldh [hSpriteDataOffset], a @@ -960,274 +962,271 @@ OaksLabLastMonText: text_far _OaksLabLastMonText text_end -OaksLabText32: -OaksLabText5: +OaksLabOak1Text: text_asm CheckEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS - jr nz, .asm_1d266 + jr nz, .already_got_poke_balls ld hl, wPokedexOwned ld b, wPokedexOwnedEnd - wPokedexOwned call CountSetBits ld a, [wNumSetBits] cp 2 - jr c, .asm_1d279 + jr c, .check_for_poke_balls CheckEvent EVENT_GOT_POKEDEX - jr z, .asm_1d279 -.asm_1d266 - ld hl, OaksLabText_1d31d + jr z, .check_for_poke_balls +.already_got_poke_balls + ld hl, .HowIsYourPokedexComingText call PrintText ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a predef DisplayDexRating - jp .asm_1d2ed -.asm_1d279 + jp .done +.check_for_poke_balls ld b, POKE_BALL call IsItemInBag - jr nz, .asm_1d2e7 + jr nz, .come_see_me_sometimes CheckEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE - jr nz, .asm_1d2d0 + jr nz, .give_poke_balls CheckEvent EVENT_GOT_POKEDEX - jr nz, .asm_1d2c8 + jr nz, .mon_around_the_world CheckEventReuseA EVENT_BATTLED_RIVAL_IN_OAKS_LAB - jr nz, .asm_1d2a9 + jr nz, .check_got_parcel ld a, [wd72e] bit 3, a - jr nz, .asm_1d2a1 - ld hl, OaksLabText_1d2f0 + jr nz, .already_got_pokemon + ld hl, .WhichPokemonDoYouWantText call PrintText - jr .asm_1d2ed -.asm_1d2a1 - ld hl, OaksLabText_1d2f5 + jr .done +.already_got_pokemon + ld hl, .YourPokemonCanFightText call PrintText - jr .asm_1d2ed -.asm_1d2a9 + jr .done +.check_got_parcel ld b, OAKS_PARCEL call IsItemInBag - jr nz, .asm_1d2b8 - ld hl, OaksLabText_1d2fa + jr nz, .got_parcel + ld hl, .RaiseYourYoungPokemonText call PrintText - jr .asm_1d2ed -.asm_1d2b8 - ld hl, OaksLabDeliverParcelText + jr .done +.got_parcel + ld hl, .DeliverParcelText call PrintText call OaksLabScript_RemoveParcel - ld a, $f + ld a, SCRIPT_OAKSLAB_RIVAL_ARRIVES_AT_OAKS_REQUEST ld [wOaksLabCurScript], a - jr .asm_1d2ed -.asm_1d2c8 - ld hl, OaksLabAroundWorldText + jr .done +.mon_around_the_world + ld hl, .PokemonAroundTheWorldText call PrintText - jr .asm_1d2ed -.asm_1d2d0 + jr .done +.give_poke_balls CheckAndSetEvent EVENT_GOT_POKEBALLS_FROM_OAK - jr nz, .asm_1d2e7 + jr nz, .come_see_me_sometimes lb bc, POKE_BALL, 5 call GiveItem - ld hl, OaksLabGivePokeballsText + ld hl, .GivePokeballsText call PrintText - jr .asm_1d2ed -.asm_1d2e7 - ld hl, OaksLabPleaseVisitText + jr .done +.come_see_me_sometimes + ld hl, .ComeSeeMeSometimesText call PrintText -.asm_1d2ed +.done jp TextScriptEnd -OaksLabText_1d2f0: - text_far _OaksLabText_1d2f0 +.WhichPokemonDoYouWantText: + text_far _OaksLabOak1WhichPokemonDoYouWantText text_end -OaksLabText_1d2f5: - text_far _OaksLabText_1d2f5 +.YourPokemonCanFightText: + text_far _OaksLabOak1YourPokemonCanFightText text_end -OaksLabText_1d2fa: - text_far _OaksLabText_1d2fa +.RaiseYourYoungPokemonText: + text_far _OaksLabOak1RaiseYourYoungPokemonText text_end -OaksLabDeliverParcelText: - text_far _OaksLabDeliverParcelText1 +.DeliverParcelText: + text_far _OaksLabOak1DeliverParcelText sound_get_key_item - text_far _OaksLabDeliverParcelText2 + text_far _OaksLabOak1ParcelThanksText text_end -OaksLabAroundWorldText: - text_far _OaksLabAroundWorldText +.PokemonAroundTheWorldText: + text_far _OaksLabOak1PokemonAroundTheWorldText text_end -OaksLabGivePokeballsText: - text_far _OaksLabGivePokeballsText1 +.GivePokeballsText: + text_far _OaksLabOak1ReceivedPokeballsText sound_get_key_item - text_far _OaksLabGivePokeballsText2 + text_far _OaksLabGivePokeballsExplanationText text_end -OaksLabPleaseVisitText: - text_far _OaksLabPleaseVisitText +.ComeSeeMeSometimesText: + text_far _OaksLabOak1ComeSeeMeSometimesText text_end -OaksLabText_1d31d: - text_far _OaksLabText_1d31d +.HowIsYourPokedexComingText: + text_far _OaksLabOak1HowIsYourPokedexComingText text_end -OaksLabText7: -OaksLabText6: +OaksLabPokedexText: text_asm - ld hl, OaksLabText_1d32c + ld hl, .Text call PrintText jp TextScriptEnd -OaksLabText_1d32c: - text_far _OaksLabText_1d32c +.Text: + text_far _OaksLabPokedexText text_end -OaksLabText8: - text_far _OaksLabText8 +OaksLabOak2Text: + text_far _OaksLabOak2Text text_end -OaksLabText9: +OaksLabGirlText: text_asm - ld hl, OaksLabText_1d340 + ld hl, .Text call PrintText jp TextScriptEnd -OaksLabText_1d340: - text_far _OaksLabText_1d340 +.Text: + text_far _OaksLabGirlText text_end -OaksLabText17: +OaksLabRivalFedUpWithWaitingText: text_asm - ld hl, OaksLabRivalWaitingText + ld hl, .Text call PrintText jp TextScriptEnd -OaksLabRivalWaitingText: - text_far _OaksLabRivalWaitingText +.Text: + text_far _OaksLabRivalFedUpWithWaitingText text_end -OaksLabText18: +OaksLabOakChooseMonText: text_asm - ld hl, OaksLabChooseMonText + ld hl, .Text call PrintText jp TextScriptEnd -OaksLabChooseMonText: - text_far _OaksLabChooseMonText +.Text: + text_far _OaksLabOakChooseMonText text_end -OaksLabText19: +OaksLabRivalWhatAboutMeText: text_asm - ld hl, OaksLabRivalInterjectionText + ld hl, .Text call PrintText jp TextScriptEnd -OaksLabRivalInterjectionText: - text_far _OaksLabRivalInterjectionText +.Text: + text_far _OaksLabRivalWhatAboutMeText text_end -OaksLabText20: +OaksLabOakBePatientText: text_asm - ld hl, OaksLabBePatientText + ld hl, .Text call PrintText jp TextScriptEnd -OaksLabBePatientText: - text_far _OaksLabBePatientText +.Text: + text_far _OaksLabOakBePatientText text_end -OaksLabText12: +OaksLabOakDontGoAwayYetText: text_asm - ld hl, OaksLabLeavingText + ld hl, .Text call PrintText jp TextScriptEnd -OaksLabLeavingText: - text_far _OaksLabLeavingText +.Text: + text_far _OaksLabOakDontGoAwayYetText text_end -OaksLabText13: +OaksLabRivalIllTakeThisOneText: text_asm - ld hl, OaksLabRivalPickingMonText + ld hl, .Text call PrintText jp TextScriptEnd -OaksLabRivalPickingMonText: - text_far _OaksLabRivalPickingMonText +.Text: + text_far _OaksLabRivalIllTakeThisOneText text_end -OaksLabText14: +OaksLabRivalReceivedMonText: text_asm - ld hl, OaksLabRivalReceivedMonText + ld hl, .Text call PrintText jp TextScriptEnd -OaksLabRivalReceivedMonText: +.Text: text_far _OaksLabRivalReceivedMonText sound_get_key_item text_end -OaksLabText15: +OaksLabRivalIllTakeYouOnText: text_asm - ld hl, OaksLabRivalChallengeText + ld hl, .Text call PrintText jp TextScriptEnd -OaksLabRivalChallengeText: - text_far _OaksLabRivalChallengeText +.Text: + text_far _OaksLabRivalIllTakeYouOnText text_end -OaksLabText_1d3be: - text_far _OaksLabText_1d3be +OaksLabRivalIPickedTheWrongPokemonText: + text_far _OaksLabRivalIPickedTheWrongPokemonText text_end -OaksLabText_1d3c3: - text_far _OaksLabText_1d3c3 +OaksLabRivalAmIGreatOrWhatText: + text_far _OaksLabRivalAmIGreatOrWhatText text_end -OaksLabText16: +OaksLabRivalSmellYouLaterText: text_asm - ld hl, OaksLabRivalToughenUpText + ld hl, .Text call PrintText jp TextScriptEnd -OaksLabRivalToughenUpText: - text_far _OaksLabRivalToughenUpText +.Text: + text_far _OaksLabRivalSmellYouLaterText text_end -OaksLabText21: - text_far _OaksLabText21 +OaksLabRivalGrampsText: + text_far _OaksLabRivalGrampsText text_end -OaksLabText22: - text_far _OaksLabText22 +OaksLabRivalWhatDidYouCallMeForText: + text_far _OaksLabRivalWhatDidYouCallMeForText text_end -OaksLabText23: - text_far _OaksLabText23 +OaksLabOakIHaveARequestText: + text_far _OaksLabOakIHaveARequestText text_end -OaksLabText24: - text_far _OaksLabText24 +OaksLabOakMyInventionPokedexText: + text_far _OaksLabOakMyInventionPokedexText text_end -OaksLabText25: - text_far _OaksLabText25 +OaksLabOakGotPokedexText: + text_far _OaksLabOakGotPokedexText sound_get_key_item text_end -OaksLabText26: - text_far _OaksLabText26 +OaksLabOakThatWasMyDreamText: + text_far _OaksLabOakThatWasMyDreamText text_end -OaksLabText27: - text_far _OaksLabText27 +OaksLabRivalLeaveItAllToMeText: + text_far _OaksLabRivalLeaveItAllToMeText text_end -OaksLabText11: -OaksLabText10: +OaksLabScientistText: text_asm - ld hl, OaksLabText_1d405 + ld hl, .Text call PrintText jp TextScriptEnd -OaksLabText_1d405: - text_far _OaksLabText_1d405 +.Text: + text_far _OaksLabScientistText text_end diff --git a/scripts/PalletTown.asm b/scripts/PalletTown.asm index 5c26fc556..dd898ac61 100644 --- a/scripts/PalletTown.asm +++ b/scripts/PalletTown.asm @@ -9,15 +9,16 @@ PalletTown_Script: jp CallFunctionInTable PalletTown_ScriptPointers: - dw PalletTownScript0 - dw PalletTownScript1 - dw PalletTownScript2 - dw PalletTownScript3 - dw PalletTownScript4 - dw PalletTownScript5 - dw PalletTownScript6 - -PalletTownScript0: + def_script_pointers + dw_const PalletTownDefaultScript, SCRIPT_PALLETTOWN_DEFAULT + dw_const PalletTownOakHeyWaitScript, SCRIPT_PALLETTOWN_OAK_HEY_WAIT + dw_const PalletTownOakWalksToPlayerScript, SCRIPT_PALLETTOWN_OAK_WALKS_TO_PLAYER + dw_const PalletTownOakNotSafeComeWithMeScript, SCRIPT_PALLETTOWN_OAK_NOT_SAFE_COME_WITH_ME + dw_const PalletTownPlayerFollowsOakScript, SCRIPT_PALLETTOWN_PLAYER_FOLLOWS_OAK + dw_const PalletTownDaisyScript, SCRIPT_PALLETTOWN_DAISY + dw_const PalletTownNoopScript, SCRIPT_PALLETTOWN_NOOP + +PalletTownDefaultScript: CheckEvent EVENT_FOLLOWED_OAK_INTO_LAB ret nz ld a, [wYCoord] @@ -33,34 +34,34 @@ PalletTownScript0: ld c, a ld a, MUSIC_MEET_PROF_OAK ; "oak appears" music call PlayMusic - ld a, $FC + ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a SetEvent EVENT_OAK_APPEARED_IN_PALLET ; trigger the next script - ld a, 1 + ld a, SCRIPT_PALLETTOWN_OAK_HEY_WAIT ld [wPalletTownCurScript], a ret -PalletTownScript1: +PalletTownOakHeyWaitScript: xor a ld [wcf0d], a - ld a, 1 + ld a, TEXT_PALLETTOWN_OAK ldh [hSpriteIndexOrTextID], a call DisplayTextID - ld a, $FF + ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ld a, HS_PALLET_TOWN_OAK ld [wMissableObjectIndex], a predef ShowObject ; trigger the next script - ld a, 2 + ld a, SCRIPT_PALLETTOWN_OAK_WALKS_TO_PLAYER ld [wPalletTownCurScript], a ret -PalletTownScript2: - ld a, 1 +PalletTownOakWalksToPlayerScript: + ld a, PALLETTOWN_OAK ldh [hSpriteIndex], a ld a, SPRITE_FACING_UP ldh [hSpriteFacingDirection], a @@ -78,18 +79,18 @@ PalletTownScript2: dec [hl] predef FindPathToPlayer ; load Oak's movement into wNPCMovementDirections2 ld de, wNPCMovementDirections2 - ld a, 1 ; oak + ld a, PALLETTOWN_OAK ldh [hSpriteIndex], a call MoveSprite - ld a, $FF + ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ; trigger the next script - ld a, 3 + ld a, SCRIPT_PALLETTOWN_OAK_NOT_SAFE_COME_WITH_ME ld [wPalletTownCurScript], a ret -PalletTownScript3: +PalletTownOakNotSafeComeWithMeScript: ld a, [wd730] bit 0, a ret nz @@ -97,15 +98,15 @@ PalletTownScript3: ld [wSpritePlayerStateData1FacingDirection], a ld a, 1 ld [wcf0d], a - ld a, $FC + ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a - ld a, 1 + ld a, TEXT_PALLETTOWN_OAK ldh [hSpriteIndexOrTextID], a call DisplayTextID ; set up movement script that causes the player to follow Oak to his lab - ld a, $FF + ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a - ld a, 1 + ld a, PALLETTOWN_OAK ld [wSpriteIndex], a xor a ld [wNPCMovementScriptFunctionNum], a @@ -115,21 +116,21 @@ PalletTownScript3: ld [wNPCMovementScriptBank], a ; trigger the next script - ld a, 4 + ld a, SCRIPT_PALLETTOWN_PLAYER_FOLLOWS_OAK ld [wPalletTownCurScript], a ret -PalletTownScript4: +PalletTownPlayerFollowsOakScript: ld a, [wNPCMovementScriptPointerTableNum] and a ; is the movement script over? ret nz ; trigger the next script - ld a, 5 + ld a, SCRIPT_PALLETTOWN_DAISY ld [wPalletTownCurScript], a ret -PalletTownScript5: +PalletTownDaisyScript: CheckEvent EVENT_DAISY_WALKING jr nz, .next CheckBothEventsSet EVENT_GOT_TOWN_MAP, EVENT_ENTERED_BLUES_HOUSE, 1 @@ -145,35 +146,36 @@ PalletTownScript5: CheckEvent EVENT_GOT_POKEBALLS_FROM_OAK ret z SetEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS_2 -PalletTownScript6: +PalletTownNoopScript: ret PalletTown_TextPointers: - dw PalletTownText1 - dw PalletTownText2 - dw PalletTownText3 - dw PalletTownText4 - dw PalletTownText5 - dw PalletTownText6 - dw PalletTownText7 - -PalletTownText1: + def_text_pointers + dw_const PalletTownOakText, TEXT_PALLETTOWN_OAK + dw_const PalletTownGirlText, TEXT_PALLETTOWN_GIRL + dw_const PalletTownFisherText, TEXT_PALLETTOWN_FISHER + dw_const PalletTownOaksLabSignText, TEXT_PALLETTOWN_OAKSLAB_SIGN + dw_const PalletTownSignText, TEXT_PALLETTOWN_SIGN + dw_const PalletTownPlayersHouseSignText, TEXT_PALLETTOWN_PLAYERSHOUSE_SIGN + dw_const PalletTownRivalsHouseSignText, TEXT_PALLETTOWN_RIVALSHOUSE_SIGN + +PalletTownOakText: text_asm ld a, [wcf0d] and a jr nz, .next ld a, 1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, OakAppearsText + ld hl, .HeyWaitDontGoOutText jr .done .next - ld hl, OakWalksUpText + ld hl, .ItsUnsafeText .done call PrintText jp TextScriptEnd -OakAppearsText: - text_far _OakAppearsText +.HeyWaitDontGoOutText: + text_far _PalletTownOakHeyWaitDontGoOutText text_asm ld c, 10 call DelayFrames @@ -185,30 +187,30 @@ OakAppearsText: ld [wPlayerMovingDirection], a jp TextScriptEnd -OakWalksUpText: - text_far _OakWalksUpText +.ItsUnsafeText: + text_far _PalletTownOakItsUnsafeText text_end -PalletTownText2: ; girl - text_far _PalletTownText2 +PalletTownGirlText: + text_far _PalletTownGirlText text_end -PalletTownText3: ; fat man - text_far _PalletTownText3 +PalletTownFisherText: + text_far _PalletTownFisherText text_end -PalletTownText4: ; sign by lab - text_far _PalletTownText4 +PalletTownOaksLabSignText: + text_far _PalletTownOaksLabSignText text_end -PalletTownText5: ; sign by fence - text_far _PalletTownText5 +PalletTownSignText: + text_far _PalletTownSignText text_end -PalletTownText6: ; sign by Red's house - text_far _PalletTownText6 +PalletTownPlayersHouseSignText: + text_far _PalletTownPlayersHouseSignText text_end -PalletTownText7: ; sign by Blue's house - text_far _PalletTownText7 +PalletTownRivalsHouseSignText: + text_far _PalletTownRivalsHouseSignText text_end diff --git a/scripts/PewterCity.asm b/scripts/PewterCity.asm index 221834de4..d1f77b766 100644 --- a/scripts/PewterCity.asm +++ b/scripts/PewterCity.asm @@ -5,49 +5,50 @@ PewterCity_Script: jp CallFunctionInTable PewterCity_ScriptPointers: - dw PewterCityScript0 - dw PewterCityScript1 - dw PewterCityScript2 - dw PewterCityScript3 - dw PewterCityScript4 - dw PewterCityScript5 - dw PewterCityScript6 - -PewterCityScript0: + def_script_pointers + dw_const PewterCityDefaultScript, SCRIPT_PEWTERCITY_DEFAULT + dw_const PewterCitySuperNerd1ShowsPlayerMuseumScript, SCRIPT_PEWTERCITY_SUPER_NERD1_SHOWS_PLAYER_MUSEUM + dw_const PewterCityHideSuperNerd1Script, SCRIPT_PEWTERCITY_HIDE_SUPER_NERD1 + dw_const PewterCityResetSuperNerd1Script, SCRIPT_PEWTERCITY_RESET_SUPER_NERD1 + dw_const PewterCityYoungsterShowsPlayerGymScript, SCRIPT_PEWTERCITY_YOUNGSTER_SHOWS_PLAYER_GYM + dw_const PewterCityHideYoungsterScript, SCRIPT_PEWTERCITY_HIDE_YOUNGSTER + dw_const PewterCityResetYoungsterScript, SCRIPT_PEWTERCITY_RESET_YOUNGSTER + +PewterCityDefaultScript: xor a ld [wMuseum1FCurScript], a ResetEvent EVENT_BOUGHT_MUSEUM_TICKET - call PewterCityScript_1925e + call PewterCityCheckPlayerLeavingEastScript ret -PewterCityScript_1925e: +PewterCityCheckPlayerLeavingEastScript: CheckEvent EVENT_BEAT_BROCK ret nz IF DEF(_DEBUG) call DebugPressedOrHeldB ret nz ENDC - ld hl, CoordsData_19277 + ld hl, PewterCityPlayerLeavingEastCoords call ArePlayerCoordsInArray ret nc - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a - ld a, $5 + ld a, TEXT_PEWTERCITY_YOUNGSTER ldh [hSpriteIndexOrTextID], a jp DisplayTextID -CoordsData_19277: +PewterCityPlayerLeavingEastCoords: dbmapcoord 35, 17 dbmapcoord 36, 17 dbmapcoord 37, 18 dbmapcoord 37, 19 db -1 ; end -PewterCityScript1: +PewterCitySuperNerd1ShowsPlayerMuseumScript: ld a, [wNPCMovementScriptPointerTableNum] and a ret nz - ld a, $3 + ld a, PEWTERCITY_SUPER_NERD1 ldh [hSpriteIndex], a ld a, SPRITE_FACING_UP ldh [hSpriteFacingDirection], a @@ -58,7 +59,7 @@ PewterCityScript1: call PlayDefaultMusic ld hl, wFlags_0xcd60 set 4, [hl] - ld a, $d + ld a, TEXT_PEWTERCITY_SUPER_NERD1_ITS_RIGHT_HERE ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, $3c @@ -69,14 +70,14 @@ PewterCityScript1: ldh [hSpriteMapYCoord], a ld a, 17 ldh [hSpriteMapXCoord], a - ld a, $3 + ld a, PEWTERCITY_SUPER_NERD1 ld [wSpriteIndex], a call SetSpritePosition1 - ld a, $3 + ld a, PEWTERCITY_SUPER_NERD1 ldh [hSpriteIndex], a ld de, MovementData_PewterMuseumGuyExit call MoveSprite - ld a, $2 + ld a, SCRIPT_PEWTERCITY_HIDE_SUPER_NERD1 ld [wPewterCityCurScript], a ret @@ -87,19 +88,19 @@ MovementData_PewterMuseumGuyExit: db NPC_MOVEMENT_DOWN db -1 ; end -PewterCityScript2: +PewterCityHideSuperNerd1Script: ld a, [wd730] bit 0, a ret nz ld a, HS_MUSEUM_GUY ld [wMissableObjectIndex], a predef HideObject - ld a, $3 + ld a, SCRIPT_PEWTERCITY_RESET_SUPER_NERD1 ld [wPewterCityCurScript], a ret -PewterCityScript3: - ld a, $3 +PewterCityResetSuperNerd1Script: + ld a, PEWTERCITY_SUPER_NERD1 ld [wSpriteIndex], a call SetSpritePosition2 ld a, HS_MUSEUM_GUY @@ -107,15 +108,15 @@ PewterCityScript3: predef ShowObject xor a ld [wJoyIgnore], a - ld a, $0 + ld a, SCRIPT_PEWTERCITY_DEFAULT ld [wPewterCityCurScript], a ret -PewterCityScript4: +PewterCityYoungsterShowsPlayerGymScript: ld a, [wNPCMovementScriptPointerTableNum] and a ret nz - ld a, $5 + ld a, PEWTERCITY_YOUNGSTER ldh [hSpriteIndex], a ld a, SPRITE_FACING_LEFT ldh [hSpriteFacingDirection], a @@ -126,7 +127,7 @@ PewterCityScript4: call PlayDefaultMusic ld hl, wFlags_0xcd60 set 4, [hl] - ld a, $e + ld a, TEXT_PEWTERCITY_YOUNGSTER_GO_TAKE_ON_BROCK ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, $3c @@ -137,14 +138,14 @@ PewterCityScript4: ldh [hSpriteMapYCoord], a ld a, 16 ldh [hSpriteMapXCoord], a - ld a, $5 + ld a, PEWTERCITY_YOUNGSTER ld [wSpriteIndex], a call SetSpritePosition1 - ld a, $5 + ld a, PEWTERCITY_YOUNGSTER ldh [hSpriteIndex], a ld de, MovementData_PewterGymGuyExit call MoveSprite - ld a, $5 + ld a, SCRIPT_PEWTERCITY_HIDE_YOUNGSTER ld [wPewterCityCurScript], a ret @@ -156,19 +157,19 @@ MovementData_PewterGymGuyExit: db NPC_MOVEMENT_RIGHT db -1 ; end -PewterCityScript5: +PewterCityHideYoungsterScript: ld a, [wd730] bit 0, a ret nz ld a, HS_GYM_GUY ld [wMissableObjectIndex], a predef HideObject - ld a, $6 + ld a, SCRIPT_PEWTERCITY_RESET_YOUNGSTER ld [wPewterCityCurScript], a ret -PewterCityScript6: - ld a, $5 +PewterCityResetYoungsterScript: + ld a, PEWTERCITY_YOUNGSTER ld [wSpriteIndex], a call SetSpritePosition2 ld a, HS_GYM_GUY @@ -176,47 +177,48 @@ PewterCityScript6: predef ShowObject xor a ld [wJoyIgnore], a - ld a, $0 + ld a, SCRIPT_PEWTERCITY_DEFAULT ld [wPewterCityCurScript], a ret PewterCity_TextPointers: - dw PewterCityText1 - dw PewterCityText2 - dw PewterCityText3 - dw PewterCityText4 - dw PewterCityText5 - dw PewterCityText6 - dw PewterCityText7 - dw MartSignText - dw PokeCenterSignText - dw PewterCityText10 - dw PewterCityText11 - dw PewterCityText12 - dw PewterCityText13 - dw PewterCityText14 - -PewterCityText1: - text_far _PewterCityText1 + def_text_pointers + dw_const PewterCityCooltrainerFText, TEXT_PEWTERCITY_COOLTRAINER_F + dw_const PewterCityCooltrainerMText, TEXT_PEWTERCITY_COOLTRAINER_M + dw_const PewterCitySuperNerd1Text, TEXT_PEWTERCITY_SUPER_NERD1 + dw_const PewterCitySuperNerd2Text, TEXT_PEWTERCITY_SUPER_NERD2 + dw_const PewterCityYoungsterText, TEXT_PEWTERCITY_YOUNGSTER + dw_const PewterCityTrainerTipsText, TEXT_PEWTERCITY_TRAINER_TIPS + dw_const PewterCityPoliceNoticeSignText, TEXT_PEWTERCITY_POLICE_NOTICE_SIGN + dw_const MartSignText, TEXT_PEWTERCITY_MART_SIGN + dw_const PokeCenterSignText, TEXT_PEWTERCITY_POKECENTER_SIGN + dw_const PewterCityMuseumSignText, TEXT_PEWTERCITY_MUSEUM_SIGN + dw_const PewterCityGymSignText, TEXT_PEWTERCITY_GYM_SIGN + dw_const PewterCitySignText, TEXT_PEWTERCITY_SIGN + dw_const PewterCitySuperNerd1ItsRightHereText, TEXT_PEWTERCITY_SUPER_NERD1_ITS_RIGHT_HERE + dw_const PewterCityYoungsterGoTakeOnBrockText, TEXT_PEWTERCITY_YOUNGSTER_GO_TAKE_ON_BROCK + +PewterCityCooltrainerFText: + text_far _PewterCityCooltrainerFText text_end -PewterCityText2: - text_far _PewterCityText2 +PewterCityCooltrainerMText: + text_far _PewterCityCooltrainerMText text_end -PewterCityText3: +PewterCitySuperNerd1Text: text_asm - ld hl, PewterCityText_193f1 + ld hl, .DidYouCheckOutMuseumText call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a jr nz, .playerDidNotGoIntoMuseum - ld hl, PewterCityText_193f6 + ld hl, .WerentThoseFossilsAmazingText call PrintText jr .done .playerDidNotGoIntoMuseum - ld hl, PewterCityText_193fb + ld hl, .YouHaveToGoText call PrintText xor a ldh [hJoyPressed], a @@ -226,62 +228,62 @@ PewterCityText3: ld [wNPCMovementScriptPointerTableNum], a ldh a, [hLoadedROMBank] ld [wNPCMovementScriptBank], a - ld a, $3 + ld a, PEWTERCITY_SUPER_NERD1 ld [wSpriteIndex], a call GetSpritePosition2 - ld a, $1 + ld a, SCRIPT_PEWTERCITY_SUPER_NERD1_SHOWS_PLAYER_MUSEUM ld [wPewterCityCurScript], a .done jp TextScriptEnd -PewterCityText_193f1: - text_far _PewterCityText_193f1 +.DidYouCheckOutMuseumText: + text_far _PewterCitySuperNerd1DidYouCheckOutMuseumText text_end -PewterCityText_193f6: - text_far _PewterCityText_193f6 +.WerentThoseFossilsAmazingText: + text_far _PewterCitySuperNerd1WerentThoseFossilsAmazingText text_end -PewterCityText_193fb: - text_far _PewterCityText_193fb +.YouHaveToGoText: + text_far _PewterCitySuperNerd1YouHaveToGoText text_end -PewterCityText13: - text_far _PewterCityText13 +PewterCitySuperNerd1ItsRightHereText: + text_far _PewterCitySuperNerd1ItsRightHereText text_end -PewterCityText4: +PewterCitySuperNerd2Text: text_asm - ld hl, PewterCityText_19427 + ld hl, .DoYouKnowWhatImDoingText call PrintText call YesNoChoice ld a, [wCurrentMenuItem] cp $0 jr nz, .playerDoesNotKnow - ld hl, PewterCityText_1942c + ld hl, .ThatsRightText call PrintText jr .done .playerDoesNotKnow - ld hl, PewterCityText_19431 + ld hl, .ImSprayingRepelText call PrintText .done jp TextScriptEnd -PewterCityText_19427: - text_far _PewterCityText_19427 +.DoYouKnowWhatImDoingText: + text_far _PewterCitySuperNerd2DoYouKnowWhatImDoingText text_end -PewterCityText_1942c: - text_far _PewterCityText_1942c +.ThatsRightText: + text_far _PewterCitySuperNerd2ThatsRightText text_end -PewterCityText_19431: - text_far _PewterCityText_19431 +.ImSprayingRepelText: + text_far _PewterCitySuperNerd2ImSprayingRepelText text_end -PewterCityText5: +PewterCityYoungsterText: text_asm - ld hl, PewterCityText_1945d + ld hl, .YoureATrainerFollowMeText call PrintText xor a ldh [hJoyHeld], a @@ -290,37 +292,37 @@ PewterCityText5: ld [wNPCMovementScriptPointerTableNum], a ldh a, [hLoadedROMBank] ld [wNPCMovementScriptBank], a - ld a, $5 + ld a, PEWTERCITY_YOUNGSTER ld [wSpriteIndex], a call GetSpritePosition2 - ld a, $4 + ld a, SCRIPT_PEWTERCITY_YOUNGSTER_SHOWS_PLAYER_GYM ld [wPewterCityCurScript], a jp TextScriptEnd -PewterCityText_1945d: - text_far _PewterCityText_1945d +.YoureATrainerFollowMeText: + text_far _PewterCityYoungsterYoureATrainerFollowMeText text_end -PewterCityText14: - text_far _PewterCityText14 +PewterCityYoungsterGoTakeOnBrockText: + text_far _PewterCityYoungsterGoTakeOnBrockText text_end -PewterCityText6: - text_far _PewterCityText6 +PewterCityTrainerTipsText: + text_far _PewterCityTrainerTipsText text_end -PewterCityText7: - text_far _PewterCityText7 +PewterCityPoliceNoticeSignText: + text_far _PewterCityPoliceNoticeSignText text_end -PewterCityText10: - text_far _PewterCityText10 +PewterCityMuseumSignText: + text_far _PewterCityMuseumSignText text_end -PewterCityText11: - text_far _PewterCityText11 +PewterCityGymSignText: + text_far _PewterCityGymSignText text_end -PewterCityText12: - text_far _PewterCityText12 +PewterCitySignText: + text_far _PewterCitySignText text_end diff --git a/scripts/PewterGym.asm b/scripts/PewterGym.asm index 798285d3a..e653fc88c 100644 --- a/scripts/PewterGym.asm +++ b/scripts/PewterGym.asm @@ -30,33 +30,34 @@ PewterGymResetScripts: ret PewterGym_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw PewterGymBrockPostBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_PEWTERGYM_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_PEWTERGYM_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_PEWTERGYM_END_BATTLE + dw_const PewterGymBrockPostBattle, SCRIPT_PEWTERGYM_BROCK_POST_BATTLE PewterGymBrockPostBattle: ld a, [wIsInBattle] cp $ff jp z, PewterGymResetScripts - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ; fallthrough PewterGymScriptReceiveTM34: - ld a, $4 + ld a, TEXT_PEWTERGYM_BROCK_WAIT_TAKE_THIS ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_BROCK lb bc, TM_BIDE, 1 call GiveItem jr nc, .BagFull - ld a, $5 + ld a, TEXT_PEWTERGYM_RECEIVED_TM34 ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM34 jr .gymVictory .BagFull - ld a, $6 + ld a, TEXT_PEWTERGYM_TM34_NO_ROOM ldh [hSpriteIndexOrTextID], a call DisplayTextID .gymVictory @@ -80,20 +81,21 @@ PewterGymScriptReceiveTM34: jp PewterGymResetScripts PewterGym_TextPointers: - dw BrockText - dw PewterGymTrainerText1 - dw PewterGymGuideText - dw BeforeReceivedTM34Text - dw ReceivedTM34Text - dw TM34NoRoomText + def_text_pointers + dw_const PewterGymBrockText, TEXT_PEWTERGYM_BROCK + dw_const PewterGymCooltrainerMText, TEXT_PEWTERGYM_COOLTRAINER_M + dw_const PewterGymGuideText, TEXT_PEWTERGYM_GYM_GUIDE + dw_const PewterGymBrockWaitTakeThisText, TEXT_PEWTERGYM_BROCK_WAIT_TAKE_THIS + dw_const PewterGymReceivedTM34Text, TEXT_PEWTERGYM_RECEIVED_TM34 + dw_const PewterGymTM34NoRoomText, TEXT_PEWTERGYM_TM34_NO_ROOM PewterGymTrainerHeaders: def_trainers 2 PewterGymTrainerHeader0: - trainer EVENT_BEAT_PEWTER_GYM_TRAINER_0, 5, PewterGymBattleText1, PewterGymEndBattleText1, PewterGymAfterBattleText1 + trainer EVENT_BEAT_PEWTER_GYM_TRAINER_0, 5, PewterGymCooltrainerMBattleText, PewterGymCooltrainerMEndBattleText, PewterGymCooltrainerMAfterBattleText db -1 ; end -BrockText: +PewterGymBrockText: text_asm CheckEvent EVENT_BEAT_BROCK jr z, .beforeBeat @@ -103,17 +105,17 @@ BrockText: call DisableWaitingAfterTextDisplay jr .done .afterBeat - ld hl, BrockPostBattleAdviceText + ld hl, .PostBattleAdviceText call PrintText jr .done .beforeBeat - ld hl, BrockPreBattleText + ld hl, .PreBattleText call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, ReceivedBoulderBadgeText - ld de, ReceivedBoulderBadgeText + ld hl, PewterGymBrockReceivedBoulderBadgeText + ld de, PewterGymBrockReceivedBoulderBadgeText call SaveEndBattleTextPointers ldh a, [hSpriteIndex] ld [wSpriteIndex], a @@ -123,56 +125,56 @@ BrockText: ld [wGymLeaderNo], a xor a ldh [hJoyHeld], a - ld a, $3 + ld a, SCRIPT_PEWTERGYM_BROCK_POST_BATTLE ld [wPewterGymCurScript], a ld [wCurMapScript], a .done jp TextScriptEnd -BrockPreBattleText: - text_far _BrockPreBattleText +.PreBattleText: + text_far _PewterGymBrockPreBattleText text_end -BrockPostBattleAdviceText: - text_far _BrockPostBattleAdviceText +.PostBattleAdviceText: + text_far _PewterGymBrockPostBattleAdviceText text_end -BeforeReceivedTM34Text: - text_far _BeforeReceivedTM34Text +PewterGymBrockWaitTakeThisText: + text_far _PewterGymBrockWaitTakeThisText text_end -ReceivedTM34Text: - text_far _ReceivedTM34Text +PewterGymReceivedTM34Text: + text_far _PewterGymReceivedTM34Text sound_get_item_1 text_far _TM34ExplanationText text_end -TM34NoRoomText: - text_far _TM34NoRoomText +PewterGymTM34NoRoomText: + text_far _PewterGymTM34NoRoomText text_end -ReceivedBoulderBadgeText: - text_far _ReceivedBoulderBadgeText +PewterGymBrockReceivedBoulderBadgeText: + text_far _PewterGymBrockReceivedBoulderBadgeText sound_level_up ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded - text_far _BrockBoulerBadgeInfoText ; Text to tell that the flash technique can be used + text_far _PewterGymBrockBoulderBadgeInfoText ; Text to tell that the flash technique can be used text_end -PewterGymTrainerText1: +PewterGymCooltrainerMText: text_asm ld hl, PewterGymTrainerHeader0 call TalkToTrainer jp TextScriptEnd -PewterGymBattleText1: - text_far _PewterGymBattleText1 +PewterGymCooltrainerMBattleText: + text_far _PewterGymCooltrainerMBattleText text_end -PewterGymEndBattleText1: - text_far _PewterGymEndBattleText1 +PewterGymCooltrainerMEndBattleText: + text_far _PewterGymCooltrainerMEndBattleText text_end -PewterGymAfterBattleText1: - text_far _PewterGymAfterBattleText1 +PewterGymCooltrainerMAfterBattleText: + text_far _PewterGymCooltrainerMAfterBattleText text_end PewterGymGuideText: @@ -190,7 +192,7 @@ PewterGymGuideText: call PrintText jr .PewterGymGuideAdviceText .PewterGymGuideBeginAdviceText - ld hl, PewterGymText_5c524 + ld hl, PewterGymGuideFreeServiceText call PrintText .PewterGymGuideAdviceText ld hl, PewterGymGuideAdviceText @@ -214,8 +216,8 @@ PewterGymGuideAdviceText: text_far _PewterGymGuideAdviceText text_end -PewterGymText_5c524: - text_far _PewterGymText_5c524 +PewterGymGuideFreeServiceText: + text_far _PewterGymGuideFreeServiceText text_end PewterGymGuidePostBattleText: diff --git a/scripts/PewterMart.asm b/scripts/PewterMart.asm index a0e9e63ed..0a5baac2b 100644 --- a/scripts/PewterMart.asm +++ b/scripts/PewterMart.asm @@ -5,26 +5,27 @@ PewterMart_Script: ret PewterMart_TextPointers: - dw PewterCashierText - dw PewterMartText2 - dw PewterMartText3 + def_text_pointers + dw_const PewterMartClerkText, TEXT_PEWTERMART_CLERK + dw_const PewterMartYoungsterText, TEXT_PEWTERMART_YOUNGSTER + dw_const PewterMartSuperNerdText, TEXT_PEWTERMART_SUPER_NERD -PewterMartText2: +PewterMartYoungsterText: text_asm ld hl, .Text call PrintText jp TextScriptEnd -.Text - text_far _PewterMartText2 +.Text: + text_far _PewterMartYoungsterText text_end -PewterMartText3: +PewterMartSuperNerdText: text_asm ld hl, .Text call PrintText jp TextScriptEnd -.Text - text_far _PewterMartText3 +.Text: + text_far _PewterMartSuperNerdText text_end diff --git a/scripts/PewterNidoranHouse.asm b/scripts/PewterNidoranHouse.asm index 93d430c0b..bd2de197b 100644 --- a/scripts/PewterNidoranHouse.asm +++ b/scripts/PewterNidoranHouse.asm @@ -2,22 +2,23 @@ PewterNidoranHouse_Script: jp EnableAutoTextBoxDrawing PewterNidoranHouse_TextPointers: - dw PewterHouse1Text1 - dw PewterHouse1Text2 - dw PewterHouse1Text3 + def_text_pointers + dw_const PewterNidoranHouseNidoranText, TEXT_PEWTERNIDORANHOUSE_NIDORAN + dw_const PewterNidoranHouseLittleBoyText, TEXT_PEWTERNIDORANHOUSE_LITTLE_BOY + dw_const PewterNidoranHouseMiddleAgedManText, TEXT_PEWTERNIDORANHOUSE_MIDDLE_AGED_MAN -PewterHouse1Text1: - text_far _PewterHouse1Text1 +PewterNidoranHouseNidoranText: + text_far _PewterNidoranHouseNidoranText text_asm ld a, NIDORAN_M call PlayCry call WaitForSoundToFinish jp TextScriptEnd -PewterHouse1Text2: - text_far _PewterHouse1Text2 +PewterNidoranHouseLittleBoyText: + text_far _PewterNidoranHouseLittleBoyText text_end -PewterHouse1Text3: - text_far _PewterHouse1Text3 +PewterNidoranHouseMiddleAgedManText: + text_far _PewterNidoranHouseMiddleAgedManText text_end diff --git a/scripts/PewterPokecenter.asm b/scripts/PewterPokecenter.asm index 3267dcee4..e5bda65ee 100644 --- a/scripts/PewterPokecenter.asm +++ b/scripts/PewterPokecenter.asm @@ -3,23 +3,24 @@ PewterPokecenter_Script: jp EnableAutoTextBoxDrawing PewterPokecenter_TextPointers: - dw PewterHealNurseText - dw PewterPokecenterText2 - dw PewterJigglypuffText - dw PewterTradeNurseText + def_text_pointers + dw_const PewterPokecenterNurseText, TEXT_PEWTERPOKECENTER_NURSE + dw_const PewterPokecenterGentlemanText, TEXT_PEWTERPOKECENTER_GENTLEMAN + dw_const PewterPokecenterJigglypuffText, TEXT_PEWTERPOKECENTER_JIGGLYPUFF + dw_const PewterPokecenterLinkReceptionistText, TEXT_PEWTERPOKECENTER_LINK_RECEPTIONIST -PewterHealNurseText: +PewterPokecenterNurseText: script_pokecenter_nurse -PewterPokecenterText2: - text_far _PewterPokecenterText2 +PewterPokecenterGentlemanText: + text_far _PewterPokecenterGentlemanText text_end -PewterJigglypuffText: +PewterPokecenterJigglypuffText: text_asm ld a, TRUE ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, .JigglypuffText + ld hl, .Text call PrintText ld a, SFX_STOP_ALL_MUSIC @@ -27,9 +28,9 @@ PewterJigglypuffText: ld c, 32 call DelayFrames - ld hl, JigglypuffFacingDirections + ld hl, .FacingDirections ld de, wJigglypuffFacingDirections - ld bc, JigglypuffFacingDirectionsEnd - JigglypuffFacingDirections + ld bc, .FacingDirectionsEnd - .FacingDirections call CopyData ld a, [wSprite03StateData1ImageIndex] @@ -53,7 +54,7 @@ PewterJigglypuffText: push hl ld hl, wJigglypuffFacingDirections ld de, wJigglypuffFacingDirections - 1 - ld bc, JigglypuffFacingDirectionsEnd - JigglypuffFacingDirections + ld bc, .FacingDirectionsEnd - .FacingDirections call CopyData ld a, [wJigglypuffFacingDirections - 1] ld [wJigglypuffFacingDirections + 3], a @@ -71,16 +72,16 @@ PewterJigglypuffText: call PlayDefaultMusic jp TextScriptEnd -.JigglypuffText: - text_far _PewterJigglypuffText +.Text: + text_far _PewterPokecenterJigglypuffText text_end -JigglypuffFacingDirections: +.FacingDirections: db $30 | SPRITE_FACING_DOWN db $30 | SPRITE_FACING_LEFT db $30 | SPRITE_FACING_UP db $30 | SPRITE_FACING_RIGHT -JigglypuffFacingDirectionsEnd: +.FacingDirectionsEnd: -PewterTradeNurseText: +PewterPokecenterLinkReceptionistText: script_cable_club_receptionist diff --git a/scripts/PewterSpeechHouse.asm b/scripts/PewterSpeechHouse.asm index 5d3d92493..e42f941bd 100644 --- a/scripts/PewterSpeechHouse.asm +++ b/scripts/PewterSpeechHouse.asm @@ -2,13 +2,14 @@ PewterSpeechHouse_Script: jp EnableAutoTextBoxDrawing PewterSpeechHouse_TextPointers: - dw PewterHouse2Text1 - dw PewterHouse2Text2 + def_text_pointers + dw_const PewterSpeechHouseGamblerText, TEXT_PEWTERSPEECHHOUSE_GAMBLER + dw_const PewterSpeechHouseYoungsterText, TEXT_PEWTERSPEECHHOUSE_YOUNGSTER -PewterHouse2Text1: - text_far _PewterHouse2Text1 +PewterSpeechHouseGamblerText: + text_far _PewterSpeechHouseGamblerText text_end -PewterHouse2Text2: - text_far _PewterHouse2Text2 +PewterSpeechHouseYoungsterText: + text_far _PewterSpeechHouseYoungsterText text_end diff --git a/scripts/PokemonFanClub.asm b/scripts/PokemonFanClub.asm index 717ba4bbf..e14eb7ed9 100644 --- a/scripts/PokemonFanClub.asm +++ b/scripts/PokemonFanClub.asm @@ -1,7 +1,7 @@ PokemonFanClub_Script: jp EnableAutoTextBoxDrawing -FanClubBikeInBag: +PokemonFanClub_CheckBikeInBag: ; check if any bike paraphernalia in bag CheckEvent EVENT_GOT_BIKE_VOUCHER ret nz @@ -12,98 +12,94 @@ FanClubBikeInBag: jp IsItemInBag PokemonFanClub_TextPointers: - dw FanClubText1 - dw FanClubText2 - dw FanClubText3 - dw FanClubText4 - dw FanClubText5 - dw FanClubText6 - dw FanClubText7 - dw FanClubText8 - -FanClubText1: -; pikachu fan + def_text_pointers + dw_const PokemonFanClubPikachuFanText, TEXT_POKEMONFANCLUB_PIKACHU_FAN + dw_const PokemonFanClubSeelFanText, TEXT_POKEMONFANCLUB_SEEL_FAN + dw_const PokemonFanClubPikachuText, TEXT_POKEMONFANCLUB_PIKACHU + dw_const PokemonFanClubSeelText, TEXT_POKEMONFANCLUB_SEEL + dw_const PokemonFanClubChairmanText, TEXT_POKEMONFANCLUB_CHAIRMAN + dw_const PokemonFanClubReceptionistText, TEXT_POKEMONFANCLUB_RECEPTIONIST + dw_const PokemonFanClubSign1Text, TEXT_POKEMONFANCLUB_SIGN_1 + dw_const PokemonFanClubSign2Text, TEXT_POKEMONFANCLUB_SIGN_2 + +PokemonFanClubPikachuFanText: text_asm CheckEvent EVENT_PIKACHU_FAN_BOAST jr nz, .mineisbetter - ld hl, .normaltext + ld hl, .NormalText call PrintText SetEvent EVENT_SEEL_FAN_BOAST jr .done .mineisbetter - ld hl, .bettertext + ld hl, .BetterText call PrintText ResetEvent EVENT_PIKACHU_FAN_BOAST .done jp TextScriptEnd -.normaltext - text_far PikachuFanText +.NormalText: + text_far _PokemonFanClubPikachuFanNormalText text_end -.bettertext - text_far PikachuFanBetterText +.BetterText: + text_far _PokemonFanClubPikachuFanBetterText text_end -FanClubText2: -; seel fan +PokemonFanClubSeelFanText: text_asm CheckEvent EVENT_SEEL_FAN_BOAST jr nz, .mineisbetter - ld hl, .normaltext + ld hl, .NormalText call PrintText SetEvent EVENT_PIKACHU_FAN_BOAST jr .done .mineisbetter - ld hl, .bettertext + ld hl, .BetterText call PrintText ResetEvent EVENT_SEEL_FAN_BOAST .done jp TextScriptEnd -.normaltext - text_far SeelFanText +.NormalText: + text_far _PokemonFanClubSeelFanNormalText text_end -.bettertext - text_far SeelFanBetterText +.BetterText: + text_far _PokemonFanClubSeelFanBetterText text_end -FanClubText3: -; pikachu +PokemonFanClubPikachuText: text_asm - ld hl, .text + ld hl, .Text call PrintText ld a, PIKACHU call PlayCry call WaitForSoundToFinish jp TextScriptEnd -.text - text_far FanClubPikachuText +.Text + text_far _PokemonFanClubPikachuText text_end -FanClubText4: -; seel +PokemonFanClubSeelText: text_asm - ld hl, .text + ld hl, .Text call PrintText ld a, SEEL call PlayCry call WaitForSoundToFinish jp TextScriptEnd -.text - text_far FanClubSeelText +.Text: + text_far _PokemonFanClubSeelText text_end -FanClubText5: -; chair +PokemonFanClubChairmanText: text_asm - call FanClubBikeInBag + call PokemonFanClub_CheckBikeInBag jr nz, .nothingleft - ld hl, .meetchairtext + ld hl, .IntroText call PrintText call YesNoChoice ld a, [wCurrentMenuItem] @@ -111,63 +107,63 @@ FanClubText5: jr nz, .nothanks ; tell the story - ld hl, .storytext + ld hl, .StoryText call PrintText lb bc, BIKE_VOUCHER, 1 call GiveItem jr nc, .bag_full - ld hl, .receivedvouchertext + ld hl, .BikeVoucherText call PrintText SetEvent EVENT_GOT_BIKE_VOUCHER jr .done .bag_full - ld hl, .bagfulltext + ld hl, .BagFullText call PrintText jr .done .nothanks - ld hl, .nostorytext + ld hl, .NoStoryText call PrintText jr .done .nothingleft - ld hl, .finaltext + ld hl, .FinalText call PrintText .done jp TextScriptEnd -.meetchairtext - text_far FanClubMeetChairText +.IntroText: + text_far _PokemonFanClubChairmanIntroText text_end -.storytext - text_far FanClubChairStoryText +.StoryText: + text_far _PokemonFanClubChairmanStoryText text_end -.receivedvouchertext - text_far ReceivedBikeVoucherText +.BikeVoucherText: + text_far _PokemonFanClubReceivedBikeVoucherText sound_get_key_item - text_far ExplainBikeVoucherText + text_far _PokemonFanClubExplainBikeVoucherText text_end -.nostorytext - text_far FanClubNoStoryText +.NoStoryText: + text_far _PokemonFanClubNoStoryText text_end -.finaltext - text_far FanClubChairFinalText +.FinalText: + text_far _PokemonFanClubChairFinalText text_end -.bagfulltext - text_far FanClubBagFullText +.BagFullText: + text_far _PokemonFanClubBagFullText text_end -FanClubText6: - text_far _FanClubText6 +PokemonFanClubReceptionistText: + text_far _PokemonFanClubReceptionistText text_end -FanClubText7: - text_far _FanClubText7 +PokemonFanClubSign1Text: + text_far _PokemonFanClubSign1Text text_end -FanClubText8: - text_far _FanClubText8 +PokemonFanClubSign2Text: + text_far _PokemonFanClubSign2Text text_end diff --git a/scripts/PokemonMansion1F.asm b/scripts/PokemonMansion1F.asm index 247562a92..c1fef205a 100644 --- a/scripts/PokemonMansion1F.asm +++ b/scripts/PokemonMansion1F.asm @@ -51,79 +51,81 @@ Mansion1Script_Switches:: ret nz xor a ldh [hJoyHeld], a - ld a, $4 + ld a, TEXT_POKEMONMANSION1F_SWITCH ldh [hSpriteIndexOrTextID], a jp DisplayTextID PokemonMansion1F_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_POKEMONMANSION1F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_POKEMONMANSION1F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_POKEMONMANSION1F_END_BATTLE PokemonMansion1F_TextPointers: - dw Mansion1Text1 - dw PickUpItemText - dw PickUpItemText - dw Mansion1Text4 + def_text_pointers + dw_const PokemonMansion1FScientistText, TEXT_POKEMONMANSION1F_SCIENTIST + dw_const PickUpItemText, TEXT_POKEMONMANSION1F_ESCAPE_ROPE + dw_const PickUpItemText, TEXT_POKEMONMANSION1F_CARBOS + dw_const PokemonMansion1FSwitchText, TEXT_POKEMONMANSION1F_SWITCH Mansion1TrainerHeaders: def_trainers Mansion1TrainerHeader0: - trainer EVENT_BEAT_MANSION_1_TRAINER_0, 3, Mansion1BattleText2, Mansion1EndBattleText2, Mansion1AfterBattleText2 + trainer EVENT_BEAT_MANSION_1_TRAINER_0, 3, PokemonMansion1FScientistBattleText, PokemonMansion1FScientistEndBattleText, PokemonMansion1FScientistAfterBattleText db -1 ; end -Mansion1Text1: +PokemonMansion1FScientistText: text_asm ld hl, Mansion1TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Mansion1BattleText2: - text_far _Mansion1BattleText2 +PokemonMansion1FScientistBattleText: + text_far _PokemonMansion1FScientistBattleText text_end -Mansion1EndBattleText2: - text_far _Mansion1EndBattleText2 +PokemonMansion1FScientistEndBattleText: + text_far _PokemonMansion1FScientistEndBattleText text_end -Mansion1AfterBattleText2: - text_far _Mansion1AfterBattleText2 +PokemonMansion1FScientistAfterBattleText: + text_far _PokemonMansion1FScientistAfterBattleText text_end -Mansion1Text4: +PokemonMansion1FSwitchText: text_asm - ld hl, MansionSwitchText + ld hl, .Text call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a - jr nz, .asm_4438c + jr nz, .not_pressed ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, wCurrentMapScriptFlags set 5, [hl] - ld hl, MansionSwitchPressedText + ld hl, .PressedText call PrintText ld a, SFX_GO_INSIDE call PlaySound CheckAndSetEvent EVENT_MANSION_SWITCH_ON - jr z, .asm_44392 + jr z, .done ResetEventReuseHL EVENT_MANSION_SWITCH_ON - jr .asm_44392 -.asm_4438c - ld hl, MansionSwitchNotPressedText + jr .done +.not_pressed + ld hl, .NotPressedText call PrintText -.asm_44392 +.done jp TextScriptEnd -MansionSwitchText: - text_far _MansionSwitchText +.Text: + text_far _PokemonMansion1FSwitchText text_end -MansionSwitchPressedText: - text_far _MansionSwitchPressedText +.PressedText: + text_far _PokemonMansion1FSwitchPressedText text_end -MansionSwitchNotPressedText: - text_far _MansionSwitchNotPressedText +.NotPressedText: + text_far _PokemonMansion1FSwitchNotPressedText text_end diff --git a/scripts/PokemonMansion2F.asm b/scripts/PokemonMansion2F.asm index a887913a9..a4322da73 100644 --- a/scripts/PokemonMansion2F.asm +++ b/scripts/PokemonMansion2F.asm @@ -47,89 +47,90 @@ Mansion2Script_Switches:: ret nz xor a ldh [hJoyHeld], a - ld a, $5 + ld a, TEXT_POKEMONMANSION2F_SWITCH ldh [hSpriteIndexOrTextID], a jp DisplayTextID PokemonMansion2F_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_POKEMONMANSION2F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_POKEMONMANSION2F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_POKEMONMANSION2F_END_BATTLE PokemonMansion2F_TextPointers: - dw Mansion2Text1 - dw PickUpItemText - dw Mansion2Text3 - dw Mansion2Text4 - dw Mansion2Text5 + def_text_pointers + dw_const PokemonMansion2FSuperNerdText, TEXT_POKEMONMANSION2F_SUPER_NERD + dw_const PickUpItemText, TEXT_POKEMONMANSION2F_CALCIUM + dw_const PokemonMansion2FDiary1Text, TEXT_POKEMONMANSION2F_DIARY1 + dw_const PokemonMansion2FDiary2Text, TEXT_POKEMONMANSION2F_DIARY2 + dw_const PokemonMansion2FSwitchText, TEXT_POKEMONMANSION2F_SWITCH Mansion2TrainerHeaders: def_trainers Mansion2TrainerHeader0: - trainer EVENT_BEAT_MANSION_2_TRAINER_0, 0, Mansion2BattleText1, Mansion2EndBattleText1, Mansion2AfterBattleText1 + trainer EVENT_BEAT_MANSION_2_TRAINER_0, 0, PokemonMansion2FSuperNerdBattleText, PokemonMansion2FSuperNerdEndBattleText, PokemonMansion2FSuperNerdAfterBattleText db -1 ; end -Mansion2Text1: +PokemonMansion2FSuperNerdText: text_asm ld hl, Mansion2TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Mansion2BattleText1: - text_far _Mansion2BattleText1 +PokemonMansion2FSuperNerdBattleText: + text_far _PokemonMansion2FSuperNerdBattleText text_end -Mansion2EndBattleText1: - text_far _Mansion2EndBattleText1 +PokemonMansion2FSuperNerdEndBattleText: + text_far _PokemonMansion2FSuperNerdEndBattleText text_end -Mansion2AfterBattleText1: - text_far _Mansion2AfterBattleText1 +PokemonMansion2FSuperNerdAfterBattleText: + text_far _PokemonMansion2FSuperNerdAfterBattleText text_end -Mansion2Text3: - text_far _Mansion2Text3 +PokemonMansion2FDiary1Text: + text_far _PokemonMansion2FDiary1Text text_end -Mansion2Text4: - text_far _Mansion2Text4 +PokemonMansion2FDiary2Text: + text_far _PokemonMansion2FDiary2Text text_end -Mansion3Text6: -Mansion2Text5: +PokemonMansion2FSwitchText: text_asm - ld hl, Mansion2Text_520c2 + ld hl, .Text call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a - jr nz, .asm_520b9 + jr nz, .not_pressed ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, wCurrentMapScriptFlags set 5, [hl] - ld hl, Mansion2Text_520c7 + ld hl, .PressedText call PrintText ld a, SFX_GO_INSIDE call PlaySound CheckAndSetEvent EVENT_MANSION_SWITCH_ON - jr z, .asm_520bf + jr z, .done ResetEventReuseHL EVENT_MANSION_SWITCH_ON - jr .asm_520bf -.asm_520b9 - ld hl, Mansion2Text_520cc + jr .done +.not_pressed + ld hl, .NotPressed call PrintText -.asm_520bf +.done jp TextScriptEnd -Mansion2Text_520c2: - text_far _Mansion2Text_520c2 +.Text: + text_far _PokemonMansion2FSwitchText text_end -Mansion2Text_520c7: - text_far _Mansion2Text_520c7 +.PressedText: + text_far _PokemonMansion2FSwitchPressedText text_end -Mansion2Text_520cc: - text_far _Mansion2Text_520cc +.NotPressed: + text_far _PokemonMansion2FSwitchNotPressedText text_end diff --git a/scripts/PokemonMansion3F.asm b/scripts/PokemonMansion3F.asm index 2fc7c18d5..ddded4e93 100644 --- a/scripts/PokemonMansion3F.asm +++ b/scripts/PokemonMansion3F.asm @@ -32,11 +32,12 @@ Mansion3Script_52204: ret PokemonMansion3F_ScriptPointers: - dw Mansion3Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const PokemonMansion3FDefaultScript, SCRIPT_POKEMONMANSION3F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_POKEMONMANSION3F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_POKEMONMANSION3F_END_BATTLE -Mansion3Script0: +PokemonMansion3FDefaultScript: ld hl, CoordsData_52254 call Mansion3Script_5225b ld a, [wWhichDungeonWarp] @@ -78,62 +79,63 @@ Mansion3Script_Switches:: ret nz xor a ldh [hJoyHeld], a - ld a, $6 + ld a, TEXT_POKEMONMANSION3F_SWITCH ldh [hSpriteIndexOrTextID], a jp DisplayTextID PokemonMansion3F_TextPointers: - dw Mansion3Text1 - dw Mansion3Text2 - dw PickUpItemText - dw PickUpItemText - dw Mansion3Text5 - dw Mansion3Text6 + def_text_pointers + dw_const PokemonMansion3FSuperNerdText, TEXT_POKEMONMANSION3F_SUPER_NERD + dw_const PokemonMansion3FScientistText, TEXT_POKEMONMANSION3F_SCIENTIST + dw_const PickUpItemText, TEXT_POKEMONMANSION3F_MAX_POTION + dw_const PickUpItemText, TEXT_POKEMONMANSION3F_IRON + dw_const PokemonMansion3FDiaryText, TEXT_POKEMONMANSION3F_DIARY + dw_const PokemonMansion2FSwitchText, TEXT_POKEMONMANSION3F_SWITCH ; This switch uses the text script from the 2F. Mansion3TrainerHeaders: def_trainers Mansion3TrainerHeader0: - trainer EVENT_BEAT_MANSION_3_TRAINER_0, 0, Mansion3BattleText1, Mansion3EndBattleText1, Mansion3AfterBattleText1 + trainer EVENT_BEAT_MANSION_3_TRAINER_0, 0, PokemonMansion3FSuperNerdBattleText, PokemonMansion3FSuperNerdEndBattleText, PokemonMansion3FSuperNerdAfterBattleText Mansion3TrainerHeader1: - trainer EVENT_BEAT_MANSION_3_TRAINER_1, 2, Mansion3BattleText2, Mansion3EndBattleText2, Mansion3AfterBattleText2 + trainer EVENT_BEAT_MANSION_3_TRAINER_1, 2, PokemonMansion3FScientistBattleText, PokemonMansion3FScientistEndBattleText, PokemonMansion3FScientistAfterBattleText db -1 ; end -Mansion3Text1: +PokemonMansion3FSuperNerdText: text_asm ld hl, Mansion3TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Mansion3Text2: +PokemonMansion3FScientistText: text_asm ld hl, Mansion3TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Mansion3BattleText1: - text_far _Mansion3BattleText1 +PokemonMansion3FSuperNerdBattleText: + text_far _PokemonMansion3FSuperNerdBattleText text_end -Mansion3EndBattleText1: - text_far _Mansion3EndBattleText1 +PokemonMansion3FSuperNerdEndBattleText: + text_far _PokemonMansion3FSuperNerdEndBattleText text_end -Mansion3AfterBattleText1: - text_far _Mansion3AfterBattleText1 +PokemonMansion3FSuperNerdAfterBattleText: + text_far _PokemonMansion3FSuperNerdAfterBattleText text_end -Mansion3BattleText2: - text_far _Mansion3BattleText2 +PokemonMansion3FScientistBattleText: + text_far _PokemonMansion3FScientistBattleText text_end -Mansion3EndBattleText2: - text_far _Mansion3EndBattleText2 +PokemonMansion3FScientistEndBattleText: + text_far _PokemonMansion3FScientistEndBattleText text_end -Mansion3AfterBattleText2: - text_far _Mansion3AfterBattleText2 +PokemonMansion3FScientistAfterBattleText: + text_far _PokemonMansion3FScientistAfterBattleText text_end -Mansion3Text5: - text_far _Mansion3Text5 +PokemonMansion3FDiaryText: + text_far _PokemonMansion3FDiaryText text_end diff --git a/scripts/PokemonMansionB1F.asm b/scripts/PokemonMansionB1F.asm index 4ca846249..187a765f3 100644 --- a/scripts/PokemonMansionB1F.asm +++ b/scripts/PokemonMansionB1F.asm @@ -49,70 +49,72 @@ Mansion4Script_Switches:: ret nz xor a ldh [hJoyHeld], a - ld a, $9 + ld a, TEXT_POKEMONMANSIONB1F_SWITCH ldh [hSpriteIndexOrTextID], a jp DisplayTextID PokemonMansionB1F_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_POKEMONMANSIONB1F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_POKEMONMANSIONB1F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_POKEMONMANSIONB1F_END_BATTLE PokemonMansionB1F_TextPointers: - dw Mansion4Text1 - dw Mansion4Text2 - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw Mansion4Text7 - dw PickUpItemText - dw Mansion3Text6 + def_text_pointers + dw_const PokemonMansionB1FBurglarText, TEXT_POKEMONMANSIONB1F_BURGLAR + dw_const PokemonMansionB1FScientistText, TEXT_POKEMONMANSIONB1F_SCIENTIST + dw_const PickUpItemText, TEXT_POKEMONMANSIONB1F_RARE_CANDY + dw_const PickUpItemText, TEXT_POKEMONMANSIONB1F_FULL_RESTORE + dw_const PickUpItemText, TEXT_POKEMONMANSIONB1F_TM_BLIZZARD + dw_const PickUpItemText, TEXT_POKEMONMANSIONB1F_TM_SOLARBEAM + dw_const PokemonMansionB1FDiaryText, TEXT_POKEMONMANSIONB1F_DIARY + dw_const PickUpItemText, TEXT_POKEMONMANSIONB1F_SECRET_KEY + dw_const PokemonMansion2FSwitchText, TEXT_POKEMONMANSIONB1F_SWITCH ; This switch uses the text script from the 2F. Mansion4TrainerHeaders: def_trainers Mansion4TrainerHeader0: - trainer EVENT_BEAT_MANSION_4_TRAINER_0, 0, Mansion4BattleText1, Mansion4EndBattleText1, Mansion4AfterBattleText1 + trainer EVENT_BEAT_MANSION_4_TRAINER_0, 0, PokemonMansionB1FBurglarBattleText, PokemonMansionB1FBurglarEndBattleText, PokemonMansionB1FBurglarAfterBattleText Mansion4TrainerHeader1: - trainer EVENT_BEAT_MANSION_4_TRAINER_1, 3, Mansion4BattleText2, Mansion4EndBattleText2, Mansion4AfterBattleText2 + trainer EVENT_BEAT_MANSION_4_TRAINER_1, 3, PokemonMansionB1FScientistBattleText, PokemonMansionB1FScientistEndBattleText, PokemonMansionB1FScientistAfterBattleText db -1 ; end -Mansion4Text1: +PokemonMansionB1FBurglarText: text_asm ld hl, Mansion4TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Mansion4Text2: +PokemonMansionB1FScientistText: text_asm ld hl, Mansion4TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Mansion4BattleText1: - text_far _Mansion4BattleText1 +PokemonMansionB1FBurglarBattleText: + text_far _PokemonMansionB1FBurglarBattleText text_end -Mansion4EndBattleText1: - text_far _Mansion4EndBattleText1 +PokemonMansionB1FBurglarEndBattleText: + text_far _PokemonMansionB1FBurglarEndBattleText text_end -Mansion4AfterBattleText1: - text_far _Mansion4AfterBattleText1 +PokemonMansionB1FBurglarAfterBattleText: + text_far _PokemonMansionB1FBurglarAfterBattleText text_end -Mansion4BattleText2: - text_far _Mansion4BattleText2 +PokemonMansionB1FScientistBattleText: + text_far _PokemonMansionB1FScientistBattleText text_end -Mansion4EndBattleText2: - text_far _Mansion4EndBattleText2 +PokemonMansionB1FScientistEndBattleText: + text_far _PokemonMansionB1FScientistEndBattleText text_end -Mansion4AfterBattleText2: - text_far _Mansion4AfterBattleText2 +PokemonMansionB1FScientistAfterBattleText: + text_far _PokemonMansionB1FScientistAfterBattleText text_end -Mansion4Text7: - text_far _Mansion4Text7 +PokemonMansionB1FDiaryText: + text_far _PokemonMansionB1FDiaryText text_end diff --git a/scripts/PokemonTower1F.asm b/scripts/PokemonTower1F.asm index 65614523f..72509f527 100644 --- a/scripts/PokemonTower1F.asm +++ b/scripts/PokemonTower1F.asm @@ -2,28 +2,29 @@ PokemonTower1F_Script: jp EnableAutoTextBoxDrawing PokemonTower1F_TextPointers: - dw PokemonTower1Text1 - dw PokemonTower1Text2 - dw PokemonTower1Text3 - dw PokemonTower1Text4 - dw PokemonTower1Text5 + def_text_pointers + dw_const PokemonTower1FReceptionistText, TEXT_POKEMONTOWER1F_RECEPTIONIST + dw_const PokemonTower1FMiddleAgedWomanText, TEXT_POKEMONTOWER1F_MIDDLE_AGED_WOMAN + dw_const PokemonTower1FBaldingGuyText, TEXT_POKEMONTOWER1F_BALDING_GUY + dw_const PokemonTower1FGirlText, TEXT_POKEMONTOWER1F_GIRL + dw_const PokemonTower1FChannelerText, TEXT_POKEMONTOWER1F_CHANNELER -PokemonTower1Text1: - text_far _PokemonTower1Text1 +PokemonTower1FReceptionistText: + text_far _PokemonTower1FReceptionistText text_end -PokemonTower1Text2: - text_far _PokemonTower1Text2 +PokemonTower1FMiddleAgedWomanText: + text_far _PokemonTower1FMiddleAgedWomanText text_end -PokemonTower1Text3: - text_far _PokemonTower1Text3 +PokemonTower1FBaldingGuyText: + text_far _PokemonTower1FBaldingGuyText text_end -PokemonTower1Text4: - text_far _PokemonTower1Text4 +PokemonTower1FGirlText: + text_far _PokemonTower1FGirlText text_end -PokemonTower1Text5: - text_far _PokemonTower1Text5 +PokemonTower1FChannelerText: + text_far _PokemonTower1FChannelerText text_end diff --git a/scripts/PokemonTower2F.asm b/scripts/PokemonTower2F.asm index be3b5b89f..e90fcdd0d 100644 --- a/scripts/PokemonTower2F.asm +++ b/scripts/PokemonTower2F.asm @@ -4,26 +4,27 @@ PokemonTower2F_Script: ld a, [wPokemonTower2FCurScript] jp CallFunctionInTable -PokemonTower2Script_604fe: - xor a +PokemonTower2FResetRivalEncounter: + xor a ; SCRIPT_POKEMONTOWER2F_DEFAULT ld [wJoyIgnore], a ld [wPokemonTower2FCurScript], a ld [wCurMapScript], a ret PokemonTower2F_ScriptPointers: - dw PokemonTower2Script0 - dw PokemonTower2Script1 - dw PokemonTower2Script2 + def_script_pointers + dw_const PokemonTower2FDefaultScript, SCRIPT_POKEMONTOWER2F_DEFAULT + dw_const PokemonTower2FDefeatedRivalScript, SCRIPT_POKEMONTOWER2F_DEFEATED_RIVAL + dw_const PokemonTower2FRivalExitsScript, SCRIPT_POKEMONTOWER2F_RIVAL_EXITS -PokemonTower2Script0: +PokemonTower2FDefaultScript: IF DEF(_DEBUG) call DebugPressedOrHeldB ret nz ENDC CheckEvent EVENT_BEAT_POKEMON_TOWER_RIVAL ret nz - ld hl, CoordsData_6055e + ld hl, PokemonTower2FRivalEncounterEventCoords call ArePlayerCoordsInArray ret nc ld a, SFX_STOP_ALL_MUSIC @@ -37,19 +38,19 @@ ENDC cp $1 ld a, PLAYER_DIR_UP ld b, SPRITE_FACING_DOWN - jr nz, .asm_60544 + jr nz, .player_below_rival ; the rival is on the left side and the player is on the right side SetEvent EVENT_POKEMON_TOWER_RIVAL_ON_LEFT ld a, PLAYER_DIR_LEFT ld b, SPRITE_FACING_RIGHT -.asm_60544 +.player_below_rival ld [wPlayerMovingDirection], a - ld a, $1 + ld a, POKEMONTOWER2F_RIVAL ldh [hSpriteIndex], a ld a, b ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay - ld a, $1 + ld a, TEXT_POKEMONTOWER2F_RIVAL ldh [hSpriteIndexOrTextID], a call DisplayTextID xor a @@ -57,39 +58,39 @@ ENDC ldh [hJoyPressed], a ret -CoordsData_6055e: +PokemonTower2FRivalEncounterEventCoords: dbmapcoord 15, 5 dbmapcoord 14, 6 db $0F ; end? (should be $ff?) -PokemonTower2Script1: +PokemonTower2FDefeatedRivalScript: ld a, [wIsInBattle] cp $ff - jp z, PokemonTower2Script_604fe - ld a, $f0 + jp z, PokemonTower2FResetRivalEncounter + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a SetEvent EVENT_BEAT_POKEMON_TOWER_RIVAL - ld a, $1 + ld a, TEXT_POKEMONTOWER2F_RIVAL ldh [hSpriteIndexOrTextID], a call DisplayTextID - ld de, MovementData_605b2 + ld de, PokemonTower2FRivalDownThenRightMovement CheckEvent EVENT_POKEMON_TOWER_RIVAL_ON_LEFT - jr nz, .asm_60589 - ld de, MovementData_605a9 -.asm_60589 - ld a, $1 + jr nz, .got_movement + ld de, PokemonTower2FRivalRightThenDownMovement +.got_movement + ld a, POKEMONTOWER2F_RIVAL ldh [hSpriteIndex], a call MoveSprite ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound farcall Music_RivalAlternateStart - ld a, $2 + ld a, SCRIPT_POKEMONTOWER2F_RIVAL_EXITS ld [wPokemonTower2FCurScript], a ld [wCurMapScript], a ret -MovementData_605a9: +PokemonTower2FRivalRightThenDownMovement: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN @@ -100,7 +101,7 @@ MovementData_605a9: db NPC_MOVEMENT_RIGHT db -1 ; end -MovementData_605b2: +PokemonTower2FRivalDownThenRightMovement: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_RIGHT @@ -111,7 +112,7 @@ MovementData_605b2: db NPC_MOVEMENT_DOWN db -1 ; end -PokemonTower2Script2: +PokemonTower2FRivalExitsScript: ld a, [wd730] bit 0, a ret nz @@ -121,30 +122,31 @@ PokemonTower2Script2: xor a ld [wJoyIgnore], a call PlayDefaultMusic - ld a, $0 + ld a, SCRIPT_POKEMONTOWER2F_DEFAULT ld [wPokemonTower2FCurScript], a ld [wCurMapScript], a ret PokemonTower2F_TextPointers: - dw PokemonTower2Text1 - dw PokemonTower2Text2 + def_text_pointers + dw_const PokemonTower2FRivalText, TEXT_POKEMONTOWER2F_RIVAL + dw_const PokemonTower2FChannelerText, TEXT_POKEMONTOWER2F_CHANNELER -PokemonTower2Text1: +PokemonTower2FRivalText: text_asm CheckEvent EVENT_BEAT_POKEMON_TOWER_RIVAL - jr z, .asm_16f24 - ld hl, PokemonTower2Text_6063c + jr z, .do_battle + ld hl, .HowsYourDexText call PrintText - jr .asm_41852 -.asm_16f24 - ld hl, PokemonTower2Text_6062d + jr .text_script_end +.do_battle + ld hl, .WhatBringsYouHereText call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, PokemonTower2Text_60632 - ld de, PokemonTower2Text_60637 + ld hl, .DefeatedText + ld de, .VictoryText call SaveEndBattleTextPointers ld a, OPP_RIVAL2 ld [wCurOpponent], a @@ -165,28 +167,28 @@ PokemonTower2Text1: .done ld [wTrainerNo], a - ld a, $1 + ld a, SCRIPT_POKEMONTOWER2F_DEFEATED_RIVAL ld [wPokemonTower2FCurScript], a ld [wCurMapScript], a -.asm_41852 +.text_script_end jp TextScriptEnd -PokemonTower2Text_6062d: - text_far _PokemonTower2Text_6062d +.WhatBringsYouHereText: + text_far _PokemonTower2FRivalWhatBringsYouHereText text_end -PokemonTower2Text_60632: - text_far _PokemonTower2Text_60632 +.DefeatedText: + text_far _PokemonTower2FRivalDefeatedText text_end -PokemonTower2Text_60637: - text_far _PokemonTower2Text_60637 +.VictoryText: + text_far _PokemonTower2FRivalVictoryText text_end -PokemonTower2Text_6063c: - text_far _PokemonTower2Text_6063c +.HowsYourDexText: + text_far _PokemonTower2FRivalHowsYourDexText text_end -PokemonTower2Text2: - text_far _PokemonTower2Text2 +PokemonTower2FChannelerText: + text_far _PokemonTower2FChannelerText text_end diff --git a/scripts/PokemonTower3F.asm b/scripts/PokemonTower3F.asm index 158bc9d75..d7c815838 100644 --- a/scripts/PokemonTower3F.asm +++ b/scripts/PokemonTower3F.asm @@ -8,76 +8,78 @@ PokemonTower3F_Script: ret PokemonTower3F_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_POKEMONTOWER3F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_POKEMONTOWER3F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_POKEMONTOWER3F_END_BATTLE PokemonTower3F_TextPointers: - dw PokemonTower3Text1 - dw PokemonTower3Text2 - dw PokemonTower3Text3 - dw PickUpItemText + def_text_pointers + dw_const PokemonTower3FChanneler1Text, TEXT_POKEMONTOWER3F_CHANNELER1 + dw_const PokemonTower3FChanneler2Text, TEXT_POKEMONTOWER3F_CHANNELER2 + dw_const PokemonTower3FChanneler3Text, TEXT_POKEMONTOWER3F_CHANNELER3 + dw_const PickUpItemText, TEXT_POKEMONTOWER3F_ESCAPE_ROPE PokemonTower3TrainerHeaders: def_trainers PokemonTower3TrainerHeader0: - trainer EVENT_BEAT_POKEMONTOWER_3_TRAINER_0, 2, PokemonTower3BattleText1, PokemonTower3EndBattleText1, PokemonTower3AfterBattleText1 + trainer EVENT_BEAT_POKEMONTOWER_3_TRAINER_0, 2, PokemonTower3FChanneler1BattleText, PokemonTower3FChanneler1EndBattleText, PokemonTower3FChanneler1AfterBattleText PokemonTower3TrainerHeader1: - trainer EVENT_BEAT_POKEMONTOWER_3_TRAINER_1, 3, PokemonTower3BattleText2, PokemonTower3EndBattleText2, PokemonTower3AfterBattleText2 + trainer EVENT_BEAT_POKEMONTOWER_3_TRAINER_1, 3, PokemonTower3FChanneler2BattleText, PokemonTower3FChanneler2EndBattleText, PokemonTower3FChanneler2AfterBattleText PokemonTower3TrainerHeader2: - trainer EVENT_BEAT_POKEMONTOWER_3_TRAINER_2, 2, PokemonTower3BattleText3, PokemonTower3EndBattleText3, PokemonTower3AfterBattleText3 + trainer EVENT_BEAT_POKEMONTOWER_3_TRAINER_2, 2, PokemonTower3FChanneler3BattleText, PokemonTower3FChanneler3EndBattleText, PokemonTower3FChanneler3AfterBattleText db -1 ; end -PokemonTower3Text1: +PokemonTower3FChanneler1Text: text_asm ld hl, PokemonTower3TrainerHeader0 call TalkToTrainer jp TextScriptEnd -PokemonTower3Text2: +PokemonTower3FChanneler2Text: text_asm ld hl, PokemonTower3TrainerHeader1 call TalkToTrainer jp TextScriptEnd -PokemonTower3Text3: +PokemonTower3FChanneler3Text: text_asm ld hl, PokemonTower3TrainerHeader2 call TalkToTrainer jp TextScriptEnd -PokemonTower3BattleText1: - text_far _PokemonTower3BattleText1 +PokemonTower3FChanneler1BattleText: + text_far _PokemonTower3FChanneler1BattleText text_end -PokemonTower3EndBattleText1: - text_far _PokemonTower3EndBattleText1 +PokemonTower3FChanneler1EndBattleText: + text_far _PokemonTower3FChanneler1EndBattleText text_end -PokemonTower3AfterBattleText1: - text_far _PokemonTower3AfterBattleText1 +PokemonTower3FChanneler1AfterBattleText: + text_far _PokemonTower3FChanneler1AfterBattleText text_end -PokemonTower3BattleText2: - text_far _PokemonTower3BattleText2 +PokemonTower3FChanneler2BattleText: + text_far _PokemonTower3FChanneler2BattleText text_end -PokemonTower3EndBattleText2: - text_far _PokemonTower3EndBattleText2 +PokemonTower3FChanneler2EndBattleText: + text_far _PokemonTower3FChanneler2EndBattleText text_end -PokemonTower3AfterBattleText2: - text_far _PokemonTower3AfterBattleText2 +PokemonTower3FChanneler2AfterBattleText: + text_far _PokemonTower3FChanneler2AfterBattleText text_end -PokemonTower3BattleText3: - text_far _PokemonTower3BattleText3 +PokemonTower3FChanneler3BattleText: + text_far _PokemonTower3FChanneler3BattleText text_end -PokemonTower3EndBattleText3: - text_far _PokemonTower3EndBattleText3 +PokemonTower3FChanneler3EndBattleText: + text_far _PokemonTower3FChanneler3EndBattleText text_end -PokemonTower3AfterBattleText3: - text_far _PokemonTower3AfterBattleText3 +PokemonTower3FChanneler3AfterBattleText: + text_far _PokemonTower3FChanneler3AfterBattleText text_end diff --git a/scripts/PokemonTower4F.asm b/scripts/PokemonTower4F.asm index 9bd291d2c..066ee277f 100644 --- a/scripts/PokemonTower4F.asm +++ b/scripts/PokemonTower4F.asm @@ -8,78 +8,80 @@ PokemonTower4F_Script: ret PokemonTower4F_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_POKEMONTOWER4F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_POKEMONTOWER4F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_POKEMONTOWER4F_END_BATTLE PokemonTower4F_TextPointers: - dw PokemonTower4Text1 - dw PokemonTower4Text2 - dw PokemonTower4Text3 - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText + def_text_pointers + dw_const PokemonTower4FChanneler1Text, TEXT_POKEMONTOWER4F_CHANNELER1 + dw_const PokemonTower4FChanneler2Text, TEXT_POKEMONTOWER4F_CHANNELER2 + dw_const PokemonTower4FChanneler3Text, TEXT_POKEMONTOWER4F_CHANNELER3 + dw_const PickUpItemText, TEXT_POKEMONTOWER4F_ELIXER + dw_const PickUpItemText, TEXT_POKEMONTOWER4F_AWAKENING + dw_const PickUpItemText, TEXT_POKEMONTOWER4F_HP_UP PokemonTower4TrainerHeaders: def_trainers PokemonTower4TrainerHeader0: - trainer EVENT_BEAT_POKEMONTOWER_4_TRAINER_0, 2, PokemonTower4BattleText1, PokemonTower4EndBattleText1, PokemonTower4AfterBattleText1 + trainer EVENT_BEAT_POKEMONTOWER_4_TRAINER_0, 2, PokemonTower4FChanneler1BattleText, PokemonTower4FChanneler1EndBattleText, PokemonTower4FChanneler1AfterBattleText PokemonTower4TrainerHeader1: - trainer EVENT_BEAT_POKEMONTOWER_4_TRAINER_1, 2, PokemonTower4BattleText2, PokemonTower4EndBattleText2, PokemonTower4AfterBattleText2 + trainer EVENT_BEAT_POKEMONTOWER_4_TRAINER_1, 2, PokemonTower4FChanneler2BattleText, PokemonTower4FChanneler2EndBattleText, PokemonTower4FChanneler2AfterBattleText PokemonTower4TrainerHeader2: - trainer EVENT_BEAT_POKEMONTOWER_4_TRAINER_2, 2, PokemonTower4BattleText3, PokemonTower4EndBattleText3, PokemonTower4AfterBattleText3 + trainer EVENT_BEAT_POKEMONTOWER_4_TRAINER_2, 2, PokemonTower4FChanneler3BattleText, PokemonTower4FChanneler3EndBattleText, PokemonTower4FChanneler3AfterBattleText db -1 ; end -PokemonTower4Text1: +PokemonTower4FChanneler1Text: text_asm ld hl, PokemonTower4TrainerHeader0 call TalkToTrainer jp TextScriptEnd -PokemonTower4Text2: +PokemonTower4FChanneler2Text: text_asm ld hl, PokemonTower4TrainerHeader1 call TalkToTrainer jp TextScriptEnd -PokemonTower4Text3: +PokemonTower4FChanneler3Text: text_asm ld hl, PokemonTower4TrainerHeader2 call TalkToTrainer jp TextScriptEnd -PokemonTower4BattleText1: - text_far _PokemonTower4BattleText1 +PokemonTower4FChanneler1BattleText: + text_far _PokemonTower4FChanneler1BattleText text_end -PokemonTower4EndBattleText1: - text_far _PokemonTower4EndBattleText1 +PokemonTower4FChanneler1EndBattleText: + text_far _PokemonTower4FChanneler1EndBattleText text_end -PokemonTower4AfterBattleText1: - text_far _PokemonTower4AfterBattleText1 +PokemonTower4FChanneler1AfterBattleText: + text_far _PokemonTower4FChanneler1AfterBattleText text_end -PokemonTower4BattleText2: - text_far _PokemonTower4BattleText2 +PokemonTower4FChanneler2BattleText: + text_far _PokemonTower4FChanneler2BattleText text_end -PokemonTower4EndBattleText2: - text_far _PokemonTower4EndBattleText2 +PokemonTower4FChanneler2EndBattleText: + text_far _PokemonTower4FChanneler2EndBattleText text_end -PokemonTower4AfterBattleText2: - text_far _PokemonTower4AfterBattleText2 +PokemonTower4FChanneler2AfterBattleText: + text_far _PokemonTower4FChanneler2AfterBattleText text_end -PokemonTower4BattleText3: - text_far _PokemonTower4BattleText3 +PokemonTower4FChanneler3BattleText: + text_far _PokemonTower4FChanneler3BattleText text_end -PokemonTower4EndBattleText3: - text_far _PokemonTower4EndBattleText3 +PokemonTower4FChanneler3EndBattleText: + text_far _PokemonTower4FChanneler3EndBattleText text_end -PokemonTower4AfterBattleText3: - text_far _PokemonTower4AfterBattleText3 +PokemonTower4FChanneler3AfterBattleText: + text_far _PokemonTower4FChanneler3AfterBattleText text_end diff --git a/scripts/PokemonTower5F.asm b/scripts/PokemonTower5F.asm index 4d89befb4..6482993d3 100644 --- a/scripts/PokemonTower5F.asm +++ b/scripts/PokemonTower5F.asm @@ -8,24 +8,25 @@ PokemonTower5F_Script: ret PokemonTower5F_ScriptPointers: - dw PokemonTower5Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const PokemonTower5FDefaultScript, SCRIPT_POKEMONTOWER5F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_POKEMONTOWER5F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_POKEMONTOWER5F_END_BATTLE -PokemonTower5Script0: - ld hl, CoordsData_60992 +PokemonTower5FDefaultScript: + ld hl, PokemonTower5FPurifiedZoneCoords call ArePlayerCoordsInArray - jr c, .asm_60960 + jr c, .in_purified_zone ld hl, wd72e res 4, [hl] ResetEvent EVENT_IN_PURIFIED_ZONE jp CheckFightingMapTrainers -.asm_60960 +.in_purified_zone CheckAndSetEvent EVENT_IN_PURIFIED_ZONE ret nz xor a ldh [hJoyHeld], a - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ld hl, wd72e set 4, [hl] @@ -34,14 +35,14 @@ PokemonTower5Script0: call Delay3 call Delay3 call GBFadeInFromWhite - ld a, $7 + ld a, TEXT_POKEMONTOWER5F_PURIFIEDZONE ldh [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [wJoyIgnore], a ret -CoordsData_60992: +PokemonTower5FPurifiedZoneCoords: dbmapcoord 10, 8 dbmapcoord 11, 8 dbmapcoord 10, 9 @@ -49,102 +50,103 @@ CoordsData_60992: db -1 ; end PokemonTower5F_TextPointers: - dw PokemonTower5Text1 - dw PokemonTower5Text2 - dw PokemonTower5Text3 - dw PokemonTower5Text4 - dw PokemonTower5Text5 - dw PickUpItemText - dw PokemonTower5Text7 + def_text_pointers + dw_const PokemonTower5FChanneler1Text, TEXT_POKEMONTOWER5F_CHANNELER1 + dw_const PokemonTower5FChanneler2Text, TEXT_POKEMONTOWER5F_CHANNELER2 + dw_const PokemonTower5FChanneler3Text, TEXT_POKEMONTOWER5F_CHANNELER3 + dw_const PokemonTower5FChanneler4Text, TEXT_POKEMONTOWER5F_CHANNELER4 + dw_const PokemonTower5FChanneler5Text, TEXT_POKEMONTOWER5F_CHANNELER5 + dw_const PickUpItemText, TEXT_POKEMONTOWER5F_NUGGET + dw_const PokemonTower5FPurifiedZoneText, TEXT_POKEMONTOWER5F_PURIFIEDZONE PokemonTower5TrainerHeaders: def_trainers 2 PokemonTower5TrainerHeader0: - trainer EVENT_BEAT_POKEMONTOWER_5_TRAINER_0, 2, PokemonTower5BattleText1, PokemonTower5EndBattleText1, PokemonTower5AfterBattleText1 + trainer EVENT_BEAT_POKEMONTOWER_5_TRAINER_0, 2, PokemonTower5FChanneler2BattleText, PokemonTower5FChanneler2EndBattleText, PokemonTower5FChanneler2AfterBattleText PokemonTower5TrainerHeader1: - trainer EVENT_BEAT_POKEMONTOWER_5_TRAINER_1, 3, PokemonTower5BattleText2, PokemonTower5EndBattleText2, PokemonTower5AfterBattleText2 + trainer EVENT_BEAT_POKEMONTOWER_5_TRAINER_1, 3, PokemonTower5FChanneler3BattleText, PokemonTower5FChanneler3EndBattleText, PokemonTower5FChanneler3AfterBattleText PokemonTower5TrainerHeader2: - trainer EVENT_BEAT_POKEMONTOWER_5_TRAINER_2, 2, PokemonTower5BattleText3, PokemonTower5EndBattleText3, PokemonTower5AfterBattleText3 + trainer EVENT_BEAT_POKEMONTOWER_5_TRAINER_2, 2, PokemonTower5FChanneler4BattleText, PokemonTower5FChanneler4EndBattleText, PokemonTower5FChanneler4AfterBattleText PokemonTower5TrainerHeader3: - trainer EVENT_BEAT_POKEMONTOWER_5_TRAINER_3, 2, PokemonTower5BattleText4, PokemonTower5EndBattleText4, PokemonTower5AfterBattleText4 + trainer EVENT_BEAT_POKEMONTOWER_5_TRAINER_3, 2, PokemonTower5FChanneler5BattleText, PokemonTower5FChanneler5EndBattleText, PokemonTower5FChanneler5AfterBattleText db -1 ; end -PokemonTower5Text1: - text_far _PokemonTower5Text1 +PokemonTower5FChanneler1Text: + text_far _PokemonTower5FChanneler1Text text_end -PokemonTower5Text2: +PokemonTower5FChanneler2Text: text_asm ld hl, PokemonTower5TrainerHeader0 call TalkToTrainer jp TextScriptEnd -PokemonTower5BattleText1: - text_far _PokemonTower5BattleText1 +PokemonTower5FChanneler2BattleText: + text_far _PokemonTower5FChanneler2BattleText text_end -PokemonTower5EndBattleText1: - text_far _PokemonTower5EndBattleText1 +PokemonTower5FChanneler2EndBattleText: + text_far _PokemonTower5FChanneler2EndBattleText text_end -PokemonTower5AfterBattleText1: - text_far _PokemonTower5AfterBattleText1 +PokemonTower5FChanneler2AfterBattleText: + text_far _PokemonTower5FChanneler2AfterBattleText text_end -PokemonTower5Text3: +PokemonTower5FChanneler3Text: text_asm ld hl, PokemonTower5TrainerHeader1 call TalkToTrainer jp TextScriptEnd -PokemonTower5BattleText2: - text_far _PokemonTower5BattleText2 +PokemonTower5FChanneler3BattleText: + text_far _PokemonTower5FChanneler3BattleText text_end -PokemonTower5EndBattleText2: - text_far _PokemonTower5EndBattleText2 +PokemonTower5FChanneler3EndBattleText: + text_far _PokemonTower5FChanneler3EndBattleText text_end -PokemonTower5AfterBattleText2: - text_far _PokemonTower5AfterBattleText2 +PokemonTower5FChanneler3AfterBattleText: + text_far _PokemonTower5FChanneler3AfterBattleText text_end -PokemonTower5Text4: +PokemonTower5FChanneler4Text: text_asm ld hl, PokemonTower5TrainerHeader2 call TalkToTrainer jp TextScriptEnd -PokemonTower5BattleText3: - text_far _PokemonTower5BattleText3 +PokemonTower5FChanneler4BattleText: + text_far _PokemonTower5FChanneler4BattleText text_end -PokemonTower5EndBattleText3: - text_far _PokemonTower5EndBattleText3 +PokemonTower5FChanneler4EndBattleText: + text_far _PokemonTower5FChanneler4EndBattleText text_end -PokemonTower5AfterBattleText3: - text_far _PokemonTower5AfterBattleText3 +PokemonTower5FChanneler4AfterBattleText: + text_far _PokemonTower5FChanneler4AfterBattleText text_end -PokemonTower5Text5: +PokemonTower5FChanneler5Text: text_asm ld hl, PokemonTower5TrainerHeader3 call TalkToTrainer jp TextScriptEnd -PokemonTower5BattleText4: - text_far _PokemonTower5BattleText4 +PokemonTower5FChanneler5BattleText: + text_far _PokemonTower5FChanneler5BattleText text_end -PokemonTower5EndBattleText4: - text_far _PokemonTower5EndBattleText4 +PokemonTower5FChanneler5EndBattleText: + text_far _PokemonTower5FChanneler5EndBattleText text_end -PokemonTower5AfterBattleText4: - text_far _PokemonTower5AfterBattleText4 +PokemonTower5FChanneler5AfterBattleText: + text_far _PokemonTower5FChanneler5AfterBattleText text_end -PokemonTower5Text7: - text_far _PokemonTower5Text7 +PokemonTower5FPurifiedZoneText: + text_far _PokemonTower5FPurifiedZoneText text_end diff --git a/scripts/PokemonTower6F.asm b/scripts/PokemonTower6F.asm index 03cb49f4d..f2e995865 100644 --- a/scripts/PokemonTower6F.asm +++ b/scripts/PokemonTower6F.asm @@ -7,70 +7,71 @@ PokemonTower6F_Script: ld [wPokemonTower6FCurScript], a ret -PokemonTower6Script_60b02: +PokemonTower6FSetDefaultScript: xor a ld [wJoyIgnore], a - ld [wPokemonTower6FCurScript], a - ld [wCurMapScript], a + ld [wPokemonTower6FCurScript], a ; SCRIPT_POKEMONTOWER6F_DEFAULT + ld [wCurMapScript], a ; SCRIPT_POKEMONTOWER6F_DEFAULT ret PokemonTower6F_ScriptPointers: - dw PokemonTower6Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw PokemonTower6Script3 - dw PokemonTower6Script4 - -PokemonTower6Script0: + def_script_pointers + dw_const PokemonTower6FDefaultScript, SCRIPT_POKEMONTOWER6F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_POKEMONTOWER6F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_POKEMONTOWER6F_END_BATTLE + dw_const PokemonTower6FPlayerMovingScript, SCRIPT_POKEMONTOWER6F_PLAYER_MOVING + dw_const PokemonTower6FMarowakBattleScript, SCRIPT_POKEMONTOWER6F_MAROWAK_BATTLE + +PokemonTower6FDefaultScript: CheckEvent EVENT_BEAT_GHOST_MAROWAK jp nz, CheckFightingMapTrainers - ld hl, CoordsData_60b45 + ld hl, PokemonTower6FMarowakCoords call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers xor a ldh [hJoyHeld], a - ld a, $6 + ld a, TEXT_POKEMONTOWER6F_BEGONE ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, RESTLESS_SOUL ld [wCurOpponent], a ld a, 30 ld [wCurEnemyLVL], a - ld a, $4 + ld a, SCRIPT_POKEMONTOWER6F_MAROWAK_BATTLE ld [wPokemonTower6FCurScript], a ld [wCurMapScript], a ret -CoordsData_60b45: +PokemonTower6FMarowakCoords: dbmapcoord 10, 16 db -1 ; end -PokemonTower6Script4: +PokemonTower6FMarowakBattleScript: ld a, [wIsInBattle] cp $ff - jp z, PokemonTower6Script_60b02 - ld a, $ff + jp z, PokemonTower6FSetDefaultScript + ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ld a, [wd72d] bit 6, a ret nz call UpdateSprites - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ld a, [wBattleResult] and a - jr nz, .asm_60b82 + jr nz, .did_not_defeat SetEvent EVENT_BEAT_GHOST_MAROWAK - ld a, $7 + ld a, TEXT_POKEMONTOWER6F_MAROWAK_DEPARTED ldh [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [wJoyIgnore], a - ld a, $0 + ld a, SCRIPT_POKEMONTOWER6F_DEFAULT ld [wPokemonTower6FCurScript], a ld [wCurMapScript], a ret -.asm_60b82 +.did_not_defeat ld a, $1 ld [wSimulatedJoypadStatesIndex], a ld a, $10 @@ -80,12 +81,12 @@ PokemonTower6Script4: ld [wOverrideSimulatedJoypadStatesMask], a ld hl, wd730 set 7, [hl] - ld a, $3 + ld a, SCRIPT_POKEMONTOWER6F_PLAYER_MOVING ld [wPokemonTower6FCurScript], a ld [wCurMapScript], a ret -PokemonTower6Script3: +PokemonTower6FPlayerMovingScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -96,99 +97,100 @@ PokemonTower6Script3: ret PokemonTower6F_TextPointers: - dw PokemonTower6Text1 - dw PokemonTower6Text2 - dw PokemonTower6Text3 - dw PickUpItemText - dw PickUpItemText - dw PokemonTower6Text6 - dw PokemonTower6Text7 + def_text_pointers + dw_const PokemonTower6FChanneler1Text, TEXT_POKEMONTOWER6F_CHANNELER1 + dw_const PokemonTower6FChanneler2Text, TEXT_POKEMONTOWER6F_CHANNELER2 + dw_const PokemonTower6FChanneler3Text, TEXT_POKEMONTOWER6F_CHANNELER3 + dw_const PickUpItemText, TEXT_POKEMONTOWER6F_RARE_CANDY + dw_const PickUpItemText, TEXT_POKEMONTOWER6F_X_ACCURACY + dw_const PokemonTower6FBeGoneText, TEXT_POKEMONTOWER6F_BEGONE + dw_const PokemonTower6FMarowakDepartedText, TEXT_POKEMONTOWER6F_MAROWAK_DEPARTED PokemonTower6TrainerHeaders: def_trainers PokemonTower6TrainerHeader0: - trainer EVENT_BEAT_POKEMONTOWER_6_TRAINER_0, 3, PokemonTower6BattleText1, PokemonTower6EndBattleText1, PokemonTower6AfterBattleText1 + trainer EVENT_BEAT_POKEMONTOWER_6_TRAINER_0, 3, PokemonTower6FChanneler1BattleText, PokemonTower6FChanneler1EndBattleText, PokemonTower6FChanneler1AfterBattleText PokemonTower6TrainerHeader1: - trainer EVENT_BEAT_POKEMONTOWER_6_TRAINER_1, 3, PokemonTower6BattleText2, PokemonTower6EndBattleText2, PokemonTower6AfterBattleText2 + trainer EVENT_BEAT_POKEMONTOWER_6_TRAINER_1, 3, PokemonTower6FChanneler2BattleText, PokemonTower6FChanneler2EndBattleText, PokemonTower6FChanneler2AfterBattleText PokemonTower6TrainerHeader2: - trainer EVENT_BEAT_POKEMONTOWER_6_TRAINER_2, 2, PokemonTower6BattleText3, PokemonTower6EndBattleText3, PokemonTower6AfterBattleText3 + trainer EVENT_BEAT_POKEMONTOWER_6_TRAINER_2, 2, PokemonTower6FChanneler3BattleText, PokemonTower6FChanneler3EndBattleText, PokemonTower6FChanneler3AfterBattleText db -1 ; end -PokemonTower6Text1: +PokemonTower6FChanneler1Text: text_asm ld hl, PokemonTower6TrainerHeader0 call TalkToTrainer jp TextScriptEnd -PokemonTower6Text2: +PokemonTower6FChanneler2Text: text_asm ld hl, PokemonTower6TrainerHeader1 call TalkToTrainer jp TextScriptEnd -PokemonTower6Text3: +PokemonTower6FChanneler3Text: text_asm ld hl, PokemonTower6TrainerHeader2 call TalkToTrainer jp TextScriptEnd -PokemonTower6Text7: +PokemonTower6FMarowakDepartedText: text_asm - ld hl, PokemonTower2Text_60c1f + ld hl, PokemonTower6FGhostWasCubonesMotherText call PrintText ld a, RESTLESS_SOUL call PlayCry call WaitForSoundToFinish ld c, 30 call DelayFrames - ld hl, PokemonTower2Text_60c24 + ld hl, PokemonTower6FSoulWasCalmedText call PrintText jp TextScriptEnd -PokemonTower2Text_60c1f: - text_far _PokemonTower2Text_60c1f +PokemonTower6FGhostWasCubonesMotherText: + text_far _PokemonTower6FGhostWasCubonesMotherText text_end -PokemonTower2Text_60c24: - text_far _PokemonTower2Text_60c24 +PokemonTower6FSoulWasCalmedText: + text_far _PokemonTower6FSoulWasCalmedText text_end -PokemonTower6BattleText1: - text_far _PokemonTower6BattleText1 +PokemonTower6FChanneler1BattleText: + text_far _PokemonTower6FChanneler1BattleText text_end -PokemonTower6EndBattleText1: - text_far _PokemonTower6EndBattleText1 +PokemonTower6FChanneler1EndBattleText: + text_far _PokemonTower6FChanneler1EndBattleText text_end -PokemonTower6AfterBattleText1: - text_far _PokemonTower6AfterBattleText1 +PokemonTower6FChanneler1AfterBattleText: + text_far _PokemonTower6FChanneler1AfterBattleText text_end -PokemonTower6BattleText2: - text_far _PokemonTower6BattleText2 +PokemonTower6FChanneler2BattleText: + text_far _PokemonTower6FChanneler2BattleText text_end -PokemonTower6EndBattleText2: - text_far _PokemonTower6EndBattleText2 +PokemonTower6FChanneler2EndBattleText: + text_far _PokemonTower6FChanneler2EndBattleText text_end -PokemonTower6AfterBattleText2: - text_far _PokemonTower6AfterBattleText2 +PokemonTower6FChanneler2AfterBattleText: + text_far _PokemonTower6FChanneler2AfterBattleText text_end -PokemonTower6BattleText3: - text_far _PokemonTower6BattleText3 +PokemonTower6FChanneler3BattleText: + text_far _PokemonTower6FChanneler3BattleText text_end -PokemonTower6EndBattleText3: - text_far _PokemonTower6EndBattleText3 +PokemonTower6FChanneler3EndBattleText: + text_far _PokemonTower6FChanneler3EndBattleText text_end -PokemonTower6AfterBattleText3: - text_far _PokemonTower6AfterBattleText3 +PokemonTower6FChanneler3AfterBattleText: + text_far _PokemonTower6FChanneler3AfterBattleText text_end -PokemonTower6Text6: - text_far _PokemonTower6Text6 +PokemonTower6FBeGoneText: + text_far _PokemonTower6FBeGoneText text_end diff --git a/scripts/PokemonTower7F.asm b/scripts/PokemonTower7F.asm index 5ed5aabdb..9991cb5f1 100644 --- a/scripts/PokemonTower7F.asm +++ b/scripts/PokemonTower7F.asm @@ -7,39 +7,40 @@ PokemonTower7F_Script: ld [wPokemonTower7FCurScript], a ret -PokemonTower7Script_60d18: +PokemonTower7FSetDefaultScript: xor a ld [wJoyIgnore], a - ld [wPokemonTower7FCurScript], a - ld [wCurMapScript], a + ld [wPokemonTower7FCurScript], a ; SCRIPT_POKEMONTOWER7F_DEFAULT + ld [wCurMapScript], a ; SCRIPT_POKEMONTOWER7F_DEFAULT ret PokemonTower7F_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw PokemonTower7Script2 - dw PokemonTower7Script3 - dw PokemonTower7Script4 + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_POKEMONTOWER7F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_POKEMONTOWER7F_START_BATTLE + dw_const PokemonTower7FEndBattleScript, SCRIPT_POKEMONTOWER7F_END_BATTLE + dw_const PokemonTower7FHideNPCScript, SCRIPT_POKEMONTOWER7F_HIDE_NPC + dw_const PokemonTower7FWarpToMrFujiHouseScript, SCRIPT_POKEMONTOWER7F_WARP_TO_MR_FUJI_HOUSE -PokemonTower7Script2: +PokemonTower7FEndBattleScript: ld hl, wFlags_0xcd60 res 0, [hl] ld a, [wIsInBattle] cp $ff - jp z, PokemonTower7Script_60d18 + jp z, PokemonTower7FSetDefaultScript call EndTrainerBattle - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ld a, [wSpriteIndex] ldh [hSpriteIndexOrTextID], a call DisplayTextID - call PokemonTower7Script_60db6 - ld a, $3 + call PokemonTower7FRocketLeaveMovementScript + ld a, SCRIPT_POKEMONTOWER7F_HIDE_NPC ld [wPokemonTower7FCurScript], a ld [wCurMapScript], a ret -PokemonTower7Script3: +PokemonTower7FHideNPCScript: ld a, [wd730] bit 0, a ret nz @@ -58,13 +59,13 @@ PokemonTower7Script3: ld [wSpriteIndex], a ld [wTrainerHeaderFlagBit], a ld [wUnusedDA38], a - ld a, $0 + ld a, SCRIPT_POKEMONTOWER7F_DEFAULT ld [wPokemonTower7FCurScript], a ld [wCurMapScript], a ret -PokemonTower7Script4: - ld a, $ff +PokemonTower7FWarpToMrFujiHouseScript: + ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ld a, HS_POKEMON_TOWER_7F_MR_FUJI ld [wMissableObjectIndex], a @@ -79,13 +80,13 @@ PokemonTower7Script4: ld [wLastMap], a ld hl, wd72d set 3, [hl] - ld a, $0 + ld a, SCRIPT_POKEMONTOWER7F_DEFAULT ld [wPokemonTower7FCurScript], a ld [wCurMapScript], a ret -PokemonTower7Script_60db6: - ld hl, CoordsData_60de3 +PokemonTower7FRocketLeaveMovementScript: + ld hl, PokemonTower7FNPCCoordMovementTable ld a, [wSpriteIndex] dec a swap a @@ -96,41 +97,41 @@ PokemonTower7Script_60db6: ld b, a ld a, [wXCoord] ld c, a -.asm_60dcb +.loop ld a, [hli] cp b - jr nz, .asm_60dde + jr nz, .inc_and_skip ld a, [hli] cp c - jr nz, .asm_60ddf + jr nz, .skip ld a, [hli] ld d, [hl] ld e, a ld a, [wSpriteIndex] ldh [hSpriteIndex], a jp MoveSprite -.asm_60dde +.inc_and_skip inc hl -.asm_60ddf +.skip inc hl inc hl - jr .asm_60dcb + jr .loop -CoordsData_60de3: - map_coord_movement 9, 12, MovementData_60e13 - map_coord_movement 10, 11, MovementData_60e1b - map_coord_movement 11, 11, MovementData_60e22 - map_coord_movement 12, 11, MovementData_60e22 - map_coord_movement 12, 10, MovementData_60e28 - map_coord_movement 11, 9, MovementData_60e30 - map_coord_movement 10, 9, MovementData_60e22 - map_coord_movement 9, 9, MovementData_60e22 - map_coord_movement 9, 8, MovementData_60e37 - map_coord_movement 10, 7, MovementData_60e22 - map_coord_movement 11, 7, MovementData_60e22 - map_coord_movement 12, 7, MovementData_60e22 +PokemonTower7FNPCCoordMovementTable: + map_coord_movement 9, 12, PokemonTower7FRocket1ExitRightDownMovement + map_coord_movement 10, 11, PokemonTower7FRocket1ExitDownRightMovement + map_coord_movement 11, 11, PokemonTower7FRocketExitDownMovement + map_coord_movement 12, 11, PokemonTower7FRocketExitDownMovement + map_coord_movement 12, 10, PokemonTower7FRocket2ExitLeftDownMovement + map_coord_movement 11, 9, PokemonTower7FRocket2ExitDownLeftMovement + map_coord_movement 10, 9, PokemonTower7FRocketExitDownMovement + map_coord_movement 9, 9, PokemonTower7FRocketExitDownMovement + map_coord_movement 9, 8, PokemonTower7FRocket3ExitRightDownMovement + map_coord_movement 10, 7, PokemonTower7FRocketExitDownMovement + map_coord_movement 11, 7, PokemonTower7FRocketExitDownMovement + map_coord_movement 12, 7, PokemonTower7FRocketExitDownMovement -MovementData_60e13: +PokemonTower7FRocket1ExitRightDownMovement: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN @@ -140,7 +141,7 @@ MovementData_60e13: db NPC_MOVEMENT_LEFT db -1 ; end -MovementData_60e1b: +PokemonTower7FRocket1ExitDownRightMovement: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_DOWN @@ -149,7 +150,7 @@ MovementData_60e1b: db NPC_MOVEMENT_DOWN db -1 ; end -MovementData_60e22: +PokemonTower7FRocketExitDownMovement: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN @@ -157,7 +158,7 @@ MovementData_60e22: db NPC_MOVEMENT_DOWN db -1 ; end -MovementData_60e28: +PokemonTower7FRocket2ExitLeftDownMovement: db NPC_MOVEMENT_LEFT db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN @@ -167,7 +168,7 @@ MovementData_60e28: db NPC_MOVEMENT_DOWN db -1 ; end -MovementData_60e30: +PokemonTower7FRocket2ExitDownLeftMovement: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN @@ -176,7 +177,7 @@ MovementData_60e30: db NPC_MOVEMENT_DOWN db -1 ; end -MovementData_60e37: +PokemonTower7FRocket3ExitRightDownMovement: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN @@ -187,42 +188,43 @@ MovementData_60e37: db -1 ; end PokemonTower7F_TextPointers: - dw PokemonTower7Text1 - dw PokemonTower7Text2 - dw PokemonTower7Text3 - dw PokemonTower7FujiText + def_text_pointers + dw_const PokemonTower7FRocket1Text, TEXT_POKEMONTOWER7F_ROCKET1 + dw_const PokemonTower7FRocket2Text, TEXT_POKEMONTOWER7F_ROCKET2 + dw_const PokemonTower7FRocket3Text, TEXT_POKEMONTOWER7F_ROCKET3 + dw_const PokemonTower7FMrFujiText, TEXT_POKEMONTOWER7F_MR_FUJI PokemonTower7TrainerHeaders: def_trainers PokemonTower7TrainerHeader0: - trainer EVENT_BEAT_POKEMONTOWER_7_TRAINER_0, 3, PokemonTower7BattleText1, PokemonTower7EndBattleText1, PokemonTower7AfterBattleText1 + trainer EVENT_BEAT_POKEMONTOWER_7_TRAINER_0, 3, PokemonTower7FRocket1BattleText, PokemonTower7FRocket1EndBattleText, PokemonTower7FRocket1AfterBattleText PokemonTower7TrainerHeader1: - trainer EVENT_BEAT_POKEMONTOWER_7_TRAINER_1, 3, PokemonTower7BattleText2, PokemonTower7EndBattleText2, PokemonTower7AfterBattleText2 + trainer EVENT_BEAT_POKEMONTOWER_7_TRAINER_1, 3, PokemonTower7FRocket2BattleText, PokemonTower7FRocket2EndBattleText, PokemonTower7FRocket2AfterBattleText PokemonTower7TrainerHeader2: - trainer EVENT_BEAT_POKEMONTOWER_7_TRAINER_2, 3, PokemonTower7BattleText3, PokemonTower7EndBattleText3, PokemonTower7AfterBattleText3 + trainer EVENT_BEAT_POKEMONTOWER_7_TRAINER_2, 3, PokemonTower7FRocket3BattleText, PokemonTower7FRocket3EndBattleText, PokemonTower7FRocket3AfterBattleText db -1 ; end -PokemonTower7Text1: +PokemonTower7FRocket1Text: text_asm ld hl, PokemonTower7TrainerHeader0 call TalkToTrainer jp TextScriptEnd -PokemonTower7Text2: +PokemonTower7FRocket2Text: text_asm ld hl, PokemonTower7TrainerHeader1 call TalkToTrainer jp TextScriptEnd -PokemonTower7Text3: +PokemonTower7FRocket3Text: text_asm ld hl, PokemonTower7TrainerHeader2 call TalkToTrainer jp TextScriptEnd -PokemonTower7FujiText: +PokemonTower7FMrFujiText: text_asm - ld hl, TowerRescueFujiText + ld hl, .RescueText call PrintText SetEvent EVENT_RESCUED_MR_FUJI SetEvent EVENT_RESCUED_MR_FUJI_2 @@ -235,47 +237,47 @@ PokemonTower7FujiText: ld a, HS_SAFFRON_CITY_F ld [wMissableObjectIndex], a predef ShowObject - ld a, $4 + ld a, SCRIPT_POKEMONTOWER7F_WARP_TO_MR_FUJI_HOUSE ld [wPokemonTower7FCurScript], a ld [wCurMapScript], a jp TextScriptEnd -TowerRescueFujiText: - text_far _TowerRescueFujiText +.RescueText: + text_far _PokemonTower7FMrFujiRescueText text_end -PokemonTower7BattleText1: - text_far _PokemonTower7BattleText1 +PokemonTower7FRocket1BattleText: + text_far _PokemonTower7FRocket1BattleText text_end -PokemonTower7EndBattleText1: - text_far _PokemonTower7EndBattleText1 +PokemonTower7FRocket1EndBattleText: + text_far _PokemonTower7FRocket1EndBattleText text_end -PokemonTower7AfterBattleText1: - text_far _PokemonTower7AfterBattleText1 +PokemonTower7FRocket1AfterBattleText: + text_far _PokemonTower7FRocket1AfterBattleText text_end -PokemonTower7BattleText2: - text_far _PokemonTower7BattleText2 +PokemonTower7FRocket2BattleText: + text_far _PokemonTower7FRocket2BattleText text_end -PokemonTower7EndBattleText2: - text_far _PokemonTower7EndBattleText2 +PokemonTower7FRocket2EndBattleText: + text_far _PokemonTower7FRocket2EndBattleText text_end -PokemonTower7AfterBattleText2: - text_far _PokemonTower7AfterBattleText2 +PokemonTower7FRocket2AfterBattleText: + text_far _PokemonTower7FRocket2AfterBattleText text_end -PokemonTower7BattleText3: - text_far _PokemonTower7BattleText3 +PokemonTower7FRocket3BattleText: + text_far _PokemonTower7FRocket3BattleText text_end -PokemonTower7EndBattleText3: - text_far _PokemonTower7EndBattleText3 +PokemonTower7FRocket3EndBattleText: + text_far _PokemonTower7FRocket3EndBattleText text_end -PokemonTower7AfterBattleText3: - text_far _PokemonTower7AfterBattleText3 +PokemonTower7FRocket3AfterBattleText: + text_far _PokemonTower7FRocket3AfterBattleText text_end diff --git a/scripts/PowerPlant.asm b/scripts/PowerPlant.asm index 67056e07f..568d79d21 100644 --- a/scripts/PowerPlant.asm +++ b/scripts/PowerPlant.asm @@ -8,105 +8,107 @@ PowerPlant_Script: ret PowerPlant_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_POWERPLANT_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_POWERPLANT_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_POWERPLANT_END_BATTLE PowerPlant_TextPointers: - dw Voltorb0Text - dw Voltorb1Text - dw Voltorb2Text - dw Voltorb3Text - dw Voltorb4Text - dw Voltorb5Text - dw Voltorb6Text - dw Voltorb7Text - dw ZapdosText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText + def_text_pointers + dw_const PowerPlantVoltorb1Text, TEXT_POWERPLANT_VOLTORB1 + dw_const PowerPlantVoltorb2Text, TEXT_POWERPLANT_VOLTORB2 + dw_const PowerPlantVoltorb3Text, TEXT_POWERPLANT_VOLTORB3 + dw_const PowerPlantElectrode1Text, TEXT_POWERPLANT_ELECTRODE1 + dw_const PowerPlantVoltorb4Text, TEXT_POWERPLANT_VOLTORB4 + dw_const PowerPlantVoltorb5Text, TEXT_POWERPLANT_VOLTORB5 + dw_const PowerPlantElectrode2Text, TEXT_POWERPLANT_ELECTRODE2 + dw_const PowerPlantVoltorb6Text, TEXT_POWERPLANT_VOLTORB6 + dw_const PowerPlantZapdosText, TEXT_POWERPLANT_ZAPDOS + dw_const PickUpItemText, TEXT_POWERPLANT_CARBOS + dw_const PickUpItemText, TEXT_POWERPLANT_HP_UP + dw_const PickUpItemText, TEXT_POWERPLANT_RARE_CANDY + dw_const PickUpItemText, TEXT_POWERPLANT_TM_THUNDER + dw_const PickUpItemText, TEXT_POWERPLANT_TM_REFLECT PowerPlantTrainerHeaders: def_trainers Voltorb0TrainerHeader: - trainer EVENT_BEAT_POWER_PLANT_VOLTORB_0, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText + trainer EVENT_BEAT_POWER_PLANT_VOLTORB_0, 0, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText Voltorb1TrainerHeader: - trainer EVENT_BEAT_POWER_PLANT_VOLTORB_1, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText + trainer EVENT_BEAT_POWER_PLANT_VOLTORB_1, 0, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText Voltorb2TrainerHeader: - trainer EVENT_BEAT_POWER_PLANT_VOLTORB_2, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText + trainer EVENT_BEAT_POWER_PLANT_VOLTORB_2, 0, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText Voltorb3TrainerHeader: - trainer EVENT_BEAT_POWER_PLANT_VOLTORB_3, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText + trainer EVENT_BEAT_POWER_PLANT_VOLTORB_3, 0, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText Voltorb4TrainerHeader: - trainer EVENT_BEAT_POWER_PLANT_VOLTORB_4, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText + trainer EVENT_BEAT_POWER_PLANT_VOLTORB_4, 0, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText Voltorb5TrainerHeader: - trainer EVENT_BEAT_POWER_PLANT_VOLTORB_5, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText + trainer EVENT_BEAT_POWER_PLANT_VOLTORB_5, 0, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText Voltorb6TrainerHeader: - trainer EVENT_BEAT_POWER_PLANT_VOLTORB_6, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText + trainer EVENT_BEAT_POWER_PLANT_VOLTORB_6, 0, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText Voltorb7TrainerHeader: - trainer EVENT_BEAT_POWER_PLANT_VOLTORB_7, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText + trainer EVENT_BEAT_POWER_PLANT_VOLTORB_7, 0, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText ZapdosTrainerHeader: - trainer EVENT_BEAT_ZAPDOS, 0, ZapdosBattleText, ZapdosBattleText, ZapdosBattleText + trainer EVENT_BEAT_ZAPDOS, 0, PowerPlantZapdosBattleText, PowerPlantZapdosBattleText, PowerPlantZapdosBattleText db -1 ; end -InitVoltorbBattle: +PowerPlantInitBattleScript: call TalkToTrainer ld a, [wCurMapScript] ld [wPowerPlantCurScript], a jp TextScriptEnd -Voltorb0Text: +PowerPlantVoltorb1Text: text_asm ld hl, Voltorb0TrainerHeader - jr InitVoltorbBattle + jr PowerPlantInitBattleScript -Voltorb1Text: +PowerPlantVoltorb2Text: text_asm ld hl, Voltorb1TrainerHeader - jr InitVoltorbBattle + jr PowerPlantInitBattleScript -Voltorb2Text: +PowerPlantVoltorb3Text: text_asm ld hl, Voltorb2TrainerHeader - jr InitVoltorbBattle + jr PowerPlantInitBattleScript -Voltorb3Text: +PowerPlantElectrode1Text: text_asm ld hl, Voltorb3TrainerHeader - jr InitVoltorbBattle + jr PowerPlantInitBattleScript -Voltorb4Text: +PowerPlantVoltorb4Text: text_asm ld hl, Voltorb4TrainerHeader - jr InitVoltorbBattle + jr PowerPlantInitBattleScript -Voltorb5Text: +PowerPlantVoltorb5Text: text_asm ld hl, Voltorb5TrainerHeader - jr InitVoltorbBattle + jr PowerPlantInitBattleScript -Voltorb6Text: +PowerPlantElectrode2Text: text_asm ld hl, Voltorb6TrainerHeader - jr InitVoltorbBattle + jr PowerPlantInitBattleScript -Voltorb7Text: +PowerPlantVoltorb6Text: text_asm ld hl, Voltorb7TrainerHeader - jr InitVoltorbBattle + jr PowerPlantInitBattleScript -ZapdosText: +PowerPlantZapdosText: text_asm ld hl, ZapdosTrainerHeader - jr InitVoltorbBattle + jr PowerPlantInitBattleScript -VoltorbBattleText: - text_far _VoltorbBattleText +PowerPlantVoltorbBattleText: + text_far _PowerPlantVoltorbBattleText text_end -ZapdosBattleText: - text_far _ZapdosBattleText +PowerPlantZapdosBattleText: + text_far _PowerPlantZapdosBattleText text_asm ld a, ZAPDOS call PlayCry diff --git a/scripts/RedsHouse1F.asm b/scripts/RedsHouse1F.asm index bdeb96d7d..0c5dbcf13 100644 --- a/scripts/RedsHouse1F.asm +++ b/scripts/RedsHouse1F.asm @@ -2,28 +2,29 @@ RedsHouse1F_Script: jp EnableAutoTextBoxDrawing RedsHouse1F_TextPointers: - dw RedsHouse1FMomText - dw RedsHouse1FTVText + def_text_pointers + dw_const RedsHouse1FMomText, TEXT_REDSHOUSE1F_MOM + dw_const RedsHouse1FTVText, TEXT_REDSHOUSE1F_TV RedsHouse1FMomText: text_asm ld a, [wd72e] bit 3, a ; received a Pokémon from Oak? jr nz, .heal - ld hl, MomWakeUpText + ld hl, .WakeUpText call PrintText jr .done .heal - call MomHealPokemon + call RedsHouse1FMomHealScript .done jp TextScriptEnd -MomWakeUpText: - text_far _MomWakeUpText +.WakeUpText: + text_far _RedsHouse1FMomWakeUpText text_end -MomHealPokemon: - ld hl, MomHealText1 +RedsHouse1FMomHealScript: + ld hl, RedsHouse1FMomYouShouldRestText call PrintText call GBFadeOutToWhite call ReloadMapData @@ -39,31 +40,31 @@ MomHealPokemon: ld [wNewSoundID], a call PlaySound call GBFadeInFromWhite - ld hl, MomHealText2 + ld hl, RedsHouse1FMomLookingGreatText jp PrintText -MomHealText1: - text_far _MomHealText1 +RedsHouse1FMomYouShouldRestText: + text_far _RedsHouse1FMomYouShouldRestText text_end -MomHealText2: - text_far _MomHealText2 +RedsHouse1FMomLookingGreatText: + text_far _RedsHouse1FMomLookingGreatText text_end RedsHouse1FTVText: text_asm ld a, [wSpritePlayerStateData1FacingDirection] cp SPRITE_FACING_UP - ld hl, TVWrongSideText + ld hl, .WrongSideText jr nz, .got_text - ld hl, StandByMeText + ld hl, .StandByMeMovieText .got_text call PrintText jp TextScriptEnd -StandByMeText: - text_far _StandByMeText +.StandByMeMovieText: + text_far _RedsHouse1FTVStandByMeMovieText text_end -TVWrongSideText: - text_far _TVWrongSideText +.WrongSideText: + text_far _RedsHouse1FTVWrongSideText text_end diff --git a/scripts/RedsHouse2F.asm b/scripts/RedsHouse2F.asm index b44b9f98a..9b2575b71 100644 --- a/scripts/RedsHouse2F.asm +++ b/scripts/RedsHouse2F.asm @@ -5,21 +5,23 @@ RedsHouse2F_Script: jp CallFunctionInTable RedsHouse2F_ScriptPointers: - dw RedsHouse2FScript0 - dw RedsHouse2FScript1 + def_script_pointers + dw_const RedsHouse2FDefaultScript, SCRIPT_REDSHOUSE2F_DEFAULT + dw_const RedsHouse2FNoopScript, SCRIPT_REDSHOUSE2F_NOOP -RedsHouse2FScript0: +RedsHouse2FDefaultScript: xor a ldh [hJoyHeld], a ld a, PLAYER_DIR_UP ld [wPlayerMovingDirection], a - ld a, 1 + ld a, SCRIPT_REDSHOUSE2F_NOOP ld [wRedsHouse2FCurScript], a ret -RedsHouse2FScript1: +RedsHouse2FNoopScript: ret RedsHouse2F_TextPointers: + def_text_pointers text_end ; unused diff --git a/scripts/RockTunnel1F.asm b/scripts/RockTunnel1F.asm index cafdbe627..234a506db 100644 --- a/scripts/RockTunnel1F.asm +++ b/scripts/RockTunnel1F.asm @@ -8,159 +8,161 @@ RockTunnel1F_Script: ret RockTunnel1F_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_ROCKTUNNEL1F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROCKTUNNEL1F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROCKTUNNEL1F_END_BATTLE RockTunnel1F_TextPointers: - dw RockTunnel1Text1 - dw RockTunnel1Text2 - dw RockTunnel1Text3 - dw RockTunnel1Text4 - dw RockTunnel1Text5 - dw RockTunnel1Text6 - dw RockTunnel1Text7 - dw RockTunnel1Text8 + def_text_pointers + dw_const RockTunnel1FHiker1Text, TEXT_ROCKTUNNEL1F_HIKER1 + dw_const RockTunnel1FHiker2Text, TEXT_ROCKTUNNEL1F_HIKER2 + dw_const RockTunnel1FHiker3Text, TEXT_ROCKTUNNEL1F_HIKER3 + dw_const RockTunnel1FSuperNerdText, TEXT_ROCKTUNNEL1F_SUPER_NERD + dw_const RockTunnel1FCooltrainerF1Text, TEXT_ROCKTUNNEL1F_COOLTRAINER_F1 + dw_const RockTunnel1FCooltrainerF2Text, TEXT_ROCKTUNNEL1F_COOLTRAINER_F2 + dw_const RockTunnel1FCooltrainerF3Text, TEXT_ROCKTUNNEL1F_COOLTRAINER_F3 + dw_const RockTunnel1FSignText, TEXT_ROCKTUNNEL1F_SIGN RockTunnel1TrainerHeaders: def_trainers RockTunnel1TrainerHeader0: - trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_0, 4, RockTunnel1BattleText1, RockTunnel1EndBattleText1, RockTunnel1AfterBattleText1 + trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_0, 4, RockTunnel1FHiker1BattleText, RockTunnel1FHiker1EndBattleText, RockTunnel1FHiker1AfterBattleText RockTunnel1TrainerHeader1: - trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1, 4, RockTunnel1BattleText2, RockTunnel1EndBattleText2, RockTunnel1AfterBattleText2 + trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1, 4, RockTunnel1FHiker2BattleText, RockTunnel1FHiker2EndBattleText, RockTunnel1FHiker2AfterBattleText RockTunnel1TrainerHeader2: - trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2, 3, RockTunnel1BattleText3, RockTunnel1EndBattleText3, RockTunnel1AfterBattleText3 + trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2, 3, RockTunnel1FHiker3BattleText, RockTunnel1FHiker3EndBattleText, RockTunnel1FHiker3AfterBattleText RockTunnel1TrainerHeader3: - trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3, 3, RockTunnel1BattleText4, RockTunnel1EndBattleText4, RockTunnel1AfterBattleText4 + trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3, 3, RockTunnel1FSuperNerdBattleText, RockTunnel1FSuperNerdEndBattleText, RockTunnel1FSuperNerdAfterBattleText RockTunnel1TrainerHeader4: - trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4, 4, RockTunnel1BattleText5, RockTunnel1EndBattleText5, RockTunnel1AfterBattleText5 + trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4, 4, RockTunnel1FCooltrainerF1BattleText, RockTunnel1FCooltrainerF1EndBattleText, RockTunnel1FCooltrainerF1AfterBattleText RockTunnel1TrainerHeader5: - trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5, 4, RockTunnel1BattleText6, RockTunnel1EndBattleText6, RockTunnel1AfterBattleText6 + trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5, 4, RockTunnel1FCooltrainerF2BattleText, RockTunnel1FCooltrainerF2EndBattleText, RockTunnel1FCooltrainerF2AfterBattleText RockTunnel1TrainerHeader6: - trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6, 4, RockTunnel1BattleText7, RockTunnel1EndBattleText7, RockTunnel1AfterBattleText7 + trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6, 4, RockTunnel1FCooltrainerF3BattleText, RockTunnel1FCooltrainerF3EndBattleText, RockTunnel1FCooltrainerF3AfterBattleText db -1 ; end -RockTunnel1Text1: +RockTunnel1FHiker1Text: text_asm ld hl, RockTunnel1TrainerHeader0 - jr RockTunnel1TalkToTrainer + jr RockTunnel1FTalkToTrainer -RockTunnel1Text2: +RockTunnel1FHiker2Text: text_asm ld hl, RockTunnel1TrainerHeader1 - jr RockTunnel1TalkToTrainer + jr RockTunnel1FTalkToTrainer -RockTunnel1Text3: +RockTunnel1FHiker3Text: text_asm ld hl, RockTunnel1TrainerHeader2 - jr RockTunnel1TalkToTrainer + jr RockTunnel1FTalkToTrainer -RockTunnel1Text4: +RockTunnel1FSuperNerdText: text_asm ld hl, RockTunnel1TrainerHeader3 - jr RockTunnel1TalkToTrainer + jr RockTunnel1FTalkToTrainer -RockTunnel1Text5: +RockTunnel1FCooltrainerF1Text: text_asm ld hl, RockTunnel1TrainerHeader4 - jr RockTunnel1TalkToTrainer + jr RockTunnel1FTalkToTrainer -RockTunnel1Text6: +RockTunnel1FCooltrainerF2Text: text_asm ld hl, RockTunnel1TrainerHeader5 - jr RockTunnel1TalkToTrainer + jr RockTunnel1FTalkToTrainer -RockTunnel1Text7: +RockTunnel1FCooltrainerF3Text: text_asm ld hl, RockTunnel1TrainerHeader6 -RockTunnel1TalkToTrainer: +RockTunnel1FTalkToTrainer: call TalkToTrainer jp TextScriptEnd -RockTunnel1BattleText1: - text_far _RockTunnel1BattleText1 +RockTunnel1FHiker1BattleText: + text_far _RockTunnel1FHiker1BattleText text_end -RockTunnel1EndBattleText1: - text_far _RockTunnel1EndBattleText1 +RockTunnel1FHiker1EndBattleText: + text_far _RockTunnel1FHiker1EndBattleText text_end -RockTunnel1AfterBattleText1: - text_far _RockTunnel1AfterBattleText1 +RockTunnel1FHiker1AfterBattleText: + text_far _RockTunnel1FHiker1AfterBattleText text_end -RockTunnel1BattleText2: - text_far _RockTunnel1BattleText2 +RockTunnel1FHiker2BattleText: + text_far _RockTunnel1FHiker2BattleText text_end -RockTunnel1EndBattleText2: - text_far _RockTunnel1EndBattleText2 +RockTunnel1FHiker2EndBattleText: + text_far _RockTunnel1FHiker2EndBattleText text_end -RockTunnel1AfterBattleText2: - text_far _RockTunnel1AfterBattleText2 +RockTunnel1FHiker2AfterBattleText: + text_far _RockTunnel1FHiker2AfterBattleText text_end -RockTunnel1BattleText3: - text_far _RockTunnel1BattleText3 +RockTunnel1FHiker3BattleText: + text_far _RockTunnel1FHiker3BattleText text_end -RockTunnel1EndBattleText3: - text_far _RockTunnel1EndBattleText3 +RockTunnel1FHiker3EndBattleText: + text_far _RockTunnel1FHiker3EndBattleText text_end -RockTunnel1AfterBattleText3: - text_far _RockTunnel1AfterBattleText3 +RockTunnel1FHiker3AfterBattleText: + text_far _RockTunnel1FHiker3AfterBattleText text_end -RockTunnel1BattleText4: - text_far _RockTunnel1BattleText4 +RockTunnel1FSuperNerdBattleText: + text_far _RockTunnel1FSuperNerdBattleText text_end -RockTunnel1EndBattleText4: - text_far _RockTunnel1EndBattleText4 +RockTunnel1FSuperNerdEndBattleText: + text_far _RockTunnel1FSuperNerdEndBattleText text_end -RockTunnel1AfterBattleText4: - text_far _RockTunnel1AfterBattleText4 +RockTunnel1FSuperNerdAfterBattleText: + text_far _RockTunnel1FSuperNerdAfterBattleText text_end -RockTunnel1BattleText5: - text_far _RockTunnel1BattleText5 +RockTunnel1FCooltrainerF1BattleText: + text_far _RockTunnel1FCooltrainerF1BattleText text_end -RockTunnel1EndBattleText5: - text_far _RockTunnel1EndBattleText5 +RockTunnel1FCooltrainerF1EndBattleText: + text_far _RockTunnel1FCooltrainerF1EndBattleText text_end -RockTunnel1AfterBattleText5: - text_far _RockTunnel1AfterBattleText5 +RockTunnel1FCooltrainerF1AfterBattleText: + text_far _RockTunnel1FCooltrainerF1AfterBattleText text_end -RockTunnel1BattleText6: - text_far _RockTunnel1BattleText6 +RockTunnel1FCooltrainerF2BattleText: + text_far _RockTunnel1FCooltrainerF2BattleText text_end -RockTunnel1EndBattleText6: - text_far _RockTunnel1EndBattleText6 +RockTunnel1FCooltrainerF2EndBattleText: + text_far _RockTunnel1FCooltrainerF2EndBattleText text_end -RockTunnel1AfterBattleText6: - text_far _RockTunnel1AfterBattleText6 +RockTunnel1FCooltrainerF2AfterBattleText: + text_far _RockTunnel1FCooltrainerF2AfterBattleText text_end -RockTunnel1BattleText7: - text_far _RockTunnel1BattleText7 +RockTunnel1FCooltrainerF3BattleText: + text_far _RockTunnel1FCooltrainerF3BattleText text_end -RockTunnel1EndBattleText7: - text_far _RockTunnel1EndBattleText7 +RockTunnel1FCooltrainerF3EndBattleText: + text_far _RockTunnel1FCooltrainerF3EndBattleText text_end -RockTunnel1AfterBattleText7: - text_far _RockTunnel1AfterBattleText7 +RockTunnel1FCooltrainerF3AfterBattleText: + text_far _RockTunnel1FCooltrainerF3AfterBattleText text_end -RockTunnel1Text8: - text_far _RockTunnel1Text8 +RockTunnel1FSignText: + text_far _RockTunnel1FSignText text_end diff --git a/scripts/RockTunnelB1F.asm b/scripts/RockTunnelB1F.asm index fa9cafdac..1a1c92669 100644 --- a/scripts/RockTunnelB1F.asm +++ b/scripts/RockTunnelB1F.asm @@ -8,180 +8,182 @@ RockTunnelB1F_Script: ret RockTunnelB1F_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_ROCKTUNNELB1F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROCKTUNNELB1F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROCKTUNNELB1F_END_BATTLE RockTunnelB1F_TextPointers: - dw RockTunnel2Text1 - dw RockTunnel2Text2 - dw RockTunnel2Text3 - dw RockTunnel2Text4 - dw RockTunnel2Text5 - dw RockTunnel2Text6 - dw RockTunnel2Text7 - dw RockTunnel2Text8 + def_text_pointers + dw_const RockTunnelB1FCooltrainerF1Text, TEXT_ROCKTUNNELB1F_COOLTRAINER_F1 + dw_const RockTunnelB1FHiker1Text, TEXT_ROCKTUNNELB1F_HIKER1 + dw_const RockTunnelB1FSuperNerd1Text, TEXT_ROCKTUNNELB1F_SUPER_NERD1 + dw_const RockTunnelB1FSuperNerd2Text, TEXT_ROCKTUNNELB1F_SUPER_NERD2 + dw_const RockTunnelB1FHiker2Text, TEXT_ROCKTUNNELB1F_HIKER2 + dw_const RockTunnelB1FCooltrainerF2Text, TEXT_ROCKTUNNELB1F_COOLTRAINER_F2 + dw_const RockTunnelB1FHiker3Text, TEXT_ROCKTUNNELB1F_HIKER3 + dw_const RockTunnelB1FSuperNerd3Text, TEXT_ROCKTUNNELB1F_SUPER_NERD3 RockTunnel2TrainerHeaders: def_trainers RockTunnel2TrainerHeader0: - trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_0, 4, RockTunnel2BattleText2, RockTunnel2EndBattleText2, RockTunnel2AfterBattleText2 + trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_0, 4, RockTunnelB1FCooltrainerF1BattleText, RockTunnelB1FCooltrainerF1EndBattleText, RockTunnelB1FCooltrainerF1AfterBattleText RockTunnel2TrainerHeader1: - trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_1, 3, RockTunnel2BattleText3, RockTunnel2EndBattleText3, RockTunnel2AfterBattleText3 + trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_1, 3, RockTunnelB1FHiker1BattleText, RockTunnelB1FHiker1EndBattleText, RockTunnelB1FHiker1AfterBattleText RockTunnel2TrainerHeader2: - trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2, 3, RockTunnel2BattleText4, RockTunnel2EndBattleText4, RockTunnel2AfterBattleText4 + trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2, 3, RockTunnelB1FSuperNerd1BattleText, RockTunnelB1FSuperNerd1EndBattleText, RockTunnelB1FSuperNerd1AfterBattleText RockTunnel2TrainerHeader3: - trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3, 4, RockTunnel2BattleText5, RockTunnel2EndBattleText5, RockTunnel2AfterBattleText5 + trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3, 4, RockTunnelB1FSuperNerd2BattleText, RockTunnelB1FSuperNerd2EndBattleText, RockTunnelB1FSuperNerd2AfterBattleText RockTunnel2TrainerHeader4: - trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4, 3, RockTunnel2BattleText6, RockTunnel2EndBattleText6, RockTunnel2AfterBattleText6 + trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4, 3, RockTunnelB1FHiker2BattleText, RockTunnelB1FHiker2EndBattleText, RockTunnelB1FHiker2AfterBattleText RockTunnel2TrainerHeader5: - trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5, 4, RockTunnel2BattleText7, RockTunnel2EndBattleText7, RockTunnel2AfterBattleText7 + trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5, 4, RockTunnelB1FCooltrainerF2BattleText, RockTunnelB1FCooltrainerF2EndBattleText, RockTunnelB1FCooltrainerF2AfterBattleText RockTunnel2TrainerHeader6: - trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6, 3, RockTunnel2BattleText8, RockTunnel2EndBattleText8, RockTunnel2AfterBattleText8 + trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6, 3, RockTunnelB1FHiker3BattleText, RockTunnelB1FHiker3EndBattleText, RockTunnelB1FHiker3AfterBattleText RockTunnel2TrainerHeader7: - trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7, 3, RockTunnel2BattleText9, RockTunnel2EndBattleText9, RockTunnel2AfterBattleText9 + trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7, 3, RockTunnelB1FSuperNerd3BattleText, RockTunnelB1FSuperNerd3EndBattleText, RockTunnelB1FSuperNerd3AfterBattleText db -1 ; end -RockTunnel2Text1: +RockTunnelB1FCooltrainerF1Text: text_asm ld hl, RockTunnel2TrainerHeader0 call TalkToTrainer jp TextScriptEnd -RockTunnel2Text2: +RockTunnelB1FHiker1Text: text_asm ld hl, RockTunnel2TrainerHeader1 call TalkToTrainer jp TextScriptEnd -RockTunnel2Text3: +RockTunnelB1FSuperNerd1Text: text_asm ld hl, RockTunnel2TrainerHeader2 call TalkToTrainer jp TextScriptEnd -RockTunnel2Text4: +RockTunnelB1FSuperNerd2Text: text_asm ld hl, RockTunnel2TrainerHeader3 call TalkToTrainer jp TextScriptEnd -RockTunnel2Text5: +RockTunnelB1FHiker2Text: text_asm ld hl, RockTunnel2TrainerHeader4 call TalkToTrainer jp TextScriptEnd -RockTunnel2Text6: +RockTunnelB1FCooltrainerF2Text: text_asm ld hl, RockTunnel2TrainerHeader5 call TalkToTrainer jp TextScriptEnd -RockTunnel2Text7: +RockTunnelB1FHiker3Text: text_asm ld hl, RockTunnel2TrainerHeader6 call TalkToTrainer jp TextScriptEnd -RockTunnel2Text8: +RockTunnelB1FSuperNerd3Text: text_asm ld hl, RockTunnel2TrainerHeader7 call TalkToTrainer jp TextScriptEnd -RockTunnel2BattleText2: - text_far _RockTunnel2BattleText2 +RockTunnelB1FCooltrainerF1BattleText: + text_far _RockTunnelB1FCooltrainerF1BattleText text_end -RockTunnel2EndBattleText2: - text_far _RockTunnel2EndBattleText2 +RockTunnelB1FCooltrainerF1EndBattleText: + text_far _RockTunnelB1FCooltrainerF1EndBattleText text_end -RockTunnel2AfterBattleText2: - text_far _RockTunnel2AfterBattleText2 +RockTunnelB1FCooltrainerF1AfterBattleText: + text_far _RockTunnelB1FCooltrainerF1AfterBattleText text_end -RockTunnel2BattleText3: - text_far _RockTunnel2BattleText3 +RockTunnelB1FHiker1BattleText: + text_far _RockTunnelB1FHiker1BattleText text_end -RockTunnel2EndBattleText3: - text_far _RockTunnel2EndBattleText3 +RockTunnelB1FHiker1EndBattleText: + text_far _RockTunnelB1FHiker1EndBattleText text_end -RockTunnel2AfterBattleText3: - text_far _RockTunnel2AfterBattleText3 +RockTunnelB1FHiker1AfterBattleText: + text_far _RockTunnelB1FHiker1AfterBattleText text_end -RockTunnel2BattleText4: - text_far _RockTunnel2BattleText4 +RockTunnelB1FSuperNerd1BattleText: + text_far _RockTunnelB1FSuperNerd1BattleText text_end -RockTunnel2EndBattleText4: - text_far _RockTunnel2EndBattleText4 +RockTunnelB1FSuperNerd1EndBattleText: + text_far _RockTunnelB1FSuperNerd1EndBattleText text_end -RockTunnel2AfterBattleText4: - text_far _RockTunnel2AfterBattleText4 +RockTunnelB1FSuperNerd1AfterBattleText: + text_far _RockTunnelB1FSuperNerd1AfterBattleText text_end -RockTunnel2BattleText5: - text_far _RockTunnel2BattleText5 +RockTunnelB1FSuperNerd2BattleText: + text_far _RockTunnelB1FSuperNerd2BattleText text_end -RockTunnel2EndBattleText5: - text_far _RockTunnel2EndBattleText5 +RockTunnelB1FSuperNerd2EndBattleText: + text_far _RockTunnelB1FSuperNerd2EndBattleText text_end -RockTunnel2AfterBattleText5: - text_far _RockTunnel2AfterBattleText5 +RockTunnelB1FSuperNerd2AfterBattleText: + text_far _RockTunnelB1FSuperNerd2AfterBattleText text_end -RockTunnel2BattleText6: - text_far _RockTunnel2BattleText6 +RockTunnelB1FHiker2BattleText: + text_far _RockTunnelB1FHiker2BattleText text_end -RockTunnel2EndBattleText6: - text_far _RockTunnel2EndBattleText6 +RockTunnelB1FHiker2EndBattleText: + text_far _RockTunnelB1FHiker2EndBattleText text_end -RockTunnel2AfterBattleText6: - text_far _RockTunnel2AfterBattleText6 +RockTunnelB1FHiker2AfterBattleText: + text_far _RockTunnelB1FHiker2AfterBattleText text_end -RockTunnel2BattleText7: - text_far _RockTunnel2BattleText7 +RockTunnelB1FCooltrainerF2BattleText: + text_far _RockTunnelB1FCooltrainerF2BattleText text_end -RockTunnel2EndBattleText7: - text_far _RockTunnel2EndBattleText7 +RockTunnelB1FCooltrainerF2EndBattleText: + text_far _RockTunnelB1FCooltrainerF2EndBattleText text_end -RockTunnel2AfterBattleText7: - text_far _RockTunnel2AfterBattleText7 +RockTunnelB1FCooltrainerF2AfterBattleText: + text_far _RockTunnelB1FCooltrainerF2AfterBattleText text_end -RockTunnel2BattleText8: - text_far _RockTunnel2BattleText8 +RockTunnelB1FHiker3BattleText: + text_far _RockTunnelB1FHiker3BattleText text_end -RockTunnel2EndBattleText8: - text_far _RockTunnel2EndBattleText8 +RockTunnelB1FHiker3EndBattleText: + text_far _RockTunnelB1FHiker3EndBattleText text_end -RockTunnel2AfterBattleText8: - text_far _RockTunnel2AfterBattleText8 +RockTunnelB1FHiker3AfterBattleText: + text_far _RockTunnelB1FHiker3AfterBattleText text_end -RockTunnel2BattleText9: - text_far _RockTunnel2BattleText9 +RockTunnelB1FSuperNerd3BattleText: + text_far _RockTunnelB1FSuperNerd3BattleText text_end -RockTunnel2EndBattleText9: - text_far _RockTunnel2EndBattleText9 +RockTunnelB1FSuperNerd3EndBattleText: + text_far _RockTunnelB1FSuperNerd3EndBattleText text_end -RockTunnel2AfterBattleText9: - text_far _RockTunnel2AfterBattleText9 +RockTunnelB1FSuperNerd3AfterBattleText: + text_far _RockTunnelB1FSuperNerd3AfterBattleText text_end diff --git a/scripts/RockTunnelPokecenter.asm b/scripts/RockTunnelPokecenter.asm index 755bb8f81..89aad6a3a 100644 --- a/scripts/RockTunnelPokecenter.asm +++ b/scripts/RockTunnelPokecenter.asm @@ -3,21 +3,22 @@ RockTunnelPokecenter_Script: jp EnableAutoTextBoxDrawing RockTunnelPokecenter_TextPointers: - dw RockTunnelHealNurseText - dw RockTunnelPokecenterText2 - dw RockTunnelPokecenterText3 - dw RockTunnelTradeNurseText + def_text_pointers + dw_const RockTunnelPokecenterNurseText, TEXT_ROCKTUNNELPOKECENTER_NURSE + dw_const RockTunnelPokecenterGentlemanText, TEXT_ROCKTUNNELPOKECENTER_GENTLEMAN + dw_const RockTunnelPokecenterFisherText, TEXT_ROCKTUNNELPOKECENTER_FISHER + dw_const RockTunnelPokecenterLinkReceptionistText, TEXT_ROCKTUNNELPOKECENTER_LINK_RECEPTIONIST -RockTunnelHealNurseText: +RockTunnelPokecenterNurseText: script_pokecenter_nurse -RockTunnelPokecenterText2: - text_far _RockTunnelPokecenterText2 +RockTunnelPokecenterGentlemanText: + text_far _RockTunnelPokecenterGentlemanText text_end -RockTunnelPokecenterText3: - text_far _RockTunnelPokecenterText3 +RockTunnelPokecenterFisherText: + text_far _RockTunnelPokecenterFisherText text_end -RockTunnelTradeNurseText: +RockTunnelPokecenterLinkReceptionistText: script_cable_club_receptionist diff --git a/scripts/RocketHideoutB1F.asm b/scripts/RocketHideoutB1F.asm index 44964e14a..f6c64bdaf 100644 --- a/scripts/RocketHideoutB1F.asm +++ b/scripts/RocketHideoutB1F.asm @@ -1,5 +1,5 @@ RocketHideoutB1F_Script: - call RocketHideout1Script_44be0 + call RocketHideoutB1FDoorCallbackScript call EnableAutoTextBoxDrawing ld hl, RocketHideout1TrainerHeaders ld de, RocketHideoutB1F_ScriptPointers @@ -8,149 +8,151 @@ RocketHideoutB1F_Script: ld [wRocketHideoutB1FCurScript], a ret -RocketHideout1Script_44be0: +RocketHideoutB1FDoorCallbackScript: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z CheckEvent EVENT_677 - jr nz, .asm_44c01 + jr nz, .door_open CheckEventReuseA EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 - jr nz, .asm_44bf7 - ld a, $54 - jr .asm_44c03 -.asm_44bf7 + jr nz, .play_sound_door_open + ld a, $54 ; Door Block + jr .set_door_block +.play_sound_door_open ld a, SFX_GO_INSIDE call PlaySound CheckEventHL EVENT_677 -.asm_44c01 - ld a, $e -.asm_44c03 +.door_open + ld a, $e ; Floor Block +.set_door_block ld [wNewTileBlockID], a lb bc, 8, 12 predef_jump ReplaceTileBlock RocketHideoutB1F_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_ROCKETHIDEOUTB1F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROCKETHIDEOUTB1F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROCKETHIDEOUTB1F_END_BATTLE RocketHideoutB1F_TextPointers: - dw RocketHideout1Text1 - dw RocketHideout1Text2 - dw RocketHideout1Text3 - dw RocketHideout1Text4 - dw RocketHideout1Text5 - dw PickUpItemText - dw PickUpItemText + def_text_pointers + dw_const RocketHideoutB1FRocket1Text, TEXT_ROCKETHIDEOUTB1F_ROCKET1 + dw_const RocketHideoutB1FRocket2Text, TEXT_ROCKETHIDEOUTB1F_ROCKET2 + dw_const RocketHideoutB1FRocket3Text, TEXT_ROCKETHIDEOUTB1F_ROCKET3 + dw_const RocketHideoutB1FRocket4Text, TEXT_ROCKETHIDEOUTB1F_ROCKET4 + dw_const RocketHideoutB1FRocket5Text, TEXT_ROCKETHIDEOUTB1F_ROCKET5 + dw_const PickUpItemText, TEXT_ROCKETHIDEOUTB1F_ESCAPE_ROPE + dw_const PickUpItemText, TEXT_ROCKETHIDEOUTB1F_HYPER_POTION RocketHideout1TrainerHeaders: def_trainers RocketHideout1TrainerHeader0: - trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0, 3, RocketHideout1BattleText2, RocketHideout1EndBattleText2, RocketHideout1AfterBattleTxt2 + trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0, 3, RocketHideoutB1FRocket1BattleText, RocketHideoutB1FRocket1EndBattleText, RocketHideoutB1FRocket1AfterBattleText RocketHideout1TrainerHeader1: - trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1, 2, RocketHideout1BattleText3, RocketHideout1EndBattleText3, RocketHideout1AfterBattleTxt3 + trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1, 2, RocketHideoutB1FRocket2BattleText, RocketHideoutB1FRocket2EndBattleText, RocketHideoutB1FRocket2AfterBattleText RocketHideout1TrainerHeader2: - trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2, 2, RocketHideout1BattleText4, RocketHideout1EndBattleText4, RocketHideout1AfterBattleTxt4 + trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2, 2, RocketHideoutB1FRocket3BattleText, RocketHideoutB1FRocket3EndBattleText, RocketHideoutB1FRocket3AfterBattleText RocketHideout1TrainerHeader3: - trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3, 3, RocketHideout1BattleText5, RocketHideout1EndBattleText5, RocketHideout1AfterBattleTxt5 + trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3, 3, RocketHideoutB1FRocket4BattleText, RocketHideoutB1FRocket4EndBattleText, RocketHideoutB1FRocket4AfterBattleText RocketHideout1TrainerHeader4: - trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4, 3, RocketHideout1BattleText6, RocketHideout1EndBattleText6, RocketHideout1AfterBattleTxt6 + trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4, 3, RocketHideoutB1FRocket5BattleText, RocketHideoutB1FRocket5EndBattleText, RocketHideoutB1FRocket5AfterBattleText db -1 ; end -RocketHideout1Text1: +RocketHideoutB1FRocket1Text: text_asm ld hl, RocketHideout1TrainerHeader0 call TalkToTrainer jp TextScriptEnd -RocketHideout1Text2: +RocketHideoutB1FRocket2Text: text_asm ld hl, RocketHideout1TrainerHeader1 call TalkToTrainer jp TextScriptEnd -RocketHideout1Text3: +RocketHideoutB1FRocket3Text: text_asm ld hl, RocketHideout1TrainerHeader2 call TalkToTrainer jp TextScriptEnd -RocketHideout1Text4: +RocketHideoutB1FRocket4Text: text_asm ld hl, RocketHideout1TrainerHeader3 call TalkToTrainer jp TextScriptEnd -RocketHideout1Text5: +RocketHideoutB1FRocket5Text: text_asm ld hl, RocketHideout1TrainerHeader4 call TalkToTrainer jp TextScriptEnd -RocketHideout1EndBattleText6: - text_far _RocketHideout1EndBattleText6 +RocketHideoutB1FRocket5EndBattleText: + text_far _RocketHideoutB1FRocket5EndBattleText text_asm SetEvent EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 - ld hl, RocketHideout1Text_44c9f + ld hl, .prompt_end ret -RocketHideout1Text_44c9f: +.prompt_end: text_promptbutton text_end -RocketHideout1BattleText2: - text_far _RocketHideout1BattleText2 +RocketHideoutB1FRocket1BattleText: + text_far _RocketHideoutB1FRocket1BattleText text_end -RocketHideout1EndBattleText2: - text_far _RocketHideout1EndBattleText2 +RocketHideoutB1FRocket1EndBattleText: + text_far _RocketHideoutB1FRocket1EndBattleText text_end -RocketHideout1AfterBattleTxt2: - text_far _RocketHideout1AfterBattleTxt2 +RocketHideoutB1FRocket1AfterBattleText: + text_far _RocketHideoutB1FRocket1AfterBattleText text_end -RocketHideout1BattleText3: - text_far _RocketHideout1BattleText3 +RocketHideoutB1FRocket2BattleText: + text_far _RocketHideoutB1FRocket2BattleText text_end -RocketHideout1EndBattleText3: - text_far _RocketHideout1EndBattleText3 +RocketHideoutB1FRocket2EndBattleText: + text_far _RocketHideoutB1FRocket2EndBattleText text_end -RocketHideout1AfterBattleTxt3: - text_far _RocketHideout1AfterBattleTxt3 +RocketHideoutB1FRocket2AfterBattleText: + text_far _RocketHideoutB1FRocket2AfterBattleText text_end -RocketHideout1BattleText4: - text_far _RocketHideout1BattleText4 +RocketHideoutB1FRocket3BattleText: + text_far _RocketHideoutB1FRocket3BattleText text_end -RocketHideout1EndBattleText4: - text_far _RocketHideout1EndBattleText4 +RocketHideoutB1FRocket3EndBattleText: + text_far _RocketHideoutB1FRocket3EndBattleText text_end -RocketHideout1AfterBattleTxt4: - text_far _RocketHideout1AfterBattleTxt4 +RocketHideoutB1FRocket3AfterBattleText: + text_far _RocketHideoutB1FRocket3AfterBattleText text_end -RocketHideout1BattleText5: - text_far _RocketHideout1BattleText5 +RocketHideoutB1FRocket4BattleText: + text_far _RocketHideoutB1FRocket4BattleText text_end -RocketHideout1EndBattleText5: - text_far _RocketHideout1EndBattleText5 +RocketHideoutB1FRocket4EndBattleText: + text_far _RocketHideoutB1FRocket4EndBattleText text_end -RocketHideout1AfterBattleTxt5: - text_far _RocketHideout1AfterBattleTxt5 +RocketHideoutB1FRocket4AfterBattleText: + text_far _RocketHideoutB1FRocket4AfterBattleText text_end -RocketHideout1BattleText6: - text_far _RocketHideout1BattleText6 +RocketHideoutB1FRocket5BattleText: + text_far _RocketHideoutB1FRocket5BattleText text_end -RocketHideout1AfterBattleTxt6: - text_far _RocketHideout1AfterBattleTxt6 +RocketHideoutB1FRocket5AfterBattleText: + text_far _RocketHideoutB1FRocket5AfterBattleText text_end diff --git a/scripts/RocketHideoutB2F.asm b/scripts/RocketHideoutB2F.asm index 4fa32e34b..3a7ffa9be 100644 --- a/scripts/RocketHideoutB2F.asm +++ b/scripts/RocketHideoutB2F.asm @@ -8,12 +8,13 @@ RocketHideoutB2F_Script: ret RocketHideoutB2F_ScriptPointers: - dw RocketHideout2Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw RocketHideout2Script3 + def_script_pointers + dw_const RocketHideoutB2FDefaultScript, SCRIPT_ROCKETHIDEOUTB2F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROCKETHIDEOUTB2F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROCKETHIDEOUTB2F_END_BATTLE + dw_const RocketHideoutB2FPlayerSpinningScript, SCRIPT_ROCKETHIDEOUTB2F_PLAYER_SPINNING -RocketHideout2Script0: +RocketHideoutB2FDefaultScript: ld a, [wYCoord] ld b, a ld a, [wXCoord] @@ -27,9 +28,9 @@ RocketHideout2Script0: call StartSimulatingJoypadStates ld a, SFX_ARROW_TILES call PlaySound - ld a, $ff + ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a - ld a, $3 + ld a, SCRIPT_ROCKETHIDEOUTB2F_PLAYER_SPINNING ld [wCurMapScript], a ret @@ -255,7 +256,7 @@ RocketHideout2ArrowMovement36: db D_LEFT, 5 db -1 ; end -RocketHideout2Script3: +RocketHideoutB2FPlayerSpinningScript: ld a, [wSimulatedJoypadStatesIndex] and a jr nz, LoadSpinnerArrowTiles @@ -263,39 +264,40 @@ RocketHideout2Script3: ld [wJoyIgnore], a ld hl, wd736 res 7, [hl] - ld a, $0 + ld a, SCRIPT_ROCKETHIDEOUTB2F_DEFAULT ld [wCurMapScript], a ret INCLUDE "engine/overworld/spinners.asm" RocketHideoutB2F_TextPointers: - dw RocketHideout2Text1 - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText + def_text_pointers + dw_const RocketHideoutB2FRocketText, TEXT_ROCKETHIDEOUTB2F_ROCKET + dw_const PickUpItemText, TEXT_ROCKETHIDEOUTB2F_MOON_STONE + dw_const PickUpItemText, TEXT_ROCKETHIDEOUTB2F_NUGGET + dw_const PickUpItemText, TEXT_ROCKETHIDEOUTB2F_TM_HORN_DRILL + dw_const PickUpItemText, TEXT_ROCKETHIDEOUTB2F_SUPER_POTION RocketHideout2TrainerHeaders: def_trainers RocketHideout2TrainerHeader0: - trainer EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0, 4, RocketHideout2BattleText2, RocketHideout2EndBattleText2, RocketHideout2AfterBattleTxt2 + trainer EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0, 4, RocketHideoutB1FRocketBattleText, RocketHideoutB1FRocketEndBattleText, RocketHideoutB1FRocketAfterBattleText db -1 ; end -RocketHideout2Text1: +RocketHideoutB2FRocketText: text_asm ld hl, RocketHideout2TrainerHeader0 call TalkToTrainer jp TextScriptEnd -RocketHideout2BattleText2: - text_far _RocketHideout2BattleText2 +RocketHideoutB1FRocketBattleText: + text_far _RocketHideoutB1FRocketBattleText text_end -RocketHideout2EndBattleText2: - text_far _RocketHideout2EndBattleText2 +RocketHideoutB1FRocketEndBattleText: + text_far _RocketHideoutB1FRocketEndBattleText text_end -RocketHideout2AfterBattleTxt2: - text_far _RocketHideout2AfterBattleTxt2 +RocketHideoutB1FRocketAfterBattleText: + text_far _RocketHideoutB1FRocketAfterBattleText text_end diff --git a/scripts/RocketHideoutB3F.asm b/scripts/RocketHideoutB3F.asm index 996790ec0..03681befa 100644 --- a/scripts/RocketHideoutB3F.asm +++ b/scripts/RocketHideoutB3F.asm @@ -8,12 +8,13 @@ RocketHideoutB3F_Script: ret RocketHideoutB3F_ScriptPointers: - dw RocketHideout3Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw RocketHideout3Script3 + def_script_pointers + dw_const RocketHideoutB3FDefaultScript, SCRIPT_ROCKETHIDEOUTB3F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROCKETHIDEOUTB3F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROCKETHIDEOUTB3F_END_BATTLE + dw_const RocketHideoutB3FPlayerSpinningScript, SCRIPT_ROCKETHIDEOUTB3F_PLAYER_SPINNING -RocketHideout3Script0: +RocketHideoutB3FDefaultScript: ld a, [wYCoord] ld b, a ld a, [wXCoord] @@ -27,9 +28,9 @@ RocketHideout3Script0: call StartSimulatingJoypadStates ld a, SFX_ARROW_TILES call PlaySound - ld a, $ff + ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a - ld a, $3 + ld a, SCRIPT_ROCKETHIDEOUTB3F_PLAYER_SPINNING ld [wCurMapScript], a ret @@ -112,7 +113,7 @@ RocketHideout3ArrowMovement12: db D_UP, 1 db -1 ; end -RocketHideout3Script3: +RocketHideoutB3FPlayerSpinningScript: ld a, [wSimulatedJoypadStatesIndex] and a jp nz, LoadSpinnerArrowTiles @@ -120,56 +121,57 @@ RocketHideout3Script3: ld [wJoyIgnore], a ld hl, wd736 res 7, [hl] - ld a, $0 + ld a, SCRIPT_ROCKETHIDEOUTB3F_DEFAULT ld [wCurMapScript], a ret RocketHideoutB3F_TextPointers: - dw RocketHideout3Text1 - dw RocketHideout3Text2 - dw PickUpItemText - dw PickUpItemText + def_text_pointers + dw_const RocketHideoutB3FRocket1Text, TEXT_ROCKETHIDEOUTB3F_ROCKET1 + dw_const RocketHideoutB3FRocket2Text, TEXT_ROCKETHIDEOUTB3F_ROCKET2 + dw_const PickUpItemText, TEXT_ROCKETHIDEOUTB3F_TM_DOUBLE_EDGE + dw_const PickUpItemText, TEXT_ROCKETHIDEOUTB3F_RARE_CANDY RocketHideout3TrainerHeaders: def_trainers RocketHideout3TrainerHeader0: - trainer EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0, 2, RocketHideout3BattleText2, RocketHideout3EndBattleText2, RocketHideout3AfterBattleTxt2 + trainer EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0, 2, RocketHideoutB3FRocket1BattleText, RocketHideoutB3FRocket1EndBattleText, RocketHideoutB3FRocket1AfterBattleText RocketHideout3TrainerHeader1: - trainer EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_1, 4, RocketHideout3BattleTxt, RocketHideout3EndBattleText3, RocketHideout3AfterBattleText3 + trainer EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_1, 4, RocketHideoutB3FRocket2BattleText, RocketHideoutB3FRocket2EndBattleText, RocketHideoutB3FRocket2AfterBattleText db -1 ; end -RocketHideout3Text1: +RocketHideoutB3FRocket1Text: text_asm ld hl, RocketHideout3TrainerHeader0 call TalkToTrainer jp TextScriptEnd -RocketHideout3BattleText2: - text_far _RocketHideout3BattleText2 +RocketHideoutB3FRocket1BattleText: + text_far _RocketHideoutB3FRocket1BattleText text_end -RocketHideout3EndBattleText2: - text_far _RocketHideout3EndBattleText2 +RocketHideoutB3FRocket1EndBattleText: + text_far _RocketHideoutB3FRocket1EndBattleText text_end -RocketHideout3AfterBattleTxt2: - text_far _RocketHideout3AfterBattleTxt2 +RocketHideoutB3FRocket1AfterBattleText: + text_far _RocketHideoutB3FRocket1AfterBattleText text_end -RocketHideout3Text2: +RocketHideoutB3FRocket2Text: text_asm ld hl, RocketHideout3TrainerHeader1 call TalkToTrainer jp TextScriptEnd -RocketHideout3BattleTxt: +RocketHideoutB3FRocket2BattleText: text_far _RocketHideout3BattleTxt text_end -RocketHideout3EndBattleText3: +RocketHideoutB3FRocket2EndBattleText: text_far _RocketHideout3EndBattleText3 text_end -RocketHideout3AfterBattleText3: +RocketHideoutB3FRocket2AfterBattleText: text_far _RocketHide3AfterBattleText3 text_end diff --git a/scripts/RocketHideoutB4F.asm b/scripts/RocketHideoutB4F.asm index a65ffb549..01584f272 100644 --- a/scripts/RocketHideoutB4F.asm +++ b/scripts/RocketHideoutB4F.asm @@ -1,5 +1,5 @@ RocketHideoutB4F_Script: - call RocketHideout4Script_45473 + call RocketHideoutB4FDoorCallbackScript call EnableAutoTextBoxDrawing ld hl, RocketHideout4TrainerHeaders ld de, RocketHideoutB4F_ScriptPointers @@ -8,29 +8,29 @@ RocketHideoutB4F_Script: ld [wRocketHideoutB4FCurScript], a ret -RocketHideout4Script_45473: +RocketHideoutB4FDoorCallbackScript: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z CheckEvent EVENT_ROCKET_HIDEOUT_4_DOOR_UNLOCKED - jr nz, .asm_45496 + jr nz, .door_already_unlocked CheckBothEventsSet EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0, EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1, 1 - jr z, .asm_4548c - ld a, $2d - jr .asm_45498 -.asm_4548c + jr z, .unlock_door + ld a, $2d ; Door block + jr .set_block +.unlock_door ld a, SFX_GO_INSIDE call PlaySound SetEvent EVENT_ROCKET_HIDEOUT_4_DOOR_UNLOCKED -.asm_45496 - ld a, $e -.asm_45498 +.door_already_unlocked + ld a, $e ; Floor block +.set_block ld [wNewTileBlockID], a lb bc, 5, 12 predef_jump ReplaceTileBlock -RocketHideout4Script_454a3: +RocketHideoutB4FSetDefaultScript: xor a ld [wJoyIgnore], a ld [wRocketHideoutB4FCurScript], a @@ -38,20 +38,21 @@ RocketHideout4Script_454a3: ret RocketHideoutB4F_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw RocketHideout4Script3 + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_ROCKETHIDEOUTB4F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROCKETHIDEOUTB4F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROCKETHIDEOUTB4F_END_BATTLE + dw_const RocketHideoutB4FBeatGiovanniScript, SCRIPT_ROCKETHIDEOUTB4F_BEAT_GIOVANNI -RocketHideout4Script3: +RocketHideoutB4FBeatGiovanniScript: ld a, [wIsInBattle] cp $ff - jp z, RocketHideout4Script_454a3 + jp z, RocketHideoutB4FSetDefaultScript call UpdateSprites - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a SetEvent EVENT_BEAT_ROCKET_HIDEOUT_GIOVANNI - ld a, $a + ld a, TEXT_ROCKETHIDEOUTB4F_GIOVANNI_HOPE_WE_MEET_AGAIN ldh [hSpriteIndexOrTextID], a call DisplayTextID call GBFadeOutToBlack @@ -67,44 +68,45 @@ RocketHideout4Script3: ld [wJoyIgnore], a ld hl, wCurrentMapScriptFlags set 5, [hl] - ld a, $0 + ld a, SCRIPT_ROCKETHIDEOUTB4F_DEFAULT ld [wRocketHideoutB4FCurScript], a ld [wCurMapScript], a ret RocketHideoutB4F_TextPointers: - dw RocketHideout4Text1 - dw RocketHideout4Text2 - dw RocketHideout4Text3 - dw RocketHideout4Text4 - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw RocketHideout4Text10 + def_text_pointers + dw_const RocketHideoutB4FGiovanniText, TEXT_ROCKETHIDEOUTB4F_GIOVANNI + dw_const RocketHideoutB4FRocket1Text, TEXT_ROCKETHIDEOUTB4F_ROCKET1 + dw_const RocketHideoutB4FRocket2Text, TEXT_ROCKETHIDEOUTB4F_ROCKET2 + dw_const RocketHideoutB4FRocket3Text, TEXT_ROCKETHIDEOUTB4F_ROCKET3 + dw_const PickUpItemText, TEXT_ROCKETHIDEOUTB4F_HP_UP + dw_const PickUpItemText, TEXT_ROCKETHIDEOUTB4F_TM_RAZOR_WIND + dw_const PickUpItemText, TEXT_ROCKETHIDEOUTB4F_IRON + dw_const PickUpItemText, TEXT_ROCKETHIDEOUTB4F_SILPH_SCOPE + dw_const PickUpItemText, TEXT_ROCKETHIDEOUTB4F_LIFT_KEY + dw_const RocketHideoutB4FGiovanniHopeWeMeetAgainText, TEXT_ROCKETHIDEOUTB4F_GIOVANNI_HOPE_WE_MEET_AGAIN RocketHideout4TrainerHeaders: def_trainers 2 RocketHideout4TrainerHeader0: - trainer EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0, 0, RocketHideout4BattleText2, RocketHideout4EndBattleText2, RocketHideout4AfterBattleText2 + trainer EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0, 0, RocketHideoutB4FGiovanniBattleText, RocketHideoutB4FGiovanniEndBattleText, RocketHideoutB4FGiovanniAfterBattleText RocketHideout4TrainerHeader1: - trainer EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1, 0, RocketHideout4BattleText3, RocketHideout4EndBattleText3, RocketHideout4AfterBattleText3 + trainer EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1, 0, RocketHideoutB4FRocket1BattleText, RocketHideoutB4FRocket1EndBattleText, RocketHideoutB4FRocket1AfterBattleText RocketHideout4TrainerHeader2: - trainer EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2, 1, RocketHideout4BattleText4, RocketHideout4EndBattleText4, RocketHideout4AfterBattleText4 + trainer EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2, 1, RocketHideoutB4FRocket2BattleText, RocketHideoutB4FRocket2EndBattleText, RocketHideoutB4FRocket2AfterBattleText db -1 ; end -RocketHideout4Text1: +RocketHideoutB4FGiovanniText: text_asm CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_GIOVANNI - jp nz, .asm_545571 - ld hl, RocketHideout4Text_4557a + jp nz, .beat_giovanni + ld hl, .ImpressedYouGotHereText call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, RocketHideout4Text_4557f - ld de, RocketHideout4Text_4557f + ld hl, .WhatCannotBeText + ld de, .WhatCannotBeText call SaveEndBattleTextPointers ldh a, [hSpriteIndex] ld [wSpriteIndex], a @@ -112,81 +114,81 @@ RocketHideout4Text1: call InitBattleEnemyParameters xor a ldh [hJoyHeld], a - ld a, $3 + ld a, SCRIPT_ROCKETHIDEOUTB4F_BEAT_GIOVANNI ld [wRocketHideoutB4FCurScript], a ld [wCurMapScript], a jr .asm_209f0 -.asm_545571 - ld hl, RocketHideout4Text10 +.beat_giovanni + ld hl, RocketHideoutB4FGiovanniHopeWeMeetAgainText call PrintText .asm_209f0 jp TextScriptEnd -RocketHideout4Text_4557a: - text_far _RocketHideout4Text_4557a +.ImpressedYouGotHereText: + text_far _RocketHideoutB4FGiovanniImpressedYouGotHereText text_end -RocketHideout4Text_4557f: - text_far _RocketHideout4Text_4557f +.WhatCannotBeText: + text_far _RocketHideoutB4FGiovanniWhatCannotBeText text_end -RocketHideout4Text10: - text_far _RocketHideout4Text_45584 +RocketHideoutB4FGiovanniHopeWeMeetAgainText: + text_far _RocketHideoutB4FGiovanniHopeWeMeetAgainText text_end -RocketHideout4Text2: +RocketHideoutB4FRocket1Text: text_asm ld hl, RocketHideout4TrainerHeader0 call TalkToTrainer jp TextScriptEnd -RocketHideout4BattleText2: - text_far _RocketHideout4BattleText2 +RocketHideoutB4FGiovanniBattleText: + text_far _RocketHideoutB4FGiovanniBattleText text_end -RocketHideout4EndBattleText2: - text_far _RocketHideout4EndBattleText2 +RocketHideoutB4FGiovanniEndBattleText: + text_far _RocketHideoutB4FGiovanniEndBattleText text_end -RocketHideout4AfterBattleText2: - text_far _RocketHide4AfterBattleText2 +RocketHideoutB4FGiovanniAfterBattleText: + text_far _RocketHideoutB4FGiovanniAfterBattleText text_end -RocketHideout4Text3: +RocketHideoutB4FRocket2Text: text_asm ld hl, RocketHideout4TrainerHeader1 call TalkToTrainer jp TextScriptEnd -RocketHideout4BattleText3: - text_far _RocketHideout4BattleText3 +RocketHideoutB4FRocket1BattleText: + text_far _RocketHideoutB4FRocket1BattleText text_end -RocketHideout4EndBattleText3: - text_far _RocketHideout4EndBattleText3 +RocketHideoutB4FRocket1EndBattleText: + text_far _RocketHideoutB4FRocket1EndBattleText text_end -RocketHideout4AfterBattleText3: - text_far _RocketHide4AfterBattleText3 +RocketHideoutB4FRocket1AfterBattleText: + text_far _RocketHideoutB4FRocket1AfterBattleText text_end -RocketHideout4Text4: +RocketHideoutB4FRocket3Text: text_asm ld hl, RocketHideout4TrainerHeader2 call TalkToTrainer jp TextScriptEnd -RocketHideout4BattleText4: - text_far _RocketHideout4BattleText4 +RocketHideoutB4FRocket2BattleText: + text_far _RocketHideoutB4FRocket2BattleText text_end -RocketHideout4EndBattleText4: - text_far _RocketHideout4EndBattleText4 +RocketHideoutB4FRocket2EndBattleText: + text_far _RocketHideoutB4FRocket2EndBattleText text_end -RocketHideout4AfterBattleText4: +RocketHideoutB4FRocket2AfterBattleText: text_asm - ld hl, RocketHideout4Text_455ec + ld hl, .Text call PrintText CheckAndSetEvent EVENT_ROCKET_DROPPED_LIFT_KEY jr nz, .asm_455e9 @@ -196,6 +198,6 @@ RocketHideout4AfterBattleText4: .asm_455e9 jp TextScriptEnd -RocketHideout4Text_455ec: - text_far _RocketHideout4Text_455ec +.Text: + text_far _RocketHideoutB4FRocket2AfterBattleText text_end diff --git a/scripts/RocketHideoutElevator.asm b/scripts/RocketHideoutElevator.asm index 8c51294e6..9352a518f 100644 --- a/scripts/RocketHideoutElevator.asm +++ b/scripts/RocketHideoutElevator.asm @@ -3,26 +3,26 @@ RocketHideoutElevator_Script: bit 5, [hl] res 5, [hl] push hl - call nz, RocketHideoutElevatorScript_4572c + call nz, RocketHideoutElevatorGetWarpsScript pop hl bit 7, [hl] res 7, [hl] - call nz, RocketHideoutElevatorScript_4575f + call nz, RocketHideoutElevatorShakeScript xor a ld [wAutoTextBoxDrawingControl], a inc a ld [wDoNotWaitForButtonPressAfterDisplayingText], a ret -RocketHideoutElevatorScript_4572c: +RocketHideoutElevatorGetWarpsScript: ld hl, wWarpEntries ld a, [wWarpedFromWhichWarp] ld b, a ld a, [wWarpedFromWhichMap] ld c, a - call RocketHideoutElevatorScript_4573a + call .SetWarpEntries -RocketHideoutElevatorScript_4573a: +.SetWarpEntries: inc hl inc hl ld a, b @@ -31,7 +31,7 @@ RocketHideoutElevatorScript_4573a: ld [hli], a ret -RocketHideoutElevatorScript_45741: +RocketHideoutElevatorScript: ld hl, RocketHideoutElavatorFloors call LoadItemList ld hl, RocketHideoutElevatorWarpMaps @@ -55,30 +55,31 @@ RocketHideoutElevatorWarpMaps: db 2, ROCKET_HIDEOUT_B4F RocketHideoutElevatorWarpMapsEnd: -RocketHideoutElevatorScript_4575f: +RocketHideoutElevatorShakeScript: call Delay3 farcall ShakeElevator ret RocketHideoutElevator_TextPointers: - dw RocketHideoutElevatorText1 + def_text_pointers + dw_const RocketHideoutElevatorText, TEXT_ROCKETHIDEOUTELEVATOR -RocketHideoutElevatorText1: +RocketHideoutElevatorText: text_asm ld b, LIFT_KEY call IsItemInBag - jr z, .asm_45782 - call RocketHideoutElevatorScript_45741 + jr z, .no_key + call RocketHideoutElevatorScript ld hl, RocketHideoutElevatorWarpMaps predef DisplayElevatorFloorMenu - jr .asm_45788 -.asm_45782 - ld hl, RocketHideoutElevatorText_4578b + jr .text_script_end +.no_key + ld hl, .AppearsToNeedKeyText call PrintText -.asm_45788 +.text_script_end jp TextScriptEnd -RocketHideoutElevatorText_4578b: - text_far _RocketElevatorText_4578b +.AppearsToNeedKeyText: + text_far _RocketHideoutElevatorAppearsToNeedKeyText text_waitbutton text_end diff --git a/scripts/Route1.asm b/scripts/Route1.asm index bd9afea38..4b9be6e78 100644 --- a/scripts/Route1.asm +++ b/scripts/Route1.asm @@ -2,51 +2,52 @@ Route1_Script: jp EnableAutoTextBoxDrawing Route1_TextPointers: - dw Route1Text1 - dw Route1Text2 - dw Route1Text3 + def_text_pointers + dw_const Route1Youngster1Text, TEXT_ROUTE1_YOUNGSTER1 + dw_const Route1Youngster2Text, TEXT_ROUTE1_YOUNGSTER2 + dw_const Route1SignText, TEXT_ROUTE1_SIGN -Route1Text1: +Route1Youngster1Text: text_asm CheckAndSetEvent EVENT_GOT_POTION_SAMPLE jr nz, .got_item - ld hl, Route1ViridianMartSampleText + ld hl, .MartSampleText call PrintText lb bc, POTION, 1 call GiveItem jr nc, .bag_full - ld hl, Route1Text_1cae8 + ld hl, .GotPotionText jr .done .bag_full - ld hl, Route1Text_1caf3 + ld hl, .NoRoomText jr .done .got_item - ld hl, Route1Text_1caee + ld hl, .AlsoGotPokeballsText .done call PrintText jp TextScriptEnd -Route1ViridianMartSampleText: - text_far _Route1ViridianMartSampleText +.MartSampleText: + text_far _Route1Youngster1MartSampleText text_end -Route1Text_1cae8: - text_far _Route1Text_1cae8 +.GotPotionText: + text_far _Route1Youngster1GotPotionText sound_get_item_1 text_end -Route1Text_1caee: - text_far _Route1Text_1caee +.AlsoGotPokeballsText: + text_far _Route1Youngster1AlsoGotPokeballsText text_end -Route1Text_1caf3: - text_far _Route1Text_1caf3 +.NoRoomText: + text_far _Route1Youngster1NoRoomText text_end -Route1Text2: - text_far _Route1Text2 +Route1Youngster2Text: + text_far _Route1Youngster2Text text_end -Route1Text3: - text_far _Route1Text3 +Route1SignText: + text_far _Route1SignText text_end diff --git a/scripts/Route10.asm b/scripts/Route10.asm index 70a7e013b..5e015a1b4 100644 --- a/scripts/Route10.asm +++ b/scripts/Route10.asm @@ -8,151 +8,152 @@ Route10_Script: ret Route10_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_ROUTE10_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE10_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROUTE10_END_BATTLE Route10_TextPointers: - dw Route10Text1 - dw Route10Text2 - dw Route10Text3 - dw Route10Text4 - dw Route10Text5 - dw Route10Text6 - dw Route10Text7 - dw PokeCenterSignText - dw Route10Text9 - dw Route10Text10 + def_text_pointers + dw_const Route10SuperNerd1Text, TEXT_ROUTE10_SUPER_NERD1 + dw_const Route10Hiker1Text, TEXT_ROUTE10_HIKER1 + dw_const Route10SuperNerd2Text, TEXT_ROUTE10_SUPER_NERD2 + dw_const Route10CooltrainerF1Text, TEXT_ROUTE10_COOLTRAINER_F1 + dw_const Route10Hiker2Text, TEXT_ROUTE10_HIKER2 + dw_const Route10CooltrainerF2Text, TEXT_ROUTE10_COOLTRAINER_F2 + dw_const Route10RockTunnelSignText, TEXT_ROUTE10_ROCKTUNNEL_NORTH_SIGN + dw_const PokeCenterSignText, TEXT_ROUTE10_POKECENTER_SIGN + dw_const Route10RockTunnelSignText, TEXT_ROUTE10_ROCKTUNNEL_SOUTH_SIGN + dw_const Route10PowerPlantSignText, TEXT_ROUTE10_POWERPLANT_SIGN Route10TrainerHeaders: def_trainers Route10TrainerHeader0: - trainer EVENT_BEAT_ROUTE_10_TRAINER_0, 4, Route10BattleText1, Route10EndBattleText1, Route10AfterBattleText1 + trainer EVENT_BEAT_ROUTE_10_TRAINER_0, 4, Route10SuperNerd1BattleText, Route10SuperNerd1EndBattleText, Route10SuperNerd1AfterBattleText Route10TrainerHeader1: - trainer EVENT_BEAT_ROUTE_10_TRAINER_1, 3, Route10BattleText2, Route10EndBattleText2, Route10AfterBattleText2 + trainer EVENT_BEAT_ROUTE_10_TRAINER_1, 3, Route10Hiker1BattleText, Route10Hiker1EndBattleText, Route10Hiker1AfterBattleText Route10TrainerHeader2: - trainer EVENT_BEAT_ROUTE_10_TRAINER_2, 4, Route10BattleText3, Route10EndBattleText3, Route10AfterBattleText3 + trainer EVENT_BEAT_ROUTE_10_TRAINER_2, 4, Route10SuperNerd2BattleText, Route10SuperNerd2EndBattleText, Route10SuperNerd2AfterBattleText Route10TrainerHeader3: - trainer EVENT_BEAT_ROUTE_10_TRAINER_3, 3, Route10BattleText4, Route10EndBattleText4, Route10AfterBattleText4 + trainer EVENT_BEAT_ROUTE_10_TRAINER_3, 3, Route10CooltrainerF1BattleText, Route10CooltrainerF1EndBattleText, Route10CooltrainerF1AfterBattleText Route10TrainerHeader4: - trainer EVENT_BEAT_ROUTE_10_TRAINER_4, 2, Route10BattleText5, Route10EndBattleText5, Route10AfterBattleText5 + trainer EVENT_BEAT_ROUTE_10_TRAINER_4, 2, Route10Hiker2BattleText, Route10Hiker2EndBattleText, Route10Hiker2AfterBattleText Route10TrainerHeader5: - trainer EVENT_BEAT_ROUTE_10_TRAINER_5, 2, Route10BattleText6, Route10EndBattleText6, Route10AfterBattleText6 + trainer EVENT_BEAT_ROUTE_10_TRAINER_5, 2, Route10CooltrainerF2BattleText, Route10CooltrainerF2EndBattleText, Route10CooltrainerF2AfterBattleText db -1 ; end -Route10Text1: +Route10SuperNerd1Text: text_asm ld hl, Route10TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route10BattleText1: - text_far _Route10BattleText1 +Route10SuperNerd1BattleText: + text_far _Route10SuperNerd1BattleText text_end -Route10EndBattleText1: - text_far _Route10EndBattleText1 +Route10SuperNerd1EndBattleText: + text_far _Route10SuperNerd1EndBattleText text_end -Route10AfterBattleText1: - text_far _Route10AfterBattleText1 +Route10SuperNerd1AfterBattleText: + text_far _Route10SuperNerd1AfterBattleText text_end -Route10Text2: +Route10Hiker1Text: text_asm ld hl, Route10TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route10BattleText2: - text_far _Route10BattleText2 +Route10Hiker1BattleText: + text_far _Route10Hiker1BattleText text_end -Route10EndBattleText2: - text_far _Route10EndBattleText2 +Route10Hiker1EndBattleText: + text_far _Route10Hiker1EndBattleText text_end -Route10AfterBattleText2: - text_far _Route10AfterBattleText2 +Route10Hiker1AfterBattleText: + text_far _Route10Hiker1AfterBattleText text_end -Route10Text3: +Route10SuperNerd2Text: text_asm ld hl, Route10TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route10BattleText3: - text_far _Route10BattleText3 +Route10SuperNerd2BattleText: + text_far _Route10SuperNerd2BattleText text_end -Route10EndBattleText3: - text_far _Route10EndBattleText3 +Route10SuperNerd2EndBattleText: + text_far _Route10SuperNerd2EndBattleText text_end -Route10AfterBattleText3: - text_far _Route10AfterBattleText3 +Route10SuperNerd2AfterBattleText: + text_far _Route10SuperNerd2AfterBattleText text_end -Route10Text4: +Route10CooltrainerF1Text: text_asm ld hl, Route10TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route10BattleText4: - text_far _Route10BattleText4 +Route10CooltrainerF1BattleText: + text_far _Route10CooltrainerF1BattleText text_end -Route10EndBattleText4: - text_far _Route10EndBattleText4 +Route10CooltrainerF1EndBattleText: + text_far _Route10CooltrainerF1EndBattleText text_end -Route10AfterBattleText4: - text_far _Route10AfterBattleText4 +Route10CooltrainerF1AfterBattleText: + text_far _Route10CooltrainerF1AfterBattleText text_end -Route10Text5: +Route10Hiker2Text: text_asm ld hl, Route10TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route10BattleText5: - text_far _Route10BattleText5 +Route10Hiker2BattleText: + text_far _Route10Hiker2BattleText text_end -Route10EndBattleText5: - text_far _Route10EndBattleText5 +Route10Hiker2EndBattleText: + text_far _Route10Hiker2EndBattleText text_end -Route10AfterBattleText5: - text_far _Route10AfterBattleText5 +Route10Hiker2AfterBattleText: + text_far _Route10Hiker2AfterBattleText text_end -Route10Text6: +Route10CooltrainerF2Text: text_asm ld hl, Route10TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route10BattleText6: - text_far _Route10BattleText6 +Route10CooltrainerF2BattleText: + text_far _Route10CooltrainerF2BattleText text_end -Route10EndBattleText6: - text_far _Route10EndBattleText6 +Route10CooltrainerF2EndBattleText: + text_far _Route10CooltrainerF2EndBattleText text_end -Route10AfterBattleText6: - text_far _Route10AfterBattleText6 +Route10CooltrainerF2AfterBattleText: + text_far _Route10CooltrainerF2AfterBattleText text_end -Route10Text9: -Route10Text7: - text_far _Route10Text7 ; _Route10Text9 +Route10RockTunnelSignText: + text_far _Route10RockTunnelSignText text_end -Route10Text10: - text_far _Route10Text10 +Route10PowerPlantSignText: + text_far _Route10PowerPlantSignText text_end diff --git a/scripts/Route11.asm b/scripts/Route11.asm index 724d8d89b..e54a4a2de 100644 --- a/scripts/Route11.asm +++ b/scripts/Route11.asm @@ -8,227 +8,229 @@ Route11_Script: ret Route11_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_ROUTE11_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE11_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROUTE11_END_BATTLE Route11_TextPointers: - dw Route11Text1 - dw Route11Text2 - dw Route11Text3 - dw Route11Text4 - dw Route11Text5 - dw Route11Text6 - dw Route11Text7 - dw Route11Text8 - dw Route11Text9 - dw Route11Text10 - dw Route11Text11 + def_text_pointers + dw_const Route11Gambler1Text, TEXT_ROUTE11_GAMBLER1 + dw_const Route11Gambler2Text, TEXT_ROUTE11_GAMBLER2 + dw_const Route11Youngster1Text, TEXT_ROUTE11_YOUNGSTER1 + dw_const Route11SuperNerd1Text, TEXT_ROUTE11_SUPER_NERD1 + dw_const Route11Youngster2Text, TEXT_ROUTE11_YOUNGSTER2 + dw_const Route11Gambler3Text, TEXT_ROUTE11_GAMBLER3 + dw_const Route11Gambler4Text, TEXT_ROUTE11_GAMBLER4 + dw_const Route11Youngster3Text, TEXT_ROUTE11_YOUNGSTER3 + dw_const Route11SuperNerd2Text, TEXT_ROUTE11_SUPER_NERD2 + dw_const Route11Youngster4Text, TEXT_ROUTE11_YOUNGSTER4 + dw_const Route11DiglettsCaveSignText, TEXT_ROUTE11_DIGLETTSCAVE_SIGN Route11TrainerHeaders: def_trainers Route11TrainerHeader0: - trainer EVENT_BEAT_ROUTE_11_TRAINER_0, 3, Route11BattleText1, Route11EndBattleText1, Route11AfterBattleText1 + trainer EVENT_BEAT_ROUTE_11_TRAINER_0, 3, Route11Gambler1BattleText, Route11Gambler1EndBattleText, Route11Gambler1AfterBattleText Route11TrainerHeader1: - trainer EVENT_BEAT_ROUTE_11_TRAINER_1, 2, Route11BattleText2, Route11EndBattleText2, Route11AfterBattleText2 + trainer EVENT_BEAT_ROUTE_11_TRAINER_1, 2, Route11Gambler2BattleText, Route11Gambler2EndBattleText, Route11Gambler2AfterBattleText Route11TrainerHeader2: - trainer EVENT_BEAT_ROUTE_11_TRAINER_2, 3, Route11BattleText3, Route11EndBattleText3, Route11AfterBattleText3 + trainer EVENT_BEAT_ROUTE_11_TRAINER_2, 3, Route11Youngster1BattleText, Route11Youngster1EndBattleText, Route11Youngster1AfterBattleText Route11TrainerHeader3: - trainer EVENT_BEAT_ROUTE_11_TRAINER_3, 3, Route11BattleText4, Route11EndBattleText4, Route11AfterBattleText4 + trainer EVENT_BEAT_ROUTE_11_TRAINER_3, 3, Route11SuperNerd1BattleText, Route11SuperNerd1EndBattleText, Route11SuperNerd1AfterBattleText Route11TrainerHeader4: - trainer EVENT_BEAT_ROUTE_11_TRAINER_4, 4, Route11BattleText5, Route11EndBattleText5, Route11AfterBattleText5 + trainer EVENT_BEAT_ROUTE_11_TRAINER_4, 4, Route11Youngster2BattleText, Route11Youngster2EndBattleText, Route11Youngster2AfterBattleText Route11TrainerHeader5: - trainer EVENT_BEAT_ROUTE_11_TRAINER_5, 3, Route11BattleText6, Route11EndBattleText6, Route11AfterBattleText6 + trainer EVENT_BEAT_ROUTE_11_TRAINER_5, 3, Route11Gambler3BattleText, Route11Gambler3EndBattleText, Route11Gambler3AfterBattleText Route11TrainerHeader6: - trainer EVENT_BEAT_ROUTE_11_TRAINER_6, 3, Route11BattleText7, Route11EndBattleText7, Route11AfterBattleText7 + trainer EVENT_BEAT_ROUTE_11_TRAINER_6, 3, Route11Gambler4BattleText, Route11Gambler4EndBattleText, Route11Gambler4AfterBattleText Route11TrainerHeader7: - trainer EVENT_BEAT_ROUTE_11_TRAINER_7, 4, Route11BattleText8, Route11EndBattleText8, Route11AfterBattleText8 + trainer EVENT_BEAT_ROUTE_11_TRAINER_7, 4, Route11Youngster3BattleText, Route11Youngster3EndBattleText, Route11Youngster3AfterBattleText Route11TrainerHeader8: - trainer EVENT_BEAT_ROUTE_11_TRAINER_8, 3, Route11BattleText9, Route11EndBattleText9, Route11AfterBattleText9 + trainer EVENT_BEAT_ROUTE_11_TRAINER_8, 3, Route11SuperNerd2BattleText, Route11SuperNerd2EndBattleText, Route11SuperNerd2AfterBattleText Route11TrainerHeader9: - trainer EVENT_BEAT_ROUTE_11_TRAINER_9, 4, Route11BattleText10, Route11EndBattleText10, Route11AfterBattleText10 + trainer EVENT_BEAT_ROUTE_11_TRAINER_9, 4, Route11Youngster4BattleText, Route11Youngster4EndBattleText, Route11Youngster4AfterBattleText db -1 ; end -Route11Text1: +Route11Gambler1Text: text_asm ld hl, Route11TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route11BattleText1: - text_far _Route11BattleText1 +Route11Gambler1BattleText: + text_far _Route11Gambler1BattleText text_end -Route11EndBattleText1: - text_far _Route11EndBattleText1 +Route11Gambler1EndBattleText: + text_far _Route11Gambler1EndBattleText text_end -Route11AfterBattleText1: - text_far _Route11AfterBattleText1 +Route11Gambler1AfterBattleText: + text_far _Route11Gambler1AfterBattleText text_end -Route11Text2: +Route11Gambler2Text: text_asm ld hl, Route11TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route11BattleText2: - text_far _Route11BattleText2 +Route11Gambler2BattleText: + text_far _Route11Gambler2BattleText text_end -Route11EndBattleText2: - text_far _Route11EndBattleText2 +Route11Gambler2EndBattleText: + text_far _Route11Gambler2EndBattleText text_end -Route11AfterBattleText2: - text_far _Route11AfterBattleText2 +Route11Gambler2AfterBattleText: + text_far _Route11Gambler2AfterBattleText text_end -Route11Text3: +Route11Youngster1Text: text_asm ld hl, Route11TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route11BattleText3: - text_far _Route11BattleText3 +Route11Youngster1BattleText: + text_far _Route11Youngster1BattleText text_end -Route11EndBattleText3: - text_far _Route11EndBattleText3 +Route11Youngster1EndBattleText: + text_far _Route11Youngster1EndBattleText text_end -Route11AfterBattleText3: - text_far _Route11AfterBattleText3 +Route11Youngster1AfterBattleText: + text_far _Route11Youngster1AfterBattleText text_end -Route11Text4: +Route11SuperNerd1Text: text_asm ld hl, Route11TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route11BattleText4: - text_far _Route11BattleText4 +Route11SuperNerd1BattleText: + text_far _Route11SuperNerd1BattleText text_end -Route11EndBattleText4: - text_far _Route11EndBattleText4 +Route11SuperNerd1EndBattleText: + text_far _Route11SuperNerd1EndBattleText text_end -Route11AfterBattleText4: - text_far _Route11AfterBattleText4 +Route11SuperNerd1AfterBattleText: + text_far _Route11SuperNerd1AfterBattleText text_end -Route11Text5: +Route11Youngster2Text: text_asm ld hl, Route11TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route11BattleText5: - text_far _Route11BattleText5 +Route11Youngster2BattleText: + text_far _Route11Youngster2BattleText text_end -Route11EndBattleText5: - text_far _Route11EndBattleText5 +Route11Youngster2EndBattleText: + text_far _Route11Youngster2EndBattleText text_end -Route11AfterBattleText5: - text_far _Route11AfterBattleText5 +Route11Youngster2AfterBattleText: + text_far _Route11Youngster2AfterBattleText5 text_end -Route11Text6: +Route11Gambler3Text: text_asm ld hl, Route11TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route11BattleText6: - text_far _Route11BattleText6 +Route11Gambler3BattleText: + text_far _Route11Gambler3BattleText text_end -Route11EndBattleText6: - text_far _Route11EndBattleText6 +Route11Gambler3EndBattleText: + text_far _Route11Gambler3EndBattleText text_end -Route11AfterBattleText6: - text_far _Route11AfterBattleText6 +Route11Gambler3AfterBattleText: + text_far _Route11Gambler3AfterBattleText text_end -Route11Text7: +Route11Gambler4Text: text_asm ld hl, Route11TrainerHeader6 call TalkToTrainer jp TextScriptEnd -Route11BattleText7: - text_far _Route11BattleText7 +Route11Gambler4BattleText: + text_far _Route11Gambler4BattleText text_end -Route11EndBattleText7: - text_far _Route11EndBattleText7 +Route11Gambler4EndBattleText: + text_far _Route11Gambler4EndBattleText text_end -Route11AfterBattleText7: - text_far _Route11AfterBattleText7 +Route11Gambler4AfterBattleText: + text_far _Route11Gambler4AfterBattleText text_end -Route11Text8: +Route11Youngster3Text: text_asm ld hl, Route11TrainerHeader7 call TalkToTrainer jp TextScriptEnd -Route11BattleText8: - text_far _Route11BattleText8 +Route11Youngster3BattleText: + text_far _Route11Youngster3BattleText text_end -Route11EndBattleText8: - text_far _Route11EndBattleText8 +Route11Youngster3EndBattleText: + text_far _Route11Youngster3EndBattleText text_end -Route11AfterBattleText8: - text_far _Route11AfterBattleText8 +Route11Youngster3AfterBattleText: + text_far _Route11Youngster3AfterBattleText text_end -Route11Text9: +Route11SuperNerd2Text: text_asm ld hl, Route11TrainerHeader8 call TalkToTrainer jp TextScriptEnd -Route11BattleText9: - text_far _Route11BattleText9 +Route11SuperNerd2BattleText: + text_far _Route11SuperNerd2BattleText text_end -Route11EndBattleText9: - text_far _Route11EndBattleText9 +Route11SuperNerd2EndBattleText: + text_far _Route11SuperNerd2EndBattleText text_end -Route11AfterBattleText9: - text_far _Route11AfterBattleText9 +Route11SuperNerd2AfterBattleText: + text_far _Route11SuperNerd2AfterBattleText text_end -Route11Text10: +Route11Youngster4Text: text_asm ld hl, Route11TrainerHeader9 call TalkToTrainer jp TextScriptEnd -Route11BattleText10: - text_far _Route11BattleText10 +Route11Youngster4BattleText: + text_far _Route11Youngster4BattleText text_end -Route11EndBattleText10: - text_far _Route11EndBattleText10 +Route11Youngster4EndBattleText: + text_far _Route11Youngster4EndBattleText text_end -Route11AfterBattleText10: - text_far _Route11AfterBattleText10 +Route11Youngster4AfterBattleText: + text_far _Route11Youngster4AfterBattleText text_end -Route11Text11: - text_far _Route11Text11 +Route11DiglettsCaveSignText: + text_far _Route11DiglettsCaveSignText text_end diff --git a/scripts/Route11Gate1F.asm b/scripts/Route11Gate1F.asm index d1ebe6ea2..7ab0bc86d 100644 --- a/scripts/Route11Gate1F.asm +++ b/scripts/Route11Gate1F.asm @@ -2,8 +2,9 @@ Route11Gate1F_Script: jp EnableAutoTextBoxDrawing Route11Gate1F_TextPointers: - dw Route11GateText1 + def_text_pointers + dw_const Route11Gate1FGuardText, TEXT_ROUTE11GATE1F_GUARD -Route11GateText1: - text_far _Route11GateText1 +Route11Gate1FGuardText: + text_far _Route11Gate1FGuardText text_end diff --git a/scripts/Route11Gate2F.asm b/scripts/Route11Gate2F.asm index 47c8db220..9c223c871 100644 --- a/scripts/Route11Gate2F.asm +++ b/scripts/Route11Gate2F.asm @@ -2,20 +2,21 @@ Route11Gate2F_Script: jp DisableAutoTextBoxDrawing Route11Gate2F_TextPointers: - dw Route11GateUpstairsText1 - dw Route11GateUpstairsText2 - dw Route11GateUpstairsText3 - dw Route11GateUpstairsText4 + def_text_pointers + dw_const Route11Gate2FYoungsterText, TEXT_ROUTE11GATE2F_YOUNGSTER + dw_const Route11Gate2FOaksAideText, TEXT_ROUTE11GATE2F_OAKS_AIDE + dw_const Route11Gate2FLeftBinocularsText, TEXT_ROUTE11GATE2F_LEFT_BINOCULARS + dw_const Route11Gate2FRightBinocularsText, TEXT_ROUTE11GATE2F_RIGHT_BINOCULARS -Route11GateUpstairsText1: +Route11Gate2FYoungsterText: text_asm xor a ; TRADE_FOR_TERRY ld [wWhichTrade], a predef DoInGameTradeDialogue -Route11GateUpstairsScriptEnd: +Route11Gate2FScriptEnd: jp TextScriptEnd -Route11GateUpstairsText2: +Route11Gate2FOaksAideText: text_asm CheckEvent EVENT_GOT_ITEMFINDER, 1 jr c, .got_item @@ -36,41 +37,41 @@ Route11GateUpstairsText2: jr nz, .no_item SetEvent EVENT_GOT_ITEMFINDER .got_item - ld hl, Route11GateUpstairsText_494a3 + ld hl, .ItemfinderDescriptionText call PrintText .no_item - jr Route11GateUpstairsScriptEnd + jr Route11Gate2FScriptEnd -Route11GateUpstairsText_494a3: - text_far _Route11GateUpstairsText_494a3 +.ItemfinderDescriptionText: + text_far _Route11Gate2FOaksAideItemfinderDescriptionText text_end -Route11GateUpstairsText3: +Route11Gate2FLeftBinocularsText: text_asm ld a, [wSpritePlayerStateData1FacingDirection] cp SPRITE_FACING_UP jp nz, GateUpstairsScript_PrintIfFacingUp CheckEvent EVENT_BEAT_ROUTE12_SNORLAX - ld hl, BinocularsSnorlaxText + ld hl, .SnorlaxText jr z, .print - ld hl, BinocularsNoSnorlaxText + ld hl, .NoSnorlaxText .print call PrintText jp TextScriptEnd -BinocularsSnorlaxText: - text_far _BinocularsSnorlaxText +.SnorlaxText: + text_far _Route11Gate2FLeftBinocularsSnorlaxText text_end -BinocularsNoSnorlaxText: - text_far _BinocularsNoSnorlaxText +.NoSnorlaxText: + text_far _Route11Gate2FLeftBinocularsNoSnorlaxText text_end -Route11GateUpstairsText4: +Route11Gate2FRightBinocularsText: text_asm - ld hl, Route11GateUpstairsText_494d5 + ld hl, .Text jp GateUpstairsScript_PrintIfFacingUp -Route11GateUpstairsText_494d5: - text_far _Route11GateUpstairsText_494d5 +.Text: + text_far _Route11Gate2FRightBinocularsText text_end diff --git a/scripts/Route12.asm b/scripts/Route12.asm index d46a95bbd..ea7b66ca7 100644 --- a/scripts/Route12.asm +++ b/scripts/Route12.asm @@ -7,7 +7,7 @@ Route12_Script: ld [wRoute12CurScript], a ret -Route12Script_59606: +Route12ResetScripts: xor a ld [wJoyIgnore], a ld [wRoute12CurScript], a @@ -15,18 +15,19 @@ Route12Script_59606: ret Route12_ScriptPointers: - dw Route12Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw Route12Script3 + def_script_pointers + dw_const Route12DefaultScript, SCRIPT_ROUTE12_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE12_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROUTE12_END_BATTLE + dw_const Route12SnorlaxPostBattleScript, SCRIPT_ROUTE12_SNORLAX_POST_BATTLE -Route12Script0: +Route12DefaultScript: CheckEventHL EVENT_BEAT_ROUTE12_SNORLAX jp nz, CheckFightingMapTrainers CheckEventReuseHL EVENT_FIGHT_ROUTE12_SNORLAX ResetEventReuseHL EVENT_FIGHT_ROUTE12_SNORLAX jp z, CheckFightingMapTrainers - ld a, $d + ld a, TEXT_ROUTE12_SNORLAX_WOKE_UP ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, SNORLAX @@ -36,206 +37,207 @@ Route12Script0: ld a, HS_ROUTE_12_SNORLAX ld [wMissableObjectIndex], a predef HideObject - ld a, $3 + ld a, SCRIPT_ROUTE12_SNORLAX_POST_BATTLE ld [wRoute12CurScript], a ld [wCurMapScript], a ret -Route12Script3: +Route12SnorlaxPostBattleScript: ld a, [wIsInBattle] cp $ff - jr z, Route12Script_59606 + jr z, Route12ResetScripts call UpdateSprites ld a, [wBattleResult] cp $2 - jr z, .asm_59664 - ld a, $e + jr z, .caught_snorlax + ld a, TEXT_ROUTE12_SNORLAX_CALMED_DOWN ldh [hSpriteIndexOrTextID], a call DisplayTextID -.asm_59664 +.caught_snorlax SetEvent EVENT_BEAT_ROUTE12_SNORLAX call Delay3 - ld a, $0 + ld a, SCRIPT_ROUTE12_DEFAULT ld [wRoute12CurScript], a ld [wCurMapScript], a ret Route12_TextPointers: - dw Route12Text1 - dw Route12Text2 - dw Route12Text3 - dw Route12Text4 - dw Route12Text5 - dw Route12Text6 - dw Route12Text7 - dw Route12Text8 - dw PickUpItemText - dw PickUpItemText - dw Route12Text11 - dw Route12Text12 - dw Route12Text13 - dw Route12Text14 + def_text_pointers + dw_const Route12SnorlaxText, TEXT_ROUTE12_SNORLAX + dw_const Route12Fisher1Text, TEXT_ROUTE12_FISHER1 + dw_const Route12Fisher2Text, TEXT_ROUTE12_FISHER2 + dw_const Route12CooltrainerMText, TEXT_ROUTE12_COOLTRAINER_M + dw_const Route12SuperNerdText, TEXT_ROUTE12_SUPER_NERD + dw_const Route12Fisher3Text, TEXT_ROUTE12_FISHER3 + dw_const Route12Fisher4Text, TEXT_ROUTE12_FISHER4 + dw_const Route12Fisher5Text, TEXT_ROUTE12_FISHER5 + dw_const PickUpItemText, TEXT_ROUTE12_TM_PAY_DAY + dw_const PickUpItemText, TEXT_ROUTE12_IRON + dw_const Route12SignText, TEXT_ROUTE12_SIGN + dw_const Route12SportFishingSignText, TEXT_ROUTE12_SPORT_FISHING_SIGN + dw_const Route12SnorlaxWokeUpText, TEXT_ROUTE12_SNORLAX_WOKE_UP + dw_const Route12SnorlaxCalmedDownText, TEXT_ROUTE12_SNORLAX_CALMED_DOWN Route12TrainerHeaders: def_trainers 2 Route12TrainerHeader0: - trainer EVENT_BEAT_ROUTE_12_TRAINER_0, 4, Route12BattleText1, Route12EndBattleText1, Route12AfterBattleText1 + trainer EVENT_BEAT_ROUTE_12_TRAINER_0, 4, Route12Fisher1BattleText, Route12Fisher1EndBattleText, Route12Fisher1AfterBattleText Route12TrainerHeader1: - trainer EVENT_BEAT_ROUTE_12_TRAINER_1, 4, Route12BattleText2, Route12EndBattleText2, Route12AfterBattleText2 + trainer EVENT_BEAT_ROUTE_12_TRAINER_1, 4, Route12Fisher2BattleText, Route12Fisher2EndBattleText, Route12Fisher2AfterBattleText Route12TrainerHeader2: - trainer EVENT_BEAT_ROUTE_12_TRAINER_2, 4, Route12BattleText3, Route12EndBattleText3, Route12AfterBattleText3 + trainer EVENT_BEAT_ROUTE_12_TRAINER_2, 4, Route12CooltrainerMBattleText, Route12CooltrainerMEndBattleText, Route12CooltrainerMAfterBattleText Route12TrainerHeader3: - trainer EVENT_BEAT_ROUTE_12_TRAINER_3, 4, Route12BattleText4, Route12EndBattleText4, Route12AfterBattleText4 + trainer EVENT_BEAT_ROUTE_12_TRAINER_3, 4, Route12SuperNerdBattleText, Route12SuperNerdEndBattleText, Route12SuperNerdAfterBattleText Route12TrainerHeader4: - trainer EVENT_BEAT_ROUTE_12_TRAINER_4, 4, Route12BattleText5, Route12EndBattleText5, Route12AfterBattleText5 + trainer EVENT_BEAT_ROUTE_12_TRAINER_4, 4, Route12Fisher3BattleText, Route12Fisher3EndBattleText, Route12Fisher3AfterBattleText Route12TrainerHeader5: - trainer EVENT_BEAT_ROUTE_12_TRAINER_5, 4, Route12BattleText6, Route12EndBattleText6, Route12AfterBattleText6 + trainer EVENT_BEAT_ROUTE_12_TRAINER_5, 4, Route12Fisher4BattleText, Route12Fisher4EndBattleText, Route12Fisher4AfterBattleText Route12TrainerHeader6: - trainer EVENT_BEAT_ROUTE_12_TRAINER_6, 1, Route12BattleText7, Route12EndBattleText7, Route12AfterBattleText7 + trainer EVENT_BEAT_ROUTE_12_TRAINER_6, 1, Route12Fisher5BattleText, Route12Fisher5EndBattleText, Route12Fisher5AfterBattleText db -1 ; end -Route12Text1: - text_far _Route12Text1 +Route12SnorlaxText: + text_far _Route12SnorlaxText text_end -Route12Text13: - text_far _Route12Text13 +Route12SnorlaxWokeUpText: + text_far _Route12SnorlaxWokeUpText text_end -Route12Text14: - text_far _Route12Text14 +Route12SnorlaxCalmedDownText: + text_far _Route12SnorlaxCalmedDownText text_end -Route12Text2: +Route12Fisher1Text: text_asm ld hl, Route12TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route12BattleText1: - text_far _Route12BattleText1 +Route12Fisher1BattleText: + text_far _Route12Fisher1BattleText text_end -Route12EndBattleText1: - text_far _Route12EndBattleText1 +Route12Fisher1EndBattleText: + text_far _Route12Fisher1EndBattleText text_end -Route12AfterBattleText1: - text_far _Route12AfterBattleText1 +Route12Fisher1AfterBattleText: + text_far _Route12Fisher1AfterBattleText text_end -Route12Text3: +Route12Fisher2Text: text_asm ld hl, Route12TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route12BattleText2: - text_far _Route12BattleText2 +Route12Fisher2BattleText: + text_far _Route12Fisher2BattleText text_end -Route12EndBattleText2: - text_far _Route12EndBattleText2 +Route12Fisher2EndBattleText: + text_far _Route12Fisher2EndBattleText text_end -Route12AfterBattleText2: - text_far _Route12AfterBattleText2 +Route12Fisher2AfterBattleText: + text_far _Route12Fisher2AfterBattleText text_end -Route12Text4: +Route12CooltrainerMText: text_asm ld hl, Route12TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route12BattleText3: - text_far _Route12BattleText3 +Route12CooltrainerMBattleText: + text_far _Route12CooltrainerMBattleText text_end -Route12EndBattleText3: - text_far _Route12EndBattleText3 +Route12CooltrainerMEndBattleText: + text_far _Route12CooltrainerMEndBattleText text_end -Route12AfterBattleText3: - text_far _Route12AfterBattleText3 +Route12CooltrainerMAfterBattleText: + text_far _Route12CooltrainerMAfterBattleText text_end -Route12Text5: +Route12SuperNerdText: text_asm ld hl, Route12TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route12BattleText4: - text_far _Route12BattleText4 +Route12SuperNerdBattleText: + text_far _Route12SuperNerdBattleText text_end -Route12EndBattleText4: - text_far _Route12EndBattleText4 +Route12SuperNerdEndBattleText: + text_far _Route12SuperNerdEndBattleText text_end -Route12AfterBattleText4: - text_far _Route12AfterBattleText4 +Route12SuperNerdAfterBattleText: + text_far _Route12SuperNerdAfterBattleText text_end -Route12Text6: +Route12Fisher3Text: text_asm ld hl, Route12TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route12BattleText5: - text_far _Route12BattleText5 +Route12Fisher3BattleText: + text_far _Route12Fisher3BattleText text_end -Route12EndBattleText5: - text_far _Route12EndBattleText5 +Route12Fisher3EndBattleText: + text_far _Route12Fisher3EndBattleText text_end -Route12AfterBattleText5: - text_far _Route12AfterBattleText5 +Route12Fisher3AfterBattleText: + text_far _Route12Fisher3AfterBattleText text_end -Route12Text7: +Route12Fisher4Text: text_asm ld hl, Route12TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route12BattleText6: - text_far _Route12BattleText6 +Route12Fisher4BattleText: + text_far _Route12Fisher4BattleText text_end -Route12EndBattleText6: - text_far _Route12EndBattleText6 +Route12Fisher4EndBattleText: + text_far _Route12Fisher4EndBattleText text_end -Route12AfterBattleText6: - text_far _Route12AfterBattleText6 +Route12Fisher4AfterBattleText: + text_far _Route12Fisher4AfterBattleText text_end -Route12Text8: +Route12Fisher5Text: text_asm ld hl, Route12TrainerHeader6 call TalkToTrainer jp TextScriptEnd -Route12BattleText7: - text_far _Route12BattleText7 +Route12Fisher5BattleText: + text_far _Route12Fisher5BattleText text_end -Route12EndBattleText7: - text_far _Route12EndBattleText7 +Route12Fisher5EndBattleText: + text_far _Route12Fisher5EndBattleText text_end -Route12AfterBattleText7: - text_far _Route12AfterBattleText7 +Route12Fisher5AfterBattleText: + text_far _Route12Fisher5AfterBattleText text_end -Route12Text11: - text_far _Route12Text11 +Route12SignText: + text_far _Route12SignText text_end -Route12Text12: - text_far _Route12Text12 +Route12SportFishingSignText: + text_far _Route12SportFishingSignText text_end diff --git a/scripts/Route12Gate1F.asm b/scripts/Route12Gate1F.asm index 72f2dfbfa..91288a1f8 100644 --- a/scripts/Route12Gate1F.asm +++ b/scripts/Route12Gate1F.asm @@ -2,8 +2,9 @@ Route12Gate1F_Script: jp EnableAutoTextBoxDrawing Route12Gate1F_TextPointers: - dw Route12GateText1 + def_text_pointers + dw_const Route12Gate1FGuardText, TEXT_ROUTE12GATE1F_GUARD -Route12GateText1: - text_far _Route12GateText1 +Route12Gate1FGuardText: + text_far _Route12Gate1FGuardText text_end diff --git a/scripts/Route12Gate2F.asm b/scripts/Route12Gate2F.asm index 2174fba8b..c1c68221b 100644 --- a/scripts/Route12Gate2F.asm +++ b/scripts/Route12Gate2F.asm @@ -2,66 +2,67 @@ Route12Gate2F_Script: jp DisableAutoTextBoxDrawing Route12Gate2F_TextPointers: - dw Route12GateUpstairsText1 - dw Route12GateUpstairsText2 - dw Route12GateUpstairsText3 + def_text_pointers + dw_const Route12Gate2FBrunetteGirlText, TEXT_ROUTE12GATE2F_BRUNETTE_GIRL + dw_const Route12Gate2FLeftBinocularsText, TEXT_ROUTE12GATE2F_LEFT_BINOCULARS + dw_const Route12Gate2FRightBinocularsText, TEXT_ROUTE12GATE2F_RIGHT_BINOCULARS -Route12GateUpstairsText1: +Route12Gate2FBrunetteGirlText: text_asm CheckEvent EVENT_GOT_TM39, 1 jr c, .got_item - ld hl, TM39PreReceiveText + ld hl, .YouCanHaveThisText call PrintText lb bc, TM_SWIFT, 1 call GiveItem jr nc, .bag_full - ld hl, ReceivedTM39Text + ld hl, .ReceivedTM39Text call PrintText SetEvent EVENT_GOT_TM39 jr .done .bag_full - ld hl, TM39NoRoomText + ld hl, .TM39NoRoomText call PrintText jr .done .got_item - ld hl, TM39ExplanationText + ld hl, .TM39ExplanationText call PrintText .done jp TextScriptEnd -TM39PreReceiveText: - text_far _TM39PreReceiveText +.YouCanHaveThisText: + text_far _Route12Gate2FBrunetteGirlYouCanHaveThisText text_end -ReceivedTM39Text: - text_far _ReceivedTM39Text +.ReceivedTM39Text: + text_far _Route12Gate2FBrunetteGirlReceivedTM39Text sound_get_item_1 text_end -TM39ExplanationText: - text_far _TM39ExplanationText +.TM39ExplanationText: + text_far _Route12Gate2FBrunetteGirlTM39ExplanationText text_end -TM39NoRoomText: - text_far _TM39NoRoomText +.TM39NoRoomText: + text_far _Route12Gate2FBrunetteGirlTM39NoRoomText text_end -Route12GateUpstairsText2: +Route12Gate2FLeftBinocularsText: text_asm - ld hl, Route12GateUpstairsText_495b8 + ld hl, .Text jp GateUpstairsScript_PrintIfFacingUp -Route12GateUpstairsText_495b8: - text_far _Route12GateUpstairsText_495b8 +.Text: + text_far _Route12Gate2FLeftBinocularsText text_end -Route12GateUpstairsText3: +Route12Gate2FRightBinocularsText: text_asm - ld hl, Route12GateUpstairsText_495c4 + ld hl, .Text jp GateUpstairsScript_PrintIfFacingUp -Route12GateUpstairsText_495c4: - text_far _Route12GateUpstairsText_495c4 +.Text: + text_far _Route12Gate2FRightBinocularsText text_end GateUpstairsScript_PrintIfFacingUp: diff --git a/scripts/Route12SuperRodHouse.asm b/scripts/Route12SuperRodHouse.asm index fba5426e9..551949d07 100644 --- a/scripts/Route12SuperRodHouse.asm +++ b/scripts/Route12SuperRodHouse.asm @@ -2,14 +2,15 @@ Route12SuperRodHouse_Script: jp EnableAutoTextBoxDrawing Route12SuperRodHouse_TextPointers: - dw Route12HouseText1 + def_text_pointers + dw_const Route12SuperRodHouseFishingGuruText, TEXT_ROUTE12SUPERRODHOUSE_FISHING_GURU -Route12HouseText1: +Route12SuperRodHouseFishingGuruText: text_asm ld a, [wd728] bit 5, a ; received super rod? jr nz, .got_item - ld hl, Route12HouseText_564c0 + ld hl, .DoYouLikeToFishText call PrintText call YesNoChoice ld a, [wCurrentMenuItem] @@ -20,38 +21,38 @@ Route12HouseText1: jr nc, .bag_full ld hl, wd728 set 5, [hl] ; received super rod - ld hl, Route12HouseText_564c5 + ld hl, .ReceivedSuperRodText jr .done .bag_full - ld hl, Route12HouseText_564d9 + ld hl, .NoRoomText jr .done .refused - ld hl, Route12HouseText_564cf + ld hl, .ThatsDisappointingText jr .done .got_item - ld hl, Route12HouseText_564d4 + ld hl, .TryFishingText .done call PrintText jp TextScriptEnd -Route12HouseText_564c0: - text_far _Route12HouseText_564c0 +.DoYouLikeToFishText: + text_far _Route12SuperRodHouseFishingGuruDoYouLikeToFishText text_end -Route12HouseText_564c5: - text_far _Route12HouseText_564c5 +.ReceivedSuperRodText: + text_far _Route12SuperRodHouseFishingGuruReceivedSuperRodText sound_get_item_1 - text_far _Route12HouseText_564ca + text_far _Route12SuperRodHouseFishingGuruFishingWayOfLifeText text_end -Route12HouseText_564cf: - text_far _Route12HouseText_564cf +.ThatsDisappointingText: + text_far _Route12SuperRodHouseFishingGuruThatsDisappointingText text_end -Route12HouseText_564d4: - text_far _Route12HouseText_564d4 +.TryFishingText: + text_far _Route12SuperRodHouseFishingGuruTryFishingText text_end -Route12HouseText_564d9: - text_far _Route12HouseText_564d9 +.NoRoomText: + text_far _Route12SuperRodHouseFishingGuruNoRoomText text_end diff --git a/scripts/Route13.asm b/scripts/Route13.asm index d7f55f28b..3ee6537a2 100644 --- a/scripts/Route13.asm +++ b/scripts/Route13.asm @@ -8,237 +8,239 @@ Route13_Script: ret Route13_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_ROUTE13_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE13_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROUTE13_END_BATTLE Route13_TextPointers: - dw Route13Text1 - dw Route13Text2 - dw Route13Text3 - dw Route13Text4 - dw Route13Text5 - dw Route13Text6 - dw Route13Text7 - dw Route13Text8 - dw Route13Text9 - dw Route13Text10 - dw Route13Text11 - dw Route13Text12 - dw Route13Text13 + def_text_pointers + dw_const Route13CooltrainerM1Text, TEXT_ROUTE13_COOLTRAINER_M1 + dw_const Route13CooltrainerF1Text, TEXT_ROUTE13_COOLTRAINER_F1 + dw_const Route13CooltrainerF2Text, TEXT_ROUTE13_COOLTRAINER_F2 + dw_const Route13CooltrainerF3Text, TEXT_ROUTE13_COOLTRAINER_F3 + dw_const Route13CooltrainerF4Text, TEXT_ROUTE13_COOLTRAINER_F4 + dw_const Route13CooltrainerM2Text, TEXT_ROUTE13_COOLTRAINER_M2 + dw_const Route13Beauty1Text, TEXT_ROUTE13_BEAUTY1 + dw_const Route13Beauty2Text, TEXT_ROUTE13_BEAUTY2 + dw_const Route13BikerText, TEXT_ROUTE13_BIKER + dw_const Route13CooltrainerM3Text, TEXT_ROUTE13_COOLTRAINER_M3 + dw_const Route13TrainerTips1Text, TEXT_ROUTE13_TRAINER_TIPS1 + dw_const Route13TrainerTips2Text, TEXT_ROUTE13_TRAINER_TIPS2 + dw_const Route13SignText, TEXT_ROUTE13_SIGN Route13TrainerHeaders: def_trainers Route13TrainerHeader0: - trainer EVENT_BEAT_ROUTE_13_TRAINER_0, 2, Route13BattleText2, Route13EndBattleText2, Route13AfterBattleText2 + trainer EVENT_BEAT_ROUTE_13_TRAINER_0, 2, Route13CooltrainerM1BattleText, Route13CooltrainerM1EndBattleText, Route13CooltrainerM1AfterBattleText Route13TrainerHeader1: - trainer EVENT_BEAT_ROUTE_13_TRAINER_1, 2, Route13BattleText3, Route13EndBattleText3, Route13AfterBattleText3 + trainer EVENT_BEAT_ROUTE_13_TRAINER_1, 2, Route13CooltrainerF1BattleText, Route13CooltrainerF1EndBattleText, Route13CooltrainerF1AfterBattleText Route13TrainerHeader2: - trainer EVENT_BEAT_ROUTE_13_TRAINER_2, 2, Route13BattleText4, Route13EndBattleText4, Route13AfterBattleText4 + trainer EVENT_BEAT_ROUTE_13_TRAINER_2, 2, Route13CooltrainerF2BattleText, Route13CooltrainerF2EndBattleText, Route13CooltrainerF2AfterBattleText Route13TrainerHeader3: - trainer EVENT_BEAT_ROUTE_13_TRAINER_3, 2, Route13BattleText5, Route13EndBattleText5, Route13AfterBattleText5 + trainer EVENT_BEAT_ROUTE_13_TRAINER_3, 2, Route13CooltrainerF3BattleText, Route13CooltrainerF3EndBattleText, Route13CooltrainerF3AfterBattleText Route13TrainerHeader4: - trainer EVENT_BEAT_ROUTE_13_TRAINER_4, 4, Route13BattleText6, Route13EndBattleText6, Route13AfterBattleText6 + trainer EVENT_BEAT_ROUTE_13_TRAINER_4, 4, Route13CooltrainerF4BattleText, Route13CooltrainerF4EndBattleText, Route13CooltrainerF4AfterBattleText Route13TrainerHeader5: - trainer EVENT_BEAT_ROUTE_13_TRAINER_5, 2, Route13BattleText7, Route13EndBattleText7, Route13AfterBattleText7 + trainer EVENT_BEAT_ROUTE_13_TRAINER_5, 2, Route13CooltrainerM2BattleText, Route13CooltrainerM2EndBattleText, Route13CooltrainerM2AfterBattleText Route13TrainerHeader6: - trainer EVENT_BEAT_ROUTE_13_TRAINER_6, 4, Route13BattleText8, Route13EndBattleText8, Route13AfterBattleText8 + trainer EVENT_BEAT_ROUTE_13_TRAINER_6, 4, Route13Beauty1BattleText, Route13Beauty1EndBattleText, Route13Beauty1AfterBattleText Route13TrainerHeader7: - trainer EVENT_BEAT_ROUTE_13_TRAINER_7, 2, Route13BattleText9, Route13EndBattleText9, Route13AfterBattleText9 + trainer EVENT_BEAT_ROUTE_13_TRAINER_7, 2, Route13Beauty2BattleText, Route13Beauty2EndBattleText, Route13Beauty2AfterBattleText Route13TrainerHeader8: - trainer EVENT_BEAT_ROUTE_13_TRAINER_8, 2, Route13BattleText10, Route13EndBattleText10, Route13AfterBattleText10 + trainer EVENT_BEAT_ROUTE_13_TRAINER_8, 2, Route13BikerBattleText, Route13BikerEndBattleText, Route13BikerAfterBattleText Route13TrainerHeader9: - trainer EVENT_BEAT_ROUTE_13_TRAINER_9, 4, Route13BattleText11, Route13EndBattleText11, Route13AfterBattleText11 + trainer EVENT_BEAT_ROUTE_13_TRAINER_9, 4, Route13CooltrainerM3BattleText, Route13CooltrainerM3EndBattleText, Route13CooltrainerM3AfterBattleText db -1 ; end -Route13Text1: +Route13CooltrainerM1Text: text_asm ld hl, Route13TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route13BattleText2: - text_far _Route13BattleText2 +Route13CooltrainerM1BattleText: + text_far _Route13CooltrainerM1BattleText text_end -Route13EndBattleText2: - text_far _Route13EndBattleText2 +Route13CooltrainerM1EndBattleText: + text_far _Route13CooltrainerM1EndBattleText text_end -Route13AfterBattleText2: - text_far _Route13AfterBattleText2 +Route13CooltrainerM1AfterBattleText: + text_far _Route13CooltrainerM1AfterBattleText text_end -Route13Text2: +Route13CooltrainerF1Text: text_asm ld hl, Route13TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route13BattleText3: - text_far _Route13BattleText3 +Route13CooltrainerF1BattleText: + text_far _Route13CooltrainerF1BattleText text_end -Route13EndBattleText3: - text_far _Route13EndBattleText3 +Route13CooltrainerF1EndBattleText: + text_far _Route13CooltrainerF1EndBattleText text_end -Route13AfterBattleText3: - text_far _Route13AfterBattleText3 +Route13CooltrainerF1AfterBattleText: + text_far _Route13CooltrainerF1AfterBattleText text_end -Route13Text3: +Route13CooltrainerF2Text: text_asm ld hl, Route13TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route13BattleText4: - text_far _Route13BattleText4 +Route13CooltrainerF2BattleText: + text_far _Route13CooltrainerF2BattleText text_end -Route13EndBattleText4: - text_far _Route13EndBattleText4 +Route13CooltrainerF2EndBattleText: + text_far _Route13CooltrainerF2EndBattleText text_end -Route13AfterBattleText4: - text_far _Route13AfterBattleText4 +Route13CooltrainerF2AfterBattleText: + text_far _Route13CooltrainerF2AfterBattleText text_end -Route13Text4: +Route13CooltrainerF3Text: text_asm ld hl, Route13TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route13BattleText5: - text_far _Route13BattleText5 +Route13CooltrainerF3BattleText: + text_far _Route13CooltrainerF3BattleText text_end -Route13EndBattleText5: - text_far _Route13EndBattleText5 +Route13CooltrainerF3EndBattleText: + text_far _Route13CooltrainerF3EndBattleText text_end -Route13AfterBattleText5: - text_far _Route13AfterBattleText5 +Route13CooltrainerF3AfterBattleText: + text_far _Route13CooltrainerF3AfterBattleText text_end -Route13Text5: +Route13CooltrainerF4Text: text_asm ld hl, Route13TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route13BattleText6: - text_far _Route13BattleText6 +Route13CooltrainerF4BattleText: + text_far _Route13CooltrainerF4BattleText text_end -Route13EndBattleText6: - text_far _Route13EndBattleText6 +Route13CooltrainerF4EndBattleText: + text_far _Route13CooltrainerF4EndBattleText text_end -Route13AfterBattleText6: - text_far _Route13AfterBattleText6 +Route13CooltrainerF4AfterBattleText: + text_far _Route13CooltrainerF4AfterBattleText text_end -Route13Text6: +Route13CooltrainerM2Text: text_asm ld hl, Route13TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route13BattleText7: - text_far _Route13BattleText7 +Route13CooltrainerM2BattleText: + text_far _Route13CooltrainerM2BattleText text_end -Route13EndBattleText7: - text_far _Route13EndBattleText7 +Route13CooltrainerM2EndBattleText: + text_far _Route13CooltrainerM2EndBattleText text_end -Route13AfterBattleText7: - text_far _Route13AfterBattleText7 +Route13CooltrainerM2AfterBattleText: + text_far _Route13CooltrainerM2AfterBattleText text_end -Route13Text7: +Route13Beauty1Text: text_asm ld hl, Route13TrainerHeader6 call TalkToTrainer jp TextScriptEnd -Route13BattleText8: - text_far _Route13BattleText8 +Route13Beauty1BattleText: + text_far _Route13Beauty1BattleText text_end -Route13EndBattleText8: - text_far _Route13EndBattleText8 +Route13Beauty1EndBattleText: + text_far _Route13Beauty1EndBattleText text_end -Route13AfterBattleText8: - text_far _Route13AfterBattleText8 +Route13Beauty1AfterBattleText: + text_far _Route13Beauty1AfterBattleText text_end -Route13Text8: +Route13Beauty2Text: text_asm ld hl, Route13TrainerHeader7 call TalkToTrainer jp TextScriptEnd -Route13BattleText9: - text_far _Route13BattleText9 +Route13Beauty2BattleText: + text_far _Route13Beauty2BattleText text_end -Route13EndBattleText9: - text_far _Route13EndBattleText9 +Route13Beauty2EndBattleText: + text_far _Route13Beauty2EndBattleText text_end -Route13AfterBattleText9: - text_far _Route13AfterBattleText9 +Route13Beauty2AfterBattleText: + text_far _Route13Beauty2AfterBattleText text_end -Route13Text9: +Route13BikerText: text_asm ld hl, Route13TrainerHeader8 call TalkToTrainer jp TextScriptEnd -Route13BattleText10: - text_far _Route13BattleText10 +Route13BikerBattleText: + text_far _Route13BikerBattleText text_end -Route13EndBattleText10: - text_far _Route13EndBattleText10 +Route13BikerEndBattleText: + text_far _Route13BikerEndBattleText text_end -Route13AfterBattleText10: - text_far _Route13AfterBattleText10 +Route13BikerAfterBattleText: + text_far _Route13BikerAfterBattleText text_end -Route13Text10: +Route13CooltrainerM3Text: text_asm ld hl, Route13TrainerHeader9 call TalkToTrainer jp TextScriptEnd -Route13BattleText11: - text_far _Route13BattleText11 +Route13CooltrainerM3BattleText: + text_far _Route13CooltrainerM3BattleText text_end -Route13EndBattleText11: - text_far _Route13EndBattleText11 +Route13CooltrainerM3EndBattleText: + text_far _Route13CooltrainerM3EndBattleText text_end -Route13AfterBattleText11: - text_far _Route13AfterBattleText11 +Route13CooltrainerM3AfterBattleText: + text_far _Route13CooltrainerM3AfterBattleText text_end -Route13Text11: - text_far _Route13Text11 +Route13TrainerTips1Text: + text_far _Route13TrainerTips1Text text_end -Route13Text12: - text_far _Route13Text12 +Route13TrainerTips2Text: + text_far _Route13TrainerTips2Text text_end -Route13Text13: - text_far _Route13Text13 +Route13SignText: + text_far _Route13SignText text_end diff --git a/scripts/Route14.asm b/scripts/Route14.asm index 3c3fe50fb..8f1cc9d06 100644 --- a/scripts/Route14.asm +++ b/scripts/Route14.asm @@ -8,227 +8,229 @@ Route14_Script: ret Route14_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_ROUTE14_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE14_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROUTE14_END_BATTLE Route14_TextPointers: - dw Route14Text1 - dw Route14Text2 - dw Route14Text3 - dw Route14Text4 - dw Route14Text5 - dw Route14Text6 - dw Route14Text7 - dw Route14Text8 - dw Route14Text9 - dw Route14Text10 - dw Route14Text11 + def_text_pointers + dw_const Route14CooltrainerM1Text, TEXT_ROUTE14_COOLTRAINER_M1 + dw_const Route14CooltrainerM2Text, TEXT_ROUTE14_COOLTRAINER_M2 + dw_const Route14CooltrainerM3Text, TEXT_ROUTE14_COOLTRAINER_M3 + dw_const Route14CooltrainerM4Text, TEXT_ROUTE14_COOLTRAINER_M4 + dw_const Route14CooltrainerM5Text, TEXT_ROUTE14_COOLTRAINER_M5 + dw_const Route14CooltrainerM6Text, TEXT_ROUTE14_COOLTRAINER_M6 + dw_const Route14Biker1Text, TEXT_ROUTE14_BIKER1 + dw_const Route14Biker2Text, TEXT_ROUTE14_BIKER2 + dw_const Route14Biker3Text, TEXT_ROUTE14_BIKER3 + dw_const Route14Biker4Text, TEXT_ROUTE14_BIKER4 + dw_const Route14SignText, TEXT_ROUTE14_SIGN Route14TrainerHeaders: def_trainers Route14TrainerHeader0: - trainer EVENT_BEAT_ROUTE_14_TRAINER_0, 2, Route14BattleText1, Route14EndBattleText1, Route14AfterBattleText1 + trainer EVENT_BEAT_ROUTE_14_TRAINER_0, 2, Route14CooltrainerM1BattleText, Route14CooltrainerM1EndBattleText, Route14CooltrainerM1AfterBattleText Route14TrainerHeader1: - trainer EVENT_BEAT_ROUTE_14_TRAINER_1, 2, Route14BattleText2, Route14EndBattleText2, Route14AfterBattleText2 + trainer EVENT_BEAT_ROUTE_14_TRAINER_1, 2, Route14CooltrainerM2BattleText, Route14CooltrainerM2EndBattleText, Route14CooltrainerM2AfterBattleText Route14TrainerHeader2: - trainer EVENT_BEAT_ROUTE_14_TRAINER_2, 4, Route14BattleText3, Route14EndBattleText3, Route14AfterBattleText3 + trainer EVENT_BEAT_ROUTE_14_TRAINER_2, 4, Route14CooltrainerM3BattleText, Route14CooltrainerM3EndBattleText, Route14CooltrainerM3AfterBattleText Route14TrainerHeader3: - trainer EVENT_BEAT_ROUTE_14_TRAINER_3, 3, Route14BattleText4, Route14EndBattleText4, Route14AfterBattleText4 + trainer EVENT_BEAT_ROUTE_14_TRAINER_3, 3, Route14CooltrainerM4BattleText, Route14CooltrainerM4EndBattleText, Route14CooltrainerM4AfterBattleText Route14TrainerHeader4: - trainer EVENT_BEAT_ROUTE_14_TRAINER_4, 3, Route14BattleText5, Route14EndBattleText5, Route14AfterBattleText5 + trainer EVENT_BEAT_ROUTE_14_TRAINER_4, 3, Route14CooltrainerM5BattleText, Route14CooltrainerM5EndBattleText, Route14CooltrainerM5AfterBattleText Route14TrainerHeader5: - trainer EVENT_BEAT_ROUTE_14_TRAINER_5, 4, Route14BattleText6, Route14EndBattleText6, Route14AfterBattleText6 + trainer EVENT_BEAT_ROUTE_14_TRAINER_5, 4, Route14CooltrainerM6BattleText, Route14CooltrainerM6EndBattleText, Route14CooltrainerM6AfterBattleText Route14TrainerHeader6: - trainer EVENT_BEAT_ROUTE_14_TRAINER_6, 4, Route14BattleText7, Route14EndBattleText7, Route14AfterBattleText7 + trainer EVENT_BEAT_ROUTE_14_TRAINER_6, 4, Route14Biker1BattleText, Route14Biker1EndBattleText, Route14Biker1AfterBattleText Route14TrainerHeader7: - trainer EVENT_BEAT_ROUTE_14_TRAINER_7, 4, Route14BattleText8, Route14EndBattleText8, Route14AfterBattleText8 + trainer EVENT_BEAT_ROUTE_14_TRAINER_7, 4, Route14Biker2BattleText, Route14Biker2EndBattleText, Route14Biker2AfterBattleText Route14TrainerHeader8: - trainer EVENT_BEAT_ROUTE_14_TRAINER_8, 3, Route14BattleText9, Route14EndBattleText9, Route14AfterBattleText9 + trainer EVENT_BEAT_ROUTE_14_TRAINER_8, 3, Route14Biker3BattleText, Route14Biker3EndBattleText, Route14Biker3AfterBattleText Route14TrainerHeader9: - trainer EVENT_BEAT_ROUTE_14_TRAINER_9, 4, Route14BattleText10, Route14EndBattleText10, Route14AfterBattleText10 + trainer EVENT_BEAT_ROUTE_14_TRAINER_9, 4, Route14Biker4BattleText, Route14Biker4EndBattleText, Route14Biker4AfterBattleText db -1 ; end -Route14Text1: +Route14CooltrainerM1Text: text_asm ld hl, Route14TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route14BattleText1: - text_far _Route14BattleText1 +Route14CooltrainerM1BattleText: + text_far _Route14CooltrainerM1BattleText text_end -Route14EndBattleText1: - text_far _Route14EndBattleText1 +Route14CooltrainerM1EndBattleText: + text_far _Route14CooltrainerM1EndBattleText text_end -Route14AfterBattleText1: - text_far _Route14AfterBattleText1 +Route14CooltrainerM1AfterBattleText: + text_far _Route14CooltrainerM1AfterBattleText text_end -Route14Text2: +Route14CooltrainerM2Text: text_asm ld hl, Route14TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route14BattleText2: - text_far _Route14BattleText2 +Route14CooltrainerM2BattleText: + text_far _Route14CooltrainerM2BattleText text_end -Route14EndBattleText2: - text_far _Route14EndBattleText2 +Route14CooltrainerM2EndBattleText: + text_far _Route14CooltrainerM2EndBattleText text_end -Route14AfterBattleText2: - text_far _Route14AfterBattleText2 +Route14CooltrainerM2AfterBattleText: + text_far _Route14CooltrainerM2AfterBattleText text_end -Route14Text3: +Route14CooltrainerM3Text: text_asm ld hl, Route14TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route14BattleText3: - text_far _Route14BattleText3 +Route14CooltrainerM3BattleText: + text_far _Route14CooltrainerM3BattleText text_end -Route14EndBattleText3: - text_far _Route14EndBattleText3 +Route14CooltrainerM3EndBattleText: + text_far _Route14CooltrainerM3EndBattleText text_end -Route14AfterBattleText3: - text_far _Route14AfterBattleText3 +Route14CooltrainerM3AfterBattleText: + text_far _Route14CooltrainerM3AfterBattleText text_end -Route14Text4: +Route14CooltrainerM4Text: text_asm ld hl, Route14TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route14BattleText4: - text_far _Route14BattleText4 +Route14CooltrainerM4BattleText: + text_far _Route14CooltrainerM4BattleText text_end -Route14EndBattleText4: - text_far _Route14EndBattleText4 +Route14CooltrainerM4EndBattleText: + text_far _Route14CooltrainerM4EndBattleText text_end -Route14AfterBattleText4: - text_far _Route14AfterBattleText4 +Route14CooltrainerM4AfterBattleText: + text_far _Route14CooltrainerM4AfterBattleText text_end -Route14Text5: +Route14CooltrainerM5Text: text_asm ld hl, Route14TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route14BattleText5: - text_far _Route14BattleText5 +Route14CooltrainerM5BattleText: + text_far _Route14CooltrainerM5BattleText text_end -Route14EndBattleText5: - text_far _Route14EndBattleText5 +Route14CooltrainerM5EndBattleText: + text_far _Route14CooltrainerM5EndBattleText text_end -Route14AfterBattleText5: - text_far _Route14AfterBattleText5 +Route14CooltrainerM5AfterBattleText: + text_far _Route14CooltrainerM5AfterBattleText text_end -Route14Text6: +Route14CooltrainerM6Text: text_asm ld hl, Route14TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route14BattleText6: - text_far _Route14BattleText6 +Route14CooltrainerM6BattleText: + text_far _Route14CooltrainerM6BattleText text_end -Route14EndBattleText6: - text_far _Route14EndBattleText6 +Route14CooltrainerM6EndBattleText: + text_far _Route14CooltrainerM6EndBattleText text_end -Route14AfterBattleText6: - text_far _Route14AfterBattleText6 +Route14CooltrainerM6AfterBattleText: + text_far _Route14CooltrainerM6AfterBattleText text_end -Route14Text7: +Route14Biker1Text: text_asm ld hl, Route14TrainerHeader6 call TalkToTrainer jp TextScriptEnd -Route14BattleText7: - text_far _Route14BattleText7 +Route14Biker1BattleText: + text_far _Route14Biker1BattleText text_end -Route14EndBattleText7: - text_far _Route14EndBattleText7 +Route14Biker1EndBattleText: + text_far _Route14Biker1EndBattleText text_end -Route14AfterBattleText7: - text_far _Route14AfterBattleText7 +Route14Biker1AfterBattleText: + text_far _Route14Biker1AfterBattleText text_end -Route14Text8: +Route14Biker2Text: text_asm ld hl, Route14TrainerHeader7 call TalkToTrainer jp TextScriptEnd -Route14BattleText8: - text_far _Route14BattleText8 +Route14Biker2BattleText: + text_far _Route14Biker2BattleText text_end -Route14EndBattleText8: - text_far _Route14EndBattleText8 +Route14Biker2EndBattleText: + text_far _Route14Biker2EndBattleText text_end -Route14AfterBattleText8: - text_far _Route14AfterBattleText8 +Route14Biker2AfterBattleText: + text_far _Route14Biker2AfterBattleText text_end -Route14Text9: +Route14Biker3Text: text_asm ld hl, Route14TrainerHeader8 call TalkToTrainer jp TextScriptEnd -Route14BattleText9: - text_far _Route14BattleText9 +Route14Biker3BattleText: + text_far _Route14Biker3BattleText text_end -Route14EndBattleText9: - text_far _Route14EndBattleText9 +Route14Biker3EndBattleText: + text_far _Route14Biker3EndBattleText text_end -Route14AfterBattleText9: - text_far _Route14AfterBattleText9 +Route14Biker3AfterBattleText: + text_far _Route14Biker3AfterBattleText text_end -Route14Text10: +Route14Biker4Text: text_asm ld hl, Route14TrainerHeader9 call TalkToTrainer jp TextScriptEnd -Route14BattleText10: - text_far _Route14BattleText10 +Route14Biker4BattleText: + text_far _Route14Biker4BattleText text_end -Route14EndBattleText10: - text_far _Route14EndBattleText10 +Route14Biker4EndBattleText: + text_far _Route14Biker4EndBattleText text_end -Route14AfterBattleText10: - text_far _Route14AfterBattleText10 +Route14Biker4AfterBattleText: + text_far _Route14Biker4AfterBattleText text_end -Route14Text11: - text_far _Route14Text11 +Route14SignText: + text_far _Route14SignText text_end diff --git a/scripts/Route15.asm b/scripts/Route15.asm index d3fb18bf3..76275dd69 100644 --- a/scripts/Route15.asm +++ b/scripts/Route15.asm @@ -8,220 +8,222 @@ Route15_Script: ret Route15_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_ROUTE15_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE15_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROUTE15_END_BATTLE Route15_TextPointers: - dw Route15Text1 - dw Route15Text2 - dw Route15Text3 - dw Route15Text4 - dw Route15Text5 - dw Route15Text6 - dw Route15Text7 - dw Route15Text8 - dw Route15Text9 - dw Route15Text10 - dw PickUpItemText - dw Route15Text12 + def_text_pointers + dw_const Route15CooltrainerF1Text, TEXT_ROUTE15_COOLTRAINER_F1 + dw_const Route15CooltrainerF2Text, TEXT_ROUTE15_COOLTRAINER_F2 + dw_const Route15CooltrainerM1Text, TEXT_ROUTE15_COOLTRAINER_M1 + dw_const Route15CooltrainerM2Text, TEXT_ROUTE15_COOLTRAINER_M2 + dw_const Route15Beauty1Text, TEXT_ROUTE15_BEAUTY1 + dw_const Route15Beauty2Text, TEXT_ROUTE15_BEAUTY2 + dw_const Route15Biker1Text, TEXT_ROUTE15_BIKER1 + dw_const Route15Biker2Text, TEXT_ROUTE15_BIKER2 + dw_const Route15CooltrainerF3Text, TEXT_ROUTE15_COOLTRAINER_F3 + dw_const Route15CooltrainerF4Text, TEXT_ROUTE15_COOLTRAINER_F4 + dw_const PickUpItemText, TEXT_ROUTE15_TM_RAGE + dw_const Route15SignText, TEXT_ROUTE15_SIGN Route15TrainerHeaders: def_trainers Route15TrainerHeader0: - trainer EVENT_BEAT_ROUTE_15_TRAINER_0, 2, Route15BattleText1, Route15EndBattleText1, Route15AfterBattleText1 + trainer EVENT_BEAT_ROUTE_15_TRAINER_0, 2, Route15CooltrainerF1BattleText, Route15CooltrainerF1EndBattleText, Route15CooltrainerF1AfterBattleText Route15TrainerHeader1: - trainer EVENT_BEAT_ROUTE_15_TRAINER_1, 3, Route15BattleText2, Route15EndBattleText2, Route15AfterBattleText2 + trainer EVENT_BEAT_ROUTE_15_TRAINER_1, 3, Route15CooltrainerF2BattleText, Route15CooltrainerF2EndBattleText, Route15CooltrainerF2AfterBattleText Route15TrainerHeader2: - trainer EVENT_BEAT_ROUTE_15_TRAINER_2, 3, Route15BattleText3, Route15EndBattleText3, Route15AfterBattleText3 + trainer EVENT_BEAT_ROUTE_15_TRAINER_2, 3, Route15CooltrainerM1BattleText, Route15CooltrainerM1EndBattleText, Route15CooltrainerM1AfterBattleText Route15TrainerHeader3: - trainer EVENT_BEAT_ROUTE_15_TRAINER_3, 3, Route15BattleText4, Route15EndBattleText4, Route15AfterBattleText4 + trainer EVENT_BEAT_ROUTE_15_TRAINER_3, 3, Route15CooltrainerM2BattleText, Route15CooltrainerM2EndBattleText, Route15CooltrainerM2AfterBattleText Route15TrainerHeader4: - trainer EVENT_BEAT_ROUTE_15_TRAINER_4, 2, Route15BattleText5, Route15EndBattleText5, Route15AfterBattleText5 + trainer EVENT_BEAT_ROUTE_15_TRAINER_4, 2, Route15Beauty1BattleText, Route15Beauty1EndBattleText, Route15Beauty1AfterBattleText Route15TrainerHeader5: - trainer EVENT_BEAT_ROUTE_15_TRAINER_5, 3, Route15BattleText6, Route15EndBattleText6, Route15AfterBattleText6 + trainer EVENT_BEAT_ROUTE_15_TRAINER_5, 3, Route15Beauty2BattleText, Route15Beauty2EndBattleText, Route15Beauty2AfterBattleText Route15TrainerHeader6: - trainer EVENT_BEAT_ROUTE_15_TRAINER_6, 3, Route15BattleText7, Route15EndBattleText7, Route15AfterBattleText7 + trainer EVENT_BEAT_ROUTE_15_TRAINER_6, 3, Route15Biker1BattleText, Route15Biker1EndBattleText, Route15Biker1AfterBattleText Route15TrainerHeader7: - trainer EVENT_BEAT_ROUTE_15_TRAINER_7, 3, Route15BattleText8, Route15EndBattleText8, Route15AfterBattleText8 + trainer EVENT_BEAT_ROUTE_15_TRAINER_7, 3, Route15Biker2BattleText, Route15Biker2EndBattleText, Route15Biker2AfterBattleText Route15TrainerHeader8: - trainer EVENT_BEAT_ROUTE_15_TRAINER_8, 3, Route15BattleText9, Route15EndBattleText9, Route15AfterBattleText9 + trainer EVENT_BEAT_ROUTE_15_TRAINER_8, 3, Route15CooltrainerF3BattleText, Route15CooltrainerF3EndBattleText, Route15CooltrainerF3AfterBattleText Route15TrainerHeader9: - trainer EVENT_BEAT_ROUTE_15_TRAINER_9, 3, Route15BattleText10, Route15EndBattleText10, Route15AfterBattleText10 + trainer EVENT_BEAT_ROUTE_15_TRAINER_9, 3, Route15CooltrainerF4BattleText, Route15CooltrainerF4EndBattleText, Route15CooltrainerF4AfterBattleText db -1 ; end -Route15Text1: +Route15CooltrainerF1Text: text_asm ld hl, Route15TrainerHeader0 jr Route15TalkToTrainer -Route15Text2: +Route15CooltrainerF2Text: text_asm ld hl, Route15TrainerHeader1 jr Route15TalkToTrainer -Route15Text3: +Route15CooltrainerM1Text: text_asm ld hl, Route15TrainerHeader2 jr Route15TalkToTrainer -Route15Text4: +Route15CooltrainerM2Text: text_asm ld hl, Route15TrainerHeader3 jr Route15TalkToTrainer -Route15Text5: +Route15Beauty1Text: text_asm ld hl, Route15TrainerHeader4 jr Route15TalkToTrainer -Route15Text6: +Route15Beauty2Text: text_asm ld hl, Route15TrainerHeader5 jr Route15TalkToTrainer -Route15Text7: +Route15Biker1Text: text_asm ld hl, Route15TrainerHeader6 jr Route15TalkToTrainer -Route15Text8: +Route15Biker2Text: text_asm ld hl, Route15TrainerHeader7 jr Route15TalkToTrainer -Route15Text9: +Route15CooltrainerF3Text: text_asm ld hl, Route15TrainerHeader8 jr Route15TalkToTrainer -Route15Text10: +Route15CooltrainerF4Text: text_asm ld hl, Route15TrainerHeader9 Route15TalkToTrainer: call TalkToTrainer jp TextScriptEnd -Route15BattleText1: - text_far _Route15BattleText1 +Route15CooltrainerF1BattleText: + text_far _Route15CooltrainerF1BattleText text_end -Route15EndBattleText1: - text_far _Route15EndBattleText1 +Route15CooltrainerF1EndBattleText: + text_far _Route15CooltrainerF1EndBattleText text_end -Route15AfterBattleText1: - text_far _Route15AfterBattleText1 +Route15CooltrainerF1AfterBattleText: + text_far _Route15CooltrainerF1AfterBattleText text_end -Route15BattleText2: - text_far _Route15BattleText2 +Route15CooltrainerF2BattleText: + text_far _Route15CooltrainerF2BattleText text_end -Route15EndBattleText2: - text_far _Route15EndBattleText2 +Route15CooltrainerF2EndBattleText: + text_far _Route15CooltrainerF2EndBattleText text_end -Route15AfterBattleText2: - text_far _Route15AfterBattleText2 +Route15CooltrainerF2AfterBattleText: + text_far _Route15CooltrainerF2AfterBattleText text_end -Route15BattleText3: - text_far _Route15BattleText3 +Route15CooltrainerM1BattleText: + text_far _Route15CooltrainerM1BattleText text_end -Route15EndBattleText3: - text_far _Route15EndBattleText3 +Route15CooltrainerM1EndBattleText: + text_far _Route15CooltrainerM1EndBattleText text_end -Route15AfterBattleText3: - text_far _Route15AfterBattleText3 +Route15CooltrainerM1AfterBattleText: + text_far _Route15CooltrainerM1AfterBattleText text_end -Route15BattleText4: - text_far _Route15BattleText4 +Route15CooltrainerM2BattleText: + text_far _Route15CooltrainerM2BattleText text_end -Route15EndBattleText4: - text_far _Route15EndBattleText4 +Route15CooltrainerM2EndBattleText: + text_far _Route15CooltrainerM2EndBattleText text_end -Route15AfterBattleText4: - text_far _Route15AfterBattleText4 +Route15CooltrainerM2AfterBattleText: + text_far _Route15CooltrainerM2AfterBattleText text_end -Route15BattleText5: - text_far _Route15BattleText5 +Route15Beauty1BattleText: + text_far _Route15Beauty1BattleText text_end -Route15EndBattleText5: - text_far _Route15EndBattleText5 +Route15Beauty1EndBattleText: + text_far _Route15Beauty1EndBattleText text_end -Route15AfterBattleText5: - text_far _Route15AfterBattleText5 +Route15Beauty1AfterBattleText: + text_far _Route15Beauty1AfterBattleText text_end -Route15BattleText6: - text_far _Route15BattleText6 +Route15Beauty2BattleText: + text_far _Route15Beauty2BattleText text_end -Route15EndBattleText6: - text_far _Route15EndBattleText6 +Route15Beauty2EndBattleText: + text_far _Route15Beauty2EndBattleText text_end -Route15AfterBattleText6: - text_far _Route15AfterBattleText6 +Route15Beauty2AfterBattleText: + text_far _Route15Beauty2AfterBattleText text_end -Route15BattleText7: - text_far _Route15BattleText7 +Route15Biker1BattleText: + text_far _Route15Biker1BattleText text_end -Route15EndBattleText7: - text_far _Route15EndBattleText7 +Route15Biker1EndBattleText: + text_far _Route15Biker1EndBattleText text_end -Route15AfterBattleText7: - text_far _Route15AfterBattleText7 +Route15Biker1AfterBattleText: + text_far _Route15Biker1AfterBattleText text_end -Route15BattleText8: - text_far _Route15BattleText8 +Route15Biker2BattleText: + text_far _Route15Biker2BattleText text_end -Route15EndBattleText8: - text_far _Route15EndBattleText8 +Route15Biker2EndBattleText: + text_far _Route15Biker2EndBattleText text_end -Route15AfterBattleText8: - text_far _Route15AfterBattleText8 +Route15Biker2AfterBattleText: + text_far _Route15Biker2AfterBattleText text_end -Route15BattleText9: - text_far _Route15BattleText9 +Route15CooltrainerF3BattleText: + text_far _Route15CooltrainerF3BattleText text_end -Route15EndBattleText9: - text_far _Route15EndBattleText9 +Route15CooltrainerF3EndBattleText: + text_far _Route15CooltrainerF3EndBattleText text_end -Route15AfterBattleText9: - text_far _Route15AfterBattleText9 +Route15CooltrainerF3AfterBattleText: + text_far _Route15CooltrainerF3AfterBattleText text_end -Route15BattleText10: - text_far _Route15BattleText10 +Route15CooltrainerF4BattleText: + text_far _Route15CooltrainerF4BattleText text_end -Route15EndBattleText10: - text_far _Route15EndBattleText10 +Route15CooltrainerF4EndBattleText: + text_far _Route15CooltrainerF4EndBattleText text_end -Route15AfterBattleText10: - text_far _Route15AfterBattleText10 +Route15CooltrainerF4AfterBattleText: + text_far _Route15CooltrainerF4AfterBattleText text_end -Route15Text12: - text_far _Route15Text12 +Route15SignText: + text_far _Route15SignText text_end diff --git a/scripts/Route15Gate1F.asm b/scripts/Route15Gate1F.asm index dfbce9d4d..fb117946e 100644 --- a/scripts/Route15Gate1F.asm +++ b/scripts/Route15Gate1F.asm @@ -2,8 +2,9 @@ Route15Gate1F_Script: jp EnableAutoTextBoxDrawing Route15Gate1F_TextPointers: - dw Route15GateText1 + def_text_pointers + dw_const Route15Gate1FGuardText, TEXT_ROUTE15GATE1F_GUARD -Route15GateText1: - text_far _Route15GateText1 +Route15Gate1FGuardText: + text_far _Route15Gate1FGuardText text_end diff --git a/scripts/Route15Gate2F.asm b/scripts/Route15Gate2F.asm index 1b85e34e1..0e04367b6 100644 --- a/scripts/Route15Gate2F.asm +++ b/scripts/Route15Gate2F.asm @@ -2,10 +2,11 @@ Route15Gate2F_Script: jp DisableAutoTextBoxDrawing Route15Gate2F_TextPointers: - dw Route15GateUpstairsText1 - dw Route15GateUpstairsText2 + def_text_pointers + dw_const Route15Gate2FOaksAideText, TEXT_ROUTE15GATE2F_OAKS_AIDE + dw_const Route15Gate2FBinocularsText, TEXT_ROUTE15GATE2F_BINOCULARS -Route15GateUpstairsText1: +Route15Gate2FOaksAideText: text_asm CheckEvent EVENT_GOT_EXP_ALL jr nz, .got_item @@ -25,20 +26,20 @@ Route15GateUpstairsText1: jr nz, .no_item SetEvent EVENT_GOT_EXP_ALL .got_item - ld hl, Route15GateUpstairsText_4968c + ld hl, .ExpAllText call PrintText .no_item jp TextScriptEnd -Route15GateUpstairsText_4968c: - text_far _Route15GateUpstairsText_4968c +.ExpAllText: + text_far _Route15Gate2FOaksAideExpAllText text_end -Route15GateUpstairsText2: +Route15Gate2FBinocularsText: text_asm - ld hl, Route15GateUpstairsText_49698 + ld hl, .Text jp GateUpstairsScript_PrintIfFacingUp -Route15GateUpstairsText_49698: - text_far _Route15GateUpstairsText_49698 +.Text: + text_far _Route15Gate2FBinocularsText text_end diff --git a/scripts/Route16.asm b/scripts/Route16.asm index b77bbf618..a1a6af784 100644 --- a/scripts/Route16.asm +++ b/scripts/Route16.asm @@ -8,25 +8,26 @@ Route16_Script: ret Route16Script_59946: - xor a + xor a ; SCRIPT_ROUTE16_DEFAULT ld [wJoyIgnore], a ld [wRoute16CurScript], a ld [wCurMapScript], a ret Route16_ScriptPointers: - dw Route16Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw Route16Script3 + def_script_pointers + dw_const Route16DefaultScript, SCRIPT_ROUTE16_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE16_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROUTE16_END_BATTLE + dw_const Route16SnorlaxBattleScript, SCRIPT_ROUTE16_SNORLAX_BATTLE -Route16Script0: +Route16DefaultScript: CheckEventHL EVENT_BEAT_ROUTE16_SNORLAX jp nz, CheckFightingMapTrainers CheckEventReuseHL EVENT_FIGHT_ROUTE16_SNORLAX ResetEventReuseHL EVENT_FIGHT_ROUTE16_SNORLAX jp z, CheckFightingMapTrainers - ld a, $a + ld a, TEXT_ROUTE16_SNORLAX_WOKE_UP ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, SNORLAX @@ -37,183 +38,184 @@ Route16Script0: ld [wMissableObjectIndex], a predef HideObject call UpdateSprites - ld a, $3 + ld a, SCRIPT_ROUTE16_SNORLAX_BATTLE ld [wRoute16CurScript], a ld [wCurMapScript], a ret -Route16Script3: +Route16SnorlaxBattleScript: ld a, [wIsInBattle] cp $ff jp z, Route16Script_59946 call UpdateSprites ld a, [wBattleResult] cp $2 - jr z, .asm_599a8 - ld a, $b + jr z, .caught + ld a, TEXT_ROUTE16_SNORLAX_RETURNED_TO_MOUNTAINS ldh [hSpriteIndexOrTextID], a call DisplayTextID -.asm_599a8 +.caught SetEvent EVENT_BEAT_ROUTE16_SNORLAX call Delay3 - ld a, $0 + ld a, SCRIPT_ROUTE16_DEFAULT ld [wRoute16CurScript], a ld [wCurMapScript], a ret Route16_TextPointers: - dw Route16Text1 - dw Route16Text2 - dw Route16Text3 - dw Route16Text4 - dw Route16Text5 - dw Route16Text6 - dw Route16Text7 - dw Route16Text8 - dw Route16Text9 - dw Route16Text10 - dw Route16Text11 + def_text_pointers + dw_const Route16Biker1Text, TEXT_ROUTE16_BIKER1 + dw_const Route16Biker2Text, TEXT_ROUTE16_BIKER2 + dw_const Route16Biker3Text, TEXT_ROUTE16_BIKER3 + dw_const Route16Biker4Text, TEXT_ROUTE16_BIKER4 + dw_const Route16Biker5Text, TEXT_ROUTE16_BIKER5 + dw_const Route16Biker6Text, TEXT_ROUTE16_BIKER6 + dw_const Route16SnorlaxText, TEXT_ROUTE16_SNORLAX + dw_const Route16CyclingRoadSignText, TEXT_ROUTE16_CYCLING_ROAD_SIGN + dw_const Route16SignText, TEXT_ROUTE16_SIGN + dw_const Route16SnorlaxWokeUpText, TEXT_ROUTE16_SNORLAX_WOKE_UP + dw_const Route16SnorlaxReturnedToMountainsText, TEXT_ROUTE16_SNORLAX_RETURNED_TO_MOUNTAINS Route16TrainerHeaders: def_trainers Route16TrainerHeader0: - trainer EVENT_BEAT_ROUTE_16_TRAINER_0, 3, Route16BattleText1, Route16EndBattleText1, Route16AfterBattleText1 + trainer EVENT_BEAT_ROUTE_16_TRAINER_0, 3, Route16Biker1BattleText, Route16Biker1EndBattleText, Route16Biker1AfterBattleText Route16TrainerHeader1: - trainer EVENT_BEAT_ROUTE_16_TRAINER_1, 2, Route16BattleText2, Route16EndBattleText2, Route16AfterBattleText2 + trainer EVENT_BEAT_ROUTE_16_TRAINER_1, 2, Route16Biker2BattleText, Route16Biker2EndBattleText, Route16Biker2AfterBattleText Route16TrainerHeader2: - trainer EVENT_BEAT_ROUTE_16_TRAINER_2, 2, Route16BattleText3, Route16EndBattleText3, Route16AfterBattleText3 + trainer EVENT_BEAT_ROUTE_16_TRAINER_2, 2, Route16Biker3BattleText, Route16Biker3EndBattleText, Route16Biker3AfterBattleText Route16TrainerHeader3: - trainer EVENT_BEAT_ROUTE_16_TRAINER_3, 2, Route16BattleText4, Route16EndBattleText4, Route16AfterBattleText4 + trainer EVENT_BEAT_ROUTE_16_TRAINER_3, 2, Route16biker4BattleText, Route16Biker4EndBattleText, Route16Biker4AfterBattleText Route16TrainerHeader4: - trainer EVENT_BEAT_ROUTE_16_TRAINER_4, 2, Route16BattleText5, Route16EndBattleText5, Route16AfterBattleText5 + trainer EVENT_BEAT_ROUTE_16_TRAINER_4, 2, Route16Biker5BattleText, Route16Biker5EndBattleText, Route16Biker5AfterBattleText Route16TrainerHeader5: - trainer EVENT_BEAT_ROUTE_16_TRAINER_5, 4, Route16BattleText6, Route16EndBattleText6, Route16AfterBattleText6 + trainer EVENT_BEAT_ROUTE_16_TRAINER_5, 4, Route16Biker6BattleText, Route16Biker6EndBattleText, Route16Biker6AfterBattleText db -1 ; end -Route16Text1: +Route16Biker1Text: text_asm ld hl, Route16TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route16BattleText1: - text_far _Route16BattleText1 +Route16Biker1BattleText: + text_far _Route16Biker1BattleText text_end -Route16EndBattleText1: - text_far _Route16EndBattleText1 +Route16Biker1EndBattleText: + text_far _Route16Biker1EndBattleText text_end -Route16AfterBattleText1: - text_far _Route16AfterBattleText1 +Route16Biker1AfterBattleText: + text_far _Route16Biker1AfterBattleText text_end -Route16Text2: +Route16Biker2Text: text_asm ld hl, Route16TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route16BattleText2: - text_far _Route16BattleText2 +Route16Biker2BattleText: + text_far _Route16Biker2BattleText text_end -Route16EndBattleText2: - text_far _Route16EndBattleText2 +Route16Biker2EndBattleText: + text_far _Route16Biker2EndBattleText text_end -Route16AfterBattleText2: - text_far _Route16AfterBattleText2 +Route16Biker2AfterBattleText: + text_far _Route16Biker2AfterBattleText text_end -Route16Text3: +Route16Biker3Text: text_asm ld hl, Route16TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route16BattleText3: - text_far _Route16BattleText3 +Route16Biker3BattleText: + text_far _Route16Biker3BattleText text_end -Route16EndBattleText3: - text_far _Route16EndBattleText3 +Route16Biker3EndBattleText: + text_far _Route16Biker3EndBattleText text_end -Route16AfterBattleText3: - text_far _Route16AfterBattleText3 +Route16Biker3AfterBattleText: + text_far _Route16Biker3AfterBattleText text_end -Route16Text4: +Route16Biker4Text: text_asm ld hl, Route16TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route16BattleText4: - text_far _Route16BattleText4 +Route16biker4BattleText: + text_far _Route16biker4BattleText text_end -Route16EndBattleText4: - text_far _Route16EndBattleText4 +Route16Biker4EndBattleText: + text_far _Route16Biker4EndBattleText text_end -Route16AfterBattleText4: - text_far _Route16AfterBattleText4 +Route16Biker4AfterBattleText: + text_far _Route16Biker4AfterBattleText text_end -Route16Text5: +Route16Biker5Text: text_asm ld hl, Route16TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route16BattleText5: - text_far _Route16BattleText5 +Route16Biker5BattleText: + text_far _Route16Biker5BattleText text_end -Route16EndBattleText5: - text_far _Route16EndBattleText5 +Route16Biker5EndBattleText: + text_far _Route16Biker5EndBattleText text_end -Route16AfterBattleText5: - text_far _Route16AfterBattleText5 +Route16Biker5AfterBattleText: + text_far _Route16Biker5AfterBattleText text_end -Route16Text6: +Route16Biker6Text: text_asm ld hl, Route16TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route16BattleText6: - text_far _Route16BattleText6 +Route16Biker6BattleText: + text_far _Route16Biker6BattleText text_end -Route16EndBattleText6: - text_far _Route16EndBattleText6 +Route16Biker6EndBattleText: + text_far _Route16Biker6EndBattleText text_end -Route16AfterBattleText6: - text_far _Route16AfterBattleText6 +Route16Biker6AfterBattleText: + text_far _Route16Biker6AfterBattleText text_end -Route16Text7: +Route16SnorlaxText: text_far _Route16Text7 text_end -Route16Text10: - text_far _Route16Text10 +Route16SnorlaxWokeUpText: + text_far _Route16SnorlaxWokeUpText text_end -Route16Text11: - text_far _Route16Text11 +Route16SnorlaxReturnedToMountainsText: + text_far _Route16SnorlaxReturnedToMountainsText text_end -Route16Text8: - text_far _Route16Text8 +Route16CyclingRoadSignText: + text_far _Route16CyclingRoadSignText text_end -Route16Text9: - text_far _Route16Text9 +Route16SignText: + text_far _Route16SignText text_end diff --git a/scripts/Route16FlyHouse.asm b/scripts/Route16FlyHouse.asm index 3bb34b753..5929b6235 100644 --- a/scripts/Route16FlyHouse.asm +++ b/scripts/Route16FlyHouse.asm @@ -2,54 +2,55 @@ Route16FlyHouse_Script: jp EnableAutoTextBoxDrawing Route16FlyHouse_TextPointers: - dw Route16HouseText1 - dw Route16HouseText2 + def_text_pointers + dw_const Route16FlyHouseBrunetteGirlText, TEXT_ROUTE16FLYHOUSE_BRUNETTE_GIRL + dw_const Route16FlyHouseFearowText, TEXT_ROUTE16FLYHOUSE_FEAROW -Route16HouseText1: +Route16FlyHouseBrunetteGirlText: text_asm CheckEvent EVENT_GOT_HM02 - ld hl, HM02ExplanationText + ld hl, .HM02ExplanationText jr nz, .got_item - ld hl, Route16HouseText3 + ld hl, .Text call PrintText lb bc, HM_FLY, 1 call GiveItem jr nc, .bag_full SetEvent EVENT_GOT_HM02 - ld hl, ReceivedHM02Text + ld hl, .ReceivedHM02Text jr .got_item .bag_full - ld hl, HM02NoRoomText + ld hl, .HM02NoRoomText .got_item call PrintText jp TextScriptEnd -Route16HouseText3: - text_far _Route16HouseText3 +.Text: + text_far _Route16FlyHouseBrunetteGirlText text_end -ReceivedHM02Text: - text_far _ReceivedHM02Text +.ReceivedHM02Text: + text_far _Route16FlyHouseBrunetteGirlReceivedHM02Text sound_get_key_item text_end -HM02ExplanationText: - text_far _HM02ExplanationText +.HM02ExplanationText: + text_far _Route16FlyHouseBrunetteGirlHM02ExplanationText text_end -HM02NoRoomText: - text_far _HM02NoRoomText +.HM02NoRoomText: + text_far _Route16FlyHouseBrunetteGirlHM02NoRoomText text_end -Route16HouseText2: +Route16FlyHouseFearowText: text_asm - ld hl, Route16HouseText_1e652 + ld hl, .Text call PrintText ld a, FEAROW call PlayCry call WaitForSoundToFinish jp TextScriptEnd -Route16HouseText_1e652: - text_far _Route16HouseText_1e652 +.Text: + text_far _Route16FlyHouseFearowText text_end diff --git a/scripts/Route16Gate1F.asm b/scripts/Route16Gate1F.asm index e992fa448..2d9777fc0 100644 --- a/scripts/Route16Gate1F.asm +++ b/scripts/Route16Gate1F.asm @@ -7,25 +7,26 @@ Route16Gate1F_Script: jp CallFunctionInTable Route16Gate1F_ScriptPointers: - dw Route16GateScript0 - dw Route16GateScript1 - dw Route16GateScript2 - dw Route16GateScript3 + def_script_pointers + dw_const Route16Gate1FDefaultScript, SCRIPT_ROUTE16GATE1F_DEFAULT + dw_const Route16Gate1FPlayerMovingUpScript, SCRIPT_ROUTE16GATE1F_PLAYER_MOVING_UP + dw_const Route16Gate1FGuardScript, SCRIPT_ROUTE16GATE1F_GUARD + dw_const Route16Gate1FPlayerMovingRightScript, SCRIPT_ROUTE16GATE1F_PLAYER_MOVING_RIGHT -Route16GateScript0: - call Route16GateScript_49755 +Route16Gate1FDefaultScript: + call Route16Gate1FIsBicycleInBagScript ret nz - ld hl, CoordsData_49714 + ld hl, .StopsPlayerCoords call ArePlayerCoordsInArray ret nc - ld a, $3 + ld a, TEXT_ROUTE16GATE1F_GUARD_WAIT_UP ldh [hSpriteIndexOrTextID], a call DisplayTextID xor a ldh [hJoyHeld], a ld a, [wCoordIndex] cp $1 - jr z, .asm_4970e + jr z, .next_to_counter ld a, [wCoordIndex] dec a ld [wSimulatedJoypadStatesIndex], a @@ -35,30 +36,30 @@ Route16GateScript0: ld hl, wSimulatedJoypadStatesEnd call FillMemory call StartSimulatingJoypadStates - ld a, $1 + ld a, SCRIPT_ROUTE16GATE1F_PLAYER_MOVING_UP ld [wRoute16Gate1FCurScript], a ret -.asm_4970e - ld a, $2 +.next_to_counter + ld a, SCRIPT_ROUTE16GATE1F_GUARD ld [wRoute16Gate1FCurScript], a ret -CoordsData_49714: +.StopsPlayerCoords: dbmapcoord 4, 7 dbmapcoord 4, 8 dbmapcoord 4, 9 dbmapcoord 4, 10 db -1 ; end -Route16GateScript1: +Route16Gate1FPlayerMovingUpScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a -Route16GateScript2: - ld a, $1 +Route16Gate1FGuardScript: + ld a, TEXT_ROUTE16GATE1F_GUARD ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 @@ -66,11 +67,11 @@ Route16GateScript2: ld a, D_RIGHT ld [wSimulatedJoypadStatesEnd], a call StartSimulatingJoypadStates - ld a, $3 + ld a, SCRIPT_ROUTE16GATE1F_PLAYER_MOVING_RIGHT ld [wRoute16Gate1FCurScript], a ret -Route16GateScript3: +Route16Gate1FPlayerMovingRightScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -78,44 +79,45 @@ Route16GateScript3: ld [wJoyIgnore], a ld hl, wd730 res 7, [hl] - ld a, $0 + ld a, SCRIPT_ROUTE16GATE1F_DEFAULT ld [wRoute16Gate1FCurScript], a ret -Route16GateScript_49755: +Route16Gate1FIsBicycleInBagScript: ld b, BICYCLE jp IsItemInBag Route16Gate1F_TextPointers: - dw Route16GateText1 - dw Route16GateText2 - dw Route16GateText3 + def_text_pointers + dw_const Route16Gate1FGuardText, TEXT_ROUTE16GATE1F_GUARD + dw_const Route16Gate1FGamblerText, TEXT_ROUTE16GATE1F_GAMBLER + dw_const Route16Gate1FGuardWaitUpText, TEXT_ROUTE16GATE1F_GUARD_WAIT_UP -Route16GateText1: +Route16Gate1FGuardText: text_asm - call Route16GateScript_49755 - jr z, .asm_0bdf3 - ld hl, Route16GateText_4977c + call Route16Gate1FIsBicycleInBagScript + jr z, .no_bike + ld hl, .CyclingRoadExplanationText call PrintText - jr .asm_56c9d -.asm_0bdf3 - ld hl, Route16GateText_49777 + jr .text_script_end +.no_bike + ld hl, .NoPedestriansAllowedText call PrintText -.asm_56c9d +.text_script_end jp TextScriptEnd -Route16GateText_49777: - text_far _Route16GateText_49777 +.NoPedestriansAllowedText: + text_far _Route16Gate1FGuardNoPedestriansAllowedText text_end -Route16GateText_4977c: - text_far _Route16GateText_4977c +.CyclingRoadExplanationText: + text_far _Route16Gate1FGuardCyclingRoadExplanationText text_end -Route16GateText3: - text_far _Route16GateText_49781 +Route16Gate1FGuardWaitUpText: + text_far _Route16Gate1FGuardWaitUpText text_end -Route16GateText2: - text_far _Route16GateText2 +Route16Gate1FGamblerText: + text_far _Route16Gate1FGamblerText text_end diff --git a/scripts/Route16Gate2F.asm b/scripts/Route16Gate2F.asm index 27e147a1b..e21359bac 100644 --- a/scripts/Route16Gate2F.asm +++ b/scripts/Route16Gate2F.asm @@ -2,45 +2,46 @@ Route16Gate2F_Script: jp DisableAutoTextBoxDrawing Route16Gate2F_TextPointers: - dw Route16GateUpstairsText1 - dw Route16GateUpstairsText2 - dw Route16GateUpstairsText3 - dw Route16GateUpstairsText4 + def_text_pointers + dw_const Route16Gate2FLittleBoyText, TEXT_ROUTE16GATE2F_LITTLE_BOY + dw_const Route16Gate2FLittleGirlText, TEXT_ROUTE16GATE2F_LITTLE_GIRL + dw_const Route16Gate2FLeftBinocularsText, TEXT_ROUTE16GATE2F_LEFT_BINOCULARS + dw_const Route16Gate2FRightBinocularsText, TEXT_ROUTE16GATE2F_RIGHT_BINOCULARS -Route16GateUpstairsText1: +Route16Gate2FLittleBoyText: text_asm - ld hl, Route16GateUpstairsText_49820 + ld hl, .Text call PrintText jp TextScriptEnd -Route16GateUpstairsText_49820: - text_far _Route16GateUpstairsText_49820 +.Text: + text_far _Route16Gate2FLittleBoyText text_end -Route16GateUpstairsText2: +Route16Gate2FLittleGirlText: text_asm - ld hl, Route16GateUpstairsText_4982f + ld hl, .Text call PrintText jp TextScriptEnd -Route16GateUpstairsText_4982f: - text_far _Route16GateUpstairsText_4982f +.Text: + text_far _Route16Gate2FLittleGirlText text_end -Route16GateUpstairsText3: +Route16Gate2FLeftBinocularsText: text_asm - ld hl, Route16GateUpstairsText_4983b + ld hl, .Text jp GateUpstairsScript_PrintIfFacingUp -Route16GateUpstairsText_4983b: - text_far _Route16GateUpstairsText_4983b +.Text: + text_far _Route16Gate2FLeftBinocularsText text_end -Route16GateUpstairsText4: +Route16Gate2FRightBinocularsText: text_asm - ld hl, Route16GateUpstairsText_49847 + ld hl, .Text jp GateUpstairsScript_PrintIfFacingUp -Route16GateUpstairsText_49847: - text_far _Route16GateUpstairsText_49847 +.Text: + text_far _Route16Gate2FRightBinocularsText text_end diff --git a/scripts/Route17.asm b/scripts/Route17.asm index 526b25763..aa40baa8f 100644 --- a/scripts/Route17.asm +++ b/scripts/Route17.asm @@ -8,252 +8,254 @@ Route17_Script: ret Route17_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_ROUTE17_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE17_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROUTE17_END_BATTLE Route17_TextPointers: - dw Route17Text1 - dw Route17Text2 - dw Route17Text3 - dw Route17Text4 - dw Route17Text5 - dw Route17Text6 - dw Route17Text7 - dw Route17Text8 - dw Route17Text9 - dw Route17Text10 - dw Route17Text11 - dw Route17Text12 - dw Route17Text13 - dw Route17Text14 - dw Route17Text15 - dw Route17Text16 + def_text_pointers + dw_const Route17Biker1Text, TEXT_ROUTE17_BIKER1 + dw_const Route17Biker2Text, TEXT_ROUTE17_BIKER2 + dw_const Route17Biker3Text, TEXT_ROUTE17_BIKER3 + dw_const Route17Biker4Text, TEXT_ROUTE17_BIKER4 + dw_const Route17Biker5Text, TEXT_ROUTE17_BIKER5 + dw_const Route17Biker6Text, TEXT_ROUTE17_BIKER6 + dw_const Route17Biker7Text, TEXT_ROUTE17_BIKER7 + dw_const Route17Biker8Text, TEXT_ROUTE17_BIKER8 + dw_const Route17Biker9Text, TEXT_ROUTE17_BIKER9 + dw_const Route17Biker10Text, TEXT_ROUTE17_BIKER10 + dw_const Route17NoticeSign1Text, TEXT_ROUTE17_NOTICE_SIGN1 + dw_const Route17TrainerTips1Text, TEXT_ROUTE17_TRAINER_TIPS1 + dw_const Route17TrainerTips2Text, TEXT_ROUTE17_TRAINER_TIPS2 + dw_const Route17SignText, TEXT_ROUTE17_SIGN + dw_const Route17NoticeSign2Text, TEXT_ROUTE17_NOTICE_SIGN2 + dw_const Route17CyclingRoadEndsSignText, TEXT_ROUTE17_CYCLING_ROAD_ENDS_SIGN Route17TrainerHeaders: def_trainers Route17TrainerHeader0: - trainer EVENT_BEAT_ROUTE_17_TRAINER_0, 3, Route17BattleText1, Route17EndBattleText1, Route17AfterBattleText1 + trainer EVENT_BEAT_ROUTE_17_TRAINER_0, 3, Route17Biker1BattleText, Route17Biker1EndBattleText, Route17Biker1AfterBattleText Route17TrainerHeader1: - trainer EVENT_BEAT_ROUTE_17_TRAINER_1, 4, Route17BattleText2, Route17EndBattleText2, Route17AfterBattleText2 + trainer EVENT_BEAT_ROUTE_17_TRAINER_1, 4, Route17Biker2BattleText, Route17Biker2EndBattleText, Route17Biker2AfterBattleText Route17TrainerHeader2: - trainer EVENT_BEAT_ROUTE_17_TRAINER_2, 4, Route17BattleText3, Route17EndBattleText3, Route17AfterBattleText3 + trainer EVENT_BEAT_ROUTE_17_TRAINER_2, 4, Route17Biker3BattleText, Route17Biker3EndBattleText, Route17Biker3AfterBattleText Route17TrainerHeader3: - trainer EVENT_BEAT_ROUTE_17_TRAINER_3, 4, Route17BattleText4, Route17EndBattleText4, Route17AfterBattleText4 + trainer EVENT_BEAT_ROUTE_17_TRAINER_3, 4, Route17Biker4BattleText, Route17Biker4EndBattleText, Route17Biker4AfterBattleText Route17TrainerHeader4: - trainer EVENT_BEAT_ROUTE_17_TRAINER_4, 3, Route17BattleText5, Route17EndBattleText5, Route17AfterBattleText5 + trainer EVENT_BEAT_ROUTE_17_TRAINER_4, 3, Route17Biker5BattleText, Route17Biker5EndBattleText, Route17Biker5AfterBattleText Route17TrainerHeader5: - trainer EVENT_BEAT_ROUTE_17_TRAINER_5, 2, Route17BattleText6, Route17EndBattleText6, Route17AfterBattleText6 + trainer EVENT_BEAT_ROUTE_17_TRAINER_5, 2, Route17Biker6BattleText, Route17Biker6EndBattleText, Route17Biker6AfterBattleText Route17TrainerHeader6: - trainer EVENT_BEAT_ROUTE_17_TRAINER_6, 4, Route17BattleText7, Route17EndBattleText7, Route17AfterBattleText7 + trainer EVENT_BEAT_ROUTE_17_TRAINER_6, 4, Route17Biker7BattleText, Route17Biker7EndBattleText, Route17Biker7AfterBattleText Route17TrainerHeader7: - trainer EVENT_BEAT_ROUTE_17_TRAINER_7, 2, Route17BattleText8, Route17EndBattleText8, Route17AfterBattleText8 + trainer EVENT_BEAT_ROUTE_17_TRAINER_7, 2, Route17Biker8BattleText, Route17Biker8EndBattleText, Route17Biker8AfterBattleText Route17TrainerHeader8: - trainer EVENT_BEAT_ROUTE_17_TRAINER_8, 3, Route17BattleText9, Route17EndBattleText9, Route17AfterBattleText9 + trainer EVENT_BEAT_ROUTE_17_TRAINER_8, 3, Route17Biker9BattleText, Route17Biker9EndBattleText, Route17Biker9AfterBattleText Route17TrainerHeader9: - trainer EVENT_BEAT_ROUTE_17_TRAINER_9, 4, Route17BattleText10, Route17EndBattleText10, Route17AfterBattleText10 + trainer EVENT_BEAT_ROUTE_17_TRAINER_9, 4, Route17Biker10BattleText, Route17Biker10EndBattleText, Route17Biker10AfterBattleText db -1 ; end -Route17Text1: +Route17Biker1Text: text_asm ld hl, Route17TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route17BattleText1: - text_far _Route17BattleText1 +Route17Biker1BattleText: + text_far _Route17Biker1BattleText text_end -Route17EndBattleText1: - text_far _Route17EndBattleText1 +Route17Biker1EndBattleText: + text_far _Route17Biker1EndBattleText text_end -Route17AfterBattleText1: - text_far _Route17AfterBattleText1 +Route17Biker1AfterBattleText: + text_far _Route17Biker1AfterBattleText text_end -Route17Text2: +Route17Biker2Text: text_asm ld hl, Route17TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route17BattleText2: - text_far _Route17BattleText2 +Route17Biker2BattleText: + text_far _Route17Biker2BattleText text_end -Route17EndBattleText2: - text_far _Route17EndBattleText2 +Route17Biker2EndBattleText: + text_far _Route17Biker2EndBattleText text_end -Route17AfterBattleText2: - text_far _Route17AfterBattleText2 +Route17Biker2AfterBattleText: + text_far _Route17Biker2AfterBattleText text_end -Route17Text3: +Route17Biker3Text: text_asm ld hl, Route17TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route17BattleText3: - text_far _Route17BattleText3 +Route17Biker3BattleText: + text_far _Route17Biker3BattleText text_end -Route17EndBattleText3: - text_far _Route17EndBattleText3 +Route17Biker3EndBattleText: + text_far _Route17Biker3EndBattleText text_end -Route17AfterBattleText3: - text_far _Route17AfterBattleText3 +Route17Biker3AfterBattleText: + text_far _Route17Biker3AfterBattleText text_end -Route17Text4: +Route17Biker4Text: text_asm ld hl, Route17TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route17BattleText4: - text_far _Route17BattleText4 +Route17Biker4BattleText: + text_far _Route17Biker4BattleText text_end -Route17EndBattleText4: - text_far _Route17EndBattleText4 +Route17Biker4EndBattleText: + text_far _Route17Biker4EndBattleText text_end -Route17AfterBattleText4: - text_far _Route17AfterBattleText4 +Route17Biker4AfterBattleText: + text_far _Route17Biker4AfterBattleText text_end -Route17Text5: +Route17Biker5Text: text_asm ld hl, Route17TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route17BattleText5: - text_far _Route17BattleText5 +Route17Biker5BattleText: + text_far _Route17Biker5BattleText text_end -Route17EndBattleText5: - text_far _Route17EndBattleText5 +Route17Biker5EndBattleText: + text_far _Route17Biker5EndBattleText text_end -Route17AfterBattleText5: - text_far _Route17AfterBattleText5 +Route17Biker5AfterBattleText: + text_far _Route17Biker5AfterBattleText text_end -Route17Text6: +Route17Biker6Text: text_asm ld hl, Route17TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route17BattleText6: - text_far _Route17BattleText6 +Route17Biker6BattleText: + text_far _Route17Biker6BattleText text_end -Route17EndBattleText6: - text_far _Route17EndBattleText6 +Route17Biker6EndBattleText: + text_far _Route17Biker6EndBattleText text_end -Route17AfterBattleText6: - text_far _Route17AfterBattleText6 +Route17Biker6AfterBattleText: + text_far _Route17Biker6AfterBattleText text_end -Route17Text7: +Route17Biker7Text: text_asm ld hl, Route17TrainerHeader6 call TalkToTrainer jp TextScriptEnd -Route17BattleText7: - text_far _Route17BattleText7 +Route17Biker7BattleText: + text_far _Route17Biker7BattleText text_end -Route17EndBattleText7: - text_far _Route17EndBattleText7 +Route17Biker7EndBattleText: + text_far _Route17Biker7EndBattleText text_end -Route17AfterBattleText7: - text_far _Route17AfterBattleText7 +Route17Biker7AfterBattleText: + text_far _Route17Biker7AfterBattleText text_end -Route17Text8: +Route17Biker8Text: text_asm ld hl, Route17TrainerHeader7 call TalkToTrainer jp TextScriptEnd -Route17BattleText8: - text_far _Route17BattleText8 +Route17Biker8BattleText: + text_far _Route17Biker8BattleText text_end -Route17EndBattleText8: - text_far _Route17EndBattleText8 +Route17Biker8EndBattleText: + text_far _Route17Biker8EndBattleText text_end -Route17AfterBattleText8: - text_far _Route17AfterBattleText8 +Route17Biker8AfterBattleText: + text_far _Route17Biker8AfterBattleText text_end -Route17Text9: +Route17Biker9Text: text_asm ld hl, Route17TrainerHeader8 call TalkToTrainer jp TextScriptEnd -Route17BattleText9: - text_far _Route17BattleText9 +Route17Biker9BattleText: + text_far _Route17Biker9BattleText text_end -Route17EndBattleText9: - text_far _Route17EndBattleText9 +Route17Biker9EndBattleText: + text_far _Route17Biker9EndBattleText text_end -Route17AfterBattleText9: - text_far _Route17AfterBattleText9 +Route17Biker9AfterBattleText: + text_far _Route17Biker9AfterBattleText text_end -Route17Text10: +Route17Biker10Text: text_asm ld hl, Route17TrainerHeader9 call TalkToTrainer jp TextScriptEnd -Route17BattleText10: - text_far _Route17BattleText10 +Route17Biker10BattleText: + text_far _Route17Biker10BattleText text_end -Route17EndBattleText10: - text_far _Route17EndBattleText10 +Route17Biker10EndBattleText: + text_far _Route17Biker10EndBattleText text_end -Route17AfterBattleText10: - text_far _Route17AfterBattleText10 +Route17Biker10AfterBattleText: + text_far _Route17Biker10AfterBattleText text_end -Route17Text11: - text_far _Route17Text11 +Route17NoticeSign1Text: + text_far _Route17NoticeSign1Text text_end -Route17Text12: - text_far _Route17Text12 +Route17TrainerTips1Text: + text_far _Route17TrainerTips1Text text_end -Route17Text13: - text_far _Route17Text13 +Route17TrainerTips2Text: + text_far _Route17TrainerTips2Text text_end -Route17Text14: - text_far _Route17Text14 +Route17SignText: + text_far _Route17SignText text_end -Route17Text15: - text_far _Route17Text15 +Route17NoticeSign2Text: + text_far _Route17NoticeSign2Text text_end -Route17Text16: - text_far _Route17Text16 +Route17CyclingRoadEndsSignText: + text_far _Route17CyclingRoadEndsSignText text_end diff --git a/scripts/Route18.asm b/scripts/Route18.asm index 42c83f4c2..26d660c80 100644 --- a/scripts/Route18.asm +++ b/scripts/Route18.asm @@ -8,85 +8,87 @@ Route18_Script: ret Route18_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_ROUTE18_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE18_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROUTE18_END_BATTLE Route18_TextPointers: - dw Route18Text1 - dw Route18Text2 - dw Route18Text3 - dw Route18Text4 - dw Route18Text5 + def_text_pointers + dw_const Route18CooltrainerM1Text, SCRIPT_ROUTE18_COOLTRAINER_M1 + dw_const Route18CooltrainerM2Text, SCRIPT_ROUTE18_COOLTRAINER_M2 + dw_const Route18CooltrainerM3Text, SCRIPT_ROUTE18_COOLTRAINER_M3 + dw_const Route18SignText, SCRIPT_ROUTE18_SIGN + dw_const Route18CyclingRoadSignText, SCRIPT_ROUTE18_CYCLING_ROAD_SIGN Route18TrainerHeaders: def_trainers Route18TrainerHeader0: - trainer EVENT_BEAT_ROUTE_18_TRAINER_0, 3, Route18BattleText1, Route18EndBattleText1, Route18AfterBattleText1 + trainer EVENT_BEAT_ROUTE_18_TRAINER_0, 3, Route18CooltrainerM1BattleText, Route18CooltrainerM1EndBattleText, Route18CooltrainerM1AfterBattleText Route18TrainerHeader1: - trainer EVENT_BEAT_ROUTE_18_TRAINER_1, 3, Route18BattleText2, Route18EndBattleText2, Route18AfterBattleText2 + trainer EVENT_BEAT_ROUTE_18_TRAINER_1, 3, Route18CooltrainerM2BattleText, Route18CooltrainerM2EndBattleText, Route18CooltrainerM2AfterBattleText Route18TrainerHeader2: - trainer EVENT_BEAT_ROUTE_18_TRAINER_2, 4, Route18BattleText3, Route18EndBattleText3, Route18AfterBattleText3 + trainer EVENT_BEAT_ROUTE_18_TRAINER_2, 4, Route18CooltrainerM3BattleText, Route18CooltrainerM3EndBattleText, Route18CooltrainerM3AfterBattleText db -1 ; end -Route18Text1: +Route18CooltrainerM1Text: text_asm ld hl, Route18TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route18BattleText1: - text_far _Route18BattleText1 +Route18CooltrainerM1BattleText: + text_far _Route18CooltrainerM1BattleText text_end -Route18EndBattleText1: - text_far _Route18EndBattleText1 +Route18CooltrainerM1EndBattleText: + text_far _Route18CooltrainerM1EndBattleText text_end -Route18AfterBattleText1: - text_far _Route18AfterBattleText1 +Route18CooltrainerM1AfterBattleText: + text_far _Route18CooltrainerM1AfterBattleText text_end -Route18Text2: +Route18CooltrainerM2Text: text_asm ld hl, Route18TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route18BattleText2: - text_far _Route18BattleText2 +Route18CooltrainerM2BattleText: + text_far _Route18CooltrainerM2BattleText text_end -Route18EndBattleText2: - text_far _Route18EndBattleText2 +Route18CooltrainerM2EndBattleText: + text_far _Route18CooltrainerM2EndBattleText text_end -Route18AfterBattleText2: - text_far _Route18AfterBattleText2 +Route18CooltrainerM2AfterBattleText: + text_far _Route18CooltrainerM2AfterBattleText text_end -Route18Text3: +Route18CooltrainerM3Text: text_asm ld hl, Route18TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route18BattleText3: - text_far _Route18BattleText3 +Route18CooltrainerM3BattleText: + text_far _Route18CooltrainerM3BattleText text_end -Route18EndBattleText3: - text_far _Route18EndBattleText3 +Route18CooltrainerM3EndBattleText: + text_far _Route18CooltrainerM3EndBattleText text_end -Route18AfterBattleText3: - text_far _Route18AfterBattleText3 +Route18CooltrainerM3AfterBattleText: + text_far _Route18CooltrainerM3AfterBattleText text_end -Route18Text4: - text_far _Route18Text4 +Route18SignText: + text_far _Route18SignText text_end -Route18Text5: - text_far _Route18Text5 +Route18CyclingRoadSignText: + text_far _Route18CyclingRoadSignText text_end diff --git a/scripts/Route18Gate1F.asm b/scripts/Route18Gate1F.asm index 2caeaedd8..8f08638cc 100644 --- a/scripts/Route18Gate1F.asm +++ b/scripts/Route18Gate1F.asm @@ -7,25 +7,26 @@ Route18Gate1F_Script: jp CallFunctionInTable Route18Gate1F_ScriptPointers: - dw Route18GateScript0 - dw Route18GateScript1 - dw Route18GateScript2 - dw Route18GateScript3 + def_script_pointers + dw_const Route18Gate1FDefaultScript, SCRIPT_ROUTE18GATE1F_DEFAULT + dw_const Route18Gate1FPlayerMovingUpScript, SCRIPT_ROUTE18GATE1F_PLAYER_MOVING_UP + dw_const Route18Gate1FGuardScript, SCRIPT_ROUTE18GATE1F_GUARD + dw_const Route18Gate1FPlayerMovingRightScript, SCRIPT_ROUTE18GATE1F_PLAYER_MOVING_RIGHT -Route18GateScript0: - call Route16GateScript_49755 +Route18Gate1FDefaultScript: + call Route16Gate1FIsBicycleInBagScript ret nz - ld hl, CoordsData_498cc + ld hl, .StopsPlayerCoords call ArePlayerCoordsInArray ret nc - ld a, $2 + ld a, TEXT_ROUTE18GATE1F_GUARD_EXCUSE_ME ldh [hSpriteIndexOrTextID], a call DisplayTextID xor a ldh [hJoyHeld], a ld a, [wCoordIndex] cp $1 - jr z, .asm_498c6 + jr z, .next_to_counter ld a, [wCoordIndex] dec a ld [wSimulatedJoypadStatesIndex], a @@ -35,30 +36,30 @@ Route18GateScript0: ld hl, wSimulatedJoypadStatesEnd call FillMemory call StartSimulatingJoypadStates - ld a, $1 + ld a, SCRIPT_ROUTE18GATE1F_PLAYER_MOVING_UP ld [wRoute18Gate1FCurScript], a ret -.asm_498c6 - ld a, $2 +.next_to_counter + ld a, SCRIPT_ROUTE18GATE1F_GUARD ld [wRoute18Gate1FCurScript], a ret -CoordsData_498cc: +.StopsPlayerCoords: dbmapcoord 4, 3 dbmapcoord 4, 4 dbmapcoord 4, 5 dbmapcoord 4, 6 db -1 ; end -Route18GateScript1: +Route18Gate1FPlayerMovingUpScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a -Route18GateScript2: - ld a, $1 +Route18Gate1FGuardScript: + ld a, TEXT_ROUTE18GATE1F_GUARD ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 @@ -66,11 +67,11 @@ Route18GateScript2: ld a, D_RIGHT ld [wSimulatedJoypadStatesEnd], a call StartSimulatingJoypadStates - ld a, $3 + ld a, SCRIPT_ROUTE18GATE1F_PLAYER_MOVING_RIGHT ld [wRoute18Gate1FCurScript], a ret -Route18GateScript3: +Route18Gate1FPlayerMovingRightScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -78,35 +79,36 @@ Route18GateScript3: ld [wJoyIgnore], a ld hl, wd730 res 7, [hl] - ld a, $0 + ld a, SCRIPT_ROUTE18GATE1F_DEFAULT ld [wRoute18Gate1FCurScript], a ret Route18Gate1F_TextPointers: - dw Route18GateText1 - dw Route18GateText2 + def_text_pointers + dw_const Route18Gate1FGuardText, TEXT_ROUTE18GATE1F_GUARD + dw_const Route18Gate1FGuardExcuseMeText, TEXT_ROUTE18GATE1F_GUARD_EXCUSE_ME -Route18GateText1: +Route18Gate1FGuardText: text_asm - call Route16GateScript_49755 - jr z, .asm_3c84d - ld hl, Route18GateText_4992d + call Route16Gate1FIsBicycleInBagScript + jr z, .no_bike + ld hl, .CyclingRoadUphillText call PrintText - jr .asm_a8410 -.asm_3c84d - ld hl, Route18GateText_49928 + jr .text_script_end +.no_bike + ld hl, .YouNeedABicycleText call PrintText -.asm_a8410 +.text_script_end jp TextScriptEnd -Route18GateText_49928: - text_far _Route18GateText_49928 +.YouNeedABicycleText: + text_far _Route18Gate1FGuardYouNeedABicycleText text_end -Route18GateText_4992d: - text_far _Route18GateText_4992d +.CyclingRoadUphillText: + text_far _Route18Gate1FGuardCyclingRoadUphillText text_end -Route18GateText2: - text_far _Route18GateText_49932 +Route18Gate1FGuardExcuseMeText: + text_far _Route18Gate1FGuardExcuseMeText text_end diff --git a/scripts/Route18Gate2F.asm b/scripts/Route18Gate2F.asm index efb6d70aa..0300966e2 100644 --- a/scripts/Route18Gate2F.asm +++ b/scripts/Route18Gate2F.asm @@ -2,31 +2,32 @@ Route18Gate2F_Script: jp DisableAutoTextBoxDrawing Route18Gate2F_TextPointers: - dw Route18GateUpstairsText1 - dw Route18GateUpstairsText2 - dw Route18GateUpstairsText3 + def_text_pointers + dw_const Route18Gate2FYoungsterText, TEXT_ROUTE18GATE2F_YOUNGSTER + dw_const Route18Gate2FLeftBinocularsText, TEXT_ROUTE18GATE2F_LEFT_BINOCULARS + dw_const Route18Gate2FRightBinocularsText, TEXT_ROUTE18GATE2F_RIGHT_BINOCULARS -Route18GateUpstairsText1: +Route18Gate2FYoungsterText: text_asm ld a, TRADE_FOR_MARC ld [wWhichTrade], a predef DoInGameTradeDialogue jp TextScriptEnd -Route18GateUpstairsText2: +Route18Gate2FLeftBinocularsText: text_asm - ld hl, Route18GateUpstairsText_49993 + ld hl, .Text jp GateUpstairsScript_PrintIfFacingUp -Route18GateUpstairsText_49993: - text_far _Route18GateUpstairsText_49993 +.Text: + text_far _Route18Gate2FLeftBinocularsText text_end -Route18GateUpstairsText3: +Route18Gate2FRightBinocularsText: text_asm - ld hl, Route18GateUpstairsText_4999f + ld hl, .Text jp GateUpstairsScript_PrintIfFacingUp -Route18GateUpstairsText_4999f: - text_far _Route18GateUpstairsText_4999f +.Text: + text_far _Route18Gate2FRightBinocularsText text_end diff --git a/scripts/Route19.asm b/scripts/Route19.asm index 7467ee1e7..ef289b5f5 100644 --- a/scripts/Route19.asm +++ b/scripts/Route19.asm @@ -8,227 +8,229 @@ Route19_Script: ret Route19_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_ROUTE19_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE19_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROUTE19_END_BATTLE Route19_TextPointers: - dw Route19Text1 - dw Route19Text2 - dw Route19Text3 - dw Route19Text4 - dw Route19Text5 - dw Route19Text6 - dw Route19Text7 - dw Route19Text8 - dw Route19Text9 - dw Route19Text10 - dw Route19Text11 + def_text_pointers + dw_const Route19CooltrainerM1Text, TEXT_ROUTE19_COOLTRAINER_M1 + dw_const Route19CooltrainerM2Text, TEXT_ROUTE19_COOLTRAINER_M2 + dw_const Route19Swimmer1Text, TEXT_ROUTE19_SWIMMER1 + dw_const Route19Swimmer2Text, TEXT_ROUTE19_SWIMMER2 + dw_const Route19Swimmer3Text, TEXT_ROUTE19_SWIMMER3 + dw_const Route19Swimmer4Text, TEXT_ROUTE19_SWIMMER4 + dw_const Route19Swimmer5Text, TEXT_ROUTE19_SWIMMER5 + dw_const Route19Swimmer6Text, TEXT_ROUTE19_SWIMMER6 + dw_const Route19Swimmer7Text, TEXT_ROUTE19_SWIMMER7 + dw_const Route19Swimmer8Text, TEXT_ROUTE19_SWIMMER8 + dw_const Route19SignText, TEXT_ROUTE19_SIGN Route19TrainerHeaders: def_trainers Route19TrainerHeader0: - trainer EVENT_BEAT_ROUTE_19_TRAINER_0, 4, Route19BattleText1, Route19EndBattleText1, Route19AfterBattleText1 + trainer EVENT_BEAT_ROUTE_19_TRAINER_0, 4, Route19CooltrainerM1BattleText, Route19CooltrainerM1EndBattleText, Route19CooltrainerM1AfterBattleText Route19TrainerHeader1: - trainer EVENT_BEAT_ROUTE_19_TRAINER_1, 3, Route19BattleText2, Route19EndBattleText2, Route19AfterBattleText2 + trainer EVENT_BEAT_ROUTE_19_TRAINER_1, 3, Route19CooltrainerM2BattleText, Route19CooltrainerM2EndBattleText, Route19CooltrainerM2AfterBattleText Route19TrainerHeader2: - trainer EVENT_BEAT_ROUTE_19_TRAINER_2, 3, Route19BattleText3, Route19EndBattleText3, Route19AfterBattleText3 + trainer EVENT_BEAT_ROUTE_19_TRAINER_2, 3, Route19Swimmer1BattleText, Route19Swimmer1EndBattleText, Route19Swimmer1AfterBattleText Route19TrainerHeader3: - trainer EVENT_BEAT_ROUTE_19_TRAINER_3, 4, Route19BattleText4, Route19EndBattleText4, Route19AfterBattleText4 + trainer EVENT_BEAT_ROUTE_19_TRAINER_3, 4, Route19Swimmer2BattleText, Route19Swimmer2EndBattleText, Route19Swimmer2AfterBattleText Route19TrainerHeader4: - trainer EVENT_BEAT_ROUTE_19_TRAINER_4, 4, Route19BattleText5, Route19EndBattleText5, Route19AfterBattleText5 + trainer EVENT_BEAT_ROUTE_19_TRAINER_4, 4, Route19Swimmer3BattleText, Route19Swimmer3EndBattleText, Route19Swimmer3AfterBattleText Route19TrainerHeader5: - trainer EVENT_BEAT_ROUTE_19_TRAINER_5, 4, Route19BattleText6, Route19EndBattleText6, Route19AfterBattleText6 + trainer EVENT_BEAT_ROUTE_19_TRAINER_5, 4, Route19Swimmer4BattleText, Route19Swimmer4EndBattleText, Route19Swimmer4AfterBattleText Route19TrainerHeader6: - trainer EVENT_BEAT_ROUTE_19_TRAINER_6, 3, Route19BattleText7, Route19EndBattleText7, Route19AfterBattleText7 + trainer EVENT_BEAT_ROUTE_19_TRAINER_6, 3, Route19Swimmer5BattleText, Route19Swimmer5EndBattleText, Route19Swimmer5AfterBattleText Route19TrainerHeader7: - trainer EVENT_BEAT_ROUTE_19_TRAINER_7, 4, Route19BattleText8, Route19EndBattleText8, Route19AfterBattleText8 + trainer EVENT_BEAT_ROUTE_19_TRAINER_7, 4, Route19Swimmer6BattleText, Route19Swimmer6EndBattleText, Route19Swimmer6AfterBattleText Route19TrainerHeader8: - trainer EVENT_BEAT_ROUTE_19_TRAINER_8, 4, Route19BattleText9, Route19EndBattleText9, Route19AfterBattleText9 + trainer EVENT_BEAT_ROUTE_19_TRAINER_8, 4, Route19Swimmer7BattleText, Route19Swimmer7EndBattleText, Route19Swimmer7AfterBattleText Route19TrainerHeader9: - trainer EVENT_BEAT_ROUTE_19_TRAINER_9, 4, Route19BattleText10, Route19EndBattleText10, Route19AfterBattleText10 + trainer EVENT_BEAT_ROUTE_19_TRAINER_9, 4, Route19Swimmer8BattleText, Route19Swimmer8EndBattleText, Route19Swimmer8AfterBattleText db -1 ; end -Route19Text1: +Route19CooltrainerM1Text: text_asm ld hl, Route19TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route19Text2: +Route19CooltrainerM2Text: text_asm ld hl, Route19TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route19Text3: +Route19Swimmer1Text: text_asm ld hl, Route19TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route19Text4: +Route19Swimmer2Text: text_asm ld hl, Route19TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route19Text5: +Route19Swimmer3Text: text_asm ld hl, Route19TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route19Text6: +Route19Swimmer4Text: text_asm ld hl, Route19TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route19Text7: +Route19Swimmer5Text: text_asm ld hl, Route19TrainerHeader6 call TalkToTrainer jp TextScriptEnd -Route19Text8: +Route19Swimmer6Text: text_asm ld hl, Route19TrainerHeader7 call TalkToTrainer jp TextScriptEnd -Route19Text9: +Route19Swimmer7Text: text_asm ld hl, Route19TrainerHeader8 call TalkToTrainer jp TextScriptEnd -Route19Text10: +Route19Swimmer8Text: text_asm ld hl, Route19TrainerHeader9 call TalkToTrainer jp TextScriptEnd -Route19BattleText1: - text_far _Route19BattleText1 +Route19CooltrainerM1BattleText: + text_far _Route19CooltrainerM1BattleText text_end -Route19EndBattleText1: - text_far _Route19EndBattleText1 +Route19CooltrainerM1EndBattleText: + text_far _Route19CooltrainerM1EndBattleText text_end -Route19AfterBattleText1: - text_far _Route19AfterBattleText1 +Route19CooltrainerM1AfterBattleText: + text_far _Route19CooltrainerM1AfterBattleText text_end -Route19BattleText2: - text_far _Route19BattleText2 +Route19CooltrainerM2BattleText: + text_far _Route19CooltrainerM2BattleText text_end -Route19EndBattleText2: - text_far _Route19EndBattleText2 +Route19CooltrainerM2EndBattleText: + text_far _Route19CooltrainerM2EndBattleText text_end -Route19AfterBattleText2: - text_far _Route19AfterBattleText2 +Route19CooltrainerM2AfterBattleText: + text_far _Route19CooltrainerM2AfterBattleText text_end -Route19BattleText3: - text_far _Route19BattleText3 +Route19Swimmer1BattleText: + text_far _Route19Swimmer1BattleText text_end -Route19EndBattleText3: - text_far _Route19EndBattleText3 +Route19Swimmer1EndBattleText: + text_far _Route19Swimmer1EndBattleText text_end -Route19AfterBattleText3: - text_far _Route19AfterBattleText3 +Route19Swimmer1AfterBattleText: + text_far _Route19Swimmer1AfterBattleText text_end -Route19BattleText4: - text_far _Route19BattleText4 +Route19Swimmer2BattleText: + text_far _Route19Swimmer2BattleText text_end -Route19EndBattleText4: - text_far _Route19EndBattleText4 +Route19Swimmer2EndBattleText: + text_far _Route19Swimmer2EndBattleText text_end -Route19AfterBattleText4: - text_far _Route19AfterBattleText4 +Route19Swimmer2AfterBattleText: + text_far _Route19Swimmer2AfterBattleText text_end -Route19BattleText5: - text_far _Route19BattleText5 +Route19Swimmer3BattleText: + text_far _Route19Swimmer3BattleText text_end -Route19EndBattleText5: - text_far _Route19EndBattleText5 +Route19Swimmer3EndBattleText: + text_far _Route19Swimmer3EndBattleText text_end -Route19AfterBattleText5: - text_far _Route19AfterBattleText5 +Route19Swimmer3AfterBattleText: + text_far _Route19Swimmer3AfterBattleText text_end -Route19BattleText6: - text_far _Route19BattleText6 +Route19Swimmer4BattleText: + text_far _Route19Swimmer4BattleText text_end -Route19EndBattleText6: - text_far _Route19EndBattleText6 +Route19Swimmer4EndBattleText: + text_far _Route19Swimmer4EndBattleText text_end -Route19AfterBattleText6: - text_far _Route19AfterBattleText6 +Route19Swimmer4AfterBattleText: + text_far _Route19Swimmer4AfterBattleText text_end -Route19BattleText7: - text_far _Route19BattleText7 +Route19Swimmer5BattleText: + text_far _Route19Swimmer5BattleText text_end -Route19EndBattleText7: - text_far _Route19EndBattleText7 +Route19Swimmer5EndBattleText: + text_far _Route19Swimmer5EndBattleText text_end -Route19AfterBattleText7: - text_far _Route19AfterBattleText7 +Route19Swimmer5AfterBattleText: + text_far _Route19Swimmer5AfterBattleText text_end -Route19BattleText8: - text_far _Route19BattleText8 +Route19Swimmer6BattleText: + text_far _Route19Swimmer6BattleText text_end -Route19EndBattleText8: - text_far _Route19EndBattleText8 +Route19Swimmer6EndBattleText: + text_far _Route19Swimmer6EndBattleText text_end -Route19AfterBattleText8: - text_far _Route19AfterBattleText8 +Route19Swimmer6AfterBattleText: + text_far _Route19Swimmer6AfterBattleText text_end -Route19BattleText9: - text_far _Route19BattleText9 +Route19Swimmer7BattleText: + text_far _Route19Swimmer7BattleText text_end -Route19EndBattleText9: - text_far _Route19EndBattleText9 +Route19Swimmer7EndBattleText: + text_far _Route19Swimmer7EndBattleText text_end -Route19AfterBattleText9: - text_far _Route19AfterBattleText9 +Route19Swimmer7AfterBattleText: + text_far _Route19Swimmer7AfterBattleText text_end -Route19BattleText10: - text_far _Route19BattleText10 +Route19Swimmer8BattleText: + text_far _Route19Swimmer8BattleText text_end -Route19EndBattleText10: - text_far _Route19EndBattleText10 +Route19Swimmer8EndBattleText: + text_far _Route19Swimmer8EndBattleText text_end -Route19AfterBattleText10: - text_far _Route19AfterBattleText10 +Route19Swimmer8AfterBattleText: + text_far _Route19Swimmer8AfterBattleText text_end -Route19Text11: - text_far _Route19Text11 +Route19SignText: + text_far _Route19SignText text_end diff --git a/scripts/Route2.asm b/scripts/Route2.asm index c6886ce40..837bbe887 100644 --- a/scripts/Route2.asm +++ b/scripts/Route2.asm @@ -2,15 +2,16 @@ Route2_Script: jp EnableAutoTextBoxDrawing Route2_TextPointers: - dw PickUpItemText - dw PickUpItemText - dw Route2Text3 - dw Route2Text4 + def_text_pointers + dw_const PickUpItemText, TEXT_ROUTE2_MOON_STONE + dw_const PickUpItemText, TEXT_ROUTE2_HP_UP + dw_const Route2SignText, TEXT_ROUTE2_SIGN + dw_const Route2DiglettsCaveSignText, TEXT_ROUTE2_DIGLETTS_CAVE_SIGN -Route2Text3: - text_far _Route2Text3 +Route2SignText: + text_far _Route2SignText text_end -Route2Text4: - text_far _Route2Text4 +Route2DiglettsCaveSignText: + text_far _Route2DiglettsCaveSignText text_end diff --git a/scripts/Route20.asm b/scripts/Route20.asm index fd20f7223..5230858e5 100644 --- a/scripts/Route20.asm +++ b/scripts/Route20.asm @@ -1,6 +1,6 @@ Route20_Script: CheckAndResetEvent EVENT_IN_SEAFOAM_ISLANDS - call nz, Route20Script_50cc6 + call nz, Route20BoulderScript call EnableAutoTextBoxDrawing ld hl, Route20TrainerHeaders ld de, Route20_ScriptPointers @@ -9,22 +9,22 @@ Route20_Script: ld [wRoute20CurScript], a ret -Route20Script_50cc6: +Route20BoulderScript: CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE - jr z, .asm_50cef + jr z, .next_boulder_check ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_1 - call Route20Script_50d0c + call Route20ShowObjectScript ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_2 - call Route20Script_50d0c + call Route20ShowObjectScript ld hl, .MissableObjectIDs -.asm_50cdc +.hide_missable_objects ld a, [hli] cp $ff - jr z, .asm_50cef + jr z, .next_boulder_check push hl - call Route20Script_50d14 + call Route20HideObjectScript pop hl - jr .asm_50cdc + jr .hide_missable_objects .MissableObjectIDs: db HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 @@ -35,251 +35,252 @@ Route20Script_50cc6: db HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 db -1 ; end -.asm_50cef +.next_boulder_check CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE ret z ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_1 - call Route20Script_50d0c + call Route20ShowObjectScript ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_2 - call Route20Script_50d0c + call Route20ShowObjectScript ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 - call Route20Script_50d14 + call Route20HideObjectScript ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 - call Route20Script_50d14 + call Route20HideObjectScript ret -Route20Script_50d0c: +Route20ShowObjectScript: ld [wMissableObjectIndex], a predef_jump ShowObject -Route20Script_50d14: +Route20HideObjectScript: ld [wMissableObjectIndex], a predef_jump HideObject Route20_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_ROUTE20_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE20_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROUTE20_END_BATTLE Route20_TextPointers: - dw Route20Text1 - dw Route20Text2 - dw Route20Text3 - dw Route20Text4 - dw Route20Text5 - dw Route20Text6 - dw Route20Text7 - dw Route20Text8 - dw Route20Text9 - dw Route20Text10 - dw Route20Text11 - dw Route20Text12 + def_text_pointers + dw_const Route20Swimmer1Text, TEXT_ROUTE20_SWIMMER1 + dw_const Route20Swimmer2Text, TEXT_ROUTE20_SWIMMER2 + dw_const Route20Swimmer3Text, TEXT_ROUTE20_SWIMMER3 + dw_const Route20Swimmer4Text, TEXT_ROUTE20_SWIMMER4 + dw_const Route20Swimmer5Text, TEXT_ROUTE20_SWIMMER5 + dw_const Route20Swimmer6Text, TEXT_ROUTE20_SWIMMER6 + dw_const Route20CooltrainerMText, TEXT_ROUTE20_COOLTRAINER_M + dw_const Route20Swimmer7Text, TEXT_ROUTE20_SWIMMER7 + dw_const Route20Swimmer8Text, TEXT_ROUTE20_SWIMMER8 + dw_const Route20Swimmer9Text, TEXT_ROUTE20_SWIMMER9 + dw_const Route20SeafoamIslandsSignText, TEXT_ROUTE20_SEAFOAM_ISLANDS_WEST_SIGN + dw_const Route20SeafoamIslandsSignText, TEXT_ROUTE20_SEAFOAM_ISLANDS_EAST_SIGN Route20TrainerHeaders: def_trainers Route20TrainerHeader0: - trainer EVENT_BEAT_ROUTE_20_TRAINER_0, 4, Route20BattleText1, Route20EndBattleText1, Route20AfterBattleText1 + trainer EVENT_BEAT_ROUTE_20_TRAINER_0, 4, Route20Swimmer1BattleText, Route20Swimmer1EndBattleText, Route20Swimmer1AfterBattleText Route20TrainerHeader1: - trainer EVENT_BEAT_ROUTE_20_TRAINER_1, 4, Route20BattleText2, Route20EndBattleText2, Route20AfterBattleText2 + trainer EVENT_BEAT_ROUTE_20_TRAINER_1, 4, Route20Swimmer2BattleText, Route20Swimmer2EndBattleText, Route20Swimmer2AfterBattleText Route20TrainerHeader2: - trainer EVENT_BEAT_ROUTE_20_TRAINER_2, 2, Route20BattleText3, Route20EndBattleText3, Route20AfterBattleText3 + trainer EVENT_BEAT_ROUTE_20_TRAINER_2, 2, Route20Swimmer3BattleText, Route20Swimmer3EndBattleText, Route20Swimmer3AfterBattleText Route20TrainerHeader3: - trainer EVENT_BEAT_ROUTE_20_TRAINER_3, 4, Route20BattleText4, Route20EndBattleText4, Route20AfterBattleText4 + trainer EVENT_BEAT_ROUTE_20_TRAINER_3, 4, Route20Swimmer4BattleText, Route20Swimmer4EndBattleText, Route20Swimmer4AfterBattleText Route20TrainerHeader4: - trainer EVENT_BEAT_ROUTE_20_TRAINER_4, 3, Route20BattleText5, Route20EndBattleText5, Route20AfterBattleText5 + trainer EVENT_BEAT_ROUTE_20_TRAINER_4, 3, Route20Swimmer5BattleText, Route20Swimmer5EndBattleText, Route20Swimmer5AfterBattleText Route20TrainerHeader5: - trainer EVENT_BEAT_ROUTE_20_TRAINER_5, 4, Route20BattleText6, Route20EndBattleText6, Route20AfterBattleText6 + trainer EVENT_BEAT_ROUTE_20_TRAINER_5, 4, Route20Swimmer6BattleText, Route20Swimmer6EndBattleText, Route20Swimmer6AfterBattleText Route20TrainerHeader6: - trainer EVENT_BEAT_ROUTE_20_TRAINER_6, 2, Route20BattleText7, Route20EndBattleText7, Route20AfterBattleText7 + trainer EVENT_BEAT_ROUTE_20_TRAINER_6, 2, Route20CooltrainerMBattleText, Route20CooltrainerMEndBattleText, Route20CooltrainerMAfterBattleText Route20TrainerHeader7: - trainer EVENT_BEAT_ROUTE_20_TRAINER_7, 4, Route20BattleText8, Route20EndBattleText8, Route20AfterBattleText8 + trainer EVENT_BEAT_ROUTE_20_TRAINER_7, 4, Route20Swimmer7BattleText, Route20Swimmer7EndBattleText, Route20Swimmer7AfterBattleText Route20TrainerHeader8: - trainer EVENT_BEAT_ROUTE_20_TRAINER_8, 3, Route20BattleText9, Route20EndBattleText9, Route20AfterBattleText9 + trainer EVENT_BEAT_ROUTE_20_TRAINER_8, 3, Route20Swimmer8BattleText, Route20Swimmer8EndBattleText, Route20Swimmer8AfterBattleText Route20TrainerHeader9: - trainer EVENT_BEAT_ROUTE_20_TRAINER_9, 4, Route20BattleText10, Route20EndBattleText10, Route20AfterBattleText10 + trainer EVENT_BEAT_ROUTE_20_TRAINER_9, 4, Route20Swimmer9BattleText, Route20Swimmer9EndBattleText, Route20Swimmer9AfterBattleText db -1 ; end -Route20Text1: +Route20Swimmer1Text: text_asm ld hl, Route20TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route20Text2: +Route20Swimmer2Text: text_asm ld hl, Route20TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route20Text3: +Route20Swimmer3Text: text_asm ld hl, Route20TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route20Text4: +Route20Swimmer4Text: text_asm ld hl, Route20TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route20Text5: +Route20Swimmer5Text: text_asm ld hl, Route20TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route20Text6: +Route20Swimmer6Text: text_asm ld hl, Route20TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route20Text7: +Route20CooltrainerMText: text_asm ld hl, Route20TrainerHeader6 call TalkToTrainer jp TextScriptEnd -Route20Text8: +Route20Swimmer7Text: text_asm ld hl, Route20TrainerHeader7 call TalkToTrainer jp TextScriptEnd -Route20Text9: +Route20Swimmer8Text: text_asm ld hl, Route20TrainerHeader8 call TalkToTrainer jp TextScriptEnd -Route20Text10: +Route20Swimmer9Text: text_asm ld hl, Route20TrainerHeader9 call TalkToTrainer jp TextScriptEnd -Route20BattleText1: - text_far _Route20BattleText1 +Route20Swimmer1BattleText: + text_far _Route20Swimmer1BattleText text_end -Route20EndBattleText1: - text_far _Route20EndBattleText1 +Route20Swimmer1EndBattleText: + text_far _Route20Swimmer1EndBattleText text_end -Route20AfterBattleText1: - text_far _Route20AfterBattleText1 +Route20Swimmer1AfterBattleText: + text_far _Route20Swimmer1AfterBattleText text_end -Route20BattleText2: - text_far _Route20BattleText2 +Route20Swimmer2BattleText: + text_far _Route20Swimmer2BattleText text_end -Route20EndBattleText2: - text_far _Route20EndBattleText2 +Route20Swimmer2EndBattleText: + text_far _Route20Swimmer2EndBattleText text_end -Route20AfterBattleText2: - text_far _Route20AfterBattleText2 +Route20Swimmer2AfterBattleText: + text_far _Route20Swimmer2AfterBattleText text_end -Route20BattleText3: - text_far _Route20BattleText3 +Route20Swimmer3BattleText: + text_far _Route20Swimmer3BattleText text_end -Route20EndBattleText3: - text_far _Route20EndBattleText3 +Route20Swimmer3EndBattleText: + text_far _Route20Swimmer3EndBattleText text_end -Route20AfterBattleText3: - text_far _Route20AfterBattleText3 +Route20Swimmer3AfterBattleText: + text_far _Route20Swimmer3AfterBattleText text_end -Route20BattleText4: - text_far _Route20BattleText4 +Route20Swimmer4BattleText: + text_far _Route20Swimmer4BattleText text_end -Route20EndBattleText4: - text_far _Route20EndBattleText4 +Route20Swimmer4EndBattleText: + text_far _Route20Swimmer4EndBattleText text_end -Route20AfterBattleText4: - text_far _Route20AfterBattleText4 +Route20Swimmer4AfterBattleText: + text_far _Route20Swimmer4AfterBattleText text_end -Route20BattleText5: - text_far _Route20BattleText5 +Route20Swimmer5BattleText: + text_far _Route20Swimmer5BattleText text_end -Route20EndBattleText5: - text_far _Route20EndBattleText5 +Route20Swimmer5EndBattleText: + text_far _Route20Swimmer5EndBattleText text_end -Route20AfterBattleText5: - text_far _Route20AfterBattleText5 +Route20Swimmer5AfterBattleText: + text_far _Route20Swimmer5AfterBattleText text_end -Route20BattleText6: - text_far _Route20BattleText6 +Route20Swimmer6BattleText: + text_far _Route20Swimmer6BattleText text_end -Route20EndBattleText6: - text_far _Route20EndBattleText6 +Route20Swimmer6EndBattleText: + text_far _Route20Swimmer6EndBattleText text_end -Route20AfterBattleText6: - text_far _Route20AfterBattleText6 +Route20Swimmer6AfterBattleText: + text_far _Route20Swimmer6AfterBattleText text_end -Route20BattleText7: - text_far _Route20BattleText7 +Route20CooltrainerMBattleText: + text_far _Route20CooltrainerMBattleText text_end -Route20EndBattleText7: - text_far _Route20EndBattleText7 +Route20CooltrainerMEndBattleText: + text_far _Route20CooltrainerMEndBattleText text_end -Route20AfterBattleText7: - text_far _Route20AfterBattleText7 +Route20CooltrainerMAfterBattleText: + text_far _Route20CooltrainerMAfterBattleText text_end -Route20BattleText8: - text_far _Route20BattleText8 +Route20Swimmer7BattleText: + text_far _Route20Swimmer7BattleText text_end -Route20EndBattleText8: - text_far _Route20EndBattleText8 +Route20Swimmer7EndBattleText: + text_far _Route20Swimmer7EndBattleText text_end -Route20AfterBattleText8: - text_far _Route20AfterBattleText8 +Route20Swimmer7AfterBattleText: + text_far _Route20Swimmer7AfterBattleText text_end -Route20BattleText9: - text_far _Route20BattleText9 +Route20Swimmer8BattleText: + text_far _Route20Swimmer8BattleText text_end -Route20EndBattleText9: - text_far _Route20EndBattleText9 +Route20Swimmer8EndBattleText: + text_far _Route20Swimmer8EndBattleText text_end -Route20AfterBattleText9: - text_far _Route20AfterBattleText9 +Route20Swimmer8AfterBattleText: + text_far _Route20Swimmer8AfterBattleText text_end -Route20BattleText10: - text_far _Route20BattleText10 +Route20Swimmer9BattleText: + text_far _Route20Swimmer9BattleText text_end -Route20EndBattleText10: - text_far _Route20EndBattleText10 +Route20Swimmer9EndBattleText: + text_far _Route20Swimmer9EndBattleText text_end -Route20AfterBattleText10: - text_far _Route20AfterBattleText10 +Route20Swimmer9AfterBattleText: + text_far _Route20Swimmer9AfterBattleText text_end -Route20Text12: -Route20Text11: - text_far _Route20Text11 +Route20SeafoamIslandsSignText: + text_far _Route20SeafoamIslandsSignText text_end diff --git a/scripts/Route21.asm b/scripts/Route21.asm index c4267816e..91840b8f1 100644 --- a/scripts/Route21.asm +++ b/scripts/Route21.asm @@ -8,201 +8,203 @@ Route21_Script: ret Route21_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_ROUTE21_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE21_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROUTE21_END_BATTLE Route21_TextPointers: - dw Route21Text1 - dw Route21Text2 - dw Route21Text3 - dw Route21Text4 - dw Route21Text5 - dw Route21Text6 - dw Route21Text7 - dw Route21Text8 - dw Route21Text9 + def_text_pointers + dw_const Route21Fisher1Text, TEXT_ROUTE21_FISHER1 + dw_const Route21Fisher2Text, TEXT_ROUTE21_FISHER2 + dw_const Route21Swimmer1Text, TEXT_ROUTE21_SWIMMER1 + dw_const Route21Swimmer2Text, TEXT_ROUTE21_SWIMMER2 + dw_const Route21Swimmer3Text, TEXT_ROUTE21_SWIMMER3 + dw_const Route21Swimmer4Text, TEXT_ROUTE21_SWIMMER4 + dw_const Route21Swimmer5Text, TEXT_ROUTE21_SWIMMER5 + dw_const Route21Fisher3Text, TEXT_ROUTE21_FISHER3 + dw_const Route21Fisher4Text, TEXT_ROUTE21_FISHER4 Route21TrainerHeaders: def_trainers Route21TrainerHeader0: - trainer EVENT_BEAT_ROUTE_21_TRAINER_0, 0, Route21BattleText1, Route21EndBattleText1, Route21AfterBattleText1 + trainer EVENT_BEAT_ROUTE_21_TRAINER_0, 0, Route21Fisher1BattleText, Route21Fisher1EndBattleText, Route21Fisher1AfterBattleText Route21TrainerHeader1: - trainer EVENT_BEAT_ROUTE_21_TRAINER_1, 0, Route21BattleText2, Route21EndBattleText2, Route21AfterBattleText2 + trainer EVENT_BEAT_ROUTE_21_TRAINER_1, 0, Route21Fisher2BattleText, Route21Fisher2EndBattleText, Route21Fisher2AfterBattleText Route21TrainerHeader2: - trainer EVENT_BEAT_ROUTE_21_TRAINER_2, 4, Route21BattleText3, Route21EndBattleText3, Route21AfterBattleText3 + trainer EVENT_BEAT_ROUTE_21_TRAINER_2, 4, Route21Swimmer1BattleText, Route21Swimmer1EndBattleText, Route21Swimmer1AfterBattleText Route21TrainerHeader3: - trainer EVENT_BEAT_ROUTE_21_TRAINER_3, 4, Route21BattleText4, Route21EndBattleText4, Route21AfterBattleText4 + trainer EVENT_BEAT_ROUTE_21_TRAINER_3, 4, Route21Swimmer2BattleText, Route21Swimmer2EndBattleText, Route21Swimmer2AfterBattleText Route21TrainerHeader4: - trainer EVENT_BEAT_ROUTE_21_TRAINER_4, 4, Route21BattleText5, Route21EndBattleText5, Route21AfterBattleText5 + trainer EVENT_BEAT_ROUTE_21_TRAINER_4, 4, Route21Swimmer3BattleText, Route21Swimmer3EndBattleText, Route21Swimmer3AfterBattleText Route21TrainerHeader5: - trainer EVENT_BEAT_ROUTE_21_TRAINER_5, 4, Route21BattleText6, Route21EndBattleText6, Route21AfterBattleText6 + trainer EVENT_BEAT_ROUTE_21_TRAINER_5, 4, Route21Swimmer4BattleText, Route21Swimmer4EndBattleText, Route21Swimmer4AfterBattleText Route21TrainerHeader6: - trainer EVENT_BEAT_ROUTE_21_TRAINER_6, 3, Route21BattleText7, Route21EndBattleText7, Route21AfterBattleText7 + trainer EVENT_BEAT_ROUTE_21_TRAINER_6, 3, Route21Swimmer5BattleText, Route21Swimmer5EndBattleText, Route21Swimmer5AfterBattleText Route21TrainerHeader7: - trainer EVENT_BEAT_ROUTE_21_TRAINER_7, 0, Route21BattleText8, Route21EndBattleText8, Route21AfterBattleText8 + trainer EVENT_BEAT_ROUTE_21_TRAINER_7, 0, Route21Fisher3BattleText, Route21Fisher3EndBattleText, Route21Fisher3AfterBattleText Route21TrainerHeader8: - trainer EVENT_BEAT_ROUTE_21_TRAINER_8, 0, Route21BattleText9, Route21EndBattleText9, Route21AfterBattleText9 + trainer EVENT_BEAT_ROUTE_21_TRAINER_8, 0, Route21Fisher4BattleText, Route21Fisher4EndBattleText, Route21Fisher4AfterBattleText db -1 ; end -Route21Text1: +Route21Fisher1Text: text_asm ld hl, Route21TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route21Text2: +Route21Fisher2Text: text_asm ld hl, Route21TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route21Text3: +Route21Swimmer1Text: text_asm ld hl, Route21TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route21Text4: +Route21Swimmer2Text: text_asm ld hl, Route21TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route21Text5: +Route21Swimmer3Text: text_asm ld hl, Route21TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route21Text6: +Route21Swimmer4Text: text_asm ld hl, Route21TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route21Text7: +Route21Swimmer5Text: text_asm ld hl, Route21TrainerHeader6 call TalkToTrainer jp TextScriptEnd -Route21Text8: +Route21Fisher3Text: text_asm ld hl, Route21TrainerHeader7 call TalkToTrainer jp TextScriptEnd -Route21Text9: +Route21Fisher4Text: text_asm ld hl, Route21TrainerHeader8 call TalkToTrainer jp TextScriptEnd -Route21BattleText1: - text_far _Route21BattleText1 +Route21Fisher1BattleText: + text_far _Route21Fisher1BattleText text_end -Route21EndBattleText1: - text_far _Route21EndBattleText1 +Route21Fisher1EndBattleText: + text_far _Route21Fisher1EndBattleText text_end -Route21AfterBattleText1: - text_far _Route21AfterBattleText1 +Route21Fisher1AfterBattleText: + text_far _Route21Fisher1AfterBattleText text_end -Route21BattleText2: - text_far _Route21BattleText2 +Route21Fisher2BattleText: + text_far _Route21Fisher2BattleText text_end -Route21EndBattleText2: - text_far _Route21EndBattleText2 +Route21Fisher2EndBattleText: + text_far _Route21Fisher2EndBattleText text_end -Route21AfterBattleText2: - text_far _Route21AfterBattleText2 +Route21Fisher2AfterBattleText: + text_far _Route21Fisher2AfterBattleText text_end -Route21BattleText3: - text_far _Route21BattleText3 +Route21Swimmer1BattleText: + text_far _Route21Swimmer1BattleText text_end -Route21EndBattleText3: - text_far _Route21EndBattleText3 +Route21Swimmer1EndBattleText: + text_far _Route21Swimmer1EndBattleText text_end -Route21AfterBattleText3: - text_far _Route21AfterBattleText3 +Route21Swimmer1AfterBattleText: + text_far _Route21Swimmer1AfterBattleText text_end -Route21BattleText4: - text_far _Route21BattleText4 +Route21Swimmer2BattleText: + text_far _Route21Swimmer2BattleText text_end -Route21EndBattleText4: - text_far _Route21EndBattleText4 +Route21Swimmer2EndBattleText: + text_far _Route21Swimmer2EndBattleText text_end -Route21AfterBattleText4: - text_far _Route21AfterBattleText4 +Route21Swimmer2AfterBattleText: + text_far _Route21Swimmer2AfterBattleText text_end -Route21BattleText5: - text_far _Route21BattleText5 +Route21Swimmer3BattleText: + text_far _Route21Swimmer3BattleText text_end -Route21EndBattleText5: - text_far _Route21EndBattleText5 +Route21Swimmer3EndBattleText: + text_far _Route21Swimmer3EndBattleText text_end -Route21AfterBattleText5: - text_far _Route21AfterBattleText5 +Route21Swimmer3AfterBattleText: + text_far _Route21Swimmer3AfterBattleText text_end -Route21BattleText6: - text_far _Route21BattleText6 +Route21Swimmer4BattleText: + text_far _Route21Swimmer4BattleText text_end -Route21EndBattleText6: - text_far _Route21EndBattleText6 +Route21Swimmer4EndBattleText: + text_far _Route21Swimmer4EndBattleText text_end -Route21AfterBattleText6: - text_far _Route21AfterBattleText6 +Route21Swimmer4AfterBattleText: + text_far _Route21Swimmer4AfterBattleText text_end -Route21BattleText7: - text_far _Route21BattleText7 +Route21Swimmer5BattleText: + text_far _Route21Swimmer5BattleText text_end -Route21EndBattleText7: - text_far _Route21EndBattleText7 +Route21Swimmer5EndBattleText: + text_far _Route21Swimmer5EndBattleText text_end -Route21AfterBattleText7: - text_far _Route21AfterBattleText7 +Route21Swimmer5AfterBattleText: + text_far _Route21Swimmer5AfterBattleText text_end -Route21BattleText8: - text_far _Route21BattleText8 +Route21Fisher3BattleText: + text_far _Route21Fisher3BattleText text_end -Route21EndBattleText8: - text_far _Route21EndBattleText8 +Route21Fisher3EndBattleText: + text_far _Route21Fisher3EndBattleText text_end -Route21AfterBattleText8: - text_far _Route21AfterBattleText8 +Route21Fisher3AfterBattleText: + text_far _Route21Fisher3AfterBattleText text_end -Route21BattleText9: - text_far _Route21BattleText9 +Route21Fisher4BattleText: + text_far _Route21Fisher4BattleText text_end -Route21EndBattleText9: - text_far _Route21EndBattleText9 +Route21Fisher4EndBattleText: + text_far _Route21Fisher4EndBattleText text_end -Route21AfterBattleText9: - text_far _Route21AfterBattleText9 +Route21Fisher4AfterBattleText: + text_far _Route21Fisher4AfterBattleText text_end diff --git a/scripts/Route22.asm b/scripts/Route22.asm index 1b02752fc..f692cb375 100644 --- a/scripts/Route22.asm +++ b/scripts/Route22.asm @@ -5,37 +5,38 @@ Route22_Script: jp CallFunctionInTable Route22_ScriptPointers: - dw Route22Script0 - dw Route22Script1 - dw Route22Script2 - dw Route22Script3 - dw Route22Script4 - dw Route22Script5 - dw Route22Script6 - dw Route22Script7 - -Route22Script_50ece: - xor a + def_script_pointers + dw_const Route22DefaultScript, SCRIPT_ROUTE22_DEFAULT + dw_const Route22Rival1StartBattleScript, SCRIPT_ROUTE22_RIVAL1_START_BATTLE + dw_const Route22Rival1AfterBattleScript, SCRIPT_ROUTE22_RIVAL1_AFTER_BATTLE + dw_const Route22Rival1ExitScript, SCRIPT_ROUTE22_RIVAL1_EXIT + dw_const Route22Rival2StartBattleScript, SCRIPT_ROUTE22_RIVAL2_START_BATTLE + dw_const Route22Rival2AfterBattleScript, SCRIPT_ROUTE22_RIVAL2_AFTER_BATTLE + dw_const Route22Rival2ExitScript, SCRIPT_ROUTE22_RIVAL2_EXIT + dw_const Route22NoopScript, SCRIPT_ROUTE22_NOOP + +Route22SetDefaultScript: + xor a ; SCRIPT_ROUTE22_DEFAULT ld [wJoyIgnore], a ld [wRoute22CurScript], a -Route22Script7: +Route22NoopScript: ret -Route22Script_50ed6: +Route22GetRivalTrainerNoByStarterScript: ld a, [wRivalStarter] ld b, a -.asm_50eda +.next_trainer_no ld a, [hli] cp b - jr z, .asm_50ee1 + jr z, .got_trainer_no inc hl - jr .asm_50eda -.asm_50ee1 + jr .next_trainer_no +.got_trainer_no ld a, [hl] ld [wTrainerNo], a ret -Route22MoveRivalSprite: +Route22MoveRivalRightScript: ld de, Route22RivalMovementData ld a, [wcf0d] cp $1 @@ -54,7 +55,7 @@ Route22RivalMovementData: db NPC_MOVEMENT_RIGHT db -1 ; end -Route22Script0: +Route22DefaultScript: CheckEvent EVENT_ROUTE22_RIVAL_WANTS_BATTLE ret z ld hl, .Route22RivalBattleCoords @@ -64,14 +65,14 @@ Route22Script0: ld [wcf0d], a xor a ldh [hJoyHeld], a - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ld a, PLAYER_DIR_LEFT ld [wPlayerMovingDirection], a CheckEvent EVENT_1ST_ROUTE22_RIVAL_BATTLE - jr nz, .firstRivalBattle - CheckEventReuseA EVENT_2ND_ROUTE22_RIVAL_BATTLE ; is this the rival at the end of the game? - jp nz, Route22Script_5104e + jr nz, Route22FirstRivalBattleScript + CheckEventReuseA EVENT_2ND_ROUTE22_RIVAL_BATTLE + jp nz, Route22SecondRivalBattleScript ret .Route22RivalBattleCoords @@ -79,92 +80,92 @@ Route22Script0: dbmapcoord 29, 5 db -1 ; end -.firstRivalBattle - ld a, $1 +Route22FirstRivalBattleScript: + ld a, ROUTE22_RIVAL1 ld [wEmotionBubbleSpriteIndex], a xor a ; EXCLAMATION_BUBBLE ld [wWhichEmotionBubble], a predef EmotionBubble ld a, [wWalkBikeSurfState] and a - jr z, .asm_50f4e + jr z, .walking ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound -.asm_50f4e +.walking ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic - ld a, $1 + ld a, ROUTE22_RIVAL1 ldh [hSpriteIndex], a - call Route22MoveRivalSprite - ld a, $1 + call Route22MoveRivalRightScript + ld a, SCRIPT_ROUTE22_RIVAL1_START_BATTLE ld [wRoute22CurScript], a ret -Route22Script1: +Route22Rival1StartBattleScript: ld a, [wd730] bit 0, a ret nz ld a, [wcf0d] cp $1 - jr nz, .asm_50f78 + jr nz, .set_rival_facing_right ld a, PLAYER_DIR_DOWN ld [wPlayerMovingDirection], a ld a, SPRITE_FACING_UP - jr .asm_50f7a -.asm_50f78 + jr .set_rival_facing_direction +.set_rival_facing_right ld a, SPRITE_FACING_RIGHT -.asm_50f7a +.set_rival_facing_direction ldh [hSpriteFacingDirection], a - ld a, $1 + ld a, ROUTE22_RIVAL1 ldh [hSpriteIndex], a call SetSpriteFacingDirectionAndDelay xor a ld [wJoyIgnore], a - ld a, $1 + ld a, TEXT_ROUTE22_RIVAL1 ldh [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, Route22RivalDefeatedText1 - ld de, Route22Text_511bc + ld hl, Route22Rival1DefeatedText + ld de, Route22Rival1VictoryText call SaveEndBattleTextPointers ld a, OPP_RIVAL1 ld [wCurOpponent], a - ld hl, StarterMons_50faf - call Route22Script_50ed6 - ld a, $2 + ld hl, .StarterTable + call Route22GetRivalTrainerNoByStarterScript + ld a, SCRIPT_ROUTE22_RIVAL1_AFTER_BATTLE ld [wRoute22CurScript], a ret -StarterMons_50faf: +.StarterTable: ; starter the rival picked, rival trainer number db STARTER2, 4 db STARTER3, 5 db STARTER1, 6 -Route22Script2: +Route22Rival1AfterBattleScript: ld a, [wIsInBattle] cp $ff - jp z, Route22Script_50ece + jp z, Route22SetDefaultScript ld a, [wSpritePlayerStateData1FacingDirection] and a ; cp SPRITE_FACING_DOWN - jr nz, .notDown + jr nz, .not_facing_down ld a, SPRITE_FACING_UP - jr .done -.notDown + jr .set_rival_facing +.not_facing_down ld a, SPRITE_FACING_RIGHT -.done +.set_rival_facing ldh [hSpriteFacingDirection], a - ld a, $1 + ld a, ROUTE22_RIVAL1 ldh [hSpriteIndex], a call SetSpriteFacingDirectionAndDelay - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a SetEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE - ld a, $1 + ld a, TEXT_ROUTE22_RIVAL1 ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, SFX_STOP_ALL_MUSIC @@ -173,28 +174,28 @@ Route22Script2: farcall Music_RivalAlternateStart ld a, [wcf0d] cp $1 - jr nz, .asm_50fff - call Route22Script_51008 - jr .asm_51002 -.asm_50fff - call Route22Script_5100d -.asm_51002 - ld a, $3 + jr nz, .exit_movement_2 + call .RivalExit1Script + jr .next_script +.exit_movement_2 + call .RivalExit2Script +.next_script + ld a, SCRIPT_ROUTE22_RIVAL1_EXIT ld [wRoute22CurScript], a ret -Route22Script_51008: - ld de, Route22RivalExitMovementData1 +.RivalExit1Script: + ld de, Route22Rival1ExitMovementData1 jr Route22MoveRival1 -Route22Script_5100d: - ld de, Route22RivalExitMovementData2 +.RivalExit2Script: + ld de, Route22Rival1ExitMovementData2 Route22MoveRival1: - ld a, $1 + ld a, ROUTE22_RIVAL1 ldh [hSpriteIndex], a jp MoveSprite -Route22RivalExitMovementData1: +Route22Rival1ExitMovementData1: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_DOWN @@ -204,7 +205,7 @@ Route22RivalExitMovementData1: db NPC_MOVEMENT_DOWN db -1 ; end -Route22RivalExitMovementData2: +Route22Rival1ExitMovementData2: db NPC_MOVEMENT_UP db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT @@ -217,7 +218,7 @@ Route22RivalExitMovementData2: db NPC_MOVEMENT_DOWN db -1 ; end -Route22Script3: +Route22Rival1ExitScript: ld a, [wd730] bit 0, a ret nz @@ -228,102 +229,102 @@ Route22Script3: predef HideObject call PlayDefaultMusic ResetEvents EVENT_1ST_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE - ld a, $0 + ld a, SCRIPT_ROUTE22_DEFAULT ld [wRoute22CurScript], a ret -Route22Script_5104e: - ld a, $2 +Route22SecondRivalBattleScript: + ld a, ROUTE22_RIVAL2 ld [wEmotionBubbleSpriteIndex], a xor a ; EXCLAMATION_BUBBLE ld [wWhichEmotionBubble], a predef EmotionBubble ld a, [wWalkBikeSurfState] and a - jr z, .skipYVisibilityTesta + jr z, .walking ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound -.skipYVisibilityTesta +.walking ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound farcall Music_RivalAlternateTempo - ld a, $2 + ld a, ROUTE22_RIVAL2 ldh [hSpriteIndex], a - call Route22MoveRivalSprite - ld a, $4 + call Route22MoveRivalRightScript + ld a, SCRIPT_ROUTE22_RIVAL2_START_BATTLE ld [wRoute22CurScript], a ret -Route22Script4: +Route22Rival2StartBattleScript: ld a, [wd730] bit 0, a ret nz - ld a, $2 + ld a, ROUTE22_RIVAL2 ldh [hSpriteIndex], a ld a, [wcf0d] cp $1 - jr nz, .asm_510a1 + jr nz, .set_player_direction_left ld a, PLAYER_DIR_DOWN ld [wPlayerMovingDirection], a ld a, SPRITE_FACING_UP - jr .asm_510a8 -.asm_510a1 + jr .set_rival_facing_direction +.set_player_direction_left ld a, PLAYER_DIR_LEFT ld [wPlayerMovingDirection], a ld a, SPRITE_FACING_RIGHT -.asm_510a8 +.set_rival_facing_direction ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay xor a ld [wJoyIgnore], a - ld a, $2 + ld a, TEXT_ROUTE22_RIVAL2 ldh [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, Route22RivalDefeatedText2 - ld de, Route22Text_511d0 + ld hl, Route22Rival2DefeatedText + ld de, Route22Rival2VictoryText call SaveEndBattleTextPointers ld a, OPP_RIVAL2 ld [wCurOpponent], a - ld hl, StarterMons_510d9 - call Route22Script_50ed6 - ld a, $5 + ld hl, .StarterTable + call Route22GetRivalTrainerNoByStarterScript + ld a, SCRIPT_ROUTE22_RIVAL2_AFTER_BATTLE ld [wRoute22CurScript], a ret -StarterMons_510d9: +.StarterTable: db STARTER2, 10 db STARTER3, 11 db STARTER1, 12 -Route22Script5: +Route22Rival2AfterBattleScript: ld a, [wIsInBattle] cp $ff - jp z, Route22Script_50ece - ld a, $2 + jp z, Route22SetDefaultScript + ld a, ROUTE22_RIVAL2 ldh [hSpriteIndex], a ld a, [wcf0d] cp $1 - jr nz, .asm_510fb + jr nz, .set_player_direction_left ld a, PLAYER_DIR_DOWN ld [wPlayerMovingDirection], a ld a, SPRITE_FACING_UP - jr .asm_51102 -.asm_510fb + jr .set_rival_facing_direction +.set_player_direction_left ld a, PLAYER_DIR_LEFT ld [wPlayerMovingDirection], a ld a, SPRITE_FACING_RIGHT -.asm_51102 +.set_rival_facing_direction ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a SetEvent EVENT_BEAT_ROUTE22_RIVAL_2ND_BATTLE - ld a, $2 + ld a, TEXT_ROUTE22_RIVAL2 ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, SFX_STOP_ALL_MUSIC @@ -332,36 +333,36 @@ Route22Script5: farcall Music_RivalAlternateStartAndTempo ld a, [wcf0d] cp $1 - jr nz, .asm_51134 - call Route22Script_5113d - jr .asm_51137 -.asm_51134 - call Route22Script_51142 -.asm_51137 - ld a, $6 + jr nz, .exit_movement_2 + call .RivalExit1Script + jr .next_script +.exit_movement_2 + call .RivalExit2Script +.next_script + ld a, SCRIPT_ROUTE22_RIVAL2_EXIT ld [wRoute22CurScript], a ret -Route22Script_5113d: - ld de, MovementData_5114c +.RivalExit1Script: + ld de, Route22Rival2ExitMovementData1 jr Route22MoveRival2 -Route22Script_51142: - ld de, MovementData_5114d +.RivalExit2Script: + ld de, Route22Rival2ExitMovementData2 Route22MoveRival2: - ld a, $2 + ld a, ROUTE22_RIVAL2 ldh [hSpriteIndex], a jp MoveSprite -MovementData_5114c: +Route22Rival2ExitMovementData1: db NPC_MOVEMENT_LEFT -MovementData_5114d: +Route22Rival2ExitMovementData2: db NPC_MOVEMENT_LEFT db NPC_MOVEMENT_LEFT db NPC_MOVEMENT_LEFT db -1 ; end -Route22Script6: +Route22Rival2ExitScript: ld a, [wd730] bit 0, a ret nz @@ -372,39 +373,40 @@ Route22Script6: predef HideObject call PlayDefaultMusic ResetEvents EVENT_2ND_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE - ld a, $7 + ld a, SCRIPT_ROUTE22_NOOP ld [wRoute22CurScript], a ret Route22_TextPointers: - dw Route22Text1 - dw Route22Text2 - dw Route22FrontGateText + def_text_pointers + dw_const Route22Rival1Text, TEXT_ROUTE22_RIVAL1 + dw_const Route22Rival2Text, TEXT_ROUTE22_RIVAL2 + dw_const Route22PokemonLeagueSignText, TEXT_ROUTE22_POKEMON_LEAGUE_SIGN -Route22Text1: +Route22Rival1Text: text_asm CheckEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE - jr z, .asm_5118b + jr z, .before_battle ld hl, Route22RivalAfterBattleText1 call PrintText - jr .asm_51191 -.asm_5118b + jr .text_script_end +.before_battle ld hl, Route22RivalBeforeBattleText1 call PrintText -.asm_51191 +.text_script_end jp TextScriptEnd -Route22Text2: +Route22Rival2Text: text_asm CheckEvent EVENT_BEAT_ROUTE22_RIVAL_2ND_BATTLE - jr z, .asm_511a4 + jr z, .before_battle ld hl, Route22RivalAfterBattleText2 call PrintText - jr .asm_511aa -.asm_511a4 + jr .text_script_end +.before_battle ld hl, Route22RivalBeforeBattleText2 call PrintText -.asm_511aa +.text_script_end jp TextScriptEnd Route22RivalBeforeBattleText1: @@ -415,12 +417,12 @@ Route22RivalAfterBattleText1: text_far _Route22RivalAfterBattleText1 text_end -Route22RivalDefeatedText1: - text_far _Route22RivalDefeatedText1 +Route22Rival1DefeatedText: + text_far _Route22Rival1DefeatedText text_end -Route22Text_511bc: - text_far _Route22Text_511bc +Route22Rival1VictoryText: + text_far _Route22Rival1VictoryText text_end Route22RivalBeforeBattleText2: @@ -431,14 +433,14 @@ Route22RivalAfterBattleText2: text_far _Route22RivalAfterBattleText2 text_end -Route22RivalDefeatedText2: - text_far _Route22RivalDefeatedText2 +Route22Rival2DefeatedText: + text_far _Route22Rival2DefeatedText text_end -Route22Text_511d0: - text_far _Route22Text_511d0 +Route22Rival2VictoryText: + text_far _Route22Rival2VictoryText text_end -Route22FrontGateText: - text_far _Route22FrontGateText +Route22PokemonLeagueSignText: + text_far _Route22PokemonLeagueSignText text_end diff --git a/scripts/Route22Gate.asm b/scripts/Route22Gate.asm index 8a726515e..9bca889df 100644 --- a/scripts/Route22Gate.asm +++ b/scripts/Route22Gate.asm @@ -6,24 +6,25 @@ Route22Gate_Script: ld a, [wYCoord] cp 4 ld a, ROUTE_23 - jr c, .asm_1e69a + jr c, .set_last_map ld a, ROUTE_22 -.asm_1e69a +.set_last_map ld [wLastMap], a ret Route22Gate_ScriptPointers: - dw Route22GateScript0 - dw Route22GateScript1 - dw Route22GateScript2 + def_script_pointers + dw_const Route22GateDefaultScript, SCRIPT_ROUTE22GATE_DEFAULT + dw_const Route22GatePlayerMovingScript, SCRIPT_ROUTE22GATE_PLAYER_MOVING + dw_const Route22GateNoopScript, SCRIPT_ROUTE22GATE_NOOP -Route22GateScript0: +Route22GateDefaultScript: ld hl, Route22GateScriptCoords call ArePlayerCoordsInArray ret nc xor a ldh [hJoyHeld], a - ld a, $1 + ld a, TEXT_ROUTE22GATE_GUARD ldh [hSpriteIndexOrTextID], a jp DisplayTextID @@ -32,7 +33,7 @@ Route22GateScriptCoords: dbmapcoord 5, 2 db -1 ; end -Route22GateScript_1e6ba: +Route22GateMovePlayerDownScript: ld a, $1 ld [wSimulatedJoypadStatesIndex], a ld a, D_DOWN @@ -41,53 +42,54 @@ Route22GateScript_1e6ba: ld [wJoyIgnore], a jp StartSimulatingJoypadStates -Route22GateScript1: +Route22GatePlayerMovingScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz xor a ld [wJoyIgnore], a call Delay3 - ld a, $0 + ld a, SCRIPT_ROUTE22GATE_DEFAULT ld [wRoute22GateCurScript], a -Route22GateScript2: +Route22GateNoopScript: ret Route22Gate_TextPointers: - dw Route22GateText1 + def_text_pointers + dw_const Route22GateGuardText, TEXT_ROUTE22GATE_GUARD -Route22GateText1: +Route22GateGuardText: text_asm ld a, [wObtainedBadges] bit BIT_BOULDERBADGE, a - jr nz, .asm_1e6f6 - ld hl, Route22GateText_1e704 + jr nz, .has_boulderbadge + ld hl, Route22GateGuardNoBoulderbadgeText call PrintText - call Route22GateScript_1e6ba - ld a, $1 - jr .asm_1e6fe -.asm_1e6f6 - ld hl, Route22GateText_1e71a + call Route22GateMovePlayerDownScript + ld a, SCRIPT_ROUTE22GATE_PLAYER_MOVING + jr .set_current_script +.has_boulderbadge + ld hl, Route22GateGuardGoRightAheadText call PrintText - ld a, $2 -.asm_1e6fe + ld a, SCRIPT_ROUTE22GATE_NOOP +.set_current_script ld [wRoute22GateCurScript], a jp TextScriptEnd -Route22GateText_1e704: - text_far _Route22GateText_1e704 +Route22GateGuardNoBoulderbadgeText: + text_far _Route22GateGuardNoBoulderbadgeText text_asm ld a, SFX_DENIED call PlaySoundWaitForCurrent call WaitForSoundToFinish - ld hl, Route22GateText_1e715 + ld hl, Route22GateGuardICantLetYouPassText ret -Route22GateText_1e715: - text_far _Route22GateText_1e715 +Route22GateGuardICantLetYouPassText: + text_far _Route22GateGuardICantLetYouPassText text_end -Route22GateText_1e71a: - text_far _Route22GateText_1e71a +Route22GateGuardGoRightAheadText: + text_far _Route22GateGuardGoRightAheadText sound_get_item_1 text_end diff --git a/scripts/Route23.asm b/scripts/Route23.asm index e5318862f..7863f8ac5 100644 --- a/scripts/Route23.asm +++ b/scripts/Route23.asm @@ -1,11 +1,11 @@ Route23_Script: - call Route23Script_511e9 + call Route23SetVictoryRoadBoulders call EnableAutoTextBoxDrawing ld hl, Route23_ScriptPointers ld a, [wRoute23CurScript] jp CallFunctionInTable -Route23Script_511e9: +Route23SetVictoryRoadBoulders: ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] @@ -20,11 +20,12 @@ Route23Script_511e9: predef_jump HideObject Route23_ScriptPointers: - dw Route23Script0 - dw Route23Script1 - dw Route23Script2 + def_script_pointers + dw_const Route23DefaultScript, SCRIPT_ROUTE23_DEFAULT + dw_const Route23PlayerMovingScript, SCRIPT_ROUTE23_PLAYER_MOVING + dw_const Route23ResetToDefaultScript, SCRIPT_ROUTE23_RESET_TO_DEFAULT -Route23Script0: +Route23DefaultScript: ld hl, YCoordsData_51255 ld a, [wYCoord] ld b, a @@ -54,7 +55,7 @@ Route23Script0: ld a, c and a ret nz - call Route23Script_5125d + call Route23CopyBadgeTextScript call DisplayTextID xor a ldh [hJoyHeld], a @@ -70,7 +71,7 @@ YCoordsData_51255: db 136 db -1 ; end -Route23Script_5125d: +Route23CopyBadgeTextScript: ld hl, BadgeTextPointers ld a, [wWhichBadge] ld c, a @@ -119,7 +120,7 @@ ThunderBadgeText: CascadeBadgeText: db "CASCADEBADGE@" -Route23Script_512d8: +Route23MovePlayerDownScript: ld a, $1 ld [wSimulatedJoypadStatesIndex], a ld a, D_DOWN @@ -129,70 +130,71 @@ Route23Script_512d8: ld [wJoyIgnore], a jp StartSimulatingJoypadStates -Route23Script1: +Route23PlayerMovingScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz -Route23Script2: - ld a, $0 +Route23ResetToDefaultScript: + ld a, SCRIPT_ROUTE23_DEFAULT ld [wRoute23CurScript], a ret Route23_TextPointers: - dw Route23Text1 - dw Route23Text2 - dw Route23Text3 - dw Route23Text4 - dw Route23Text5 - dw Route23Text6 - dw Route23Text7 - dw Route23Text8 - -Route23Text1: + def_text_pointers + dw_const Route23Guard1Text, TEXT_ROUTE23_GUARD1 + dw_const Route23Guard2Text, TEXT_ROUTE23_GUARD2 + dw_const Route23Swimmer1Text, TEXT_ROUTE23_SWIMMER1 + dw_const Route23Swimmer2Text, TEXT_ROUTE23_SWIMMER2 + dw_const Route23Guard3Text, TEXT_ROUTE23_GUARD3 + dw_const Route23Guard4Text, TEXT_ROUTE23_GUARD4 + dw_const Route23Guard5Text, TEXT_ROUTE23_GUARD5 + dw_const Route23VictoryRoadGateSignText, TEXT_ROUTE23_VICTORY_ROAD_GATE_SIGN + +Route23Guard1Text: text_asm EventFlagBit a, EVENT_PASSED_EARTHBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK - call Route23Script_51346 + call Route23CheckForBadgeScript jp TextScriptEnd -Route23Text2: +Route23Guard2Text: text_asm EventFlagBit a, EVENT_PASSED_VOLCANOBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK - call Route23Script_51346 + call Route23CheckForBadgeScript jp TextScriptEnd -Route23Text3: +Route23Swimmer1Text: text_asm EventFlagBit a, EVENT_PASSED_MARSHBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK - call Route23Script_51346 + call Route23CheckForBadgeScript jp TextScriptEnd -Route23Text4: +Route23Swimmer2Text: text_asm EventFlagBit a, EVENT_PASSED_SOULBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK - call Route23Script_51346 + call Route23CheckForBadgeScript jp TextScriptEnd -Route23Text5: +Route23Guard3Text: text_asm EventFlagBit a, EVENT_PASSED_RAINBOWBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK - call Route23Script_51346 + call Route23CheckForBadgeScript jp TextScriptEnd -Route23Text6: +Route23Guard4Text: text_asm EventFlagBit a, EVENT_PASSED_THUNDERBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK - call Route23Script_51346 + call Route23CheckForBadgeScript jp TextScriptEnd -Route23Text7: +Route23Guard5Text: text_asm EventFlagBit a, EVENT_PASSED_CASCADEBADGE_CHECK - call Route23Script_51346 + call Route23CheckForBadgeScript jp TextScriptEnd -Route23Script_51346: +Route23CheckForBadgeScript: ld [wWhichBadge], a - call Route23Script_5125d + call Route23CopyBadgeTextScript ld a, [wWhichBadge] inc a ld c, a @@ -201,43 +203,43 @@ Route23Script_51346: predef FlagActionPredef ld a, c and a - jr nz, .asm_5136e - ld hl, VictoryRoadGuardText1 + jr nz, .have_badge + ld hl, Route23YouDontHaveTheBadgeYetText call PrintText - call Route23Script_512d8 - ld a, $1 + call Route23MovePlayerDownScript + ld a, SCRIPT_ROUTE23_PLAYER_MOVING ld [wRoute23CurScript], a ret -.asm_5136e - ld hl, VictoryRoadGuardText2 +.have_badge + ld hl, Route23OhThatIsTheBadgeText call PrintText ld a, [wWhichBadge] ld c, a ld b, FLAG_SET EventFlagAddress hl, EVENT_PASSED_CASCADEBADGE_CHECK predef FlagActionPredef - ld a, $2 + ld a, SCRIPT_ROUTE23_RESET_TO_DEFAULT ld [wRoute23CurScript], a ret -Route23Script_51388: - ld hl, VictoryRoadGuardText2 +Route23PrintOhThatsTheBadgeTextScript: ; unreferenced + ld hl, Route23OhThatIsTheBadgeText jp PrintText -VictoryRoadGuardText1: - text_far _VictoryRoadGuardText1 +Route23YouDontHaveTheBadgeYetText: + text_far _Route23YouDontHaveTheBadgeYetText text_asm ld a, SFX_DENIED call PlaySoundWaitForCurrent call WaitForSoundToFinish jp TextScriptEnd -VictoryRoadGuardText2: - text_far _VictoryRoadGuardText2 +Route23OhThatIsTheBadgeText: + text_far _Route23OhThatIsTheBadgeText sound_get_item_1 - text_far _VictoryRoadGuardText_513a3 + text_far _Route23GoRightAheadText text_end -Route23Text8: - text_far _Route23Text8 +Route23VictoryRoadGateSignText: + text_far _Route23VictoryRoadGateSignText text_end diff --git a/scripts/Route24.asm b/scripts/Route24.asm index 5cbb78a61..8fa9dd202 100644 --- a/scripts/Route24.asm +++ b/scripts/Route24.asm @@ -7,29 +7,30 @@ Route24_Script: ld [wRoute24CurScript], a ret -Route24Script_513c0: - xor a +Route24SetDefaultScript: + xor a ; SCRIPT_ROUTE24_DEFAULT ld [wJoyIgnore], a ld [wRoute24CurScript], a ld [wCurMapScript], a ret Route24_ScriptPointers: - dw Route24Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw Route24Script3 - dw Route24Script4 - -Route24Script0: + def_script_pointers + dw_const Route24DefaultScript, SCRIPT_ROUTE24_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE24_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROUTE24_END_BATTLE + dw_const Route24AfterRocketBattleScript, SCRIPT_ROUTE24_AFTER_ROCKET_BATTLE + dw_const Route24PlayerMovingScript, SCRIPT_ROUTE24_PLAYER_MOVING + +Route24DefaultScript: CheckEvent EVENT_GOT_NUGGET jp nz, CheckFightingMapTrainers - ld hl, CoordsData_5140e + ld hl, .PlayerCoordsArray call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers xor a ldh [hJoyHeld], a - ld a, $1 + ld a, TEXT_ROUTE24_COOLTRAINER_M1 ldh [hSpriteIndexOrTextID], a call DisplayTextID CheckAndResetEvent EVENT_NUGGET_REWARD_AVAILABLE @@ -39,89 +40,90 @@ Route24Script0: ld a, $1 ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld a, $4 + ld a, SCRIPT_ROUTE24_PLAYER_MOVING ld [wRoute24CurScript], a ld [wCurMapScript], a ret -CoordsData_5140e: +.PlayerCoordsArray: dbmapcoord 10, 15 db -1 ; end -Route24Script4: +Route24PlayerMovingScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz call Delay3 - ld a, $0 + ld a, SCRIPT_ROUTE24_DEFAULT ld [wRoute24CurScript], a ld [wCurMapScript], a ret -Route24Script3: +Route24AfterRocketBattleScript: ld a, [wIsInBattle] cp $ff - jp z, Route24Script_513c0 + jp z, Route24SetDefaultScript call UpdateSprites - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a SetEvent EVENT_BEAT_ROUTE24_ROCKET - ld a, $1 + ld a, TEXT_ROUTE24_COOLTRAINER_M1 ldh [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [wJoyIgnore], a - ld a, $0 + ld a, SCRIPT_ROUTE24_DEFAULT ld [wRoute24CurScript], a ld [wCurMapScript], a ret Route24_TextPointers: - dw Route24Text1 - dw Route24Text2 - dw Route24Text3 - dw Route24Text4 - dw Route24Text5 - dw Route24Text6 - dw Route24Text7 - dw PickUpItemText + def_text_pointers + dw_const Route24CooltrainerM1Text, TEXT_ROUTE24_COOLTRAINER_M1 + dw_const Route24CooltrainerM2Text, TEXT_ROUTE24_COOLTRAINER_M2 + dw_const Route24CooltrainerM3Text, TEXT_ROUTE24_COOLTRAINER_M3 + dw_const Route24CooltrainerF1Text, TEXT_ROUTE24_COOLTRAINER_F1 + dw_const Route24Youngster1Text, TEXT_ROUTE24_YOUNGSTER_1 + dw_const Route24CooltrainerF2Text, TEXT_ROUTE24_COOLTRAINER_F2 + dw_const Route24Youngster2Text, TEXT_ROUTE24_YOUNGSTER_2 + dw_const PickUpItemText, TEXT_ROUTE24_TM_THUNDER_WAVE Route24TrainerHeaders: def_trainers 2 Route24TrainerHeader0: - trainer EVENT_BEAT_ROUTE_24_TRAINER_0, 4, Route24BattleText1, Route24EndBattleText1, Route24AfterBattleText1 + trainer EVENT_BEAT_ROUTE_24_TRAINER_0, 4, Route24CooltrainerM2BattleText, Route24CooltrainerM2EndBattleText, Route24CooltrainerM2AfterBattleText Route24TrainerHeader1: - trainer EVENT_BEAT_ROUTE_24_TRAINER_1, 1, Route24BattleText2, Route24EndBattleText2, Route24AfterBattleText2 + trainer EVENT_BEAT_ROUTE_24_TRAINER_1, 1, Route24CooltrainerM3BattleText, Route24CooltrainerM3EndBattleText, Route24CooltrainerM3AfterBattleText Route24TrainerHeader2: - trainer EVENT_BEAT_ROUTE_24_TRAINER_2, 1, Route24BattleText3, Route24EndBattleText3, Route24AfterBattleText3 + trainer EVENT_BEAT_ROUTE_24_TRAINER_2, 1, Route24CooltrainerF1BattleText, Route24CooltrainerF1EndBattleText, Route24CooltrainerF1AfterBattleText Route24TrainerHeader3: - trainer EVENT_BEAT_ROUTE_24_TRAINER_3, 1, Route24BattleText4, Route24EndBattleText4, Route24AfterBattleText4 + trainer EVENT_BEAT_ROUTE_24_TRAINER_3, 1, Route24Youngster1BattleText, Route24Youngster1EndBattleText, Route24Youngster1AfterBattleText Route24TrainerHeader4: - trainer EVENT_BEAT_ROUTE_24_TRAINER_4, 1, Route24BattleText5, Route24EndBattleText5, Route24AfterBattleText5 + trainer EVENT_BEAT_ROUTE_24_TRAINER_4, 1, Route24CooltrainerF2BattleText, Route24CooltrainerF2EndBattleText, Route24CooltrainerF2AfterBattleText Route24TrainerHeader5: - trainer EVENT_BEAT_ROUTE_24_TRAINER_5, 1, Route24BattleText6, Route24EndBattleText6, Route24AfterBattleText6 + trainer EVENT_BEAT_ROUTE_24_TRAINER_5, 1, Route24Youngster2BattleText, Route24Youngster2EndBattleText, Route24Youngster2AfterBattleText db -1 ; end -Route24Text1: +Route24CooltrainerM1Text: text_asm ResetEvent EVENT_NUGGET_REWARD_AVAILABLE CheckEvent EVENT_GOT_NUGGET jr nz, .got_item - ld hl, Route24Text_51510 + ld hl, .YouBeatOurContestText call PrintText lb bc, NUGGET, 1 call GiveItem jr nc, .bag_full SetEvent EVENT_GOT_NUGGET - ld hl, Route24Text_5151a + ld hl, .ReceivedNuggetText call PrintText - ld hl, Route24Text_51526 + ld hl, .JoinTeamRocketText call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, Route24Text_5152b - ld de, Route24Text_5152b + ld hl, .DefeatedText + ld de, .DefeatedText call SaveEndBattleTextPointers ldh a, [hSpriteIndexOrTextID] ld [wSpriteIndex], a @@ -129,152 +131,152 @@ Route24Text1: call InitBattleEnemyParameters xor a ldh [hJoyHeld], a - ld a, $3 + ld a, SCRIPT_ROUTE24_AFTER_ROCKET_BATTLE ld [wRoute24CurScript], a ld [wCurMapScript], a jp TextScriptEnd .got_item - ld hl, Route24Text_51530 + ld hl, .YouCouldBecomeATopLeaderText call PrintText jp TextScriptEnd .bag_full - ld hl, Route24Text_51521 + ld hl, .NoRoomText call PrintText SetEvent EVENT_NUGGET_REWARD_AVAILABLE jp TextScriptEnd -Route24Text_51510: - text_far _Route24Text_51510 +.YouBeatOurContestText: + text_far _Route24CooltrainerM1YouBeatOurContestText sound_get_item_1 - text_far _Route24Text_51515 + text_far _Route24CooltrainerM1YouJustEarnedAPrizeText text_end -Route24Text_5151a: - text_far _Route24Text_5151a +.ReceivedNuggetText: + text_far _Route24CooltrainerM1ReceivedNuggetText sound_get_item_1 text_promptbutton text_end -Route24Text_51521: - text_far _Route24Text_51521 +.NoRoomText: + text_far _Route24CooltrainerM1NoRoomText text_end -Route24Text_51526: - text_far _Route24Text_51526 +.JoinTeamRocketText: + text_far _Route24CooltrainerM1JoinTeamRocketText text_end -Route24Text_5152b: - text_far _Route24Text_5152b +.DefeatedText: + text_far _Route24CooltrainerM1DefeatedText text_end -Route24Text_51530: - text_far _Route24Text_51530 +.YouCouldBecomeATopLeaderText: + text_far _Route24CooltrainerM1YouCouldBecomeATopLeaderText text_end -Route24Text2: +Route24CooltrainerM2Text: text_asm ld hl, Route24TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route24Text3: +Route24CooltrainerM3Text: text_asm ld hl, Route24TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route24Text4: +Route24CooltrainerF1Text: text_asm ld hl, Route24TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route24Text5: +Route24Youngster1Text: text_asm ld hl, Route24TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route24Text6: +Route24CooltrainerF2Text: text_asm ld hl, Route24TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route24Text7: +Route24Youngster2Text: text_asm ld hl, Route24TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route24BattleText1: - text_far _Route24BattleText1 +Route24CooltrainerM2BattleText: + text_far _Route24CooltrainerM2BattleText text_end -Route24EndBattleText1: - text_far _Route24EndBattleText1 +Route24CooltrainerM2EndBattleText: + text_far _Route24CooltrainerM2EndBattleText text_end -Route24AfterBattleText1: - text_far _Route24AfterBattleText1 +Route24CooltrainerM2AfterBattleText: + text_far _Route24CooltrainerM2AfterBattleText text_end -Route24BattleText2: - text_far _Route24BattleText2 +Route24CooltrainerM3BattleText: + text_far _Route24CooltrainerM3BattleText text_end -Route24EndBattleText2: - text_far _Route24EndBattleText2 +Route24CooltrainerM3EndBattleText: + text_far _Route24CooltrainerM3EndBattleText text_end -Route24AfterBattleText2: - text_far _Route24AfterBattleText2 +Route24CooltrainerM3AfterBattleText: + text_far _Route24CooltrainerM3AfterBattleText text_end -Route24BattleText3: - text_far _Route24BattleText3 +Route24CooltrainerF1BattleText: + text_far _Route24CooltrainerF1BattleText text_end -Route24EndBattleText3: - text_far _Route24EndBattleText3 +Route24CooltrainerF1EndBattleText: + text_far _Route24CooltrainerF1EndBattleText text_end -Route24AfterBattleText3: - text_far _Route24AfterBattleText3 +Route24CooltrainerF1AfterBattleText: + text_far _Route24CooltrainerF1AfterBattleText text_end -Route24BattleText4: - text_far _Route24BattleText4 +Route24Youngster1BattleText: + text_far _Route24Youngster1BattleText text_end -Route24EndBattleText4: - text_far _Route24EndBattleText4 +Route24Youngster1EndBattleText: + text_far _Route24Youngster1EndBattleText text_end -Route24AfterBattleText4: - text_far _Route24AfterBattleText4 +Route24Youngster1AfterBattleText: + text_far _Route24Youngster1AfterBattleText text_end -Route24BattleText5: - text_far _Route24BattleText5 +Route24CooltrainerF2BattleText: + text_far _Route24CooltrainerF2BattleText text_end -Route24EndBattleText5: - text_far _Route24EndBattleText5 +Route24CooltrainerF2EndBattleText: + text_far _Route24CooltrainerF2EndBattleText text_end -Route24AfterBattleText5: - text_far _Route24AfterBattleText5 +Route24CooltrainerF2AfterBattleText: + text_far _Route24CooltrainerF2AfterBattleText text_end -Route24BattleText6: - text_far _Route24BattleText6 +Route24Youngster2BattleText: + text_far _Route24Youngster2BattleText text_end -Route24EndBattleText6: - text_far _Route24EndBattleText6 +Route24Youngster2EndBattleText: + text_far _Route24Youngster2EndBattleText text_end -Route24AfterBattleText6: - text_far _Route24AfterBattleText6 +Route24Youngster2AfterBattleText: + text_far _Route24Youngster2AfterBattleText text_end diff --git a/scripts/Route25.asm b/scripts/Route25.asm index 265a8310b..ef0e8fd2d 100644 --- a/scripts/Route25.asm +++ b/scripts/Route25.asm @@ -1,5 +1,5 @@ Route25_Script: - call Route25Script_515e1 + call Route25ShowHideBillScript call EnableAutoTextBoxDrawing ld hl, Route25TrainerHeaders ld de, Route25_ScriptPointers @@ -8,7 +8,7 @@ Route25_Script: ld [wRoute25CurScript], a ret -Route25Script_515e1: +Route25ShowHideBillScript: ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] @@ -16,12 +16,12 @@ Route25Script_515e1: CheckEventHL EVENT_LEFT_BILLS_HOUSE_AFTER_HELPING ret nz CheckEventReuseHL EVENT_MET_BILL_2 - jr nz, .asm_515ff + jr nz, .met_bill ResetEventReuseHL EVENT_BILL_SAID_USE_CELL_SEPARATOR ld a, HS_BILL_POKEMON ld [wMissableObjectIndex], a predef_jump ShowObject -.asm_515ff +.met_bill CheckEventAfterBranchReuseHL EVENT_GOT_SS_TICKET, EVENT_MET_BILL_2 ret z SetEventReuseHL EVENT_LEFT_BILLS_HOUSE_AFTER_HELPING @@ -36,207 +36,209 @@ Route25Script_515e1: predef_jump ShowObject Route25_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_ROUTE25_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE25_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROUTE25_END_BATTLE Route25_TextPointers: - dw Route25Text1 - dw Route25Text2 - dw Route25Text3 - dw Route25Text4 - dw Route25Text5 - dw Route25Text6 - dw Route25Text7 - dw Route25Text8 - dw Route25Text9 - dw PickUpItemText - dw Route25Text11 + def_text_pointers + dw_const Route25Youngster1Text, TEXT_ROUTE25_YOUNGSTER1 + dw_const Route25Youngster2Text, TEXT_ROUTE25_YOUNGSTER2 + dw_const Route25CooltrainerMText, TEXT_ROUTE25_COOLTRAINER_M + dw_const Route25CooltrainerF1Text, TEXT_ROUTE25_COOLTRAINER_F1 + dw_const Route25Youngster3Text, TEXT_ROUTE25_YOUNGSTER3 + dw_const Route25CooltrainerF2Text, TEXT_ROUTE25_COOLTRAINER_F2 + dw_const Route25Hiker1Text, TEXT_ROUTE25_HIKER1 + dw_const Route25Hiker2Text, TEXT_ROUTE25_HIKER2 + dw_const Route25Hiker3Text, TEXT_ROUTE25_HIKER3 + dw_const PickUpItemText, TEXT_ROUTE25_TM_SEISMIC_TOSS + dw_const Route25BillSignText, TEXT_ROUTE25_BILL_SIGN Route25TrainerHeaders: def_trainers Route25TrainerHeader0: - trainer EVENT_BEAT_ROUTE_25_TRAINER_0, 2, Route25BattleText1, Route25EndBattleText1, Route25AfterBattleText1 + trainer EVENT_BEAT_ROUTE_25_TRAINER_0, 2, Route25Youngster1BattleText, Route25Youngster1EndBattleText, Route25Youngster1AfterBattleText Route25TrainerHeader1: - trainer EVENT_BEAT_ROUTE_25_TRAINER_1, 3, Route25BattleText2, Route25EndBattleText2, Route25AfterBattleText2 + trainer EVENT_BEAT_ROUTE_25_TRAINER_1, 3, Route25Youngster2BattleText, Route25Youngster2EndBattleText, Route25Youngster2AfterBattleText Route25TrainerHeader2: - trainer EVENT_BEAT_ROUTE_25_TRAINER_2, 3, Route25BattleText3, Route25EndBattleText3, Route25AfterBattleText3 + trainer EVENT_BEAT_ROUTE_25_TRAINER_2, 3, Route25CooltrainerMBattleText, Route25CooltrainerMEndBattleText, Route25CooltrainerMAfterBattleText Route25TrainerHeader3: - trainer EVENT_BEAT_ROUTE_25_TRAINER_3, 2, Route25BattleText4, Route25EndBattleText4, Route25AfterBattleText4 + trainer EVENT_BEAT_ROUTE_25_TRAINER_3, 2, Route25CooltrainerF1BattleText, Route25CooltrainerF1EndBattleText, Route25CooltrainerF1AfterBattleText Route25TrainerHeader4: - trainer EVENT_BEAT_ROUTE_25_TRAINER_4, 4, Route25BattleText5, Route25EndBattleText5, Route25AfterBattleText5 + trainer EVENT_BEAT_ROUTE_25_TRAINER_4, 4, Route25Youngster3BattleText, Route25Youngster3EndBattleText, Route25Youngster3AfterBattleText Route25TrainerHeader5: - trainer EVENT_BEAT_ROUTE_25_TRAINER_5, 4, Route25BattleText6, Route25EndBattleText6, Route25AfterBattleText6 + trainer EVENT_BEAT_ROUTE_25_TRAINER_5, 4, Route25CooltrainerF2BattleText, Route25CooltrainerF2EndBattleText, Route25CooltrainerF2AfterBattleText Route25TrainerHeader6: - trainer EVENT_BEAT_ROUTE_25_TRAINER_6, 3, Route25BattleText7, Route25EndBattleText7, Route25AfterBattleText7 + trainer EVENT_BEAT_ROUTE_25_TRAINER_6, 3, Route25Hiker1BattleText, Route25Hiker1EndBattleText, Route25Hiker1AfterBattleText Route25TrainerHeader7: - trainer EVENT_BEAT_ROUTE_25_TRAINER_7, 2, Route25BattleText8, Route25EndBattleText8, Route25AfterBattleText8 + trainer EVENT_BEAT_ROUTE_25_TRAINER_7, 2, Route25Hiker2BattleText, Route25Hiker2EndBattleText, Route25Hiker2AfterBattleText Route25TrainerHeader8: - trainer EVENT_BEAT_ROUTE_25_TRAINER_8, 2, Route25BattleText9, Route25EndBattleText9, Route25AfterBattleText9 + trainer EVENT_BEAT_ROUTE_25_TRAINER_8, 2, Route25Hiker3BattleText, Route25Hiker3EndBattleText, Route25Hiker3AfterBattleText db -1 ; end -Route25Text1: +Route25Youngster1Text: text_asm ld hl, Route25TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route25Text2: +Route25Youngster2Text: text_asm ld hl, Route25TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route25Text3: +Route25CooltrainerMText: text_asm ld hl, Route25TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route25Text4: +Route25CooltrainerF1Text: text_asm ld hl, Route25TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route25Text5: +Route25Youngster3Text: text_asm ld hl, Route25TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route25Text6: +Route25CooltrainerF2Text: text_asm ld hl, Route25TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route25Text7: +Route25Hiker1Text: text_asm ld hl, Route25TrainerHeader6 call TalkToTrainer jp TextScriptEnd -Route25Text8: +Route25Hiker2Text: text_asm ld hl, Route25TrainerHeader7 call TalkToTrainer jp TextScriptEnd -Route25Text9: +Route25Hiker3Text: text_asm ld hl, Route25TrainerHeader8 call TalkToTrainer jp TextScriptEnd -Route25BattleText1: - text_far _Route25BattleText1 +Route25Youngster1BattleText: + text_far _Route25Youngster1BattleText text_end -Route25EndBattleText1: - text_far _Route25EndBattleText1 +Route25Youngster1EndBattleText: + text_far _Route25Youngster1EndBattleText text_end -Route25AfterBattleText1: - text_far _Route25AfterBattleText1 +Route25Youngster1AfterBattleText: + text_far _Route25Youngster1AfterBattleText text_end -Route25BattleText2: - text_far _Route25BattleText2 +Route25Youngster2BattleText: + text_far _Route25Youngster2BattleText text_end -Route25EndBattleText2: - text_far _Route25EndBattleText2 +Route25Youngster2EndBattleText: + text_far _Route25Youngster2EndBattleText text_end -Route25AfterBattleText2: - text_far _Route25AfterBattleText2 +Route25Youngster2AfterBattleText: + text_far _Route25Youngster2AfterBattleText text_end -Route25BattleText3: - text_far _Route25BattleText3 +Route25CooltrainerMBattleText: + text_far _Route25CooltrainerMBattleText text_end -Route25EndBattleText3: - text_far _Route25EndBattleText3 +Route25CooltrainerMEndBattleText: + text_far _Route25CooltrainerMEndBattleText text_end -Route25AfterBattleText3: - text_far _Route25AfterBattleText3 +Route25CooltrainerMAfterBattleText: + text_far _Route25CooltrainerMAfterBattleText text_end -Route25BattleText4: - text_far _Route25BattleText4 +Route25CooltrainerF1BattleText: + text_far _Route25CooltrainerF1BattleText text_end -Route25EndBattleText4: - text_far _Route25EndBattleText4 +Route25CooltrainerF1EndBattleText: + text_far _Route25CooltrainerF1EndBattleText text_end -Route25AfterBattleText4: - text_far _Route25AfterBattleText4 +Route25CooltrainerF1AfterBattleText: + text_far _Route25CooltrainerF1AfterBattleText text_end -Route25BattleText5: - text_far _Route25BattleText5 +Route25Youngster3BattleText: + text_far _Route25Youngster3BattleText text_end -Route25EndBattleText5: - text_far _Route25EndBattleText5 +Route25Youngster3EndBattleText: + text_far _Route25Youngster3EndBattleText text_end -Route25AfterBattleText5: - text_far _Route25AfterBattleText5 +Route25Youngster3AfterBattleText: + text_far _Route25Youngster3AfterBattleText text_end -Route25BattleText6: - text_far _Route25BattleText6 +Route25CooltrainerF2BattleText: + text_far _Route25CooltrainerF2BattleText text_end -Route25EndBattleText6: - text_far _Route25EndBattleText6 +Route25CooltrainerF2EndBattleText: + text_far _Route25CooltrainerF2EndBattleText text_end -Route25AfterBattleText6: - text_far _Route25AfterBattleText6 +Route25CooltrainerF2AfterBattleText: + text_far _Route25CooltrainerF2AfterBattleText text_end -Route25BattleText7: - text_far _Route25BattleText7 +Route25Hiker1BattleText: + text_far _Route25Hiker1BattleText text_end -Route25EndBattleText7: - text_far _Route25EndBattleText7 +Route25Hiker1EndBattleText: + text_far _Route25Hiker1EndBattleText text_end -Route25AfterBattleText7: - text_far _Route25AfterBattleText7 +Route25Hiker1AfterBattleText: + text_far _Route25Hiker1AfterBattleText text_end -Route25BattleText8: - text_far _Route25BattleText8 +Route25Hiker2BattleText: + text_far _Route25Hiker2BattleText text_end -Route25EndBattleText8: - text_far _Route25EndBattleText8 +Route25Hiker2EndBattleText: + text_far _Route25Hiker2EndBattleText text_end -Route25AfterBattleText8: - text_far _Route25AfterBattleText8 +Route25Hiker2AfterBattleText: + text_far _Route25Hiker2AfterBattleText text_end -Route25BattleText9: - text_far _Route25BattleText9 +Route25Hiker3BattleText: + text_far _Route25Hiker3BattleText text_end -Route25EndBattleText9: - text_far _Route25EndBattleText9 +Route25Hiker3EndBattleText: + text_far _Route25Hiker3EndBattleText text_end -Route25AfterBattleText9: - text_far _Route25AfterBattleText9 +Route25Hiker3AfterBattleText: + text_far _Route25Hiker3AfterBattleText text_end -Route25Text11: - text_far _Route25Text11 +Route25BillSignText: + text_far _Route25BillSignText text_end diff --git a/scripts/Route2Gate.asm b/scripts/Route2Gate.asm index 60f6ffe11..a198dbd78 100644 --- a/scripts/Route2Gate.asm +++ b/scripts/Route2Gate.asm @@ -2,10 +2,11 @@ Route2Gate_Script: jp EnableAutoTextBoxDrawing Route2Gate_TextPointers: - dw Route2GateText1 - dw Route2GateText2 + def_text_pointers + dw_const Route2GateOaksAideText, TEXT_ROUTE2GATE_OAKS_AIDE + dw_const Route2GateYoungsterText, TEXT_ROUTE2GATE_YOUNGSTER -Route2GateText1: +Route2GateOaksAideText: text_asm CheckEvent EVENT_GOT_HM05 jr nz, .got_item @@ -25,15 +26,15 @@ Route2GateText1: jr nz, .no_item SetEvent EVENT_GOT_HM05 .got_item - ld hl, Route2GateText_5d616 + ld hl, .FlashExplanationText call PrintText .no_item jp TextScriptEnd -Route2GateText_5d616: - text_far _Route2GateText_5d616 +.FlashExplanationText: + text_far _Route2GateOaksAideFlashExplanationText text_end -Route2GateText2: - text_far _Route2GateText2 +Route2GateYoungsterText: + text_far _Route2GateYoungsterText text_end diff --git a/scripts/Route2TradeHouse.asm b/scripts/Route2TradeHouse.asm index 85ed2d342..f439db7b2 100644 --- a/scripts/Route2TradeHouse.asm +++ b/scripts/Route2TradeHouse.asm @@ -2,14 +2,15 @@ Route2TradeHouse_Script: jp EnableAutoTextBoxDrawing Route2TradeHouse_TextPointers: - dw Route2HouseText1 - dw Route2HouseText2 + def_text_pointers + dw_const Route2TradeHouseScientistText, TEXT_ROUTE2TRADEHOUSE_SCIENTIST + dw_const Route2TradeHouseGameboyKidText, TEXT_ROUTE2TRADEHOUSE_GAMEBOY_KID -Route2HouseText1: - text_far _Route2HouseText1 +Route2TradeHouseScientistText: + text_far _Route2TradeHouseScientistText text_end -Route2HouseText2: +Route2TradeHouseGameboyKidText: text_asm ld a, TRADE_FOR_MARCEL ld [wWhichTrade], a diff --git a/scripts/Route3.asm b/scripts/Route3.asm index ecc16a0c8..19a8a0ebf 100644 --- a/scripts/Route3.asm +++ b/scripts/Route3.asm @@ -8,190 +8,192 @@ Route3_Script: ret Route3_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_ROUTE3_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE3_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROUTE3_END_BATTLE Route3_TextPointers: - dw Route3Text1 - dw Route3Text2 - dw Route3Text3 - dw Route3Text4 - dw Route3Text5 - dw Route3Text6 - dw Route3Text7 - dw Route3Text8 - dw Route3Text9 - dw Route3Text10 + def_text_pointers + dw_const Route3SuperNerdText, TEXT_ROUTE3_SUPER_NERD + dw_const Route3Youngster1Text, TEXT_ROUTE3_YOUNGSTER1 + dw_const Route3Youngster2Text, TEXT_ROUTE3_YOUNGSTER2 + dw_const Route3CooltrainerF1Text, TEXT_ROUTE3_COOLTRAINER_F1 + dw_const Route3Youngster3Text, TEXT_ROUTE3_YOUNGSTER3 + dw_const Route3CooltrainerF2Text, TEXT_ROUTE3_COOLTRAINER_F2 + dw_const Route3Youngster4Text, TEXT_ROUTE3_YOUNGSTER4 + dw_const Route3Youngster5Text, TEXT_ROUTE3_YOUNGSTER5 + dw_const Route3CooltrainerF3Text, TEXT_ROUTE3_COOLTRAINER_F3 + dw_const Route3SignText, TEXT_ROUTE3_SIGN Route3TrainerHeaders: def_trainers 2 Route3TrainerHeader0: - trainer EVENT_BEAT_ROUTE_3_TRAINER_0, 2, Route3BattleText1, Route3EndBattleText1, Route3AfterBattleText1 + trainer EVENT_BEAT_ROUTE_3_TRAINER_0, 2, Route3Youngster1BattleText, Route3Youngster1EndBattleText, Route3Youngster1AfterBattleText Route3TrainerHeader1: - trainer EVENT_BEAT_ROUTE_3_TRAINER_1, 3, Route3BattleText2, Route3EndBattleText2, Route3AfterBattleText2 + trainer EVENT_BEAT_ROUTE_3_TRAINER_1, 3, Route3Youngster2BattleText, Route3Youngster2EndBattleText, Route3Youngster2AfterBattleText Route3TrainerHeader2: - trainer EVENT_BEAT_ROUTE_3_TRAINER_2, 2, Route3BattleText3, Route3EndBattleText3, Route3AfterBattleText3 + trainer EVENT_BEAT_ROUTE_3_TRAINER_2, 2, Route3CooltrainerF1BattleText, Route3CooltrainerF1EndBattleText, Route3CooltrainerF1AfterBattleText Route3TrainerHeader3: - trainer EVENT_BEAT_ROUTE_3_TRAINER_3, 1, Route3BattleText4, Route3EndBattleText4, Route3AfterBattleText4 + trainer EVENT_BEAT_ROUTE_3_TRAINER_3, 1, Route3Youngster3BattleText, Route3Youngster3EndBattleText, Route3Youngster3AfterBattleText Route3TrainerHeader4: - trainer EVENT_BEAT_ROUTE_3_TRAINER_4, 4, Route3BattleText5, Route3EndBattleText5, Route3AfterBattleText5 + trainer EVENT_BEAT_ROUTE_3_TRAINER_4, 4, Route3CooltrainerF2BattleText, Route3CooltrainerF2EndBattleText, Route3CooltrainerF2AfterBattleText Route3TrainerHeader5: - trainer EVENT_BEAT_ROUTE_3_TRAINER_5, 3, Route3BattleText6, Route3EndBattleText6, Route3AfterBattleText6 + trainer EVENT_BEAT_ROUTE_3_TRAINER_5, 3, Route3Youngster4BattleText, Route3Youngster4EndBattleText, Route3Youngster4AfterBattleText Route3TrainerHeader6: - trainer EVENT_BEAT_ROUTE_3_TRAINER_6, 3, Route3BattleText7, Route3EndBattleText7, Route3AfterBattleText7 + trainer EVENT_BEAT_ROUTE_3_TRAINER_6, 3, Route3Youngster5BattleText, Route3Youngster5EndBattleText, Route3Youngster5AfterBattleText Route3TrainerHeader7: - trainer EVENT_BEAT_ROUTE_3_TRAINER_7, 2, Route3BattleText8, Route3EndBattleText8, Route3AfterBattleText8 + trainer EVENT_BEAT_ROUTE_3_TRAINER_7, 2, Route3CooltrainerF3BattleText, Route3CooltrainerF3EndBattleText, Route3CooltrainerF3AfterBattleText db -1 ; end -Route3Text1: +Route3SuperNerdText: text_far _Route3Text1 text_end -Route3Text2: +Route3Youngster1Text: text_asm ld hl, Route3TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route3BattleText1: - text_far _Route3BattleText1 +Route3Youngster1BattleText: + text_far _Route3Youngster1BattleText text_end -Route3EndBattleText1: - text_far _Route3EndBattleText1 +Route3Youngster1EndBattleText: + text_far _Route3Youngster1EndBattleText text_end -Route3AfterBattleText1: - text_far _Route3AfterBattleText1 +Route3Youngster1AfterBattleText: + text_far _Route3Youngster1AfterBattleText text_end -Route3Text3: +Route3Youngster2Text: text_asm ld hl, Route3TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route3BattleText2: - text_far _Route3BattleText2 +Route3Youngster2BattleText: + text_far _Route3Youngster2BattleText text_end -Route3EndBattleText2: - text_far _Route3EndBattleText2 +Route3Youngster2EndBattleText: + text_far _Route3Youngster2EndBattleText text_end -Route3AfterBattleText2: - text_far _Route3AfterBattleText2 +Route3Youngster2AfterBattleText: + text_far _Route3Youngster2AfterBattleText text_end -Route3Text4: +Route3CooltrainerF1Text: text_asm ld hl, Route3TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route3BattleText3: - text_far _Route3BattleText3 +Route3CooltrainerF1BattleText: + text_far _Route3CooltrainerF1BattleText text_end -Route3EndBattleText3: - text_far _Route3EndBattleText3 +Route3CooltrainerF1EndBattleText: + text_far _Route3CooltrainerF1EndBattleText text_end -Route3AfterBattleText3: - text_far _Route3AfterBattleText3 +Route3CooltrainerF1AfterBattleText: + text_far _Route3CooltrainerF1AfterBattleText text_end -Route3Text5: +Route3Youngster3Text: text_asm ld hl, Route3TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route3BattleText4: - text_far _Route3BattleText4 +Route3Youngster3BattleText: + text_far _Route3Youngster3BattleText text_end -Route3EndBattleText4: - text_far _Route3EndBattleText4 +Route3Youngster3EndBattleText: + text_far _Route3Youngster3EndBattleText text_end -Route3AfterBattleText4: - text_far _Route3AfterBattleText4 +Route3Youngster3AfterBattleText: + text_far _Route3Youngster3AfterBattleText text_end -Route3Text6: +Route3CooltrainerF2Text: text_asm ld hl, Route3TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route3BattleText5: - text_far _Route3BattleText5 +Route3CooltrainerF2BattleText: + text_far _Route3CooltrainerF2BattleText text_end -Route3EndBattleText5: - text_far _Route3EndBattleText5 +Route3CooltrainerF2EndBattleText: + text_far _Route3CooltrainerF2EndBattleText text_end -Route3AfterBattleText5: - text_far _Route3AfterBattleText5 +Route3CooltrainerF2AfterBattleText: + text_far _Route3CooltrainerF2AfterBattleText text_end -Route3Text7: +Route3Youngster4Text: text_asm ld hl, Route3TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route3BattleText6: - text_far _Route3BattleText6 +Route3Youngster4BattleText: + text_far _Route3Youngster4BattleText text_end -Route3EndBattleText6: - text_far _Route3EndBattleText6 +Route3Youngster4EndBattleText: + text_far _Route3Youngster4EndBattleText text_end -Route3AfterBattleText6: - text_far _Route3AfterBattleText6 +Route3Youngster4AfterBattleText: + text_far _Route3Youngster4AfterBattleText text_end -Route3Text8: +Route3Youngster5Text: text_asm ld hl, Route3TrainerHeader6 call TalkToTrainer jp TextScriptEnd -Route3BattleText7: - text_far _Route3BattleText7 +Route3Youngster5BattleText: + text_far _Route3Youngster5BattleText text_end -Route3EndBattleText7: - text_far _Route3EndBattleText7 +Route3Youngster5EndBattleText: + text_far _Route3Youngster5EndBattleText text_end -Route3AfterBattleText7: - text_far _Route3AfterBattleText7 +Route3Youngster5AfterBattleText: + text_far _Route3Youngster5AfterBattleText text_end -Route3Text9: +Route3CooltrainerF3Text: text_asm ld hl, Route3TrainerHeader7 call TalkToTrainer jp TextScriptEnd -Route3BattleText8: - text_far _Route3BattleText8 +Route3CooltrainerF3BattleText: + text_far _Route3CooltrainerF3BattleText text_end -Route3EndBattleText8: - text_far _Route3EndBattleText8 +Route3CooltrainerF3EndBattleText: + text_far _Route3CooltrainerF3EndBattleText text_end -Route3AfterBattleText8: - text_far _Route3AfterBattleText8 +Route3CooltrainerF3AfterBattleText: + text_far _Route3CooltrainerF3AfterBattleText text_end -Route3Text10: - text_far _Route3Text10 +Route3SignText: + text_far _Route3SignText text_end diff --git a/scripts/Route4.asm b/scripts/Route4.asm index d62f797d5..39127f889 100644 --- a/scripts/Route4.asm +++ b/scripts/Route4.asm @@ -8,50 +8,52 @@ Route4_Script: ret Route4_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_ROUTE4_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE4_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROUTE4_END_BATTLE Route4_TextPointers: - dw Route4Text1 - dw Route4Text2 - dw PickUpItemText - dw PokeCenterSignText - dw Route4Text5 - dw Route4Text6 + def_text_pointers + dw_const Route4CooltrainerF1Text, TEXT_ROUTE4_COOLTRAINER_F1 + dw_const Route4CooltrainerF2Text, TEXT_ROUTE4_COOLTRAINER_F2 + dw_const PickUpItemText, TEXT_ROUTE4_TM_WHIRLWIND + dw_const PokeCenterSignText, TEXT_ROUTE4_POKECENTER_SIGN + dw_const Route4MtMoonSignText, TEXT_ROUTE4_MT_MOON_SIGN + dw_const Route4SignText, TEXT_ROUTE4_SIGN Route4TrainerHeaders: def_trainers 2 Route4TrainerHeader0: - trainer EVENT_BEAT_ROUTE_4_TRAINER_0, 3, Route4BattleText1, Route4EndBattleText1, Route4AfterBattleText1 + trainer EVENT_BEAT_ROUTE_4_TRAINER_0, 3, Route4CooltrainerF2BattleText, Route4CooltrainerF2EndBattleText, Route4CooltrainerF2AfterBattleText db -1 ; end -Route4Text1: - text_far _Route4Text1 +Route4CooltrainerF1Text: + text_far _Route4CooltrainerF1Text text_end -Route4Text2: +Route4CooltrainerF2Text: text_asm ld hl, Route4TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route4BattleText1: - text_far _Route4BattleText1 +Route4CooltrainerF2BattleText: + text_far _Route4CooltrainerF2BattleText text_end -Route4EndBattleText1: - text_far _Route4EndBattleText1 +Route4CooltrainerF2EndBattleText: + text_far _Route4CooltrainerF2EndBattleText text_end -Route4AfterBattleText1: - text_far _Route4AfterBattleText1 +Route4CooltrainerF2AfterBattleText: + text_far _Route4CooltrainerF2AfterBattleText text_end -Route4Text5: - text_far _Route4Text5 +Route4MtMoonSignText: + text_far _Route4MtMoonSignText text_end -Route4Text6: - text_far _Route4Text6 +Route4SignText: + text_far _Route4SignText text_end diff --git a/scripts/Route5.asm b/scripts/Route5.asm index 33f3c345f..18d2d0ac5 100644 --- a/scripts/Route5.asm +++ b/scripts/Route5.asm @@ -2,8 +2,9 @@ Route5_Script: jp EnableAutoTextBoxDrawing Route5_TextPointers: - dw Route5Text1 + def_text_pointers + dw_const Route5UndergroundPathSignText, TEXT_ROUTE5_UNDERGROUND_PATH_SIGN -Route5Text1: - text_far _Route5Text1 +Route5UndergroundPathSignText: + text_far _Route5UndergroundPathSignText text_end diff --git a/scripts/Route5Gate.asm b/scripts/Route5Gate.asm index 72efbd9e1..d6e086ce8 100644 --- a/scripts/Route5Gate.asm +++ b/scripts/Route5Gate.asm @@ -5,21 +5,22 @@ Route5Gate_Script: jp CallFunctionInTable Route5Gate_ScriptPointers: - dw Route5GateScript0 - dw Route5GateScript1 + def_script_pointers + dw_const Route5GateDefaultScript, SCRIPT_ROUTE5GATE_DEFAULT + dw_const Route5GatePlayerMovingScript, SCRIPT_ROUTE5GATE_PLAYER_MOVING -Route5GateScript_1df43: +Route5GateMovePlayerUpScript: ld a, D_UP ld [wSimulatedJoypadStatesEnd], a ld a, $1 ld [wSimulatedJoypadStatesIndex], a jp StartSimulatingJoypadStates -Route5GateScript0: +Route5GateDefaultScript: ld a, [wd728] bit 6, a ret nz - ld hl, CoordsData_1df8f + ld hl, .PlayerInCoordsArray call ArePlayerCoordsInArray ret nc ld a, PLAYER_DIR_LEFT @@ -29,28 +30,28 @@ Route5GateScript0: farcall RemoveGuardDrink ldh a, [hItemToRemoveID] and a - jr nz, .asm_1df82 - ld a, $2 + jr nz, .have_drink + ld a, TEXT_ROUTE5GATE_GUARD_GEE_IM_THIRSTY ldh [hSpriteIndexOrTextID], a call DisplayTextID - call Route5GateScript_1df43 - ld a, $1 + call Route5GateMovePlayerUpScript + ld a, SCRIPT_ROUTE5GATE_PLAYER_MOVING ld [wRoute5GateCurScript], a ret -.asm_1df82 - ld a, $3 +.have_drink + ld a, TEXT_ROUTE5GATE_GUARD_GIVE_DRINK ldh [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd728 set 6, [hl] ret -CoordsData_1df8f: +.PlayerInCoordsArray: dbmapcoord 3, 3 dbmapcoord 4, 3 db -1 ; end -Route5GateScript1: +Route5GatePlayerMovingScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -61,55 +62,49 @@ Route5GateScript1: ret Route5Gate_TextPointers: - dw Route5GateText1 - dw Route5GateText2 - dw Route5GateText3 + def_text_pointers + dw_const SaffronGateGuardText, TEXT_ROUTE5GATE_GUARD + dw_const SaffronGateGuardGeeImThirstyText, TEXT_ROUTE5GATE_GUARD_GEE_IM_THIRSTY + dw_const SaffronGateGuardGiveDrinkText, TEXT_ROUTE5GATE_GUARD_GIVE_DRINK -Route8GateText1: -Route7GateText1: -Route6GateText1: -Route5GateText1: +SaffronGateGuardText: text_asm ld a, [wd728] bit 6, a - jr nz, .asm_88856 + jr nz, .thanks_for_drink farcall RemoveGuardDrink ldh a, [hItemToRemoveID] and a - jr nz, .asm_768a2 - ld hl, Route5GateText2 + jr nz, .have_drink + ld hl, SaffronGateGuardGeeImThirstyText call PrintText - call Route5GateScript_1df43 - ld a, $1 + call Route5GateMovePlayerUpScript + ld a, SCRIPT_ROUTE5GATE_PLAYER_MOVING ld [wRoute5GateCurScript], a jp TextScriptEnd -.asm_768a2 - ld hl, Route5GateText3 + +.have_drink + ld hl, SaffronGateGuardGiveDrinkText call PrintText ld hl, wd728 set 6, [hl] jp TextScriptEnd -.asm_88856 - ld hl, SaffronGateText_1dff6 + +.thanks_for_drink + ld hl, SaffronGateGuardThanksForTheDrinkText call PrintText jp TextScriptEnd -Route8GateText2: -Route7GateText2: -Route6GateText2: -Route5GateText2: - text_far _SaffronGateText_1dfe7 +SaffronGateGuardGeeImThirstyText: + text_far _SaffronGateGuardGeeImThirstyText text_end -Route8GateText3: -Route7GateText3: -Route6GateText3: -Route5GateText3: - text_far _SaffronGateText_8aaa9 +SaffronGateGuardGiveDrinkText: + text_far _SaffronGateGuardImParchedText sound_get_key_item - text_far _SaffronGateText_1dff1 + text_far _SaffronGateGuardYouCanGoOnThroughText text_end -SaffronGateText_1dff6: - text_far _SaffronGateText_1dff6 +SaffronGateGuardThanksForTheDrinkText: + text_far _SaffronGateGuardThanksForTheDrinkText text_end diff --git a/scripts/Route6.asm b/scripts/Route6.asm index de1f89183..b7b8c1ce8 100644 --- a/scripts/Route6.asm +++ b/scripts/Route6.asm @@ -8,139 +8,141 @@ Route6_Script: ret Route6_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_ROUTE6_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE6_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROUTE6_END_BATTLE Route6_TextPointers: - dw Route6Text1 - dw Route6Text2 - dw Route6Text3 - dw Route6Text4 - dw Route6Text5 - dw Route6Text6 - dw Route6Text7 + def_text_pointers + dw_const Route6CooltrainerM1Text, TEXT_ROUTE6_COOLTRAINER_M1 + dw_const Route6CooltrainerF1Text, TEXT_ROUTE6_COOLTRAINER_F1 + dw_const Route6Youngster1Text, TEXT_ROUTE6_YOUNGSTER_1 + dw_const Route6CooltrainerM2Text, TEXT_ROUTE6_COOLTRAINER_M2 + dw_const Route6CooltrainerF2Text, TEXT_ROUTE6_COOLTRAINER_F2 + dw_const Route6Youngster2Text, TEXT_ROUTE6_YOUNGSTER_2 + dw_const Route6UndergroundPathSignText, TEXT_ROUTE6_UNDERGROUND_PATH_SIGN Route6TrainerHeaders: def_trainers Route6TrainerHeader0: - trainer EVENT_BEAT_ROUTE_6_TRAINER_0, 0, Route6BattleText1, Route6EndBattleText1, Route6AfterBattleText1 + trainer EVENT_BEAT_ROUTE_6_TRAINER_0, 0, Route6CooltrainerM1BattleText, Route6CooltrainerM1EndBattleText, Route6CooltrainerAfterBattleText Route6TrainerHeader1: - trainer EVENT_BEAT_ROUTE_6_TRAINER_1, 0, Route6BattleText2, Route6EndBattleText2, Route6AfterBattleText1 + trainer EVENT_BEAT_ROUTE_6_TRAINER_1, 0, Route6CooltrainerF1BattleText, Route6CooltrainerF1EndBattleText, Route6CooltrainerAfterBattleText Route6TrainerHeader2: - trainer EVENT_BEAT_ROUTE_6_TRAINER_2, 4, Route6BattleText3, Route6EndBattleText3, Route6AfterBattleText3 + trainer EVENT_BEAT_ROUTE_6_TRAINER_2, 4, Route6Youngster1BattleText, Route6Youngster1EndBattleText, Route6Youngster1AfterBattleText Route6TrainerHeader3: - trainer EVENT_BEAT_ROUTE_6_TRAINER_3, 3, Route6BattleText4, Route6EndBattleText4, Route6AfterBattleText4 + trainer EVENT_BEAT_ROUTE_6_TRAINER_3, 3, Route6CooltrainerM2BattleText, Route6CooltrainerM2EndBattleText, Route6CooltrainerM2AfterBattleText Route6TrainerHeader4: - trainer EVENT_BEAT_ROUTE_6_TRAINER_4, 3, Route6BattleText5, Route6EndBattleText5, Route6AfterBattleText5 + trainer EVENT_BEAT_ROUTE_6_TRAINER_4, 3, Route6CooltrainerF2BattleText, Route6CooltrainerF2EndBattleText, Route6CooltrainerF2AfterBattleText Route6TrainerHeader5: - trainer EVENT_BEAT_ROUTE_6_TRAINER_5, 3, Route6BattleText6, Route6EndBattleText6, Route6AfterBattleText6 + trainer EVENT_BEAT_ROUTE_6_TRAINER_5, 3, Route6Youngster2BattleText, Route6Youngster2EndBattleText, Route6Youngster2AfterBattleText db -1 ; end -Route6Text1: +Route6CooltrainerM1Text: text_asm ld hl, Route6TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route6BattleText1: - text_far _Route6BattleText1 +Route6CooltrainerM1BattleText: + text_far _Route6CooltrainerM1BattleText text_end -Route6EndBattleText1: - text_far _Route6EndBattleText1 +Route6CooltrainerM1EndBattleText: + text_far _Route6CooltrainerM1EndBattleText text_end -Route6AfterBattleText1: - text_far _Route6AfterBattleText1 +Route6CooltrainerAfterBattleText: ; used by both COOLTRAINER_M1 and COOLTRAINER_F1 + text_far _Route6CooltrainerAfterBattleText text_end -Route6Text2: +Route6CooltrainerF1Text: text_asm ld hl, Route6TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route6BattleText2: - text_far _Route6BattleText2 +Route6CooltrainerF1BattleText: + text_far _Route6CooltrainerF1BattleText text_end -Route6EndBattleText2: - text_far _Route6EndBattleText2 +Route6CooltrainerF1EndBattleText: + text_far _Route6CooltrainerF1EndBattleText text_end -Route6Text3: +Route6Youngster1Text: text_asm ld hl, Route6TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route6BattleText3: - text_far _Route6BattleText3 +Route6Youngster1BattleText: + text_far _Route6Youngster1BattleText text_end -Route6EndBattleText3: - text_far _Route6EndBattleText3 +Route6Youngster1EndBattleText: + text_far _Route6Youngster1EndBattleText text_end -Route6AfterBattleText3: - text_far _Route6AfterBattleText3 +Route6Youngster1AfterBattleText: + text_far _Route6Youngster1AfterBattleText text_end -Route6Text4: +Route6CooltrainerM2Text: text_asm ld hl, Route6TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route6BattleText4: - text_far _Route6BattleText4 +Route6CooltrainerM2BattleText: + text_far _Route6CooltrainerM2BattleText text_end -Route6EndBattleText4: - text_far _Route6EndBattleText4 +Route6CooltrainerM2EndBattleText: + text_far _Route6CooltrainerM2EndBattleText text_end -Route6AfterBattleText4: - text_far _Route6AfterBattleText4 +Route6CooltrainerM2AfterBattleText: + text_far _Route6CooltrainerM2AfterBattleText text_end -Route6Text5: +Route6CooltrainerF2Text: text_asm ld hl, Route6TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route6BattleText5: - text_far _Route6BattleText5 +Route6CooltrainerF2BattleText: + text_far _Route6CooltrainerF2BattleText text_end -Route6EndBattleText5: - text_far _Route6EndBattleText5 +Route6CooltrainerF2EndBattleText: + text_far _Route6CooltrainerF2EndBattleText text_end -Route6AfterBattleText5: - text_far _Route6AfterBattleText5 +Route6CooltrainerF2AfterBattleText: + text_far _Route6CooltrainerF2AfterBattleText text_end -Route6Text6: +Route6Youngster2Text: text_asm ld hl, Route6TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route6BattleText6: - text_far _Route6BattleText6 +Route6Youngster2BattleText: + text_far _Route6Youngster2BattleText text_end -Route6EndBattleText6: - text_far _Route6EndBattleText6 +Route6Youngster2EndBattleText: + text_far _Route6Youngster2EndBattleText text_end -Route6AfterBattleText6: - text_far _Route6AfterBattleText6 +Route6Youngster2AfterBattleText: + text_far _Route6Youngster2AfterBattleText text_end -Route6Text7: - text_far _Route6Text7 +Route6UndergroundPathSignText: + text_far _Route6UndergroundPathSignText text_end diff --git a/scripts/Route6Gate.asm b/scripts/Route6Gate.asm index 143f60ae5..db4cfcab1 100644 --- a/scripts/Route6Gate.asm +++ b/scripts/Route6Gate.asm @@ -6,14 +6,15 @@ Route6Gate_Script: ret Route6Gate_ScriptPointers: - dw Route6GateScript0 - dw Route6GateScript1 + def_script_pointers + dw_const Route6GateDefaultScript, SCRIPT_ROUTE6GATE_DEFAULT + dw_const Route6GatePlayerMovingScript, SCRIPT_ROUTE6GATE_PLAYER_MOVING -Route6GateScript0: +Route6GateDefaultScript: ld a, [wd728] bit 6, a ret nz - ld hl, CoordsData_1e08c + ld hl, .PlayerInCoordsArray call ArePlayerCoordsInArray ret nc ld a, PLAYER_DIR_RIGHT @@ -23,27 +24,27 @@ Route6GateScript0: farcall RemoveGuardDrink ldh a, [hItemToRemoveID] and a - jr nz, .asm_1e080 - ld a, $2 + jr nz, .have_drink + ld a, TEXT_ROUTE6GATE_GUARD_GEE_IM_THIRSTY ldh [hSpriteIndexOrTextID], a call DisplayTextID - call Route6GateScript_1e0a1 - ld a, $1 + call Route6GateMovePlayerDownScript + ld a, SCRIPT_ROUTE6GATE_PLAYER_MOVING ld [wRoute6GateCurScript], a ret -.asm_1e080 +.have_drink ld hl, wd728 set 6, [hl] - ld a, $3 + ld a, TEXT_ROUTE6GATE_GUARD_GIVE_DRINK ldh [hSpriteIndexOrTextID], a jp DisplayTextID -CoordsData_1e08c: +.PlayerInCoordsArray: dbmapcoord 3, 2 dbmapcoord 4, 2 db -1 ; end -Route6GateScript1: +Route6GatePlayerMovingScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -53,10 +54,10 @@ Route6GateScript1: ld [wRoute6GateCurScript], a ret -Route6GateScript_1e0a1: +Route6GateMovePlayerDownScript: ld hl, wd730 set 7, [hl] - ld a, $80 + ld a, D_DOWN ld [wSimulatedJoypadStatesEnd], a ld a, $1 ld [wSimulatedJoypadStatesIndex], a @@ -66,6 +67,7 @@ Route6GateScript_1e0a1: ret Route6Gate_TextPointers: - dw Route6GateText1 - dw Route6GateText2 - dw Route6GateText3 + def_text_pointers + dw_const SaffronGateGuardText, TEXT_ROUTE6GATE_GUARD + dw_const SaffronGateGuardGeeImThirstyText, TEXT_ROUTE6GATE_GUARD_GEE_IM_THIRSTY + dw_const SaffronGateGuardGiveDrinkText, TEXT_ROUTE6GATE_GUARD_GIVE_DRINK diff --git a/scripts/Route7.asm b/scripts/Route7.asm index 1fd38abb7..f49822b32 100644 --- a/scripts/Route7.asm +++ b/scripts/Route7.asm @@ -2,8 +2,9 @@ Route7_Script: jp EnableAutoTextBoxDrawing Route7_TextPointers: - dw Route7Text1 + def_text_pointers + dw_const Route7UndergroundPathSignText, TEXT_ROUTE7_UNDERGROUND_PATH_SIGN -Route7Text1: - text_far _Route7Text1 +Route7UndergroundPathSignText: + text_far _Route7UndergroundPathSignText text_end diff --git a/scripts/Route7Gate.asm b/scripts/Route7Gate.asm index 9a647965d..0260fb488 100644 --- a/scripts/Route7Gate.asm +++ b/scripts/Route7Gate.asm @@ -6,13 +6,14 @@ Route7Gate_Script: ret Route7Gate_ScriptPointers: - dw Route7GateScript0 - dw Route7GateScript1 + def_script_pointers + dw_const Route7DefaultScript, SCRIPT_ROUTE7GATE_DEFAULT + dw_const Route7PlayerMovingScript, SCRIPT_ROUTE7GATE_PLAYER_MOVING -Route7GateScript_1e111: +Route7GateMovePlayerLeftScript: ld hl, wd730 set 7, [hl] - ld a, $20 + ld a, D_LEFT ld [wSimulatedJoypadStatesEnd], a ld a, $1 ld [wSimulatedJoypadStatesIndex], a @@ -21,11 +22,11 @@ Route7GateScript_1e111: ld [wOverrideSimulatedJoypadStatesMask], a ret -Route7GateScript0: +Route7DefaultScript: ld a, [wd728] bit 6, a ret nz - ld hl, CoordsData_1e167 + ld hl, .PlayerInCoordsArray call ArePlayerCoordsInArray ret nc ld a, PLAYER_DIR_UP @@ -35,28 +36,28 @@ Route7GateScript0: farcall RemoveGuardDrink ldh a, [hItemToRemoveID] and a - jr nz, .asm_1e15a - ld a, $2 + jr nz, .have_drink + ld a, TEXT_ROUTE7GATE_GUARD_GEE_IM_THIRSTY ldh [hSpriteIndexOrTextID], a call DisplayTextID - call Route7GateScript_1e111 - ld a, $1 + call Route7GateMovePlayerLeftScript + ld a, SCRIPT_ROUTE7GATE_PLAYER_MOVING ld [wRoute7GateCurScript], a ret -.asm_1e15a - ld a, $3 +.have_drink + ld a, TEXT_ROUTE7GATE_GUARD_GIVE_DRINK ldh [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd728 set 6, [hl] ret -CoordsData_1e167: +.PlayerInCoordsArray: dbmapcoord 3, 3 dbmapcoord 3, 4 db -1 ; end -Route7GateScript1: +Route7PlayerMovingScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -68,6 +69,7 @@ Route7GateScript1: ret Route7Gate_TextPointers: - dw Route7GateText1 - dw Route7GateText2 - dw Route7GateText3 + def_text_pointers + dw_const SaffronGateGuardText, TEXT_ROUTE7GATE_GUARD + dw_const SaffronGateGuardGeeImThirstyText, TEXT_ROUTE7GATE_GUARD_GEE_IM_THIRSTY + dw_const SaffronGateGuardGiveDrinkText, TEXT_ROUTE7GATE_GUARD_GIVE_DRINK diff --git a/scripts/Route8.asm b/scripts/Route8.asm index 7ecdbe097..657d5c834 100644 --- a/scripts/Route8.asm +++ b/scripts/Route8.asm @@ -8,206 +8,208 @@ Route8_Script: ret Route8_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_ROUTE8_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE8_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROUTE8_END_BATTLE Route8_TextPointers: - dw Route8Text1 - dw Route8Text2 - dw Route8Text3 - dw Route8Text4 - dw Route8Text5 - dw Route8Text6 - dw Route8Text7 - dw Route8Text8 - dw Route8Text9 - dw Route8Text10 + def_text_pointers + dw_const Route8SuperNerd1Text, TEXT_ROUTE8_SUPER_NERD1 + dw_const Route8Gambler1Text, TEXT_ROUTE8_GAMBLER1 + dw_const Route8SuperNerd2Text, TEXT_ROUTE8_SUPER_NERD2 + dw_const Route8CooltrainerF1Text, TEXT_ROUTE8_COOLTRAINER_F1 + dw_const Route8SuperNerd3Text, TEXT_ROUTE8_SUPER_NERD3 + dw_const Route8CooltrainerF2Text, TEXT_ROUTE8_COOLTRAINER_F2 + dw_const Route8CooltrainerF3Text, TEXT_ROUTE8_COOLTRAINER_F3 + dw_const Route8Gambler2Text, TEXT_ROUTE8_GAMBLER2 + dw_const Route8CooltrainerF4Text, TEXT_ROUTE8_COOLTRAINER_F4 + dw_const Route8UndergroundSignText, TEXT_ROUTE8_UNDERGROUND_SIGN Route8TrainerHeaders: def_trainers Route8TrainerHeader0: - trainer EVENT_BEAT_ROUTE_8_TRAINER_0, 4, Route8BattleText1, Route8EndBattleText1, Route8AfterBattleText1 + trainer EVENT_BEAT_ROUTE_8_TRAINER_0, 4, Route8SuperNerd1BattleText, Route8SuperNerd1EndBattleText, Route8SuperNerd1AfterBattleText Route8TrainerHeader1: - trainer EVENT_BEAT_ROUTE_8_TRAINER_1, 4, Route8BattleText2, Route8EndBattleText2, Route8AfterBattleText2 + trainer EVENT_BEAT_ROUTE_8_TRAINER_1, 4, Route8Gambler1BattleText, Route8Gambler1EndBattleText, Route8Gambler1AfterBattleText Route8TrainerHeader2: - trainer EVENT_BEAT_ROUTE_8_TRAINER_2, 4, Route8BattleText3, Route8EndBattleText3, Route8AfterBattleText3 + trainer EVENT_BEAT_ROUTE_8_TRAINER_2, 4, Route8SuperNerd2BattleText, Route8SuperNerd2EndBattleText, Route8SuperNerd2AfterBattleText Route8TrainerHeader3: - trainer EVENT_BEAT_ROUTE_8_TRAINER_3, 2, Route8BattleText4, Route8EndBattleText4, Route8AfterBattleText4 + trainer EVENT_BEAT_ROUTE_8_TRAINER_3, 2, Route8CooltrainerF1BattleText, Route8CooltrainerF21EndBattleText, Route8CooltrainerF1AfterBattleText Route8TrainerHeader4: - trainer EVENT_BEAT_ROUTE_8_TRAINER_4, 3, Route8BattleText5, Route8EndBattleText5, Route8AfterBattleText5 + trainer EVENT_BEAT_ROUTE_8_TRAINER_4, 3, Route8SuperNerd3BattleText, Route8SuperNerd3EndBattleText, Route8SuperNerd3AfterBattleText Route8TrainerHeader5: - trainer EVENT_BEAT_ROUTE_8_TRAINER_5, 3, Route8BattleText6, Route8EndBattleText6, Route8AfterBattleText6 + trainer EVENT_BEAT_ROUTE_8_TRAINER_5, 3, Route8CooltrainerF2BattleText, Route8CooltrainerF2EndBattleText, Route8CooltrainerF2AfterBattleText Route8TrainerHeader6: - trainer EVENT_BEAT_ROUTE_8_TRAINER_6, 2, Route8BattleText7, Route8EndBattleText7, Route8AfterBattleText7 + trainer EVENT_BEAT_ROUTE_8_TRAINER_6, 2, Route8CooltrainerF3BattleText, Route8CooltrainerF3EndBattleText, Route8CooltrainerF3AfterBattleText Route8TrainerHeader7: - trainer EVENT_BEAT_ROUTE_8_TRAINER_7, 2, Route8BattleText8, Route8EndBattleText8, Route8AfterBattleText8 + trainer EVENT_BEAT_ROUTE_8_TRAINER_7, 2, Route8Gambler2BattleText, Route8Gambler2EndBattleText, Route8Gambler2AfterBattleText Route8TrainerHeader8: - trainer EVENT_BEAT_ROUTE_8_TRAINER_8, 4, Route8BattleText9, Route8EndBattleText9, Route8AfterBattleText9 + trainer EVENT_BEAT_ROUTE_8_TRAINER_8, 4, Route8CooltrainerF4BattleText, Route8CooltrainerF4EndBattleText, Route8CooltrainerF4AfterBattleText db -1 ; end -Route8Text1: +Route8SuperNerd1Text: text_asm ld hl, Route8TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route8BattleText1: - text_far _Route8BattleText1 +Route8SuperNerd1BattleText: + text_far _Route8SuperNerd1BattleText text_end -Route8EndBattleText1: - text_far _Route8EndBattleText1 +Route8SuperNerd1EndBattleText: + text_far _Route8SuperNerd1EndBattleText text_end -Route8AfterBattleText1: - text_far _Route8AfterBattleText1 +Route8SuperNerd1AfterBattleText: + text_far _Route8SuperNerd1AfterBattleText text_end -Route8Text2: +Route8Gambler1Text: text_asm ld hl, Route8TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route8BattleText2: - text_far _Route8BattleText2 +Route8Gambler1BattleText: + text_far _Route8Gambler1BattleText text_end -Route8EndBattleText2: - text_far _Route8EndBattleText2 +Route8Gambler1EndBattleText: + text_far _Route8Gambler1EndBattleText text_end -Route8AfterBattleText2: - text_far _Route8AfterBattleText2 +Route8Gambler1AfterBattleText: + text_far _Route8Gambler1AfterBattleText text_end -Route8Text3: +Route8SuperNerd2Text: text_asm ld hl, Route8TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route8BattleText3: - text_far _Route8BattleText3 +Route8SuperNerd2BattleText: + text_far _Route8SuperNerd2BattleText text_end -Route8EndBattleText3: - text_far _Route8EndBattleText3 +Route8SuperNerd2EndBattleText: + text_far _Route8SuperNerd2EndBattleText text_end -Route8AfterBattleText3: - text_far _Route8AfterBattleText3 +Route8SuperNerd2AfterBattleText: + text_far _Route8SuperNerd2AfterBattleText text_end -Route8Text4: +Route8CooltrainerF1Text: text_asm ld hl, Route8TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route8BattleText4: - text_far _Route8BattleText4 +Route8CooltrainerF1BattleText: + text_far _Route8CooltrainerF1BattleText text_end -Route8EndBattleText4: - text_far _Route8EndBattleText4 +Route8CooltrainerF21EndBattleText: + text_far _Route8CooltrainerF21EndBattleText text_end -Route8AfterBattleText4: - text_far _Route8AfterBattleText4 +Route8CooltrainerF1AfterBattleText: + text_far _Route8CooltrainerF1AfterBattleText text_end -Route8Text5: +Route8SuperNerd3Text: text_asm ld hl, Route8TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route8BattleText5: - text_far _Route8BattleText5 +Route8SuperNerd3BattleText: + text_far _Route8SuperNerd3BattleText text_end -Route8EndBattleText5: - text_far _Route8EndBattleText5 +Route8SuperNerd3EndBattleText: + text_far _Route8SuperNerd3EndBattleText text_end -Route8AfterBattleText5: - text_far _Route8AfterBattleText5 +Route8SuperNerd3AfterBattleText: + text_far _Route8SuperNerd3AfterBattleText text_end -Route8Text6: +Route8CooltrainerF2Text: text_asm ld hl, Route8TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route8BattleText6: - text_far _Route8BattleText6 +Route8CooltrainerF2BattleText: + text_far _Route8CooltrainerF2BattleText text_end -Route8EndBattleText6: - text_far _Route8EndBattleText6 +Route8CooltrainerF2EndBattleText: + text_far _Route8CooltrainerF2EndBattleText text_end -Route8AfterBattleText6: - text_far _Route8AfterBattleText6 +Route8CooltrainerF2AfterBattleText: + text_far _Route8CooltrainerF2AfterBattleText text_end -Route8Text7: +Route8CooltrainerF3Text: text_asm ld hl, Route8TrainerHeader6 call TalkToTrainer jp TextScriptEnd -Route8BattleText7: - text_far _Route8BattleText7 +Route8CooltrainerF3BattleText: + text_far _Route8CooltrainerF3BattleText text_end -Route8EndBattleText7: - text_far _Route8EndBattleText7 +Route8CooltrainerF3EndBattleText: + text_far _Route8CooltrainerF3EndBattleText text_end -Route8AfterBattleText7: - text_far _Route8AfterBattleText7 +Route8CooltrainerF3AfterBattleText: + text_far _Route8CooltrainerF3AfterBattleText text_end -Route8Text8: +Route8Gambler2Text: text_asm ld hl, Route8TrainerHeader7 call TalkToTrainer jp TextScriptEnd -Route8BattleText8: - text_far _Route8BattleText8 +Route8Gambler2BattleText: + text_far _Route8Gambler2BattleText text_end -Route8EndBattleText8: - text_far _Route8EndBattleText8 +Route8Gambler2EndBattleText: + text_far _Route8Gambler2EndBattleText text_end -Route8AfterBattleText8: - text_far _Route8AfterBattleText8 +Route8Gambler2AfterBattleText: + text_far _Route8Gambler2AfterBattleText text_end -Route8Text9: +Route8CooltrainerF4Text: text_asm ld hl, Route8TrainerHeader8 call TalkToTrainer jp TextScriptEnd -Route8BattleText9: - text_far _Route8BattleText9 +Route8CooltrainerF4BattleText: + text_far _Route8CooltrainerF4BattleText text_end -Route8EndBattleText9: - text_far _Route8EndBattleText9 +Route8CooltrainerF4EndBattleText: + text_far _Route8CooltrainerF4EndBattleText text_end -Route8AfterBattleText9: - text_far _Route8AfterBattleText9 +Route8CooltrainerF4AfterBattleText: + text_far _Route8CooltrainerF4AfterBattleText text_end -Route8Text10: - text_far _Route8Text10 +Route8UndergroundSignText: + text_far _Route8UndergroundSignText text_end diff --git a/scripts/Route8Gate.asm b/scripts/Route8Gate.asm index 3167cd76e..af4fe1968 100644 --- a/scripts/Route8Gate.asm +++ b/scripts/Route8Gate.asm @@ -5,13 +5,14 @@ Route8Gate_Script: jp CallFunctionInTable Route8Gate_ScriptPointers: - dw Route8GateScript0 - dw Route8GateScript1 + def_script_pointers + dw_const Route8GateDefaultScript, SCRIPT_ROUTE8GATE_DEFAULT + dw_const Route8GatePlayerMovingScript, SCRIPT_ROUTE8GATE_PLAYER_MOVING -Route8GateScript_1e1d7: +Route8GateMovePlayerRightScript: ld hl, wd730 set 7, [hl] - ld a, $10 + ld a, D_RIGHT ld [wSimulatedJoypadStatesEnd], a ld a, $1 ld [wSimulatedJoypadStatesIndex], a @@ -20,11 +21,11 @@ Route8GateScript_1e1d7: ld [wOverrideSimulatedJoypadStatesMask], a ret -Route8GateScript0: +Route8GateDefaultScript: ld a, [wd728] bit 6, a ret nz - ld hl, CoordsData_1e22c + ld hl, .PlayerInCoordsArray call ArePlayerCoordsInArray ret nc ld a, PLAYER_DIR_LEFT @@ -34,27 +35,27 @@ Route8GateScript0: farcall RemoveGuardDrink ldh a, [hItemToRemoveID] and a - jr nz, .asm_1e220 - ld a, $2 + jr nz, .have_drink + ld a, TEXT_ROUTE8GATE_GUARD_GEE_IM_THIRSTY ldh [hSpriteIndexOrTextID], a call DisplayTextID - call Route8GateScript_1e1d7 - ld a, $1 + call Route8GateMovePlayerRightScript + ld a, SCRIPT_ROUTE8GATE_PLAYER_MOVING ld [wRoute8GateCurScript], a ret -.asm_1e220 +.have_drink ld hl, wd728 set 6, [hl] - ld a, $3 + ld a, TEXT_ROUTE8GATE_GUARD_GIVE_DRINK ldh [hSpriteIndexOrTextID], a jp DisplayTextID -CoordsData_1e22c: +.PlayerInCoordsArray: dbmapcoord 2, 3 dbmapcoord 2, 4 db -1 ; end -Route8GateScript1: +Route8GatePlayerMovingScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -65,6 +66,7 @@ Route8GateScript1: ret Route8Gate_TextPointers: - dw Route8GateText1 - dw Route8GateText2 - dw Route8GateText3 + def_text_pointers + dw_const SaffronGateGuardText, TEXT_ROUTE8GATE_GUARD + dw_const SaffronGateGuardGeeImThirstyText, TEXT_ROUTE8GATE_GUARD_GEE_IM_THIRSTY + dw_const SaffronGateGuardGiveDrinkText, TEXT_ROUTE8GATE_GUARD_GIVE_DRINK diff --git a/scripts/Route9.asm b/scripts/Route9.asm index 72c43a5c4..0aa912294 100644 --- a/scripts/Route9.asm +++ b/scripts/Route9.asm @@ -8,200 +8,202 @@ Route9_Script: ret Route9_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_ROUTE9_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE9_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROUTE9_END_BATTLE Route9_TextPointers: - dw Route9Text1 - dw Route9Text2 - dw Route9Text3 - dw Route9Text4 - dw Route9Text5 - dw Route9Text6 - dw Route9Text7 - dw Route9Text8 - dw Route9Text9 - dw PickUpItemText - dw Route9Text11 + def_text_pointers + dw_const Route9CooltrainerF1Text, TEXT_ROUTE9_COOLTRAINER_F1 + dw_const Route9CooltrainerM1Text, TEXT_ROUTE9_COOLTRAINER_M1 + dw_const Route9CooltrainerM2Text, TEXT_ROUTE9_COOLTRAINER_M2 + dw_const Route9CooltrainerF2Text, TEXT_ROUTE9_COOLTRAINER_F2 + dw_const Route9Hiker1Text, TEXT_ROUTE9_HIKER_1 + dw_const Route9Hiker2Text, TEXT_ROUTE9_HIKER_2 + dw_const Route9Youngster1Text, TEXT_ROUTE9_YOUNGSTER_1 + dw_const Route9Hiker3Text, TEXT_ROUTE9_HIKER_3 + dw_const Route9Youngster2Text, TEXT_ROUTE9_YOUNGSTER_2 + dw_const PickUpItemText, TEXT_ROUTE9_TM_TELEPORT + dw_const Route9SignText, TEXT_ROUTE9_SIGN Route9TrainerHeaders: def_trainers Route9TrainerHeader0: - trainer EVENT_BEAT_ROUTE_9_TRAINER_0, 3, Route9BattleText1, Route9EndBattleText1, Route9AfterBattleText1 + trainer EVENT_BEAT_ROUTE_9_TRAINER_0, 3, Route9CooltrainerF1BattleText, Route9CooltrainerF1EndBattleText, Route9CooltrainerF1AfterBattleText Route9TrainerHeader1: - trainer EVENT_BEAT_ROUTE_9_TRAINER_1, 2, Route9BattleText2, Route9EndBattleText2, Route9AfterBattleText2 + trainer EVENT_BEAT_ROUTE_9_TRAINER_1, 2, Route9CooltrainerM1BattleText, Route9CooltrainerM1EndBattleText, Route9CooltrainerM1AfterBattleText Route9TrainerHeader2: - trainer EVENT_BEAT_ROUTE_9_TRAINER_2, 4, Route9BattleText3, Route9EndBattleText3, Route9AfterBattleText3 + trainer EVENT_BEAT_ROUTE_9_TRAINER_2, 4, Route9CooltrainerM2BattleText, Route9CooltrainerM2EndBattleText, Route9CooltrainerM2AfterBattleText Route9TrainerHeader3: - trainer EVENT_BEAT_ROUTE_9_TRAINER_3, 2, Route9BattleText4, Route9EndBattleText4, Route9AfterBattleText4 + trainer EVENT_BEAT_ROUTE_9_TRAINER_3, 2, Route9CooltrainerF2BattleText, Route9CooltrainerF2EndBattleText, Route9CooltrainerF2AfterBattleText Route9TrainerHeader4: - trainer EVENT_BEAT_ROUTE_9_TRAINER_4, 2, Route9BattleText5, Route9EndBattleText5, Route9AfterBattleText5 + trainer EVENT_BEAT_ROUTE_9_TRAINER_4, 2, Route9Hiker1BattleText, Route9Hiker1EndBattleText, Route9Hiker1AfterBattleText Route9TrainerHeader5: - trainer EVENT_BEAT_ROUTE_9_TRAINER_5, 3, Route9BattleText6, Route9EndBattleText6, Route9AfterBattleText6 + trainer EVENT_BEAT_ROUTE_9_TRAINER_5, 3, Route9Hiker2BattleText, Route9Hiker2EndBattleText, Route9Hiker2AfterBattleText Route9TrainerHeader6: - trainer EVENT_BEAT_ROUTE_9_TRAINER_6, 4, Route9BattleText7, Route9EndBattleText7, Route9AfterBattleText7 + trainer EVENT_BEAT_ROUTE_9_TRAINER_6, 4, Route9Youngster1BattleText, Route9Youngster1EndBattleText, Route9Youngster1AfterBattleText Route9TrainerHeader7: - trainer EVENT_BEAT_ROUTE_9_TRAINER_7, 2, Route9BattleText8, Route9EndBattleText8, Route9AfterBattleText8 + trainer EVENT_BEAT_ROUTE_9_TRAINER_7, 2, Route9Hiker3BattleText, Route9Hiker3EndBattleText, Route9Hiker3AfterBattleText Route9TrainerHeader8: - trainer EVENT_BEAT_ROUTE_9_TRAINER_8, 2, Route9BattleText9, Route9EndBattleText9, Route9AfterBattleText9 + trainer EVENT_BEAT_ROUTE_9_TRAINER_8, 2, Route9Youngster2BattleText, Route9Youngster2EndBattleText, Route9Youngster2AfterBattleText db -1 ; end -Route9Text1: +Route9CooltrainerF1Text: text_asm ld hl, Route9TrainerHeader0 jr Route9TalkToTrainer -Route9Text2: +Route9CooltrainerM1Text: text_asm ld hl, Route9TrainerHeader1 jr Route9TalkToTrainer -Route9Text3: +Route9CooltrainerM2Text: text_asm ld hl, Route9TrainerHeader2 jr Route9TalkToTrainer -Route9Text4: +Route9CooltrainerF2Text: text_asm ld hl, Route9TrainerHeader3 jr Route9TalkToTrainer -Route9Text5: +Route9Hiker1Text: text_asm ld hl, Route9TrainerHeader4 jr Route9TalkToTrainer -Route9Text6: +Route9Hiker2Text: text_asm ld hl, Route9TrainerHeader5 jr Route9TalkToTrainer -Route9Text7: +Route9Youngster1Text: text_asm ld hl, Route9TrainerHeader6 jr Route9TalkToTrainer -Route9Text8: +Route9Hiker3Text: text_asm ld hl, Route9TrainerHeader7 jr Route9TalkToTrainer -Route9Text9: +Route9Youngster2Text: text_asm ld hl, Route9TrainerHeader8 Route9TalkToTrainer: call TalkToTrainer jp TextScriptEnd -Route9BattleText1: - text_far _Route9BattleText1 +Route9CooltrainerF1BattleText: + text_far _Route9CooltrainerF1BattleText text_end -Route9EndBattleText1: - text_far _Route9EndBattleText1 +Route9CooltrainerF1EndBattleText: + text_far _Route9CooltrainerF1EndBattleText text_end -Route9AfterBattleText1: - text_far _Route9AfterBattleText1 +Route9CooltrainerF1AfterBattleText: + text_far _Route9CooltrainerF1AfterBattleText text_end -Route9BattleText2: - text_far _Route9BattleText2 +Route9CooltrainerM1BattleText: + text_far _Route9CooltrainerM1BattleText text_end -Route9EndBattleText2: - text_far _Route9EndBattleText2 +Route9CooltrainerM1EndBattleText: + text_far _Route9CooltrainerM1EndBattleText text_end -Route9AfterBattleText2: - text_far _Route9AfterBattleText2 +Route9CooltrainerM1AfterBattleText: + text_far _Route9CooltrainerM1AfterBattleText text_end -Route9BattleText3: - text_far _Route9BattleText3 +Route9CooltrainerM2BattleText: + text_far _Route9CooltrainerM2BattleText text_end -Route9EndBattleText3: - text_far _Route9EndBattleText3 +Route9CooltrainerM2EndBattleText: + text_far _Route9CooltrainerM2EndBattleText text_end -Route9AfterBattleText3: - text_far _Route9AfterBattleText3 +Route9CooltrainerM2AfterBattleText: + text_far _Route9CooltrainerM2AfterBattleText text_end -Route9BattleText4: - text_far _Route9BattleText4 +Route9CooltrainerF2BattleText: + text_far _Route9CooltrainerF2BattleText text_end -Route9EndBattleText4: - text_far _Route9EndBattleText4 +Route9CooltrainerF2EndBattleText: + text_far _Route9CooltrainerF2EndBattleText text_end -Route9AfterBattleText4: - text_far _Route9AfterBattleText4 +Route9CooltrainerF2AfterBattleText: + text_far _Route9CooltrainerF2AfterBattleText text_end -Route9BattleText5: - text_far _Route9BattleText5 +Route9Hiker1BattleText: + text_far _Route9Hiker1BattleText text_end -Route9EndBattleText5: - text_far _Route9EndBattleText5 +Route9Hiker1EndBattleText: + text_far _Route9Hiker1EndBattleText text_end -Route9AfterBattleText5: - text_far _Route9AfterBattleText5 +Route9Hiker1AfterBattleText: + text_far _Route9Hiker1AfterBattleText text_end -Route9BattleText6: - text_far _Route9BattleText6 +Route9Hiker2BattleText: + text_far _Route9Hiker2BattleText text_end -Route9EndBattleText6: - text_far _Route9EndBattleText6 +Route9Hiker2EndBattleText: + text_far _Route9Hiker2EndBattleText text_end -Route9AfterBattleText6: - text_far _Route9AfterBattleText6 +Route9Hiker2AfterBattleText: + text_far _Route9Hiker2AfterBattleText text_end -Route9BattleText7: - text_far _Route9BattleText7 +Route9Youngster1BattleText: + text_far _Route9Youngster1BattleText text_end -Route9EndBattleText7: - text_far _Route9EndBattleText7 +Route9Youngster1EndBattleText: + text_far _Route9Youngster1EndBattleText text_end -Route9AfterBattleText7: - text_far _Route9AfterBattleText7 +Route9Youngster1AfterBattleText: + text_far _Route9Youngster1AfterBattleText text_end -Route9BattleText8: - text_far _Route9BattleText8 +Route9Hiker3BattleText: + text_far _Route9Hiker3BattleText text_end -Route9EndBattleText8: - text_far _Route9EndBattleText8 +Route9Hiker3EndBattleText: + text_far _Route9Hiker3EndBattleText text_end -Route9AfterBattleText8: - text_far _Route9AfterBattleText8 +Route9Hiker3AfterBattleText: + text_far _Route9Hiker3AfterBattleText text_end -Route9BattleText9: - text_far _Route9BattleText9 +Route9Youngster2BattleText: + text_far _Route9Youngster2BattleText text_end -Route9EndBattleText9: - text_far _Route9EndBattleText9 +Route9Youngster2EndBattleText: + text_far _Route9Youngster2EndBattleText text_end -Route9AfterBattleText9: - text_far _Route9AfterBattleText9 +Route9Youngster2AfterBattleText: + text_far _Route9Youngster2AfterBattleText text_end -Route9Text11: - text_far _Route9Text11 +Route9SignText: + text_far _Route9SignText text_end diff --git a/scripts/SSAnne1F.asm b/scripts/SSAnne1F.asm index c819f4708..0bea07d59 100644 --- a/scripts/SSAnne1F.asm +++ b/scripts/SSAnne1F.asm @@ -3,13 +3,14 @@ SSAnne1F_Script: ret SSAnne1F_TextPointers: - dw SSAnne1Text1 - dw SSAnne1Text2 + def_text_pointers + dw_const SSAnne1FWaiterText, TEXT_SSANNE1F_WAITER + dw_const SSAnne1FSailorText, TEXT_SSANNE1F_SAILOR -SSAnne1Text1: - text_far _SSAnne1Text1 +SSAnne1FWaiterText: + text_far _SSAnne1FWaiterText text_end -SSAnne1Text2: - text_far _SSAnne1Text2 +SSAnne1FSailorText: + text_far _SSAnne1FSailorText text_end diff --git a/scripts/SSAnne1FRooms.asm b/scripts/SSAnne1FRooms.asm index f958dff85..10cc8cb95 100644 --- a/scripts/SSAnne1FRooms.asm +++ b/scripts/SSAnne1FRooms.asm @@ -8,130 +8,132 @@ SSAnne1FRooms_Script: ret SSAnne1FRooms_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_SSANNE1FROOMS_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_SSANNE1FROOMS_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_SSANNE1FROOMS_END_BATTLE SSAnne1FRooms_TextPointers: - dw SSAnne8Text1 - dw SSAnne8Text2 - dw SSAnne8Text3 - dw SSAnne8Text4 - dw SSAnne8Text5 - dw SSAnne8Text6 - dw SSAnne8Text7 - dw SSAnne8Text8 - dw SSAnne8Text9 - dw PickUpItemText - dw SSAnne8Text11 + def_text_pointers + dw_const SSAnne1FRoomsGentleman1Text, TEXT_SSANNE1FROOMS_GENTLEMAN1 + dw_const SSAnne1FRoomsGentleman2Text, TEXT_SSANNE1FROOMS_GENTLEMAN2 + dw_const SSAnne1FRoomsYoungsterText, TEXT_SSANNE1FROOMS_YOUNGSTER + dw_const SSAnne1FRoomsCooltrainerFText, TEXT_SSANNE1FROOMS_COOLTRAINER_F + dw_const SSAnne1FRoomsGirl1Text, TEXT_SSANNE1FROOMS_GIRL1 + dw_const SSAnne1FRoomsMiddleAgedManText, TEXT_SSANNE1FROOMS_MIDDLE_AGED_MAN + dw_const SSAnne1FRoomsLittleGirlText, TEXT_SSANNE1FROOMS_LITTLE_GIRL + dw_const SSAnne1FRoomsWigglytuffText, TEXT_SSANNE1FROOMS_WIGGLYTUFF + dw_const SSAnne1FRoomsGirl2Text, TEXT_SSANNE1FROOMS_GIRL2 + dw_const PickUpItemText, TEXT_SSANNE1FROOMS_TM_BODY_SLAM + dw_const SSAnne1FRoomsGentleman3Text, TEXT_SSANNE1FROOMS_GENTLEMAN3 SSAnne8TrainerHeaders: def_trainers SSAnne8TrainerHeader0: - trainer EVENT_BEAT_SS_ANNE_8_TRAINER_0, 2, SSAnne8BattleText1, SSAnne8EndBattleText1, SSAnne8AfterBattleText1 + trainer EVENT_BEAT_SS_ANNE_8_TRAINER_0, 2, SSAnne1FRoomsGentleman1BattleText, SSAnne1FRoomsGentleman1EndBattleText, SSAnne1FRoomsGentleman1AfterBattleText SSAnne8TrainerHeader1: - trainer EVENT_BEAT_SS_ANNE_8_TRAINER_1, 3, SSAnne8BattleText2, SSAnne8EndBattleText2, SSAnne8AfterBattleText2 + trainer EVENT_BEAT_SS_ANNE_8_TRAINER_1, 3, SSAnne1FRoomsGentleman2BattleText, SSAnne1FRoomsGentleman2EndBattleText, SSAnne1FRoomsGentleman2AfterBattleText SSAnne8TrainerHeader2: - trainer EVENT_BEAT_SS_ANNE_8_TRAINER_2, 2, SSAnne8BattleText3, SSAnne8EndBattleText3, SSAnne8AfterBattleText3 + trainer EVENT_BEAT_SS_ANNE_8_TRAINER_2, 2, SSAnne1FRoomsYoungsterBattleText, SSAnne1FRoomsYoungsterEndBattleText, SSAnne1FRoomsYoungsterAfterBattleText SSAnne8TrainerHeader3: - trainer EVENT_BEAT_SS_ANNE_8_TRAINER_3, 2, SSAnne8BattleText4, SSAnne8EndBattleText4, SSAnne8AfterBattleText4 + trainer EVENT_BEAT_SS_ANNE_8_TRAINER_3, 2, SSAnne1FRoomsCooltrainerFBattleText, SSAnne1FRoomsCooltrainerFEndBattleText, SSAnne1FRoomsCooltrainerFAfterBattleText db -1 ; end -SSAnne8Text1: +SSAnne1FRoomsGentleman1Text: text_asm ld hl, SSAnne8TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SSAnne8Text2: +SSAnne1FRoomsGentleman2Text: text_asm ld hl, SSAnne8TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SSAnne8Text3: +SSAnne1FRoomsYoungsterText: text_asm ld hl, SSAnne8TrainerHeader2 call TalkToTrainer jp TextScriptEnd -SSAnne8Text4: +SSAnne1FRoomsCooltrainerFText: text_asm ld hl, SSAnne8TrainerHeader3 call TalkToTrainer jp TextScriptEnd -SSAnne8Text8: - text_far _SSAnne8Text8 +SSAnne1FRoomsWigglytuffText: + text_far _SSAnne1FRoomsWigglytuffText text_asm ld a, WIGGLYTUFF call PlayCry jp TextScriptEnd -SSAnne8BattleText1: - text_far _SSAnne8BattleText1 +SSAnne1FRoomsGentleman1BattleText: + text_far _SSAnne1FRoomsGentleman1BattleText text_end -SSAnne8EndBattleText1: - text_far _SSAnne8EndBattleText1 +SSAnne1FRoomsGentleman1EndBattleText: + text_far _SSAnne1FRoomsGentleman1EndBattleText text_end -SSAnne8AfterBattleText1: - text_far _SSAnne8AfterBattleText1 +SSAnne1FRoomsGentleman1AfterBattleText: + text_far _SSAnne1FRoomsGentleman1AfterBattleText text_end -SSAnne8BattleText2: - text_far _SSAnne8BattleText2 +SSAnne1FRoomsGentleman2BattleText: + text_far _SSAnne1FRoomsGentleman2BattleText text_end -SSAnne8EndBattleText2: - text_far _SSAnne8EndBattleText2 +SSAnne1FRoomsGentleman2EndBattleText: + text_far _SSAnne1FRoomsGentleman2EndBattleText text_end -SSAnne8AfterBattleText2: - text_far _SSAnne8AfterBattleText2 +SSAnne1FRoomsGentleman2AfterBattleText: + text_far _SSAnne1FRoomsGentleman2AfterBattleText text_end -SSAnne8BattleText3: - text_far _SSAnne8BattleText3 +SSAnne1FRoomsYoungsterBattleText: + text_far _SSAnne1FRoomsYoungsterBattleText text_end -SSAnne8EndBattleText3: - text_far _SSAnne8EndBattleText3 +SSAnne1FRoomsYoungsterEndBattleText: + text_far _SSAnne1FRoomsYoungsterEndBattleText text_end -SSAnne8AfterBattleText3: - text_far _SSAnne8AfterBattleText3 +SSAnne1FRoomsYoungsterAfterBattleText: + text_far _SSAnne1FRoomsYoungsterAfterBattleText text_end -SSAnne8BattleText4: - text_far _SSAnne8BattleText4 +SSAnne1FRoomsCooltrainerFBattleText: + text_far _SSAnne1FRoomsCooltrainerFBattleText text_end -SSAnne8EndBattleText4: - text_far _SSAnne8EndBattleText4 +SSAnne1FRoomsCooltrainerFEndBattleText: + text_far _SSAnne1FRoomsCooltrainerFEndBattleText text_end -SSAnne8AfterBattleText4: - text_far _SSAnne8AfterBattleText4 +SSAnne1FRoomsCooltrainerFAfterBattleText: + text_far _SSAnne1FRoomsCooltrainerFAfterBattleText text_end -SSAnne8Text5: - text_far _SSAnne8Text5 +SSAnne1FRoomsGirl1Text: + text_far _SSAnne1FRoomsGirl1Text text_end -SSAnne8Text6: - text_far _SSAnne8Text6 +SSAnne1FRoomsMiddleAgedManText: + text_far _SSAnne1FRoomsMiddleAgedManText text_end -SSAnne8Text7: - text_far _SSAnne8Text7 +SSAnne1FRoomsLittleGirlText: + text_far _SSAnne1FRoomsLittleGirlText text_end -SSAnne8Text9: - text_far _SSAnne8Text9 +SSAnne1FRoomsGirl2Text: + text_far _SSAnne1FRoomsGirl2Text text_end -SSAnne8Text11: - text_far _SSAnne8Text11 +SSAnne1FRoomsGentleman3Text: + text_far _SSAnne1FRoomsGentleman3Text text_end diff --git a/scripts/SSAnne2F.asm b/scripts/SSAnne2F.asm index d15ec1803..3d6be5d17 100644 --- a/scripts/SSAnne2F.asm +++ b/scripts/SSAnne2F.asm @@ -4,24 +4,25 @@ SSAnne2F_Script: ld a, [wSSAnne2FCurScript] jp CallFunctionInTable -SSAnne2Script_613ab: +SSAnne2FResetScripts: xor a ld [wJoyIgnore], a ld [wSSAnne2FCurScript], a ret SSAnne2F_ScriptPointers: - dw SSAnne2Script0 - dw SSAnne2Script1 - dw SSAnne2Script2 - dw SSAnne2Script3 - dw SSAnne2Script4 - -SSAnne2Script4: + def_script_pointers + dw_const SSAnne2FDefaultScript, SCRIPT_SSANNE2F_DEFAULT + dw_const SSAnne2FRivalStartBattleScript, SCRIPT_SSANNE2F_RIVAL_START_BATTLE + dw_const SSAnne2FRivalAfterBattleScript, SCRIPT_SSANNE2F_RIVAL_AFTER_BATTLE + dw_const SSAnne2FRivalExitScript, SCRIPT_SSANNE2F_RIVAL_EXIT + dw_const SSAnne2FNoopScript, SCRIPT_SSANNE2F_NOOP + +SSAnne2FNoopScript: ret -SSAnne2Script0: - ld hl, CoordsData_61411 +SSAnne2FDefaultScript: + ld hl, .PlayerCoordinatesArray call ArePlayerCoordsInArray ret nc ld a, SFX_STOP_ALL_MUSIC @@ -36,63 +37,63 @@ SSAnne2Script0: ld [wMissableObjectIndex], a predef ShowObject call Delay3 - ld a, $2 + ld a, SSANNE2F_RIVAL ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF xor a ldh [hJoyHeld], a - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ldh a, [hSavedCoordIndex] cp $2 - jr nz, .asm_61400 - ld de, MovementData_6140c - jr .asm_61403 -.asm_61400 - ld de, MovementData_6140d -.asm_61403 + jr nz, .player_standing_right + ld de, .RivalDownFourMovement + jr .move_sprite +.player_standing_right + ld de, .RivalDownThreeMovement +.move_sprite call MoveSprite - ld a, $1 + ld a, SCRIPT_SSANNE2F_RIVAL_START_BATTLE ld [wSSAnne2FCurScript], a ret -MovementData_6140c: +.RivalDownFourMovement: db NPC_MOVEMENT_DOWN -MovementData_6140d: +.RivalDownThreeMovement: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db -1 ; end -CoordsData_61411: +.PlayerCoordinatesArray: dbmapcoord 36, 8 dbmapcoord 37, 8 db -1 ; end -SSAnne2Script_61416: +SSAnne2FSetFacingDirectionScript: ld a, [wXCoord] cp 37 - jr nz, .asm_61426 + jr nz, .player_standing_left ld a, PLAYER_DIR_LEFT ld [wPlayerMovingDirection], a ld a, SPRITE_FACING_RIGHT - jr .asm_61427 -.asm_61426 + jr .set_facing_direction +.player_standing_left xor a ; SPRITE_FACING_DOWN -.asm_61427 +.set_facing_direction ldh [hSpriteFacingDirection], a - ld a, $2 + ld a, SSANNE2F_RIVAL ldh [hSpriteIndex], a jp SetSpriteFacingDirectionAndDelay -SSAnne2Script1: +SSAnne2FRivalStartBattleScript: ld a, [wd730] bit 0, a ret nz - call SSAnne2Script_61416 + call SSAnne2FSetFacingDirectionScript xor a ld [wJoyIgnore], a - ld a, $2 + ld a, TEXT_SSANNE2F_RIVAL ldh [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 @@ -115,54 +116,54 @@ SSAnne2Script1: .done ld [wTrainerNo], a - call SSAnne2Script_61416 - ld a, $2 + call SSAnne2FSetFacingDirectionScript + ld a, SCRIPT_SSANNE2F_RIVAL_AFTER_BATTLE ld [wSSAnne2FCurScript], a ret -SSAnne2Script2: +SSAnne2FRivalAfterBattleScript: ld a, [wIsInBattle] cp $ff - jp z, SSAnne2Script_613ab - call SSAnne2Script_61416 - ld a, $f0 + jp z, SSAnne2FResetScripts + call SSAnne2FSetFacingDirectionScript + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a - ld a, $3 + ld a, TEXT_SSANNE2F_RIVAL_CUT_MASTER ldh [hSpriteIndexOrTextID], a call DisplayTextID - ld a, $2 + ld a, SSANNE2F_RIVAL ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF ld a, [wXCoord] cp 37 - jr nz, .asm_61497 - ld de, MovementData_614b9 - jr .asm_6149a -.asm_61497 - ld de, MovementData_614b7 -.asm_6149a - ld a, $2 + jr nz, .player_standing_left + ld de, .RivalDownFourMovement + jr .move_sprite +.player_standing_left + ld de, .RivalWalkAroundPlayerMovement +.move_sprite + ld a, SSANNE2F_RIVAL ldh [hSpriteIndex], a call MoveSprite ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound farcall Music_RivalAlternateStart - ld a, $3 + ld a, SCRIPT_SSANNE2F_RIVAL_EXIT ld [wSSAnne2FCurScript], a ret -MovementData_614b7: +.RivalWalkAroundPlayerMovement: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_DOWN -MovementData_614b9: +.RivalDownFourMovement: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db -1 ; end -SSAnne2Script3: +SSAnne2FRivalExitScript: ld a, [wd730] bit 0, a ret nz @@ -172,43 +173,44 @@ SSAnne2Script3: ld [wMissableObjectIndex], a predef HideObject call PlayDefaultMusic - ld a, $4 + ld a, SCRIPT_SSANNE2F_NOOP ld [wSSAnne2FCurScript], a ret SSAnne2F_TextPointers: - dw SSAnne2Text1 - dw SSAnne2Text2 - dw SSAnne2Text3 + def_text_pointers + dw_const SSAnne2FWaiterText, TEXT_SSANNE2F_WAITER + dw_const SSAnne2FRivalText, TEXT_SSANNE2F_RIVAL + dw_const SSAnne2FRivalCutMasterText, TEXT_SSANNE2F_RIVAL_CUT_MASTER -SSAnne2Text1: - text_far _SSAnne2Text1 +SSAnne2FWaiterText: + text_far _SSAnne2FWaiterText text_end -SSAnne2Text2: +SSAnne2FRivalText: text_asm - ld hl, SSAnneRivalBeforeBattleText + ld hl, .Text call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, SSAnneRivalDefeatedText - ld de, SSAnneRivalWonText + ld hl, SSAnne2FRivalDefeatedText + ld de, SSAnne2FRivalVictoryText call SaveEndBattleTextPointers jp TextScriptEnd -SSAnneRivalBeforeBattleText: - text_far _SSAnneRivalBeforeBattleText +.Text: + text_far _SSAnne2FRivalText text_end -SSAnneRivalDefeatedText: - text_far _SSAnneRivalDefeatedText +SSAnne2FRivalDefeatedText: + text_far _SSAnne2FRivalDefeatedText text_end -SSAnneRivalWonText: - text_far _SSAnneRivalWonText +SSAnne2FRivalVictoryText: + text_far _SSAnne2FRivalVictoryText text_end -SSAnne2Text3: - text_far _SSAnneRivalCaptainText +SSAnne2FRivalCutMasterText: + text_far _SSAnne2FRivalCutMasterText text_end diff --git a/scripts/SSAnne2FRooms.asm b/scripts/SSAnne2FRooms.asm index 4fa679e37..e7b88b3f9 100644 --- a/scripts/SSAnne2FRooms.asm +++ b/scripts/SSAnne2FRooms.asm @@ -11,179 +11,181 @@ SSAnne2FRooms_Script: ret SSAnne2FRooms_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_SSANNE2FROOMS_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_SSANNE2FROOMS_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_SSANNE2FROOMS_END_BATTLE SSAnne2FRooms_TextPointers: - dw SSAnne9Text1 - dw SSAnne9Text2 - dw SSAnne9Text3 - dw SSAnne9Text4 - dw SSAnne9Text5 - dw PickUpItemText - dw SSAnne9Text7 - dw SSAnne9Text8 - dw PickUpItemText - dw SSAnne9Text10 - dw SSAnne9Text11 - dw SSAnne9Text12 - dw SSAnne9Text13 + def_text_pointers + dw_const SSAnne2FRoomsGentleman1Text, TEXT_SSANNE2FROOMS_GENTLEMAN1 + dw_const SSAnne2FRoomsFisherText, TEXT_SSANNE2FROOMS_FISHER + dw_const SSAnne2FRoomsGentleman2Text, TEXT_SSANNE2FROOMS_GENTLEMAN2 + dw_const SSAnne2FRoomsCooltrainerFText, TEXT_SSANNE2FROOMS_COOLTRAINER_F + dw_const SSAnne2FRoomsGentleman3Text, TEXT_SSANNE2FROOMS_GENTLEMAN3 + dw_const PickUpItemText, TEXT_SSANNE2FROOMS_MAX_ETHER + dw_const SSAnne2FRoomsGentleman4Text, TEXT_SSANNE2FROOMS_GENTLEMAN4 + dw_const SSAnne2FRoomsGrampsText, TEXT_SSANNE2FROOMS_GRAMPS + dw_const PickUpItemText, TEXT_SSANNE2FROOMS_RARE_CANDY + dw_const SSAnne2FRoomsGentleman5Text, TEXT_SSANNE2FROOMS_GENTLEMAN5 + dw_const SSAnne2FRoomsLittleBoyText, TEXT_SSANNE2FROOMS_LITTLE_BOY + dw_const SSAnne2FRoomsBrunetteGirlText, TEXT_SSANNE2FROOMS_BRUNETTE_GIRL + dw_const SSAnne2FRoomsBeautyText, TEXT_SSANNE2FROOMS_BEAUTY SSAnne9TrainerHeaders: def_trainers SSAnne9TrainerHeader0: - trainer EVENT_BEAT_SS_ANNE_9_TRAINER_0, 2, SSAnne9BattleText1, SSAnne9EndBattleText1, SSAnne9AfterBattleText1 + trainer EVENT_BEAT_SS_ANNE_9_TRAINER_0, 2, SSAnne2FRoomsGentleman1BattleText, SSAnne2FRoomsGentleman1EndBattleText, SSAnne2FRoomsGentleman1AfterBattleText SSAnne9TrainerHeader1: - trainer EVENT_BEAT_SS_ANNE_9_TRAINER_1, 3, SSAnne9BattleText2, SSAnne9EndBattleText2, SSAnne9AfterBattleText2 + trainer EVENT_BEAT_SS_ANNE_9_TRAINER_1, 3, SSAnne2FRoomsFisherBattleText, SSAnne2FRoomsFisherEndBattleText, SSAnne2FRoomsFisherAfterBattleText SSAnne9TrainerHeader2: - trainer EVENT_BEAT_SS_ANNE_9_TRAINER_2, 3, SSAnne9BattleText3, SSAnne9EndBattleText3, SSAnne9AfterBattleText3 + trainer EVENT_BEAT_SS_ANNE_9_TRAINER_2, 3, SSAnne2FRoomsGentleman2BattleText, SSAnne2FRoomsGentleman2EndBattleText, SSAnne2FRoomsGentleman2AfterBattleText SSAnne9TrainerHeader3: - trainer EVENT_BEAT_SS_ANNE_9_TRAINER_3, 2, SSAnne9BattleText4, SSAnne9EndBattleText4, SSAnne9AfterBattleText4 + trainer EVENT_BEAT_SS_ANNE_9_TRAINER_3, 2, SSAnne2FRoomsCooltrainerFBattleText, SSAnne2FRoomsCooltrainerFEndBattleText, SSAnne2FRoomsCooltrainerFAfterBattleText db -1 ; end -SSAnne9Text1: +SSAnne2FRoomsGentleman1Text: text_asm ld hl, SSAnne9TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SSAnne9Text2: +SSAnne2FRoomsFisherText: text_asm ld hl, SSAnne9TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SSAnne9Text3: +SSAnne2FRoomsGentleman2Text: text_asm ld hl, SSAnne9TrainerHeader2 call TalkToTrainer jp TextScriptEnd -SSAnne9Text4: +SSAnne2FRoomsCooltrainerFText: text_asm ld hl, SSAnne9TrainerHeader3 call TalkToTrainer jp TextScriptEnd -SSAnne9Text5: +SSAnne2FRoomsGentleman3Text: text_asm call SaveScreenTilesToBuffer1 - ld hl, SSAnne9Text_61bf2 + ld hl, .Text call PrintText call LoadScreenTilesFromBuffer1 ld a, SNORLAX call DisplayPokedex jp TextScriptEnd -SSAnne9Text_61bf2: - text_far _SSAnne9Text_61bf2 +.Text: + text_far _SSAnne2FRoomsGentleman3Text text_end -SSAnne9Text7: +SSAnne2FRoomsGentleman4Text: text_asm - ld hl, SSAnne9Text_61c01 + ld hl, .Text call PrintText jp TextScriptEnd -SSAnne9Text_61c01: - text_far _SSAnne9Text_61c01 +.Text: + text_far _SSAnne2FRoomsGentleman4Text text_end -SSAnne9Text8: +SSAnne2FRoomsGrampsText: text_asm - ld hl, SSAnne9Text_61c10 + ld hl, .Text call PrintText jp TextScriptEnd -SSAnne9Text_61c10: - text_far _SSAnne9Text_61c10 +.Text: + text_far _SSAnne2FRoomsGrampsText text_end -SSAnne9Text10: +SSAnne2FRoomsGentleman5Text: text_asm - ld hl, SSAnne9Text_61c1f + ld hl, .Text call PrintText jp TextScriptEnd -SSAnne9Text_61c1f: - text_far _SSAnne9Text_61c1f +.Text: + text_far _SSAnne2FRoomsGentleman5Text text_end -SSAnne9Text11: +SSAnne2FRoomsLittleBoyText: text_asm - ld hl, SSAnne9Text_61c2e + ld hl, .Text call PrintText jp TextScriptEnd -SSAnne9Text_61c2e: - text_far _SSAnne9Text_61c2e +.Text: + text_far _SSAnne2FRoomsLittleBoyText text_end -SSAnne9Text12: +SSAnne2FRoomsBrunetteGirlText: text_asm - ld hl, SSAnne9Text_61c3d + ld hl, .Text call PrintText jp TextScriptEnd -SSAnne9Text_61c3d: - text_far _SSAnne9Text_61c3d +.Text: + text_far _SSAnne2FRoomsBrunetteGirlText text_end -SSAnne9Text13: +SSAnne2FRoomsBeautyText: text_asm - ld hl, SSAnne9Text_61c4c + ld hl, .Text call PrintText jp TextScriptEnd -SSAnne9Text_61c4c: - text_far _SSAnne9Text_61c4c +.Text: + text_far _SSAnne2FRoomsBeautyText text_end -SSAnne9BattleText1: - text_far _SSAnne9BattleText1 +SSAnne2FRoomsGentleman1BattleText: + text_far _SSAnne2FRoomsGentleman1BattleText text_end -SSAnne9EndBattleText1: - text_far _SSAnne9EndBattleText1 +SSAnne2FRoomsGentleman1EndBattleText: + text_far _SSAnne2FRoomsGentleman1EndBattleText text_end -SSAnne9AfterBattleText1: - text_far _SSAnne9AfterBattleText1 +SSAnne2FRoomsGentleman1AfterBattleText: + text_far _SSAnne2FRoomsGentleman1AfterBattleText text_end -SSAnne9BattleText2: - text_far _SSAnne9BattleText2 +SSAnne2FRoomsFisherBattleText: + text_far _SSAnne2FRoomsFisherBattleText text_end -SSAnne9EndBattleText2: - text_far _SSAnne9EndBattleText2 +SSAnne2FRoomsFisherEndBattleText: + text_far _SSAnne2FRoomsFisherEndBattleText text_end -SSAnne9AfterBattleText2: - text_far _SSAnne9AfterBattleText2 +SSAnne2FRoomsFisherAfterBattleText: + text_far _SSAnne2FRoomsFisherAfterBattleText text_end -SSAnne9BattleText3: - text_far _SSAnne9BattleText3 +SSAnne2FRoomsGentleman2BattleText: + text_far _SSAnne2FRoomsGentleman2BattleText text_end -SSAnne9EndBattleText3: - text_far _SSAnne9EndBattleText3 +SSAnne2FRoomsGentleman2EndBattleText: + text_far _SSAnne2FRoomsGentleman2EndBattleText text_end -SSAnne9AfterBattleText3: - text_far _SSAnne9AfterBattleText3 +SSAnne2FRoomsGentleman2AfterBattleText: + text_far _SSAnne2FRoomsGentleman2AfterBattleText text_end -SSAnne9BattleText4: - text_far _SSAnne9BattleText4 +SSAnne2FRoomsCooltrainerFBattleText: + text_far _SSAnne2FRoomsCooltrainerFBattleText text_end -SSAnne9EndBattleText4: - text_far _SSAnne9EndBattleText4 +SSAnne2FRoomsCooltrainerFEndBattleText: + text_far _SSAnne2FRoomsCooltrainerFEndBattleText text_end -SSAnne9AfterBattleText4: - text_far _SSAnne9AfterBattleText4 +SSAnne2FRoomsCooltrainerFAfterBattleText: + text_far _SSAnne2FRoomsCooltrainerFAfterBattleText text_end diff --git a/scripts/SSAnne3F.asm b/scripts/SSAnne3F.asm index e3e7a1d33..21443fbc3 100644 --- a/scripts/SSAnne3F.asm +++ b/scripts/SSAnne3F.asm @@ -2,8 +2,9 @@ SSAnne3F_Script: jp EnableAutoTextBoxDrawing SSAnne3F_TextPointers: - dw SSAnne3Text1 + def_text_pointers + dw_const SSAnne3FSailorText, TEXT_SSANNE3F_SAILOR -SSAnne3Text1: - text_far _SSAnne3Text1 +SSAnne3FSailorText: + text_far _SSAnne3FSailorText text_end diff --git a/scripts/SSAnneB1F.asm b/scripts/SSAnneB1F.asm index f66fdfaa9..218c9ec70 100644 --- a/scripts/SSAnneB1F.asm +++ b/scripts/SSAnneB1F.asm @@ -2,5 +2,6 @@ SSAnneB1F_Script: jp EnableAutoTextBoxDrawing SSAnneB1F_TextPointers: + def_text_pointers text_end ; unused diff --git a/scripts/SSAnneB1FRooms.asm b/scripts/SSAnneB1FRooms.asm index 610a0ca06..e4a61de58 100644 --- a/scripts/SSAnneB1FRooms.asm +++ b/scripts/SSAnneB1FRooms.asm @@ -8,154 +8,156 @@ SSAnneB1FRooms_Script: ret SSAnneB1FRooms_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_SSANNEB1FROOMS_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_SSANNEB1FROOMS_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_SSANNEB1FROOMS_END_BATTLE SSAnneB1FRooms_TextPointers: - dw SSAnne10Text1 - dw SSAnne10Text2 - dw SSAnne10Text3 - dw SSAnne10Text4 - dw SSAnne10Text5 - dw SSAnne10Text6 - dw SSAnne10Text7 - dw SSAnne10Text8 - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText + def_text_pointers + dw_const SSAnneB1FRoomsSailor1Text, TEXT_SSANNEB1FROOMS_SAILOR1 + dw_const SSAnneB1FRoomsSailor2Text, TEXT_SSANNEB1FROOMS_SAILOR2 + dw_const SSAnneB1FRoomsSailor3Text, TEXT_SSANNEB1FROOMS_SAILOR3 + dw_const SSAnneB1FRoomsSailor4Text, TEXT_SSANNEB1FROOMS_SAILOR4 + dw_const SSAnneB1FRoomsSailor5Text, TEXT_SSANNEB1FROOMS_SAILOR5 + dw_const SSAnneB1FRoomsFisherText, TEXT_SSANNEB1FROOMS_FISHER + dw_const SSAnneB1FRoomsSuperNerdText, TEXT_SSANNEB1FROOMS_SUPER_NERD + dw_const SSAnneB1FRoomsMachokeText, TEXT_SSANNEB1FROOMS_MACHOKE + dw_const PickUpItemText, TEXT_SSANNEB1FROOMS_ETHER + dw_const PickUpItemText, TEXT_SSANNEB1FROOMS_TM_REST + dw_const PickUpItemText, TEXT_SSANNEB1FROOMS_MAX_POTION SSAnne10TrainerHeaders: def_trainers SSAnne10TrainerHeader0: - trainer EVENT_BEAT_SS_ANNE_10_TRAINER_0, 2, SSAnne10BattleText1, SSAnne10EndBattleText1, SSAnne10AfterBattleText1 + trainer EVENT_BEAT_SS_ANNE_10_TRAINER_0, 2, SSAnneB1FRoomsSailor1BattleText, SSAnneB1FRoomsSailor1EndBattleText, SSAnneB1FRoomsSailor1AfterBattleText SSAnne10TrainerHeader1: - trainer EVENT_BEAT_SS_ANNE_10_TRAINER_1, 3, SSAnne10BattleText2, SSAnne10EndBattleText2, SSAnne10AfterBattleText2 + trainer EVENT_BEAT_SS_ANNE_10_TRAINER_1, 3, SSAnneB1FRoomsSailor2BattleText, SSAnneB1FRoomsSailor2EndBattleText, SSAnneB1FRoomsSailor2AfterBattleText SSAnne10TrainerHeader2: - trainer EVENT_BEAT_SS_ANNE_10_TRAINER_2, 2, SSAnne10BattleText3, SSAnne10EndBattleText3, SSAnne10AfterBattleText3 + trainer EVENT_BEAT_SS_ANNE_10_TRAINER_2, 2, SSAnneB1FRoomsSailor3BattleText, SSAnneB1FRoomsSailor3EndBattleText, SSAnneB1FRoomsSailor3AfterBattleText SSAnne10TrainerHeader3: - trainer EVENT_BEAT_SS_ANNE_10_TRAINER_3, 2, SSAnne10BattleText4, SSAnne10EndBattleText4, SSAnne10AfterBattleText4 + trainer EVENT_BEAT_SS_ANNE_10_TRAINER_3, 2, SSAnneB1FRoomsSailor4BattleText, SSAnneB1FRoomsSailor4EndBattleText, SSAnneB1FRoomsSailor4AfterBattleText SSAnne10TrainerHeader4: - trainer EVENT_BEAT_SS_ANNE_10_TRAINER_4, 2, SSAnne10BattleText5, SSAnne10EndBattleText5, SSAnne10AfterBattleText5 + trainer EVENT_BEAT_SS_ANNE_10_TRAINER_4, 2, SSAnneB1FRoomsSailor5BattleText, SSAnneB1FRoomsSailor5EndBattleText, SSAnneB1FRoomsSailor5AfterBattleText SSAnne10TrainerHeader5: - trainer EVENT_BEAT_SS_ANNE_10_TRAINER_5, 3, SSAnne10BattleText6, SSAnne10EndBattleText6, SSAnne10AfterBattleText6 + trainer EVENT_BEAT_SS_ANNE_10_TRAINER_5, 3, SSAnneB1FRoomsFisherBattleText, SSAnneB1FRoomsFisherEndBattleText, SSAnneB1FRoomsFisherAfterBattleText db -1 ; end -SSAnne10Text1: +SSAnneB1FRoomsSailor1Text: text_asm ld hl, SSAnne10TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SSAnne10Text2: +SSAnneB1FRoomsSailor2Text: text_asm ld hl, SSAnne10TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SSAnne10Text3: +SSAnneB1FRoomsSailor3Text: text_asm ld hl, SSAnne10TrainerHeader2 call TalkToTrainer jp TextScriptEnd -SSAnne10Text4: +SSAnneB1FRoomsSailor4Text: text_asm ld hl, SSAnne10TrainerHeader3 call TalkToTrainer jp TextScriptEnd -SSAnne10Text5: +SSAnneB1FRoomsSailor5Text: text_asm ld hl, SSAnne10TrainerHeader4 call TalkToTrainer jp TextScriptEnd -SSAnne10Text6: +SSAnneB1FRoomsFisherText: text_asm ld hl, SSAnne10TrainerHeader5 call TalkToTrainer jp TextScriptEnd -SSAnne10Text8: - text_far _SSAnne10Text8 +SSAnneB1FRoomsMachokeText: + text_far _SSAnneB1FRoomsMachokeText text_asm ld a, MACHOKE call PlayCry jp TextScriptEnd -SSAnne10BattleText1: - text_far _SSAnne10BattleText1 +SSAnneB1FRoomsSailor1BattleText: + text_far _SSAnneB1FRoomsSailor1BattleText text_end -SSAnne10EndBattleText1: - text_far _SSAnne10EndBattleText1 +SSAnneB1FRoomsSailor1EndBattleText: + text_far _SSAnneB1FRoomsSailor1EndBattleText text_end -SSAnne10AfterBattleText1: - text_far _SSAnne10AfterBattleText1 +SSAnneB1FRoomsSailor1AfterBattleText: + text_far _SSAnneB1FRoomsSailor1AfterBattleText text_end -SSAnne10BattleText2: - text_far _SSAnne10BattleText2 +SSAnneB1FRoomsSailor2BattleText: + text_far _SSAnneB1FRoomsSailor2BattleText text_end -SSAnne10EndBattleText2: - text_far _SSAnne10EndBattleText2 +SSAnneB1FRoomsSailor2EndBattleText: + text_far _SSAnneB1FRoomsSailor2EndBattleText text_end -SSAnne10AfterBattleText2: - text_far _SSAnne10AfterBattleText2 +SSAnneB1FRoomsSailor2AfterBattleText: + text_far _SSAnneB1FRoomsSailor2AfterBattleText text_end -SSAnne10BattleText3: - text_far _SSAnne10BattleText3 +SSAnneB1FRoomsSailor3BattleText: + text_far _SSAnneB1FRoomsSailor3BattleText text_end -SSAnne10EndBattleText3: - text_far _SSAnne10EndBattleText3 +SSAnneB1FRoomsSailor3EndBattleText: + text_far _SSAnneB1FRoomsSailor3EndBattleText text_end -SSAnne10AfterBattleText3: - text_far _SSAnne10AfterBattleText3 +SSAnneB1FRoomsSailor3AfterBattleText: + text_far _SSAnneB1FRoomsSailor3AfterBattleText text_end -SSAnne10BattleText4: - text_far _SSAnne10BattleText4 +SSAnneB1FRoomsSailor4BattleText: + text_far _SSAnneB1FRoomsSailor4BattleText text_end -SSAnne10EndBattleText4: - text_far _SSAnne10EndBattleText4 +SSAnneB1FRoomsSailor4EndBattleText: + text_far _SSAnneB1FRoomsSailor4EndBattleText text_end -SSAnne10AfterBattleText4: - text_far _SSAnne10AfterBattleText4 +SSAnneB1FRoomsSailor4AfterBattleText: + text_far _SSAnneB1FRoomsSailor4AfterBattleText text_end -SSAnne10BattleText5: - text_far _SSAnne10BattleText5 +SSAnneB1FRoomsSailor5BattleText: + text_far _SSAnneB1FRoomsSailor5BattleText text_end -SSAnne10EndBattleText5: - text_far _SSAnne10EndBattleText5 +SSAnneB1FRoomsSailor5EndBattleText: + text_far _SSAnneB1FRoomsSailor5EndBattleText text_end -SSAnne10AfterBattleText5: - text_far _SSAnne10AfterBattleText5 +SSAnneB1FRoomsSailor5AfterBattleText: + text_far _SSAnneB1FRoomsSailor5AfterBattleText text_end -SSAnne10BattleText6: - text_far _SSAnne10BattleText6 +SSAnneB1FRoomsFisherBattleText: + text_far _SSAnneB1FRoomsFisherBattleText text_end -SSAnne10EndBattleText6: - text_far _SSAnne10EndBattleText6 +SSAnneB1FRoomsFisherEndBattleText: + text_far _SSAnneB1FRoomsFisherEndBattleText text_end -SSAnne10AfterBattleText6: - text_far _SSAnne10AfterBattleText6 +SSAnneB1FRoomsFisherAfterBattleText: + text_far _SSAnneB1FRoomsFisherAfterBattleText text_end -SSAnne10Text7: - text_far _SSAnne10Text7 +SSAnneB1FRoomsSuperNerdText: + text_far _SSAnneB1FRoomsSuperNerdText text_end diff --git a/scripts/SSAnneBow.asm b/scripts/SSAnneBow.asm index 80d98668e..2e3b5e00f 100644 --- a/scripts/SSAnneBow.asm +++ b/scripts/SSAnneBow.asm @@ -8,69 +8,71 @@ SSAnneBow_Script: ret SSAnneBow_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_SSANNEBOW_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_SSANNEBOW_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_SSANNEBOW_END_BATTLE SSAnneBow_TextPointers: - dw SSAnne5Text1 - dw SSAnne5Text2 - dw SSAnne5Text3 - dw SSAnne5Text4 - dw SSAnne5Text5 + def_text_pointers + dw_const SSAnneBowSuperNerdText, TEXT_SSANNEBOW_SUPER_NERD + dw_const SSAnneBowSailor1Text, TEXT_SSANNEBOW_SAILOR1 + dw_const SSAnneBowCooltrainerMText, TEXT_SSANNEBOW_COOLTRAINER_M + dw_const SSAnneBowSailor2Text, TEXT_SSANNEBOW_SAILOR2 + dw_const SSAnneBowSailor3Text, TEXT_SSANNEBOW_SAILOR3 SSAnne5TrainerHeaders: def_trainers 4 SSAnne5TrainerHeader0: - trainer EVENT_BEAT_SS_ANNE_5_TRAINER_0, 3, SSAnne5BattleText1, SSAnne5EndBattleText1, SSAnne5AfterBattleText1 + trainer EVENT_BEAT_SS_ANNE_5_TRAINER_0, 3, SSAnneBowSailor2BattleText, SSAnneBowSailor2EndBattleText, SSAnneBowSailor2AfterBattleText SSAnne5TrainerHeader1: - trainer EVENT_BEAT_SS_ANNE_5_TRAINER_1, 3, SSAnne5BattleText2, SSAnne5EndBattleText2, SSAnne5AfterBattleText2 + trainer EVENT_BEAT_SS_ANNE_5_TRAINER_1, 3, SSAnneBowSailor3BattleText, SSAnneBowSailor3EndBattleText, SSAnneBowSailor3AfterBattleText db -1 ; end -SSAnne5Text1: - text_far _SSAnne5Text1 +SSAnneBowSuperNerdText: + text_far _SSAnneBowSuperNerdText text_end -SSAnne5Text2: - text_far _SSAnne5Text2 +SSAnneBowSailor1Text: + text_far _SSAnneBowSailor1Text text_end -SSAnne5Text3: - text_far _SSAnne5Text3 +SSAnneBowCooltrainerMText: + text_far _SSAnneBowCooltrainerMText text_end -SSAnne5Text4: +SSAnneBowSailor2Text: text_asm ld hl, SSAnne5TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SSAnne5BattleText1: - text_far _SSAnne5BattleText1 +SSAnneBowSailor2BattleText: + text_far _SSAnneBowSailor2BattleText text_end -SSAnne5EndBattleText1: - text_far _SSAnne5EndBattleText1 +SSAnneBowSailor2EndBattleText: + text_far _SSAnneBowSailor2EndBattleText text_end -SSAnne5AfterBattleText1: - text_far _SSAnne5AfterBattleText1 +SSAnneBowSailor2AfterBattleText: + text_far _SSAnneBowSailor2AfterBattleText text_end -SSAnne5Text5: +SSAnneBowSailor3Text: text_asm ld hl, SSAnne5TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SSAnne5BattleText2: - text_far _SSAnne5BattleText2 +SSAnneBowSailor3BattleText: + text_far _SSAnneBowSailor3BattleText text_end -SSAnne5EndBattleText2: - text_far _SSAnne5EndBattleText2 +SSAnneBowSailor3EndBattleText: + text_far _SSAnneBowSailor3EndBattleText text_end -SSAnne5AfterBattleText2: - text_far _SSAnne5AfterBattleText2 +SSAnneBowSailor3AfterBattleText: + text_far _SSAnneBowSailor3AfterBattleText text_end diff --git a/scripts/SSAnneCaptainsRoom.asm b/scripts/SSAnneCaptainsRoom.asm index d618a69e1..da094261f 100644 --- a/scripts/SSAnneCaptainsRoom.asm +++ b/scripts/SSAnneCaptainsRoom.asm @@ -1,8 +1,8 @@ SSAnneCaptainsRoom_Script: - call SSAnne7Script_6189b + call SSAnneCaptainsRoomEventScript jp EnableAutoTextBoxDrawing -SSAnne7Script_6189b: +SSAnneCaptainsRoomEventScript: CheckEvent EVENT_RUBBED_CAPTAINS_BACK ret nz ld hl, wd72d @@ -10,84 +10,85 @@ SSAnne7Script_6189b: ret SSAnneCaptainsRoom_TextPointers: - dw SSAnne7Text1 - dw SSAnne7Text2 - dw SSAnne7Text3 + def_text_pointers + dw_const SSAnneCaptainsRoomCaptainText, TEXT_SSANNECAPTAINSROOM_CAPTAIN + dw_const SSAnneCaptainsRoomTrashText, TEXT_SSANNECAPTAINSROOM_TRASH + dw_const SSAnneCaptainsRoomSeasickBookText, TEXT_SSANNECAPTAINSROOM_SEASICK_BOOK -SSAnne7Text1: +SSAnneCaptainsRoomCaptainText: text_asm CheckEvent EVENT_GOT_HM01 jr nz, .got_item - ld hl, SSAnne7RubText + ld hl, SSAnneCaptainsRoomRubCaptainsBackText call PrintText - ld hl, ReceivingHM01Text + ld hl, SSAnneCaptainsRoomCaptainIFeelMuchBetterText call PrintText lb bc, HM_CUT, 1 call GiveItem jr nc, .bag_full - ld hl, ReceivedHM01Text + ld hl, SSAnneCaptainsRoomCaptainReceivedHM01Text call PrintText SetEvent EVENT_GOT_HM01 jr .done .bag_full - ld hl, HM01NoRoomText + ld hl, SSAnneCaptainsRoomCaptainHM01NoRoomText call PrintText ld hl, wd72d set 5, [hl] jr .done .got_item - ld hl, SSAnne7Text_61932 + ld hl, SSAnneCaptainsRoomCaptainNotSickAnymoreText call PrintText .done jp TextScriptEnd -SSAnne7RubText: - text_far _SSAnne7RubText +SSAnneCaptainsRoomRubCaptainsBackText: + text_far _SSAnneCaptainsRoomRubCaptainsBackText text_asm ld a, [wAudioROMBank] cp BANK("Audio Engine 3") ld [wAudioSavedROMBank], a - jr nz, .asm_61908 + jr nz, .not_audio_engine_3 ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound ld a, BANK(Music_PkmnHealed) ld [wAudioROMBank], a -.asm_61908 +.not_audio_engine_3 ld a, MUSIC_PKMN_HEALED ld [wNewSoundID], a call PlaySound -.asm_61910 +.loop ld a, [wChannelSoundIDs] cp MUSIC_PKMN_HEALED - jr z, .asm_61910 + jr z, .loop call PlayDefaultMusic SetEvent EVENT_RUBBED_CAPTAINS_BACK ld hl, wd72d res 5, [hl] jp TextScriptEnd -ReceivingHM01Text: - text_far _ReceivingHM01Text +SSAnneCaptainsRoomCaptainIFeelMuchBetterText: + text_far _SSAnneCaptainsRoomCaptainIFeelMuchBetterText text_end -ReceivedHM01Text: - text_far _ReceivedHM01Text +SSAnneCaptainsRoomCaptainReceivedHM01Text: + text_far _SSAnneCaptainsRoomCaptainReceivedHM01Text sound_get_key_item text_end -SSAnne7Text_61932: - text_far _SSAnne7Text_61932 +SSAnneCaptainsRoomCaptainNotSickAnymoreText: + text_far _SSAnneCaptainsRoomCaptainNotSickAnymoreText text_end -HM01NoRoomText: - text_far _HM01NoRoomText +SSAnneCaptainsRoomCaptainHM01NoRoomText: + text_far _SSAnneCaptainsRoomCaptainHM01NoRoomText text_end -SSAnne7Text2: - text_far _SSAnne7Text2 +SSAnneCaptainsRoomTrashText: + text_far _SSAnneCaptainsRoomTrashText text_end -SSAnne7Text3: - text_far _SSAnne7Text3 +SSAnneCaptainsRoomSeasickBookText: + text_far _SSAnneCaptainsRoomSeasickBookText text_end diff --git a/scripts/SSAnneKitchen.asm b/scripts/SSAnneKitchen.asm index 30a9830f0..4062199cf 100644 --- a/scripts/SSAnneKitchen.asm +++ b/scripts/SSAnneKitchen.asm @@ -3,70 +3,71 @@ SSAnneKitchen_Script: ret SSAnneKitchen_TextPointers: - dw SSAnne6Text1 - dw SSAnne6Text2 - dw SSAnne6Text3 - dw SSAnne6Text4 - dw SSAnne6Text5 - dw SSAnne6Text6 - dw SSAnne6Text7 + def_text_pointers + dw_const SSAnneKitchenCook1Text, TEXT_SSANNEKITCHEN_COOK1 + dw_const SSAnneKitchenCook2Text, TEXT_SSANNEKITCHEN_COOK2 + dw_const SSAnneKitchenCook3Text, TEXT_SSANNEKITCHEN_COOK3 + dw_const SSAnneKitchenCook4Text, TEXT_SSANNEKITCHEN_COOK4 + dw_const SSAnneKitchenCook5Text, TEXT_SSANNEKITCHEN_COOK5 + dw_const SSAnneKitchenCook6Text, TEXT_SSANNEKITCHEN_COOK6 + dw_const SSAnneKitchenCook7Text, TEXT_SSANNEKITCHEN_COOK7 -SSAnne6Text1: - text_far _SSAnne6Text1 +SSAnneKitchenCook1Text: + text_far _SSAnneKitchenCook1Text text_end -SSAnne6Text2: - text_far _SSAnne6Text2 +SSAnneKitchenCook2Text: + text_far _SSAnneKitchenCook2Text text_end -SSAnne6Text3: - text_far _SSAnne6Text3 +SSAnneKitchenCook3Text: + text_far _SSAnneKitchenCook3Text text_end -SSAnne6Text4: - text_far _SSAnne6Text4 +SSAnneKitchenCook4Text: + text_far _SSAnneKitchenCook4Text text_end -SSAnne6Text5: - text_far _SSAnne6Text5 +SSAnneKitchenCook5Text: + text_far _SSAnneKitchenCook5Text text_end -SSAnne6Text6: - text_far _SSAnne6Text6 +SSAnneKitchenCook6Text: + text_far _SSAnneKitchenCook6Text text_end -SSAnne6Text7: +SSAnneKitchenCook7Text: text_asm - ld hl, SSAnne6Text_61807 + ld hl, .MainCourseIsText call PrintText ldh a, [hRandomAdd] bit 7, a jr z, .not_dialog_1 - ld hl, SSAnne6Text_6180c + ld hl, .SalmonDuSaladText jr .done .not_dialog_1 bit 4, a jr z, .not_dialog_2 - ld hl, SSAnne6Text_61811 + ld hl, .EelsAuBarbecueText jr .done .not_dialog_2 - ld hl, SSAnne6Text_61816 + ld hl, .PrimeBeefSteakText .done call PrintText jp TextScriptEnd -SSAnne6Text_61807: - text_far _SSAnne6Text_61807 +.MainCourseIsText: + text_far _SSAnneKitchenCook7MainCourseIsText text_end -SSAnne6Text_6180c: - text_far _SSAnne6Text_6180c +.SalmonDuSaladText: + text_far SSAnneKitchenCook7SalmonDuSaladText text_end -SSAnne6Text_61811: - text_far _SSAnne6Text_61811 +.EelsAuBarbecueText: + text_far SSAnneKitchenCook7EelsAuBarbecueText text_end -SSAnne6Text_61816: - text_far _SSAnne6Text_61816 +.PrimeBeefSteakText: + text_far SSAnneKitchenCook7PrimeBeefSteakText text_end diff --git a/scripts/SafariZoneCenter.asm b/scripts/SafariZoneCenter.asm index 1e7db2435..4dd100eba 100644 --- a/scripts/SafariZoneCenter.asm +++ b/scripts/SafariZoneCenter.asm @@ -2,14 +2,15 @@ SafariZoneCenter_Script: jp EnableAutoTextBoxDrawing SafariZoneCenter_TextPointers: - dw PickUpItemText - dw SafariZoneCenterText2 - dw SafariZoneCenterText3 + def_text_pointers + dw_const PickUpItemText, TEXT_SAFARIZONECENTER_NUGGET + dw_const SafariZoneCenterRestHouseSignText, TEXT_SAFARIZONECENTER_REST_HOUSE_SIGN + dw_const SafariZoneCenterTrainerTipsSignText, TEXT_SAFARIZONECENTER_TRAINER_TIPS_SIGN -SafariZoneCenterText2: - text_far _SafariZoneCenterText2 +SafariZoneCenterRestHouseSignText: + text_far _SafariZoneCenterRestHouseSignText text_end -SafariZoneCenterText3: - text_far _SafariZoneCenterText3 +SafariZoneCenterTrainerTipsSignText: + text_far _SafariZoneCenterTrainerTipsSignText text_end diff --git a/scripts/SafariZoneCenterRestHouse.asm b/scripts/SafariZoneCenterRestHouse.asm index a03823cce..3bba2ca6f 100644 --- a/scripts/SafariZoneCenterRestHouse.asm +++ b/scripts/SafariZoneCenterRestHouse.asm @@ -2,13 +2,14 @@ SafariZoneCenterRestHouse_Script: jp EnableAutoTextBoxDrawing SafariZoneCenterRestHouse_TextPointers: - dw SafariZoneRestHouse1Text1 - dw SafariZoneRestHouse1Text2 + def_text_pointers + dw_const SafariZoneCenterRestHouseGirlText, TEXT_SAFARIZONECENTERRESTHOUSE_GIRL + dw_const SafariZoneCenterRestHouseScientistText, TEXT_SAFARIZONECENTERRESTHOUSE_SCIENTIST -SafariZoneRestHouse1Text1: - text_far _SafariZoneRestHouse1Text1 +SafariZoneCenterRestHouseGirlText: + text_far _SafariZoneCenterRestHouseGirlText text_end -SafariZoneRestHouse1Text2: - text_far _SafariZoneRestHouse1Text2 +SafariZoneCenterRestHouseScientistText: + text_far _SafariZoneCenterRestHouseScientistText text_end diff --git a/scripts/SafariZoneEast.asm b/scripts/SafariZoneEast.asm index 062eeab1e..6cb045d38 100644 --- a/scripts/SafariZoneEast.asm +++ b/scripts/SafariZoneEast.asm @@ -2,22 +2,23 @@ SafariZoneEast_Script: jp EnableAutoTextBoxDrawing SafariZoneEast_TextPointers: - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw SafariZoneEastText5 - dw SafariZoneEastText6 - dw SafariZoneEastText7 + def_text_pointers + dw_const PickUpItemText, TEXT_SAFARIZONEEAST_FULL_RESTORE + dw_const PickUpItemText, TEXT_SAFARIZONEEAST_MAX_RESTORE + dw_const PickUpItemText, TEXT_SAFARIZONEEAST_CARBOS + dw_const PickUpItemText, TEXT_SAFARIZONEEAST_TM_EGG_BOMB + dw_const SafariZoneEastRestHouseSignText, TEXT_SAFARIZONEEAST_REST_HOUSE_SIGN + dw_const SafariZoneEastTrainerTipsText, TEXT_SAFARIZONEEAST_TRAINER_TIPS + dw_const SafariZoneEastSignText, TEXT_SAFARIZONEEAST_SIGN -SafariZoneEastText5: - text_far _SafariZoneEastText5 +SafariZoneEastRestHouseSignText: + text_far _SafariZoneEastRestHouseSignText text_end -SafariZoneEastText6: - text_far _SafariZoneEastText6 +SafariZoneEastTrainerTipsText: + text_far _SafariZoneEastTrainerTipsText text_end -SafariZoneEastText7: - text_far _SafariZoneEastText7 +SafariZoneEastSignText: + text_far _SafariZoneEastSignText text_end diff --git a/scripts/SafariZoneEastRestHouse.asm b/scripts/SafariZoneEastRestHouse.asm index 03655d699..7d8e726d0 100644 --- a/scripts/SafariZoneEastRestHouse.asm +++ b/scripts/SafariZoneEastRestHouse.asm @@ -3,18 +3,19 @@ SafariZoneEastRestHouse_Script: ret SafariZoneEastRestHouse_TextPointers: - dw SafariZoneRestHouse3Text1 - dw SafariZoneRestHouse3Text2 - dw SafariZoneRestHouse3Text3 + def_text_pointers + dw_const SafariZoneEastRestHouseScientistText, TEXT_SAFARIZONEEASTRESTHOUSE_SCIENTIST + dw_const SafariZoneEastRestHouseRockerText, TEXT_SAFARIZONEEASTRESTHOUSE_ROCKER + dw_const SafariZoneEastRestHouseSilphWorkerMText, TEXT_SAFARIZONEEASTRESTHOUSE_SILPH_WORKER_M -SafariZoneRestHouse3Text1: - text_far _SafariZoneRestHouse3Text1 +SafariZoneEastRestHouseScientistText: + text_far _SafariZoneEastRestHouseScientistText text_end -SafariZoneRestHouse3Text2: - text_far _SafariZoneRestHouse3Text2 +SafariZoneEastRestHouseRockerText: + text_far _SafariZoneEastRestHouseRockerText text_end -SafariZoneRestHouse3Text3: - text_far _SafariZoneRestHouse3Text3 +SafariZoneEastRestHouseSilphWorkerMText: + text_far _SafariZoneEastRestHouseSilphWorkerMText text_end diff --git a/scripts/SafariZoneGate.asm b/scripts/SafariZoneGate.asm index fd9a08840..a0f9c1f41 100644 --- a/scripts/SafariZoneGate.asm +++ b/scripts/SafariZoneGate.asm @@ -5,22 +5,24 @@ SafariZoneGate_Script: jp CallFunctionInTable SafariZoneGate_ScriptPointers: - dw .SafariZoneEntranceScript0 - dw .SafariZoneEntranceScript1 - dw .SafariZoneEntranceScript2 - dw .SafariZoneEntranceScript3 - dw .SafariZoneEntranceScript4 - dw .SafariZoneEntranceScript5 - dw .SafariZoneEntranceScript6 + def_script_pointers + dw_const SafariZoneGateDefaultScript, SCRIPT_SAFARIZONEGATE_DEFAULT + dw_const SafariZoneGatePlayerMovingRightScript, SCRIPT_SAFARIZONEGATE_PLAYER_MOVING_RIGHT + dw_const SafariZoneGateWouldYouLikeToJoinScript, SCRIPT_SAFARIZONEGATE_WOULD_YOU_LIKE_TO_JOIN + dw_const SafariZoneGatePlayerMovingUpScript, SCRIPT_SAFARIZONEGATE_PLAYER_MOVING + dw_const SafariZoneGatePlayerMovingDownScript, SCRIPT_SAFARIZONEGATE_PLAYER_MOVING_DOWN + dw_const SafariZoneGateLeavingSafariScript, SCRIPT_SAFARIZONEGATE_LEAVING_SAFARI + dw_const SafariZoneGateSetScriptAfterMoveScript, SCRIPT_SAFARIZONEGATE_SET_SCRIPT_AFTER_MOVE + EXPORT SCRIPT_SAFARIZONEGATE_LEAVING_SAFARI ; used by engine/events/hidden_objects/safari_game.asm -.SafariZoneEntranceScript0 - ld hl, .CoordsData_75221 +SafariZoneGateDefaultScript: + ld hl, .PlayerNextToSafariZoneWorker1CoordsArray call ArePlayerCoordsInArray ret nc - ld a, $3 + ld a, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1_1 ldh [hSpriteIndexOrTextID], a call DisplayTextID - ld a, $ff + ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a xor a ldh [hJoyHeld], a @@ -28,59 +30,59 @@ SafariZoneGate_ScriptPointers: ld [wSpritePlayerStateData1FacingDirection], a ld a, [wCoordIndex] cp $1 - jr z, .asm_7520f - ld a, $2 + jr z, .player_not_next_to_worker + ld a, SCRIPT_SAFARIZONEGATE_WOULD_YOU_LIKE_TO_JOIN ld [wSafariZoneGateCurScript], a ret -.asm_7520f +.player_not_next_to_worker ld a, D_RIGHT ld c, $1 call SafariZoneEntranceAutoWalk - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a - ld a, $1 + ld a, SCRIPT_SAFARIZONEGATE_PLAYER_MOVING_RIGHT ld [wSafariZoneGateCurScript], a ret -.CoordsData_75221: +.PlayerNextToSafariZoneWorker1CoordsArray: dbmapcoord 3, 2 dbmapcoord 4, 2 db -1 ; end -.SafariZoneEntranceScript1 - call SafariZoneEntranceScript_752b4 +SafariZoneGatePlayerMovingRightScript: + call SafariZoneGateReturnSimulatedJoypadStateScript ret nz -.SafariZoneEntranceScript2 +SafariZoneGateWouldYouLikeToJoinScript: xor a ldh [hJoyHeld], a ld [wJoyIgnore], a call UpdateSprites - ld a, $4 + ld a, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1_WOULD_YOU_LIKE_TO_JOIN ldh [hSpriteIndexOrTextID], a call DisplayTextID - ld a, $ff + ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ret -.SafariZoneEntranceScript3 - call SafariZoneEntranceScript_752b4 +SafariZoneGatePlayerMovingUpScript: + call SafariZoneGateReturnSimulatedJoypadStateScript ret nz xor a ld [wJoyIgnore], a - ld a, $5 + ld a, SCRIPT_SAFARIZONEGATE_LEAVING_SAFARI ld [wSafariZoneGateCurScript], a ret -.SafariZoneEntranceScript5 +SafariZoneGateLeavingSafariScript: ld a, PLAYER_DIR_DOWN ld [wPlayerMovingDirection], a CheckAndResetEvent EVENT_SAFARI_GAME_OVER - jr z, .asm_7527f + jr z, .leaving_early ResetEventReuseHL EVENT_IN_SAFARI_ZONE call UpdateSprites - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a - ld a, $6 + ld a, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1_GOOD_HAUL_COME_AGAIN ldh [hSpriteIndexOrTextID], a call DisplayTextID xor a @@ -88,27 +90,27 @@ SafariZoneGate_ScriptPointers: ld a, D_DOWN ld c, $3 call SafariZoneEntranceAutoWalk - ld a, $4 + ld a, SCRIPT_SAFARIZONEGATE_PLAYER_MOVING_DOWN ld [wSafariZoneGateCurScript], a - jr .asm_75286 -.asm_7527f - ld a, $5 + jr .return +.leaving_early + ld a, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1_LEAVING_EARLY ldh [hSpriteIndexOrTextID], a call DisplayTextID -.asm_75286 +.return ret -.SafariZoneEntranceScript4 - call SafariZoneEntranceScript_752b4 +SafariZoneGatePlayerMovingDownScript: + call SafariZoneGateReturnSimulatedJoypadStateScript ret nz xor a ld [wJoyIgnore], a - ld a, $0 + ld a, SCRIPT_SAFARIZONEGATE_DEFAULT ld [wSafariZoneGateCurScript], a ret -.SafariZoneEntranceScript6 - call SafariZoneEntranceScript_752b4 +SafariZoneGateSetScriptAfterMoveScript: + call SafariZoneGateReturnSimulatedJoypadStateScript ret nz call Delay3 ld a, [wcf0d] @@ -125,25 +127,26 @@ SafariZoneEntranceAutoWalk: call FillMemory jp StartSimulatingJoypadStates -SafariZoneEntranceScript_752b4: +SafariZoneGateReturnSimulatedJoypadStateScript: ld a, [wSimulatedJoypadStatesIndex] and a ret SafariZoneGate_TextPointers: - dw .SafariZoneEntranceText1 - dw .SafariZoneEntranceText2 - dw .SafariZoneEntranceText1 - dw .SafariZoneEntranceText4 - dw .SafariZoneEntranceText5 - dw .SafariZoneEntranceText6 + def_text_pointers + dw_const SafariZoneGateSafariZoneWorker1Text, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1 + dw_const SafariZoneGateSafariZoneWorker2Text, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER2 + dw_const SafariZoneGateSafariZoneWorker1Text, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1_1 + dw_const SafariZoneGateSafariZoneWorker1WouldYouLikeToJoinText, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1_WOULD_YOU_LIKE_TO_JOIN + dw_const SafariZoneGateSafariZoneWorker1LeavingEarlyText, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1_LEAVING_EARLY + dw_const SafariZoneGateSafariZoneWorker1GoodHaulComeAgainText, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1_GOOD_HAUL_COME_AGAIN -.SafariZoneEntranceText1 - text_far _SafariZoneEntranceText1 +SafariZoneGateSafariZoneWorker1Text: + text_far _SafariZoneGateSafariZoneWorker1Text text_end -.SafariZoneEntranceText4 - text_far SafariZoneEntranceText_9e6e4 +SafariZoneGateSafariZoneWorker1WouldYouLikeToJoinText: + text_far _SafariZoneGateSafariZoneWorker1WouldYouLikeToJoinText text_asm ld a, MONEY_BOX ld [wTextBoxID], a @@ -191,7 +194,7 @@ SafariZoneGate_TextPointers: call SafariZoneEntranceAutoWalk SetEvent EVENT_IN_SAFARI_ZONE ResetEventReuseHL EVENT_SAFARI_GAME_OVER - ld a, 3 + ld a, SCRIPT_SAFARIZONEGATE_PLAYER_MOVING ld [wSafariZoneGateCurScript], a jr .done @@ -202,33 +205,33 @@ SafariZoneGate_TextPointers: ld a, D_DOWN ld c, 1 call SafariZoneEntranceAutoWalk - ld a, 4 + ld a, SCRIPT_SAFARIZONEGATE_PLAYER_MOVING_DOWN ld [wSafariZoneGateCurScript], a .done jp TextScriptEnd .MakePaymentText - text_far SafariZoneEntranceText_9e747 + text_far _SafariZoneGateSafariZoneWorker1ThatllBe500PleaseText sound_get_item_1 - text_far _SafariZoneEntranceText_75360 + text_far _SafariZoneGateSafariZoneWorker1CallYouOnThePAText text_end .PleaseComeAgainText - text_far _SafariZoneEntranceText_75365 + text_far _SafariZoneGateSafariZoneWorker1PleaseComeAgainText text_end .NotEnoughMoneyText - text_far _SafariZoneEntranceText_7536a + text_far _SafariZoneGateSafariZoneWorker1NotEnoughMoneyText text_end -.SafariZoneEntranceText5 - text_far SafariZoneEntranceText_9e814 +SafariZoneGateSafariZoneWorker1LeavingEarlyText: + text_far _SafariZoneGateSafariZoneWorker1LeavingEarlyText text_asm call YesNoChoice ld a, [wCurrentMenuItem] and a - jr nz, .asm_7539c - ld hl, .SafariZoneEntranceText_753bb + jr nz, .not_ready_to_leave + ld hl, .ReturnSafariBallsText call PrintText xor a ld [wSpritePlayerStateData1FacingDirection], a @@ -238,56 +241,56 @@ SafariZoneGate_TextPointers: ResetEvents EVENT_SAFARI_GAME_OVER, EVENT_IN_SAFARI_ZONE ld a, $0 ld [wcf0d], a - jr .asm_753b3 -.asm_7539c - ld hl, .SafariZoneEntranceText_753c0 + jr .set_current_script +.not_ready_to_leave + ld hl, .GoodLuckText call PrintText ld a, SPRITE_FACING_UP ld [wSpritePlayerStateData1FacingDirection], a ld a, D_UP ld c, $1 call SafariZoneEntranceAutoWalk - ld a, $5 + ld a, SCRIPT_SAFARIZONEGATE_LEAVING_SAFARI ld [wcf0d], a -.asm_753b3 - ld a, $6 +.set_current_script + ld a, SCRIPT_SAFARIZONEGATE_SET_SCRIPT_AFTER_MOVE ld [wSafariZoneGateCurScript], a jp TextScriptEnd -.SafariZoneEntranceText_753bb - text_far _SafariZoneEntranceText_753bb +.ReturnSafariBallsText + text_far _SafariZoneGateSafariZoneWorker1ReturnSafariBallsText text_end -.SafariZoneEntranceText_753c0 - text_far _SafariZoneEntranceText_753c0 +.GoodLuckText + text_far _SafariZoneGateSafariZoneWorker1GoodLuckText text_end -.SafariZoneEntranceText6 - text_far _SafariZoneEntranceText_753c5 +SafariZoneGateSafariZoneWorker1GoodHaulComeAgainText: + text_far _SafariZoneGateSafariZoneWorker1GoodHaulComeAgainText text_end -.SafariZoneEntranceText2 +SafariZoneGateSafariZoneWorker2Text: text_asm - ld hl, .FirstTimeQuestionText + ld hl, .FirstTimeHereText call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a - ld hl, .RegularText - jr nz, .Explanation - ld hl, .ExplanationText -.Explanation + ld hl, .YoureARegularHereText + jr nz, .print_text + ld hl, .SafariZoneExplanationText +.print_text call PrintText jp TextScriptEnd -.FirstTimeQuestionText - text_far _SafariZoneEntranceText_753e6 +.FirstTimeHereText + text_far _SafariZoneGateSafariZoneWorker2FirstTimeHereText text_end -.ExplanationText - text_far _SafariZoneEntranceText_753eb +.SafariZoneExplanationText + text_far _SafariZoneGateSafariZoneWorker2SafariZoneExplanationText text_end -.RegularText - text_far _SafariZoneEntranceText_753f0 +.YoureARegularHereText + text_far _SafariZoneGateSafariZoneWorker2YoureARegularHereText text_end diff --git a/scripts/SafariZoneNorth.asm b/scripts/SafariZoneNorth.asm index aaf39ea25..7cdec6cb8 100644 --- a/scripts/SafariZoneNorth.asm +++ b/scripts/SafariZoneNorth.asm @@ -2,30 +2,31 @@ SafariZoneNorth_Script: jp EnableAutoTextBoxDrawing SafariZoneNorth_TextPointers: - dw PickUpItemText - dw PickUpItemText - dw SafariZoneNorthText3 - dw SafariZoneNorthText4 - dw SafariZoneNorthText5 - dw SafariZoneNorthText6 - dw SafariZoneNorthText7 + def_text_pointers + dw_const PickUpItemText, TEXT_SAFARIZONENORTH_PROTEIN + dw_const PickUpItemText, TEXT_SAFARIZONENORTH_TM_SKULL_BASH + dw_const SafariZoneNorthRestHouseSignText, TEXT_SAFARIZONENORTH_REST_HOUSE_SIGN + dw_const SafariZoneNorthTrainerTips1Text, TEXT_SAFARIZONENORTH_TRAINER_TIPS_1 + dw_const SafariZoneNorthSignText, TEXT_SAFARIZONENORTH_SIGN + dw_const SafariZoneNorthTrainerTips2Text, TEXT_SAFARIZONENORTH_TRAINER_TIPS_2 + dw_const SafariZoneNorthTrainerTips3Text, TEXT_SAFARIZONENORTH_TRAINER_TIPS_3 -SafariZoneNorthText3: - text_far _SafariZoneNorthText3 +SafariZoneNorthRestHouseSignText: + text_far _SafariZoneNorthRestHouseSignText text_end -SafariZoneNorthText4: - text_far _SafariZoneNorthText4 +SafariZoneNorthTrainerTips1Text: + text_far _SafariZoneNorthTrainerTips1Text text_end -SafariZoneNorthText5: - text_far _SafariZoneNorthText5 +SafariZoneNorthSignText: + text_far _SafariZoneNorthSignText text_end -SafariZoneNorthText6: - text_far _SafariZoneNorthText6 +SafariZoneNorthTrainerTips2Text: + text_far _SafariZoneNorthTrainerTips2Text text_end -SafariZoneNorthText7: - text_far _SafariZoneNorthText7 +SafariZoneNorthTrainerTips3Text: + text_far _SafariZoneNorthTrainerTips3Text text_end diff --git a/scripts/SafariZoneNorthRestHouse.asm b/scripts/SafariZoneNorthRestHouse.asm index b7a690a1d..372e59c66 100644 --- a/scripts/SafariZoneNorthRestHouse.asm +++ b/scripts/SafariZoneNorthRestHouse.asm @@ -3,18 +3,19 @@ SafariZoneNorthRestHouse_Script: ret SafariZoneNorthRestHouse_TextPointers: - dw SafariZoneRestHouse4Text1 - dw SafariZoneRestHouse4Text2 - dw SafariZoneRestHouse4Text3 + def_text_pointers + dw_const SafariZoneNorthRestHouseScientistText, TEXT_SAFARIZONENORTHRESTHOUSE_SCIENTIST + dw_const SafariZoneNorthRestHouseSafariZoneWorkerText, TEXT_SAFARIZONENORTHRESTHOUSE_SAFARI_ZONE_WORKER + dw_const SafariZoneNorthRestHouseGentlemanText, TEXT_SAFARIZONENORTHRESTHOUSE_GENTLEMAN -SafariZoneRestHouse4Text1: - text_far _SafariZoneRestHouse4Text1 +SafariZoneNorthRestHouseScientistText: + text_far _SafariZoneNorthRestHouseScientistText text_end -SafariZoneRestHouse4Text2: - text_far _SafariZoneRestHouse4Text2 +SafariZoneNorthRestHouseSafariZoneWorkerText: + text_far _SafariZoneNorthRestHouseSafariZoneWorkerText text_end -SafariZoneRestHouse4Text3: - text_far _SafariZoneRestHouse4Text3 +SafariZoneNorthRestHouseGentlemanText: + text_far _SafariZoneNorthRestHouseGentlemanText text_end diff --git a/scripts/SafariZoneSecretHouse.asm b/scripts/SafariZoneSecretHouse.asm index 6eeff8adb..f8058641b 100644 --- a/scripts/SafariZoneSecretHouse.asm +++ b/scripts/SafariZoneSecretHouse.asm @@ -2,44 +2,45 @@ SafariZoneSecretHouse_Script: jp EnableAutoTextBoxDrawing SafariZoneSecretHouse_TextPointers: - dw SafariZoneSecretHouseText1 + def_text_pointers + dw_const SafariZoneSecretHouseFishingGuruText, TEXT_SAFARIZONESECRETHOUSE_FISHING_GURU -SafariZoneSecretHouseText1: +SafariZoneSecretHouseFishingGuruText: text_asm CheckEvent EVENT_GOT_HM03 jr nz, .got_item - ld hl, SafariZoneSecretHouseText_4a350 + ld hl, .YouHaveWonText call PrintText lb bc, HM_SURF, 1 call GiveItem jr nc, .bag_full - ld hl, ReceivedHM03Text + ld hl, .ReceivedHM03Text call PrintText SetEvent EVENT_GOT_HM03 jr .done .bag_full - ld hl, HM03NoRoomText + ld hl, .HM03NoRoomText call PrintText jr .done .got_item - ld hl, HM03ExplanationText + ld hl, .HM03ExplanationText call PrintText .done jp TextScriptEnd -SafariZoneSecretHouseText_4a350: - text_far _SecretHouseText_4a350 +.YouHaveWonText: + text_far _SafariZoneSecretHouseFishingGuruYouHaveWonText text_end -ReceivedHM03Text: - text_far _ReceivedHM03Text +.ReceivedHM03Text: + text_far _SafariZoneSecretHouseFishingGuruReceivedHM03Text sound_get_item_1 text_end -HM03ExplanationText: - text_far _HM03ExplanationText +.HM03ExplanationText: + text_far _SafariZoneSecretHouseFishingGuruHM03ExplanationText text_end -HM03NoRoomText: - text_far _HM03NoRoomText +.HM03NoRoomText: + text_far _SafariZoneSecretHouseFishingGuruHM03NoRoomText text_end diff --git a/scripts/SafariZoneWest.asm b/scripts/SafariZoneWest.asm index 7ae0807d9..76021e335 100644 --- a/scripts/SafariZoneWest.asm +++ b/scripts/SafariZoneWest.asm @@ -2,27 +2,28 @@ SafariZoneWest_Script: jp EnableAutoTextBoxDrawing SafariZoneWest_TextPointers: - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw SafariZoneWestText5 - dw SafariZoneWestText6 - dw SafariZoneWestText7 - dw SafariZoneWestText8 + def_text_pointers + dw_const PickUpItemText, TEXT_SAFARIZONEWEST_MAX_POTION + dw_const PickUpItemText, TEXT_SAFARIZONEWEST_TM_DOUBLE_TEAM + dw_const PickUpItemText, TEXT_SAFARIZONEWEST_MAX_REVIVE + dw_const PickUpItemText, TEXT_SAFARIZONEWEST_GOLD_TEETH + dw_const SafariZoneWestRestHouseSignText, TEXT_SAFARIZONEWEST_REST_HOUSE_SIGN + dw_const SafariZoneWestFindWardensTeethSignText, TEXT_SAFARIZONEWEST_FIND_WARDENS_TEETH_SIGN + dw_const SafariZoneWestTrainerTipsText, TEXT_SAFARIZONEWEST_TRAINER_TIPS + dw_const SafariZoneWestSignText, TEXT_SAFARIZONEWEST_SIGN -SafariZoneWestText5: - text_far _SafariZoneWestText5 +SafariZoneWestRestHouseSignText: + text_far _SafariZoneWestRestHouseSignText text_end -SafariZoneWestText6: - text_far _SafariZoneWestText6 +SafariZoneWestFindWardensTeethSignText: + text_far _SafariZoneWestFindWardensTeethSignText text_end -SafariZoneWestText7: - text_far _SafariZoneWestText7 +SafariZoneWestTrainerTipsText: + text_far _SafariZoneWestTrainerTipsText text_end -SafariZoneWestText8: - text_far _SafariZoneWestText8 +SafariZoneWestSignText: + text_far _SafariZoneWestSignText text_end diff --git a/scripts/SafariZoneWestRestHouse.asm b/scripts/SafariZoneWestRestHouse.asm index 74ad98fe3..6f3a9c93c 100644 --- a/scripts/SafariZoneWestRestHouse.asm +++ b/scripts/SafariZoneWestRestHouse.asm @@ -3,18 +3,19 @@ SafariZoneWestRestHouse_Script: ret SafariZoneWestRestHouse_TextPointers: - dw SafariZoneRestHouse2Text1 - dw SafariZoneRestHouse2Text2 - dw SafariZoneRestHouse2Text3 + def_text_pointers + dw_const SafariZoneWestRestHouseScientistText, TEXT_SAFARIZONEWESTRESTHOUSE_SCIENTIST + dw_const SafariZoneWestRestHouseCooltrainerMText, TEXT_SAFARIZONEWESTRESTHOUSE_COOLTRAINER_M + dw_const SafariZoneWestRestHouseSilphWorkerFText, TEXT_SAFARIZONEWESTRESTHOUSE_SILPH_WORKER_F -SafariZoneRestHouse2Text1: - text_far _SafariZoneRestHouse2Text1 +SafariZoneWestRestHouseScientistText: + text_far _SafariZoneWestRestHouseScientistText text_end -SafariZoneRestHouse2Text2: - text_far _SafariZoneRestHouse2Text2 +SafariZoneWestRestHouseCooltrainerMText: + text_far _SafariZoneWestRestHouseCooltrainerMText text_end -SafariZoneRestHouse2Text3: - text_far _SafariZoneRestHouse2Text3 +SafariZoneWestRestHouseSilphWorkerFText: + text_far _SafariZoneWestRestHouseSilphWorkerFText text_end diff --git a/scripts/SaffronCity.asm b/scripts/SaffronCity.asm index 849825349..b1ab87816 100644 --- a/scripts/SaffronCity.asm +++ b/scripts/SaffronCity.asm @@ -2,121 +2,122 @@ SaffronCity_Script: jp EnableAutoTextBoxDrawing SaffronCity_TextPointers: - dw SaffronCityText1 - dw SaffronCityText2 - dw SaffronCityText3 - dw SaffronCityText4 - dw SaffronCityText5 - dw SaffronCityText6 - dw SaffronCityText7 - dw SaffronCityText8 - dw SaffronCityText9 - dw SaffronCityText10 - dw SaffronCityText11 - dw SaffronCityText12 - dw SaffronCityText13 - dw SaffronCityText14 - dw SaffronCityText15 - dw SaffronCityText16 - dw SaffronCityText17 - dw SaffronCityText18 - dw MartSignText - dw SaffronCityText20 - dw SaffronCityText21 - dw SaffronCityText22 - dw PokeCenterSignText - dw SaffronCityText24 - dw SaffronCityText25 + def_text_pointers + dw_const SaffronCityRocket1Text, TEXT_SAFFRONCITY_ROCKET1 + dw_const SaffronCityRocket2Text, TEXT_SAFFRONCITY_ROCKET2 + dw_const SaffronCityRocket3Text, TEXT_SAFFRONCITY_ROCKET3 + dw_const SaffronCityRocket4Text, TEXT_SAFFRONCITY_ROCKET4 + dw_const SaffronCityRocket5Text, TEXT_SAFFRONCITY_ROCKET5 + dw_const SaffronCityRocket6Text, TEXT_SAFFRONCITY_ROCKET6 + dw_const SaffronCityRocket7Text, TEXT_SAFFRONCITY_ROCKET7 + dw_const SaffronCityScientistText, TEXT_SAFFRONCITY_SCIENTIST + dw_const SaffronCitySilphWorkerMText, TEXT_SAFFRONCITY_SILPH_WORKER_M + dw_const SaffronCitySilphWorkerFText, TEXT_SAFFRONCITY_SILPH_WORKER_F + dw_const SaffronCityGentlemanText, TEXT_SAFFRONCITY_GENTLEMAN + dw_const SaffronCityPidgeotText, TEXT_SAFFRONCITY_PIDGEOT + dw_const SaffronCityRockerText, TEXT_SAFFRONCITY_ROCKER + dw_const SaffronCityRocket8Text, TEXT_SAFFRONCITY_ROCKET8 + dw_const SaffronCityRocket9Text, TEXT_SAFFRONCITY_ROCKET9 + dw_const SaffronCitySignText, TEXT_SAFFRONCITY_SIGN + dw_const SaffronCityFightingDojoSignText, TEXT_SAFFRONCITY_FIGHTING_DOJO_SIGN + dw_const SaffronCityGymSignText, TEXT_SAFFRONCITY_GYM_SIGN + dw_const MartSignText, TEXT_SAFFRONCITY_MART_SIGN + dw_const SaffronCityTrainerTips1Text, TEXT_SAFFRONCITY_TRAINER_TIPS1 + dw_const SaffronCityTrainerTips2Text, TEXT_SAFFRONCITY_TRAINER_TIPS2 + dw_const SaffronCitySilphCoSignText, TEXT_SAFFRONCITY_SILPH_CO_SIGN + dw_const PokeCenterSignText, TEXT_SAFFRONCITY_POKECENTER_SIGN + dw_const SaffronCityMrPsychicsHouseSignText, TEXT_SAFFRONCITY_MR_PSYCHICS_HOUSE_SIGN + dw_const SaffronCitySilphCoLatestProductSignText, TEXT_SAFFRONCITY_SILPH_CO_LATEST_PRODUCT_SIGN -SaffronCityText1: - text_far _SaffronCityText1 +SaffronCityRocket1Text: + text_far _SaffronCityRocket1Text text_end -SaffronCityText2: - text_far _SaffronCityText2 +SaffronCityRocket2Text: + text_far _SaffronCityRocket2Text text_end -SaffronCityText3: - text_far _SaffronCityText3 +SaffronCityRocket3Text: + text_far _SaffronCityRocket3Text text_end -SaffronCityText4: - text_far _SaffronCityText4 +SaffronCityRocket4Text: + text_far _SaffronCityRocket4Text text_end -SaffronCityText5: - text_far _SaffronCityText5 +SaffronCityRocket5Text: + text_far _SaffronCityRocket5Text text_end -SaffronCityText6: - text_far _SaffronCityText6 +SaffronCityRocket6Text: + text_far _SaffronCityRocket6Text text_end -SaffronCityText7: - text_far _SaffronCityText7 +SaffronCityRocket7Text: + text_far _SaffronCityRocket7Text text_end -SaffronCityText8: - text_far _SaffronCityText8 +SaffronCityScientistText: + text_far _SaffronCityScientistText text_end -SaffronCityText9: - text_far _SaffronCityText9 +SaffronCitySilphWorkerMText: + text_far _SaffronCitySilphWorkerMText text_end -SaffronCityText10: - text_far _SaffronCityText10 +SaffronCitySilphWorkerFText: + text_far _SaffronCitySilphWorkerFText text_end -SaffronCityText11: - text_far _SaffronCityText11 +SaffronCityGentlemanText: + text_far _SaffronCityGentlemanText text_end -SaffronCityText12: - text_far _SaffronCityText12 +SaffronCityPidgeotText: + text_far _SaffronCityPidgeotText sound_cry_pidgeot text_end -SaffronCityText13: - text_far _SaffronCityText13 +SaffronCityRockerText: + text_far _SaffronCityRockerText text_end -SaffronCityText14: - text_far _SaffronCityText14 +SaffronCityRocket8Text: + text_far _SaffronCityRocket8Text text_end -SaffronCityText15: - text_far _SaffronCityText15 +SaffronCityRocket9Text: + text_far _SaffronCityRocket9Text text_end -SaffronCityText16: - text_far _SaffronCityText16 +SaffronCitySignText: + text_far _SaffronCitySignText text_end -SaffronCityText17: - text_far _SaffronCityText17 +SaffronCityFightingDojoSignText: + text_far _SaffronCityFightingDojoSignText text_end -SaffronCityText18: - text_far _SaffronCityText18 +SaffronCityGymSignText: + text_far _SaffronCityGymSignText text_end -SaffronCityText20: - text_far _SaffronCityText20 +SaffronCityTrainerTips1Text: + text_far _SaffronCityTrainerTips1Text text_end -SaffronCityText21: - text_far _SaffronCityText21 +SaffronCityTrainerTips2Text: + text_far _SaffronCityTrainerTips2Text text_end -SaffronCityText22: - text_far _SaffronCityText22 +SaffronCitySilphCoSignText: + text_far _SaffronCitySilphCoSignText text_end -SaffronCityText24: - text_far _SaffronCityText24 +SaffronCityMrPsychicsHouseSignText: + text_far _SaffronCityMrPsychicsHouseSignText text_end -SaffronCityText25: - text_far _SaffronCityText25 +SaffronCitySilphCoLatestProductSignText: + text_far _SaffronCitySilphCoLatestProductSignText text_end diff --git a/scripts/SaffronGym.asm b/scripts/SaffronGym.asm index 23b2dd857..96e453dfb 100644 --- a/scripts/SaffronGym.asm +++ b/scripts/SaffronGym.asm @@ -23,40 +23,41 @@ SaffronGym_Script: db "SABRINA@" SaffronGymResetScripts: - xor a + xor a ; SCRIPT_SAFFRONGYM_DEFAULT ld [wJoyIgnore], a ld [wSaffronGymCurScript], a ld [wCurMapScript], a ret SaffronGym_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw SaffronGymSabrinaPostBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_SAFFRONGYM_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_SAFFRONGYM_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_SAFFRONGYM_END_BATTLE + dw_const SaffronGymSabrinaPostBattle, SCRIPT_SAFFRONGYM_SABRINA_POST_BATTLE SaffronGymSabrinaPostBattle: ld a, [wIsInBattle] cp $ff jp z, SaffronGymResetScripts - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a -SaffronGymReceiveTM46: - ld a, $a +SaffronGymSabrinaReceiveTM46Script: + ld a, TEXT_SAFFRONGYM_SABRINA_MARSH_BADGE_INFO ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_SABRINA lb bc, TM_PSYWAVE, 1 call GiveItem jr nc, .BagFull - ld a, $b + ld a, TEXT_SAFFRONGYM_SABRINA_RECEIVED_TM46 ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM46 jr .gymVictory .BagFull - ld a, $c + ld a, TEXT_SAFFRONGYM_SABRINA_TM46_NO_ROOM ldh [hSpriteIndexOrTextID], a call DisplayTextID .gymVictory @@ -71,58 +72,59 @@ SaffronGymReceiveTM46: jp SaffronGymResetScripts SaffronGym_TextPointers: - dw SabrinaText - dw SaffronGymTrainerText1 - dw SaffronGymTrainerText2 - dw SaffronGymTrainerText3 - dw SaffronGymTrainerText4 - dw SaffronGymTrainerText5 - dw SaffronGymTrainerText6 - dw SaffronGymTrainerText7 - dw SaffronGymGuideText - dw KogaMarshBadgeInfoText - dw ReceivedTM46Text - dw TM46NoRoomText + def_text_pointers + dw_const SaffronGymSabrinaText, TEXT_SAFFRONGYM_SABRINA + dw_const SaffronGymChanneler1Text, TEXT_SAFFRONGYM_CHANNELER1 + dw_const SaffronGymYoungster1Text, TEXT_SAFFRONGYM_YOUNGSTER1 + dw_const SaffronGymChanneler2Text, TEXT_SAFFRONGYM_CHANNELER2 + dw_const SaffronGymYoungster2Text, TEXT_SAFFRONGYM_YOUNGSTER2 + dw_const SaffronGymChanneler3Text, TEXT_SAFFRONGYM_CHANNELER3 + dw_const SaffronGymYoungster3Text, TEXT_SAFFRONGYM_YOUNGSTER3 + dw_const SaffronGymYoungster4Text, TEXT_SAFFRONGYM_YOUNGSTER4 + dw_const SaffronGymGymGuideText, TEXT_SAFFRONGYM_GYM_GUIDE + dw_const SaffronGymSabrinaMarshBadgeInfoText, TEXT_SAFFRONGYM_SABRINA_MARSH_BADGE_INFO + dw_const SaffronGymSabrinaReceivedTM46Text, TEXT_SAFFRONGYM_SABRINA_RECEIVED_TM46 + dw_const SaffronGymSabrinaTM46NoRoomText, TEXT_SAFFRONGYM_SABRINA_TM46_NO_ROOM SaffronGymTrainerHeaders: def_trainers 2 SaffronGymTrainerHeader0: - trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_0, 3, SaffronGymBattleText1, SaffronGymEndBattleText1, SaffronGymAfterBattleText1 + trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_0, 3, SaffronGymChanneler1BattleText, SaffronGymChanneler1EndBattleText, SaffronGymChanneler1AfterBattleText SaffronGymTrainerHeader1: - trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_1, 3, SaffronGymBattleText2, SaffronGymEndBattleText2, SaffronGymAfterBattleText2 + trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_1, 3, SaffronGymYoungster1BattleText, SaffronGymYoungster1EndBattleText, SaffronGymYoungster1AfterBattleText SaffronGymTrainerHeader2: - trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_2, 3, SaffronGymBattleText3, SaffronGymEndBattleText3, SaffronGymAfterBattleText3 + trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_2, 3, SaffronGymChanneler2BattleText, SaffronGymChanneler2EndBattleText, SaffronGymChanneler2AfterBattleText SaffronGymTrainerHeader3: - trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_3, 3, SaffronGymBattleText4, SaffronGymEndBattleText4, SaffronGymAfterBattleText4 + trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_3, 3, SaffronGymYoungster2BattleText, SaffronGymYoungster2EndBattleText, SaffronGymYoungster2AfterBattleText SaffronGymTrainerHeader4: - trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_4, 3, SaffronGymBattleText5, SaffronGymEndBattleText5, SaffronGymAfterBattleText5 + trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_4, 3, SaffronGymChanneler3BattleText, SaffronGymChanneler3EndBattleText, SaffronGymChanneler3AfterBattleText SaffronGymTrainerHeader5: - trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_5, 3, SaffronGymBattleText6, SaffronGymEndBattleText6, SaffronGymAfterBattleText6 + trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_5, 3, SaffronGymYoungster3BattleText, SaffronGymYoungster3EndBattleText, SaffronGymYoungster3AfterBattleText SaffronGymTrainerHeader6: - trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_6, 3, SaffronGymBattleText7, SaffronGymEndBattleText7, SaffronGymAfterBattleText7 + trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_6, 3, SaffronGymYoungster4BattleText, SaffronGymYoungster4EndBattleText, SaffronGymYoungster4AfterBattleText db -1 ; end -SabrinaText: +SaffronGymSabrinaText: text_asm CheckEvent EVENT_BEAT_SABRINA jr z, .beforeBeat CheckEventReuseA EVENT_GOT_TM46 jr nz, .afterBeat - call z, SaffronGymReceiveTM46 + call z, SaffronGymSabrinaReceiveTM46Script call DisableWaitingAfterTextDisplay jr .done .afterBeat - ld hl, SabrinaPostBattleAdviceText + ld hl, .PostBattleAdviceText call PrintText jr .done .beforeBeat - ld hl, SabrinaPreBattleText + ld hl, .Text call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, ReceivedMarshBadgeText - ld de, ReceivedMarshBadgeText + ld hl, .ReceivedMarshBadgeText + ld de, .ReceivedMarshBadgeText call SaveEndBattleTextPointers ldh a, [hSpriteIndex] ld [wSpriteIndex], a @@ -130,182 +132,182 @@ SabrinaText: call InitBattleEnemyParameters ld a, $6 ld [wGymLeaderNo], a - ld a, $3 + ld a, SCRIPT_SAFFRONGYM_SABRINA_POST_BATTLE ld [wSaffronGymCurScript], a .done jp TextScriptEnd -SabrinaPreBattleText: - text_far _SabrinaPreBattleText +.Text: + text_far _SaffronGymSabrinaText text_end -ReceivedMarshBadgeText: - text_far _ReceivedMarshBadgeText +.ReceivedMarshBadgeText: + text_far _SaffronGymSabrinaReceivedMarshBadgeText sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded text_promptbutton text_end -SabrinaPostBattleAdviceText: - text_far _SabrinaPostBattleAdviceText +.PostBattleAdviceText: + text_far _SaffronGymSabrinaPostBattleAdviceText text_end -KogaMarshBadgeInfoText: - text_far _KogaMarshBadgeInfoText +SaffronGymSabrinaMarshBadgeInfoText: + text_far _SaffronGymSabrinaMarshBadgeInfoText text_end -ReceivedTM46Text: - text_far _ReceivedTM46Text +SaffronGymSabrinaReceivedTM46Text: + text_far _SaffronGymSabrinaReceivedTM46Text sound_get_item_1 text_far _TM46ExplanationText text_end -TM46NoRoomText: - text_far _TM46NoRoomText +SaffronGymSabrinaTM46NoRoomText: + text_far _SaffronGymSabrinaTM46NoRoomText text_end -SaffronGymTrainerText1: +SaffronGymChanneler1Text: text_asm ld hl, SaffronGymTrainerHeader0 call TalkToTrainer jp TextScriptEnd -SaffronGymTrainerText2: +SaffronGymYoungster1Text: text_asm ld hl, SaffronGymTrainerHeader1 call TalkToTrainer jp TextScriptEnd -SaffronGymTrainerText3: +SaffronGymChanneler2Text: text_asm ld hl, SaffronGymTrainerHeader2 call TalkToTrainer jp TextScriptEnd -SaffronGymTrainerText4: +SaffronGymYoungster2Text: text_asm ld hl, SaffronGymTrainerHeader3 call TalkToTrainer jp TextScriptEnd -SaffronGymTrainerText5: +SaffronGymChanneler3Text: text_asm ld hl, SaffronGymTrainerHeader4 call TalkToTrainer jp TextScriptEnd -SaffronGymTrainerText6: +SaffronGymYoungster3Text: text_asm ld hl, SaffronGymTrainerHeader5 call TalkToTrainer jp TextScriptEnd -SaffronGymTrainerText7: +SaffronGymYoungster4Text: text_asm ld hl, SaffronGymTrainerHeader6 call TalkToTrainer jp TextScriptEnd -SaffronGymGuideText: +SaffronGymGymGuideText: text_asm CheckEvent EVENT_BEAT_SABRINA jr nz, .afterBeat - ld hl, SaffronGymGuidePreBattleText + ld hl, .ChampInMakingText call PrintText jr .done .afterBeat - ld hl, SaffronGymGuidePostBattleText + ld hl, .BeatSabrinaText call PrintText .done jp TextScriptEnd -SaffronGymGuidePreBattleText: - text_far _SaffronGymGuidePreBattleText +.ChampInMakingText: + text_far _SaffronGymGuideChampInMakingText text_end -SaffronGymGuidePostBattleText: - text_far _SaffronGymGuidePostBattleText +.BeatSabrinaText: + text_far _SaffronGymGuideBeatSabrinaText text_end -SaffronGymBattleText1: - text_far _SaffronGymBattleText1 +SaffronGymChanneler1BattleText: + text_far _SaffronGymChanneler1BattleText text_end -SaffronGymEndBattleText1: - text_far _SaffronGymEndBattleText1 +SaffronGymChanneler1EndBattleText: + text_far _SaffronGymChanneler1EndBattleText text_end -SaffronGymAfterBattleText1: - text_far _SaffronGymAfterBattleText1 +SaffronGymChanneler1AfterBattleText: + text_far _SaffronGymChanneler1AfterBattleText text_end -SaffronGymBattleText2: - text_far _SaffronGymBattleText2 +SaffronGymYoungster1BattleText: + text_far _SaffronGymYoungster1BattleText text_end -SaffronGymEndBattleText2: - text_far _SaffronGymEndBattleText2 +SaffronGymYoungster1EndBattleText: + text_far _SaffronGymYoungster1EndBattleText text_end -SaffronGymAfterBattleText2: - text_far _SaffronGymAfterBattleText2 +SaffronGymYoungster1AfterBattleText: + text_far _SaffronGymYoungster1AfterBattleText text_end -SaffronGymBattleText3: - text_far _SaffronGymBattleText3 +SaffronGymChanneler2BattleText: + text_far _SaffronGymChanneler2BattleText text_end -SaffronGymEndBattleText3: - text_far _SaffronGymEndBattleText3 +SaffronGymChanneler2EndBattleText: + text_far _SaffronGymChanneler2EndBattleText text_end -SaffronGymAfterBattleText3: - text_far _SaffronGymAfterBattleText3 +SaffronGymChanneler2AfterBattleText: + text_far _SaffronGymChanneler2AfterBattleText text_end -SaffronGymBattleText4: - text_far _SaffronGymBattleText4 +SaffronGymYoungster2BattleText: + text_far _SaffronGymYoungster2BattleText text_end -SaffronGymEndBattleText4: - text_far _SaffronGymEndBattleText4 +SaffronGymYoungster2EndBattleText: + text_far _SaffronGymYoungster2EndBattleText text_end -SaffronGymAfterBattleText4: - text_far _SaffronGymAfterBattleText4 +SaffronGymYoungster2AfterBattleText: + text_far _SaffronGymYoungster2AfterBattleText text_end -SaffronGymBattleText5: - text_far _SaffronGymBattleText5 +SaffronGymChanneler3BattleText: + text_far _SaffronGymChanneler3BattleText text_end -SaffronGymEndBattleText5: - text_far _SaffronGymEndBattleText5 +SaffronGymChanneler3EndBattleText: + text_far _SaffronGymChanneler3EndBattleText text_end -SaffronGymAfterBattleText5: - text_far _SaffronGymAfterBattleText5 +SaffronGymChanneler3AfterBattleText: + text_far _SaffronGymChanneler3AfterBattleText text_end -SaffronGymBattleText6: - text_far _SaffronGymBattleText6 +SaffronGymYoungster3BattleText: + text_far _SaffronGymYoungster3BattleText text_end -SaffronGymEndBattleText6: - text_far _SaffronGymEndBattleText6 +SaffronGymYoungster3EndBattleText: + text_far _SaffronGymYoungster3EndBattleText text_end -SaffronGymAfterBattleText6: - text_far _SaffronGymAfterBattleText6 +SaffronGymYoungster3AfterBattleText: + text_far _SaffronGymYoungster3AfterBattleText text_end -SaffronGymBattleText7: - text_far _SaffronGymBattleText7 +SaffronGymYoungster4BattleText: + text_far _SaffronGymYoungster4BattleText text_end -SaffronGymEndBattleText7: - text_far _SaffronGymEndBattleText7 +SaffronGymYoungster4EndBattleText: + text_far _SaffronGymYoungster4EndBattleText text_end -SaffronGymAfterBattleText7: - text_far _SaffronGymAfterBattleText7 +SaffronGymYoungster4AfterBattleText: + text_far _SaffronGymYoungster4AfterBattleText text_end diff --git a/scripts/SaffronMart.asm b/scripts/SaffronMart.asm index bfa47eb15..aaf6f4ba0 100644 --- a/scripts/SaffronMart.asm +++ b/scripts/SaffronMart.asm @@ -2,14 +2,15 @@ SaffronMart_Script: jp EnableAutoTextBoxDrawing SaffronMart_TextPointers: - dw SaffronCashierText - dw SaffronMartText2 - dw SaffronMartText3 + def_text_pointers + dw_const SaffronMartClerkText, TEXT_SAFFRONMART_CLERK + dw_const SaffronMartSuperNerdText, TEXT_SAFFRONMART_SUPER_NERD + dw_const SaffronMartCooltrainerFText, TEXT_SAFFRONMART_COOLTRAINER_F -SaffronMartText2: - text_far _SaffronMartText2 +SaffronMartSuperNerdText: + text_far _SaffronMartSuperNerdText text_end -SaffronMartText3: - text_far _SaffronMartText3 +SaffronMartCooltrainerFText: + text_far _SaffronMartCooltrainerFText text_end diff --git a/scripts/SaffronPidgeyHouse.asm b/scripts/SaffronPidgeyHouse.asm index 90078e81a..83ff5ce71 100644 --- a/scripts/SaffronPidgeyHouse.asm +++ b/scripts/SaffronPidgeyHouse.asm @@ -2,26 +2,27 @@ SaffronPidgeyHouse_Script: jp EnableAutoTextBoxDrawing SaffronPidgeyHouse_TextPointers: - dw SaffronHouse1Text1 - dw SaffronHouse1Text2 - dw SaffronHouse1Text3 - dw SaffronHouse1Text4 + def_text_pointers + dw_const SaffronPidgeyHouseBrunetteGirlText, TEXT_SAFFRONPIDGEYHOUSE_BRUNETTE_GIRL + dw_const SaffronPidgeyHousePidgeyText, TEXT_SAFFRONPIDGEYHOUSE_PIDGEY + dw_const SaffronPidgeyHouseYoungsterText, TEXT_SAFFRONPIDGEYHOUSE_YOUNGSTER + dw_const SaffronPidgeyHousePaperText, TEXT_SAFFRONPIDGEYHOUSE_PAPER -SaffronHouse1Text1: - text_far _SaffronHouse1Text1 +SaffronPidgeyHouseBrunetteGirlText: + text_far _SaffronPidgeyHouseBrunetteGirlText text_end -SaffronHouse1Text2: - text_far _SaffronHouse1Text2 +SaffronPidgeyHousePidgeyText: + text_far _SaffronPidgeyHousePidgeyText text_asm ld a, PIDGEY call PlayCry jp TextScriptEnd -SaffronHouse1Text3: - text_far _SaffronHouse1Text3 +SaffronPidgeyHouseYoungsterText: + text_far _SaffronPidgeyHouseYoungsterText text_end -SaffronHouse1Text4: - text_far _SaffronHouse1Text4 +SaffronPidgeyHousePaperText: + text_far _SaffronPidgeyHousePaperText text_end diff --git a/scripts/SaffronPokecenter.asm b/scripts/SaffronPokecenter.asm index 68eb4fc6f..4a21b4639 100644 --- a/scripts/SaffronPokecenter.asm +++ b/scripts/SaffronPokecenter.asm @@ -3,21 +3,22 @@ SaffronPokecenter_Script: jp EnableAutoTextBoxDrawing SaffronPokecenter_TextPointers: - dw SaffronHealNurseText - dw SaffronPokecenterText2 - dw SaffronPokecenterText3 - dw SaffronTradeNurseText + def_text_pointers + dw_const SaffronPokecenterNurseText, TEXT_SAFFRONPOKECENTER_NURSE + dw_const SaffronPokecenterBeautyText, TEXT_SAFFRONPOKECENTER_BEAUTY + dw_const SaffronPokecenterGentlemanText, TEXT_SAFFRONPOKECENTER_GENTLEMAN + dw_const SaffronPokecenterLinkReceptionistText, TEXT_SAFFRONPOKECENTER_LINK_RECEPTIONIST -SaffronHealNurseText: +SaffronPokecenterNurseText: script_pokecenter_nurse -SaffronPokecenterText2: - text_far _SaffronPokecenterText2 +SaffronPokecenterBeautyText: + text_far _SaffronPokecenterBeautyText text_end -SaffronPokecenterText3: - text_far _SaffronPokecenterText3 +SaffronPokecenterGentlemanText: + text_far _SaffronPokecenterGentlemanText text_end -SaffronTradeNurseText: +SaffronPokecenterLinkReceptionistText: script_cable_club_receptionist diff --git a/scripts/SeafoamIslands1F.asm b/scripts/SeafoamIslands1F.asm index ceb2a2fb9..eda3051bc 100644 --- a/scripts/SeafoamIslands1F.asm +++ b/scripts/SeafoamIslands1F.asm @@ -43,5 +43,6 @@ Seafoam1HolesCoords: db -1 ; end SeafoamIslands1F_TextPointers: - dw BoulderText - dw BoulderText + def_text_pointers + dw_const BoulderText, TEXT_SEAFOAMISLANDS1F_BOULDER1 + dw_const BoulderText, TEXT_SEAFOAMISLANDS1F_BOULDER2 diff --git a/scripts/SeafoamIslandsB1F.asm b/scripts/SeafoamIslandsB1F.asm index ac6675137..6a56c337e 100644 --- a/scripts/SeafoamIslandsB1F.asm +++ b/scripts/SeafoamIslandsB1F.asm @@ -42,5 +42,6 @@ Seafoam2HolesCoords: db -1 ; end SeafoamIslandsB1F_TextPointers: - dw BoulderText - dw BoulderText + def_text_pointers + dw_const BoulderText, TEXT_SEAFOAMISLANDSB1F_BOULDER1 + dw_const BoulderText, TEXT_SEAFOAMISLANDSB1F_BOULDER2 diff --git a/scripts/SeafoamIslandsB2F.asm b/scripts/SeafoamIslandsB2F.asm index fe4b3ead6..635d923fe 100644 --- a/scripts/SeafoamIslandsB2F.asm +++ b/scripts/SeafoamIslandsB2F.asm @@ -42,5 +42,6 @@ Seafoam3HolesCoords: db -1 ; end SeafoamIslandsB2F_TextPointers: - dw BoulderText - dw BoulderText + def_text_pointers + dw_const BoulderText, TEXT_SEAFOAMISLANDSB2F_BOULDER1 + dw_const BoulderText, TEXT_SEAFOAMISLANDSB2F_BOULDER2 diff --git a/scripts/SeafoamIslandsB3F.asm b/scripts/SeafoamIslandsB3F.asm index 9d1093e52..a1e178331 100644 --- a/scripts/SeafoamIslandsB3F.asm +++ b/scripts/SeafoamIslandsB3F.asm @@ -50,12 +50,14 @@ Seafoam4HolesCoords: db -1 ; end SeafoamIslandsB3F_ScriptPointers: - dw SeafoamIslands4Script0 - dw SeafoamIslands4Script1 - dw SeafoamIslands4Script2 - dw SeafoamIslands4Script3 + def_script_pointers + dw_const SeafoamIslandsB3FDefaultScript, SCRIPT_SEAFOAMISLANDSB3F_DEFAULT + dw_const SeafoamIslandsB3FObjectMoving1Script, SCRIPT_SEAFOAMISLANDSB3F_OBJECT_MOVING1 + dw_const SeafoamIslandsB3FMoveObjectScript, SCRIPT_SEAFOAMISLANDSB3F_MOVE_OBJECT + dw_const SeafoamIslandsB3FObjectMoving2Script, SCRIPT_SEAFOAMISLANDSB3F_OBJECT_MOVING2 + EXPORT SCRIPT_SEAFOAMISLANDSB3F_MOVE_OBJECT ; used by engine/overworld/player_state.asm -SeafoamIslands4Script0: +SeafoamIslandsB3FDefaultScript: CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE ret z ld a, [wYCoord] @@ -72,7 +74,7 @@ SeafoamIslands4Script0: call StartSimulatingJoypadStates ld hl, wFlags_D733 set 2, [hl] - ld a, $1 + ld a, SCRIPT_SEAFOAMISLANDSB3F_OBJECT_MOVING1 ld [wSeafoamIslandsB3FCurScript], a ret @@ -82,22 +84,22 @@ RLEMovement46632: db D_DOWN, 3 db -1 ; end -SeafoamIslands4Script1: +SeafoamIslandsB3FObjectMoving1Script: ld a, [wSimulatedJoypadStatesIndex] and a ret nz - ld a, $0 + ld a, SCRIPT_SEAFOAMISLANDSB3F_DEFAULT ld [wSeafoamIslandsB3FCurScript], a ret -SeafoamIslands4Script2: +SeafoamIslandsB3FMoveObjectScript: CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE ret z ld a, [wXCoord] cp 18 jr z, .asm_4665e cp 19 - ld a, $0 + ld a, SCRIPT_SEAFOAMISLANDSB3F_DEFAULT jr nz, .asm_4667b ld de, RLEData_4667f jr .asm_46661 @@ -114,7 +116,7 @@ SeafoamIslands4Script2: set 7, [hl] ld hl, wFlags_D733 set 2, [hl] - ld a, $3 + ld a, SCRIPT_SEAFOAMISLANDSB3F_OBJECT_MOVING2 .asm_4667b ld [wSeafoamIslandsB3FCurScript], a ret @@ -132,18 +134,19 @@ RLEData_46688: db D_DOWN, 4 db -1 ; end -SeafoamIslands4Script3: +SeafoamIslandsB3FObjectMoving2Script: ld a, [wSimulatedJoypadStatesIndex] and a ret nz - ld a, $0 + ld a, SCRIPT_SEAFOAMISLANDSB3F_DEFAULT ld [wSeafoamIslandsB3FCurScript], a ret SeafoamIslandsB3F_TextPointers: - dw BoulderText - dw BoulderText - dw BoulderText - dw BoulderText - dw BoulderText - dw BoulderText + def_text_pointers + dw_const BoulderText, TEXT_SEAFOAMISLANDSB3F_BOULDER1 + dw_const BoulderText, TEXT_SEAFOAMISLANDSB3F_BOULDER2 + dw_const BoulderText, TEXT_SEAFOAMISLANDSB3F_BOULDER3 + dw_const BoulderText, TEXT_SEAFOAMISLANDSB3F_BOULDER4 + dw_const BoulderText, TEXT_SEAFOAMISLANDSB3F_BOULDER5 + dw_const BoulderText, TEXT_SEAFOAMISLANDSB3F_BOULDER6 diff --git a/scripts/SeafoamIslandsB4F.asm b/scripts/SeafoamIslandsB4F.asm index 5fa51bb73..98ea0a5ba 100644 --- a/scripts/SeafoamIslandsB4F.asm +++ b/scripts/SeafoamIslandsB4F.asm @@ -11,22 +11,24 @@ SeafoamIslands5Script_467a5: ret SeafoamIslandsB4F_ScriptPointers: - dw SeafoamIslands5Script0 - dw SeafoamIslands5Script1 - dw SeafoamIslands5Script2 - dw SeafoamIslands5Script3 - dw SeafoamIslands5Script4 - -SeafoamIslands5Script4: + def_script_pointers + dw_const SeafoamIslandsB4FDefaultScript, SCRIPT_SEAFOAMISLANDSB4F_DEFAULT + dw_const SeafoamIslandsB4FObjectMoving1Script, SCRIPT_SEAFOAMISLANDSB4F_OBJECT_MOVING1 + dw_const SeafoamIslandsB4FMoveObjectScript, SCRIPT_SEAFOAMISLANDSB4F_MOVE_OBJECT + dw_const SeafoamIslandsB4FObjectMoving2Script, SCRIPT_SEAFOAMISLANDSB4F_OBJECT_MOVING2 + dw_const SeafoamIslandsB4FObjectMoving3Script, SCRIPT_SEAFOAMISLANDSB4F_OBJECT_MOVING3 + EXPORT SCRIPT_SEAFOAMISLANDSB4F_MOVE_OBJECT ; used by engine/overworld/player_state.asm + +SeafoamIslandsB4FObjectMoving3Script: ld a, [wIsInBattle] cp $ff jr z, SeafoamIslands5Script_467a5 call EndTrainerBattle - ld a, $0 + ld a, SCRIPT_SEAFOAMISLANDSB4F_DEFAULT ld [wSeafoamIslandsB4FCurScript], a ret -SeafoamIslands5Script0: +SeafoamIslandsB4FDefaultScript: CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE ret z ld hl, .Coords @@ -48,7 +50,7 @@ SeafoamIslands5Script0: call StartSimulatingJoypadStates ld hl, wFlags_D733 res 2, [hl] - ld a, $1 + ld a, SCRIPT_SEAFOAMISLANDSB4F_OBJECT_MOVING1 ld [wSeafoamIslandsB4FCurScript], a ret @@ -59,23 +61,23 @@ SeafoamIslands5Script0: dbmapcoord 21, 16 db -1 ; end -SeafoamIslands5Script1: +SeafoamIslandsB4FObjectMoving1Script: ld a, [wSimulatedJoypadStatesIndex] and a ret nz xor a ld [wJoyIgnore], a - ld a, $0 + ld a, SCRIPT_SEAFOAMISLANDSB4F_DEFAULT ld [wSeafoamIslandsB4FCurScript], a ret -SeafoamIslands5Script2: +SeafoamIslandsB4FMoveObjectScript: CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE - ld a, $0 + ld a, SCRIPT_SEAFOAMISLANDSB4F_DEFAULT jr z, .asm_46849 ld hl, .Coords call ArePlayerCoordsInArray - ld a, $0 + ld a, SCRIPT_SEAFOAMISLANDSB4F_DEFAULT jr nc, .asm_46849 ld a, [wCoordIndex] cp $1 @@ -90,7 +92,7 @@ SeafoamIslands5Script2: dec a ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld a, $3 + ld a, SCRIPT_SEAFOAMISLANDSB4F_OBJECT_MOVING2 .asm_46849 ld [wSeafoamIslandsB4FCurScript], a ret @@ -112,7 +114,7 @@ RLEMovementData_46859: db D_UP, 1 db -1 ; end -SeafoamIslands5Script3: +SeafoamIslandsB4FObjectMoving2Script: ld a, [wSimulatedJoypadStatesIndex] ld b, a cp $1 @@ -120,7 +122,7 @@ SeafoamIslands5Script3: ld a, b and a ret nz - ld a, $0 + ld a, SCRIPT_SEAFOAMISLANDSB4F_DEFAULT ld [wSeafoamIslandsB4FCurScript], a ret @@ -131,40 +133,41 @@ SeaFoamIslands5Script_46872: jp ForceBikeOrSurf SeafoamIslandsB4F_TextPointers: - dw BoulderText - dw BoulderText - dw ArticunoText - dw SeafoamIslands5Text4 - dw SeafoamIslands5Text5 + def_text_pointers + dw_const BoulderText, TEXT_SEAFOAMISLANDSB4F_BOULDER1 + dw_const BoulderText, TEXT_SEAFOAMISLANDSB4F_BOULDER2 + dw_const SeafoamIslandsB4FArticunoText, TEXT_SEAFOAMISLANDSB4F_ARTICUNO + dw_const SeafoamIslandsB4FBouldersSignText, TEXT_SEAFOAMISLANDSB4F_BOULDERS_SIGN + dw_const SeafoamIslandsB4FDangerSignText, TEXT_SEAFOAMISLANDSB4F_DANGER_SIGN ; Articuno is object 3, but its event flag is bit 2. ; This is not a problem because its sight range is 0, and ; trainer headers were not stored by ExecuteCurMapScriptInTable. def_trainers 2 ArticunoTrainerHeader: - trainer EVENT_BEAT_ARTICUNO, 0, ArticunoBattleText, ArticunoBattleText, ArticunoBattleText + trainer EVENT_BEAT_ARTICUNO, 0, SeafoamIslandsB4FArticunoBattleText, SeafoamIslandsB4FArticunoBattleText, SeafoamIslandsB4FArticunoBattleText db -1 ; end -ArticunoText: +SeafoamIslandsB4FArticunoText: text_asm ld hl, ArticunoTrainerHeader call TalkToTrainer - ld a, $4 + ld a, SCRIPT_SEAFOAMISLANDSB4F_OBJECT_MOVING3 ld [wSeafoamIslandsB4FCurScript], a jp TextScriptEnd -ArticunoBattleText: - text_far _ArticunoBattleText +SeafoamIslandsB4FArticunoBattleText: + text_far _SeafoamIslandsB4FArticunoBattleText text_asm ld a, ARTICUNO call PlayCry call WaitForSoundToFinish jp TextScriptEnd -SeafoamIslands5Text4: - text_far _SeafoamIslands5Text4 +SeafoamIslandsB4FBouldersSignText: + text_far _SeafoamIslandsB4FBouldersSignText text_end -SeafoamIslands5Text5: - text_far _SeafoamIslands5Text5 +SeafoamIslandsB4FDangerSignText: + text_far _SeafoamIslandsB4FDangerSignText text_end diff --git a/scripts/SilphCo10F.asm b/scripts/SilphCo10F.asm index b8b5bfea5..7cc2c58e7 100644 --- a/scripts/SilphCo10F.asm +++ b/scripts/SilphCo10F.asm @@ -1,5 +1,5 @@ SilphCo10F_Script: - call SilphCo10Script_5a14f + call SilphCo10FGateCallbackScript call EnableAutoTextBoxDrawing ld hl, SilphCo10TrainerHeaders ld de, SilphCo10F_ScriptPointers @@ -8,14 +8,14 @@ SilphCo10F_Script: ld [wSilphCo10FCurScript], a ret -SilphCo10Script_5a14f: +SilphCo10FGateCallbackScript: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z - ld hl, SilphCo10GateCoords - call SilphCo2Script_59d43 - call SilphCo10Text_5a176 + ld hl, .GateCoordinates + call SilphCo2F_SetCardKeyDoorYScript + call SilphCo10F_SetUnlockedSilphCoDoorsScript CheckEvent EVENT_SILPH_CO_10_UNLOCKED_DOOR ret nz ld a, $54 @@ -23,11 +23,11 @@ SilphCo10Script_5a14f: lb bc, 4, 5 predef_jump ReplaceTileBlock -SilphCo10GateCoords: +.GateCoordinates: dbmapcoord 5, 4 db -1 ; end -SilphCo10Text_5a176: +SilphCo10F_SetUnlockedSilphCoDoorsScript: ldh a, [hUnlockedSilphCoDoors] and a ret z @@ -35,76 +35,78 @@ SilphCo10Text_5a176: ret SilphCo10F_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_SILPHCO10F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_SILPHCO10F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_SILPHCO10F_END_BATTLE SilphCo10F_TextPointers: - dw SilphCo10Text1 - dw SilphCo10Text2 - dw SilphCo10Text3 - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText + def_text_pointers + dw_const SilphCo10FRocketText, TEXT_SILPHCO10F_ROCKET + dw_const SilphCo10FScientistText, TEXT_SILPHCO10F_SCIENTIST + dw_const SilphCo10FSilphWorkerFText, TEXT_SILPHCO10F_SILPH_WORKER_F + dw_const PickUpItemText, TEXT_SILPHCO10F_TM_EARTHQUAKE + dw_const PickUpItemText, TEXT_SILPHCO10F_RARE_CANDY + dw_const PickUpItemText, TEXT_SILPHCO10F_CARBOS SilphCo10TrainerHeaders: def_trainers SilphCo10TrainerHeader0: - trainer EVENT_BEAT_SILPH_CO_10F_TRAINER_0, 3, SilphCo10BattleText1, SilphCo10EndBattleText1, SilphCo10AfterBattleText1 + trainer EVENT_BEAT_SILPH_CO_10F_TRAINER_0, 3, SilphCo10FRocketBattleText, SilphCo10FRocketEndBattleText, SilphCo10FRocketAfterBattleText SilphCo10TrainerHeader1: - trainer EVENT_BEAT_SILPH_CO_10F_TRAINER_1, 4, SilphCo10BattleText2, SilphCo10EndBattleText2, SilphCo10AfterBattleText2 + trainer EVENT_BEAT_SILPH_CO_10F_TRAINER_1, 4, SilphCo10FScientistBattleText, SilphCo10FScientistEndBattleText, SilphCo10FScientistAfterBattleText db -1 ; end -SilphCo10Text1: +SilphCo10FRocketText: text_asm ld hl, SilphCo10TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SilphCo10Text2: +SilphCo10FScientistText: text_asm ld hl, SilphCo10TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SilphCo10Text3: +SilphCo10FSilphWorkerFText: text_asm CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI - ld hl, SilphCo10Text_5a1d8 - jr nz, .asm_cf85f - ld hl, SilphCo10Text_5a1d3 -.asm_cf85f + ld hl, .QuietAboutMyCryingText + jr nz, .beat_giovanni + ld hl, .ImScaredText +.beat_giovanni call PrintText jp TextScriptEnd -SilphCo10Text_5a1d3: - text_far _SilphCo10Text_5a1d3 +.ImScaredText: + text_far _SilphCo10FSilphWorkerFImScaredText text_end -SilphCo10Text_5a1d8: - text_far _SilphCo10Text_5a1d8 +.QuietAboutMyCryingText: + text_far _SilphCo10FSilphWorkerFQuietAboutMyCryingText text_end -SilphCo10BattleText1: - text_far _SilphCo10BattleText1 +SilphCo10FRocketBattleText: + text_far _SilphCo10FRocketBattleText text_end -SilphCo10EndBattleText1: - text_far _SilphCo10EndBattleText1 +SilphCo10FRocketEndBattleText: + text_far _SilphCo10FRocketEndBattleText text_end -SilphCo10AfterBattleText1: - text_far _SilphCo10AfterBattleText1 +SilphCo10FRocketAfterBattleText: + text_far _SilphCo10FRocketAfterBattleText text_end -SilphCo10BattleText2: - text_far _SilphCo10BattleText2 +SilphCo10FScientistBattleText: + text_far _SilphCo10FScientistBattleText text_end -SilphCo10EndBattleText2: - text_far _SilphCo10EndBattleText2 +SilphCo10FScientistEndBattleText: + text_far _SilphCo10FScientistEndBattleText text_end -SilphCo10AfterBattleText2: - text_far _SilphCo10AfterBattleText2 +SilphCo10FScientistAfterBattleText: + text_far _SilphCo10FScientistAfterBattleText text_end diff --git a/scripts/SilphCo11F.asm b/scripts/SilphCo11F.asm index 701193318..1a2978a8a 100644 --- a/scripts/SilphCo11F.asm +++ b/scripts/SilphCo11F.asm @@ -1,5 +1,5 @@ SilphCo11F_Script: - call SilphCo11Script_62110 + call SilphCo11FGateCallbackScript call EnableAutoTextBoxDrawing ld hl, SilphCo11TrainerHeaders ld de, SilphCo11F_ScriptPointers @@ -8,14 +8,14 @@ SilphCo11F_Script: ld [wSilphCo11FCurScript], a ret -SilphCo11Script_62110: +SilphCo11FGateCallbackScript: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z ld hl, SilphCo11GateCoords - call SilphCo11Script_62137 - call SilphCo11Script_62163 + call SilphCo11F_SetCardKeyDoorYScript + call SilphCo11FSetUnlockedDoorEventScript CheckEvent EVENT_SILPH_CO_11_UNLOCKED_DOOR ret nz ld a, $20 @@ -27,7 +27,7 @@ SilphCo11GateCoords: dbmapcoord 3, 6 db -1 ; end -SilphCo11Script_62137: +SilphCo11F_SetCardKeyDoorYScript: push hl ld hl, wCardKeyDoorY ld a, [hli] @@ -37,53 +37,53 @@ SilphCo11Script_62137: xor a ldh [hUnlockedSilphCoDoors], a pop hl -.asm_62143 +.loop_check_doors ld a, [hli] cp $ff - jr z, .asm_6215f + jr z, .exit_loop push hl ld hl, hUnlockedSilphCoDoors inc [hl] pop hl cp b - jr z, .asm_62154 + jr z, .check_y_coord inc hl - jr .asm_62143 -.asm_62154 + jr .loop_check_doors +.check_y_coord ld a, [hli] cp c - jr nz, .asm_62143 + jr nz, .loop_check_doors ld hl, wCardKeyDoorY xor a ld [hli], a ld [hl], a ret -.asm_6215f +.exit_loop xor a ldh [hUnlockedSilphCoDoors], a ret -SilphCo11Script_62163: +SilphCo11FSetUnlockedDoorEventScript: ldh a, [hUnlockedSilphCoDoors] and a ret z SetEvent EVENT_SILPH_CO_11_UNLOCKED_DOOR ret -SilphCo11Script_6216d: - ld hl, MissableObjectIDs_6219b -.asm_62170 +SilphCo11FTeamRocketLeavesScript: + ld hl, .HideMissableObjectIDs +.hide_loop ld a, [hli] cp $ff - jr z, .asm_62181 + jr z, .done_hiding push hl ld [wMissableObjectIndex], a predef HideObject pop hl - jr .asm_62170 -.asm_62181 - ld hl, MissableObjectIDs_62194 -.asm_62184 + jr .hide_loop +.done_hiding + ld hl, .ShowMissableObjectIDs +.show_loop ld a, [hli] cp -1 ret z @@ -91,9 +91,9 @@ SilphCo11Script_6216d: ld [wMissableObjectIndex], a predef ShowObject pop hl - jr .asm_62184 + jr .show_loop -MissableObjectIDs_62194: +.ShowMissableObjectIDs: db HS_SAFFRON_CITY_8 db HS_SAFFRON_CITY_9 db HS_SAFFRON_CITY_A @@ -102,7 +102,7 @@ MissableObjectIDs_62194: db HS_SAFFRON_CITY_D db -1 ; end -MissableObjectIDs_6219b: +.HideMissableObjectIDs: db HS_SAFFRON_CITY_1 db HS_SAFFRON_CITY_2 db HS_SAFFRON_CITY_3 @@ -145,123 +145,124 @@ MissableObjectIDs_6219b: db HS_SILPH_CO_11F_3 db -1 ; end -SilphCo11Script_621c4: +SilphCo11FResetCurScript: xor a ld [wJoyIgnore], a - -SilphCo11Script_621c8: +; fallthrough +SilphCo11FSetCurScript: ld [wSilphCo11FCurScript], a ld [wCurMapScript], a ret SilphCo11F_ScriptPointers: - dw SilphCo11Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw SilphCo11Script3 - dw SilphCo11Script4 - dw SilphCo11Script5 - -SilphCo11Script0: + def_script_pointers + dw_const SilphCo11FDefaultScript, SCRIPT_SILPHCO11F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_SILPHCO11F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_SILPHCO11F_END_BATTLE + dw_const SilphCo11FGiovanniBattleFacingScript, SCRIPT_SILPHCO11F_GIOVANNI_FACING + dw_const SilphCo11FGiovanniStartBattleScript, SCRIPT_SILPHCO11F_GIOVANNI_START_BATTLE + dw_const SilphCo11FGiovanniAfterBattleScript, SCRIPT_SILPHCO11F_GIOVANNI_AFTER_BATTLE + +SilphCo11FDefaultScript: CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI ret nz - ld hl, CoordsData_62211 + ld hl, .PlayerCoordsArray call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers ld a, [wCoordIndex] ld [wcf0d], a xor a ldh [hJoyHeld], a - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a - ld a, $3 + ld a, TEXT_SILPHCO11F_GIOVANNI ldh [hSpriteIndexOrTextID], a call DisplayTextID - ld a, $3 + ld a, SILPHCO11F_GIOVANNI ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF - ld de, MovementData_62216 + ld de, .GiovanniMovement call MoveSprite - ld a, $3 - jp SilphCo11Script_621c8 + ld a, SCRIPT_SILPHCO11F_GIOVANNI_FACING + jp SilphCo11FSetCurScript -CoordsData_62211: +.PlayerCoordsArray: dbmapcoord 6, 13 dbmapcoord 7, 12 db -1 ; end -MovementData_62216: +.GiovanniMovement: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db -1 ; end -SilphCo11Script_6221a: +SilphCo11FSetPlayerAndSpriteFacingDirectionScript: ld [wPlayerMovingDirection], a - ld a, $3 + ld a, SILPHCO11F_GIOVANNI ldh [hSpriteIndex], a ld a, b ldh [hSpriteFacingDirection], a jp SetSpriteFacingDirectionAndDelay -SilphCo11Script5: +SilphCo11FGiovanniAfterBattleScript: ld a, [wIsInBattle] cp $ff - jp z, SilphCo11Script_621c4 + jp z, SilphCo11FResetCurScript ld a, [wcf0d] cp $1 - jr z, .asm_6223c + jr z, .face_player_up ld a, PLAYER_DIR_LEFT ld b, SPRITE_FACING_RIGHT - jr .asm_62240 -.asm_6223c + jr .continue +.face_player_up ld a, PLAYER_DIR_UP ld b, SPRITE_FACING_DOWN -.asm_62240 - call SilphCo11Script_6221a - ld a, $f0 +.continue + call SilphCo11FSetPlayerAndSpriteFacingDirectionScript + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a - ld a, $6 + ld a, TEXT_SILPHCO11F_GIOVANNI_YOU_RUINED_OUR_PLANS ldh [hSpriteIndexOrTextID], a call DisplayTextID call GBFadeOutToBlack - call SilphCo11Script_6216d + call SilphCo11FTeamRocketLeavesScript call UpdateSprites call Delay3 call GBFadeInFromBlack SetEvent EVENT_BEAT_SILPH_CO_GIOVANNI xor a ld [wJoyIgnore], a - jp SilphCo11Script_621c8 + jp SilphCo11FSetCurScript -SilphCo11Script3: +SilphCo11FGiovanniBattleFacingScript: ld a, [wd730] bit 0, a ret nz - ld a, $3 + ld a, SILPHCO11F_GIOVANNI ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF ld a, [wcf0d] cp $1 - jr z, .asm_62284 + jr z, .face_player_up ld a, PLAYER_DIR_LEFT ld b, SPRITE_FACING_RIGHT - jr .asm_62288 -.asm_62284 + jr .continue +.face_player_up ld a, PLAYER_DIR_UP ld b, SPRITE_FACING_DOWN -.asm_62288 - call SilphCo11Script_6221a +.continue + call SilphCo11FSetPlayerAndSpriteFacingDirectionScript call Delay3 - ld a, $4 - jp SilphCo11Script_621c8 + ld a, SCRIPT_SILPHCO11F_GIOVANNI_START_BATTLE + jp SilphCo11FSetCurScript -SilphCo11Script4: +SilphCo11FGiovanniStartBattleScript: ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, SilphCo10Text_62330 - ld de, SilphCo10Text_62330 + ld hl, SilphCo10FGiovanniILostAgainText + ld de, SilphCo10FGiovanniILostAgainText call SaveEndBattleTextPointers ldh a, [hSpriteIndex] ld [wSpriteIndex], a @@ -269,125 +270,126 @@ SilphCo11Script4: call InitBattleEnemyParameters xor a ld [wJoyIgnore], a - ld a, $5 - jp SilphCo11Script_621c8 + ld a, SCRIPT_SILPHCO11F_GIOVANNI_AFTER_BATTLE + jp SilphCo11FSetCurScript SilphCo11F_TextPointers: - dw SilphCo11Text1 - dw SilphCo11Text2 - dw SilphCo11Text3 - dw SilphCo11Text4 - dw SilphCo11Text5 - dw SilphCo11Text6 + def_text_pointers + dw_const SilphCo11FSilphPresidentText, TEXT_SILPHCO11F_SILPH_PRESIDENT + dw_const SilphCo11FBeautyText, TEXT_SILPHCO11F_BEAUTY + dw_const SilphCo11FGiovanniText, TEXT_SILPHCO11F_GIOVANNI + dw_const SilphCo11FRocket1Text, TEXT_SILPHCO11F_ROCKET1 + dw_const SilphCo11FRocket2Text, TEXT_SILPHCO11F_ROCKET2 + dw_const SilphCo11FGiovanniYouRuinedOurPlansText, TEXT_SILPHCO11F_GIOVANNI_YOU_RUINED_OUR_PLANS SilphCo11TrainerHeaders: def_trainers 4 SilphCo11TrainerHeader0: - trainer EVENT_BEAT_SILPH_CO_11F_TRAINER_0, 4, SilphCo11BattleText1, SilphCo11EndBattleText1, SilphCo11AfterBattleText1 + trainer EVENT_BEAT_SILPH_CO_11F_TRAINER_0, 4, SilphCo11FRocket1BattleText, SilphCo11FRocket1EndBattleText, SilphCo11FRocket1AfterBattleText SilphCo11TrainerHeader1: - trainer EVENT_BEAT_SILPH_CO_11F_TRAINER_1, 3, SilphCo11BattleText2, SilphCo11EndBattleText2, SilphCo11AfterBattleText2 + trainer EVENT_BEAT_SILPH_CO_11F_TRAINER_1, 3, SilphCo11FRocket2BattleText, SilphCo11FRocket2EndBattleText, SilphCo11FRocket2AfterBattleText db -1 ; end -SilphCo11Text1: +SilphCo11FSilphPresidentText: text_asm CheckEvent EVENT_GOT_MASTER_BALL jp nz, .got_item - ld hl, SilphCoPresidentText + ld hl, .Text call PrintText lb bc, MASTER_BALL, 1 call GiveItem jr nc, .bag_full - ld hl, ReceivedSilphCoMasterBallText + ld hl, .ReceivedMasterBallText call PrintText SetEvent EVENT_GOT_MASTER_BALL jr .done .bag_full - ld hl, SilphCoMasterBallNoRoomText + ld hl, .NoRoomText call PrintText jr .done .got_item - ld hl, SilphCo10Text_6231c + ld hl, .MasterBallDescriptionText call PrintText .done jp TextScriptEnd -SilphCoPresidentText: - text_far _SilphCoPresidentText +.Text: + text_far _SilphCo11FSilphPresidentText text_end -ReceivedSilphCoMasterBallText: - text_far _ReceivedSilphCoMasterBallText +.ReceivedMasterBallText: + text_far _SilphCo11FSilphPresidentReceivedMasterBallText sound_get_key_item text_end -SilphCo10Text_6231c: - text_far _SilphCo10Text_6231c +.MasterBallDescriptionText: + text_far _SilphCo11FSilphPresidentMasterBallDescriptionText text_end -SilphCoMasterBallNoRoomText: - text_far _SilphCoMasterBallNoRoomText +.NoRoomText: + text_far _SilphCo11FSilphPresidentNoRoomText text_end -SilphCo11Text2: - text_far _SilphCo11Text2 +SilphCo11FBeautyText: + text_far _SilphCo11FBeautyText text_end -SilphCo11Text3: - text_far _SilphCo11Text3 +SilphCo11FGiovanniText: + text_far _SilphCo11FGiovanniText text_end -SilphCo10Text_62330: - text_far _SilphCo10Text_62330 +SilphCo10FGiovanniILostAgainText: + text_far _SilphCo10FGiovanniILostAgainText text_end -SilphCo11Text6: - text_far _SilphCo10Text_62335 +SilphCo11FGiovanniYouRuinedOurPlansText: + text_far _SilphCo11FGiovanniYouRuinedOurPlansText text_end -SilphCo11Text4: +SilphCo11FRocket1Text: text_asm ld hl, SilphCo11TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SilphCo11BattleText1: - text_far _SilphCo11BattleText1 +SilphCo11FRocket1BattleText: + text_far _SilphCo11FRocket1BattleText text_end -SilphCo11EndBattleText1: - text_far _SilphCo11EndBattleText1 +SilphCo11FRocket1EndBattleText: + text_far _SilphCo11FRocket1EndBattleText text_end -SilphCo11AfterBattleText1: - text_far _SilphCo11AfterBattleText1 +SilphCo11FRocket1AfterBattleText: + text_far _SilphCo11FRocket1AfterBattleText text_end -SilphCo11Text5: +SilphCo11FRocket2Text: text_asm ld hl, SilphCo11TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SilphCo11BattleText2: - text_far _SilphCo11BattleText2 +SilphCo11FRocket2BattleText: + text_far _SilphCo11FRocket2BattleText text_end -SilphCo11EndBattleText2: - text_far _SilphCo11EndBattleText2 +SilphCo11FRocket2EndBattleText: + text_far _SilphCo11FRocket2EndBattleText text_end -SilphCo11AfterBattleText2: - text_far _SilphCo11AfterBattleText2 +SilphCo11FRocket2AfterBattleText: + text_far _SilphCo11FRocket2AfterBattleText text_end -SilphCo10Text_6236c: +SilphCo10FPorygonText: ; unreferenced text_asm - ld hl, SilphCo10Text_6237b + ld hl, .Text call PrintText ld a, PORYGON call DisplayPokedex jp TextScriptEnd -SilphCo10Text_6237b: - text_far _SilphCo10Text_6237b +.Text: + text_far _SilphCo10FPorygonText text_end diff --git a/scripts/SilphCo1F.asm b/scripts/SilphCo1F.asm index bc484b7ca..fbc70d77d 100644 --- a/scripts/SilphCo1F.asm +++ b/scripts/SilphCo1F.asm @@ -9,8 +9,9 @@ SilphCo1F_Script: predef_jump ShowObject SilphCo1F_TextPointers: - dw SilphCo1Text1 + def_text_pointers + dw_const SilphCo1FLinkReceptionistText, TEXT_SILPHCO1F_LINK_RECEPTIONIST -SilphCo1Text1: - text_far _SilphCo1Text1 +SilphCo1FLinkReceptionistText: + text_far _SilphCo1FLinkReceptionistText text_end diff --git a/scripts/SilphCo2F.asm b/scripts/SilphCo2F.asm index f8e157e8a..52241b95f 100644 --- a/scripts/SilphCo2F.asm +++ b/scripts/SilphCo2F.asm @@ -1,5 +1,5 @@ SilphCo2F_Script: - call SilphCo2Script_59d07 + call SilphCo2FGateCallbackScript call EnableAutoTextBoxDrawing ld hl, SilphCo2TrainerHeaders ld de, SilphCo2F_ScriptPointers @@ -8,23 +8,23 @@ SilphCo2F_Script: ld [wSilphCo2FCurScript], a ret -SilphCo2Script_59d07: +SilphCo2FGateCallbackScript: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z - ld hl, SilphCo2GateCoords - call SilphCo2Script_59d43 - call SilphCo2Script_59d6f + ld hl, .GateCoordinates + call SilphCo2F_SetCardKeyDoorYScript + call SilphCo2F_UnlockedDoorEventScript CheckEvent EVENT_SILPH_CO_2_UNLOCKED_DOOR1 - jr nz, .asm_59d2e + jr nz, .unlock_door1 push af ld a, $54 ld [wNewTileBlockID], a lb bc, 2, 2 predef ReplaceTileBlock pop af -.asm_59d2e +.unlock_door1 CheckEventAfterBranchReuseA EVENT_SILPH_CO_2_UNLOCKED_DOOR2, EVENT_SILPH_CO_2_UNLOCKED_DOOR1 ret nz ld a, $54 @@ -32,12 +32,12 @@ SilphCo2Script_59d07: lb bc, 5, 2 predef_jump ReplaceTileBlock -SilphCo2GateCoords: +.GateCoordinates: dbmapcoord 2, 2 dbmapcoord 2, 5 db -1 ; end -SilphCo2Script_59d43: +SilphCo2F_SetCardKeyDoorYScript: push hl ld hl, wCardKeyDoorY ld a, [hli] @@ -47,173 +47,175 @@ SilphCo2Script_59d43: xor a ldh [hUnlockedSilphCoDoors], a pop hl -.asm_59d4f +.loop_check_doors ld a, [hli] cp $ff - jr z, .asm_59d6b + jr z, .exit_loop push hl ld hl, hUnlockedSilphCoDoors inc [hl] pop hl cp b - jr z, .asm_59d60 + jr z, .check_y_coord inc hl - jr .asm_59d4f -.asm_59d60 + jr .loop_check_doors +.check_y_coord ld a, [hli] cp c - jr nz, .asm_59d4f + jr nz, .loop_check_doors ld hl, wCardKeyDoorY xor a ld [hli], a ld [hl], a ret -.asm_59d6b +.exit_loop xor a ldh [hUnlockedSilphCoDoors], a ret -SilphCo2Script_59d6f: +SilphCo2F_UnlockedDoorEventScript: EventFlagAddress hl, EVENT_SILPH_CO_2_UNLOCKED_DOOR1 ldh a, [hUnlockedSilphCoDoors] and a ret z cp $1 - jr nz, .next + jr nz, .unlock_door1 SetEventReuseHL EVENT_SILPH_CO_2_UNLOCKED_DOOR1 ret -.next +.unlock_door1 SetEventAfterBranchReuseHL EVENT_SILPH_CO_2_UNLOCKED_DOOR2, EVENT_SILPH_CO_2_UNLOCKED_DOOR1 ret SilphCo2F_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_SILPHCO2F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_SILPHCO2F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_SILPHCO2F_END_BATTLE SilphCo2F_TextPointers: - dw SilphCo2Text1 - dw SilphCo2Text2 - dw SilphCo2Text3 - dw SilphCo2Text4 - dw SilphCo2Text5 + def_text_pointers + dw_const SilphCo2FSilphWorkerFText, TEXT_SILPHCO2F_SILPH_WORKER_F + dw_const SilphCo2FScientist1Text, TEXT_SILPHCO2F_SCIENTIST1 + dw_const SilphCo2FScientist2Text, TEXT_SILPHCO2F_SCIENTIST2 + dw_const SilphCo2FRocket1Text, TEXT_SILPHCO2F_ROCKET1 + dw_const SilphCo2FRocket2Text, TEXT_SILPHCO2F_ROCKET2 SilphCo2TrainerHeaders: def_trainers 2 SilphCo2TrainerHeader0: - trainer EVENT_BEAT_SILPH_CO_2F_TRAINER_0, 3, SilphCo2BattleText1, SilphCo2EndBattleText1, SilphCo2AfterBattleText1 + trainer EVENT_BEAT_SILPH_CO_2F_TRAINER_0, 3, SilphCo2FScientist1BattleText, SilphCo2FScientist1EndBattleText, SilphCo2FScientist1AfterBattleText SilphCo2TrainerHeader1: - trainer EVENT_BEAT_SILPH_CO_2F_TRAINER_1, 4, SilphCo2BattleText2, SilphCo2EndBattleText2, SilphCo2AfterBattleText2 + trainer EVENT_BEAT_SILPH_CO_2F_TRAINER_1, 4, SilphCo2FScientist2BattleText, SilphCo2FScientist2EndBattleText, SilphCo2FScientist2AfterBattleText SilphCo2TrainerHeader2: - trainer EVENT_BEAT_SILPH_CO_2F_TRAINER_2, 3, SilphCo2BattleText3, SilphCo2EndBattleText3, SilphCo2AfterBattleText3 + trainer EVENT_BEAT_SILPH_CO_2F_TRAINER_2, 3, SilphCo2FRocket1BattleText, SilphCo2FRocket1EndBattleText, SilphCo2FRocket1AfterBattleText SilphCo2TrainerHeader3: - trainer EVENT_BEAT_SILPH_CO_2F_TRAINER_3, 3, SilphCo2BattleText4, SilphCo2EndBattleText4, SilphCo2AfterBattleText4 + trainer EVENT_BEAT_SILPH_CO_2F_TRAINER_3, 3, SilphCo2FRocket2BattleText, SilphCo2FRocket2EndBattleText, SilphCo2FRocket2AfterBattleText db -1 ; end -SilphCo2Text1: +SilphCo2FSilphWorkerFText: text_asm CheckEvent EVENT_GOT_TM36 - jr nz, .asm_59de4 - ld hl, SilphCo2Text_59ded + jr nz, .already_have_tm + ld hl, .PleaseTakeThisText call PrintText lb bc, TM_SELFDESTRUCT, 1 call GiveItem - ld hl, TM36NoRoomText - jr nc, .asm_59de7 + ld hl, .TM36NoRoomText + jr nc, .print_text SetEvent EVENT_GOT_TM36 - ld hl, ReceivedTM36Text - jr .asm_59de7 -.asm_59de4 - ld hl, TM36ExplanationText -.asm_59de7 + ld hl, .ReceivedTM36Text + jr .print_text +.already_have_tm + ld hl, .TM36ExplanationText +.print_text call PrintText jp TextScriptEnd -SilphCo2Text_59ded: - text_far _SilphCo2Text_59ded +.PleaseTakeThisText: + text_far SilphCo2FSilphWorkerFPleaseTakeThisText text_end -ReceivedTM36Text: - text_far _ReceivedTM36Text +.ReceivedTM36Text: + text_far _SilphCo2FSilphWorkerFReceivedTM36Text sound_get_item_1 text_end -TM36ExplanationText: - text_far _TM36ExplanationText +.TM36ExplanationText: + text_far _SilphCo2FSilphWorkerFTM36ExplanationText text_end -TM36NoRoomText: - text_far _TM36NoRoomText +.TM36NoRoomText: + text_far _SilphCo2FSilphWorkerFTM36NoRoomText text_end -SilphCo2Text2: +SilphCo2FScientist1Text: text_asm ld hl, SilphCo2TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SilphCo2Text3: +SilphCo2FScientist2Text: text_asm ld hl, SilphCo2TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SilphCo2Text4: +SilphCo2FRocket1Text: text_asm ld hl, SilphCo2TrainerHeader2 call TalkToTrainer jp TextScriptEnd -SilphCo2Text5: +SilphCo2FRocket2Text: text_asm ld hl, SilphCo2TrainerHeader3 call TalkToTrainer jp TextScriptEnd -SilphCo2BattleText1: - text_far _SilphCo2BattleText1 +SilphCo2FScientist1BattleText: + text_far _SilphCo2FScientist1BattleText text_end -SilphCo2EndBattleText1: - text_far _SilphCo2EndBattleText1 +SilphCo2FScientist1EndBattleText: + text_far _SilphCo2FScientist1EndBattleText text_end -SilphCo2AfterBattleText1: - text_far _SilphCo2AfterBattleText1 +SilphCo2FScientist1AfterBattleText: + text_far _SilphCo2FScientist1AfterBattleText text_end -SilphCo2BattleText2: - text_far _SilphCo2BattleText2 +SilphCo2FScientist2BattleText: + text_far _SilphCo2FScientist2BattleText text_end -SilphCo2EndBattleText2: - text_far _SilphCo2EndBattleText2 +SilphCo2FScientist2EndBattleText: + text_far _SilphCo2FScientist2EndBattleText text_end -SilphCo2AfterBattleText2: - text_far _SilphCo2AfterBattleText2 +SilphCo2FScientist2AfterBattleText: + text_far _SilphCo2FScientist2AfterBattleText text_end -SilphCo2BattleText3: - text_far _SilphCo2BattleText3 +SilphCo2FRocket1BattleText: + text_far _SilphCo2FRocket1BattleText text_end -SilphCo2EndBattleText3: - text_far _SilphCo2EndBattleText3 +SilphCo2FRocket1EndBattleText: + text_far _SilphCo2FRocket1EndBattleText text_end -SilphCo2AfterBattleText3: - text_far _SilphCo2AfterBattleText3 +SilphCo2FRocket1AfterBattleText: + text_far _SilphCo2FRocket1AfterBattleText text_end -SilphCo2BattleText4: - text_far _SilphCo2BattleText4 +SilphCo2FRocket2BattleText: + text_far _SilphCo2FRocket2BattleText text_end -SilphCo2EndBattleText4: - text_far _SilphCo2EndBattleText4 +SilphCo2FRocket2EndBattleText: + text_far _SilphCo2FRocket2EndBattleText text_end -SilphCo2AfterBattleText4: - text_far _SilphCo2AfterBattleText4 +SilphCo2FRocket2AfterBattleText: + text_far _SilphCo2FRocket2AfterBattleText text_end diff --git a/scripts/SilphCo3F.asm b/scripts/SilphCo3F.asm index eb92dd787..df9df9e8c 100644 --- a/scripts/SilphCo3F.asm +++ b/scripts/SilphCo3F.asm @@ -1,5 +1,5 @@ SilphCo3F_Script: - call SilphCo3Script_59f71 + call SilphCo3FGateCallbackScript call EnableAutoTextBoxDrawing ld hl, SilphCo3TrainerHeaders ld de, SilphCo3F_ScriptPointers @@ -8,23 +8,23 @@ SilphCo3F_Script: ld [wSilphCo3FCurScript], a ret -SilphCo3Script_59f71: +SilphCo3FGateCallbackScript: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z - ld hl, SilphCo3GateCoords - call SilphCo2Script_59d43 - call SilphCo3Script_59fad + ld hl, .GateCoordinates + call SilphCo2F_SetCardKeyDoorYScript + call SilphCo3F_UnlockedDoorEventScript CheckEvent EVENT_SILPH_CO_3_UNLOCKED_DOOR1 - jr nz, .asm_59f98 + jr nz, .unlock_door1 push af ld a, $5f ld [wNewTileBlockID], a lb bc, 4, 4 predef ReplaceTileBlock pop af -.asm_59f98 +.unlock_door1 CheckEventAfterBranchReuseA EVENT_SILPH_CO_3_UNLOCKED_DOOR2, EVENT_SILPH_CO_3_UNLOCKED_DOOR1 ret nz ld a, $5f @@ -32,93 +32,95 @@ SilphCo3Script_59f71: lb bc, 4, 8 predef_jump ReplaceTileBlock -SilphCo3GateCoords: +.GateCoordinates: dbmapcoord 4, 4 dbmapcoord 8, 4 db -1 ; end -SilphCo3Script_59fad: +SilphCo3F_UnlockedDoorEventScript: EventFlagAddress hl, EVENT_SILPH_CO_3_UNLOCKED_DOOR1 ldh a, [hUnlockedSilphCoDoors] and a ret z cp $1 - jr nz, .next + jr nz, .unlock_door1 SetEventReuseHL EVENT_SILPH_CO_3_UNLOCKED_DOOR1 ret -.next +.unlock_door1 SetEventAfterBranchReuseHL EVENT_SILPH_CO_3_UNLOCKED_DOOR2, EVENT_SILPH_CO_3_UNLOCKED_DOOR1 ret SilphCo3F_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_SILPHCO3F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_SILPHCO3F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_SILPHCO3F_END_BATTLE SilphCo3F_TextPointers: - dw SilphCo3Text1 - dw SilphCo3Text2 - dw SilphCo3Text3 - dw PickUpItemText + def_text_pointers + dw_const SilphCo3FSilphWorkerMText, TEXT_SILPHCO3F_SILPH_WORKER_M + dw_const SilphCo3FRocketText, TEXT_SILPHCO3F_ROCKET + dw_const SilphCo3FScientistText, TEXT_SILPHCO3F_SCIENTIST + dw_const PickUpItemText, TEXT_SILPHCO3F_HYPER_POTION SilphCo3TrainerHeaders: def_trainers 2 SilphCo3TrainerHeader0: - trainer EVENT_BEAT_SILPH_CO_3F_TRAINER_0, 2, SilphCo3BattleText1, SilphCo3EndBattleText1, SilphCo3AfterBattleText1 + trainer EVENT_BEAT_SILPH_CO_3F_TRAINER_0, 2, SilphCo3FRocketBattleText, SilphCo3FRocketEndBattleText, SilphCo3FRocketAfterBattleText SilphCo3TrainerHeader1: - trainer EVENT_BEAT_SILPH_CO_3F_TRAINER_1, 3, SilphCo3BattleText2, SilphCo3EndBattleText2, SilphCo3AfterBattleText2 + trainer EVENT_BEAT_SILPH_CO_3F_TRAINER_1, 3, SilphCo3FScientistBattleText, SilphCo3FScientistEndBattleText, SilphCo3FScientistAfterBattleText db -1 ; end -SilphCo3Text1: +SilphCo3FSilphWorkerMText: text_asm CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI - ld hl, SilphCo3Text_59ffe - jr nz, .asm_59fee - ld hl, SilphCo3Text_59ff9 -.asm_59fee + ld hl, .YouSavedUsText + jr nz, .beat_giovanni + ld hl, .WhatShouldIDoText +.beat_giovanni call PrintText jp TextScriptEnd -SilphCo3Text_59ff9: - text_far _SilphCo3Text_59ff9 +.WhatShouldIDoText: + text_far _SilphCo3FSilphWorkerMWhatShouldIDoText text_end -SilphCo3Text_59ffe: - text_far _SilphCo3Text_59ffe +.YouSavedUsText: + text_far _SilphCo3FSilphWorkerMYouSavedUsText text_end -SilphCo3Text2: +SilphCo3FRocketText: text_asm ld hl, SilphCo3TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SilphCo3BattleText1: - text_far _SilphCo3BattleText1 +SilphCo3FRocketBattleText: + text_far _SilphCo3FRocketBattleText text_end -SilphCo3EndBattleText1: - text_far _SilphCo3EndBattleText1 +SilphCo3FRocketEndBattleText: + text_far _SilphCo3FRocketEndBattleText text_end -SilphCo3AfterBattleText1: - text_far _SilphCo3AfterBattleText1 +SilphCo3FRocketAfterBattleText: + text_far _SilphCo3FRocketAfterBattleText text_end -SilphCo3Text3: +SilphCo3FScientistText: text_asm ld hl, SilphCo3TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SilphCo3BattleText2: - text_far _SilphCo3BattleText2 +SilphCo3FScientistBattleText: + text_far _SilphCo3FScientistBattleText text_end -SilphCo3EndBattleText2: - text_far _SilphCo3EndBattleText2 +SilphCo3FScientistEndBattleText: + text_far _SilphCo3FScientistEndBattleText text_end -SilphCo3AfterBattleText2: - text_far _SilphCo3AfterBattleText2 +SilphCo3FScientistAfterBattleText: + text_far _SilphCo3FScientistAfterBattleText text_end diff --git a/scripts/SilphCo4F.asm b/scripts/SilphCo4F.asm index 486b68aca..91453d653 100644 --- a/scripts/SilphCo4F.asm +++ b/scripts/SilphCo4F.asm @@ -1,5 +1,5 @@ SilphCo4F_Script: - call SilphCo4Script_19d21 + call SilphCo4FGateCallbackScript call EnableAutoTextBoxDrawing ld hl, SilphCo4TrainerHeaders ld de, SilphCo4F_ScriptPointers @@ -8,23 +8,23 @@ SilphCo4F_Script: ld [wSilphCo4FCurScript], a ret -SilphCo4Script_19d21: +SilphCo4FGateCallbackScript: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z - ld hl, SilphCo4GateCoords - call SilphCo4Script_19d5d - call SilphCo4Script_19d89 + ld hl, .GateCoordinates + call SilphCo4F_SetCardKeyDoorYScript + call SilphCo4FUnlockedDoorEventScript CheckEvent EVENT_SILPH_CO_4_UNLOCKED_DOOR1 - jr nz, .asm_19d48 + jr nz, .unlock_door1 push af ld a, $54 ld [wNewTileBlockID], a lb bc, 6, 2 predef ReplaceTileBlock pop af -.asm_19d48 +.unlock_door1 CheckEventAfterBranchReuseA EVENT_SILPH_CO_4_UNLOCKED_DOOR2, EVENT_SILPH_CO_4_UNLOCKED_DOOR1 ret nz ld a, $54 @@ -32,12 +32,12 @@ SilphCo4Script_19d21: lb bc, 4, 6 predef_jump ReplaceTileBlock -SilphCo4GateCoords: +.GateCoordinates: dbmapcoord 2, 6 dbmapcoord 6, 4 db -1 ; end -SilphCo4Script_19d5d: +SilphCo4F_SetCardKeyDoorYScript: push hl ld hl, wCardKeyDoorY ld a, [hli] @@ -47,134 +47,136 @@ SilphCo4Script_19d5d: xor a ldh [hUnlockedSilphCoDoors], a pop hl -.asm_19d69 +.loop_check_doors ld a, [hli] cp $ff - jr z, .asm_19d85 + jr z, .exit_loop push hl ld hl, hUnlockedSilphCoDoors inc [hl] pop hl cp b - jr z, .asm_19d7a + jr z, .check_y_coord inc hl - jr .asm_19d69 -.asm_19d7a + jr .loop_check_doors +.check_y_coord ld a, [hli] cp c - jr nz, .asm_19d69 + jr nz, .loop_check_doors ld hl, wCardKeyDoorY xor a ld [hli], a ld [hl], a ret -.asm_19d85 +.exit_loop xor a ldh [hUnlockedSilphCoDoors], a ret -SilphCo4Script_19d89: +SilphCo4FUnlockedDoorEventScript: EventFlagAddress hl, EVENT_SILPH_CO_4_UNLOCKED_DOOR1 ldh a, [hUnlockedSilphCoDoors] and a ret z cp $1 - jr nz, .next + jr nz, .unlock_door1 SetEventReuseHL EVENT_SILPH_CO_4_UNLOCKED_DOOR1 ret -.next +.unlock_door1 SetEventAfterBranchReuseHL EVENT_SILPH_CO_4_UNLOCKED_DOOR2, EVENT_SILPH_CO_4_UNLOCKED_DOOR1 ret SilphCo4F_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_SILPHCO4F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_SILPHCO4F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_SILPHCO4F_END_BATTLE SilphCo4F_TextPointers: - dw SilphCo4Text1 - dw SilphCo4Text2 - dw SilphCo4Text3 - dw SilphCo4Text4 - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText + def_text_pointers + dw_const SilphCo4FSilphWorkerMText, TEXT_SILPHCO4F_SILPH_WORKER_M + dw_const SilphCo4FRocket1Text, TEXT_SILPHCO4F_ROCKET1 + dw_const SilphCo4FScientistText, TEXT_SILPHCO4F_SCIENTIST + dw_const SilphCo4FRocket2Text, TEXT_SILPHCO4F_ROCKET2 + dw_const PickUpItemText, TEXT_SILPHCO4F_FULL_HEAL + dw_const PickUpItemText, TEXT_SILPHCO4F_MAX_REVIVE + dw_const PickUpItemText, TEXT_SILPHCO4F_ESCAPE_ROPE SilphCo4TrainerHeaders: def_trainers 2 SilphCo4TrainerHeader0: - trainer EVENT_BEAT_SILPH_CO_4F_TRAINER_0, 4, SilphCo4BattleText2, SilphCo4EndBattleText2, SilphCo4AfterBattleText2 + trainer EVENT_BEAT_SILPH_CO_4F_TRAINER_0, 4, SilphCo4FRocket1BattleText, SilphCo4FRocket1EndBattleText, SilphCo4FRocket1AfterBattleText SilphCo4TrainerHeader1: - trainer EVENT_BEAT_SILPH_CO_4F_TRAINER_1, 3, SilphCo4BattleText3, SilphCo4EndBattleText3, SilphCo4AfterBattleText3 + trainer EVENT_BEAT_SILPH_CO_4F_TRAINER_1, 3, SilphCo4FScientistBattleText, SilphCo4FScientistEndBattleText, SilphCo4FScientistAfterBattleText SilphCo4TrainerHeader2: - trainer EVENT_BEAT_SILPH_CO_4F_TRAINER_2, 4, SilphCo4BattleText4, SilphCo4EndBattleText4, SilphCo4AfterBattleText4 + trainer EVENT_BEAT_SILPH_CO_4F_TRAINER_2, 4, SilphCo4FRocket2BattleText, SilphCo4FRocket2EndBattleText, SilphCo4FRocket2AfterBattleText db -1 ; end -SilphCo4Text1: +SilphCo4FSilphWorkerMText: text_asm - ld hl, SilphCo4Text_19de0 - ld de, SilphCo4Text_19de5 - call SilphCo6Script_1a22f + ld hl, .ImHidingText + ld de, .TeamRocketIsGoneText + call SilphCo6FBeatGiovanniPrintDEOrPrintHLScript jp TextScriptEnd -SilphCo4Text_19de0: - text_far _SilphCo4Text_19de0 +.ImHidingText: + text_far _SilphCo4FSilphWorkerMImHidingText text_end -SilphCo4Text_19de5: - text_far _SilphCo4Text_19de5 +.TeamRocketIsGoneText: + text_far _SilphCo4FSilphWorkerMTeamRocketIsGoneText text_end -SilphCo4Text2: +SilphCo4FRocket1Text: text_asm ld hl, SilphCo4TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SilphCo4BattleText2: - text_far _SilphCo4BattleText2 +SilphCo4FRocket1BattleText: + text_far _SilphCo4FRocket1BattleText text_end -SilphCo4EndBattleText2: - text_far _SilphCo4EndBattleText2 +SilphCo4FRocket1EndBattleText: + text_far _SilphCo4FRocket1EndBattleText text_end -SilphCo4AfterBattleText2: - text_far _SilphCo4AfterBattleText2 +SilphCo4FRocket1AfterBattleText: + text_far _SilphCo4FRocket1AfterBattleText text_end -SilphCo4Text3: +SilphCo4FScientistText: text_asm ld hl, SilphCo4TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SilphCo4BattleText3: - text_far _SilphCo4BattleText3 +SilphCo4FScientistBattleText: + text_far _SilphCo4FScientistBattleText text_end -SilphCo4EndBattleText3: - text_far _SilphCo4EndBattleText3 +SilphCo4FScientistEndBattleText: + text_far _SilphCo4FScientistEndBattleText text_end -SilphCo4AfterBattleText3: - text_far _SilphCo4AfterBattleText3 +SilphCo4FScientistAfterBattleText: + text_far _SilphCo4FScientistAfterBattleText text_end -SilphCo4Text4: +SilphCo4FRocket2Text: text_asm ld hl, SilphCo4TrainerHeader2 call TalkToTrainer jp TextScriptEnd -SilphCo4BattleText4: - text_far _SilphCo4BattleText4 +SilphCo4FRocket2BattleText: + text_far _SilphCo4FRocket2BattleText text_end -SilphCo4EndBattleText4: - text_far _SilphCo4EndBattleText4 +SilphCo4FRocket2EndBattleText: + text_far _SilphCo4FRocket2EndBattleText text_end -SilphCo4AfterBattleText4: - text_far _SilphCo4AfterBattleText4 +SilphCo4FRocket2AfterBattleText: + text_far _SilphCo4FRocket2AfterBattleText text_end diff --git a/scripts/SilphCo5F.asm b/scripts/SilphCo5F.asm index 58b64ba2c..1834bfa84 100644 --- a/scripts/SilphCo5F.asm +++ b/scripts/SilphCo5F.asm @@ -1,5 +1,5 @@ SilphCo5F_Script: - call SilphCo5Script_19f4d + call SilphCo5FGateCallbackScript call EnableAutoTextBoxDrawing ld hl, SilphCo5TrainerHeaders ld de, SilphCo5F_ScriptPointers @@ -8,32 +8,32 @@ SilphCo5F_Script: ld [wSilphCo5FCurScript], a ret -SilphCo5Script_19f4d: +SilphCo5FGateCallbackScript: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z - ld hl, SilphCo5GateCoords - call SilphCo4Script_19d5d - call SilphCo5Script_19f9e + ld hl, .GateCoordinates + call SilphCo4F_SetCardKeyDoorYScript + call SilphCo5F_SetUnlockedSilphCoDoorsScript CheckEvent EVENT_SILPH_CO_5_UNLOCKED_DOOR1 - jr nz, .asm_19f74 + jr nz, .unlock_door1 push af ld a, $5f ld [wNewTileBlockID], a lb bc, 2, 3 predef ReplaceTileBlock pop af -.asm_19f74 +.unlock_door1 CheckEventAfterBranchReuseA EVENT_SILPH_CO_5_UNLOCKED_DOOR2, EVENT_SILPH_CO_5_UNLOCKED_DOOR1 - jr nz, .asm_19f87 + jr nz, .unlock_door2 push af ld a, $5f ld [wNewTileBlockID], a lb bc, 6, 3 predef ReplaceTileBlock pop af -.asm_19f87 +.unlock_door2 CheckEventAfterBranchReuseA EVENT_SILPH_CO_5_UNLOCKED_DOOR3, EVENT_SILPH_CO_5_UNLOCKED_DOOR2 ret nz ld a, $5f @@ -41,155 +41,157 @@ SilphCo5Script_19f4d: lb bc, 5, 7 predef_jump ReplaceTileBlock -SilphCo5GateCoords: +.GateCoordinates: dbmapcoord 3, 2 dbmapcoord 3, 6 dbmapcoord 7, 5 db -1 ; end -SilphCo5Script_19f9e: +SilphCo5F_SetUnlockedSilphCoDoorsScript: EventFlagAddress hl, EVENT_SILPH_CO_5_UNLOCKED_DOOR1 ldh a, [hUnlockedSilphCoDoors] and a ret z cp $1 - jr nz, .next1 + jr nz, .unlock_door1 SetEventReuseHL EVENT_SILPH_CO_5_UNLOCKED_DOOR1 ret -.next1 +.unlock_door1 cp $2 - jr nz, .next2 + jr nz, .unlock_door2 SetEventAfterBranchReuseHL EVENT_SILPH_CO_5_UNLOCKED_DOOR2, EVENT_SILPH_CO_5_UNLOCKED_DOOR1 ret -.next2 +.unlock_door2 SetEventAfterBranchReuseHL EVENT_SILPH_CO_5_UNLOCKED_DOOR3, EVENT_SILPH_CO_5_UNLOCKED_DOOR1 ret SilphCo5F_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_SILPHCO5F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_SILPHCO5F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_SILPHCO5F_END_BATTLE SilphCo5F_TextPointers: - dw SilphCo5Text1 - dw SilphCo5Text2 - dw SilphCo5Text3 - dw SilphCo5Text4 - dw SilphCo5Text5 - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw SilphCo5Text9 - dw SilphCo5Text10 - dw SilphCo5Text11 + def_text_pointers + dw_const SilphCo5FSilphWorkerMText, TEXT_SILPHCO5F_SILPH_WORKER_M + dw_const SilphCo5FRocket1Text, TEXT_SILPHCO5F_ROCKET1 + dw_const SilphCo5FScientistText, TEXT_SILPHCO5F_SCIENTIST + dw_const SilphCo5FRockerText, TEXT_SILPHCO5F_ROCKER + dw_const SilphCo5FRocket2Text, TEXT_SILPHCO5F_ROCKET2 + dw_const PickUpItemText, TEXT_SILPHCO5F_TM_TAKE_DOWN + dw_const PickUpItemText, TEXT_SILPHCO5F_PROTEIN + dw_const PickUpItemText, TEXT_SILPHCO5F_CARD_KEY + dw_const SilphCo5FPokemonReport1Text, TEXT_SILPHCO5F_POKEMON_REPORT1 + dw_const SilphCo5FPokemonReport2Text, TEXT_SILPHCO5F_POKEMON_REPORT2 + dw_const SilphCo5FPokemonReport3Text, TEXT_SILPHCO5F_POKEMON_REPORT3 SilphCo5TrainerHeaders: def_trainers 2 SilphCo5TrainerHeader0: - trainer EVENT_BEAT_SILPH_CO_5F_TRAINER_0, 1, SilphCo5BattleText2, SilphCo5EndBattleText2, SilphCo5AfterBattleText2 + trainer EVENT_BEAT_SILPH_CO_5F_TRAINER_0, 1, SilphCo5FRocket1BattleText, SilphCo5FRocket1EndBattleText, SilphCo5FRocket1AfterBattleText SilphCo5TrainerHeader1: - trainer EVENT_BEAT_SILPH_CO_5F_TRAINER_1, 2, SilphCo5BattleText3, SilphCo5EndBattleText3, SilphCo5AfterBattleText3 + trainer EVENT_BEAT_SILPH_CO_5F_TRAINER_1, 2, SilphCo5FScientistBattleText, SilphCo5FScientistEndBattleText, SilphCo5FScientistAfterBattleText SilphCo5TrainerHeader2: - trainer EVENT_BEAT_SILPH_CO_5F_TRAINER_2, 4, SilphCo5BattleText4, SilphCo5EndBattleText4, SilphCo5AfterBattleText4 + trainer EVENT_BEAT_SILPH_CO_5F_TRAINER_2, 4, SilphCo5FRockerBattleText, SilphCo5FRockerEndBattleText, SilphCo5FRockerAfterBattleText SilphCo5TrainerHeader3: - trainer EVENT_BEAT_SILPH_CO_5F_TRAINER_3, 3, SilphCo5BattleText5, SilphCo5EndBattleText5, SilphCo5AfterBattleText5 + trainer EVENT_BEAT_SILPH_CO_5F_TRAINER_3, 3, SilphCo5FRocket2BattleText, SilphCo5FRocket2EndBattleText, SilphCo5FRocket2AfterBattleText db -1 ; end -SilphCo5Text1: +SilphCo5FSilphWorkerMText: text_asm - ld hl, SilphCo5Text_1a010 - ld de, SilphCo5Text_1a015 - call SilphCo6Script_1a22f + ld hl, .ThatsYouRightText + ld de, .YoureOurHeroText + call SilphCo6FBeatGiovanniPrintDEOrPrintHLScript jp TextScriptEnd -SilphCo5Text_1a010: - text_far _SilphCo5Text_1a010 +.ThatsYouRightText: + text_far _SilphCo5FSilphWorkerMThatsYouRightText text_end -SilphCo5Text_1a015: - text_far _SilphCo5Text_1a015 +.YoureOurHeroText: + text_far _SilphCo5FSilphWorkerMYoureOurHeroText text_end -SilphCo5Text2: +SilphCo5FRocket1Text: text_asm ld hl, SilphCo5TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SilphCo5BattleText2: - text_far _SilphCo5BattleText2 +SilphCo5FRocket1BattleText: + text_far _SilphCo5FRocket1BattleText text_end -SilphCo5EndBattleText2: - text_far _SilphCo5EndBattleText2 +SilphCo5FRocket1EndBattleText: + text_far _SilphCo5FRocket1EndBattleText text_end -SilphCo5AfterBattleText2: - text_far _SilphCo5AfterBattleText2 +SilphCo5FRocket1AfterBattleText: + text_far _SilphCo5FRocket1AfterBattleText text_end -SilphCo5Text3: +SilphCo5FScientistText: text_asm ld hl, SilphCo5TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SilphCo5BattleText3: - text_far _SilphCo5BattleText3 +SilphCo5FScientistBattleText: + text_far _SilphCo5FScientistBattleText text_end -SilphCo5EndBattleText3: - text_far _SilphCo5EndBattleText3 +SilphCo5FScientistEndBattleText: + text_far _SilphCo5FScientistEndBattleText text_end -SilphCo5AfterBattleText3: - text_far _SilphCo5AfterBattleText3 +SilphCo5FScientistAfterBattleText: + text_far _SilphCo5FScientistAfterBattleText text_end -SilphCo5Text4: +SilphCo5FRockerText: text_asm ld hl, SilphCo5TrainerHeader2 call TalkToTrainer jp TextScriptEnd -SilphCo5BattleText4: - text_far _SilphCo5BattleText4 +SilphCo5FRockerBattleText: + text_far _SilphCo5FRockerBattleText text_end -SilphCo5EndBattleText4: - text_far _SilphCo5EndBattleText4 +SilphCo5FRockerEndBattleText: + text_far _SilphCo5FRockerEndBattleText text_end -SilphCo5AfterBattleText4: - text_far _SilphCo5AfterBattleText4 +SilphCo5FRockerAfterBattleText: + text_far _SilphCo5FRockerAfterBattleText text_end -SilphCo5Text5: +SilphCo5FRocket2Text: text_asm ld hl, SilphCo5TrainerHeader3 call TalkToTrainer jp TextScriptEnd -SilphCo5BattleText5: - text_far _SilphCo5BattleText5 +SilphCo5FRocket2BattleText: + text_far _SilphCo5FRocket2BattleText text_end -SilphCo5EndBattleText5: - text_far _SilphCo5EndBattleText5 +SilphCo5FRocket2EndBattleText: + text_far _SilphCo5FRocket2EndBattleText text_end -SilphCo5AfterBattleText5: - text_far _SilphCo5AfterBattleText5 +SilphCo5FRocket2AfterBattleText: + text_far _SilphCo5FRocket2AfterBattleText text_end -SilphCo5Text9: - text_far _SilphCo5Text9 +SilphCo5FPokemonReport1Text: + text_far _SilphCo5FPokemonReport1Text text_end -SilphCo5Text10: - text_far _SilphCo5Text10 +SilphCo5FPokemonReport2Text: + text_far _SilphCo5FPokemonReport2Text text_end -SilphCo5Text11: - text_far _SilphCo5Text11 +SilphCo5FPokemonReport3Text: + text_far _SilphCo5FPokemonReport3Text text_end diff --git a/scripts/SilphCo6F.asm b/scripts/SilphCo6F.asm index 74cad9783..0626ffdbd 100644 --- a/scripts/SilphCo6F.asm +++ b/scripts/SilphCo6F.asm @@ -1,5 +1,5 @@ SilphCo6F_Script: - call SilphCo6Script_1a1bf + call SilphCo6F_GateCallbackScript call EnableAutoTextBoxDrawing ld hl, SilphCo6TrainerHeaders ld de, SilphCo6F_ScriptPointers @@ -8,14 +8,14 @@ SilphCo6F_Script: ld [wSilphCo6FCurScript], a ret -SilphCo6Script_1a1bf: +SilphCo6F_GateCallbackScript: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z - ld hl, SilphCo6GateCoords - call SilphCo4Script_19d5d - call SilphCo6Script_1a1e6 + ld hl, .GateCoordinates + call SilphCo4F_SetCardKeyDoorYScript + call SilphCo6F_UnlockedDoorEventScript CheckEvent EVENT_SILPH_CO_6_UNLOCKED_DOOR ret nz ld a, $5f @@ -23,11 +23,11 @@ SilphCo6Script_1a1bf: lb bc, 6, 2 predef_jump ReplaceTileBlock -SilphCo6GateCoords: +.GateCoordinates: dbmapcoord 2, 6 db -1 ; end -SilphCo6Script_1a1e6: +SilphCo6F_UnlockedDoorEventScript: ldh a, [hUnlockedSilphCoDoors] and a ret z @@ -35,167 +35,169 @@ SilphCo6Script_1a1e6: ret SilphCo6F_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_SILPHCO6F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_SILPHCO6F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_SILPHCO6F_END_BATTLE SilphCo6F_TextPointers: - dw SilphCo6Text1 - dw SilphCo6Text2 - dw SilphCo6Text3 - dw SilphCo6Text4 - dw SilphCo6Text5 - dw SilphCo6Text6 - dw SilphCo6Text7 - dw SilphCo6Text8 - dw PickUpItemText - dw PickUpItemText + def_text_pointers + dw_const SilphCo6FSilphWorkerM1Text, TEXT_SILPHCO6F_SILPH_WORKER_M1 + dw_const SilphCo6FSilphWorkerM2Text, TEXT_SILPHCO6F_SILPH_WORKER_M2 + dw_const SilphCo6FSilphWorkerF1Text, TEXT_SILPHCO6F_SILPH_WORKER_F1 + dw_const SilphCo6FSilphWorkerF2Text, TEXT_SILPHCO6F_SILPH_WORKER_F2 + dw_const SilphCo6FSilphWorkerM3Text, TEXT_SILPHCO6F_SILPH_WORKER_M3 + dw_const SilphCo6FRocket1Text, TEXT_SILPHCO6F_ROCKET1 + dw_const SilphCo6FScientistText, TEXT_SILPHCO6F_SCIENTIST + dw_const SilphCo6FRocket2Text, TEXT_SILPHCO6F_ROCKET2 + dw_const PickUpItemText, TEXT_SILPHCO6F_HP_UP + dw_const PickUpItemText, TEXT_SILPHCO6F_X_ACCURACY SilphCo6TrainerHeaders: def_trainers 6 SilphCo6TrainerHeader0: - trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_0, 2, SilphCo6BattleText2, SilphCo6EndBattleText2, SilphCo6AfterBattleText2 + trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_0, 2, SilphCo6FRocket1BattleText, SilphCo6Rocket1EndBattleText, SilphCo6Rocket1AfterBattleText SilphCo6TrainerHeader1: - trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_1, 3, SilphCo6BattleText3, SilphCo6EndBattleText3, SilphCo6AfterBattleText3 + trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_1, 3, SilphCo6FScientistBattleText, SilphCo6FScientistEndBattleText, SilphCo6FScientistAfterBattleText SilphCo6TrainerHeader2: - trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_2, 2, SilphCo6BattleText4, SilphCo6EndBattleText4, SilphCo6AfterBattleText4 + trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_2, 2, SilphCo6FRocket2BattleText, SilphCo6FRocket2EndBattleText, SilphCo6FRocket2AfterBattleText db -1 ; end -SilphCo6Script_1a22f: +SilphCo6FBeatGiovanniPrintDEOrPrintHLScript: CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI - jr nz, .asm_1a238 - jr .asm_1a23a -.asm_1a238 + jr nz, .beat_giovanni + jr .print_text +.beat_giovanni ld h, d ld l, e -.asm_1a23a +.print_text jp PrintText -SilphCo6Text1: +SilphCo6FSilphWorkerM1Text: text_asm - ld hl, SilphCo6Text_1a24a - ld de, SilphCo6Text_1a24f - call SilphCo6Script_1a22f + ld hl, .TookOverTheBuildingText + ld de, .BackToWorkText + call SilphCo6FBeatGiovanniPrintDEOrPrintHLScript jp TextScriptEnd -SilphCo6Text_1a24a: - text_far _SilphCo6Text_1a24a +.TookOverTheBuildingText: + text_far _SilphCo6FSilphWorkerM1TookOverTheBuildingText text_end -SilphCo6Text_1a24f: - text_far _SilphCo6Text_1a24f +.BackToWorkText: + text_far _SilphCo6FSilphWorkerM1BackToWorkText text_end -SilphCo6Text2: +SilphCo6FSilphWorkerM2Text: text_asm - ld hl, SilphCo6Text_1a261 - ld de, SilphCo6Text_1a266 - call SilphCo6Script_1a22f + ld hl, .HelpMePleaseText + ld de, .WeGotEngagedText + call SilphCo6FBeatGiovanniPrintDEOrPrintHLScript jp TextScriptEnd -SilphCo6Text_1a261: - text_far _SilphCo6Text_1a261 +.HelpMePleaseText: + text_far _SilphCo6FSilphWorkerMHelpMePleaseText text_end -SilphCo6Text_1a266: - text_far _SilphCo6Text_1a266 +.WeGotEngagedText: + text_far _SilphCo6FSilphWorkerMWeGotEngagedText text_end -SilphCo6Text3: +SilphCo6FSilphWorkerF1Text: text_asm - ld hl, SilphCo6Text_1a278 - ld de, SilphCo6Text_1a27d - call SilphCo6Script_1a22f + ld hl, .SuchACowardText + ld de, .HaveToMarryHimText + call SilphCo6FBeatGiovanniPrintDEOrPrintHLScript jp TextScriptEnd -SilphCo6Text_1a278: - text_far _SilphCo6Text_1a278 +.SuchACowardText: + text_far _SilphCo6FSilphWorkerF1SuchACowardText text_end -SilphCo6Text_1a27d: - text_far _SilphCo6Text_1a27d +.HaveToMarryHimText: + text_far _SilphCo6FSilphWorkerF1HaveToMarryHimText text_end -SilphCo6Text4: +SilphCo6FSilphWorkerF2Text: text_asm - ld hl, SilphCo6Text_1a28f - ld de, SilphCo6Text_1a294 - call SilphCo6Script_1a22f + ld hl, .TeamRocketConquerWorldText + ld de, .TeamRocketRanText + call SilphCo6FBeatGiovanniPrintDEOrPrintHLScript jp TextScriptEnd -SilphCo6Text_1a28f: - text_far _SilphCo6Text_1a28f +.TeamRocketConquerWorldText: + text_far _SilphCo6FSilphWorkerF2TeamRocketConquerWorldText text_end -SilphCo6Text_1a294: - text_far _SilphCo6Text_1a294 +.TeamRocketRanText: + text_far _SilphCo6FSilphWorkerF2TeamRocketRanText text_end -SilphCo6Text5: +SilphCo6FSilphWorkerM3Text: text_asm - ld hl, SilphCo6Text_1a2a6 - ld de, SilphCo6Text_1a2ab - call SilphCo6Script_1a22f + ld hl, .TargetedSilphText + ld de, .WorkForSilphText + call SilphCo6FBeatGiovanniPrintDEOrPrintHLScript jp TextScriptEnd -SilphCo6Text_1a2a6: - text_far _SilphCo6Text_1a2a6 +.TargetedSilphText: + text_far _SilphCo6FSilphWorkerM3TargetedSilphText text_end -SilphCo6Text_1a2ab: - text_far _SilphCo6Text_1a2ab +.WorkForSilphText: + text_far _SilphCo6FSilphWorkerM3WorkForSilphText text_end -SilphCo6Text6: +SilphCo6FRocket1Text: text_asm ld hl, SilphCo6TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SilphCo6BattleText2: - text_far _SilphCo6BattleText2 +SilphCo6FRocket1BattleText: + text_far _SilphCo6FRocket1BattleText text_end -SilphCo6EndBattleText2: - text_far _SilphCo6EndBattleText2 +SilphCo6Rocket1EndBattleText: + text_far _SilphCo6Rocket1EndBattleText text_end -SilphCo6AfterBattleText2: - text_far _SilphCo6AfterBattleText2 +SilphCo6Rocket1AfterBattleText: + text_far _SilphCo6Rocket1AfterBattleText text_end -SilphCo6Text7: +SilphCo6FScientistText: text_asm ld hl, SilphCo6TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SilphCo6BattleText3: - text_far _SilphCo6BattleText3 +SilphCo6FScientistBattleText: + text_far _SilphCo6FScientistBattleText text_end -SilphCo6EndBattleText3: - text_far _SilphCo6EndBattleText3 +SilphCo6FScientistEndBattleText: + text_far _SilphCo6FScientistEndBattleText text_end -SilphCo6AfterBattleText3: - text_far _SilphCo6AfterBattleText3 +SilphCo6FScientistAfterBattleText: + text_far _SilphCo6FScientistAfterBattleText text_end -SilphCo6Text8: +SilphCo6FRocket2Text: text_asm ld hl, SilphCo6TrainerHeader2 call TalkToTrainer jp TextScriptEnd -SilphCo6BattleText4: - text_far _SilphCo6BattleText4 +SilphCo6FRocket2BattleText: + text_far _SilphCo6FRocket2BattleText text_end -SilphCo6EndBattleText4: - text_far _SilphCo6EndBattleText4 +SilphCo6FRocket2EndBattleText: + text_far _SilphCo6FRocket2EndBattleText text_end -SilphCo6AfterBattleText4: - text_far _SilphCo6AfterBattleText4 +SilphCo6FRocket2AfterBattleText: + text_far _SilphCo6FRocket2AfterBattleText text_end diff --git a/scripts/SilphCo7F.asm b/scripts/SilphCo7F.asm index ac4aaa890..c6afd27a4 100644 --- a/scripts/SilphCo7F.asm +++ b/scripts/SilphCo7F.asm @@ -1,5 +1,5 @@ SilphCo7F_Script: - call SilphCo7Script_51b77 + call SilphCo7F_GateCallbackScript call EnableAutoTextBoxDrawing ld hl, SilphCo7TrainerHeaders ld de, SilphCo7F_ScriptPointers @@ -8,32 +8,32 @@ SilphCo7F_Script: ld [wSilphCo7FCurScript], a ret -SilphCo7Script_51b77: +SilphCo7F_GateCallbackScript: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z - ld hl, SilphCo7GateCoords - call SilphCo7Text_51bc8 - call SilphCo7Text_51bf4 + ld hl, .GateCoordinates + call SilphCo7F_SetCardKeyDoorYScript + call SilphCo7F_UnlockedDoorEventScript CheckEvent EVENT_SILPH_CO_7_UNLOCKED_DOOR1 - jr nz, .asm_51b9e + jr nz, .unlock_door1 push af ld a, $54 ld [wNewTileBlockID], a lb bc, 3, 5 predef ReplaceTileBlock pop af -.asm_51b9e +.unlock_door1 CheckEventAfterBranchReuseA EVENT_SILPH_CO_7_UNLOCKED_DOOR2, EVENT_SILPH_CO_7_UNLOCKED_DOOR1 - jr nz, .asm_51bb1 + jr nz, .unlock_door2 push af ld a, $54 ld [wNewTileBlockID], a lb bc, 2, 10 predef ReplaceTileBlock pop af -.asm_51bb1 +.unlock_door2 CheckEventAfterBranchReuseA EVENT_SILPH_CO_7_UNLOCKED_DOOR3, EVENT_SILPH_CO_7_UNLOCKED_DOOR2 ret nz ld a, $54 @@ -41,13 +41,13 @@ SilphCo7Script_51b77: lb bc, 6, 10 predef_jump ReplaceTileBlock -SilphCo7GateCoords: +.GateCoordinates: dbmapcoord 5, 3 dbmapcoord 10, 2 dbmapcoord 10, 6 db -1 ; end -SilphCo7Text_51bc8: +SilphCo7F_SetCardKeyDoorYScript: push hl ld hl, wCardKeyDoorY ld a, [hli] @@ -57,76 +57,77 @@ SilphCo7Text_51bc8: xor a ldh [hUnlockedSilphCoDoors], a pop hl -.asm_51bd4 +.loop_check_doors ld a, [hli] cp $ff - jr z, .asm_51bf0 + jr z, .exit_loop push hl ld hl, hUnlockedSilphCoDoors inc [hl] pop hl cp b - jr z, .asm_51be5 + jr z, .check_y_coord inc hl - jr .asm_51bd4 -.asm_51be5 + jr .loop_check_doors +.check_y_coord ld a, [hli] cp c - jr nz, .asm_51bd4 + jr nz, .loop_check_doors ld hl, wCardKeyDoorY xor a ld [hli], a ld [hl], a ret -.asm_51bf0 +.exit_loop xor a ldh [hUnlockedSilphCoDoors], a ret -SilphCo7Text_51bf4: +SilphCo7F_UnlockedDoorEventScript: EventFlagAddress hl, EVENT_SILPH_CO_7_UNLOCKED_DOOR1 ldh a, [hUnlockedSilphCoDoors] and a ret z cp $1 - jr nz, .next1 + jr nz, .unlock_door1 SetEventReuseHL EVENT_SILPH_CO_7_UNLOCKED_DOOR1 ret -.next1 +.unlock_door1 cp $2 - jr nz, .next2 + jr nz, .unlock_door2 SetEventAfterBranchReuseHL EVENT_SILPH_CO_7_UNLOCKED_DOOR2, EVENT_SILPH_CO_7_UNLOCKED_DOOR1 ret -.next2 +.unlock_door2 SetEventAfterBranchReuseHL EVENT_SILPH_CO_7_UNLOCKED_DOOR3, EVENT_SILPH_CO_7_UNLOCKED_DOOR1 ret -SilphCo7Text_51c0c: +SilphCo7FSetDefaultScript: xor a ld [wJoyIgnore], a -SilphCo7Text_51c10: +SilphCo7FSetCurScript: ld [wSilphCo7FCurScript], a ld [wCurMapScript], a ret SilphCo7F_ScriptPointers: - dw SilphCo7Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw SilphCo7Script3 - dw SilphCo7Script4 - dw SilphCo7Script5 - -SilphCo7Script0: + def_script_pointers + dw_const SilphCo7FDefaultScript, SCRIPT_SILPHCO7F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_SILPHCO7F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_SILPHCO7F_END_BATTLE + dw_const SilphCo7FRivalStartBattleScript, SCRIPT_SILPHCO7F_RIVAL_START_BATTLE + dw_const SilphCo7FRivalAfterBattleScript, SCRIPT_SILPHCO7F_RIVAL_AFTER_BATTLE + dw_const SilphCo7FRivalExitScript, SCRIPT_SILPHCO7F_RIVAL_EXIT + +SilphCo7FDefaultScript: CheckEvent EVENT_BEAT_SILPH_CO_RIVAL jp nz, CheckFightingMapTrainers - ld hl, CoordsData_51c78 + ld hl, .RivalEncounterCoordinates call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers xor a ldh [hJoyHeld], a - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ld a, PLAYER_DIR_DOWN ld [wPlayerMovingDirection], a @@ -136,111 +137,111 @@ SilphCo7Script0: ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic - ld a, $9 + ld a, TEXT_SILPHCO7F_RIVAL ldh [hSpriteIndexOrTextID], a call DisplayTextID - ld a, $9 + ld a, SILPHCO7F_RIVAL ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF - ld de, MovementData_51c7d + ld de, .RivalMovementUp ld a, [wCoordIndex] ld [wcf0d], a cp $1 - jr z, .asm_51c6c + jr z, .full_rival_movement inc de -.asm_51c6c - ld a, $9 +.full_rival_movement + ld a, SILPHCO7F_RIVAL ldh [hSpriteIndex], a call MoveSprite - ld a, $3 - jp SilphCo7Text_51c10 + ld a, SCRIPT_SILPHCO7F_RIVAL_START_BATTLE + jp SilphCo7FSetCurScript -CoordsData_51c78: +.RivalEncounterCoordinates: dbmapcoord 3, 2 dbmapcoord 3, 3 db -1 ; end -MovementData_51c7d: +.RivalMovementUp: db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP db -1 ; end -SilphCo7Script3: +SilphCo7FRivalStartBattleScript: ld a, [wd730] bit 0, a ret nz xor a ld [wJoyIgnore], a - ld a, $d + ld a, TEXT_SILPHCO7F_RIVAL_WAITED_HERE ldh [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, SilphCo7Text14 - ld de, SilphCo7Text_51ecd + ld hl, SilphCo7FRivalDefeatedText + ld de, SilphCo7FRivalVictoryText call SaveEndBattleTextPointers ld a, OPP_RIVAL2 ld [wCurOpponent], a ld a, [wRivalStarter] cp STARTER2 - jr nz, .asm_51cb6 + jr nz, .not_starter_2 ld a, $7 - jr .asm_51cc0 -.asm_51cb6 + jr .set_trainer_no +.not_starter_2 cp STARTER3 - jr nz, .asm_51cbe + jr nz, .no_starter_3 ld a, $8 - jr .asm_51cc0 -.asm_51cbe + jr .set_trainer_no +.no_starter_3 ld a, $9 -.asm_51cc0 +.set_trainer_no ld [wTrainerNo], a - ld a, $4 - jp SilphCo7Text_51c10 + ld a, SCRIPT_SILPHCO7F_RIVAL_AFTER_BATTLE + jp SilphCo7FSetCurScript -SilphCo7Script4: +SilphCo7FRivalAfterBattleScript: ld a, [wIsInBattle] cp $ff - jp z, SilphCo7Text_51c0c - ld a, $f0 + jp z, SilphCo7FSetDefaultScript + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a SetEvent EVENT_BEAT_SILPH_CO_RIVAL ld a, PLAYER_DIR_DOWN ld [wPlayerMovingDirection], a - ld a, $9 + ld a, SILPHCO7F_RIVAL ldh [hSpriteIndex], a ld a, SPRITE_FACING_UP ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay - ld a, $f + ld a, TEXT_SILPHCO7F_RIVAL_GOOD_LUCK_TO_YOU ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound farcall Music_RivalAlternateStart - ld de, MovementData_51d1d + ld de, .RivalWalkAroundPlayerMovement ld a, [wcf0d] cp $1 - jr nz, .asm_51d0e - ld de, MovementData_51d1a -.asm_51d0e - ld a, $9 + jr nz, .walk_around_player + ld de, .RivalExitRightMovement +.walk_around_player + ld a, SILPHCO7F_RIVAL ldh [hSpriteIndex], a call MoveSprite - ld a, $5 - jp SilphCo7Text_51c10 + ld a, SCRIPT_SILPHCO7F_RIVAL_EXIT + jp SilphCo7FSetCurScript -MovementData_51d1a: +.RivalExitRightMovement: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT db -1 ; end -MovementData_51d1d: +.RivalWalkAroundPlayerMovement: db NPC_MOVEMENT_LEFT db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP @@ -250,7 +251,7 @@ MovementData_51d1d: db NPC_MOVEMENT_DOWN db -1 ; end -SilphCo7Script5: +SilphCo7FRivalExitScript: ld a, [wd730] bit 0, a ret nz @@ -260,50 +261,51 @@ SilphCo7Script5: call PlayDefaultMusic xor a ld [wJoyIgnore], a - jp SilphCo7Text_51c10 + jp SilphCo7FSetCurScript SilphCo7F_TextPointers: - dw SilphCo7Text1 - dw SilphCo7Text2 - dw SilphCo7Text3 - dw SilphCo7Text4 - dw SilphCo7Text5 - dw SilphCo7Text6 - dw SilphCo7Text7 - dw SilphCo7Text8 - dw SilphCo7Text9 - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw SilphCo7Text13 - dw SilphCo7Text14 - dw SilphCo7Text15 + def_text_pointers + dw_const SilphCo7FSilphWorkerM1Text, TEXT_SILPHCO7F_SILPH_WORKER_M1 + dw_const SilphCo7FSilphWorkerM2Text, TEXT_SILPHCO7F_SILPH_WORKER_M2 + dw_const SilphCo7FSilphWorkerM3Text, TEXT_SILPHCO7F_SILPH_WORKER_M3 + dw_const SilphCo7FSilphWorkerM4Text, TEXT_SILPHCO7F_SILPH_WORKER_M4 + dw_const SilphCo7FRocket1Text, TEXT_SILPHCO7F_ROCKET1 + dw_const SilphCo7FScientistText, TEXT_SILPHCO7F_SCIENTIST + dw_const SilphCo7FRocket2Text, TEXT_SILPHCO7F_ROCKET2 + dw_const SilphCo7FRocket3Text, TEXT_SILPHCO7F_ROCKET3 + dw_const SilphCo7FRivalText, TEXT_SILPHCO7F_RIVAL + dw_const PickUpItemText, TEXT_SILPHCO7F_CALCIUM + dw_const PickUpItemText, TEXT_SILPHCO7F_TM_SWORDS_DANCE + dw_const PickUpItemText, TEXT_SILPHCO7F_UNREFERENCED_ITEM ; unreferenced + dw_const SilphCo7FRivalWaitedHereText, TEXT_SILPHCO7F_RIVAL_WAITED_HERE + dw_const SilphCo7FRivalDefeatedText, TEXT_SILPHCO7F_RIVAL_DEFEATED + dw_const SilphCo7FRivalGoodLuckToYouText, TEXT_SILPHCO7F_RIVAL_GOOD_LUCK_TO_YOU SilphCo7TrainerHeaders: def_trainers 5 SilphCo7TrainerHeader0: - trainer EVENT_BEAT_SILPH_CO_7F_TRAINER_0, 2, SilphCo7BattleText1, SilphCo7EndBattleText1, SilphCo7AfterBattleText1 + trainer EVENT_BEAT_SILPH_CO_7F_TRAINER_0, 2, SilphCo7FRocket1BattleText, SilphCo7FRocket1EndBattleText, SilphCo7FRocket1AfterBattleText SilphCo7TrainerHeader1: - trainer EVENT_BEAT_SILPH_CO_7F_TRAINER_1, 3, SilphCo7BattleText2, SilphCo7EndBattleText2, SilphCo7AfterBattleText2 + trainer EVENT_BEAT_SILPH_CO_7F_TRAINER_1, 3, SilphCo7FScientistBattleText, SilphCo7FScientistEndBattleText, SilphCo7FScientistAfterBattleText SilphCo7TrainerHeader2: - trainer EVENT_BEAT_SILPH_CO_7F_TRAINER_2, 3, SilphCo7BattleText3, SilphCo7EndBattleText3, SilphCo7AfterBattleText3 + trainer EVENT_BEAT_SILPH_CO_7F_TRAINER_2, 3, SilphCo7FRocket2BattleText, SilphCo7FRocket2EndBattleText, SilphCo7FRocket2AfterBattleText SilphCo7TrainerHeader3: - trainer EVENT_BEAT_SILPH_CO_7F_TRAINER_3, 4, SilphCo7BattleText4, SilphCo7EndBattleText4, SilphCo7AfterBattleText4 + trainer EVENT_BEAT_SILPH_CO_7F_TRAINER_3, 4, SilphCo7FRocket3BattleText, SilphCo7FRocket3EndBattleText, SilphCo7FRocket3AfterBattleText db -1 ; end -SilphCo7Text1: +SilphCo7FSilphWorkerM1Text: ; lapras guy text_asm ld a, [wd72e] bit 0, a ; got lapras? - jr z, .givelapras + jr z, .give_lapras CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI - jr nz, .savedsilph - ld hl, .LaprasGuyText + jr nz, .saved_silph + ld hl, .IsOurPresidentOkText call PrintText jr .done -.givelapras - ld hl, .MeetLaprasGuyText +.give_lapras + ld hl, .HaveThisPokemonText call PrintText lb bc, LAPRAS, 15 call GivePokemon @@ -312,190 +314,190 @@ SilphCo7Text1: and a call z, WaitForTextScrollButtonPress call EnableAutoTextBoxDrawing - ld hl, .HeresYourLaprasText + ld hl, .LaprasDescriptionText call PrintText ld hl, wd72e set 0, [hl] jr .done -.savedsilph - ld hl, .LaprasGuySavedText +.saved_silph + ld hl, .SavedText call PrintText .done jp TextScriptEnd -.MeetLaprasGuyText - text_far _MeetLaprasGuyText +.HaveThisPokemonText + text_far _SilphCo7FSilphWorkerM1HaveThisPokemonText text_end -.HeresYourLaprasText - text_far _HeresYourLaprasText +.LaprasDescriptionText + text_far _SilphCo7FSilphWorkerM1LaprasDescriptionText text_end -.LaprasGuyText - text_far _LaprasGuyText +.IsOurPresidentOkText + text_far _SilphCo7FSilphWorkerM1IsOurPresidentOkText text_end -.LaprasGuySavedText - text_far _LaprasGuySavedText +.SavedText + text_far _SilphCo7FSilphWorkerM1SavedText text_end -SilphCo7Text2: +SilphCo7FSilphWorkerM2Text: text_asm CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI - jr nz, .savedsilph - ld hl, .rockettext + jr nz, .saved_silph + ld hl, .AfterTheMasterBallText call PrintText jr .done -.savedsilph - ld hl, .savedtext +.saved_silph + ld hl, .CancelledTheMasterBallText call PrintText .done jp TextScriptEnd -.rockettext - text_far _SilphCo7Text_51e00 +.AfterTheMasterBallText + text_far _SilphCo7FSilphWorkerM2AfterTheMasterBallText text_end -.savedtext - text_far _CanceledMasterBallText +.CancelledTheMasterBallText + text_far _SilphCo7FSilphWorkerM2CancelledMasterBallText text_end -SilphCo7Text3: +SilphCo7FSilphWorkerM3Text: text_asm CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI - jr nz, .savedsilph - ld hl, .rockettext + jr nz, .saved_silph + ld hl, .ItWouldBeBadText call PrintText jr .done -.savedsilph - ld hl, .savedtext +.saved_silph + ld hl, .YouChasedOffTeamRocketText call PrintText .done jp TextScriptEnd -.rockettext - text_far _SilphCo7Text_51e23 +.ItWouldBeBadText + text_far _SilphCo7FSilphWorkerM3ItWouldBeBadText text_end -.savedtext - text_far _SilphCo7Text_51e28 +.YouChasedOffTeamRocketText + text_far _SilphCo7FSilphWorkerM3YouChasedOffTeamRocketText text_end -SilphCo7Text4: +SilphCo7FSilphWorkerM4Text: text_asm CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI - jr nz, .savedsilph - ld hl, .rockettext + jr nz, .saved_silph + ld hl, .ItsReallyDangerousHereText call PrintText jr .done -.savedsilph - ld hl, .savedtext +.saved_silph + ld hl, .SafeAtLastText call PrintText .done jp TextScriptEnd -.rockettext - text_far _SilphCo7Text_51e46 +.ItsReallyDangerousHereText + text_far _SilphCo7FSilphWorkerM4ItsReallyDangerousHereText text_end -.savedtext - text_far _SilphCo7Text_51e4b +.SafeAtLastText + text_far _SilphCo7FSilphWorkerM4SafeAtLastText text_end -SilphCo7Text5: +SilphCo7FRocket1Text: text_asm ld hl, SilphCo7TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SilphCo7BattleText1: - text_far _SilphCo7BattleText1 +SilphCo7FRocket1BattleText: + text_far _SilphCo7FRocket1BattleText text_end -SilphCo7EndBattleText1: - text_far _SilphCo7EndBattleText1 +SilphCo7FRocket1EndBattleText: + text_far _SilphCo7FRocket1EndBattleText text_end -SilphCo7AfterBattleText1: - text_far _SilphCo7AfterBattleText1 +SilphCo7FRocket1AfterBattleText: + text_far _SilphCo7FRocket1AfterBattleText text_end -SilphCo7Text6: +SilphCo7FScientistText: text_asm ld hl, SilphCo7TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SilphCo7BattleText2: - text_far _SilphCo7BattleText2 +SilphCo7FScientistBattleText: + text_far _SilphCo7FScientistBattleText text_end -SilphCo7EndBattleText2: - text_far _SilphCo7EndBattleText2 +SilphCo7FScientistEndBattleText: + text_far _SilphCo7FScientistEndBattleText text_end -SilphCo7AfterBattleText2: - text_far _SilphCo7AfterBattleText2 +SilphCo7FScientistAfterBattleText: + text_far _SilphCo7FScientistAfterBattleText text_end -SilphCo7Text7: +SilphCo7FRocket2Text: text_asm ld hl, SilphCo7TrainerHeader2 call TalkToTrainer jp TextScriptEnd -SilphCo7BattleText3: - text_far _SilphCo7BattleText3 +SilphCo7FRocket2BattleText: + text_far _SilphCo7FRocket2BattleText text_end -SilphCo7EndBattleText3: - text_far _SilphCo7EndBattleText3 +SilphCo7FRocket2EndBattleText: + text_far _SilphCo7FRocket2EndBattleText text_end -SilphCo7AfterBattleText3: - text_far _SilphCo7AfterBattleText3 +SilphCo7FRocket2AfterBattleText: + text_far _SilphCo7FRocket2AfterBattleText text_end -SilphCo7Text8: +SilphCo7FRocket3Text: text_asm ld hl, SilphCo7TrainerHeader3 call TalkToTrainer jp TextScriptEnd -SilphCo7BattleText4: - text_far _SilphCo7BattleText4 +SilphCo7FRocket3BattleText: + text_far _SilphCo7FRocket3BattleText text_end -SilphCo7EndBattleText4: - text_far _SilphCo7EndBattleText4 +SilphCo7FRocket3EndBattleText: + text_far _SilphCo7FRocket3EndBattleText text_end -SilphCo7AfterBattleText4: - text_far _SilphCo7AfterBattleText4 +SilphCo7FRocket3AfterBattleText: + text_far _SilphCo7FRocket3AfterBattleText text_end -SilphCo7Text9: +SilphCo7FRivalText: text_asm - ld hl, SilphCo7Text_51ebe + ld hl, .Text call PrintText jp TextScriptEnd -SilphCo7Text_51ebe: - text_far _SilphCo7Text_51ebe +.Text: + text_far _SilphCo7FRivalText text_end -SilphCo7Text13: - text_far _SilphCo7Text_51ec3 +SilphCo7FRivalWaitedHereText: + text_far _SilphCo7FRivalWaitedHereText text_end -SilphCo7Text14: - text_far _SilphCo7Text_51ec8 +SilphCo7FRivalDefeatedText: + text_far _SilphCo7FRivalDefeatedText text_end -SilphCo7Text_51ecd: - text_far _SilphCo7Text_51ecd +SilphCo7FRivalVictoryText: + text_far _SilphCo7FRivalVictoryText text_end -SilphCo7Text15: - text_far _SilphCo7Text_51ed2 +SilphCo7FRivalGoodLuckToYouText: + text_far _SilphCo7FRivalGoodLuckToYouText text_end diff --git a/scripts/SilphCo8F.asm b/scripts/SilphCo8F.asm index d86f433a0..cdd7f486f 100644 --- a/scripts/SilphCo8F.asm +++ b/scripts/SilphCo8F.asm @@ -1,5 +1,5 @@ SilphCo8F_Script: - call SilphCo8Script_5651a + call SilphCo8FGateCallbackScript call EnableAutoTextBoxDrawing ld hl, SilphCo8TrainerHeaders ld de, SilphCo8F_ScriptPointers @@ -8,14 +8,14 @@ SilphCo8F_Script: ld [wSilphCo8FCurScript], a ret -SilphCo8Script_5651a: +SilphCo8FGateCallbackScript: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z - ld hl, SilphCo8GateCoords - call SilphCo8Script_56541 - call SilphCo8Script_5656d + ld hl, .GateCoordinates + call SilphCo8F_SetCardKeyDoorYScript + call SilphCo8F_UnlockedDoorEventScript CheckEvent EVENT_SILPH_CO_8_UNLOCKED_DOOR ret nz ld a, $5f @@ -23,11 +23,11 @@ SilphCo8Script_5651a: lb bc, 4, 3 predef_jump ReplaceTileBlock -SilphCo8GateCoords: +.GateCoordinates: dbmapcoord 3, 4 db -1 ; end -SilphCo8Script_56541: +SilphCo8F_SetCardKeyDoorYScript: push hl ld hl, wCardKeyDoorY ld a, [hli] @@ -37,33 +37,33 @@ SilphCo8Script_56541: xor a ldh [hUnlockedSilphCoDoors], a pop hl -.asm_5654d +.loop_check_doors ld a, [hli] cp $ff - jr z, .asm_56569 + jr z, .exit_loop push hl ld hl, hUnlockedSilphCoDoors inc [hl] pop hl cp b - jr z, .asm_5655e + jr z, .check_y_coord inc hl - jr .asm_5654d -.asm_5655e + jr .loop_check_doors +.check_y_coord ld a, [hli] cp c - jr nz, .asm_5654d + jr nz, .loop_check_doors ld hl, wCardKeyDoorY xor a ld [hli], a ld [hl], a ret -.asm_56569 +.exit_loop xor a ldh [hUnlockedSilphCoDoors], a ret -SilphCo8Script_5656d: +SilphCo8F_UnlockedDoorEventScript: ldh a, [hUnlockedSilphCoDoors] and a ret z @@ -71,94 +71,96 @@ SilphCo8Script_5656d: ret SilphCo8F_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_SILPHCO8F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_SILPHCO8F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_SILPHCO8F_END_BATTLE SilphCo8F_TextPointers: - dw SilphCo8Text1 - dw SilphCo8Text2 - dw SilphCo8Text3 - dw SilphCo8Text4 + def_text_pointers + dw_const SilphCo8FSilphWorkerMText, TEXT_SILPHCO8F_SILPH_WORKER_M + dw_const SilphCo8FRocket1Text, TEXT_SILPHCO8F_ROCKET1 + dw_const SilphCo8FScientistText, TEXT_SILPHCO8F_SCIENTIST + dw_const SilphCo8FRocket2Text, TEXT_SILPHCO8F_ROCKET2 SilphCo8TrainerHeaders: def_trainers 2 SilphCo8TrainerHeader0: - trainer EVENT_BEAT_SILPH_CO_8F_TRAINER_0, 4, SilphCo8BattleText1, SilphCo8EndBattleText1, SilphCo8AfterBattleText1 + trainer EVENT_BEAT_SILPH_CO_8F_TRAINER_0, 4, SilphCo8FRocket1BattleText, SilphCo8FRocket1EndBattleText, SilphCo8FRocket1AfterBattleText SilphCo8TrainerHeader1: - trainer EVENT_BEAT_SILPH_CO_8F_TRAINER_1, 4, SilphCo8BattleText2, SilphCo8EndBattleText2, SilphCo8AfterBattleText2 + trainer EVENT_BEAT_SILPH_CO_8F_TRAINER_1, 4, SilphCo8FScientistBattleText, SilphCo8FScientistEndBattleText, SilphCo8FScientistAfterBattleText SilphCo8TrainerHeader2: - trainer EVENT_BEAT_SILPH_CO_8F_TRAINER_2, 4, SilphCo8BattleText3, SilphCo8EndBattleText3, SilphCo8AfterBattleText3 + trainer EVENT_BEAT_SILPH_CO_8F_TRAINER_2, 4, SilphCo8FRocket2BattleText, SilphCo8FRocket2EndBattleText, SilphCo8FRocket2AfterBattleText db -1 ; end -SilphCo8Text1: +SilphCo8FSilphWorkerMText: text_asm CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI - ld hl, SilphCo8Text_565c3 - jr nz, .asm_565b8 - ld hl, SilphCo8Text_565be -.asm_565b8 + ld hl, .ThanksForSavingUsText + jr nz, .beat_giovanni + ld hl, .SilphIsFinishedText +.beat_giovanni call PrintText jp TextScriptEnd -SilphCo8Text_565be: - text_far _SilphCo8Text_565be +.SilphIsFinishedText: + text_far __SilphCo8FSilphWorkerMThanksForSavingUsText text_end -SilphCo8Text_565c3: - text_far _SilphCo8Text_565c3 +.ThanksForSavingUsText: + text_far _SilphCo8FSilphWorkerMThanksForSavingUsText text_end -SilphCo8Text2: +SilphCo8FRocket1Text: text_asm ld hl, SilphCo8TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SilphCo8Text3: +SilphCo8FScientistText: text_asm ld hl, SilphCo8TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SilphCo8Text4: +SilphCo8FRocket2Text: text_asm ld hl, SilphCo8TrainerHeader2 call TalkToTrainer jp TextScriptEnd -SilphCo8BattleText1: - text_far _SilphCo8BattleText1 +SilphCo8FRocket1BattleText: + text_far _SilphCo8FRocket1BattleText text_end -SilphCo8EndBattleText1: - text_far _SilphCo8EndBattleText1 +SilphCo8FRocket1EndBattleText: + text_far _SilphCo8FRocket1EndBattleText text_end -SilphCo8AfterBattleText1: - text_far _SilphCo8AfterBattleText1 +SilphCo8FRocket1AfterBattleText: + text_far _SilphCo8FRocket1AfterBattleText text_end -SilphCo8BattleText2: - text_far _SilphCo8BattleText2 +SilphCo8FScientistBattleText: + text_far _SilphCo8FScientistBattleText text_end -SilphCo8EndBattleText2: - text_far _SilphCo8EndBattleText2 +SilphCo8FScientistEndBattleText: + text_far _SilphCo8FScientistEndBattleText text_end -SilphCo8AfterBattleText2: - text_far _SilphCo8AfterBattleText2 +SilphCo8FScientistAfterBattleText: + text_far _SilphCo8FScientistAfterBattleText text_end -SilphCo8BattleText3: - text_far _SilphCo8BattleText3 +SilphCo8FRocket2BattleText: + text_far _SilphCo8FRocket2BattleText text_end -SilphCo8EndBattleText3: - text_far _SilphCo8EndBattleText3 +SilphCo8FRocket2EndBattleText: + text_far _SilphCo8FRocket2EndBattleText text_end -SilphCo8AfterBattleText3: - text_far _SilphCo8AfterBattleText3 +SilphCo8FRocket2AfterBattleText: + text_far _SilphCo8FRocket2AfterBattleText text_end diff --git a/scripts/SilphCo9F.asm b/scripts/SilphCo9F.asm index 3f76fb527..fe7f3da28 100644 --- a/scripts/SilphCo9F.asm +++ b/scripts/SilphCo9F.asm @@ -1,5 +1,5 @@ SilphCo9F_Script: - call SilphCo9Script_5d7d1 + call SilphCo9FGateCallbackScript call EnableAutoTextBoxDrawing ld hl, SilphCo9TrainerHeaders ld de, SilphCo9F_ScriptPointers @@ -8,41 +8,41 @@ SilphCo9F_Script: ld [wSilphCo9FCurScript], a ret -SilphCo9Script_5d7d1: +SilphCo9FGateCallbackScript: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z - ld hl, SilphCo9GateCoords - call SilphCo9Script_5d837 - call SilphCo9Script_5d863 + ld hl, .GateCoordinates + call SilphCo9F_SetCardKeyDoorYScript + call SilphCo9F_SetUnlockedSilphCoDoorsScript CheckEvent EVENT_SILPH_CO_9_UNLOCKED_DOOR1 - jr nz, .asm_5d7f8 + jr nz, .unlock_door1 push af ld a, $5f ld [wNewTileBlockID], a lb bc, 4, 1 predef ReplaceTileBlock pop af -.asm_5d7f8 +.unlock_door1 CheckEventAfterBranchReuseA EVENT_SILPH_CO_9_UNLOCKED_DOOR2, EVENT_SILPH_CO_9_UNLOCKED_DOOR1 - jr nz, .asm_5d80b + jr nz, .unlock_door2 push af ld a, $54 ld [wNewTileBlockID], a lb bc, 2, 9 predef ReplaceTileBlock pop af -.asm_5d80b +.unlock_door2 CheckEventAfterBranchReuseA EVENT_SILPH_CO_9_UNLOCKED_DOOR3, EVENT_SILPH_CO_9_UNLOCKED_DOOR2 - jr nz, .asm_5d81e + jr nz, .unlock_door3 push af ld a, $54 ld [wNewTileBlockID], a lb bc, 5, 9 predef ReplaceTileBlock pop af -.asm_5d81e +.unlock_door3 CheckEventAfterBranchReuseA EVENT_SILPH_CO_9_UNLOCKED_DOOR4, EVENT_SILPH_CO_9_UNLOCKED_DOOR3 ret nz ld a, $5f @@ -50,14 +50,14 @@ SilphCo9Script_5d7d1: lb bc, 6, 5 predef_jump ReplaceTileBlock -SilphCo9GateCoords: +.GateCoordinates: dbmapcoord 1, 4 dbmapcoord 9, 2 dbmapcoord 9, 5 dbmapcoord 5, 6 db -1 ; end -SilphCo9Script_5d837: +SilphCo9F_SetCardKeyDoorYScript: push hl ld hl, wCardKeyDoorY ld a, [hli] @@ -67,159 +67,161 @@ SilphCo9Script_5d837: xor a ldh [hUnlockedSilphCoDoors], a pop hl -.asm_5d843 +.loop_card_key_doors ld a, [hli] cp $ff - jr z, .asm_5d85f + jr z, .exit_loop push hl ld hl, hUnlockedSilphCoDoors inc [hl] pop hl cp b - jr z, .asm_5d854 + jr z, .check_door inc hl - jr .asm_5d843 -.asm_5d854 + jr .loop_card_key_doors +.check_door ld a, [hli] cp c - jr nz, .asm_5d843 + jr nz, .loop_card_key_doors ld hl, wCardKeyDoorY xor a ld [hli], a ld [hl], a ret -.asm_5d85f +.exit_loop xor a ldh [hUnlockedSilphCoDoors], a ret -SilphCo9Script_5d863: +SilphCo9F_SetUnlockedSilphCoDoorsScript: EventFlagAddress hl, EVENT_SILPH_CO_9_UNLOCKED_DOOR1 ldh a, [hUnlockedSilphCoDoors] and a ret z cp $1 - jr nz, .next1 + jr nz, .unlock_door1 SetEventReuseHL EVENT_SILPH_CO_9_UNLOCKED_DOOR1 ret -.next1 +.unlock_door1 cp $2 - jr nz, .next2 + jr nz, .unlock_door2 SetEventAfterBranchReuseHL EVENT_SILPH_CO_9_UNLOCKED_DOOR2, EVENT_SILPH_CO_9_UNLOCKED_DOOR1 ret -.next2 +.unlock_door2 cp $3 - jr nz, .next3 + jr nz, .unlock_door3 SetEventAfterBranchReuseHL EVENT_SILPH_CO_9_UNLOCKED_DOOR3, EVENT_SILPH_CO_9_UNLOCKED_DOOR1 ret -.next3 +.unlock_door3 cp $4 ret nz SetEventAfterBranchReuseHL EVENT_SILPH_CO_9_UNLOCKED_DOOR4, EVENT_SILPH_CO_9_UNLOCKED_DOOR1 ret SilphCo9F_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_SILPHCO9F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_SILPHCO9F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_SILPHCO9F_END_BATTLE SilphCo9F_TextPointers: - dw SilphCo9Text1 - dw SilphCo9Text2 - dw SilphCo9Text3 - dw SilphCo9Text4 + def_text_pointers + dw_const SilphCo9FNurseText, TEXT_SILPHCO9F_NURSE + dw_const SilphCo9FRocket1Text, TEXT_SILPHCO9F_ROCKET1 + dw_const SilphCo9FScientistText, TEXT_SILPHCO9F_SCIENTIST + dw_const SilphCo9FRocket2Text, TEXT_SILPHCO9F_ROCKET2 SilphCo9TrainerHeaders: def_trainers 2 SilphCo9TrainerHeader0: - trainer EVENT_BEAT_SILPH_CO_9F_TRAINER_0, 4, SilphCo9BattleText1, SilphCo9EndBattleText1, SilphCo9AfterBattleText1 + trainer EVENT_BEAT_SILPH_CO_9F_TRAINER_0, 4, SilphCo9FRocket1BattleText, SilphCo9FRocket1EndBattleText, SilphCo9FRocket1AfterBattleText SilphCo9TrainerHeader1: - trainer EVENT_BEAT_SILPH_CO_9F_TRAINER_1, 2, SilphCo9BattleText2, SilphCo9EndBattleText2, SilphCo9AfterBattleText2 + trainer EVENT_BEAT_SILPH_CO_9F_TRAINER_1, 2, SilphCo9FScientistBattleText, SilphCo9FScientistEndBattleText, SilphCo9FScientistAfterBattleText SilphCo9TrainerHeader2: - trainer EVENT_BEAT_SILPH_CO_9F_TRAINER_2, 4, SilphCo9BattleText3, SilphCo9EndBattleText3, SilphCo9AfterBattleText3 + trainer EVENT_BEAT_SILPH_CO_9F_TRAINER_2, 4, SilphCo9FRocket2BattleText, SilphCo9FRocket2EndBattleText, SilphCo9FRocket2AfterBattleText db -1 ; end -SilphCo9Text1: +SilphCo9FNurseText: text_asm CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI - jr nz, .asm_5d8dc - ld hl, SilphCo9Text_5d8e5 + jr nz, .beat_giovanni + ld hl, .YouLookTiredText call PrintText predef HealParty call GBFadeOutToWhite call Delay3 call GBFadeInFromWhite - ld hl, SilphCo9Text_5d8ea + ld hl, .DontGiveUpText call PrintText - jr .asm_5d8e2 -.asm_5d8dc - ld hl, SilphCo9Text_5d8ef + jr .text_script_end +.beat_giovanni + ld hl, .ThankYouText call PrintText -.asm_5d8e2 +.text_script_end jp TextScriptEnd -SilphCo9Text_5d8e5: - text_far _SilphCo9Text_5d8e5 +.YouLookTiredText: + text_far SilphCo9FNurseYouLookTiredText text_end -SilphCo9Text_5d8ea: - text_far _SilphCo9Text_5d8ea +.DontGiveUpText: + text_far SilphCo9FNurseDontGiveUpText text_end -SilphCo9Text_5d8ef: - text_far _SilphCo9Text_5d8ef +.ThankYouText: + text_far SilphCo9FNurseThankYouText text_end -SilphCo9Text2: +SilphCo9FRocket1Text: text_asm ld hl, SilphCo9TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SilphCo9Text3: +SilphCo9FScientistText: text_asm ld hl, SilphCo9TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SilphCo9Text4: +SilphCo9FRocket2Text: text_asm ld hl, SilphCo9TrainerHeader2 call TalkToTrainer jp TextScriptEnd -SilphCo9BattleText1: - text_far _SilphCo9BattleText1 +SilphCo9FRocket1BattleText: + text_far _SilphCo9FRocket1BattleText text_end -SilphCo9EndBattleText1: - text_far _SilphCo9EndBattleText1 +SilphCo9FRocket1EndBattleText: + text_far _SilphCo9FRocket1EndBattleText text_end -SilphCo9AfterBattleText1: - text_far _SilphCo9AfterBattleText1 +SilphCo9FRocket1AfterBattleText: + text_far _SilphCo9FRocket1AfterBattleText text_end -SilphCo9BattleText2: - text_far _SilphCo9BattleText2 +SilphCo9FScientistBattleText: + text_far _SilphCo9FScientistBattleText text_end -SilphCo9EndBattleText2: - text_far _SilphCo9EndBattleText2 +SilphCo9FScientistEndBattleText: + text_far _SilphCo9FScientistEndBattleText text_end -SilphCo9AfterBattleText2: - text_far _SilphCo9AfterBattleText2 +SilphCo9FScientistAfterBattleText: + text_far _SilphCo9FScientistAfterBattleText text_end -SilphCo9BattleText3: - text_far _SilphCo9BattleText3 +SilphCo9FRocket2BattleText: + text_far _SilphCo9FRocket2BattleText text_end -SilphCo9EndBattleText3: - text_far _SilphCo9EndBattleText3 +SilphCo9FRocket2EndBattleText: + text_far _SilphCo9FRocket2EndBattleText text_end -SilphCo9AfterBattleText3: - text_far _SilphCo9AfterBattleText3 +SilphCo9FRocket2AfterBattleText: + text_far _SilphCo9FRocket2AfterBattleText text_end diff --git a/scripts/SilphCoElevator.asm b/scripts/SilphCoElevator.asm index c898cbd17..1d728e6b5 100644 --- a/scripts/SilphCoElevator.asm +++ b/scripts/SilphCoElevator.asm @@ -7,7 +7,7 @@ SilphCoElevator_Script: pop hl bit 7, [hl] res 7, [hl] - call nz, SilphCoElevatorScript_45827 + call nz, SilphCoElevatorShakeElevatorScript xor a ld [wAutoTextBoxDrawingControl], a inc a @@ -20,9 +20,9 @@ SilphCoElevatorScript_457dc: ld b, a ld a, [wWarpedFromWhichMap] ld c, a - call SilphCoElevatorScript_457ea + call .StoreWarpEntry -SilphCoElevatorScript_457ea: +.StoreWarpEntry: inc hl inc hl ld a, b @@ -31,7 +31,7 @@ SilphCoElevatorScript_457ea: ld [hli], a ret -SilphCoElevatorScript_457f1: +SilphCoElevatorCopyWarpMapsScript: ld hl, SilphCoElevatorFloors call LoadItemList ld hl, SilphCoElevatorWarpMaps @@ -71,17 +71,18 @@ SilphCoElevatorWarpMaps: db 1, SILPH_CO_11F SilphCoElevatorWarpMapsEnd: -SilphCoElevatorScript_45827: +SilphCoElevatorShakeElevatorScript: call Delay3 farcall ShakeElevator ret SilphCoElevator_TextPointers: - dw SilphCoElevatorText1 + def_text_pointers + dw_const SilphCoElevatorElevatorText, TEXT_SILPHCOELEVATOR_ELEVATOR -SilphCoElevatorText1: +SilphCoElevatorElevatorText: text_asm - call SilphCoElevatorScript_457f1 + call SilphCoElevatorCopyWarpMapsScript ld hl, SilphCoElevatorWarpMaps predef DisplayElevatorFloorMenu jp TextScriptEnd diff --git a/scripts/TradeCenter.asm b/scripts/TradeCenter.asm index dbed79c17..d7e7c54c1 100644 --- a/scripts/TradeCenter.asm +++ b/scripts/TradeCenter.asm @@ -7,7 +7,7 @@ TradeCenter_Script: ld a, SPRITE_FACING_RIGHT .next ldh [hSpriteFacingDirection], a - ld a, $1 + ld a, TRADECENTER_OPPONENT ldh [hSpriteIndex], a call SetSpriteFacingDirection ld hl, wd72d @@ -31,8 +31,9 @@ TradeCenter_Script: ret TradeCenter_TextPointers: - dw TradeCenterText1 + def_text_pointers + dw_const TradeCenterOpponentText, TEXT_TRADECENTER_OPPONENT -TradeCenterText1: - text_far _TradeCenterText1 +TradeCenterOpponentText: + text_far _TradeCenterOpponentText text_end diff --git a/scripts/UndergroundPathNorthSouth.asm b/scripts/UndergroundPathNorthSouth.asm index 00a7ef90d..18b86f4e8 100644 --- a/scripts/UndergroundPathNorthSouth.asm +++ b/scripts/UndergroundPathNorthSouth.asm @@ -2,5 +2,6 @@ UndergroundPathNorthSouth_Script: jp EnableAutoTextBoxDrawing UndergroundPathNorthSouth_TextPointers: + def_text_pointers text_end ; unused diff --git a/scripts/UndergroundPathRoute5.asm b/scripts/UndergroundPathRoute5.asm index 5c0780508..6959c5a82 100644 --- a/scripts/UndergroundPathRoute5.asm +++ b/scripts/UndergroundPathRoute5.asm @@ -7,9 +7,10 @@ UndergroundPathEntranceRoute5_TextScriptEndingText: text_end UndergroundPathRoute5_TextPointers: - dw UndergroundPathEntranceRoute5Text1 + def_text_pointers + dw_const UndergroundPathRoute5LittleGirlText, TEXT_UNDERGROUNDPATHROUTE5_LITTLE_GIRL -UndergroundPathEntranceRoute5Text1: +UndergroundPathRoute5LittleGirlText: text_asm ld a, TRADE_FOR_SPOT ld [wWhichTrade], a diff --git a/scripts/UndergroundPathRoute6.asm b/scripts/UndergroundPathRoute6.asm index e3994e335..2afa7676b 100644 --- a/scripts/UndergroundPathRoute6.asm +++ b/scripts/UndergroundPathRoute6.asm @@ -4,8 +4,9 @@ UndergroundPathRoute6_Script: jp EnableAutoTextBoxDrawing UndergroundPathRoute6_TextPointers: - dw UndergroundPathEntranceRoute6Text1 + def_text_pointers + dw_const UndergroundPathRoute6GirlText, TEXT_UNDERGROUNDPATHROUTE6_GIRL -UndergroundPathEntranceRoute6Text1: - text_far _UndergrdTunnelEntRoute6Text1 +UndergroundPathRoute6GirlText: + text_far _UndergroundPathRoute6GirlText text_end diff --git a/scripts/UndergroundPathRoute7.asm b/scripts/UndergroundPathRoute7.asm index c311b409f..04ca54038 100644 --- a/scripts/UndergroundPathRoute7.asm +++ b/scripts/UndergroundPathRoute7.asm @@ -4,8 +4,9 @@ UndergroundPathRoute7_Script: jp EnableAutoTextBoxDrawing UndergroundPathRoute7_TextPointers: - dw UndergroundPathEntranceRoute7Text1 + def_text_pointers + dw_const UndergroundPathRoute7MiddleAgedManText, TEXT_UNDERGROUNDPATHROUTE7_MIDDLE_AGED_MAN -UndergroundPathEntranceRoute7Text1: - text_far _UndergroundPathEntRoute7Text1 +UndergroundPathRoute7MiddleAgedManText: + text_far _UndergroundPathRoute7MiddleAgedManText text_end diff --git a/scripts/UndergroundPathRoute7Copy.asm b/scripts/UndergroundPathRoute7Copy.asm index 2eb74fce8..c6678141b 100644 --- a/scripts/UndergroundPathRoute7Copy.asm +++ b/scripts/UndergroundPathRoute7Copy.asm @@ -4,21 +4,22 @@ UndergroundPathRoute7Copy_Script: ret UndergroundPathRoute7Copy_TextPointers: - dw UGPathRoute7EntranceUnusedText_5d773 - dw UGPathRoute7EntranceUnusedText_5d77d + def_text_pointers + dw_const UndergroundPathRoute7CopyUnusedGirlText, TEXT_UNDERGROUNDPATHROUTE7COPY_UNUSED_GIRL + dw_const UndergroundPathRoute7CopyUnusedMiddleAgedManText, TEXT_UNDERGROUNDPATHROUTE7COPY_UNUSED_MIDDLE_AGED_MAN -UGPathRoute7EntranceUnusedText_5d773: - text_far _UGPathRoute7EntranceUnusedText_5d773 +UndergroundPathRoute7CopyUnusedGirlText: + text_far _UndergroundPathRoute7CopyUnusedGirlText text_end -UGPathRoute7EntranceUnusedText_5d778: - text_far _UGPathRoute7EntranceUnusedText_5d778 +UndergroundPathRoute7CopyUnusedTeamRocketHadAHideoutText: + text_far _UndergroundPathRoute7CopyUnusedTeamRocketHadAHideoutText text_end -UGPathRoute7EntranceUnusedText_5d77d: - text_far _UGPathRoute7EntranceUnusedText_5d77d +UndergroundPathRoute7CopyUnusedMiddleAgedManText: + text_far _UndergroundPathRoute7CopyUnusedMiddleAgedManText text_end -UGPathRoute7EntranceUnusedText_5d782: - text_far _UGPathRoute7EntranceUnusedText_5d782 +UndergroundPathRoute7CopyUnusedGoesUnderSaffronText: + text_far _UndergroundPathRoute7CopyUnusedGoesUnderSaffronText text_end diff --git a/scripts/UndergroundPathRoute8.asm b/scripts/UndergroundPathRoute8.asm index 6eab58c24..5c77875ef 100644 --- a/scripts/UndergroundPathRoute8.asm +++ b/scripts/UndergroundPathRoute8.asm @@ -4,8 +4,9 @@ UndergroundPathRoute8_Script: jp EnableAutoTextBoxDrawing UndergroundPathRoute8_TextPointers: - dw UndergroundPathEntranceRoute8Text1 + def_text_pointers + dw_const UndergroundPathRoute8GirlText, TEXT_UNDERGROUNDPATHROUTE8_GIRL -UndergroundPathEntranceRoute8Text1: - text_far _UndergroundPathEntRoute8Text1 +UndergroundPathRoute8GirlText: + text_far _UndergroundPathRoute8GirlText text_end diff --git a/scripts/UndergroundPathWestEast.asm b/scripts/UndergroundPathWestEast.asm index 98571e177..258c28fb1 100644 --- a/scripts/UndergroundPathWestEast.asm +++ b/scripts/UndergroundPathWestEast.asm @@ -2,5 +2,6 @@ UndergroundPathWestEast_Script: jp EnableAutoTextBoxDrawing UndergroundPathWestEast_TextPointers: + def_text_pointers text_end ; unused diff --git a/scripts/VermilionCity.asm b/scripts/VermilionCity.asm index 629bb0c8a..4c8a0b18a 100644 --- a/scripts/VermilionCity.asm +++ b/scripts/VermilionCity.asm @@ -4,7 +4,7 @@ VermilionCity_Script: bit 6, [hl] res 6, [hl] push hl - call nz, .initCityScript + call nz, VermilionCityLeftSSAnneCallbackScript pop hl bit 5, [hl] res 5, [hl] @@ -20,24 +20,25 @@ VermilionCity_Script: ld [wFirstLockTrashCanIndex], a ret -.initCityScript +VermilionCityLeftSSAnneCallbackScript: CheckEventHL EVENT_SS_ANNE_LEFT ret z CheckEventReuseHL EVENT_WALKED_PAST_GUARD_AFTER_SS_ANNE_LEFT SetEventReuseHL EVENT_WALKED_PAST_GUARD_AFTER_SS_ANNE_LEFT ret nz - ld a, $2 + ld a, SCRIPT_VERMILIONCITY_PLAYER_EXIT_SHIP ld [wVermilionCityCurScript], a ret VermilionCity_ScriptPointers: - dw VermilionCityScript0 - dw VermilionCityScript1 - dw VermilionCityScript2 - dw VermilionCityScript3 - dw VermilionCityScript4 + def_script_pointers + dw_const VermilionCityDefaultScript, SCRIPT_VERMILIONCITY_DEFAULT + dw_const VermilionCityPlayerMovingUp1Script, SCRIPT_VERMILIONCITY_PLAYER_MOVING_UP1 + dw_const VermilionCityPlayerExitShipScript, SCRIPT_VERMILIONCITY_PLAYER_EXIT_SHIP + dw_const VermilionCityPlayerMovingUp2Script, SCRIPT_VERMILIONCITY_PLAYER_MOVING_UP2 + dw_const VermilionCityPlayerAllowedToPassScript, SCRIPT_VERMILIONCITY_PLAYER_ALLOWED_TO_PASS -VermilionCityScript0: +VermilionCityDefaultScript: ld a, [wSpritePlayerStateData1FacingDirection] and a ; cp SPRITE_FACING_DOWN ret nz @@ -47,23 +48,23 @@ VermilionCityScript0: xor a ldh [hJoyHeld], a ld [wcf0d], a - ld a, $3 + ld a, TEXT_VERMILIONCITY_SAILOR1 ldh [hSpriteIndexOrTextID], a call DisplayTextID CheckEvent EVENT_SS_ANNE_LEFT - jr nz, .shipHasDeparted + jr nz, .ship_departed ld b, S_S_TICKET predef GetQuantityOfItemInBag ld a, b and a ret nz -.shipHasDeparted +.ship_departed ld a, D_UP ld [wSimulatedJoypadStatesEnd], a ld a, $1 ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld a, $1 + ld a, SCRIPT_VERMILIONCITY_PLAYER_MOVING_UP1 ld [wVermilionCityCurScript], a ret @@ -71,16 +72,16 @@ SSAnneTicketCheckCoords: dbmapcoord 18, 30 db -1 ; end -VermilionCityScript4: +VermilionCityPlayerAllowedToPassScript: ld hl, SSAnneTicketCheckCoords call ArePlayerCoordsInArray ret c - ld a, $0 + ld a, SCRIPT_VERMILIONCITY_DEFAULT ld [wVermilionCityCurScript], a ret -VermilionCityScript2: - ld a, $ff +VermilionCityPlayerExitShipScript: + ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ld a, D_UP ld [wSimulatedJoypadStatesEnd], a @@ -88,104 +89,105 @@ VermilionCityScript2: ld a, 2 ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld a, $3 + ld a, SCRIPT_VERMILIONCITY_PLAYER_MOVING_UP2 ld [wVermilionCityCurScript], a ret -VermilionCityScript3: +VermilionCityPlayerMovingUp2Script: ld a, [wSimulatedJoypadStatesIndex] and a ret nz xor a ld [wJoyIgnore], a ldh [hJoyHeld], a - ld a, $0 + ld a, SCRIPT_VERMILIONCITY_DEFAULT ld [wVermilionCityCurScript], a ret -VermilionCityScript1: +VermilionCityPlayerMovingUp1Script: ld a, [wSimulatedJoypadStatesIndex] and a ret nz ld c, 10 call DelayFrames - ld a, $0 + ld a, SCRIPT_VERMILIONCITY_DEFAULT ld [wVermilionCityCurScript], a ret VermilionCity_TextPointers: - dw VermilionCityText1 - dw VermilionCityText2 - dw VermilionCityText3 - dw VermilionCityText4 - dw VermilionCityText5 - dw VermilionCityText6 - dw VermilionCityText7 - dw VermilionCityText8 - dw MartSignText - dw PokeCenterSignText - dw VermilionCityText11 - dw VermilionCityText12 - dw VermilionCityText13 + def_text_pointers + dw_const VermilionCityBeautyText, TEXT_VERMILIONCITY_BEAUTY + dw_const VermilionCityGambler1Text, TEXT_VERMILIONCITY_GAMBLER1 + dw_const VermilionCitySailor1Text, TEXT_VERMILIONCITY_SAILOR1 + dw_const VermilionCityGambler2Text, TEXT_VERMILIONCITY_GAMBLER2 + dw_const VermilionCityMachopText, TEXT_VERMILIONCITY_MACHOP + dw_const VermilionCitySailor2Text, TEXT_VERMILIONCITY_SAILOR2 + dw_const VermilionCitySignText, TEXT_VERMILIONCITY_SIGN + dw_const VermilionCityNoticeSignText, TEXT_VERMILIONCITY_NOTICE_SIGN + dw_const MartSignText, TEXT_VERMILIONCITY_MART_SIGN + dw_const PokeCenterSignText, TEXT_VERMILIONCITY_POKECENTER_SIGN + dw_const VermilionCityPokemonFanClubSignText, TEXT_VERMILIONCITY_POKEMON_FAN_CLUB_SIGN + dw_const VermilionCityGymSignText, TEXT_VERMILIONCITY_GYM_SIGN + dw_const VermilionCityHarborSignText, TEXT_VERMILIONCITY_HARBOR_SIGN -VermilionCityText1: - text_far _VermilionCityText1 +VermilionCityBeautyText: + text_far _VermilionCityBeautyText text_end -VermilionCityText2: +VermilionCityGambler1Text: text_asm CheckEvent EVENT_SS_ANNE_LEFT - jr nz, .shipHasDeparted - ld hl, VermilionCityTextDidYouSee + jr nz, .ship_departed + ld hl, .DidYouSeeText call PrintText - jr .end -.shipHasDeparted - ld hl, VermilionCityTextSSAnneDeparted + jr .text_script_end +.ship_departed + ld hl, .SSAnneDepartedText call PrintText -.end +.text_script_end jp TextScriptEnd -VermilionCityTextDidYouSee: - text_far _VermilionCityTextDidYouSee +.DidYouSeeText: + text_far _VermilionCityGambler1DidYouSeeText text_end -VermilionCityTextSSAnneDeparted: - text_far _VermilionCityTextSSAnneDeparted +.SSAnneDepartedText: + text_far _VermilionCityGambler1SSAnneDepartedText text_end -VermilionCityText3: +VermilionCitySailor1Text: text_asm CheckEvent EVENT_SS_ANNE_LEFT - jr nz, .shipHasDeparted + jr nz, .ship_departed ld a, [wSpritePlayerStateData1FacingDirection] cp SPRITE_FACING_RIGHT - jr z, .greetPlayer + jr z, .greet_player ld hl, .inFrontOfOrBehindGuardCoords call ArePlayerCoordsInArray - jr nc, .greetPlayerAndCheckTicket -.greetPlayer - ld hl, SSAnneWelcomeText4 + jr nc, .greet_player_and_check_ticket +.greet_player + ld hl, .WelcomeToSSAnneText call PrintText jr .end -.greetPlayerAndCheckTicket - ld hl, SSAnneWelcomeText9 +.greet_player_and_check_ticket + ld hl, .DoYouHaveATicketText call PrintText ld b, S_S_TICKET predef GetQuantityOfItemInBag ld a, b and a - jr nz, .playerHasTicket - ld hl, SSAnneNoTicketText + jr nz, .player_has_ticket + ld hl, .YouNeedATicketText call PrintText jr .end -.playerHasTicket - ld hl, SSAnneFlashedTicketText +.player_has_ticket + ld hl, .FlashedTicketText call PrintText - ld a, $4 + ld a, SCRIPT_VERMILIONCITY_PLAYER_ALLOWED_TO_PASS ld [wVermilionCityCurScript], a jr .end -.shipHasDeparted - ld hl, SSAnneNotHereText +.ship_departed + ld hl, .ShipSetSailText call PrintText .end jp TextScriptEnd @@ -195,63 +197,63 @@ VermilionCityText3: dbmapcoord 19, 31 ; behind guard db -1 ; end -SSAnneWelcomeText4: - text_far _SSAnneWelcomeText4 +.WelcomeToSSAnneText: + text_far _VermilionCitySailor1WelcomeToSSAnneText text_end -SSAnneWelcomeText9: - text_far _SSAnneWelcomeText9 +.DoYouHaveATicketText: + text_far _VermilionCitySailor1DoYouHaveATicketText text_end -SSAnneFlashedTicketText: - text_far _SSAnneFlashedTicketText +.FlashedTicketText: + text_far _VermilionCitySailor1FlashedTicketText text_end -SSAnneNoTicketText: - text_far _SSAnneNoTicketText +.YouNeedATicketText: + text_far _VermilionCitySailor1YouNeedATicketText text_end -SSAnneNotHereText: - text_far _SSAnneNotHereText +.ShipSetSailText: + text_far _VermilionCitySailor1ShipSetSailText text_end -VermilionCityText4: - text_far _VermilionCityText4 +VermilionCityGambler2Text: + text_far _VermilionCityGambler2Text text_end -VermilionCityText5: - text_far _VermilionCityText5 +VermilionCityMachopText: + text_far _VermilionCityMachopText text_asm ld a, MACHOP call PlayCry call WaitForSoundToFinish - ld hl, VermilionCityText14 + ld hl, .StompingTheLandFlatText ret -VermilionCityText14: - text_far _VermilionCityText14 +.StompingTheLandFlatText: + text_far _VermilionCityMachopStompingTheLandFlatText text_end -VermilionCityText6: - text_far _VermilionCityText6 +VermilionCitySailor2Text: + text_far _VermilionCitySailor2Text text_end -VermilionCityText7: - text_far _VermilionCityText7 +VermilionCitySignText: + text_far _VermilionCitySignText text_end -VermilionCityText8: - text_far _VermilionCityText8 +VermilionCityNoticeSignText: + text_far _VermilionCityNoticeSignText text_end -VermilionCityText11: - text_far _VermilionCityText11 +VermilionCityPokemonFanClubSignText: + text_far _VermilionCityPokemonFanClubSignText text_end -VermilionCityText12: - text_far _VermilionCityText12 +VermilionCityGymSignText: + text_far _VermilionCityGymSignText text_end -VermilionCityText13: - text_far _VermilionCityText13 +VermilionCityHarborSignText: + text_far _VermilionCityHarborSignText text_end diff --git a/scripts/VermilionDock.asm b/scripts/VermilionDock.asm index 947797988..041bf5b4a 100644 --- a/scripts/VermilionDock.asm +++ b/scripts/VermilionDock.asm @@ -1,14 +1,14 @@ VermilionDock_Script: call EnableAutoTextBoxDrawing CheckEventHL EVENT_STARTED_WALKING_OUT_OF_DOCK - jr nz, .asm_1db8d + jr nz, .walking_out_of_dock CheckEventReuseHL EVENT_GOT_HM01 ret z ld a, [wDestinationWarpID] cp $1 ret nz CheckEventReuseHL EVENT_SS_ANNE_LEFT - jp z, VermilionDock_1db9b + jp z, VermilionDockSSAnneLeavesScript SetEventReuseHL EVENT_STARTED_WALKING_OUT_OF_DOCK call Delay3 ld hl, wd730 @@ -26,7 +26,7 @@ VermilionDock_Script: dec a ld [wJoyIgnore], a ret -.asm_1db8d +.walking_out_of_dock CheckEventAfterBranchReuseHL EVENT_WALKED_OUT_OF_DOCK, EVENT_STARTED_WALKING_OUT_OF_DOCK ret nz ld a, [wSimulatedJoypadStatesIndex] @@ -36,7 +36,7 @@ VermilionDock_Script: SetEventReuseHL EVENT_WALKED_OUT_OF_DOCK ret -VermilionDock_1db9b: +VermilionDockSSAnneLeavesScript: SetEventForceReuseHL EVENT_SS_ANNE_LEFT ld a, SFX_STOP_ALL_MUSIC ld [wJoyIgnore], a @@ -77,7 +77,7 @@ VermilionDock_1db9b: ld [wUpdateSpritesEnabled], a ld d, $0 ld e, $8 -.asm_1dbfa +.shift_columns_up ld hl, $2 add hl, bc ld a, l @@ -90,19 +90,19 @@ VermilionDock_1db9b: call VermilionDock_EmitSmokePuff pop de ld b, $10 -.asm_1dc11 +.smoke_puff_drift_loop call VermilionDock_AnimSmokePuffDriftRight ld c, $8 -.asm_1dc16 - call VermilionDock_1dc7c +.delay_between_drifts + call VermilionDock_SyncScrollWithLY dec c - jr nz, .asm_1dc16 + jr nz, .delay_between_drifts inc d dec b - jr nz, .asm_1dc11 + jr nz, .smoke_puff_drift_loop pop bc dec e - jr nz, .asm_1dbfa + jr nz, .shift_columns_up xor a ldh [rWY], a ldh [hWY], a @@ -129,12 +129,12 @@ VermilionDock_AnimSmokePuffDriftRight: swap a ld c, a ld de, 4 -.loop +.drift_loop inc [hl] inc [hl] add hl, de dec c - jr nz, .loop + jr nz, .drift_loop pop de pop bc ret @@ -161,22 +161,22 @@ VermilionDockOAMBlock: db $fe, $10 db $ff, $10 -VermilionDock_1dc7c: +VermilionDock_SyncScrollWithLY: ld h, d ld l, $50 - call .asm_1dc86 + call .sync_scroll_ly ld h, $0 ld l, $80 -.asm_1dc86 +.sync_scroll_ly ldh a, [rLY] cp l - jr nz, .asm_1dc86 + jr nz, .sync_scroll_ly ld a, h ldh [rSCX], a -.asm_1dc8e +.wait_for_ly_match ldh a, [rLY] cp h - jr z, .asm_1dc8e + jr z, .wait_for_ly_match ret VermilionDock_EraseSSAnne: @@ -209,8 +209,9 @@ VermilionDock_EraseSSAnne: ret VermilionDock_TextPointers: - dw VermilionDockText1 + def_text_pointers + dw_const VermilionDockUnusedText, TEXT_VERMILIONDOCK_UNUSED -VermilionDockText1: - text_far _VermilionDockText1 +VermilionDockUnusedText: + text_far _VermilionDockUnusedText text_end diff --git a/scripts/VermilionGym.asm b/scripts/VermilionGym.asm index 3bbb87439..a4fab9525 100644 --- a/scripts/VermilionGym.asm +++ b/scripts/VermilionGym.asm @@ -49,36 +49,37 @@ VermilionGymResetScripts: ret VermilionGym_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw VermilionGymLTSurgePostBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_VERMILIONGYM_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_VERMILIONGYM_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_VERMILIONGYM_END_BATTLE + dw_const VermilionGymLTSurgeAfterBattleScript, SCRIPT_VERMILIONGYM_LT_SURGE_AFTER_BATTLE -VermilionGymLTSurgePostBattle: +VermilionGymLTSurgeAfterBattleScript: ld a, [wIsInBattle] cp $ff ; did we lose? jp z, VermilionGymResetScripts ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a -VermilionGymReceiveTM24: - ld a, $6 +VermilionGymLTSurgeReceiveTM24Script: + ld a, TEXT_VERMILIONGYM_LT_SURGE_THUNDER_BADGE_INFO ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_LT_SURGE lb bc, TM_THUNDERBOLT, 1 call GiveItem - jr nc, .BagFull - ld a, $7 + jr nc, .bag_full + ld a, TEXT_VERMILIONGYM_LT_SURGE_RECEIVED_TM24 ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM24 - jr .gymVictory -.BagFull - ld a, $8 + jr .gym_victory +.bag_full + ld a, TEXT_VERMILIONGYM_LT_SURGE_TM24_NO_ROOM ldh [hSpriteIndexOrTextID], a call DisplayTextID -.gymVictory +.gym_victory ld hl, wObtainedBadges set BIT_THUNDERBADGE, [hl] ld hl, wBeatGymFlags @@ -90,46 +91,47 @@ VermilionGymReceiveTM24: jp VermilionGymResetScripts VermilionGym_TextPointers: - dw LTSurgeText - dw VermilionGymTrainerText1 - dw VermilionGymTrainerText2 - dw VermilionGymTrainerText3 - dw VermilionGymGuideText - dw LTSurgeThunderBadgeInfoText - dw ReceivedTM24Text - dw TM24NoRoomText + def_text_pointers + dw_const VermilionGymLTSurgeText, TEXT_VERMILIONGYM_LT_SURGE + dw_const VermilionGymGentlemanText, TEXT_VERMILIONGYM_GENTLEMAN + dw_const VermilionGymSuperNerdText, TEXT_VERMILIONGYM_SUPER_NERD + dw_const VermilionGymSailorText, TEXT_VERMILIONGYM_SAILOR + dw_const VermilionGymGymGuideText, TEXT_VERMILIONGYM_GYM_GUIDE + dw_const VermilionGymLTSurgeThunderBadgeInfoText, TEXT_VERMILIONGYM_LT_SURGE_THUNDER_BADGE_INFO + dw_const VermilionGymLTSurgeReceivedTM24Text, TEXT_VERMILIONGYM_LT_SURGE_RECEIVED_TM24 + dw_const VermilionGymLTSurgeTM24NoRoomText, TEXT_VERMILIONGYM_LT_SURGE_TM24_NO_ROOM VermilionGymTrainerHeaders: def_trainers 2 VermilionGymTrainerHeader0: - trainer EVENT_BEAT_VERMILION_GYM_TRAINER_0, 3, VermilionGymBattleText1, VermilionGymEndBattleText1, VermilionGymAfterBattleText1 + trainer EVENT_BEAT_VERMILION_GYM_TRAINER_0, 3, VermilionGymGentlemanBattleText, VermilionGymGentlemanEndBattleText, VermilionGymGentlemanAfterBattleText VermilionGymTrainerHeader1: - trainer EVENT_BEAT_VERMILION_GYM_TRAINER_1, 2, VermilionGymBattleText2, VermilionGymEndBattleText2, VermilionGymAfterBattleText2 + trainer EVENT_BEAT_VERMILION_GYM_TRAINER_1, 2, VermilionGymSuperNerdBattleText, VermilionGymSuperNerdEndBattleText, VermilionGymSuperNerdAfterBattleText VermilionGymTrainerHeader2: - trainer EVENT_BEAT_VERMILION_GYM_TRAINER_2, 3, VermilionGymBattleText3, VermilionGymEndBattleText3, VermilionGymAfterBattleText3 + trainer EVENT_BEAT_VERMILION_GYM_TRAINER_2, 3, VermilionGymSailorBattleText, VermilionGymSailorEndBattleText, VermilionGymSailorAfterBattleText db -1 ; end -LTSurgeText: +VermilionGymLTSurgeText: text_asm CheckEvent EVENT_BEAT_LT_SURGE - jr z, .beforeBeat + jr z, .before_beat CheckEventReuseA EVENT_GOT_TM24 - jr nz, .afterBeat - call z, VermilionGymReceiveTM24 + jr nz, .got_tm24_already + call z, VermilionGymLTSurgeReceiveTM24Script call DisableWaitingAfterTextDisplay - jr .done -.afterBeat - ld hl, LTSurgePostBattleAdviceText + jr .text_script_end +.got_tm24_already + ld hl, .PostBattleAdviceText call PrintText - jr .done -.beforeBeat - ld hl, LTSurgePreBattleText + jr .text_script_end +.before_beat + ld hl, .PreBattleText call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, ReceivedThunderBadgeText - ld de, ReceivedThunderBadgeText + ld hl, VermilionGymLTSurgeReceivedThunderBadgeText + ld de, VermilionGymLTSurgeReceivedThunderBadgeText call SaveEndBattleTextPointers ldh a, [hSpriteIndex] ld [wSpriteIndex], a @@ -139,110 +141,110 @@ LTSurgeText: ld [wGymLeaderNo], a xor a ldh [hJoyHeld], a - ld a, $3 ; set script index to LT Surge post-battle script + ld a, SCRIPT_VERMILIONGYM_LT_SURGE_AFTER_BATTLE ld [wVermilionGymCurScript], a ld [wCurMapScript], a -.done +.text_script_end jp TextScriptEnd -LTSurgePreBattleText: - text_far _LTSurgePreBattleText +.PreBattleText: + text_far _VermilionGymLTSurgePreBattleText text_end -LTSurgePostBattleAdviceText: - text_far _LTSurgePostBattleAdviceText +.PostBattleAdviceText: + text_far _VermilionGymLTSurgePostBattleAdviceText text_end -LTSurgeThunderBadgeInfoText: - text_far _LTSurgeThunderBadgeInfoText +VermilionGymLTSurgeThunderBadgeInfoText: + text_far _VermilionGymLTSurgeThunderBadgeInfoText text_end -ReceivedTM24Text: - text_far _ReceivedTM24Text +VermilionGymLTSurgeReceivedTM24Text: + text_far _VermilionGymLTSurgeReceivedTM24Text sound_get_key_item text_far _TM24ExplanationText text_end -TM24NoRoomText: - text_far _TM24NoRoomText +VermilionGymLTSurgeTM24NoRoomText: + text_far _VermilionGymLTSurgeTM24NoRoomText text_end -ReceivedThunderBadgeText: - text_far _ReceivedThunderBadgeText +VermilionGymLTSurgeReceivedThunderBadgeText: + text_far _VermilionGymLTSurgeReceivedThunderBadgeText text_end -VermilionGymTrainerText1: +VermilionGymGentlemanText: text_asm ld hl, VermilionGymTrainerHeader0 call TalkToTrainer jp TextScriptEnd -VermilionGymBattleText1: - text_far _VermilionGymBattleText1 +VermilionGymGentlemanBattleText: + text_far _VermilionGymGentlemanBattleText text_end -VermilionGymEndBattleText1: - text_far _VermilionGymEndBattleText1 +VermilionGymGentlemanEndBattleText: + text_far _VermilionGymGentlemanEndBattleText text_end -VermilionGymAfterBattleText1: - text_far _VermilionGymAfterBattleText1 +VermilionGymGentlemanAfterBattleText: + text_far _VermilionGymGentlemanAfterBattleText text_end -VermilionGymTrainerText2: +VermilionGymSuperNerdText: text_asm ld hl, VermilionGymTrainerHeader1 call TalkToTrainer jp TextScriptEnd -VermilionGymBattleText2: - text_far _VermilionGymBattleText2 +VermilionGymSuperNerdBattleText: + text_far _VermilionGymSuperNerdBattleText text_end -VermilionGymEndBattleText2: - text_far _VermilionGymEndBattleText2 +VermilionGymSuperNerdEndBattleText: + text_far _VermilionGymSuperNerdEndBattleText text_end -VermilionGymAfterBattleText2: - text_far _VermilionGymAfterBattleText2 +VermilionGymSuperNerdAfterBattleText: + text_far _VermilionGymSuperNerdAfterBattleText text_end -VermilionGymTrainerText3: +VermilionGymSailorText: text_asm ld hl, VermilionGymTrainerHeader2 call TalkToTrainer jp TextScriptEnd -VermilionGymBattleText3: - text_far _VermilionGymBattleText3 +VermilionGymSailorBattleText: + text_far _VermilionGymSailorBattleText text_end -VermilionGymEndBattleText3: - text_far _VermilionGymEndBattleText3 +VermilionGymSailorEndBattleText: + text_far _VermilionGymSailorEndBattleText text_end -VermilionGymAfterBattleText3: - text_far _VermilionGymAfterBattleText3 +VermilionGymSailorAfterBattleText: + text_far _VermilionGymSailorAfterBattleText text_end -VermilionGymGuideText: +VermilionGymGymGuideText: text_asm ld a, [wBeatGymFlags] bit BIT_THUNDERBADGE, a - jr nz, .afterBeat - ld hl, VermilionGymGuidePreBattleText + jr nz, .got_thunderbadge + ld hl, .ChampInMakingText call PrintText - jr .done -.afterBeat - ld hl, VermilionGymGuidePostBattleText + jr .text_script_end +.got_thunderbadge + ld hl, .BeatLTSurgeText call PrintText -.done +.text_script_end jp TextScriptEnd -VermilionGymGuidePreBattleText: - text_far _VermilionGymGuidePreBattleText +.ChampInMakingText: + text_far _VermilionGymGymGuideChampInMakingText text_end -VermilionGymGuidePostBattleText: - text_far _VermilionGymGuidePostBattleText +.BeatLTSurgeText: + text_far _VermilionGymGymGuideBeatLTSurgeText text_end diff --git a/scripts/VermilionMart.asm b/scripts/VermilionMart.asm index 88a632c88..dd848d214 100644 --- a/scripts/VermilionMart.asm +++ b/scripts/VermilionMart.asm @@ -2,14 +2,15 @@ VermilionMart_Script: jp EnableAutoTextBoxDrawing VermilionMart_TextPointers: - dw VermilionCashierText - dw VermilionMartText2 - dw VermilionMartText3 + def_text_pointers + dw_const VermilionMartClerkText, TEXT_VERMILIONMART_CLERK + dw_const VermilionMartCooltrainerMText, TEXT_VERMILIONMART_COOLTRAINER_M + dw_const VermilionMartCooltrainerFText, TEXT_VERMILIONMART_COOLTRAINER_F -VermilionMartText2: - text_far _VermilionMartText2 +VermilionMartCooltrainerMText: + text_far _VermilionMartCooltrainerMText text_end -VermilionMartText3: - text_far _VermilionMartText3 +VermilionMartCooltrainerFText: + text_far _VermilionMartCooltrainerFText text_end diff --git a/scripts/VermilionOldRodHouse.asm b/scripts/VermilionOldRodHouse.asm index 524395d46..f170bcafc 100644 --- a/scripts/VermilionOldRodHouse.asm +++ b/scripts/VermilionOldRodHouse.asm @@ -2,14 +2,15 @@ VermilionOldRodHouse_Script: jp EnableAutoTextBoxDrawing VermilionOldRodHouse_TextPointers: - dw VermilionHouse2Text1 + def_text_pointers + dw_const VermilionOldRodHouseFishingGuruText, TEXT_VERMILIONOLDRODHOUSE_FISHING_GURU -VermilionHouse2Text1: +VermilionOldRodHouseFishingGuruText: text_asm ld a, [wd728] bit 3, a ; got old rod? - jr nz, .got_item - ld hl, VermilionHouse2Text_560b1 + jr nz, .got_old_rod + ld hl, .DoYouLikeToFishText call PrintText call YesNoChoice ld a, [wCurrentMenuItem] @@ -20,38 +21,38 @@ VermilionHouse2Text1: jr nc, .bag_full ld hl, wd728 set 3, [hl] ; got old rod - ld hl, VermilionHouse2Text_560b6 - jr .done + ld hl, .TakeThisText + jr .print_text .bag_full - ld hl, VermilionHouse2Text_560ca - jr .done + ld hl, .NoRoomText + jr .print_text .refused - ld hl, VermilionHouse2Text_560c0 - jr .done -.got_item - ld hl, VermilionHouse2Text_560c5 -.done + ld hl, .ThatsSoDisappointingText + jr .print_text +.got_old_rod + ld hl, .HowAreTheFishBitingText +.print_text call PrintText jp TextScriptEnd -VermilionHouse2Text_560b1: - text_far _VermilionHouse2Text_560b1 +.DoYouLikeToFishText: + text_far _VermilionOldRodHouseFishingGuruDoYouLikeToFishText text_end -VermilionHouse2Text_560b6: - text_far _VermilionHouse2Text_560b6 +.TakeThisText: + text_far _VermilionOldRodHouseFishingGuruTakeThisText sound_get_item_1 - text_far _VermilionHouse2Text_560bb + text_far _VermilionOldRodHouseFishingGuruFishingIsAWayOfLifeText text_end -VermilionHouse2Text_560c0: - text_far _VermilionHouse2Text_560c0 +.ThatsSoDisappointingText: + text_far _VermilionOldRodHouseFishingGuruThatsSoDisappointingText text_end -VermilionHouse2Text_560c5: - text_far _VermilionHouse2Text_560c5 +.HowAreTheFishBitingText: + text_far _VermilionOldRodHouseFishingGuruHowAreTheFishBitingText text_end -VermilionHouse2Text_560ca: - text_far _VermilionHouse2Text_560ca +.NoRoomText: + text_far _VermilionOldRodHouseFishingGuruNoRoomText text_end diff --git a/scripts/VermilionPidgeyHouse.asm b/scripts/VermilionPidgeyHouse.asm index fef476d5f..1265f1095 100644 --- a/scripts/VermilionPidgeyHouse.asm +++ b/scripts/VermilionPidgeyHouse.asm @@ -3,22 +3,23 @@ VermilionPidgeyHouse_Script: ret VermilionPidgeyHouse_TextPointers: - dw VermilionHouse1Text1 - dw VermilionHouse1Text2 - dw VermilionHouse1Text3 + def_text_pointers + dw_const VermilionPidgeyHouseYoungsterText, TEXT_VERMILIONPIDGEYHOUSE_YOUNGSTER + dw_const VermilionPidgeyHousePidgeyText, TEXT_VERMILIONPIDGEYHOUSE_PIDGEY + dw_const VermilionPidgeyHouseLetterText, TEXT_VERMILIONPIDGEYHOUSE_LETTER -VermilionHouse1Text1: - text_far _VermilionHouse1Text1 +VermilionPidgeyHouseYoungsterText: + text_far _VermilionPidgeyHouseYoungsterText text_end -VermilionHouse1Text2: - text_far _VermilionHouse1Text2 +VermilionPidgeyHousePidgeyText: + text_far _VermilionPidgeyHousePidgeyText text_asm ld a, PIDGEY call PlayCry call WaitForSoundToFinish jp TextScriptEnd -VermilionHouse1Text3: - text_far _VermilionHouse1Text3 +VermilionPidgeyHouseLetterText: + text_far _VermilionPidgeyHouseLetterText text_end diff --git a/scripts/VermilionPokecenter.asm b/scripts/VermilionPokecenter.asm index 65b5a3dfb..481a81484 100644 --- a/scripts/VermilionPokecenter.asm +++ b/scripts/VermilionPokecenter.asm @@ -3,21 +3,22 @@ VermilionPokecenter_Script: jp EnableAutoTextBoxDrawing VermilionPokecenter_TextPointers: - dw VermilionHealNurseText - dw VermilionPokecenterText2 - dw VermilionPokecenterText3 - dw VermilionTradeNurseText + def_text_pointers + dw_const VermilionPokecenterNurseText, TEXT_VERMILIONPOKECENTER_NURSE + dw_const VermilionPokecenterFishingGuruText, TEXT_VERMILIONPOKECENTER_FISHING_GURU + dw_const VermilionPokecenterSailorText, TEXT_VERMILIONPOKECENTER_SAILOR + dw_const VermilionPokecenterLinkReceptionistText, TEXT_VERMILIONPOKECENTER_LINK_RECEPTIONIST -VermilionHealNurseText: +VermilionPokecenterNurseText: script_pokecenter_nurse -VermilionPokecenterText2: - text_far _VermilionPokecenterText2 +VermilionPokecenterFishingGuruText: + text_far _VermilionPokecenterFishingGuruText text_end -VermilionPokecenterText3: - text_far _VermilionPokecenterText3 +VermilionPokecenterSailorText: + text_far _VermilionPokecenterSailorText text_end -VermilionTradeNurseText: +VermilionPokecenterLinkReceptionistText: script_cable_club_receptionist diff --git a/scripts/VermilionTradeHouse.asm b/scripts/VermilionTradeHouse.asm index 7fdb9f401..67ce62ee0 100644 --- a/scripts/VermilionTradeHouse.asm +++ b/scripts/VermilionTradeHouse.asm @@ -2,9 +2,10 @@ VermilionTradeHouse_Script: jp EnableAutoTextBoxDrawing VermilionTradeHouse_TextPointers: - dw VermilionHouse3Text1 + def_text_pointers + dw_const VermilionTradeHouseLittleGirlText, TEXT_VERMILIONTRADEHOUSE_LITTLE_GIRL -VermilionHouse3Text1: +VermilionTradeHouseLittleGirlText: text_asm ld a, TRADE_FOR_DUX ld [wWhichTrade], a diff --git a/scripts/VictoryRoad1F.asm b/scripts/VictoryRoad1F.asm index e07e549e1..e80e17d51 100644 --- a/scripts/VictoryRoad1F.asm +++ b/scripts/VictoryRoad1F.asm @@ -19,14 +19,15 @@ VictoryRoad1F_Script: predef_jump ReplaceTileBlock VictoryRoad1F_ScriptPointers: - dw VictoryRoad1Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const VictoryRoad1FDefaultScript, SCRIPT_VICTORYROAD1F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_VICTORYROAD1F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_VICTORYROAD1F_END_BATTLE -VictoryRoad1Script0: +VictoryRoad1FDefaultScript: CheckEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH jp nz, CheckFightingMapTrainers - ld hl, CoordsData_5da5c + ld hl, .SwitchCoords call CheckBoulderCoords jp nc, CheckFightingMapTrainers ld hl, wCurrentMapScriptFlags @@ -34,59 +35,60 @@ VictoryRoad1Script0: SetEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH ret -CoordsData_5da5c: +.SwitchCoords: dbmapcoord 17, 13 db -1 ; end VictoryRoad1F_TextPointers: - dw VictoryRoad1Text1 - dw VictoryRoad1Text2 - dw PickUpItemText - dw PickUpItemText - dw BoulderText - dw BoulderText - dw BoulderText + def_text_pointers + dw_const VictoryRoad1FCooltrainerFText, TEXT_VICTORYROAD1F_COOLTRAINER_F + dw_const VictoryRoad1FCooltrainerMText, TEXT_VICTORYROAD1F_COOLTRAINER_M + dw_const PickUpItemText, TEXT_VICTORYROAD1F_TM_SKY_ATTACK + dw_const PickUpItemText, TEXT_VICTORYROAD1F_RARE_CANDY + dw_const BoulderText, TEXT_VICTORYROAD1F_BOULDER1 + dw_const BoulderText, TEXT_VICTORYROAD1F_BOULDER2 + dw_const BoulderText, TEXT_VICTORYROAD1F_BOULDER3 VictoryRoad1TrainerHeaders: def_trainers VictoryRoad1TrainerHeader0: - trainer EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0, 2, VictoryRoad1BattleText1, VictoryRoad1EndBattleText1, VictoryRoad1AfterBattleText1 + trainer EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0, 2, VictoryRoad1FCooltrainerFBattleText, VictoryRoad1FCooltrainerFEndBattleText, VictoryRoad1FCooltrainerFAfterBattleText VictoryRoad1TrainerHeader1: - trainer EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1, 2, VictoryRoad1BattleText2, VictoryRoad1EndBattleText2, VictoryRoad1AfterBattleText2 + trainer EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1, 2, VictoryRoad1FCooltrainerMBattleText, VictoryRoad1FCooltrainerMEndBattleText, VictoryRoad1FCooltrainerMAfterBattleText db -1 ; end -VictoryRoad1Text1: +VictoryRoad1FCooltrainerFText: text_asm ld hl, VictoryRoad1TrainerHeader0 call TalkToTrainer jp TextScriptEnd -VictoryRoad1Text2: +VictoryRoad1FCooltrainerMText: text_asm ld hl, VictoryRoad1TrainerHeader1 call TalkToTrainer jp TextScriptEnd -VictoryRoad1BattleText1: - text_far _VictoryRoad1BattleText1 +VictoryRoad1FCooltrainerFBattleText: + text_far _VictoryRoad1FCooltrainerFBattleText text_end -VictoryRoad1EndBattleText1: - text_far _VictoryRoad1EndBattleText1 +VictoryRoad1FCooltrainerFEndBattleText: + text_far _VictoryRoad1FCooltrainerFEndBattleText text_end -VictoryRoad1AfterBattleText1: - text_far _VictoryRoad1AfterBattleText1 +VictoryRoad1FCooltrainerFAfterBattleText: + text_far _VictoryRoad1FCooltrainerFAfterBattleText text_end -VictoryRoad1BattleText2: - text_far _VictoryRoad1BattleText2 +VictoryRoad1FCooltrainerMBattleText: + text_far _VictoryRoad1FCooltrainerMBattleText text_end -VictoryRoad1EndBattleText2: - text_far _VictoryRoad1EndBattleText2 +VictoryRoad1FCooltrainerMEndBattleText: + text_far _VictoryRoad1FCooltrainerMEndBattleText text_end -VictoryRoad1AfterBattleText2: - text_far _VictoryRoad1AfterBattleText2 +VictoryRoad1FCooltrainerMAfterBattleText: + text_far _VictoryRoad1FCooltrainerMAfterBattleText text_end diff --git a/scripts/VictoryRoad2F.asm b/scripts/VictoryRoad2F.asm index d86c7a165..5cbd53768 100644 --- a/scripts/VictoryRoad2F.asm +++ b/scripts/VictoryRoad2F.asm @@ -2,11 +2,11 @@ VictoryRoad2F_Script: ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] - call nz, VictoryRoad2Script_517c4 + call nz, VictoryRoad2FResetBoulderEventScript ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] - call nz, VictoryRoad2Script_517c9 + call nz, VictoryRoad2FCheckBoulderEventScript call EnableAutoTextBoxDrawing ld hl, VictoryRoad2TrainerHeaders ld de, VictoryRoad2F_ScriptPointers @@ -15,188 +15,190 @@ VictoryRoad2F_Script: ld [wVictoryRoad2FCurScript], a ret -VictoryRoad2Script_517c4: +VictoryRoad2FResetBoulderEventScript: ResetEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH -VictoryRoad2Script_517c9: +; fallthrough +VictoryRoad2FCheckBoulderEventScript: CheckEvent EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1 - jr z, .asm_517da + jr z, .not_on_switch push af ld a, $15 lb bc, 4, 3 - call VictoryRoad2Script_517e2 + call VictoryRoad2FReplaceTileBlockScript pop af -.asm_517da +.not_on_switch bit 7, a ret z ld a, $1d lb bc, 7, 11 -VictoryRoad2Script_517e2: +VictoryRoad2FReplaceTileBlockScript: ld [wNewTileBlockID], a predef ReplaceTileBlock ret VictoryRoad2F_ScriptPointers: - dw VictoryRoad2Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + dw_const VictoryRoad2FDefaultScript, SCRIPT_VICTORYROAD2F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_VICTORYROAD2F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_VICTORYROAD2F_END_BATTLE -VictoryRoad2Script0: - ld hl, CoordsData_51816 +VictoryRoad2FDefaultScript: + ld hl, .SwitchCoords call CheckBoulderCoords jp nc, CheckFightingMapTrainers EventFlagAddress hl, EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1 ld a, [wCoordIndex] cp $2 - jr z, .asm_5180b + jr z, .second_switch CheckEventReuseHL EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1 SetEventReuseHL EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1 ret nz - jr .asm_51810 -.asm_5180b + jr .set_script_flag +.second_switch CheckEventAfterBranchReuseHL EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2, EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1 SetEventReuseHL EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2 ret nz -.asm_51810 +.set_script_flag ld hl, wCurrentMapScriptFlags set 5, [hl] ret -CoordsData_51816: +.SwitchCoords: dbmapcoord 1, 16 dbmapcoord 9, 16 db -1 ; end VictoryRoad2F_TextPointers: - dw VictoryRoad2Text1 - dw VictoryRoad2Text2 - dw VictoryRoad2Text3 - dw VictoryRoad2Text4 - dw VictoryRoad2Text5 - dw MoltresText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw BoulderText - dw BoulderText - dw BoulderText + def_text_pointers + dw_const VictoryRoad2FHikerText, TEXT_VICTORYROAD2F_HIKER + dw_const VictoryRoad2FSuperNerd1Text, TEXT_VICTORYROAD2F_SUPER_NERD1 + dw_const VictoryRoad2FCooltrainerMText, TEXT_VICTORYROAD2F_COOLTRAINER_M + dw_const VictoryRoad2FSuperNerd2Text, TEXT_VICTORYROAD2F_SUPER_NERD2 + dw_const VictoryRoad2FSuperNerd3Text, TEXT_VICTORYROAD2F_SUPER_NERD3 + dw_const VictoryRoad2FMoltresText, TEXT_VICTORYROAD2F_MOLTRES + dw_const PickUpItemText, TEXT_VICTORYROAD2F_TM_SUBMISSION + dw_const PickUpItemText, TEXT_VICTORYROAD2F_FULL_HEAL + dw_const PickUpItemText, TEXT_VICTORYROAD2F_TM_MEGA_KICK + dw_const PickUpItemText, TEXT_VICTORYROAD2F_GUARD_SPEC + dw_const BoulderText, TEXT_VICTORYROAD2F_BOULDER1 + dw_const BoulderText, TEXT_VICTORYROAD2F_BOULDER2 + dw_const BoulderText, TEXT_VICTORYROAD2F_BOULDER3 VictoryRoad2TrainerHeaders: def_trainers VictoryRoad2TrainerHeader0: - trainer EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0, 4, VictoryRoad2BattleText1, VictoryRoad2EndBattleText1, VictoryRoad2AfterBattleText1 + trainer EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0, 4, VictoryRoad2FHikerBattleText, VictoryRoad2FHikerEndBattleText, VictoryRoad2FHikerAfterBattleText VictoryRoad2TrainerHeader1: - trainer EVENT_BEAT_VICTORY_ROAD_2_TRAINER_1, 3, VictoryRoad2BattleText2, VictoryRoad2EndBattleText2, VictoryRoad2AfterBattleText2 + trainer EVENT_BEAT_VICTORY_ROAD_2_TRAINER_1, 3, VictoryRoad2FSuperNerd1BattleText, VictoryRoad2FSuperNerd1EndBattleText, VictoryRoad2FSuperNerd1AfterBattleText VictoryRoad2TrainerHeader2: - trainer EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2, 3, VictoryRoad2BattleText3, VictoryRoad2EndBattleText3, VictoryRoad2AfterBattleText3 + trainer EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2, 3, VictoryRoad2FCooltrainerMBattleText, VictoryRoad2FCooltrainerMEndBattleText, VictoryRoad2FCooltrainerMAfterBattleText VictoryRoad2TrainerHeader3: - trainer EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3, 1, VictoryRoad2BattleText4, VictoryRoad2EndBattleText4, VictoryRoad2AfterBattleText4 + trainer EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3, 1, VictoryRoad2FSuperNerd2BattleText, VictoryRoad2FSuperNerd2EndBattleText, VictoryRoad2FSuperNerd2AfterBattleText VictoryRoad2TrainerHeader4: - trainer EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4, 3, VictoryRoad2BattleText5, VictoryRoad2EndBattleText5, VictoryRoad2AfterBattleText5 + trainer EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4, 3, VictoryRoad2FSuperNerd3BattleText, VictoryRoad2FSuperNerd3EndBattleText, VictoryRoad2FSuperNerd3AfterBattleText MoltresTrainerHeader: - trainer EVENT_BEAT_MOLTRES, 0, MoltresBattleText, MoltresBattleText, MoltresBattleText + trainer EVENT_BEAT_MOLTRES, 0, VictoryRoad2FMoltresBattleText, VictoryRoad2FMoltresBattleText, VictoryRoad2FMoltresBattleText db -1 ; end -VictoryRoad2Text1: +VictoryRoad2FHikerText: text_asm ld hl, VictoryRoad2TrainerHeader0 call TalkToTrainer jp TextScriptEnd -VictoryRoad2Text2: +VictoryRoad2FSuperNerd1Text: text_asm ld hl, VictoryRoad2TrainerHeader1 call TalkToTrainer jp TextScriptEnd -VictoryRoad2Text3: +VictoryRoad2FCooltrainerMText: text_asm ld hl, VictoryRoad2TrainerHeader2 call TalkToTrainer jp TextScriptEnd -VictoryRoad2Text4: +VictoryRoad2FSuperNerd2Text: text_asm ld hl, VictoryRoad2TrainerHeader3 call TalkToTrainer jp TextScriptEnd -VictoryRoad2Text5: +VictoryRoad2FSuperNerd3Text: text_asm ld hl, VictoryRoad2TrainerHeader4 call TalkToTrainer jp TextScriptEnd -MoltresText: +VictoryRoad2FMoltresText: text_asm ld hl, MoltresTrainerHeader call TalkToTrainer jp TextScriptEnd -MoltresBattleText: - text_far _MoltresBattleText +VictoryRoad2FMoltresBattleText: + text_far _VictoryRoad2FMoltresBattleText text_asm ld a, MOLTRES call PlayCry call WaitForSoundToFinish jp TextScriptEnd -VictoryRoad2BattleText1: - text_far _VictoryRoad2BattleText1 +VictoryRoad2FHikerBattleText: + text_far _VictoryRoad2FHikerBattleText text_end -VictoryRoad2EndBattleText1: - text_far _VictoryRoad2EndBattleText1 +VictoryRoad2FHikerEndBattleText: + text_far _VictoryRoad2FHikerEndBattleText text_end -VictoryRoad2AfterBattleText1: - text_far _VictoryRoad2AfterBattleText1 +VictoryRoad2FHikerAfterBattleText: + text_far _VictoryRoad2FHikerAfterBattleText text_end -VictoryRoad2BattleText2: - text_far _VictoryRoad2BattleText2 +VictoryRoad2FSuperNerd1BattleText: + text_far _VictoryRoad2FSuperNerd1BattleText text_end -VictoryRoad2EndBattleText2: - text_far _VictoryRoad2EndBattleText2 +VictoryRoad2FSuperNerd1EndBattleText: + text_far _VictoryRoad2FSuperNerd1EndBattleText text_end -VictoryRoad2AfterBattleText2: - text_far _VictoryRoad2AfterBattleText2 +VictoryRoad2FSuperNerd1AfterBattleText: + text_far _VictoryRoad2FSuperNerd1AfterBattleText text_end -VictoryRoad2BattleText3: - text_far _VictoryRoad2BattleText3 +VictoryRoad2FCooltrainerMBattleText: + text_far _VictoryRoad2FCooltrainerMBattleText text_end -VictoryRoad2EndBattleText3: - text_far _VictoryRoad2EndBattleText3 +VictoryRoad2FCooltrainerMEndBattleText: + text_far _VictoryRoad2FCooltrainerMEndBattleText text_end -VictoryRoad2AfterBattleText3: - text_far _VictoryRoad2AfterBattleText3 +VictoryRoad2FCooltrainerMAfterBattleText: + text_far _VictoryRoad2FCooltrainerMAfterBattleText text_end -VictoryRoad2BattleText4: - text_far _VictoryRoad2BattleText4 +VictoryRoad2FSuperNerd2BattleText: + text_far _VictoryRoad2FSuperNerd2BattleText text_end -VictoryRoad2EndBattleText4: - text_far _VictoryRoad2EndBattleText4 +VictoryRoad2FSuperNerd2EndBattleText: + text_far _VictoryRoad2FSuperNerd2EndBattleText text_end -VictoryRoad2AfterBattleText4: - text_far _VictoryRoad2AfterBattleText4 +VictoryRoad2FSuperNerd2AfterBattleText: + text_far _VictoryRoad2FSuperNerd2AfterBattleText text_end -VictoryRoad2BattleText5: - text_far _VictoryRoad2BattleText5 +VictoryRoad2FSuperNerd3BattleText: + text_far _VictoryRoad2FSuperNerd3BattleText text_end -VictoryRoad2EndBattleText5: - text_far _VictoryRoad2EndBattleText5 +VictoryRoad2FSuperNerd3EndBattleText: + text_far _VictoryRoad2FSuperNerd3EndBattleText text_end -VictoryRoad2AfterBattleText5: - text_far _VictoryRoad2AfterBattleText5 +VictoryRoad2FSuperNerd3AfterBattleText: + text_far _VictoryRoad2FSuperNerd3AfterBattleText text_end diff --git a/scripts/VictoryRoad3F.asm b/scripts/VictoryRoad3F.asm index c0a0f1918..ce7e2175d 100644 --- a/scripts/VictoryRoad3F.asm +++ b/scripts/VictoryRoad3F.asm @@ -1,5 +1,5 @@ VictoryRoad3F_Script: - call VictoryRoad3Script_44996 + call VictoryRoad3FCheckBoulderEventScript call EnableAutoTextBoxDrawing ld hl, VictoryRoad3TrainerHeaders ld de, VictoryRoad3F_ScriptPointers @@ -8,7 +8,7 @@ VictoryRoad3F_Script: ld [wVictoryRoad3FCurScript], a ret -VictoryRoad3Script_44996: +VictoryRoad3FCheckBoulderEventScript: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] @@ -21,28 +21,29 @@ VictoryRoad3Script_44996: predef_jump ReplaceTileBlock VictoryRoad3F_ScriptPointers: - dw VictoryRoad3Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const VictoryRoad3FDefaultScript, SCRIPT_VICTORYROAD3F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_VICTORYROAD3F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_VICTORYROAD3F_END_BATTLE -VictoryRoad3Script0: +VictoryRoad3FDefaultScript: ld hl, wFlags_0xcd60 bit 7, [hl] res 7, [hl] - jp z, .asm_449fe - ld hl, .coordsData_449f9 + jp z, .check_switch_hole + ld hl, .SwitchOrHoleCoords call CheckBoulderCoords - jp nc, .asm_449fe + jp nc, .check_switch_hole ld a, [wCoordIndex] cp $1 - jr nz, .asm_449dc + jr nz, .handle_hole ld hl, wCurrentMapScriptFlags set 5, [hl] SetEvent EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH1 ret -.asm_449dc +.handle_hole CheckAndSetEvent EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH2 - jr nz, .asm_449fe + jr nz, .check_switch_hole ld a, HS_VICTORY_ROAD_3F_BOULDER ld [wMissableObjectIndex], a predef HideObject @@ -50,122 +51,123 @@ VictoryRoad3Script0: ld [wMissableObjectIndex], a predef_jump ShowObject -.coordsData_449f9: - dbmapcoord 3, 5 - dbmapcoord 23, 15 +.SwitchOrHoleCoords: + dbmapcoord 3, 5 ; switch + dbmapcoord 23, 15 ; hole db -1 ; end -.asm_449fe +.check_switch_hole ld a, VICTORY_ROAD_2F ld [wDungeonWarpDestinationMap], a - ld hl, .coordsData_449f9 + ld hl, .SwitchOrHoleCoords call IsPlayerOnDungeonWarp ld a, [wCoordIndex] cp $1 - jr nz, .asm_44a1b + jr nz, .hole ld hl, wd72d res 4, [hl] ld hl, wd732 res 4, [hl] ret -.asm_44a1b +.hole ld a, [wd72d] bit 4, a jp z, CheckFightingMapTrainers ret VictoryRoad3F_TextPointers: - dw VictoryRoad3Text1 - dw VictoryRoad3Text2 - dw VictoryRoad3Text3 - dw VictoryRoad3Text4 - dw PickUpItemText - dw PickUpItemText - dw BoulderText - dw BoulderText - dw BoulderText - dw BoulderText + def_text_pointers + dw_const VictoryRoad3FCooltrainerM1Text, TEXT_VICTORYROAD3F_COOLTRAINER_M1 + dw_const VictoryRoad3FCooltrainerF1Text, TEXT_VICTORYROAD3F_COOLTRAINER_F1 + dw_const VictoryRoad3FCooltrainerM2Text, TEXT_VICTORYROAD3F_COOLTRAINER_M2 + dw_const VictoryRoad3FCooltrainerF2Text, TEXT_VICTORYROAD3F_COOLTRAINER_F2 + dw_const PickUpItemText, TEXT_VICTORYROAD3F_MAX_REVIVE + dw_const PickUpItemText, TEXT_VICTORYROAD3F_TM_EXPLOSION + dw_const BoulderText, TEXT_VICTORYROAD3F_BOULDER1 + dw_const BoulderText, TEXT_VICTORYROAD3F_BOULDER2 + dw_const BoulderText, TEXT_VICTORYROAD3F_BOULDER3 + dw_const BoulderText, TEXT_VICTORYROAD3F_BOULDER4 VictoryRoad3TrainerHeaders: def_trainers VictoryRoad3TrainerHeader0: - trainer EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0, 1, VictoryRoad3BattleText2, VictoryRoad3EndBattleText2, VictoryRoad3AfterBattleText2 + trainer EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0, 1, VictoryRoad3FCooltrainerM1BattleText, VictoryRoad3FCooltrainerM1EndBattleText, VictoryRoad3FCooltrainerM1AfterBattleText VictoryRoad3TrainerHeader1: - trainer EVENT_BEAT_VICTORY_ROAD_3_TRAINER_1, 4, VictoryRoad3BattleText3, VictoryRoad3EndBattleText3, VictoryRoad3AfterBattleText3 + trainer EVENT_BEAT_VICTORY_ROAD_3_TRAINER_1, 4, VictoryRoad3FCooltrainerF1BattleText, VictoryRoad3FCooltrainerF1EndBattleText, VictoryRoad3FCooltrainerF1AfterBattleText VictoryRoad3TrainerHeader2: - trainer EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2, 4, VictoryRoad3BattleText4, VictoryRoad3EndBattleText4, VictoryRoad3AfterBattleText4 + trainer EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2, 4, VictoryRoad3FCooltrainerM2BattleText, VictoryRoad3FCooltrainerM2EndBattleText, VictoryRoad3FCooltrainerM2AfterBattleText VictoryRoad3TrainerHeader3: - trainer EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3, 4, VictoryRoad3BattleText5, VictoryRoad3EndBattleText5, VictoryRoad3AfterBattleText5 + trainer EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3, 4, VictoryRoad3FCooltrainerF2BattleText, VictoryRoad3FCooltrainerF2EndBattleText, VictoryRoad3FCooltrainerF2AfterBattleText db -1 ; end -VictoryRoad3Text1: +VictoryRoad3FCooltrainerM1Text: text_asm ld hl, VictoryRoad3TrainerHeader0 call TalkToTrainer jp TextScriptEnd -VictoryRoad3Text2: +VictoryRoad3FCooltrainerF1Text: text_asm ld hl, VictoryRoad3TrainerHeader1 call TalkToTrainer jp TextScriptEnd -VictoryRoad3Text3: +VictoryRoad3FCooltrainerM2Text: text_asm ld hl, VictoryRoad3TrainerHeader2 call TalkToTrainer jp TextScriptEnd -VictoryRoad3Text4: +VictoryRoad3FCooltrainerF2Text: text_asm ld hl, VictoryRoad3TrainerHeader3 call TalkToTrainer jp TextScriptEnd -VictoryRoad3BattleText2: - text_far _VictoryRoad3BattleText2 +VictoryRoad3FCooltrainerM1BattleText: + text_far _VictoryRoad3FCooltrainerM1BattleText text_end -VictoryRoad3EndBattleText2: - text_far _VictoryRoad3EndBattleText2 +VictoryRoad3FCooltrainerM1EndBattleText: + text_far _VictoryRoad3FCooltrainerM1EndBattleText text_end -VictoryRoad3AfterBattleText2: - text_far _VictoryRoad3AfterBattleText2 +VictoryRoad3FCooltrainerM1AfterBattleText: + text_far _VictoryRoad3FCooltrainerM1AfterBattleText text_end -VictoryRoad3BattleText3: - text_far _VictoryRoad3BattleText3 +VictoryRoad3FCooltrainerF1BattleText: + text_far _VictoryRoad3FCooltrainerF1BattleText text_end -VictoryRoad3EndBattleText3: - text_far _VictoryRoad3EndBattleText3 +VictoryRoad3FCooltrainerF1EndBattleText: + text_far _VictoryRoad3FCooltrainerF1EndBattleText text_end -VictoryRoad3AfterBattleText3: - text_far _VictoryRoad3AfterBattleText3 +VictoryRoad3FCooltrainerF1AfterBattleText: + text_far _VictoryRoad3FCooltrainerF1AfterBattleText text_end -VictoryRoad3BattleText4: - text_far _VictoryRoad3BattleText4 +VictoryRoad3FCooltrainerM2BattleText: + text_far _VictoryRoad3FCooltrainerM2BattleText text_end -VictoryRoad3EndBattleText4: - text_far _VictoryRoad3EndBattleText4 +VictoryRoad3FCooltrainerM2EndBattleText: + text_far _VictoryRoad3FCooltrainerM2EndBattleText text_end -VictoryRoad3AfterBattleText4: - text_far _VictoryRoad3AfterBattleText4 +VictoryRoad3FCooltrainerM2AfterBattleText: + text_far _VictoryRoad3FCooltrainerM2AfterBattleText text_end -VictoryRoad3BattleText5: - text_far _VictoryRoad3BattleText5 +VictoryRoad3FCooltrainerF2BattleText: + text_far _VictoryRoad3FCooltrainerF2BattleText text_end -VictoryRoad3EndBattleText5: - text_far _VictoryRoad3EndBattleText5 +VictoryRoad3FCooltrainerF2EndBattleText: + text_far _VictoryRoad3FCooltrainerF2EndBattleText text_end -VictoryRoad3AfterBattleText5: - text_far _VictoryRoad3AfterBattleText5 +VictoryRoad3FCooltrainerF2AfterBattleText: + text_far _VictoryRoad3FCooltrainerF2AfterBattleText text_end diff --git a/scripts/ViridianCity.asm b/scripts/ViridianCity.asm index 532451c95..efd2db211 100644 --- a/scripts/ViridianCity.asm +++ b/scripts/ViridianCity.asm @@ -5,16 +5,17 @@ ViridianCity_Script: jp CallFunctionInTable ViridianCity_ScriptPointers: - dw ViridianCityScript0 - dw ViridianCityScript1 - dw ViridianCityScript2 - dw ViridianCityScript3 + def_script_pointers + dw_const ViridianCityDefaultScript, SCRIPT_VIRIDIANCITY_DEFAULT + dw_const ViridianCityOldManStartCatchTrainingScript, SCRIPT_VIRIDIANCITY_OLD_MAN_START_CATCH_TRAINING + dw_const ViridianCityOldManEndCatchTrainingScript, SCRIPT_VIRIDIANCITY_OLD_MAN_END_CATCH_TRAINING + dw_const ViridianCityPlayerMovingDownScript, SCRIPT_VIRIDIANCITY_PLAYER_MOVING_DOWN -ViridianCityScript0: - call ViridianCityScript_1900b - jp ViridianCityScript_1903d +ViridianCityDefaultScript: + call ViridianCityCheckGymOpenScript + jp ViridianCityCheckGotPokedexScript -ViridianCityScript_1900b: +ViridianCityCheckGymOpenScript: CheckEvent EVENT_VIRIDIAN_GYM_OPEN ret nz ld a, [wObtainedBadges] @@ -29,17 +30,17 @@ ViridianCityScript_1900b: ld a, [wXCoord] cp 32 ret nz - ld a, $e + ld a, TEXT_VIRIDIANCITY_GYM_LOCKED ldh [hSpriteIndexOrTextID], a call DisplayTextID xor a ldh [hJoyHeld], a - call ViridianCityScript_190cf - ld a, $3 + call ViridianCityMovePlayerDownScript + ld a, SCRIPT_VIRIDIANCITY_PLAYER_MOVING_DOWN ld [wViridianCityCurScript], a ret -ViridianCityScript_1903d: +ViridianCityCheckGotPokedexScript: CheckEvent EVENT_GOT_POKEDEX ret nz ld a, [wYCoord] @@ -48,17 +49,17 @@ ViridianCityScript_1903d: ld a, [wXCoord] cp 19 ret nz - ld a, $5 + ld a, TEXT_VIRIDIANCITY_OLD_MAN_SLEEPY ldh [hSpriteIndexOrTextID], a call DisplayTextID xor a ldh [hJoyHeld], a - call ViridianCityScript_190cf - ld a, $3 + call ViridianCityMovePlayerDownScript + ld a, SCRIPT_VIRIDIANCITY_PLAYER_MOVING_DOWN ld [wViridianCityCurScript], a ret -ViridianCityScript1: +ViridianCityOldManStartCatchTrainingScript: ld a, [wSprite03StateData1YPixels] ldh [hSpriteScreenYCoord], a ld a, [wSprite03StateData1XPixels] @@ -77,11 +78,11 @@ ViridianCityScript1: ld [wCurEnemyLVL], a ld a, WEEDLE ld [wCurOpponent], a - ld a, $2 + ld a, SCRIPT_VIRIDIANCITY_OLD_MAN_END_CATCH_TRAINING ld [wViridianCityCurScript], a ret -ViridianCityScript2: +ViridianCityOldManEndCatchTrainingScript: ldh a, [hSpriteScreenYCoord] ld [wSprite03StateData1YPixels], a ldh a, [hSpriteScreenXCoord] @@ -94,26 +95,26 @@ ViridianCityScript2: call Delay3 xor a ld [wJoyIgnore], a - ld a, $f + ld a, TEXT_VIRIDIANCITY_OLD_MAN_YOU_NEED_TO_WEAKEN_THE_TARGET ldh [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [wBattleType], a ld [wJoyIgnore], a - ld a, $0 + ld a, SCRIPT_VIRIDIANCITY_DEFAULT ld [wViridianCityCurScript], a ret -ViridianCityScript3: +ViridianCityPlayerMovingDownScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz call Delay3 - ld a, 0 + ld a, SCRIPT_VIRIDIANCITY_DEFAULT ld [wViridianCityCurScript], a ret -ViridianCityScript_190cf: +ViridianCityMovePlayerDownScript: call StartSimulatingJoypadStates ld a, $1 ld [wSimulatedJoypadStatesIndex], a @@ -125,153 +126,154 @@ ViridianCityScript_190cf: ret ViridianCity_TextPointers: - dw ViridianCityText1 - dw ViridianCityText2 - dw ViridianCityText3 - dw ViridianCityText4 - dw ViridianCityText5 - dw ViridianCityText6 - dw ViridianCityText7 - dw ViridianCityText8 - dw ViridianCityText9 - dw ViridianCityText10 - dw MartSignText - dw PokeCenterSignText - dw ViridianCityText13 - dw ViridianCityText14 - dw ViridianCityText15 - -ViridianCityText1: - text_far _ViridianCityText1 + def_text_pointers + dw_const ViridianCityYoungster1Text, TEXT_VIRIDIANCITY_YOUNGSTER1 + dw_const ViridianCityGambler1Text, TEXT_VIRIDIANCITY_GAMBLER1 + dw_const ViridianCityYoungster2Text, TEXT_VIRIDIANCITY_YOUNGSTER2 + dw_const ViridianCityGirlText, TEXT_VIRIDIANCITY_GIRL + dw_const ViridianCityOldManSleepyText, TEXT_VIRIDIANCITY_OLD_MAN_SLEEPY + dw_const ViridianCityFisherText, TEXT_VIRIDIANCITY_FISHER + dw_const ViridianCityOldManText, TEXT_VIRIDIANCITY_OLD_MAN + dw_const ViridianCitySignText, TEXT_VIRIDIANCITY_SIGN + dw_const ViridianCityTrainerTips1Text, TEXT_VIRIDIANCITY_TRAINER_TIPS1 + dw_const ViridianCityTrainerTips2Text, TEXT_VIRIDIANCITY_TRAINER_TIPS2 + dw_const MartSignText, TEXT_VIRIDIANCITY_MART_SIGN + dw_const PokeCenterSignText, TEXT_VIRIDIANCITY_POKECENTER_SIGN + dw_const ViridianCityGymSignText, TEXT_VIRIDIANCITY_GYM_SIGN + dw_const ViridianCityGymLockedText, TEXT_VIRIDIANCITY_GYM_LOCKED + dw_const ViridianCityOldManYouNeedToWeakenTheTargetText, TEXT_VIRIDIANCITY_OLD_MAN_YOU_NEED_TO_WEAKEN_THE_TARGET + +ViridianCityYoungster1Text: + text_far _ViridianCityYoungster1Text text_end -ViridianCityText2: +ViridianCityGambler1Text: text_asm ld a, [wObtainedBadges] cp ~(1 << BIT_EARTHBADGE) - ld hl, ViridianCityText_19127 - jr z, .done + ld hl, .GymLeaderReturnedText + jr z, .print_text CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI - jr nz, .done - ld hl, ViridianCityText_19122 -.done + jr nz, .print_text + ld hl, .GymAlwaysClosedText +.print_text call PrintText jp TextScriptEnd -ViridianCityText_19122: - text_far _ViridianCityText_19122 +.GymAlwaysClosedText: + text_far _ViridianCityGambler1GymAlwaysClosedText text_end -ViridianCityText_19127: - text_far _ViridianCityText_19127 +.GymLeaderReturnedText: + text_far _ViridianCityGambler1GymLeaderReturnedText text_end -ViridianCityText3: +ViridianCityYoungster2Text: text_asm - ld hl, ViridianCityText_1914d + ld hl, .YouWantToKnowAboutText call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a jr nz, .no - ld hl, ViridianCityText_19157 + ld hl, .CaterpieAndWeedleDescriptionText call PrintText - jr .done + jr .text_script_end .no - ld hl, ViridianCityText_19152 + ld hl, .OkThenText call PrintText -.done +.text_script_end jp TextScriptEnd -ViridianCityText_1914d: - text_far _ViridianCityText_1914d +.YouWantToKnowAboutText: + text_far _ViridianCityYoungster2YouWantToKnowAboutText text_end -ViridianCityText_19152: - text_far _ViridianCityText_19152 +.OkThenText: + text_far ViridianCityYoungster2OkThenText text_end -ViridianCityText_19157: - text_far _ViridianCityText_19157 +.CaterpieAndWeedleDescriptionText: + text_far ViridianCityYoungster2CaterpieAndWeedleDescriptionText text_end -ViridianCityText4: +ViridianCityGirlText: text_asm CheckEvent EVENT_GOT_POKEDEX - jr nz, .gotPokedex - ld hl, ViridianCityText_19175 + jr nz, .got_pokedex + ld hl, .HasntHadHisCoffeeYetText call PrintText - jr .done -.gotPokedex - ld hl, ViridianCityText_1917a + jr .text_script_end +.got_pokedex + ld hl, .WhenIGoShopText call PrintText -.done +.text_script_end jp TextScriptEnd -ViridianCityText_19175: - text_far _ViridianCityText_19175 +.HasntHadHisCoffeeYetText: + text_far _ViridianCityGirlHasntHadHisCoffeeYetText text_end -ViridianCityText_1917a: - text_far _ViridianCityText_1917a +.WhenIGoShopText: + text_far _ViridianCityGirlWhenIGoShopText text_end -ViridianCityText5: +ViridianCityOldManSleepyText: text_asm - ld hl, ViridianCityText_19191 + ld hl, .PrivatePropertyText call PrintText - call ViridianCityScript_190cf - ld a, $3 + call ViridianCityMovePlayerDownScript + ld a, SCRIPT_VIRIDIANCITY_PLAYER_MOVING_DOWN ld [wViridianCityCurScript], a jp TextScriptEnd -ViridianCityText_19191: - text_far _ViridianCityText_19191 +.PrivatePropertyText: + text_far _ViridianCityOldManSleepyPrivatePropertyText text_end -ViridianCityText6: +ViridianCityFisherText: text_asm CheckEvent EVENT_GOT_TM42 jr nz, .got_item - ld hl, ViridianCityText_191ca + ld hl, .YouCanHaveThisText call PrintText lb bc, TM_DREAM_EATER, 1 call GiveItem jr nc, .bag_full - ld hl, ReceivedTM42Text + ld hl, .ReceivedTM42Text call PrintText SetEvent EVENT_GOT_TM42 jr .done .bag_full - ld hl, TM42NoRoomText + ld hl, .TM42NoRoomText call PrintText jr .done .got_item - ld hl, TM42Explanation + ld hl, .TM42ExplanationText call PrintText .done jp TextScriptEnd -ViridianCityText_191ca: - text_far _ViridianCityText_191ca +.YouCanHaveThisText: + text_far ViridianCityFisherYouCanHaveThisText text_end -ReceivedTM42Text: - text_far _ReceivedTM42Text +.ReceivedTM42Text: + text_far _ViridianCityFisherReceivedTM42Text sound_get_item_2 text_end -TM42Explanation: - text_far _TM42Explanation +.TM42ExplanationText: + text_far _ViridianCityFisherTM42ExplanationText text_end -TM42NoRoomText: - text_far _TM42NoRoomText +.TM42NoRoomText: + text_far _ViridianCityFisherTM42NoRoomText text_end -ViridianCityText7: +ViridianCityOldManText: text_asm - ld hl, ViridianCityText_1920a + ld hl, .HadMyCoffeeNowText call PrintText ld c, 2 call DelayFrames @@ -279,49 +281,49 @@ ViridianCityText7: ld a, [wCurrentMenuItem] and a jr z, .refused - ld hl, ViridianCityText_1920f + ld hl, .KnowHowToCatchPokemonText call PrintText - ld a, $1 + ld a, SCRIPT_VIRIDIANCITY_OLD_MAN_START_CATCH_TRAINING ld [wViridianCityCurScript], a jr .done .refused - ld hl, ViridianCityText_19214 + ld hl, .TimeIsMoneyText call PrintText .done jp TextScriptEnd -ViridianCityText_1920a: - text_far _ViridianCityText_1920a +.HadMyCoffeeNowText: + text_far _ViridianCityOldManHadMyCoffeeNowText text_end -ViridianCityText_1920f: - text_far _ViridianCityText_1920f +.KnowHowToCatchPokemonText: + text_far _ViridianCityOldManKnowHowToCatchPokemonText text_end -ViridianCityText_19214: - text_far _ViridianCityText_19214 +.TimeIsMoneyText: + text_far _ViridianCityOldManTimeIsMoneyText text_end -ViridianCityText15: - text_far _ViridianCityText_19219 +ViridianCityOldManYouNeedToWeakenTheTargetText: + text_far _ViridianCityOldManYouNeedToWeakenTheTargetText text_end -ViridianCityText8: - text_far _ViridianCityText8 +ViridianCitySignText: + text_far _ViridianCitySignText text_end -ViridianCityText9: - text_far _ViridianCityText9 +ViridianCityTrainerTips1Text: + text_far _ViridianCityTrainerTips1Text text_end -ViridianCityText10: - text_far _ViridianCityText10 +ViridianCityTrainerTips2Text: + text_far _ViridianCityTrainerTips2Text text_end -ViridianCityText13: - text_far _ViridianCityText13 +ViridianCityGymSignText: + text_far _ViridianCityGymSignText text_end -ViridianCityText14: - text_far _ViridianCityText14 +ViridianCityGymLockedText: + text_far _ViridianCityGymLockedText text_end diff --git a/scripts/ViridianForest.asm b/scripts/ViridianForest.asm index 140816949..4eeb92265 100644 --- a/scripts/ViridianForest.asm +++ b/scripts/ViridianForest.asm @@ -8,118 +8,120 @@ ViridianForest_Script: ret ViridianForest_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_VIRIDIANFOREST_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_VIRIDIANFOREST_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_VIRIDIANFOREST_END_BATTLE ViridianForest_TextPointers: - dw ViridianForestText1 - dw ViridianForestText2 - dw ViridianForestText3 - dw ViridianForestText4 - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw ViridianForestText8 - dw ViridianForestText9 - dw ViridianForestText10 - dw ViridianForestText11 - dw ViridianForestText12 - dw ViridianForestText13 - dw ViridianForestText14 + def_text_pointers + dw_const ViridianForestYoungster1Text, TEXT_VIRIDIANFOREST_YOUNGSTER1 + dw_const ViridianForestYoungster2Text, TEXT_VIRIDIANFOREST_YOUNGSTER2 + dw_const ViridianForestYoungster3Text, TEXT_VIRIDIANFOREST_YOUNGSTER3 + dw_const ViridianForestYoungster4Text, TEXT_VIRIDIANFOREST_YOUNGSTER4 + dw_const PickUpItemText, TEXT_VIRIDIANFOREST_ANTIDOTE + dw_const PickUpItemText, TEXT_VIRIDIANFOREST_POTION + dw_const PickUpItemText, TEXT_VIRIDIANFOREST_POKE_BALL + dw_const ViridianForestYoungster5Text, TEXT_VIRIDIANFOREST_YOUNGSTER5 + dw_const ViridianForestTrainerTips1Text, TEXT_VIRIDIANFOREST_TRAINER_TIPS1 + dw_const ViridianForestUseAntidoteSignText, TEXT_VIRIDIANFOREST_USE_ANTIDOTE_SIGN + dw_const ViridianForestTrainerTips2Text, TEXT_VIRIDIANFOREST_TRAINER_TIPS2 + dw_const ViridianForestTrainerTips3Text, TEXT_VIRIDIANFOREST_TRAINER_TIPS3 + dw_const ViridianForestTrainerTips4Text, TEXT_VIRIDIANFOREST_TRAINER_TIPS4 + dw_const ViridianForestLeavingSignText, TEXT_VIRIDIANFOREST_LEAVING_SIGN ViridianForestTrainerHeaders: def_trainers 2 ViridianForestTrainerHeader0: - trainer EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0, 4, ViridianForestBattleText1, ViridianForestEndBattleText1, ViridianForestAfterBattleText1 + trainer EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0, 4, ViridianForestYoungster2BattleText, ViridianForestYoungster2EndBattleText, ViridianForestYoungster2AfterBattleText ViridianForestTrainerHeader1: - trainer EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_1, 4, ViridianForestBattleText2, ViridianForestEndBattleText2, ViridianForestAfterBattleText2 + trainer EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_1, 4, ViridianForestYoungster3BattleText, ViridianForestYoungster3EndBattleText, ViridianForestYoungster3AfterBattleText ViridianForestTrainerHeader2: - trainer EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_2, 1, ViridianForestBattleText3, ViridianForestEndBattleText3, ViridianForestAfterBattleText3 + trainer EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_2, 1, ViridianForestYoungster4BattleText, ViridianForestYoungster4EndBattleText, ViridianForestYoungster4AfterBattleText db -1 ; end -ViridianForestText1: - text_far _ViridianForestText1 +ViridianForestYoungster1Text: + text_far _ViridianForestYoungster1Text text_end -ViridianForestText2: +ViridianForestYoungster2Text: text_asm ld hl, ViridianForestTrainerHeader0 call TalkToTrainer jp TextScriptEnd -ViridianForestText3: +ViridianForestYoungster3Text: text_asm ld hl, ViridianForestTrainerHeader1 call TalkToTrainer jp TextScriptEnd -ViridianForestText4: +ViridianForestYoungster4Text: text_asm ld hl, ViridianForestTrainerHeader2 call TalkToTrainer jp TextScriptEnd -ViridianForestBattleText1: - text_far _ViridianForestBattleText1 +ViridianForestYoungster2BattleText: + text_far _ViridianForestYoungster2BattleText text_end -ViridianForestEndBattleText1: - text_far _ViridianForestEndBattleText1 +ViridianForestYoungster2EndBattleText: + text_far _ViridianForestYoungster2EndBattleText text_end -ViridianForestAfterBattleText1: - text_far _ViridianFrstAfterBattleText1 +ViridianForestYoungster2AfterBattleText: + text_far _ViridianForestYoungster2AfterBattleText text_end -ViridianForestBattleText2: - text_far _ViridianForestBattleText2 +ViridianForestYoungster3BattleText: + text_far _ViridianForestYoungster3BattleText text_end -ViridianForestEndBattleText2: - text_far _ViridianForestEndBattleText2 +ViridianForestYoungster3EndBattleText: + text_far _ViridianForestYoungster3EndBattleText text_end -ViridianForestAfterBattleText2: - text_far _ViridianFrstAfterBattleText2 +ViridianForestYoungster3AfterBattleText: + text_far _ViridianForestYoungster3AfterBattleText text_end -ViridianForestBattleText3: - text_far _ViridianForestBattleText3 +ViridianForestYoungster4BattleText: + text_far _ViridianForestYoungster4BattleText text_end -ViridianForestEndBattleText3: - text_far _ViridianForestEndBattleText3 +ViridianForestYoungster4EndBattleText: + text_far _ViridianForestYoungster4EndBattleText text_end -ViridianForestAfterBattleText3: - text_far _ViridianFrstAfterBattleText3 +ViridianForestYoungster4AfterBattleText: + text_far _ViridianForestYoungster4AfterBattleText text_end -ViridianForestText8: - text_far _ViridianForestText8 +ViridianForestYoungster5Text: + text_far _ViridianForestYoungster5Text text_end -ViridianForestText9: - text_far _ViridianForestText9 +ViridianForestTrainerTips1Text: + text_far _ViridianForestTrainerTips1Text text_end -ViridianForestText10: - text_far _ViridianForestText10 +ViridianForestUseAntidoteSignText: + text_far _ViridianForestUseAntidoteSignText text_end -ViridianForestText11: - text_far _ViridianForestText11 +ViridianForestTrainerTips2Text: + text_far _ViridianForestTrainerTips2Text text_end -ViridianForestText12: - text_far _ViridianForestText12 +ViridianForestTrainerTips3Text: + text_far _ViridianForestTrainerTips3Text text_end -ViridianForestText13: - text_far _ViridianForestText13 +ViridianForestTrainerTips4Text: + text_far _ViridianForestTrainerTips4Text text_end -ViridianForestText14: - text_far _ViridianForestText14 +ViridianForestLeavingSignText: + text_far _ViridianForestLeavingSignText text_end diff --git a/scripts/ViridianForestNorthGate.asm b/scripts/ViridianForestNorthGate.asm index 6aef26d3d..9b027e993 100644 --- a/scripts/ViridianForestNorthGate.asm +++ b/scripts/ViridianForestNorthGate.asm @@ -2,13 +2,14 @@ ViridianForestNorthGate_Script: jp EnableAutoTextBoxDrawing ViridianForestNorthGate_TextPointers: - dw ViridianForestExitText1 - dw ViridianForestExitText2 + def_text_pointers + dw_const ViridianForestNorthGateSuperNerdText, TEXT_VIRIDIANFORESTNORTHGATE_SUPER_NERD + dw_const ViridianForestNorthGateGrampsText, TEXT_VIRIDIANFORESTNORTHGATE_GRAMPS -ViridianForestExitText1: - text_far _ViridianForestExitText1 +ViridianForestNorthGateSuperNerdText: + text_far _ViridianForestNorthGateSuperNerdText text_end -ViridianForestExitText2: - text_far _ViridianForestExitText2 +ViridianForestNorthGateGrampsText: + text_far _ViridianForestNorthGateGrampsText text_end diff --git a/scripts/ViridianForestSouthGate.asm b/scripts/ViridianForestSouthGate.asm index 996ac2aec..29bbd95fe 100644 --- a/scripts/ViridianForestSouthGate.asm +++ b/scripts/ViridianForestSouthGate.asm @@ -2,13 +2,14 @@ ViridianForestSouthGate_Script: jp EnableAutoTextBoxDrawing ViridianForestSouthGate_TextPointers: - dw ViridianForestEntranceText1 - dw ViridianForestEntranceText2 + def_text_pointers + dw_const ViridianForestSouthGateGirlText, TEXT_VIRIDIANFORESTSOUTHGATE_GIRL + dw_const ViridianForestSouthGateLittleGirlText, TEXT_VIRIDIANFORESTSOUTHGATE_LITTLE_GIRL -ViridianForestEntranceText1: - text_far _ViridianForestEntranceText1 +ViridianForestSouthGateGirlText: + text_far _ViridianForestSouthGateGirlText text_end -ViridianForestEntranceText2: - text_far _ViridianForestEntranceText2 +ViridianForestSouthGateLittleGirlText: + text_far _ViridianForestSouthGateLittleGirlText text_end diff --git a/scripts/ViridianGym.asm b/scripts/ViridianGym.asm index 0b90383c8..5162d3bc0 100644 --- a/scripts/ViridianGym.asm +++ b/scripts/ViridianGym.asm @@ -24,13 +24,14 @@ ViridianGymResetScripts: ret ViridianGym_ScriptPointers: - dw ViridianGymScript0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw ViridianGymGiovanniPostBattle - dw ViridianGymScript4 - -ViridianGymScript0: + def_script_pointers + dw_const ViridianGymDefaultScript, SCRIPT_VIRIDIANGYM_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_VIRIDIANGYM_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_VIRIDIANGYM_END_BATTLE + dw_const ViridianGymGiovanniPostBattle, SCRIPT_VIRIDIANGYM_GIOVANNI_POST_BATTLE + dw_const ViridianGymPlayerSpinningScript, SCRIPT_VIRIDIANGYM_PLAYER_SPINNING + +ViridianGymDefaultScript: ld a, [wYCoord] ld b, a ld a, [wXCoord] @@ -44,9 +45,9 @@ ViridianGymScript0: set 7, [hl] ld a, SFX_ARROW_TILES call PlaySound - ld a, $ff + ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a - ld a, $4 + ld a, SCRIPT_VIRIDIANGYM_PLAYER_SPINNING ld [wCurMapScript], a ret @@ -113,7 +114,7 @@ ViridianGymArrowMovement12: db D_LEFT, 12 db -1 ; end -ViridianGymScript4: +ViridianGymPlayerSpinningScript: ld a, [wSimulatedJoypadStatesIndex] and a jr nz, .ViridianGymLoadSpinnerArrow @@ -121,7 +122,7 @@ ViridianGymScript4: ld [wJoyIgnore], a ld hl, wd736 res 7, [hl] - ld a, $0 + ld a, SCRIPT_VIRIDIANGYM_DEFAULT ld [wCurMapScript], a ret .ViridianGymLoadSpinnerArrow @@ -131,27 +132,27 @@ ViridianGymGiovanniPostBattle: ld a, [wIsInBattle] cp $ff jp z, ViridianGymResetScripts - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ; fallthrough ViridianGymReceiveTM27: - ld a, $c + ld a, TEXT_VIRIDIANGYM_GIOVANNI_EARTH_BADGE_INFO ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI lb bc, TM_FISSURE, 1 call GiveItem - jr nc, .BagFull - ld a, $d + jr nc, .bag_full + ld a, TEXT_VIRIDIANGYM_GIOVANNI_RECEIVED_TM27 ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM27 - jr .gymVictory -.BagFull - ld a, $e + jr .gym_victory +.bag_full + ld a, TEXT_VIRIDIANGYM_GIOVANNI_TM27_NO_ROOM ldh [hSpriteIndexOrTextID], a call DisplayTextID -.gymVictory +.gym_victory ld hl, wObtainedBadges set BIT_EARTHBADGE, [hl] ld hl, wBeatGymFlags @@ -167,42 +168,43 @@ ViridianGymReceiveTM27: jp ViridianGymResetScripts ViridianGym_TextPointers: - dw GiovanniText - dw ViridianGymTrainerText1 - dw ViridianGymTrainerText2 - dw ViridianGymTrainerText3 - dw ViridianGymTrainerText4 - dw ViridianGymTrainerText5 - dw ViridianGymTrainerText6 - dw ViridianGymTrainerText7 - dw ViridianGymTrainerText8 - dw ViridianGymGuideText - dw PickUpItemText - dw GiovanniEarthBadgeInfoText - dw ReceivedTM27Text - dw TM27NoRoomText + def_text_pointers + dw_const ViridianGymGiovanniText, TEXT_VIRIDIANGYM_GIOVANNI + dw_const ViridianGymCooltrainerM1Text, TEXT_VIRIDIANGYM_COOLTRAINER_M1 + dw_const ViridianGymHiker1Text, TEXT_VIRIDIANGYM_HIKER1 + dw_const ViridianGymRocker1Text, TEXT_VIRIDIANGYM_ROCKER1 + dw_const ViridianGymHiker2Text, TEXT_VIRIDIANGYM_HIKER2 + dw_const ViridianGymCooltrainerM2Text, TEXT_VIRIDIANGYM_COOLTRAINER_M2 + dw_const ViridianGymHiker3Text, TEXT_VIRIDIANGYM_HIKER3 + dw_const ViridianGymRocker2Text, TEXT_VIRIDIANGYM_ROCKER2 + dw_const ViridianGymCooltrainerM3Text, TEXT_VIRIDIANGYM_COOLTRAINER_M3 + dw_const ViridianGymGymGuideText, TEXT_VIRIDIANGYM_GYM_GUIDE + dw_const PickUpItemText, TEXT_VIRIDIANGYM_REVIVE + dw_const ViridianGymGiovanniEarthBadgeInfoText, TEXT_VIRIDIANGYM_GIOVANNI_EARTH_BADGE_INFO + dw_const ViridianGymGiovanniReceivedTM27Text, TEXT_VIRIDIANGYM_GIOVANNI_RECEIVED_TM27 + dw_const ViridianGymGiovanniTM27NoRoomText, TEXT_VIRIDIANGYM_GIOVANNI_TM27_NO_ROOM ViridianGymTrainerHeaders: def_trainers 2 ViridianGymTrainerHeader0: - trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0, 4, ViridianGymBattleText1, ViridianGymEndBattleText1, ViridianGymAfterBattleText1 + trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0, 4, ViridianGymCooltrainerM1BattleText, ViridianGymCooltrainerM1EndBattleText, ViridianGymCooltrainerM1AfterBattleText ViridianGymTrainerHeader1: - trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_1, 4, ViridianGymBattleText2, ViridianGymEndBattleText2, ViridianGymAfterBattleText2 + trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_1, 4, ViridianGymHiker1BattleText, ViridianGymHiker1EndBattleText, ViridianGymHiker1AfterBattleText ViridianGymTrainerHeader2: - trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_2, 4, ViridianGymBattleText3, ViridianGymEndBattleText3, ViridianGymAfterBattleText3 + trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_2, 4, ViridianGymRocker1BattleText, ViridianGymRocker1EndBattleText, ViridianGymRocker1AfterBattleText ViridianGymTrainerHeader3: - trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_3, 2, ViridianGymBattleText4, ViridianGymEndBattleText4, ViridianGymAfterBattleText4 + trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_3, 2, ViridianGymHiker2BattleText, ViridianGymHiker2EndBattleText, ViridianGymHiker2AfterBattleText ViridianGymTrainerHeader4: - trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_4, 3, ViridianGymBattleText5, ViridianGymEndBattleText5, ViridianGymAfterBattleText5 + trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_4, 3, ViridianGymCooltrainerM2BattleText, ViridianGymCooltrainerM2EndBattleText, ViridianGymCooltrainerM2AfterBattleText ViridianGymTrainerHeader5: - trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_5, 4, ViridianGymBattleText6, ViridianGymEndBattleText6, ViridianGymAfterBattleText6 + trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_5, 4, ViridianGymHiker3BattleText, ViridianGymHiker3EndBattleText, ViridianGymHiker3AfterBattleText ViridianGymTrainerHeader6: - trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_6, 3, ViridianGymBattleText7, ViridianGymEndBattleText7, ViridianGymAfterBattleText7 + trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_6, 3, ViridianGymRocker2BattleText, ViridianGymRocker2EndBattleText, ViridianGymRocker2AfterBattleText ViridianGymTrainerHeader7: - trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7, 4, ViridianGymBattleText8, ViridianGymEndBattleText8, ViridianGymAfterBattleText8 + trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7, 4, ViridianGymCooltrainerM3BattleText, ViridianGymCooltrainerM3EndBattleText, ViridianGymCooltrainerM3AfterBattleText db -1 ; end -GiovanniText: +ViridianGymGiovanniText: text_asm CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI jr z, .beforeBeat @@ -210,11 +212,11 @@ GiovanniText: jr nz, .afterBeat call z, ViridianGymReceiveTM27 call DisableWaitingAfterTextDisplay - jr .done + jr .text_script_end .afterBeat ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, GiovanniPostBattleAdviceText + ld hl, .PostBattleAdviceText call PrintText call GBFadeOutToBlack ld a, HS_VIRIDIAN_GYM_GIOVANNI @@ -223,15 +225,15 @@ GiovanniText: call UpdateSprites call Delay3 call GBFadeInFromBlack - jr .done + jr .text_script_end .beforeBeat - ld hl, GiovanniPreBattleText + ld hl, .PreBattleText call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, ReceivedEarthBadgeText - ld de, ReceivedEarthBadgeText + ld hl, .ReceivedEarthBadgeText + ld de, .ReceivedEarthBadgeText call SaveEndBattleTextPointers ldh a, [hSpriteIndex] ld [wSpriteIndex], a @@ -239,186 +241,186 @@ GiovanniText: call InitBattleEnemyParameters ld a, $8 ld [wGymLeaderNo], a - ld a, $3 + ld a, SCRIPT_VIRIDIANGYM_GIOVANNI_POST_BATTLE ld [wViridianGymCurScript], a -.done +.text_script_end jp TextScriptEnd -GiovanniPreBattleText: - text_far _GiovanniPreBattleText +.PreBattleText: + text_far _ViridianGymGiovanniPreBattleText text_end -ReceivedEarthBadgeText: - text_far _ReceivedEarthBadgeText +.ReceivedEarthBadgeText: + text_far _ViridianGymGiovanniReceivedEarthBadgeText sound_level_up ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded text_end -GiovanniPostBattleAdviceText: - text_far _GiovanniPostBattleAdviceText +.PostBattleAdviceText: + text_far _ViridianGymGiovanniPostBattleAdviceText text_waitbutton text_end -GiovanniEarthBadgeInfoText: - text_far _GiovanniEarthBadgeInfoText +ViridianGymGiovanniEarthBadgeInfoText: + text_far _ViridianGymGiovanniEarthBadgeInfoText text_end -ReceivedTM27Text: - text_far _ReceivedTM27Text +ViridianGymGiovanniReceivedTM27Text: + text_far _ViridianGymGiovanniReceivedTM27Text sound_get_item_1 -TM27ExplanationText: - text_far _TM27ExplanationText +ViridianGymGiovanniTM27ExplanationText: + text_far _ViridianGymGiovanniTM27ExplanationText text_end -TM27NoRoomText: - text_far _TM27NoRoomText +ViridianGymGiovanniTM27NoRoomText: + text_far _ViridianGymGiovanniTM27NoRoomText text_end -ViridianGymTrainerText1: +ViridianGymCooltrainerM1Text: text_asm ld hl, ViridianGymTrainerHeader0 call TalkToTrainer jp TextScriptEnd -ViridianGymBattleText1: - text_far _ViridianGymBattleText1 +ViridianGymCooltrainerM1BattleText: + text_far _ViridianGymCooltrainerM1BattleText text_end -ViridianGymEndBattleText1: - text_far _ViridianGymEndBattleText1 +ViridianGymCooltrainerM1EndBattleText: + text_far _ViridianGymCooltrainerM1EndBattleText text_end -ViridianGymAfterBattleText1: - text_far _ViridianGymAfterBattleText1 +ViridianGymCooltrainerM1AfterBattleText: + text_far _ViridianGymCooltrainerM1AfterBattleText text_end -ViridianGymTrainerText2: +ViridianGymHiker1Text: text_asm ld hl, ViridianGymTrainerHeader1 call TalkToTrainer jp TextScriptEnd -ViridianGymBattleText2: - text_far _ViridianGymBattleText2 +ViridianGymHiker1BattleText: + text_far _ViridianGymHiker1BattleText text_end -ViridianGymEndBattleText2: - text_far _ViridianGymEndBattleText2 +ViridianGymHiker1EndBattleText: + text_far _ViridianGymHiker1EndBattleText text_end -ViridianGymAfterBattleText2: - text_far _ViridianGymAfterBattleText2 +ViridianGymHiker1AfterBattleText: + text_far _ViridianGymHiker1AfterBattleText text_end -ViridianGymTrainerText3: +ViridianGymRocker1Text: text_asm ld hl, ViridianGymTrainerHeader2 call TalkToTrainer jp TextScriptEnd -ViridianGymBattleText3: - text_far _ViridianGymBattleText3 +ViridianGymRocker1BattleText: + text_far _ViridianGymRocker1BattleText text_end -ViridianGymEndBattleText3: - text_far _ViridianGymEndBattleText3 +ViridianGymRocker1EndBattleText: + text_far _ViridianGymRocker1EndBattleText text_end -ViridianGymAfterBattleText3: - text_far _ViridianGymAfterBattleText3 +ViridianGymRocker1AfterBattleText: + text_far _ViridianGymRocker1AfterBattleText text_end -ViridianGymTrainerText4: +ViridianGymHiker2Text: text_asm ld hl, ViridianGymTrainerHeader3 call TalkToTrainer jp TextScriptEnd -ViridianGymBattleText4: - text_far _ViridianGymBattleText4 +ViridianGymHiker2BattleText: + text_far _ViridianGymHiker2BattleText text_end -ViridianGymEndBattleText4: - text_far _ViridianGymEndBattleText4 +ViridianGymHiker2EndBattleText: + text_far _ViridianGymHiker2EndBattleText text_end -ViridianGymAfterBattleText4: - text_far _ViridianGymAfterBattleText4 +ViridianGymHiker2AfterBattleText: + text_far _ViridianGymHiker2AfterBattleText text_end -ViridianGymTrainerText5: +ViridianGymCooltrainerM2Text: text_asm ld hl, ViridianGymTrainerHeader4 call TalkToTrainer jp TextScriptEnd -ViridianGymBattleText5: - text_far _ViridianGymBattleText5 +ViridianGymCooltrainerM2BattleText: + text_far _ViridianGymCooltrainerM2BattleText text_end -ViridianGymEndBattleText5: - text_far _ViridianGymEndBattleText5 +ViridianGymCooltrainerM2EndBattleText: + text_far _ViridianGymCooltrainerM2EndBattleText text_end -ViridianGymAfterBattleText5: - text_far _ViridianGymAfterBattleText5 +ViridianGymCooltrainerM2AfterBattleText: + text_far _ViridianGymCooltrainerM2AfterBattleText text_end -ViridianGymTrainerText6: +ViridianGymHiker3Text: text_asm ld hl, ViridianGymTrainerHeader5 call TalkToTrainer jp TextScriptEnd -ViridianGymBattleText6: - text_far _ViridianGymBattleText6 +ViridianGymHiker3BattleText: + text_far _ViridianGymHiker3BattleText text_end -ViridianGymEndBattleText6: - text_far _ViridianGymEndBattleText6 +ViridianGymHiker3EndBattleText: + text_far _ViridianGymHiker3EndBattleText text_end -ViridianGymAfterBattleText6: - text_far _ViridianGymAfterBattleText6 +ViridianGymHiker3AfterBattleText: + text_far _ViridianGymHiker3AfterBattleText text_end -ViridianGymTrainerText7: +ViridianGymRocker2Text: text_asm ld hl, ViridianGymTrainerHeader6 call TalkToTrainer jp TextScriptEnd -ViridianGymBattleText7: - text_far _ViridianGymBattleText7 +ViridianGymRocker2BattleText: + text_far _ViridianGymRocker2BattleText text_end -ViridianGymEndBattleText7: - text_far _ViridianGymEndBattleText7 +ViridianGymRocker2EndBattleText: + text_far _ViridianGymRocker2EndBattleText text_end -ViridianGymAfterBattleText7: - text_far _ViridianGymAfterBattleText7 +ViridianGymRocker2AfterBattleText: + text_far _ViridianGymRocker2AfterBattleText text_end -ViridianGymTrainerText8: +ViridianGymCooltrainerM3Text: text_asm ld hl, ViridianGymTrainerHeader7 call TalkToTrainer jp TextScriptEnd -ViridianGymBattleText8: - text_far _ViridianGymBattleText8 +ViridianGymCooltrainerM3BattleText: + text_far _ViridianGymCooltrainerM3BattleText text_end -ViridianGymEndBattleText8: - text_far _ViridianGymEndBattleText8 +ViridianGymCooltrainerM3EndBattleText: + text_far _ViridianGymCooltrainerM3EndBattleText text_end -ViridianGymAfterBattleText8: - text_far _ViridianGymAfterBattleText8 +ViridianGymCooltrainerM3AfterBattleText: + text_far _ViridianGymCooltrainerM3AfterBattleText text_end -ViridianGymGuideText: +ViridianGymGymGuideText: text_asm CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI jr nz, .afterBeat diff --git a/scripts/ViridianMart.asm b/scripts/ViridianMart.asm index f71cc6ef9..2e78a0368 100644 --- a/scripts/ViridianMart.asm +++ b/scripts/ViridianMart.asm @@ -1,11 +1,11 @@ ViridianMart_Script: - call ViridianMartScript_1d47d + call ViridianMartCheckParcelDeliveredScript call EnableAutoTextBoxDrawing ld hl, ViridianMart_ScriptPointers ld a, [wViridianMartCurScript] jp CallFunctionInTable -ViridianMartScript_1d47d: +ViridianMartCheckParcelDeliveredScript: CheckEvent EVENT_OAK_GOT_PARCEL jr nz, .delivered_parcel ld hl, ViridianMart_TextPointers @@ -20,76 +20,80 @@ ViridianMartScript_1d47d: ret ViridianMart_ScriptPointers: - dw ViridianMartScript0 - dw ViridianMartScript1 - dw ViridianMartScript2 + def_script_pointers + dw_const ViridianMartDefaultScript, SCRIPT_VIRIDIANMART_DEFAULT + dw_const ViridianMartOaksParcelScript, SCRIPT_VIRIDIANMART_OAKS_PARCEL + dw_const ViridianMartNoopScript, SCRIPT_VIRIDIANMART_NOOP -ViridianMartScript0: +ViridianMartDefaultScript: call UpdateSprites - ld a, $4 + ld a, TEXT_VIRIDIANMART_CLERK_YOU_CAME_FROM_PALLET_TOWN ldh [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wSimulatedJoypadStatesEnd - ld de, RLEMovement1d4bb + ld de, .PlayerMovement call DecodeRLEList dec a ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld a, $1 + ld a, SCRIPT_VIRIDIANMART_OAKS_PARCEL ld [wViridianMartCurScript], a ret -RLEMovement1d4bb: +.PlayerMovement: db D_LEFT, 1 db D_UP, 2 db -1 ; end -ViridianMartScript1: +ViridianMartOaksParcelScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz call Delay3 - ld a, $5 + ld a, TEXT_VIRIDIANMART_CLERK_PARCEL_QUEST ldh [hSpriteIndexOrTextID], a call DisplayTextID lb bc, OAKS_PARCEL, 1 call GiveItem SetEvent EVENT_GOT_OAKS_PARCEL - ld a, $2 + ld a, SCRIPT_VIRIDIANMART_NOOP ld [wViridianMartCurScript], a ; fallthrough -ViridianMartScript2: +ViridianMartNoopScript: ret ViridianMart_TextPointers: - dw ViridianMartText1 - dw ViridianMartText2 - dw ViridianMartText3 - dw ViridianMartText4 - dw ViridianMartText5 + dw ViridianMartClerkSayHiToOakText + dw ViridianMartYoungsterText + dw ViridianMartCooltrainerMText + const_def 4 + dw_const ViridianMartClerkYouCameFromPalletTownText, TEXT_VIRIDIANMART_CLERK_YOU_CAME_FROM_PALLET_TOWN + dw_const ViridianMartClerkParcelQuestText, TEXT_VIRIDIANMART_CLERK_PARCEL_QUEST ViridianMart_TextPointers2: - dw ViridianCashierText - dw ViridianMartText2 - dw ViridianMartText3 + ; This becomes the primary text pointers table when Oak's parcel has been delivered. + def_text_pointers + dw_const ViridianMartClerkText, TEXT_VIRIDIANMART_CLERK + dw_const ViridianMartYoungsterText, TEXT_VIRIDIANMART_YOUNGSTER + dw_const ViridianMartCooltrainerMText, TEXT_VIRIDIANMART_COOLTRAINER_M -ViridianMartText1: - text_far _ViridianMartText1 +ViridianMartClerkSayHiToOakText: + text_far _ViridianMartClerkSayHiToOakText text_end -ViridianMartText4: - text_far _ViridianMartText4 +ViridianMartClerkYouCameFromPalletTownText: + text_far _ViridianMartClerkYouCameFromPalletTownText text_end -ViridianMartText5: - text_far ViridianMartParcelQuestText +ViridianMartClerkParcelQuestText: + text_far _ViridianMartClerkParcelQuestText sound_get_key_item text_end -ViridianMartText2: - text_far _ViridianMartText2 +ViridianMartYoungsterText: + text_far _ViridianMartYoungsterText text_end -ViridianMartText3: - text_far _ViridianMartText3 +ViridianMartCooltrainerMText: + text_far _ViridianMartCooltrainerMText text_end diff --git a/scripts/ViridianNicknameHouse.asm b/scripts/ViridianNicknameHouse.asm index df7482c2f..7aba0b4ae 100644 --- a/scripts/ViridianNicknameHouse.asm +++ b/scripts/ViridianNicknameHouse.asm @@ -2,32 +2,33 @@ ViridianNicknameHouse_Script: jp EnableAutoTextBoxDrawing ViridianNicknameHouse_TextPointers: - dw ViridianHouseText1 - dw ViridianHouseText2 - dw ViridianHouseText3 - dw ViridianHouseText4 + def_text_pointers + dw_const ViridianNicknameHouseBaldingGuyText, TEXT_VIRIDIANNICKNAMEHOUSE_BALDING_GUY + dw_const ViridianNicknameHouseLittleGirlText, TEXT_VIRIDIANNICKNAMEHOUSE_LITTLE_GIRL + dw_const ViridianNicknameHouseSpearowText, TEXT_VIRIDIANNICKNAMEHOUSE_SPEAROW + dw_const ViridianNicknameHouseSpearySignText, TEXT_VIRIDIANNICKNAMEHOUSE_SPEARY_SIGN -ViridianHouseText1: - text_far _ViridianHouseText1 +ViridianNicknameHouseBaldingGuyText: + text_far _ViridianNicknameHouseBaldingGuyText text_end -ViridianHouseText2: - text_far _ViridianHouseText2 +ViridianNicknameHouseLittleGirlText: + text_far _ViridianNicknameHouseLittleGirlText text_end -ViridianHouseText3: +ViridianNicknameHouseSpearowText: text_asm - ld hl, ViridianHouseText_1d5b1 + ld hl, .Text call PrintText ld a, SPEAROW call PlayCry call WaitForSoundToFinish jp TextScriptEnd -ViridianHouseText_1d5b1: - text_far _ViridianHouseText_1d5b1 +.Text: + text_far _ViridianNicknameHouseSpearowText text_end -ViridianHouseText4: - text_far _ViridianHouseText4 +ViridianNicknameHouseSpearySignText: + text_far _ViridianNicknameHouseSpearySignText text_end diff --git a/scripts/ViridianPokecenter.asm b/scripts/ViridianPokecenter.asm index 085776788..37d39ff9b 100644 --- a/scripts/ViridianPokecenter.asm +++ b/scripts/ViridianPokecenter.asm @@ -3,21 +3,22 @@ ViridianPokecenter_Script: jp EnableAutoTextBoxDrawing ViridianPokecenter_TextPointers: - dw ViridianHealNurseText - dw ViridianPokeCenterText2 - dw ViridianPokeCenterText3 - dw ViridianTradeNurseText + def_text_pointers + dw_const ViridianPokecenterNurseText, TEXT_VIRIDIANPOKECENTER_NURSE + dw_const ViridianPokecenterGentlemanText, TEXT_VIRIDIANPOKECENTER_GENTLEMAN + dw_const ViridianPokecenterCooltrainerMText, TEXT_VIRIDIANPOKECENTER_COOLTRAINER_M + dw_const ViridianPokecenterLinkReceptionistText, TEXT_VIRIDIANPOKECENTER_LINK_RECEPTIONIST -ViridianHealNurseText: +ViridianPokecenterNurseText: script_pokecenter_nurse -ViridianPokeCenterText2: - text_far _ViridianPokeCenterText2 +ViridianPokecenterGentlemanText: + text_far _ViridianPokecenterGentlemanText text_end -ViridianPokeCenterText3: - text_far _ViridianPokeCenterText3 +ViridianPokecenterCooltrainerMText: + text_far _ViridianPokecenterCooltrainerMText text_end -ViridianTradeNurseText: +ViridianPokecenterLinkReceptionistText: script_cable_club_receptionist diff --git a/scripts/ViridianSchoolHouse.asm b/scripts/ViridianSchoolHouse.asm index 731e2daca..a7beb1b59 100644 --- a/scripts/ViridianSchoolHouse.asm +++ b/scripts/ViridianSchoolHouse.asm @@ -2,13 +2,14 @@ ViridianSchoolHouse_Script: jp EnableAutoTextBoxDrawing ViridianSchoolHouse_TextPointers: - dw SchoolText1 - dw SchoolText2 + def_text_pointers + dw_const ViridianSchoolHouseBrunetteGirlText, TEXT_VIRIDIANSCHOOLHOUSE_BRUNETTE_GIRL + dw_const ViridianSchoolHouseCooltrainerFText, TEXT_VIRIDIANSCHOOLHOUSE_COOLTRAINER_F -SchoolText1: - text_far _SchoolText1 +ViridianSchoolHouseBrunetteGirlText: + text_far _ViridianSchoolHouseBrunetteGirlText text_end -SchoolText2: - text_far _SchoolText2 +ViridianSchoolHouseCooltrainerFText: + text_far _ViridianSchoolHouseCooltrainerFText text_end diff --git a/scripts/WardensHouse.asm b/scripts/WardensHouse.asm index 2dd0410c8..1851e341a 100644 --- a/scripts/WardensHouse.asm +++ b/scripts/WardensHouse.asm @@ -2,13 +2,14 @@ WardensHouse_Script: jp EnableAutoTextBoxDrawing WardensHouse_TextPointers: - dw FuchsiaHouse2Text1 - dw PickUpItemText - dw BoulderText - dw FuchsiaHouse2Text4 - dw FuchsiaHouse2Text5 + def_text_pointers + dw_const WardensHouseWardenText, TEXT_WARDENSHOUSE_WARDEN + dw_const PickUpItemText, TEXT_WARDENSHOUSE_RARE_CANDY + dw_const BoulderText, TEXT_WARDENSHOUSE_BOULDER + dw_const WardensHouseDisplayText, TEXT_WARDENSHOUSE_DISPLAY_LEFT + dw_const WardensHouseDisplayText, TEXT_WARDENSHOUSE_DISPLAY_RIGHT -FuchsiaHouse2Text1: +WardensHouseWardenText: text_asm CheckEvent EVENT_GOT_HM04 jr nz, .got_item @@ -17,97 +18,96 @@ FuchsiaHouse2Text1: jr nz, .have_gold_teeth CheckEvent EVENT_GAVE_GOLD_TEETH jr nz, .gave_gold_teeth - ld hl, WardenGibberishText1 + ld hl, .Gibberish1Text call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a - ld hl, WardenGibberishText3 + ld hl, .Gibberish3Text jr nz, .refused - ld hl, WardenGibberishText2 + ld hl, .Gibberish2Text .refused call PrintText jr .done .have_gold_teeth - ld hl, WardenTeethText1 + ld hl, .GaveTheGoldTeethText call PrintText ld a, GOLD_TEETH ldh [hItemToRemoveID], a farcall RemoveItemByID SetEvent EVENT_GAVE_GOLD_TEETH .gave_gold_teeth - ld hl, WardenThankYouText + ld hl, .ThanksText call PrintText lb bc, HM_STRENGTH, 1 call GiveItem jr nc, .bag_full - ld hl, ReceivedHM04Text + ld hl, .ReceivedHM04Text call PrintText SetEvent EVENT_GOT_HM04 jr .done .got_item - ld hl, HM04ExplanationText + ld hl, .HM04ExplanationText call PrintText jr .done .bag_full - ld hl, HM04NoRoomText + ld hl, .HM04NoRoomText call PrintText .done jp TextScriptEnd -WardenGibberishText1: - text_far _WardenGibberishText1 +.Gibberish1Text: + text_far _WardensHouseWardenGibberish1Text text_end -WardenGibberishText2: - text_far _WardenGibberishText2 +.Gibberish2Text: + text_far _WardensHouseWardenGibberish2Text text_end -WardenGibberishText3: - text_far _WardenGibberishText3 +.Gibberish3Text: + text_far _WardensHouseWardenGibberish3Text text_end -WardenTeethText1: - text_far _WardenTeethText1 +.GaveTheGoldTeethText: + text_far _WardensHouseWardenGaveTheGoldTeethText sound_get_item_1 -WardenTeethText2: - text_far _WardenTeethText2 +.PoppedInHisTeethText: ; unreferenced + text_far _WardensHouseWardenTeethPoppedInHisTeethText text_end -WardenThankYouText: - text_far _WardenThankYouText +.ThanksText: + text_far _WardensHouseWardenThanksText text_end -ReceivedHM04Text: - text_far _ReceivedHM04Text +.ReceivedHM04Text: + text_far _WardensHouseWardenReceivedHM04Text sound_get_item_1 text_end -HM04ExplanationText: - text_far _HM04ExplanationText +.HM04ExplanationText: + text_far _WardensHouseWardenHM04ExplanationText text_end -HM04NoRoomText: - text_far _HM04NoRoomText +.HM04NoRoomText: + text_far _WardensHouseWardenHM04NoRoomText text_end -FuchsiaHouse2Text5: -FuchsiaHouse2Text4: +WardensHouseDisplayText: text_asm - ldh a, [hSpriteIndex] - cp $4 - ld hl, FuchsiaHouse2Text_7517b - jr nz, .asm_4c9a2 - ld hl, FuchsiaHouse2Text_75176 -.asm_4c9a2 + ldh a, [hSpriteIndexOrTextID] + cp TEXT_WARDENSHOUSE_DISPLAY_LEFT + ld hl, .MerchandiseText + jr nz, .print_text + ld hl, .PhotosAndFossilsText +.print_text call PrintText jp TextScriptEnd -FuchsiaHouse2Text_75176: - text_far _FuchsiaHouse2Text_75176 +.PhotosAndFossilsText: + text_far _WardensHouseDisplayPhotosAndFossilsText text_end -FuchsiaHouse2Text_7517b: - text_far _FuchsiaHouse2Text_7517b +.MerchandiseText: + text_far _WardensHouseDisplayMerchandiseText text_end diff --git a/text/AgathasRoom.asm b/text/AgathasRoom.asm index 9ef5059a7..fbebcf454 100644 --- a/text/AgathasRoom.asm +++ b/text/AgathasRoom.asm @@ -38,7 +38,7 @@ _AgathaAfterBattleText:: cont "along now, child!" done -_AgathaDontRunAwayText:: +_AgathasRoomAgathaDontRunAwayText:: text "Someone's voice:" line "Don't run away!" done diff --git a/text/BikeShop.asm b/text/BikeShop.asm index 5d71133c3..fcfc7b032 100644 --- a/text/BikeShop.asm +++ b/text/BikeShop.asm @@ -1,4 +1,4 @@ -_BikeShopText_1d810:: +_BikeShopClerkWelcomeText:: text "Hi! Welcome to" line "our BIKE SHOP." @@ -6,7 +6,7 @@ _BikeShopText_1d810:: line "the BIKE for you!" prompt -_BikeShopText_1d815:: +_BikeShopClerkDoYouLikeItText:: text "It's a cool BIKE!" line "Do you want it?" done @@ -16,7 +16,7 @@ _BikeShopCantAffordText:: line "afford it!" prompt -_BikeShopText_1d81f:: +_BikeShopClerkOhThatsAVoucherText:: text "Oh, that's..." para "A BIKE VOUCHER!" @@ -24,7 +24,7 @@ _BikeShopText_1d81f:: para "OK! Here you go!" prompt -_BikeShopText_1d824:: +_BikeShopExchangedVoucherText:: text " exchanged" line "the BIKE VOUCHER" cont "for a BICYCLE.@" @@ -35,7 +35,7 @@ _BikeShopComeAgainText:: line "some time!" done -_BikeShopText_1d82f:: +_BikeShopClerkHowDoYouLikeYourBicycleText:: text "How do you like" line "your new BICYCLE?" @@ -44,12 +44,12 @@ _BikeShopText_1d82f:: cont "and in caves!" done -_BikeShopText_1d834:: +_BikeShopBagFullText:: text "You better make" line "room for this!" done -_BikeShopText_1d843:: +_BikeShopMiddleAgedWomanText:: text "A plain city BIKE" line "is good enough" cont "for me!" @@ -59,13 +59,13 @@ _BikeShopText_1d843:: cont "on an MTB!" done -_BikeShopText_1d85c:: +_BikeShopYoungsterTheseBikesAreExpensiveText:: text "These BIKEs are" line "cool, but they're" cont "way expensive!" done -_BikeShopText_1d861:: +_BikeShopYoungsterCoolBikeText:: text "Wow. Your BIKE is" line "really cool!" done diff --git a/text/BillsHouse.asm b/text/BillsHouse.asm index 9bbea9d78..be39b7b47 100644 --- a/text/BillsHouse.asm +++ b/text/BillsHouse.asm @@ -1,4 +1,4 @@ -_BillsHouseText_1e865:: +_BillsHouseBillImNotAPokemonText:: text "Hiya! I'm a" line "#MON..." cont "...No I'm not!" @@ -19,7 +19,7 @@ _BillsHouseText_1e865:: line "Help me out here!" done -_BillsHouseText_1e86a:: +_BillsHouseBillUseSeparationSystemText:: text "When I'm in the" line "TELEPORTER, go to" cont "my PC and run the" @@ -27,7 +27,7 @@ _BillsHouseText_1e86a:: cont "System!" done -_BillsHouseText_1e86f:: +_BillsHouseBillNoYouGottaHelpText:: text "No!? Come on, you" line "gotta help a guy" cont "in deep trouble!" @@ -37,7 +37,7 @@ _BillsHouseText_1e86f:: cont "OK? All right!" prompt -_BillThankYouText:: +_BillsHouseBillThankYouText:: text "BILL: Yeehah!" line "Thanks, bud! I" cont "owe you one!" @@ -65,7 +65,7 @@ _SSTicketNoRoomText:: line "much stuff, bud!" done -_BillsHouseText_1e8cb:: +_BillsHouseBillWhyDontYouGoInsteadOfMeText:: text "That cruise ship," line "S.S.ANNE, is in" cont "VERMILION CITY." @@ -80,7 +80,7 @@ _BillsHouseText_1e8cb:: cont "instead of me?" done -_BillsHouseText_1e8da:: +_BillsHouseBillCheckOutMyRarePokemonText:: text "BILL: Look, bud," line "just check out" cont "some of my rare" diff --git a/text/BluesHouse.asm b/text/BluesHouse.asm index 8b3cdd201..53309b2b0 100644 --- a/text/BluesHouse.asm +++ b/text/BluesHouse.asm @@ -1,10 +1,10 @@ -_DaisyInitialText:: +_BluesHouseDaisyRivalAtLabText:: text "Hi !" line " is out at" cont "Grandpa's lab." done -_DaisyOfferMapText:: +_BluesHouseDaisyOfferMapText:: text "Grandpa asked you" line "to run an errand?" cont "Here, this will" @@ -18,12 +18,12 @@ _GotMapText:: text "!@" text_end -_DaisyBagFullText:: +_BluesHouseDaisyBagFullText:: text "You have too much" line "stuff with you." done -_DaisyUseMapText:: +_BluesHouseDaisyUseMapText:: text "Use the TOWN MAP" line "to find out where" cont "you are." diff --git a/text/BrunosRoom.asm b/text/BrunosRoom.asm index 9c493c4ac..ac00ae609 100644 --- a/text/BrunosRoom.asm +++ b/text/BrunosRoom.asm @@ -31,7 +31,7 @@ _BrunoAfterBattleText:: cont "challenge!" done -_BrunoDontRunAwayText:: +_BrunosRoomBrunoDontRunAwayText:: text "Someone's voice:" line "Don't run away!" done diff --git a/text/CeladonChiefHouse.asm b/text/CeladonChiefHouse.asm index 19e59bd60..075b8d49c 100644 --- a/text/CeladonChiefHouse.asm +++ b/text/CeladonChiefHouse.asm @@ -1,10 +1,10 @@ -_CeladonHouseText1:: +_CeladonChiefHouseChiefText:: text "Hehehe! The slots" line "just reel in the" cont "dough, big time!" done -_CeladonHouseText2:: +_CeladonChiefHouseRocketText:: text "CHIEF!" para "We just shipped" @@ -12,7 +12,7 @@ _CeladonHouseText2:: cont "slot prizes!" done -_CeladonHouseText3:: +_CeladonChiefHouseSailorText:: text "Don't touch the" line "poster at the" cont "GAME CORNER!" diff --git a/text/CeladonCity.asm b/text/CeladonCity.asm index 12146016d..8baaf8d3e 100644 --- a/text/CeladonCity.asm +++ b/text/CeladonCity.asm @@ -1,4 +1,4 @@ -_CeladonCityText1:: +_CeladonCityLittleGirlText:: text "I got my KOFFING" line "in CINNABAR!" @@ -7,19 +7,19 @@ _CeladonCityText1:: cont "when it's angry!" done -_CeladonCityText2:: +_CeladonCityGramps1Text:: text "Heheh! This GYM" line "is great! It's" cont "full of women!" done -_CeladonCityText3:: +_CeladonCityGirlText:: text "The GAME CORNER" line "is bad for our" cont "city's image!" done -_CeladonCityText4:: +_CeladonCityGramps2Text:: text "Moan! I blew it" line "all at the slots!" @@ -28,7 +28,7 @@ _CeladonCityText4:: cont "coins for prizes!" done -_TM41PreText:: +_CeledonCityGramps3Text:: text "Hello, there!" para "I've seen you," @@ -39,14 +39,14 @@ _TM41PreText:: line "dropping by!" prompt -_ReceivedTM41Text:: +_CeledonCityGramps3ReceivedTM41Text:: text " received" line "@" text_ram wStringBuffer text "!@" text_end -_TM41ExplanationText:: +_CeledonCityGramps3TM41ExplanationText:: text "TM41 teaches" line "SOFTBOILED!" @@ -57,12 +57,12 @@ _TM41ExplanationText:: line "CHANSEY!" done -_TM41NoRoomText:: +_CeledonCityGramps3TM41NoRoomText:: text "Oh, your pack is" line "full of items!" done -_CeladonCityText6:: +_CeladonCityFisherText:: text "This is my trusted" line "pal, POLIWRATH!" @@ -71,22 +71,22 @@ _CeladonCityText6:: cont "used WATER STONE!" done -_CeladonCityText7:: +_CeladonCityPoliwrathText:: text "POLIWRATH: Ribi" line "ribit!@" text_end -_CeladonCityText8:: +_CeladonCityRocket1Text:: text "What are you" line "staring at?" done -_CeladonCityText9:: +_CeladonCityRocket2Text:: text "Keep out of TEAM" line "ROCKET's way!" done -_CeladonCityText10:: +_CeladonCityTrainerTips1Text:: text "TRAINER TIPS" para "X ACCURACY boosts" @@ -102,13 +102,13 @@ _CeladonCityText10:: cont "STORE!" done -_CeladonCityText11:: +_CeladonCitySignText:: text "CELADON CITY" line "The City of" cont "Rainbow Dreams" done -_CeladonCityText13:: +_CeladonCityGymSignText:: text "CELADON CITY" line "#MON GYM" cont "LEADER: ERIKA" @@ -117,17 +117,17 @@ _CeladonCityText13:: line "Princess!" done -_CeladonCityText14:: +_CeladonCityMansionSignText:: text "CELADON MANSION" done -_CeladonCityText15:: +_CeladonCityDeptStoreSignText:: text "Find what you" line "need at CELADON" cont "DEPT. STORE!" done -_CeladonCityText16:: +_CeladonCityTrainerTips2Text:: text "TRAINER TIPS" para "GUARD SPEC." @@ -141,13 +141,13 @@ _CeladonCityText16:: cont "STORE!" done -_CeladonCityText17:: +_CeladonCityPrizeExchangeSignText:: text "Coins exchanged" line "for prizes!" cont "PRIZE EXCHANGE" done -_CeladonCityText18:: +_CeladonCityGameCornerSignText:: text "ROCKET GAME CORNER" line "The playground" cont "for grown-ups!" diff --git a/text/CeladonDiner.asm b/text/CeladonDiner.asm index b91cb5a98..c46811f77 100644 --- a/text/CeladonDiner.asm +++ b/text/CeladonDiner.asm @@ -1,24 +1,24 @@ -_CeladonDinerText1:: +_CeladonDinerCookText:: text "Hi!" para "We're taking a" line "break now." done -_CeladonDinerText2:: +_CeladonDinerMiddleAgedWomanText:: text "My #MON are" line "weak, so I often" cont "have to go to the" cont "DRUG STORE." done -_CeladonDinerText3:: +_CeladonDinerMiddleAgedManText:: text "Psst! There's a" line "basement under" cont "the GAME CORNER." done -_CeladonDinerText4:: +_CeladonDinerFisherText:: text "Munch..." para "The man at that" @@ -26,7 +26,7 @@ _CeladonDinerText4:: cont "at the slots." done -_CeladonDinerText_491a7:: +_CeladonDinerGymGuideImFlatOutBustedText:: text "Go ahead! Laugh!" para "I'm flat out" @@ -41,19 +41,19 @@ _CeladonDinerText_491a7:: cont "more!" prompt -_ReceivedCoinCaseText:: +_CeladonDinerGymGuideReceivedCoinCaseText:: text " received" line "a @" text_ram wStringBuffer text "!@" text_end -_CoinCaseNoRoomText:: +_CeladonDinerGymGuideCoinCaseNoRoomText:: text "Make room for" line "this!" done -_CeladonDinerText_491b7:: +_CeladonDinerGymGuideWinItBackText:: text "I always thought" line "I was going to" cont "win it back..." diff --git a/text/CeladonGym.asm b/text/CeladonGym.asm index f4ca049a0..6f6b2cc33 100644 --- a/text/CeladonGym.asm +++ b/text/CeladonGym.asm @@ -1,4 +1,4 @@ -_ErikaPreBattleText:: +_CeladonGymErikaPreBattleText:: text "Hello. Lovely" line "weather isn't it?" cont "It's so pleasant." @@ -25,7 +25,7 @@ _ErikaPreBattleText:: line "shall not lose." done -_ReceivedRainbowBadgeText:: +_CeladonGymErikaReceivedRainbowBadgeText:: text "Oh!" line "I concede defeat." @@ -36,7 +36,7 @@ _ReceivedRainbowBadgeText:: line "the RAINBOWBADGE." prompt -_ErikaPostBattleAdviceText:: +_CeladonGymErikaPostBattleAdviceText:: text "You are cataloging" line "#MON? I must" cont "say I'm impressed." @@ -47,7 +47,7 @@ _ErikaPostBattleAdviceText:: cont "unattractive." done -_ErikaRainbowBadgeInfoText:: +_CeladonGymRainbowBadgeInfoText:: text "The RAINBOWBADGE" line "will make #MON" cont "up to L50 obey." @@ -61,7 +61,7 @@ _ErikaRainbowBadgeInfoText:: line "this with you." done -_ReceivedTM21Text:: +_CeladonGymReceivedTM21Text:: text " received" line "@" text_ram wStringBuffer @@ -80,7 +80,7 @@ _TM21ExplanationText:: cont "your #MON!" done -_TM21NoRoomText:: +_CeladonGymTM21NoRoomText:: text "You should make" line "room for this." done diff --git a/text/CeladonHotel.asm b/text/CeladonHotel.asm index f2eb059e0..4753178fe 100644 --- a/text/CeladonHotel.asm +++ b/text/CeladonHotel.asm @@ -1,4 +1,4 @@ -_CeladonHotelText1:: +_CeladonHotelGrannyText:: text "#MON? No, this" line "is a hotel for" cont "people." @@ -6,7 +6,7 @@ _CeladonHotelText1:: para "We're full up." done -_CeladonHotelText2:: +_CeladonHotelBeautyText:: text "I'm on vacation" line "with my brother" cont "and boy friend." @@ -15,7 +15,7 @@ _CeladonHotelText2:: line "pretty city!" done -_CeladonHotelText3:: +_CeladonHotelSuperNerdText:: text "Why did she bring" line "her brother?" done diff --git a/text/CeladonMansion1F.asm b/text/CeladonMansion1F.asm index 14a48a819..8773ff31b 100644 --- a/text/CeladonMansion1F.asm +++ b/text/CeladonMansion1F.asm @@ -1,8 +1,8 @@ -_CeladonMansion1Text1:: +_CeladonMansion1FMeowthText:: text "MEOWTH: Meow!@" text_end -_CeladonMansion1Text2:: +_CeladonMansion1FGrannyText:: text "My dear #MON" line "keep me company." @@ -10,17 +10,17 @@ _CeladonMansion1Text2:: line "money home!" done -_CeladonMansion1Text3:: +_CeladonMansion1FClefairyText:: text "CLEFAIRY: Pi" line "pippippi!@" text_end -_CeladonMansion1Text4:: +_CeladonMansion1FNidoranFText:: text "NIDORAN: Kya" line "kyaoo!@" text_end -_CeladonMansion1Text5:: +_CeladonMansion1FManagersSuiteSignText:: text "CELADON MANSION" line "Manager's Suite" done diff --git a/text/CeladonMansion2F.asm b/text/CeladonMansion2F.asm index b2ecb4fa9..b057b3e8a 100644 --- a/text/CeladonMansion2F.asm +++ b/text/CeladonMansion2F.asm @@ -1,4 +1,4 @@ -_CeladonMansion2Text1:: +_CeladonMansion2FMeetingRoomSignText:: text "GAME FREAK" line "Meeting Room" done diff --git a/text/CeladonMansion3F.asm b/text/CeladonMansion3F.asm index 714ecf19c..36a1c0857 100644 --- a/text/CeladonMansion3F.asm +++ b/text/CeladonMansion3F.asm @@ -1,15 +1,15 @@ -_ProgrammerText:: +_CeladonMansion3FProgrammerText:: text "Me? I'm the" line "programmer!" done -_GraphicArtistText:: +_CeladonMansion3FGraphicArtistText:: text "I'm the graphic" line "artist!" cont "I drew you!" done -_WriterText:: +_CeladonMansion3FWriterText:: text "I wrote the story!" line "Isn't ERIKA cute?" @@ -20,7 +20,7 @@ _WriterText:: line "I like her!" done -_GameDesignerText:: +_CeladonMansion3FGameDesignerText:: text "Is that right?" para "I'm the game" @@ -34,7 +34,7 @@ _GameDesignerText:: line "come tell me!" done -_CompletedDexText:: +_CeladonMansion3FGameDesignerCompletedDexText:: text "Wow! Excellent!" line "You completed" cont "your #DEX!" @@ -42,26 +42,26 @@ _CompletedDexText:: cont "...@" text_end -_CeladonMansion3Text5:: +_CeladonMansion3FGameProgramPCText:: text "It's the game" line "program! Messing" cont "with it could bug" cont "out the game!" done -_CeladonMansion3Text6:: +_CeladonMansion3FPlayingGamePCText:: text "Someone's playing" line "a game instead of" cont "working!" done -_CeladonMansion3Text7:: +_CeladonMansion3FGameScriptPCText:: text "It's the script!" line "Better not look" cont "at the ending!" done -_CeladonMansion3Text8:: +_CeladonMansion3FDevRoomSignText:: text "GAME FREAK" line "Development Room" done diff --git a/text/CeladonMansionRoof.asm b/text/CeladonMansionRoof.asm index c8fd7ec88..67963cb36 100644 --- a/text/CeladonMansionRoof.asm +++ b/text/CeladonMansionRoof.asm @@ -1,3 +1,3 @@ -_CeladonMansion4Text1:: +_CeladonMansionRoofHouseSignText:: text "I KNOW EVERYTHING!" done diff --git a/text/CeladonMansionRoofHouse.asm b/text/CeladonMansionRoofHouse.asm index dab81a8dc..c3cef1ba4 100644 --- a/text/CeladonMansionRoofHouse.asm +++ b/text/CeladonMansionRoofHouse.asm @@ -1,4 +1,4 @@ -_CeladonMansion5Text1:: +_CeladonMansionRoofHouseHikerText:: text "I know everything" line "about the world" cont "of #MON in" diff --git a/text/CeladonMart1F.asm b/text/CeladonMart1F.asm index 8d805edc7..c9975da98 100644 --- a/text/CeladonMart1F.asm +++ b/text/CeladonMart1F.asm @@ -1,4 +1,4 @@ -_CeladonMart1Text1:: +_CeladonMart1FReceptionistText:: text "Hello! Welcome to" line "CELADON DEPT." cont "STORE." @@ -8,7 +8,7 @@ _CeladonMart1Text1:: cont "the store layout." done -_CeladonMart1Text2:: +_CeladonMart1FDirectorySignText:: text "1F: SERVICE" line " COUNTER" @@ -25,7 +25,7 @@ _CeladonMart1Text2:: line "VENDING MACHINES" done -_CeladonMart1Text3:: +_CeladonMart1FCurrentFloorSignText:: text "1F: SERVICE" line " COUNTER" done diff --git a/text/CeladonMart2F.asm b/text/CeladonMart2F.asm index 74869902b..05cf93f9c 100644 --- a/text/CeladonMart2F.asm +++ b/text/CeladonMart2F.asm @@ -1,4 +1,4 @@ -_CeladonMart2Text3:: +_CeladonMart2FMiddleAgedManText:: text "SUPER REPEL keeps" line "weak #MON at" cont "bay..." @@ -7,13 +7,13 @@ _CeladonMart2Text3:: line "powerful REPEL!" done -_CeladonMart2Text4:: +_CeladonMart2FGirlText:: text "For long outings," line "you should buy" cont "REVIVE." done -_CeladonMart2Text5:: +_CeladonMart2FCurrentFloorSignText:: text "Top Grade Items" line "for Trainers!" diff --git a/text/CeladonMart3F.asm b/text/CeladonMart3F.asm index c24763e46..a3211c5d6 100644 --- a/text/CeladonMart3F.asm +++ b/text/CeladonMart3F.asm @@ -1,4 +1,4 @@ -_TM18PreReceiveText:: +_CeladonMart3FClerkTM18PreReceiveText:: text "Oh, hi! I finally" line "finished #MON!" @@ -7,26 +7,26 @@ _TM18PreReceiveText:: cont "useful!" prompt -_ReceivedTM18Text:: +_CeladonMart3FClerkReceivedTM18Text:: text " received" line "@" text_ram wStringBuffer text "!@" text_end -_TM18ExplanationText:: +_CeladonMart3FClerkTM18ExplanationText:: text "TM18 is COUNTER!" line "Not like the one" cont "I'm leaning on," cont "mind you!" done -_TM18NoRoomText:: +_CeladonMart3FClerkTM18NoRoomText:: text "Your pack is full" line "of items!" done -_CeladonMart3Text2:: +_CeladonMart3FGameBoyKid1Text:: text "Captured #MON" line "are registered" cont "with an ID No." @@ -36,7 +36,7 @@ _CeladonMart3Text2:: cont "caught it!" done -_CeladonMart3Text3:: +_CeladonMart3FGameBoyKid2Text:: text "All right!" para "My buddy's going" @@ -45,7 +45,7 @@ _CeladonMart3Text3:: cont "GRAVELER!" done -_CeladonMart3Text4:: +_CeladonMart3FGameBoyKid3Text:: text "Come on GRAVELER!" para "I love GRAVELER!" @@ -58,42 +58,42 @@ _CeladonMart3Text4:: cont "#MON!" done -_CeladonMart3Text5:: +_CeladonMart3FLittleBoyText:: text "You can identify" line "#MON you got" cont "in trades by" cont "their ID Numbers!" done -_CeladonMart3Text6:: +_CeladonMart3FSNESText:: text "It's an SNES!" done -_CeladonMart3Text7:: +_CeladonMart3FRPGText:: text "An RPG! There's" line "no time for that!" done -_CeladonMart3Text9:: +_CeladonMart3FSportsGameText:: text "A sports game!" line "Dad'll like that!" done -_CeladonMart3Text11:: +_CeladonMart3FPuzzleGameText:: text "A puzzle game!" line "Looks addictive!" done -_CeladonMart3Text13:: +_CeladonMart3FFightingGameText:: text "A fighting game!" line "Looks tough!" done -_CeladonMart3Text14:: +_CeladonMart3FCurrentFloorSignText:: text "3F: TV GAME SHOP" done -_CeladonMart3Text15:: +_CeladonMart3FPokemonPosterText:: text "Red and Blue!" line "Both are #MON!" done diff --git a/text/CeladonMart4F.asm b/text/CeladonMart4F.asm index 78fa0b66b..d08e8d895 100644 --- a/text/CeladonMart4F.asm +++ b/text/CeladonMart4F.asm @@ -1,10 +1,10 @@ -_CeladonMart4Text2:: +_CeladonMart4FSuperNerdText:: text "I'm getting a" line "# DOLL for my" cont "girl friend!" done -_CeladonMart4Text3:: +_CeladonMart4FYoungsterText:: text "I heard something" line "useful." @@ -14,7 +14,7 @@ _CeladonMart4Text3:: cont "with a # DOLL!" done -_CeladonMart4Text4:: +_CeladonMart4FCurrentFloorSignText:: text "Express yourself" line "with gifts!" diff --git a/text/CeladonMart5F.asm b/text/CeladonMart5F.asm index 1871194bc..7d3193a67 100644 --- a/text/CeladonMart5F.asm +++ b/text/CeladonMart5F.asm @@ -1,4 +1,4 @@ -_CeladonMart5Text1:: +_CeladonMart5FGentlemanText:: text "#MON ability" line "enhancers can be" cont "bought only here." @@ -11,7 +11,7 @@ _CeladonMart5Text1:: line "increase SPEED." done -_CeladonMart5Text2:: +_CeladonMart5FSailorText:: text "I'm here for" line "#MON ability" cont "enhancers." @@ -23,6 +23,6 @@ _CeladonMart5Text2:: line "DEFENSE!" done -_CeladonMart5Text5:: +_CeladonMart5FCurrentFloorSignText:: text "5F: DRUG STORE" done diff --git a/text/CeladonMartRoof.asm b/text/CeladonMartRoof.asm index cbedb3b74..1a107b61e 100644 --- a/text/CeladonMartRoof.asm +++ b/text/CeladonMartRoof.asm @@ -1,9 +1,9 @@ -_CeladonMartRoofText_484ee:: +_CeladonMartRoofLittleGirlGiveHerWhichDrinkText:: text "Give her which" line "drink?" done -_CeladonMartRoofText_484f3:: +_CeladonMartRoofLittleGirlYayFreshWaterText:: text "Yay!" para "FRESH WATER!" @@ -14,14 +14,14 @@ _CeladonMartRoofText_484f3:: line "from me!@" text_end -_CeladonMartRoofText_484f9:: +_CeladonMartRoofLittleGirlReceivedTM13Text:: text " received" line "@" text_ram wStringBuffer text "!@" text_end -_CeladonMartRoofText_484fe:: +_CeladonMartRoofLittleGirlTM13ExplanationText:: text_start para "@" @@ -33,7 +33,7 @@ _CeladonMartRoofText_484fe:: line "target sometimes!@" text_end -_CeladonMartRoofText_48504:: +_CeladonMartRoofLittleGirlYaySodaPopText:: text "Yay!" para "SODA POP!" @@ -44,14 +44,14 @@ _CeladonMartRoofText_48504:: line "from me!@" text_end -_CeladonMartRoofText_4850a:: +_CeladonMartRoofLittleGirlReceivedTM48Text:: text " received" line "@" text_ram wStringBuffer text "!@" text_end -_CeladonMartRoofText_4850f:: +_CeladonMartRoofLittleGirlTM48ExplanationText:: text_start para "@" @@ -63,7 +63,7 @@ _CeladonMartRoofText_4850f:: line "target sometimes!@" text_end -_CeladonMartRoofText_48515:: +_CeladonMartRoofLittleGirlYayLemonadeText:: text "Yay!" para "LEMONADE!" @@ -74,30 +74,30 @@ _CeladonMartRoofText_48515:: line "from me!@" text_end -_ReceivedTM49Text:: +_CeladonMartRoofLittleGirlReceivedTM49Text:: text " received" line "TM49!@" text_end -_CeladonMartRoofText_48520:: +_CeladonMartRoofLittleGirlTM49ExplanationText:: text_start para "TM49 contains" line "TRI ATTACK!@" text_end -_CeladonMartRoofText_48526:: +_CeladonMartRoofLittleGirlNoRoomText:: text "You don't have" line "space for this!@" text_end -_CeladonMartRoofText_4852c:: +_CeladonMartRoofLittleGirlImNotThirstyText:: text "No thank you!" line "I'm not thirsty" cont "after all!@" text_end -_CeladonMartRoofText1:: +_CeladonMartRoofSuperNerdText:: text "My sister is a" line "trainer, believe" cont "it or not." @@ -107,13 +107,13 @@ _CeladonMartRoofText1:: cont "drives me nuts!" done -_CeladonMartRoofText_48598:: +_CeladonMartRoofLittleGirlImThirstyText:: text "I'm thirsty!" line "I want something" cont "to drink!" done -_CeladonMartRoofText4:: +_CeladonMartRoofLittleGirlGiveHerADrinkText:: text "I'm thirsty!" line "I want something" cont "to drink!" @@ -121,7 +121,7 @@ _CeladonMartRoofText4:: para "Give her a drink?" done -_CeladonMartRoofText6:: +_CeladonMartRoofCurrentFloorSignText:: text "ROOFTOP SQUARE:" line "VENDING MACHINES" done diff --git a/text/CeladonPokecenter.asm b/text/CeladonPokecenter.asm index a04f51c98..38ceaf2f7 100644 --- a/text/CeladonPokecenter.asm +++ b/text/CeladonPokecenter.asm @@ -1,11 +1,11 @@ -_CeladonPokecenterText2:: +_CeladonPokecenterGentlemanText:: text "# FLUTE awakens" line "#MON with a" cont "sound that only" cont "they can hear!" done -_CeladonPokecenterText3:: +_CeladonPokecenterBeautyText:: text "I rode uphill on" line "CYCLING ROAD from" cont "FUCHSIA!" diff --git a/text/CeruleanBadgeHouse.asm b/text/CeruleanBadgeHouse.asm index 9d701443d..60fea5b56 100644 --- a/text/CeruleanBadgeHouse.asm +++ b/text/CeruleanBadgeHouse.asm @@ -1,4 +1,4 @@ -_CeruleanHouse2Text_74e77:: +_CeruleanBadgeHouseMiddleAgedManText:: text "#MON BADGEs" line "are owned only by" cont "skilled trainers." @@ -10,7 +10,7 @@ _CeruleanHouse2Text_74e77:: line "amazing secrets!" prompt -_CeruleanHouse2Text_74e7c:: +_CeruleanBadgeHouseMiddleAgedManWhichBadgeText:: text "Now then..." para "Which of the 8" @@ -18,12 +18,12 @@ _CeruleanHouse2Text_74e7c:: cont "describe?" done -_CeruleanHouse2Text_74e81:: +_CeruleanBadgeHouseMiddleAgedManVisitAnyTimeText:: text "Come visit me any" line "time you wish." done -_CeruleanHouse2Text_74e96:: +_CeruleanBadgeHouseBoulderBadgeText:: text "The ATTACK of all" line "#MON increases" cont "a little bit." @@ -33,7 +33,7 @@ _CeruleanHouse2Text_74e96:: cont "time you desire." prompt -_CeruleanHouse2Text_74e9b:: +_CeruleanBadgeHouseCascadeBadgeText:: text "#MON up to L30" line "will obey you." @@ -45,7 +45,7 @@ _CeruleanHouse2Text_74e9b:: cont "of battle." prompt -_CeruleanHouse2Text_74ea0:: +_CeruleanBadgeHouseThunderBadgeText:: text "The SPEED of all" line "#MON increases" cont "a little bit." @@ -55,7 +55,7 @@ _CeruleanHouse2Text_74ea0:: cont "of battle." prompt -_CeruleanHouse2Text_74ea5:: +_CeruleanBadgeHouseRainbowBadgeText:: text "#MON up to L50" line "will obey you." @@ -67,7 +67,7 @@ _CeruleanHouse2Text_74ea5:: cont "side of battle." prompt -_CeruleanHouse2Text_74eaa:: +_CeruleanBadgeHouseSoulBadgeText:: text "The DEFENSE of all" line "#MON increases" cont "a little bit." @@ -77,7 +77,7 @@ _CeruleanHouse2Text_74eaa:: cont "of battle." prompt -_CeruleanHouse2Text_74eaf:: +_CeruleanBadgeHouseMarshBadgeText:: text "#MON up to L70" line "will obey you." @@ -85,13 +85,13 @@ _CeruleanHouse2Text_74eaf:: line "become unruly!" prompt -_CeruleanHouse2Text_74eb4:: +_CeruleanBadgeHouseVolcanoBadgeText:: text "Your #MON's" line "SPECIAL abilities" cont "increase a bit." prompt -_CeruleanHouse2Text_74eb9:: +_CeruleanBadgeHouseEarthBadgeText:: text "All #MON will" line "obey you!" prompt diff --git a/text/CeruleanCity.asm b/text/CeruleanCity.asm index d0884a399..63c67d582 100644 --- a/text/CeruleanCity.asm +++ b/text/CeruleanCity.asm @@ -1,4 +1,4 @@ -_CeruleanCityText_19668:: +_CeruleanCityRivalPreBattleText:: text ": Yo!" line "!" @@ -16,19 +16,19 @@ _CeruleanCityText_19668:: cont "!" done -_CeruleanCityText_1966d:: +_CeruleanCityRivalDefeatedText:: text "Hey!" line "Take it easy!" cont "You won already!" prompt -_CeruleanCityText_19672:: +_CeruleanCityRivalVictoryText:: text "Heh!" line "You're no match" cont "for my genius!" prompt -_CeruleanCityText_19677:: +_CeruleanCityRivalIWentToBillsText:: text ": Hey," line "guess what?" @@ -58,7 +58,7 @@ _CeruleanCityText_19677:: cont "Smell ya later!" done -_CeruleanCityText_196d9:: +_CeruleanCityRocketText:: text "Hey! Stay out!" line "It's not your" cont "yard! Huh? Me?" @@ -68,19 +68,19 @@ _CeruleanCityText_196d9:: cont "you believe me?" done -_ReceivedTM28Text:: +_CeruleanCityRocketReceivedTM28Text:: text " recovered" line "TM28!@" text_end -_ReceivedTM28Text2:: +_CeruleanCityRocketIBetterGetMovingText:: text_start para "I better get" line "moving! Bye!@" text_end -_TM28NoRoomText:: +_CeruleanCityRocketTM28NoRoomText:: text "Make room for" line "this!" @@ -88,25 +88,25 @@ _TM28NoRoomText:: line "I give it to you!" done -_CeruleanCityText_196ee:: +_CeruleanCityRocketIGiveUpText:: text "Stop!" line "I give up! I'll" cont "leave quietly!" prompt -_CeruleanCityText_196f3:: +_CeruleanCityRocketIllReturnTheTMText:: text "OK! I'll return" line "the TM I stole!" prompt -_CeruleanCityText3:: +_CeruleanCityCooltrainerMText:: text "You're a trainer" line "too? Collecting," cont "fighting, it's a" cont "tough life." done -_CeruleanCityText4:: +_CeruleanCitySuperNerd1Text:: text "That bush in" line "front of the shop" cont "is in the way." @@ -115,14 +115,14 @@ _CeruleanCityText4:: line "way around." done -_CeruleanCityText5:: +_CeruleanCitySuperNerd2Text:: text "You're making an" line "encyclopedia on" cont "#MON? That" cont "sounds amusing." done -_CeruleanCityText6:: +_CeruleanCityGuardText:: text "The people here" line "were robbed." @@ -136,20 +136,20 @@ _CeruleanCityText6:: cont "with the ROCKETs!" done -_CeruleanCityText_19730:: +_CeruleanCityCooltrainerF1SlowbroUseSonicboomText:: text "OK! SLOWBRO!" line "Use SONICBOOM!" cont "Come on, SLOWBRO" cont "pay attention!" done -_CeruleanCityText_19735:: +_CeruleanCityCooltrainerF1SlowbroPunchText:: text "SLOWBRO punch!" line "No! You blew it" cont "again!" done -_CeruleanCityText_1973a:: +_CeruleanCityCooltrainerF1SlowbroWithdrawText:: text "SLOWBRO, WITHDRAW!" line "No! That's wrong!" @@ -162,27 +162,27 @@ _CeruleanCityText_1973a:: cont "as a trainer!" done -_CeruleanCityText_1976f:: +_CeruleanCitySlowbroTookASnoozeText:: text "SLOWBRO took a" line "snooze..." done -_CeruleanCityText_19774:: +_CeruleanCitySlowbroIsLoafingAroundText:: text "SLOWBRO is" line "loafing around..." done -_CeruleanCityText_19779:: +_CeruleanCitySlowbroTurnedAwayText:: text "SLOWBRO turned" line "away..." done -_CeruleanCityText_1977e:: +_CeruleanCitySlowbroIgnoredOrdersText:: text "SLOWBRO" line "ignored orders..." done -_CeruleanCityText9:: +_CeruleanCityCooltrainerF2Text:: text "I want a bright" line "red BICYCLE!" @@ -191,7 +191,7 @@ _CeruleanCityText9:: cont "get dirty!" done -_CeruleanCityText10:: +_CeruleanCitySuperNerd3Text:: text "This is CERULEAN" line "CAVE! Horribly" cont "strong #MON" @@ -203,14 +203,14 @@ _CeruleanCityText10:: cont "is allowed in!" done -_CeruleanCityText12:: +_CeruleanCitySignText:: text "CERULEAN CITY" line "A Mysterious," cont "Blue Aura" cont "Surrounds It" done -_CeruleanCityText13:: +_CeruleanCityTrainerTipsText:: text "TRAINER TIPS" para "Pressing B Button" @@ -219,13 +219,13 @@ _CeruleanCityText13:: cont "process." done -_CeruleanCityText16:: +_CeruleanCityBikeShopSign:: text "Grass and caves" line "handled easily!" cont "BIKE SHOP" done -_CeruleanCityText17:: +_CeruleanCityGymSign:: text "CERULEAN CITY" line "#MON GYM" cont "LEADER: MISTY" diff --git a/text/CeruleanGym.asm b/text/CeruleanGym.asm index 2c90ed15f..d734b4559 100644 --- a/text/CeruleanGym.asm +++ b/text/CeruleanGym.asm @@ -1,4 +1,4 @@ -_MistyPreBattleText:: +_CeruleanGymMistyPreBattleText:: text "Hi, you're a new" line "face!" @@ -17,7 +17,7 @@ _MistyPreBattleText:: cont "#MON!" done -_TM11ExplanationText:: +_CeruleanGymMistyTM11ExplanationText:: text "TM11 teaches" line "BUBBLEBEAM!" @@ -25,7 +25,7 @@ _TM11ExplanationText:: line "aquatic #MON!" done -_MistyCascadeBadgeInfoText:: +_CeruleanGymMistyCascadeBadgeInfoText:: text "The CASCADEBADGE" line "makes all #MON" cont "up to L30 obey!" @@ -45,17 +45,17 @@ _MistyCascadeBadgeInfoText:: line "my favorite TM!" done -_ReceivedTM11Text:: +_CeruleanGymMistyReceivedTM11Text:: text " received" line "TM11!@" text_end -_TM11NoRoomText:: +_CeruleanGymMistyTM11NoRoomText:: text "You better make" line "room for this!" done -_ReceivedCascadeBadgeText:: +_CeruleanGymMistyReceivedCascadeBadgeText:: text "Wow!" line "You're too much!" @@ -105,7 +105,7 @@ _CeruleanGymAfterBattleText2:: line "someone like you!" done -_CeruleanGymGuidePreBattleText:: +_CeruleanGymGymGuideChampInMakingText:: text "Yo! Champ in" line "making!" @@ -123,7 +123,7 @@ _CeruleanGymGuidePreBattleText:: line "electricity!" done -_CeruleanGymGuidePostBattleText:: +_CeruleanGymGymGuideBeatMistyText:: text "You beat MISTY!" line "What'd I tell ya?" diff --git a/text/CeruleanMart.asm b/text/CeruleanMart.asm index 86a745887..0039b9339 100644 --- a/text/CeruleanMart.asm +++ b/text/CeruleanMart.asm @@ -1,4 +1,4 @@ -_CeruleanMartText2:: +_CeruleanMartCooltrainerMText:: text "Use REPEL to keep" line "bugs and weak" cont "#MON away." @@ -9,7 +9,7 @@ _CeruleanMartText2:: cont "for best results!" done -_CeruleanMartText3:: +_CeruleanMartCooltrainerFText:: text "Have you seen any" line "RARE CANDY?" diff --git a/text/CeruleanPokecenter.asm b/text/CeruleanPokecenter.asm index 497fbce32..5c93a5bde 100644 --- a/text/CeruleanPokecenter.asm +++ b/text/CeruleanPokecenter.asm @@ -1,4 +1,4 @@ -_CeruleanPokecenterText2:: +_CeruleanPokecenterSuperNerdText:: text "That BILL!" para "I heard that" @@ -7,7 +7,7 @@ _CeruleanPokecenterText2:: cont "rare #MON!" done -_CeruleanPokecenterText3:: +_CeruleanPokecenterGentlemanText:: text "Have you heard" line "about BILL?" diff --git a/text/CeruleanTradeHouse.asm b/text/CeruleanTradeHouse.asm index b606613bd..205bba3f0 100644 --- a/text/CeruleanTradeHouse.asm +++ b/text/CeruleanTradeHouse.asm @@ -1,4 +1,4 @@ -_CeruleanHouse1Text1:: +_CeruleanTradeHouseGrannyText:: text "My husband likes" line "trading #MON." diff --git a/text/CeruleanTrashedHouse.asm b/text/CeruleanTrashedHouse.asm index f79540ae2..7d93703d9 100644 --- a/text/CeruleanTrashedHouse.asm +++ b/text/CeruleanTrashedHouse.asm @@ -1,4 +1,4 @@ -_CeruleanTrashedText_1d6ab:: +_CeruleanTrashedHouseFishingGuruTheyStoleATMText:: text "Those miserable" line "ROCKETs!" @@ -14,7 +14,7 @@ _CeruleanTrashedText_1d6ab:: line "bundle, it did!" done -_CeruleanTrashedText_1d6b0:: +_CeruleanTrashedHouseFishingGuruWhatsLostIsLostText:: text "I figure what's" line "lost is lost!" @@ -23,14 +23,14 @@ _CeruleanTrashedText_1d6b0:: cont "DIG without a TM!" done -_CeruleanHouseTrashedText2:: +_CeruleanTrashedHouseGirlText:: text "TEAM ROCKET must" line "be trying to DIG" cont "their way into no" cont "good!" done -_CeruleanHouseTrashedText3:: +_CeruleanTrashedHouseWallHoleText:: text "TEAM ROCKET left" line "a way out!" done diff --git a/text/ChampionsRoom.asm b/text/ChampionsRoom.asm index 575b7da46..92f23f69c 100644 --- a/text/ChampionsRoom.asm +++ b/text/ChampionsRoom.asm @@ -1,4 +1,4 @@ -_GaryChampionIntroText:: +_ChampionsRoomRivalIntroText:: text ": Hey!" para "I was looking" @@ -35,7 +35,7 @@ _GaryChampionIntroText:: cont "in the world!" done -_GaryDefeatedText:: +_RivalDefeatedText:: text "NO!" line "That can't be!" cont "You beat my best!" @@ -49,7 +49,7 @@ _GaryDefeatedText:: cont "It's not fair!" prompt -_GaryVictoryText:: +_RivalVictoryText:: text "Hahaha!" line "I won, I won!" @@ -65,7 +65,7 @@ _GaryVictoryText:: line "Hahaha!" prompt -_GaryText_76103:: +_ChampionsRoomRivalAfterBattleText:: text "Why?" line "Why did I lose?" @@ -81,11 +81,11 @@ _GaryText_76103:: line "like to admit it." done -_GaryText2:: +_ChampionsRoomOakText:: text "OAK: !" done -_GaryText_76120:: +_ChampionsRoomOakCongratulatesPlayerText:: text "OAK: So, you won!" line "Congratulations!" cont "You're the new" @@ -103,7 +103,7 @@ _GaryText_76120:: line "come of age!" done -_GaryText_76125:: +_ChampionsRoomOakDisappointedWithRivalText:: text "OAK: ! I'm" line "disappointed!" @@ -129,7 +129,7 @@ _GaryText_76125:: cont "a champ again!" done -_GaryText_7612a:: +_ChampionsRoomOakComeWithMeText:: text "OAK: !" para "You understand" diff --git a/text/CinnabarGym.asm b/text/CinnabarGym.asm index daab36d45..840ec5068 100644 --- a/text/CinnabarGym.asm +++ b/text/CinnabarGym.asm @@ -1,4 +1,4 @@ -_BlainePreBattleText:: +_CinnabarGymBlainePreBattleText:: text "Hah!" para "I am BLAINE! I" @@ -13,7 +13,7 @@ _BlainePreBattleText:: line "have BURN HEAL!" done -_ReceivedVolcanoBadgeText:: +_CinnabarGymBlaineReceivedVolcanoBadgeText:: text "I have" line "burnt out!" @@ -21,7 +21,7 @@ _ReceivedVolcanoBadgeText:: line "the VOLCANOBADGE!@" text_end -_BlainePostBattleAdviceText:: +_CinnabarGymBlainePostBattleAdviceText:: text "FIRE BLAST is the" line "ultimate fire" cont "technique!" @@ -30,7 +30,7 @@ _BlainePostBattleAdviceText:: line "water #MON!" done -_BlaineVolcanoBadgeInfoText:: +_CinnabarGymBlaineVolcanoBadgeInfoText:: text "Hah!" para "The VOLCANOBADGE" @@ -42,14 +42,14 @@ _BlaineVolcanoBadgeInfoText:: line "have this too!" done -_ReceivedTM38Text:: +_CinnabarGymBlaineReceivedTM38Text:: text " received" line "@" text_ram wStringBuffer text "!@" text_end -_TM38ExplanationText:: +_CinnabarGymBlaineTM38ExplanationText:: text_start para "TM38 contains" @@ -63,23 +63,23 @@ _TM38ExplanationText:: cont "good bets!" done -_TM38NoRoomText:: +_CinnabarGymBlaineTM38NoRoomText:: text "Make room for my" line "gift!" done -_CinnabarGymBattleText2:: +_CinnabarGymSuperNerd1BattleText:: text "Do you know how" line "hot #MON fire" cont "breath can get?" done -_CinnabarGymEndBattleText2:: +_CinnabarGymSuperNerd1EndBattleText:: text "Yow!" line "Hot, hot, hot!" prompt -_CinnabarGymAfterBattleText2:: +_CinnabarGymSuperNerd1AfterBattleText:: text "Fire, or to be" line "more precise," cont "combustion..." @@ -88,66 +88,66 @@ _CinnabarGymAfterBattleText2:: line "blah..." done -_CinnabarGymBattleText1:: +_CinnabarGymSuperNerd2BattleText:: text "I was a thief, but" line "I became straight" cont "as a trainer!" done -_CinnabarGymEndBattleText1:: +_CinnabarGymSuperNerd2EndBattleText:: text "I" line "surrender!" prompt -_CinnabarGymAfterBattleText1:: +_CinnabarGymSuperNerd2AfterBattleText:: text "I can't help" line "stealing other" cont "people's #MON!" done -_CinnabarGymBattleText3:: +_CinnabarGymSuperNerd3BattleText:: text "You can't win!" line "I have studied" cont "#MON totally!" done -_CinnabarGymEndBattleText3:: +_CinnabarGymSuperNerd3EndBattleText:: text "Waah!" line "My studies!" prompt -_CinnabarGymAfterBattleText3:: +_CinnabarGymSuperNerd3AfterBattleText:: text "My theories are" line "too complicated" cont "for you!" done -_CinnabarGymBattleText4:: +_CinnabarGymSuperNerd4BattleText:: text "I just like using" line "fire #MON!" done -_CinnabarGymEndBattleText4:: +_CinnabarGymSuperNerd4EndBattleText:: text "Too hot" line "to handle!" prompt -_CinnabarGymAfterBattleText4:: +_CinnabarGymSuperNerd4AfterBattleText:: text "I wish there was" line "a thief #MON!" cont "I'd use that!" done -_CinnabarGymBattleText5:: +_CinnabarGymSuperNerd5BattleText:: text "I know why BLAINE" line "became a trainer!" done -_CinnabarGymEndBattleText5:: +_CinnabarGymSuperNerd5EndBattleText:: text "Ow!" prompt -_CinnabarGymAfterBattleText5:: +_CinnabarGymSuperNerd5AfterBattleText:: text "BLAINE was lost" line "in the mountains" cont "when a fiery bird" @@ -158,40 +158,40 @@ _CinnabarGymAfterBattleText5:: cont "his way down!" done -_CinnabarGymBattleText6:: +_CinnabarGymSuperNerd6BattleText:: text "I've been to many" line "GYMs, but this is" cont "my favorite!" done -_CinnabarGymEndBattleText6:: +_CinnabarGymSuperNerd6EndBattleText:: text "Yowza!" line "Too hot!" prompt -_CinnabarGymAfterBattleText6:: +_CinnabarGymSuperNerd6AfterBattleText:: text "Us fire #MON" line "fans like PONYTA" cont "and NINETALES!" done -_CinnabarGymBattleText7:: +_CinnabarGymSuperNerd7BattleText:: text "Fire is weak" line "against H2O!" done -_CinnabarGymEndBattleText7:: +_CinnabarGymSuperNerd7EndBattleText:: text "Oh!" line "Snuffed out!" prompt -_CinnabarGymAfterBattleText7:: +_CinnabarGymSuperNerd7AfterBattleText:: text "Water beats fire!" line "But, fire melts" cont "ice #MON!" done -_CinnabarGymGuidePreBattleText:: +_CinnabarGymGymGuideChampInMakingText:: text "Yo! Champ in" line "making!" @@ -206,7 +206,7 @@ _CinnabarGymGuidePreBattleText:: line "some BURN HEALs!" done -_CinnabarGymGuidePostBattleText:: +_CinnabarGymGymGuideBeatBlaineText:: text "! You beat" line "that fire brand!" done diff --git a/text/CinnabarIsland.asm b/text/CinnabarIsland.asm index 352ab8eac..75bf99b49 100644 --- a/text/CinnabarIsland.asm +++ b/text/CinnabarIsland.asm @@ -1,33 +1,33 @@ -_CinnabarIslandText8:: +_CinnabarIslandDoorIsLockedText:: text "The door is" line "locked..." done -_CinnabarIslandText1:: +_CinnabarIslandGirlText:: text "CINNABAR GYM's" line "BLAINE is an odd" cont "man who has lived" cont "here for decades." done -_CinnabarIslandText2:: +_CinnabarIslandGamblerText:: text "Scientists conduct" line "experiments in" cont "the burned out" cont "building." done -_CinnabarIslandText3:: +_CinnabarIslandSignText:: text "CINNABAR ISLAND" line "The Fiery Town of" cont "Burning Desire" done -_CinnabarIslandText6:: +_CinnabarIslandPokemonLabSignText:: text "#MON LAB" done -_CinnabarIslandText7:: +_CinnabarIslandGymSignText:: text "CINNABAR ISLAND" line "#MON GYM" cont "LEADER: BLAINE" diff --git a/text/CinnabarLab.asm b/text/CinnabarLab.asm index a93a484da..3d1102f2e 100644 --- a/text/CinnabarLab.asm +++ b/text/CinnabarLab.asm @@ -1,4 +1,4 @@ -_Lab1Text1:: +_CinnabarLabFishingGuruText:: text "We study #MON" line "extensively here." @@ -7,23 +7,23 @@ _Lab1Text1:: cont "for examination." done -_Lab1Text2:: +_CinnabarLabPhotoText:: text "A photo of the" line "LAB's founder," cont "DR.FUJI!" done -_Lab1Text3:: +_CinnabarLabMeetingRoomSignText:: text "#MON LAB" line "Meeting Room" done -_Lab1Text4:: +_CinnabarLabRAndDSignText:: text "#MON LAB" line "R-and-D Room" done -_Lab1Text5:: +_CinnabarLabTestingRoomSignText:: text "#MON LAB" line "Testing Room" done diff --git a/text/CinnabarLabFossilRoom.asm b/text/CinnabarLabFossilRoom.asm index 14db7fff2..161342e4c 100644 --- a/text/CinnabarLabFossilRoom.asm +++ b/text/CinnabarLabFossilRoom.asm @@ -1,4 +1,4 @@ -_Lab4Text_75dc6:: +_CinnabarLabFossilRoomScientist1Text:: text "Hiya!" para "I am important" @@ -11,11 +11,11 @@ _Lab4Text_75dc6:: line "fossil for me?" prompt -_Lab4Text_75dcb:: +_CinnabarLabFossilRoomScientist1NoFossilsText:: text "No! Is too bad!" done -_Lab4Text_75dd0:: +_CinnabarLabFossilRoomScientist1GoForAWalkText:: text "I take a little" line "time!" @@ -23,7 +23,7 @@ _Lab4Text_75dd0:: line "little while!" done -_Lab4Text_75dd5:: +_CinnabarLabFossilRoomScientist1FossilIsBackToLifeText:: text "Where were you?" para "Your fossil is" diff --git a/text/CinnabarLabMetronomeRoom.asm b/text/CinnabarLabMetronomeRoom.asm index 2a8099536..dc42e1149 100644 --- a/text/CinnabarLabMetronomeRoom.asm +++ b/text/CinnabarLabMetronomeRoom.asm @@ -1,4 +1,4 @@ -_TM35PreReceiveText:: +_CinnabarLabMetronomeRoomScientist1Text:: text "Tch-tch-tch!" line "I made a cool TM!" @@ -6,14 +6,14 @@ _TM35PreReceiveText:: line "kinds of fun!" prompt -_ReceivedTM35Text:: +_CinnabarLabMetronomeRoomScientist1ReceivedTM35Text:: text " received " line "@" text_ram wStringBuffer text "!@" text_end -_TM35ExplanationText:: +_CinnabarLabMetronomeRoomScientist1TM35ExplanationText:: text "Tch-tch-tch!" line "That's the sound" cont "of a METRONOME!" @@ -24,18 +24,18 @@ _TM35ExplanationText:: cont "it doesn't know!" done -_TM35NoRoomText:: +_CinnabarLabMetronomeRoomScientist1TM35NoRoomText:: text "Your pack is" line "crammed full!" done -_Lab3Text2:: +_CinnabarLabMetronomeRoomScientist2Text:: text "EEVEE can evolve" line "into 1 of 3 kinds" cont "of #MON." done -_Lab3Text3:: +_CinnabarLabMetronomeRoomPCText:: text "There's an e-mail" line "message!" @@ -59,6 +59,6 @@ _Lab3Text3:: para "..." done -_Lab3Text5:: +_CinnabarLabMetronomeRoomAmberPipeText:: text "An amber pipe!" done diff --git a/text/CinnabarLabTradeRoom.asm b/text/CinnabarLabTradeRoom.asm index 196124e7c..6f9a409e2 100644 --- a/text/CinnabarLabTradeRoom.asm +++ b/text/CinnabarLabTradeRoom.asm @@ -1,4 +1,4 @@ -_Lab2Text1:: +_CinnabarLabTradeRoomSuperNerdText:: text "I found this very" line "strange fossil in" cont "MT.MOON!" diff --git a/text/CinnabarMart.asm b/text/CinnabarMart.asm index 42a41d065..063e2ff90 100644 --- a/text/CinnabarMart.asm +++ b/text/CinnabarMart.asm @@ -1,10 +1,10 @@ -_CinnabarMartText2:: +_CinnabarMartSilphWorkerFText:: text "Don't they have X" line "ATTACK? It's good" cont "for battles!" done -_CinnabarMartText3:: +_CinnabarMartScientistText:: text "It never hurts to" line "have extra items!" done diff --git a/text/CinnabarPokecenter.asm b/text/CinnabarPokecenter.asm index cf481764e..07602e6eb 100644 --- a/text/CinnabarPokecenter.asm +++ b/text/CinnabarPokecenter.asm @@ -1,4 +1,4 @@ -_CinnabarPokecenterText2:: +_CinnabarPokecenterCooltrainerFText:: text "You can cancel" line "evolution." @@ -8,7 +8,7 @@ _CinnabarPokecenterText2:: cont "it the way it is." done -_CinnabarPokecenterText3:: +_CinnabarPokecenterGentlemanText:: text "Do you have any" line "friends?" diff --git a/text/CopycatsHouse1F.asm b/text/CopycatsHouse1F.asm index 0bf84558e..557488df4 100644 --- a/text/CopycatsHouse1F.asm +++ b/text/CopycatsHouse1F.asm @@ -1,11 +1,11 @@ -_CopycatsHouse1FText1:: +_CopycatsHouse1FMiddleAgedWomanText:: text "My daughter is so" line "self-centered." cont "She only has a" cont "few friends." done -_CopycatsHouse1FText2:: +_CopycatsHouse1FMiddleAgedManText:: text "My daughter likes" line "to mimic people." @@ -15,7 +15,7 @@ _CopycatsHouse1FText2:: cont "around here!" done -_CopycatsHouse1FText3:: +_CopycatsHouse1FChanseyText:: text "CHANSEY: Chaan!" line "Sii!@" text_end diff --git a/text/CopycatsHouse2F.asm b/text/CopycatsHouse2F.asm index 117dd64eb..83184615d 100644 --- a/text/CopycatsHouse2F.asm +++ b/text/CopycatsHouse2F.asm @@ -1,4 +1,4 @@ -_CopycatsHouse2FText_5ccd4:: +_CopycatsHouse2FCopycatDoYouLikePokemonText:: text ": Hi! Do" line "you like #MON?" @@ -15,7 +15,7 @@ _CopycatsHouse2FText_5ccd4:: line "favorite hobby!" prompt -_TM31PreReceiveText:: +_CopycatsHouse2FCopycatTM31PreReceiveText:: text "Oh wow!" line "A # DOLL!" @@ -26,14 +26,14 @@ _TM31PreReceiveText:: line "this, then!" prompt -_ReceivedTM31Text:: +_CopycatsHouse2FCopycatReceivedTM31Text:: text " received" line "@" text_ram wStringBuffer text "!@" text_end -_TM31ExplanationText1:: +_CopycatsHouse2FCopycatTM31Explanation1Text:: text_start para "TM31 contains my" @@ -43,7 +43,7 @@ _TM31ExplanationText1:: line "#MON!@" text_end -_TM31ExplanationText2:: +_CopycatsHouse2FCopycatTM31Explanation2Text:: text ": Hi!" line "Thanks for TM31!" @@ -57,12 +57,12 @@ _TM31ExplanationText2:: line "It's a scream!" done -_TM31NoRoomText:: +_CopycatsHouse2FCopycatTM31NoRoomText:: text "Don't you want" line "this?@" text_end -_CopycatsHouse2FText2:: +_CopycatsHouse2FDoduoText:: text "DODUO: Giiih!" para "MIRROR MIRROR ON" @@ -71,19 +71,19 @@ _CopycatsHouse2FText2:: cont "OF ALL?" done -_CopycatsHouse2FText3:: +_CopycatsHouse2FRareDollText:: text "This is a rare" line "#MON! Huh?" cont "It's only a doll!" done -_CopycatsHouse2FText6:: +_CopycatsHouse2FSNESText:: text "A game with MARIO" line "wearing a bucket" cont "on his head!" done -_CopycatsHouse2FText_5cd17:: +_CopycatsHouse2FPCMySecretsText:: text "..." para "My Secrets!" @@ -95,6 +95,6 @@ _CopycatsHouse2FText_5cd17:: cont "CLEFAIRY!" done -_CopycatsHouse2FText_5cd1c:: +_CopycatsHouse2FPCCantSeeText:: text "Huh? Can't see!" done diff --git a/text/Daycare.asm b/text/Daycare.asm index 197927ddc..87cde965f 100644 --- a/text/Daycare.asm +++ b/text/Daycare.asm @@ -1,16 +1,16 @@ -_DayCareIntroText:: +_DaycareGentlemanIntroText:: text "I run a DAYCARE." line "Would you like me" cont "to raise one of" cont "your #MON?" done -_DayCareWhichMonText:: +_DaycareGentlemanWhichMonText:: text "Which #MON" line "should I raise?" prompt -_DayCareWillLookAfterMonText:: +_DaycareGentlemanWillLookAfterMonText:: text "Fine, I'll look" line "after @" text_ram wcd6d @@ -18,12 +18,12 @@ _DayCareWillLookAfterMonText:: cont "for a while." prompt -_DayCareComeSeeMeInAWhileText:: +_DaycareGentlemanComeSeeMeInAWhileText:: text "Come see me in" line "a while." done -_DayCareMonHasGrownText:: +_DaycareGentlemanMonHasGrownText:: text "Your @" text_ram wcd6d text_start @@ -37,7 +37,7 @@ _DayCareMonHasGrownText:: para "Aren't I great?" prompt -_DayCareOweMoneyText:: +_DaycareGentlemanOweMoneyText:: text "You owe me ¥@" text_bcd wDayCareTotalCost, 2 | LEADING_ZEROES | LEFT_ALIGN text_start @@ -45,14 +45,14 @@ _DayCareOweMoneyText:: cont "of this #MON." done -_DayCareGotMonBackText:: +_DaycareGentlemanGotMonBackText:: text " got" line "@" text_ram wDayCareMonName text " back!" done -_DayCareMonNeedsMoreTimeText:: +_DaycareGentlemanMonNeedsMoreTimeText:: text "Back already?" line "Your @" text_ram wcd6d diff --git a/text/Daycare_2.asm b/text/Daycare_2.asm index 7efb200eb..6fe2b85d8 100644 --- a/text/Daycare_2.asm +++ b/text/Daycare_2.asm @@ -1,34 +1,34 @@ -_DayCareAllRightThenText:: +_DaycareGentlemanAllRightThenText:: text "All right then," line "@" text_end -_DayCareComeAgainText:: +_DaycareGentlemanComeAgainText:: text "come again." done -_DayCareNoRoomForMonText:: +_DaycareGentlemanNoRoomForMonText:: text "You have no room" line "for this #MON!" done -_DayCareOnlyHaveOneMonText:: +_DaycareGentlemanOnlyHaveOneMonText:: text "You only have one" line "#MON with you." done -_DayCareCantAcceptMonWithHMText:: +_DaycareGentlemanCantAcceptMonWithHMText:: text "I can't accept a" line "#MON that" cont "knows an HM move." done -_DayCareHeresYourMonText:: +_DaycareGentlemanHeresYourMonText:: text "Thank you! Here's" line "your #MON!" prompt -_DayCareNotEnoughMoneyText:: +_DaycareGentlemanNotEnoughMoneyText:: text "Hey, you don't" line "have enough ¥!" done diff --git a/text/DiglettsCaveRoute11.asm b/text/DiglettsCaveRoute11.asm index ecd3225e8..62e9a1ea0 100644 --- a/text/DiglettsCaveRoute11.asm +++ b/text/DiglettsCaveRoute11.asm @@ -1,4 +1,4 @@ -_DiglettsCaveEntRoute11Text1:: +_DiglettsCaveRoute11GamblerText:: text "What a surprise!" line "DIGLETTs dug this" cont "long tunnel!" diff --git a/text/DiglettsCaveRoute2.asm b/text/DiglettsCaveRoute2.asm index a04bbef7e..cf2f328ea 100644 --- a/text/DiglettsCaveRoute2.asm +++ b/text/DiglettsCaveRoute2.asm @@ -1,4 +1,4 @@ -_DiglettsCaveRoute2Text1:: +_DiglettsCaveRoute2FishingGuruText:: text "I went to ROCK" line "TUNNEL, but it's" cont "dark and scary." diff --git a/text/FightingDojo.asm b/text/FightingDojo.asm index 3df069c1b..7a73b5097 100644 --- a/text/FightingDojo.asm +++ b/text/FightingDojo.asm @@ -1,4 +1,4 @@ -_FightingDojoText_5ce8e:: +_FightingDojoKarateMasterText:: text "Grunt!" para "I am the KARATE" @@ -12,12 +12,12 @@ _FightingDojoText_5ce8e:: para "Fwaaa!" done -_FightingDojoText_5ce93:: +_FightingDojoKarateMasterDefeatedText:: text "Hwa!" line "Arrgh! Beaten!" prompt -_FightingDojoText_5ce98:: +_FightingDojoKarateMasterIWillGiveYouAPokemonText:: text "Indeed, I have" line "lost!" @@ -34,24 +34,24 @@ _FightingDojoText_5ce98:: line "one you like!" done -_FightingDojoText_5ce9d:: +_FightingDojoKarateMasterStayAndTrainWithUsText:: text "Ho!" para "Stay and train at" line "Karate with us!" done -_FightingDojoBattleText1:: +_FightingDojoBlackbelt1BattleText:: text "Hoargh! Take your" line "shoes off!" done -_FightingDojoEndBattleText1:: +_FightingDojoBlackbelt1EndBattleText:: text "I give" line "up!" prompt -_FightingDojoAfterBattleText1:: +_FightingDojoBlackbelt1AfterBattleText:: text "You wait 'til you" line "see our Master!" @@ -59,22 +59,22 @@ _FightingDojoAfterBattleText1:: line "compared to him!" done -_FightingDojoBattleText2:: +_FightingDojoBlackbelt2BattleText:: text "I hear you're" line "good! Show me!" done -_FightingDojoEndBattleText2:: +_FightingDojoBlackbelt2EndBattleText:: text "Judge!" line "1 point!" prompt -_FightingDojoAfterBattleText2:: +_FightingDojoBlackbelt2AfterBattleText:: text "Our Master is a" line "pro fighter!" done -_FightingDojoBattleText3:: +_FightingDojoBlackbelt3BattleText:: text "Nothing tough" line "frightens me!" @@ -82,18 +82,18 @@ _FightingDojoBattleText3:: line "for training!" done -_FightingDojoEndBattleText3:: +_FightingDojoBlackbelt3EndBattleText:: text "Yow!" line "Stubbed fingers!" prompt -_FightingDojoAfterBattleText3:: +_FightingDojoBlackbelt3AfterBattleText:: text "The only thing" line "that frightens us" cont "is psychic power!" done -_FightingDojoBattleText4:: +_FightingDojoBlackbelt4BattleText:: text "Hoohah!" para "You're trespassing" @@ -101,30 +101,30 @@ _FightingDojoBattleText4:: cont "DOJO!" done -_FightingDojoEndBattleText4:: +_FightingDojoBlackbelt4EndBattleText:: text "Oof!" line "I give up!" prompt -_FightingDojoAfterBattleText4:: +_FightingDojoBlackbelt4AfterBattleText:: text "The prime fighters" line "across the land" cont "train here." done -_WantHitmonleeText:: +_FightingDojoHitmonleePokeBallText:: text "You want the" line "hard kicking" cont "HITMONLEE?" done -_WantHitmonchanText:: +_FightingDojoHitmonchanPokeBallText:: text "You want the" line "piston punching" cont "HITMONCHAN?" done -_OtherHitmonText:: +_FightingDojoBetterNotGetGreedyText:: text "Better not get" line "greedy..." done diff --git a/text/FuchsiaBillsGrandpasHouse.asm b/text/FuchsiaBillsGrandpasHouse.asm index 7b6556b14..9842de2ff 100644 --- a/text/FuchsiaBillsGrandpasHouse.asm +++ b/text/FuchsiaBillsGrandpasHouse.asm @@ -1,4 +1,4 @@ -_FuchsiaHouse1Text1:: +_FuchsiaBillsGrandpasHouseMiddleAgedWomanText:: text "SAFARI ZONE's" line "WARDEN is old," cont "but still active!" @@ -7,7 +7,7 @@ _FuchsiaHouse1Text1:: line "false, though." done -_FuchsiaHouse1Text2:: +_FuchsiaBillsGrandpasHouseBillsGrandpaText:: text "Hmm? You've met" line "BILL?" @@ -18,7 +18,7 @@ _FuchsiaHouse1Text2:: cont "even as a child!" done -_FuchsiaHouse1Text3:: +_FuchsiaBillsGrandpasHouseYoungsterText:: text "BILL files his" line "own #MON data" cont "on his PC!" diff --git a/text/FuchsiaCity.asm b/text/FuchsiaCity.asm index a90d0021f..ab1a49e03 100644 --- a/text/FuchsiaCity.asm +++ b/text/FuchsiaCity.asm @@ -1,11 +1,11 @@ -_FuchsiaCityText1:: +_FuchsiaCityYoungster1Text:: text "Did you try the" line "SAFARI GAME? Some" cont "#MON can only" cont "be caught there." done -_FuchsiaCityText2:: +_FuchsiaCityGamblerText:: text "SAFARI ZONE has a" line "zoo in front of" cont "the entrance." @@ -15,44 +15,44 @@ _FuchsiaCityText2:: cont "catching #MON." done -_FuchsiaCityText3:: +_FuchsiaCityErikText:: text "ERIK: Where's" line "SARA? I said I'd" cont "meet her here." done -_FuchsiaCityText4:: +_FuchsiaCityYoungster2Text:: text "That item ball in" line "there is really a" cont "#MON." done -_FuchsiaCityText5:: +_FuchsiaCityPokemonText:: text "!" done -_FuchsiaCityText11:: +_FuchsiaCitySignText:: text "FUCHSIA CITY" line "Behold! It's" cont "Passion Pink!" done -_FuchsiaCityText13:: +_FuchsiaCitySafariGameSignText:: text "SAFARI GAME" line "#MON-U-CATCH!" done -_FuchsiaCityText16:: +_FuchsiaCityWardensHomeSignText:: text "SAFARI ZONE" line "WARDEN's HOME" done -_FuchsiaCityText17:: +_FuchsiaCitySafariZoneSignText:: text "#MON PARADISE" line "SAFARI ZONE" done -_FuchsiaCityText18:: +_FuchsiaCityGymSignText:: text "FUCHSIA CITY" line "#MON GYM" cont "LEADER: KOGA" @@ -61,21 +61,21 @@ _FuchsiaCityText18:: line "Ninja Master" done -_FuchsiaCityChanseyText:: +_FuchsiaCityChanseySignText:: text "Name: CHANSEY" para "Catching one is" line "all up to chance." prompt -_FuchsiaCityVoltorbText:: +_FuchsiaCityVoltorbSignText:: text "Name: VOLTORB" para "The very image of" line "a # BALL." prompt -_FuchsiaCityKangaskhanText:: +_FuchsiaCityKangaskhanSignText:: text "Name: KANGASKHAN" para "A maternal #MON" @@ -84,21 +84,21 @@ _FuchsiaCityKangaskhanText:: cont "on its belly." prompt -_FuchsiaCitySlowpokeText:: +_FuchsiaCitySlowpokeSignText:: text "Name: SLOWPOKE" para "Friendly and very" line "slow moving." prompt -_FuchsiaCityLaprasText:: +_FuchsiaCityLaprasSignText:: text "Name: LAPRAS" para "A.K.A. the king" line "of the seas." prompt -_FuchsiaCityOmanyteText:: +_FuchsiaCityFossilSignOmanyteText:: text "Name: OMANYTE" para "A #MON that" @@ -106,7 +106,7 @@ _FuchsiaCityOmanyteText:: cont "from a fossil." prompt -_FuchsiaCityKabutoText:: +_FuchsiaCityFossilSignKabutoText:: text "Name: KABUTO" para "A #MON that" @@ -114,6 +114,6 @@ _FuchsiaCityKabutoText:: cont "from a fossil." prompt -_FuchsiaCityText_19b2a:: +_FuchsiaCityFossilSignUndeterminedText:: text "..." done diff --git a/text/FuchsiaGoodRodHouse.asm b/text/FuchsiaGoodRodHouse.asm index 4625f8bfc..d1454551b 100644 --- a/text/FuchsiaGoodRodHouse.asm +++ b/text/FuchsiaGoodRodHouse.asm @@ -1,4 +1,4 @@ -_FuchsiaHouse3Text_561bd:: +_FuchsiaGoodRodHouseFishingGuruText:: text "I'm the FISHING" line "GURU's older" cont "brother!" @@ -10,7 +10,7 @@ _FuchsiaHouse3Text_561bd:: line "fish?" done -_FuchsiaHouse3Text_561c2:: +_FuchsiaGoodRodHouseFishingGuruReceivedGoodRodText:: text "Grand! I like" line "your style!" @@ -23,12 +23,12 @@ _FuchsiaHouse3Text_561c2:: text "!@" text_end -_FuchsiaHouse3Text_56212:: +_FuchsiaGoodRodHouseFishingGuruThatsSoDisappointingText:: text "Oh... That's so" line "disappointing..." done -_FuchsiaHouse3Text_56217:: +_FuchsiaGoodRodHouseFishingGuruHowAreTheFishText:: text "Hello there," line "!" @@ -36,7 +36,7 @@ _FuchsiaHouse3Text_56217:: line "biting?" done -_FuchsiaHouse3Text_5621c:: +_FuchsiaGoodRodHouseFishingGuruNoRoomText:: text "Oh no!" para "You have no room" diff --git a/text/FuchsiaGym.asm b/text/FuchsiaGym.asm index 3b2c01e9f..5a87e54e8 100644 --- a/text/FuchsiaGym.asm +++ b/text/FuchsiaGym.asm @@ -1,4 +1,4 @@ -_KogaBeforeBattleText:: +_FuchsiaGymKogaBeforeBattleText:: text "KOGA: Fwahahaha!" para "A mere child like" @@ -16,7 +16,7 @@ _KogaBeforeBattleText:: cont "techniques!" done -_ReceivedSoulBadgeText:: +_FuchsiaGymKogaReceivedSoulBadgeText:: text "Humph!" line "You have proven" cont "your worth!" diff --git a/text/FuchsiaGym_2.asm b/text/FuchsiaGym_2.asm index bec139569..229e060cd 100644 --- a/text/FuchsiaGym_2.asm +++ b/text/FuchsiaGym_2.asm @@ -1,4 +1,4 @@ -_KogaPostBattleAdviceText:: +_FuchsiaGymKogaPostBattleAdviceText:: text "When afflicted by" line "TOXIC, #MON" cont "suffer more and" @@ -9,7 +9,7 @@ _KogaPostBattleAdviceText:: line "terrorize foes!" done -_KogaSoulBadgeInfoText:: +_FuchsiaGymKogaSoulBadgeInfoText:: text "Now that you have" line "the SOULBADGE," cont "the DEFENSE of" @@ -24,14 +24,14 @@ _KogaSoulBadgeInfoText:: line "too!" done -_ReceivedTM06Text:: +_FuchsiaGymKogaReceivedTM06Text:: text " received" line "@" text_ram wStringBuffer text "!@" text_end -_TM06ExplanationText:: +_FuchsiaGymKogaTM06ExplanationText:: text_start para "TM06 contains" line "TOXIC!" @@ -41,12 +41,12 @@ _TM06ExplanationText:: cont "400 years old!" done -_TM06NoRoomText:: +_FuchsiaGymKogaTM06NoRoomText:: text "Make space for" line "this, child!" done -_FuchsiaGymBattleText1:: +_FuchsiaGymRocker1BattleText:: text "Strength isn't" line "the key for" cont "#MON!" @@ -58,54 +58,54 @@ _FuchsiaGymBattleText1:: cont "brute strength!" done -_FuchsiaGymEndBattleText1:: +_FuchsiaGymRocker1EndBattleText:: text "What?" line "Extraordinary!" prompt -_FuchsiaGymAfterBattleText1:: +_FuchsiaGymRocker1AfterBattleText:: text "So, you mix brawn" line "with brains?" cont "Good strategy!" done -_FuchsiaGymBattleText2:: +_FuchsiaGymRocker2BattleText:: text "I wanted to become" line "a ninja, so I" cont "joined this GYM!" done -_FuchsiaGymEndBattleText2:: +_FuchsiaGymRocker2EndBattleText:: text "I'm done" line "for!" prompt -_FuchsiaGymAfterBattleText2:: +_FuchsiaGymRocker2AfterBattleText:: text "I will keep on" line "training under" cont "KOGA, my ninja" cont "master!" done -_FuchsiaGymBattleText3:: +_FuchsiaGymRocker3BattleText:: text "Let's see you" line "beat my special" cont "techniques!" done -_FuchsiaGymEndBattleText3:: +_FuchsiaGymRocker3EndBattleText:: text "You" line "had me fooled!" prompt -_FuchsiaGymAfterBattleText3:: +_FuchsiaGymRocker3AfterBattleText:: text "I like poison and" line "sleep techniques," cont "as they linger" cont "after battle!" done -_FuchsiaGymBattleText4:: +_FuchsiaGymRocker4BattleText:: text "Stop right there!" para "Our invisible" @@ -113,12 +113,12 @@ _FuchsiaGymBattleText4:: cont "frustrated?" done -_FuchsiaGymEndBattleText4:: +_FuchsiaGymRocker4EndBattleText:: text "Whoa!" line "He's got it!" prompt -_FuchsiaGymAfterBattleText4:: +_FuchsiaGymRocker4AfterBattleText:: text "You impressed me!" line "Here's a hint!" @@ -127,7 +127,7 @@ _FuchsiaGymAfterBattleText4:: cont "invisible walls!" done -_FuchsiaGymBattleText5:: +_FuchsiaGymRocker5BattleText:: text "I also study the" line "way of the ninja" cont "with master KOGA!" @@ -137,16 +137,16 @@ _FuchsiaGymBattleText5:: cont "animals!" done -_FuchsiaGymEndBattleText5:: +_FuchsiaGymRocker5EndBattleText:: text "Awoo!" prompt -_FuchsiaGymAfterBattleText5:: +_FuchsiaGymRocker5AfterBattleText:: text "I still have much" line "to learn!" done -_FuchsiaGymBattleText6:: +_FuchsiaGymRocker6BattleText:: text "Master KOGA comes" line "from a long line" cont "of ninjas!" @@ -155,12 +155,12 @@ _FuchsiaGymBattleText6:: line "descend from?" done -_FuchsiaGymEndBattleText6:: +_FuchsiaGymRocker6EndBattleText:: text "Dropped" line "my balls!" prompt -_FuchsiaGymAfterBattleText6:: +_FuchsiaGymRocker6AfterBattleText:: text "Where there is" line "light, there is" cont "shadow!" @@ -170,7 +170,7 @@ _FuchsiaGymAfterBattleText6:: cont "choose?" done -_FuchsiaGymGuidePreBattleText:: +_FuchsiaGymGymGuideChampInMakingText:: text "Yo! Champ in" line "making!" @@ -187,7 +187,7 @@ _FuchsiaGymGuidePreBattleText:: cont "to reach him!" done -_FuchsiaGymGuidePostBattleText:: +_FuchsiaGymGymGuideBeatKogaText:: text "It's amazing how" line "ninja can terrify" cont "even now!" diff --git a/text/FuchsiaMart.asm b/text/FuchsiaMart.asm index 574898cef..6033b02c8 100644 --- a/text/FuchsiaMart.asm +++ b/text/FuchsiaMart.asm @@ -1,4 +1,4 @@ -_FuchsiaMartText2:: +_FuchsiaMartMiddleAgedManText:: text "Do you have a" line "SAFARI ZONE flag?" @@ -6,7 +6,7 @@ _FuchsiaMartText2:: line "or calendars?" done -_FuchsiaMartText3:: +_FuchsiaMartCooltrainerFText:: text "Did you try X" line "SPEED? It speeds" cont "up a #MON in" diff --git a/text/FuchsiaMeetingRoom.asm b/text/FuchsiaMeetingRoom.asm index 10675eadc..c3278861f 100644 --- a/text/FuchsiaMeetingRoom.asm +++ b/text/FuchsiaMeetingRoom.asm @@ -1,4 +1,4 @@ -_FuchsiaMeetingRoomText1:: +_FuchsiaMeetingRoomSafariZoneWorker1:: text "We nicknamed the" line "WARDEN SLOWPOKE." @@ -6,7 +6,7 @@ _FuchsiaMeetingRoomText1:: line "both look vacant!" done -_FuchsiaMeetingRoomText2:: +_FuchsiaMeetingRoomSafariZoneWorker2:: text "SLOWPOKE is very" line "knowledgeable" cont "about #MON!" @@ -16,7 +16,7 @@ _FuchsiaMeetingRoomText2:: cont "extinct #MON!" done -_FuchsiaMeetingRoomText3:: +_FuchsiaMeetingRoomSafariZoneWorker3:: text "SLOWPOKE came in," line "but I couldn't" cont "understand him." diff --git a/text/FuchsiaPokecenter.asm b/text/FuchsiaPokecenter.asm index a0def7eb0..b7c6b364f 100644 --- a/text/FuchsiaPokecenter.asm +++ b/text/FuchsiaPokecenter.asm @@ -1,4 +1,4 @@ -_FuchsiaPokecenterText1:: +_FuchsiaPokecenterRockerText:: text "You can't win" line "with just one" cont "strong #MON." @@ -8,7 +8,7 @@ _FuchsiaPokecenterText1:: cont "them evenly." done -_FuchsiaPokecenterText3:: +_FuchsiaPokecenterCooltrainerFText:: text "There's a narrow" line "trail west of" cont "VIRIDIAN CITY." diff --git a/text/GameCorner.asm b/text/GameCorner.asm index 1868daf8b..4b9d0d14f 100644 --- a/text/GameCorner.asm +++ b/text/GameCorner.asm @@ -1,4 +1,4 @@ -_CeladonGameCornerText1:: +_GameCornerBeauty1Text:: text "Welcome!" para "You can exchange" @@ -7,7 +7,7 @@ _CeladonGameCornerText1:: cont "next door." done -_CeladonGameCornerText_48d22:: +_GameCornerClerk1DoYouNeedSomeGameCoinsText:: text "Welcome to ROCKET" line "GAME CORNER!" @@ -19,32 +19,32 @@ _CeladonGameCornerText_48d22:: cont "like some?" done -_CeladonGameCornerText_48d27:: +_GameCornerClerk1ThanksHereAre50CoinsText:: text "Thanks! Here are" line "your 50 coins!" done -_CeladonGameCornerText_48d2c:: +_GameCornerClerk1PleaseComePlaySometimeText:: text "No? Please come" line "play sometime!" done -_CeladonGameCornerText_48d31:: +_GameCornerClerk1CantAffordTheCoinsText:: text "You can't afford" line "the coins!" done -_CeladonGameCornerText_48d36:: +_GameCornerClerk1CoinCaseIsFullText:: text "Oops! Your COIN" line "CASE is full." done -_CeladonGameCornerText_48d3b:: +_GameCornerClerk1DontHaveCoinCaseText:: text "You don't have a" line "COIN CASE!" done -_CeladonGameCornerText3:: +_GameCornerMiddleAgedMan1Text:: text "Keep this quiet." para "It's rumored that" @@ -52,38 +52,38 @@ _CeladonGameCornerText3:: cont "by TEAM ROCKET." done -_CeladonGameCornerText4:: +_GameCornerBeauty2Text:: text "I think these" line "machines have" cont "different odds." done -_CeladonGameCornerText_48d9c:: +_GameCornerFishingGuruWantToPlayText:: text "Kid, do you want" line "to play?" prompt -_Received10CoinsText:: +_GameCornerFishingGuruReceived10CoinsText:: text " received" line "10 coins!@" text_end -_CeladonGameCornerText_48da7:: +_GameCornerFishingGuruDontNeedMyCoinsText:: text "You don't need my" line "coins!" done -_CeladonGameCornerText_48dac:: +_GameCornerFishingGuruWinsComeAndGoText:: text "Wins seem to come" line "and go." done -_CeladonGameCornerText6:: +_GameCornerMiddleAgedWomanText:: text "I'm having a" line "wonderful time!" done -_CeladonGameCornerText_48dca:: +_GameCornerGymGuideChampInMakingText:: text "Hey!" para "You have better" @@ -100,7 +100,7 @@ _CeladonGameCornerText_48dca:: cont "be fooled!" done -_CeladonGameCornerText_48dcf:: +_GameCornerGymGuideTheyOfferRarePokemonText:: text "They offer rare" line "#MON that can" cont "be exchanged for" @@ -110,73 +110,73 @@ _CeladonGameCornerText_48dcf:: line "seem to win!" done -_CeladonGameCornerText8:: +_GameCornerGamblerText:: text "Games are scary!" line "It's so easy to" cont "get hooked!" done -_CeladonGameCornerText_48e26:: +_GameCornerClerk2WantSomeCoinsText:: text "What's up? Want" line "some coins?" prompt -_Received20CoinsText:: +_GameCornerClerk2Received20CoinsText:: text " received" line "20 coins!@" text_end -_CeladonGameCornerText_48e31:: +_GameCornerClerk2YouHaveLotsOfCoinsText:: text "You have lots of" line "coins!" done -_CeladonGameCornerText_48e36:: +_GameCornerClerk2INeedMoreCoinsText:: text "Darn! I need more" line "coins for the" cont "#MON I want!" done -_CeladonGameCornerText_48e88:: +_GameCornerGentlemanThrowingMeOffText:: text "Hey, what? You're" line "throwing me off!" cont "Here are some" cont "coins, shoo!" prompt -_CeladonGameCornerText_48e8d:: +_GameCornerGentlemanReceived20CoinsText:: text " received" line "20 coins!@" text_end -_CeladonGameCornerText_48e93:: +_GameCornerGentlemanYouGotYourOwnCoinsText:: text "You've got your" line "own coins!" done -_CeladonGameCornerText_48e98:: +_GameCornerGentlemanCloselyWatchTheReelsText:: text "The trick is to" line "watch the reels" cont "closely!" done -_CeladonGameCornerText_48ece:: +_GameCornerRocketImGuardingThisPosterText:: text "I'm guarding this" line "poster!" cont "Go away, or else!" done -_CeladonGameCornerText_48ed3:: +_GameCornerRocketBattleEndText:: text "Dang!" prompt -_CeladonGameCornerText_48ed8:: +_GameCornerRocketAfterBattleText:: text "Our hideout might" line "be discovered! I" cont "better tell BOSS!" done -_CeladonGameCornerText_48f09:: +_GameCornerPosterSwitchBehindPosterText:: text "Hey!" para "A switch behind" @@ -184,7 +184,7 @@ _CeladonGameCornerText_48f09:: cont "Let's push it!@" text_end -_CeladonGameCornerText_48f19:: +_GameCornerOopsForgotCoinCaseText:: text "Oops! Forgot the" line "COIN CASE!" done diff --git a/text/GameCornerPrizeRoom.asm b/text/GameCornerPrizeRoom.asm index 6b2bb5371..9ece15ace 100644 --- a/text/GameCornerPrizeRoom.asm +++ b/text/GameCornerPrizeRoom.asm @@ -1,4 +1,4 @@ -_CeladonPrizeRoomText1:: +_GameCornerPrizeRoomBaldingGuyText:: text "I sure do fancy" line "that PORYGON!" @@ -6,7 +6,7 @@ _CeladonPrizeRoomText1:: line "win at slots!" done -_CeladonPrizeRoomText2:: +_GameCornerPrizeRoomGamblerText:: text "I had a major" line "haul today!" done diff --git a/text/HallOfFame.asm b/text/HallOfFame.asm index c799268b4..e193b62a2 100644 --- a/text/HallOfFame.asm +++ b/text/HallOfFame.asm @@ -1,4 +1,4 @@ -_HallofFameRoomText1:: +_HallOfFameOakText:: text "OAK: Er-hem!" line "Congratulations" cont "!" diff --git a/text/IndigoPlateauLobby.asm b/text/IndigoPlateauLobby.asm index 8487e29a7..13ce40486 100644 --- a/text/IndigoPlateauLobby.asm +++ b/text/IndigoPlateauLobby.asm @@ -1,4 +1,4 @@ -_IndigoPlateauLobbyText2:: +_IndigoPlateauLobbyGymGuideText:: text "Yo! Champ in" line "making!" @@ -13,7 +13,7 @@ _IndigoPlateauLobbyText2:: cont "is it! Go for it!" done -_IndigoPlateauLobbyText3:: +_IndigoPlateauLobbyCooltrainerFText:: text "From here on, you" line "face the ELITE" cont "FOUR one by one!" diff --git a/text/LancesRoom.asm b/text/LancesRoom.asm index 2531b638d..bd62d0839 100644 --- a/text/LancesRoom.asm +++ b/text/LancesRoom.asm @@ -1,4 +1,4 @@ -_LanceBeforeBattleText:: +_LancesRoomLanceBeforeBattleText:: text "Ah! I heard about" line "you !" @@ -27,7 +27,7 @@ _LanceBeforeBattleText:: cont "with me, !" done -_LanceEndBattleText:: +_LancesRoomLanceEndBattleText:: text "That's it!" para "I hate to admit" @@ -35,7 +35,7 @@ _LanceEndBattleText:: cont "#MON master!" prompt -_LanceAfterBattleText:: +_LancesRoomLanceAfterBattleText:: text "I still can't" line "believe my" cont "dragons lost to" diff --git a/text/LavenderCuboneHouse.asm b/text/LavenderCuboneHouse.asm index 77b8598d1..ae9c75bcf 100644 --- a/text/LavenderCuboneHouse.asm +++ b/text/LavenderCuboneHouse.asm @@ -1,8 +1,8 @@ -_LavenderHouse2Text1:: +_LavenderCuboneHouseCuboneText:: text "CUBONE: Kyarugoo!@" text_end -_LavenderHouse2Text_1d9dc:: +_LavenderCuboneHouseBrunetteGirlPoorCubonesMotherText:: text "I hate those" line "horrible ROCKETs!" @@ -14,7 +14,7 @@ _LavenderHouse2Text_1d9dc:: cont "from TEAM ROCKET!" done -_LavenderHouse2Text_1d9e1:: +_LavenderCuboneHouseBrunetteGirlGhostIsGoneText:: text "The GHOST of" line "#MON TOWER is" cont "gone!" diff --git a/text/LavenderMart.asm b/text/LavenderMart.asm index 222712c6c..94a9f64b5 100644 --- a/text/LavenderMart.asm +++ b/text/LavenderMart.asm @@ -1,4 +1,4 @@ -_LavenderMartText2:: +_LavenderMartBaldingGuyText:: text "I'm searching for" line "items that raise" cont "the abilities of" @@ -14,13 +14,13 @@ _LavenderMartText2:: line "I can get them?" done -_LavenderMartReviveText:: +_LavenderMartCooltrainerMReviveText:: text "You know REVIVE?" line "It revives any" cont "fainted #MON!" done -_LavenderMartNuggetText:: +_LavenderMartCooltrainerMNuggetText:: text "I found a NUGGET" line "in the mountains." diff --git a/text/LavenderPokecenter.asm b/text/LavenderPokecenter.asm index 3aa7b67d3..33fe53f2d 100644 --- a/text/LavenderPokecenter.asm +++ b/text/LavenderPokecenter.asm @@ -1,10 +1,10 @@ -_LavenderPokecenterText2:: +_LavenderPokecenterGentlemanText:: text "TEAM ROCKET will" line "do anything for" cont "the sake of gold!" done -_LavenderPokecenterText3:: +_LavenderPokecenterLittleGirlText:: text "I saw CUBONE's" line "mother die trying" cont "to escape from" diff --git a/text/LavenderTown.asm b/text/LavenderTown.asm index 19b6c8c89..294b12ccc 100644 --- a/text/LavenderTown.asm +++ b/text/LavenderTown.asm @@ -1,14 +1,14 @@ -_LavenderTownText_4413c:: +_LavenderTownLittleGirlDoYouBelieveInGhostsText:: text "Do you believe in" line "GHOSTs?" done -_LavenderTownText_44141:: +_LavenderTownLittleGirlSoThereAreBelieversText:: text "Really? So there" line "are believers..." done -_LavenderTownText_44146:: +_LavenderTownLittleGirlHaHaGuessNotText:: text "Hahaha, I guess" line "not." @@ -17,7 +17,7 @@ _LavenderTownText_44146:: cont "it's not real." done -_LavenderTownText2:: +_LavenderTownCooltrainerMText:: text "This town is known" line "as the grave site" cont "of #MON." @@ -27,7 +27,7 @@ _LavenderTownText2:: cont "#MON TOWER." done -_LavenderTownText3:: +_LavenderTownSuperNerdText:: text "GHOSTs appeared" line "in #MON TOWER." @@ -37,13 +37,13 @@ _LavenderTownText3:: cont "ROCKETs killed." done -_LavenderTownText4:: +_LavenderTownSignText:: text "LAVENDER TOWN" line "The Noble Purple" cont "Town" done -_LavenderTownText5:: +_LavenderTownSilphScopeSignText:: text "New SILPH SCOPE!" para "Make the Invisible" @@ -52,12 +52,12 @@ _LavenderTownText5:: para "SILPH CO." done -_LavenderTownText8:: +_LavenderTownPokemonHouseSignText:: text "LAVENDER VOLUNTEER" line "#MON HOUSE" done -_LavenderTownText9:: +_LavenderTownPokemonTowerSignText:: text "May the Souls of" line "#MON Rest Easy" cont "#MON TOWER" diff --git a/text/LoreleisRoom.asm b/text/LoreleisRoom.asm index fdbb55b44..14c098df0 100644 --- a/text/LoreleisRoom.asm +++ b/text/LoreleisRoom.asm @@ -1,4 +1,4 @@ -_LoreleiBeforeBattleText:: +_LoreleisRoomLoreleiBeforeBattleText:: text "Welcome to" line "#MON LEAGUE!" @@ -21,12 +21,12 @@ _LoreleiBeforeBattleText:: line "Are you ready?" done -_LoreleiEndBattleText:: +_LoreleisRoomLoreleiEndBattleText:: text "How" line "dare you!" prompt -_LoreleiAfterBattleText:: +_LoreleisRoomLoreleiAfterBattleText:: text "You're better" line "than I thought!" cont "Go on ahead!" @@ -36,7 +36,7 @@ _LoreleiAfterBattleText:: cont "LEAGUE power!" done -_LoreleiDontRunAwayText:: +_LoreleisRoomLoreleiDontRunAwayText:: text "Someone's voice:" line "Don't run away!" done diff --git a/text/MrFujisHouse.asm b/text/MrFujisHouse.asm index 6c7f3439a..3759c2a8b 100644 --- a/text/MrFujisHouse.asm +++ b/text/MrFujisHouse.asm @@ -1,16 +1,16 @@ -_LavenderHouse1Text_1d8d1:: +_MrFujisHouseSuperNerdMrFujiIsntHereText:: text "That's odd, MR.FUJI" line "isn't here." cont "Where'd he go?" done -_LavenderHouse1Text_1d8d6:: +_MrFujisHouseSuperNerdMrFujiHadBeenPrayingText:: text "MR.FUJI had been" line "praying alone for" cont "CUBONE's mother." done -_LavenderHouse1Text_1d8f4:: +_MrFujisHouseLittleGirlThisIsMrFujisHouseText:: text "This is really" line "MR.FUJI's house." @@ -21,21 +21,21 @@ _LavenderHouse1Text_1d8f4:: cont "orphaned #MON!" done -_LavenderHouse1Text_1d8f9:: +_MrFujisHouseLittleGirlPokemonAreNiceToHugText:: text "It's so warm!" line "#MON are so" cont "nice to hug!" done -_LavenderHouse1Text3:: +_MrFujisHousePsyduckText:: text "PSYDUCK: Gwappa!@" text_end -_LavenderHouse1Text4:: +_MrFujisHouseNidorinoText:: text "NIDORINO: Gaoo!@" text_end -_LavenderHouse1Text_1d94c:: +_MrFujisHouseMrFujiIThinkThisMayHelpYourQuestText:: text "MR.FUJI: ." para "Your #DEX quest" @@ -47,14 +47,14 @@ _LavenderHouse1Text_1d94c:: line "help your quest." prompt -_ReceivedFluteText:: +_MrFujisHouseMrFujiReceivedPokeFluteText:: text " received" line "a @" text_ram wStringBuffer text "!@" text_end -_FluteExplanationText:: +_MrFujisHouseMrFujiPokeFluteExplanationText:: text_start para "Upon hearing #" @@ -66,17 +66,17 @@ _FluteExplanationText:: line "sleeping #MON." done -_FluteNoRoomText:: +_MrFujisHouseMrFujiPokeFluteNoRoomText:: text "You must make" line "room for this!" done -_MrFujiAfterFluteText:: +_MrFujisHouseMrFujiHasMyFluteHelpedYouText:: text "MR.FUJI: Has my" line "FLUTE helped you?" done -_LavenderHouse1Text6:: +_MrFujisHouseMrFujiPokedexText:: text "#MON Monthly" line "Grand Prize" cont "Drawing!" diff --git a/text/MrPsychicsHouse.asm b/text/MrPsychicsHouse.asm index f58188e26..18946ae5e 100644 --- a/text/MrPsychicsHouse.asm +++ b/text/MrPsychicsHouse.asm @@ -1,18 +1,18 @@ -_TM29PreReceiveText:: +_MrPsychicsHouseMrPsychicYouWantedThisText:: text "...Wait! Don't" line "say a word!" para "You wanted this!" prompt -_ReceivedTM29Text:: +_MrPsychicsHouseMrPsychicReceivedTM29Text:: text " received" line "@" text_ram wStringBuffer text "!@" text_end -_TM29ExplanationText:: +_MrPsychicsHouseMrPsychicTM29ExplanationText:: text "TM29 is PSYCHIC!" para "It can lower the" @@ -20,7 +20,7 @@ _TM29ExplanationText:: cont "abilities." done -_TM29NoRoomText:: +_MrPsychicsHouseMrPsychicTM29NoRoomText:: text "Where do you plan" line "to put this?" done diff --git a/text/MtMoon1F.asm b/text/MtMoon1F.asm index 761a52400..33176d2f9 100644 --- a/text/MtMoon1F.asm +++ b/text/MtMoon1F.asm @@ -1,119 +1,119 @@ -_MtMoon1BattleText2:: +_MtMoon1FHikerBattleText:: text "WHOA! You shocked" line "me! Oh, you're" cont "just a kid!" done -_MtMoon1EndBattleText2:: +_MtMoon1FHikerEndBattleText:: text "Wow!" line "Shocked again!" prompt -_MtMoon1AfterBattleText2:: +_MtMoon1FHikerAfterBattleText:: text "Kids like you" line "shouldn't be" cont "here!" done -_MtMoon1BattleText3:: +_MtMoon1FYoungster1BattleText:: text "Did you come to" line "explore too?" done -_MtMoon1EndBattleText3:: +_MtMoon1FYoungster1EndBattleText:: text "Losing" line "stinks!" prompt -_MtMoon1AfterBattleText3:: +_MtMoon1FYoungster1AfterBattleText:: text "I came down here" line "to show off to" cont "girls." done -_MtMoon1BattleText4:: +_MtMoon1FCooltrainerF1BattleText:: text "Wow! It's way" line "bigger in here" cont "than I thought!" done -_MtMoon1EndBattleText4:: +_MtMoon1FCooltrainerF1EndBattleText:: text "Oh!" line "I lost it!" prompt -_MtMoon1AfterBattleText4:: +_MtMoon1FCooltrainerF1AfterBattleText:: text "How do you get" line "out of here?" done -_MtMoon1BattleText5:: +_MtMoon1FSuperNerdBattleText:: text "What! Don't sneak" line "up on me!" done -_MtMoon1EndBattleText5:: +_MtMoon1FSuperNerdEndBattleText:: text "My" line "#MON won't do!" prompt -_MtMoon1AfterBattleText5:: +_MtMoon1FSuperNerdAfterBattleText:: text "I have to find" line "stronger #MON." done -_MtMoon1BattleText6:: +_MtMoon1FCooltrainerF2BattleText:: text "What? I'm waiting" line "for my friends to" cont "find me here." done -_MtMoon1EndBattleText6:: +_MtMoon1FCooltrainerF2EndBattleText:: text "I lost?" prompt -_MtMoon1AfterBattleText6:: +_MtMoon1FCooltrainerF2AfterBattleText:: text "I heard there are" line "some very rare" cont "fossils here." done -_MtMoon1BattleText7:: +_MtMoon1FYoungster2BattleText:: text "Suspicious men" line "are in the cave." cont "What about you?" done -_MtMoon1EndBattleText7:: +_MtMoon1FYoungster2EndBattleText:: text "You" line "got me!" prompt -_MtMoon1AfterBattleText7:: +_MtMoon1FYoungster2AfterBattleText:: text "I saw them! I'm" line "sure they're from" cont "TEAM ROCKET!" done -_MtMoon1BattleText8:: +_MtMoon1FYoungster3BattleText:: text "Go through this" line "cave to get to" cont "CERULEAN CITY!" done -_MtMoon1EndBattleText8:: +_MtMoon1FYoungster3EndBattleText:: text "I" line "lost." prompt -_MtMoon1AfterBattleText8:: +_MtMoon1FYoungster3AfterBattleText:: text "ZUBAT is tough!" line "But, it can be" cont "useful if you" cont "catch one." done -_MtMoon1Text14:: +_MtMoon1FBewareZubatSign:: text "Beware! ZUBAT is" line "a blood sucker!" done diff --git a/text/MtMoonB1F.asm b/text/MtMoonB1F.asm index 968b845fc..2d2dea005 100644 --- a/text/MtMoonB1F.asm +++ b/text/MtMoonB1F.asm @@ -1,3 +1,3 @@ -_MtMoonText1:: +_MtMoonB1FUnusedText:: text_start done diff --git a/text/MtMoonB2F.asm b/text/MtMoonB2F.asm index 87d8d7552..92797cfe2 100644 --- a/text/MtMoonB2F.asm +++ b/text/MtMoonB2F.asm @@ -1,26 +1,26 @@ -_MtMoon3Text_49f24:: +_MtMoonB2FDomeFossilYouWantText:: text "You want the" line "DOME FOSSIL?" done -_MtMoon3Text_49f64:: +_MtMoonB2FHelixFossilYouWantText:: text "You want the" line "HELIX FOSSIL?" done -_MtMoon3Text_49f6f:: +_MtMoonB2FReceivedFossilText:: text " got the" line "@" text_ram wStringBuffer text "!@" text_end -_MtMoon3Text_49f7f:: +_MtMoonB2FYouHaveNoRoomText:: text "Look, you've got" line "no room for this.@" text_end -_MtMoon3Text_49f85:: +_MtMoonB2FSuperNerdTheyreBothMineText:: text "Hey, stop!" para "I found these" @@ -28,18 +28,18 @@ _MtMoon3Text_49f85:: cont "both mine!" done -_MtMoon3Text_49f8a:: +_MtMoonB2FSuperNerdOkIllShareText:: text "OK!" line "I'll share!" prompt -_MtMoon3Text_49f8f:: +_MtMoonB2fSuperNerdEachTakeOneText:: text "We'll each take" line "one!" cont "No being greedy!" done -_MtMoon3Text_49f94:: +_MtMoonB2FSuperNerdTheresAPokemonLabText:: text "Far away, on" line "CINNABAR ISLAND," cont "there's a #MON" @@ -50,75 +50,75 @@ _MtMoon3Text_49f94:: cont "fossils." done -_MtMoon3Text_49f99:: +_MtMoonB2FSuperNerdThenThisIsMineText:: text "All right. Then" line "this is mine!@" text_end -_MtMoon3BattleText2:: +_MtMoonB2FRocket1BattleText:: text "TEAM ROCKET will" line "find the fossils," cont "revive and sell" cont "them for cash!" done -_MtMoon3EndBattleText2:: +_MtMoonB2FRocket1EndBattleText:: text "Urgh!" line "Now I'm mad!" prompt -_MtMoon3AfterBattleText2:: +_MtMoonB2FRocket1AfterBattleText:: text "You made me mad!" line "TEAM ROCKET will" cont "blacklist you!" done -_MtMoon3BattleText3:: +_MtMoonB2FRocket2BattleText:: text "We, TEAM ROCKET," line "are #MON" cont "gangsters!" done -_MtMoon3EndBattleText3:: +_MtMoonB2FRocket2EndBattleText:: text "I blew" line "it!" prompt -_MtMoon3AfterBattleText3:: +_MtMoonB2FRocket2AfterBattleText:: text "Darn it all! My" line "associates won't" cont "stand for this!" done -_MtMoon3BattleText4:: +_MtMoonB2FRocket3BattleText:: text "We're pulling a" line "big job here!" cont "Get lost, kid!" done -_MtMoon3EndBattleText4:: +_MtMoonB2FRocket3EndBattleText:: text "So, you" line "are good." prompt -_MtMoon3AfterBattleText4:: +_MtMoonB2FRocket3AfterBattleText:: text "If you find a" line "fossil, give it" cont "to me and scram!" done -_MtMoon3BattleText5:: +_MtMoonB2FRocket4BattleText:: text "Little kids" line "should leave" cont "grown-ups alone!" done -_MtMoon3EndBattleText5:: +_MtMoonB2FRocket4EndBattleText:: text "I'm" line "steamed!" prompt -_MtMoon3AfterBattleText5:: +_MtMoonB2FRocket4AfterBattleText:: text "#MON lived" line "here long before" cont "people came." diff --git a/text/MtMoonPokecenter.asm b/text/MtMoonPokecenter.asm index dda620441..9970ab2ab 100644 --- a/text/MtMoonPokecenter.asm +++ b/text/MtMoonPokecenter.asm @@ -1,4 +1,4 @@ -_MtMoonPokecenterText1:: +_MtMoonPokecenterYoungsterText:: text "I've 6 # BALLs" line "set in my belt." @@ -6,7 +6,7 @@ _MtMoonPokecenterText1:: line "carry 6 #MON." done -_MtMoonPokecenterText3:: +_MtMoonPokecenterGentlemanText:: text "TEAM ROCKET" line "attacks CERULEAN" cont "citizens..." @@ -16,7 +16,7 @@ _MtMoonPokecenterText3:: cont "news!" done -_MagikarpSalesmanText1:: +_MtMoonPokecenterMagikarpSalesmanIGotADealText:: text "MAN: Hello, there!" line "Have I got a deal" cont "just for you!" @@ -27,22 +27,22 @@ _MagikarpSalesmanText1:: cont "What do you say?" done -_MagikarpSalesmanNoText:: +_MtMoonPokecenterMagikarpSalesmanNoText:: text "No? I'm only" line "doing this as a" cont "favor to you!" done -_MagikarpSalesmanNoMoneyText:: +_MtMoonPokecenterMagikarpSalesmanNoMoneyText:: text "You'll need more" line "money than that!" done -_MagikarpSalesmanText2:: +_MtMoonPokecenterMagikarpSalesmanNoRefundsText:: text "MAN: Well, I don't" line "give refunds!" done -_MtMoonPokecenterText5:: +_MtMoonPokecenterClipboardText:: text_start done diff --git a/text/Museum1F.asm b/text/Museum1F.asm index be1bb2f71..314a419d7 100644 --- a/text/Museum1F.asm +++ b/text/Museum1F.asm @@ -1,8 +1,8 @@ -_Museum1FText_5c21a:: +_Museum1FScientist1ComeAgainText:: text "Come again!" done -_Museum1FText_5c21f:: +_Museum1FScientist1WouldYouLikeToComeInText:: text "It's ¥50 for a" line "child's ticket." @@ -10,17 +10,17 @@ _Museum1FText_5c21f:: line "come in?" done -_Museum1FText_5c224:: +_Museum1FScientist1ThankYouText:: text "Right, ¥50!" line "Thank you!" done -_Museum1FText_5c229:: +_Museum1FScientist1DontHaveEnoughMoneyText:: text "You don't have" line "enough money." prompt -_Museum1FText_5c22e:: +_Museum1FScientist1DoYouKnowWhatAmberIsText:: text "You can't sneak" line "in the back way!" @@ -29,7 +29,7 @@ _Museum1FText_5c22e:: cont "AMBER is?" done -_Museum1FText_5c233:: +_Museum1FScientist1TheresALabSomewhereText:: text "There's a lab" line "somewhere trying" cont "to resurrect" @@ -37,28 +37,28 @@ _Museum1FText_5c233:: cont "from AMBER." done -_Museum1FText_5c238:: +_Museum1FScientist1AmberIsFossilizedTreeSapText:: text "AMBER is fossil-" line "ized tree sap." done -_Museum1FText_5c23d:: +_Museum1FScientist1GoToOtherSideText:: text "Please go to the" line "other side!" done -_Museum1FText_5c242:: +_Museum1FScientist1TakePlentyOfTimeText:: text "Take plenty of" line "time to look!" done -_Museum1FText_5c251:: +_Museum1FGamblerText:: text "That is one" line "magnificent" cont "fossil!" done -_Museum1FText_5c28e:: +_Museum1FScientist2TakeThisToAPokemonLabText:: text "Ssh! I think that" line "this chunk of" cont "AMBER contains" @@ -80,29 +80,29 @@ _Museum1FText_5c28e:: cont "get it examined!" prompt -_ReceivedOldAmberText:: +_Museum1FScientist2ReceivedOldAmberText:: text " received" line "OLD AMBER!@" text_end -_Museum1FText_5c299:: +_Museum1FScientist2GetTheOldAmberCheckText:: text "Ssh! Get the OLD" line "AMBER checked!" done -_Museum1FText_5c29e:: +_Museum1FScientist2YouDontHaveSpaceText:: text "You don't have" line "space for this!" done -_Museum1FText_5c2ad:: +_Museum1FScientist3Text:: text "We are proud of 2" line "fossils of very" cont "rare, prehistoric" cont "#MON!" done -_Museum1FText_5c2bc:: +_Museum1FOldAmberText:: text "The AMBER is" line "clear and gold!" done diff --git a/text/Museum2F.asm b/text/Museum2F.asm index 4f34a2491..f79616853 100644 --- a/text/Museum2F.asm +++ b/text/Museum2F.asm @@ -1,11 +1,11 @@ -_Museum2FText1:: +_Museum2FYoungsterText:: text "MOON STONE?" para "What's so special" line "about it?" done -_Museum2FText2:: +_Museum2FGrampsText:: text "July 20, 1969!" para "The 1st lunar" @@ -15,12 +15,12 @@ _Museum2FText2:: line "TV to watch it!" done -_Museum2FText3:: +_Museum2FScientistText:: text "We have a space" line "exhibit now." done -_Museum2FText4:: +_Museum2FBrunetteGirlText:: text "I want a PIKACHU!" line "It's so cute!" @@ -28,17 +28,17 @@ _Museum2FText4:: line "to catch me one!" done -_Museum2FText5:: +_Museum2FHikerText:: text "Yeah, a PIKACHU" line "soon, I promise!" done -_Museum2FText6:: +_Museum2FSpaceShuttleSignText:: text "SPACE SHUTTLE" line "COLUMBIA" done -_Museum2FText7:: +_Museum2FMoonStoneSignText:: text "Meteorite that" line "fell on MT.MOON." cont "(MOON STONE?)" diff --git a/text/NameRatersHouse.asm b/text/NameRatersHouse.asm index b50321449..106a2cf00 100644 --- a/text/NameRatersHouse.asm +++ b/text/NameRatersHouse.asm @@ -1,4 +1,4 @@ -_NameRaterText_1dab3:: +_NameRatersHouseNameRaterWantMeToRateText:: text "Hello, hello!" line "I am the official" cont "NAME RATER!" @@ -8,12 +8,12 @@ _NameRaterText_1dab3:: cont "your #MON?" done -_NameRaterText_1dab8:: +_NameRatersHouseNameRaterWhichPokemonText:: text "Which #MON" line "should I look at?" prompt -_NameRaterText_1dabd:: +_NameRatersHouseNameRaterGiveItANiceNameText:: text_ram wcd6d text ", is it?" line "That is a decent" @@ -26,12 +26,12 @@ _NameRaterText_1dabd:: para "How about it?" done -_NameRaterText_1dac2:: +_NameRatersHouseNameRaterWhatShouldWeNameItText:: text "Fine! What should" line "we name it?" prompt -_NameRaterText_1dac7:: +_NameRatersHouseNameRaterPokemonHasBeenRenamedText:: text "OK! This #MON" line "has been renamed" cont "@" @@ -42,12 +42,12 @@ _NameRaterText_1dac7:: line "name than before!" done -_NameRaterText_1dacc:: +_NameRatersHouseNameRaterComeAnyTimeYouLikeText:: text "Fine! Come any" line "time you like!" done -_NameRaterText_1dad1:: +_NameRatersHouseNameRaterATrulyImpeccableNameText:: text_ram wcd6d text ", is it?" line "That is a truly" diff --git a/text/OaksLab.asm b/text/OaksLab.asm index 74804841f..11accbd44 100644 --- a/text/OaksLab.asm +++ b/text/OaksLab.asm @@ -1,10 +1,10 @@ -_OaksLabGaryText1:: +_OaksLabRivalGrampsIsntAroundText:: text ": Yo" line "! Gramps" cont "isn't around!" done -_OaksLabText40:: +_OaksLabRivalGoAheadAndChooseText:: text ": Heh, I" line "don't need to be" cont "greedy like you!" @@ -13,31 +13,31 @@ _OaksLabText40:: line "choose, !" done -_OaksLabText41:: +_OaksLabRivalMyPokemonLooksStrongerText:: text ": My" line "#MON looks a" cont "lot stronger." done -_OaksLabText39:: +_OaksLabThoseArePokeBallsText:: text "Those are #" line "BALLs. They" cont "contain #MON!" done -_OaksLabCharmanderText:: +_OaksLabYouWantCharmanderText:: text "So! You want the" line "fire #MON," cont "CHARMANDER?" done -_OaksLabSquirtleText:: +_OaksLabYouWantSquirtleText:: text "So! You want the" line "water #MON," cont "SQUIRTLE?" done -_OaksLabBulbasaurText:: +_OaksLabYouWantBulbasaurText:: text "So! You want the" line "plant #MON," cont "BULBASAUR?" @@ -60,27 +60,27 @@ _OaksLabLastMonText:: line "last #MON!" done -_OaksLabText_1d2f0:: +_OaksLabOak1WhichPokemonDoYouWantText:: text "OAK: Now, ," line "which #MON do" cont "you want?" done -_OaksLabText_1d2f5:: +_OaksLabOak1YourPokemonCanFightText:: text "OAK: If a wild" line "#MON appears," cont "your #MON can" cont "fight against it!" done -_OaksLabText_1d2fa:: +_OaksLabOak1RaiseYourYoungPokemonText:: text "OAK: ," line "raise your young" cont "#MON by making" cont "it fight!" done -_OaksLabDeliverParcelText1:: +_OaksLabOak1DeliverParcelText:: text "OAK: Oh, !" para "How is my old" @@ -100,7 +100,7 @@ _OaksLabDeliverParcelText1:: line "OAK's PARCEL.@" text_end -_OaksLabDeliverParcelText2:: +_OaksLabOak1ParcelThanksText:: text_start para "Ah! This is the" line "custom # BALL" @@ -108,13 +108,13 @@ _OaksLabDeliverParcelText2:: cont "Thank you!" done -_OaksLabAroundWorldText:: +_OaksLabOak1PokemonAroundTheWorldText:: text "#MON around the" line "world wait for" cont "you, !" done -_OaksLabGivePokeballsText1:: +_OaksLabOak1ReceivedPokeballsText:: text "OAK: You can't get" line "detailed data on" cont "#MON by just" @@ -129,7 +129,7 @@ _OaksLabGivePokeballsText1:: line "# BALLs!@" text_end -_OaksLabGivePokeballsText2:: +_OaksLabGivePokeballsExplanationText:: text_start para "When a wild" line "#MON appears," @@ -147,7 +147,7 @@ _OaksLabGivePokeballsText2:: cont "have to be lucky!" done -_OaksLabPleaseVisitText:: +_OaksLabOak1ComeSeeMeSometimesText:: text "OAK: Come see me" line "sometimes." @@ -156,7 +156,7 @@ _OaksLabPleaseVisitText:: cont "coming along." done -_OaksLabText_1d31d:: +_OaksLabOak1HowIsYourPokedexComingText:: text "OAK: Good to see " line "you! How is your " cont "#DEX coming? " @@ -164,17 +164,17 @@ _OaksLabText_1d31d:: cont "a look!" prompt -_OaksLabText_1d32c:: +_OaksLabPokedexText:: text "It's encyclopedia-" line "like, but the" cont "pages are blank!" done -_OaksLabText8:: +_OaksLabOak2Text:: text "?" done -_OaksLabText_1d340:: +_OaksLabGirlText:: text "PROF.OAK is the" line "authority on" cont "#MON!" @@ -184,13 +184,13 @@ _OaksLabText_1d340:: cont "in high regard!" done -_OaksLabRivalWaitingText:: +_OaksLabRivalFedUpWithWaitingText:: text ": Gramps!" line "I'm fed up with" cont "waiting!" done -_OaksLabChooseMonText:: +_OaksLabOakChooseMonText:: text "OAK: ?" line "Let me think..." @@ -218,24 +218,24 @@ _OaksLabChooseMonText:: cont "one! Choose!" done -_OaksLabRivalInterjectionText:: +_OaksLabRivalWhatAboutMeText:: text ": Hey!" line "Gramps! What" cont "about me?" done -_OaksLabBePatientText:: +_OaksLabOakBePatientText:: text "OAK: Be patient!" line ", you can" cont "have one too!" done -_OaksLabLeavingText:: +_OaksLabOakDontGoAwayYetText:: text "OAK: Hey! Don't go" line "away yet!" done -_OaksLabRivalPickingMonText:: +_OaksLabRivalIllTakeThisOneText:: text ": I'll take" line "this one, then!" done @@ -247,7 +247,7 @@ _OaksLabRivalReceivedMonText:: text "!@" text_end -_OaksLabRivalChallengeText:: +_OaksLabRivalIllTakeYouOnText:: text ": Wait" line "!" cont "Let's check out" @@ -257,19 +257,19 @@ _OaksLabRivalChallengeText:: line "you on!" done -_OaksLabText_1d3be:: +_OaksLabRivalIPickedTheWrongPokemonText:: text "WHAT?" line "Unbelievable!" cont "I picked the" cont "wrong #MON!" prompt -_OaksLabText_1d3c3:: +_OaksLabRivalAmIGreatOrWhatText:: text ": Yeah! Am" line "I great or what?" prompt -_OaksLabRivalToughenUpText:: +_OaksLabRivalSmellYouLaterText:: text ": Okay!" line "I'll make my" cont "#MON fight to" @@ -279,22 +279,22 @@ _OaksLabRivalToughenUpText:: line "Smell you later!" done -_OaksLabText21:: +_OaksLabRivalGrampsText:: text ": Gramps!" done -_OaksLabText22:: +_OaksLabRivalWhatDidYouCallMeForText:: text ": What did" line "you call me for?" done -_OaksLabText23:: +_OaksLabOakIHaveARequestText:: text "OAK: Oh right! I" line "have a request" cont "of you two." done -_OaksLabText24:: +_OaksLabOakMyInventionPokedexText:: text "On the desk there" line "is my invention," cont "#DEX!" @@ -308,7 +308,7 @@ _OaksLabText24:: line "encyclopedia!" done -_OaksLabText25:: +_OaksLabOakGotPokedexText:: text "OAK: and" line "! Take" cont "these with you!" @@ -317,7 +317,7 @@ _OaksLabText25:: line "#DEX from OAK!@" text_end -_OaksLabText26:: +_OaksLabOakThatWasMyDreamText:: text "To make a complete" line "guide on all the" cont "#MON in the" @@ -340,7 +340,7 @@ _OaksLabText26:: cont "#MON history!" done -_OaksLabText27:: +_OaksLabRivalLeaveItAllToMeText:: text ": Alright" line "Gramps! Leave it" cont "all to me!" @@ -358,7 +358,7 @@ _OaksLabText27:: cont "! Hahaha!" done -_OaksLabText_1d405:: +_OaksLabScientistText:: text "I study #MON as" line "PROF.OAK's AIDE." done diff --git a/text/PalletTown.asm b/text/PalletTown.asm index caaed3aca..dea14896a 100644 --- a/text/PalletTown.asm +++ b/text/PalletTown.asm @@ -1,9 +1,9 @@ -_OakAppearsText:: +_PalletTownOakHeyWaitDontGoOutText:: text "OAK: Hey! Wait!" line "Don't go out!@" text_end -_OakWalksUpText:: +_PalletTownOakItsUnsafeText:: text "OAK: It's unsafe!" line "Wild #MON live" cont "in tall grass!" @@ -17,7 +17,7 @@ _OakWalksUpText:: line "me!" done -_PalletTownText2:: +_PalletTownGirlText:: text "I'm raising" line "#MON too!" @@ -26,7 +26,7 @@ _PalletTownText2:: cont "protect me!" done -_PalletTownText3:: +_PalletTownFisherText:: text "Technology is" line "incredible!" @@ -36,21 +36,21 @@ _PalletTownText3:: cont "data via PC!" done -_PalletTownText4:: +_PalletTownOaksLabSignText:: text "OAK #MON" line "RESEARCH LAB" done -_PalletTownText5:: +_PalletTownSignText:: text "PALLET TOWN" line "Shades of your" cont "journey await!" done -_PalletTownText6:: +_PalletTownPlayersHouseSignText:: text "'s house " done -_PalletTownText7:: +_PalletTownRivalsHouseSignText:: text "'s house " done diff --git a/text/PewterCity.asm b/text/PewterCity.asm index 14240c9e1..f3570f8c7 100644 --- a/text/PewterCity.asm +++ b/text/PewterCity.asm @@ -1,4 +1,4 @@ -_PewterCityText1:: +_PewterCityCooltrainerFText:: text "It's rumored that" line "CLEFAIRYs came" cont "from the moon!" @@ -8,7 +8,7 @@ _PewterCityText1:: cont "fell on MT.MOON." done -_PewterCityText2:: +_PewterCityCooltrainerMText:: text "There aren't many" line "serious #MON" cont "trainers here!" @@ -20,24 +20,24 @@ _PewterCityText2:: cont "into it!" done -_PewterCityText_193f1:: +_PewterCitySuperNerd1DidYouCheckOutMuseumText:: text "Did you check out" line "the MUSEUM?" done -_PewterCityText_193f6:: +_PewterCitySuperNerd1WerentThoseFossilsAmazingText:: text "Weren't those" line "fossils from MT." cont "MOON amazing?" done -_PewterCityText_193fb:: +_PewterCitySuperNerd1YouHaveToGoText:: text "Really?" line "You absolutely" cont "have to go!" done -_PewterCityText13:: +_PewterCitySuperNerd1ItsRightHereText:: text "It's right here!" line "You have to pay" cont "to get in, but" @@ -45,24 +45,24 @@ _PewterCityText13:: cont "See you around!" done -_PewterCityText_19427:: +_PewterCitySuperNerd2DoYouKnowWhatImDoingText:: text "Psssst!" line "Do you know what" cont "I'm doing?" done -_PewterCityText_1942c:: +_PewterCitySuperNerd2ThatsRightText:: text "That's right!" line "It's hard work!" done -_PewterCityText_19431:: +_PewterCitySuperNerd2ImSprayingRepelText:: text "I'm spraying REPEL" line "to keep #MON" cont "out of my garden!" done -_PewterCityText_1945d:: +_PewterCityYoungsterYoureATrainerFollowMeText:: text "You're a trainer" line "right? BROCK's" cont "looking for new" @@ -70,13 +70,13 @@ _PewterCityText_1945d:: cont "Follow me!" done -_PewterCityText14:: +_PewterCityYoungsterGoTakeOnBrockText:: text "If you have the" line "right stuff, go" cont "take on BROCK!" done -_PewterCityText6:: +_PewterCityTrainerTipsText:: text "TRAINER TIPS" para "Any #MON that" @@ -85,7 +85,7 @@ _PewterCityText6:: cont "short, earns EXP!" done -_PewterCityText7:: +_PewterCityPoliceNoticeSignText:: text "NOTICE!" para "Thieves have been" @@ -96,12 +96,12 @@ _PewterCityText7:: cont "with any info!" done -_PewterCityText10:: +_PewterCityMuseumSignText:: text "PEWTER MUSEUM" line "OF SCIENCE" done -_PewterCityText11:: +_PewterCityGymSignText:: text "PEWTER CITY" line "#MON GYM" cont "LEADER: BROCK" @@ -110,7 +110,7 @@ _PewterCityText11:: line "#MON Trainer!" done -_PewterCityText12:: +_PewterCitySignText:: text "PEWTER CITY" line "A Stone Gray" cont "City" diff --git a/text/PewterGym.asm b/text/PewterGym.asm index 9114ec7b4..fa11c373b 100644 --- a/text/PewterGym.asm +++ b/text/PewterGym.asm @@ -1,4 +1,4 @@ -_BrockPreBattleText:: +_PewterGymBrockPreBattleText:: text "I'm BROCK!" line "I'm PEWTER's GYM" cont "LEADER!" diff --git a/text/PewterGym_2.asm b/text/PewterGym_2.asm index 2f6512783..46ba918c9 100644 --- a/text/PewterGym_2.asm +++ b/text/PewterGym_2.asm @@ -1,4 +1,4 @@ -_BrockPostBattleAdviceText:: +_PewterGymBrockPostBattleAdviceText:: text "There are all" line "kinds of trainers" cont "in the world!" @@ -12,12 +12,12 @@ _BrockPostBattleAdviceText:: cont "your abilities!" done -_BeforeReceivedTM34Text:: +_PewterGymBrockWaitTakeThisText:: text "Wait! Take this" line "with you!" done -_ReceivedTM34Text:: +_PewterGymReceivedTM34Text:: text " received" line "TM34!@" text_end @@ -46,12 +46,12 @@ _TM34ExplanationText:: cont "it back double!" done -_TM34NoRoomText:: +_PewterGymTM34NoRoomText:: text "You don't have" line "room for this!" done -_ReceivedBoulderBadgeText:: +_PewterGymBrockReceivedBoulderBadgeText:: text "I took" line "you for granted." @@ -63,7 +63,7 @@ _ReceivedBoulderBadgeText:: line "the BOULDERBADGE!@" text_end -_BrockBoulerBadgeInfoText:: +_PewterGymBrockBoulderBadgeInfoText:: text_start para "That's an official" @@ -79,7 +79,7 @@ _BrockBoulerBadgeInfoText:: cont "used any time!" prompt -_PewterGymBattleText1:: +_PewterGymCooltrainerMBattleText:: text "Stop right there," line "kid!" @@ -88,7 +88,7 @@ _PewterGymBattleText1:: cont "BROCK!" done -_PewterGymEndBattleText1:: +_PewterGymCooltrainerMEndBattleText:: text "Darn!" para "Light years isn't" @@ -96,7 +96,7 @@ _PewterGymEndBattleText1:: cont "distance!" prompt -_PewterGymAfterBattleText1:: +_PewterGymCooltrainerMAfterBattleText:: text "You're pretty hot," line "but not as hot" cont "as BROCK!" @@ -133,7 +133,7 @@ _PewterGymGuideAdviceText:: cont "made easier!" done -_PewterGymText_5c524:: +_PewterGymGuideFreeServiceText:: text "It's a free" line "service! Let's" cont "get happening!" diff --git a/text/PewterMart.asm b/text/PewterMart.asm index 0d5b07a26..42f408305 100644 --- a/text/PewterMart.asm +++ b/text/PewterMart.asm @@ -1,4 +1,4 @@ -_PewterMartText2:: +_PewterMartYoungsterText:: text "A shady, old man" line "got me to buy" cont "this really weird" @@ -8,7 +8,7 @@ _PewterMartText2:: line "and it cost ¥500!" done -_PewterMartText3:: +_PewterMartSuperNerdText:: text "Good things can" line "happen if you" cont "raise #MON" diff --git a/text/PewterNidoranHouse.asm b/text/PewterNidoranHouse.asm index d4a092c88..dc52ef01a 100644 --- a/text/PewterNidoranHouse.asm +++ b/text/PewterNidoranHouse.asm @@ -1,12 +1,12 @@ -_PewterHouse1Text1:: +_PewterNidoranHouseNidoranText:: text "NIDORAN: Bowbow!@" text_end -_PewterHouse1Text2:: +_PewterNidoranHouseLittleBoyText:: text "NIDORAN sit!" done -_PewterHouse1Text3:: +_PewterNidoranHouseMiddleAgedManText:: text "Our #MON's an" line "outsider, so it's" cont "hard to handle." diff --git a/text/PewterPokecenter.asm b/text/PewterPokecenter.asm index 6a1b373e9..89b053263 100644 --- a/text/PewterPokecenter.asm +++ b/text/PewterPokecenter.asm @@ -1,4 +1,4 @@ -_PewterPokecenterText2:: +_PewterPokecenterGentlemanText:: text "What!?" para "TEAM ROCKET is" @@ -8,7 +8,7 @@ _PewterPokecenterText2:: para "Scram!" done -_PewterJigglypuffText:: +_PewterPokecenterJigglypuffText:: text "JIGGLYPUFF: Puu" line "pupuu!" done diff --git a/text/PewterSpeechHouse.asm b/text/PewterSpeechHouse.asm index 615536f7e..154061e97 100644 --- a/text/PewterSpeechHouse.asm +++ b/text/PewterSpeechHouse.asm @@ -1,4 +1,4 @@ -_PewterHouse2Text1:: +_PewterSpeechHouseGamblerText:: text "#MON learn new" line "techniques as" cont "they grow!" @@ -8,7 +8,7 @@ _PewterHouse2Text1:: cont "the trainer!" done -_PewterHouse2Text2:: +_PewterSpeechHouseYoungsterText:: text "#MON become" line "easier to catch" cont "when they are" diff --git a/text/PokemonFanClub.asm b/text/PokemonFanClub.asm index 150bbeba9..c70ac08b2 100644 --- a/text/PokemonFanClub.asm +++ b/text/PokemonFanClub.asm @@ -1,16 +1,16 @@ -PikachuFanText:: +_PokemonFanClubPikachuFanNormalText:: text "Won't you admire" line "my PIKACHU's" cont "adorable tail?" done -PikachuFanBetterText:: +_PokemonFanClubPikachuFanBetterText:: text "Humph! My PIKACHU" line "is twice as cute" cont "as that one!" done -SeelFanText:: +_PokemonFanClubSeelFanNormalText:: text "I just love my" line "SEEL!" @@ -18,23 +18,23 @@ SeelFanText:: line "hug it!" done -SeelFanBetterText:: +_PokemonFanClubSeelFanBetterText:: text "Oh dear!" para "My SEEL is far" line "more attractive!" done -FanClubPikachuText:: +_PokemonFanClubPikachuText:: text "PIKACHU: Chu!" line "Pikachu!" done -FanClubSeelText:: +_PokemonFanClubSeelText:: text "SEEL: Kyuoo!" done -FanClubMeetChairText:: +_PokemonFanClubChairmanIntroText:: text "I chair the" line "#MON Fan Club!" @@ -52,7 +52,7 @@ FanClubMeetChairText:: cont "about my #MON?" done -FanClubChairStoryText:: +_PokemonFanClubChairmanStoryText:: text "Good!" line "Then listen up!" @@ -82,15 +82,16 @@ FanClubChairStoryText:: cont "you to have this!" prompt -ReceivedBikeVoucherText:: +_PokemonFanClubReceivedBikeVoucherText:: text " received" line "a @" text_ram wStringBuffer text "!@" text_end -ExplainBikeVoucherText:: +_PokemonFanClubExplainBikeVoucherText:: text_start + para "Exchange that for" line "a BICYCLE!" @@ -105,13 +106,13 @@ ExplainBikeVoucherText:: line "cycling!" done -FanClubNoStoryText:: +_PokemonFanClubNoStoryText:: text "Oh. Come back" line "when you want to" cont "hear my story!" done -FanClubChairFinalText:: +_PokemonFanClubChairFinalText:: text "Hello, !" para "Did you come see" @@ -121,24 +122,24 @@ FanClubChairFinalText:: para "No? Too bad!" done -FanClubBagFullText:: +_PokemonFanClubBagFullText:: text "Make room for" line "this!" done -_FanClubText6:: +_PokemonFanClubReceptionistText:: text "Our Chairman is" line "very vocal about" cont "#MON." done -_FanClubText7:: +_PokemonFanClubSign1Text:: text "Let's all listen" line "politely to other" cont "trainers!" done -_FanClubText8:: +_PokemonFanClubSign2Text:: text "If someone brags," line "brag right back!" done diff --git a/text/PokemonMansion1F.asm b/text/PokemonMansion1F.asm index a3c517fbe..2e927f250 100644 --- a/text/PokemonMansion1F.asm +++ b/text/PokemonMansion1F.asm @@ -1,29 +1,29 @@ -_Mansion1BattleText2:: +_PokemonMansion1FScientistBattleText:: text "Who are you? There" line "shouldn't be" cont "anyone here." done -_Mansion1EndBattleText2:: +_PokemonMansion1FScientistEndBattleText:: text "Ouch!" prompt -_Mansion1AfterBattleText2:: +_PokemonMansion1FScientistAfterBattleText:: text "A key? I don't" line "know what you're" cont "talking about." done -_MansionSwitchText:: +_PokemonMansion1FSwitchText:: text "A secret switch!" para "Press it?" done -_MansionSwitchPressedText:: +_PokemonMansion1FSwitchPressedText:: text "Who wouldn't?" prompt -_MansionSwitchNotPressedText:: +_PokemonMansion1FSwitchNotPressedText:: text "Not quite yet!" done diff --git a/text/PokemonMansion2F.asm b/text/PokemonMansion2F.asm index 378efb30d..ee2ddaeb5 100644 --- a/text/PokemonMansion2F.asm +++ b/text/PokemonMansion2F.asm @@ -1,21 +1,21 @@ -_Mansion2BattleText1:: +_PokemonMansion2FSuperNerdBattleText:: text "I can't get out!" line "This old place is" cont "one big puzzle!" done -_Mansion2EndBattleText1:: +_PokemonMansion2FSuperNerdEndBattleText:: text "Oh no!" line "My bag of loot!" prompt -_Mansion2AfterBattleText1:: +_PokemonMansion2FSuperNerdAfterBattleText:: text "Switches open and" line "close alternating" cont "sets of doors!" done -_Mansion2Text3:: +_PokemonMansion2FDiary1Text:: text "Diary: July 5" line "Guyana," cont "South America" @@ -25,23 +25,23 @@ _Mansion2Text3:: cont "in the jungle." done -_Mansion2Text4:: +_PokemonMansion2FDiary2Text:: text "Diary: July 10" line "We christened the" cont "newly discovered" cont "#MON, MEW." done -_Mansion2Text_520c2:: +_PokemonMansion2FSwitchText:: text "A secret switch!" para "Press it?" done -_Mansion2Text_520c7:: +_PokemonMansion2FSwitchPressedText:: text "Who wouldn't?" prompt -_Mansion2Text_520cc:: +_PokemonMansion2FSwitchNotPressedText:: text "Not quite yet!" done diff --git a/text/PokemonMansion3F.asm b/text/PokemonMansion3F.asm index 70331fdf1..42655b77c 100644 --- a/text/PokemonMansion3F.asm +++ b/text/PokemonMansion3F.asm @@ -1,34 +1,34 @@ -_Mansion3BattleText1:: +_PokemonMansion3FSuperNerdBattleText:: text "This place is" line "like, huge!" done -_Mansion3EndBattleText1:: +_PokemonMansion3FSuperNerdEndBattleText:: text "Ayah!" prompt -_Mansion3AfterBattleText1:: +_PokemonMansion3FSuperNerdAfterBattleText:: text "I wonder where" line "my partner went." done -_Mansion3BattleText2:: +_PokemonMansion3FScientistBattleText:: text "My mentor once" line "lived here." done -_Mansion3EndBattleText2:: +_PokemonMansion3FScientistEndBattleText:: text "Whew!" line "Overwhelming!" prompt -_Mansion3AfterBattleText2:: +_PokemonMansion3FScientistAfterBattleText:: text "So, you're stuck?" line "Try jumping off" cont "over there!" done -_Mansion3Text5:: +_PokemonMansion3FDiaryText:: text "Diary: Feb. 6" line "MEW gave birth." diff --git a/text/PokemonMansionB1F.asm b/text/PokemonMansionB1F.asm index 1bc1ef89a..da641b5f5 100644 --- a/text/PokemonMansionB1F.asm +++ b/text/PokemonMansionB1F.asm @@ -1,34 +1,34 @@ -_Mansion4BattleText1:: +_PokemonMansionB1FBurglarBattleText:: text "Uh-oh. Where am" line "I now?" done -_Mansion4EndBattleText1:: +_PokemonMansionB1FBurglarEndBattleText:: text "Awooh!" prompt -_Mansion4AfterBattleText1:: +_PokemonMansionB1FBurglarAfterBattleText:: text "You can find stuff" line "lying around." done -_Mansion4BattleText2:: +_PokemonMansionB1FScientistBattleText:: text "This place is" line "ideal for a lab." done -_Mansion4EndBattleText2:: +_PokemonMansionB1FScientistEndBattleText:: text "What" line "was that for?" prompt -_Mansion4AfterBattleText2:: +_PokemonMansionB1FScientistAfterBattleText:: text "I like it here!" line "It's conducive to" cont "my studies!" done -_Mansion4Text7:: +_PokemonMansionB1FDiaryText:: text "Diary; Sept. 1" line "MEWTWO is far too" cont "powerful." diff --git a/text/PokemonTower1F.asm b/text/PokemonTower1F.asm index 50a2cd298..f883134f5 100644 --- a/text/PokemonTower1F.asm +++ b/text/PokemonTower1F.asm @@ -1,17 +1,17 @@ -_PokemonTower1Text1:: +_PokemonTower1FReceptionistText:: text "#MON TOWER was" line "erected in the" cont "memory of #MON" cont "that had died." done -_PokemonTower1Text2:: +_PokemonTower1FMiddleAgedWomanText:: text "Did you come to" line "pay respects?" cont "Bless you!" done -_PokemonTower1Text3:: +_PokemonTower1FBaldingGuyText:: text "I came to pray" line "for my CLEFAIRY." @@ -19,12 +19,12 @@ _PokemonTower1Text3:: line "stop crying..." done -_PokemonTower1Text4:: +_PokemonTower1FGirlText:: text "My GROWLITHE..." line "Why did you die?" done -_PokemonTower1Text5:: +_PokemonTower1FChannelerText:: text "I am a CHANNELER!" line "There are spirits" cont "up to mischief!" diff --git a/text/PokemonTower2F.asm b/text/PokemonTower2F.asm index 79323001e..e927eabdc 100644 --- a/text/PokemonTower2F.asm +++ b/text/PokemonTower2F.asm @@ -1,4 +1,4 @@ -_PokemonTower2Text_6062d:: +_PokemonTower2FRivalWhatBringsYouHereText:: text ": Hey," line "! What" cont "brings you here?" @@ -10,7 +10,7 @@ _PokemonTower2Text_6062d:: cont "Let's go, pal!" done -_PokemonTower2Text_60632:: +_PokemonTower2FRivalDefeatedText:: text "What?" line "You stinker!" @@ -18,7 +18,7 @@ _PokemonTower2Text_60632:: line "you too!" prompt -_PokemonTower2Text_60637:: +_PokemonTower2FRivalVictoryText:: text ": Well," line "look at all your" cont "wimpy #MON!" @@ -27,7 +27,7 @@ _PokemonTower2Text_60637:: line "bit more!" prompt -_PokemonTower2Text_6063c:: +_PokemonTower2FRivalHowsYourDexText:: text "How's your #DEX" line "coming, pal?" cont "I just caught a" @@ -46,7 +46,7 @@ _PokemonTower2Text_6063c:: para "Smell ya later!" done -_PokemonTower2Text2:: +_PokemonTower2FChannelerText:: text "Even we could not" line "identify the" cont "wayward GHOSTs!" diff --git a/text/PokemonTower3F.asm b/text/PokemonTower3F.asm index 67098e6bf..2059fe8e5 100644 --- a/text/PokemonTower3F.asm +++ b/text/PokemonTower3F.asm @@ -1,45 +1,45 @@ -_PokemonTower3BattleText1:: +_PokemonTower3FChanneler1BattleText:: text "Urrg...Awaa..." line "Huhu...graa.." done -_PokemonTower3EndBattleText1:: +_PokemonTower3FChanneler1EndBattleText:: text "Hwa!" line "I'm saved!" prompt -_PokemonTower3AfterBattleText1:: +_PokemonTower3FChanneler1AfterBattleText:: text "The GHOSTs can be" line "identified by the" cont "SILPH SCOPE." done -_PokemonTower3BattleText2:: +_PokemonTower3FChanneler2BattleText:: text "Kekeke...." line "Kwaaah!" done -_PokemonTower3EndBattleText2:: +_PokemonTower3FChanneler2EndBattleText:: text "Hmm?" line "What am I doing?" prompt -_PokemonTower3AfterBattleText2:: +_PokemonTower3FChanneler2AfterBattleText:: text "Sorry! I was" line "possessed!" done -_PokemonTower3BattleText3:: +_PokemonTower3FChanneler3BattleText:: text "Be gone!" line "Evil spirit!" done -_PokemonTower3EndBattleText3:: +_PokemonTower3FChanneler3EndBattleText:: text "Whew!" line "The spirit left!" prompt -_PokemonTower3AfterBattleText3:: +_PokemonTower3FChanneler3AfterBattleText:: text "My friends were" line "possessed too!" done diff --git a/text/PokemonTower4F.asm b/text/PokemonTower4F.asm index 771325a0c..4b3882a75 100644 --- a/text/PokemonTower4F.asm +++ b/text/PokemonTower4F.asm @@ -1,44 +1,44 @@ -_PokemonTower4BattleText1:: +_PokemonTower4FChanneler1BattleText:: text "GHOST! No!" line "Kwaaah!" done -_PokemonTower4EndBattleText1:: +_PokemonTower4FChanneler1EndBattleText:: text "Where" line "is the GHOST?" prompt -_PokemonTower4AfterBattleText1:: +_PokemonTower4FChanneler1AfterBattleText:: text "I must have been" line "dreaming..." done -_PokemonTower4BattleText2:: +_PokemonTower4FChanneler2BattleText:: text "Be cursed with" line "me! Kwaaah!" done -_PokemonTower4EndBattleText2:: +_PokemonTower4FChanneler2EndBattleText:: text "What!" prompt -_PokemonTower4AfterBattleText2:: +_PokemonTower4FChanneler2AfterBattleText:: text "We can't crack" line "the identity of" cont "the GHOSTs." done -_PokemonTower4BattleText3:: +_PokemonTower4FChanneler3BattleText:: text "Huhuhu..." line "Beat me not!" done -_PokemonTower4EndBattleText3:: +_PokemonTower4FChanneler3EndBattleText:: text "Huh?" line "Who? What?" prompt -_PokemonTower4AfterBattleText3:: +_PokemonTower4FChanneler3AfterBattleText:: text "May the departed" line "souls of #MON" cont "rest in peace..." diff --git a/text/PokemonTower5F.asm b/text/PokemonTower5F.asm index b329118dd..ae4135d7c 100644 --- a/text/PokemonTower5F.asm +++ b/text/PokemonTower5F.asm @@ -1,4 +1,4 @@ -_PokemonTower5Text1:: +_PokemonTower5FChanneler1Text:: text "Come, child! I" line "sealed this space" cont "with white magic!" @@ -6,63 +6,63 @@ _PokemonTower5Text1:: para "You can rest here!" done -_PokemonTower5BattleText1:: +_PokemonTower5FChanneler2BattleText:: text "Give...me..." line "your...soul..." done -_PokemonTower5EndBattleText1:: +_PokemonTower5FChanneler2EndBattleText:: text "Gasp!" prompt -_PokemonTower5AfterBattleText1:: +_PokemonTower5FChanneler2AfterBattleText:: text "I was under" line "possession!" done -_PokemonTower5BattleText2:: +_PokemonTower5FChanneler3BattleText:: text "You...shall..." line "join...us..." done -_PokemonTower5EndBattleText2:: +_PokemonTower5FChanneler3EndBattleText:: text "What" line "a nightmare!" prompt -_PokemonTower5AfterBattleText2:: +_PokemonTower5FChanneler3AfterBattleText:: text "I was possessed!" done -_PokemonTower5BattleText3:: +_PokemonTower5FChanneler4BattleText:: text "Zombies!" done -_PokemonTower5EndBattleText3:: +_PokemonTower5FChanneler4EndBattleText:: text "Ha?" prompt -_PokemonTower5AfterBattleText3:: +_PokemonTower5FChanneler4AfterBattleText:: text "I regained my" line "senses!" done -_PokemonTower5BattleText4:: +_PokemonTower5FChanneler5BattleText:: text "Urgah..." line "Urff...." done -_PokemonTower5EndBattleText4:: +_PokemonTower5FChanneler5EndBattleText:: text "Whoo!" prompt -_PokemonTower5AfterBattleText4:: +_PokemonTower5FChanneler5AfterBattleText:: text "I fell to evil" line "spirits despite" cont "my training!" done -_PokemonTower5Text7:: +_PokemonTower5FPurifiedZoneText:: text "Entered purified," line "protected zone!" diff --git a/text/PokemonTower6F.asm b/text/PokemonTower6F.asm index 7532d56dd..55509e91b 100644 --- a/text/PokemonTower6F.asm +++ b/text/PokemonTower6F.asm @@ -1,10 +1,10 @@ -_PokemonTower2Text_60c1f:: +_PokemonTower6FGhostWasCubonesMotherText:: text "The GHOST was the" line "restless soul of" cont "CUBONE's mother!" done -_PokemonTower2Text_60c24:: +_PokemonTower6FSoulWasCalmedText:: text "The mother's soul" line "was calmed." @@ -12,50 +12,50 @@ _PokemonTower2Text_60c24:: line "the afterlife!" done -_PokemonTower6BattleText1:: +_PokemonTower6FChanneler1BattleText:: text "Give...me..." line "blood..." done -_PokemonTower6EndBattleText1:: +_PokemonTower6FChanneler1EndBattleText:: text "Groan!" prompt -_PokemonTower6AfterBattleText1:: +_PokemonTower6FChanneler1AfterBattleText:: text "I feel anemic and" line "weak..." done -_PokemonTower6BattleText2:: +_PokemonTower6FChanneler2BattleText:: text "Urff... Kwaah!" done -_PokemonTower6EndBattleText2:: +_PokemonTower6FChanneler2EndBattleText:: text "Some-" line "thing fell out!" prompt -_PokemonTower6AfterBattleText2:: +_PokemonTower6FChanneler2AfterBattleText:: text "Hair didn't fall" line "out! It was an" cont "evil spirit!" done -_PokemonTower6BattleText3:: +_PokemonTower6FChanneler3BattleText:: text "Ke..ke...ke..." line "ke..ke...ke!!" done -_PokemonTower6EndBattleText3:: +_PokemonTower6FChanneler3EndBattleText:: text "Keee!" prompt -_PokemonTower6AfterBattleText3:: +_PokemonTower6FChanneler3AfterBattleText:: text "What's going on" line "here?" done -_PokemonTower6Text6:: +_PokemonTower6FBeGoneText:: text "Be gone..." line "Intruders..." done diff --git a/text/PokemonTower7F.asm b/text/PokemonTower7F.asm index 704a71ebe..43e88a568 100644 --- a/text/PokemonTower7F.asm +++ b/text/PokemonTower7F.asm @@ -1,4 +1,4 @@ -_TowerRescueFujiText:: +_PokemonTower7FMrFujiRescueText:: text "MR.FUJI: Heh? You" line "came to save me?" @@ -24,21 +24,21 @@ _TowerRescueFujiText:: cont "of this tower." done -_PokemonTower7BattleText1:: +_PokemonTower7FRocket1BattleText:: text "What do you want?" line "Why are you here?" done -_PokemonTower7EndBattleText1:: +_PokemonTower7FRocket1EndBattleText:: text "I give up!" prompt -_PokemonTower7AfterBattleText1:: +_PokemonTower7FRocket1AfterBattleText:: text "I'm not going to" line "forget this!" done -_PokemonTower7BattleText2:: +_PokemonTower7FRocket2BattleText:: text "This old guy came" line "and complained" cont "about us harming" @@ -48,12 +48,12 @@ _PokemonTower7BattleText2:: line "over as adults!" done -_PokemonTower7EndBattleText2:: +_PokemonTower7FRocket2EndBattleText:: text "Please!" line "No more!" prompt -_PokemonTower7AfterBattleText2:: +_PokemonTower7FRocket2AfterBattleText:: text "#MON are only" line "good for making" cont "money!" @@ -62,17 +62,17 @@ _PokemonTower7AfterBattleText2:: line "business!" done -_PokemonTower7BattleText3:: +_PokemonTower7FRocket3BattleText:: text "You're not saving" line "anyone, kid!" done -_PokemonTower7EndBattleText3:: +_PokemonTower7FRocket3EndBattleText:: text "Don't" line "fight us ROCKETs!" prompt -_PokemonTower7AfterBattleText3:: +_PokemonTower7FRocket3AfterBattleText:: text "You're not getting" line "away with this!" done diff --git a/text/PowerPlant.asm b/text/PowerPlant.asm index dcdcd739e..f2ff25df4 100644 --- a/text/PowerPlant.asm +++ b/text/PowerPlant.asm @@ -1,7 +1,7 @@ -_VoltorbBattleText:: +_PowerPlantVoltorbBattleText:: text "Bzzzt!" done -_ZapdosBattleText:: +_PowerPlantZapdosBattleText:: text "Gyaoo!@" text_end diff --git a/text/RedsHouse1F.asm b/text/RedsHouse1F.asm index 07768af9b..7421bb0c3 100644 --- a/text/RedsHouse1F.asm +++ b/text/RedsHouse1F.asm @@ -1,4 +1,4 @@ -_MomWakeUpText:: +_RedsHouse1FMomWakeUpText:: text "MOM: Right." line "All boys leave" cont "home some day." @@ -9,13 +9,13 @@ _MomWakeUpText:: cont "for you." done -_MomHealText1:: +_RedsHouse1FMomYouShouldRestText:: text "MOM: !" line "You should take a" cont "quick rest." prompt -_MomHealText2:: +_RedsHouse1FMomLookingGreatText:: text "MOM: Oh good!" line "You and your" cont "#MON are" @@ -23,7 +23,7 @@ _MomHealText2:: cont "Take care now!" done -_StandByMeText:: +_RedsHouse1FTVStandByMeMovieText:: text "There's a movie" line "on TV. Four boys" cont "are walking on" @@ -32,6 +32,6 @@ _StandByMeText:: para "I better go too." done -_TVWrongSideText:: +_RedsHouse1FTVWrongSideText:: text "Oops, wrong side." done diff --git a/text/RockTunnel1F.asm b/text/RockTunnel1F.asm index 472c52f8a..cfe389399 100644 --- a/text/RockTunnel1F.asm +++ b/text/RockTunnel1F.asm @@ -1,114 +1,114 @@ -_RockTunnel1BattleText1:: +_RockTunnel1FHiker1BattleText:: text "This tunnel goes" line "a long way, kid!" done -_RockTunnel1EndBattleText1:: +_RockTunnel1FHiker1EndBattleText:: text "Doh!" line "You win!" prompt -_RockTunnel1AfterBattleText1:: +_RockTunnel1FHiker1AfterBattleText:: text "Watch for ONIX!" line "It can put the" cont "squeeze on you!" done -_RockTunnel1BattleText2:: +_RockTunnel1FHiker2BattleText:: text "Hmm. Maybe I'm" line "lost in here..." done -_RockTunnel1EndBattleText2:: +_RockTunnel1FHiker2EndBattleText:: text "Ease up!" line "What am I doing?" cont "Which way is out?" prompt -_RockTunnel1AfterBattleText2:: +_RockTunnel1FHiker2AfterBattleText:: text "That sleeping" line "#MON on ROUTE" cont "12 forced me to" cont "take this detour." done -_RockTunnel1BattleText3:: +_RockTunnel1FHiker3BattleText:: text "Outsiders like" line "you need to show" cont "me some respect!" done -_RockTunnel1EndBattleText3:: +_RockTunnel1FHiker3EndBattleText:: text "I give!" prompt -_RockTunnel1AfterBattleText3:: +_RockTunnel1FHiker3AfterBattleText:: text "You're talented" line "enough to hike!" done -_RockTunnel1BattleText4:: +_RockTunnel1FSuperNerdBattleText:: text "#MON fight!" line "Ready, go!" done -_RockTunnel1EndBattleText4:: +_RockTunnel1FSuperNerdEndBattleText:: text "Game" line "over!" prompt -_RockTunnel1AfterBattleText4:: +_RockTunnel1FSuperNerdAfterBattleText:: text "Oh well, I'll get" line "a ZUBAT as I go!" done -_RockTunnel1BattleText5:: +_RockTunnel1FCooltrainerF1BattleText:: text "Eek! Don't try" line "anything funny in" cont "the dark!" done -_RockTunnel1EndBattleText5:: +_RockTunnel1FCooltrainerF1EndBattleText:: text "It" line "was too dark!" prompt -_RockTunnel1AfterBattleText5:: +_RockTunnel1FCooltrainerF1AfterBattleText:: text "I saw a MACHOP" line "in this tunnel!" done -_RockTunnel1BattleText6:: +_RockTunnel1FCooltrainerF2BattleText:: text "I came this far" line "for #MON!" done -_RockTunnel1EndBattleText6:: +_RockTunnel1FCooltrainerF2EndBattleText:: text "I'm" line "out of #MON!" prompt -_RockTunnel1AfterBattleText6:: +_RockTunnel1FCooltrainerF2AfterBattleText:: text "You looked cute" line "and harmless!" done -_RockTunnel1BattleText7:: +_RockTunnel1FCooltrainerF3BattleText:: text "You have #MON!" line "Let's start!" done -_RockTunnel1EndBattleText7:: +_RockTunnel1FCooltrainerF3EndBattleText:: text "You" line "play hard!" prompt -_RockTunnel1AfterBattleText7:: +_RockTunnel1FCooltrainerF3AfterBattleText:: text "Whew! I'm all" line "sweaty now!" done -_RockTunnel1Text8:: +_RockTunnel1FSignText:: text "ROCK TUNNEL" line "CERULEAN CITY -" cont "LAVENDER TOWN" diff --git a/text/RockTunnelB1F.asm b/text/RockTunnelB1F.asm index 1a565eb36..cf4bc83c2 100644 --- a/text/RockTunnelB1F.asm +++ b/text/RockTunnelB1F.asm @@ -1,108 +1,108 @@ -_RockTunnel2BattleText2:: +_RockTunnelB1FCooltrainerF1BattleText:: text "Hikers leave twigs" line "as trail markers." done -_RockTunnel2EndBattleText2:: +_RockTunnelB1FCooltrainerF1EndBattleText:: text "Ohhh!" line "I did my best!" prompt -_RockTunnel2AfterBattleText2:: +_RockTunnelB1FCooltrainerF1AfterBattleText:: text "I want to go " line "home!" done -_RockTunnel2BattleText3:: +_RockTunnelB1FHiker1BattleText:: text "Hahaha! Can you" line "beat my power?" done -_RockTunnel2EndBattleText3:: +_RockTunnelB1FHiker1EndBattleText:: text "Oops!" line "Out-muscled!" prompt -_RockTunnel2AfterBattleText3:: +_RockTunnelB1FHiker1AfterBattleText:: text "I go for power" line "because I hate" cont "thinking!" done -_RockTunnel2BattleText4:: +_RockTunnelB1FSuperNerd1BattleText:: text "You have a" line "#DEX?" cont "I want one too!" done -_RockTunnel2EndBattleText4:: +_RockTunnelB1FSuperNerd1EndBattleText:: text "Shoot!" line "I'm so jealous!" prompt -_RockTunnel2AfterBattleText4:: +_RockTunnelB1FSuperNerd1AfterBattleText:: text "When you finish" line "your #DEX, can" cont "I have it?" done -_RockTunnel2BattleText5:: +_RockTunnelB1FSuperNerd2BattleText:: text "Do you know about" line "costume players?" done -_RockTunnel2EndBattleText5:: +_RockTunnelB1FSuperNerd2EndBattleText:: text "Well," line "that's that." prompt -_RockTunnel2AfterBattleText5:: +_RockTunnelB1FSuperNerd2AfterBattleText:: text "Costume players" line "dress up as" cont "#MON for fun." done -_RockTunnel2BattleText6:: +_RockTunnelB1FHiker2BattleText:: text "My #MON" line "techniques will" cont "leave you crying!" done -_RockTunnel2EndBattleText6:: +_RockTunnelB1FHiker2EndBattleText:: text "I give!" line "You're a better" cont "technician!" prompt -_RockTunnel2AfterBattleText6:: +_RockTunnelB1FHiker2AfterBattleText:: text "In mountains," line "you'll often find" cont "rock-type #MON." done -_RockTunnel2BattleText7:: +_RockTunnelB1FCooltrainerF2BattleText:: text "I don't often" line "come here, but I" cont "will fight you." done -_RockTunnel2EndBattleText7:: +_RockTunnelB1FCooltrainerF2EndBattleText:: text "Oh!" line "I lost!" prompt -_RockTunnel2AfterBattleText7:: +_RockTunnelB1FCooltrainerF2AfterBattleText:: text "I like tiny" line "#MON, big ones" cont "are too scary!" done -_RockTunnel2BattleText8:: +_RockTunnelB1FHiker3BattleText:: text "Hit me with your" line "best shot!" done -_RockTunnel2EndBattleText8:: +_RockTunnelB1FHiker3EndBattleText:: text "Fired" line "away!" prompt diff --git a/text/RockTunnelB1F_2.asm b/text/RockTunnelB1F_2.asm index e8e45a7f7..bf80cc265 100644 --- a/text/RockTunnelB1F_2.asm +++ b/text/RockTunnelB1F_2.asm @@ -1,20 +1,20 @@ -_RockTunnel2AfterBattleText8:: +_RockTunnelB1FHiker3AfterBattleText:: text "I'll raise my" line "#MON to beat" cont "yours, kid!" done -_RockTunnel2BattleText9:: +_RockTunnelB1FSuperNerd3BattleText:: text "I draw #MON" line "when I'm home." done -_RockTunnel2EndBattleText9:: +_RockTunnelB1FSuperNerd3EndBattleText:: text "Whew!" line "I'm exhausted!" prompt -_RockTunnel2AfterBattleText9:: +_RockTunnelB1FSuperNerd3AfterBattleText:: text "I'm an artist," line "not a fighter." done diff --git a/text/RockTunnelPokecenter.asm b/text/RockTunnelPokecenter.asm index 0fc249ff4..738dfab68 100644 --- a/text/RockTunnelPokecenter.asm +++ b/text/RockTunnelPokecenter.asm @@ -1,4 +1,4 @@ -_RockTunnelPokecenterText2:: +_RockTunnelPokecenterGentlemanText:: text "The element types" line "of #MON make" cont "them stronger" @@ -7,7 +7,7 @@ _RockTunnelPokecenterText2:: cont "others!" done -_RockTunnelPokecenterText3:: +_RockTunnelPokecenterFisherText:: text "I sold a useless" line "NUGGET for ¥5000!" done diff --git a/text/RocketHideoutB1F.asm b/text/RocketHideoutB1F.asm index c4fcb4b1e..4ff0f8ec4 100644 --- a/text/RocketHideoutB1F.asm +++ b/text/RocketHideoutB1F.asm @@ -1,74 +1,74 @@ -_RocketHideout1EndBattleText6:: +_RocketHideoutB1FRocket5EndBattleText:: text "Why...?@" text_end -_RocketHideout1BattleText2:: +_RocketHideoutB1FRocket1BattleText:: text "Who are you? How" line "did you get here?" done -_RocketHideout1EndBattleText2:: +_RocketHideoutB1FRocket1EndBattleText:: text "Oww!" line "Beaten!" prompt -_RocketHideout1AfterBattleTxt2:: +_RocketHideoutB1FRocket1AfterBattleText:: text "Are you dissing" line "TEAM ROCKET?" done -_RocketHideout1BattleText3:: +_RocketHideoutB1FRocket2BattleText:: text "You broke into" line "our operation?" done -_RocketHideout1EndBattleText3:: +_RocketHideoutB1FRocket2EndBattleText:: text "Burnt!" prompt -_RocketHideout1AfterBattleTxt3:: +_RocketHideoutB1FRocket2AfterBattleText:: text "You're not going" line "to get away with" cont "this, brat!" done -_RocketHideout1BattleText4:: +_RocketHideoutB1FRocket3BattleText:: text "Intruder alert!" done -_RocketHideout1EndBattleText4:: +_RocketHideoutB1FRocket3EndBattleText:: text "I" line "can't do it!" prompt -_RocketHideout1AfterBattleTxt4:: +_RocketHideoutB1FRocket3AfterBattleText:: text "SILPH SCOPE?" line "I don't know" cont "where it is!" done -_RocketHideout1BattleText5:: +_RocketHideoutB1FRocket4BattleText:: text "Why did you come" line "here?" done -_RocketHideout1EndBattleText5:: +_RocketHideoutB1FRocket4EndBattleText:: text "This" line "won't do!" prompt -_RocketHideout1AfterBattleTxt5:: +_RocketHideoutB1FRocket4AfterBattleText:: text "OK, I'll talk!" line "Take the elevator" cont "to see my BOSS!" done -_RocketHideout1BattleText6:: +_RocketHideoutB1FRocket5BattleText:: text "Are you lost, you" line "little rat?" done -_RocketHideout1AfterBattleTxt6:: +_RocketHideoutB1FRocket5AfterBattleText:: text "Uh-oh, that fight" line "opened the door!" done diff --git a/text/RocketHideoutB2F.asm b/text/RocketHideoutB2F.asm index c13c35935..4dffbc3be 100644 --- a/text/RocketHideoutB2F.asm +++ b/text/RocketHideoutB2F.asm @@ -1,15 +1,15 @@ -_RocketHideout2BattleText2:: +_RocketHideoutB1FRocketBattleText:: text "BOSS said you can" line "see GHOSTs with" cont "the SILPH SCOPE!" done -_RocketHideout2EndBattleText2:: +_RocketHideoutB1FRocketEndBattleText:: text "I" line "surrender!" prompt -_RocketHideout2AfterBattleTxt2:: +_RocketHideoutB1FRocketAfterBattleText:: text "The TEAM ROCKET" line "HQ has 4 basement" cont "floors. Can you" diff --git a/text/RocketHideoutB3F.asm b/text/RocketHideoutB3F.asm index a146a3838..b7ec9e1a2 100644 --- a/text/RocketHideoutB3F.asm +++ b/text/RocketHideoutB3F.asm @@ -1,15 +1,15 @@ -_RocketHideout3BattleText2:: +_RocketHideoutB3FRocket1BattleText:: text "Stop meddling in" line "TEAM ROCKET's" cont "affairs!" done -_RocketHideout3EndBattleText2:: +_RocketHideoutB3FRocket1EndBattleText:: text "Oof!" line "Taken down!" prompt -_RocketHideout3AfterBattleTxt2:: +_RocketHideoutB3FRocket1AfterBattleText:: text "SILPH SCOPE?" line "The machine the" cont "BOSS stole. It's" diff --git a/text/RocketHideoutB4F.asm b/text/RocketHideoutB4F.asm index f3ba43f36..b105b32a3 100644 --- a/text/RocketHideoutB4F.asm +++ b/text/RocketHideoutB4F.asm @@ -1,15 +1,15 @@ -_RocketHideout4Text_4557a:: +_RocketHideoutB4FGiovanniImpressedYouGotHereText:: text "So! I must say, I" line "am impressed you" cont "got here!" done -_RocketHideout4Text_4557f:: +_RocketHideoutB4FGiovanniWhatCannotBeText:: text "WHAT!" line "This cannot be!" prompt -_RocketHideout4Text_45584:: +_RocketHideoutB4FGiovanniHopeWeMeetAgainText:: text "I see that you" line "raise #MON" cont "with utmost care." @@ -26,49 +26,49 @@ _RocketHideout4Text_45584:: line "again..." done -_RocketHideout4BattleText2:: +_RocketHideoutB4FGiovanniBattleText:: text "I know you! You" line "ruined our plans" cont "at MT.MOON!" done -_RocketHideout4EndBattleText2:: +_RocketHideoutB4FGiovanniEndBattleText:: text "Burned" line "again!" prompt -_RocketHide4AfterBattleText2:: +_RocketHideoutB4FGiovanniAfterBattleText:: text "Do you have" line "something against" cont "TEAM ROCKET?" done -_RocketHideout4BattleText3:: +_RocketHideoutB4FRocket1BattleText:: text "How can you not" line "see the beauty of" cont "our evil?" done -_RocketHideout4EndBattleText3:: +_RocketHideoutB4FRocket1EndBattleText:: text "Ayaya!" prompt -_RocketHide4AfterBattleText3:: +_RocketHideoutB4FRocket1AfterBattleText:: text "BOSS! I'm sorry I" line "failed you!" done -_RocketHideout4BattleText4:: +_RocketHideoutB4FRocket2BattleText:: text "The elevator" line "doesn't work? Who" cont "has the LIFT KEY?" done -_RocketHideout4EndBattleText4:: +_RocketHideoutB4FRocket2EndBattleText:: text "No!" prompt -_RocketHideout4Text_455ec:: +_RocketHideoutB4FRocket2AfterBattleText:: text "Oh no! I dropped" line "the LIFT KEY!" done diff --git a/text/RocketHideoutElevator.asm b/text/RocketHideoutElevator.asm index 1b8ba5613..a35af3814 100644 --- a/text/RocketHideoutElevator.asm +++ b/text/RocketHideoutElevator.asm @@ -1,4 +1,4 @@ -_RocketElevatorText_4578b:: +_RocketHideoutElevatorAppearsToNeedKeyText:: text "It appears to" line "need a key.@" text_end diff --git a/text/Route1.asm b/text/Route1.asm index c7a05cd45..bc9badafa 100644 --- a/text/Route1.asm +++ b/text/Route1.asm @@ -1,4 +1,4 @@ -_Route1ViridianMartSampleText:: +_Route1Youngster1MartSampleText:: text "Hi! I work at a" line "#MON MART." @@ -12,25 +12,25 @@ _Route1ViridianMartSampleText:: cont "Here you go!" prompt -_Route1Text_1cae8:: +_Route1Youngster1GotPotionText:: text " got" line "@" text_ram wStringBuffer text "!@" text_end -_Route1Text_1caee:: +_Route1Youngster1AlsoGotPokeballsText:: text "We also carry" line "# BALLs for" cont "catching #MON!" done -_Route1Text_1caf3:: +_Route1Youngster1NoRoomText:: text "You have too much" line "stuff with you!" done -_Route1Text2:: +_Route1Youngster2Text:: text "See those ledges" line "along the road?" @@ -43,7 +43,7 @@ _Route1Text2:: cont "quicker that way." done -_Route1Text3:: +_Route1SignText:: text "ROUTE 1" line "PALLET TOWN -" cont "VIRIDIAN CITY" diff --git a/text/Route10.asm b/text/Route10.asm index 057ddcb59..a08c4da06 100644 --- a/text/Route10.asm +++ b/text/Route10.asm @@ -1,97 +1,97 @@ -_Route10BattleText1:: +_Route10SuperNerd1BattleText:: text "Wow, are you a" line "#MANIAC too?" cont "Want to see my" cont "collection?" done -_Route10EndBattleText1:: +_Route10SuperNerd1EndBattleText:: text "Humph." line "I'm not angry!" prompt -_Route10AfterBattleText1:: +_Route10SuperNerd1AfterBattleText:: text "I have more rare" line "#MON at home!" done -_Route10BattleText2:: +_Route10Hiker1BattleText:: text "Ha-hahah-ah-ha!" done -_Route10EndBattleText2:: +_Route10Hiker1EndBattleText:: text "Ha-haha!" line "Not laughing!" cont "Ha-hay fever!" cont "Haha-ha-choo!" prompt -_Route10AfterBattleText2:: +_Route10Hiker1AfterBattleText:: text "Haha-ha-choo!" line "Ha-choo!" cont "Snort! Snivel!" done -_Route10BattleText3:: +_Route10SuperNerd2BattleText:: text "Hi kid, want to" line "see my #MON?" done -_Route10EndBattleText3:: +_Route10SuperNerd2EndBattleText:: text "Oh no!" line "My #MON!" prompt -_Route10AfterBattleText3:: +_Route10SuperNerd2AfterBattleText:: text "I don't like you" line "for beating me!" done -_Route10BattleText4:: +_Route10CooltrainerF1BattleText:: text "I've been to a" line "#MON GYM a few" cont "times. But, I" cont "lost each time." done -_Route10EndBattleText4:: +_Route10CooltrainerF1EndBattleText:: text "Ohh!" line "Blew it again!" prompt -_Route10AfterBattleText4:: +_Route10CooltrainerF1AfterBattleText:: text "I noticed some" line "#MANIACs" cont "prowling around." done -_Route10BattleText5:: +_Route10Hiker2BattleText:: text "Ah! This mountain" line "air is delicious!" done -_Route10EndBattleText5:: +_Route10Hiker2EndBattleText:: text "That" line "cleared my head!" prompt -_Route10AfterBattleText5:: +_Route10Hiker2AfterBattleText:: text "I feel bloated on" line "mountain air!" done -_Route10BattleText6:: +_Route10CooltrainerF2BattleText:: text "I'm feeling a bit" line "faint from this" cont "tough hike." done -_Route10EndBattleText6:: +_Route10CooltrainerF2EndBattleText:: text "I'm" line "not up to it!" prompt -_Route10AfterBattleText6:: +_Route10CooltrainerF2AfterBattleText:: text "The #MON here" line "are so chunky!" cont "There should be a" @@ -99,11 +99,10 @@ _Route10AfterBattleText6:: cont "floral pattern!" done -_Route10Text9:: -_Route10Text7:: +_Route10RockTunnelSignText:: text "ROCK TUNNEL" done -_Route10Text10:: +_Route10PowerPlantSignText:: text "POWER PLANT" done diff --git a/text/Route11.asm b/text/Route11.asm index 13e37bdf5..d2ea9b942 100644 --- a/text/Route11.asm +++ b/text/Route11.asm @@ -1,123 +1,123 @@ -_Route11BattleText1:: +_Route11Gambler1BattleText:: text "Win, lose or draw!" done -_Route11EndBattleText1:: +_Route11Gambler1EndBattleText:: text "Atcha!" line "Didn't go my way!" prompt -_Route11AfterBattleText1:: +_Route11Gambler1AfterBattleText:: text "#MON is life!" line "And to live is to" cont "gamble!" done -_Route11BattleText2:: +_Route11Gambler2BattleText:: text "Competition! I" line "can't get enough!" done -_Route11EndBattleText2:: +_Route11Gambler2EndBattleText:: text "I had" line "a chance!" prompt -_Route11AfterBattleText2:: +_Route11Gambler2AfterBattleText:: text "You can't be a" line "coward in the" cont "world of #MON!" done -_Route11BattleText3:: +_Route11Youngster1BattleText:: text "Let's go, but" line "don't cheat!" done -_Route11EndBattleText3:: +_Route11Youngster1EndBattleText:: text "Huh?" line "That's not right!" prompt -_Route11AfterBattleText3:: +_Route11Youngster1AfterBattleText:: text "I did my best! I" line "have no regrets!" done -_Route11BattleText4:: +_Route11SuperNerd1BattleText:: text "Careful!" line "I'm laying down" cont "some cables!" done -_Route11EndBattleText4:: +_Route11SuperNerd1EndBattleText:: text "That" line "was electric!" prompt -_Route11AfterBattleText4:: +_Route11SuperNerd1AfterBattleText:: text "Spread the word" line "to save energy!" done -_Route11BattleText5:: +_Route11Youngster2BattleText:: text "I just became a" line "trainer! But, I" cont "think I can win!" done -_Route11EndBattleText5:: +_Route11Youngster2EndBattleText:: text "My" line "#MON couldn't!" prompt -_Route11AfterBattleText5:: +_Route11Youngster2AfterBattleText5:: text "What do you want?" line "Leave me alone!" done -_Route11BattleText6:: +_Route11Gambler3BattleText:: text "Fwahaha! I have" line "never lost!" done -_Route11EndBattleText6:: +_Route11Gambler3EndBattleText:: text "My" line "first loss!" prompt -_Route11AfterBattleText6:: +_Route11Gambler3AfterBattleText:: text "Luck of the draw!" line "Just luck!" done -_Route11BattleText7:: +_Route11Gambler4BattleText:: text "I have never won" line "before..." done -_Route11EndBattleText7:: +_Route11Gambler4EndBattleText:: text "I saw" line "this coming..." prompt -_Route11AfterBattleText7:: +_Route11Gambler4AfterBattleText:: text "It's just luck." line "Luck of the draw." done -_Route11BattleText8:: +_Route11Youngster3BattleText:: text "I'm the best in" line "my class!" done -_Route11EndBattleText8:: +_Route11Youngster3EndBattleText:: text "Darn!" line "I need to make my" cont "#MON stronger!" prompt -_Route11AfterBattleText8:: +_Route11Youngster3AfterBattleText:: text "There's a fat" line "#MON that" cont "comes down from" @@ -127,7 +127,7 @@ _Route11AfterBattleText8:: line "you can get it." done -_Route11BattleText9:: +_Route11SuperNerd2BattleText:: text "Watch out for" line "live wires!" done diff --git a/text/Route11Gate1F.asm b/text/Route11Gate1F.asm index ef371d06d..bca56b529 100644 --- a/text/Route11Gate1F.asm +++ b/text/Route11Gate1F.asm @@ -1,4 +1,4 @@ -_Route11GateText1:: +_Route11Gate1FGuardText:: text "When you catch" line "lots of #MON," cont "isn't it hard to" diff --git a/text/Route11Gate2F.asm b/text/Route11Gate2F.asm index 10236081d..cb05fdff7 100644 --- a/text/Route11Gate2F.asm +++ b/text/Route11Gate2F.asm @@ -1,4 +1,4 @@ -_Route11GateUpstairsText_494a3:: +_Route11Gate2FOaksAideItemfinderDescriptionText:: text "There are items on" line "the ground that" cont "can't be seen." @@ -12,7 +12,7 @@ _Route11GateUpstairsText_494a3:: cont "to look yourself!" done -_BinocularsSnorlaxText:: +_Route11Gate2FLeftBinocularsSnorlaxText:: text "Looked into the" line "binoculars." @@ -20,7 +20,7 @@ _BinocularsSnorlaxText:: line "asleep on a road!" done -_BinocularsNoSnorlaxText:: +_Route11Gate2FLeftBinocularsNoSnorlaxText:: text "Looked into the" line "binoculars." @@ -28,7 +28,7 @@ _BinocularsNoSnorlaxText:: line "view!" done -_Route11GateUpstairsText_494d5:: +_Route11Gate2FRightBinocularsText:: text "Looked into the" line "binoculars." diff --git a/text/Route11_2.asm b/text/Route11_2.asm index b9b68d6d7..e117da3a9 100644 --- a/text/Route11_2.asm +++ b/text/Route11_2.asm @@ -1,28 +1,28 @@ -_Route11EndBattleText9:: +_Route11SuperNerd2EndBattleText:: text "Whoa!" line "You spark plug!" prompt -_Route11AfterBattleText9:: +_Route11SuperNerd2AfterBattleText:: text "Well, better get" line "back to work." done -_Route11BattleText10:: +_Route11Youngster4BattleText:: text "My #MON should" line "be ready by now!" done -_Route11EndBattleText10:: +_Route11Youngster4EndBattleText:: text "Too" line "much, too young!" prompt -_Route11AfterBattleText10:: +_Route11Youngster4AfterBattleText:: text "I better go find" line "stronger ones!" done -_Route11Text11:: +_Route11DiglettsCaveSignText:: text "DIGLETT's CAVE" done diff --git a/text/Route12.asm b/text/Route12.asm index 82696fda7..d38f6154c 100644 --- a/text/Route12.asm +++ b/text/Route12.asm @@ -1,139 +1,139 @@ -_Route12Text1:: +_Route12SnorlaxText:: text "A sleeping #MON" line "blocks the way!" done -_Route12Text13:: +_Route12SnorlaxWokeUpText:: text "SNORLAX woke up!" para "It attacked in a" line "grumpy rage!" done -_Route12Text14:: +_Route12SnorlaxCalmedDownText:: text "SNORLAX calmed" line "down! With a big" cont "yawn, it returned" cont "to the mountains!" done -_Route12BattleText1:: +_Route12Fisher1BattleText:: text "Yeah! I got a" line "bite, here!" done -_Route12EndBattleText1:: +_Route12Fisher1EndBattleText:: text "Tch!" line "Just a small fry!" prompt -_Route12AfterBattleText1:: +_Route12Fisher1AfterBattleText:: text "Hang on! My line's" line "snagged!" done -_Route12BattleText2:: +_Route12Fisher2BattleText:: text "Be patient!" line "Fishing is a" cont "waiting game!" done -_Route12EndBattleText2:: +_Route12Fisher2EndBattleText:: text "That" line "one got away!" prompt -_Route12AfterBattleText2:: +_Route12Fisher2AfterBattleText:: text "With a better ROD," line "I could catch" cont "better #MON!" done -_Route12BattleText3:: +_Route12CooltrainerMBattleText:: text "Have you found a" line "MOON STONE?" done -_Route12EndBattleText3:: +_Route12CooltrainerMEndBattleText:: text "Oww!" prompt -_Route12AfterBattleText3:: +_Route12CooltrainerMAfterBattleText:: text "I could have made" line "my #MON evolve" cont "with MOON STONE!" done -_Route12BattleText4:: +_Route12SuperNerdBattleText:: text "Electricity is my" line "specialty!" done -_Route12EndBattleText4:: +_Route12SuperNerdEndBattleText:: text "Unplugged!" prompt -_Route12AfterBattleText4:: +_Route12SuperNerdAfterBattleText:: text "Water conducts" line "electricity, so" cont "you should zap" cont "sea #MON!" done -_Route12BattleText5:: +_Route12Fisher3BattleText:: text "The FISHING FOOL" line "vs. #MON KID!" done -_Route12EndBattleText5:: +_Route12Fisher3EndBattleText:: text "Too" line "much!" prompt -_Route12AfterBattleText5:: +_Route12Fisher3AfterBattleText:: text "You beat me at" line "#MON, but I'm" cont "good at fishing!" done -_Route12BattleText6:: +_Route12Fisher4BattleText:: text "I'd rather be" line "working!" done -_Route12EndBattleText6:: +_Route12Fisher4EndBattleText:: text "It's" line "not easy..." prompt -_Route12AfterBattleText6:: +_Route12Fisher4AfterBattleText:: text "It's all right." line "Losing doesn't" cont "bug me any more." done -_Route12BattleText7:: +_Route12Fisher5BattleText:: text "You never know" line "what you could" cont "catch!" done -_Route12EndBattleText7:: +_Route12Fisher5EndBattleText:: text "Lost" line "it!" prompt -_Route12AfterBattleText7:: +_Route12Fisher5AfterBattleText:: text "I catch MAGIKARP" line "all the time, but" cont "they're so weak!" done -_Route12Text11:: +_Route12SignText:: text "ROUTE 12 " line "North to LAVENDER" done -_Route12Text12:: +_Route12SportFishingSignText:: text "SPORT FISHING AREA" done diff --git a/text/Route12Gate1F.asm b/text/Route12Gate1F.asm index 51d755394..e43764d5e 100644 --- a/text/Route12Gate1F.asm +++ b/text/Route12Gate1F.asm @@ -1,4 +1,4 @@ -_Route12GateText1:: +_Route12Gate1FGuardText:: text "There's a lookout" line "spot upstairs." done diff --git a/text/Route12Gate2F.asm b/text/Route12Gate2F.asm index b5a6465f7..6ff233853 100644 --- a/text/Route12Gate2F.asm +++ b/text/Route12Gate2F.asm @@ -1,4 +1,4 @@ -_TM39PreReceiveText:: +_Route12Gate2FBrunetteGirlYouCanHaveThisText:: text "My #MON's" line "ashes are stored" cont "in #MON TOWER." @@ -8,12 +8,12 @@ _TM39PreReceiveText:: cont "it any more..." prompt -_ReceivedTM39Text:: +_Route12Gate2FBrunetteGirlReceivedTM39Text:: text " received" line "TM39!@" text_end -_TM39ExplanationText:: +_Route12Gate2FBrunetteGirlTM39ExplanationText:: text "TM39 is a move" line "called SWIFT." @@ -23,19 +23,19 @@ _TM39ExplanationText:: cont "afford to lose." done -_TM39NoRoomText:: +_Route12Gate2FBrunetteGirlTM39NoRoomText:: text "You don't have" line "room for this." done -_Route12GateUpstairsText_495b8:: +_Route12Gate2FLeftBinocularsText:: text "Looked into the" line "binoculars." para "A man fishing!" done -_Route12GateUpstairsText_495c4:: +_Route12Gate2FRightBinocularsText:: text "Looked into the" line "binoculars." diff --git a/text/Route12SuperRodHouse.asm b/text/Route12SuperRodHouse.asm index 990fc6311..dfb87296a 100644 --- a/text/Route12SuperRodHouse.asm +++ b/text/Route12SuperRodHouse.asm @@ -1,4 +1,4 @@ -_Route12HouseText_564c0:: +_Route12SuperRodHouseFishingGuruDoYouLikeToFishText:: text "I'm the FISHING" line "GURU's brother!" @@ -9,7 +9,7 @@ _Route12HouseText_564c0:: line "fish?" done -_Route12HouseText_564c5:: +_Route12SuperRodHouseFishingGuruReceivedSuperRodText:: text "Grand! I like" line "your style!" @@ -22,7 +22,7 @@ _Route12HouseText_564c5:: text "!@" text_end -_Route12HouseText_564ca:: +_Route12SuperRodHouseFishingGuruFishingWayOfLifeText:: text_start para "Fishing is a way" @@ -34,12 +34,12 @@ _Route12HouseText_564ca:: cont "one!" done -_Route12HouseText_564cf:: +_Route12SuperRodHouseFishingGuruThatsDisappointingText:: text "Oh... That's so" line "disappointing..." done -_Route12HouseText_564d4:: +_Route12SuperRodHouseFishingGuruTryFishingText:: text "Hello there," line "!" @@ -53,7 +53,7 @@ _Route12HouseText_564d4:: line "wherever you can!" done -_Route12HouseText_564d9:: +_Route12SuperRodHouseFishingGuruNoRoomText:: text "Oh no!" para "I had a gift for" diff --git a/text/Route13.asm b/text/Route13.asm index e27189199..26f7727f2 100644 --- a/text/Route13.asm +++ b/text/Route13.asm @@ -1,170 +1,170 @@ -_Route13BattleText2:: +_Route13CooltrainerM1BattleText:: text "My bird #MON" line "want to scrap!" done -_Route13EndBattleText2:: +_Route13CooltrainerM1EndBattleText:: text "My" line "bird combo lost?" prompt -_Route13AfterBattleText2:: +_Route13CooltrainerM1AfterBattleText:: text "My #MON look" line "happy even though" cont "they lost." done -_Route13BattleText3:: +_Route13CooltrainerF1BattleText:: text "I'm told I'm good" line "for a kid!" done -_Route13EndBattleText3:: +_Route13CooltrainerF1EndBattleText:: text "Ohh!" line "I lost!" prompt -_Route13AfterBattleText3:: +_Route13CooltrainerF1AfterBattleText:: text "I want to become" line "a good trainer." cont "I'll train hard." done -_Route13BattleText4:: +_Route13CooltrainerF2BattleText:: text "Wow! Your BADGEs" line "are too cool!" done -_Route13EndBattleText4:: +_Route13CooltrainerF2EndBattleText:: text "Not" line "enough!" prompt -_Route13AfterBattleText4:: +_Route13CooltrainerF2AfterBattleText:: text "You got those" line "BADGEs from GYM" cont "LEADERs. I know!" done -_Route13BattleText5:: +_Route13CooltrainerF3BattleText:: text "My cute #MON" line "wish to make your" cont "acquaintance." done -_Route13EndBattleText5:: +_Route13CooltrainerF3EndBattleText:: text "Wow!" line "You totally won!" prompt -_Route13AfterBattleText5:: +_Route13CooltrainerF3AfterBattleText:: text "You have to make" line "#MON fight to" cont "toughen them up!" done -_Route13BattleText6:: +_Route13CooltrainerF4BattleText:: text "I found CARBOS in" line "a cave once." done -_Route13EndBattleText6:: +_Route13CooltrainerF4EndBattleText:: text "Just" line "messed up!" prompt -_Route13AfterBattleText6:: +_Route13CooltrainerF4AfterBattleText:: text "CARBOS boosted" line "the SPEED of my" cont "#MON." done -_Route13BattleText7:: +_Route13CooltrainerM2BattleText:: text "The wind's blowing" line "my way!" done -_Route13EndBattleText7:: +_Route13CooltrainerM2EndBattleText:: text "The" line "wind turned!" prompt -_Route13AfterBattleText7:: +_Route13CooltrainerM2AfterBattleText:: text "I'm beat. I guess" line "I'll FLY home." done -_Route13BattleText8:: +_Route13Beauty1BattleText:: text "Sure, I'll play" line "with you!" done -_Route13EndBattleText8:: +_Route13Beauty1EndBattleText:: text "Oh!" line "You little brute!" prompt -_Route13AfterBattleText8:: +_Route13Beauty1AfterBattleText:: text "I wonder which is" line "stronger, male or" cont "female #MON?" done -_Route13BattleText9:: +_Route13Beauty2BattleText:: text "Do you want to" line "#MON with me?" done -_Route13EndBattleText9:: +_Route13Beauty2EndBattleText:: text "It's over" line "already?" prompt -_Route13AfterBattleText9:: +_Route13Beauty2AfterBattleText:: text "I don't know" line "anything about" cont "#MON. I just" cont "like cool ones!" done -_Route13BattleText10:: +_Route13BikerBattleText:: text "What're you" line "lookin' at?" done -_Route13EndBattleText10:: +_Route13BikerEndBattleText:: text "Dang!" line "Stripped gears!" prompt -_Route13AfterBattleText10:: +_Route13BikerAfterBattleText:: text "Get lost!" done -_Route13BattleText11:: +_Route13CooltrainerM3BattleText:: text "I always go with" line "bird #MON!" done -_Route13EndBattleText11:: +_Route13CooltrainerM3EndBattleText:: text "Out" line "of power!" prompt -_Route13AfterBattleText11:: +_Route13CooltrainerM3AfterBattleText:: text "I wish I could" line "fly like PIDGEY" cont "and PIDGEOTTO..." done -_Route13Text11:: +_Route13TrainerTips1Text:: text "TRAINER TIPS" para "Look to the left" line "of that post!" done -_Route13Text12:: +_Route13TrainerTips2Text:: text "TRAINER TIPS" para "Use SELECT to" @@ -172,7 +172,7 @@ _Route13Text12:: cont "the ITEM window!" done -_Route13Text13:: +_Route13SignText:: text "ROUTE 13" line "North to SILENCE" cont "BRIDGE" diff --git a/text/Route14.asm b/text/Route14.asm index 18e85ed4a..5fd3740c2 100644 --- a/text/Route14.asm +++ b/text/Route14.asm @@ -1,147 +1,147 @@ -_Route14BattleText1:: +_Route14CooltrainerM1BattleText:: text "You need to use" line "TMs to teach good" cont "moves to #MON!" done -_Route14EndBattleText1:: +_Route14CooltrainerM1EndBattleText:: text "Not" line "good enough!" prompt -_Route14AfterBattleText1:: +_Route14CooltrainerM1AfterBattleText:: text "You have some HMs" line "right? #MON" cont "can't ever forget" cont "those moves." done -_Route14BattleText2:: +_Route14CooltrainerM2BattleText:: text "My bird #MON" line "should be ready" cont "for battle." done -_Route14EndBattleText2:: +_Route14CooltrainerM2EndBattleText:: text "Not" line "ready yet!" prompt -_Route14AfterBattleText2:: +_Route14CooltrainerM2AfterBattleText:: text "They need to learn" line "better moves." done -_Route14BattleText3:: +_Route14CooltrainerM3BattleText:: text "TMs are on sale" line "in CELADON!" cont "But, only a few" cont "people have HMs!" done -_Route14EndBattleText3:: +_Route14CooltrainerM3EndBattleText:: text "Aww," line "bummer!" prompt -_Route14AfterBattleText3:: +_Route14CooltrainerM3AfterBattleText:: text "Teach #MON" line "moves of the same" cont "element type for" cont "more power." done -_Route14BattleText4:: +_Route14CooltrainerM4BattleText:: text "Have you taught" line "your bird #MON" cont "how to FLY?" done -_Route14EndBattleText4:: +_Route14CooltrainerM4EndBattleText:: text "Shot" line "down in flames!" prompt -_Route14AfterBattleText4:: +_Route14CooltrainerM4AfterBattleText:: text "Bird #MON are" line "my true love!" done -_Route14BattleText5:: +_Route14CooltrainerM5BattleText:: text "Have you heard of" line "the legendary" cont "#MON?" done -_Route14EndBattleText5:: +_Route14CooltrainerM5EndBattleText:: text "Why?" line "Why'd I lose?" prompt -_Route14AfterBattleText5:: +_Route14CooltrainerM5AfterBattleText:: text "The 3 legendary" line "#MON are all" cont "birds of prey." done -_Route14BattleText6:: +_Route14CooltrainerM6BattleText:: text "I'm not into it," line "but OK! Let's go!" done -_Route14EndBattleText6:: +_Route14CooltrainerM6EndBattleText:: text "I" line "knew it!" prompt -_Route14AfterBattleText6:: +_Route14CooltrainerM6AfterBattleText:: text "Winning, losing," line "it doesn't matter" cont "in the long run!" done -_Route14BattleText7:: +_Route14Biker1BattleText:: text "C'mon, c'mon." line "Let's go, let's" cont "go, let's go!" done -_Route14EndBattleText7:: +_Route14Biker1EndBattleText:: text "Arrg!" line "Lost! Get lost!" prompt -_Route14AfterBattleText7:: +_Route14Biker1AfterBattleText:: text "What, what, what?" line "What do you want?" done -_Route14BattleText8:: +_Route14Biker2BattleText:: text "Perfect! I need to" line "burn some time!" done -_Route14EndBattleText8:: +_Route14Biker2EndBattleText:: text "What?" line "You!?" prompt -_Route14AfterBattleText8:: +_Route14Biker2AfterBattleText:: text "Raising #MON" line "is a drag, man." done -_Route14BattleText9:: +_Route14Biker3BattleText:: text "We ride out here" line "because there's" cont "more room!" done -_Route14EndBattleText9:: +_Route14Biker3EndBattleText:: text "Wipe out!" prompt -_Route14AfterBattleText9:: +_Route14Biker3AfterBattleText:: text "It's cool you" line "made your #MON" cont "so strong!" @@ -150,23 +150,23 @@ _Route14AfterBattleText9:: line "And you know it!" done -_Route14BattleText10:: +_Route14Biker4BattleText:: text "#MON fight?" line "Cool! Rumble!" done -_Route14EndBattleText10:: +_Route14Biker4EndBattleText:: text "Blown" line "away!" prompt -_Route14AfterBattleText10:: +_Route14Biker4AfterBattleText:: text "You know who'd" line "win, you and me" cont "one on one!" done -_Route14Text11:: +_Route14SignText:: text "ROUTE 14" line "West to FUCHSIA" cont "CITY" diff --git a/text/Route15.asm b/text/Route15.asm index 9dc0e6bac..f28b315d0 100644 --- a/text/Route15.asm +++ b/text/Route15.asm @@ -1,15 +1,15 @@ -_Route15BattleText1:: +_Route15CooltrainerF1BattleText:: text "Let me try out the" line "#MON I just" cont "got in a trade!" done -_Route15EndBattleText1:: +_Route15CooltrainerF1EndBattleText:: text "Not" line "good enough!" prompt -_Route15AfterBattleText1:: +_Route15CooltrainerF1AfterBattleText:: text "You can't change" line "the nickname of" cont "any #MON you" @@ -19,153 +19,153 @@ _Route15AfterBattleText1:: line "Trainer can." done -_Route15BattleText2:: +_Route15CooltrainerF2BattleText:: text "You look gentle," line "so I think I can" cont "beat you!" done -_Route15EndBattleText2:: +_Route15CooltrainerF2EndBattleText:: text "No," line "wrong!" prompt -_Route15AfterBattleText2:: +_Route15CooltrainerF2AfterBattleText:: text "I'm afraid of" line "BIKERs, they look" cont "so ugly and mean!" done -_Route15BattleText3:: +_Route15CooltrainerM1BattleText:: text "When I whistle, I" line "can summon bird" cont "#MON!" done -_Route15EndBattleText3:: +_Route15CooltrainerM1EndBattleText:: text "Ow!" line "That's tragic!" prompt -_Route15AfterBattleText3:: +_Route15CooltrainerM1AfterBattleText:: text "Maybe I'm not cut" line "out for battles." done -_Route15BattleText4:: +_Route15CooltrainerM2BattleText:: text "Hmm? My birds are" line "shivering! You're" cont "good, aren't you?" done -_Route15EndBattleText4:: +_Route15CooltrainerM2EndBattleText:: text "Just" line "as I thought!" prompt -_Route15AfterBattleText4:: +_Route15CooltrainerM2AfterBattleText:: text "Did you know moves" line "like EARTHQUAKE" cont "don't have any" cont "effect on birds?" done -_Route15BattleText5:: +_Route15Beauty1BattleText:: text "Oh, you're a" line "little cutie!" done -_Route15EndBattleText5:: +_Route15Beauty1EndBattleText:: text "You looked" line "so cute too!" prompt -_Route15AfterBattleText5:: +_Route15Beauty1AfterBattleText:: text "I forgive you!" line "I can take it!" done -_Route15BattleText6:: +_Route15Beauty2BattleText:: text "I raise #MON" line "because I live" cont "alone!" done -_Route15EndBattleText6:: +_Route15Beauty2EndBattleText:: text "I didn't" line "ask for this!" prompt -_Route15AfterBattleText6:: +_Route15Beauty2AfterBattleText:: text "I just like going" line "home to be with" cont "my #MON!" done -_Route15BattleText7:: +_Route15Biker1BattleText:: text "Hey kid! C'mon!" line "I just got these!" done -_Route15EndBattleText7:: +_Route15Biker1EndBattleText:: text "Why" line "not?" prompt -_Route15AfterBattleText7:: +_Route15Biker1AfterBattleText:: text "You only live" line "once, so I live" cont "as an outlaw!" cont "TEAM ROCKET RULES!" done -_Route15BattleText8:: +_Route15Biker2BattleText:: text "Fork over all your" line "cash when you" cont "lose to me, kid!" done -_Route15EndBattleText8:: +_Route15Biker2EndBattleText:: text "That" line "can't be true!" prompt -_Route15AfterBattleText8:: +_Route15Biker2AfterBattleText:: text "I was just joking" line "about the money!" done -_Route15BattleText9:: +_Route15CooltrainerF3BattleText:: text "What's cool?" line "Trading #MON!" done -_Route15EndBattleText9:: +_Route15CooltrainerF3EndBattleText:: text "I" line "said trade!" prompt -_Route15AfterBattleText9:: +_Route15CooltrainerF3AfterBattleText:: text "I trade #MON" line "with my friends!" done -_Route15BattleText10:: +_Route15CooltrainerF4BattleText:: text "Want to play with" line "my #MON?" done -_Route15EndBattleText10:: +_Route15CooltrainerF4EndBattleText:: text "I was" line "too impatient!" prompt -_Route15AfterBattleText10:: +_Route15CooltrainerF4AfterBattleText:: text "I'll go train with" line "weaker people.@" text_end -_Route15Text12:: +_Route15SignText:: text "ROUTE 15" line "West to FUCHSIA" cont "CITY" diff --git a/text/Route15Gate1F.asm b/text/Route15Gate1F.asm index 0a5261428..5aec0e028 100644 --- a/text/Route15Gate1F.asm +++ b/text/Route15Gate1F.asm @@ -1,4 +1,4 @@ -_Route15GateText1:: +_Route15Gate1FGuardText:: text "Are you working" line "on a #DEX?" diff --git a/text/Route15Gate2F.asm b/text/Route15Gate2F.asm index ade4a358a..e93ce19fa 100644 --- a/text/Route15Gate2F.asm +++ b/text/Route15Gate2F.asm @@ -1,4 +1,4 @@ -_Route15GateUpstairsText_4968c:: +_Route15Gate2FOaksAideExpAllText:: text "EXP.ALL gives" line "EXP points to all" cont "the #MON with" @@ -15,7 +15,7 @@ _Route15GateUpstairsText_4968c:: cont "store it via PC." done -_Route15GateUpstairsText_49698:: +_Route15Gate2FBinocularsText:: text "Looked into the" line "binoculars." diff --git a/text/Route16.asm b/text/Route16.asm index 45265829b..2f244a250 100644 --- a/text/Route16.asm +++ b/text/Route16.asm @@ -1,90 +1,90 @@ -_Route16BattleText1:: +_Route16Biker1BattleText:: text "What do you want?" done -_Route16EndBattleText1:: +_Route16Biker1EndBattleText:: text "Don't you" line "dare laugh!" prompt -_Route16AfterBattleText1:: +_Route16Biker1AfterBattleText:: text "We like just" line "hanging here," cont "what's it to you?" done -_Route16BattleText2:: +_Route16Biker2BattleText:: text "Nice BIKE!" line "Hand it over!" done -_Route16EndBattleText2:: +_Route16Biker2EndBattleText:: text "Knock" line "out!" prompt -_Route16AfterBattleText2:: +_Route16Biker2AfterBattleText:: text "Forget it, who" line "needs your BIKE!" done -_Route16BattleText3:: +_Route16Biker3BattleText:: text "Come out and play," line "little mouse!" done -_Route16EndBattleText3:: +_Route16Biker3EndBattleText:: text "You" line "little rat!" prompt -_Route16AfterBattleText3:: +_Route16Biker3AfterBattleText:: text "I hate losing!" line "Get away from me!" done -_Route16BattleText4:: +_Route16biker4BattleText:: text "Hey, you just" line "bumped me!" done -_Route16EndBattleText4:: +_Route16Biker4EndBattleText:: text "Kaboom!" prompt -_Route16AfterBattleText4:: +_Route16Biker4AfterBattleText:: text "You can also get" line "to FUCHSIA from" cont "VERMILION using a" cont "coastal road." done -_Route16BattleText5:: +_Route16Biker5BattleText:: text "I'm feeling" line "hungry and mean!" done -_Route16EndBattleText5:: +_Route16Biker5EndBattleText:: text "Bad," line "bad, bad!" prompt -_Route16AfterBattleText5:: +_Route16Biker5AfterBattleText:: text "I like my #MON" line "ferocious! They" cont "tear up enemies!" done -_Route16BattleText6:: +_Route16Biker6BattleText:: text "Sure, I'll go!" done -_Route16EndBattleText6:: +_Route16Biker6EndBattleText:: text "Don't make" line "me mad!" prompt -_Route16AfterBattleText6:: +_Route16Biker6AfterBattleText:: text "I like harassing" line "people with my" cont "vicious #MON!" @@ -95,25 +95,25 @@ _Route16Text7:: line "blocks the way!" done -_Route16Text10:: +_Route16SnorlaxWokeUpText:: text "SNORLAX woke up!" para "It attacked in a" line "grumpy rage!" done -_Route16Text11:: +_Route16SnorlaxReturnedToMountainsText:: text "With a big yawn," line "SNORLAX returned" cont "to the mountains!" done -_Route16Text8:: +_Route16CyclingRoadSignText:: text "Enjoy the slope!" line "CYCLING ROAD" done -_Route16Text9:: +_Route16SignText:: text "ROUTE 16" line "CELADON CITY -" cont "FUCHSIA CITY" diff --git a/text/Route16FlyHouse.asm b/text/Route16FlyHouse.asm index 89f76e51d..d8b17cbe1 100644 --- a/text/Route16FlyHouse.asm +++ b/text/Route16FlyHouse.asm @@ -1,4 +1,4 @@ -_Route16HouseText3:: +_Route16FlyHouseBrunetteGirlText:: text "Oh, you found my" line "secret retreat!" @@ -8,12 +8,12 @@ _Route16HouseText3:: cont "to you with this!" prompt -_ReceivedHM02Text:: +_Route16FlyHouseBrunetteGirlReceivedHM02Text:: text " received" line "HM02!@" text_end -_HM02ExplanationText:: +_Route16FlyHouseBrunetteGirlHM02ExplanationText:: text "HM02 is FLY." line "It will take you" cont "back to any town." @@ -22,11 +22,11 @@ _HM02ExplanationText:: line "use!" done -_HM02NoRoomText:: +_Route16FlyHouseBrunetteGirlHM02NoRoomText:: text "You don't have any" line "room for this." done -_Route16HouseText_1e652:: +_Route16FlyHouseFearowText:: text "FEAROW: Kyueen!" done diff --git a/text/Route16Gate1F.asm b/text/Route16Gate1F.asm index f548977fa..6286528aa 100644 --- a/text/Route16Gate1F.asm +++ b/text/Route16Gate1F.asm @@ -1,22 +1,22 @@ -_Route16GateText_49777:: +_Route16Gate1FGuardNoPedestriansAllowedText:: text "No pedestrians" line "are allowed on" cont "CYCLING ROAD!" done -_Route16GateText_4977c:: +_Route16Gate1FGuardCyclingRoadExplanationText:: text "CYCLING ROAD is a" line "downhill course" cont "by the sea. It's" cont "a great ride." done -_Route16GateText_49781:: +_Route16Gate1FGuardWaitUpText:: text "Excuse me! Wait" line "up please!" done -_Route16GateText2:: +_Route16Gate1FGamblerText:: text "How'd you get in?" line "Good effort!" done diff --git a/text/Route16Gate2F.asm b/text/Route16Gate2F.asm index d76b70ca5..e8c3adce2 100644 --- a/text/Route16Gate2F.asm +++ b/text/Route16Gate2F.asm @@ -1,15 +1,15 @@ -_Route16GateUpstairsText_49820:: +_Route16Gate2FLittleBoyText:: text "I'm going for a" line "ride with my girl" cont "friend!" done -_Route16GateUpstairsText_4982f:: +_Route16Gate2FLittleGirlText:: text "We're going" line "riding together!" done -_Route16GateUpstairsText_4983b:: +_Route16Gate2FLeftBinocularsText:: text "Looked into the" line "binoculars." @@ -17,7 +17,7 @@ _Route16GateUpstairsText_4983b:: line "STORE!" done -_Route16GateUpstairsText_49847:: +_Route16Gate2FRightBinocularsText:: text "Looked into the" line "binoculars." diff --git a/text/Route17.asm b/text/Route17.asm index a0affd903..fdd47aacb 100644 --- a/text/Route17.asm +++ b/text/Route17.asm @@ -1,160 +1,160 @@ -_Route17BattleText1:: +_Route17Biker1BattleText:: text "There's no money" line "in fighting kids!" done -_Route17EndBattleText1:: +_Route17Biker1EndBattleText:: text "Burned" line "out!" prompt -_Route17AfterBattleText1:: +_Route17Biker1AfterBattleText:: text "Good stuff is" line "lying around on" cont "CYCLING ROAD!" done -_Route17BattleText2:: +_Route17Biker2BattleText:: text "What do you want," line "kiddo?" done -_Route17EndBattleText2:: +_Route17Biker2EndBattleText:: text "Whoo!" prompt -_Route17AfterBattleText2:: +_Route17Biker2AfterBattleText:: text "I could belly-" line "bump you outta" cont "here!" done -_Route17BattleText3:: +_Route17Biker3BattleText:: text "You heading to" line "FUCHSIA?" done -_Route17EndBattleText3:: +_Route17Biker3EndBattleText:: text "Crash and" line "burn!" prompt -_Route17AfterBattleText3:: +_Route17Biker3AfterBattleText:: text "I love racing" line "downhill!" done -_Route17BattleText4:: +_Route17Biker4BattleText:: text "We're BIKERs!" line "Highway stars!" done -_Route17EndBattleText4:: +_Route17Biker4EndBattleText:: text "Smoked!" prompt -_Route17AfterBattleText4:: +_Route17Biker4AfterBattleText:: text "Are you looking" line "for adventure?" done -_Route17BattleText5:: +_Route17Biker5BattleText:: text "Let VOLTORB" line "electrify you!" done -_Route17EndBattleText5:: +_Route17Biker5EndBattleText:: text "Grounded" line "out!" prompt -_Route17AfterBattleText5:: +_Route17Biker5AfterBattleText:: text "I got my VOLTORB" line "at the abandoned" cont "POWER PLANT." done -_Route17BattleText6:: +_Route17Biker6BattleText:: text "My #MON won't" line "evolve! Why?" done -_Route17EndBattleText6:: +_Route17Biker6EndBattleText:: text "Why," line "you!" prompt -_Route17AfterBattleText6:: +_Route17Biker6AfterBattleText:: text "Maybe some #MON" line "need element" cont "STONEs to evolve." done -_Route17BattleText7:: +_Route17Biker7BattleText:: text "I need a little" line "exercise!" done -_Route17EndBattleText7:: +_Route17Biker7EndBattleText:: text "Whew!" line "Good workout!" prompt -_Route17AfterBattleText7:: +_Route17Biker7AfterBattleText:: text "I'm sure I lost" line "weight there!" done -_Route17BattleText8:: +_Route17Biker8BattleText:: text "Be a rebel!" done -_Route17EndBattleText8:: +_Route17Biker8EndBattleText:: text "Aaaargh!" prompt -_Route17AfterBattleText8:: +_Route17Biker8AfterBattleText:: text "Be ready to fight" line "for your beliefs!" done -_Route17BattleText9:: +_Route17Biker9BattleText:: text "Nice BIKE!" line "How's it handle?" done -_Route17EndBattleText9:: +_Route17Biker9EndBattleText:: text "Shoot!" prompt -_Route17AfterBattleText9:: +_Route17Biker9AfterBattleText:: text "The slope makes" line "it hard to steer!" done -_Route17BattleText10:: +_Route17Biker10BattleText:: text "Get lost kid!" line "I'm bushed!" done -_Route17EndBattleText10:: +_Route17Biker10EndBattleText:: text "Are you" line "satisfied?" prompt -_Route17AfterBattleText10:: +_Route17Biker10AfterBattleText:: text "I need to catch" line "a few Zs!" done -_Route17Text11:: +_Route17NoticeSign1Text:: text "It's a notice!" para "Watch out for" line "discarded items!" done -_Route17Text12:: +_Route17TrainerTips1Text:: text "TRAINER TIPS" para "All #MON are" @@ -166,7 +166,7 @@ _Route17Text12:: cont "different rates." done -_Route17Text13:: +_Route17TrainerTips2Text:: text "TRAINER TIPS" para "Press the A or B" @@ -175,13 +175,13 @@ _Route17Text13:: cont "slope." done -_Route17Text14:: +_Route17SignText:: text "ROUTE 17" line "CELADON CITY -" cont "FUCHSIA CITY" done -_Route17Text15:: +_Route17NoticeSign2Text:: text "It's a notice!" para "Don't throw the" @@ -189,7 +189,7 @@ _Route17Text15:: cont "BALLs instead!" done -_Route17Text16:: +_Route17CyclingRoadEndsSignText:: text "CYCLING ROAD" line "Slope ends here!" done diff --git a/text/Route18.asm b/text/Route18.asm index d09caf82f..d91b1b94c 100644 --- a/text/Route18.asm +++ b/text/Route18.asm @@ -1,57 +1,57 @@ -_Route18BattleText1:: +_Route18CooltrainerM1BattleText:: text "I always check" line "every grassy area" cont "for new #MON." done -_Route18EndBattleText1:: +_Route18CooltrainerM1EndBattleText:: text "Tch!" prompt -_Route18AfterBattleText1:: +_Route18CooltrainerM1AfterBattleText:: text "I wish I had a" line "BIKE!" done -_Route18BattleText2:: +_Route18CooltrainerM2BattleText:: text "Kurukkoo!" line "How do you like" cont "my bird call?" done -_Route18EndBattleText2:: +_Route18CooltrainerM2EndBattleText:: text "I" line "had to bug you!" prompt -_Route18AfterBattleText2:: +_Route18CooltrainerM2AfterBattleText:: text "I also collect sea" line "#MON on" cont "weekends!" done -_Route18BattleText3:: +_Route18CooltrainerM3BattleText:: text "This is my turf!" line "Get out of here!" done -_Route18EndBattleText3:: +_Route18CooltrainerM3EndBattleText:: text "Darn!" prompt -_Route18AfterBattleText3:: +_Route18CooltrainerM3AfterBattleText:: text "This is my fave" line "#MON hunting" cont "area!" done -_Route18Text4:: +_Route18SignText:: text "ROUTE 18" line "CELADON CITY -" cont "FUCHSIA CITY" done -_Route18Text5:: +_Route18CyclingRoadSignText:: text "CYCLING ROAD" line "No pedestrians" cont "permitted!" diff --git a/text/Route18Gate1F.asm b/text/Route18Gate1F.asm index f2f510393..453290f2b 100644 --- a/text/Route18Gate1F.asm +++ b/text/Route18Gate1F.asm @@ -1,14 +1,14 @@ -_Route18GateText_49928:: +_Route18Gate1FGuardYouNeedABicycleText:: text "You need a BICYCLE" line "for CYCLING ROAD!" done -_Route18GateText_4992d:: +_Route18Gate1FGuardCyclingRoadUphillText:: text "CYCLING ROAD is" line "all uphill from" cont "here." done -_Route18GateText_49932:: +_Route18Gate1FGuardExcuseMeText:: text "Excuse me!" done diff --git a/text/Route18Gate2F.asm b/text/Route18Gate2F.asm index 0fd2de098..78da40791 100644 --- a/text/Route18Gate2F.asm +++ b/text/Route18Gate2F.asm @@ -1,4 +1,4 @@ -_Route18GateUpstairsText_49993:: +_Route18Gate2FLeftBinocularsText:: text "Looked into the" line "binoculars." @@ -6,7 +6,7 @@ _Route18GateUpstairsText_49993:: line "the west!" done -_Route18GateUpstairsText_4999f:: +_Route18Gate2FRightBinocularsText:: text "Looked into the" line "binoculars." diff --git a/text/Route19.asm b/text/Route19.asm index 244e31d0b..ca060e00c 100644 --- a/text/Route19.asm +++ b/text/Route19.asm @@ -1,156 +1,156 @@ -_Route19BattleText1:: +_Route19CooltrainerM1BattleText:: text "Have to warm up" line "before my swim!" done -_Route19EndBattleText1:: +_Route19CooltrainerM1EndBattleText:: text "All" line "warmed up!" prompt -_Route19AfterBattleText1:: +_Route19CooltrainerM1AfterBattleText:: text "Thanks, kid! I'm" line "ready for a swim!" done -_Route19BattleText2:: +_Route19CooltrainerM2BattleText:: text "Wait! You'll have" line "a heart attack!" done -_Route19EndBattleText2:: +_Route19CooltrainerM2EndBattleText:: text "Ooh!" line "That's chilly!" prompt -_Route19AfterBattleText2:: +_Route19CooltrainerM2AfterBattleText:: text "Watch out for" line "TENTACOOL!" done -_Route19BattleText3:: +_Route19Swimmer1BattleText:: text "I love swimming!" line "What about you?" done -_Route19EndBattleText3:: +_Route19Swimmer1EndBattleText:: text "Belly" line "flop!" prompt -_Route19AfterBattleText3:: +_Route19Swimmer1AfterBattleText:: text "I can beat #MON" line "at swimming!" done -_Route19BattleText4:: +_Route19Swimmer2BattleText:: text "What's beyond the" line "horizon?" done -_Route19EndBattleText4:: +_Route19Swimmer2EndBattleText:: text "Glub!" prompt -_Route19AfterBattleText4:: +_Route19Swimmer2AfterBattleText:: text "I see a couple of" line "islands!" done -_Route19BattleText5:: +_Route19Swimmer3BattleText:: text "I tried diving" line "for #MON, but" cont "it was a no go!" done -_Route19EndBattleText5:: +_Route19Swimmer3EndBattleText:: text "Help!" prompt -_Route19AfterBattleText5:: +_Route19Swimmer3AfterBattleText:: text "You have to fish" line "for sea #MON!" done -_Route19BattleText6:: +_Route19Swimmer4BattleText:: text "I look at the" line "sea to forget!" done -_Route19EndBattleText6:: +_Route19Swimmer4EndBattleText:: text "Ooh!" line "Traumatic!" prompt -_Route19AfterBattleText6:: +_Route19Swimmer4AfterBattleText:: text "I'm looking at the" line "sea to forget!" done -_Route19BattleText7:: +_Route19Swimmer5BattleText:: text "Oh, I just love" line "your ride! Can I" cont "have it if I win?" done -_Route19EndBattleText7:: +_Route19Swimmer5EndBattleText:: text "Oh!" line "I lost!" prompt -_Route19AfterBattleText7:: +_Route19Swimmer5AfterBattleText:: text "It's still a long" line "way to go to" cont "SEAFOAM ISLANDS." done -_Route19BattleText8:: +_Route19Swimmer6BattleText:: text "Swimming's great!" line "Sunburns aren't!" done -_Route19EndBattleText8:: +_Route19Swimmer6EndBattleText:: text "Shocker!" prompt -_Route19AfterBattleText8:: +_Route19Swimmer6AfterBattleText:: text "My boy friend" line "wanted to swim to" cont "SEAFOAM ISLANDS." done -_Route19BattleText9:: +_Route19Swimmer7BattleText:: text "These waters are" line "treacherous!" done -_Route19EndBattleText9:: +_Route19Swimmer7EndBattleText:: text "Ooh!" line "Dangerous!" prompt -_Route19AfterBattleText9:: +_Route19Swimmer7AfterBattleText:: text "I got a cramp!" line "Glub, glub..." done -_Route19BattleText10:: +_Route19Swimmer8BattleText:: text "I swam here, but" line "I'm tired." done -_Route19EndBattleText10:: +_Route19Swimmer8EndBattleText:: text "I'm" line "exhausted..." prompt -_Route19AfterBattleText10:: +_Route19Swimmer8AfterBattleText:: text "LAPRAS is so big," line "it must keep you" cont "dry on water." done -_Route19Text11:: +_Route19SignText:: text "SEA ROUTE 19" line "FUCHSIA CITY -" cont "SEAFOAM ISLANDS" diff --git a/text/Route2.asm b/text/Route2.asm index dd7becc0c..eda91b0b4 100644 --- a/text/Route2.asm +++ b/text/Route2.asm @@ -1,9 +1,9 @@ -_Route2Text3:: +_Route2SignText:: text "ROUTE 2" line "VIRIDIAN CITY -" cont "PEWTER CITY" done -_Route2Text4:: +_Route2DiglettsCaveSignText:: text "DIGLETT's CAVE" done diff --git a/text/Route20.asm b/text/Route20.asm index 1ccf0b6c9..b81b9d3a0 100644 --- a/text/Route20.asm +++ b/text/Route20.asm @@ -1,156 +1,155 @@ -_Route20BattleText1:: +_Route20Swimmer1BattleText:: text "The water is" line "shallow here." done -_Route20EndBattleText1:: +_Route20Swimmer1EndBattleText:: text "Splash!" prompt -_Route20AfterBattleText1:: +_Route20Swimmer1AfterBattleText:: text "I wish I could" line "ride my #MON." done -_Route20BattleText2:: +_Route20Swimmer2BattleText:: text "SEAFOAM is a" line "quiet getaway!" done -_Route20EndBattleText2:: +_Route20Swimmer2EndBattleText:: text "Quit it!" prompt -_Route20AfterBattleText2:: +_Route20Swimmer2AfterBattleText:: text "There's a huge" line "cavern underneath" cont "this island." done -_Route20BattleText3:: +_Route20Swimmer3BattleText:: text "I love floating" line "with the fishes!" done -_Route20EndBattleText3:: +_Route20Swimmer3EndBattleText:: text "Yowch!" prompt -_Route20AfterBattleText3:: +_Route20Swimmer3AfterBattleText:: text "Want to float" line "with me?" done -_Route20BattleText4:: +_Route20Swimmer4BattleText:: text "Are you on" line "vacation too?" done -_Route20EndBattleText4:: +_Route20Swimmer4EndBattleText:: text "No" line "mercy at all!" prompt -_Route20AfterBattleText4:: +_Route20Swimmer4AfterBattleText:: text "SEAFOAM used to" line "be one island!" done -_Route20BattleText5:: +_Route20Swimmer5BattleText:: text "Check out my buff" line "physique!" done -_Route20EndBattleText5:: +_Route20Swimmer5EndBattleText:: text "Wimpy!" prompt -_Route20AfterBattleText5:: +_Route20Swimmer5AfterBattleText:: text "I should've been" line "buffing up my" cont "#MON, not me!" done -_Route20BattleText6:: +_Route20Swimmer6BattleText:: text "Why are you" line "riding a #MON?" cont "Can't you swim?" done -_Route20EndBattleText6:: +_Route20Swimmer6EndBattleText:: text "Ouch!" line "Torpedoed!" prompt -_Route20AfterBattleText6:: +_Route20Swimmer6AfterBattleText:: text "Riding a #MON" line "sure looks fun!" done -_Route20BattleText7:: +_Route20CooltrainerMBattleText:: text "I rode my bird" line "#MON here!" done -_Route20EndBattleText7:: +_Route20CooltrainerMEndBattleText:: text "Oh" line "no!" prompt -_Route20AfterBattleText7:: +_Route20CooltrainerMAfterBattleText:: text "My birds can't" line "FLY me back!" done -_Route20BattleText8:: +_Route20Swimmer7BattleText:: text "My boy friend gave" line "me big pearls!" done -_Route20EndBattleText8:: +_Route20Swimmer7EndBattleText:: text "Don't" line "touch my pearls!" prompt -_Route20AfterBattleText8:: +_Route20Swimmer7AfterBattleText:: text "Will my pearls" line "grow bigger" cont "inside CLOYSTER?" done -_Route20BattleText9:: +_Route20Swimmer8BattleText:: text "I swam here from" line "CINNABAR ISLAND!" done -_Route20EndBattleText9:: +_Route20Swimmer8EndBattleText:: text "I'm" line "so disappointed!" prompt -_Route20AfterBattleText9:: +_Route20Swimmer8AfterBattleText:: text "#MON have" line "taken over an" cont "abandoned mansion" cont "on CINNABAR!" done -_Route20BattleText10:: +_Route20Swimmer9BattleText:: text "CINNABAR, in the" line "west, has a LAB" cont "for #MON." done -_Route20EndBattleText10:: +_Route20Swimmer9EndBattleText:: text "Wait!" prompt -_Route20AfterBattleText10:: +_Route20Swimmer9AfterBattleText:: text "CINNABAR is a " line "volcanic island!" done -_Route20Text12:: -_Route20Text11:: +_Route20SeafoamIslandsSignText:: text "SEAFOAM ISLANDS" done diff --git a/text/Route21.asm b/text/Route21.asm index 3451953f9..e2e1bf6c4 100644 --- a/text/Route21.asm +++ b/text/Route21.asm @@ -1,137 +1,137 @@ -_Route21BattleText1:: +_Route21Fisher1BattleText:: text "You want to know" line "if the fish are" cont "biting?" done -_Route21EndBattleText1:: +_Route21Fisher1EndBattleText:: text "Dang!" prompt -_Route21AfterBattleText1:: +_Route21Fisher1AfterBattleText:: text "I can't catch" line "anything good!" done -_Route21BattleText2:: +_Route21Fisher2BattleText:: text "I got a big haul!" line "Wanna go for it?" done -_Route21EndBattleText2:: +_Route21Fisher2EndBattleText:: text "Darn" line "MAGIKARP!" prompt -_Route21AfterBattleText2:: +_Route21Fisher2AfterBattleText:: text "I seem to only" line "catch MAGIKARP!" done -_Route21BattleText3:: +_Route21Swimmer1BattleText:: text "The sea cleanses" line "my body and soul!" done -_Route21EndBattleText3:: +_Route21Swimmer1EndBattleText:: text "Ayah!" prompt -_Route21AfterBattleText3:: +_Route21Swimmer1AfterBattleText:: text "I like the" line "mountains too!" done -_Route21BattleText4:: +_Route21Swimmer2BattleText:: text "What's wrong with" line "me swimming?" done -_Route21EndBattleText4:: +_Route21Swimmer2EndBattleText:: text "Cheap" line "shot!" prompt -_Route21AfterBattleText4:: +_Route21Swimmer2AfterBattleText:: text "I look like what?" line "A studded inner" cont "tube? Get lost!" done -_Route21BattleText5:: +_Route21Swimmer3BattleText:: text "I caught all my" line "#MON at sea!" done -_Route21EndBattleText5:: +_Route21Swimmer3EndBattleText:: text "Diver!!" line "Down!!" prompt -_Route21AfterBattleText5:: +_Route21Swimmer3AfterBattleText:: text "Where'd you catch" line "your #MON?" done -_Route21BattleText6:: +_Route21Swimmer4BattleText:: text "Right now, I'm in" line "a triathlon meet!" done -_Route21EndBattleText6:: +_Route21Swimmer4EndBattleText:: text "Pant..." line "pant...pant..." prompt -_Route21AfterBattleText6:: +_Route21Swimmer4AfterBattleText:: text "I'm beat!" line "But, I still have" cont "the bike race and" cont "marathon left!" done -_Route21BattleText7:: +_Route21Swimmer5BattleText:: text "Ahh! Feel the sun" line "and the wind!" done -_Route21EndBattleText7:: +_Route21Swimmer5EndBattleText:: text "Yow!" line "I lost!" prompt -_Route21AfterBattleText7:: +_Route21Swimmer5AfterBattleText:: text "I'm sunburnt to a" line "crisp!" done -_Route21BattleText8:: +_Route21Fisher3BattleText:: text "Hey, don't scare" line "away the fish!" done -_Route21EndBattleText8:: +_Route21Fisher3EndBattleText:: text "Sorry!" line "I didn't mean it!" prompt -_Route21AfterBattleText8:: +_Route21Fisher3AfterBattleText:: text "I was just angry" line "that I couldn't" cont "catch anything." done -_Route21BattleText9:: +_Route21Fisher4BattleText:: text "Keep me company" line "'til I get a hit!" done -_Route21EndBattleText9:: +_Route21Fisher4EndBattleText:: text "That" line "burned some time." prompt -_Route21AfterBattleText9:: +_Route21Fisher4AfterBattleText:: text "Oh wait! I got a" line "bite! Yeah!" done diff --git a/text/Route22.asm b/text/Route22.asm index 3a1d28f02..12291eb54 100644 --- a/text/Route22.asm +++ b/text/Route22.asm @@ -31,13 +31,13 @@ _Route22RivalAfterBattleText1:: cont "a move on!" done -_Route22RivalDefeatedText1:: +_Route22Rival1DefeatedText:: text "Awww!" line "You just lucked" cont "out!" prompt -_Route22Text_511bc:: +_Route22Rival1VictoryText:: text ": What?" line "Why do I have 2" cont "#MON?" @@ -80,14 +80,14 @@ _Route22RivalAfterBattleText2:: cont "here. Smell ya!" done -_Route22RivalDefeatedText2:: +_Route22Rival2DefeatedText:: text "What!?" para "I was just" line "careless!" prompt -_Route22Text_511d0:: +_Route22Rival2VictoryText:: text ": Hahaha!" line "! That's" cont "your best? You're" @@ -98,7 +98,7 @@ _Route22Text_511d0:: line "more! You loser!" prompt -_Route22FrontGateText:: +_Route22PokemonLeagueSignText:: text "#MON LEAGUE" line "Front Gate" done diff --git a/text/Route22Gate.asm b/text/Route22Gate.asm index 33893d6e1..20607ac30 100644 --- a/text/Route22Gate.asm +++ b/text/Route22Gate.asm @@ -1,4 +1,4 @@ -_Route22GateText_1e704:: +_Route22GateGuardNoBoulderbadgeText:: text "Only truly skilled" line "trainers are" cont "allowed through." @@ -7,7 +7,7 @@ _Route22GateText_1e704:: line "BOULDERBADGE yet!@" text_end -_Route22GateText_1e715:: +_Route22GateGuardICantLetYouPassText:: text_start para "The rules are" @@ -15,7 +15,7 @@ _Route22GateText_1e715:: cont "let you pass." done -_Route22GateText_1e71a:: +_Route22GateGuardGoRightAheadText:: text "Oh! That is the" line "BOULDERBADGE!" cont "Go right ahead!@" diff --git a/text/Route23.asm b/text/Route23.asm index f21857b3d..921b64070 100644 --- a/text/Route23.asm +++ b/text/Route23.asm @@ -1,4 +1,4 @@ -_VictoryRoadGuardText1:: +_Route23YouDontHaveTheBadgeYetText:: text "You can pass here" line "only if you have" cont "the @" @@ -15,7 +15,7 @@ _VictoryRoadGuardText1:: cont "#MON LEAGUE!@" text_end -_VictoryRoadGuardText2:: +_Route23OhThatIsTheBadgeText:: text "You can pass here" line "only if you have" cont "the @" @@ -28,14 +28,14 @@ _VictoryRoadGuardText2:: text "!@" text_end -_VictoryRoadGuardText_513a3:: +_Route23GoRightAheadText:: text_start para "OK then! Please," line "go right ahead!" done -_Route23Text8:: +_Route23VictoryRoadGateSignText:: text "VICTORY ROAD GATE" line "- #MON LEAGUE" done diff --git a/text/Route24.asm b/text/Route24.asm index 5dc4ab79a..704aeea07 100644 --- a/text/Route24.asm +++ b/text/Route24.asm @@ -1,29 +1,29 @@ -_Route24Text_51510:: +_Route24CooltrainerM1YouBeatOurContestText:: text "Congratulations!" line "You beat our 5" cont "contest trainers!@" text_end -_Route24Text_51515:: +_Route24CooltrainerM1YouJustEarnedAPrizeText:: text_start para "You just earned a" line "fabulous prize!" prompt -_Route24Text_5151a:: +_Route24CooltrainerM1ReceivedNuggetText:: text " received" line "a @" text_ram wStringBuffer text "!@" text_end -_Route24Text_51521:: +_Route24CooltrainerM1NoRoomText:: text "You don't have" line "any room!" done -_Route24Text_51526:: +_Route24CooltrainerM1JoinTeamRocketText:: text "By the way, would" line "you like to join" cont "TEAM ROCKET?" @@ -49,19 +49,19 @@ _Route24Text_51526:: cont "refuse!" done -_Route24Text_5152b:: +_Route24CooltrainerM1DefeatedText:: text "Arrgh!" line "You are good!" prompt -_Route24Text_51530:: +_Route24CooltrainerM1YouCouldBecomeATopLeaderText:: text "With your ability," line "you could become" cont "a top leader in" cont "TEAM ROCKET!" done -_Route24BattleText1:: +_Route24CooltrainerM2BattleText:: text "I saw your feat" line "from the grass!" done diff --git a/text/Route24_2.asm b/text/Route24_2.asm index 325dea13f..5c01218cc 100644 --- a/text/Route24_2.asm +++ b/text/Route24_2.asm @@ -1,75 +1,75 @@ -_Route24EndBattleText1:: +_Route24CooltrainerM2EndBattleText:: text "I" line "thought not!" prompt -_Route24AfterBattleText1:: +_Route24CooltrainerM2AfterBattleText:: text "I hid because the" line "people on the" cont "bridge scared me!" done -_Route24BattleText2:: +_Route24CooltrainerM3BattleText:: text "OK! I'm No. 5!" line "I'll stomp you!" done -_Route24EndBattleText2:: +_Route24CooltrainerM3EndBattleText:: text "Whoa!" line "Too much!" prompt -_Route24AfterBattleText2:: +_Route24CooltrainerM3AfterBattleText:: text "I did my best, I" line "have no regrets!" done -_Route24BattleText3:: +_Route24CooltrainerF1BattleText:: text "I'm No. 4!" line "Getting tired?" done -_Route24EndBattleText3:: +_Route24CooltrainerF1EndBattleText:: text "I lost" line "too!" prompt -_Route24AfterBattleText3:: +_Route24CooltrainerF1AfterBattleText:: text "I did my best, so" line "I've no regrets!" done -_Route24BattleText4:: +_Route24Youngster1BattleText:: text "Here's No. 3!" line "I won't be easy!" done -_Route24EndBattleText4:: +_Route24Youngster1EndBattleText:: text "Ow!" line "Stomped flat!" prompt -_Route24AfterBattleText4:: +_Route24Youngster1AfterBattleText:: text "I did my best, I" line "have no regrets!" done -_Route24BattleText5:: +_Route24CooltrainerF2BattleText:: text "I'm second!" line "Now it's serious!" done -_Route24EndBattleText5:: +_Route24CooltrainerF2EndBattleText:: text "How could I" line "lose?" prompt -_Route24AfterBattleText5:: +_Route24CooltrainerF2AfterBattleText:: text "I did my best, I" line "have no regrets!" done -_Route24BattleText6:: +_Route24Youngster2BattleText:: text "This is NUGGET" line "BRIDGE! Beat us 5" cont "trainers and win" @@ -79,12 +79,12 @@ _Route24BattleText6:: line "what it takes?" done -_Route24EndBattleText6:: +_Route24Youngster2EndBattleText:: text "Whoo!" line "Good stuff!" prompt -_Route24AfterBattleText6:: +_Route24Youngster2AfterBattleText:: text "I did my best, I" line "have no regrets!" done diff --git a/text/Route25.asm b/text/Route25.asm index 325ab3487..666b457c8 100644 --- a/text/Route25.asm +++ b/text/Route25.asm @@ -1,156 +1,156 @@ -_Route25BattleText1:: +_Route25Youngster1BattleText:: text "Local trainers" line "come here to" cont "practice!" done -_Route25EndBattleText1:: +_Route25Youngster1EndBattleText:: text "You're" line "decent." prompt -_Route25AfterBattleText1:: +_Route25Youngster1AfterBattleText:: text "All #MON have" line "weaknesses. It's" cont "best to raise" cont "different kinds." done -_Route25BattleText2:: +_Route25Youngster2BattleText:: text "Dad took me to a" line "great party on" cont "S.S.ANNE at" cont "VERMILION CITY!" done -_Route25EndBattleText2:: +_Route25Youngster2EndBattleText:: text "I'm" line "not mad!" prompt -_Route25AfterBattleText2:: +_Route25Youngster2AfterBattleText:: text "On S.S.ANNE, I" line "saw trainers from" cont "around the world." done -_Route25BattleText3:: +_Route25CooltrainerMBattleText:: text "I'm a cool guy." line "I've got a girl" cont "friend!" done -_Route25EndBattleText3:: +_Route25CooltrainerMEndBattleText:: text "Aww," line "darn..." prompt -_Route25AfterBattleText3:: +_Route25CooltrainerMAfterBattleText:: text "Oh well. My girl" line "will cheer me up." done -_Route25BattleText4:: +_Route25CooltrainerF1BattleText:: text "Hi! My boy" line "friend is cool!" done -_Route25EndBattleText4:: +_Route25CooltrainerF1EndBattleText:: text "I was in" line "bad condition!" prompt -_Route25AfterBattleText4:: +_Route25CooltrainerF1AfterBattleText:: text "I wish my guy was" line "as good as you!" done -_Route25BattleText5:: +_Route25Youngster3BattleText:: text "I knew I had to" line "fight you!" done -_Route25EndBattleText5:: +_Route25Youngster3EndBattleText:: text "I knew" line "I'd lose too!" prompt -_Route25AfterBattleText5:: +_Route25Youngster3AfterBattleText:: text "If your #MON" line "gets confused or" cont "falls asleep," cont "switch it!" done -_Route25BattleText6:: +_Route25CooltrainerF2BattleText:: text "My friend has a" line "cute #MON." cont "I'm so jealous!" done -_Route25EndBattleText6:: +_Route25CooltrainerF2EndBattleText:: text "I'm" line "not so jealous!" prompt -_Route25AfterBattleText6:: +_Route25CooltrainerF2AfterBattleText:: text "You came from MT." line "MOON? May I have" cont "a CLEFAIRY?" done -_Route25BattleText7:: +_Route25Hiker1BattleText:: text "I just got down" line "from MT.MOON," cont "but I'm ready!" done -_Route25EndBattleText7:: +_Route25Hiker1EndBattleText:: text "You" line "worked hard!" prompt -_Route25AfterBattleText7:: +_Route25Hiker1AfterBattleText:: text "Drat!" line "A ZUBAT bit me" cont "back in there." done -_Route25BattleText8:: +_Route25Hiker2BattleText:: text "I'm off to see a" line "#MON collector" cont "at the cape!" done -_Route25EndBattleText8:: +_Route25Hiker2EndBattleText:: text "You" line "got me." prompt -_Route25AfterBattleText8:: +_Route25Hiker2AfterBattleText:: text "The collector has" line "many rare kinds" cont "of #MON." done -_Route25BattleText9:: +_Route25Hiker3BattleText:: text "You're going to" line "see BILL? First," cont "let's fight!" done -_Route25EndBattleText9:: +_Route25Hiker3EndBattleText:: text "You're" line "something." prompt -_Route25AfterBattleText9:: +_Route25Hiker3AfterBattleText:: text "The trail below" line "is a shortcut to" cont "CERULEAN CITY." done -_Route25Text11:: +_Route25BillSignText:: text "SEA COTTAGE" line "BILL lives here!" done diff --git a/text/Route2Gate.asm b/text/Route2Gate.asm index 566830f8a..ad22479a7 100644 --- a/text/Route2Gate.asm +++ b/text/Route2Gate.asm @@ -1,10 +1,10 @@ -_Route2GateText_5d616:: +_Route2GateOaksAideFlashExplanationText:: text "The HM FLASH" line "lights even the" cont "darkest dungeons." done -_Route2GateText2:: +_Route2GateYoungsterText:: text "Once a #MON" line "learns FLASH, you" cont "can get through" diff --git a/text/Route2TradeHouse.asm b/text/Route2TradeHouse.asm index 46fc10626..e6a29bfc9 100644 --- a/text/Route2TradeHouse.asm +++ b/text/Route2TradeHouse.asm @@ -1,4 +1,4 @@ -_Route2HouseText1:: +_Route2TradeHouseScientistText:: text "A fainted #MON" line "can't fight. But, " cont "it can still use " diff --git a/text/Route3.asm b/text/Route3.asm index 966a0786c..692c7537c 100644 --- a/text/Route3.asm +++ b/text/Route3.asm @@ -8,138 +8,138 @@ _Route3Text1:: cont "lot out of you!" done -_Route3BattleText1:: +_Route3Youngster1BattleText:: text "Hey! I met you in" line "VIRIDIAN FOREST!" done -_Route3EndBattleText1:: +_Route3Youngster1EndBattleText:: text "You" line "beat me again!" prompt -_Route3AfterBattleText1:: +_Route3Youngster1AfterBattleText:: text "There are other" line "kinds of #MON" cont "than those found" cont "in the forest!" done -_Route3BattleText2:: +_Route3Youngster2BattleText:: text "Hi! I like shorts!" line "They're comfy and" cont "easy to wear!" done -_Route3EndBattleText2:: +_Route3Youngster2EndBattleText:: text "I don't" line "believe it!" prompt -_Route3AfterBattleText2:: +_Route3Youngster2AfterBattleText:: text "Are you storing" line "your #MON on" cont "PC? Each BOX can" cont "hold 20 #MON!" done -_Route3BattleText3:: +_Route3CooltrainerF1BattleText:: text "You looked at me," line "didn't you?" done -_Route3EndBattleText3:: +_Route3CooltrainerF1EndBattleText:: text "You're" line "mean!" prompt -_Route3AfterBattleText3:: +_Route3CooltrainerF1AfterBattleText:: text "Quit staring if" line "you don't want to" cont "fight!" done -_Route3BattleText4:: +_Route3Youngster3BattleText:: text "Are you a trainer?" line "Let's fight!" done -_Route3EndBattleText4:: +_Route3Youngster3EndBattleText:: text "If I" line "had new #MON I" cont "would've won!" prompt -_Route3AfterBattleText4:: +_Route3Youngster3AfterBattleText:: text "If a #MON BOX" line "on the PC gets" cont "full, just switch" cont "to another BOX!" done -_Route3BattleText5:: +_Route3CooltrainerF2BattleText:: text "That look you" line "gave me, it's so" cont "intriguing!" done -_Route3EndBattleText5:: +_Route3CooltrainerF2EndBattleText:: text "Be nice!" prompt -_Route3AfterBattleText5:: +_Route3CooltrainerF2AfterBattleText:: text "Avoid fights by" line "not letting" cont "people see you!" done -_Route3BattleText6:: +_Route3Youngster4BattleText:: text "Hey! You're not" line "wearing shorts!" done -_Route3EndBattleText6:: +_Route3Youngster4EndBattleText:: text "Lost!" line "Lost! Lost!" prompt -_Route3AfterBattleText6:: +_Route3Youngster4AfterBattleText:: text "I always wear" line "shorts, even in" cont "winter!" done -_Route3BattleText7:: +_Route3Youngster5BattleText:: text "You can fight my" line "new #MON!" done -_Route3EndBattleText7:: +_Route3Youngster5EndBattleText:: text "Done" line "like dinner!" prompt -_Route3AfterBattleText7:: +_Route3Youngster5AfterBattleText:: text "Trained #MON" line "are stronger than" cont "the wild ones!" done -_Route3BattleText8:: +_Route3CooltrainerF3BattleText:: text "Eek! Did you" line "touch me?" done -_Route3EndBattleText8:: +_Route3CooltrainerF3EndBattleText:: text "That's it?" prompt -_Route3AfterBattleText8:: +_Route3CooltrainerF3AfterBattleText:: text "ROUTE 4 is at the" line "foot of MT.MOON." done -_Route3Text10:: +_Route3SignText:: text "ROUTE 3" line "MT.MOON AHEAD" done diff --git a/text/Route4.asm b/text/Route4.asm index 0a36f4cd6..802f8003d 100644 --- a/text/Route4.asm +++ b/text/Route4.asm @@ -1,20 +1,20 @@ -_Route4Text1:: +_Route4CooltrainerF1Text:: text "Ouch! I tripped" line "over a rocky" cont "#MON, GEODUDE!" done -_Route4BattleText1:: +_Route4CooltrainerF2BattleText:: text "I came to get my" line "mushroom #MON!" done -_Route4EndBattleText1:: +_Route4CooltrainerF2EndBattleText:: text "Oh! My cute" line "mushroom #MON!" prompt -_Route4AfterBattleText1:: +_Route4CooltrainerF2AfterBattleText:: text "There might not" line "be any more" cont "mushrooms here." @@ -23,12 +23,12 @@ _Route4AfterBattleText1:: line "them all." done -_Route4Text5:: +_Route4MtMoonSignText:: text "MT.MOON" line "Tunnel Entrance" done -_Route4Text6:: +_Route4SignText:: text "ROUTE 4" line "MT.MOON -" cont "CERULEAN CITY" diff --git a/text/Route5.asm b/text/Route5.asm index 54ff0f841..aeae95f13 100644 --- a/text/Route5.asm +++ b/text/Route5.asm @@ -1,4 +1,4 @@ -_Route5Text1:: +_Route5UndergroundPathSignText:: text "UNDERGROUND PATH" line "CERULEAN CITY -" cont "VERMILION CITY" diff --git a/text/Route6.asm b/text/Route6.asm index c48b5d3d3..209b29c30 100644 --- a/text/Route6.asm +++ b/text/Route6.asm @@ -1,96 +1,96 @@ -_Route6BattleText1:: +_Route6CooltrainerM1BattleText:: text "Who's there?" line "Quit listening in" cont "on us!" done -_Route6EndBattleText1:: +_Route6CooltrainerM1EndBattleText:: text "I" line "just can't win!" prompt -_Route6AfterBattleText1:: +_Route6CooltrainerAfterBattleText:: text "Whisper..." line "whisper..." done -_Route6BattleText2:: +_Route6CooltrainerF1BattleText:: text "Excuse me! This" line "is a private" cont "conversation!" done -_Route6EndBattleText2:: +_Route6CooltrainerF1EndBattleText:: text "Ugh!" line "I hate losing!" prompt -_Route6BattleText3:: +_Route6Youngster1BattleText:: text "There aren't many" line "bugs out here." done -_Route6EndBattleText3:: +_Route6Youngster1EndBattleText:: text "No!" line "You're kidding!" prompt -_Route6AfterBattleText3:: +_Route6Youngster1AfterBattleText:: text "I like bugs, so" line "I'm going back to" cont "VIRIDIAN FOREST." done -_Route6BattleText4:: +_Route6CooltrainerM2BattleText:: text "Huh? You want" line "to talk to me?" done -_Route6EndBattleText4:: +_Route6CooltrainerM2EndBattleText:: text "I" line "didn't start it!" prompt -_Route6AfterBattleText4:: +_Route6CooltrainerM2AfterBattleText:: text "I should carry" line "more #MON with" cont "me for safety." done -_Route6BattleText5:: +_Route6CooltrainerF2BattleText:: text "Me? Well, OK." line "I'll play!" done -_Route6EndBattleText5:: +_Route6CooltrainerF2EndBattleText:: text "Just" line "didn't work!" prompt -_Route6AfterBattleText5:: +_Route6CooltrainerF2AfterBattleText:: text "I want to get" line "stronger! What's" cont "your secret?" done -_Route6BattleText6:: +_Route6Youngster2BattleText:: text "I've never seen" line "you around!" cont "Are you good?" done -_Route6EndBattleText6:: +_Route6Youngster2EndBattleText:: text "You" line "are too good!" prompt -_Route6AfterBattleText6:: +_Route6Youngster2AfterBattleText:: text "Are my #MON" line "weak? Or, am I" cont "just bad?" done -_Route6Text7:: +_Route6UndergroundPathSignText:: text "UNDERGROUND PATH" line "CERULEAN CITY -" cont "VERMILION CITY" diff --git a/text/Route7.asm b/text/Route7.asm index 6500be966..9d1f26231 100644 --- a/text/Route7.asm +++ b/text/Route7.asm @@ -1,4 +1,4 @@ -_Route7Text1:: +_Route7UndergroundPathSignText:: text "UNDERGROUND PATH" line "CELADON CITY -" cont "LAVENDER TOWN" diff --git a/text/Route8.asm b/text/Route8.asm index 57a9a5f9b..818a81d6b 100644 --- a/text/Route8.asm +++ b/text/Route8.asm @@ -1,153 +1,153 @@ -_Route8BattleText1:: +_Route8SuperNerd1BattleText:: text "You look good at" line "#MON, but" cont "how's your chem?" done -_Route8EndBattleText1:: +_Route8SuperNerd1EndBattleText:: text "Ow!" line "Meltdown!" prompt -_Route8AfterBattleText1:: +_Route8SuperNerd1AfterBattleText:: text "I am better at" line "school than this!" done -_Route8BattleText2:: +_Route8Gambler1BattleText:: text "All right! Let's" line "roll the dice!" done -_Route8EndBattleText2:: +_Route8Gambler1EndBattleText:: text "Drat!" line "Came up short!" prompt -_Route8AfterBattleText2:: +_Route8Gambler1AfterBattleText:: text "Lady Luck's not" line "with me today!" done -_Route8BattleText3:: +_Route8SuperNerd2BattleText:: text "You need strategy" line "to win at this!" done -_Route8EndBattleText3:: +_Route8SuperNerd2EndBattleText:: text "It's" line "not logical!" prompt -_Route8AfterBattleText3:: +_Route8SuperNerd2AfterBattleText:: text "Go with GRIMER" line "first...and..." cont "...and...then..." done -_Route8BattleText4:: +_Route8CooltrainerF1BattleText:: text "I like NIDORAN, so" line "I collect them!" done -_Route8EndBattleText4:: +_Route8CooltrainerF21EndBattleText:: text "Why? Why??" prompt -_Route8AfterBattleText4:: +_Route8CooltrainerF1AfterBattleText:: text "When #MON grow" line "up they get ugly!" cont "They shouldn't" cont "evolve!" done -_Route8BattleText5:: +_Route8SuperNerd3BattleText:: text "School is fun, but" line "so are #MON." done -_Route8EndBattleText5:: +_Route8SuperNerd3EndBattleText:: text "I'll" line "stay with school." prompt -_Route8AfterBattleText5:: +_Route8SuperNerd3AfterBattleText:: text "We're stuck here" line "because of the" cont "gates at SAFFRON." done -_Route8BattleText6:: +_Route8CooltrainerF2BattleText:: text "MEOWTH is so cute," line "meow, meow, meow!" done -_Route8EndBattleText6:: +_Route8CooltrainerF2EndBattleText:: text "Meow!" prompt -_Route8AfterBattleText6:: +_Route8CooltrainerF2AfterBattleText:: text "I think PIDGEY" line "and RATTATA" cont "are cute too!" done -_Route8BattleText7:: +_Route8CooltrainerF3BattleText:: text "We must look" line "silly standing" cont "here like this!" done -_Route8EndBattleText7:: +_Route8CooltrainerF3EndBattleText:: text "Look what" line "you did!" prompt -_Route8AfterBattleText7:: +_Route8CooltrainerF3AfterBattleText:: text "SAFFRON's gate" line "keeper won't let" cont "us through." cont "He's so mean!" done -_Route8BattleText8:: +_Route8Gambler2BattleText:: text "I'm a rambling," line "gambling dude!" done -_Route8EndBattleText8:: +_Route8Gambler2EndBattleText:: text "Missed" line "the big score!" prompt -_Route8AfterBattleText8:: +_Route8Gambler2AfterBattleText:: text "Gambling and" line "#MON are like" cont "eating peanuts!" cont "Just can't stop!" done -_Route8BattleText9:: +_Route8CooltrainerF4BattleText:: text "What's a cute," line "round and fluffy" cont "#MON?" done -_Route8EndBattleText9:: +_Route8CooltrainerF4EndBattleText:: text "Stop!" para "Don't be so mean" line "to my CLEFAIRY!" prompt -_Route8AfterBattleText9:: +_Route8CooltrainerF4AfterBattleText:: text "I heard that" line "CLEFAIRY evolves" cont "when it's exposed" cont "to a MOON STONE." done -_Route8Text10:: +_Route8UndergroundSignText:: text "UNDERGROUND PATH" line "CELADON CITY -" cont "LAVENDER TOWN" diff --git a/text/Route9.asm b/text/Route9.asm index 9975000d1..19901a7e7 100644 --- a/text/Route9.asm +++ b/text/Route9.asm @@ -1,74 +1,74 @@ -_Route9BattleText1:: +_Route9CooltrainerF1BattleText:: text "You have #MON" line "with you!" cont "You're mine!" done -_Route9EndBattleText1:: +_Route9CooltrainerF1EndBattleText:: text "You" line "deceived me!" prompt -_Route9AfterBattleText1:: +_Route9CooltrainerF1AfterBattleText:: text "You need light to" line "get through that" cont "dark tunnel ahead." done -_Route9BattleText2:: +_Route9CooltrainerM1BattleText:: text "Who's that walking" line "with those good" cont "looking #MON?" done -_Route9EndBattleText2:: +_Route9CooltrainerM1EndBattleText:: text "Out" line "like a light!" prompt -_Route9AfterBattleText2:: +_Route9CooltrainerM1AfterBattleText:: text "Keep walking!" done -_Route9BattleText3:: +_Route9CooltrainerM2BattleText:: text "I'm taking ROCK" line "TUNNEL to go to" cont "LAVENDER..." done -_Route9EndBattleText3:: +_Route9CooltrainerM2EndBattleText:: text "Can't" line "measure up!" prompt -_Route9AfterBattleText3:: +_Route9CooltrainerM2AfterBattleText:: text "Are you off to" line "ROCK TUNNEL too?" done -_Route9BattleText4:: +_Route9CooltrainerF2BattleText:: text "Don't you dare" line "condescend me!" done -_Route9EndBattleText4:: +_Route9CooltrainerF2EndBattleText:: text "No!" line "You're too much!" prompt -_Route9AfterBattleText4:: +_Route9CooltrainerF2AfterBattleText:: text "You're obviously" line "talented! Good" cont "luck to you!" done -_Route9BattleText5:: +_Route9Hiker1BattleText:: text "Bwahaha!" line "Great! I was" cont "bored, eh!" done -_Route9EndBattleText5:: +_Route9Hiker1EndBattleText:: text "Keep it" line "coming, eh!" @@ -76,81 +76,81 @@ _Route9EndBattleText5:: line "of #MON!" prompt -_Route9AfterBattleText5:: +_Route9Hiker1AfterBattleText:: text "You sure had guts" line "standing up to me" cont "there, eh?" done -_Route9BattleText6:: +_Route9Hiker2BattleText:: text "Hahaha!" line "Aren't you a" cont "little toughie!" done -_Route9EndBattleText6:: +_Route9Hiker2EndBattleText:: text "What's" line "that?" prompt -_Route9AfterBattleText6:: +_Route9Hiker2AfterBattleText:: text "Hahaha! Kids" line "should be tough!" done -_Route9BattleText7:: +_Route9Youngster1BattleText:: text "I got up early" line "every day to" cont "raise my #MON" cont "from cocoons!" done -_Route9EndBattleText7:: +_Route9Youngster1EndBattleText:: text "WHAT?" para "What a total" line "waste of time!" prompt -_Route9AfterBattleText7:: +_Route9Youngster1AfterBattleText:: text "I have to collect" line "more than bugs to" cont "get stronger..." done -_Route9BattleText8:: +_Route9Hiker3BattleText:: text "Hahahaha!" line "Come on, dude!" done -_Route9EndBattleText8:: +_Route9Hiker3EndBattleText:: text "Hahahaha!" line "You beat me fair!" prompt -_Route9AfterBattleText8:: +_Route9Hiker3AfterBattleText:: text "Hahahaha!" line "Us hearty guys" cont "always laugh!" done -_Route9BattleText9:: +_Route9Youngster2BattleText:: text "Go, my super bug" line "#MON!" done -_Route9EndBattleText9:: +_Route9Youngster2EndBattleText:: text "My" line "bugs..." prompt -_Route9AfterBattleText9:: +_Route9Youngster2AfterBattleText:: text "If you don't like" line "bug #MON, you" cont "bug me!" done -_Route9Text11:: +_Route9SignText:: text "ROUTE 9" line "CERULEAN CITY-" cont "ROCK TUNNEL" diff --git a/text/SSAnne1F.asm b/text/SSAnne1F.asm index 2bbdcbacc..6db138d7b 100644 --- a/text/SSAnne1F.asm +++ b/text/SSAnne1F.asm @@ -1,4 +1,4 @@ -_SSAnne1Text1:: +_SSAnne1FWaiterText:: text "Bonjour!" line "I am le waiter on" cont "this ship!" @@ -11,7 +11,7 @@ _SSAnne1Text1:: line "silent type!" done -_SSAnne1Text2:: +_SSAnne1FSailorText:: text "The passengers" line "are restless!" diff --git a/text/SSAnne1FRooms.asm b/text/SSAnne1FRooms.asm index da672f8d1..70433683a 100644 --- a/text/SSAnne1FRooms.asm +++ b/text/SSAnne1FRooms.asm @@ -1,9 +1,9 @@ -_SSAnne8Text8:: +_SSAnne1FRoomsWigglytuffText:: text "WIGGLYTUFF: Puup" line "pupuu!@" text_end -_SSAnne8BattleText1:: +_SSAnne1FRoomsGentleman1BattleText:: text "I travel alone" line "on my journeys!" @@ -11,42 +11,42 @@ _SSAnne8BattleText1:: line "only friends!" done -_SSAnne8EndBattleText1:: +_SSAnne1FRoomsGentleman1EndBattleText:: text "My, my" line "friends..." prompt -_SSAnne8AfterBattleText1:: +_SSAnne1FRoomsGentleman1AfterBattleText:: text "You should be" line "nice to friends!" done -_SSAnne8BattleText2:: +_SSAnne1FRoomsGentleman2BattleText:: text "You pup! How dare" line "you barge in!" done -_SSAnne8EndBattleText2:: +_SSAnne1FRoomsGentleman2EndBattleText:: text "Humph!" line "You rude child!" prompt -_SSAnne8AfterBattleText2:: +_SSAnne1FRoomsGentleman2AfterBattleText:: text "I wish to be left" line "alone! Get out!" done -_SSAnne8BattleText3:: +_SSAnne1FRoomsYoungsterBattleText:: text "I love #MON!" line "Do you?" done -_SSAnne8EndBattleText3:: +_SSAnne1FRoomsYoungsterEndBattleText:: text "Wow! " line "You're great!" prompt -_SSAnne8AfterBattleText3:: +_SSAnne1FRoomsYoungsterAfterBattleText:: text "Let me be your" line "friend, OK?" @@ -54,19 +54,19 @@ _SSAnne8AfterBattleText3:: line "#MON!" done -_SSAnne8BattleText4:: +_SSAnne1FRoomsCooltrainerFBattleText:: text "I collected these" line "#MON from all" cont "around the world!" done -_SSAnne8EndBattleText4:: +_SSAnne1FRoomsCooltrainerFEndBattleText:: text "Oh no!" line "I went around the" cont "world for these!" prompt -_SSAnne8AfterBattleText4:: +_SSAnne1FRoomsCooltrainerFAfterBattleText:: text "You hurt my poor" line "worldly #MON!" @@ -75,28 +75,28 @@ _SSAnne8AfterBattleText4:: cont "#MON CENTER!" done -_SSAnne8Text5:: +_SSAnne1FRoomsGirl1Text:: text "Waiter, I would" line "like a cherry pie" cont "please!" done -_SSAnne8Text6:: +_SSAnne1FRoomsMiddleAgedManText:: text "A cruise is so" line "elegant yet cozy!" done -_SSAnne8Text7:: +_SSAnne1FRoomsLittleGirlText:: text "I always travel" line "with WIGGLYTUFF!" done -_SSAnne8Text9:: +_SSAnne1FRoomsGirl2Text:: text "We are cruising" line "around the world." done -_SSAnne8Text11:: +_SSAnne1FRoomsGentleman3Text:: text "Ssh! I'm a GLOBAL" line "POLICE agent!" diff --git a/text/SSAnne2F.asm b/text/SSAnne2F.asm index 58d804ba1..851834386 100644 --- a/text/SSAnne2F.asm +++ b/text/SSAnne2F.asm @@ -1,4 +1,4 @@ -_SSAnne2Text1:: +_SSAnne2FWaiterText:: text "This ship, she is" line "a luxury liner" cont "for trainers!" @@ -8,7 +8,7 @@ _SSAnne2Text1:: cont "invited trainers!" done -_SSAnneRivalBeforeBattleText:: +_SSAnne2FRivalText:: text ": Bonjour!" line "!" @@ -31,7 +31,7 @@ _SSAnneRivalBeforeBattleText:: line "grassy areas!" done -_SSAnneRivalDefeatedText:: +_SSAnne2FRivalDefeatedText:: text "Humph!" para "At least you're" @@ -39,7 +39,7 @@ _SSAnneRivalDefeatedText:: cont "#MON!" prompt -_SSAnneRivalWonText:: +_SSAnne2FRivalVictoryText:: text "! What are" line "you, seasick?" @@ -47,7 +47,7 @@ _SSAnneRivalWonText:: line "up, pal!" prompt -_SSAnneRivalCaptainText:: +_SSAnne2FRivalCutMasterText:: text ": I heard" line "there was a CUT" cont "master on board." diff --git a/text/SSAnne2FRooms.asm b/text/SSAnne2FRooms.asm index a9be8cee1..b8ef99e37 100644 --- a/text/SSAnne2FRooms.asm +++ b/text/SSAnne2FRooms.asm @@ -1,4 +1,4 @@ -_SSAnne9Text_61bf2:: +_SSAnne2FRoomsGentleman3Text:: text "In all my travels" line "I've never seen" cont "any #MON sleep" @@ -8,19 +8,19 @@ _SSAnne9Text_61bf2:: line "like this!" prompt -_SSAnne9Text_61c01:: +_SSAnne2FRoomsGentleman4Text:: text "Ah yes, I have" line "seen some #MON" cont "ferry people" cont "across the water!" done -_SSAnne9Text_61c10:: +_SSAnne2FRoomsGrampsText:: text "#MON can CUT" line "down small bushes." done -_SSAnne9Text_61c1f:: +_SSAnne2FRoomsGentleman5Text:: text "Have you gone to" line "the SAFARI ZONE" cont "in FUCHSIA CITY?" @@ -29,51 +29,51 @@ _SSAnne9Text_61c1f:: line "kinds of #MON!!" done -_SSAnne9Text_61c2e:: +_SSAnne2FRoomsLittleBoyText:: text "Me and my Daddy" line "think the SAFARI" cont "ZONE is awesome!" done -_SSAnne9Text_61c3d:: +_SSAnne2FRoomsBrunetteGirlText:: text "The CAPTAIN looked" line "really sick and" cont "pale!" done -_SSAnne9Text_61c4c:: +_SSAnne2FRoomsBeautyText:: text "I hear many people" line "get seasick!" done -_SSAnne9BattleText1:: +_SSAnne2FRoomsGentleman1BattleText:: text "Competing against" line "the young keeps" cont "me youthful." done -_SSAnne9EndBattleText1:: +_SSAnne2FRoomsGentleman1EndBattleText:: text "Good" line "fight! Ah, I feel" cont "young again!" prompt -_SSAnne9AfterBattleText1:: +_SSAnne2FRoomsGentleman1AfterBattleText:: text "15 years ago, I" line "would have won!" done -_SSAnne9BattleText2:: +_SSAnne2FRoomsFisherBattleText:: text "Check out what I" line "fished up!" done -_SSAnne9EndBattleText2:: +_SSAnne2FRoomsFisherEndBattleText:: text "I'm" line "all out!" prompt -_SSAnne9AfterBattleText2:: +_SSAnne2FRoomsFisherAfterBattleText:: text "Party?" para "The cruise ship's" @@ -81,33 +81,33 @@ _SSAnne9AfterBattleText2:: cont "over by now." done -_SSAnne9BattleText3:: +_SSAnne2FRoomsGentleman2BattleText:: text "Which do you like," line "a strong or a" cont "rare #MON?" done -_SSAnne9EndBattleText3:: +_SSAnne2FRoomsGentleman2EndBattleText:: text "I must" line "salute you!" prompt -_SSAnne9AfterBattleText3:: +_SSAnne2FRoomsGentleman2AfterBattleText:: text "I prefer strong" line "and rare #MON." done -_SSAnne9BattleText4:: +_SSAnne2FRoomsCooltrainerFBattleText:: text "I never saw you" line "at the party." done -_SSAnne9EndBattleText4:: +_SSAnne2FRoomsCooltrainerFEndBattleText:: text "Take" line "it easy!" prompt -_SSAnne9AfterBattleText4:: +_SSAnne2FRoomsCooltrainerFAfterBattleText:: text "Oh, I adore your" line "strong #MON!" done diff --git a/text/SSAnne3F.asm b/text/SSAnne3F.asm index 764905941..e7485dedf 100644 --- a/text/SSAnne3F.asm +++ b/text/SSAnne3F.asm @@ -1,4 +1,4 @@ -_SSAnne3Text1:: +_SSAnne3FSailorText:: text "Our CAPTAIN is a" line "sword master!" diff --git a/text/SSAnneB1FRooms.asm b/text/SSAnneB1FRooms.asm index 8072fc851..1329cf779 100644 --- a/text/SSAnneB1FRooms.asm +++ b/text/SSAnneB1FRooms.asm @@ -1,90 +1,90 @@ -_SSAnne10Text8:: +_SSAnneB1FRoomsMachokeText:: text "MACHOKE: Gwoh!" line "Goggoh!@" text_end -_SSAnne10BattleText1:: +_SSAnneB1FRoomsSailor1BattleText:: text "You know what they" line "say about sailors" cont "and fighting!" done -_SSAnne10EndBattleText1:: +_SSAnneB1FRoomsSailor1EndBattleText:: text "Right!" line "Good fight, mate!" prompt -_SSAnne10AfterBattleText1:: +_SSAnneB1FRoomsSailor1AfterBattleText:: text "Haha! Want to be" line "a sailor, mate?" done -_SSAnne10BattleText2:: +_SSAnneB1FRoomsSailor2BattleText:: text "My sailor's pride" line "is at stake!" done -_SSAnne10EndBattleText2:: +_SSAnneB1FRoomsSailor2EndBattleText:: text "Your" line "spirit sank me!" prompt -_SSAnne10AfterBattleText2:: +_SSAnneB1FRoomsSailor2AfterBattleText:: text "Did you see the" line "FISHING GURU in" cont "VERMILION CITY?" done -_SSAnne10BattleText3:: +_SSAnneB1FRoomsSailor3BattleText:: text "Us sailors have" line "#MON too!" done -_SSAnne10EndBattleText3:: +_SSAnneB1FRoomsSailor3EndBattleText:: text "OK, " line "you're not bad." prompt -_SSAnne10AfterBattleText3:: +_SSAnneB1FRoomsSailor3AfterBattleText:: text "We caught all our" line "#MON while" cont "out at sea!" done -_SSAnne10BattleText4:: +_SSAnneB1FRoomsSailor4BattleText:: text "I like feisty" line "kids like you!@" text_end -_SSAnne10EndBattleText4:: +_SSAnneB1FRoomsSailor4EndBattleText:: text "Argh!" line "Lost it!" prompt -_SSAnne10AfterBattleText4:: +_SSAnneB1FRoomsSailor4AfterBattleText:: text "Sea #MON live" line "in deep water." cont "You'll need a ROD!" done -_SSAnne10BattleText5:: +_SSAnneB1FRoomsSailor5BattleText:: text "Matey, you're" line "walking the plank" cont "if you lose!" done -_SSAnne10EndBattleText5:: +_SSAnneB1FRoomsSailor5EndBattleText:: text "Argh!" line "Beaten by a kid!" prompt -_SSAnne10AfterBattleText5:: +_SSAnneB1FRoomsSailor5AfterBattleText:: text "Jellyfish some-" line "times drift into" cont "the ship." done -_SSAnne10BattleText6:: +_SSAnneB1FRoomsFisherBattleText:: text "Hello stranger!" line "Stop and chat!" @@ -92,19 +92,19 @@ _SSAnne10BattleText6:: line "are from the sea!" done -_SSAnne10EndBattleText6:: +_SSAnneB1FRoomsFisherEndBattleText:: text "Darn!" line "I let that one" cont "get away!" prompt -_SSAnne10AfterBattleText6:: +_SSAnneB1FRoomsFisherAfterBattleText:: text "I was going to" line "make you my" cont "assistant too!" done -_SSAnne10Text7:: +_SSAnneB1FRoomsSuperNerdText:: text "My buddy, MACHOKE," line "is super strong!" diff --git a/text/SSAnneBow.asm b/text/SSAnneBow.asm index 76cd56316..dcc1b4ff4 100644 --- a/text/SSAnneBow.asm +++ b/text/SSAnneBow.asm @@ -1,50 +1,50 @@ -_SSAnne5Text1:: +_SSAnneBowSuperNerdText:: text "The party's over." line "The ship will be" cont "departing soon." done -_SSAnne5Text2:: +_SSAnneBowSailor1Text:: text "Scrubbing decks" line "is hard work!" done -_SSAnne5Text3:: +_SSAnneBowCooltrainerMText:: text "Urf. I feel ill." para "I stepped out to" line "get some air." done -_SSAnne5BattleText1:: +_SSAnneBowSailor2BattleText:: text "Hey matey!" para "Let's do a little" line "jig!" done -_SSAnne5EndBattleText1:: +_SSAnneBowSailor2EndBattleText:: text "You're" line "impressive!" prompt -_SSAnne5AfterBattleText1:: +_SSAnneBowSailor2AfterBattleText:: text "How many kinds of" line "#MON do you" cont "think there are?" done -_SSAnne5BattleText2:: +_SSAnneBowSailor3BattleText:: text "Ahoy there!" line "Are you seasick?" done -_SSAnne5EndBattleText2:: +_SSAnneBowSailor3EndBattleText:: text "I was" line "just careless!" prompt -_SSAnne5AfterBattleText2:: +_SSAnneBowSailor3AfterBattleText:: text "My Pa said there" line "are 100 kinds of" cont "#MON. I think" diff --git a/text/SSAnneCaptainsRoom.asm b/text/SSAnneCaptainsRoom.asm index 13829483c..f3235d194 100644 --- a/text/SSAnneCaptainsRoom.asm +++ b/text/SSAnneCaptainsRoom.asm @@ -1,4 +1,4 @@ -_SSAnne7RubText:: +_SSAnneCaptainsRoomRubCaptainsBackText:: text "CAPTAIN: Ooargh..." line "I feel hideous..." cont "Urrp! Seasick..." @@ -11,7 +11,7 @@ _SSAnne7RubText:: line "Rub-rub...@" text_end -_ReceivingHM01Text:: +_SSAnneCaptainsRoomCaptainIFeelMuchBetterText:: text "CAPTAIN: Whew!" line "Thank you! I" cont "feel much better!" @@ -31,14 +31,14 @@ _ReceivingHM01Text:: cont "any time!" prompt -_ReceivedHM01Text:: +_SSAnneCaptainsRoomCaptainReceivedHM01Text:: text " got" line "@" text_ram wStringBuffer text "!@" text_end -_SSAnne7Text_61932:: +_SSAnneCaptainsRoomCaptainNotSickAnymoreText:: text "CAPTAIN: Whew!" para "Now that I'm not" @@ -46,17 +46,17 @@ _SSAnne7Text_61932:: cont "guess it's time." done -_HM01NoRoomText:: +_SSAnneCaptainsRoomCaptainHM01NoRoomText:: text "Oh no! You have" line "no room for this!" done -_SSAnne7Text2:: +_SSAnneCaptainsRoomTrashText:: text "Yuck! Shouldn't" line "have looked!" done -_SSAnne7Text3:: +_SSAnneCaptainsRoomSeasickBookText:: text "How to Conquer" line "Seasickness..." cont "The CAPTAIN's" diff --git a/text/SSAnneKitchen.asm b/text/SSAnneKitchen.asm index 7fcc9973b..e98b7a906 100644 --- a/text/SSAnneKitchen.asm +++ b/text/SSAnneKitchen.asm @@ -1,20 +1,20 @@ -_SSAnne6Text1:: +_SSAnneKitchenCook1Text:: text "You, mon petit!" line "We're busy here!" cont "Out of the way!" done -_SSAnne6Text2:: +_SSAnneKitchenCook2Text:: text "I saw an odd ball" line "in the trash." done -_SSAnne6Text3:: +_SSAnneKitchenCook3Text:: text "I'm so busy I'm" line "getting dizzy!" done -_SSAnne6Text4:: +_SSAnneKitchenCook4Text:: text "Hum-de-hum-de-" line "ho..." @@ -23,7 +23,7 @@ _SSAnne6Text4:: cont "Hum-hum..." done -_SSAnne6Text5:: +_SSAnneKitchenCook5Text:: text "Did you hear about" line "SNORLAX?" @@ -31,7 +31,7 @@ _SSAnne6Text5:: line "eat and sleep!" done -_SSAnne6Text6:: +_SSAnneKitchenCook6Text:: text "Snivel...Sniff..." para "I only get to" @@ -39,14 +39,14 @@ _SSAnne6Text6:: cont "Snivel..." done -_SSAnne6Text_61807:: +_SSAnneKitchenCook7MainCourseIsText:: text "Er-hem! Indeed I" line "am le CHEF!" para "Le main course is" prompt -_SSAnne6Text_6180c:: +SSAnneKitchenCook7SalmonDuSaladText:: text "Salmon du Salad!" para "Les guests may" @@ -54,14 +54,14 @@ _SSAnne6Text_6180c:: cont "again, however!" done -_SSAnne6Text_61811:: +SSAnneKitchenCook7EelsAuBarbecueText:: text "Eels au Barbecue!" para "Les guests will" line "mutiny, I fear." done -_SSAnne6Text_61816:: +SSAnneKitchenCook7PrimeBeefSteakText:: text "Prime Beef Steak!" para "But, have I enough" diff --git a/text/SafariZoneCenter.asm b/text/SafariZoneCenter.asm index 09918f937..b37b0e9be 100644 --- a/text/SafariZoneCenter.asm +++ b/text/SafariZoneCenter.asm @@ -1,8 +1,8 @@ -_SafariZoneCenterText2:: +_SafariZoneCenterRestHouseSignText:: text "REST HOUSE" done -_SafariZoneCenterText3:: +_SafariZoneCenterTrainerTipsSignText:: text "TRAINER TIPS" para "Press the START" diff --git a/text/SafariZoneCenterRestHouse.asm b/text/SafariZoneCenterRestHouse.asm index b6c878180..dd8d660d2 100644 --- a/text/SafariZoneCenterRestHouse.asm +++ b/text/SafariZoneCenterRestHouse.asm @@ -1,10 +1,10 @@ -_SafariZoneRestHouse1Text1:: +_SafariZoneCenterRestHouseGirlText:: text "SARA: Where did" line "my boy friend," cont "ERIK, go?" done -_SafariZoneRestHouse1Text2:: +_SafariZoneCenterRestHouseScientistText:: text "I'm catching" line "#MON to take" cont "home as gifts!" diff --git a/text/SafariZoneEast.asm b/text/SafariZoneEast.asm index eebe5de7c..680fd9eca 100644 --- a/text/SafariZoneEast.asm +++ b/text/SafariZoneEast.asm @@ -1,8 +1,8 @@ -_SafariZoneEastText5:: +_SafariZoneEastRestHouseSignText:: text "REST HOUSE" done -_SafariZoneEastText6:: +_SafariZoneEastTrainerTipsText:: text "TRAINER TIPS" para "The remaining time" @@ -10,7 +10,7 @@ _SafariZoneEastText6:: cont "while you walk!" done -_SafariZoneEastText7:: +_SafariZoneEastSignText:: text "CENTER AREA" line "NORTH: AREA 2" done diff --git a/text/SafariZoneEastRestHouse.asm b/text/SafariZoneEastRestHouse.asm index d5f7abc82..6ef33d897 100644 --- a/text/SafariZoneEastRestHouse.asm +++ b/text/SafariZoneEastRestHouse.asm @@ -1,10 +1,10 @@ -_SafariZoneRestHouse3Text1:: +_SafariZoneEastRestHouseScientistText:: text "How many did you" line "catch? I'm bushed" cont "from the work!" done -_SafariZoneRestHouse3Text2:: +_SafariZoneEastRestHouseRockerText:: text "I caught a" line "CHANSEY!" @@ -12,7 +12,7 @@ _SafariZoneRestHouse3Text2:: line "all worthwhile!" done -_SafariZoneRestHouse3Text3:: +_SafariZoneEastRestHouseSilphWorkerMText:: text "Whew! I'm tired" line "from all the fun!" done diff --git a/text/SafariZoneGate.asm b/text/SafariZoneGate.asm index 59a7c2afe..bf15dd87b 100644 --- a/text/SafariZoneGate.asm +++ b/text/SafariZoneGate.asm @@ -1,9 +1,9 @@ -_SafariZoneEntranceText1:: +_SafariZoneGateSafariZoneWorker1Text:: text "Welcome to the" line "SAFARI ZONE!" done -SafariZoneEntranceText_9e6e4:: +_SafariZoneGateSafariZoneWorker1WouldYouLikeToJoinText:: text "For just ¥500," line "you can catch all" cont "the #MON you" @@ -13,7 +13,7 @@ SafariZoneEntranceText_9e6e4:: line "join the hunt?@" text_end -SafariZoneEntranceText_9e747:: +_SafariZoneGateSafariZoneWorker1ThatllBe500PleaseText:: text "That'll be ¥500" line "please!" @@ -25,7 +25,7 @@ SafariZoneEntranceText_9e747:: line "30 SAFARI BALLs!@" text_end -_SafariZoneEntranceText_75360:: +_SafariZoneGateSafariZoneWorker1CallYouOnThePAText:: text_start para "We'll call you on" @@ -34,42 +34,42 @@ _SafariZoneEntranceText_75360:: cont "or SAFARI BALLs!" done -_SafariZoneEntranceText_75365:: +_SafariZoneGateSafariZoneWorker1PleaseComeAgainText:: text "OK! Please come" line "again!" done -_SafariZoneEntranceText_7536a:: +_SafariZoneGateSafariZoneWorker1NotEnoughMoneyText:: text "Oops! Not enough" line "money!" done -SafariZoneEntranceText_9e814:: +_SafariZoneGateSafariZoneWorker1LeavingEarlyText:: text "Leaving early?@" text_end -_SafariZoneEntranceText_753bb:: +_SafariZoneGateSafariZoneWorker1ReturnSafariBallsText:: text "Please return any" line "SAFARI BALLs you" cont "have left." done -_SafariZoneEntranceText_753c0:: +_SafariZoneGateSafariZoneWorker1GoodLuckText:: text "Good Luck!" done -_SafariZoneEntranceText_753c5:: +_SafariZoneGateSafariZoneWorker1GoodHaulComeAgainText:: text "Did you get a" line "good haul?" cont "Come again!" done -_SafariZoneEntranceText_753e6:: +_SafariZoneGateSafariZoneWorker2FirstTimeHereText:: text "Hi! Is it your" line "first time here?" done -_SafariZoneEntranceText_753eb:: +_SafariZoneGateSafariZoneWorker2SafariZoneExplanationText:: text "SAFARI ZONE has 4" line "zones in it." @@ -91,7 +91,7 @@ _SafariZoneEntranceText_753eb:: cont "new #MON!" done -_SafariZoneEntranceText_753f0:: +_SafariZoneGateSafariZoneWorker2YoureARegularHereText:: text "Sorry, you're a" line "regular here!" done diff --git a/text/SafariZoneNorth.asm b/text/SafariZoneNorth.asm index 1e148f0bd..83de96078 100644 --- a/text/SafariZoneNorth.asm +++ b/text/SafariZoneNorth.asm @@ -1,19 +1,19 @@ -_SafariZoneNorthText3:: +_SafariZoneNorthRestHouseSignText:: text "REST HOUSE" done -_SafariZoneNorthText4:: +_SafariZoneNorthTrainerTips1Text:: text "TRAINER TIPS" para "The SECRET HOUSE" line "is still ahead!" done -_SafariZoneNorthText5:: +_SafariZoneNorthSignText:: text "AREA 2" done -_SafariZoneNorthText6:: +_SafariZoneNorthTrainerTips2Text:: text "TRAINER TIPS" para "#MON hide in" @@ -24,7 +24,7 @@ _SafariZoneNorthText6:: cont "flush them out." done -_SafariZoneNorthText7:: +_SafariZoneNorthTrainerTips3Text:: text "TRAINER TIPS" para "Win a free HM for" diff --git a/text/SafariZoneNorthRestHouse.asm b/text/SafariZoneNorthRestHouse.asm index 93f02c8f2..7e6871d02 100644 --- a/text/SafariZoneNorthRestHouse.asm +++ b/text/SafariZoneNorthRestHouse.asm @@ -1,4 +1,4 @@ -_SafariZoneRestHouse4Text1:: +_SafariZoneNorthRestHouseScientistText:: text "You can keep any" line "item you find on" cont "the ground here." @@ -9,14 +9,14 @@ _SafariZoneRestHouse4Text1:: cont "of them at once!" done -_SafariZoneRestHouse4Text2:: +_SafariZoneNorthRestHouseSafariZoneWorkerText:: text "Go to the deepest" line "part of the" cont "SAFARI ZONE. You" cont "will win a prize!" done -_SafariZoneRestHouse4Text3:: +_SafariZoneNorthRestHouseGentlemanText:: text "My EEVEE evolved" line "into FLAREON!" diff --git a/text/SafariZoneSecretHouse.asm b/text/SafariZoneSecretHouse.asm index c80061707..b0101c23a 100644 --- a/text/SafariZoneSecretHouse.asm +++ b/text/SafariZoneSecretHouse.asm @@ -1,4 +1,4 @@ -_SecretHouseText_4a350:: +_SafariZoneSecretHouseFishingGuruYouHaveWonText:: text "Ah! Finally!" para "You're the first" @@ -14,14 +14,14 @@ _SecretHouseText_4a350:: line "You have won!" prompt -_ReceivedHM03Text:: +_SafariZoneSecretHouseFishingGuruReceivedHM03Text:: text " received" line "@" text_ram wStringBuffer text "!@" text_end -_HM03ExplanationText:: +_SafariZoneSecretHouseFishingGuruHM03ExplanationText:: text "HM03 is SURF!" para "#MON will be" @@ -38,7 +38,7 @@ _HM03ExplanationText:: cont "fabulous prize!" done -_HM03NoRoomText:: +_SafariZoneSecretHouseFishingGuruHM03NoRoomText:: text "You don't have" line "room for this" cont "fabulous prize!" diff --git a/text/SafariZoneWest.asm b/text/SafariZoneWest.asm index dcb2fe6cf..a2af705c8 100644 --- a/text/SafariZoneWest.asm +++ b/text/SafariZoneWest.asm @@ -1,8 +1,8 @@ -_SafariZoneWestText5:: +_SafariZoneWestRestHouseSignText:: text "REST HOUSE" done -_SafariZoneWestText6:: +_SafariZoneWestFindWardensTeethSignText:: text "REQUEST NOTICE" para "Please find the" @@ -15,7 +15,7 @@ _SafariZoneWestText6:: line "Contact: WARDEN" done -_SafariZoneWestText7:: +_SafariZoneWestTrainerTipsText:: text "TRAINER TIPS" para "Zone Exploration" @@ -25,7 +25,7 @@ _SafariZoneWestText7:: line "the SECRET HOUSE!" done -_SafariZoneWestText8:: +_SafariZoneWestSignText:: text "AREA 3" line "EAST: CENTER AREA" done diff --git a/text/SafariZoneWestRestHouse.asm b/text/SafariZoneWestRestHouse.asm index 94802b13a..134577a35 100644 --- a/text/SafariZoneWestRestHouse.asm +++ b/text/SafariZoneWestRestHouse.asm @@ -1,4 +1,4 @@ -_SafariZoneRestHouse2Text1:: +_SafariZoneWestRestHouseScientistText:: text "Tossing ROCKs at" line "#MON might" cont "make them run," @@ -6,13 +6,13 @@ _SafariZoneRestHouse2Text1:: cont "easier to catch." done -_SafariZoneRestHouse2Text2:: +_SafariZoneWestRestHouseCooltrainerMText:: text "Using BAIT will" line "make #MON" cont "easier to catch." done -_SafariZoneRestHouse2Text3:: +_SafariZoneWestRestHouseSilphWorkerFText:: text "I hiked a lot, but" line "I didn't see any" cont "#MON I wanted." diff --git a/text/SaffronCity.asm b/text/SaffronCity.asm index ae9c44f26..67dc833e6 100644 --- a/text/SaffronCity.asm +++ b/text/SaffronCity.asm @@ -1,60 +1,60 @@ -_SaffronCityText1:: +_SaffronCityRocket1Text:: text "What do you want?" line "Get lost!" done -_SaffronCityText2:: +_SaffronCityRocket2Text:: text "BOSS said he'll" line "take this town!" done -_SaffronCityText3:: +_SaffronCityRocket3Text:: text "Get out of the" line "way!" done -_SaffronCityText4:: +_SaffronCityRocket4Text:: text "SAFFRON belongs" line "to TEAM ROCKET!" done -_SaffronCityText5:: +_SaffronCityRocket5Text:: text "Being evil makes" line "me feel so alive!" done -_SaffronCityText6:: +_SaffronCityRocket6Text:: text "Ow! Watch where" line "you're walking!" done -_SaffronCityText7:: +_SaffronCityRocket7Text:: text "With SILPH under" line "control, we can" cont "exploit #MON" cont "around the world!" done -_SaffronCityText8:: +_SaffronCityScientistText:: text "You beat TEAM" line "ROCKET all alone?" cont "That's amazing!" done -_SaffronCityText9:: +_SaffronCitySilphWorkerMText:: text "Yeah! TEAM ROCKET" line "is gone!" cont "It's safe to go" cont "out again!" done -_SaffronCityText10:: +_SaffronCitySilphWorkerFText:: text "People should be" line "flocking back to" cont "SAFFRON now." done -_SaffronCityText11:: +_SaffronCityGentlemanText:: text "I flew here on my" line "PIDGEOT when I" cont "read about SILPH." @@ -64,17 +64,17 @@ _SaffronCityText11:: cont "media action." done -_SaffronCityText12:: +_SaffronCityPidgeotText:: text "PIDGEOT: Bi bibii!@" text_end -_SaffronCityText13:: +_SaffronCityRockerText:: text "I saw ROCKET" line "BOSS escaping" cont "SILPH's building." done -_SaffronCityText14:: +_SaffronCityRocket8Text:: text "I'm a security" line "guard." @@ -82,7 +82,7 @@ _SaffronCityText14:: line "don't allow in!" done -_SaffronCityText15:: +_SaffronCityRocket9Text:: text "..." line "Snore..." @@ -90,17 +90,17 @@ _SaffronCityText15:: line "a snooze!" done -_SaffronCityText16:: +_SaffronCitySignText:: text "SAFFRON CITY" line "Shining, Golden" cont "Land of Commerce" done -_SaffronCityText17:: +_SaffronCityFightingDojoSignText:: text "FIGHTING DOJO" done -_SaffronCityText18:: +_SaffronCityGymSignText:: text "SAFFRON CITY" line "#MON GYM" cont "LEADER: SABRINA" @@ -109,7 +109,7 @@ _SaffronCityText18:: line "Psychic #MON!" done -_SaffronCityText20:: +_SaffronCityTrainerTips1Text:: text "TRAINER TIPS" para "FULL HEAL cures" @@ -121,7 +121,7 @@ _SaffronCityText20:: cont "more convenient." done -_SaffronCityText21:: +_SaffronCityTrainerTips2Text:: text "TRAINER TIPS" para "New GREAT BALL" @@ -133,17 +133,17 @@ _SaffronCityText21:: cont "#MON." done -_SaffronCityText22:: +_SaffronCitySilphCoSignText:: text "SILPH CO." line "OFFICE BUILDING" done -_SaffronCityText24:: +_SaffronCityMrPsychicsHouseSignText:: text "MR.PSYCHIC's" line "HOUSE" done -_SaffronCityText25:: +_SaffronCitySilphCoLatestProductSignText:: text "SILPH's latest" line "product!" diff --git a/text/SaffronGates.asm b/text/SaffronGates.asm index 4f53553a6..b21cccb6c 100644 --- a/text/SaffronGates.asm +++ b/text/SaffronGates.asm @@ -1,4 +1,4 @@ -_SaffronGateText_1dfe7:: +_SaffronGateGuardGeeImThirstyText:: text "I'm on guard duty." line "Gee, I'm thirsty," cont "though!" @@ -7,7 +7,7 @@ _SaffronGateText_1dfe7:: line "the road's closed." done -_SaffronGateText_8aaa9:: +_SaffronGateGuardImParchedText:: text "Whoa, boy!" line "I'm parched!" cont "..." @@ -16,7 +16,7 @@ _SaffronGateText_8aaa9:: cont "Gee, thanks!@" text_end -_SaffronGateText_1dff1:: +_SaffronGateGuardYouCanGoOnThroughText:: text_start para "..." @@ -32,7 +32,7 @@ _SaffronGateText_1dff1:: cont "the other guards!" done -_SaffronGateText_1dff6:: +_SaffronGateGuardThanksForTheDrinkText:: text "Hi, thanks for" line "the cool drinks!" done diff --git a/text/SaffronGym.asm b/text/SaffronGym.asm index 090b951a0..68bb5824b 100644 --- a/text/SaffronGym.asm +++ b/text/SaffronGym.asm @@ -1,4 +1,4 @@ -_SabrinaPreBattleText:: +_SaffronGymSabrinaText:: text "I had a vision of" line "your arrival!" @@ -16,7 +16,7 @@ _SabrinaPreBattleText:: cont "you my powers!" done -_ReceivedMarshBadgeText:: +_SaffronGymSabrinaReceivedMarshBadgeText:: text "I'm" line "shocked!" cont "But, a loss is a" @@ -30,14 +30,14 @@ _ReceivedMarshBadgeText:: line "MARSHBADGE!@" text_end -_SabrinaPostBattleAdviceText:: +_SaffronGymSabrinaPostBattleAdviceText:: text "Everyone has" line "psychic power!" cont "People just don't" cont "realize it!" done -_KogaMarshBadgeInfoText:: +_SaffronGymSabrinaMarshBadgeInfoText:: text "The MARSHBADGE" line "makes #MON up" cont "to L70 obey you!" @@ -55,7 +55,7 @@ _KogaMarshBadgeInfoText:: line "this TM with you!" done -_ReceivedTM46Text:: +_SaffronGymSabrinaReceivedTM46Text:: text " received" line "TM46!@" text_end @@ -69,12 +69,12 @@ _TM46ExplanationText:: cont "inflict damage!" done -_TM46NoRoomText:: +_SaffronGymSabrinaTM46NoRoomText:: text "Your pack is full" line "of other items!" done -_SaffronGymGuidePreBattleText:: +_SaffronGymGuideChampInMakingText:: text "Yo! Champ in" line "making!" @@ -91,7 +91,7 @@ _SaffronGymGuidePreBattleText:: cont "even aim a punch!" done -_SaffronGymGuidePostBattleText:: +_SaffronGymGuideBeatSabrinaText:: text "Psychic power," line "huh?" @@ -100,18 +100,18 @@ _SaffronGymGuidePostBattleText:: cont "at the slots!" done -_SaffronGymBattleText1:: +_SaffronGymChanneler1BattleText:: text "SABRINA is younger" line "than I, but I" cont "respect her!" done -_SaffronGymEndBattleText1:: +_SaffronGymChanneler1EndBattleText:: text "Not" line "good enough!" prompt -_SaffronGymAfterBattleText1:: +_SaffronGymChanneler1AfterBattleText:: text "In a battle of" line "equals, the one" cont "with the stronger" @@ -122,23 +122,23 @@ _SaffronGymAfterBattleText1:: cont "focus on winning!" done -_SaffronGymBattleText2:: +_SaffronGymYoungster1BattleText:: text "Does our unseen" line "power scare you?" done -_SaffronGymEndBattleText2:: +_SaffronGymYoungster1EndBattleText:: text "I never" line "foresaw this!" prompt -_SaffronGymAfterBattleText2:: +_SaffronGymYoungster1AfterBattleText:: text "Psychic #MON" line "fear only ghosts" cont "and bugs!" done -_SaffronGymBattleText3:: +_SaffronGymChanneler2BattleText:: text "#MON take on" line "the appearance of" cont "their trainers." @@ -147,52 +147,52 @@ _SaffronGymBattleText3:: line "be tough, then!" done -_SaffronGymEndBattleText3:: +_SaffronGymChanneler2EndBattleText:: text "I knew" line "it!" prompt -_SaffronGymAfterBattleText3:: +_SaffronGymChanneler2AfterBattleText:: text "I must teach" line "better techniques" cont "to my #MON!" done -_SaffronGymBattleText4:: +_SaffronGymYoungster2BattleText:: text "You know that" line "power alone isn't" cont "enough!" done -_SaffronGymEndBattleText4:: +_SaffronGymYoungster2EndBattleText:: text "I don't" line "believe this!" prompt -_SaffronGymAfterBattleText4:: +_SaffronGymYoungster2AfterBattleText:: text "SABRINA just wiped" line "out the KARATE" cont "MASTER next door!" done -_SaffronGymBattleText5:: +_SaffronGymChanneler3BattleText:: text "You and I, our" line "#MON shall" cont "fight!" done -_SaffronGymEndBattleText5:: +_SaffronGymChanneler3EndBattleText:: text "I lost" line "after all!" prompt -_SaffronGymAfterBattleText5:: +_SaffronGymChanneler3AfterBattleText:: text "I knew that this" line "was going to take" cont "place." done -_SaffronGymBattleText6:: +_SaffronGymYoungster3BattleText:: text "SABRINA is young," line "but she's also" cont "our LEADER!" @@ -201,12 +201,12 @@ _SaffronGymBattleText6:: line "her easily!" done -_SaffronGymEndBattleText6:: +_SaffronGymYoungster3EndBattleText:: text "I lost" line "my concentration!" prompt -_SaffronGymAfterBattleText6:: +_SaffronGymYoungster3AfterBattleText:: text "There used to be" line "2 #MON GYMs in" cont "SAFFRON." @@ -218,7 +218,7 @@ _SaffronGymAfterBattleText6:: cont "creamed them!" done -_SaffronGymBattleText7:: +_SaffronGymYoungster4BattleText:: text "SAFFRON #MON" line "GYM is famous for" cont "its psychics!" @@ -228,11 +228,11 @@ _SaffronGymBattleText7:: cont "I can tell!" done -_SaffronGymEndBattleText7:: +_SaffronGymYoungster4EndBattleText:: text "Arrrgh!" prompt -_SaffronGymAfterBattleText7:: +_SaffronGymYoungster4AfterBattleText:: text "That's right! I" line "used telepathy to" cont "read your mind!" diff --git a/text/SaffronMart.asm b/text/SaffronMart.asm index a43b0d94d..f5a0983a8 100644 --- a/text/SaffronMart.asm +++ b/text/SaffronMart.asm @@ -1,4 +1,4 @@ -_SaffronMartText2:: +_SaffronMartSuperNerdText:: text "MAX REPEL lasts" line "longer than SUPER" cont "REPEL for keeping" @@ -6,7 +6,7 @@ _SaffronMartText2:: cont "away!" done -_SaffronMartText3:: +_SaffronMartCooltrainerFText:: text "REVIVE is costly," line "but it revives" cont "fainted #MON!" diff --git a/text/SaffronPidgeyHouse.asm b/text/SaffronPidgeyHouse.asm index d8666a07c..80b1a0b8e 100644 --- a/text/SaffronPidgeyHouse.asm +++ b/text/SaffronPidgeyHouse.asm @@ -1,4 +1,4 @@ -_SaffronHouse1Text1:: +_SaffronPidgeyHouseBrunetteGirlText:: text "Thank you for" line "writing. I hope" cont "to see you soon!" @@ -7,17 +7,17 @@ _SaffronHouse1Text1:: line "at my letter!" done -_SaffronHouse1Text2:: +_SaffronPidgeyHousePidgeyText:: text "PIDGEY: Kurukkoo!@" text_end -_SaffronHouse1Text3:: +_SaffronPidgeyHouseYoungsterText:: text "The COPYCAT is" line "cute! I'm getting" cont "her a # DOLL!" done -_SaffronHouse1Text4:: +_SaffronPidgeyHousePaperText:: text "I was given a PP" line "UP as a gift." diff --git a/text/SaffronPokecenter.asm b/text/SaffronPokecenter.asm index 6548aff88..9d20d6496 100644 --- a/text/SaffronPokecenter.asm +++ b/text/SaffronPokecenter.asm @@ -1,10 +1,10 @@ -_SaffronPokecenterText2:: +_SaffronPokecenterBeautyText:: text "#MON growth" line "rates differ from" cont "specie to specie." done -_SaffronPokecenterText3:: +_SaffronPokecenterGentlemanText:: text "SILPH CO. is very" line "famous. That's" cont "why it attracted" diff --git a/text/SeafoamIslandsB4F.asm b/text/SeafoamIslandsB4F.asm index ea7eeaa21..8086a59fe 100644 --- a/text/SeafoamIslandsB4F.asm +++ b/text/SeafoamIslandsB4F.asm @@ -1,14 +1,14 @@ -_ArticunoBattleText:: +_SeafoamIslandsB4FArticunoBattleText:: text "Gyaoo!@" text_end -_SeafoamIslands5Text4:: +_SeafoamIslandsB4FBouldersSignText:: text "Boulders might" line "change the flow" cont "of water!" done -_SeafoamIslands5Text5:: +_SeafoamIslandsB4FDangerSignText:: text "DANGER" line "Fast current!" done diff --git a/text/SilphCo10F.asm b/text/SilphCo10F.asm index e916c64aa..5bc063ab4 100644 --- a/text/SilphCo10F.asm +++ b/text/SilphCo10F.asm @@ -1,41 +1,41 @@ -_SilphCo10Text_5a1d3:: +_SilphCo10FSilphWorkerFImScaredText:: text "Waaaaa!" cont "I'm scared!" done -_SilphCo10Text_5a1d8:: +_SilphCo10FSilphWorkerFQuietAboutMyCryingText:: text "Please keep quiet" line "about my crying!" done -_SilphCo10BattleText1:: +_SilphCo10FRocketBattleText:: text "Welcome to the" line "10F! So good of" cont "you to join me!" done -_SilphCo10EndBattleText1:: +_SilphCo10FRocketEndBattleText:: text "I'm" line "stunned!" prompt -_SilphCo10AfterBattleText1:: +_SilphCo10FRocketAfterBattleText:: text "Nice try, but the" line "boardroom is up" cont "one more floor!" done -_SilphCo10BattleText2:: +_SilphCo10FScientistBattleText:: text "Enough of your" line "silly games!" done -_SilphCo10EndBattleText2:: +_SilphCo10FScientistEndBattleText:: text "No" line "continues left!" prompt -_SilphCo10AfterBattleText2:: +_SilphCo10FScientistAfterBattleText:: text "Are you satisfied" line "with beating me?" cont "Then go on home!" diff --git a/text/SilphCo11F.asm b/text/SilphCo11F.asm index 1b42fd933..25607d0fa 100644 --- a/text/SilphCo11F.asm +++ b/text/SilphCo11F.asm @@ -1,4 +1,4 @@ -_SilphCoPresidentText:: +_SilphCo11FSilphPresidentText:: text "PRESIDENT: Thank" line "you for saving" cont "SILPH!" @@ -19,14 +19,14 @@ _SilphCoPresidentText:: line "will do!" prompt -_ReceivedSilphCoMasterBallText:: +_SilphCo11FSilphPresidentReceivedMasterBallText:: text " got a" line "@" text_ram wStringBuffer text "!@" text_end -_SilphCo10Text_6231c:: +_SilphCo11FSilphPresidentMasterBallDescriptionText:: text "PRESIDENT: You" line "can't buy that" cont "anywhere!" @@ -44,12 +44,12 @@ _SilphCo10Text_6231c:: cont "it, though." done -_SilphCoMasterBallNoRoomText:: +_SilphCo11FSilphPresidentNoRoomText:: text "You have no" line "room for this." done -_SilphCo11Text2:: +_SilphCo11FBeautyText:: text "SECRETARY: Thank" line "you for rescuing" cont "all of us!" @@ -58,7 +58,7 @@ _SilphCo11Text2:: line "courage." done -_SilphCo11Text3:: +_SilphCo11FGiovanniText:: text "Ah !" line "So we meet again!" @@ -75,12 +75,12 @@ _SilphCo11Text3:: line "world of pain!" done -_SilphCo10Text_62330:: +_SilphCo10FGiovanniILostAgainText:: text "Arrgh!!" line "I lost again!?" prompt -_SilphCo10Text_62335:: +_SilphCo11FGiovanniYouRuinedOurPlansText:: text "Blast it all!" line "You ruined our" cont "plans for SILPH!" @@ -97,39 +97,39 @@ _SilphCo10Text_62335:: line "shall return!" done -_SilphCo11BattleText1:: +_SilphCo11FRocket1BattleText:: text "Stop right there!" line "Don't you move!" done -_SilphCo11EndBattleText1:: +_SilphCo11FRocket1EndBattleText:: text "Don't..." line "Please!" prompt -_SilphCo11AfterBattleText1:: +_SilphCo11FRocket1AfterBattleText:: text "So, you want to" line "see my BOSS?" done -_SilphCo11BattleText2:: +_SilphCo11FRocket2BattleText:: text "Halt! Do you have" line "an appointment" cont "with my BOSS?" done -_SilphCo11EndBattleText2:: +_SilphCo11FRocket2EndBattleText:: text "Gaah!" line "Demolished!" prompt -_SilphCo11AfterBattleText2:: +_SilphCo11FRocket2AfterBattleText:: text "Watch your step," line "my BOSS likes his" cont "#MON tough!" done -_SilphCo10Text_6237b:: +_SilphCo10FPorygonText:: text "The monitor has" line "#MON on it!" done diff --git a/text/SilphCo1F.asm b/text/SilphCo1F.asm index 1ef801892..d58be4d84 100644 --- a/text/SilphCo1F.asm +++ b/text/SilphCo1F.asm @@ -1,4 +1,4 @@ -_SilphCo1Text1:: +_SilphCo1FLinkReceptionistText:: text "Welcome!" para "The PRESIDENT is" diff --git a/text/SilphCo2F.asm b/text/SilphCo2F.asm index 32546b15a..f86931b2d 100644 --- a/text/SilphCo2F.asm +++ b/text/SilphCo2F.asm @@ -1,4 +1,4 @@ -_SilphCo2Text_59ded:: +SilphCo2FSilphWorkerFPleaseTakeThisText:: text "Eeek!" line "No! Stop! Help!" @@ -9,14 +9,14 @@ _SilphCo2Text_59ded:: cont "please take this!" prompt -_ReceivedTM36Text:: +_SilphCo2FSilphWorkerFReceivedTM36Text:: text " got" line "@" text_ram wStringBuffer text "!@" text_end -_TM36ExplanationText:: +_SilphCo2FSilphWorkerFTM36ExplanationText:: text "TM36 is" line "SELFDESTRUCT!" @@ -26,53 +26,53 @@ _TM36ExplanationText:: cont "Be careful." done -_TM36NoRoomText:: +_SilphCo2FSilphWorkerFTM36NoRoomText:: text "You don't have any" line "room for this." done -_SilphCo2BattleText1:: +_SilphCo2FScientist1BattleText:: text "Help! I'm a SILPH" line "employee." done -_SilphCo2EndBattleText1:: +_SilphCo2FScientist1EndBattleText:: text "How" line "did you know I" cont "was a ROCKET?" prompt -_SilphCo2AfterBattleText1:: +_SilphCo2FScientist1AfterBattleText:: text "I work for both" line "SILPH and TEAM" cont "ROCKET!" done -_SilphCo2BattleText2:: +_SilphCo2FScientist2BattleText:: text "It's off limits" line "here! Go home!" done -_SilphCo2EndBattleText2:: +_SilphCo2FScientist2EndBattleText:: text "You're" line "good." prompt -_SilphCo2AfterBattleText2:: +_SilphCo2FScientist2AfterBattleText:: text "Can you solve the" line "maze in here?" done -_SilphCo2BattleText3:: +_SilphCo2FRocket1BattleText:: text "No kids are" line "allowed in here!" done -_SilphCo2EndBattleText3:: +_SilphCo2FRocket1EndBattleText:: text "Tough!" prompt -_SilphCo2AfterBattleText3:: +_SilphCo2FRocket1AfterBattleText:: text "Diamond shaped" line "tiles are" cont "teleport blocks!" @@ -81,16 +81,16 @@ _SilphCo2AfterBattleText3:: line "transporters!" done -_SilphCo2BattleText4:: +_SilphCo2FRocket2BattleText:: text "Hey kid! What are" line "you doing here?" done -_SilphCo2EndBattleText4:: +_SilphCo2FRocket2EndBattleText:: text "I goofed!" prompt -_SilphCo2AfterBattleText4:: +_SilphCo2FRocket2AfterBattleText:: text "SILPH CO. will" line "be merged with" cont "TEAM ROCKET!" diff --git a/text/SilphCo3F.asm b/text/SilphCo3F.asm index b6a023f94..4bc62e0e5 100644 --- a/text/SilphCo3F.asm +++ b/text/SilphCo3F.asm @@ -1,42 +1,42 @@ -_SilphCo3Text_59ff9:: +_SilphCo3FSilphWorkerMWhatShouldIDoText:: text "I work for SILPH." line "What should I do?" done -_SilphCo3Text_59ffe:: +_SilphCo3FSilphWorkerMYouSavedUsText:: text "! You and" line "your #MON" cont "saved us!" done -_SilphCo3BattleText1:: +_SilphCo3FRocketBattleText:: text "Quit messing with" line "us, kid!" done -_SilphCo3EndBattleText1:: +_SilphCo3FRocketEndBattleText:: text "I give" line "up!" prompt -_SilphCo3AfterBattleText1:: +_SilphCo3FRocketAfterBattleText:: text "A hint? You can" line "open doors with a" cont "CARD KEY!" done -_SilphCo3BattleText2:: +_SilphCo3FScientistBattleText:: text "I support TEAM" line "ROCKET more than" cont "I support SILPH!" done -_SilphCo3EndBattleText2:: +_SilphCo3FScientistEndBattleText:: text "You" line "really got me!" prompt -_SilphCo3AfterBattleText2:: +_SilphCo3FScientistAfterBattleText:: text "Humph..." para "TEAM ROCKET said" diff --git a/text/SilphCo4F.asm b/text/SilphCo4F.asm index 5b484ec74..2d99ec95b 100644 --- a/text/SilphCo4F.asm +++ b/text/SilphCo4F.asm @@ -1,56 +1,56 @@ -_SilphCo4Text_19de0:: +_SilphCo4FSilphWorkerMImHidingText:: text "Sssh! Can't you" line "see I'm hiding?" done -_SilphCo4Text_19de5:: +_SilphCo4FSilphWorkerMTeamRocketIsGoneText:: text "Huh? TEAM ROCKET" line "is gone?" done -_SilphCo4BattleText2:: +_SilphCo4FRocket1BattleText:: text "TEAM ROCKET has" line "taken command of" cont "SILPH CO.!" done -_SilphCo4EndBattleText2:: +_SilphCo4FRocket1EndBattleText:: text "Arrgh!" prompt -_SilphCo4AfterBattleText2:: +_SilphCo4FRocket1AfterBattleText:: text "Fwahahaha!" line "My BOSS has been" cont "after this place!" done -_SilphCo4BattleText3:: +_SilphCo4FScientistBattleText:: text "My #MON are my" line "loyal soldiers!" done -_SilphCo4EndBattleText3:: +_SilphCo4FScientistEndBattleText:: text "Darn!" line "You weak #MON!" prompt -_SilphCo4AfterBattleText3:: +_SilphCo4FScientistAfterBattleText:: text "The doors are" line "electronically" cont "locked! A CARD" cont "KEY opens them!" done -_SilphCo4BattleText4:: +_SilphCo4FRocket2BattleText:: text "Intruder spotted!" done -_SilphCo4EndBattleText4:: +_SilphCo4FRocket2EndBattleText:: text "Who" line "are you?" prompt -_SilphCo4AfterBattleText4:: +_SilphCo4FRocket2AfterBattleText:: text "I better tell the" line "BOSS on 11F!" done diff --git a/text/SilphCo5F.asm b/text/SilphCo5F.asm index dab425396..d4f5b82b7 100644 --- a/text/SilphCo5F.asm +++ b/text/SilphCo5F.asm @@ -1,50 +1,50 @@ -_SilphCo5Text_1a010:: +_SilphCo5FSilphWorkerMThatsYouRightText:: text "TEAM ROCKET is" line "in an uproar over" cont "some intruder." cont "That's you right?" done -_SilphCo5Text_1a015:: +_SilphCo5FSilphWorkerMYoureOurHeroText:: text "TEAM ROCKET took" line "off! You're our" cont "hero! Thank you!" done -_SilphCo5BattleText2:: +_SilphCo5FRocket1BattleText:: text "I heard a kid was" line "wandering around." done -_SilphCo5EndBattleText2:: +_SilphCo5FRocket1EndBattleText:: text "Boom!" prompt -_SilphCo5AfterBattleText2:: +_SilphCo5FRocket1AfterBattleText:: text "It's not smart" line "to pick a fight" cont "with TEAM ROCKET!" done -_SilphCo5BattleText3:: +_SilphCo5FScientistBattleText:: text "We study #" line "BALL technology" cont "on this floor!" done -_SilphCo5EndBattleText3:: +_SilphCo5FScientistEndBattleText:: text "Dang!" line "Blast it!" prompt -_SilphCo5AfterBattleText3:: +_SilphCo5FScientistAfterBattleText:: text "We worked on the" line "ultimate #" cont "BALL which would" cont "catch anything!" done -_SilphCo5BattleText4:: +_SilphCo5FRockerBattleText:: text "Whaaat? There" line "shouldn't be any" cont "children here?" diff --git a/text/SilphCo5F_2.asm b/text/SilphCo5F_2.asm index 3c1b8ead2..2eb724243 100644 --- a/text/SilphCo5F_2.asm +++ b/text/SilphCo5F_2.asm @@ -1,32 +1,32 @@ -_SilphCo5EndBattleText4:: +_SilphCo5FRockerEndBattleText:: text "Oh" line "goodness!" prompt -_SilphCo5AfterBattleText4:: +_SilphCo5FRockerAfterBattleText:: text "You're only on 5F." line "It's a long way" cont "to my BOSS!" done -_SilphCo5BattleText5:: +_SilphCo5FRocket2BattleText:: text "Show TEAM ROCKET" line "a little respect!" done -_SilphCo5EndBattleText5:: +_SilphCo5FRocket2EndBattleText:: text "Cough..." line "Cough..." prompt -_SilphCo5AfterBattleText5:: +_SilphCo5FRocket2AfterBattleText:: text "Which reminds me." para "KOFFING evolves" line "into WEEZING!" done -_SilphCo5Text9:: +_SilphCo5FPokemonReport1Text:: text "It's a #MON" line "REPORT!" @@ -36,7 +36,7 @@ _SilphCo5Text9:: cont "reality #MON." done -_SilphCo5Text10:: +_SilphCo5FPokemonReport2Text:: text "It's a #MON" line "REPORT!" @@ -45,7 +45,7 @@ _SilphCo5Text10:: cont "been confirmed." done -_SilphCo5Text11:: +_SilphCo5FPokemonReport3Text:: text "It's a #MON" line "REPORT!" diff --git a/text/SilphCo6F.asm b/text/SilphCo6F.asm index 90456b5ca..86581c242 100644 --- a/text/SilphCo6F.asm +++ b/text/SilphCo6F.asm @@ -1,77 +1,77 @@ -_SilphCo6Text_1a24a:: +_SilphCo6FSilphWorkerM1TookOverTheBuildingText:: text "The ROCKETs came" line "and took over the" cont "building!" done -_SilphCo6Text_1a24f:: +_SilphCo6FSilphWorkerM1BackToWorkText:: text "Well, better get" line "back to work!" done -_SilphCo6Text_1a261:: +_SilphCo6FSilphWorkerMHelpMePleaseText:: text "Oh dear, oh dear." line "Help me please!" done -_SilphCo6Text_1a266:: +_SilphCo6FSilphWorkerMWeGotEngagedText:: text "We got engaged!" line "Heheh!" done -_SilphCo6Text_1a278:: +_SilphCo6FSilphWorkerF1SuchACowardText:: text "Look at him! He's" line "such a coward!" done -_SilphCo6Text_1a27d:: +_SilphCo6FSilphWorkerF1HaveToMarryHimText:: text "I feel so sorry" line "for him, I have" cont "to marry him!" done -_SilphCo6Text_1a28f:: +_SilphCo6FSilphWorkerF2TeamRocketConquerWorldText:: text "TEAM ROCKET is" line "trying to conquer" cont "the world with" cont "#MON!" done -_SilphCo6Text_1a294:: +_SilphCo6FSilphWorkerF2TeamRocketRanText:: text "TEAM ROCKET ran" line "because of you!" done -_SilphCo6Text_1a2a6:: +_SilphCo6FSilphWorkerM3TargetedSilphText:: text "They must have" line "targeted SILPH" cont "for our #MON" cont "products." done -_SilphCo6Text_1a2ab:: +_SilphCo6FSilphWorkerM3WorkForSilphText:: text "Come work for" line "SILPH when you" cont "get older!" done -_SilphCo6BattleText2:: +_SilphCo6FRocket1BattleText:: text "I am one of the 4" line "ROCKET BROTHERS!" done -_SilphCo6EndBattleText2:: +_SilphCo6Rocket1EndBattleText:: text "Flame" line "out!" prompt -_SilphCo6AfterBattleText2:: +_SilphCo6Rocket1AfterBattleText:: text "No matter!" line "My brothers will" cont "avenge me!" done -_SilphCo6BattleText3:: +_SilphCo6FScientistBattleText:: text "That rotten" line "PRESIDENT!" @@ -80,27 +80,27 @@ _SilphCo6BattleText3:: cont "TIKSI BRANCH!" done -_SilphCo6EndBattleText3:: +_SilphCo6FScientistEndBattleText:: text "Shoot!" prompt -_SilphCo6AfterBattleText3:: +_SilphCo6FScientistAfterBattleText:: text "TIKSI BRANCH?" line "It's in Russian" cont "no man's land!" done -_SilphCo6BattleText4:: +_SilphCo6FRocket2BattleText:: text "You dare betray" line "TEAM ROCKET?" done -_SilphCo6EndBattleText4:: +_SilphCo6FRocket2EndBattleText:: text "You" line "traitor!" prompt -_SilphCo6AfterBattleText4:: +_SilphCo6FRocket2AfterBattleText:: text "If you stand for" line "justice, you" cont "betray evil!" diff --git a/text/SilphCo7F.asm b/text/SilphCo7F.asm index 1cc2bc30f..906c890a3 100644 --- a/text/SilphCo7F.asm +++ b/text/SilphCo7F.asm @@ -1,4 +1,4 @@ -_MeetLaprasGuyText:: +_SilphCo7FSilphWorkerM1HaveThisPokemonText:: text "Oh! Hi! You're" line "not a ROCKET! You" cont "came to save us?" @@ -9,7 +9,7 @@ _MeetLaprasGuyText:: cont "for saving us." prompt -_HeresYourLaprasText:: +_SilphCo7FSilphWorkerM1LaprasDescriptionText:: text "It's LAPRAS. It's" line "very intelligent." @@ -27,129 +27,129 @@ _HeresYourLaprasText:: cont "give you a lift!" done -_LaprasGuyText:: +_SilphCo7FSilphWorkerM1IsOurPresidentOkText:: text "TEAM ROCKET's" line "BOSS went to the" cont "boardroom! Is our" cont "PRESIDENT OK?" done -_LaprasGuySavedText:: +_SilphCo7FSilphWorkerM1SavedText:: text "Saved at last!" line "Thank you!" done -_SilphCo7Text_51e00:: +_SilphCo7FSilphWorkerM2AfterTheMasterBallText:: text "TEAM ROCKET was" line "after the MASTER" cont "BALL which will" cont "catch any #MON!" done -_CanceledMasterBallText:: +_SilphCo7FSilphWorkerM2CancelledMasterBallText:: text "We canceled the" line "MASTER BALL" cont "project because" cont "of TEAM ROCKET." done -_SilphCo7Text_51e23:: +_SilphCo7FSilphWorkerM3ItWouldBeBadText:: text "It would be bad" line "if TEAM ROCKET" cont "took over SILPH" cont "or our #MON!" done -_SilphCo7Text_51e28:: +_SilphCo7FSilphWorkerM3YouChasedOffTeamRocketText:: text "Wow! You chased" line "off TEAM ROCKET" cont "all by yourself?" done -_SilphCo7Text_51e46:: +_SilphCo7FSilphWorkerM4ItsReallyDangerousHereText:: text "You! It's really" line "dangerous here!" cont "You came to save" cont "me? You can't!" done -_SilphCo7Text_51e4b:: +_SilphCo7FSilphWorkerM4SafeAtLastText:: text "Safe at last!" line "Oh thank you!" done -_SilphCo7BattleText1:: +_SilphCo7FRocket1BattleText:: text "Oh ho! I smell a" line "little rat!" done -_SilphCo7EndBattleText1:: +_SilphCo7FRocket1EndBattleText:: text "Lights" line "out!" prompt -_SilphCo7AfterBattleText1:: +_SilphCo7FRocket1AfterBattleText:: text "You won't find my" line "BOSS by just" cont "scurrying around!" done -_SilphCo7BattleText2:: +_SilphCo7FScientistBattleText:: text "Heheh!" para "You mistook me for" line "a SILPH worker?" done -_SilphCo7EndBattleText2:: +_SilphCo7FScientistEndBattleText:: text "I'm" line "done!" prompt -_SilphCo7AfterBattleText2:: +_SilphCo7FScientistAfterBattleText:: text "Despite your age," line "you are a skilled" cont "trainer!" done -_SilphCo7BattleText3:: +_SilphCo7FRocket2BattleText:: text "I am one of the 4" line "ROCKET BROTHERS!" done -_SilphCo7EndBattleText3:: +_SilphCo7FRocket2EndBattleText:: text "Aack!" line "Brothers, I lost!" prompt -_SilphCo7AfterBattleText3:: +_SilphCo7FRocket2AfterBattleText:: text "Doesn't matter." line "My brothers will" cont "repay the favor!" done -_SilphCo7BattleText4:: +_SilphCo7FRocket3BattleText:: text "A child intruder?" line "That must be you!" done -_SilphCo7EndBattleText4:: +_SilphCo7FRocket3EndBattleText:: text "Fine!" line "I lost!" prompt -_SilphCo7AfterBattleText4:: +_SilphCo7FRocket3AfterBattleText:: text "Go on home" line "before my BOSS" cont "gets ticked off!" done -_SilphCo7Text_51ebe:: +_SilphCo7FRivalText:: text ": What" line "kept you ?" done -_SilphCo7Text_51ec3:: +_SilphCo7FRivalWaitedHereText:: text ": Hahaha!" line "I thought you'd" cont "turn up if I" @@ -166,13 +166,13 @@ _SilphCo7Text_51ec3:: cont "you got better!" done -_SilphCo7Text_51ec8:: +_SilphCo7FRivalDefeatedText:: text "Oh ho!" line "So, you are ready" cont "for BOSS ROCKET!" prompt -_SilphCo7Text_51ecd:: +_SilphCo7FRivalVictoryText:: text ": How can" line "I put this?" @@ -181,7 +181,7 @@ _SilphCo7Text_51ecd:: cont "with us big boys!" prompt -_SilphCo7Text_51ed2:: +_SilphCo7FRivalGoodLuckToYouText:: text "Well, !" para "I'm moving on up" diff --git a/text/SilphCo8F.asm b/text/SilphCo8F.asm index fabae5e6e..8e4cf93f4 100644 --- a/text/SilphCo8F.asm +++ b/text/SilphCo8F.asm @@ -1,56 +1,56 @@ -_SilphCo8Text_565be:: +__SilphCo8FSilphWorkerMThanksForSavingUsText:: text "I wonder if SILPH" line "is finished..." done -_SilphCo8Text_565c3:: +_SilphCo8FSilphWorkerMThanksForSavingUsText:: text "Thanks for saving" line "us!" done -_SilphCo8BattleText1:: +_SilphCo8FRocket1BattleText:: text "That's as far as" line "you'll go!" done -_SilphCo8EndBattleText1:: +_SilphCo8FRocket1EndBattleText:: text "Not" line "enough grit!" prompt -_SilphCo8AfterBattleText1:: +_SilphCo8FRocket1AfterBattleText:: text "If you don't turn" line "back, I'll call" cont "for backup!" done -_SilphCo8BattleText2:: +_SilphCo8FScientistBattleText:: text "You're causing us" line "problems!" done -_SilphCo8EndBattleText2:: +_SilphCo8FScientistEndBattleText:: text "Huh?" line "I lost?" prompt -_SilphCo8AfterBattleText2:: +_SilphCo8FScientistAfterBattleText:: text "So, what do you" line "think of SILPH" cont "BUILDING's maze?" done -_SilphCo8BattleText3:: +_SilphCo8FRocket2BattleText:: text "I am one of the 4" line "ROCKET BROTHERS!" done -_SilphCo8EndBattleText3:: +_SilphCo8FRocket2EndBattleText:: text "Whoo!" line "Oh brothers!" prompt -_SilphCo8AfterBattleText3:: +_SilphCo8FRocket2AfterBattleText:: text "I'll leave you up" line "to my brothers!" done diff --git a/text/SilphCo9F.asm b/text/SilphCo9F.asm index fd1aa91c5..f9b09228e 100644 --- a/text/SilphCo9F.asm +++ b/text/SilphCo9F.asm @@ -1,62 +1,62 @@ -_SilphCo9Text_5d8e5:: +SilphCo9FNurseYouLookTiredText:: text "You look tired!" line "You should take a" cont "quick nap!" prompt -_SilphCo9Text_5d8ea:: +SilphCo9FNurseDontGiveUpText:: text "Don't give up!" done -_SilphCo9Text_5d8ef:: +SilphCo9FNurseThankYouText:: text "Thank you so" line "much!" done -_SilphCo9BattleText1:: +_SilphCo9FRocket1BattleText:: text "Your #MON seem" line "to adore you, kid!" done -_SilphCo9EndBattleText1:: +_SilphCo9FRocket1EndBattleText:: text "Ghaaah!" prompt -_SilphCo9AfterBattleText1:: +_SilphCo9FRocket1AfterBattleText:: text "If I had started" line "as a trainer at" cont "your age..." done -_SilphCo9BattleText2:: +_SilphCo9FScientistBattleText:: text "Your #MON have" line "weak points! I" cont "can nail them!" done -_SilphCo9EndBattleText2:: +_SilphCo9FScientistEndBattleText:: text "You" line "hammered me!" prompt -_SilphCo9AfterBattleText2:: +_SilphCo9FScientistAfterBattleText:: text "Exploiting weak" line "spots does work!" cont "Think about" cont "element types!" done -_SilphCo9BattleText3:: +_SilphCo9FRocket2BattleText:: text "I am one of the 4" line "ROCKET BROTHERS!" done -_SilphCo9EndBattleText3:: +_SilphCo9FRocket2EndBattleText:: text "Warg!" line "Brothers, I lost!" prompt -_SilphCo9AfterBattleText3:: +_SilphCo9FRocket2AfterBattleText:: text "My brothers will" line "avenge me!" done diff --git a/text/UndergroundPathRoute6.asm b/text/UndergroundPathRoute6.asm index dacc44f75..85cfdda20 100644 --- a/text/UndergroundPathRoute6.asm +++ b/text/UndergroundPathRoute6.asm @@ -1,4 +1,4 @@ -_UndergrdTunnelEntRoute6Text1:: +_UndergroundPathRoute6GirlText:: text "People often lose" line "things in that" cont "UNDERGROUND PATH." diff --git a/text/UndergroundPathRoute7.asm b/text/UndergroundPathRoute7.asm index 5cde36143..e7562764a 100644 --- a/text/UndergroundPathRoute7.asm +++ b/text/UndergroundPathRoute7.asm @@ -1,4 +1,4 @@ -_UndergroundPathEntRoute7Text1:: +_UndergroundPathRoute7MiddleAgedManText:: text "I heard a sleepy" line "#MON appeared" cont "near CELADON CITY." diff --git a/text/UndergroundPathRoute7Copy.asm b/text/UndergroundPathRoute7Copy.asm index 4e0dc3ca0..09ba09ca6 100644 --- a/text/UndergroundPathRoute7Copy.asm +++ b/text/UndergroundPathRoute7Copy.asm @@ -1,4 +1,4 @@ -_UGPathRoute7EntranceUnusedText_5d773:: +_UndergroundPathRoute7CopyUnusedGirlText:: text "I want to shop at" line "the dept. store" cont "in CELADON but..." @@ -8,13 +8,13 @@ _UGPathRoute7EntranceUnusedText_5d773:: cont "people there." done -_UGPathRoute7EntranceUnusedText_5d778:: +_UndergroundPathRoute7CopyUnusedTeamRocketHadAHideoutText:: text "TEAM ROCKET had a" line "secret hideout in" cont "CELADON CITY?" done -_UGPathRoute7EntranceUnusedText_5d77d:: +_UndergroundPathRoute7CopyUnusedMiddleAgedManText:: text "You're here to" line "shop in CELADON?" @@ -22,7 +22,7 @@ _UGPathRoute7EntranceUnusedText_5d77d:: line "and head west!" done -_UGPathRoute7EntranceUnusedText_5d782:: +_UndergroundPathRoute7CopyUnusedGoesUnderSaffronText:: text "The UNDERGROUND" line "PATH goes beneath" cont "SAFFRON and leads" diff --git a/text/UndergroundPathRoute8.asm b/text/UndergroundPathRoute8.asm index da785c8e8..6aa54d3c4 100644 --- a/text/UndergroundPathRoute8.asm +++ b/text/UndergroundPathRoute8.asm @@ -1,4 +1,4 @@ -_UndergroundPathEntRoute8Text1:: +_UndergroundPathRoute8GirlText:: text "The dept. store" line "in CELADON has a" cont "great selection!" diff --git a/text/VermilionCity.asm b/text/VermilionCity.asm index 2f60eb979..d850acbf3 100644 --- a/text/VermilionCity.asm +++ b/text/VermilionCity.asm @@ -1,4 +1,4 @@ -_VermilionCityText1:: +_VermilionCityBeautyText:: text "We're careful" line "about pollution!" @@ -7,13 +7,13 @@ _VermilionCityText1:: cont "toxic sludge!" done -_VermilionCityTextDidYouSee:: +_VermilionCityGambler1DidYouSeeText:: text "Did you see S.S." line "ANNE moored in" cont "the harbor?" done -_VermilionCityTextSSAnneDeparted:: +_VermilionCityGambler1SSAnneDepartedText:: text "So, S.S.ANNE has" line "departed!" @@ -21,12 +21,12 @@ _VermilionCityTextSSAnneDeparted:: line "about a year." done -_SSAnneWelcomeText4:: +_VermilionCitySailor1WelcomeToSSAnneText:: text "Welcome to S.S." line "ANNE!" done -_SSAnneWelcomeText9:: +_VermilionCitySailor1DoYouHaveATicketText:: text "Welcome to S.S." line "ANNE!" @@ -34,7 +34,7 @@ _SSAnneWelcomeText9:: line "have a ticket?" prompt -_SSAnneFlashedTicketText:: +_VermilionCitySailor1FlashedTicketText:: text " flashed" line "the S.S.TICKET!" @@ -42,7 +42,7 @@ _SSAnneFlashedTicketText:: line "S.S.ANNE!" done -_SSAnneNoTicketText:: +_VermilionCitySailor1YouNeedATicketText:: text " doesn't" line "have the needed" cont "S.S.TICKET." @@ -53,11 +53,11 @@ _SSAnneNoTicketText:: line "to get aboard." done -_SSAnneNotHereText:: +_VermilionCitySailor1ShipSetSailText:: text "The ship set sail." done -_VermilionCityText4:: +_VermilionCityGambler2Text:: text "I'm putting up a" line "building on this" cont "plot of land." @@ -66,19 +66,19 @@ _VermilionCityText4:: line "tamping the land." done -_VermilionCityText5:: +_VermilionCityMachopText:: text "MACHOP: Guoh!" line "Gogogoh!@" text_end -_VermilionCityText14:: +_VermilionCityMachopStompingTheLandFlatText:: text_start para "A MACHOP is" line "stomping the land" cont "flat." done -_VermilionCityText6:: +_VermilionCitySailor2Text:: text "S.S.ANNE is a" line "famous luxury" cont "cruise ship." @@ -87,13 +87,13 @@ _VermilionCityText6:: line "once a year." done -_VermilionCityText7:: +_VermilionCitySignText:: text "VERMILION CITY" line "The Port of" cont "Exquisite Sunsets" done -_VermilionCityText8:: +_VermilionCityNoticeSignText:: text "NOTICE!" para "ROUTE 12 may be" @@ -107,13 +107,13 @@ _VermilionCityText8:: para "VERMILION POLICE" done -_VermilionCityText11:: +_VermilionCityPokemonFanClubSignText:: text "#MON FAN CLUB" line "All #MON fans" cont "welcome!" done -_VermilionCityText12:: +_VermilionCityGymSignText:: text "VERMILION CITY" line "#MON GYM" cont "LEADER: LT.SURGE" @@ -122,6 +122,6 @@ _VermilionCityText12:: line "American!" done -_VermilionCityText13:: +_VermilionCityHarborSignText:: text "VERMILION HARBOR" done diff --git a/text/VermilionDock.asm b/text/VermilionDock.asm index aaf1ed34c..91201cc20 100644 --- a/text/VermilionDock.asm +++ b/text/VermilionDock.asm @@ -1,3 +1,3 @@ -_VermilionDockText1:: +_VermilionDockUnusedText:: text_start done diff --git a/text/VermilionGym.asm b/text/VermilionGym.asm index 14e0bceae..0d2902353 100644 --- a/text/VermilionGym.asm +++ b/text/VermilionGym.asm @@ -1,4 +1,4 @@ -_LTSurgePreBattleText:: +_VermilionGymLTSurgePreBattleText:: text "Hey, kid! What do" line "you think you're" cont "doing here?" diff --git a/text/VermilionGym_2.asm b/text/VermilionGym_2.asm index 018574838..1dac45526 100644 --- a/text/VermilionGym_2.asm +++ b/text/VermilionGym_2.asm @@ -1,4 +1,4 @@ -_LTSurgePostBattleAdviceText:: +_VermilionGymLTSurgePostBattleAdviceText:: text "A little word of" line "advice, kid!" @@ -10,7 +10,7 @@ _LTSurgePostBattleAdviceText:: cont "type #MON!" done -_LTSurgeThunderBadgeInfoText:: +_VermilionGymLTSurgeThunderBadgeInfoText:: text "The THUNDERBADGE" line "cranks up your" cont "#MON's SPEED!" @@ -23,7 +23,7 @@ _LTSurgeThunderBadgeInfoText:: line "kid! Take this!" done -_ReceivedTM24Text:: +_VermilionGymLTSurgeReceivedTM24Text:: text " received " line "@" text_ram wStringBuffer @@ -40,12 +40,12 @@ _TM24ExplanationText:: line "electric #MON!" done -_TM24NoRoomText:: +_VermilionGymLTSurgeTM24NoRoomText:: text "Yo kid, make room" line "in your pack!" done -_ReceivedThunderBadgeText:: +_VermilionGymLTSurgeReceivedThunderBadgeText:: text "Whoa!" para "You're the real" @@ -55,18 +55,18 @@ _ReceivedThunderBadgeText:: line "the THUNDERBADGE!" prompt -_VermilionGymBattleText1:: +_VermilionGymGentlemanBattleText:: text "When I was in the" line "Army, LT.SURGE" cont "was my strict CO!" done -_VermilionGymEndBattleText1:: +_VermilionGymGentlemanEndBattleText:: text "Stop!" line "You're very good!" prompt -_VermilionGymAfterBattleText1:: +_VermilionGymGentlemanAfterBattleText:: text "The door won't" line "open?" @@ -74,17 +74,17 @@ _VermilionGymAfterBattleText1:: line "was cautious!" done -_VermilionGymBattleText2:: +_VermilionGymSuperNerdBattleText:: text "I'm a lightweight," line "but I'm good with" cont "electricity!" done -_VermilionGymEndBattleText2:: +_VermilionGymSuperNerdEndBattleText:: text "Fried!" prompt -_VermilionGymAfterBattleText2:: +_VermilionGymSuperNerdAfterBattleText:: text "OK, I'll talk!" para "LT.SURGE said he" @@ -92,17 +92,17 @@ _VermilionGymAfterBattleText2:: cont "inside something!" done -_VermilionGymBattleText3:: +_VermilionGymSailorBattleText:: text "This is no place" line "for kids!" done -_VermilionGymEndBattleText3:: +_VermilionGymSailorEndBattleText:: text "Wow!" line "Surprised me!" prompt -_VermilionGymAfterBattleText3:: +_VermilionGymSailorAfterBattleText:: text "LT.SURGE set up" line "double locks!" cont "Here's a hint!" @@ -113,7 +113,7 @@ _VermilionGymAfterBattleText3:: cont "next to it!" done -_VermilionGymGuidePreBattleText:: +_VermilionGymGymGuideChampInMakingText:: text "Yo! Champ in" line "making!" @@ -139,7 +139,7 @@ _VermilionGymGuidePreBattleText:: cont "get to him!" done -_VermilionGymGuidePostBattleText:: +_VermilionGymGymGuideBeatLTSurgeText:: text "Whew! That match" line "was electric!" done diff --git a/text/VermilionMart.asm b/text/VermilionMart.asm index 107439895..f2e36d117 100644 --- a/text/VermilionMart.asm +++ b/text/VermilionMart.asm @@ -1,4 +1,4 @@ -_VermilionMartText2:: +_VermilionMartCooltrainerMText:: text "There are evil" line "people who will" cont "use #MON for" @@ -15,7 +15,7 @@ _VermilionMartText2:: cont "useful." done -_VermilionMartText3:: +_VermilionMartCooltrainerFText:: text "I think #MON" line "can be good or" cont "evil. It depends" diff --git a/text/VermilionOldRodHouse.asm b/text/VermilionOldRodHouse.asm index 587681b2f..e08f17124 100644 --- a/text/VermilionOldRodHouse.asm +++ b/text/VermilionOldRodHouse.asm @@ -1,4 +1,4 @@ -_VermilionHouse2Text_560b1:: +_VermilionOldRodHouseFishingGuruDoYouLikeToFishText:: text "I'm the FISHING" line "GURU!" @@ -9,7 +9,7 @@ _VermilionHouse2Text_560b1:: line "fish?" done -_VermilionHouse2Text_560b6:: +_VermilionOldRodHouseFishingGuruTakeThisText:: text "Grand! I like" line "your style!" @@ -22,7 +22,7 @@ _VermilionHouse2Text_560b6:: text "!@" text_end -_VermilionHouse2Text_560bb:: +_VermilionOldRodHouseFishingGuruFishingIsAWayOfLifeText:: text_start para "Fishing is a way" @@ -34,12 +34,12 @@ _VermilionHouse2Text_560bb:: cont "one, young one!" done -_VermilionHouse2Text_560c0:: +_VermilionOldRodHouseFishingGuruThatsSoDisappointingText:: text "Oh... That's so" line "disappointing..." done -_VermilionHouse2Text_560c5:: +_VermilionOldRodHouseFishingGuruHowAreTheFishBitingText:: text "Hello there," line "!" @@ -47,7 +47,7 @@ _VermilionHouse2Text_560c5:: line "biting?" done -_VermilionHouse2Text_560ca:: +_VermilionOldRodHouseFishingGuruNoRoomText:: text "Oh no!" para "You have no room" diff --git a/text/VermilionPidgeyHouse.asm b/text/VermilionPidgeyHouse.asm index 858e84f3e..ea238d6d3 100644 --- a/text/VermilionPidgeyHouse.asm +++ b/text/VermilionPidgeyHouse.asm @@ -1,15 +1,15 @@ -_VermilionHouse1Text1:: +_VermilionPidgeyHouseYoungsterText:: text "I'm getting my" line "PIDGEY to fly a" cont "letter to SAFFRON" cont "in the north!" done -_VermilionHouse1Text2:: +_VermilionPidgeyHousePidgeyText:: text "PIDGEY: Kurukkoo!@" text_end -_VermilionHouse1Text3:: +_VermilionPidgeyHouseLetterText:: text "Dear PIPPI, I hope" line "to see you soon." diff --git a/text/VermilionPokecenter.asm b/text/VermilionPokecenter.asm index c9e9a581d..e911d18b0 100644 --- a/text/VermilionPokecenter.asm +++ b/text/VermilionPokecenter.asm @@ -1,4 +1,4 @@ -_VermilionPokecenterText2:: +_VermilionPokecenterFishingGuruText:: text "Even if they are" line "the same level," cont "#MON can have" @@ -11,7 +11,7 @@ _VermilionPokecenterText2:: cont "in the wild." done -_VermilionPokecenterText3:: +_VermilionPokecenterSailorText:: text "My #MON was" line "poisoned! It" cont "fainted while we" diff --git a/text/VictoryRoad1F.asm b/text/VictoryRoad1F.asm index 1523db883..a1c0526a9 100644 --- a/text/VictoryRoad1F.asm +++ b/text/VictoryRoad1F.asm @@ -1,31 +1,31 @@ -_VictoryRoad1BattleText1:: +_VictoryRoad1FCooltrainerFBattleText:: text "I wonder if you" line "are good enough" cont "for me!" done -_VictoryRoad1EndBattleText1:: +_VictoryRoad1FCooltrainerFEndBattleText:: text "I" line "lost out!" prompt -_VictoryRoad1AfterBattleText1:: +_VictoryRoad1FCooltrainerFAfterBattleText:: text "I never wanted to" line "lose to anybody!" done -_VictoryRoad1BattleText2:: +_VictoryRoad1FCooltrainerMBattleText:: text "I can see you're" line "good! Let me see" cont "exactly how good!" done -_VictoryRoad1EndBattleText2:: +_VictoryRoad1FCooltrainerMEndBattleText:: text "I" line "had a chance..." prompt -_VictoryRoad1AfterBattleText2:: +_VictoryRoad1FCooltrainerMAfterBattleText:: text "I concede, you're" line "better than me!" done diff --git a/text/VictoryRoad2F.asm b/text/VictoryRoad2F.asm index ff72afaaf..7275222dc 100644 --- a/text/VictoryRoad2F.asm +++ b/text/VictoryRoad2F.asm @@ -1,85 +1,85 @@ -_MoltresBattleText:: +_VictoryRoad2FMoltresBattleText:: text "Gyaoo!@" text_end -_VictoryRoad2BattleText1:: +_VictoryRoad2FHikerBattleText:: text "VICTORY ROAD is" line "the final test" cont "for trainers!" done -_VictoryRoad2EndBattleText1:: +_VictoryRoad2FHikerEndBattleText:: text "Aiyah!" prompt -_VictoryRoad2AfterBattleText1:: +_VictoryRoad2FHikerAfterBattleText:: text "If you get stuck," line "try moving some" cont "boulders around!" done -_VictoryRoad2BattleText2:: +_VictoryRoad2FSuperNerd1BattleText:: text "Ah, so you wish" line "to challenge the" cont "ELITE FOUR?" done -_VictoryRoad2EndBattleText2:: +_VictoryRoad2FSuperNerd1EndBattleText:: text "You" line "got me!" prompt -_VictoryRoad2AfterBattleText2:: +_VictoryRoad2FSuperNerd1AfterBattleText:: text " also came" line "through here!" done -_VictoryRoad2BattleText3:: +_VictoryRoad2FCooltrainerMBattleText:: text "Come on!" line "I'll whip you!" done -_VictoryRoad2EndBattleText3:: +_VictoryRoad2FCooltrainerMEndBattleText:: text "I got" line "whipped!" prompt -_VictoryRoad2AfterBattleText3:: +_VictoryRoad2FCooltrainerMAfterBattleText:: text "You earned the" line "right to be on" cont "VICTORY ROAD!" done -_VictoryRoad2BattleText4:: +_VictoryRoad2FSuperNerd2BattleText:: text "If you can get" line "through here, you" cont "can go meet the" cont "ELITE FOUR!" done -_VictoryRoad2EndBattleText4:: +_VictoryRoad2FSuperNerd2EndBattleText:: text "No!" line "Unbelievable!" prompt -_VictoryRoad2AfterBattleText4:: +_VictoryRoad2FSuperNerd2AfterBattleText:: text "I can beat you" line "when it comes to" cont "knowledge about" cont "#MON!" done -_VictoryRoad2BattleText5:: +_VictoryRoad2FSuperNerd3BattleText:: text "Is VICTORY ROAD" line "too tough?" done -_VictoryRoad2EndBattleText5:: +_VictoryRoad2FSuperNerd3EndBattleText:: text "Well" line "done!" prompt -_VictoryRoad2AfterBattleText5:: +_VictoryRoad2FSuperNerd3AfterBattleText:: text "Many trainers give" line "up the challenge" cont "here." diff --git a/text/VictoryRoad3F.asm b/text/VictoryRoad3F.asm index 07e0be70f..95cdeb3f8 100644 --- a/text/VictoryRoad3F.asm +++ b/text/VictoryRoad3F.asm @@ -1,62 +1,62 @@ -_VictoryRoad3BattleText2:: +_VictoryRoad3FCooltrainerM1BattleText:: text "I heard rumors of" line "a child prodigy!" done -_VictoryRoad3EndBattleText2:: +_VictoryRoad3FCooltrainerM1EndBattleText:: text "The" line "rumors were true!" prompt -_VictoryRoad3AfterBattleText2:: +_VictoryRoad3FCooltrainerM1AfterBattleText:: text "You beat GIOVANNI" line "of TEAM ROCKET?" done -_VictoryRoad3BattleText3:: +_VictoryRoad3FCooltrainerF1BattleText:: text "I'll show you just" line "how good you are!" done -_VictoryRoad3EndBattleText3:: +_VictoryRoad3FCooltrainerF1EndBattleText:: text "I'm" line "furious!" prompt -_VictoryRoad3AfterBattleText3:: +_VictoryRoad3FCooltrainerF1AfterBattleText:: text "You showed me just" line "how good I was!" done -_VictoryRoad3BattleText4:: +_VictoryRoad3FCooltrainerM2BattleText:: text "Only the chosen" line "can pass here!" done -_VictoryRoad3EndBattleText4:: +_VictoryRoad3FCooltrainerM2EndBattleText:: text "I" line "don't believe it!" prompt -_VictoryRoad3AfterBattleText4:: +_VictoryRoad3FCooltrainerM2AfterBattleText:: text "All trainers here" line "are headed to the" cont "#MON LEAGUE!" cont "Be careful!" done -_VictoryRoad3BattleText5:: +_VictoryRoad3FCooltrainerF2BattleText:: text "Trainers live to" line "seek stronger" cont "opponents!" done -_VictoryRoad3EndBattleText5:: +_VictoryRoad3FCooltrainerF2EndBattleText:: text "Oh!" line "So strong!" prompt -_VictoryRoad3AfterBattleText5:: +_VictoryRoad3FCooltrainerF2AfterBattleText:: text "By fighting tough" line "battles, you get" cont "stronger!" diff --git a/text/ViridianCity.asm b/text/ViridianCity.asm index 8ee813483..6f45bfa3b 100644 --- a/text/ViridianCity.asm +++ b/text/ViridianCity.asm @@ -1,4 +1,4 @@ -_ViridianCityText1:: +_ViridianCityYoungster1Text:: text "Those # BALLs" line "at your waist!" cont "You have #MON!" @@ -9,7 +9,7 @@ _ViridianCityText1:: cont "time, anywhere!" done -_ViridianCityText_19122:: +_ViridianCityGambler1GymAlwaysClosedText:: text "This #MON GYM" line "is always closed." @@ -17,23 +17,23 @@ _ViridianCityText_19122:: line "LEADER is?" done -_ViridianCityText_19127:: +_ViridianCityGambler1GymLeaderReturnedText:: text "VIRIDIAN GYM's" line "LEADER returned!" done -_ViridianCityText_1914d:: +_ViridianCityYoungster2YouWantToKnowAboutText:: text "You want to know" line "about the 2 kinds" cont "of caterpillar" cont "#MON?" done -_ViridianCityText_19152:: +ViridianCityYoungster2OkThenText:: text "Oh, OK then!" done -_ViridianCityText_19157:: +ViridianCityYoungster2CaterpieAndWeedleDescriptionText:: text "CATERPIE has no" line "poison, but" cont "WEEDLE does." @@ -42,14 +42,14 @@ _ViridianCityText_19157:: line "POISON STING!" done -_ViridianCityText_19175:: +_ViridianCityGirlHasntHadHisCoffeeYetText:: text "Oh Grandpa! Don't" line "be so mean!" cont "He hasn't had his" cont "coffee yet." done -_ViridianCityText_1917a:: +_ViridianCityGirlWhenIGoShopText:: text "When I go shop in" line "PEWTER CITY, I" cont "have to take the" @@ -57,7 +57,7 @@ _ViridianCityText_1917a:: cont "VIRIDIAN FOREST." done -_ViridianCityText_19191:: +_ViridianCityOldManSleepyPrivatePropertyText:: text "You can't go" line "through here!" @@ -65,7 +65,7 @@ _ViridianCityText_19191:: line "property!" done -_ViridianCityText_191ca:: +ViridianCityFisherYouCanHaveThisText:: text "Yawn!" line "I must have dozed" cont "off in the sun." @@ -82,23 +82,23 @@ _ViridianCityText_191ca:: cont "have this TM." prompt -_ReceivedTM42Text:: +_ViridianCityFisherReceivedTM42Text:: text " received" line "TM42!@" text_end -_TM42Explanation:: +_ViridianCityFisherTM42ExplanationText:: text "TM42 contains" line "DREAM EATER..." cont "...Snore..." done -_TM42NoRoomText:: +_ViridianCityFisherTM42NoRoomText:: text "You have too much" line "stuff already." done -_ViridianCityText_1920a:: +_ViridianCityOldManHadMyCoffeeNowText:: text "Ahh, I've had my" line "coffee now and I" cont "feel great!" @@ -110,7 +110,7 @@ _ViridianCityText_1920a:: line "hurry?" done -_ViridianCityText_1920f:: +_ViridianCityOldManKnowHowToCatchPokemonText:: text "I see you're using" line "a #DEX." @@ -127,24 +127,24 @@ _ViridianCityText_1920f:: line "how to then." done -_ViridianCityText_19214:: +_ViridianCityOldManTimeIsMoneyText:: text "Time is money..." line "Go along then." done -_ViridianCityText_19219:: +_ViridianCityOldManYouNeedToWeakenTheTargetText:: text "First, you need" line "to weaken the" cont "target #MON." done -_ViridianCityText8:: +_ViridianCitySignText:: text "VIRIDIAN CITY " line "The Eternally" cont "Green Paradise" done -_ViridianCityText9:: +_ViridianCityTrainerTips1Text:: text "TRAINER TIPS" para "Catch #MON" @@ -156,7 +156,7 @@ _ViridianCityText9:: cont "to fight!" done -_ViridianCityText10:: +_ViridianCityTrainerTips2Text:: text "TRAINER TIPS" para "The battle moves" @@ -170,12 +170,12 @@ _ViridianCityText10:: cont "#MON CENTER!" done -_ViridianCityText13:: +_ViridianCityGymSignText:: text "VIRIDIAN CITY" line "#MON GYM" done -_ViridianCityText14:: +_ViridianCityGymLockedText:: text "The GYM's doors" line "are locked..." done diff --git a/text/ViridianForest.asm b/text/ViridianForest.asm index 813b193a7..925299f28 100644 --- a/text/ViridianForest.asm +++ b/text/ViridianForest.asm @@ -1,4 +1,4 @@ -_ViridianForestText1:: +_ViridianForestYoungster1Text:: text "I came here with" line "some friends!" @@ -6,53 +6,53 @@ _ViridianForestText1:: line "#MON fights!" done -_ViridianForestBattleText1:: +_ViridianForestYoungster2BattleText:: text "Hey! You have" line "#MON! Come on!" cont "Let's battle'em!" done -_ViridianForestEndBattleText1:: +_ViridianForestYoungster2EndBattleText:: text "No!" line "CATERPIE can't" cont "cut it!" prompt -_ViridianFrstAfterBattleText1:: +_ViridianForestYoungster2AfterBattleText:: text "Ssh! You'll scare" line "the bugs away!" done -_ViridianForestBattleText2:: +_ViridianForestYoungster3BattleText:: text "Yo! You can't jam" line "out if you're a" cont "#MON trainer!" done -_ViridianForestEndBattleText2:: +_ViridianForestYoungster3EndBattleText:: text "Huh?" line "I ran out of" cont "#MON!" prompt -_ViridianFrstAfterBattleText2:: +_ViridianForestYoungster3AfterBattleText:: text "Darn! I'm going" line "to catch some" cont "stronger ones!" done -_ViridianForestBattleText3:: +_ViridianForestYoungster4BattleText:: text "Hey, wait up!" line "What's the hurry?" done -_ViridianForestEndBattleText3:: +_ViridianForestYoungster4EndBattleText:: text "I" line "give! You're good" cont "at this!" prompt -_ViridianFrstAfterBattleText3:: +_ViridianForestYoungster4AfterBattleText:: text "Sometimes, you" line "can find stuff on" cont "the ground!" @@ -62,7 +62,7 @@ _ViridianFrstAfterBattleText3:: cont "dropped!" done -_ViridianForestText8:: +_ViridianForestYoungster5Text:: text "I ran out of #" line "BALLs to catch" cont "#MON with!" @@ -71,7 +71,7 @@ _ViridianForestText8:: line "extras!" done -_ViridianForestText9:: +_ViridianForestTrainerTips1Text:: text "TRAINER TIPS" para "If you want to" @@ -80,13 +80,13 @@ _ViridianForestText9:: cont "grassy areas!" done -_ViridianForestText10:: +_ViridianForestUseAntidoteSignText:: text "For poison, use" line "ANTIDOTE! Get it" cont "at #MON MARTs!" done -_ViridianForestText11:: +_ViridianForestTrainerTips2Text:: text "TRAINER TIPS" para "Contact PROF.OAK" @@ -95,7 +95,7 @@ _ViridianForestText11:: cont "evaluated!" done -_ViridianForestText12:: +_ViridianForestTrainerTips3Text:: text "TRAINER TIPS" para "No stealing of" @@ -105,7 +105,7 @@ _ViridianForestText12:: cont "#MON!" done -_ViridianForestText13:: +_ViridianForestTrainerTips4Text:: text "TRAINER TIPS" para "Weaken #MON" @@ -116,7 +116,7 @@ _ViridianForestText13:: line "they may escape!" done -_ViridianForestText14:: +_ViridianForestLeavingSignText:: text "LEAVING" line "VIRIDIAN FOREST" cont "PEWTER CITY AHEAD" diff --git a/text/ViridianForestNorthGate.asm b/text/ViridianForestNorthGate.asm index ab6a5a1d2..2939caa2d 100644 --- a/text/ViridianForestNorthGate.asm +++ b/text/ViridianForestNorthGate.asm @@ -1,4 +1,4 @@ -_ViridianForestExitText1:: +_ViridianForestNorthGateSuperNerdText:: text "Many #MON live" line "only in forests " cont "and caves." @@ -8,7 +8,7 @@ _ViridianForestExitText1:: cont "different kinds!" done -_ViridianForestExitText2:: +_ViridianForestNorthGateGrampsText:: text "Have you noticed" line "the bushes on the" cont "roadside?" diff --git a/text/ViridianForestSouthGate.asm b/text/ViridianForestSouthGate.asm index c1a8df225..1226bca78 100644 --- a/text/ViridianForestSouthGate.asm +++ b/text/ViridianForestSouthGate.asm @@ -1,11 +1,11 @@ -_ViridianForestEntranceText1:: +_ViridianForestSouthGateGirlText:: text "Are you going to" line "VIRIDIAN FOREST?" cont "Be careful, it's" cont "a natural maze!" done -_ViridianForestEntranceText2:: +_ViridianForestSouthGateLittleGirlText:: text "RATTATA may be" line "small, but its" cont "bite is wicked!" diff --git a/text/ViridianGym.asm b/text/ViridianGym.asm index feac79637..2999a8923 100644 --- a/text/ViridianGym.asm +++ b/text/ViridianGym.asm @@ -1,4 +1,4 @@ -_GiovanniPreBattleText:: +_ViridianGymGiovanniPreBattleText:: text "Fwahahaha! This is" line "my hideout!" @@ -18,7 +18,7 @@ _GiovanniPreBattleText:: cont "greatest trainer!" done -_ReceivedEarthBadgeText:: +_ViridianGymGiovanniReceivedEarthBadgeText:: text "Ha!" line "That was a truly" cont "intense fight!" @@ -27,7 +27,7 @@ _ReceivedEarthBadgeText:: cont "the EARTHBADGE!@" text_end -_GiovanniPostBattleAdviceText:: +_ViridianGymGiovanniPostBattleAdviceText:: text "Having lost, I" line "cannot face my" cont "underlings!" @@ -43,7 +43,7 @@ _GiovanniPostBattleAdviceText:: cont "Farewell!@" text_end -_GiovanniEarthBadgeInfoText:: +_ViridianGymGiovanniEarthBadgeInfoText:: text "The EARTHBADGE" line "makes #MON of" cont "any level obey!" @@ -61,12 +61,12 @@ _GiovanniEarthBadgeInfoText:: cont "LEAGUE challenge!" done -_ReceivedTM27Text:: +_ViridianGymGiovanniReceivedTM27Text:: text " received" line "TM27!@" text_end -_TM27ExplanationText:: +_ViridianGymGiovanniTM27ExplanationText:: text_start para "TM27 is FISSURE!" @@ -79,136 +79,136 @@ _TM27ExplanationText:: cont "too long ago..." done -_TM27NoRoomText:: +_ViridianGymGiovanniTM27NoRoomText:: text "You do not have" line "space for this!" done -_ViridianGymBattleText1:: +_ViridianGymCooltrainerM1BattleText:: text "Heh! You must be" line "running out of" cont "steam by now!" done -_ViridianGymEndBattleText1:: +_ViridianGymCooltrainerM1EndBattleText:: text "I" line "ran out of gas!" prompt -_ViridianGymAfterBattleText1:: +_ViridianGymCooltrainerM1AfterBattleText:: text "You need power to" line "keep up with our" cont "GYM LEADER!" done -_ViridianGymBattleText2:: +_ViridianGymHiker1BattleText:: text "Rrrroar! I'm" line "working myself" cont "into a rage!" done -_ViridianGymEndBattleText2:: +_ViridianGymHiker1EndBattleText:: text "Wargh!" prompt -_ViridianGymAfterBattleText2:: +_ViridianGymHiker1AfterBattleText:: text "I'm still not" line "worthy!" done -_ViridianGymBattleText3:: +_ViridianGymRocker1BattleText:: text "#MON and I, we" line "make wonderful" cont "music together!" done -_ViridianGymEndBattleText3:: +_ViridianGymRocker1EndBattleText:: text "You are in" line "perfect harmony!" prompt -_ViridianGymAfterBattleText3:: +_ViridianGymRocker1AfterBattleText:: text "Do you know the" line "identity of our" cont "GYM LEADER?" done -_ViridianGymBattleText4:: +_ViridianGymHiker2BattleText:: text "Karate is the" line "ultimate form of" cont "martial arts!" done -_ViridianGymEndBattleText4:: +_ViridianGymHiker2EndBattleText:: text "Atcho!" prompt -_ViridianGymAfterBattleText4:: +_ViridianGymHiker2AfterBattleText:: text "If my #MON" line "were as good at" cont "Karate as I..." done -_ViridianGymBattleText5:: +_ViridianGymCooltrainerM2BattleText:: text "The truly talented" line "win with style!" done -_ViridianGymEndBattleText5:: +_ViridianGymCooltrainerM2EndBattleText:: text "I" line "lost my grip!" prompt -_ViridianGymAfterBattleText5:: +_ViridianGymCooltrainerM2AfterBattleText:: text "The LEADER will" line "scold me!" done -_ViridianGymBattleText6:: +_ViridianGymHiker3BattleText:: text "I'm the KARATE" line "KING! Your fate" cont "rests with me!" done -_ViridianGymEndBattleText6:: +_ViridianGymHiker3EndBattleText:: text "Ayah!" prompt -_ViridianGymAfterBattleText6:: +_ViridianGymHiker3AfterBattleText:: text "#MON LEAGUE?" line "You? Don't get" cont "cocky!" done -_ViridianGymBattleText7:: +_ViridianGymRocker2BattleText:: text "Your #MON will" line "cower at the" cont "crack of my whip!" done -_ViridianGymEndBattleText7:: +_ViridianGymRocker2EndBattleText:: text "Yowch!" line "Whiplash!" prompt -_ViridianGymAfterBattleText7:: +_ViridianGymRocker2AfterBattleText:: text "Wait! I was just" line "careless!" done -_ViridianGymBattleText8:: +_ViridianGymCooltrainerM3BattleText:: text "VIRIDIAN GYM was" line "closed for a long" cont "time, but now our" cont "LEADER is back!" done -_ViridianGymEndBattleText8:: +_ViridianGymCooltrainerM3EndBattleText:: text "I" line "was beaten?" prompt -_ViridianGymAfterBattleText8:: +_ViridianGymCooltrainerM3AfterBattleText:: text "You can go onto" line "#MON LEAGUE" cont "only by defeating" diff --git a/text/ViridianMart.asm b/text/ViridianMart.asm index 640d7fd11..90ac2bfae 100644 --- a/text/ViridianMart.asm +++ b/text/ViridianMart.asm @@ -1,14 +1,14 @@ -_ViridianMartText1:: +_ViridianMartClerkSayHiToOakText:: text "Okay! Say hi to" line "PROF.OAK for me!" done -_ViridianMartText4:: +_ViridianMartClerkYouCameFromPalletTownText:: text "Hey! You came from" line "PALLET TOWN?" done -ViridianMartParcelQuestText:: +_ViridianMartClerkParcelQuestText:: text "You know PROF." line "OAK, right?" @@ -20,12 +20,12 @@ ViridianMartParcelQuestText:: line "OAK's PARCEL!@" text_end -_ViridianMartText2:: +_ViridianMartYoungsterText:: text "This shop sells" line "many ANTIDOTEs." done -_ViridianMartText3:: +_ViridianMartCooltrainerMText:: text "No! POTIONs are" line "all sold out." done diff --git a/text/ViridianNicknameHouse.asm b/text/ViridianNicknameHouse.asm index 757f597a3..987ecb3a7 100644 --- a/text/ViridianNicknameHouse.asm +++ b/text/ViridianNicknameHouse.asm @@ -1,4 +1,4 @@ -_ViridianHouseText1:: +_ViridianNicknameHouseBaldingGuyText:: text "Coming up with" line "nicknames is fun," cont "but hard." @@ -8,16 +8,16 @@ _ViridianHouseText1:: cont "remember." done -_ViridianHouseText2:: +_ViridianNicknameHouseLittleGirlText:: text "My Daddy loves" line "#MON too." done -_ViridianHouseText_1d5b1:: +_ViridianNicknameHouseSpearowText:: text "SPEARY: Tetweet!" done -_ViridianHouseText4:: +_ViridianNicknameHouseSpearySignText:: text "SPEAROW" line "Name: SPEARY" done diff --git a/text/ViridianPokecenter.asm b/text/ViridianPokecenter.asm index 4ac18bf66..b9e2a4323 100644 --- a/text/ViridianPokecenter.asm +++ b/text/ViridianPokecenter.asm @@ -1,4 +1,4 @@ -_ViridianPokeCenterText2:: +_ViridianPokecenterGentlemanText:: text "You can use that" line "PC in the corner." @@ -6,7 +6,7 @@ _ViridianPokeCenterText2:: line "told me. So kind!" done -_ViridianPokeCenterText3:: +_ViridianPokecenterCooltrainerMText:: text "There's a #MON" line "CENTER in every" cont "town ahead." diff --git a/text/ViridianSchoolHouse.asm b/text/ViridianSchoolHouse.asm index f6041e0db..c802db48d 100644 --- a/text/ViridianSchoolHouse.asm +++ b/text/ViridianSchoolHouse.asm @@ -1,10 +1,10 @@ -_SchoolText1:: +_ViridianSchoolHouseBrunetteGirlText:: text "Whew! I'm trying" line "to memorize all" cont "my notes." done -_SchoolText2:: +_ViridianSchoolHouseCooltrainerFText:: text "Okay!" para "Be sure to read" diff --git a/text/WardensHouse.asm b/text/WardensHouse.asm index 16ac68355..976899012 100644 --- a/text/WardensHouse.asm +++ b/text/WardensHouse.asm @@ -1,4 +1,4 @@ -_WardenGibberishText1:: +_WardensHouseWardenGibberish1Text:: text "WARDEN: Hif fuff" line "hefifoo!" @@ -7,30 +7,30 @@ _WardenGibberishText1:: cont "hee fwee!" done -_WardenGibberishText2:: +_WardensHouseWardenGibberish2Text:: text "Ah howhee ho hoo!" line "Eef ee hafahi ho!" done -_WardenGibberishText3:: +_WardensHouseWardenGibberish3Text:: text "Ha? He ohay heh" line "ha hoo ee haheh!" done -_WardenTeethText1:: +_WardensHouseWardenGaveTheGoldTeethText:: text " gave the" line "GOLD TEETH to the" cont "WARDEN!@" text_end -_WardenTeethText2:: +_WardensHouseWardenTeethPoppedInHisTeethText:: text_start para "The WARDEN popped" line "in his teeth!" prompt -_WardenThankYouText:: +_WardensHouseWardenThanksText:: text "WARDEN: Thanks," line "kid! No one could" cont "understand a word" @@ -43,14 +43,14 @@ _WardenThankYouText:: cont "your trouble." prompt -_ReceivedHM04Text:: +_WardensHouseWardenReceivedHM04Text:: text " received" line "@" text_ram wStringBuffer text "!@" text_end -_HM04ExplanationText:: +_WardensHouseWardenHM04ExplanationText:: text "WARDEN: HM04" line "teaches STRENGTH!" @@ -70,17 +70,17 @@ _HM04ExplanationText:: line "rare SURF HM." done -_HM04NoRoomText:: +_WardensHouseWardenHM04NoRoomText:: text "Your pack is" line "stuffed full!" done -_FuchsiaHouse2Text_75176:: +_WardensHouseDisplayPhotosAndFossilsText:: text "#MON photos" line "and fossils." done -_FuchsiaHouse2Text_7517b:: +_WardensHouseDisplayMerchandiseText:: text "Old #MON" line "merchandise." done From f46db37d508f0111ad44ad062ed3d83ba3282d1d Mon Sep 17 00:00:00 2001 From: SatoMew Date: Sat, 15 Jul 2023 23:36:59 +0100 Subject: [PATCH 09/53] Thoroughly document debug code (#410) --- constants/item_constants.asm | 2 +- constants/misc_constants.asm | 3 ++ data/maps/special_warps.asm | 10 ++-- engine/battle/core.asm | 25 ++++++---- engine/battle/init_battle_variables.asm | 2 +- engine/debug/debug_menu.asm | 23 ++++++---- engine/debug/debug_party.asm | 24 ++++------ engine/menus/main_menu.asm | 13 ++++-- engine/movie/oak_speech/oak_speech.asm | 17 +++++-- engine/movie/title.asm | 8 ++-- engine/overworld/special_warps.asm | 61 ++++++++++++------------- gfx/font.asm | 4 +- home/npc_movement.asm | 6 ++- home/overworld.asm | 10 ++-- home/text.asm | 6 ++- home/trainers.asm | 2 + ram/wram.asm | 19 ++------ scripts/HallOfFame.asm | 2 +- 18 files changed, 128 insertions(+), 109 deletions(-) diff --git a/constants/item_constants.asm b/constants/item_constants.asm index edd70379c..e25aadba4 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -13,7 +13,7 @@ const POKE_BALL ; $04 const TOWN_MAP ; $05 const BICYCLE ; $06 - const SURFBOARD ; $07 buggy? + const SURFBOARD ; $07 const SAFARI_BALL ; $08 const POKEDEX ; $09 const MOON_STONE ; $0A diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 847756082..a230b3d7a 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -16,3 +16,6 @@ DEF TEXT_DELAY_SLOW EQU %101 ; 5 const_def 6 const BIT_BATTLE_SHIFT ; 6 const BIT_BATTLE_ANIMATION ; 7 + +; wd732 flags +DEF BIT_DEBUG_MODE EQU 1 diff --git a/data/maps/special_warps.asm b/data/maps/special_warps.asm index cad320edb..28cdbf6c0 100644 --- a/data/maps/special_warps.asm +++ b/data/maps/special_warps.asm @@ -44,15 +44,15 @@ MACRO special_warp_spec db \4 ENDM -FirstMapSpec: +NewGameWarp: special_warp_spec REDS_HOUSE_2F, 3, 6, REDS_HOUSE_2 -TradeCenterSpec1: +TradeCenterPlayerWarp: special_warp_spec TRADE_CENTER, 3, 4, CLUB -TradeCenterSpec2: +TradeCenterFriendWarp: special_warp_spec TRADE_CENTER, 6, 4, CLUB -ColosseumSpec1: +ColosseumPlayerWarp: special_warp_spec COLOSSEUM, 3, 4, CLUB -ColosseumSpec2: +ColosseumFriendWarp: special_warp_spec COLOSSEUM, 6, 4, CLUB diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 4a0263e21..f976674a4 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2493,9 +2493,9 @@ MoveSelectionMenu: ; so it is necessary to put the di ei block to not cause tearing call TextBoxBorder hlcoord 4, 12 - ld [hl], $7a + ld [hl], "─" hlcoord 10, 12 - ld [hl], $7e + ld [hl], "┘" ei hlcoord 6, 13 call .writemoves @@ -2557,11 +2557,12 @@ MoveSelectionMenu: ld a, [wLinkState] cp LINK_STATE_BATTLING jr z, .matchedkeyspicked + ; Disable left, right, and START buttons in regular battles. ld a, [wFlags_D733] bit BIT_TEST_BATTLE, a ld b, D_UP | D_DOWN | A_BUTTON | B_BUTTON | SELECT jr z, .matchedkeyspicked - ld b, $ff + ld b, D_UP | D_DOWN | D_LEFT | D_RIGHT | A_BUTTON | B_BUTTON | SELECT | START .matchedkeyspicked ld a, b ld [hli], a ; wMenuWatchedKeys @@ -2585,8 +2586,12 @@ SelectMenuItem: call PlaceString jr .select .battleselect + ; Hide move swap cursor in TestBattle. ld a, [wFlags_D733] bit BIT_TEST_BATTLE, a + ; This causes PrintMenuItem to not run in TestBattle. + ; MoveSelectionMenu still draws part of its window, an issue + ; which did not seem to exist in the Japanese versions. jr nz, .select call PrintMenuItem ld a, [wMenuItemToSwap] @@ -2648,8 +2653,9 @@ SelectMenuItem: jr z, .disabled ld a, [wPlayerBattleStatus3] bit 3, a ; transformed - jr nz, .dummy ; game freak derp -.dummy + jr nz, .transformedMoveSelected +.transformedMoveSelected ; pointless + ; Allow moves copied by Transform to be used. ld a, [wCurrentMenuItem] ld hl, wBattleMonMoves ld c, a @@ -6085,6 +6091,7 @@ GetCurrentMove: jr .selected .player ld de, wPlayerMoveNum + ; Apply InitBattleVariables to TestBattle. ld a, [wFlags_D733] bit BIT_TEST_BATTLE, a ld a, [wTestBattlePlayerSelectedMove] @@ -6768,12 +6775,12 @@ InitOpponent: DetermineWildOpponent: ld a, [wd732] - bit 1, a - jr z, .notDebug + bit BIT_DEBUG_MODE, a + jr z, .notDebugMode ldh a, [hJoyHeld] - bit BIT_B_BUTTON, a + bit BIT_B_BUTTON, a ; disable wild encounters ret nz -.notDebug +.notDebugMode ld a, [wNumberOfNoRandomBattleStepsLeft] and a ret nz diff --git a/engine/battle/init_battle_variables.asm b/engine/battle/init_battle_variables.asm index dd9f9714f..aa081296f 100644 --- a/engine/battle/init_battle_variables.asm +++ b/engine/battle/init_battle_variables.asm @@ -20,7 +20,7 @@ InitBattleVariables: ld [hli], a ; wPlayerHPBarColor ld [hl], a ; wEnemyHPBarColor ld hl, wCanEvolveFlags - ld b, $3c + ld b, wMiscBattleDataEnd - wMiscBattleData .loop ld [hli], a dec b diff --git a/engine/debug/debug_menu.asm b/engine/debug/debug_menu.asm index 907acb8a1..fbf136fe5 100644 --- a/engine/debug/debug_menu.asm +++ b/engine/debug/debug_menu.asm @@ -56,7 +56,7 @@ IF DEF(_DEBUG) ; DEBUG ld hl, wd732 - set 1, [hl] + set BIT_DEBUG_MODE, [hl] jp StartNewGameDebug DebugBattlePlayerName: @@ -72,18 +72,23 @@ ELSE ret ENDC -TestBattle: +TestBattle: ; unreferenced except in _DEBUG .loop call GBPalNormal - ; Don't mess around - ; with obedience. + ; Don't mess around with obedience. ld a, 1 << BIT_EARTHBADGE ld [wObtainedBadges], a ld hl, wFlags_D733 set BIT_TEST_BATTLE, [hl] + ; wNumBagItems and wBagItems are not initialized here, + ; and their garbage values happen to act as if EXP_ALL + ; is in the bag at the end of the test battle. + ; pokeyellow fixes this by initializing them with a + ; list of items. + ; Reset the party. ld hl, wPartyCount xor a @@ -91,8 +96,7 @@ TestBattle: dec a ld [hl], a - ; Give the player a - ; level 20 Rhydon. + ; Give the player a level 20 Rhydon. ld a, RHYDON ld [wcf91], a ld a, 20 @@ -102,15 +106,14 @@ TestBattle: ld [wCurMap], a call AddPartyMon - ; Fight against a - ; level 20 Rhydon. + ; Fight against a level 20 Rhydon. ld a, RHYDON ld [wCurOpponent], a predef InitOpponent - ; When the battle ends, - ; do it all again. + ; When the battle ends, do it all again. + ; There are some graphical quirks in SGB mode. ld a, 1 ld [wUpdateSpritesEnabled], a ldh [hAutoBGTransferEnabled], a diff --git a/engine/debug/debug_party.asm b/engine/debug/debug_party.asm index 36eb8e6f0..0c76bde12 100644 --- a/engine/debug/debug_party.asm +++ b/engine/debug/debug_party.asm @@ -1,13 +1,5 @@ -; This function is a debugging feature to give the player Tsunekazu Ishihara's -; favorite Pokemon. This is indicated by the overpowered Exeggutor, which -; Ishihara (president of Creatures Inc.) said was his favorite Pokemon in an ABC -; interview on February 8, 2000. -; "Exeggutor is my favorite. That's because I was always using this character -; while I was debugging the program." -; http://www.ign.com/articles/2000/02/09/abc-news-pokamon-chat-transcript - -SetIshiharaTeam: - ld de, IshiharaTeam +SetDebugNewGameParty: ; unreferenced except in _DEBUG + ld de, DebugNewGameParty .loop ld a, [de] cp -1 @@ -20,7 +12,11 @@ SetIshiharaTeam: call AddPartyMon jr .loop -IshiharaTeam: +DebugNewGameParty: ; unreferenced except in _DEBUG + ; Exeggutor is the only debug party member shared with Red, Green, and Japanese Blue. + ; "Tsunekazu Ishihara: Exeggutor is my favorite. That's because I was + ; always using this character while I was debugging the program." + ; From https://web.archive.org/web/20000607152840/http://pocket.ign.com/news/14973.html db EXEGGUTOR, 90 IF DEF(_DEBUG) db MEW, 5 @@ -35,13 +31,13 @@ IF DEF(_DEBUG) ENDC db -1 ; end -DebugStart: +PrepareNewGameDebug: ; dummy except in _DEBUG IF DEF(_DEBUG) xor a ; PLAYER_PARTY_DATA ld [wMonDataLocation], a ; Fly anywhere. - dec a ; $ff + dec a ; $ff (all bits) ld [wTownVisitedFlag], a ld [wTownVisitedFlag + 1], a @@ -49,7 +45,7 @@ IF DEF(_DEBUG) ld a, ~(1 << BIT_EARTHBADGE) ld [wObtainedBadges], a - call SetIshiharaTeam + call SetDebugNewGameParty ; Exeggutor gets four HM moves. ld hl, wPartyMon1Moves diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index 024def28c..69b3b9181 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -121,7 +121,7 @@ MainMenu: ld [wDestinationMap], a ld hl, wd732 set 2, [hl] ; fly warp or dungeon warp - call SpecialWarpIn + call PrepareForSpecialWarp jp SpecialEnterMap InitOptions: @@ -268,10 +268,10 @@ LinkMenu: ld c, 50 call DelayFrames ld hl, wd732 - res 1, [hl] + res BIT_DEBUG_MODE, [hl] ld a, [wDefaultMap] ld [wDestinationMap], a - call SpecialWarpIn + call PrepareForSpecialWarp ld c, 20 call DelayFrames xor a @@ -308,7 +308,12 @@ LinkCanceledText: StartNewGame: ld hl, wd732 - res 1, [hl] + ; Ensure debug mode is not used when + ; starting a regular new game. + ; Debug mode persists in saved games for + ; both debug and non-debug builds, and is + ; only reset here by the main menu. + res BIT_DEBUG_MODE, [hl] ; fallthrough StartNewGameDebug: call OakSpeech diff --git a/engine/movie/oak_speech/oak_speech.asm b/engine/movie/oak_speech/oak_speech.asm index 3a08372d7..4ed4735e5 100644 --- a/engine/movie/oak_speech/oak_speech.asm +++ b/engine/movie/oak_speech/oak_speech.asm @@ -3,6 +3,11 @@ PrepareOakSpeech: push af ld a, [wOptions] push af + ; Retrieve BIT_DEBUG_MODE set in DebugMenu for StartNewGameDebug. + ; BUG: StartNewGame carries over bit 5 from previous save files, + ; which causes CheckForceBikeOrSurf to not return. + ; To fix this in debug builds, reset bit 5 here or in StartNewGame. + ; In non-debug builds, the instructions can be removed. ld a, [wd732] push af ld hl, wPlayerName @@ -24,6 +29,7 @@ PrepareOakSpeech: call z, InitOptions ; These debug names are used for StartNewGameDebug. ; TestBattle uses the debug names from DebugMenu. + ; A variant of this process is performed in PrepareTitleScreen. ld hl, DebugNewGamePlayerName ld de, wPlayerName ld bc, NAME_LENGTH @@ -49,15 +55,15 @@ OakSpeech: ld [wcf91], a ld a, 1 ld [wItemQuantity], a - call AddItemToInventory ; give one potion + call AddItemToInventory ld a, [wDefaultMap] ld [wDestinationMap], a - call SpecialWarpIn + call PrepareForSpecialWarp xor a ldh [hTileAnimations], a ld a, [wd732] - bit 1, a ; possibly a debug mode bit - jp nz, .skipChoosingNames + bit BIT_DEBUG_MODE, a + jp nz, .skipSpeech ld de, ProfOakPic lb bc, BANK(ProfOakPic), $00 call IntroDisplayPicCenteredOrUpperRight @@ -93,7 +99,7 @@ OakSpeech: ld hl, IntroduceRivalText call PrintText call ChooseRivalName -.skipChoosingNames +.skipSpeech call GBFadeOutToWhite call ClearScreen ld de, RedPicFront @@ -159,6 +165,7 @@ OakSpeechText1: text_end OakSpeechText2: text_far _OakSpeechText2A + ; BUG: The cry played does not match the sprite displayed. sound_cry_nidorina text_far _OakSpeechText2B text_end diff --git a/engine/movie/title.asm b/engine/movie/title.asm index ad5f6ebf5..36a28b0df 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -1,4 +1,4 @@ -CopyDebugName: +CopyDebugName: ; unused ld bc, NAME_LENGTH jp CopyData @@ -42,10 +42,10 @@ DisplayTitleScreen: ld bc, 5 tiles ld a, BANK(NintendoCopyrightLogoGraphics) call FarCopyData2 - ld hl, GamefreakLogoGraphics + ld hl, GameFreakLogoGraphics ld de, vTitleLogo2 tile (16 + 5) ld bc, 9 tiles - ld a, BANK(GamefreakLogoGraphics) + ld a, BANK(GameFreakLogoGraphics) call FarCopyData2 ld hl, PokemonLogoGraphics ld de, vTitleLogo @@ -378,7 +378,7 @@ LoadCopyrightAndTextBoxTiles: LoadCopyrightTiles: ld de, NintendoCopyrightLogoGraphics ld hl, vChars2 tile $60 - lb bc, BANK(NintendoCopyrightLogoGraphics), (GamefreakLogoGraphicsEnd - NintendoCopyrightLogoGraphics) / $10 + lb bc, BANK(NintendoCopyrightLogoGraphics), (GameFreakLogoGraphicsEnd - NintendoCopyrightLogoGraphics) / $10 call CopyVideoData hlcoord 2, 7 ld de, CopyrightTextString diff --git a/engine/overworld/special_warps.asm b/engine/overworld/special_warps.asm index 61356a033..c538938bd 100644 --- a/engine/overworld/special_warps.asm +++ b/engine/overworld/special_warps.asm @@ -1,60 +1,60 @@ -SpecialWarpIn:: +PrepareForSpecialWarp:: call LoadSpecialWarpData predef LoadTilesetHeader ld hl, wd732 bit 2, [hl] ; dungeon warp or fly warp? res 2, [hl] - jr z, .next -; if dungeon warp or fly warp + jr z, .debugNewGameWarp ld a, [wDestinationMap] - jr .next2 + jr .next +.debugNewGameWarp + bit BIT_DEBUG_MODE, [hl] + jr z, .setNewGameMatWarp ; apply to StartNewGameDebug only + call PrepareNewGameDebug +.setNewGameMatWarp + ; This is called by OakSpeech during StartNewGame and + ; loads the first warp event for the specified map index. + ld a, PALLET_TOWN .next - bit 1, [hl] - jr z, .next3 - call DebugStart -.next3 - ld a, 0 -.next2 ld b, a ld a, [wd72d] and a - jr nz, .next4 + jr nz, .next2 ld a, b -.next4 +.next2 ld hl, wd732 - bit 4, [hl] ; dungeon warp? + bit 4, [hl] ; dungeon warp ret nz -; if not dungeon warp ld [wLastMap], a ret -; gets the map ID, tile block map view pointer, tileset, and coordinates LoadSpecialWarpData: ld a, [wd72d] cp TRADE_CENTER jr nz, .notTradeCenter - ld hl, TradeCenterSpec1 + ld hl, TradeCenterPlayerWarp ldh a, [hSerialConnectionStatus] - cp USING_INTERNAL_CLOCK ; which gameboy is clocking determines who is on the left and who is on the right + cp USING_INTERNAL_CLOCK jr z, .copyWarpData - ld hl, TradeCenterSpec2 + ld hl, TradeCenterFriendWarp jr .copyWarpData .notTradeCenter cp COLOSSEUM jr nz, .notColosseum - ld hl, ColosseumSpec1 + ld hl, ColosseumPlayerWarp ldh a, [hSerialConnectionStatus] cp USING_INTERNAL_CLOCK jr z, .copyWarpData - ld hl, ColosseumSpec2 + ld hl, ColosseumFriendWarp jr .copyWarpData .notColosseum ld a, [wd732] - bit 1, a - jr nz, .notFirstMap + bit BIT_DEBUG_MODE, a + ; warp to wLastMap (PALLET_TOWN) for StartNewGameDebug + jr nz, .notNewGameWarp bit 2, a - jr nz, .notFirstMap - ld hl, FirstMapSpec + jr nz, .notNewGameWarp + ld hl, NewGameWarp .copyWarpData ld de, wCurMap ld c, $7 @@ -68,18 +68,17 @@ LoadSpecialWarpData: ld [wCurMapTileset], a xor a jr .done -.notFirstMap +.notNewGameWarp ld a, [wLastMap] ; this value is overwritten before it's ever read ld hl, wd732 - bit 4, [hl] ; used dungeon warp (jumped down hole/waterfall)? - jr nz, .usedDunegonWarp - bit 6, [hl] ; return to last pokemon center (or player's house)? + bit 4, [hl] ; dungeon warp + jr nz, .usedDungeonWarp + bit 6, [hl] ; blacked out res 6, [hl] jr z, .otherDestination -; return to last pokemon center or player's house ld a, [wLastBlackoutMap] jr .usedFlyWarp -.usedDunegonWarp +.usedDungeonWarp ld hl, wd72d res 4, [hl] ld a, [wDungeonWarpDestinationMap] @@ -142,7 +141,7 @@ LoadSpecialWarpData: .done ld [wYOffsetSinceLastSpecialWarp], a ld [wXOffsetSinceLastSpecialWarp], a - ld a, $ff ; the player's coordinates have already been updated using a special warp, so don't use any of the normal warps + ld a, -1 ; exclude normal warps ld [wDestinationWarpID], a ret diff --git a/gfx/font.asm b/gfx/font.asm index fc2aff4f9..daff36329 100644 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -15,8 +15,8 @@ BattleHudTiles3End: NintendoCopyrightLogoGraphics: INCBIN "gfx/splash/copyright.2bpp" -GamefreakLogoGraphics: INCBIN "gfx/title/gamefreak_inc.2bpp" -GamefreakLogoGraphicsEnd: +GameFreakLogoGraphics: INCBIN "gfx/title/gamefreak_inc.2bpp" +GameFreakLogoGraphicsEnd: TextBoxGraphics:: INCBIN "gfx/font/font_extra.2bpp" TextBoxGraphicsEnd:: diff --git a/home/npc_movement.asm b/home/npc_movement.asm index a3367f9a3..23a854272 100644 --- a/home/npc_movement.asm +++ b/home/npc_movement.asm @@ -50,10 +50,12 @@ RunNPCMovementScript:: EndNPCMovementScript:: farjp _EndNPCMovementScript -DebugPressedOrHeldB:: +DebugPressedOrHeldB:: ; dummy except in _DEBUG +; This is used to skip Trainer battles, the +; Safari Game step counter, and some NPC scripts. IF DEF(_DEBUG) ld a, [wd732] - bit 1, a + bit BIT_DEBUG_MODE, a ret z ldh a, [hJoyHeld] bit BIT_B_BUTTON, a diff --git a/home/overworld.asm b/home/overworld.asm index be1e6b244..1ebc794b9 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -117,7 +117,7 @@ OverworldLoopLessDelay:: predef LoadSAV ld a, [wCurMap] ld [wDestinationMap], a - call SpecialWarpIn + call PrepareForSpecialWarp ld a, [wCurMap] call SwitchToMapRomBank ; switch to the ROM bank of the current map ld hl, wCurMapTileset @@ -762,11 +762,11 @@ HandleBlackOut:: call StopMusic ld hl, wd72e res 5, [hl] - ld a, BANK(ResetStatusAndHalveMoneyOnBlackout) ; also BANK(SpecialWarpIn) and BANK(SpecialEnterMap) + ld a, BANK(ResetStatusAndHalveMoneyOnBlackout) ; also BANK(PrepareForSpecialWarp) and BANK(SpecialEnterMap) ldh [hLoadedROMBank], a ld [MBC1RomBank], a call ResetStatusAndHalveMoneyOnBlackout - call SpecialWarpIn + call PrepareForSpecialWarp call PlayDefaultMusicFadeOutCurrent jp SpecialEnterMap @@ -793,10 +793,10 @@ HandleFlyWarpOrDungeonWarp:: set 2, [hl] ; fly warp or dungeon warp res 5, [hl] ; forced to ride bike call LeaveMapAnim - ld a, BANK(SpecialWarpIn) + ld a, BANK(PrepareForSpecialWarp) ldh [hLoadedROMBank], a ld [MBC1RomBank], a - call SpecialWarpIn + call PrepareForSpecialWarp jp SpecialEnterMap LeaveMapAnim:: diff --git a/home/text.asm b/home/text.asm index 836f3986d..9462c7490 100644 --- a/home/text.asm +++ b/home/text.asm @@ -111,10 +111,14 @@ NextChar:: inc de jp PlaceNextChar -NullChar:: +NullChar:: ; unused ld b, h ld c, l pop hl + ; A "" character in a printed string + ; displays an error message with the current value + ; of hSpriteIndexOrTextID in decimal format. + ; This is a debugging leftover. ld de, TextIDErrorText dec de ret diff --git a/home/trainers.asm b/home/trainers.asm index 4dc63fef1..e01957290 100644 --- a/home/trainers.asm +++ b/home/trainers.asm @@ -135,7 +135,9 @@ ENDC ld a, [wSpriteIndex] cp $ff jr nz, .trainerEngaging +IF DEF(_DEBUG) .trainerNotEngaging +ENDC xor a ld [wSpriteIndex], a ld [wTrainerHeaderFlagBit], a diff --git a/ram/wram.asm b/ram/wram.asm index ac382f79f..0d7de416e 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -420,6 +420,7 @@ wAddedToParty:: ; The purpose of these flags is to track which mons levelled up during the ; current battle at the end of the battle when evolution occurs. ; Other methods of evolution simply set it by calling TryEvolvingMon. +wMiscBattleData:: wCanEvolveFlags:: db wForceEvolution:: db @@ -433,8 +434,7 @@ wAILayer2Encouragement:: db wPlayerSubstituteHP:: db wEnemySubstituteHP:: db -; The player's selected move during a test battle. -; InitBattleVariables sets it to the move Pound. +; used for TestBattle (unused in non-debug builds) wTestBattlePlayerSelectedMove:: db ds 1 @@ -502,6 +502,7 @@ wEnemyNumHits:: ; db wEnemyBideAccumulatedDamage:: dw ds 8 +wMiscBattleDataEnd:: ENDU ; This union spans 39 bytes. @@ -2155,17 +2156,7 @@ wd730:: db ds 1 ; bit 0: play time being counted -; bit 1: remnant of debug mode; only set by the debug build. -; if it is set: -; 1. skips most of Prof. Oak's speech, and uses NINTEN as the player's name and SONY as the rival's name -; 2. does not have the player start in floor two of the player's house (instead sending them to [wLastMap]) -; 3. allows wild battles to be avoided by holding down B -; furthermore, in the debug build: -; 4. allows trainers to be avoided by holding down B -; 5. skips Safari Zone step counter by holding down B -; 6. skips the NPC who blocks Route 3 before beating Brock by holding down B -; 7. skips Cerulean City rival battle by holding down B -; 8. skips Pokémon Tower rival battle by holding down B +; bit 1: debug mode (unused and incomplete in non-debug builds) ; bit 2: the target warp is a fly warp (bit 3 set or blacked out) or a dungeon warp (bit 4 set) ; bit 3: used warp pad, escape rope, dig, teleport, or fly, so the target warp is a "fly warp" ; bit 4: jumped into hole (Pokemon Mansion, Seafoam Islands, Victory Road) or went down waterfall (Seafoam Islands), so the target warp is a "dungeon warp" @@ -2173,7 +2164,7 @@ wd730:: db ; bit 6: map destination is [wLastBlackoutMap] (usually the last used pokemon center, but could be the player's house) wd732:: db -; bit 0: running a test battle +; bit 0: running a test battle (unused in non-debug builds) ; bit 1: prevent music from changing when entering new map ; bit 2: skip the joypad check in CheckWarpsNoCollision (used for the forced warp down the waterfall in the Seafoam Islands) ; bit 3: trainer wants to battle diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm index 9fc7da185..523567df9 100644 --- a/scripts/HallOfFame.asm +++ b/scripts/HallOfFame.asm @@ -32,7 +32,7 @@ HallOfFameResetEventsAndSaveScript: ld hl, wFlags_D733 res 1, [hl] inc hl - set 0, [hl] + set BIT_TEST_BATTLE, [hl] ; debug, unused? xor a ; SCRIPT_*_DEFAULT ld hl, wLoreleisRoomCurScript ld [hli], a ; wLoreleisRoomCurScript From c42b7167ced16cd6ac5d23e906db555583d45f83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20Unneb=C3=A4ck?= Date: Sun, 16 Jul 2023 23:21:20 +0200 Subject: [PATCH 10/53] Use charmap in link_battle_versus_text (#415) --- engine/battle/link_battle_versus_text.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/battle/link_battle_versus_text.asm b/engine/battle/link_battle_versus_text.asm index 29c113563..374dcabc4 100644 --- a/engine/battle/link_battle_versus_text.asm +++ b/engine/battle/link_battle_versus_text.asm @@ -13,9 +13,9 @@ DisplayLinkBattleVersusTextBox: call PlaceString ; place bold "VS" tiles between the names hlcoord 9, 8 - ld a, $69 + ld a, "" ld [hli], a - ld [hl], $6a + ld [hl], "" xor a ld [wUpdateSpritesEnabled], a callfar SetupPlayerAndEnemyPokeballs From a38c7922dda3b6650a1dfe0fe544175ded259b19 Mon Sep 17 00:00:00 2001 From: SatoMew Date: Mon, 17 Jul 2023 02:22:06 +0100 Subject: [PATCH 11/53] Improve comment about the "ED" tile bug (#421) --- engine/menus/naming_screen.asm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index a0062dcd7..c2e63aef3 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -326,9 +326,8 @@ DisplayNamingScreen: LoadEDTile: ld de, ED_Tile ld hl, vFont tile $70 - ld bc, (ED_TileEnd - ED_Tile) / $8 - ; to fix the graphical bug on poor emulators - ;lb bc, BANK(ED_Tile), (ED_TileEnd - ED_Tile) / $8 + ; BUG: BANK("Home") should be BANK(ED_Tile), although it coincidentally works as-is + lb bc, BANK("Home"), (ED_TileEnd - ED_Tile) / $8 jp CopyVideoDataDouble ED_Tile: From fa18a75dc55c58505b7c643560bc7d8f1198995b Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 15 Aug 2023 19:26:41 -0400 Subject: [PATCH 12/53] Fix segfaults at EOF, add token/newline checks, and support '\r' in scan_includes.c --- tools/scan_includes.c | 52 +++++++++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 14 deletions(-) diff --git a/tools/scan_includes.c b/tools/scan_includes.c index e57ddc358..9ec5f3c5d 100644 --- a/tools/scan_includes.c +++ b/tools/scan_includes.c @@ -3,6 +3,8 @@ #include "common.h" +#include + void parse_args(int argc, char *argv[], bool *strict) { struct option long_options[] = { {"strict", no_argument, 0, 's'}, @@ -40,31 +42,47 @@ void scan_file(const char *filename, bool strict) { fclose(f); contents[size] = '\0'; - for (char *ptr = contents; ptr && ptr - contents < size; ptr++) { - bool is_incbin = false, is_include = false; + for (char *ptr = contents; ptr && ptr < contents + size; ptr++) { + ptr = strpbrk(ptr, ";\"Ii"); + if (!ptr) { + break; + } switch (*ptr) { case ';': - ptr = strchr(ptr, '\n'); - if (!ptr) { - fprintf(stderr, "%s: no newline at end of file\n", filename); + // Skip comments until the end of the line + ptr += strcspn(ptr + 1, "\r\n"); + if (*ptr) { + ptr++; } break; + case '"': - ptr++; - ptr = strchr(ptr, '"'); - if (ptr) { + // Skip string literal until the closing quote + ptr += strcspn(ptr + 1, "\""); + if (*ptr) { ptr++; - } else { - fprintf(stderr, "%s: unterminated string\n", filename); } break; + case 'I': case 'i': - is_incbin = !strncmp(ptr, "INCBIN", 6) || !strncmp(ptr, "incbin", 6); - is_include = !strncmp(ptr, "INCLUDE", 7) || !strncmp(ptr, "include", 7); + /* empty statement between the label and the variable declaration */; + // Check that an INCLUDE/INCBIN starts as its own token + char before = ptr > contents ? *(ptr - 1) : '\n'; + if (!isspace((unsigned)before) && before != ':') { + break; + } + bool is_incbin = !strncmp(ptr, "INCBIN", 6) || !strncmp(ptr, "incbin", 6); + bool is_include = !strncmp(ptr, "INCLUDE", 7) || !strncmp(ptr, "include", 7); if (is_incbin || is_include) { - ptr = strchr(ptr, '"'); - if (ptr) { + // Check that an INCLUDE/INCBIN ends as its own token + ptr += is_include ? 7 : 6; + if (!isspace((unsigned)*ptr) && *ptr != '"') { + break; + } + ptr += strspn(ptr, " \t"); + if (*ptr == '"') { + // Print the file path and recursively scan INCLUDEs ptr++; char *include_path = ptr; size_t length = strcspn(ptr, "\""); @@ -74,6 +92,12 @@ void scan_file(const char *filename, bool strict) { if (is_include) { scan_file(include_path, strict); } + } else { + fprintf(stderr, "%s: no file path after INC%s\n", filename, is_include ? "LUDE" : "BIN"); + // Continue to process a comment + if (*ptr == ';') { + ptr--; + } } } break; From 35d80643178cff48b3c1ac2cb55a979ea9161085 Mon Sep 17 00:00:00 2001 From: Vortyne <104168801+Vortyne@users.noreply.github.com> Date: Sat, 26 Aug 2023 11:08:29 -0400 Subject: [PATCH 13/53] Correct constant name (SILPH, not SLIPH) (#422) --- data/maps/objects/RocketHideoutB4F.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/maps/objects/RocketHideoutB4F.asm b/data/maps/objects/RocketHideoutB4F.asm index 939b5c934..de8625786 100644 --- a/data/maps/objects/RocketHideoutB4F.asm +++ b/data/maps/objects/RocketHideoutB4F.asm @@ -6,7 +6,7 @@ const ROCKETHIDEOUTB4F_HP_UP const ROCKETHIDEOUTB4F_TM_RAZOR_WIND const ROCKETHIDEOUTB4F_IRON - const ROCKETHIDEOUTB4F_SLIPH_SCOPE + const ROCKETHIDEOUTB4F_SILPH_SCOPE const ROCKETHIDEOUTB4F_LIFT_KEY RocketHideoutB4F_Object: From 9a780d4501933a46d244fa817d75f91d59ad2e28 Mon Sep 17 00:00:00 2001 From: Vortyne <104168801+Vortyne@users.noreply.github.com> Date: Sat, 26 Aug 2023 11:08:59 -0400 Subject: [PATCH 14/53] Missing usage of def_script_pointers (#423) --- scripts/VictoryRoad2F.asm | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/VictoryRoad2F.asm b/scripts/VictoryRoad2F.asm index 5cbd53768..347d16a53 100644 --- a/scripts/VictoryRoad2F.asm +++ b/scripts/VictoryRoad2F.asm @@ -37,6 +37,7 @@ VictoryRoad2FReplaceTileBlockScript: ret VictoryRoad2F_ScriptPointers: + def_script_pointers dw_const VictoryRoad2FDefaultScript, SCRIPT_VICTORYROAD2F_DEFAULT dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_VICTORYROAD2F_START_BATTLE dw_const EndTrainerBattle, SCRIPT_VICTORYROAD2F_END_BATTLE From 7bc3fd051e7a55ef8c66fc9122abf5ec03d67d21 Mon Sep 17 00:00:00 2001 From: vulcandth Date: Sat, 26 Aug 2023 10:11:05 -0500 Subject: [PATCH 15/53] CI copy `.map` files to symbols branch (#428) --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 44317b8b2..2f26a4d35 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -66,11 +66,12 @@ jobs: if: ${{ github.event_name == 'push' && github.repository_owner == 'pret' }} run: | cp -v *.sym symbols/ + cp -v *.map symbols/ - name: Update symbols if: ${{ github.event_name == 'push' && github.repository_owner == 'pret' }} uses: EndBug/add-and-commit@v9 with: cwd: "./symbols" - add: "*.sym" + add: "*.sym *.map" message: ${{ github.event.commits[0].message }} From 8003cca603ef55f95116c65dab8593aa578b248e Mon Sep 17 00:00:00 2001 From: Zachary Buhman Date: Sat, 26 Aug 2023 08:11:55 -0700 Subject: [PATCH 16/53] text_2.asm: trivial missing whitespace (#425) --- data/text/text_2.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/text/text_2.asm b/data/text/text_2.asm index 6720021c0..dcb67c675 100644 --- a/data/text/text_2.asm +++ b/data/text/text_2.asm @@ -912,7 +912,7 @@ _TrainerAboutToUseText:: text_ram wTrainerName text " is" line "about to use" - cont"@" + cont "@" text_ram wEnemyMonNick text "!" From 508a46b2ceb9a20c27b64a022d3e9b8869e81fbd Mon Sep 17 00:00:00 2001 From: vulcandth Date: Sat, 26 Aug 2023 10:14:57 -0500 Subject: [PATCH 17/53] Fix tools/free_space.awk for new rgbds (pret/pokecrystal#1049) (#416) Co-authored-by: mid-kid --- tools/free_space.awk | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/tools/free_space.awk b/tools/free_space.awk index 0e1578587..287853778 100755 --- a/tools/free_space.awk +++ b/tools/free_space.awk @@ -38,17 +38,25 @@ function register_bank(amount) { printf "Bank %3d: %5d/16384 (%.2f%%)\n", bank_num, amount, amount * 100 / 16384 } } +function register_bank_str(str) { + if (str ~ /\$[0-9A-F]+/) { + register_bank(strtonum("0x" substr(str, 2))) + } else { + printf "Malformed number? \"%s\" does not start with '$'\n", str + } +} rom_bank && toupper($0) ~ /^[ \t]*EMPTY$/ { # Empty bank register_bank(16384) } rom_bank && toupper($0) ~ /^[ \t]*SLACK:[ \t]/ { - if ($2 ~ /\$[0-9A-F]+/) { - register_bank(strtonum("0x" substr($2, 2))) - } else { - printf "Malformed slack line? \"%s\" does not start with '$'\n", $2 - } + # Old (rgbds <=0.6.0) end-of-bank free space + register_bank_str($2) +} +rom_bank && toupper($0) ~ /^[ \t]*TOTAL EMPTY:[ \t]/ { + # New (rgbds >=0.6.1) total free space + register_bank_str($3) } END { From c2d2cc4e1120d05e0d599bd9da2a927b6f476c65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20Unneb=C3=A4ck?= Date: Wed, 20 Sep 2023 21:43:01 +0200 Subject: [PATCH 18/53] Fix wPlayerHPBarColor type (#429) --- ram/wram.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ram/wram.asm b/ram/wram.asm index 0d7de416e..df2866764 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -1018,14 +1018,14 @@ wOnSGB:: db wDefaultPaletteCommand:: db UNION -wPlayerHPBarColor:: dw +wPlayerHPBarColor:: db NEXTU ; species of the mon whose palette is used for the whole screen wWholeScreenPaletteMonSpecies:: db +ENDU wEnemyHPBarColor:: db -ENDU ; 0: green ; 1: yellow From 30c244ae4f1acc6f018499ceaa9b138367d7bedf Mon Sep 17 00:00:00 2001 From: strager Date: Wed, 20 Sep 2023 12:43:27 -0700 Subject: [PATCH 19/53] Use PSN constant in PoisonEffect routine (#426) --- engine/battle/effects.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/battle/effects.asm b/engine/battle/effects.asm index aaaf20d0a..e89d19f3e 100644 --- a/engine/battle/effects.asm +++ b/engine/battle/effects.asm @@ -118,7 +118,7 @@ PoisonEffect: ret nc .inflictPoison dec hl - set 3, [hl] ; mon is now poisoned + set PSN, [hl] push de dec de ldh a, [hWhoseTurn] From b302e93674f376f2881cbd931a698345ad27bec3 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Wed, 11 Oct 2023 20:12:25 -0500 Subject: [PATCH 20/53] Use map object consts in data/maps/hide_show_data.asm (#432) --- data/maps/hide_show_data.asm | 456 +++++++++--------- data/maps/objects/AgathasRoom.asm | 2 +- data/maps/objects/BikeShop.asm | 6 +- data/maps/objects/BillsHouse.asm | 6 +- data/maps/objects/BluesHouse.asm | 6 +- data/maps/objects/BrunosRoom.asm | 2 +- data/maps/objects/CeladonChiefHouse.asm | 6 +- data/maps/objects/CeladonCity.asm | 18 +- data/maps/objects/CeladonDiner.asm | 10 +- data/maps/objects/CeladonGym.asm | 16 +- data/maps/objects/CeladonHotel.asm | 6 +- data/maps/objects/CeladonMansion1F.asm | 8 +- data/maps/objects/CeladonMansion3F.asm | 8 +- data/maps/objects/CeladonMansionRoofHouse.asm | 4 +- data/maps/objects/CeladonMart1F.asm | 2 +- data/maps/objects/CeladonMart2F.asm | 8 +- data/maps/objects/CeladonMart3F.asm | 10 +- data/maps/objects/CeladonMart4F.asm | 6 +- data/maps/objects/CeladonMart5F.asm | 8 +- data/maps/objects/CeladonMartRoof.asm | 4 +- data/maps/objects/CeladonPokecenter.asm | 8 +- data/maps/objects/CeruleanBadgeHouse.asm | 2 +- data/maps/objects/CeruleanCave1F.asm | 6 +- data/maps/objects/CeruleanCave2F.asm | 6 +- data/maps/objects/CeruleanCaveB1F.asm | 6 +- data/maps/objects/CeruleanCity.asm | 22 +- data/maps/objects/CeruleanGym.asm | 8 +- data/maps/objects/CeruleanMart.asm | 6 +- data/maps/objects/CeruleanPokecenter.asm | 8 +- data/maps/objects/CeruleanTradeHouse.asm | 4 +- data/maps/objects/CeruleanTrashedHouse.asm | 4 +- data/maps/objects/ChampionsRoom.asm | 4 +- data/maps/objects/CinnabarGym.asm | 18 +- data/maps/objects/CinnabarIsland.asm | 4 +- data/maps/objects/CinnabarLab.asm | 2 +- data/maps/objects/CinnabarLabFossilRoom.asm | 4 +- .../maps/objects/CinnabarLabMetronomeRoom.asm | 4 +- data/maps/objects/CinnabarLabTradeRoom.asm | 6 +- data/maps/objects/CinnabarMart.asm | 6 +- data/maps/objects/CinnabarPokecenter.asm | 8 +- data/maps/objects/Colosseum.asm | 2 +- data/maps/objects/CopycatsHouse1F.asm | 6 +- data/maps/objects/CopycatsHouse2F.asm | 10 +- data/maps/objects/Daycare.asm | 2 +- data/maps/objects/DiglettsCaveRoute11.asm | 2 +- data/maps/objects/DiglettsCaveRoute2.asm | 2 +- data/maps/objects/FightingDojo.asm | 14 +- .../objects/FuchsiaBillsGrandpasHouse.asm | 6 +- data/maps/objects/FuchsiaCity.asm | 20 +- data/maps/objects/FuchsiaGoodRodHouse.asm | 2 +- data/maps/objects/FuchsiaGym.asm | 16 +- data/maps/objects/FuchsiaMart.asm | 6 +- data/maps/objects/FuchsiaMeetingRoom.asm | 6 +- data/maps/objects/FuchsiaPokecenter.asm | 8 +- data/maps/objects/GameCorner.asm | 22 +- data/maps/objects/GameCornerPrizeRoom.asm | 4 +- data/maps/objects/HallOfFame.asm | 2 +- data/maps/objects/IndigoPlateauLobby.asm | 10 +- data/maps/objects/LancesRoom.asm | 2 +- data/maps/objects/LavenderCuboneHouse.asm | 4 +- data/maps/objects/LavenderMart.asm | 6 +- data/maps/objects/LavenderPokecenter.asm | 8 +- data/maps/objects/LavenderTown.asm | 6 +- data/maps/objects/LoreleisRoom.asm | 2 +- data/maps/objects/MrFujisHouse.asm | 12 +- data/maps/objects/MrPsychicsHouse.asm | 2 +- data/maps/objects/MtMoon1F.asm | 28 +- data/maps/objects/MtMoonB2F.asm | 18 +- data/maps/objects/MtMoonPokecenter.asm | 12 +- data/maps/objects/Museum1F.asm | 10 +- data/maps/objects/Museum2F.asm | 10 +- data/maps/objects/NameRatersHouse.asm | 2 +- data/maps/objects/OaksLab.asm | 22 +- data/maps/objects/PalletTown.asm | 6 +- data/maps/objects/PewterCity.asm | 10 +- data/maps/objects/PewterGym.asm | 6 +- data/maps/objects/PewterMart.asm | 6 +- data/maps/objects/PewterNidoranHouse.asm | 6 +- data/maps/objects/PewterPokecenter.asm | 8 +- data/maps/objects/PewterSpeechHouse.asm | 4 +- data/maps/objects/PokemonFanClub.asm | 16 +- data/maps/objects/PokemonMansion1F.asm | 6 +- data/maps/objects/PokemonMansion2F.asm | 8 +- data/maps/objects/PokemonMansion3F.asm | 10 +- data/maps/objects/PokemonMansionB1F.asm | 16 +- data/maps/objects/PokemonTower1F.asm | 10 +- data/maps/objects/PokemonTower2F.asm | 4 +- data/maps/objects/PokemonTower3F.asm | 8 +- data/maps/objects/PokemonTower4F.asm | 12 +- data/maps/objects/PokemonTower5F.asm | 12 +- data/maps/objects/PokemonTower6F.asm | 10 +- data/maps/objects/PokemonTower7F.asm | 8 +- data/maps/objects/PowerPlant.asm | 28 +- data/maps/objects/RedsHouse1F.asm | 2 +- data/maps/objects/RockTunnel1F.asm | 14 +- data/maps/objects/RockTunnelB1F.asm | 16 +- data/maps/objects/RockTunnelPokecenter.asm | 8 +- data/maps/objects/RocketHideoutB1F.asm | 14 +- data/maps/objects/RocketHideoutB2F.asm | 10 +- data/maps/objects/RocketHideoutB3F.asm | 8 +- data/maps/objects/RocketHideoutB4F.asm | 18 +- data/maps/objects/Route1.asm | 4 +- data/maps/objects/Route10.asm | 12 +- data/maps/objects/Route11.asm | 20 +- data/maps/objects/Route11Gate1F.asm | 2 +- data/maps/objects/Route11Gate2F.asm | 4 +- data/maps/objects/Route12.asm | 20 +- data/maps/objects/Route12Gate1F.asm | 2 +- data/maps/objects/Route12Gate2F.asm | 2 +- data/maps/objects/Route12SuperRodHouse.asm | 2 +- data/maps/objects/Route13.asm | 20 +- data/maps/objects/Route14.asm | 20 +- data/maps/objects/Route15.asm | 22 +- data/maps/objects/Route15Gate1F.asm | 2 +- data/maps/objects/Route15Gate2F.asm | 2 +- data/maps/objects/Route16.asm | 14 +- data/maps/objects/Route16FlyHouse.asm | 4 +- data/maps/objects/Route16Gate1F.asm | 4 +- data/maps/objects/Route16Gate2F.asm | 4 +- data/maps/objects/Route17.asm | 20 +- data/maps/objects/Route18.asm | 6 +- data/maps/objects/Route18Gate1F.asm | 2 +- data/maps/objects/Route18Gate2F.asm | 2 +- data/maps/objects/Route19.asm | 20 +- data/maps/objects/Route2.asm | 4 +- data/maps/objects/Route20.asm | 20 +- data/maps/objects/Route21.asm | 18 +- data/maps/objects/Route22.asm | 4 +- data/maps/objects/Route22Gate.asm | 2 +- data/maps/objects/Route23.asm | 14 +- data/maps/objects/Route24.asm | 16 +- data/maps/objects/Route25.asm | 20 +- data/maps/objects/Route2Gate.asm | 4 +- data/maps/objects/Route2TradeHouse.asm | 4 +- data/maps/objects/Route3.asm | 18 +- data/maps/objects/Route4.asm | 6 +- data/maps/objects/Route5Gate.asm | 2 +- data/maps/objects/Route6.asm | 12 +- data/maps/objects/Route6Gate.asm | 2 +- data/maps/objects/Route7Gate.asm | 2 +- data/maps/objects/Route8.asm | 18 +- data/maps/objects/Route8Gate.asm | 2 +- data/maps/objects/Route9.asm | 20 +- data/maps/objects/SSAnne1F.asm | 4 +- data/maps/objects/SSAnne1FRooms.asm | 22 +- data/maps/objects/SSAnne2F.asm | 4 +- data/maps/objects/SSAnne2FRooms.asm | 26 +- data/maps/objects/SSAnne3F.asm | 2 +- data/maps/objects/SSAnneB1FRooms.asm | 22 +- data/maps/objects/SSAnneBow.asm | 10 +- data/maps/objects/SSAnneCaptainsRoom.asm | 2 +- data/maps/objects/SSAnneKitchen.asm | 14 +- data/maps/objects/SafariZoneCenter.asm | 2 +- .../objects/SafariZoneCenterRestHouse.asm | 4 +- data/maps/objects/SafariZoneEast.asm | 8 +- data/maps/objects/SafariZoneEastRestHouse.asm | 6 +- data/maps/objects/SafariZoneGate.asm | 4 +- data/maps/objects/SafariZoneNorth.asm | 4 +- .../maps/objects/SafariZoneNorthRestHouse.asm | 6 +- data/maps/objects/SafariZoneSecretHouse.asm | 2 +- data/maps/objects/SafariZoneWest.asm | 8 +- data/maps/objects/SafariZoneWestRestHouse.asm | 6 +- data/maps/objects/SaffronCity.asm | 30 +- data/maps/objects/SaffronGym.asm | 18 +- data/maps/objects/SaffronMart.asm | 6 +- data/maps/objects/SaffronPidgeyHouse.asm | 8 +- data/maps/objects/SaffronPokecenter.asm | 8 +- data/maps/objects/SeafoamIslands1F.asm | 4 +- data/maps/objects/SeafoamIslandsB1F.asm | 4 +- data/maps/objects/SeafoamIslandsB2F.asm | 4 +- data/maps/objects/SeafoamIslandsB3F.asm | 12 +- data/maps/objects/SeafoamIslandsB4F.asm | 6 +- data/maps/objects/SilphCo10F.asm | 12 +- data/maps/objects/SilphCo11F.asm | 10 +- data/maps/objects/SilphCo1F.asm | 2 +- data/maps/objects/SilphCo2F.asm | 10 +- data/maps/objects/SilphCo3F.asm | 8 +- data/maps/objects/SilphCo4F.asm | 14 +- data/maps/objects/SilphCo5F.asm | 22 +- data/maps/objects/SilphCo6F.asm | 20 +- data/maps/objects/SilphCo7F.asm | 23 +- data/maps/objects/SilphCo8F.asm | 8 +- data/maps/objects/SilphCo9F.asm | 8 +- data/maps/objects/TradeCenter.asm | 2 +- data/maps/objects/UndergroundPathRoute5.asm | 2 +- data/maps/objects/UndergroundPathRoute6.asm | 2 +- data/maps/objects/UndergroundPathRoute7.asm | 2 +- .../objects/UndergroundPathRoute7Copy.asm | 4 +- data/maps/objects/UndergroundPathRoute8.asm | 2 +- data/maps/objects/VermilionCity.asm | 12 +- data/maps/objects/VermilionGym.asm | 10 +- data/maps/objects/VermilionMart.asm | 6 +- data/maps/objects/VermilionOldRodHouse.asm | 2 +- data/maps/objects/VermilionPidgeyHouse.asm | 6 +- data/maps/objects/VermilionPokecenter.asm | 8 +- data/maps/objects/VermilionTradeHouse.asm | 2 +- data/maps/objects/VictoryRoad1F.asm | 14 +- data/maps/objects/VictoryRoad2F.asm | 26 +- data/maps/objects/VictoryRoad3F.asm | 20 +- data/maps/objects/ViridianCity.asm | 14 +- data/maps/objects/ViridianForest.asm | 16 +- data/maps/objects/ViridianForestNorthGate.asm | 4 +- data/maps/objects/ViridianForestSouthGate.asm | 4 +- data/maps/objects/ViridianGym.asm | 22 +- data/maps/objects/ViridianMart.asm | 6 +- data/maps/objects/ViridianNicknameHouse.asm | 8 +- data/maps/objects/ViridianPokecenter.asm | 8 +- data/maps/objects/ViridianSchoolHouse.asm | 4 +- data/maps/objects/WardensHouse.asm | 6 +- macros/const.asm | 5 + 210 files changed, 1155 insertions(+), 1149 deletions(-) diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index f54e484a7..e2b31e431 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -263,306 +263,306 @@ MissableObjects: ; format: map id, object id, HIDE/SHOW PalletTownHS: - db PALLET_TOWN, $01, HIDE + db PALLET_TOWN, PALLETTOWN_OAK, HIDE ViridianCityHS: - db VIRIDIAN_CITY, $05, SHOW - db VIRIDIAN_CITY, $07, HIDE + db VIRIDIAN_CITY, VIRIDIANCITY_OLD_MAN_SLEEPY, SHOW + db VIRIDIAN_CITY, VIRIDIANCITY_OLD_MAN, HIDE PewterCityHS: - db PEWTER_CITY, $03, SHOW - db PEWTER_CITY, $05, SHOW + db PEWTER_CITY, PEWTERCITY_SUPER_NERD1, SHOW + db PEWTER_CITY, PEWTERCITY_YOUNGSTER, SHOW CeruleanCityHS: - db CERULEAN_CITY, $01, HIDE - db CERULEAN_CITY, $02, SHOW - db CERULEAN_CITY, $06, HIDE - db CERULEAN_CITY, $0A, SHOW - db CERULEAN_CITY, $0B, SHOW + db CERULEAN_CITY, CERULEANCITY_RIVAL, HIDE + db CERULEAN_CITY, CERULEANCITY_ROCKET, SHOW + db CERULEAN_CITY, CERULEANCITY_GUARD1, HIDE + db CERULEAN_CITY, CERULEANCITY_SUPER_NERD3, SHOW + db CERULEAN_CITY, CERULEANCITY_GUARD2, SHOW SaffronCityHS: - db SAFFRON_CITY, $01, SHOW - db SAFFRON_CITY, $02, SHOW - db SAFFRON_CITY, $03, SHOW - db SAFFRON_CITY, $04, SHOW - db SAFFRON_CITY, $05, SHOW - db SAFFRON_CITY, $06, SHOW - db SAFFRON_CITY, $07, SHOW - db SAFFRON_CITY, $08, HIDE - db SAFFRON_CITY, $09, HIDE - db SAFFRON_CITY, $0A, HIDE - db SAFFRON_CITY, $0B, HIDE - db SAFFRON_CITY, $0C, HIDE - db SAFFRON_CITY, $0D, HIDE - db SAFFRON_CITY, $0E, SHOW - db SAFFRON_CITY, $0F, HIDE + db SAFFRON_CITY, SAFFRONCITY_ROCKET1, SHOW + db SAFFRON_CITY, SAFFRONCITY_ROCKET2, SHOW + db SAFFRON_CITY, SAFFRONCITY_ROCKET3, SHOW + db SAFFRON_CITY, SAFFRONCITY_ROCKET4, SHOW + db SAFFRON_CITY, SAFFRONCITY_ROCKET5, SHOW + db SAFFRON_CITY, SAFFRONCITY_ROCKET6, SHOW + db SAFFRON_CITY, SAFFRONCITY_ROCKET7, SHOW + db SAFFRON_CITY, SAFFRONCTIY_SCIENTIST, HIDE + db SAFFRON_CITY, SAFFRONCITY_SILPH_WORKER_M, HIDE + db SAFFRON_CITY, SAFFRONCITY_SILPH_WORKER_F, HIDE + db SAFFRON_CITY, SAFFRONCITY_GENTLEMAN, HIDE + db SAFFRON_CITY, SAFFRONCITY_PIDGEOT, HIDE + db SAFFRON_CITY, SAFFRONCITY_ROCKER, HIDE + db SAFFRON_CITY, SAFFRONCITY_ROCKET8, SHOW + db SAFFRON_CITY, SAFFRONCITY_ROCKET9, HIDE Route2HS: - db ROUTE_2, $01, SHOW - db ROUTE_2, $02, SHOW + db ROUTE_2, ROUTE2_MOON_STONE, SHOW + db ROUTE_2, ROUTE2_HP_UP, SHOW Route4HS: - db ROUTE_4, $03, SHOW + db ROUTE_4, ROUTE4_TM_WHIRLWIND, SHOW Route9HS: - db ROUTE_9, $0A, SHOW + db ROUTE_9, ROUTE9_TM_TELEPORT, SHOW Route12HS: - db ROUTE_12, $01, SHOW - db ROUTE_12, $09, SHOW - db ROUTE_12, $0A, SHOW + db ROUTE_12, ROUTE12_SNORLAX, SHOW + db ROUTE_12, ROUTE12_TM_PAY_DAY, SHOW + db ROUTE_12, ROUTE12_IRON, SHOW Route15HS: - db ROUTE_15, $0B, SHOW + db ROUTE_15, ROUTE15_TM_RAGE, SHOW Route16HS: - db ROUTE_16, $07, SHOW + db ROUTE_16, ROUTE16_SNORLAX, SHOW Route22HS: - db ROUTE_22, $01, HIDE - db ROUTE_22, $02, HIDE + db ROUTE_22, ROUTE22_RIVAL1, HIDE + db ROUTE_22, ROUTE22_RIVAL2, HIDE Route24HS: - db ROUTE_24, $01, SHOW - db ROUTE_24, $08, SHOW + db ROUTE_24, ROUTE24_COOLTRAINER_M1, SHOW + db ROUTE_24, ROUTE24_TM_THUNDER_WAVE, SHOW Route25HS: - db ROUTE_25, $0A, SHOW + db ROUTE_25, ROUTE25_TM_SEISMIC_TOSS, SHOW BluesHouseHS: - db BLUES_HOUSE, $01, SHOW - db BLUES_HOUSE, $02, HIDE - db BLUES_HOUSE, $03, SHOW + db BLUES_HOUSE, BLUESHOUSE_DAISY1, SHOW + db BLUES_HOUSE, BLUESHOUSE_DAISY2, HIDE + db BLUES_HOUSE, BLUESHOUSE_TOWN_MAP, SHOW OaksLabHS: - db OAKS_LAB, $01, SHOW - db OAKS_LAB, $02, SHOW - db OAKS_LAB, $03, SHOW - db OAKS_LAB, $04, SHOW - db OAKS_LAB, $05, HIDE - db OAKS_LAB, $06, SHOW - db OAKS_LAB, $07, SHOW - db OAKS_LAB, $08, HIDE + db OAKS_LAB, OAKSLAB_RIVAL, SHOW + db OAKS_LAB, OAKSLAB_CHARMANDER_POKE_BALL, SHOW + db OAKS_LAB, OAKSLAB_SQUIRTLE_POKE_BALL, SHOW + db OAKS_LAB, OAKSLAB_BULBASAUR_POKE_BALL, SHOW + db OAKS_LAB, OAKSLAB_OAK1, HIDE + db OAKS_LAB, OAKSLAB_POKEDEX1, SHOW + db OAKS_LAB, OAKSLAB_POKEDEX2, SHOW + db OAKS_LAB, OAKSLAB_OAK2, HIDE ViridianGymHS: - db VIRIDIAN_GYM, $01, SHOW - db VIRIDIAN_GYM, $0B, SHOW + db VIRIDIAN_GYM, VIRIDIANGYM_GIOVANNI, SHOW + db VIRIDIAN_GYM, VIRIDIANGYM_REVIVE, SHOW Museum1FHS: - db MUSEUM_1F, $05, SHOW + db MUSEUM_1F, MUSEUM1F_OLD_AMBER, SHOW CeruleanCaveHS: - db CERULEAN_CAVE_1F, $01, SHOW - db CERULEAN_CAVE_1F, $02, SHOW - db CERULEAN_CAVE_1F, $03, SHOW + db CERULEAN_CAVE_1F, CERULEANCAVE1F_FULL_RESTORE, SHOW + db CERULEAN_CAVE_1F, CERULEANCAVE1F_MAX_ELIXER, SHOW + db CERULEAN_CAVE_1F, CERULEANCAVE1F_NUGGET, SHOW PokemonTower2FHS: - db POKEMON_TOWER_2F, $01, SHOW + db POKEMON_TOWER_2F, POKEMONTOWER2F_RIVAL, SHOW PokemonTower3FHS: - db POKEMON_TOWER_3F, $04, SHOW + db POKEMON_TOWER_3F, POKEMONTOWER3F_ESCAPE_ROPE, SHOW PokemonTower4FHS: - db POKEMON_TOWER_4F, $04, SHOW - db POKEMON_TOWER_4F, $05, SHOW - db POKEMON_TOWER_4F, $06, SHOW + db POKEMON_TOWER_4F, POKEMONTOWER4F_ELIXER, SHOW + db POKEMON_TOWER_4F, POKEMONTOWER4F_AWAKENING, SHOW + db POKEMON_TOWER_4F, POKEMONTOWER4F_HP_UP, SHOW PokemonTower5FHS: - db POKEMON_TOWER_5F, $06, SHOW + db POKEMON_TOWER_5F, POKEMONTOWER5F_NUGGET, SHOW PokemonTower6FHS: - db POKEMON_TOWER_6F, $04, SHOW - db POKEMON_TOWER_6F, $05, SHOW + db POKEMON_TOWER_6F, POKEMONTOWER6F_RARE_CANDY, SHOW + db POKEMON_TOWER_6F, POKEMONTOWER6F_X_ACCURACY, SHOW PokemonTower7FHS: - db POKEMON_TOWER_7F, $01, SHOW - db POKEMON_TOWER_7F, $02, SHOW - db POKEMON_TOWER_7F, $03, SHOW - db POKEMON_TOWER_7F, $04, SHOW + db POKEMON_TOWER_7F, POKEMONTOWER7F_ROCKET1, SHOW + db POKEMON_TOWER_7F, POKEMONTOWER7F_ROCKET2, SHOW + db POKEMON_TOWER_7F, POKEMONTOWER7F_ROCKET3, SHOW + db POKEMON_TOWER_7F, POKEMONTOWER7F_MR_FUJI, SHOW MrFujisHouseHS: - db MR_FUJIS_HOUSE, $05, HIDE + db MR_FUJIS_HOUSE, MRFUJISHOUSE_MR_FUJI, HIDE CeladonMansionRoofHouseHS: - db CELADON_MANSION_ROOF_HOUSE, $02, SHOW + db CELADON_MANSION_ROOF_HOUSE, CELADONMANSION_ROOF_HOUSE_EEVEE_POKEBALL, SHOW GameCornerHS: - db GAME_CORNER, $0B, SHOW + db GAME_CORNER, GAMECORNER_ROCKET, SHOW WardensHouseHS: - db WARDENS_HOUSE, $02, SHOW + db WARDENS_HOUSE, WARDENSHOUSE_RARE_CANDY, SHOW PokemonMansion1FHS: - db POKEMON_MANSION_1F, $02, SHOW - db POKEMON_MANSION_1F, $03, SHOW + db POKEMON_MANSION_1F, POKEMONMANSION1F_ESCAPE_ROPE, SHOW + db POKEMON_MANSION_1F, POKEMONMANSION1F_CARBOS, SHOW FightingDojoHS: - db FIGHTING_DOJO, $06, SHOW - db FIGHTING_DOJO, $07, SHOW + db FIGHTING_DOJO, FIGHTINGDOJO_HITMONLEE_POKE_BALL, SHOW + db FIGHTING_DOJO, FIGHTINGDOJO_HITMONCHAN_POKE_BALL, SHOW SilphCo1FHS: - db SILPH_CO_1F, $01, HIDE + db SILPH_CO_1F, SILPHCO1F_LINK_RECEPTIONIST, HIDE PowerPlantHS: - db POWER_PLANT, $01, SHOW - db POWER_PLANT, $02, SHOW - db POWER_PLANT, $03, SHOW - db POWER_PLANT, $04, SHOW - db POWER_PLANT, $05, SHOW - db POWER_PLANT, $06, SHOW - db POWER_PLANT, $07, SHOW - db POWER_PLANT, $08, SHOW - db POWER_PLANT, $09, SHOW - db POWER_PLANT, $0A, SHOW - db POWER_PLANT, $0B, SHOW - db POWER_PLANT, $0C, SHOW - db POWER_PLANT, $0D, SHOW - db POWER_PLANT, $0E, SHOW + db POWER_PLANT, POWERPLANT_VOLTORB1, SHOW + db POWER_PLANT, POWERPLANT_VOLTORB2, SHOW + db POWER_PLANT, POWERPLANT_VOLTORB3, SHOW + db POWER_PLANT, POWERPLANT_ELECTRODE1, SHOW + db POWER_PLANT, POWERPLANT_VOLTORB4, SHOW + db POWER_PLANT, POWERPLANT_VOLTORB5, SHOW + db POWER_PLANT, POWERPLANT_ELECTRODE2, SHOW + db POWER_PLANT, POWERPLANT_VOLTORB6, SHOW + db POWER_PLANT, POWERPLANT_ZAPDOS, SHOW + db POWER_PLANT, POWERPLANT_CARBOS, SHOW + db POWER_PLANT, POWERPLANT_HP_UP, SHOW + db POWER_PLANT, POWERPLANT_RARE_CANDY, SHOW + db POWER_PLANT, POWERPLANT_TM_THUNDER, SHOW + db POWER_PLANT, POWERPLANT_TM_REFLECT, SHOW VictoryRoad2FHS: - db VICTORY_ROAD_2F, $06, SHOW - db VICTORY_ROAD_2F, $07, SHOW - db VICTORY_ROAD_2F, $08, SHOW - db VICTORY_ROAD_2F, $09, SHOW - db VICTORY_ROAD_2F, $0A, SHOW - db VICTORY_ROAD_2F, $0D, SHOW + db VICTORY_ROAD_2F, VICTORYROAD2F_MOLTRES, SHOW + db VICTORY_ROAD_2F, VICTORYROAD2F_TM_SUBMISSION, SHOW + db VICTORY_ROAD_2F, VICTORYROAD2F_FULL_HEAL, SHOW + db VICTORY_ROAD_2F, VICTORYROAD2F_TM_MEGA_KICK, SHOW + db VICTORY_ROAD_2F, VICTORYROAD2F_GUARD_SPEC, SHOW + db VICTORY_ROAD_2F, VICTORYROAD2F_BOULDER3, SHOW BillsHouseHS: - db BILLS_HOUSE, $01, SHOW - db BILLS_HOUSE, $02, HIDE - db BILLS_HOUSE, $03, HIDE + db BILLS_HOUSE, BILLSHOUSE_BILL_POKEMON, SHOW + db BILLS_HOUSE, BILLSHOUSE_BILL1, HIDE + db BILLS_HOUSE, BILLSHOUSE_BILL2, HIDE ViridianForestHS: - db VIRIDIAN_FOREST, $05, SHOW - db VIRIDIAN_FOREST, $06, SHOW - db VIRIDIAN_FOREST, $07, SHOW + db VIRIDIAN_FOREST, VIRIDIANFOREST_ANTIDOTE, SHOW + db VIRIDIAN_FOREST, VIRIDIANFOREST_POTION, SHOW + db VIRIDIAN_FOREST, VIRIDIANFOREST_POKE_BALL, SHOW MtMoon1FHS: - db MT_MOON_1F, $08, SHOW - db MT_MOON_1F, $09, SHOW - db MT_MOON_1F, $0A, SHOW - db MT_MOON_1F, $0B, SHOW - db MT_MOON_1F, $0C, SHOW - db MT_MOON_1F, $0D, SHOW + db MT_MOON_1F, MTMOON1F_POTION1, SHOW + db MT_MOON_1F, MTMOON1F_MOON_STONE, SHOW + db MT_MOON_1F, MTMOON1F_RARE_CANDY, SHOW + db MT_MOON_1F, MTMOON1F_ESCAPE_ROPE, SHOW + db MT_MOON_1F, MTMOON1F_POTION2, SHOW + db MT_MOON_1F, MTMOON1F_TM_WATER_GUN, SHOW MtMoonB2FHS: - db MT_MOON_B2F, $06, SHOW - db MT_MOON_B2F, $07, SHOW - db MT_MOON_B2F, $08, SHOW - db MT_MOON_B2F, $09, SHOW + db MT_MOON_B2F, MTMOONB2F_DOME_FOSSIL, SHOW + db MT_MOON_B2F, MTMOONB2F_HELIX_FOSSIL, SHOW + db MT_MOON_B2F, MTMOONB2F_HP_UP, SHOW + db MT_MOON_B2F, MTMOONB2F_TM_MEGA_PUNCH, SHOW SSAnne2FHS: - db SS_ANNE_2F, $02, HIDE + db SS_ANNE_2F, SSANNE2F_RIVAL, HIDE SSAnne1FRoomsHS: - db SS_ANNE_1F_ROOMS, $0A, SHOW + db SS_ANNE_1F_ROOMS, SSANNE1FROOMS_TM_BODY_SLAM, SHOW SSAnne2FRoomsHS: - db SS_ANNE_2F_ROOMS, $06, SHOW - db SS_ANNE_2F_ROOMS, $09, SHOW + db SS_ANNE_2F_ROOMS, SSANNE2FROOMS_MAX_ETHER, SHOW + db SS_ANNE_2F_ROOMS, SSANNE2FROOMS_RARE_CANDY, SHOW SSAnneB1FRoomsHS: - db SS_ANNE_B1F_ROOMS, $09, SHOW - db SS_ANNE_B1F_ROOMS, $0A, SHOW - db SS_ANNE_B1F_ROOMS, $0B, SHOW + db SS_ANNE_B1F_ROOMS, SSANNEB1FROOMS_ETHER, SHOW + db SS_ANNE_B1F_ROOMS, SSANNEB1FROOMS_TM_REST, SHOW + db SS_ANNE_B1F_ROOMS, SSANNEB1FROOMS_MAX_POTION, SHOW VictoryRoad3FHS: - db VICTORY_ROAD_3F, $05, SHOW - db VICTORY_ROAD_3F, $06, SHOW - db VICTORY_ROAD_3F, $0A, SHOW + db VICTORY_ROAD_3F, VICTORYROAD3F_MAX_REVIVE, SHOW + db VICTORY_ROAD_3F, VICTORYROAD3F_TM_EXPLOSION, SHOW + db VICTORY_ROAD_3F, VICTORYROAD3F_BOULDER4, SHOW RocketHideoutB1FHS: - db ROCKET_HIDEOUT_B1F, $06, SHOW - db ROCKET_HIDEOUT_B1F, $07, SHOW + db ROCKET_HIDEOUT_B1F, ROCKETHIDEOUTB1F_ESCAPE_ROPE, SHOW + db ROCKET_HIDEOUT_B1F, ROCKETHIDEOUTB1F_HYPER_POTION, SHOW RocketHideoutB2FHS: - db ROCKET_HIDEOUT_B2F, $02, SHOW - db ROCKET_HIDEOUT_B2F, $03, SHOW - db ROCKET_HIDEOUT_B2F, $04, SHOW - db ROCKET_HIDEOUT_B2F, $05, SHOW + db ROCKET_HIDEOUT_B2F, ROCKETHIDEOUTB2F_MOON_STONE, SHOW + db ROCKET_HIDEOUT_B2F, ROCKETHIDEOUTB2F_NUGGET, SHOW + db ROCKET_HIDEOUT_B2F, ROCKETHIDEOUTB2F_TM_HORN_DRILL, SHOW + db ROCKET_HIDEOUT_B2F, ROCKETHIDEOUTB2F_SUPER_POTION, SHOW RocketHideoutB3FHS: - db ROCKET_HIDEOUT_B3F, $03, SHOW - db ROCKET_HIDEOUT_B3F, $04, SHOW + db ROCKET_HIDEOUT_B3F, ROCKETHIDEOUTB3F_TM_DOUBLE_EDGE, SHOW + db ROCKET_HIDEOUT_B3F, ROCKETHIDEOUTB3F_RARE_CANDY, SHOW RocketHideoutB4FHS: - db ROCKET_HIDEOUT_B4F, $01, SHOW - db ROCKET_HIDEOUT_B4F, $05, SHOW - db ROCKET_HIDEOUT_B4F, $06, SHOW - db ROCKET_HIDEOUT_B4F, $07, SHOW - db ROCKET_HIDEOUT_B4F, $08, HIDE - db ROCKET_HIDEOUT_B4F, $09, HIDE + db ROCKET_HIDEOUT_B4F, ROCKETHIDEOUTB4F_GIOVANNI, SHOW + db ROCKET_HIDEOUT_B4F, ROCKETHIDEOUTB4F_HP_UP, SHOW + db ROCKET_HIDEOUT_B4F, ROCKETHIDEOUTB4F_TM_RAZOR_WIND, SHOW + db ROCKET_HIDEOUT_B4F, ROCKETHIDEOUTB4F_IRON, SHOW + db ROCKET_HIDEOUT_B4F, ROCKETHIDEOUTB4F_SILPH_SCOPE, HIDE + db ROCKET_HIDEOUT_B4F, ROCKETHIDEOUTB4F_LIFT_KEY, HIDE SilphCo2FHS: - db SILPH_CO_2F, $01, SHOW - db SILPH_CO_2F, $02, SHOW - db SILPH_CO_2F, $03, SHOW - db SILPH_CO_2F, $04, SHOW - db SILPH_CO_2F, $05, SHOW + db SILPH_CO_2F, SILPHCO2F_SILPH_WORKER_F, SHOW + db SILPH_CO_2F, SILPHCO2F_SCIENTIST1, SHOW + db SILPH_CO_2F, SILPHCO2F_SCIENTIST2, SHOW + db SILPH_CO_2F, SILPHCO2F_ROCKET1, SHOW + db SILPH_CO_2F, SILPHCO2F_ROCKET2, SHOW SilphCo3FHS: - db SILPH_CO_3F, $02, SHOW - db SILPH_CO_3F, $03, SHOW - db SILPH_CO_3F, $04, SHOW + db SILPH_CO_3F, SILPHCO3F_ROCKET, SHOW + db SILPH_CO_3F, SILPHCO3F_SCIENTIST, SHOW + db SILPH_CO_3F, SILPHCO3F_HYPER_POTION, SHOW SilphCo4FHS: - db SILPH_CO_4F, $02, SHOW - db SILPH_CO_4F, $03, SHOW - db SILPH_CO_4F, $04, SHOW - db SILPH_CO_4F, $05, SHOW - db SILPH_CO_4F, $06, SHOW - db SILPH_CO_4F, $07, SHOW + db SILPH_CO_4F, SILPHCO4F_ROCKET1, SHOW + db SILPH_CO_4F, SILPHCO4F_SCIENTIST, SHOW + db SILPH_CO_4F, SILPHCO4F_ROCKET2, SHOW + db SILPH_CO_4F, SILPHCO4F_FULL_HEAL, SHOW + db SILPH_CO_4F, SILPHCO4F_MAX_REVIVE, SHOW + db SILPH_CO_4F, SILPHCO4F_ESCAPE_ROPE, SHOW SilphCo5FHS: - db SILPH_CO_5F, $02, SHOW - db SILPH_CO_5F, $03, SHOW - db SILPH_CO_5F, $04, SHOW - db SILPH_CO_5F, $05, SHOW - db SILPH_CO_5F, $06, SHOW - db SILPH_CO_5F, $07, SHOW - db SILPH_CO_5F, $08, SHOW + db SILPH_CO_5F, SILPHCO5F_ROCKET1, SHOW + db SILPH_CO_5F, SILPHCO5F_SCIENTIST, SHOW + db SILPH_CO_5F, SILPHCO5F_ROCKER, SHOW + db SILPH_CO_5F, SILPHCO5F_ROCKET2, SHOW + db SILPH_CO_5F, SILPHCO5F_TM_TAKE_DOWN, SHOW + db SILPH_CO_5F, SILPHCO5F_PROTEIN, SHOW + db SILPH_CO_5F, SILPHCO5F_CARD_KEY, SHOW SilphCo6FHS: - db SILPH_CO_6F, $06, SHOW - db SILPH_CO_6F, $07, SHOW - db SILPH_CO_6F, $08, SHOW - db SILPH_CO_6F, $09, SHOW - db SILPH_CO_6F, $0A, SHOW + db SILPH_CO_6F, SILPHCO6F_ROCKET1, SHOW + db SILPH_CO_6F, SILPHCO6F_SCIENTIST, SHOW + db SILPH_CO_6F, SILPHCO6F_ROCKET2, SHOW + db SILPH_CO_6F, SILPHCO6F_HP_UP, SHOW + db SILPH_CO_6F, SILPHCO6F_X_ACCURACY, SHOW SilphCo7FHS: - db SILPH_CO_7F, $05, SHOW - db SILPH_CO_7F, $06, SHOW - db SILPH_CO_7F, $07, SHOW - db SILPH_CO_7F, $08, SHOW - db SILPH_CO_7F, $09, SHOW - db SILPH_CO_7F, $0A, SHOW - db SILPH_CO_7F, $0B, SHOW - db SILPH_CO_7F, $0C, SHOW + db SILPH_CO_7F, SILPHCO7F_ROCKET1, SHOW + db SILPH_CO_7F, SILPHCO7F_SCIENTIST, SHOW + db SILPH_CO_7F, SILPHCO7F_ROCKET2, SHOW + db SILPH_CO_7F, SILPHCO7F_ROCKET3, SHOW + db SILPH_CO_7F, SILPHCO7F_RIVAL, SHOW + db SILPH_CO_7F, SILPHCO7F_CALCIUM, SHOW + db SILPH_CO_7F, SILPHCO7F_TM_SWORDS_DANCE, SHOW + db SILPH_CO_7F, SILPHCO7F_UNUSED, SHOW SilphCo8FHS: - db SILPH_CO_8F, $02, SHOW - db SILPH_CO_8F, $03, SHOW - db SILPH_CO_8F, $04, SHOW + db SILPH_CO_8F, SILPHCO8F_ROCKET1, SHOW + db SILPH_CO_8F, SILPHCO8F_SCIENTIST, SHOW + db SILPH_CO_8F, SILPHCO8F_ROCKET2, SHOW SilphCo9FHS: - db SILPH_CO_9F, $02, SHOW - db SILPH_CO_9F, $03, SHOW - db SILPH_CO_9F, $04, SHOW + db SILPH_CO_9F, SILPHCO9F_ROCKET1, SHOW + db SILPH_CO_9F, SILPHCO9F_SCIENTIST, SHOW + db SILPH_CO_9F, SILPHCO9F_ROCKET2, SHOW SilphCo10FHS: - db SILPH_CO_10F, $01, SHOW - db SILPH_CO_10F, $02, SHOW - db SILPH_CO_10F, $03, SHOW - db SILPH_CO_10F, $04, SHOW - db SILPH_CO_10F, $05, SHOW - db SILPH_CO_10F, $06, SHOW + db SILPH_CO_10F, SILPHCO10F_ROCKET, SHOW + db SILPH_CO_10F, SILPHCO10F_SCIENTIST, SHOW + db SILPH_CO_10F, SILPHCO10F_SILPH_WORKER_F, SHOW + db SILPH_CO_10F, SILPHCO10F_TM_EARTHQUAKE, SHOW + db SILPH_CO_10F, SILPHCO10F_RARE_CANDY, SHOW + db SILPH_CO_10F, SILPHCO10F_CARBOS, SHOW SilphCo11FHS: - db SILPH_CO_11F, $03, SHOW - db SILPH_CO_11F, $04, SHOW - db SILPH_CO_11F, $05, SHOW + db SILPH_CO_11F, SILPHCO11F_GIOVANNI, SHOW + db SILPH_CO_11F, SILPHCO11F_ROCKET1, SHOW + db SILPH_CO_11F, SILPHCO11F_ROCKET2, SHOW UnusedMapF4HS: - db UNUSED_MAP_F4, $02, SHOW + db UNUSED_MAP_F4, $02, SHOW ; unused PokemonMansion2FHS: - db POKEMON_MANSION_2F, $02, SHOW + db POKEMON_MANSION_2F, POKEMONMANSION2F_CALCIUM, SHOW PokemonMansion3FHS: - db POKEMON_MANSION_3F, $03, SHOW - db POKEMON_MANSION_3F, $04, SHOW + db POKEMON_MANSION_3F, POKEMONMANSION3F_MAX_POTION, SHOW + db POKEMON_MANSION_3F, POKEMONMANSION3F_IRON, SHOW PokemonMansionB1FHS: - db POKEMON_MANSION_B1F, $03, SHOW - db POKEMON_MANSION_B1F, $04, SHOW - db POKEMON_MANSION_B1F, $05, SHOW - db POKEMON_MANSION_B1F, $06, SHOW - db POKEMON_MANSION_B1F, $08, SHOW + db POKEMON_MANSION_B1F, POKEMONMANSIONB1F_RARE_CANDY, SHOW + db POKEMON_MANSION_B1F, POKEMONMANSIONB1F_FULL_RESTORE, SHOW + db POKEMON_MANSION_B1F, POKEMONMANSIONB1F_TM_BLIZZARD, SHOW + db POKEMON_MANSION_B1F, POKEMONMANSIONB1F_TM_SOLARBEAM, SHOW + db POKEMON_MANSION_B1F, POKEMONMANSIONB1F_SECRET_KEY, SHOW SafariZoneEastHS: - db SAFARI_ZONE_EAST, $01, SHOW - db SAFARI_ZONE_EAST, $02, SHOW - db SAFARI_ZONE_EAST, $03, SHOW - db SAFARI_ZONE_EAST, $04, SHOW + db SAFARI_ZONE_EAST, SAFARIZONEEAST_FULL_RESTORE, SHOW + db SAFARI_ZONE_EAST, SAFARIZONEEAST_MAX_RESTORE, SHOW + db SAFARI_ZONE_EAST, SAFARIZONEEAST_CARBOS, SHOW + db SAFARI_ZONE_EAST, SAFARIZONEEAST_TM_EGG_BOMB, SHOW SafariZoneNorthHS: - db SAFARI_ZONE_NORTH, $01, SHOW - db SAFARI_ZONE_NORTH, $02, SHOW + db SAFARI_ZONE_NORTH, SAFARIZONENORTH_PROTEIN, SHOW + db SAFARI_ZONE_NORTH, SAFARIZONENORTH_TM_SKULL_BASH, SHOW SafariZoneWestHS: - db SAFARI_ZONE_WEST, $01, SHOW - db SAFARI_ZONE_WEST, $02, SHOW - db SAFARI_ZONE_WEST, $03, SHOW - db SAFARI_ZONE_WEST, $04, SHOW + db SAFARI_ZONE_WEST, SAFARIZONEWEST_MAX_POTION, SHOW + db SAFARI_ZONE_WEST, SAFARIZONEWEST_TM_DOUBLE_TEAM, SHOW + db SAFARI_ZONE_WEST, SAFARIZONEWEST_MAX_REVIVE, SHOW + db SAFARI_ZONE_WEST, SAFARIZONEWEST_GOLD_TEETH, SHOW SafariZoneCenterHS: - db SAFARI_ZONE_CENTER, $01, SHOW + db SAFARI_ZONE_CENTER, SAFARIZONECENTER_NUGGET, SHOW CeruleanCave2FHS: - db CERULEAN_CAVE_2F, $01, SHOW - db CERULEAN_CAVE_2F, $02, SHOW - db CERULEAN_CAVE_2F, $03, SHOW + db CERULEAN_CAVE_2F, CERULEANCAVE2F_PP_UP, SHOW + db CERULEAN_CAVE_2F, CERULEANCAVE2F_ULTRA_BALL, SHOW + db CERULEAN_CAVE_2F, CERULEANCAVE2F_FULL_RESTORE, SHOW CeruleanCaveB1FHS: - db CERULEAN_CAVE_B1F, $01, SHOW - db CERULEAN_CAVE_B1F, $02, SHOW - db CERULEAN_CAVE_B1F, $03, SHOW + db CERULEAN_CAVE_B1F, CERULEANCAVE_B1F_MEWTWO, SHOW + db CERULEAN_CAVE_B1F, CERULEANCAVE_B1F_ULTRA_BALL, SHOW + db CERULEAN_CAVE_B1F, CERULEANCAVE_B1F_MAX_REVIVE, SHOW VictoryRoad1FHS: - db VICTORY_ROAD_1F, $03, SHOW - db VICTORY_ROAD_1F, $04, SHOW + db VICTORY_ROAD_1F, VICTORYROAD1F_TM_SKY_ATTACK, SHOW + db VICTORY_ROAD_1F, VICTORYROAD1F_RARE_CANDY, SHOW ChampionsRoomHS: - db CHAMPIONS_ROOM, $02, HIDE + db CHAMPIONS_ROOM, CHAMPIONSROOM_OAK, HIDE SeafoamIslands1FHS: - db SEAFOAM_ISLANDS_1F, $01, SHOW - db SEAFOAM_ISLANDS_1F, $02, SHOW + db SEAFOAM_ISLANDS_1F, SEAFOAMISLANDS1F_BOULDER1, SHOW + db SEAFOAM_ISLANDS_1F, SEAFOAMISLANDS1F_BOULDER2, SHOW SeafoamIslandsB1FHS: - db SEAFOAM_ISLANDS_B1F, $01, HIDE - db SEAFOAM_ISLANDS_B1F, $02, HIDE + db SEAFOAM_ISLANDS_B1F, SEAFOAMISLANDSB1F_BOULDER1, HIDE + db SEAFOAM_ISLANDS_B1F, SEAFOAMISLANDSB1F_BOULDER2, HIDE SeafoamIslandsB2FHS: - db SEAFOAM_ISLANDS_B2F, $01, HIDE - db SEAFOAM_ISLANDS_B2F, $02, HIDE + db SEAFOAM_ISLANDS_B2F, SEAFOAMISLANDSB2F_BOULDER1, HIDE + db SEAFOAM_ISLANDS_B2F, SEAFOAMISLANDSB2F_BOULDER2, HIDE SeafoamIslandsB3FHS: - db SEAFOAM_ISLANDS_B3F, $02, SHOW - db SEAFOAM_ISLANDS_B3F, $03, SHOW - db SEAFOAM_ISLANDS_B3F, $05, HIDE - db SEAFOAM_ISLANDS_B3F, $06, HIDE + db SEAFOAM_ISLANDS_B3F, SEAFOAMISLANDSB3F_BOULDER2, SHOW + db SEAFOAM_ISLANDS_B3F, SEAFOAMISLANDSB3F_BOULDER3, SHOW + db SEAFOAM_ISLANDS_B3F, SEAFOAMISLANDSB3F_BOULDER5, HIDE + db SEAFOAM_ISLANDS_B3F, SEAFOAMISLANDSB3F_BOULDER6, HIDE SeafoamIslandsB4FHS: - db SEAFOAM_ISLANDS_B4F, $01, HIDE - db SEAFOAM_ISLANDS_B4F, $02, HIDE - db SEAFOAM_ISLANDS_B4F, $03, SHOW + db SEAFOAM_ISLANDS_B4F, SEAFOAMISLANDSB4F_BOULDER1, HIDE + db SEAFOAM_ISLANDS_B4F, SEAFOAMISLANDSB4F_BOULDER2, HIDE + db SEAFOAM_ISLANDS_B4F, SEAFOAMISLANDSB4F_ARTICUNO, SHOW db $FF, $01, SHOW ; end assert_table_length NUM_HS_OBJECTS + 1 diff --git a/data/maps/objects/AgathasRoom.asm b/data/maps/objects/AgathasRoom.asm index 6cd6f21da..59a0f9d36 100644 --- a/data/maps/objects/AgathasRoom.asm +++ b/data/maps/objects/AgathasRoom.asm @@ -1,5 +1,5 @@ object_const_def - const AGATHASROOM_AGATHA + const_export AGATHASROOM_AGATHA AgathasRoom_Object: db $0 ; border block diff --git a/data/maps/objects/BikeShop.asm b/data/maps/objects/BikeShop.asm index 450d7a3a7..a635d0095 100644 --- a/data/maps/objects/BikeShop.asm +++ b/data/maps/objects/BikeShop.asm @@ -1,7 +1,7 @@ object_const_def - const BIKESHOP_CLERK - const BIKESHOP_MIDDLE_AGED_WOMAN - const BIKESHOP_YOUNGSTER + const_export BIKESHOP_CLERK + const_export BIKESHOP_MIDDLE_AGED_WOMAN + const_export BIKESHOP_YOUNGSTER BikeShop_Object: db $e ; border block diff --git a/data/maps/objects/BillsHouse.asm b/data/maps/objects/BillsHouse.asm index 198e6d9ef..6cbbb5b60 100644 --- a/data/maps/objects/BillsHouse.asm +++ b/data/maps/objects/BillsHouse.asm @@ -1,7 +1,7 @@ object_const_def - const BILLSHOUSE_BILL_POKEMON - const BILLSHOUSE_BILL1 - const BILLSHOUSE_BILL2 + const_export BILLSHOUSE_BILL_POKEMON + const_export BILLSHOUSE_BILL1 + const_export BILLSHOUSE_BILL2 BillsHouse_Object: db $d ; border block diff --git a/data/maps/objects/BluesHouse.asm b/data/maps/objects/BluesHouse.asm index 9633c1d05..d356506d7 100644 --- a/data/maps/objects/BluesHouse.asm +++ b/data/maps/objects/BluesHouse.asm @@ -1,7 +1,7 @@ object_const_def - const BLUESHOUSE_DAISY1 - const BLUESHOUSE_DAISY2 - const BLUESHOUSE_TOWN_MAP + const_export BLUESHOUSE_DAISY1 + const_export BLUESHOUSE_DAISY2 + const_export BLUESHOUSE_TOWN_MAP BluesHouse_Object: db $a ; border block diff --git a/data/maps/objects/BrunosRoom.asm b/data/maps/objects/BrunosRoom.asm index e4cd56925..0ec7a5a29 100644 --- a/data/maps/objects/BrunosRoom.asm +++ b/data/maps/objects/BrunosRoom.asm @@ -1,5 +1,5 @@ object_const_def - const BRUNOSROOM_BRUNO + const_export BRUNOSROOM_BRUNO BrunosRoom_Object: db $3 ; border block diff --git a/data/maps/objects/CeladonChiefHouse.asm b/data/maps/objects/CeladonChiefHouse.asm index 8fe27f685..0f457589e 100644 --- a/data/maps/objects/CeladonChiefHouse.asm +++ b/data/maps/objects/CeladonChiefHouse.asm @@ -1,7 +1,7 @@ object_const_def - const CELADONCHIEFHOUSE_CHIEF - const CELADONCHIEFHOUSE_ROCKET - const CELADONCHIEFHOUSE_SAILOR + const_export CELADONCHIEFHOUSE_CHIEF + const_export CELADONCHIEFHOUSE_ROCKET + const_export CELADONCHIEFHOUSE_SAILOR CeladonChiefHouse_Object: db $f ; border block diff --git a/data/maps/objects/CeladonCity.asm b/data/maps/objects/CeladonCity.asm index 6975bf6be..bab78ab74 100644 --- a/data/maps/objects/CeladonCity.asm +++ b/data/maps/objects/CeladonCity.asm @@ -1,13 +1,13 @@ object_const_def - const CELADONCITY_LITTLE_GIRL - const CELADONCITY_GRAMPS1 - const CELADONCITY_GIRL - const CELADONCITY_GRAMPS2 - const CELADONCITY_GRAMPS3 - const CELADONCITY_FISHER - const CELADONCITY_POLIWRATH - const CELADONCITY_ROCKET1 - const CELADONCITY_ROCKET2 + const_export CELADONCITY_LITTLE_GIRL + const_export CELADONCITY_GRAMPS1 + const_export CELADONCITY_GIRL + const_export CELADONCITY_GRAMPS2 + const_export CELADONCITY_GRAMPS3 + const_export CELADONCITY_FISHER + const_export CELADONCITY_POLIWRATH + const_export CELADONCITY_ROCKET1 + const_export CELADONCITY_ROCKET2 CeladonCity_Object: db $f ; border block diff --git a/data/maps/objects/CeladonDiner.asm b/data/maps/objects/CeladonDiner.asm index 98363688c..d3c1a0196 100644 --- a/data/maps/objects/CeladonDiner.asm +++ b/data/maps/objects/CeladonDiner.asm @@ -1,9 +1,9 @@ object_const_def - const CELADONDINER_COOK - const CELADONDINER_MIDDLE_AGED_WOMAN - const CELADONDINER_MIDDLE_AGED_MAN - const CELADONDINER_FISHER - const CELADONDINER_GYM_GUIDE + const_export CELADONDINER_COOK + const_export CELADONDINER_MIDDLE_AGED_WOMAN + const_export CELADONDINER_MIDDLE_AGED_MAN + const_export CELADONDINER_FISHER + const_export CELADONDINER_GYM_GUIDE CeladonDiner_Object: db $f ; border block diff --git a/data/maps/objects/CeladonGym.asm b/data/maps/objects/CeladonGym.asm index bb4ad61c5..06fc882ef 100644 --- a/data/maps/objects/CeladonGym.asm +++ b/data/maps/objects/CeladonGym.asm @@ -1,12 +1,12 @@ object_const_def - const CELADONGYM_ERIKA - const CELADONGYM_COOLTRAINER_F1 - const CELADONGYM_BEAUTY1 - const CELADONGYM_COOLTRAINER_F2 - const CELADONGYM_BEAUTY2 - const CELADONGYM_COOLTRAINER_F3 - const CELADONGYM_BEAUTY3 - const CELADONGYM_COOLTRAINER_F4 + const_export CELADONGYM_ERIKA + const_export CELADONGYM_COOLTRAINER_F1 + const_export CELADONGYM_BEAUTY1 + const_export CELADONGYM_COOLTRAINER_F2 + const_export CELADONGYM_BEAUTY2 + const_export CELADONGYM_COOLTRAINER_F3 + const_export CELADONGYM_BEAUTY3 + const_export CELADONGYM_COOLTRAINER_F4 CeladonGym_Object: db $3 ; border block diff --git a/data/maps/objects/CeladonHotel.asm b/data/maps/objects/CeladonHotel.asm index 700361ce9..54a64d51e 100644 --- a/data/maps/objects/CeladonHotel.asm +++ b/data/maps/objects/CeladonHotel.asm @@ -1,7 +1,7 @@ object_const_def - const CELADONHOTEL_GRANNY - const CELADONHOTEL_BEAUTY - const CELADONHOTEL_SUPER_NERD + const_export CELADONHOTEL_GRANNY + const_export CELADONHOTEL_BEAUTY + const_export CELADONHOTEL_SUPER_NERD CeladonHotel_Object: db $0 ; border block diff --git a/data/maps/objects/CeladonMansion1F.asm b/data/maps/objects/CeladonMansion1F.asm index 6161cf0a4..e36b7b494 100644 --- a/data/maps/objects/CeladonMansion1F.asm +++ b/data/maps/objects/CeladonMansion1F.asm @@ -1,8 +1,8 @@ object_const_def - const CELADONMANSION1F_MEOWTH - const CELADONMANSION1F_GRANNY - const CELADONMANSION1F_CLEFAIRY - const CELADONMANSION1F_NIDORANF + const_export CELADONMANSION1F_MEOWTH + const_export CELADONMANSION1F_GRANNY + const_export CELADONMANSION1F_CLEFAIRY + const_export CELADONMANSION1F_NIDORANF CeladonMansion1F_Object: db $f ; border block diff --git a/data/maps/objects/CeladonMansion3F.asm b/data/maps/objects/CeladonMansion3F.asm index 5d2c1e999..7e744af33 100644 --- a/data/maps/objects/CeladonMansion3F.asm +++ b/data/maps/objects/CeladonMansion3F.asm @@ -1,8 +1,8 @@ object_const_def - const CELADONMANSION3F_PROGRAMMER - const CELADONMANSION3F_GRAPHIC_ARTIST - const CELADONMANSION3F_WRITER - const CELADONMANSION3F_GAME_DESIGNER + const_export CELADONMANSION3F_PROGRAMMER + const_export CELADONMANSION3F_GRAPHIC_ARTIST + const_export CELADONMANSION3F_WRITER + const_export CELADONMANSION3F_GAME_DESIGNER CeladonMansion3F_Object: db $f ; border block diff --git a/data/maps/objects/CeladonMansionRoofHouse.asm b/data/maps/objects/CeladonMansionRoofHouse.asm index 4ee9494bd..4a37bf4e5 100644 --- a/data/maps/objects/CeladonMansionRoofHouse.asm +++ b/data/maps/objects/CeladonMansionRoofHouse.asm @@ -1,6 +1,6 @@ object_const_def - const CELADONMANSION_ROOF_HOUSE_HIKER - const CELADONMANSION_ROOF_HOUSE_EEVEE_POKEBALL + const_export CELADONMANSION_ROOF_HOUSE_HIKER + const_export CELADONMANSION_ROOF_HOUSE_EEVEE_POKEBALL CeladonMansionRoofHouse_Object: db $a ; border block diff --git a/data/maps/objects/CeladonMart1F.asm b/data/maps/objects/CeladonMart1F.asm index 6ec1e35d9..d1dd26831 100644 --- a/data/maps/objects/CeladonMart1F.asm +++ b/data/maps/objects/CeladonMart1F.asm @@ -1,5 +1,5 @@ object_const_def - const CELADONMART1F_RECEPTIONIST + const_export CELADONMART1F_RECEPTIONIST CeladonMart1F_Object: db $f ; border block diff --git a/data/maps/objects/CeladonMart2F.asm b/data/maps/objects/CeladonMart2F.asm index 520523839..039afecde 100644 --- a/data/maps/objects/CeladonMart2F.asm +++ b/data/maps/objects/CeladonMart2F.asm @@ -1,8 +1,8 @@ object_const_def - const CELADONMART2F_CLERK1 - const CELADONMART2F_CLERK2 - const CELADONMART2F_MIDDLE_AGED_MAN - const CELADONMART2F_GIRL + const_export CELADONMART2F_CLERK1 + const_export CELADONMART2F_CLERK2 + const_export CELADONMART2F_MIDDLE_AGED_MAN + const_export CELADONMART2F_GIRL CeladonMart2F_Object: db $f ; border block diff --git a/data/maps/objects/CeladonMart3F.asm b/data/maps/objects/CeladonMart3F.asm index e0e3f7be8..99d980789 100644 --- a/data/maps/objects/CeladonMart3F.asm +++ b/data/maps/objects/CeladonMart3F.asm @@ -1,9 +1,9 @@ object_const_def - const CELADONMART3F_CLERK - const CELADONMART3F_GAMEBOY_KID1 - const CELADONMART3F_GAMEBOY_KID2 - const CELADONMART3F_GAMEBOY_KID3 - const CELADONMART3F_LITTLE_BOY + const_export CELADONMART3F_CLERK + const_export CELADONMART3F_GAMEBOY_KID1 + const_export CELADONMART3F_GAMEBOY_KID2 + const_export CELADONMART3F_GAMEBOY_KID3 + const_export CELADONMART3F_LITTLE_BOY CeladonMart3F_Object: db $f ; border block diff --git a/data/maps/objects/CeladonMart4F.asm b/data/maps/objects/CeladonMart4F.asm index 6ee17f192..21846abe9 100644 --- a/data/maps/objects/CeladonMart4F.asm +++ b/data/maps/objects/CeladonMart4F.asm @@ -1,7 +1,7 @@ object_const_def - const CELADONMART4F_CLERK - const CELADONMART4F_SUPER_NERD - const CELADONMART4F_YOUNGSTER + const_export CELADONMART4F_CLERK + const_export CELADONMART4F_SUPER_NERD + const_export CELADONMART4F_YOUNGSTER CeladonMart4F_Object: db $f ; border block diff --git a/data/maps/objects/CeladonMart5F.asm b/data/maps/objects/CeladonMart5F.asm index 916d2756c..637fd6624 100644 --- a/data/maps/objects/CeladonMart5F.asm +++ b/data/maps/objects/CeladonMart5F.asm @@ -1,8 +1,8 @@ object_const_def - const CELADONMART5F_GENTLEMAN - const CELADONMART5F_SAILOR - const CELADONMART5F_CLERK1 - const CELADONMART5F_CLERK2 + const_export CELADONMART5F_GENTLEMAN + const_export CELADONMART5F_SAILOR + const_export CELADONMART5F_CLERK1 + const_export CELADONMART5F_CLERK2 CeladonMart5F_Object: db $f ; border block diff --git a/data/maps/objects/CeladonMartRoof.asm b/data/maps/objects/CeladonMartRoof.asm index e686567c7..51350b5dc 100644 --- a/data/maps/objects/CeladonMartRoof.asm +++ b/data/maps/objects/CeladonMartRoof.asm @@ -1,6 +1,6 @@ object_const_def - const CELADONMARTROOF_SUPER_NERD - const CELADONMARTROOF_LITTLE_GIRL + const_export CELADONMARTROOF_SUPER_NERD + const_export CELADONMARTROOF_LITTLE_GIRL CeladonMartRoof_Object: db $42 ; border block diff --git a/data/maps/objects/CeladonPokecenter.asm b/data/maps/objects/CeladonPokecenter.asm index 4709203b7..4d9c5f26d 100644 --- a/data/maps/objects/CeladonPokecenter.asm +++ b/data/maps/objects/CeladonPokecenter.asm @@ -1,8 +1,8 @@ object_const_def - const CELADONPOKECENTER_NURSE - const CELADONPOKECENTER_GENTLEMAN - const CELADONPOKECENTER_BEAUTY - const CELADONPOKECENTER_LINK_RECEPTIONIST + const_export CELADONPOKECENTER_NURSE + const_export CELADONPOKECENTER_GENTLEMAN + const_export CELADONPOKECENTER_BEAUTY + const_export CELADONPOKECENTER_LINK_RECEPTIONIST CeladonPokecenter_Object: db $0 ; border block diff --git a/data/maps/objects/CeruleanBadgeHouse.asm b/data/maps/objects/CeruleanBadgeHouse.asm index 1fec6ac8e..d534cbe7c 100644 --- a/data/maps/objects/CeruleanBadgeHouse.asm +++ b/data/maps/objects/CeruleanBadgeHouse.asm @@ -1,5 +1,5 @@ object_const_def - const CERULEANBADGEHOUSE_MIDDLE_AGED_MAN + const_export CERULEANBADGEHOUSE_MIDDLE_AGED_MAN CeruleanBadgeHouse_Object: db $c ; border block diff --git a/data/maps/objects/CeruleanCave1F.asm b/data/maps/objects/CeruleanCave1F.asm index 777805d4e..89a647265 100644 --- a/data/maps/objects/CeruleanCave1F.asm +++ b/data/maps/objects/CeruleanCave1F.asm @@ -1,7 +1,7 @@ object_const_def - const CERULEANCAVE1F_FULL_RESTORE - const CERULEANCAVE1F_MAX_ELIXER - const CERULEANCAVE1F_NUGGET + const_export CERULEANCAVE1F_FULL_RESTORE + const_export CERULEANCAVE1F_MAX_ELIXER + const_export CERULEANCAVE1F_NUGGET CeruleanCave1F_Object: db $7d ; border block diff --git a/data/maps/objects/CeruleanCave2F.asm b/data/maps/objects/CeruleanCave2F.asm index 6eea42a0c..3fb226a3c 100644 --- a/data/maps/objects/CeruleanCave2F.asm +++ b/data/maps/objects/CeruleanCave2F.asm @@ -1,7 +1,7 @@ object_const_def - const CERULEANCAVE2F_PP_UP - const CERULEANCAVE2F_ULTRA_BALL - const CERULEANCAVE2F_FULL_RESTORE + const_export CERULEANCAVE2F_PP_UP + const_export CERULEANCAVE2F_ULTRA_BALL + const_export CERULEANCAVE2F_FULL_RESTORE CeruleanCave2F_Object: db $7d ; border block diff --git a/data/maps/objects/CeruleanCaveB1F.asm b/data/maps/objects/CeruleanCaveB1F.asm index 81e2b880c..a82d1712f 100644 --- a/data/maps/objects/CeruleanCaveB1F.asm +++ b/data/maps/objects/CeruleanCaveB1F.asm @@ -1,7 +1,7 @@ object_const_def - const CERULEANCAVE_B1F_MEWTWO - const CERULEANCAVE_B1F_ULTRA_BALL - const CERULEANCAVE_B1F_MAX_REVIVE + const_export CERULEANCAVE_B1F_MEWTWO + const_export CERULEANCAVE_B1F_ULTRA_BALL + const_export CERULEANCAVE_B1F_MAX_REVIVE CeruleanCaveB1F_Object: db $7d ; border block diff --git a/data/maps/objects/CeruleanCity.asm b/data/maps/objects/CeruleanCity.asm index 605aa417e..12de9dd3a 100644 --- a/data/maps/objects/CeruleanCity.asm +++ b/data/maps/objects/CeruleanCity.asm @@ -1,15 +1,15 @@ object_const_def - const CERULEANCITY_RIVAL - const CERULEANCITY_ROCKET - const CERULEANCITY_COOLTRAINER_M - const CERULEANCITY_SUPER_NERD1 - const CERULEANCITY_SUPER_NERD2 - const CERULEANCITY_GUARD1 - const CERULEANCITY_COOLTRAINER_F1 - const CERULEANCITY_SLOWBRO - const CERULEANCITY_COOLTRAINER_F2 - const CERULEANCITY_SUPER_NERD3 - const CERULEANCITY_GUARD2 + const_export CERULEANCITY_RIVAL + const_export CERULEANCITY_ROCKET + const_export CERULEANCITY_COOLTRAINER_M + const_export CERULEANCITY_SUPER_NERD1 + const_export CERULEANCITY_SUPER_NERD2 + const_export CERULEANCITY_GUARD1 + const_export CERULEANCITY_COOLTRAINER_F1 + const_export CERULEANCITY_SLOWBRO + const_export CERULEANCITY_COOLTRAINER_F2 + const_export CERULEANCITY_SUPER_NERD3 + const_export CERULEANCITY_GUARD2 CeruleanCity_Object: db $f ; border block diff --git a/data/maps/objects/CeruleanGym.asm b/data/maps/objects/CeruleanGym.asm index 19a068700..cfee7bfa7 100644 --- a/data/maps/objects/CeruleanGym.asm +++ b/data/maps/objects/CeruleanGym.asm @@ -1,8 +1,8 @@ object_const_def - const CERULEANGYM_MISTY - const CERULEANGYM_COOLTRAINER_F - const CERULEANGYM_SWIMMER - const CERULEANGYM_GYM_GUIDE + const_export CERULEANGYM_MISTY + const_export CERULEANGYM_COOLTRAINER_F + const_export CERULEANGYM_SWIMMER + const_export CERULEANGYM_GYM_GUIDE CeruleanGym_Object: db $3 ; border block diff --git a/data/maps/objects/CeruleanMart.asm b/data/maps/objects/CeruleanMart.asm index a1ab6717a..fa13abd55 100644 --- a/data/maps/objects/CeruleanMart.asm +++ b/data/maps/objects/CeruleanMart.asm @@ -1,7 +1,7 @@ object_const_def - const CERULEANMART_CLERK - const CERULEANMART_COOLTRAINER_M - const CERULEANMART_COOLTRAINER_F + const_export CERULEANMART_CLERK + const_export CERULEANMART_COOLTRAINER_M + const_export CERULEANMART_COOLTRAINER_F CeruleanMart_Object: db $0 ; border block diff --git a/data/maps/objects/CeruleanPokecenter.asm b/data/maps/objects/CeruleanPokecenter.asm index 5e1a4015d..9eb611783 100644 --- a/data/maps/objects/CeruleanPokecenter.asm +++ b/data/maps/objects/CeruleanPokecenter.asm @@ -1,8 +1,8 @@ object_const_def - const CERULEANPOKECENTER_NURSE - const CERULEANPOKECENTER_SUPER_NERD - const CERULEANPOKECENTER_GENTLEMAN - const CERULEANPOKECENTER_LINK_RECEPTIONIST + const_export CERULEANPOKECENTER_NURSE + const_export CERULEANPOKECENTER_SUPER_NERD + const_export CERULEANPOKECENTER_GENTLEMAN + const_export CERULEANPOKECENTER_LINK_RECEPTIONIST CeruleanPokecenter_Object: db $0 ; border block diff --git a/data/maps/objects/CeruleanTradeHouse.asm b/data/maps/objects/CeruleanTradeHouse.asm index c55ed6ef8..d4014f3a2 100644 --- a/data/maps/objects/CeruleanTradeHouse.asm +++ b/data/maps/objects/CeruleanTradeHouse.asm @@ -1,6 +1,6 @@ object_const_def - const CERULEANTRADEHOUSE_GRANNY - const CERULEANTRADEHOUSE_GAMBLER + const_export CERULEANTRADEHOUSE_GRANNY + const_export CERULEANTRADEHOUSE_GAMBLER CeruleanTradeHouse_Object: db $a ; border block diff --git a/data/maps/objects/CeruleanTrashedHouse.asm b/data/maps/objects/CeruleanTrashedHouse.asm index 993e66c2e..f8dfa87e8 100644 --- a/data/maps/objects/CeruleanTrashedHouse.asm +++ b/data/maps/objects/CeruleanTrashedHouse.asm @@ -1,6 +1,6 @@ object_const_def - const CERULEANTRASHEDHOUSE_FISHING_GURU - const CERULEANTRASHEDHOUSE_GIRL + const_export CERULEANTRASHEDHOUSE_FISHING_GURU + const_export CERULEANTRASHEDHOUSE_GIRL CeruleanTrashedHouse_Object: db $a ; border block diff --git a/data/maps/objects/ChampionsRoom.asm b/data/maps/objects/ChampionsRoom.asm index 50bdee605..79fd15dce 100644 --- a/data/maps/objects/ChampionsRoom.asm +++ b/data/maps/objects/ChampionsRoom.asm @@ -1,6 +1,6 @@ object_const_def - const CHAMPIONSROOM_RIVAL - const CHAMPIONSROOM_OAK + const_export CHAMPIONSROOM_RIVAL + const_export CHAMPIONSROOM_OAK ChampionsRoom_Object: db $3 ; border block diff --git a/data/maps/objects/CinnabarGym.asm b/data/maps/objects/CinnabarGym.asm index 9453d0b70..f571b4352 100644 --- a/data/maps/objects/CinnabarGym.asm +++ b/data/maps/objects/CinnabarGym.asm @@ -1,13 +1,13 @@ object_const_def - const CINNABARGYM_BLAINE - const CINNABARGYM_SUPER_NERD1 - const CINNABARGYM_SUPER_NERD2 - const CINNABARGYM_SUPER_NERD3 - const CINNABARGYM_SUPER_NERD4 - const CINNABARGYM_SUPER_NERD5 - const CINNABARGYM_SUPER_NERD6 - const CINNABARGYM_SUPER_NERD7 - const CINNABARGYM_GYM_GUIDE + const_export CINNABARGYM_BLAINE + const_export CINNABARGYM_SUPER_NERD1 + const_export CINNABARGYM_SUPER_NERD2 + const_export CINNABARGYM_SUPER_NERD3 + const_export CINNABARGYM_SUPER_NERD4 + const_export CINNABARGYM_SUPER_NERD5 + const_export CINNABARGYM_SUPER_NERD6 + const_export CINNABARGYM_SUPER_NERD7 + const_export CINNABARGYM_GYM_GUIDE CinnabarGym_Object: db $2e ; border block diff --git a/data/maps/objects/CinnabarIsland.asm b/data/maps/objects/CinnabarIsland.asm index dd3593b34..739d5d754 100644 --- a/data/maps/objects/CinnabarIsland.asm +++ b/data/maps/objects/CinnabarIsland.asm @@ -1,6 +1,6 @@ object_const_def - const CINNABARISLAND_GIRL - const CINNABARISLAND_GAMBLER + const_export CINNABARISLAND_GIRL + const_export CINNABARISLAND_GAMBLER CinnabarIsland_Object: db $43 ; border block diff --git a/data/maps/objects/CinnabarLab.asm b/data/maps/objects/CinnabarLab.asm index bced7c56f..a921cb26a 100644 --- a/data/maps/objects/CinnabarLab.asm +++ b/data/maps/objects/CinnabarLab.asm @@ -1,5 +1,5 @@ object_const_def - const CINNABARLAB_FISHING_GURU + const_export CINNABARLAB_FISHING_GURU CinnabarLab_Object: db $17 ; border block diff --git a/data/maps/objects/CinnabarLabFossilRoom.asm b/data/maps/objects/CinnabarLabFossilRoom.asm index 6ffe49124..42a801343 100644 --- a/data/maps/objects/CinnabarLabFossilRoom.asm +++ b/data/maps/objects/CinnabarLabFossilRoom.asm @@ -1,6 +1,6 @@ object_const_def - const CINNABARLABFOSSILROOM_SCIENTIST1 - const CINNABARLABFOSSILROOM_SCIENTIST2 + const_export CINNABARLABFOSSILROOM_SCIENTIST1 + const_export CINNABARLABFOSSILROOM_SCIENTIST2 CinnabarLabFossilRoom_Object: db $17 ; border block diff --git a/data/maps/objects/CinnabarLabMetronomeRoom.asm b/data/maps/objects/CinnabarLabMetronomeRoom.asm index 926e9024f..abcae5a7c 100644 --- a/data/maps/objects/CinnabarLabMetronomeRoom.asm +++ b/data/maps/objects/CinnabarLabMetronomeRoom.asm @@ -1,6 +1,6 @@ object_const_def - const CINNABARLABMETRONOMEROOM_SCIENTIST1 - const CINNABARLABMETRONOMEROOM_SCIENTIST2 + const_export CINNABARLABMETRONOMEROOM_SCIENTIST1 + const_export CINNABARLABMETRONOMEROOM_SCIENTIST2 CinnabarLabMetronomeRoom_Object: db $17 ; border block diff --git a/data/maps/objects/CinnabarLabTradeRoom.asm b/data/maps/objects/CinnabarLabTradeRoom.asm index 69a944831..294646a75 100644 --- a/data/maps/objects/CinnabarLabTradeRoom.asm +++ b/data/maps/objects/CinnabarLabTradeRoom.asm @@ -1,7 +1,7 @@ object_const_def - const CINNABARLABTRADEROOM_SUPER_NERD - const CINNABARLABTRADEROOM_GRAMPS - const CINNABARLABTRADEROOM_BEAUTY + const_export CINNABARLABTRADEROOM_SUPER_NERD + const_export CINNABARLABTRADEROOM_GRAMPS + const_export CINNABARLABTRADEROOM_BEAUTY CinnabarLabTradeRoom_Object: db $17 ; border block diff --git a/data/maps/objects/CinnabarMart.asm b/data/maps/objects/CinnabarMart.asm index d6651e973..e77ba5cfe 100644 --- a/data/maps/objects/CinnabarMart.asm +++ b/data/maps/objects/CinnabarMart.asm @@ -1,7 +1,7 @@ object_const_def - const CINNABARMART_CLERK - const CINNABARMART_SILPH_WORKER_F - const CINNABARMART_SCIENTIST + const_export CINNABARMART_CLERK + const_export CINNABARMART_SILPH_WORKER_F + const_export CINNABARMART_SCIENTIST CinnabarMart_Object: db $0 ; border block diff --git a/data/maps/objects/CinnabarPokecenter.asm b/data/maps/objects/CinnabarPokecenter.asm index 1d3b39f09..1c50b2981 100644 --- a/data/maps/objects/CinnabarPokecenter.asm +++ b/data/maps/objects/CinnabarPokecenter.asm @@ -1,8 +1,8 @@ object_const_def - const CINNABARPOKECENTER_NURSE - const CINNABARPOKECENTER_COOLTRAINER_F - const CINNABARPOKECENTER_GENTLEMAN - const CINNABARPOKECENTER_LINK_RECEPTIONIST + const_export CINNABARPOKECENTER_NURSE + const_export CINNABARPOKECENTER_COOLTRAINER_F + const_export CINNABARPOKECENTER_GENTLEMAN + const_export CINNABARPOKECENTER_LINK_RECEPTIONIST CinnabarPokecenter_Object: db $0 ; border block diff --git a/data/maps/objects/Colosseum.asm b/data/maps/objects/Colosseum.asm index 9d6b04410..6fc8e9021 100644 --- a/data/maps/objects/Colosseum.asm +++ b/data/maps/objects/Colosseum.asm @@ -1,5 +1,5 @@ object_const_def - const COLOSSEUM_OPPONENT + const_export COLOSSEUM_OPPONENT Colosseum_Object: db $e ; border block diff --git a/data/maps/objects/CopycatsHouse1F.asm b/data/maps/objects/CopycatsHouse1F.asm index e82bd7808..cf55877b3 100644 --- a/data/maps/objects/CopycatsHouse1F.asm +++ b/data/maps/objects/CopycatsHouse1F.asm @@ -1,7 +1,7 @@ object_const_def - const COPYCATSHOUSE1F_MIDDLE_AGED_WOMAN - const COPYCATSHOUSE1F_MIDDLE_AGED_MAN - const COPYCATSHOUSE1F_CHANSEY + const_export COPYCATSHOUSE1F_MIDDLE_AGED_WOMAN + const_export COPYCATSHOUSE1F_MIDDLE_AGED_MAN + const_export COPYCATSHOUSE1F_CHANSEY CopycatsHouse1F_Object: db $a ; border block diff --git a/data/maps/objects/CopycatsHouse2F.asm b/data/maps/objects/CopycatsHouse2F.asm index dbc9918da..ac1890ed1 100644 --- a/data/maps/objects/CopycatsHouse2F.asm +++ b/data/maps/objects/CopycatsHouse2F.asm @@ -1,9 +1,9 @@ object_const_def - const COPYCATSHOUSE2F_COPYCAT - const COPYCATSHOUSE2F_DODUO - const COPYCATSHOUSE2F_MONSTER - const COPYCATSHOUSE2F_BIRD - const COPYCATSHOUSE2F_FAIRY + const_export COPYCATSHOUSE2F_COPYCAT + const_export COPYCATSHOUSE2F_DODUO + const_export COPYCATSHOUSE2F_MONSTER + const_export COPYCATSHOUSE2F_BIRD + const_export COPYCATSHOUSE2F_FAIRY CopycatsHouse2F_Object: db $a ; border block diff --git a/data/maps/objects/Daycare.asm b/data/maps/objects/Daycare.asm index 78060a94a..f19f99377 100644 --- a/data/maps/objects/Daycare.asm +++ b/data/maps/objects/Daycare.asm @@ -1,5 +1,5 @@ object_const_def - const DAYCARE_GENTLEMAN + const_export DAYCARE_GENTLEMAN Daycare_Object: db $a ; border block diff --git a/data/maps/objects/DiglettsCaveRoute11.asm b/data/maps/objects/DiglettsCaveRoute11.asm index 509566935..a10df2850 100644 --- a/data/maps/objects/DiglettsCaveRoute11.asm +++ b/data/maps/objects/DiglettsCaveRoute11.asm @@ -1,5 +1,5 @@ object_const_def - const DIGLETTSCAVEROUTE11_GAMBLER + const_export DIGLETTSCAVEROUTE11_GAMBLER DiglettsCaveRoute11_Object: db $7d ; border block diff --git a/data/maps/objects/DiglettsCaveRoute2.asm b/data/maps/objects/DiglettsCaveRoute2.asm index 97b975c02..9da4f0cd0 100644 --- a/data/maps/objects/DiglettsCaveRoute2.asm +++ b/data/maps/objects/DiglettsCaveRoute2.asm @@ -1,5 +1,5 @@ object_const_def - const DIGLETTSCAVEROUTE2_FISHING_GURU + const_export DIGLETTSCAVEROUTE2_FISHING_GURU DiglettsCaveRoute2_Object: db $7d ; border block diff --git a/data/maps/objects/FightingDojo.asm b/data/maps/objects/FightingDojo.asm index 15ce598f1..9d364a46d 100644 --- a/data/maps/objects/FightingDojo.asm +++ b/data/maps/objects/FightingDojo.asm @@ -1,11 +1,11 @@ object_const_def - const FIGHTINGDOJO_KARATE_MASTER - const FIGHTINGDOJO_BLACKBELT1 - const FIGHTINGDOJO_BLACKBELT2 - const FIGHTINGDOJO_BLACKBELT3 - const FIGHTINGDOJO_BLACKBELT4 - const FIGHTINGDOJO_HITMONLEE_POKE_BALL - const FIGHTINGDOJO_HITMONCHAN_POKE_BALL + const_export FIGHTINGDOJO_KARATE_MASTER + const_export FIGHTINGDOJO_BLACKBELT1 + const_export FIGHTINGDOJO_BLACKBELT2 + const_export FIGHTINGDOJO_BLACKBELT3 + const_export FIGHTINGDOJO_BLACKBELT4 + const_export FIGHTINGDOJO_HITMONLEE_POKE_BALL + const_export FIGHTINGDOJO_HITMONCHAN_POKE_BALL FightingDojo_Object: db $3 ; border block diff --git a/data/maps/objects/FuchsiaBillsGrandpasHouse.asm b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm index 3d9bc1438..72a1c382a 100644 --- a/data/maps/objects/FuchsiaBillsGrandpasHouse.asm +++ b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm @@ -1,7 +1,7 @@ object_const_def - const FUCHSIABILLSGRANDPASHOUSE_MIDDLE_AGED_WOMAN - const FUCHSIABILLSGRANDPASHOUSE_BILLS_GRANDPA - const FUCHSIABILLSGRANDPASHOUSE_YOUNGSTER + const_export FUCHSIABILLSGRANDPASHOUSE_MIDDLE_AGED_WOMAN + const_export FUCHSIABILLSGRANDPASHOUSE_BILLS_GRANDPA + const_export FUCHSIABILLSGRANDPASHOUSE_YOUNGSTER FuchsiaBillsGrandpasHouse_Object: db $a ; border block diff --git a/data/maps/objects/FuchsiaCity.asm b/data/maps/objects/FuchsiaCity.asm index 7e4201ff5..230158845 100644 --- a/data/maps/objects/FuchsiaCity.asm +++ b/data/maps/objects/FuchsiaCity.asm @@ -1,14 +1,14 @@ object_const_def - const FUCHSIACITY_YOUNGSTER1 - const FUCHSIACITY_GAMBLER - const FUCHSIACITY_ERIK - const FUCHSIACITY_YOUNGSTER2 - const FUCHSIACITY_CHANSEY - const FUCHSIACITY_VOLTORB - const FUCHSIACITY_KANGASKHAN - const FUCHSIACITY_SLOWPOKE - const FUCHSIACITY_LAPRAS - const FUCHSIACITY_FOSSIL + const_export FUCHSIACITY_YOUNGSTER1 + const_export FUCHSIACITY_GAMBLER + const_export FUCHSIACITY_ERIK + const_export FUCHSIACITY_YOUNGSTER2 + const_export FUCHSIACITY_CHANSEY + const_export FUCHSIACITY_VOLTORB + const_export FUCHSIACITY_KANGASKHAN + const_export FUCHSIACITY_SLOWPOKE + const_export FUCHSIACITY_LAPRAS + const_export FUCHSIACITY_FOSSIL FuchsiaCity_Object: db $f ; border block diff --git a/data/maps/objects/FuchsiaGoodRodHouse.asm b/data/maps/objects/FuchsiaGoodRodHouse.asm index eea49399e..3282a904b 100644 --- a/data/maps/objects/FuchsiaGoodRodHouse.asm +++ b/data/maps/objects/FuchsiaGoodRodHouse.asm @@ -1,5 +1,5 @@ object_const_def - const FUCHSIAGOODRODHOUSE_FISHING_GURU + const_export FUCHSIAGOODRODHOUSE_FISHING_GURU FuchsiaGoodRodHouse_Object: db $c ; border block diff --git a/data/maps/objects/FuchsiaGym.asm b/data/maps/objects/FuchsiaGym.asm index e3d0680a0..71be22322 100644 --- a/data/maps/objects/FuchsiaGym.asm +++ b/data/maps/objects/FuchsiaGym.asm @@ -1,12 +1,12 @@ object_const_def - const FUCHSIAGYM_KOGA - const FUCHSIAGYM_ROCKER1 - const FUCHSIAGYM_ROCKER2 - const FUCHSIAGYM_ROCKER3 - const FUCHSIAGYM_ROCKER4 - const FUCHSIAGYM_ROCKER5 - const FUCHSIAGYM_ROCKER6 - const FUCHSIAGYM_GYM_GUIDE + const_export FUCHSIAGYM_KOGA + const_export FUCHSIAGYM_ROCKER1 + const_export FUCHSIAGYM_ROCKER2 + const_export FUCHSIAGYM_ROCKER3 + const_export FUCHSIAGYM_ROCKER4 + const_export FUCHSIAGYM_ROCKER5 + const_export FUCHSIAGYM_ROCKER6 + const_export FUCHSIAGYM_GYM_GUIDE FuchsiaGym_Object: db $3 ; border block diff --git a/data/maps/objects/FuchsiaMart.asm b/data/maps/objects/FuchsiaMart.asm index b41ba0f66..a961b957b 100644 --- a/data/maps/objects/FuchsiaMart.asm +++ b/data/maps/objects/FuchsiaMart.asm @@ -1,7 +1,7 @@ object_const_def - const FUCHSIAMART_CLERK - const FUCHSIAMART_MIDDLE_AGED_MAN - const FUCHSIAMART_COOLTRAINER_F + const_export FUCHSIAMART_CLERK + const_export FUCHSIAMART_MIDDLE_AGED_MAN + const_export FUCHSIAMART_COOLTRAINER_F FuchsiaMart_Object: db $0 ; border block diff --git a/data/maps/objects/FuchsiaMeetingRoom.asm b/data/maps/objects/FuchsiaMeetingRoom.asm index c4670a095..c5cc58fee 100644 --- a/data/maps/objects/FuchsiaMeetingRoom.asm +++ b/data/maps/objects/FuchsiaMeetingRoom.asm @@ -1,7 +1,7 @@ object_const_def - const FUCHSIAMEETINGROOM_SAFARI_ZONE_WORKER1 - const FUCHSIAMEETINGROOM_SAFARI_ZONE_WORKER2 - const FUCHSIAMEETINGROOM_SAFARI_ZONE_WORKER3 + const_export FUCHSIAMEETINGROOM_SAFARI_ZONE_WORKER1 + const_export FUCHSIAMEETINGROOM_SAFARI_ZONE_WORKER2 + const_export FUCHSIAMEETINGROOM_SAFARI_ZONE_WORKER3 FuchsiaMeetingRoom_Object: db $17 ; border block diff --git a/data/maps/objects/FuchsiaPokecenter.asm b/data/maps/objects/FuchsiaPokecenter.asm index efa756437..0d2ee3f1d 100644 --- a/data/maps/objects/FuchsiaPokecenter.asm +++ b/data/maps/objects/FuchsiaPokecenter.asm @@ -1,8 +1,8 @@ object_const_def - const FUCHSIAPOKECENTER_NURSE - const FUCHSIAPOKECENTER_ROCKER - const FUCHSIAPOKECENTER_COOLTRAINER_F - const FUCHSIAPOKECENTER_LINK_RECEPTIONIST + const_export FUCHSIAPOKECENTER_NURSE + const_export FUCHSIAPOKECENTER_ROCKER + const_export FUCHSIAPOKECENTER_COOLTRAINER_F + const_export FUCHSIAPOKECENTER_LINK_RECEPTIONIST FuchsiaPokecenter_Object: db $0 ; border block diff --git a/data/maps/objects/GameCorner.asm b/data/maps/objects/GameCorner.asm index 06277a330..121e8a470 100644 --- a/data/maps/objects/GameCorner.asm +++ b/data/maps/objects/GameCorner.asm @@ -1,15 +1,15 @@ object_const_def - const GAMECORNER_BEAUTY1 - const GAMECORNER_CLERK1 - const GAMECORNER_MIDDLE_AGED_MAN1 - const GAMECORNER_BEAUTY2 - const GAMECORNER_FISHING_GURU - const GAMECORNER_MIDDLE_AGED_WOMAN - const GAMECORNER_GYM_GUIDE - const GAMECORNER_GAMBLER - const GAMECORNER_CLERK2 - const GAMECORNER_GENTLEMAN - const GAMECORNER_ROCKET + const_export GAMECORNER_BEAUTY1 + const_export GAMECORNER_CLERK1 + const_export GAMECORNER_MIDDLE_AGED_MAN1 + const_export GAMECORNER_BEAUTY2 + const_export GAMECORNER_FISHING_GURU + const_export GAMECORNER_MIDDLE_AGED_WOMAN + const_export GAMECORNER_GYM_GUIDE + const_export GAMECORNER_GAMBLER + const_export GAMECORNER_CLERK2 + const_export GAMECORNER_GENTLEMAN + const_export GAMECORNER_ROCKET GameCorner_Object: db $f ; border block diff --git a/data/maps/objects/GameCornerPrizeRoom.asm b/data/maps/objects/GameCornerPrizeRoom.asm index 145238131..e5d75d122 100644 --- a/data/maps/objects/GameCornerPrizeRoom.asm +++ b/data/maps/objects/GameCornerPrizeRoom.asm @@ -1,6 +1,6 @@ object_const_def - const GAMECORNERPRIZEROOM_BALDING_GUY - const GAMECORNERPRIZEROOM_GAMBLER + const_export GAMECORNERPRIZEROOM_BALDING_GUY + const_export GAMECORNERPRIZEROOM_GAMBLER GameCornerPrizeRoom_Object: db $f ; border block diff --git a/data/maps/objects/HallOfFame.asm b/data/maps/objects/HallOfFame.asm index 5c711dbe1..b40602d56 100644 --- a/data/maps/objects/HallOfFame.asm +++ b/data/maps/objects/HallOfFame.asm @@ -1,5 +1,5 @@ object_const_def - const HALLOFFAME_OAK + const_export HALLOFFAME_OAK HallOfFame_Object: db $3 ; border block diff --git a/data/maps/objects/IndigoPlateauLobby.asm b/data/maps/objects/IndigoPlateauLobby.asm index 97ced88ba..788f70b7e 100644 --- a/data/maps/objects/IndigoPlateauLobby.asm +++ b/data/maps/objects/IndigoPlateauLobby.asm @@ -1,9 +1,9 @@ object_const_def - const INDIGOPLATEAULOBBY_NURSE - const INDIGOPLATEAULOBBY_GYM_GUIDE - const INDIGOPLATEAULOBBY_COOLTRAINER_F - const INDIGOPLATEAULOBBY_CLERK - const INDIGOPLATEAULOBBY_LINK_RECEPTIONIST + const_export INDIGOPLATEAULOBBY_NURSE + const_export INDIGOPLATEAULOBBY_GYM_GUIDE + const_export INDIGOPLATEAULOBBY_COOLTRAINER_F + const_export INDIGOPLATEAULOBBY_CLERK + const_export INDIGOPLATEAULOBBY_LINK_RECEPTIONIST IndigoPlateauLobby_Object: db $0 ; border block diff --git a/data/maps/objects/LancesRoom.asm b/data/maps/objects/LancesRoom.asm index 9cd2aaf3b..ff11435ad 100644 --- a/data/maps/objects/LancesRoom.asm +++ b/data/maps/objects/LancesRoom.asm @@ -1,5 +1,5 @@ object_const_def - const LANCESROOM_LANCE + const_export LANCESROOM_LANCE LancesRoom_Object: db $3 ; border block diff --git a/data/maps/objects/LavenderCuboneHouse.asm b/data/maps/objects/LavenderCuboneHouse.asm index 6ed539230..0b4163da3 100644 --- a/data/maps/objects/LavenderCuboneHouse.asm +++ b/data/maps/objects/LavenderCuboneHouse.asm @@ -1,6 +1,6 @@ object_const_def - const LAVENDERCUBONEHOUSE_CUBONE - const LAVENDERCUBONEHOUSE_BRUNETTE_GIRL + const_export LAVENDERCUBONEHOUSE_CUBONE + const_export LAVENDERCUBONEHOUSE_BRUNETTE_GIRL LavenderCuboneHouse_Object: db $a ; border block diff --git a/data/maps/objects/LavenderMart.asm b/data/maps/objects/LavenderMart.asm index 7302981f1..4b45ba253 100644 --- a/data/maps/objects/LavenderMart.asm +++ b/data/maps/objects/LavenderMart.asm @@ -1,7 +1,7 @@ object_const_def - const LAVENDERMART_CLERK - const LAVENDERMART_BALDING_GUY - const LAVENDERMART_COOLTRAINER_M + const_export LAVENDERMART_CLERK + const_export LAVENDERMART_BALDING_GUY + const_export LAVENDERMART_COOLTRAINER_M LavenderMart_Object: db $0 ; border block diff --git a/data/maps/objects/LavenderPokecenter.asm b/data/maps/objects/LavenderPokecenter.asm index 2fb98ec0c..c2b14e788 100644 --- a/data/maps/objects/LavenderPokecenter.asm +++ b/data/maps/objects/LavenderPokecenter.asm @@ -1,8 +1,8 @@ object_const_def - const LAVENDERPOKECENTER_NURSE - const LAVENDERPOKECENTER_GENTLEMAN - const LAVENDERPOKECENTER_LITTLE_GIRL - const LAVENDERPOKECENTER_LINK_RECEPTIONIST + const_export LAVENDERPOKECENTER_NURSE + const_export LAVENDERPOKECENTER_GENTLEMAN + const_export LAVENDERPOKECENTER_LITTLE_GIRL + const_export LAVENDERPOKECENTER_LINK_RECEPTIONIST LavenderPokecenter_Object: db $0 ; border block diff --git a/data/maps/objects/LavenderTown.asm b/data/maps/objects/LavenderTown.asm index 76df4c60f..daf2fdff5 100644 --- a/data/maps/objects/LavenderTown.asm +++ b/data/maps/objects/LavenderTown.asm @@ -1,7 +1,7 @@ object_const_def - const LAVENDERTOWN_LITTLE_GIRL - const LAVENDERTOWN_COOLTRAINER_M - const LAVENDERTOWN_SUPER_NERD + const_export LAVENDERTOWN_LITTLE_GIRL + const_export LAVENDERTOWN_COOLTRAINER_M + const_export LAVENDERTOWN_SUPER_NERD LavenderTown_Object: db $2c ; border block diff --git a/data/maps/objects/LoreleisRoom.asm b/data/maps/objects/LoreleisRoom.asm index 3a24b23cc..9a8c6b561 100644 --- a/data/maps/objects/LoreleisRoom.asm +++ b/data/maps/objects/LoreleisRoom.asm @@ -1,5 +1,5 @@ object_const_def - const LORELEISROOM_LORELEI + const_export LORELEISROOM_LORELEI LoreleisRoom_Object: db $3 ; border block diff --git a/data/maps/objects/MrFujisHouse.asm b/data/maps/objects/MrFujisHouse.asm index 0a816d1e0..869390575 100644 --- a/data/maps/objects/MrFujisHouse.asm +++ b/data/maps/objects/MrFujisHouse.asm @@ -1,10 +1,10 @@ object_const_def - const MRFUJISHOUSE_SUPER_NERD - const MRFUJISHOUSE_LITTLE_GIRL - const MRFUJISHOUSE_PSYDUCK - const MRFUJISHOUSE_NIDORINO - const MRFUJISHOUSE_MR_FUJI - const MRFUJISHOUSE_POKEDEX + const_export MRFUJISHOUSE_SUPER_NERD + const_export MRFUJISHOUSE_LITTLE_GIRL + const_export MRFUJISHOUSE_PSYDUCK + const_export MRFUJISHOUSE_NIDORINO + const_export MRFUJISHOUSE_MR_FUJI + const_export MRFUJISHOUSE_POKEDEX MrFujisHouse_Object: db $a ; border block diff --git a/data/maps/objects/MrPsychicsHouse.asm b/data/maps/objects/MrPsychicsHouse.asm index f7c009e62..3a0727302 100644 --- a/data/maps/objects/MrPsychicsHouse.asm +++ b/data/maps/objects/MrPsychicsHouse.asm @@ -1,5 +1,5 @@ object_const_def - const MRPSYCHICSHOUSE_MR_PSYCHIC + const_export MRPSYCHICSHOUSE_MR_PSYCHIC MrPsychicsHouse_Object: db $a ; border block diff --git a/data/maps/objects/MtMoon1F.asm b/data/maps/objects/MtMoon1F.asm index bc697395b..c13f13793 100644 --- a/data/maps/objects/MtMoon1F.asm +++ b/data/maps/objects/MtMoon1F.asm @@ -1,18 +1,18 @@ object_const_def - const MTMOON1F_HIKER - const MTMOON1F_YOUNGSTER1 - const MTMOON1F_COOLTRAINER_F1 - const MTMOON1F_SUPER_NERD - const MTMOON1F_COOLTRAINER_F2 - const MTMOON1F_YOUNGSTER2 - const MTMOON1F_YOUNGSTER3 - const MTMOON1F_POTION1 - const MTMOON1F_MOON_STONE - const MTMOON1F_RARE_CANDY - const MTMOON1F_ESCAPE_ROPE - const MTMOON1F_POTION2 - const MTMOON1F_TM_WATER_GUN - const MTMOON1F_BEWARE_ZUBAT_SIGN + const_export MTMOON1F_HIKER + const_export MTMOON1F_YOUNGSTER1 + const_export MTMOON1F_COOLTRAINER_F1 + const_export MTMOON1F_SUPER_NERD + const_export MTMOON1F_COOLTRAINER_F2 + const_export MTMOON1F_YOUNGSTER2 + const_export MTMOON1F_YOUNGSTER3 + const_export MTMOON1F_POTION1 + const_export MTMOON1F_MOON_STONE + const_export MTMOON1F_RARE_CANDY + const_export MTMOON1F_ESCAPE_ROPE + const_export MTMOON1F_POTION2 + const_export MTMOON1F_TM_WATER_GUN + const_export MTMOON1F_BEWARE_ZUBAT_SIGN MtMoon1F_Object: db $3 ; border block diff --git a/data/maps/objects/MtMoonB2F.asm b/data/maps/objects/MtMoonB2F.asm index 5f3bbf763..0eb2d2768 100644 --- a/data/maps/objects/MtMoonB2F.asm +++ b/data/maps/objects/MtMoonB2F.asm @@ -1,13 +1,13 @@ object_const_def - const MTMOONB2F_SUPER_NERD - const MTMOONB2F_ROCKET1 - const MTMOONB2F_ROCKET2 - const MTMOONB2F_ROCKET3 - const MTMOONB2F_ROCKET4 - const MTMOONB2F_DOME_FOSSIL - const MTMOONB2F_HELIX_FOSSIL - const MTMOONB2F_HP_UP - const MTMOONB2F_TM_MEGA_PUNCH + const_export MTMOONB2F_SUPER_NERD + const_export MTMOONB2F_ROCKET1 + const_export MTMOONB2F_ROCKET2 + const_export MTMOONB2F_ROCKET3 + const_export MTMOONB2F_ROCKET4 + const_export MTMOONB2F_DOME_FOSSIL + const_export MTMOONB2F_HELIX_FOSSIL + const_export MTMOONB2F_HP_UP + const_export MTMOONB2F_TM_MEGA_PUNCH MtMoonB2F_Object: db $3 ; border block diff --git a/data/maps/objects/MtMoonPokecenter.asm b/data/maps/objects/MtMoonPokecenter.asm index 28049feff..ee033919d 100644 --- a/data/maps/objects/MtMoonPokecenter.asm +++ b/data/maps/objects/MtMoonPokecenter.asm @@ -1,10 +1,10 @@ object_const_def - const MTMOONPOKECENTER_NURSE - const MTMOONPOKECENTER_YOUNGSTER - const MTMOONPOKECENTER_GENTLEMAN - const MTMOONPOKECENTER_MAGIKARP_SALESMAN - const MTMOONPOKECENTER_CLIPBOARD - const MTMOONPOKECENTER_LINK_RECEPTIONIST + const_export MTMOONPOKECENTER_NURSE + const_export MTMOONPOKECENTER_YOUNGSTER + const_export MTMOONPOKECENTER_GENTLEMAN + const_export MTMOONPOKECENTER_MAGIKARP_SALESMAN + const_export MTMOONPOKECENTER_CLIPBOARD + const_export MTMOONPOKECENTER_LINK_RECEPTIONIST MtMoonPokecenter_Object: db $0 ; border block diff --git a/data/maps/objects/Museum1F.asm b/data/maps/objects/Museum1F.asm index d33151a62..7f856f89f 100644 --- a/data/maps/objects/Museum1F.asm +++ b/data/maps/objects/Museum1F.asm @@ -1,9 +1,9 @@ object_const_def - const MUSEUM1F_SCIENTIST1 - const MUSEUM1F_GAMBLER - const MUSEUM1F_SCIENTIST2 - const MUSEUM1F_SCIENTIST3 - const MUSEUM1F_OLD_AMBER + const_export MUSEUM1F_SCIENTIST1 + const_export MUSEUM1F_GAMBLER + const_export MUSEUM1F_SCIENTIST2 + const_export MUSEUM1F_SCIENTIST3 + const_export MUSEUM1F_OLD_AMBER Museum1F_Object: db $a ; border block diff --git a/data/maps/objects/Museum2F.asm b/data/maps/objects/Museum2F.asm index e3c271172..f13ce91ac 100644 --- a/data/maps/objects/Museum2F.asm +++ b/data/maps/objects/Museum2F.asm @@ -1,9 +1,9 @@ object_const_def - const MUSEUM2F_YOUNGSTER - const MUSEUM2F_GRAMPS - const MUSEUM2F_SCIENTIST - const MUSEUM2F_BRUNETTE_GIRL - const MUSEUM2F_HIKER + const_export MUSEUM2F_YOUNGSTER + const_export MUSEUM2F_GRAMPS + const_export MUSEUM2F_SCIENTIST + const_export MUSEUM2F_BRUNETTE_GIRL + const_export MUSEUM2F_HIKER Museum2F_Object: db $a ; border block diff --git a/data/maps/objects/NameRatersHouse.asm b/data/maps/objects/NameRatersHouse.asm index 0b6375e91..0051e08c5 100644 --- a/data/maps/objects/NameRatersHouse.asm +++ b/data/maps/objects/NameRatersHouse.asm @@ -1,5 +1,5 @@ object_const_def - const NAMERATERSHOUSE_NAME_RATER + const_export NAMERATERSHOUSE_NAME_RATER NameRatersHouse_Object: db $a ; border block diff --git a/data/maps/objects/OaksLab.asm b/data/maps/objects/OaksLab.asm index f800e880c..4a58aa596 100644 --- a/data/maps/objects/OaksLab.asm +++ b/data/maps/objects/OaksLab.asm @@ -1,15 +1,15 @@ object_const_def - const OAKSLAB_RIVAL - const OAKSLAB_CHARMANDER_POKE_BALL - const OAKSLAB_SQUIRTLE_POKE_BALL - const OAKSLAB_BULBASAUR_POKE_BALL - const OAKSLAB_OAK1 - const OAKSLAB_POKEDEX1 - const OAKSLAB_POKEDEX2 - const OAKSLAB_OAK2 - const OAKSLAB_GIRL - const OAKSLAB_SCIENTIST1 - const OAKSLAB_SCIENTIST2 + const_export OAKSLAB_RIVAL + const_export OAKSLAB_CHARMANDER_POKE_BALL + const_export OAKSLAB_SQUIRTLE_POKE_BALL + const_export OAKSLAB_BULBASAUR_POKE_BALL + const_export OAKSLAB_OAK1 + const_export OAKSLAB_POKEDEX1 + const_export OAKSLAB_POKEDEX2 + const_export OAKSLAB_OAK2 + const_export OAKSLAB_GIRL + const_export OAKSLAB_SCIENTIST1 + const_export OAKSLAB_SCIENTIST2 OaksLab_Object: db $3 ; border block diff --git a/data/maps/objects/PalletTown.asm b/data/maps/objects/PalletTown.asm index 793ec1641..91516b6e4 100644 --- a/data/maps/objects/PalletTown.asm +++ b/data/maps/objects/PalletTown.asm @@ -1,7 +1,7 @@ object_const_def - const PALLETTOWN_OAK - const PALLETTOWN_GIRL - const PALLETTOWN_FISHER + const_export PALLETTOWN_OAK + const_export PALLETTOWN_GIRL + const_export PALLETTOWN_FISHER PalletTown_Object: db $b ; border block diff --git a/data/maps/objects/PewterCity.asm b/data/maps/objects/PewterCity.asm index b734ee401..e2eaced94 100644 --- a/data/maps/objects/PewterCity.asm +++ b/data/maps/objects/PewterCity.asm @@ -1,9 +1,9 @@ object_const_def - const PEWTERCITY_COOLTRAINER_F - const PEWTERCITY_COOLTRAINER_M - const PEWTERCITY_SUPER_NERD1 - const PEWTERCITY_SUPER_NERD2 - const PEWTERCITY_YOUNGSTER + const_export PEWTERCITY_COOLTRAINER_F + const_export PEWTERCITY_COOLTRAINER_M + const_export PEWTERCITY_SUPER_NERD1 + const_export PEWTERCITY_SUPER_NERD2 + const_export PEWTERCITY_YOUNGSTER PewterCity_Object: db $a ; border block diff --git a/data/maps/objects/PewterGym.asm b/data/maps/objects/PewterGym.asm index ee82ed21d..f81ca6d64 100644 --- a/data/maps/objects/PewterGym.asm +++ b/data/maps/objects/PewterGym.asm @@ -1,7 +1,7 @@ object_const_def - const PEWTERGYM_BROCK - const PEWTERGYM_COOLTRAINER_M - const PEWTERGYM_GYM_GUIDE + const_export PEWTERGYM_BROCK + const_export PEWTERGYM_COOLTRAINER_M + const_export PEWTERGYM_GYM_GUIDE PewterGym_Object: db $3 ; border block diff --git a/data/maps/objects/PewterMart.asm b/data/maps/objects/PewterMart.asm index e5fc199b2..0c575366c 100644 --- a/data/maps/objects/PewterMart.asm +++ b/data/maps/objects/PewterMart.asm @@ -1,7 +1,7 @@ object_const_def - const PEWTERMART_CLERK - const PEWTERMART_YOUNGSTER - const PEWTERMART_SUPER_NERD + const_export PEWTERMART_CLERK + const_export PEWTERMART_YOUNGSTER + const_export PEWTERMART_SUPER_NERD PewterMart_Object: db $0 ; border block diff --git a/data/maps/objects/PewterNidoranHouse.asm b/data/maps/objects/PewterNidoranHouse.asm index d14ee3454..15419cba7 100644 --- a/data/maps/objects/PewterNidoranHouse.asm +++ b/data/maps/objects/PewterNidoranHouse.asm @@ -1,7 +1,7 @@ object_const_def - const PEWTERNIDORANHOUSE_NIDORAN - const PEWTERNIDORANHOUSE_LITTLE_BOY - const PEWTERNIDORANHOUSE_MIDDLE_AGED_MAN + const_export PEWTERNIDORANHOUSE_NIDORAN + const_export PEWTERNIDORANHOUSE_LITTLE_BOY + const_export PEWTERNIDORANHOUSE_MIDDLE_AGED_MAN PewterNidoranHouse_Object: db $a ; border block diff --git a/data/maps/objects/PewterPokecenter.asm b/data/maps/objects/PewterPokecenter.asm index 3b3e9cd9b..11d449dc6 100644 --- a/data/maps/objects/PewterPokecenter.asm +++ b/data/maps/objects/PewterPokecenter.asm @@ -1,8 +1,8 @@ object_const_def - const PEWTERPOKECENTER_NURSE - const PEWTERPOKECENTER_GENTLEMAN - const PEWTERPOKECENTER_JIGGLYPUFF - const PEWTERPOKECENTER_LINK_RECEPTIONIST + const_export PEWTERPOKECENTER_NURSE + const_export PEWTERPOKECENTER_GENTLEMAN + const_export PEWTERPOKECENTER_JIGGLYPUFF + const_export PEWTERPOKECENTER_LINK_RECEPTIONIST PewterPokecenter_Object: db $0 ; border block diff --git a/data/maps/objects/PewterSpeechHouse.asm b/data/maps/objects/PewterSpeechHouse.asm index 0e892b601..47f34915c 100644 --- a/data/maps/objects/PewterSpeechHouse.asm +++ b/data/maps/objects/PewterSpeechHouse.asm @@ -1,6 +1,6 @@ object_const_def - const PEWTERSPEECHHOUSE_GAMBLER - const PEWTERSPEECHHOUSE_YOUNGSTER + const_export PEWTERSPEECHHOUSE_GAMBLER + const_export PEWTERSPEECHHOUSE_YOUNGSTER PewterSpeechHouse_Object: db $a ; border block diff --git a/data/maps/objects/PokemonFanClub.asm b/data/maps/objects/PokemonFanClub.asm index 5ee899d3d..8bc6098a0 100644 --- a/data/maps/objects/PokemonFanClub.asm +++ b/data/maps/objects/PokemonFanClub.asm @@ -1,12 +1,12 @@ object_const_def - const POKEMONFANCLUB_PIKACHU_FAN - const POKEMONFANCLUB_SEEL_FAN - const POKEMONFANCLUB_PIKACHU - const POKEMONFANCLUB_SEEL - const POKEMONFANCLUB_CHAIRMAN - const POKEMONFANCLUB_RECEPTIONIST - const POKEMONFANCLUB_SIGN_1 - const POKEMONFANCLUB_SIGN_2 + const_export POKEMONFANCLUB_PIKACHU_FAN + const_export POKEMONFANCLUB_SEEL_FAN + const_export POKEMONFANCLUB_PIKACHU + const_export POKEMONFANCLUB_SEEL + const_export POKEMONFANCLUB_CHAIRMAN + const_export POKEMONFANCLUB_RECEPTIONIST + const_export POKEMONFANCLUB_SIGN_1 + const_export POKEMONFANCLUB_SIGN_2 PokemonFanClub_Object: db $d ; border block diff --git a/data/maps/objects/PokemonMansion1F.asm b/data/maps/objects/PokemonMansion1F.asm index 3fb8780ea..0487847a0 100644 --- a/data/maps/objects/PokemonMansion1F.asm +++ b/data/maps/objects/PokemonMansion1F.asm @@ -1,7 +1,7 @@ object_const_def - const POKEMONMANSION1F_SCIENTIST - const POKEMONMANSION1F_ESCAPE_ROPE - const POKEMONMANSION1F_CARBOS + const_export POKEMONMANSION1F_SCIENTIST + const_export POKEMONMANSION1F_ESCAPE_ROPE + const_export POKEMONMANSION1F_CARBOS PokemonMansion1F_Object: db $2e ; border block diff --git a/data/maps/objects/PokemonMansion2F.asm b/data/maps/objects/PokemonMansion2F.asm index a4b71d2c9..f251ac8f5 100644 --- a/data/maps/objects/PokemonMansion2F.asm +++ b/data/maps/objects/PokemonMansion2F.asm @@ -1,8 +1,8 @@ object_const_def - const POKEMONMANSION2F_SUPER_NERD - const POKEMONMANSION2F_CALCIUM - const POKEMONMANSION2F_DIARY1 - const POKEMONMANSION2F_DIARY2 + const_export POKEMONMANSION2F_SUPER_NERD + const_export POKEMONMANSION2F_CALCIUM + const_export POKEMONMANSION2F_DIARY1 + const_export POKEMONMANSION2F_DIARY2 PokemonMansion2F_Object: db $1 ; border block diff --git a/data/maps/objects/PokemonMansion3F.asm b/data/maps/objects/PokemonMansion3F.asm index a9ebedc98..4999b61f0 100644 --- a/data/maps/objects/PokemonMansion3F.asm +++ b/data/maps/objects/PokemonMansion3F.asm @@ -1,9 +1,9 @@ object_const_def - const POKEMONMANSION3F_SUPER_NERD - const POKEMONMANSION3F_SCIENTIST - const POKEMONMANSION3F_MAX_POTION - const POKEMONMANSION3F_IRON - const POKEMONMANSION3F_DIARY + const_export POKEMONMANSION3F_SUPER_NERD + const_export POKEMONMANSION3F_SCIENTIST + const_export POKEMONMANSION3F_MAX_POTION + const_export POKEMONMANSION3F_IRON + const_export POKEMONMANSION3F_DIARY PokemonMansion3F_Object: db $1 ; border block diff --git a/data/maps/objects/PokemonMansionB1F.asm b/data/maps/objects/PokemonMansionB1F.asm index 5d70db705..a90552488 100644 --- a/data/maps/objects/PokemonMansionB1F.asm +++ b/data/maps/objects/PokemonMansionB1F.asm @@ -1,12 +1,12 @@ object_const_def - const POKEMONMANSIONB1F_BURGLAR - const POKEMONMANSIONB1F_SCIENTIST - const POKEMONMANSIONB1F_RARE_CANDY - const POKEMONMANSIONB1F_FULL_RESTORE - const POKEMONMANSIONB1F_TM_BLIZZARD - const POKEMONMANSIONB1F_TM_SOLARBEAM - const POKEMONMANSIONB1F_DIARY - const POKEMONMANSIONB1F_SECRET_KEY + const_export POKEMONMANSIONB1F_BURGLAR + const_export POKEMONMANSIONB1F_SCIENTIST + const_export POKEMONMANSIONB1F_RARE_CANDY + const_export POKEMONMANSIONB1F_FULL_RESTORE + const_export POKEMONMANSIONB1F_TM_BLIZZARD + const_export POKEMONMANSIONB1F_TM_SOLARBEAM + const_export POKEMONMANSIONB1F_DIARY + const_export POKEMONMANSIONB1F_SECRET_KEY PokemonMansionB1F_Object: db $1 ; border block diff --git a/data/maps/objects/PokemonTower1F.asm b/data/maps/objects/PokemonTower1F.asm index 0f8c64c3d..936eb6f33 100644 --- a/data/maps/objects/PokemonTower1F.asm +++ b/data/maps/objects/PokemonTower1F.asm @@ -1,9 +1,9 @@ object_const_def - const POKEMONTOWER1F_RECEPTIONIST - const POKEMONTOWER1F_MIDDLE_AGED_WOMAN - const POKEMONTOWER1F_BALDING_GUY - const POKEMONTOWER1F_GIRL - const POKEMONTOWER1F_CHANNELER + const_export POKEMONTOWER1F_RECEPTIONIST + const_export POKEMONTOWER1F_MIDDLE_AGED_WOMAN + const_export POKEMONTOWER1F_BALDING_GUY + const_export POKEMONTOWER1F_GIRL + const_export POKEMONTOWER1F_CHANNELER PokemonTower1F_Object: db $1 ; border block diff --git a/data/maps/objects/PokemonTower2F.asm b/data/maps/objects/PokemonTower2F.asm index ecdbc20ae..55a22d764 100644 --- a/data/maps/objects/PokemonTower2F.asm +++ b/data/maps/objects/PokemonTower2F.asm @@ -1,6 +1,6 @@ object_const_def - const POKEMONTOWER2F_RIVAL - const POKEMONTOWER2F_CHANNELER + const_export POKEMONTOWER2F_RIVAL + const_export POKEMONTOWER2F_CHANNELER PokemonTower2F_Object: db $1 ; border block diff --git a/data/maps/objects/PokemonTower3F.asm b/data/maps/objects/PokemonTower3F.asm index 2a5c9b8d6..917370225 100644 --- a/data/maps/objects/PokemonTower3F.asm +++ b/data/maps/objects/PokemonTower3F.asm @@ -1,8 +1,8 @@ object_const_def - const POKEMONTOWER3F_CHANNELER1 - const POKEMONTOWER3F_CHANNELER2 - const POKEMONTOWER3F_CHANNELER3 - const POKEMONTOWER3F_ESCAPE_ROPE + const_export POKEMONTOWER3F_CHANNELER1 + const_export POKEMONTOWER3F_CHANNELER2 + const_export POKEMONTOWER3F_CHANNELER3 + const_export POKEMONTOWER3F_ESCAPE_ROPE PokemonTower3F_Object: db $1 ; border block diff --git a/data/maps/objects/PokemonTower4F.asm b/data/maps/objects/PokemonTower4F.asm index ad8175ebd..e331cc1d8 100644 --- a/data/maps/objects/PokemonTower4F.asm +++ b/data/maps/objects/PokemonTower4F.asm @@ -1,10 +1,10 @@ object_const_def - const POKEMONTOWER4F_CHANNELER1 - const POKEMONTOWER4F_CHANNELER2 - const POKEMONTOWER4F_CHANNELER3 - const POKEMONTOWER4F_ELIXER - const POKEMONTOWER4F_AWAKENING - const POKEMONTOWER4F_HP_UP + const_export POKEMONTOWER4F_CHANNELER1 + const_export POKEMONTOWER4F_CHANNELER2 + const_export POKEMONTOWER4F_CHANNELER3 + const_export POKEMONTOWER4F_ELIXER + const_export POKEMONTOWER4F_AWAKENING + const_export POKEMONTOWER4F_HP_UP PokemonTower4F_Object: db $1 ; border block diff --git a/data/maps/objects/PokemonTower5F.asm b/data/maps/objects/PokemonTower5F.asm index be27f3c1b..1829dd514 100644 --- a/data/maps/objects/PokemonTower5F.asm +++ b/data/maps/objects/PokemonTower5F.asm @@ -1,10 +1,10 @@ object_const_def - const POKEMONTOWER5F_CHANNELER1 - const POKEMONTOWER5F_CHANNELER2 - const POKEMONTOWER5F_CHANNELER3 - const POKEMONTOWER5F_CHANNELER4 - const POKEMONTOWER5F_CHANNELER5 - const POKEMONTOWER5F_NUGGET + const_export POKEMONTOWER5F_CHANNELER1 + const_export POKEMONTOWER5F_CHANNELER2 + const_export POKEMONTOWER5F_CHANNELER3 + const_export POKEMONTOWER5F_CHANNELER4 + const_export POKEMONTOWER5F_CHANNELER5 + const_export POKEMONTOWER5F_NUGGET PokemonTower5F_Object: db $1 ; border block diff --git a/data/maps/objects/PokemonTower6F.asm b/data/maps/objects/PokemonTower6F.asm index 96e0b5b5f..f10aef778 100644 --- a/data/maps/objects/PokemonTower6F.asm +++ b/data/maps/objects/PokemonTower6F.asm @@ -1,9 +1,9 @@ object_const_def - const POKEMONTOWER6F_CHANNELER1 - const POKEMONTOWER6F_CHANNELER2 - const POKEMONTOWER6F_CHANNELER3 - const POKEMONTOWER6F_RARE_CANDY - const POKEMONTOWER6F_X_ACCURACY + const_export POKEMONTOWER6F_CHANNELER1 + const_export POKEMONTOWER6F_CHANNELER2 + const_export POKEMONTOWER6F_CHANNELER3 + const_export POKEMONTOWER6F_RARE_CANDY + const_export POKEMONTOWER6F_X_ACCURACY PokemonTower6F_Object: db $1 ; border block diff --git a/data/maps/objects/PokemonTower7F.asm b/data/maps/objects/PokemonTower7F.asm index 9f72f3edd..7e1db10b4 100644 --- a/data/maps/objects/PokemonTower7F.asm +++ b/data/maps/objects/PokemonTower7F.asm @@ -1,8 +1,8 @@ object_const_def - const POKEMONTOWER7F_ROCKET1 - const POKEMONTOWER7F_ROCKET2 - const POKEMONTOWER7F_ROCKET3 - const POKEMONTOWER7F_MR_FUJI + const_export POKEMONTOWER7F_ROCKET1 + const_export POKEMONTOWER7F_ROCKET2 + const_export POKEMONTOWER7F_ROCKET3 + const_export POKEMONTOWER7F_MR_FUJI PokemonTower7F_Object: db $1 ; border block diff --git a/data/maps/objects/PowerPlant.asm b/data/maps/objects/PowerPlant.asm index df3bca012..dcabba03b 100644 --- a/data/maps/objects/PowerPlant.asm +++ b/data/maps/objects/PowerPlant.asm @@ -1,18 +1,18 @@ object_const_def - const POWERPLANT_VOLTORB1 - const POWERPLANT_VOLTORB2 - const POWERPLANT_VOLTORB3 - const POWERPLANT_ELECTRODE1 - const POWERPLANT_VOLTORB4 - const POWERPLANT_VOLTORB5 - const POWERPLANT_ELECTRODE2 - const POWERPLANT_VOLTORB6 - const POWERPLANT_ZAPDOS - const POWERPLANT_CARBOS - const POWERPLANT_HP_UP - const POWERPLANT_RARE_CANDY - const POWERPLANT_TM_THUNDER - const POWERPLANT_TM_REFLECT + const_export POWERPLANT_VOLTORB1 + const_export POWERPLANT_VOLTORB2 + const_export POWERPLANT_VOLTORB3 + const_export POWERPLANT_ELECTRODE1 + const_export POWERPLANT_VOLTORB4 + const_export POWERPLANT_VOLTORB5 + const_export POWERPLANT_ELECTRODE2 + const_export POWERPLANT_VOLTORB6 + const_export POWERPLANT_ZAPDOS + const_export POWERPLANT_CARBOS + const_export POWERPLANT_HP_UP + const_export POWERPLANT_RARE_CANDY + const_export POWERPLANT_TM_THUNDER + const_export POWERPLANT_TM_REFLECT PowerPlant_Object: db $2e ; border block diff --git a/data/maps/objects/RedsHouse1F.asm b/data/maps/objects/RedsHouse1F.asm index 9b259a991..bfb294b51 100644 --- a/data/maps/objects/RedsHouse1F.asm +++ b/data/maps/objects/RedsHouse1F.asm @@ -1,5 +1,5 @@ object_const_def - const REDSHOUSE1F_MOM + const_export REDSHOUSE1F_MOM RedsHouse1F_Object: db $a ; border block diff --git a/data/maps/objects/RockTunnel1F.asm b/data/maps/objects/RockTunnel1F.asm index 57726be8c..c61cbda48 100644 --- a/data/maps/objects/RockTunnel1F.asm +++ b/data/maps/objects/RockTunnel1F.asm @@ -1,11 +1,11 @@ object_const_def - const ROCKTUNNEL1F_HIKER1 - const ROCKTUNNEL1F_HIKER2 - const ROCKTUNNEL1F_HIKER3 - const ROCKTUNNEL1F_SUPER_NERD - const ROCKTUNNEL1F_COOLTRAINER_F1 - const ROCKTUNNEL1F_COOLTRAINER_F2 - const ROCKTUNNEL1F_COOLTRAINER_F3 + const_export ROCKTUNNEL1F_HIKER1 + const_export ROCKTUNNEL1F_HIKER2 + const_export ROCKTUNNEL1F_HIKER3 + const_export ROCKTUNNEL1F_SUPER_NERD + const_export ROCKTUNNEL1F_COOLTRAINER_F1 + const_export ROCKTUNNEL1F_COOLTRAINER_F2 + const_export ROCKTUNNEL1F_COOLTRAINER_F3 RockTunnel1F_Object: db $3 ; border block diff --git a/data/maps/objects/RockTunnelB1F.asm b/data/maps/objects/RockTunnelB1F.asm index c0905cbc2..f3a88febe 100644 --- a/data/maps/objects/RockTunnelB1F.asm +++ b/data/maps/objects/RockTunnelB1F.asm @@ -1,12 +1,12 @@ object_const_def - const ROCKTUNNELB1F_COOLTRAINER_F1 - const ROCKTUNNELB1F_HIKER1 - const ROCKTUNNELB1F_SUPER_NERD1 - const ROCKTUNNELB1F_SUPER_NERD2 - const ROCKTUNNELB1F_HIKER2 - const ROCKTUNNELB1F_COOLTRAINER_F2 - const ROCKTUNNELB1F_HIKER3 - const ROCKTUNNELB1F_SUPER_NERD3 + const_export ROCKTUNNELB1F_COOLTRAINER_F1 + const_export ROCKTUNNELB1F_HIKER1 + const_export ROCKTUNNELB1F_SUPER_NERD1 + const_export ROCKTUNNELB1F_SUPER_NERD2 + const_export ROCKTUNNELB1F_HIKER2 + const_export ROCKTUNNELB1F_COOLTRAINER_F2 + const_export ROCKTUNNELB1F_HIKER3 + const_export ROCKTUNNELB1F_SUPER_NERD3 RockTunnelB1F_Object: db $3 ; border block diff --git a/data/maps/objects/RockTunnelPokecenter.asm b/data/maps/objects/RockTunnelPokecenter.asm index 810fea0ba..8823e21c0 100644 --- a/data/maps/objects/RockTunnelPokecenter.asm +++ b/data/maps/objects/RockTunnelPokecenter.asm @@ -1,8 +1,8 @@ object_const_def - const ROCKTUNNELPOKECENTER_NURSE - const ROCKTUNNELPOKECENTER_GENTLEMAN - const ROCKTUNNELPOKECENTER_FISHER - const ROCKTUNNELPOKECENTER_LINK_RECEPTIONIST + const_export ROCKTUNNELPOKECENTER_NURSE + const_export ROCKTUNNELPOKECENTER_GENTLEMAN + const_export ROCKTUNNELPOKECENTER_FISHER + const_export ROCKTUNNELPOKECENTER_LINK_RECEPTIONIST RockTunnelPokecenter_Object: db $0 ; border block diff --git a/data/maps/objects/RocketHideoutB1F.asm b/data/maps/objects/RocketHideoutB1F.asm index 7d7209605..8ecbc78e1 100644 --- a/data/maps/objects/RocketHideoutB1F.asm +++ b/data/maps/objects/RocketHideoutB1F.asm @@ -1,11 +1,11 @@ object_const_def - const ROCKETHIDEOUTB1F_ROCKET1 - const ROCKETHIDEOUTB1F_ROCKET2 - const ROCKETHIDEOUTB1F_ROCKET3 - const ROCKETHIDEOUTB1F_ROCKET4 - const ROCKETHIDEOUTB1F_ROCKET5 - const ROCKETHIDEOUTB1F_ESCAPE_ROPE - const ROCKETHIDEOUTB1F_HYPER_POTION + const_export ROCKETHIDEOUTB1F_ROCKET1 + const_export ROCKETHIDEOUTB1F_ROCKET2 + const_export ROCKETHIDEOUTB1F_ROCKET3 + const_export ROCKETHIDEOUTB1F_ROCKET4 + const_export ROCKETHIDEOUTB1F_ROCKET5 + const_export ROCKETHIDEOUTB1F_ESCAPE_ROPE + const_export ROCKETHIDEOUTB1F_HYPER_POTION RocketHideoutB1F_Object: db $2e ; border block diff --git a/data/maps/objects/RocketHideoutB2F.asm b/data/maps/objects/RocketHideoutB2F.asm index 9808f58b1..cbbe8d054 100644 --- a/data/maps/objects/RocketHideoutB2F.asm +++ b/data/maps/objects/RocketHideoutB2F.asm @@ -1,9 +1,9 @@ object_const_def - const ROCKETHIDEOUTB2F_ROCKET - const ROCKETHIDEOUTB2F_MOON_STONE - const ROCKETHIDEOUTB2F_NUGGET - const ROCKETHIDEOUTB2F_TM_HORN_DRILL - const ROCKETHIDEOUTB2F_SUPER_POTION + const_export ROCKETHIDEOUTB2F_ROCKET + const_export ROCKETHIDEOUTB2F_MOON_STONE + const_export ROCKETHIDEOUTB2F_NUGGET + const_export ROCKETHIDEOUTB2F_TM_HORN_DRILL + const_export ROCKETHIDEOUTB2F_SUPER_POTION RocketHideoutB2F_Object: db $2e ; border block diff --git a/data/maps/objects/RocketHideoutB3F.asm b/data/maps/objects/RocketHideoutB3F.asm index ee02d8094..e0e843e3c 100644 --- a/data/maps/objects/RocketHideoutB3F.asm +++ b/data/maps/objects/RocketHideoutB3F.asm @@ -1,8 +1,8 @@ object_const_def - const ROCKETHIDEOUTB3F_ROCKET1 - const ROCKETHIDEOUTB3F_ROCKET2 - const ROCKETHIDEOUTB3F_TM_DOUBLE_EDGE - const ROCKETHIDEOUTB3F_RARE_CANDY + const_export ROCKETHIDEOUTB3F_ROCKET1 + const_export ROCKETHIDEOUTB3F_ROCKET2 + const_export ROCKETHIDEOUTB3F_TM_DOUBLE_EDGE + const_export ROCKETHIDEOUTB3F_RARE_CANDY RocketHideoutB3F_Object: db $2e ; border block diff --git a/data/maps/objects/RocketHideoutB4F.asm b/data/maps/objects/RocketHideoutB4F.asm index de8625786..57b1342ac 100644 --- a/data/maps/objects/RocketHideoutB4F.asm +++ b/data/maps/objects/RocketHideoutB4F.asm @@ -1,13 +1,13 @@ object_const_def - const ROCKETHIDEOUTB4F_GIOVANNI - const ROCKETHIDEOUTB4F_ROCKET1 - const ROCKETHIDEOUTB4F_ROCKET2 - const ROCKETHIDEOUTB4F_ROCKET3 - const ROCKETHIDEOUTB4F_HP_UP - const ROCKETHIDEOUTB4F_TM_RAZOR_WIND - const ROCKETHIDEOUTB4F_IRON - const ROCKETHIDEOUTB4F_SILPH_SCOPE - const ROCKETHIDEOUTB4F_LIFT_KEY + const_export ROCKETHIDEOUTB4F_GIOVANNI + const_export ROCKETHIDEOUTB4F_ROCKET1 + const_export ROCKETHIDEOUTB4F_ROCKET2 + const_export ROCKETHIDEOUTB4F_ROCKET3 + const_export ROCKETHIDEOUTB4F_HP_UP + const_export ROCKETHIDEOUTB4F_TM_RAZOR_WIND + const_export ROCKETHIDEOUTB4F_IRON + const_export ROCKETHIDEOUTB4F_SILPH_SCOPE + const_export ROCKETHIDEOUTB4F_LIFT_KEY RocketHideoutB4F_Object: db $2e ; border block diff --git a/data/maps/objects/Route1.asm b/data/maps/objects/Route1.asm index bb6bcf630..2c610e0d4 100644 --- a/data/maps/objects/Route1.asm +++ b/data/maps/objects/Route1.asm @@ -1,6 +1,6 @@ object_const_def - const ROUTE1_YOUNGSTER1 - const ROUTE1_YOUNGSTER2 + const_export ROUTE1_YOUNGSTER1 + const_export ROUTE1_YOUNGSTER2 Route1_Object: db $b ; border block diff --git a/data/maps/objects/Route10.asm b/data/maps/objects/Route10.asm index 031ae5217..7b4d7fe34 100644 --- a/data/maps/objects/Route10.asm +++ b/data/maps/objects/Route10.asm @@ -1,10 +1,10 @@ object_const_def - const ROUTE10_SUPER_NERD1 - const ROUTE10_HIKER1 - const ROUTE10_SUPER_NERD2 - const ROUTE10_COOLTRAINER_F1 - const ROUTE10_HIKER2 - const ROUTE10_COOLTRAINER_F2 + const_export ROUTE10_SUPER_NERD1 + const_export ROUTE10_HIKER1 + const_export ROUTE10_SUPER_NERD2 + const_export ROUTE10_COOLTRAINER_F1 + const_export ROUTE10_HIKER2 + const_export ROUTE10_COOLTRAINER_F2 Route10_Object: db $2c ; border block diff --git a/data/maps/objects/Route11.asm b/data/maps/objects/Route11.asm index 264872160..0e2ded1f9 100644 --- a/data/maps/objects/Route11.asm +++ b/data/maps/objects/Route11.asm @@ -1,14 +1,14 @@ object_const_def - const ROUTE11_GAMBLER1 - const ROUTE11_GAMBLER2 - const ROUTE11_YOUNGSTER1 - const ROUTE11_SUPER_NERD1 - const ROUTE11_YOUNGSTER2 - const ROUTE11_GAMBLER3 - const ROUTE11_GAMBLER4 - const ROUTE11_YOUNGSTER3 - const ROUTE11_SUPER_NERD2 - const ROUTE11_YOUNGSTER4 + const_export ROUTE11_GAMBLER1 + const_export ROUTE11_GAMBLER2 + const_export ROUTE11_YOUNGSTER1 + const_export ROUTE11_SUPER_NERD1 + const_export ROUTE11_YOUNGSTER2 + const_export ROUTE11_GAMBLER3 + const_export ROUTE11_GAMBLER4 + const_export ROUTE11_YOUNGSTER3 + const_export ROUTE11_SUPER_NERD2 + const_export ROUTE11_YOUNGSTER4 Route11_Object: db $f ; border block diff --git a/data/maps/objects/Route11Gate1F.asm b/data/maps/objects/Route11Gate1F.asm index 56d2e7f7f..0b3a372fa 100644 --- a/data/maps/objects/Route11Gate1F.asm +++ b/data/maps/objects/Route11Gate1F.asm @@ -1,5 +1,5 @@ object_const_def - const ROUTE11GATE1F_GUARD + const_export ROUTE11GATE1F_GUARD Route11Gate1F_Object: db $a ; border block diff --git a/data/maps/objects/Route11Gate2F.asm b/data/maps/objects/Route11Gate2F.asm index 7e76288ae..3ad103467 100644 --- a/data/maps/objects/Route11Gate2F.asm +++ b/data/maps/objects/Route11Gate2F.asm @@ -1,6 +1,6 @@ object_const_def - const ROUTE11GATE2F_YOUNGSTER - const ROUTE11GATE2F_OAKS_AIDE + const_export ROUTE11GATE2F_YOUNGSTER + const_export ROUTE11GATE2F_OAKS_AIDE Route11Gate2F_Object: db $a ; border block diff --git a/data/maps/objects/Route12.asm b/data/maps/objects/Route12.asm index 4884a6f92..7fae0d328 100644 --- a/data/maps/objects/Route12.asm +++ b/data/maps/objects/Route12.asm @@ -1,14 +1,14 @@ object_const_def - const ROUTE12_SNORLAX - const ROUTE12_FISHER1 - const ROUTE12_FISHER2 - const ROUTE12_COOLTRAINER_M - const ROUTE12_SUPER_NERD - const ROUTE12_FISHER3 - const ROUTE12_FISHER4 - const ROUTE12_FISHER5 - const ROUTE12_TM_PAY_DAY - const ROUTE12_IRON + const_export ROUTE12_SNORLAX + const_export ROUTE12_FISHER1 + const_export ROUTE12_FISHER2 + const_export ROUTE12_COOLTRAINER_M + const_export ROUTE12_SUPER_NERD + const_export ROUTE12_FISHER3 + const_export ROUTE12_FISHER4 + const_export ROUTE12_FISHER5 + const_export ROUTE12_TM_PAY_DAY + const_export ROUTE12_IRON Route12_Object: db $43 ; border block diff --git a/data/maps/objects/Route12Gate1F.asm b/data/maps/objects/Route12Gate1F.asm index eef1a37d1..ad1c4e7ac 100644 --- a/data/maps/objects/Route12Gate1F.asm +++ b/data/maps/objects/Route12Gate1F.asm @@ -1,5 +1,5 @@ object_const_def - const ROUTE12GATE1F_GUARD + const_export ROUTE12GATE1F_GUARD Route12Gate1F_Object: db $a ; border block diff --git a/data/maps/objects/Route12Gate2F.asm b/data/maps/objects/Route12Gate2F.asm index a3fc5c80f..f4832eee4 100644 --- a/data/maps/objects/Route12Gate2F.asm +++ b/data/maps/objects/Route12Gate2F.asm @@ -1,5 +1,5 @@ object_const_def - const ROUTE12GATE2F_BRUNETTE_GIRL + const_export ROUTE12GATE2F_BRUNETTE_GIRL Route12Gate2F_Object: db $a ; border block diff --git a/data/maps/objects/Route12SuperRodHouse.asm b/data/maps/objects/Route12SuperRodHouse.asm index b9899c675..49a7c3d6e 100644 --- a/data/maps/objects/Route12SuperRodHouse.asm +++ b/data/maps/objects/Route12SuperRodHouse.asm @@ -1,5 +1,5 @@ object_const_def - const ROUTE12SUPERRODHOUSE_FISHING_GURU + const_export ROUTE12SUPERRODHOUSE_FISHING_GURU Route12SuperRodHouse_Object: db $a ; border block diff --git a/data/maps/objects/Route13.asm b/data/maps/objects/Route13.asm index ef9d12761..0b640ba5e 100644 --- a/data/maps/objects/Route13.asm +++ b/data/maps/objects/Route13.asm @@ -1,14 +1,14 @@ object_const_def - const ROUTE13_COOLTRAINER_M1 - const ROUTE13_COOLTRAINER_F1 - const ROUTE13_COOLTRAINER_F2 - const ROUTE13_COOLTRAINER_F3 - const ROUTE13_COOLTRAINER_F4 - const ROUTE13_COOLTRAINER_M2 - const ROUTE13_BEAUTY1 - const ROUTE13_BEAUTY2 - const ROUTE13_BIKER - const ROUTE13_COOLTRAINER_M3 + const_export ROUTE13_COOLTRAINER_M1 + const_export ROUTE13_COOLTRAINER_F1 + const_export ROUTE13_COOLTRAINER_F2 + const_export ROUTE13_COOLTRAINER_F3 + const_export ROUTE13_COOLTRAINER_F4 + const_export ROUTE13_COOLTRAINER_M2 + const_export ROUTE13_BEAUTY1 + const_export ROUTE13_BEAUTY2 + const_export ROUTE13_BIKER + const_export ROUTE13_COOLTRAINER_M3 Route13_Object: db $43 ; border block diff --git a/data/maps/objects/Route14.asm b/data/maps/objects/Route14.asm index 0ca3a40a7..1d2aa2ed9 100644 --- a/data/maps/objects/Route14.asm +++ b/data/maps/objects/Route14.asm @@ -1,14 +1,14 @@ object_const_def - const ROUTE14_COOLTRAINER_M1 - const ROUTE14_COOLTRAINER_M2 - const ROUTE14_COOLTRAINER_M3 - const ROUTE14_COOLTRAINER_M4 - const ROUTE14_COOLTRAINER_M5 - const ROUTE14_COOLTRAINER_M6 - const ROUTE14_BIKER1 - const ROUTE14_BIKER2 - const ROUTE14_BIKER3 - const ROUTE14_BIKER4 + const_export ROUTE14_COOLTRAINER_M1 + const_export ROUTE14_COOLTRAINER_M2 + const_export ROUTE14_COOLTRAINER_M3 + const_export ROUTE14_COOLTRAINER_M4 + const_export ROUTE14_COOLTRAINER_M5 + const_export ROUTE14_COOLTRAINER_M6 + const_export ROUTE14_BIKER1 + const_export ROUTE14_BIKER2 + const_export ROUTE14_BIKER3 + const_export ROUTE14_BIKER4 Route14_Object: db $43 ; border block diff --git a/data/maps/objects/Route15.asm b/data/maps/objects/Route15.asm index d04c305c2..311654c94 100644 --- a/data/maps/objects/Route15.asm +++ b/data/maps/objects/Route15.asm @@ -1,15 +1,15 @@ object_const_def - const ROUTE15_COOLTRAINER_F1 - const ROUTE15_COOLTRAINER_F2 - const ROUTE15_COOLTRAINER_M1 - const ROUTE15_COOLTRAINER_M2 - const ROUTE15_BEAUTY1 - const ROUTE15_BEAUTY2 - const ROUTE15_BIKER1 - const ROUTE15_BIKER2 - const ROUTE15_COOLTRAINER_F3 - const ROUTE15_COOLTRAINER_F4 - const ROUTE15_TM_RAGE + const_export ROUTE15_COOLTRAINER_F1 + const_export ROUTE15_COOLTRAINER_F2 + const_export ROUTE15_COOLTRAINER_M1 + const_export ROUTE15_COOLTRAINER_M2 + const_export ROUTE15_BEAUTY1 + const_export ROUTE15_BEAUTY2 + const_export ROUTE15_BIKER1 + const_export ROUTE15_BIKER2 + const_export ROUTE15_COOLTRAINER_F3 + const_export ROUTE15_COOLTRAINER_F4 + const_export ROUTE15_TM_RAGE Route15_Object: db $43 ; border block diff --git a/data/maps/objects/Route15Gate1F.asm b/data/maps/objects/Route15Gate1F.asm index 7285c23e4..590263463 100644 --- a/data/maps/objects/Route15Gate1F.asm +++ b/data/maps/objects/Route15Gate1F.asm @@ -1,5 +1,5 @@ object_const_def - const ROUTE15GATE1F_GUARD + const_export ROUTE15GATE1F_GUARD Route15Gate1F_Object: db $a ; border block diff --git a/data/maps/objects/Route15Gate2F.asm b/data/maps/objects/Route15Gate2F.asm index b2b17285a..1d25bc1b3 100644 --- a/data/maps/objects/Route15Gate2F.asm +++ b/data/maps/objects/Route15Gate2F.asm @@ -1,5 +1,5 @@ object_const_def - const ROUTE15GATE2F_OAKS_AIDE + const_export ROUTE15GATE2F_OAKS_AIDE Route15Gate2F_Object: db $a ; border block diff --git a/data/maps/objects/Route16.asm b/data/maps/objects/Route16.asm index 0eff9b2e0..de5070672 100644 --- a/data/maps/objects/Route16.asm +++ b/data/maps/objects/Route16.asm @@ -1,11 +1,11 @@ object_const_def - const ROUTE16_BIKER1 - const ROUTE16_BIKER2 - const ROUTE16_BIKER3 - const ROUTE16_BIKER4 - const ROUTE16_BIKER5 - const ROUTE16_BIKER6 - const ROUTE16_SNORLAX + const_export ROUTE16_BIKER1 + const_export ROUTE16_BIKER2 + const_export ROUTE16_BIKER3 + const_export ROUTE16_BIKER4 + const_export ROUTE16_BIKER5 + const_export ROUTE16_BIKER6 + const_export ROUTE16_SNORLAX Route16_Object: db $f ; border block diff --git a/data/maps/objects/Route16FlyHouse.asm b/data/maps/objects/Route16FlyHouse.asm index be2f19d40..9c387449a 100644 --- a/data/maps/objects/Route16FlyHouse.asm +++ b/data/maps/objects/Route16FlyHouse.asm @@ -1,6 +1,6 @@ object_const_def - const ROUTE16FLYHOUSE_BRUNETTE_GIRL - const ROUTE16FLYHOUSE_FEAROW + const_export ROUTE16FLYHOUSE_BRUNETTE_GIRL + const_export ROUTE16FLYHOUSE_FEAROW Route16FlyHouse_Object: db $a ; border block diff --git a/data/maps/objects/Route16Gate1F.asm b/data/maps/objects/Route16Gate1F.asm index d703a6e01..d9168c5d5 100644 --- a/data/maps/objects/Route16Gate1F.asm +++ b/data/maps/objects/Route16Gate1F.asm @@ -1,6 +1,6 @@ object_const_def - const ROUTE16GATE1F_GUARD - const ROUTE16GATE1F_GAMBLER + const_export ROUTE16GATE1F_GUARD + const_export ROUTE16GATE1F_GAMBLER Route16Gate1F_Object: db $a ; border block diff --git a/data/maps/objects/Route16Gate2F.asm b/data/maps/objects/Route16Gate2F.asm index 421b5caa0..64c5476aa 100644 --- a/data/maps/objects/Route16Gate2F.asm +++ b/data/maps/objects/Route16Gate2F.asm @@ -1,6 +1,6 @@ object_const_def - const ROUTE16GATE2F_LITTLE_BOY - const ROUTE16GATE2F_LITTLE_GIRL + const_export ROUTE16GATE2F_LITTLE_BOY + const_export ROUTE16GATE2F_LITTLE_GIRL Route16Gate2F_Object: db $a ; border block diff --git a/data/maps/objects/Route17.asm b/data/maps/objects/Route17.asm index 2f1dbeb1b..fb0a1fba2 100644 --- a/data/maps/objects/Route17.asm +++ b/data/maps/objects/Route17.asm @@ -1,14 +1,14 @@ object_const_def - const ROUTE17_BIKER1 - const ROUTE17_BIKER2 - const ROUTE17_BIKER3 - const ROUTE17_BIKER4 - const ROUTE17_BIKER5 - const ROUTE17_BIKER6 - const ROUTE17_BIKER7 - const ROUTE17_BIKER8 - const ROUTE17_BIKER9 - const ROUTE17_BIKER10 + const_export ROUTE17_BIKER1 + const_export ROUTE17_BIKER2 + const_export ROUTE17_BIKER3 + const_export ROUTE17_BIKER4 + const_export ROUTE17_BIKER5 + const_export ROUTE17_BIKER6 + const_export ROUTE17_BIKER7 + const_export ROUTE17_BIKER8 + const_export ROUTE17_BIKER9 + const_export ROUTE17_BIKER10 Route17_Object: db $43 ; border block diff --git a/data/maps/objects/Route18.asm b/data/maps/objects/Route18.asm index 41286afca..bf585e3d2 100644 --- a/data/maps/objects/Route18.asm +++ b/data/maps/objects/Route18.asm @@ -1,7 +1,7 @@ object_const_def - const ROUTE18_COOLTRAINER_M1 - const ROUTE18_COOLTRAINER_M2 - const ROUTE18_COOLTRAINER_M3 + const_export ROUTE18_COOLTRAINER_M1 + const_export ROUTE18_COOLTRAINER_M2 + const_export ROUTE18_COOLTRAINER_M3 Route18_Object: db $43 ; border block diff --git a/data/maps/objects/Route18Gate1F.asm b/data/maps/objects/Route18Gate1F.asm index f5699ba05..42a5bdc15 100644 --- a/data/maps/objects/Route18Gate1F.asm +++ b/data/maps/objects/Route18Gate1F.asm @@ -1,5 +1,5 @@ object_const_def - const ROUTE18GATE1F_GUARD + const_export ROUTE18GATE1F_GUARD Route18Gate1F_Object: db $a ; border block diff --git a/data/maps/objects/Route18Gate2F.asm b/data/maps/objects/Route18Gate2F.asm index 92d42985f..beae6a84d 100644 --- a/data/maps/objects/Route18Gate2F.asm +++ b/data/maps/objects/Route18Gate2F.asm @@ -1,5 +1,5 @@ object_const_def - const ROUTE18GATE2F_YOUNGSTER + const_export ROUTE18GATE2F_YOUNGSTER Route18Gate2F_Object: db $a ; border block diff --git a/data/maps/objects/Route19.asm b/data/maps/objects/Route19.asm index 7c5f6f7f5..ca5a2ffad 100644 --- a/data/maps/objects/Route19.asm +++ b/data/maps/objects/Route19.asm @@ -1,14 +1,14 @@ object_const_def - const ROUTE19_COOLTRAINER_M1 - const ROUTE19_COOLTRAINER_M2 - const ROUTE19_SWIMMER1 - const ROUTE19_SWIMMER2 - const ROUTE19_SWIMMER3 - const ROUTE19_SWIMMER4 - const ROUTE19_SWIMMER5 - const ROUTE19_SWIMMER6 - const ROUTE19_SWIMMER7 - const ROUTE19_SWIMMER8 + const_export ROUTE19_COOLTRAINER_M1 + const_export ROUTE19_COOLTRAINER_M2 + const_export ROUTE19_SWIMMER1 + const_export ROUTE19_SWIMMER2 + const_export ROUTE19_SWIMMER3 + const_export ROUTE19_SWIMMER4 + const_export ROUTE19_SWIMMER5 + const_export ROUTE19_SWIMMER6 + const_export ROUTE19_SWIMMER7 + const_export ROUTE19_SWIMMER8 Route19_Object: db $43 ; border block diff --git a/data/maps/objects/Route2.asm b/data/maps/objects/Route2.asm index 45e4d2d08..b5a6c628e 100644 --- a/data/maps/objects/Route2.asm +++ b/data/maps/objects/Route2.asm @@ -1,6 +1,6 @@ object_const_def - const ROUTE2_MOON_STONE - const ROUTE2_HP_UP + const_export ROUTE2_MOON_STONE + const_export ROUTE2_HP_UP Route2_Object: db $f ; border block diff --git a/data/maps/objects/Route20.asm b/data/maps/objects/Route20.asm index eaa80344c..e48fead8a 100644 --- a/data/maps/objects/Route20.asm +++ b/data/maps/objects/Route20.asm @@ -1,14 +1,14 @@ object_const_def - const ROUTE20_SWIMMER1 - const ROUTE20_SWIMMER2 - const ROUTE20_SWIMMER3 - const ROUTE20_SWIMMER4 - const ROUTE20_SWIMMER5 - const ROUTE20_SWIMMER6 - const ROUTE20_COOLTRAINER_M - const ROUTE20_SWIMMER7 - const ROUTE20_SWIMMER8 - const ROUTE20_SWIMMER9 + const_export ROUTE20_SWIMMER1 + const_export ROUTE20_SWIMMER2 + const_export ROUTE20_SWIMMER3 + const_export ROUTE20_SWIMMER4 + const_export ROUTE20_SWIMMER5 + const_export ROUTE20_SWIMMER6 + const_export ROUTE20_COOLTRAINER_M + const_export ROUTE20_SWIMMER7 + const_export ROUTE20_SWIMMER8 + const_export ROUTE20_SWIMMER9 Route20_Object: db $43 ; border block diff --git a/data/maps/objects/Route21.asm b/data/maps/objects/Route21.asm index 94cfa5681..47c530463 100644 --- a/data/maps/objects/Route21.asm +++ b/data/maps/objects/Route21.asm @@ -1,13 +1,13 @@ object_const_def - const ROUTE21_FISHER1 - const ROUTE21_FISHER2 - const ROUTE21_SWIMMER1 - const ROUTE21_SWIMMER2 - const ROUTE21_SWIMMER3 - const ROUTE21_SWIMMER4 - const ROUTE21_SWIMMER5 - const ROUTE21_FISHER3 - const ROUTE21_FISHER4 + const_export ROUTE21_FISHER1 + const_export ROUTE21_FISHER2 + const_export ROUTE21_SWIMMER1 + const_export ROUTE21_SWIMMER2 + const_export ROUTE21_SWIMMER3 + const_export ROUTE21_SWIMMER4 + const_export ROUTE21_SWIMMER5 + const_export ROUTE21_FISHER3 + const_export ROUTE21_FISHER4 Route21_Object: db $43 ; border block diff --git a/data/maps/objects/Route22.asm b/data/maps/objects/Route22.asm index 1fc18704d..4c0265664 100644 --- a/data/maps/objects/Route22.asm +++ b/data/maps/objects/Route22.asm @@ -1,6 +1,6 @@ object_const_def - const ROUTE22_RIVAL1 - const ROUTE22_RIVAL2 + const_export ROUTE22_RIVAL1 + const_export ROUTE22_RIVAL2 Route22_Object: db $2c ; border block diff --git a/data/maps/objects/Route22Gate.asm b/data/maps/objects/Route22Gate.asm index 6ebe7d7ef..b633c2a3c 100644 --- a/data/maps/objects/Route22Gate.asm +++ b/data/maps/objects/Route22Gate.asm @@ -1,5 +1,5 @@ object_const_def - const ROUTE22GATE_GUARD + const_export ROUTE22GATE_GUARD Route22Gate_Object: db $a ; border block diff --git a/data/maps/objects/Route23.asm b/data/maps/objects/Route23.asm index f13409a25..b31aff421 100644 --- a/data/maps/objects/Route23.asm +++ b/data/maps/objects/Route23.asm @@ -1,11 +1,11 @@ object_const_def - const ROUTE23_GUARD1 - const ROUTE23_GUARD2 - const ROUTE23_SWIMMER1 - const ROUTE23_SWIMMER2 - const ROUTE23_GUARD3 - const ROUTE23_GUARD4 - const ROUTE23_GUARD5 + const_export ROUTE23_GUARD1 + const_export ROUTE23_GUARD2 + const_export ROUTE23_SWIMMER1 + const_export ROUTE23_SWIMMER2 + const_export ROUTE23_GUARD3 + const_export ROUTE23_GUARD4 + const_export ROUTE23_GUARD5 Route23_Object: db $f ; border block diff --git a/data/maps/objects/Route24.asm b/data/maps/objects/Route24.asm index 6c0b6ad6f..f23eb7f84 100644 --- a/data/maps/objects/Route24.asm +++ b/data/maps/objects/Route24.asm @@ -1,12 +1,12 @@ object_const_def - const ROUTE24_COOLTRAINER_M1 - const ROUTE24_COOLTRAINER_M2 - const ROUTE24_COOLTRAINER_M3 - const ROUTE24_COOLTRAINER_F1 - const ROUTE24_YOUNGSTER_1 - const ROUTE24_COOLTRAINER_F2 - const ROUTE24_YOUNGSTER_2 - const ROUTE24_TM_THUNDER_WAVE + const_export ROUTE24_COOLTRAINER_M1 + const_export ROUTE24_COOLTRAINER_M2 + const_export ROUTE24_COOLTRAINER_M3 + const_export ROUTE24_COOLTRAINER_F1 + const_export ROUTE24_YOUNGSTER_1 + const_export ROUTE24_COOLTRAINER_F2 + const_export ROUTE24_YOUNGSTER_2 + const_export ROUTE24_TM_THUNDER_WAVE Route24_Object: db $2c ; border block diff --git a/data/maps/objects/Route25.asm b/data/maps/objects/Route25.asm index 897c42984..c723a8522 100644 --- a/data/maps/objects/Route25.asm +++ b/data/maps/objects/Route25.asm @@ -1,14 +1,14 @@ object_const_def - const ROUTE25_YOUNGSTER1 - const ROUTE25_YOUNGSTER2 - const ROUTE25_COOLTRAINER_M - const ROUTE25_COOLTRAINER_F1 - const ROUTE25_YOUNGSTER3 - const ROUTE25_COOLTRAINER_F2 - const ROUTE25_HIKER1 - const ROUTE25_HIKER2 - const ROUTE25_HIKER3 - const ROUTE25_TM_SEISMIC_TOSS + const_export ROUTE25_YOUNGSTER1 + const_export ROUTE25_YOUNGSTER2 + const_export ROUTE25_COOLTRAINER_M + const_export ROUTE25_COOLTRAINER_F1 + const_export ROUTE25_YOUNGSTER3 + const_export ROUTE25_COOLTRAINER_F2 + const_export ROUTE25_HIKER1 + const_export ROUTE25_HIKER2 + const_export ROUTE25_HIKER3 + const_export ROUTE25_TM_SEISMIC_TOSS Route25_Object: db $2c ; border block diff --git a/data/maps/objects/Route2Gate.asm b/data/maps/objects/Route2Gate.asm index acbe73e9b..6c46736dd 100644 --- a/data/maps/objects/Route2Gate.asm +++ b/data/maps/objects/Route2Gate.asm @@ -1,6 +1,6 @@ object_const_def - const ROUTE2_OAKS_AIDE - const ROUTE2_YOUNGSTER + const_export ROUTE2_OAKS_AIDE + const_export ROUTE2_YOUNGSTER Route2Gate_Object: db $a ; border block diff --git a/data/maps/objects/Route2TradeHouse.asm b/data/maps/objects/Route2TradeHouse.asm index ef2785ba3..daedcba37 100644 --- a/data/maps/objects/Route2TradeHouse.asm +++ b/data/maps/objects/Route2TradeHouse.asm @@ -1,6 +1,6 @@ object_const_def - const ROUTE2TRADEHOUSE_SCIENTIST - const ROUTE2TRADEHOUSE_GAMEBOY_KID + const_export ROUTE2TRADEHOUSE_SCIENTIST + const_export ROUTE2TRADEHOUSE_GAMEBOY_KID Route2TradeHouse_Object: db $a ; border block diff --git a/data/maps/objects/Route3.asm b/data/maps/objects/Route3.asm index 3db963ade..ce7224b57 100644 --- a/data/maps/objects/Route3.asm +++ b/data/maps/objects/Route3.asm @@ -1,13 +1,13 @@ object_const_def - const ROUTE3_SUPER_NERD - const ROUTE3_YOUNGSTER1 - const ROUTE3_YOUNGSTER2 - const ROUTE3_COOLTRAINER_F1 - const ROUTE3_YOUNGSTER3 - const ROUTE3_COOLTRAINER_F2 - const ROUTE3_YOUNGSTER4 - const ROUTE3_YOUNGSTER5 - const ROUTE3_COOLTRAINER_F3 + const_export ROUTE3_SUPER_NERD + const_export ROUTE3_YOUNGSTER1 + const_export ROUTE3_YOUNGSTER2 + const_export ROUTE3_COOLTRAINER_F1 + const_export ROUTE3_YOUNGSTER3 + const_export ROUTE3_COOLTRAINER_F2 + const_export ROUTE3_YOUNGSTER4 + const_export ROUTE3_YOUNGSTER5 + const_export ROUTE3_COOLTRAINER_F3 Route3_Object: db $2c ; border block diff --git a/data/maps/objects/Route4.asm b/data/maps/objects/Route4.asm index b34c913d4..63cdefa8a 100644 --- a/data/maps/objects/Route4.asm +++ b/data/maps/objects/Route4.asm @@ -1,7 +1,7 @@ object_const_def - const ROUTE4_COOLTRAINER_F1 - const ROUTE4_COOLTRAINER_F2 - const ROUTE4_TM_WHIRLWIND + const_export ROUTE4_COOLTRAINER_F1 + const_export ROUTE4_COOLTRAINER_F2 + const_export ROUTE4_TM_WHIRLWIND Route4_Object: db $2c ; border block diff --git a/data/maps/objects/Route5Gate.asm b/data/maps/objects/Route5Gate.asm index 87b7b5f28..06559f48a 100644 --- a/data/maps/objects/Route5Gate.asm +++ b/data/maps/objects/Route5Gate.asm @@ -1,5 +1,5 @@ object_const_def - const ROUTE5GATE_GUARD + const_export ROUTE5GATE_GUARD Route5Gate_Object: db $a ; border block diff --git a/data/maps/objects/Route6.asm b/data/maps/objects/Route6.asm index 461ccf27b..cd6667688 100644 --- a/data/maps/objects/Route6.asm +++ b/data/maps/objects/Route6.asm @@ -1,10 +1,10 @@ object_const_def - const ROUTE6_COOLTRAINER_M1 - const ROUTE6_COOLTRAINER_F1 - const ROUTE6_YOUNGSTER_1 - const ROUTE6_COOLTRAINER_M2 - const ROUTE6_COOLTRAINER_F2 - const ROUTE6_YOUNGSTER_2 + const_export ROUTE6_COOLTRAINER_M1 + const_export ROUTE6_COOLTRAINER_F1 + const_export ROUTE6_YOUNGSTER_1 + const_export ROUTE6_COOLTRAINER_M2 + const_export ROUTE6_COOLTRAINER_F2 + const_export ROUTE6_YOUNGSTER_2 Route6_Object: db $f ; border block diff --git a/data/maps/objects/Route6Gate.asm b/data/maps/objects/Route6Gate.asm index bce3596e1..0b1f6359d 100644 --- a/data/maps/objects/Route6Gate.asm +++ b/data/maps/objects/Route6Gate.asm @@ -1,5 +1,5 @@ object_const_def - const ROUTE6GATE_GUARD + const_export ROUTE6GATE_GUARD Route6Gate_Object: db $a ; border block diff --git a/data/maps/objects/Route7Gate.asm b/data/maps/objects/Route7Gate.asm index 18931e9e4..8aac6e856 100644 --- a/data/maps/objects/Route7Gate.asm +++ b/data/maps/objects/Route7Gate.asm @@ -1,5 +1,5 @@ object_const_def - const ROUTE7GATE_GUARD + const_export ROUTE7GATE_GUARD Route7Gate_Object: db $a ; border block diff --git a/data/maps/objects/Route8.asm b/data/maps/objects/Route8.asm index de0a1a264..eed93844d 100644 --- a/data/maps/objects/Route8.asm +++ b/data/maps/objects/Route8.asm @@ -1,13 +1,13 @@ object_const_def - const ROUTE8_SUPER_NERD1 - const ROUTE8_GAMBLER1 - const ROUTE8_SUPER_NERD2 - const ROUTE8_COOLTRAINER_F1 - const ROUTE8_SUPER_NERD3 - const ROUTE8_COOLTRAINER_F2 - const ROUTE8_COOLTRAINER_F3 - const ROUTE8_GAMBLER2 - const ROUTE8_COOLTRAINER_F4 + const_export ROUTE8_SUPER_NERD1 + const_export ROUTE8_GAMBLER1 + const_export ROUTE8_SUPER_NERD2 + const_export ROUTE8_COOLTRAINER_F1 + const_export ROUTE8_SUPER_NERD3 + const_export ROUTE8_COOLTRAINER_F2 + const_export ROUTE8_COOLTRAINER_F3 + const_export ROUTE8_GAMBLER2 + const_export ROUTE8_COOLTRAINER_F4 Route8_Object: db $2c ; border block diff --git a/data/maps/objects/Route8Gate.asm b/data/maps/objects/Route8Gate.asm index 37000dd4d..64a931e61 100644 --- a/data/maps/objects/Route8Gate.asm +++ b/data/maps/objects/Route8Gate.asm @@ -1,5 +1,5 @@ object_const_def - const ROUTE8GATE_GUARD + const_export ROUTE8GATE_GUARD Route8Gate_Object: db $a ; border block diff --git a/data/maps/objects/Route9.asm b/data/maps/objects/Route9.asm index 21c742e9a..a5c29befd 100644 --- a/data/maps/objects/Route9.asm +++ b/data/maps/objects/Route9.asm @@ -1,14 +1,14 @@ object_const_def - const ROUTE9_COOLTRAINER_F1 - const ROUTE9_COOLTRAINER_M1 - const ROUTE9_COOLTRAINER_M2 - const ROUTE9_COOLTRAINER_F2 - const ROUTE9_HIKER_1 - const ROUTE9_HIKER_2 - const ROUTE9_YOUNGSTER_1 - const ROUTE9_HIKER_3 - const ROUTE9_YOUNGSTER_2 - const ROUTE9_TM_TELEPORT + const_export ROUTE9_COOLTRAINER_F1 + const_export ROUTE9_COOLTRAINER_M1 + const_export ROUTE9_COOLTRAINER_M2 + const_export ROUTE9_COOLTRAINER_F2 + const_export ROUTE9_HIKER_1 + const_export ROUTE9_HIKER_2 + const_export ROUTE9_YOUNGSTER_1 + const_export ROUTE9_HIKER_3 + const_export ROUTE9_YOUNGSTER_2 + const_export ROUTE9_TM_TELEPORT Route9_Object: db $2c ; border block diff --git a/data/maps/objects/SSAnne1F.asm b/data/maps/objects/SSAnne1F.asm index 0a00befd4..e18e87a26 100644 --- a/data/maps/objects/SSAnne1F.asm +++ b/data/maps/objects/SSAnne1F.asm @@ -1,6 +1,6 @@ object_const_def - const SSANNE1F_WAITER - const SSANNE1F_SAILOR + const_export SSANNE1F_WAITER + const_export SSANNE1F_SAILOR SSAnne1F_Object: db $c ; border block diff --git a/data/maps/objects/SSAnne1FRooms.asm b/data/maps/objects/SSAnne1FRooms.asm index c23fe124f..9fc7bcbfb 100644 --- a/data/maps/objects/SSAnne1FRooms.asm +++ b/data/maps/objects/SSAnne1FRooms.asm @@ -1,15 +1,15 @@ object_const_def - const SSANNE1FROOMS_GENTLEMAN1 - const SSANNE1FROOMS_GENTLEMAN2 - const SSANNE1FROOMS_YOUNGSTER - const SSANNE1FROOMS_COOLTRAINER_F - const SSANNE1FROOMS_GIRL1 - const SSANNE1FROOMS_MIDDLE_AGED_MAN - const SSANNE1FROOMS_LITTLE_GIRL - const SSANNE1FROOMS_WIGGLYTUFF - const SSANNE1FROOMS_GIRL2 - const SSANNE1FROOMS_TM_BODY_SLAM - const SSANNE1FROOMS_GENTLEMAN3 + const_export SSANNE1FROOMS_GENTLEMAN1 + const_export SSANNE1FROOMS_GENTLEMAN2 + const_export SSANNE1FROOMS_YOUNGSTER + const_export SSANNE1FROOMS_COOLTRAINER_F + const_export SSANNE1FROOMS_GIRL1 + const_export SSANNE1FROOMS_MIDDLE_AGED_MAN + const_export SSANNE1FROOMS_LITTLE_GIRL + const_export SSANNE1FROOMS_WIGGLYTUFF + const_export SSANNE1FROOMS_GIRL2 + const_export SSANNE1FROOMS_TM_BODY_SLAM + const_export SSANNE1FROOMS_GENTLEMAN3 SSAnne1FRooms_Object: db $c ; border block diff --git a/data/maps/objects/SSAnne2F.asm b/data/maps/objects/SSAnne2F.asm index 283ca70f1..0bf5fcbfe 100644 --- a/data/maps/objects/SSAnne2F.asm +++ b/data/maps/objects/SSAnne2F.asm @@ -1,6 +1,6 @@ object_const_def - const SSANNE2F_WAITER - const SSANNE2F_RIVAL + const_export SSANNE2F_WAITER + const_export SSANNE2F_RIVAL SSAnne2F_Object: db $c ; border block diff --git a/data/maps/objects/SSAnne2FRooms.asm b/data/maps/objects/SSAnne2FRooms.asm index 22e59bbe6..7418222ea 100644 --- a/data/maps/objects/SSAnne2FRooms.asm +++ b/data/maps/objects/SSAnne2FRooms.asm @@ -1,17 +1,17 @@ object_const_def - const SSANNE2FROOMS_GENTLEMAN1 - const SSANNE2FROOMS_FISHER - const SSANNE2FROOMS_GENTLEMAN2 - const SSANNE2FROOMS_COOLTRAINER_F - const SSANNE2FROOMS_GENTLEMAN3 - const SSANNE2FROOMS_MAX_ETHER - const SSANNE2FROOMS_GENTLEMAN4 - const SSANNE2FROOMS_GRAMPS - const SSANNE2FROOMS_RARE_CANDY - const SSANNE2FROOMS_GENTLEMAN5 - const SSANNE2FROOMS_LITTLE_BOY - const SSANNE2FROOMS_BRUNETTE_GIRL - const SSANNE2FROOMS_BEAUTY + const_export SSANNE2FROOMS_GENTLEMAN1 + const_export SSANNE2FROOMS_FISHER + const_export SSANNE2FROOMS_GENTLEMAN2 + const_export SSANNE2FROOMS_COOLTRAINER_F + const_export SSANNE2FROOMS_GENTLEMAN3 + const_export SSANNE2FROOMS_MAX_ETHER + const_export SSANNE2FROOMS_GENTLEMAN4 + const_export SSANNE2FROOMS_GRAMPS + const_export SSANNE2FROOMS_RARE_CANDY + const_export SSANNE2FROOMS_GENTLEMAN5 + const_export SSANNE2FROOMS_LITTLE_BOY + const_export SSANNE2FROOMS_BRUNETTE_GIRL + const_export SSANNE2FROOMS_BEAUTY SSAnne2FRooms_Object: db $c ; border block diff --git a/data/maps/objects/SSAnne3F.asm b/data/maps/objects/SSAnne3F.asm index db904ad6e..291cdf69f 100644 --- a/data/maps/objects/SSAnne3F.asm +++ b/data/maps/objects/SSAnne3F.asm @@ -1,5 +1,5 @@ object_const_def - const SSANNE3F_SAILOR + const_export SSANNE3F_SAILOR SSAnne3F_Object: db $c ; border block diff --git a/data/maps/objects/SSAnneB1FRooms.asm b/data/maps/objects/SSAnneB1FRooms.asm index f7654fbb5..7846186e5 100644 --- a/data/maps/objects/SSAnneB1FRooms.asm +++ b/data/maps/objects/SSAnneB1FRooms.asm @@ -1,15 +1,15 @@ object_const_def - const SSANNEB1FROOMS_SAILOR1 - const SSANNEB1FROOMS_SAILOR2 - const SSANNEB1FROOMS_SAILOR3 - const SSANNEB1FROOMS_SAILOR4 - const SSANNEB1FROOMS_SAILOR5 - const SSANNEB1FROOMS_FISHER - const SSANNEB1FROOMS_SUPER_NERD - const SSANNEB1FROOMS_MACHOKE - const SSANNEB1FROOMS_ETHER - const SSANNEB1FROOMS_TM_REST - const SSANNEB1FROOMS_MAX_POTION + const_export SSANNEB1FROOMS_SAILOR1 + const_export SSANNEB1FROOMS_SAILOR2 + const_export SSANNEB1FROOMS_SAILOR3 + const_export SSANNEB1FROOMS_SAILOR4 + const_export SSANNEB1FROOMS_SAILOR5 + const_export SSANNEB1FROOMS_FISHER + const_export SSANNEB1FROOMS_SUPER_NERD + const_export SSANNEB1FROOMS_MACHOKE + const_export SSANNEB1FROOMS_ETHER + const_export SSANNEB1FROOMS_TM_REST + const_export SSANNEB1FROOMS_MAX_POTION SSAnneB1FRooms_Object: db $c ; border block diff --git a/data/maps/objects/SSAnneBow.asm b/data/maps/objects/SSAnneBow.asm index 41e5c0492..139e09e4b 100644 --- a/data/maps/objects/SSAnneBow.asm +++ b/data/maps/objects/SSAnneBow.asm @@ -1,9 +1,9 @@ object_const_def - const SSANNEBOW_SUPER_NERD - const SSANNEBOW_SAILOR1 - const SSANNEBOW_COOLTRAINER_M - const SSANNEBOW_SAILOR2 - const SSANNEBOW_SAILOR3 + const_export SSANNEBOW_SUPER_NERD + const_export SSANNEBOW_SAILOR1 + const_export SSANNEBOW_COOLTRAINER_M + const_export SSANNEBOW_SAILOR2 + const_export SSANNEBOW_SAILOR3 SSAnneBow_Object: db $23 ; border block diff --git a/data/maps/objects/SSAnneCaptainsRoom.asm b/data/maps/objects/SSAnneCaptainsRoom.asm index 7121a7b38..92573dbd3 100644 --- a/data/maps/objects/SSAnneCaptainsRoom.asm +++ b/data/maps/objects/SSAnneCaptainsRoom.asm @@ -1,5 +1,5 @@ object_const_def - const SSANNECAPTAINSROOM_CAPTAIN + const_export SSANNECAPTAINSROOM_CAPTAIN SSAnneCaptainsRoom_Object: db $c ; border block diff --git a/data/maps/objects/SSAnneKitchen.asm b/data/maps/objects/SSAnneKitchen.asm index d44e9547d..707db8664 100644 --- a/data/maps/objects/SSAnneKitchen.asm +++ b/data/maps/objects/SSAnneKitchen.asm @@ -1,11 +1,11 @@ object_const_def - const SSANNEKITCHEN_COOK1 - const SSANNEKITCHEN_COOK2 - const SSANNEKITCHEN_COOK3 - const SSANNEKITCHEN_COOK4 - const SSANNEKITCHEN_COOK5 - const SSANNEKITCHEN_COOK6 - const SSANNEKITCHEN_COOK7 + const_export SSANNEKITCHEN_COOK1 + const_export SSANNEKITCHEN_COOK2 + const_export SSANNEKITCHEN_COOK3 + const_export SSANNEKITCHEN_COOK4 + const_export SSANNEKITCHEN_COOK5 + const_export SSANNEKITCHEN_COOK6 + const_export SSANNEKITCHEN_COOK7 SSAnneKitchen_Object: db $c ; border block diff --git a/data/maps/objects/SafariZoneCenter.asm b/data/maps/objects/SafariZoneCenter.asm index ac176e149..f30ed123d 100644 --- a/data/maps/objects/SafariZoneCenter.asm +++ b/data/maps/objects/SafariZoneCenter.asm @@ -1,5 +1,5 @@ object_const_def - const SAFARIZONECENTER_NUGGET + const_export SAFARIZONECENTER_NUGGET SafariZoneCenter_Object: db $0 ; border block diff --git a/data/maps/objects/SafariZoneCenterRestHouse.asm b/data/maps/objects/SafariZoneCenterRestHouse.asm index 06ec0d22c..8bb502565 100644 --- a/data/maps/objects/SafariZoneCenterRestHouse.asm +++ b/data/maps/objects/SafariZoneCenterRestHouse.asm @@ -1,6 +1,6 @@ object_const_def - const SAFARIZONECENTERRESTHOUSE_GIRL - const SAFARIZONECENTERRESTHOUSE_SCIENTIST + const_export SAFARIZONECENTERRESTHOUSE_GIRL + const_export SAFARIZONECENTERRESTHOUSE_SCIENTIST SafariZoneCenterRestHouse_Object: db $a ; border block diff --git a/data/maps/objects/SafariZoneEast.asm b/data/maps/objects/SafariZoneEast.asm index 0b4e26b46..cef466d9b 100644 --- a/data/maps/objects/SafariZoneEast.asm +++ b/data/maps/objects/SafariZoneEast.asm @@ -1,8 +1,8 @@ object_const_def - const SAFARIZONEEAST_FULL_RESTORE - const SAFARIZONEEAST_MAX_RESTORE - const SAFARIZONEEAST_CARBOS - const SAFARIZONEEAST_TM_EGG_BOMB + const_export SAFARIZONEEAST_FULL_RESTORE + const_export SAFARIZONEEAST_MAX_RESTORE + const_export SAFARIZONEEAST_CARBOS + const_export SAFARIZONEEAST_TM_EGG_BOMB SafariZoneEast_Object: db $0 ; border block diff --git a/data/maps/objects/SafariZoneEastRestHouse.asm b/data/maps/objects/SafariZoneEastRestHouse.asm index 7c89d27ef..47a1562c2 100644 --- a/data/maps/objects/SafariZoneEastRestHouse.asm +++ b/data/maps/objects/SafariZoneEastRestHouse.asm @@ -1,7 +1,7 @@ object_const_def - const SAFARIZONEEASTRESTHOUSE_SCIENTIST - const SAFARIZONEEASTRESTHOUSE_ROCKER - const SAFARIZONEEASTRESTHOUSE_SILPH_WORKER_M + const_export SAFARIZONEEASTRESTHOUSE_SCIENTIST + const_export SAFARIZONEEASTRESTHOUSE_ROCKER + const_export SAFARIZONEEASTRESTHOUSE_SILPH_WORKER_M SafariZoneEastRestHouse_Object: db $a ; border block diff --git a/data/maps/objects/SafariZoneGate.asm b/data/maps/objects/SafariZoneGate.asm index c9542e69b..b4c72c9b1 100644 --- a/data/maps/objects/SafariZoneGate.asm +++ b/data/maps/objects/SafariZoneGate.asm @@ -1,6 +1,6 @@ object_const_def - const SAFARIZONEGATE_SAFARI_ZONE_WORKER1 - const SAFARIZONEGATE_SAFARI_ZONE_WORKER2 + const_export SAFARIZONEGATE_SAFARI_ZONE_WORKER1 + const_export SAFARIZONEGATE_SAFARI_ZONE_WORKER2 SafariZoneGate_Object: db $a ; border block diff --git a/data/maps/objects/SafariZoneNorth.asm b/data/maps/objects/SafariZoneNorth.asm index 2ee7b17a3..3433cd6d0 100644 --- a/data/maps/objects/SafariZoneNorth.asm +++ b/data/maps/objects/SafariZoneNorth.asm @@ -1,6 +1,6 @@ object_const_def - const SAFARIZONENORTH_PROTEIN - const SAFARIZONENORTH_TM_SKULL_BASH + const_export SAFARIZONENORTH_PROTEIN + const_export SAFARIZONENORTH_TM_SKULL_BASH SafariZoneNorth_Object: db $0 ; border block diff --git a/data/maps/objects/SafariZoneNorthRestHouse.asm b/data/maps/objects/SafariZoneNorthRestHouse.asm index edb99c6b0..8411f8a5d 100644 --- a/data/maps/objects/SafariZoneNorthRestHouse.asm +++ b/data/maps/objects/SafariZoneNorthRestHouse.asm @@ -1,7 +1,7 @@ object_const_def - const SAFARIZONENORTHRESTHOUSE_SCIENTIST - const SAFARIZONENORTHRESTHOUSE_SAFARI_ZONE_WORKER - const SAFARIZONENORTHRESTHOUSE_GENTLEMAN + const_export SAFARIZONENORTHRESTHOUSE_SCIENTIST + const_export SAFARIZONENORTHRESTHOUSE_SAFARI_ZONE_WORKER + const_export SAFARIZONENORTHRESTHOUSE_GENTLEMAN SafariZoneNorthRestHouse_Object: db $a ; border block diff --git a/data/maps/objects/SafariZoneSecretHouse.asm b/data/maps/objects/SafariZoneSecretHouse.asm index 44ebd3422..351123266 100644 --- a/data/maps/objects/SafariZoneSecretHouse.asm +++ b/data/maps/objects/SafariZoneSecretHouse.asm @@ -1,5 +1,5 @@ object_const_def - const SAFARIZONESECRETHOUSE_FISHING_GURU + const_export SAFARIZONESECRETHOUSE_FISHING_GURU SafariZoneSecretHouse_Object: db $17 ; border block diff --git a/data/maps/objects/SafariZoneWest.asm b/data/maps/objects/SafariZoneWest.asm index 284cd244c..dbc02825e 100644 --- a/data/maps/objects/SafariZoneWest.asm +++ b/data/maps/objects/SafariZoneWest.asm @@ -1,8 +1,8 @@ object_const_def - const SAFARIZONEWEST_MAX_POTION - const SAFARIZONEWEST_TM_DOUBLE_TEAM - const SAFARIZONEWEST_MAX_REVIVE - const SAFARIZONEWEST_GOLD_TEETH + const_export SAFARIZONEWEST_MAX_POTION + const_export SAFARIZONEWEST_TM_DOUBLE_TEAM + const_export SAFARIZONEWEST_MAX_REVIVE + const_export SAFARIZONEWEST_GOLD_TEETH SafariZoneWest_Object: db $0 ; border block diff --git a/data/maps/objects/SafariZoneWestRestHouse.asm b/data/maps/objects/SafariZoneWestRestHouse.asm index bf2eabe2f..bc77ca4d4 100644 --- a/data/maps/objects/SafariZoneWestRestHouse.asm +++ b/data/maps/objects/SafariZoneWestRestHouse.asm @@ -1,7 +1,7 @@ object_const_def - const SAFARIZONEWESTRESTHOUSE_SCIENTIST - const SAFARIZONEWESTRESTHOUSE_COOLTRAINER_M - const SAFARIZONEWESTRESTHOUSE_SILPH_WORKER_F + const_export SAFARIZONEWESTRESTHOUSE_SCIENTIST + const_export SAFARIZONEWESTRESTHOUSE_COOLTRAINER_M + const_export SAFARIZONEWESTRESTHOUSE_SILPH_WORKER_F SafariZoneWestRestHouse_Object: db $a ; border block diff --git a/data/maps/objects/SaffronCity.asm b/data/maps/objects/SaffronCity.asm index 181b5c078..8de01fe2e 100644 --- a/data/maps/objects/SaffronCity.asm +++ b/data/maps/objects/SaffronCity.asm @@ -1,19 +1,19 @@ object_const_def - const SAFFRONCITY_ROCKET1 - const SAFFRONCITY_ROCKET2 - const SAFFRONCITY_ROCKET3 - const SAFFRONCITY_ROCKET4 - const SAFFRONCITY_ROCKET5 - const SAFFRONCITY_ROCKET6 - const SAFFRONCITY_ROCKET7 - const SAFFRONCTIY_SCIENTIST - const SAFFRONCITY_SILPH_WORKER_M - const SAFFRONCITY_SILPH_WORKER_F - const SAFFRONCITY_GENTLEMAN - const SAFFRONCITY_PIDGEOT - const SAFFRONCITY_ROCKER - const SAFFRONCITY_ROCKET8 - const SAFFRONCITY_ROCKET9 + const_export SAFFRONCITY_ROCKET1 + const_export SAFFRONCITY_ROCKET2 + const_export SAFFRONCITY_ROCKET3 + const_export SAFFRONCITY_ROCKET4 + const_export SAFFRONCITY_ROCKET5 + const_export SAFFRONCITY_ROCKET6 + const_export SAFFRONCITY_ROCKET7 + const_export SAFFRONCTIY_SCIENTIST + const_export SAFFRONCITY_SILPH_WORKER_M + const_export SAFFRONCITY_SILPH_WORKER_F + const_export SAFFRONCITY_GENTLEMAN + const_export SAFFRONCITY_PIDGEOT + const_export SAFFRONCITY_ROCKER + const_export SAFFRONCITY_ROCKET8 + const_export SAFFRONCITY_ROCKET9 SaffronCity_Object: db $f ; border block diff --git a/data/maps/objects/SaffronGym.asm b/data/maps/objects/SaffronGym.asm index af4bd68e1..839228adc 100644 --- a/data/maps/objects/SaffronGym.asm +++ b/data/maps/objects/SaffronGym.asm @@ -1,13 +1,13 @@ object_const_def - const SAFFRONGYM_SABRINA - const SAFFRONGYM_CHANNELER1 - const SAFFRONGYM_YOUNGSTER1 - const SAFFRONGYM_CHANNELER2 - const SAFFRONGYM_YOUNGSTER2 - const SAFFRONGYM_CHANNELER3 - const SAFFRONGYM_YOUNGSTER3 - const SAFFRONGYM_YOUNGSTER4 - const SAFFRONGYM_GYM_GUIDE + const_export SAFFRONGYM_SABRINA + const_export SAFFRONGYM_CHANNELER1 + const_export SAFFRONGYM_YOUNGSTER1 + const_export SAFFRONGYM_CHANNELER2 + const_export SAFFRONGYM_YOUNGSTER2 + const_export SAFFRONGYM_CHANNELER3 + const_export SAFFRONGYM_YOUNGSTER3 + const_export SAFFRONGYM_YOUNGSTER4 + const_export SAFFRONGYM_GYM_GUIDE SaffronGym_Object: db $2e ; border block diff --git a/data/maps/objects/SaffronMart.asm b/data/maps/objects/SaffronMart.asm index 7a2d9eb1e..56057e28d 100644 --- a/data/maps/objects/SaffronMart.asm +++ b/data/maps/objects/SaffronMart.asm @@ -1,7 +1,7 @@ object_const_def - const SAFFRONMART_CLERK - const SAFFRONMART_SUPER_NERD - const SAFFRONMART_COOLTRAINER_F + const_export SAFFRONMART_CLERK + const_export SAFFRONMART_SUPER_NERD + const_export SAFFRONMART_COOLTRAINER_F SaffronMart_Object: db $0 ; border block diff --git a/data/maps/objects/SaffronPidgeyHouse.asm b/data/maps/objects/SaffronPidgeyHouse.asm index 3fc0cb9d1..4ee23c0f0 100644 --- a/data/maps/objects/SaffronPidgeyHouse.asm +++ b/data/maps/objects/SaffronPidgeyHouse.asm @@ -1,8 +1,8 @@ object_const_def - const SAFFRONPIDGEYHOUSE_BRUNETTE_GIRL - const SAFFRONPIDGEYHOUSE_PIDGEY - const SAFFRONPIDGEYHOUSE_YOUNGSTER - const SAFFRONPIDGEYHOUSE_PAPER + const_export SAFFRONPIDGEYHOUSE_BRUNETTE_GIRL + const_export SAFFRONPIDGEYHOUSE_PIDGEY + const_export SAFFRONPIDGEYHOUSE_YOUNGSTER + const_export SAFFRONPIDGEYHOUSE_PAPER SaffronPidgeyHouse_Object: db $a ; border block diff --git a/data/maps/objects/SaffronPokecenter.asm b/data/maps/objects/SaffronPokecenter.asm index 3169ea43e..51bb2a1da 100644 --- a/data/maps/objects/SaffronPokecenter.asm +++ b/data/maps/objects/SaffronPokecenter.asm @@ -1,8 +1,8 @@ object_const_def - const SAFFRONPOKECENTER_NURSE - const SAFFRONPOKECENTER_BEAUTY - const SAFFRONPOKECENTER_GENTLEMAN - const SAFFRONPOKECENTER_LINK_RECEPTIONIST + const_export SAFFRONPOKECENTER_NURSE + const_export SAFFRONPOKECENTER_BEAUTY + const_export SAFFRONPOKECENTER_GENTLEMAN + const_export SAFFRONPOKECENTER_LINK_RECEPTIONIST SaffronPokecenter_Object: db $0 ; border block diff --git a/data/maps/objects/SeafoamIslands1F.asm b/data/maps/objects/SeafoamIslands1F.asm index a90042842..3c41d5c90 100644 --- a/data/maps/objects/SeafoamIslands1F.asm +++ b/data/maps/objects/SeafoamIslands1F.asm @@ -1,6 +1,6 @@ object_const_def - const SEAFOAMISLANDS1F_BOULDER1 - const SEAFOAMISLANDS1F_BOULDER2 + const_export SEAFOAMISLANDS1F_BOULDER1 + const_export SEAFOAMISLANDS1F_BOULDER2 SeafoamIslands1F_Object: db $7d ; border block diff --git a/data/maps/objects/SeafoamIslandsB1F.asm b/data/maps/objects/SeafoamIslandsB1F.asm index c941ea21f..7330333a8 100644 --- a/data/maps/objects/SeafoamIslandsB1F.asm +++ b/data/maps/objects/SeafoamIslandsB1F.asm @@ -1,6 +1,6 @@ object_const_def - const SEAFOAMISLANDSB1F_BOULDER1 - const SEAFOAMISLANDSB1F_BOULDER2 + const_export SEAFOAMISLANDSB1F_BOULDER1 + const_export SEAFOAMISLANDSB1F_BOULDER2 SeafoamIslandsB1F_Object: db $7d ; border block diff --git a/data/maps/objects/SeafoamIslandsB2F.asm b/data/maps/objects/SeafoamIslandsB2F.asm index 26bf3b074..c1d5021fb 100644 --- a/data/maps/objects/SeafoamIslandsB2F.asm +++ b/data/maps/objects/SeafoamIslandsB2F.asm @@ -1,6 +1,6 @@ object_const_def - const SEAFOAMISLANDSB2F_BOULDER1 - const SEAFOAMISLANDSB2F_BOULDER2 + const_export SEAFOAMISLANDSB2F_BOULDER1 + const_export SEAFOAMISLANDSB2F_BOULDER2 SeafoamIslandsB2F_Object: db $7d ; border block diff --git a/data/maps/objects/SeafoamIslandsB3F.asm b/data/maps/objects/SeafoamIslandsB3F.asm index 667e6ff7e..1f0991345 100644 --- a/data/maps/objects/SeafoamIslandsB3F.asm +++ b/data/maps/objects/SeafoamIslandsB3F.asm @@ -1,10 +1,10 @@ object_const_def - const SEAFOAMISLANDSB3F_BOULDER1 - const SEAFOAMISLANDSB3F_BOULDER2 - const SEAFOAMISLANDSB3F_BOULDER3 - const SEAFOAMISLANDSB3F_BOULDER4 - const SEAFOAMISLANDSB3F_BOULDER5 - const SEAFOAMISLANDSB3F_BOULDER6 + const_export SEAFOAMISLANDSB3F_BOULDER1 + const_export SEAFOAMISLANDSB3F_BOULDER2 + const_export SEAFOAMISLANDSB3F_BOULDER3 + const_export SEAFOAMISLANDSB3F_BOULDER4 + const_export SEAFOAMISLANDSB3F_BOULDER5 + const_export SEAFOAMISLANDSB3F_BOULDER6 SeafoamIslandsB3F_Object: db $7d ; border block diff --git a/data/maps/objects/SeafoamIslandsB4F.asm b/data/maps/objects/SeafoamIslandsB4F.asm index 0948200d9..b80685fe2 100644 --- a/data/maps/objects/SeafoamIslandsB4F.asm +++ b/data/maps/objects/SeafoamIslandsB4F.asm @@ -1,7 +1,7 @@ object_const_def - const SEAFOAMISLANDSB4F_BOULDER1 - const SEAFOAMISLANDSB4F_BOULDER2 - const SEAFOAMISLANDSB4F_ARTICUNO + const_export SEAFOAMISLANDSB4F_BOULDER1 + const_export SEAFOAMISLANDSB4F_BOULDER2 + const_export SEAFOAMISLANDSB4F_ARTICUNO SeafoamIslandsB4F_Object: db $7d ; border block diff --git a/data/maps/objects/SilphCo10F.asm b/data/maps/objects/SilphCo10F.asm index 6904165a7..b95d5f09e 100644 --- a/data/maps/objects/SilphCo10F.asm +++ b/data/maps/objects/SilphCo10F.asm @@ -1,10 +1,10 @@ object_const_def - const SILPHCO10F_ROCKET - const SILPHCO10F_SCIENTIST - const SILPHCO10F_SILPH_WORKER_F - const SILPHCO10F_TM_EARTHQUAKE - const SILPHCO10F_RARE_CANDY - const SILPHCO10F_CARBOS + const_export SILPHCO10F_ROCKET + const_export SILPHCO10F_SCIENTIST + const_export SILPHCO10F_SILPH_WORKER_F + const_export SILPHCO10F_TM_EARTHQUAKE + const_export SILPHCO10F_RARE_CANDY + const_export SILPHCO10F_CARBOS SilphCo10F_Object: db $2e ; border block diff --git a/data/maps/objects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm index 1ee5ffe6a..c96745d42 100644 --- a/data/maps/objects/SilphCo11F.asm +++ b/data/maps/objects/SilphCo11F.asm @@ -1,9 +1,9 @@ object_const_def - const SILPHCO11F_SILPH_PRESIDENT - const SILPHCO11F_BEAUTY - const SILPHCO11F_GIOVANNI - const SILPHCO11F_ROCKET1 - const SILPHCO11F_ROCKET2 + const_export SILPHCO11F_SILPH_PRESIDENT + const_export SILPHCO11F_BEAUTY + const_export SILPHCO11F_GIOVANNI + const_export SILPHCO11F_ROCKET1 + const_export SILPHCO11F_ROCKET2 SilphCo11F_Object: db $d ; border block diff --git a/data/maps/objects/SilphCo1F.asm b/data/maps/objects/SilphCo1F.asm index 3d1873b53..07ddb1711 100644 --- a/data/maps/objects/SilphCo1F.asm +++ b/data/maps/objects/SilphCo1F.asm @@ -1,5 +1,5 @@ object_const_def - const SILPHCO1F_LINK_RECEPTIONIST + const_export SILPHCO1F_LINK_RECEPTIONIST SilphCo1F_Object: db $2e ; border block diff --git a/data/maps/objects/SilphCo2F.asm b/data/maps/objects/SilphCo2F.asm index b618708ad..0c99d5783 100644 --- a/data/maps/objects/SilphCo2F.asm +++ b/data/maps/objects/SilphCo2F.asm @@ -1,9 +1,9 @@ object_const_def - const SILPHCO2F_SILPH_WORKER_F - const SILPHCO2F_SCIENTIST1 - const SILPHCO2F_SCIENTIST2 - const SILPHCO2F_ROCKET1 - const SILPHCO2F_ROCKET2 + const_export SILPHCO2F_SILPH_WORKER_F + const_export SILPHCO2F_SCIENTIST1 + const_export SILPHCO2F_SCIENTIST2 + const_export SILPHCO2F_ROCKET1 + const_export SILPHCO2F_ROCKET2 SilphCo2F_Object: db $2e ; border block diff --git a/data/maps/objects/SilphCo3F.asm b/data/maps/objects/SilphCo3F.asm index f22eee828..a8c568c37 100644 --- a/data/maps/objects/SilphCo3F.asm +++ b/data/maps/objects/SilphCo3F.asm @@ -1,8 +1,8 @@ object_const_def - const SILPHCO3F_SILPH_WORKER_M - const SILPHCO3F_ROCKET - const SILPHCO3F_SCIENTIST - const SILPHCO3F_HYPER_POTION + const_export SILPHCO3F_SILPH_WORKER_M + const_export SILPHCO3F_ROCKET + const_export SILPHCO3F_SCIENTIST + const_export SILPHCO3F_HYPER_POTION SilphCo3F_Object: db $2e ; border block diff --git a/data/maps/objects/SilphCo4F.asm b/data/maps/objects/SilphCo4F.asm index cf471cb46..bf4e1115d 100644 --- a/data/maps/objects/SilphCo4F.asm +++ b/data/maps/objects/SilphCo4F.asm @@ -1,11 +1,11 @@ object_const_def - const SILPHCO4F_SILPH_WORKER_M - const SILPHCO4F_ROCKET1 - const SILPHCO4F_SCIENTIST - const SILPHCO4F_ROCKET2 - const SILPHCO4F_FULL_HEAL - const SILPHCO4F_MAX_REVIVE - const SILPHCO4F_ESCAPE_ROPE + const_export SILPHCO4F_SILPH_WORKER_M + const_export SILPHCO4F_ROCKET1 + const_export SILPHCO4F_SCIENTIST + const_export SILPHCO4F_ROCKET2 + const_export SILPHCO4F_FULL_HEAL + const_export SILPHCO4F_MAX_REVIVE + const_export SILPHCO4F_ESCAPE_ROPE SilphCo4F_Object: db $2e ; border block diff --git a/data/maps/objects/SilphCo5F.asm b/data/maps/objects/SilphCo5F.asm index c6cc7e34f..bc3a8391d 100644 --- a/data/maps/objects/SilphCo5F.asm +++ b/data/maps/objects/SilphCo5F.asm @@ -1,15 +1,15 @@ object_const_def - const SILPHCO5F_SILPH_WORKER_M - const SILPHCO5F_ROCKET1 - const SILPHCO5F_SCIENTIST - const SILPHCO5F_ROCKER - const SILPHCO5F_ROCKET2 - const SILPHCO5F_TM_TAKE_DOWN - const SILPHCO5F_PROTEIN - const SILPHCO5F_CARD_KEY - const SILPHCO5F_POKEMON_REPORT1 - const SILPHCO5F_POKEMON_REPORT2 - const SILPHCO5F_POKEMON_REPORT3 + const_export SILPHCO5F_SILPH_WORKER_M + const_export SILPHCO5F_ROCKET1 + const_export SILPHCO5F_SCIENTIST + const_export SILPHCO5F_ROCKER + const_export SILPHCO5F_ROCKET2 + const_export SILPHCO5F_TM_TAKE_DOWN + const_export SILPHCO5F_PROTEIN + const_export SILPHCO5F_CARD_KEY + const_export SILPHCO5F_POKEMON_REPORT1 + const_export SILPHCO5F_POKEMON_REPORT2 + const_export SILPHCO5F_POKEMON_REPORT3 SilphCo5F_Object: db $2e ; border block diff --git a/data/maps/objects/SilphCo6F.asm b/data/maps/objects/SilphCo6F.asm index 5dc9c87ba..26aad741f 100644 --- a/data/maps/objects/SilphCo6F.asm +++ b/data/maps/objects/SilphCo6F.asm @@ -1,14 +1,14 @@ object_const_def - const SILPHCO6F_SILPH_WORKER_M1 - const SILPHCO6F_SILPH_WORKER_M2 - const SILPHCO6F_SILPH_WORKER_F1 - const SILPHCO6F_SILPH_WORKER_F2 - const SILPHCO6F_SILPH_WORKER_M3 - const SILPHCO6F_ROCKET1 - const SILPHCO6F_SCIENTIST - const SILPHCO6F_ROCKET2 - const SILPHCO6F_HP_UP - const SILPHCO6F_X_ACCURACY + const_export SILPHCO6F_SILPH_WORKER_M1 + const_export SILPHCO6F_SILPH_WORKER_M2 + const_export SILPHCO6F_SILPH_WORKER_F1 + const_export SILPHCO6F_SILPH_WORKER_F2 + const_export SILPHCO6F_SILPH_WORKER_M3 + const_export SILPHCO6F_ROCKET1 + const_export SILPHCO6F_SCIENTIST + const_export SILPHCO6F_ROCKET2 + const_export SILPHCO6F_HP_UP + const_export SILPHCO6F_X_ACCURACY SilphCo6F_Object: db $2e ; border block diff --git a/data/maps/objects/SilphCo7F.asm b/data/maps/objects/SilphCo7F.asm index 2d5ed33c5..6f2ca90d1 100644 --- a/data/maps/objects/SilphCo7F.asm +++ b/data/maps/objects/SilphCo7F.asm @@ -1,15 +1,16 @@ object_const_def - const SILPHCO7F_SILPH_WORKER_M1 - const SILPHCO7F_SILPH_WORKER_M2 - const SILPHCO7F_SILPH_WORKER_M3 - const SILPHCO7F_SILPH_WORKER_M4 - const SILPHCO7F_ROCKET1 - const SILPHCO7F_SCIENTIST - const SILPHCO7F_ROCKET2 - const SILPHCO7F_ROCKET3 - const SILPHCO7F_RIVAL - const SILPHCO7F_CALCIUM - const SILPHCO7F_TM_SWORDS_DANCE + const_export SILPHCO7F_SILPH_WORKER_M1 + const_export SILPHCO7F_SILPH_WORKER_M2 + const_export SILPHCO7F_SILPH_WORKER_M3 + const_export SILPHCO7F_SILPH_WORKER_M4 + const_export SILPHCO7F_ROCKET1 + const_export SILPHCO7F_SCIENTIST + const_export SILPHCO7F_ROCKET2 + const_export SILPHCO7F_ROCKET3 + const_export SILPHCO7F_RIVAL + const_export SILPHCO7F_CALCIUM + const_export SILPHCO7F_TM_SWORDS_DANCE + const_export SILPHCO7F_UNUSED ; referenced in data/maps/hide_show_data.asm, no corresponding object_event SilphCo7F_Object: db $2e ; border block diff --git a/data/maps/objects/SilphCo8F.asm b/data/maps/objects/SilphCo8F.asm index 7f0bbc784..46450b5b5 100644 --- a/data/maps/objects/SilphCo8F.asm +++ b/data/maps/objects/SilphCo8F.asm @@ -1,8 +1,8 @@ object_const_def - const SILPHCO8F_SILPH_WORKER_M - const SILPHCO8F_ROCKET1 - const SILPHCO8F_SCIENTIST - const SILPHCO8F_ROCKET2 + const_export SILPHCO8F_SILPH_WORKER_M + const_export SILPHCO8F_ROCKET1 + const_export SILPHCO8F_SCIENTIST + const_export SILPHCO8F_ROCKET2 SilphCo8F_Object: db $2e ; border block diff --git a/data/maps/objects/SilphCo9F.asm b/data/maps/objects/SilphCo9F.asm index 59cb2c5bc..36a4998db 100644 --- a/data/maps/objects/SilphCo9F.asm +++ b/data/maps/objects/SilphCo9F.asm @@ -1,8 +1,8 @@ object_const_def - const SILPHCO9F_NURSE - const SILPHCO9F_ROCKET1 - const SILPHCO9F_SCIENTIST - const SILPHCO9F_ROCKET2 + const_export SILPHCO9F_NURSE + const_export SILPHCO9F_ROCKET1 + const_export SILPHCO9F_SCIENTIST + const_export SILPHCO9F_ROCKET2 SilphCo9F_Object: db $2e ; border block diff --git a/data/maps/objects/TradeCenter.asm b/data/maps/objects/TradeCenter.asm index edc3e0b54..74613f9af 100644 --- a/data/maps/objects/TradeCenter.asm +++ b/data/maps/objects/TradeCenter.asm @@ -1,5 +1,5 @@ object_const_def - const TRADECENTER_OPPONENT + const_export TRADECENTER_OPPONENT TradeCenter_Object: db $e ; border block diff --git a/data/maps/objects/UndergroundPathRoute5.asm b/data/maps/objects/UndergroundPathRoute5.asm index 56402b41b..250607cf6 100644 --- a/data/maps/objects/UndergroundPathRoute5.asm +++ b/data/maps/objects/UndergroundPathRoute5.asm @@ -1,5 +1,5 @@ object_const_def - const UNDERGROUNDPATHROUTE5_LITTLE_GIRL + const_export UNDERGROUNDPATHROUTE5_LITTLE_GIRL UndergroundPathRoute5_Object: db $a ; border block diff --git a/data/maps/objects/UndergroundPathRoute6.asm b/data/maps/objects/UndergroundPathRoute6.asm index a1ac3acf0..c9d7b6da6 100644 --- a/data/maps/objects/UndergroundPathRoute6.asm +++ b/data/maps/objects/UndergroundPathRoute6.asm @@ -1,5 +1,5 @@ object_const_def - const UNDERGROUNDPATHROUTE6_GIRL + const_export UNDERGROUNDPATHROUTE6_GIRL UndergroundPathRoute6_Object: db $a ; border block diff --git a/data/maps/objects/UndergroundPathRoute7.asm b/data/maps/objects/UndergroundPathRoute7.asm index d7772f6cd..aad976d39 100644 --- a/data/maps/objects/UndergroundPathRoute7.asm +++ b/data/maps/objects/UndergroundPathRoute7.asm @@ -1,5 +1,5 @@ object_const_def - const UNDERGROUNDPATHROUTE7_MIDDLE_AGED_MAN + const_export UNDERGROUNDPATHROUTE7_MIDDLE_AGED_MAN UndergroundPathRoute7_Object: db $a ; border block diff --git a/data/maps/objects/UndergroundPathRoute7Copy.asm b/data/maps/objects/UndergroundPathRoute7Copy.asm index 9c3841cb3..8e2c70e09 100644 --- a/data/maps/objects/UndergroundPathRoute7Copy.asm +++ b/data/maps/objects/UndergroundPathRoute7Copy.asm @@ -1,6 +1,6 @@ object_const_def - const UNDERGROUNDPATHROUTE7COPY_UNUSED_GIRL - const UNDERGROUNDPATHROUTE7COPY_UNUSED_MIDDLE_AGED_MAN + const_export UNDERGROUNDPATHROUTE7COPY_UNUSED_GIRL + const_export UNDERGROUNDPATHROUTE7COPY_UNUSED_MIDDLE_AGED_MAN UndergroundPathRoute7Copy_Object: db $a ; border block diff --git a/data/maps/objects/UndergroundPathRoute8.asm b/data/maps/objects/UndergroundPathRoute8.asm index 751690f43..e7bd2891e 100644 --- a/data/maps/objects/UndergroundPathRoute8.asm +++ b/data/maps/objects/UndergroundPathRoute8.asm @@ -1,5 +1,5 @@ object_const_def - const UNDERGROUNDPATHROUTE8_GIRL + const_export UNDERGROUNDPATHROUTE8_GIRL UndergroundPathRoute8_Object: db $a ; border block diff --git a/data/maps/objects/VermilionCity.asm b/data/maps/objects/VermilionCity.asm index 1146d2b88..eeeded0c4 100644 --- a/data/maps/objects/VermilionCity.asm +++ b/data/maps/objects/VermilionCity.asm @@ -1,10 +1,10 @@ object_const_def - const VERMILIONCITY_BEAUTY - const VERMILIONCITY_GAMBLER1 - const VERMILIONCITY_SAILOR1 - const VERMILIONCITY_GAMBLER2 - const VERMILIONCITY_MACHOP - const VERMILIONCITY_SAILOR2 + const_export VERMILIONCITY_BEAUTY + const_export VERMILIONCITY_GAMBLER1 + const_export VERMILIONCITY_SAILOR1 + const_export VERMILIONCITY_GAMBLER2 + const_export VERMILIONCITY_MACHOP + const_export VERMILIONCITY_SAILOR2 VermilionCity_Object: db $43 ; border block diff --git a/data/maps/objects/VermilionGym.asm b/data/maps/objects/VermilionGym.asm index 0defc08f8..5e45d0d5d 100644 --- a/data/maps/objects/VermilionGym.asm +++ b/data/maps/objects/VermilionGym.asm @@ -1,9 +1,9 @@ object_const_def - const VERMILIONGYM_LT_SURGE - const VERMILIONGYM_GENTLEMAN - const VERMILIONGYM_SUPER_NERD - const VERMILIONGYM_SAILOR - const VERMILIONGYM_GYM_GUIDE + const_export VERMILIONGYM_LT_SURGE + const_export VERMILIONGYM_GENTLEMAN + const_export VERMILIONGYM_SUPER_NERD + const_export VERMILIONGYM_SAILOR + const_export VERMILIONGYM_GYM_GUIDE VermilionGym_Object: db $3 ; border block diff --git a/data/maps/objects/VermilionMart.asm b/data/maps/objects/VermilionMart.asm index 7cab5e7a2..465f38d74 100644 --- a/data/maps/objects/VermilionMart.asm +++ b/data/maps/objects/VermilionMart.asm @@ -1,7 +1,7 @@ object_const_def - const VERMILIONMART_CLERK - const VERMILIONMART_COOLTRAINER_M - const VERMILIONMART_COOLTRAINER_F + const_export VERMILIONMART_CLERK + const_export VERMILIONMART_COOLTRAINER_M + const_export VERMILIONMART_COOLTRAINER_F VermilionMart_Object: db $0 ; border block diff --git a/data/maps/objects/VermilionOldRodHouse.asm b/data/maps/objects/VermilionOldRodHouse.asm index 3efb3956f..b84f531f1 100644 --- a/data/maps/objects/VermilionOldRodHouse.asm +++ b/data/maps/objects/VermilionOldRodHouse.asm @@ -1,5 +1,5 @@ object_const_def - const VERMILIONOLDRODHOUSE_FISHING_GURU + const_export VERMILIONOLDRODHOUSE_FISHING_GURU VermilionOldRodHouse_Object: db $a ; border block diff --git a/data/maps/objects/VermilionPidgeyHouse.asm b/data/maps/objects/VermilionPidgeyHouse.asm index 6ffd90642..9b56c5672 100644 --- a/data/maps/objects/VermilionPidgeyHouse.asm +++ b/data/maps/objects/VermilionPidgeyHouse.asm @@ -1,7 +1,7 @@ object_const_def - const VERMILIONPIDGEYHOUSE_YOUNGSTER - const VERMILIONPIDGEYHOUSE_PIDGEY - const VERMILIONPIDGEYHOUSE_LETTER + const_export VERMILIONPIDGEYHOUSE_YOUNGSTER + const_export VERMILIONPIDGEYHOUSE_PIDGEY + const_export VERMILIONPIDGEYHOUSE_LETTER VermilionPidgeyHouse_Object: db $a ; border block diff --git a/data/maps/objects/VermilionPokecenter.asm b/data/maps/objects/VermilionPokecenter.asm index 5793aae08..441ffbb89 100644 --- a/data/maps/objects/VermilionPokecenter.asm +++ b/data/maps/objects/VermilionPokecenter.asm @@ -1,8 +1,8 @@ object_const_def - const VERMILIONPOKECENTER_NURSE - const VERMILIONPOKECENTER_FISHING_GURU - const VERMILIONPOKECENTER_SAILOR - const VERMILIONPOKECENTER_LINK_RECEPTIONIST + const_export VERMILIONPOKECENTER_NURSE + const_export VERMILIONPOKECENTER_FISHING_GURU + const_export VERMILIONPOKECENTER_SAILOR + const_export VERMILIONPOKECENTER_LINK_RECEPTIONIST VermilionPokecenter_Object: db $0 ; border block diff --git a/data/maps/objects/VermilionTradeHouse.asm b/data/maps/objects/VermilionTradeHouse.asm index 3d83357c6..9740dbcb2 100644 --- a/data/maps/objects/VermilionTradeHouse.asm +++ b/data/maps/objects/VermilionTradeHouse.asm @@ -1,5 +1,5 @@ object_const_def - const VERMILIONTRADEHOUSE_LITTLE_GIRL + const_export VERMILIONTRADEHOUSE_LITTLE_GIRL VermilionTradeHouse_Object: db $a ; border block diff --git a/data/maps/objects/VictoryRoad1F.asm b/data/maps/objects/VictoryRoad1F.asm index 40295c811..267ae00a6 100644 --- a/data/maps/objects/VictoryRoad1F.asm +++ b/data/maps/objects/VictoryRoad1F.asm @@ -1,11 +1,11 @@ object_const_def - const VICTORYROAD1F_COOLTRAINER_F - const VICTORYROAD1F_COOLTRAINER_M - const VICTORYROAD1F_TM_SKY_ATTACK - const VICTORYROAD1F_RARE_CANDY - const VICTORYROAD1F_BOULDER1 - const VICTORYROAD1F_BOULDER2 - const VICTORYROAD1F_BOULDER3 + const_export VICTORYROAD1F_COOLTRAINER_F + const_export VICTORYROAD1F_COOLTRAINER_M + const_export VICTORYROAD1F_TM_SKY_ATTACK + const_export VICTORYROAD1F_RARE_CANDY + const_export VICTORYROAD1F_BOULDER1 + const_export VICTORYROAD1F_BOULDER2 + const_export VICTORYROAD1F_BOULDER3 VictoryRoad1F_Object: db $7d ; border block diff --git a/data/maps/objects/VictoryRoad2F.asm b/data/maps/objects/VictoryRoad2F.asm index 09fc44589..c4de36839 100644 --- a/data/maps/objects/VictoryRoad2F.asm +++ b/data/maps/objects/VictoryRoad2F.asm @@ -1,17 +1,17 @@ object_const_def - const VICTORYROAD2F_HIKER - const VICTORYROAD2F_SUPER_NERD1 - const VICTORYROAD2F_COOLTRAINER_M - const VICTORYROAD2F_SUPER_NERD2 - const VICTORYROAD2F_SUPER_NERD3 - const VICTORYROAD2F_MOLTRES - const VICTORYROAD2F_TM_SUBMISSION - const VICTORYROAD2F_FULL_HEAL - const VICTORYROAD2F_TM_MEGA_KICK - const VICTORYROAD2F_GUARD_SPEC - const VICTORYROAD2F_BOULDER1 - const VICTORYROAD2F_BOULDER2 - const VICTORYROAD2F_BOULDER3 + const_export VICTORYROAD2F_HIKER + const_export VICTORYROAD2F_SUPER_NERD1 + const_export VICTORYROAD2F_COOLTRAINER_M + const_export VICTORYROAD2F_SUPER_NERD2 + const_export VICTORYROAD2F_SUPER_NERD3 + const_export VICTORYROAD2F_MOLTRES + const_export VICTORYROAD2F_TM_SUBMISSION + const_export VICTORYROAD2F_FULL_HEAL + const_export VICTORYROAD2F_TM_MEGA_KICK + const_export VICTORYROAD2F_GUARD_SPEC + const_export VICTORYROAD2F_BOULDER1 + const_export VICTORYROAD2F_BOULDER2 + const_export VICTORYROAD2F_BOULDER3 VictoryRoad2F_Object: db $7d ; border block diff --git a/data/maps/objects/VictoryRoad3F.asm b/data/maps/objects/VictoryRoad3F.asm index ad6b4df10..d56f9d65f 100644 --- a/data/maps/objects/VictoryRoad3F.asm +++ b/data/maps/objects/VictoryRoad3F.asm @@ -1,14 +1,14 @@ object_const_def - const VICTORYROAD3F_COOLTRAINER_M1 - const VICTORYROAD3F_COOLTRAINER_F1 - const VICTORYROAD3F_COOLTRAINER_M2 - const VICTORYROAD3F_COOLTRAINER_F2 - const VICTORYROAD3F_MAX_REVIVE - const VICTORYROAD3F_TM_EXPLOSION - const VICTORYROAD3F_BOULDER1 - const VICTORYROAD3F_BOULDER2 - const VICTORYROAD3F_BOULDER3 - const VICTORYROAD3F_BOULDER4 + const_export VICTORYROAD3F_COOLTRAINER_M1 + const_export VICTORYROAD3F_COOLTRAINER_F1 + const_export VICTORYROAD3F_COOLTRAINER_M2 + const_export VICTORYROAD3F_COOLTRAINER_F2 + const_export VICTORYROAD3F_MAX_REVIVE + const_export VICTORYROAD3F_TM_EXPLOSION + const_export VICTORYROAD3F_BOULDER1 + const_export VICTORYROAD3F_BOULDER2 + const_export VICTORYROAD3F_BOULDER3 + const_export VICTORYROAD3F_BOULDER4 VictoryRoad3F_Object: db $7d ; border block diff --git a/data/maps/objects/ViridianCity.asm b/data/maps/objects/ViridianCity.asm index b3a64f364..854a27880 100644 --- a/data/maps/objects/ViridianCity.asm +++ b/data/maps/objects/ViridianCity.asm @@ -1,11 +1,11 @@ object_const_def - const VIRIDIANCITY_YOUNGSTER1 - const VIRIDIANCITY_GAMBLER1 - const VIRIDIANCITY_YOUNGSTER2 - const VIRIDIANCITY_GIRL - const VIRIDIANCITY_OLD_MAN_SLEEPY - const VIRIDIANCITY_FISHER - const VIRIDIANCITY_OLD_MAN + const_export VIRIDIANCITY_YOUNGSTER1 + const_export VIRIDIANCITY_GAMBLER1 + const_export VIRIDIANCITY_YOUNGSTER2 + const_export VIRIDIANCITY_GIRL + const_export VIRIDIANCITY_OLD_MAN_SLEEPY + const_export VIRIDIANCITY_FISHER + const_export VIRIDIANCITY_OLD_MAN ViridianCity_Object: db $f ; border block diff --git a/data/maps/objects/ViridianForest.asm b/data/maps/objects/ViridianForest.asm index ca3fc30bc..5002a3156 100644 --- a/data/maps/objects/ViridianForest.asm +++ b/data/maps/objects/ViridianForest.asm @@ -1,12 +1,12 @@ object_const_def - const VIRIDIANFOREST_YOUNGSTER1 - const VIRIDIANFOREST_YOUNGSTER2 - const VIRIDIANFOREST_YOUNGSTER3 - const VIRIDIANFOREST_YOUNGSTER4 - const VIRIDIANFOREST_ANTIDOTE - const VIRIDIANFOREST_POTION - const VIRIDIANFOREST_POKE_BALL - const VIRIDIANFOREST_YOUNGSTER5 + const_export VIRIDIANFOREST_YOUNGSTER1 + const_export VIRIDIANFOREST_YOUNGSTER2 + const_export VIRIDIANFOREST_YOUNGSTER3 + const_export VIRIDIANFOREST_YOUNGSTER4 + const_export VIRIDIANFOREST_ANTIDOTE + const_export VIRIDIANFOREST_POTION + const_export VIRIDIANFOREST_POKE_BALL + const_export VIRIDIANFOREST_YOUNGSTER5 ViridianForest_Object: db $3 ; border block diff --git a/data/maps/objects/ViridianForestNorthGate.asm b/data/maps/objects/ViridianForestNorthGate.asm index bd804359c..ad4b9babb 100644 --- a/data/maps/objects/ViridianForestNorthGate.asm +++ b/data/maps/objects/ViridianForestNorthGate.asm @@ -1,6 +1,6 @@ object_const_def - const VIRIDIANFORESTNORTHGATE_SUPER_NERD - const VIRIDIANFORESTNORTHGATE_GRAMPS + const_export VIRIDIANFORESTNORTHGATE_SUPER_NERD + const_export VIRIDIANFORESTNORTHGATE_GRAMPS ViridianForestNorthGate_Object: db $a ; border block diff --git a/data/maps/objects/ViridianForestSouthGate.asm b/data/maps/objects/ViridianForestSouthGate.asm index 15ada6fff..dd7f2a267 100644 --- a/data/maps/objects/ViridianForestSouthGate.asm +++ b/data/maps/objects/ViridianForestSouthGate.asm @@ -1,6 +1,6 @@ object_const_def - const VIRIDIANFORESTSOUTHGATE_GIRL - const VIRIDIANFORESTSOUTHGATE_LITTLE_GIRL + const_export VIRIDIANFORESTSOUTHGATE_GIRL + const_export VIRIDIANFORESTSOUTHGATE_LITTLE_GIRL ViridianForestSouthGate_Object: db $a ; border block diff --git a/data/maps/objects/ViridianGym.asm b/data/maps/objects/ViridianGym.asm index d58736dab..87d2ef901 100644 --- a/data/maps/objects/ViridianGym.asm +++ b/data/maps/objects/ViridianGym.asm @@ -1,15 +1,15 @@ object_const_def - const VIRIDIANGYM_GIOVANNI - const VIRIDIANGYM_COOLTRAINER_M1 - const VIRIDIANGYM_HIKER1 - const VIRIDIANGYM_ROCKER1 - const VIRIDIANGYM_HIKER2 - const VIRIDIANGYM_COOLTRAINER_M2 - const VIRIDIANGYM_HIKER3 - const VIRIDIANGYM_ROCKER2 - const VIRIDIANGYM_COOLTRAINER_M3 - const VIRIDIANGYM_GYM_GUIDE - const VIRIDIANGYM_REVIVE + const_export VIRIDIANGYM_GIOVANNI + const_export VIRIDIANGYM_COOLTRAINER_M1 + const_export VIRIDIANGYM_HIKER1 + const_export VIRIDIANGYM_ROCKER1 + const_export VIRIDIANGYM_HIKER2 + const_export VIRIDIANGYM_COOLTRAINER_M2 + const_export VIRIDIANGYM_HIKER3 + const_export VIRIDIANGYM_ROCKER2 + const_export VIRIDIANGYM_COOLTRAINER_M3 + const_export VIRIDIANGYM_GYM_GUIDE + const_export VIRIDIANGYM_REVIVE ViridianGym_Object: db $3 ; border block diff --git a/data/maps/objects/ViridianMart.asm b/data/maps/objects/ViridianMart.asm index 05d8048ed..6107eff79 100644 --- a/data/maps/objects/ViridianMart.asm +++ b/data/maps/objects/ViridianMart.asm @@ -1,7 +1,7 @@ object_const_def - const VIRIDIANMART_CLERK - const VIRIDIANMART_YOUNGSTER - const VIRIDIANMART_COOLTRAINER_M + const_export VIRIDIANMART_CLERK + const_export VIRIDIANMART_YOUNGSTER + const_export VIRIDIANMART_COOLTRAINER_M ViridianMart_Object: db $0 ; border block diff --git a/data/maps/objects/ViridianNicknameHouse.asm b/data/maps/objects/ViridianNicknameHouse.asm index 29e1873c4..3021c8496 100644 --- a/data/maps/objects/ViridianNicknameHouse.asm +++ b/data/maps/objects/ViridianNicknameHouse.asm @@ -1,8 +1,8 @@ object_const_def - const VIRIDIANNICKNAMEHOUSE_BALDING_GUY - const VIRIDIANNICKNAMEHOUSE_LITTLE_GIRL - const VIRIDIANNICKNAMEHOUSE_SPEAROW - const VIRIDIANNICKNAMEHOUSE_SPEARY_SIGN + const_export VIRIDIANNICKNAMEHOUSE_BALDING_GUY + const_export VIRIDIANNICKNAMEHOUSE_LITTLE_GIRL + const_export VIRIDIANNICKNAMEHOUSE_SPEAROW + const_export VIRIDIANNICKNAMEHOUSE_SPEARY_SIGN ViridianNicknameHouse_Object: db $a ; border block diff --git a/data/maps/objects/ViridianPokecenter.asm b/data/maps/objects/ViridianPokecenter.asm index e4b564fa7..44eb2ecef 100644 --- a/data/maps/objects/ViridianPokecenter.asm +++ b/data/maps/objects/ViridianPokecenter.asm @@ -1,8 +1,8 @@ object_const_def - const VIRIDIANPOKECENTER_NURSE - const VIRIDIANPOKECENTER_GENTLEMAN - const VIRIDIANPOKECENTER_COOLTRAINER_M - const VIRIDIANPOKECENTER_LINK_RECEPTIONIST + const_export VIRIDIANPOKECENTER_NURSE + const_export VIRIDIANPOKECENTER_GENTLEMAN + const_export VIRIDIANPOKECENTER_COOLTRAINER_M + const_export VIRIDIANPOKECENTER_LINK_RECEPTIONIST ViridianPokecenter_Object: db $0 ; border block diff --git a/data/maps/objects/ViridianSchoolHouse.asm b/data/maps/objects/ViridianSchoolHouse.asm index a389cb9d5..7e1c38602 100644 --- a/data/maps/objects/ViridianSchoolHouse.asm +++ b/data/maps/objects/ViridianSchoolHouse.asm @@ -1,6 +1,6 @@ object_const_def - const VIRIDIANSCHOOLHOUSE_BRUNETTE_GIRL - const VIRIDIANSCHOOLHOUSE_COOLTRAINER_F + const_export VIRIDIANSCHOOLHOUSE_BRUNETTE_GIRL + const_export VIRIDIANSCHOOLHOUSE_COOLTRAINER_F ViridianSchoolHouse_Object: db $a ; border block diff --git a/data/maps/objects/WardensHouse.asm b/data/maps/objects/WardensHouse.asm index 40aee76dc..a4b1181bd 100644 --- a/data/maps/objects/WardensHouse.asm +++ b/data/maps/objects/WardensHouse.asm @@ -1,7 +1,7 @@ object_const_def - const WARDENSHOUSE_WARDEN - const WARDENSHOUSE_RARE_CANDY - const WARDENSHOUSE_BOULDER + const_export WARDENSHOUSE_WARDEN + const_export WARDENSHOUSE_RARE_CANDY + const_export WARDENSHOUSE_BOULDER WardensHouse_Object: db $17 ; border block diff --git a/macros/const.asm b/macros/const.asm index e0a84404b..fa2f07532 100644 --- a/macros/const.asm +++ b/macros/const.asm @@ -18,6 +18,11 @@ MACRO const DEF const_value += const_inc ENDM +MACRO const_export + const \1 + EXPORT \1 +ENDM + MACRO shift_const DEF \1 EQU 1 << const_value DEF const_value += const_inc From 83b373ad734fb0bf4b476b0f38dbeec8ea205f19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20Unneb=C3=A4ck?= Date: Fri, 17 Nov 2023 19:50:27 +0100 Subject: [PATCH 21/53] Add constants for wMapConnections bits and group map header wram labels * Add constants for wMapConnections bits * Apply Vulcandth and Rangi42 feedback --------- Co-authored-by: vulcandth --- constants/map_data_constants.asm | 7 +++++++ engine/menus/save.asm | 2 +- home/overworld.asm | 21 ++++++++++----------- home/predef_text.asm | 10 +++++----- home/text_script.asm | 2 +- ram/wram.asm | 15 +++++++-------- scripts/OaksLab.asm | 4 ++-- scripts/ViridianMart.asm | 4 ++-- 8 files changed, 35 insertions(+), 30 deletions(-) diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index 1877e6a08..b28b3d797 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -3,6 +3,13 @@ DEF MAP_BORDER EQU 3 ; connection directions + const_def + const EAST_F + const WEST_F + const SOUTH_F + const NORTH_F + +; wCurMapConnections const_def shift_const EAST ; 1 shift_const WEST ; 2 diff --git a/engine/menus/save.asm b/engine/menus/save.asm index b74b90587..1857d6f50 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -372,7 +372,7 @@ ChangeBox:: call GetBoxSRAMLocation ld de, wBoxDataStart call CopyBoxToOrFromSRAM ; copy new box from SRAM to WRAM - ld hl, wMapTextPtr + ld hl, wCurMapTextPtr ld de, wChangeBoxSavedMapTextPointer ld a, [hli] ld [de], a diff --git a/home/overworld.asm b/home/overworld.asm index 1ebc794b9..defa17281 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -910,9 +910,9 @@ LoadTileBlockMap:: add hl, bc ld c, MAP_BORDER add hl, bc ; this puts us past the (west) border - ld a, [wMapDataPtr] ; tile map pointer + ld a, [wCurMapDataPtr] ; tile map pointer ld e, a - ld a, [wMapDataPtr + 1] + ld a, [wCurMapDataPtr + 1] ld d, a ; de = tile map pointer ld a, [wCurMapHeight] ld b, a @@ -1966,7 +1966,7 @@ RunMapScript:: call RunNPCMovementScript ld a, [wCurMap] ; current map number call SwitchToMapRomBank ; change to the ROM bank the map's data is in - ld hl, wMapScriptPtr + ld hl, wCurMapScriptPtr ld a, [hli] ld h, [hl] ld l, a @@ -2035,9 +2035,8 @@ LoadMapHeader:: ld a, [hli] ld h, [hl] ld l, a ; hl = base of map header -; copy the first 10 bytes (the fixed area) of the map data to D367-D370 - ld de, wCurMapTileset - ld c, $0a + ld de, wCurMapHeader + ld c, wCurMapHeaderEnd - wCurMapHeader .copyFixedHeaderLoop ld a, [hli] ld [de], a @@ -2051,25 +2050,25 @@ LoadMapHeader:: ld [wWestConnectedMap], a ld [wEastConnectedMap], a ; copy connection data (if any) to WRAM - ld a, [wMapConnections] + ld a, [wCurMapConnections] ld b, a .checkNorth - bit 3, b + bit NORTH_F, b jr z, .checkSouth ld de, wNorthConnectionHeader call CopyMapConnectionHeader .checkSouth - bit 2, b + bit SOUTH_F, b jr z, .checkWest ld de, wSouthConnectionHeader call CopyMapConnectionHeader .checkWest - bit 1, b + bit WEST_F, b jr z, .checkEast ld de, wWestConnectionHeader call CopyMapConnectionHeader .checkEast - bit 0, b + bit EAST_F, b jr z, .getObjectDataPointer ld de, wEastConnectionHeader call CopyMapConnectionHeader diff --git a/home/predef_text.asm b/home/predef_text.asm index b494a2c87..1537ad5b7 100644 --- a/home/predef_text.asm +++ b/home/predef_text.asm @@ -7,7 +7,7 @@ PrintPredefTextID:: call DisplayTextID RestoreMapTextPointer:: - ld hl, wMapTextPtr + ld hl, wCurMapTextPtr ldh a, [hSavedMapTextPtr] ld [hli], a ldh a, [hSavedMapTextPtr + 1] @@ -15,14 +15,14 @@ RestoreMapTextPointer:: ret SetMapTextPointer:: - ld a, [wMapTextPtr] + ld a, [wCurMapTextPtr] ldh [hSavedMapTextPtr], a - ld a, [wMapTextPtr + 1] + ld a, [wCurMapTextPtr + 1] ldh [hSavedMapTextPtr + 1], a ld a, l - ld [wMapTextPtr], a + ld [wCurMapTextPtr], a ld a, h - ld [wMapTextPtr + 1], a + ld [wCurMapTextPtr + 1], a ret INCLUDE "data/text_predef_pointers.asm" diff --git a/home/text_script.asm b/home/text_script.asm index 9e1ba275f..ceae1a0a1 100644 --- a/home/text_script.asm +++ b/home/text_script.asm @@ -13,7 +13,7 @@ DisplayTextID:: .skipSwitchToMapBank ld a, 30 ; half a second ldh [hFrameCounter], a ; used as joypad poll timer - ld hl, wMapTextPtr + ld hl, wCurMapTextPtr ld a, [hli] ld h, [hl] ld l, a ; hl = map text pointer diff --git a/ram/wram.asm b/ram/wram.asm index df2866764..753a96782 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -1795,17 +1795,16 @@ wLastMap:: db wUnusedD366:: db +wCurMapHeader:: wCurMapTileset:: db - -; blocks -wCurMapHeight:: db +wCurMapHeight:: db wCurMapWidth:: db +wCurMapDataPtr:: dw +wCurMapTextPtr:: dw +wCurMapScriptPtr:: dw +wCurMapConnections:: db +wCurMapHeaderEnd:: -wMapDataPtr:: dw -wMapTextPtr:: dw -wMapScriptPtr:: dw - -wMapConnections:: db wNorthConnectionHeader:: map_connection_struct wNorth wSouthConnectionHeader:: map_connection_struct wSouth wWestConnectionHeader:: map_connection_struct wWest diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm index 407ee3e51..30ee93ed6 100644 --- a/scripts/OaksLab.asm +++ b/scripts/OaksLab.asm @@ -715,9 +715,9 @@ OaksLabCalcRivalMovementScript: OaksLabLoadTextPointers2Script: ld hl, OaksLab_TextPointers2 ld a, l - ld [wMapTextPtr], a + ld [wCurMapTextPtr], a ld a, h - ld [wMapTextPtr + 1], a + ld [wCurMapTextPtr + 1], a ret OaksLab_TextPointers: diff --git a/scripts/ViridianMart.asm b/scripts/ViridianMart.asm index 2e78a0368..8f91afd6d 100644 --- a/scripts/ViridianMart.asm +++ b/scripts/ViridianMart.asm @@ -14,9 +14,9 @@ ViridianMartCheckParcelDeliveredScript: ld hl, ViridianMart_TextPointers2 .done ld a, l - ld [wMapTextPtr], a + ld [wCurMapTextPtr], a ld a, h - ld [wMapTextPtr+1], a + ld [wCurMapTextPtr+1], a ret ViridianMart_ScriptPointers: From 141502ac446524a558664225ebaa79278e9309c0 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Fri, 17 Nov 2023 21:32:47 -0500 Subject: [PATCH 22/53] Replaced decomp list with pret.github.io link * Added newer decomp projects to readme * Lowercase pret * Replaced decomp list with pret.github.io link * Align readme with pokecrystal --------- Co-authored-by: vulcandth --- README.md | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 706ab86cd..d522f2db1 100644 --- a/README.md +++ b/README.md @@ -17,32 +17,13 @@ To set up the repository, see [**INSTALL.md**](INSTALL.md). - [**Wiki**][wiki] (includes [tutorials][tutorials]) - [**Symbols**][symbols] -- **Discord:** [pret][discord] -- **IRC:** [libera#pret][irc] - -Other disassembly projects: - -- [**Pokémon Yellow**][pokeyellow] -- [**Pokémon Gold/Silver**][pokegold] -- [**Pokémon Crystal**][pokecrystal] -- [**Pokémon Pinball**][pokepinball] -- [**Pokémon TCG**][poketcg] -- [**Pokémon Ruby**][pokeruby] -- [**Pokémon FireRed**][pokefirered] -- [**Pokémon Emerald**][pokeemerald] - -[pokeyellow]: https://github.com/pret/pokeyellow -[pokegold]: https://github.com/pret/pokegold -[pokecrystal]: https://github.com/pret/pokecrystal -[pokepinball]: https://github.com/pret/pokepinball -[poketcg]: https://github.com/pret/poketcg -[pokeruby]: https://github.com/pret/pokeruby -[pokefirered]: https://github.com/pret/pokefirered -[pokeemerald]: https://github.com/pret/pokeemerald + +You can find us on [Discord (pret, #pokered)](https://discord.gg/d5dubZ3). + +For other pret projects, see [pret.github.io](https://pret.github.io/). + [wiki]: https://github.com/pret/pokered/wiki [tutorials]: https://github.com/pret/pokered/wiki/Tutorials [symbols]: https://github.com/pret/pokered/tree/symbols -[discord]: https://discord.gg/d5dubZ3 -[irc]: https://web.libera.chat/?#pret [ci]: https://github.com/pret/pokered/actions [ci-badge]: https://github.com/pret/pokered/actions/workflows/main.yml/badge.svg From da382ed9f4a8c34b78a831f07b82dbd7749da2b5 Mon Sep 17 00:00:00 2001 From: vulcandth Date: Fri, 17 Nov 2023 22:08:15 -0600 Subject: [PATCH 23/53] Move charmap.asm to constants/ --- charmap.asm => constants/charmap.asm | 0 includes.asm | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) rename charmap.asm => constants/charmap.asm (100%) diff --git a/charmap.asm b/constants/charmap.asm similarity index 100% rename from charmap.asm rename to constants/charmap.asm diff --git a/includes.asm b/includes.asm index 29acbc6c9..271828b95 100644 --- a/includes.asm +++ b/includes.asm @@ -1,5 +1,3 @@ -INCLUDE "charmap.asm" - INCLUDE "macros/asserts.asm" INCLUDE "macros/const.asm" INCLUDE "macros/predef.asm" @@ -15,6 +13,7 @@ INCLUDE "macros/scripts/maps.asm" INCLUDE "macros/scripts/events.asm" INCLUDE "macros/scripts/text.asm" +INCLUDE "constants/charmap.asm" INCLUDE "constants/hardware_constants.asm" INCLUDE "constants/oam_constants.asm" INCLUDE "constants/misc_constants.asm" From 64061e2092a47095f4ad6a8c2ac35f38db4bc107 Mon Sep 17 00:00:00 2001 From: vulcandth Date: Fri, 17 Nov 2023 22:36:21 -0600 Subject: [PATCH 24/53] .calculateHPBarCoords incorrectly referenced OAM Resolves #411 Co-Authored-By: SnDream <12762219+sndream@users.noreply.github.com> --- engine/items/item_effects.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 466b14230..927f54cb0 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1175,7 +1175,7 @@ ItemUseMedicine: xor a ld [wBattleMonStatus], a ; remove the status ailment in the in-battle pokemon data .calculateHPBarCoords - ld hl, wShadowOAMSprite36 + hlcoord 4, -1 ld bc, 2 * SCREEN_WIDTH inc d .calculateHPBarCoordsLoop From 26a342b104e48bede16b9e2324c2f8f57df5bd50 Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Sat, 18 Nov 2023 19:44:03 -0500 Subject: [PATCH 25/53] Identify more map script labels --- engine/events/cinnabar_lab.asm | 24 ++++++++++++------------ scripts/CeladonMartElevator.asm | 22 +++++++++++----------- scripts/CeruleanBadgeHouse.asm | 10 +++++----- scripts/CeruleanCity.asm | 12 ++++++------ scripts/ChampionsRoom.asm | 12 ++++++------ scripts/CinnabarGym.asm | 6 +++--- scripts/FightingDojo.asm | 9 ++++----- scripts/GameCorner.asm | 24 ++++++++++++------------ scripts/HallOfFame.asm | 6 +++--- scripts/MtMoonB2F.asm | 8 ++++---- scripts/RocketHideoutB4F.asm | 8 ++++---- scripts/RocketHideoutElevator.asm | 14 +++++++------- scripts/Route16.asm | 10 +++++----- scripts/Route22.asm | 4 ++-- scripts/Route23.asm | 12 ++++++------ scripts/SilphCoElevator.asm | 14 +++++++------- text/CinnabarLabFossilRoom.asm | 8 ++++---- 17 files changed, 101 insertions(+), 102 deletions(-) diff --git a/engine/events/cinnabar_lab.asm b/engine/events/cinnabar_lab.asm index 547f782e0..545baf139 100644 --- a/engine/events/cinnabar_lab.asm +++ b/engine/events/cinnabar_lab.asm @@ -52,40 +52,40 @@ GiveFossilToCinnabarLab:: ld a, b ld [wFossilMon], a call LoadFossilItemAndMonName - ld hl, LabFossil_610ae + ld hl, .ScientistSeesFossilText call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a jr nz, .cancelledGivingFossil - ld hl, LabFossil_610b3 + ld hl, .ScientistTakesFossilText call PrintText ld a, [wFossilItem] ldh [hItemToRemoveID], a farcall RemoveItemByID - ld hl, LabFossil_610b8 + ld hl, .GoForAWalkText call PrintText SetEvents EVENT_GAVE_FOSSIL_TO_LAB, EVENT_LAB_STILL_REVIVING_FOSSIL ret .cancelledGivingFossil - ld hl, LabFossil_610bd + ld hl, .ComeAgainText call PrintText ret -LabFossil_610ae: - text_far _Lab4Text_610ae +.ScientistSeesFossilText: + text_far _CinnabarLabFossilRoomScientist1SeesFossilText text_end -LabFossil_610b3: - text_far _Lab4Text_610b3 +.ScientistTakesFossilText: + text_far _CinnabarLabFossilRoomScientist1TakesFossilText text_end -LabFossil_610b8: - text_far _Lab4Text_610b8 +.GoForAWalkText: + text_far _CinnabarLabFossilRoomScientist1GoForAWalkText2 text_end -LabFossil_610bd: - text_far _Lab4Text_610bd +.ComeAgainText: + text_far _CinnabarLabFossilRoomScientist1ComeAgainText text_end PrintFossilsInBag: diff --git a/scripts/CeladonMartElevator.asm b/scripts/CeladonMartElevator.asm index c13ecd73f..9a2842f32 100644 --- a/scripts/CeladonMartElevator.asm +++ b/scripts/CeladonMartElevator.asm @@ -3,26 +3,26 @@ CeladonMartElevator_Script: bit 5, [hl] res 5, [hl] push hl - call nz, CeladonMartElevatorScript_4861c + call nz, CeladonMartElevatorStoreWarpEntriesScript pop hl bit 7, [hl] res 7, [hl] - call nz, CeladonMartElevatorScript_48654 + call nz, CeladonMartElevatorShakeScript xor a ld [wAutoTextBoxDrawingControl], a inc a ld [wDoNotWaitForButtonPressAfterDisplayingText], a ret -CeladonMartElevatorScript_4861c: +CeladonMartElevatorStoreWarpEntriesScript: ld hl, wWarpEntries ld a, [wWarpedFromWhichWarp] ld b, a ld a, [wWarpedFromWhichMap] ld c, a - call CeladonMartElevatorScript_4862a - -CeladonMartElevatorScript_4862a: + call .StoreWarpEntry + ; fallthrough +.StoreWarpEntry: inc hl inc hl ld a, b @@ -31,12 +31,12 @@ CeladonMartElevatorScript_4862a: ld [hli], a ret -CeladonMartElevatorScript_48631: +CeladonMartElevatorCopyWarpMapsScript: ld hl, CeladonMartElevatorFloors call LoadItemList ld hl, CeladonMartElevatorWarpMaps ld de, wElevatorWarpMaps - ld bc, CeladonMartElevatorWarpMapsEnd - CeladonMartElevatorWarpMaps + ld bc, CeladonMartElevatorWarpMaps.End - CeladonMartElevatorWarpMaps jp CopyData CeladonMartElevatorFloors: @@ -56,9 +56,9 @@ CeladonMartElevatorWarpMaps: db 2, CELADON_MART_3F db 2, CELADON_MART_4F db 2, CELADON_MART_5F -CeladonMartElevatorWarpMapsEnd: +.End: -CeladonMartElevatorScript_48654: +CeladonMartElevatorShakeScript: farjp ShakeElevator CeladonMartElevator_TextPointers: @@ -67,7 +67,7 @@ CeladonMartElevator_TextPointers: CeladonMartElevatorText: text_asm - call CeladonMartElevatorScript_48631 + call CeladonMartElevatorCopyWarpMapsScript ld hl, CeladonMartElevatorWarpMaps predef DisplayElevatorFloorMenu jp TextScriptEnd diff --git a/scripts/CeruleanBadgeHouse.asm b/scripts/CeruleanBadgeHouse.asm index de457ab80..417198e1f 100644 --- a/scripts/CeruleanBadgeHouse.asm +++ b/scripts/CeruleanBadgeHouse.asm @@ -16,7 +16,7 @@ CeruleanBadgeHouseMiddleAgedManText: xor a ld [wCurrentMenuItem], a ld [wListScrollOffset], a -.asm_74e23 +.loop ld hl, .WhichBadgeText call PrintText ld hl, .BadgeItemList @@ -32,7 +32,7 @@ CeruleanBadgeHouseMiddleAgedManText: ld a, SPECIALLISTMENU ld [wListMenuID], a call DisplayListMenuID - jr c, .asm_74e60 + jr c, .done ld hl, CeruleanBadgeHouseBadgeTextPointers ld a, [wcf91] sub BOULDERBADGE @@ -44,8 +44,8 @@ CeruleanBadgeHouseMiddleAgedManText: ld h, [hl] ld l, a call PrintText - jr .asm_74e23 -.asm_74e60 + jr .loop +.done xor a ld [wListScrollOffset], a ld hl, .VisitAnyTimeText @@ -54,7 +54,7 @@ CeruleanBadgeHouseMiddleAgedManText: .BadgeItemList: table_width 1, .BadgeItemList - db NUM_BADGES + db NUM_BADGES ; # db BOULDERBADGE db CASCADEBADGE db THUNDERBADGE diff --git a/scripts/CeruleanCity.asm b/scripts/CeruleanCity.asm index 6e480285e..439c31ade 100644 --- a/scripts/CeruleanCity.asm +++ b/scripts/CeruleanCity.asm @@ -4,7 +4,7 @@ CeruleanCity_Script: ld a, [wCeruleanCityCurScript] jp CallFunctionInTable -CeruleanCityScript_1948c: +CeruleanCityClearScripts: xor a ; SCRIPT_CERULEANCITY_DEFAULT ld [wJoyIgnore], a ld [wCeruleanCityCurScript], a @@ -23,7 +23,7 @@ CeruleanCity_ScriptPointers: CeruleanCityRocketDefeatedScript: ld a, [wIsInBattle] cp $ff - jp z, CeruleanCityScript_1948c + jp z, CeruleanCityClearScripts ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a SetEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF @@ -117,7 +117,7 @@ CeruleanCityMovement1: db NPC_MOVEMENT_DOWN db -1 ; end -CeruleanCityScript_1955d: +CeruleanCityFaceRivalScript: ld a, CERULEANCITY_RIVAL ldh [hSpriteIndex], a xor a ; SPRITE_FACING_DOWN @@ -160,7 +160,7 @@ CeruleanCityRivalBattleScript: xor a ldh [hJoyHeld], a - call CeruleanCityScript_1955d + call CeruleanCityFaceRivalScript ld a, SCRIPT_CERULEANCITY_RIVAL_DEFEATED ld [wCeruleanCityCurScript], a ret @@ -168,8 +168,8 @@ CeruleanCityRivalBattleScript: CeruleanCityRivalDefeatedScript: ld a, [wIsInBattle] cp $ff - jp z, CeruleanCityScript_1948c - call CeruleanCityScript_1955d + jp z, CeruleanCityClearScripts + call CeruleanCityFaceRivalScript ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a SetEvent EVENT_BEAT_CERULEAN_RIVAL diff --git a/scripts/ChampionsRoom.asm b/scripts/ChampionsRoom.asm index 0837ae52b..c6c7c1dd7 100644 --- a/scripts/ChampionsRoom.asm +++ b/scripts/ChampionsRoom.asm @@ -100,7 +100,7 @@ ChampionsRoomRivalDefeatedScript: ld [wJoyIgnore], a ld a, TEXT_CHAMPIONSROOM_RIVAL ldh [hSpriteIndexOrTextID], a - call RivalScript_760c8 + call ChampionsRoom_DisplayTextID_AllowABSelectStart ld a, CHAMPIONSROOM_RIVAL ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF @@ -112,7 +112,7 @@ ChampionsRoomOakArrivesScript: farcall Music_Cities1AlternateTempo ld a, TEXT_CHAMPIONSROOM_OAK ldh [hSpriteIndexOrTextID], a - call RivalScript_760c8 + call ChampionsRoom_DisplayTextID_AllowABSelectStart ld a, CHAMPIONSROOM_OAK ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF @@ -153,7 +153,7 @@ ChampionsRoomOakCongratulatesPlayerScript: call SetSpriteFacingDirectionAndDelay ld a, TEXT_CHAMPIONSROOM_OAK_CONGRATULATES_PLAYER ldh [hSpriteIndexOrTextID], a - call RivalScript_760c8 + call ChampionsRoom_DisplayTextID_AllowABSelectStart ld a, SCRIPT_CHAMPIONSROOM_OAK_DISAPPOINTED_WITH_RIVAL ld [wChampionsRoomCurScript], a ret @@ -166,7 +166,7 @@ ChampionsRoomOakDisappointedWithRivalScript: call SetSpriteFacingDirectionAndDelay ld a, TEXT_CHAMPIONSROOM_OAK_DISAPPOINTED_WITH_RIVAL ldh [hSpriteIndexOrTextID], a - call RivalScript_760c8 + call ChampionsRoom_DisplayTextID_AllowABSelectStart ld a, SCRIPT_CHAMPIONSROOM_OAK_COME_WITH_ME ld [wChampionsRoomCurScript], a ret @@ -179,7 +179,7 @@ ChampionsRoomOakComeWithMeScript: call SetSpriteFacingDirectionAndDelay ld a, TEXT_CHAMPIONSROOM_OAK_COME_WITH_ME ldh [hSpriteIndexOrTextID], a - call RivalScript_760c8 + call ChampionsRoom_DisplayTextID_AllowABSelectStart ld de, OakExitChampionsRoomMovement ld a, CHAMPIONSROOM_OAK ldh [hSpriteIndex], a @@ -232,7 +232,7 @@ ChampionsRoomCleanupScript: ld [wChampionsRoomCurScript], a ret -RivalScript_760c8: +ChampionsRoom_DisplayTextID_AllowABSelectStart: ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a call DisplayTextID diff --git a/scripts/CinnabarGym.asm b/scripts/CinnabarGym.asm index af7646be6..a962aa2fa 100644 --- a/scripts/CinnabarGym.asm +++ b/scripts/CinnabarGym.asm @@ -93,7 +93,7 @@ CinnabarGymGetOpponentTextScript: CinnabarGymFlagAction: predef_jump FlagActionPredef - + ; fallthrough CinnabarGymOpenGateScript: ld a, [wIsInBattle] cp $ff @@ -107,12 +107,12 @@ CinnabarGymOpenGateScript: call CinnabarGymFlagAction ld a, c and a - jr nz, .asm_7581b + jr nz, .no_sound call WaitForSoundToFinish ld a, SFX_GO_INSIDE call PlaySound call WaitForSoundToFinish -.asm_7581b +.no_sound ld a, [wTrainerHeaderFlagBit] ldh [hGymGateIndex], a AdjustEventBit EVENT_BEAT_CINNABAR_GYM_TRAINER_0, 2 diff --git a/scripts/FightingDojo.asm b/scripts/FightingDojo.asm index fb9847d1d..298c2fcb6 100644 --- a/scripts/FightingDojo.asm +++ b/scripts/FightingDojo.asm @@ -7,7 +7,7 @@ FightingDojo_Script: ld [wFightingDojoCurScript], a ret -FightingDojoScript_5cd70: +FightingDojoResetScripts: xor a ; SCRIPT_FIGHTINGDOJO_DEFAULT ld [wJoyIgnore], a ld [wFightingDojoCurScript], a @@ -56,10 +56,10 @@ FightingDojoDefaultScript: FightingDojoKarateMasterPostBattleScript: ld a, [wIsInBattle] cp $ff - jp z, FightingDojoScript_5cd70 + jp z, FightingDojoResetScripts ld a, [wcf0d] and a - jr z, .asm_5cde4 + jr z, .already_facing ld a, PLAYER_DIR_RIGHT ld [wPlayerMovingDirection], a ld a, FIGHTINGDOJO_KARATE_MASTER @@ -67,8 +67,7 @@ FightingDojoKarateMasterPostBattleScript: ld a, SPRITE_FACING_LEFT ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay - -.asm_5cde4 +.already_facing ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a SetEventRange EVENT_BEAT_KARATE_MASTER, EVENT_BEAT_FIGHTING_DOJO_TRAINER_3 diff --git a/scripts/GameCorner.asm b/scripts/GameCorner.asm index 3944a2f97..68cdc333a 100644 --- a/scripts/GameCorner.asm +++ b/scripts/GameCorner.asm @@ -14,9 +14,9 @@ GameCornerSelectLuckySlotMachine: call Random ldh a, [hRandomAdd] cp $7 - jr nc, .asm_48be2 + jr nc, .not_max ld a, $8 -.asm_48be2 +.not_max srl a srl a srl a @@ -63,18 +63,18 @@ GameCornerRocketBattleScript: ld a, GAMECORNER_ROCKET ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF - ld de, GameCornerMovement_Grunt_WalkAroundPlayer + ld de, GameCornerMovement_Rocket_WalkAroundPlayer ld a, [wYCoord] cp 6 - jr nz, .asm_48c43 - ld de, GameCornerMovement_Grunt_WalkDirect - jr .asm_48c4d -.asm_48c43 + jr nz, .not_direct_movement + ld de, GameCornerMovement_Rocket_WalkDirect + jr .got_rocket_movement +.not_direct_movement ld a, [wXCoord] cp 8 - jr nz, .asm_48c4d - ld de, GameCornerMovement_Grunt_WalkDirect -.asm_48c4d + jr nz, .got_rocket_movement + ld de, GameCornerMovement_Rocket_WalkDirect +.got_rocket_movement ld a, GAMECORNER_ROCKET ldh [hSpriteIndex], a call MoveSprite @@ -82,7 +82,7 @@ GameCornerRocketBattleScript: ld [wGameCornerCurScript], a ret -GameCornerMovement_Grunt_WalkAroundPlayer: +GameCornerMovement_Rocket_WalkAroundPlayer: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT @@ -93,7 +93,7 @@ GameCornerMovement_Grunt_WalkAroundPlayer: db NPC_MOVEMENT_RIGHT db -1 ; end -GameCornerMovement_Grunt_WalkDirect: +GameCornerMovement_Rocket_WalkDirect: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm index 523567df9..51f48af4b 100644 --- a/scripts/HallOfFame.asm +++ b/scripts/HallOfFame.asm @@ -4,7 +4,7 @@ HallOfFame_Script: ld a, [wHallOfFameCurScript] jp CallFunctionInTable -HallofFameRoomScript_5a4aa: +HallofFameRoomClearScripts: ; unreferenced xor a ld [wJoyIgnore], a ld [wHallOfFameCurScript], a @@ -60,7 +60,7 @@ HallOfFameDefaultScript: ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ld hl, wSimulatedJoypadStatesEnd - ld de, RLEMovement5a528 + ld de, HallOfFakeEntryMovement call DecodeRLEList dec a ld [wSimulatedJoypadStatesIndex], a @@ -69,7 +69,7 @@ HallOfFameDefaultScript: ld [wHallOfFameCurScript], a ret -RLEMovement5a528: +HallOfFakeEntryMovement: db D_UP, 5 db -1 ; end diff --git a/scripts/MtMoonB2F.asm b/scripts/MtMoonB2F.asm index 6e2dc8455..89871e350 100644 --- a/scripts/MtMoonB2F.asm +++ b/scripts/MtMoonB2F.asm @@ -7,18 +7,18 @@ MtMoonB2F_Script: ld [wMtMoonB2FCurScript], a CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD ret z - ld hl, CoordsData_49d37 + ld hl, MtMoonB2FFossilAreaCoords call ArePlayerCoordsInArray - jr nc, .asm_49d31 + jr nc, .enable_battles ld hl, wd72e set 4, [hl] ret -.asm_49d31 +.enable_battles ld hl, wd72e res 4, [hl] ret -CoordsData_49d37: +MtMoonB2FFossilAreaCoords: dbmapcoord 11, 5 dbmapcoord 12, 5 dbmapcoord 13, 5 diff --git a/scripts/RocketHideoutB4F.asm b/scripts/RocketHideoutB4F.asm index 01584f272..24bdd4a63 100644 --- a/scripts/RocketHideoutB4F.asm +++ b/scripts/RocketHideoutB4F.asm @@ -117,11 +117,11 @@ RocketHideoutB4FGiovanniText: ld a, SCRIPT_ROCKETHIDEOUTB4F_BEAT_GIOVANNI ld [wRocketHideoutB4FCurScript], a ld [wCurMapScript], a - jr .asm_209f0 + jr .done .beat_giovanni ld hl, RocketHideoutB4FGiovanniHopeWeMeetAgainText call PrintText -.asm_209f0 +.done jp TextScriptEnd .ImpressedYouGotHereText: @@ -191,11 +191,11 @@ RocketHideoutB4FRocket2AfterBattleText: ld hl, .Text call PrintText CheckAndSetEvent EVENT_ROCKET_DROPPED_LIFT_KEY - jr nz, .asm_455e9 + jr nz, .done ld a, HS_ROCKET_HIDEOUT_B4F_ITEM_5 ld [wMissableObjectIndex], a predef ShowObject -.asm_455e9 +.done jp TextScriptEnd .Text: diff --git a/scripts/RocketHideoutElevator.asm b/scripts/RocketHideoutElevator.asm index 9352a518f..71ff0758a 100644 --- a/scripts/RocketHideoutElevator.asm +++ b/scripts/RocketHideoutElevator.asm @@ -3,7 +3,7 @@ RocketHideoutElevator_Script: bit 5, [hl] res 5, [hl] push hl - call nz, RocketHideoutElevatorGetWarpsScript + call nz, RocketHideoutElevatorStoreWarpEntriesScript pop hl bit 7, [hl] res 7, [hl] @@ -14,15 +14,15 @@ RocketHideoutElevator_Script: ld [wDoNotWaitForButtonPressAfterDisplayingText], a ret -RocketHideoutElevatorGetWarpsScript: +RocketHideoutElevatorStoreWarpEntriesScript: ld hl, wWarpEntries ld a, [wWarpedFromWhichWarp] ld b, a ld a, [wWarpedFromWhichMap] ld c, a - call .SetWarpEntries - -.SetWarpEntries: + call .StoreWarpEntry + ; fallthrough +.StoreWarpEntry: inc hl inc hl ld a, b @@ -36,7 +36,7 @@ RocketHideoutElevatorScript: call LoadItemList ld hl, RocketHideoutElevatorWarpMaps ld de, wElevatorWarpMaps - ld bc, RocketHideoutElevatorWarpMapsEnd - RocketHideoutElevatorWarpMaps + ld bc, RocketHideoutElevatorWarpMaps.End - RocketHideoutElevatorWarpMaps call CopyData ret @@ -53,7 +53,7 @@ RocketHideoutElevatorWarpMaps: db 4, ROCKET_HIDEOUT_B1F db 4, ROCKET_HIDEOUT_B2F db 2, ROCKET_HIDEOUT_B4F -RocketHideoutElevatorWarpMapsEnd: +.End: RocketHideoutElevatorShakeScript: call Delay3 diff --git a/scripts/Route16.asm b/scripts/Route16.asm index a1a6af784..f51bd00eb 100644 --- a/scripts/Route16.asm +++ b/scripts/Route16.asm @@ -7,7 +7,7 @@ Route16_Script: ld [wRoute16CurScript], a ret -Route16Script_59946: +Route16ResetScripts: xor a ; SCRIPT_ROUTE16_DEFAULT ld [wJoyIgnore], a ld [wRoute16CurScript], a @@ -19,7 +19,7 @@ Route16_ScriptPointers: dw_const Route16DefaultScript, SCRIPT_ROUTE16_DEFAULT dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE16_START_BATTLE dw_const EndTrainerBattle, SCRIPT_ROUTE16_END_BATTLE - dw_const Route16SnorlaxBattleScript, SCRIPT_ROUTE16_SNORLAX_BATTLE + dw_const Route16SnorlaxPostBattleScript, SCRIPT_ROUTE16_SNORLAX_POST_BATTLE Route16DefaultScript: CheckEventHL EVENT_BEAT_ROUTE16_SNORLAX @@ -38,15 +38,15 @@ Route16DefaultScript: ld [wMissableObjectIndex], a predef HideObject call UpdateSprites - ld a, SCRIPT_ROUTE16_SNORLAX_BATTLE + ld a, SCRIPT_ROUTE16_SNORLAX_POST_BATTLE ld [wRoute16CurScript], a ld [wCurMapScript], a ret -Route16SnorlaxBattleScript: +Route16SnorlaxPostBattleScript: ld a, [wIsInBattle] cp $ff - jp z, Route16Script_59946 + jp z, Route16ResetScripts call UpdateSprites ld a, [wBattleResult] cp $2 diff --git a/scripts/Route22.asm b/scripts/Route22.asm index f692cb375..abf6c8e4d 100644 --- a/scripts/Route22.asm +++ b/scripts/Route22.asm @@ -40,9 +40,9 @@ Route22MoveRivalRightScript: ld de, Route22RivalMovementData ld a, [wcf0d] cp $1 - jr z, .asm_50ef1 + jr z, .skip_first_right inc de -.asm_50ef1 +.skip_first_right call MoveSprite ld a, SPRITE_FACING_RIGHT ldh [hSpriteFacingDirection], a diff --git a/scripts/Route23.asm b/scripts/Route23.asm index 7863f8ac5..044d5e504 100644 --- a/scripts/Route23.asm +++ b/scripts/Route23.asm @@ -26,25 +26,25 @@ Route23_ScriptPointers: dw_const Route23ResetToDefaultScript, SCRIPT_ROUTE23_RESET_TO_DEFAULT Route23DefaultScript: - ld hl, YCoordsData_51255 + ld hl, Route23GuardsYCoords ld a, [wYCoord] ld b, a ld e, $0 EventFlagBit c, EVENT_PASSED_EARTHBADGE_CHECK + 1, EVENT_PASSED_CASCADEBADGE_CHECK -.asm_51224 +.loop ld a, [hli] cp -1 ret z inc e dec c cp b - jr nz, .asm_51224 + jr nz, .loop cp 35 - jr nz, .asm_51237 + jr nz, .not_past_victory_road ld a, [wXCoord] cp 14 ret nc -.asm_51237 +.not_past_victory_road ld a, e ldh [hSpriteIndexOrTextID], a ld a, c @@ -61,7 +61,7 @@ Route23DefaultScript: ldh [hJoyHeld], a ret -YCoordsData_51255: +Route23GuardsYCoords: db 35 db 56 db 85 diff --git a/scripts/SilphCoElevator.asm b/scripts/SilphCoElevator.asm index 1d728e6b5..a2ed009e6 100644 --- a/scripts/SilphCoElevator.asm +++ b/scripts/SilphCoElevator.asm @@ -3,25 +3,25 @@ SilphCoElevator_Script: bit 5, [hl] res 5, [hl] push hl - call nz, SilphCoElevatorScript_457dc + call nz, SilphCoElevatorStoreWarpEntriesScript pop hl bit 7, [hl] res 7, [hl] - call nz, SilphCoElevatorShakeElevatorScript + call nz, SilphCoElevatorShakeScript xor a ld [wAutoTextBoxDrawingControl], a inc a ld [wDoNotWaitForButtonPressAfterDisplayingText], a ret -SilphCoElevatorScript_457dc: +SilphCoElevatorStoreWarpEntriesScript: ld hl, wWarpEntries ld a, [wWarpedFromWhichWarp] ld b, a ld a, [wWarpedFromWhichMap] ld c, a call .StoreWarpEntry - + ; fallthrough .StoreWarpEntry: inc hl inc hl @@ -36,7 +36,7 @@ SilphCoElevatorCopyWarpMapsScript: call LoadItemList ld hl, SilphCoElevatorWarpMaps ld de, wElevatorWarpMaps - ld bc, SilphCoElevatorWarpMapsEnd - SilphCoElevatorWarpMaps + ld bc, SilphCoElevatorWarpMaps.End - SilphCoElevatorWarpMaps call CopyData ret @@ -69,9 +69,9 @@ SilphCoElevatorWarpMaps: db 2, SILPH_CO_9F db 2, SILPH_CO_10F db 1, SILPH_CO_11F -SilphCoElevatorWarpMapsEnd: +.End: -SilphCoElevatorShakeElevatorScript: +SilphCoElevatorShakeScript: call Delay3 farcall ShakeElevator ret diff --git a/text/CinnabarLabFossilRoom.asm b/text/CinnabarLabFossilRoom.asm index 161342e4c..6701bbd03 100644 --- a/text/CinnabarLabFossilRoom.asm +++ b/text/CinnabarLabFossilRoom.asm @@ -35,7 +35,7 @@ _CinnabarLabFossilRoomScientist1FossilIsBackToLifeText:: line "like I think!" prompt -_Lab4Text_610ae:: +_CinnabarLabFossilRoomScientist1SeesFossilText:: text "Oh! That is" line "@" text_ram wcd6d @@ -54,7 +54,7 @@ _Lab4Text_610ae:: cont "again!" done -_Lab4Text_610b3:: +_CinnabarLabFossilRoomScientist1TakesFossilText:: text "So! You hurry and" line "give me that!" @@ -64,7 +64,7 @@ _Lab4Text_610b3:: text "!" prompt -_Lab4Text_610b8:: +_CinnabarLabFossilRoomScientist1GoForAWalkText2:: text "I take a little" line "time!" @@ -72,7 +72,7 @@ _Lab4Text_610b8:: line "little while!" done -_Lab4Text_610bd:: +_CinnabarLabFossilRoomScientist1ComeAgainText:: text "Aiyah! You come" line "again!" done From dc705d25c57d18c1ef40d35a786d09192303e85e Mon Sep 17 00:00:00 2001 From: Alchav <59858495+Alchav@users.noreply.github.com> Date: Sat, 18 Nov 2023 23:48:40 -0500 Subject: [PATCH 26/53] Correct wTilePlayerStandingOn "unused?" comment (#433) `TilePairCollisionsWater` contains the entry `db CAVERN, $14, $05`, which prevents surfing from raised cave ground tiles. If `wTilePlayerStandingOn` is not updated when the start menu is opened, it will be left at the previous tile, which will be the raised ground tile if you have just walked onto the stairs from one. --- home/overworld.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/overworld.asm b/home/overworld.asm index defa17281..8085f484a 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -104,7 +104,7 @@ OverworldLoopLessDelay:: bit 0, a jr nz, .checkForOpponent lda_coord 8, 9 - ld [wTilePlayerStandingOn], a ; unused? + ld [wTilePlayerStandingOn], a ; checked when using Surf for forbidden tile pairs call DisplayTextID ; display either the start menu or the NPC/sign text ld a, [wEnteringCableClub] and a From 9f2d6aa0a877b57eb65bce4bf3cde8a3f960bcc8 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 19 Nov 2023 12:33:30 -0600 Subject: [PATCH 27/53] Fix Celedon typo --- data/maps/objects/Route19.asm | 2 +- scripts/CeladonCity.asm | 8 ++++---- text/CeladonCity.asm | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/data/maps/objects/Route19.asm b/data/maps/objects/Route19.asm index ca5a2ffad..3513d477c 100644 --- a/data/maps/objects/Route19.asm +++ b/data/maps/objects/Route19.asm @@ -20,7 +20,7 @@ Route19_Object: def_object_events object_event 8, 7, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE19_COOLTRAINER_M1, OPP_SWIMMER, 2 - object_event 13, 7, SPRITE_COOLTRAINER_M,STAY, LEFT, TEXT_ROUTE19_COOLTRAINER_M2, OPP_SWIMMER, 3 + object_event 13, 7, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE19_COOLTRAINER_M2, OPP_SWIMMER, 3 object_event 13, 25, SPRITE_SWIMMER, STAY, LEFT, TEXT_ROUTE19_SWIMMER1, OPP_SWIMMER, 4 object_event 4, 27, SPRITE_SWIMMER, STAY, RIGHT, TEXT_ROUTE19_SWIMMER2, OPP_SWIMMER, 5 object_event 16, 31, SPRITE_SWIMMER, STAY, UP, TEXT_ROUTE19_SWIMMER3, OPP_SWIMMER, 6 diff --git a/scripts/CeladonCity.asm b/scripts/CeladonCity.asm index ee62c78ba..60ca58c3c 100644 --- a/scripts/CeladonCity.asm +++ b/scripts/CeladonCity.asm @@ -65,20 +65,20 @@ CeladonCityGramps3Text: jp TextScriptEnd .Text: - text_far _CeledonCityGramps3Text + text_far _CeladonCityGramps3Text text_end .ReceivedTM41Text: - text_far _CeledonCityGramps3ReceivedTM41Text + text_far _CeladonCityGramps3ReceivedTM41Text sound_get_item_1 text_end .TM41ExplanationText: - text_far _CeledonCityGramps3TM41ExplanationText + text_far _CeladonCityGramps3TM41ExplanationText text_end .TM41NoRoomText: - text_far _CeledonCityGramps3TM41NoRoomText + text_far _CeladonCityGramps3TM41NoRoomText text_end CeladonCityFisherText: diff --git a/text/CeladonCity.asm b/text/CeladonCity.asm index 8baaf8d3e..d1ea41476 100644 --- a/text/CeladonCity.asm +++ b/text/CeladonCity.asm @@ -28,7 +28,7 @@ _CeladonCityGramps2Text:: cont "coins for prizes!" done -_CeledonCityGramps3Text:: +_CeladonCityGramps3Text:: text "Hello, there!" para "I've seen you," @@ -39,14 +39,14 @@ _CeledonCityGramps3Text:: line "dropping by!" prompt -_CeledonCityGramps3ReceivedTM41Text:: +_CeladonCityGramps3ReceivedTM41Text:: text " received" line "@" text_ram wStringBuffer text "!@" text_end -_CeledonCityGramps3TM41ExplanationText:: +_CeladonCityGramps3TM41ExplanationText:: text "TM41 teaches" line "SOFTBOILED!" @@ -57,7 +57,7 @@ _CeledonCityGramps3TM41ExplanationText:: line "CHANSEY!" done -_CeledonCityGramps3TM41NoRoomText:: +_CeladonCityGramps3TM41NoRoomText:: text "Oh, your pack is" line "full of items!" done From 4ac6f54c67c825df00da11f7807c03f0de056717 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 19 Nov 2023 13:17:51 -0600 Subject: [PATCH 28/53] Fix HallOfFake typo --- scripts/HallOfFame.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm index 51f48af4b..d51028307 100644 --- a/scripts/HallOfFame.asm +++ b/scripts/HallOfFame.asm @@ -60,7 +60,7 @@ HallOfFameDefaultScript: ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ld hl, wSimulatedJoypadStatesEnd - ld de, HallOfFakeEntryMovement + ld de, HallOfFameEntryMovement call DecodeRLEList dec a ld [wSimulatedJoypadStatesIndex], a @@ -69,7 +69,7 @@ HallOfFameDefaultScript: ld [wHallOfFameCurScript], a ret -HallOfFakeEntryMovement: +HallOfFameEntryMovement: db D_UP, 5 db -1 ; end From 5739aea99068b83604bf64f7c2d27682b3df51de Mon Sep 17 00:00:00 2001 From: Vortyne <104168801+Vortyne@users.noreply.github.com> Date: Sun, 19 Nov 2023 16:09:33 -0500 Subject: [PATCH 29/53] Name unnamed labels in seafoam islands and pokemon mansion script files (#435) * Update PokemonMansion1F.asm * Name unnamed seafoam/mansion labels --- engine/overworld/push_boulder.asm | 2 +- scripts/PokemonMansion1F.asm | 28 +++++++++++----------- scripts/PokemonMansion2F.asm | 22 ++++++++--------- scripts/PokemonMansion3F.asm | 24 +++++++++---------- scripts/PokemonMansionB1F.asm | 24 +++++++++---------- scripts/SeafoamIslands1F.asm | 12 +++++----- scripts/SeafoamIslandsB1F.asm | 12 +++++----- scripts/SeafoamIslandsB2F.asm | 12 +++++----- scripts/SeafoamIslandsB3F.asm | 40 +++++++++++++++---------------- scripts/SeafoamIslandsB4F.asm | 34 +++++++++++++------------- 10 files changed, 105 insertions(+), 105 deletions(-) diff --git a/engine/overworld/push_boulder.asm b/engine/overworld/push_boulder.asm index a8e532d31..96c506c02 100644 --- a/engine/overworld/push_boulder.asm +++ b/engine/overworld/push_boulder.asm @@ -94,7 +94,7 @@ DoBoulderDustAnimation:: call DiscardButtonPresses ld [wJoyIgnore], a call ResetBoulderPushFlags - set 7, [hl] + set 7, [hl] ; [wFlags_0xcd60] ld a, [wBoulderSpriteIndex] ldh [hSpriteIndex], a call GetSpriteMovementByte2Pointer diff --git a/scripts/PokemonMansion1F.asm b/scripts/PokemonMansion1F.asm index c1fef205a..b294a2473 100644 --- a/scripts/PokemonMansion1F.asm +++ b/scripts/PokemonMansion1F.asm @@ -1,5 +1,5 @@ PokemonMansion1F_Script: - call Mansion1Subscript1 + call Mansion1CheckReplaceSwitchDoorBlocks call EnableAutoTextBoxDrawing ld hl, Mansion1TrainerHeaders ld de, PokemonMansion1F_ScriptPointers @@ -8,37 +8,37 @@ PokemonMansion1F_Script: ld [wPokemonMansion1FCurScript], a ret -Mansion1Subscript1: +Mansion1CheckReplaceSwitchDoorBlocks: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z CheckEvent EVENT_MANSION_SWITCH_ON - jr nz, .asm_442ec + jr nz, .switchTurnedOn lb bc, 6, 12 - call Mansion1Script_4430b + call Mansion1LoadEmptyFloorTileBlock lb bc, 3, 8 - call Mansion1Script_44304 + call Mansion1LoadHorizontalGateBlock lb bc, 8, 10 - call Mansion1Script_44304 + call Mansion1LoadHorizontalGateBlock lb bc, 13, 13 - jp Mansion1Script_44304 -.asm_442ec + jp Mansion1LoadHorizontalGateBlock +.switchTurnedOn lb bc, 6, 12 - call Mansion1Script_44304 + call Mansion1LoadHorizontalGateBlock lb bc, 3, 8 - call Mansion1Script_4430b + call Mansion1LoadEmptyFloorTileBlock lb bc, 8, 10 - call Mansion1Script_4430b + call Mansion1LoadEmptyFloorTileBlock lb bc, 13, 13 - jp Mansion1Script_4430b + jp Mansion1LoadEmptyFloorTileBlock -Mansion1Script_44304: +Mansion1LoadHorizontalGateBlock: ld a, $2d ld [wNewTileBlockID], a jr Mansion1ReplaceBlock -Mansion1Script_4430b: +Mansion1LoadEmptyFloorTileBlock: ld a, $e ld [wNewTileBlockID], a Mansion1ReplaceBlock: diff --git a/scripts/PokemonMansion2F.asm b/scripts/PokemonMansion2F.asm index a4322da73..bc3d78e9b 100644 --- a/scripts/PokemonMansion2F.asm +++ b/scripts/PokemonMansion2F.asm @@ -1,5 +1,5 @@ PokemonMansion2F_Script: - call Mansion2Script_51fee + call Mansion2CheckReplaceSwitchDoorBlocks call EnableAutoTextBoxDrawing ld hl, Mansion2TrainerHeaders ld de, PokemonMansion2F_ScriptPointers @@ -8,36 +8,36 @@ PokemonMansion2F_Script: ld [wPokemonMansion2FCurScript], a ret -Mansion2Script_51fee: +Mansion2CheckReplaceSwitchDoorBlocks: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z CheckEvent EVENT_MANSION_SWITCH_ON - jr nz, .asm_52016 + jr nz, .switchTurnedOn ld a, $e lb bc, 2, 4 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ld a, $54 lb bc, 4, 9 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ld a, $5f lb bc, 11, 3 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ret -.asm_52016 +.switchTurnedOn ld a, $5f lb bc, 2, 4 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ld a, $e lb bc, 4, 9 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ld a, $e lb bc, 11, 3 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ret -Mansion2Script_5202f: +Mansion2ReplaceBlock: ld [wNewTileBlockID], a predef_jump ReplaceTileBlock diff --git a/scripts/PokemonMansion3F.asm b/scripts/PokemonMansion3F.asm index ddded4e93..c3a9fba87 100644 --- a/scripts/PokemonMansion3F.asm +++ b/scripts/PokemonMansion3F.asm @@ -1,5 +1,5 @@ PokemonMansion3F_Script: - call Mansion3Script_52204 + call Mansion3CheckReplaceSwitchDoorBlocks call EnableAutoTextBoxDrawing ld hl, Mansion3TrainerHeaders ld de, PokemonMansion3F_ScriptPointers @@ -8,27 +8,27 @@ PokemonMansion3F_Script: ld [wPokemonMansion3FCurScript], a ret -Mansion3Script_52204: +Mansion3CheckReplaceSwitchDoorBlocks: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z CheckEvent EVENT_MANSION_SWITCH_ON - jr nz, .asm_52224 + jr nz, .switchTurnedOn ld a, $e lb bc, 2, 7 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ld a, $5f lb bc, 5, 7 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ret -.asm_52224 +.switchTurnedOn ld a, $5f lb bc, 2, 7 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ld a, $e lb bc, 5, 7 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ret PokemonMansion3F_ScriptPointers: @@ -38,8 +38,8 @@ PokemonMansion3F_ScriptPointers: dw_const EndTrainerBattle, SCRIPT_POKEMONMANSION3F_END_BATTLE PokemonMansion3FDefaultScript: - ld hl, CoordsData_52254 - call Mansion3Script_5225b + ld hl, .holeCoords + call .isPlayerFallingDownHole ld a, [wWhichDungeonWarp] and a jp z, CheckFightingMapTrainers @@ -51,13 +51,13 @@ PokemonMansion3FDefaultScript: ld [wDungeonWarpDestinationMap], a ret -CoordsData_52254: +.holeCoords: dbmapcoord 16, 14 dbmapcoord 17, 14 dbmapcoord 19, 14 db -1 ; end -Mansion3Script_5225b: +.isPlayerFallingDownHole: xor a ld [wWhichDungeonWarp], a ld a, [wd72d] diff --git a/scripts/PokemonMansionB1F.asm b/scripts/PokemonMansionB1F.asm index 187a765f3..74f1648e7 100644 --- a/scripts/PokemonMansionB1F.asm +++ b/scripts/PokemonMansionB1F.asm @@ -1,5 +1,5 @@ PokemonMansionB1F_Script: - call Mansion4Script_523cf + call MansionB1FCheckReplaceSwitchDoorBlocks call EnableAutoTextBoxDrawing ld hl, Mansion4TrainerHeaders ld de, PokemonMansionB1F_ScriptPointers @@ -8,39 +8,39 @@ PokemonMansionB1F_Script: ld [wPokemonMansionB1FCurScript], a ret -Mansion4Script_523cf: +MansionB1FCheckReplaceSwitchDoorBlocks: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z CheckEvent EVENT_MANSION_SWITCH_ON - jr nz, .asm_523ff + jr nz, .switchTurnedOn ld a, $e ld bc, $80d - call Mansion2Script_5202f + call Mansion2ReplaceBlock ld a, $e ld bc, $b06 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ld a, $5f ld bc, $304 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ld a, $54 ld bc, $808 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ret -.asm_523ff +.switchTurnedOn ld a, $2d ld bc, $80d - call Mansion2Script_5202f + call Mansion2ReplaceBlock ld a, $5f ld bc, $b06 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ld a, $e ld bc, $304 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ld a, $e ld bc, $808 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ret Mansion4Script_Switches:: diff --git a/scripts/SeafoamIslands1F.asm b/scripts/SeafoamIslands1F.asm index eda3051bc..27ddc2766 100644 --- a/scripts/SeafoamIslands1F.asm +++ b/scripts/SeafoamIslands1F.asm @@ -4,34 +4,34 @@ SeafoamIslands1F_Script: ld hl, wFlags_0xcd60 bit 7, [hl] res 7, [hl] - jr z, .asm_4483b + jr z, .noBoulderWasPushed ld hl, Seafoam1HolesCoords call CheckBoulderCoords ret nc EventFlagAddress hl, EVENT_SEAFOAM1_BOULDER1_DOWN_HOLE ld a, [wCoordIndex] cp $1 - jr nz, .asm_44819 + jr nz, .boulder2FellDownHole SetEventReuseHL EVENT_SEAFOAM1_BOULDER1_DOWN_HOLE ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_1 ld [wObjectToHide], a ld a, HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 ld [wObjectToShow], a - jr .asm_44825 -.asm_44819 + jr .hideAndShowBoulderObjects +.boulder2FellDownHole SetEventAfterBranchReuseHL EVENT_SEAFOAM1_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM1_BOULDER1_DOWN_HOLE ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_2 ld [wObjectToHide], a ld a, HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 ld [wObjectToShow], a -.asm_44825 +.hideAndShowBoulderObjects ld a, [wObjectToHide] ld [wMissableObjectIndex], a predef HideObject ld a, [wObjectToShow] ld [wMissableObjectIndex], a predef_jump ShowObject -.asm_4483b +.noBoulderWasPushed ld a, SEAFOAM_ISLANDS_B1F ld [wDungeonWarpDestinationMap], a ld hl, Seafoam1HolesCoords diff --git a/scripts/SeafoamIslandsB1F.asm b/scripts/SeafoamIslandsB1F.asm index 6a56c337e..271775ed7 100644 --- a/scripts/SeafoamIslandsB1F.asm +++ b/scripts/SeafoamIslandsB1F.asm @@ -3,34 +3,34 @@ SeafoamIslandsB1F_Script: ld hl, wFlags_0xcd60 bit 7, [hl] res 7, [hl] - jr z, .asm_46362 + jr z, .noBoulderWasPushed ld hl, Seafoam2HolesCoords call CheckBoulderCoords ret nc EventFlagAddress hl, EVENT_SEAFOAM2_BOULDER1_DOWN_HOLE ld a, [wCoordIndex] cp $1 - jr nz, .asm_46340 + jr nz, .boulder2FellDownHole SetEventReuseHL EVENT_SEAFOAM2_BOULDER1_DOWN_HOLE ld a, HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 ld [wObjectToHide], a ld a, HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 ld [wObjectToShow], a - jr .asm_4634c -.asm_46340 + jr .hideAndShowBoulderObjects +.boulder2FellDownHole SetEventAfterBranchReuseHL EVENT_SEAFOAM2_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM2_BOULDER1_DOWN_HOLE ld a, HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 ld [wObjectToHide], a ld a, HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 ld [wObjectToShow], a -.asm_4634c +.hideAndShowBoulderObjects ld a, [wObjectToHide] ld [wMissableObjectIndex], a predef HideObject ld a, [wObjectToShow] ld [wMissableObjectIndex], a predef_jump ShowObject -.asm_46362 +.noBoulderWasPushed ld a, SEAFOAM_ISLANDS_B2F ld [wDungeonWarpDestinationMap], a ld hl, Seafoam2HolesCoords diff --git a/scripts/SeafoamIslandsB2F.asm b/scripts/SeafoamIslandsB2F.asm index 635d923fe..71ae2e1ae 100644 --- a/scripts/SeafoamIslandsB2F.asm +++ b/scripts/SeafoamIslandsB2F.asm @@ -3,34 +3,34 @@ SeafoamIslandsB2F_Script: ld hl, wFlags_0xcd60 bit 7, [hl] res 7, [hl] - jr z, .asm_4649e + jr z, .noBoulderWasPushed ld hl, Seafoam3HolesCoords call CheckBoulderCoords ret nc EventFlagAddress hl, EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE ld a, [wCoordIndex] cp $1 - jr nz, .asm_4647c + jr nz, .boulder2FellDownHole SetEventReuseHL EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE ld a, HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 ld [wObjectToHide], a ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_3 ld [wObjectToShow], a - jr .asm_46488 -.asm_4647c + jr .hideAndShowBoulderObjects +.boulder2FellDownHole SetEventAfterBranchReuseHL EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE ld a, HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 ld [wObjectToHide], a ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 ld [wObjectToShow], a -.asm_46488 +.hideAndShowBoulderObjects ld a, [wObjectToHide] ld [wMissableObjectIndex], a predef HideObject ld a, [wObjectToShow] ld [wMissableObjectIndex], a predef_jump ShowObject -.asm_4649e +.noBoulderWasPushed ld a, SEAFOAM_ISLANDS_B3F ld [wDungeonWarpDestinationMap], a ld hl, Seafoam3HolesCoords diff --git a/scripts/SeafoamIslandsB3F.asm b/scripts/SeafoamIslandsB3F.asm index a1e178331..8c225dcc5 100644 --- a/scripts/SeafoamIslandsB3F.asm +++ b/scripts/SeafoamIslandsB3F.asm @@ -3,35 +3,35 @@ SeafoamIslandsB3F_Script: ld hl, wFlags_0xcd60 bit 7, [hl] res 7, [hl] - jr z, .asm_465dc + jr z, .noBoulderWasPushed ld hl, Seafoam4HolesCoords call CheckBoulderCoords ret nc EventFlagAddress hl, EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE ld a, [wCoordIndex] cp $1 - jr nz, .asm_465b8 + jr nz, .boulder2FellDownHole SetEventReuseHL EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_1 ld [wObjectToHide], a ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 ld [wObjectToShow], a - jr .asm_465c4 -.asm_465b8 + jr .hideAndShowBoulderObjects +.boulder2FellDownHole SetEventAfterBranchReuseHL EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_2 ld [wObjectToHide], a ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 ld [wObjectToShow], a -.asm_465c4 +.hideAndShowBoulderObjects ld a, [wObjectToHide] ld [wMissableObjectIndex], a predef HideObject ld a, [wObjectToShow] ld [wMissableObjectIndex], a predef ShowObject - jr .asm_465ed -.asm_465dc + jr .runCurrentMapScript +.noBoulderWasPushed ld a, SEAFOAM_ISLANDS_B4F ld [wDungeonWarpDestinationMap], a ld hl, Seafoam4HolesCoords @@ -39,7 +39,7 @@ SeafoamIslandsB3F_Script: ld a, [wd732] bit 4, a ret nz -.asm_465ed +.runCurrentMapScript ld hl, SeafoamIslandsB3F_ScriptPointers ld a, [wSeafoamIslandsB3FCurScript] jp CallFunctionInTable @@ -67,7 +67,7 @@ SeafoamIslandsB3FDefaultScript: cp 15 ret nz ld hl, wSimulatedJoypadStatesEnd - ld de, RLEMovement46632 + ld de, RLEList_ForcedSurfingStrongCurrentNearSteps call DecodeRLEList dec a ld [wSimulatedJoypadStatesIndex], a @@ -78,7 +78,7 @@ SeafoamIslandsB3FDefaultScript: ld [wSeafoamIslandsB3FCurScript], a ret -RLEMovement46632: +RLEList_ForcedSurfingStrongCurrentNearSteps: db D_DOWN, 6 db D_RIGHT, 5 db D_DOWN, 3 @@ -97,15 +97,15 @@ SeafoamIslandsB3FMoveObjectScript: ret z ld a, [wXCoord] cp 18 - jr z, .asm_4665e + jr z, .playerFellThroughHoleLeft cp 19 ld a, SCRIPT_SEAFOAMISLANDSB3F_DEFAULT - jr nz, .asm_4667b - ld de, RLEData_4667f - jr .asm_46661 -.asm_4665e - ld de, RLEData_46688 -.asm_46661 + jr nz, .playerNotInStrongCurrent + ld de, .RLEList_StrongCurrentNearRightBoulder + jr .forceSurfMovement +.playerFellThroughHoleLeft + ld de, .RLEList_StrongCurrentNearLeftBoulder +.forceSurfMovement ld hl, wSimulatedJoypadStatesEnd call DecodeRLEList dec a @@ -117,18 +117,18 @@ SeafoamIslandsB3FMoveObjectScript: ld hl, wFlags_D733 set 2, [hl] ld a, SCRIPT_SEAFOAMISLANDSB3F_OBJECT_MOVING2 -.asm_4667b +.playerNotInStrongCurrent ld [wSeafoamIslandsB3FCurScript], a ret -RLEData_4667f: +.RLEList_StrongCurrentNearRightBoulder: db D_DOWN, 6 db D_RIGHT, 2 db D_DOWN, 4 db D_LEFT, 1 db -1 ; end -RLEData_46688: +.RLEList_StrongCurrentNearLeftBoulder: db D_DOWN, 6 db D_RIGHT, 2 db D_DOWN, 4 diff --git a/scripts/SeafoamIslandsB4F.asm b/scripts/SeafoamIslandsB4F.asm index 98ea0a5ba..7584cd81a 100644 --- a/scripts/SeafoamIslandsB4F.asm +++ b/scripts/SeafoamIslandsB4F.asm @@ -4,7 +4,7 @@ SeafoamIslandsB4F_Script: ld hl, SeafoamIslandsB4F_ScriptPointers jp CallFunctionInTable -SeafoamIslands5Script_467a5: +SeafoamIslandsB4FResetScript: xor a ld [wSeafoamIslandsB4FCurScript], a ld [wJoyIgnore], a @@ -22,7 +22,7 @@ SeafoamIslandsB4F_ScriptPointers: SeafoamIslandsB4FObjectMoving3Script: ld a, [wIsInBattle] cp $ff - jr z, SeafoamIslands5Script_467a5 + jr z, SeafoamIslandsB4FResetScript call EndTrainerBattle ld a, SCRIPT_SEAFOAMISLANDSB4F_DEFAULT ld [wSeafoamIslandsB4FCurScript], a @@ -36,14 +36,14 @@ SeafoamIslandsB4FDefaultScript: ret nc ld a, [wCoordIndex] cp $3 - jr nc, .asm_467e6 + jr nc, .only1UpInputNeeded ld a, NPC_MOVEMENT_UP ld [wSimulatedJoypadStatesEnd + 1], a ld a, 2 - jr .asm_467e8 -.asm_467e6 + jr .forcePlayerUpFromSurfExit +.only1UpInputNeeded ld a, 1 -.asm_467e8 +.forcePlayerUpFromSurfExit ld [wSimulatedJoypadStatesIndex], a ld a, D_UP ld [wSimulatedJoypadStatesEnd], a @@ -74,26 +74,26 @@ SeafoamIslandsB4FObjectMoving1Script: SeafoamIslandsB4FMoveObjectScript: CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE ld a, SCRIPT_SEAFOAMISLANDSB4F_DEFAULT - jr z, .asm_46849 + jr z, .playerNotInStrongCurrent ld hl, .Coords call ArePlayerCoordsInArray ld a, SCRIPT_SEAFOAMISLANDSB4F_DEFAULT - jr nc, .asm_46849 + jr nc, .playerNotInStrongCurrent ld a, [wCoordIndex] cp $1 - jr nz, .asm_46837 - ld de, RLEMovementData_46859 - jr .asm_4683a -.asm_46837 - ld de, RLEMovementData_46852 -.asm_4683a + jr nz, .nearRightBoulder + ld de, .RLEList_StrongCurrentNearLeftBoulder + jr .forceSurfMovement +.nearRightBoulder + ld de, .RLEList_StrongCurrentNearRightBoulder +.forceSurfMovement ld hl, wSimulatedJoypadStatesEnd call DecodeRLEList dec a ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, SCRIPT_SEAFOAMISLANDSB4F_OBJECT_MOVING2 -.asm_46849 +.playerNotInStrongCurrent ld [wSeafoamIslandsB4FCurScript], a ret @@ -102,13 +102,13 @@ SeafoamIslandsB4FMoveObjectScript: dbmapcoord 5, 14 db -1 ; end -RLEMovementData_46852: +.RLEList_StrongCurrentNearRightBoulder: db D_UP, 3 db D_RIGHT, 2 db D_UP, 1 db -1 ; end -RLEMovementData_46859: +.RLEList_StrongCurrentNearLeftBoulder: db D_UP, 3 db D_RIGHT, 3 db D_UP, 1 From 3adf1e22abb83e62e541c5a7b59a00960a8ceb87 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 19 Nov 2023 16:00:44 -0600 Subject: [PATCH 30/53] Remove incorrect sign object consts --- data/maps/objects/MtMoon1F.asm | 1 - data/maps/objects/PokemonFanClub.asm | 2 -- 2 files changed, 3 deletions(-) diff --git a/data/maps/objects/MtMoon1F.asm b/data/maps/objects/MtMoon1F.asm index c13f13793..75264ae69 100644 --- a/data/maps/objects/MtMoon1F.asm +++ b/data/maps/objects/MtMoon1F.asm @@ -12,7 +12,6 @@ const_export MTMOON1F_ESCAPE_ROPE const_export MTMOON1F_POTION2 const_export MTMOON1F_TM_WATER_GUN - const_export MTMOON1F_BEWARE_ZUBAT_SIGN MtMoon1F_Object: db $3 ; border block diff --git a/data/maps/objects/PokemonFanClub.asm b/data/maps/objects/PokemonFanClub.asm index 8bc6098a0..d7b94077a 100644 --- a/data/maps/objects/PokemonFanClub.asm +++ b/data/maps/objects/PokemonFanClub.asm @@ -5,8 +5,6 @@ const_export POKEMONFANCLUB_SEEL const_export POKEMONFANCLUB_CHAIRMAN const_export POKEMONFANCLUB_RECEPTIONIST - const_export POKEMONFANCLUB_SIGN_1 - const_export POKEMONFANCLUB_SIGN_2 PokemonFanClub_Object: db $d ; border block From e7f94cc52005142315878bb3a8f0bc96a9eda6fc Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 19 Nov 2023 16:03:49 -0600 Subject: [PATCH 31/53] Fix inconsistent object const names --- data/maps/objects/Route24.asm | 8 ++++---- data/maps/objects/Route6.asm | 8 ++++---- data/maps/objects/Route9.asm | 20 ++++++++++---------- scripts/Route24.asm | 4 ++-- scripts/Route6.asm | 4 ++-- scripts/Route9.asm | 10 +++++----- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/data/maps/objects/Route24.asm b/data/maps/objects/Route24.asm index f23eb7f84..780bedd2b 100644 --- a/data/maps/objects/Route24.asm +++ b/data/maps/objects/Route24.asm @@ -3,9 +3,9 @@ const_export ROUTE24_COOLTRAINER_M2 const_export ROUTE24_COOLTRAINER_M3 const_export ROUTE24_COOLTRAINER_F1 - const_export ROUTE24_YOUNGSTER_1 + const_export ROUTE24_YOUNGSTER1 const_export ROUTE24_COOLTRAINER_F2 - const_export ROUTE24_YOUNGSTER_2 + const_export ROUTE24_YOUNGSTER2 const_export ROUTE24_TM_THUNDER_WAVE Route24_Object: @@ -20,9 +20,9 @@ Route24_Object: object_event 5, 20, SPRITE_COOLTRAINER_M, STAY, UP, TEXT_ROUTE24_COOLTRAINER_M2, OPP_JR_TRAINER_M, 2 object_event 11, 19, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE24_COOLTRAINER_M3, OPP_JR_TRAINER_M, 3 object_event 10, 22, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE24_COOLTRAINER_F1, OPP_LASS, 7 - object_event 11, 25, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE24_YOUNGSTER_1, OPP_YOUNGSTER, 4 + object_event 11, 25, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE24_YOUNGSTER1, OPP_YOUNGSTER, 4 object_event 10, 28, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE24_COOLTRAINER_F2, OPP_LASS, 8 - object_event 11, 31, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE24_YOUNGSTER_2, OPP_BUG_CATCHER, 9 + object_event 11, 31, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE24_YOUNGSTER2, OPP_BUG_CATCHER, 9 object_event 10, 5, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE24_TM_THUNDER_WAVE, TM_THUNDER_WAVE def_warps_to ROUTE_24 diff --git a/data/maps/objects/Route6.asm b/data/maps/objects/Route6.asm index cd6667688..155cbfb65 100644 --- a/data/maps/objects/Route6.asm +++ b/data/maps/objects/Route6.asm @@ -1,10 +1,10 @@ object_const_def const_export ROUTE6_COOLTRAINER_M1 const_export ROUTE6_COOLTRAINER_F1 - const_export ROUTE6_YOUNGSTER_1 + const_export ROUTE6_YOUNGSTER1 const_export ROUTE6_COOLTRAINER_M2 const_export ROUTE6_COOLTRAINER_F2 - const_export ROUTE6_YOUNGSTER_2 + const_export ROUTE6_YOUNGSTER2 Route6_Object: db $f ; border block @@ -21,9 +21,9 @@ Route6_Object: def_object_events object_event 10, 21, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_ROUTE6_COOLTRAINER_M1, OPP_JR_TRAINER_M, 4 object_event 11, 21, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE6_COOLTRAINER_F1, OPP_JR_TRAINER_F, 2 - object_event 0, 15, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE6_YOUNGSTER_1, OPP_BUG_CATCHER, 10 + object_event 0, 15, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE6_YOUNGSTER1, OPP_BUG_CATCHER, 10 object_event 11, 31, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE6_COOLTRAINER_M2, OPP_JR_TRAINER_M, 5 object_event 11, 30, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE6_COOLTRAINER_F2, OPP_JR_TRAINER_F, 3 - object_event 19, 26, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE6_YOUNGSTER_2, OPP_BUG_CATCHER, 11 + object_event 19, 26, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE6_YOUNGSTER2, OPP_BUG_CATCHER, 11 def_warps_to ROUTE_6 diff --git a/data/maps/objects/Route9.asm b/data/maps/objects/Route9.asm index a5c29befd..5d5a66cb7 100644 --- a/data/maps/objects/Route9.asm +++ b/data/maps/objects/Route9.asm @@ -3,11 +3,11 @@ const_export ROUTE9_COOLTRAINER_M1 const_export ROUTE9_COOLTRAINER_M2 const_export ROUTE9_COOLTRAINER_F2 - const_export ROUTE9_HIKER_1 - const_export ROUTE9_HIKER_2 - const_export ROUTE9_YOUNGSTER_1 - const_export ROUTE9_HIKER_3 - const_export ROUTE9_YOUNGSTER_2 + const_export ROUTE9_HIKER1 + const_export ROUTE9_HIKER2 + const_export ROUTE9_YOUNGSTER1 + const_export ROUTE9_HIKER3 + const_export ROUTE9_YOUNGSTER2 const_export ROUTE9_TM_TELEPORT Route9_Object: @@ -23,11 +23,11 @@ Route9_Object: object_event 24, 7, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE9_COOLTRAINER_M1, OPP_JR_TRAINER_M, 7 object_event 31, 7, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_ROUTE9_COOLTRAINER_M2, OPP_JR_TRAINER_M, 8 object_event 48, 8, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE9_COOLTRAINER_F2, OPP_JR_TRAINER_F, 6 - object_event 16, 15, SPRITE_HIKER, STAY, LEFT, TEXT_ROUTE9_HIKER_1, OPP_HIKER, 11 - object_event 43, 3, SPRITE_HIKER, STAY, LEFT, TEXT_ROUTE9_HIKER_2, OPP_HIKER, 6 - object_event 22, 2, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_ROUTE9_YOUNGSTER_1, OPP_BUG_CATCHER, 13 - object_event 45, 15, SPRITE_HIKER, STAY, RIGHT, TEXT_ROUTE9_HIKER_3, OPP_HIKER, 5 - object_event 40, 8, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE9_YOUNGSTER_2, OPP_BUG_CATCHER, 14 + object_event 16, 15, SPRITE_HIKER, STAY, LEFT, TEXT_ROUTE9_HIKER1, OPP_HIKER, 11 + object_event 43, 3, SPRITE_HIKER, STAY, LEFT, TEXT_ROUTE9_HIKER2, OPP_HIKER, 6 + object_event 22, 2, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_ROUTE9_YOUNGSTER1, OPP_BUG_CATCHER, 13 + object_event 45, 15, SPRITE_HIKER, STAY, RIGHT, TEXT_ROUTE9_HIKER3, OPP_HIKER, 5 + object_event 40, 8, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE9_YOUNGSTER2, OPP_BUG_CATCHER, 14 object_event 10, 15, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE9_TM_TELEPORT, TM_TELEPORT def_warps_to ROUTE_9 diff --git a/scripts/Route24.asm b/scripts/Route24.asm index 8fa9dd202..47d6eb9f0 100644 --- a/scripts/Route24.asm +++ b/scripts/Route24.asm @@ -83,9 +83,9 @@ Route24_TextPointers: dw_const Route24CooltrainerM2Text, TEXT_ROUTE24_COOLTRAINER_M2 dw_const Route24CooltrainerM3Text, TEXT_ROUTE24_COOLTRAINER_M3 dw_const Route24CooltrainerF1Text, TEXT_ROUTE24_COOLTRAINER_F1 - dw_const Route24Youngster1Text, TEXT_ROUTE24_YOUNGSTER_1 + dw_const Route24Youngster1Text, TEXT_ROUTE24_YOUNGSTER1 dw_const Route24CooltrainerF2Text, TEXT_ROUTE24_COOLTRAINER_F2 - dw_const Route24Youngster2Text, TEXT_ROUTE24_YOUNGSTER_2 + dw_const Route24Youngster2Text, TEXT_ROUTE24_YOUNGSTER2 dw_const PickUpItemText, TEXT_ROUTE24_TM_THUNDER_WAVE Route24TrainerHeaders: diff --git a/scripts/Route6.asm b/scripts/Route6.asm index b7b8c1ce8..0151c9248 100644 --- a/scripts/Route6.asm +++ b/scripts/Route6.asm @@ -17,10 +17,10 @@ Route6_TextPointers: def_text_pointers dw_const Route6CooltrainerM1Text, TEXT_ROUTE6_COOLTRAINER_M1 dw_const Route6CooltrainerF1Text, TEXT_ROUTE6_COOLTRAINER_F1 - dw_const Route6Youngster1Text, TEXT_ROUTE6_YOUNGSTER_1 + dw_const Route6Youngster1Text, TEXT_ROUTE6_YOUNGSTER1 dw_const Route6CooltrainerM2Text, TEXT_ROUTE6_COOLTRAINER_M2 dw_const Route6CooltrainerF2Text, TEXT_ROUTE6_COOLTRAINER_F2 - dw_const Route6Youngster2Text, TEXT_ROUTE6_YOUNGSTER_2 + dw_const Route6Youngster2Text, TEXT_ROUTE6_YOUNGSTER2 dw_const Route6UndergroundPathSignText, TEXT_ROUTE6_UNDERGROUND_PATH_SIGN Route6TrainerHeaders: diff --git a/scripts/Route9.asm b/scripts/Route9.asm index 0aa912294..a2bb6abb5 100644 --- a/scripts/Route9.asm +++ b/scripts/Route9.asm @@ -19,11 +19,11 @@ Route9_TextPointers: dw_const Route9CooltrainerM1Text, TEXT_ROUTE9_COOLTRAINER_M1 dw_const Route9CooltrainerM2Text, TEXT_ROUTE9_COOLTRAINER_M2 dw_const Route9CooltrainerF2Text, TEXT_ROUTE9_COOLTRAINER_F2 - dw_const Route9Hiker1Text, TEXT_ROUTE9_HIKER_1 - dw_const Route9Hiker2Text, TEXT_ROUTE9_HIKER_2 - dw_const Route9Youngster1Text, TEXT_ROUTE9_YOUNGSTER_1 - dw_const Route9Hiker3Text, TEXT_ROUTE9_HIKER_3 - dw_const Route9Youngster2Text, TEXT_ROUTE9_YOUNGSTER_2 + dw_const Route9Hiker1Text, TEXT_ROUTE9_HIKER1 + dw_const Route9Hiker2Text, TEXT_ROUTE9_HIKER2 + dw_const Route9Youngster1Text, TEXT_ROUTE9_YOUNGSTER1 + dw_const Route9Hiker3Text, TEXT_ROUTE9_HIKER3 + dw_const Route9Youngster2Text, TEXT_ROUTE9_YOUNGSTER2 dw_const PickUpItemText, TEXT_ROUTE9_TM_TELEPORT dw_const Route9SignText, TEXT_ROUTE9_SIGN From 7d2dde5c848484d0bc911b1a0d4a1cfd4087f36a Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 19 Nov 2023 16:24:11 -0600 Subject: [PATCH 32/53] Fix incorrect fallthrough comment --- scripts/CinnabarGym.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/CinnabarGym.asm b/scripts/CinnabarGym.asm index a962aa2fa..17ac1ac1e 100644 --- a/scripts/CinnabarGym.asm +++ b/scripts/CinnabarGym.asm @@ -93,7 +93,7 @@ CinnabarGymGetOpponentTextScript: CinnabarGymFlagAction: predef_jump FlagActionPredef - ; fallthrough + CinnabarGymOpenGateScript: ld a, [wIsInBattle] cp $ff From 12a2f7a903ba8f36a41e418d9ae72e00e9602988 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 19 Nov 2023 16:41:19 -0600 Subject: [PATCH 33/53] Fix inconsistent B1F object consts --- data/maps/hide_show_data.asm | 6 +++--- data/maps/objects/CeruleanCaveB1F.asm | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index e2b31e431..3c304e918 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -538,9 +538,9 @@ CeruleanCave2FHS: db CERULEAN_CAVE_2F, CERULEANCAVE2F_ULTRA_BALL, SHOW db CERULEAN_CAVE_2F, CERULEANCAVE2F_FULL_RESTORE, SHOW CeruleanCaveB1FHS: - db CERULEAN_CAVE_B1F, CERULEANCAVE_B1F_MEWTWO, SHOW - db CERULEAN_CAVE_B1F, CERULEANCAVE_B1F_ULTRA_BALL, SHOW - db CERULEAN_CAVE_B1F, CERULEANCAVE_B1F_MAX_REVIVE, SHOW + db CERULEAN_CAVE_B1F, CERULEANCAVEB1F_MEWTWO, SHOW + db CERULEAN_CAVE_B1F, CERULEANCAVEB1F_ULTRA_BALL, SHOW + db CERULEAN_CAVE_B1F, CERULEANCAVEB1F_MAX_REVIVE, SHOW VictoryRoad1FHS: db VICTORY_ROAD_1F, VICTORYROAD1F_TM_SKY_ATTACK, SHOW db VICTORY_ROAD_1F, VICTORYROAD1F_RARE_CANDY, SHOW diff --git a/data/maps/objects/CeruleanCaveB1F.asm b/data/maps/objects/CeruleanCaveB1F.asm index a82d1712f..ef29c2e72 100644 --- a/data/maps/objects/CeruleanCaveB1F.asm +++ b/data/maps/objects/CeruleanCaveB1F.asm @@ -1,7 +1,7 @@ object_const_def - const_export CERULEANCAVE_B1F_MEWTWO - const_export CERULEANCAVE_B1F_ULTRA_BALL - const_export CERULEANCAVE_B1F_MAX_REVIVE + const_export CERULEANCAVEB1F_MEWTWO + const_export CERULEANCAVEB1F_ULTRA_BALL + const_export CERULEANCAVEB1F_MAX_REVIVE CeruleanCaveB1F_Object: db $7d ; border block From 27940a72982b8b73172f42dbeb7d2befd98b49d9 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 19 Nov 2023 17:25:49 -0600 Subject: [PATCH 34/53] Fix SAFFRONCTIY typo --- data/maps/hide_show_data.asm | 2 +- data/maps/objects/SaffronCity.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index 3c304e918..e3ece9425 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -284,7 +284,7 @@ SaffronCityHS: db SAFFRON_CITY, SAFFRONCITY_ROCKET5, SHOW db SAFFRON_CITY, SAFFRONCITY_ROCKET6, SHOW db SAFFRON_CITY, SAFFRONCITY_ROCKET7, SHOW - db SAFFRON_CITY, SAFFRONCTIY_SCIENTIST, HIDE + db SAFFRON_CITY, SAFFRONCITY_SCIENTIST, HIDE db SAFFRON_CITY, SAFFRONCITY_SILPH_WORKER_M, HIDE db SAFFRON_CITY, SAFFRONCITY_SILPH_WORKER_F, HIDE db SAFFRON_CITY, SAFFRONCITY_GENTLEMAN, HIDE diff --git a/data/maps/objects/SaffronCity.asm b/data/maps/objects/SaffronCity.asm index 8de01fe2e..ce8772a5e 100644 --- a/data/maps/objects/SaffronCity.asm +++ b/data/maps/objects/SaffronCity.asm @@ -6,7 +6,7 @@ const_export SAFFRONCITY_ROCKET5 const_export SAFFRONCITY_ROCKET6 const_export SAFFRONCITY_ROCKET7 - const_export SAFFRONCTIY_SCIENTIST + const_export SAFFRONCITY_SCIENTIST const_export SAFFRONCITY_SILPH_WORKER_M const_export SAFFRONCITY_SILPH_WORKER_F const_export SAFFRONCITY_GENTLEMAN From 3bbd38aa155c99ca90a3bf8a2c8aa80608999456 Mon Sep 17 00:00:00 2001 From: Vortyne <104168801+Vortyne@users.noreply.github.com> Date: Sun, 19 Nov 2023 18:37:59 -0500 Subject: [PATCH 35/53] Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) --- scripts/PokemonMansion3F.asm | 4 ++-- scripts/SeafoamIslandsB4F.asm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/PokemonMansion3F.asm b/scripts/PokemonMansion3F.asm index c3a9fba87..f64357d57 100644 --- a/scripts/PokemonMansion3F.asm +++ b/scripts/PokemonMansion3F.asm @@ -45,9 +45,9 @@ PokemonMansion3FDefaultScript: jp z, CheckFightingMapTrainers cp $3 ld a, POKEMON_MANSION_1F - jr nz, .asm_52250 + jr nz, .fellDownHoleTo1F ld a, POKEMON_MANSION_2F -.asm_52250 +.fellDownHoleTo1F ld [wDungeonWarpDestinationMap], a ret diff --git a/scripts/SeafoamIslandsB4F.asm b/scripts/SeafoamIslandsB4F.asm index 7584cd81a..bff27e9fd 100644 --- a/scripts/SeafoamIslandsB4F.asm +++ b/scripts/SeafoamIslandsB4F.asm @@ -118,7 +118,7 @@ SeafoamIslandsB4FObjectMoving2Script: ld a, [wSimulatedJoypadStatesIndex] ld b, a cp $1 - call z, SeaFoamIslands5Script_46872 + call z, .doneForcedSurfMovement ld a, b and a ret nz @@ -126,7 +126,7 @@ SeafoamIslandsB4FObjectMoving2Script: ld [wSeafoamIslandsB4FCurScript], a ret -SeaFoamIslands5Script_46872: +.doneForcedSurfMovement: xor a ld [wWalkBikeSurfState], a ld [wWalkBikeSurfStateCopy], a From 7a7a6d689c1fc2cd42ae925e4c7e19434a4e0267 Mon Sep 17 00:00:00 2001 From: Vortyne <104168801+Vortyne@users.noreply.github.com> Date: Mon, 20 Nov 2023 17:23:22 -0500 Subject: [PATCH 36/53] Identify the unnamed HRAM variables and one WRAM label (#438) --- engine/events/hidden_objects/bookshelves.asm | 4 +-- engine/gfx/sprite_oam.asm | 4 +-- engine/overworld/sprite_collisions.asm | 38 ++++++++++---------- home/hidden_objects.asm | 2 +- ram/hram.asm | 13 +++---- ram/wram.asm | 2 +- 6 files changed, 30 insertions(+), 33 deletions(-) diff --git a/engine/events/hidden_objects/bookshelves.asm b/engine/events/hidden_objects/bookshelves.asm index b58444af8..813cfc49a 100644 --- a/engine/events/hidden_objects/bookshelves.asm +++ b/engine/events/hidden_objects/bookshelves.asm @@ -24,7 +24,7 @@ PrintBookshelfText:: pop af call PrintPredefTextID xor a - ldh [hFFDB], a + ldh [hInteractedWithBookshelf], a ret .nextBookshelfEntry1 inc hl @@ -33,7 +33,7 @@ PrintBookshelfText:: jr .loop .noMatch ld a, $ff - ldh [hFFDB], a + ldh [hInteractedWithBookshelf], a farjp PrintCardKeyText INCLUDE "data/tilesets/bookshelf_tile_ids.asm" diff --git a/engine/gfx/sprite_oam.asm b/engine/gfx/sprite_oam.asm index 69956a317..4a31ab5e4 100644 --- a/engine/gfx/sprite_oam.asm +++ b/engine/gfx/sprite_oam.asm @@ -28,7 +28,7 @@ PrepareOAMData:: inc e inc e ld a, [de] ; [x#SPRITESTATEDATA1_IMAGEINDEX] - ld [wd5cd], a + ld [wSpriteImageIndexBackup], a cp $ff ; off-screen (don't draw) jr nz, .visible @@ -98,7 +98,7 @@ PrepareOAMData:: push bc ld b, a - ld a, [wd5cd] ; temp copy of [x#SPRITESTATEDATA1_IMAGEINDEX] + ld a, [wSpriteImageIndexBackup] swap a ; high nybble determines sprite used (0 is always player sprite, next are some npcs) and $f diff --git a/engine/overworld/sprite_collisions.asm b/engine/overworld/sprite_collisions.asm index dc57d5b9c..46c29e3e0 100644 --- a/engine/overworld/sprite_collisions.asm +++ b/engine/overworld/sprite_collisions.asm @@ -80,7 +80,7 @@ DetectCollisionBetweenSprites: and $f0 or c - ldh [hFF90], a ; store Y coordinate adjusted for direction of movement + ldh [hCollidingSpriteTempYValue], a ; y adjusted for direction of movement ld a, [hli] ; a = [i#SPRITESTATEDATA1_XSTEPVECTOR] (-1, 0, or 1) call SetSpriteCollisionValues @@ -93,7 +93,7 @@ DetectCollisionBetweenSprites: and $f0 or c - ldh [hFF91], a ; store X coordinate adjusted for direction of movement + ldh [hCollidingSpriteTempXValue], a ; x adjusted for direction of movement ld a, l add 7 @@ -103,15 +103,15 @@ DetectCollisionBetweenSprites: ld [hld], a ; zero [i#SPRITESTATEDATA1_0D] XXX what's this for? ld [hld], a ; zero [i#SPRITESTATEDATA1_COLLISIONDATA] - ldh a, [hFF91] + ldh a, [hCollidingSpriteTempXValue] ld [hld], a ; [i#SPRITESTATEDATA1_XADJUSTED] - ldh a, [hFF90] + ldh a, [hCollidingSpriteTempYValue] ld [hl], a ; [i#SPRITESTATEDATA1_YADJUSTED] xor a ; zero the loop counter .loop - ldh [hFF8F], a ; store loop counter + ldh [hCollidingSpriteOffset], a swap a ld e, a ldh a, [hCurrentSpriteOffset] @@ -155,7 +155,7 @@ DetectCollisionBetweenSprites: cpl inc a .noCarry1 - ldh [hFF90], a ; store the distance between the two sprites' adjusted Y values + ldh [hCollidingSpriteTempYValue], a ; store the distance between the two sprites' adjusted Y values ; Use the carry flag set by the above subtraction to determine which sprite's ; Y coordinate is larger. This information is used later to set @@ -177,11 +177,11 @@ DetectCollisionBetweenSprites: ld b, 9 .next1 - ldh a, [hFF90] ; a = distance between adjusted Y coordinates + ldh a, [hCollidingSpriteTempYValue] ; a = distance between adjusted Y coordinates sub b - ldh [hFF92], a ; store distance adjusted using sprite i's direction + ldh [hCollidingSpriteAdjustedDistance], a ld a, b - ldh [hFF90], a ; store 7 or 9 depending on sprite i's delta Y + ldh [hCollidingSpriteTempYValue], a ; store 7 or 9 depending on sprite i's delta Y jr c, .checkXDistance ; If sprite j's delta Y is 0, then b = 7, else b = 9. @@ -194,7 +194,7 @@ DetectCollisionBetweenSprites: ld b, 9 .next2 - ldh a, [hFF92] ; a = distance adjusted using sprite i's direction + ldh a, [hCollidingSpriteAdjustedDistance] sub b ; adjust distance using sprite j's direction jr z, .checkXDistance jr nc, .next ; go to next sprite if distance is still positive after both adjustments @@ -226,7 +226,7 @@ DetectCollisionBetweenSprites: cpl inc a .noCarry2 - ldh [hFF91], a ; store the distance between the two sprites' adjusted X values + ldh [hCollidingSpriteTempXValue], a ; store the distance between the two sprites' adjusted X values ; Use the carry flag set by the above subtraction to determine which sprite's ; X coordinate is larger. This information is used later to set @@ -248,11 +248,11 @@ DetectCollisionBetweenSprites: ld b, 9 .next3 - ldh a, [hFF91] ; a = distance between adjusted X coordinates + ldh a, [hCollidingSpriteTempXValue] ; a = distance between adjusted X coordinates sub b - ldh [hFF92], a ; store distance adjusted using sprite i's direction + ldh [hCollidingSpriteAdjustedDistance], a ld a, b - ldh [hFF91], a ; store 7 or 9 depending on sprite i's delta X + ldh [hCollidingSpriteTempXValue], a ; store 7 or 9 depending on sprite i's delta X jr c, .collision ; If sprite j's delta X is 0, then b = 7, else b = 9. @@ -265,15 +265,15 @@ DetectCollisionBetweenSprites: ld b, 9 .next4 - ldh a, [hFF92] ; a = distance adjusted using sprite i's direction + ldh a, [hCollidingSpriteAdjustedDistance] sub b ; adjust distance using sprite j's direction jr z, .collision jr nc, .next ; go to next sprite if distance is still positive after both adjustments .collision - ldh a, [hFF91] ; a = 7 or 9 depending on sprite i's delta X + ldh a, [hCollidingSpriteTempXValue] ; a = 7 or 9 depending on sprite i's delta X ld b, a - ldh a, [hFF90] ; a = 7 or 9 depending on sprite i's delta Y + ldh a, [hCollidingSpriteTempYValue] ; a = 7 or 9 depending on sprite i's delta Y inc l ; If delta X isn't 0 and delta Y is 0, then b = %0011, else b = %1100. @@ -296,7 +296,7 @@ DetectCollisionBetweenSprites: ; to indicate which sprite the collision occurred with inc l inc l - ldh a, [hFF8F] ; a = loop counter + ldh a, [hCollidingSpriteOffset] ld de, SpriteCollisionBitTable add a add e @@ -313,7 +313,7 @@ DetectCollisionBetweenSprites: ld [hl], a .next - ldh a, [hFF8F] ; a = loop counter + ldh a, [hCollidingSpriteOffset] inc a cp $10 jp nz, .loop diff --git a/home/hidden_objects.asm b/home/hidden_objects.asm index 6e7d980a7..2e3510b04 100644 --- a/home/hidden_objects.asm +++ b/home/hidden_objects.asm @@ -26,7 +26,7 @@ CheckForHiddenObjectOrBookshelfOrCardKeyDoor:: jr .done .hiddenObjectNotFound farcall PrintBookshelfText - ldh a, [hFFDB] + ldh a, [hInteractedWithBookshelf] and a jr z, .done .nothingFound diff --git a/ram/hram.asm b/ram/hram.asm index 0607a4843..72e9e13a2 100644 --- a/ram/hram.asm +++ b/ram/hram.asm @@ -85,10 +85,10 @@ hSpriteScreenX:: db hSpriteScreenY:: db NEXTU -hFF8F:: db -hFF90:: db -hFF91:: db -hFF92:: db +hCollidingSpriteOffset:: db +hCollidingSpriteTempYValue:: db +hCollidingSpriteTempXValue:: db +hCollidingSpriteAdjustedDistance:: db ENDU hTilePlayerStandingOn:: db @@ -327,11 +327,8 @@ hItemCounter:: hSavedCoordIndex:: hMissableObjectIndex:: hGymTrashCanRandNumMask:: +hInteractedWithBookshelf:: db - -NEXTU -hFFDB:: db -hFFDC:: db ENDU ds 1 diff --git a/ram/wram.asm b/ram/wram.asm index 753a96782..8c246b8a6 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -1914,7 +1914,7 @@ wMissableObjectFlagsEnd:: ds 7 ; temp copy of SPRITESTATEDATA1_IMAGEINDEX (used for sprite facing/anim) -wd5cd:: db +wSpriteImageIndexBackup:: db ; each entry consists of 2 bytes ; * the sprite ID (depending on the current map) From b066d3c9bc02cf4213173538d148cfabcc7212a8 Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Mon, 20 Nov 2023 17:53:19 -0500 Subject: [PATCH 37/53] Add `bigdw` and `dc` data macros --- engine/battle/animations.asm | 54 +++++++++++++------------- engine/battle/battle_transitions.asm | 24 ++++++------ engine/battle/scale_sprites.asm | 21 ++-------- engine/movie/credits.asm | 8 ++-- engine/movie/oak_speech/oak_speech.asm | 12 +++--- engine/overworld/sprite_collisions.asm | 19 ++------- home/fade.asm | 18 ++++----- macros/data.asm | 11 ++++++ 8 files changed, 76 insertions(+), 91 deletions(-) diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index fcfec14d3..712958bcb 100644 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -976,7 +976,7 @@ AnimationFlashScreenLong: push hl .innerLoop ld a, [hli] - cp $01 ; is it the end of the palettes? + cp 1 jr z, .endOfPalettes ldh [rBGP], a call FlashScreenLongDelay @@ -992,35 +992,35 @@ AnimationFlashScreenLong: ; BG palettes FlashScreenLongMonochrome: - db %11111001 ; 3, 3, 2, 1 - db %11111110 ; 3, 3, 3, 2 - db %11111111 ; 3, 3, 3, 3 - db %11111110 ; 3, 3, 3, 2 - db %11111001 ; 3, 3, 2, 1 - db %11100100 ; 3, 2, 1, 0 - db %10010000 ; 2, 1, 0, 0 - db %01000000 ; 1, 0, 0, 0 - db %00000000 ; 0, 0, 0, 0 - db %01000000 ; 1, 0, 0, 0 - db %10010000 ; 2, 1, 0, 0 - db %11100100 ; 3, 2, 1, 0 - db $01 ; terminator + dc 3, 3, 2, 1 + dc 3, 3, 3, 2 + dc 3, 3, 3, 3 + dc 3, 3, 3, 2 + dc 3, 3, 2, 1 + dc 3, 2, 1, 0 + dc 2, 1, 0, 0 + dc 1, 0, 0, 0 + dc 0, 0, 0, 0 + dc 1, 0, 0, 0 + dc 2, 1, 0, 0 + dc 3, 2, 1, 0 + db 1 ; end ; BG palettes FlashScreenLongSGB: - db %11111000 ; 3, 3, 2, 0 - db %11111100 ; 3, 3, 3, 0 - db %11111111 ; 3, 3, 3, 3 - db %11111100 ; 3, 3, 3, 0 - db %11111000 ; 3, 3, 2, 0 - db %11100100 ; 3, 2, 1, 0 - db %10010000 ; 2, 1, 0, 0 - db %01000000 ; 1, 0, 0, 0 - db %00000000 ; 0, 0, 0, 0 - db %01000000 ; 1, 0, 0, 0 - db %10010000 ; 2, 1, 0, 0 - db %11100100 ; 3, 2, 1, 0 - db $01 ; terminator + dc 3, 3, 2, 0 + dc 3, 3, 3, 0 + dc 3, 3, 3, 3 + dc 3, 3, 3, 0 + dc 3, 3, 2, 0 + dc 3, 2, 1, 0 + dc 2, 1, 0, 0 + dc 1, 0, 0, 0 + dc 0, 0, 0, 0 + dc 1, 0, 0, 0 + dc 2, 1, 0, 0 + dc 3, 2, 1, 0 + db 1 ; end ; causes a delay of 2 frames for the first cycle ; causes a delay of 1 frame for the second and third cycles diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index a16fd2504..363533cec 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -335,18 +335,18 @@ BattleTransition_FlashScreen_: ret BattleTransition_FlashScreenPalettes: - db %11111001 - db %11111110 - db %11111111 - db %11111110 - db %11111001 - db %11100100 - db %10010000 - db %01000000 - db %00000000 - db %01000000 - db %10010000 - db %11100100 + dc 3, 3, 2, 1 + dc 3, 3, 3, 2 + dc 3, 3, 3, 3 + dc 3, 3, 3, 2 + dc 3, 3, 2, 1 + dc 3, 2, 1, 0 + dc 2, 1, 0, 0 + dc 1, 0, 0, 0 + dc 0, 0, 0, 0 + dc 1, 0, 0, 0 + dc 2, 1, 0, 0 + dc 3, 2, 1, 0 db 1 ; end ; used for low level trainer dungeon battles diff --git a/engine/battle/scale_sprites.asm b/engine/battle/scale_sprites.asm index 8b8942e68..9e24c89d2 100644 --- a/engine/battle/scale_sprites.asm +++ b/engine/battle/scale_sprites.asm @@ -77,21 +77,8 @@ ScalePixelsByTwo: add hl, bc ; add offset ret -; repeats each input bit twice +; repeats each input bit twice, e.g. DuplicateBitsTable[%0101] = %00110011 DuplicateBitsTable: - db %00000000 - db %00000011 - db %00001100 - db %00001111 - db %00110000 - db %00110011 - db %00111100 - db %00111111 - db %11000000 - db %11000011 - db %11001100 - db %11001111 - db %11110000 - db %11110011 - db %11111100 - db %11111111 +FOR n, 16 + db (n & 1) * 3 + (n & 2) * 6 + (n & 4) * 12 + (n & 8) * 24 +ENDR diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm index 0410de213..5f258503b 100644 --- a/engine/movie/credits.asm +++ b/engine/movie/credits.asm @@ -131,10 +131,10 @@ ScrollCreditsMonLeft_SetSCX: ret HoFGBPalettes: - db %11000000 - db %11010000 - db %11100000 - db %11110000 + dc 3, 0, 0, 0 + dc 3, 1, 0, 0 + dc 3, 2, 0, 0 + dc 3, 3, 0, 0 CreditsCopyTileMapToVRAM: ld a, l diff --git a/engine/movie/oak_speech/oak_speech.asm b/engine/movie/oak_speech/oak_speech.asm index 4ed4735e5..3e339619b 100644 --- a/engine/movie/oak_speech/oak_speech.asm +++ b/engine/movie/oak_speech/oak_speech.asm @@ -192,12 +192,12 @@ FadeInIntroPic: ret IntroFadePalettes: - db %01010100 - db %10101000 - db %11111100 - db %11111000 - db %11110100 - db %11100100 + dc 1, 1, 1, 0 + dc 2, 2, 2, 0 + dc 3, 3, 3, 0 + dc 3, 3, 2, 0 + dc 3, 3, 1, 0 + dc 3, 2, 1, 0 MovePicLeft: ld a, 119 diff --git a/engine/overworld/sprite_collisions.asm b/engine/overworld/sprite_collisions.asm index 46c29e3e0..ffed37083 100644 --- a/engine/overworld/sprite_collisions.asm +++ b/engine/overworld/sprite_collisions.asm @@ -340,19 +340,6 @@ SetSpriteCollisionValues: ret SpriteCollisionBitTable: - db %00000000,%00000001 - db %00000000,%00000010 - db %00000000,%00000100 - db %00000000,%00001000 - db %00000000,%00010000 - db %00000000,%00100000 - db %00000000,%01000000 - db %00000000,%10000000 - db %00000001,%00000000 - db %00000010,%00000000 - db %00000100,%00000000 - db %00001000,%00000000 - db %00010000,%00000000 - db %00100000,%00000000 - db %01000000,%00000000 - db %10000000,%00000000 +FOR n, $10 + bigdw 1 << n +ENDR diff --git a/home/fade.asm b/home/fade.asm index f5ddf9643..b67f4b1c1 100644 --- a/home/fade.asm +++ b/home/fade.asm @@ -62,12 +62,12 @@ GBFadeDecCommon: jr nz, GBFadeDecCommon ret -FadePal1:: db %11111111, %11111111, %11111111 -FadePal2:: db %11111110, %11111110, %11111000 -FadePal3:: db %11111001, %11100100, %11100100 -FadePal4:: db %11100100, %11010000, %11100000 -; rBGP rOBP0 rOBP1 -FadePal5:: db %11100100, %11010000, %11100000 -FadePal6:: db %10010000, %10000000, %10010000 -FadePal7:: db %01000000, %01000000, %01000000 -FadePal8:: db %00000000, %00000000, %00000000 +FadePal1:: dc 3,3,3,3, 3,3,3,3, 3,3,3,3 +FadePal2:: dc 3,3,3,2, 3,3,3,2, 3,3,2,0 +FadePal3:: dc 3,3,2,1, 3,2,1,0, 3,2,1,0 +FadePal4:: dc 3,2,1,0, 3,1,0,0, 3,2,0,0 +; rBGP rOBP0 rOBP1 +FadePal5:: dc 3,2,1,0, 3,1,0,0, 3,2,0,0 +FadePal6:: dc 2,1,0,0, 2,0,0,0, 2,1,0,0 +FadePal7:: dc 1,0,0,0, 1,0,0,0, 1,0,0,0 +FadePal8:: dc 0,0,0,0, 0,0,0,0, 0,0,0,0 diff --git a/macros/data.asm b/macros/data.asm index 5092b74ee..2e4a7ce2a 100644 --- a/macros/data.asm +++ b/macros/data.asm @@ -56,6 +56,17 @@ MACRO dn ; nybbles ENDR ENDM +MACRO dc ; "crumbs" + REPT _NARG / 4 + db ((\1) << 6) | ((\2) << 4) | ((\3) << 2) | (\4) + SHIFT 4 + ENDR +ENDM + +MACRO bigdw ; big-endian word + db HIGH(\1), LOW(\1) +ENDM + MACRO dba ; dbw bank, address REPT _NARG dbw BANK(\1), \1 From 77887be2512b4b8af688dc4552bdb4490d35e65b Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Mon, 20 Nov 2023 18:53:23 -0500 Subject: [PATCH 38/53] Identify `wSavedCoordIndex` and its other usages --- engine/gfx/sprite_oam.asm | 4 ++-- engine/items/item_effects.asm | 2 +- engine/menus/pokedex.asm | 2 +- engine/overworld/auto_movement.asm | 4 ++-- engine/overworld/movement.asm | 2 +- home/overworld.asm | 2 +- home/pathfinding.asm | 2 +- ram/wram.asm | 13 ++++++++----- scripts/FightingDojo.asm | 10 +++++----- scripts/PalletTown.asm | 8 ++++---- scripts/Route22.asm | 24 ++++++++++++------------ scripts/SafariZoneGate.asm | 18 +++++++++--------- scripts/SilphCo11F.asm | 10 +++++----- scripts/SilphCo7F.asm | 8 ++++---- scripts/VermilionCity.asm | 2 +- 15 files changed, 57 insertions(+), 54 deletions(-) diff --git a/engine/gfx/sprite_oam.asm b/engine/gfx/sprite_oam.asm index 4a31ab5e4..8704814ff 100644 --- a/engine/gfx/sprite_oam.asm +++ b/engine/gfx/sprite_oam.asm @@ -28,7 +28,7 @@ PrepareOAMData:: inc e inc e ld a, [de] ; [x#SPRITESTATEDATA1_IMAGEINDEX] - ld [wSpriteImageIndexBackup], a + ld [wSavedSpriteImageIndex], a cp $ff ; off-screen (don't draw) jr nz, .visible @@ -98,7 +98,7 @@ PrepareOAMData:: push bc ld b, a - ld a, [wSpriteImageIndexBackup] + ld a, [wSavedSpriteImageIndex] swap a ; high nybble determines sprite used (0 is always player sprite, next are some npcs) and $f diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 927f54cb0..12c7dade6 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -740,7 +740,7 @@ ItemUseSurfboard: ld a, b ld [wSimulatedJoypadStatesEnd], a xor a - ld [wWastedByteCD39], a + ld [wUnusedCD39], a inc a ld [wSimulatedJoypadStatesIndex], a ret diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm index 3411f7291..96bae343e 100644 --- a/engine/menus/pokedex.asm +++ b/engine/menus/pokedex.asm @@ -36,7 +36,7 @@ ShowPokedexMenu: ld [wCurrentMenuItem], a ld [wLastMenuItem], a ldh [hJoy7], a - ld [wWastedByteCD3A], a + ld [wUnusedCD3A], a ld [wOverrideSimulatedJoypadStatesMask], a pop af ld [wListScrollOffset], a diff --git a/engine/overworld/auto_movement.asm b/engine/overworld/auto_movement.asm index 75816886e..53b70c19a 100644 --- a/engine/overworld/auto_movement.asm +++ b/engine/overworld/auto_movement.asm @@ -17,7 +17,7 @@ PlayerStepOutFromDoor:: ret .notStandingOnDoor xor a - ld [wWastedByteCD3A], a + ld [wUnusedCD3A], a ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesEnd], a ld hl, wd736 @@ -39,7 +39,7 @@ _EndNPCMovementScript:: ld [wNPCMovementScriptSpriteOffset], a ld [wNPCMovementScriptPointerTableNum], a ld [wNPCMovementScriptFunctionNum], a - ld [wWastedByteCD3A], a + ld [wUnusedCD3A], a ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesEnd], a ret diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index e08da61a0..eb186f1eb 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -179,7 +179,7 @@ UpdateNPCSprite: res 0, [hl] xor a ld [wSimulatedJoypadStatesIndex], a - ld [wWastedByteCD3A], a + ld [wUnusedCD3A], a ret .next cp WALK diff --git a/home/overworld.asm b/home/overworld.asm index 8085f484a..885a53274 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -1869,7 +1869,7 @@ JoypadOverworld:: ; if done simulating button presses .doneSimulating xor a - ld [wWastedByteCD3A], a + ld [wUnusedCD3A], a ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesEnd], a ld [wJoyIgnore], a diff --git a/home/pathfinding.asm b/home/pathfinding.asm index 53f988479..77cb5c4b3 100644 --- a/home/pathfinding.asm +++ b/home/pathfinding.asm @@ -40,7 +40,7 @@ MoveSprite_:: ld [wSimulatedJoypadStatesEnd], a dec a ld [wJoyIgnore], a - ld [wWastedByteCD3A], a + ld [wUnusedCD3A], a ret ; divides [hDividend2] by [hDivisor2] and stores the quotient in [hQuotient2] diff --git a/ram/wram.asm b/ram/wram.asm index 8c246b8a6..32749db37 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -576,10 +576,10 @@ wFilteredBagItemsCount:: db wSimulatedJoypadStatesIndex:: db ; written to but nothing ever reads it -wWastedByteCD39:: db +wUnusedCD39:: db ; written to but nothing ever reads it -wWastedByteCD3A:: db +wUnusedCD3A:: db ; mask indicating which real button presses can override simulated ones ; XXX is it ever not 0? @@ -979,7 +979,10 @@ wBattleResult:: db ; bit 0: if set, DisplayTextID automatically draws a text box wAutoTextBoxDrawingControl:: db -wcf0d:: db ; used with some overworld scripts (not exactly sure what it's used for) +; used in some overworld scripts to vary scripted movement +wSavedCoordIndex:: +wOakWalkedToPlayer:: +wNextSafariZoneGateScript:: db ; used in CheckForTilePairCollisions2 to store the tile the player is on wTilePlayerStandingOn:: db @@ -1913,8 +1916,8 @@ wMissableObjectFlagsEnd:: ds 7 -; temp copy of SPRITESTATEDATA1_IMAGEINDEX (used for sprite facing/anim) -wSpriteImageIndexBackup:: db +; saved copy of SPRITESTATEDATA1_IMAGEINDEX (used for sprite facing/anim) +wSavedSpriteImageIndex:: db ; each entry consists of 2 bytes ; * the sprite ID (depending on the current map) diff --git a/scripts/FightingDojo.asm b/scripts/FightingDojo.asm index 298c2fcb6..d434f6816 100644 --- a/scripts/FightingDojo.asm +++ b/scripts/FightingDojo.asm @@ -32,15 +32,15 @@ FightingDojoDefaultScript: ret nz xor a ldh [hJoyHeld], a - ld [wcf0d], a + ld [wSavedCoordIndex], a ld a, [wYCoord] cp 3 ret nz ld a, [wXCoord] cp 4 ret nz - ld a, $1 - ld [wcf0d], a + ld a, 1 + ld [wSavedCoordIndex], a ld a, PLAYER_DIR_RIGHT ld [wPlayerMovingDirection], a ld a, FIGHTINGDOJO_KARATE_MASTER @@ -57,8 +57,8 @@ FightingDojoKarateMasterPostBattleScript: ld a, [wIsInBattle] cp $ff jp z, FightingDojoResetScripts - ld a, [wcf0d] - and a + ld a, [wSavedCoordIndex] + and a ; nz if the player was at (4, 3), left of the Karate Master jr z, .already_facing ld a, PLAYER_DIR_RIGHT ld [wPlayerMovingDirection], a diff --git a/scripts/PalletTown.asm b/scripts/PalletTown.asm index dd898ac61..4d5bebf0d 100644 --- a/scripts/PalletTown.asm +++ b/scripts/PalletTown.asm @@ -45,7 +45,7 @@ PalletTownDefaultScript: PalletTownOakHeyWaitScript: xor a - ld [wcf0d], a + ld [wOakWalkedToPlayer], a ld a, TEXT_PALLETTOWN_OAK ldh [hSpriteIndexOrTextID], a call DisplayTextID @@ -96,8 +96,8 @@ PalletTownOakNotSafeComeWithMeScript: ret nz xor a ; ld a, SPRITE_FACING_DOWN ld [wSpritePlayerStateData1FacingDirection], a - ld a, 1 - ld [wcf0d], a + ld a, TRUE + ld [wOakWalkedToPlayer], a ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ld a, TEXT_PALLETTOWN_OAK @@ -161,7 +161,7 @@ PalletTown_TextPointers: PalletTownOakText: text_asm - ld a, [wcf0d] + ld a, [wOakWalkedToPlayer] and a jr nz, .next ld a, 1 diff --git a/scripts/Route22.asm b/scripts/Route22.asm index abf6c8e4d..1e575e43f 100644 --- a/scripts/Route22.asm +++ b/scripts/Route22.asm @@ -38,7 +38,7 @@ Route22GetRivalTrainerNoByStarterScript: Route22MoveRivalRightScript: ld de, Route22RivalMovementData - ld a, [wcf0d] + ld a, [wSavedCoordIndex] cp $1 jr z, .skip_first_right inc de @@ -62,7 +62,7 @@ Route22DefaultScript: call ArePlayerCoordsInArray ret nc ld a, [wCoordIndex] - ld [wcf0d], a + ld [wSavedCoordIndex], a xor a ldh [hJoyHeld], a ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN @@ -107,8 +107,8 @@ Route22Rival1StartBattleScript: ld a, [wd730] bit 0, a ret nz - ld a, [wcf0d] - cp $1 + ld a, [wSavedCoordIndex] + cp 1 ; index of second, lower entry in Route22DefaultScript.Route22RivalBattleCoords jr nz, .set_rival_facing_right ld a, PLAYER_DIR_DOWN ld [wPlayerMovingDirection], a @@ -172,8 +172,8 @@ Route22Rival1AfterBattleScript: ld [wNewSoundID], a call PlaySound farcall Music_RivalAlternateStart - ld a, [wcf0d] - cp $1 + ld a, [wSavedCoordIndex] + cp 1 ; index of second, lower entry in Route22DefaultScript.Route22RivalBattleCoords jr nz, .exit_movement_2 call .RivalExit1Script jr .next_script @@ -263,8 +263,8 @@ Route22Rival2StartBattleScript: ret nz ld a, ROUTE22_RIVAL2 ldh [hSpriteIndex], a - ld a, [wcf0d] - cp $1 + ld a, [wSavedCoordIndex] + cp 1 ; index of second, lower entry in Route22DefaultScript.Route22RivalBattleCoords jr nz, .set_player_direction_left ld a, PLAYER_DIR_DOWN ld [wPlayerMovingDirection], a @@ -307,8 +307,8 @@ Route22Rival2AfterBattleScript: jp z, Route22SetDefaultScript ld a, ROUTE22_RIVAL2 ldh [hSpriteIndex], a - ld a, [wcf0d] - cp $1 + ld a, [wSavedCoordIndex] + cp 1 ; index of second, lower entry in Route22DefaultScript.Route22RivalBattleCoords jr nz, .set_player_direction_left ld a, PLAYER_DIR_DOWN ld [wPlayerMovingDirection], a @@ -331,8 +331,8 @@ Route22Rival2AfterBattleScript: ld [wNewSoundID], a call PlaySound farcall Music_RivalAlternateStartAndTempo - ld a, [wcf0d] - cp $1 + ld a, [wSavedCoordIndex] + cp 1 ; index of second, lower entry in Route22DefaultScript.Route22RivalBattleCoords jr nz, .exit_movement_2 call .RivalExit1Script jr .next_script diff --git a/scripts/SafariZoneGate.asm b/scripts/SafariZoneGate.asm index a0f9c1f41..14a8a79b7 100644 --- a/scripts/SafariZoneGate.asm +++ b/scripts/SafariZoneGate.asm @@ -29,14 +29,14 @@ SafariZoneGateDefaultScript: ld a, SPRITE_FACING_RIGHT ld [wSpritePlayerStateData1FacingDirection], a ld a, [wCoordIndex] - cp $1 + cp 1 ; index of second, lower entry in .PlayerNextToSafariZoneWorker1CoordsArray jr z, .player_not_next_to_worker ld a, SCRIPT_SAFARIZONEGATE_WOULD_YOU_LIKE_TO_JOIN ld [wSafariZoneGateCurScript], a ret .player_not_next_to_worker ld a, D_RIGHT - ld c, $1 + ld c, 1 call SafariZoneEntranceAutoWalk ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a @@ -88,7 +88,7 @@ SafariZoneGateLeavingSafariScript: xor a ld [wNumSafariBalls], a ld a, D_DOWN - ld c, $3 + ld c, 3 call SafariZoneEntranceAutoWalk ld a, SCRIPT_SAFARIZONEGATE_PLAYER_MOVING_DOWN ld [wSafariZoneGateCurScript], a @@ -113,7 +113,7 @@ SafariZoneGateSetScriptAfterMoveScript: call SafariZoneGateReturnSimulatedJoypadStateScript ret nz call Delay3 - ld a, [wcf0d] + ld a, [wNextSafariZoneGateScript] ld [wSafariZoneGateCurScript], a ret @@ -236,11 +236,11 @@ SafariZoneGateSafariZoneWorker1LeavingEarlyText: xor a ld [wSpritePlayerStateData1FacingDirection], a ld a, D_DOWN - ld c, $3 + ld c, 3 call SafariZoneEntranceAutoWalk ResetEvents EVENT_SAFARI_GAME_OVER, EVENT_IN_SAFARI_ZONE - ld a, $0 - ld [wcf0d], a + ld a, SCRIPT_SAFARIZONEGATE_DEFAULT + ld [wNextSafariZoneGateScript], a jr .set_current_script .not_ready_to_leave ld hl, .GoodLuckText @@ -248,10 +248,10 @@ SafariZoneGateSafariZoneWorker1LeavingEarlyText: ld a, SPRITE_FACING_UP ld [wSpritePlayerStateData1FacingDirection], a ld a, D_UP - ld c, $1 + ld c, 1 call SafariZoneEntranceAutoWalk ld a, SCRIPT_SAFARIZONEGATE_LEAVING_SAFARI - ld [wcf0d], a + ld [wNextSafariZoneGateScript], a .set_current_script ld a, SCRIPT_SAFARIZONEGATE_SET_SCRIPT_AFTER_MOVE ld [wSafariZoneGateCurScript], a diff --git a/scripts/SilphCo11F.asm b/scripts/SilphCo11F.asm index 1a2978a8a..778283c53 100644 --- a/scripts/SilphCo11F.asm +++ b/scripts/SilphCo11F.asm @@ -170,7 +170,7 @@ SilphCo11FDefaultScript: call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers ld a, [wCoordIndex] - ld [wcf0d], a + ld [wSavedCoordIndex], a xor a ldh [hJoyHeld], a ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN @@ -209,8 +209,8 @@ SilphCo11FGiovanniAfterBattleScript: ld a, [wIsInBattle] cp $ff jp z, SilphCo11FResetCurScript - ld a, [wcf0d] - cp $1 + ld a, [wSavedCoordIndex] + cp 1 ; index of second, upper-right entry in SilphCo11FDefaultScript.PlayerCoordsArray jr z, .face_player_up ld a, PLAYER_DIR_LEFT ld b, SPRITE_FACING_RIGHT @@ -242,8 +242,8 @@ SilphCo11FGiovanniBattleFacingScript: ld a, SILPHCO11F_GIOVANNI ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF - ld a, [wcf0d] - cp $1 + ld a, [wSavedCoordIndex] + cp 1 ; index of second, upper-right entry in SilphCo11FDefaultScript.PlayerCoordsArray jr z, .face_player_up ld a, PLAYER_DIR_LEFT ld b, SPRITE_FACING_RIGHT diff --git a/scripts/SilphCo7F.asm b/scripts/SilphCo7F.asm index c6afd27a4..bfa788473 100644 --- a/scripts/SilphCo7F.asm +++ b/scripts/SilphCo7F.asm @@ -145,8 +145,8 @@ SilphCo7FDefaultScript: call SetSpriteMovementBytesToFF ld de, .RivalMovementUp ld a, [wCoordIndex] - ld [wcf0d], a - cp $1 + ld [wSavedCoordIndex], a + cp 1 ; index of second, lower entry in .RivalEncounterCoordinates jr z, .full_rival_movement inc de .full_rival_movement @@ -225,8 +225,8 @@ SilphCo7FRivalAfterBattleScript: call PlaySound farcall Music_RivalAlternateStart ld de, .RivalWalkAroundPlayerMovement - ld a, [wcf0d] - cp $1 + ld a, [wSavedCoordIndex] + cp 1 ; index of second, lower entry in SilphCo7FDefaultScript.RivalEncounterCoordinates jr nz, .walk_around_player ld de, .RivalExitRightMovement .walk_around_player diff --git a/scripts/VermilionCity.asm b/scripts/VermilionCity.asm index 4c8a0b18a..9d8002334 100644 --- a/scripts/VermilionCity.asm +++ b/scripts/VermilionCity.asm @@ -47,7 +47,7 @@ VermilionCityDefaultScript: ret nc xor a ldh [hJoyHeld], a - ld [wcf0d], a + ld [wSavedCoordIndex], a ; unnecessary ld a, TEXT_VERMILIONCITY_SAILOR1 ldh [hSpriteIndexOrTextID], a call DisplayTextID From e8868d53e929e451c699a2ee491569d49fd9050a Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Mon, 20 Nov 2023 19:05:09 -0500 Subject: [PATCH 39/53] Have palfix.py always output grayscale Fixes #431 --- tools/palfix.py | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/tools/palfix.py b/tools/palfix.py index e78419586..3a997d544 100755 --- a/tools/palfix.py +++ b/tools/palfix.py @@ -4,10 +4,9 @@ """ Usage: python palfix.py image.png -Fix the palette format of the input image. Colored images (Gen 2 Pokémon or -trainer sprites) will become indexed, with a palette sorted {white, light -color, dark color, black}. Grayscale images (all Gen 1 images) will become -two-bit grayscale. +Fix the palette format of the input image to two-bit grayscale. +Colored images will have their palette sorted {white, light +color, dark color, black}. """ import sys @@ -18,10 +17,6 @@ def rgb8_to_rgb5(c): r, g, b = c return (r // 8, g // 8, b // 8) -def rgb5_to_rgb8(c): - r, g, b = c - return (r * 8 + r // 4, g * 8 + g // 4, b * 8 + b // 4) - def invert(c): r, g, b = c return (31 - r, 31 - g, 31 - b) @@ -33,10 +28,6 @@ def luminance(c): def rgb5_pixels(row): yield from (rgb8_to_rgb5(row[x:x+3]) for x in range(0, len(row), 4)) -def is_grayscale(palette): - return (palette == ((31, 31, 31), (21, 21, 21), (10, 10, 10), (0, 0, 0)) or - palette == ((31, 31, 31), (20, 20, 20), (10, 10, 10), (0, 0, 0))) - def fix_pal(filename): with open(filename, 'rb') as file: width, height, rows = png.Reader(file).asRGBA8()[:3] @@ -52,13 +43,8 @@ def fix_pal(filename): return False palette = tuple(sorted(colors | b_and_w, key=luminance, reverse=True)) assert len(palette) == 4 - rows = [list(map(palette.index, rgb5_pixels(row))) for row in rows] - if is_grayscale(palette): - rows = [[3 - c for c in row] for row in rows] - writer = png.Writer(width, height, greyscale=True, bitdepth=2, compression=9) - else: - palette = tuple(map(rgb5_to_rgb8, palette)) - writer = png.Writer(width, height, palette=palette, bitdepth=8, compression=9) + rows = [[3 - palette.index(c) for c in rgb5_pixels(row)] for row in rows] + writer = png.Writer(width, height, greyscale=True, bitdepth=2, compression=9) with open(filename, 'wb') as file: writer.write(file, rows) return True From 100e0a76fb338d994f4a6f99c4967f22e425299e Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Mon, 20 Nov 2023 19:25:49 -0500 Subject: [PATCH 40/53] List unidentified labels in Discord webhook --- .github/webhook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/webhook.sh b/.github/webhook.sh index ce454a499..2ba63dbbf 100755 --- a/.github/webhook.sh +++ b/.github/webhook.sh @@ -2,7 +2,7 @@ set -e # Report unnamed symbols -content="$(tools/unnamed.py -r . pokered.sym | head)" +content="$(tools/unnamed.py -r . -l 30 pokered.sym | head)" curl -H 'Content-Type: application/json' -X POST "$DISCORD_WEBHOOK_URL" -d@- << EOF { From d3e713f6c6d8cea16dfbae0f10801903eed3ec27 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Mon, 20 Nov 2023 21:03:38 -0600 Subject: [PATCH 41/53] Fix event check --- scripts/OaksLab.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm index 30ee93ed6..9173dd946 100644 --- a/scripts/OaksLab.asm +++ b/scripts/OaksLab.asm @@ -771,7 +771,7 @@ OaksLabRivalText: call PrintText jr .done .beforeChooseMon - bit 2, a + CheckEventReuseA EVENT_GOT_STARTER jr nz, .afterChooseMon ld hl, .GoAheadAndChooseText call PrintText From 66b6c5197140dfc966bad951c70796b33ae9edae Mon Sep 17 00:00:00 2001 From: Rotekoppen Date: Tue, 21 Nov 2023 23:52:04 +0100 Subject: [PATCH 42/53] Update install instructions for Arch Linux RGBDS is now available in the official repos as community/rgbds --- INSTALL.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index e0204866a..a5c7efb5a 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -101,11 +101,9 @@ Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building To install the software required for **pokered**: ```bash -sudo pacman -S make gcc git +sudo pacman -S make gcc git rgbds ``` -Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#pre-built) for Arch Linux to install **rgbds 0.6.1**. - If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.6.1** from source. ### Termux From 9827190aea7ce6a6f30d6a0c04eda34934cbd35e Mon Sep 17 00:00:00 2001 From: BlueZangoose <113498143+BlueZangoose@users.noreply.github.com> Date: Wed, 22 Nov 2023 00:52:53 +0000 Subject: [PATCH 43/53] Use MEGA_PUNCH constant in explosion animation routine (#434) * Use MEGA_PUNCH constant in explosion animation routine * Add AnimationType constants and assert --------- Co-authored-by: vulcandth --- constants/battle_anim_constants.asm | 8 ++++++++ engine/battle/core.asm | 14 ++++++++------ engine/battle/effects.asm | 4 ++-- includes.asm | 1 + 4 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 constants/battle_anim_constants.asm diff --git a/constants/battle_anim_constants.asm b/constants/battle_anim_constants.asm new file mode 100644 index 000000000..db57d6c4f --- /dev/null +++ b/constants/battle_anim_constants.asm @@ -0,0 +1,8 @@ +; AnimationTypePointerTable indexes (see engine/battle/animations.asm) + const_def 1 + const ANIMATIONTYPE_SHAKE_SCREEN_VERTICALLY ; 1 + const ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_HEAVY ; 2 + const ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_SLOW ; 3 + const ANIMATIONTYPE_BLINK_ENEMY_MON_SPRITE ; 4 + const ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_LIGHT ; 5 + const ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_SLOW_2 ; 6 diff --git a/engine/battle/core.asm b/engine/battle/core.asm index f976674a4..19ebdfcfa 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -3154,9 +3154,9 @@ handleIfPlayerMoveMissed: getPlayerAnimationType: ld a, [wPlayerMoveEffect] and a - ld a, 4 ; move has no effect other than dealing damage + ld a, ANIMATIONTYPE_BLINK_ENEMY_MON_SPRITE ; move has no effect other than dealing damage jr z, playPlayerMoveAnimation - ld a, 5 ; move has effect + ld a, ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_LIGHT ; move has effect playPlayerMoveAnimation: push af ld a, [wPlayerBattleStatus2] @@ -5681,9 +5681,9 @@ handleIfEnemyMoveMissed: GetEnemyAnimationType: ld a, [wEnemyMoveEffect] and a - ld a, $1 + ld a, ANIMATIONTYPE_SHAKE_SCREEN_VERTICALLY jr z, playEnemyMoveAnimation - ld a, $2 + ld a, ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_HEAVY jr playEnemyMoveAnimation handleExplosionMiss: call SwapPlayerAndEnemyLevels @@ -6752,9 +6752,11 @@ HandleExplodingAnimation: ld a, [wMoveMissed] and a ret nz - ld a, 5 + ld a, ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_LIGHT ld [wAnimationType], a - + assert ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_LIGHT == MEGA_PUNCH + ; ld a, MEGA_PUNCH +; fallthrough PlayMoveAnimation: ld [wAnimationID], a vc_hook_red Reduce_move_anim_flashing_Confusion diff --git a/engine/battle/effects.asm b/engine/battle/effects.asm index e89d19f3e..b94b12d22 100644 --- a/engine/battle/effects.asm +++ b/engine/battle/effects.asm @@ -1460,9 +1460,9 @@ PlayBattleAnimation2: ld [wAnimationID], a ldh a, [hWhoseTurn] and a - ld a, $6 + ld a, ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_SLOW_2 jr z, .storeAnimationType - ld a, $3 + ld a, ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_SLOW .storeAnimationType ld [wAnimationType], a jp PlayBattleAnimationGotID diff --git a/includes.asm b/includes.asm index 271828b95..6253859b6 100644 --- a/includes.asm +++ b/includes.asm @@ -23,6 +23,7 @@ INCLUDE "constants/serial_constants.asm" INCLUDE "constants/script_constants.asm" INCLUDE "constants/type_constants.asm" INCLUDE "constants/battle_constants.asm" +INCLUDE "constants/battle_anim_constants.asm" INCLUDE "constants/move_constants.asm" INCLUDE "constants/move_animation_constants.asm" INCLUDE "constants/move_effect_constants.asm" From a681f718ac0fa6077c45ad793968a8f0cbfb93c7 Mon Sep 17 00:00:00 2001 From: SatoMew Date: Wed, 22 Nov 2023 00:54:39 +0000 Subject: [PATCH 44/53] Rename `EV_*` constants to `EVOLVE_*` like pokecrystal (#407) --- constants/pokemon_data_constants.asm | 6 +- data/pokemon/evos_moves.asm | 144 +++++++++++++-------------- engine/menus/party_menu.asm | 2 +- engine/pokemon/evos_moves.asm | 6 +- 4 files changed, 79 insertions(+), 79 deletions(-) diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 028d67113..3c594ae1b 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -79,9 +79,9 @@ DEF HOF_TEAM_CAPACITY EQU 50 ; Evolution types const_def 1 - const EV_LEVEL ; 1 - const EV_ITEM ; 2 - const EV_TRADE ; 3 + const EVOLVE_LEVEL ; 1 + const EVOLVE_ITEM ; 2 + const EVOLVE_TRADE ; 3 DEF MAX_EVOLUTIONS EQU 3 DEF EVOLUTION_SIZE EQU 4 diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index c5fcc2927..a555579e1 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -220,7 +220,7 @@ KangaskhanEvosMoves: NidoranMEvosMoves: ; Evolutions - db EV_LEVEL, 16, NIDORINO + db EVOLVE_LEVEL, 16, NIDORINO db 0 ; Learnset db 8, HORN_ATTACK @@ -233,7 +233,7 @@ NidoranMEvosMoves: ClefairyEvosMoves: ; Evolutions - db EV_ITEM, MOON_STONE, 1, CLEFABLE + db EVOLVE_ITEM, MOON_STONE, 1, CLEFABLE db 0 ; Learnset db 13, SING @@ -246,7 +246,7 @@ ClefairyEvosMoves: SpearowEvosMoves: ; Evolutions - db EV_LEVEL, 20, FEAROW + db EVOLVE_LEVEL, 20, FEAROW db 0 ; Learnset db 9, LEER @@ -258,7 +258,7 @@ SpearowEvosMoves: VoltorbEvosMoves: ; Evolutions - db EV_LEVEL, 30, ELECTRODE + db EVOLVE_LEVEL, 30, ELECTRODE db 0 ; Learnset db 17, SONICBOOM @@ -292,7 +292,7 @@ SlowbroEvosMoves: IvysaurEvosMoves: ; Evolutions - db EV_LEVEL, 32, VENUSAUR + db EVOLVE_LEVEL, 32, VENUSAUR db 0 ; Learnset db 7, LEECH_SEED @@ -324,7 +324,7 @@ LickitungEvosMoves: ExeggcuteEvosMoves: ; Evolutions - db EV_ITEM, LEAF_STONE, 1, EXEGGUTOR + db EVOLVE_ITEM, LEAF_STONE, 1, EXEGGUTOR db 0 ; Learnset db 25, REFLECT @@ -337,7 +337,7 @@ ExeggcuteEvosMoves: GrimerEvosMoves: ; Evolutions - db EV_LEVEL, 38, MUK + db EVOLVE_LEVEL, 38, MUK db 0 ; Learnset db 30, POISON_GAS @@ -358,7 +358,7 @@ GengarEvosMoves: NidoranFEvosMoves: ; Evolutions - db EV_LEVEL, 16, NIDORINA + db EVOLVE_LEVEL, 16, NIDORINA db 0 ; Learnset db 8, SCRATCH @@ -380,7 +380,7 @@ NidoqueenEvosMoves: CuboneEvosMoves: ; Evolutions - db EV_LEVEL, 28, MAROWAK + db EVOLVE_LEVEL, 28, MAROWAK db 0 ; Learnset db 25, LEER @@ -392,7 +392,7 @@ CuboneEvosMoves: RhyhornEvosMoves: ; Evolutions - db EV_LEVEL, 42, RHYDON + db EVOLVE_LEVEL, 42, RHYDON db 0 ; Learnset db 30, STOMP @@ -444,7 +444,7 @@ GyaradosEvosMoves: ShellderEvosMoves: ; Evolutions - db EV_ITEM, WATER_STONE, 1, CLOYSTER + db EVOLVE_ITEM, WATER_STONE, 1, CLOYSTER db 0 ; Learnset db 18, SUPERSONIC @@ -456,7 +456,7 @@ ShellderEvosMoves: TentacoolEvosMoves: ; Evolutions - db EV_LEVEL, 30, TENTACRUEL + db EVOLVE_LEVEL, 30, TENTACRUEL db 0 ; Learnset db 7, SUPERSONIC @@ -471,7 +471,7 @@ TentacoolEvosMoves: GastlyEvosMoves: ; Evolutions - db EV_LEVEL, 25, HAUNTER + db EVOLVE_LEVEL, 25, HAUNTER db 0 ; Learnset db 27, HYPNOSIS @@ -492,7 +492,7 @@ ScytherEvosMoves: StaryuEvosMoves: ; Evolutions - db EV_ITEM, WATER_STONE, 1, STARMIE + db EVOLVE_ITEM, WATER_STONE, 1, STARMIE db 0 ; Learnset db 17, WATER_GUN @@ -554,7 +554,7 @@ MissingNo20EvosMoves: GrowlitheEvosMoves: ; Evolutions - db EV_ITEM, FIRE_STONE, 1, ARCANINE + db EVOLVE_ITEM, FIRE_STONE, 1, ARCANINE db 0 ; Learnset db 18, EMBER @@ -588,7 +588,7 @@ FearowEvosMoves: PidgeyEvosMoves: ; Evolutions - db EV_LEVEL, 18, PIDGEOTTO + db EVOLVE_LEVEL, 18, PIDGEOTTO db 0 ; Learnset db 5, SAND_ATTACK @@ -601,7 +601,7 @@ PidgeyEvosMoves: SlowpokeEvosMoves: ; Evolutions - db EV_LEVEL, 37, SLOWBRO + db EVOLVE_LEVEL, 37, SLOWBRO db 0 ; Learnset db 18, DISABLE @@ -614,7 +614,7 @@ SlowpokeEvosMoves: KadabraEvosMoves: ; Evolutions - db EV_TRADE, 1, ALAKAZAM + db EVOLVE_TRADE, 1, ALAKAZAM db 0 ; Learnset db 16, CONFUSION @@ -627,7 +627,7 @@ KadabraEvosMoves: GravelerEvosMoves: ; Evolutions - db EV_TRADE, 1, GOLEM + db EVOLVE_TRADE, 1, GOLEM db 0 ; Learnset db 11, DEFENSE_CURL @@ -652,7 +652,7 @@ ChanseyEvosMoves: MachokeEvosMoves: ; Evolutions - db EV_TRADE, 1, MACHAMP + db EVOLVE_TRADE, 1, MACHAMP db 0 ; Learnset db 20, LOW_KICK @@ -719,7 +719,7 @@ ParasectEvosMoves: PsyduckEvosMoves: ; Evolutions - db EV_LEVEL, 33, GOLDUCK + db EVOLVE_LEVEL, 33, GOLDUCK db 0 ; Learnset db 28, TAIL_WHIP @@ -731,7 +731,7 @@ PsyduckEvosMoves: DrowzeeEvosMoves: ; Evolutions - db EV_LEVEL, 26, HYPNO + db EVOLVE_LEVEL, 26, HYPNO db 0 ; Learnset db 12, DISABLE @@ -803,7 +803,7 @@ MagnetonEvosMoves: KoffingEvosMoves: ; Evolutions - db EV_LEVEL, 35, WEEZING + db EVOLVE_LEVEL, 35, WEEZING db 0 ; Learnset db 32, SLUDGE @@ -821,7 +821,7 @@ MissingNo38EvosMoves: MankeyEvosMoves: ; Evolutions - db EV_LEVEL, 28, PRIMEAPE + db EVOLVE_LEVEL, 28, PRIMEAPE db 0 ; Learnset db 15, KARATE_CHOP @@ -833,7 +833,7 @@ MankeyEvosMoves: SeelEvosMoves: ; Evolutions - db EV_LEVEL, 34, DEWGONG + db EVOLVE_LEVEL, 34, DEWGONG db 0 ; Learnset db 30, GROWL @@ -845,7 +845,7 @@ SeelEvosMoves: DiglettEvosMoves: ; Evolutions - db EV_LEVEL, 26, DUGTRIO + db EVOLVE_LEVEL, 26, DUGTRIO db 0 ; Learnset db 15, GROWL @@ -897,7 +897,7 @@ FarfetchdEvosMoves: VenonatEvosMoves: ; Evolutions - db EV_LEVEL, 31, VENOMOTH + db EVOLVE_LEVEL, 31, VENOMOTH db 0 ; Learnset db 24, POISONPOWDER @@ -939,7 +939,7 @@ MissingNo45EvosMoves: DoduoEvosMoves: ; Evolutions - db EV_LEVEL, 31, DODRIO + db EVOLVE_LEVEL, 31, DODRIO db 0 ; Learnset db 20, GROWL @@ -952,7 +952,7 @@ DoduoEvosMoves: PoliwagEvosMoves: ; Evolutions - db EV_LEVEL, 25, POLIWHIRL + db EVOLVE_LEVEL, 25, POLIWHIRL db 0 ; Learnset db 16, HYPNOSIS @@ -1010,7 +1010,7 @@ DittoEvosMoves: MeowthEvosMoves: ; Evolutions - db EV_LEVEL, 28, PERSIAN + db EVOLVE_LEVEL, 28, PERSIAN db 0 ; Learnset db 12, BITE @@ -1022,7 +1022,7 @@ MeowthEvosMoves: KrabbyEvosMoves: ; Evolutions - db EV_LEVEL, 28, KINGLER + db EVOLVE_LEVEL, 28, KINGLER db 0 ; Learnset db 20, VICEGRIP @@ -1052,7 +1052,7 @@ MissingNo51EvosMoves: VulpixEvosMoves: ; Evolutions - db EV_ITEM, FIRE_STONE, 1, NINETALES + db EVOLVE_ITEM, FIRE_STONE, 1, NINETALES db 0 ; Learnset db 16, QUICK_ATTACK @@ -1070,7 +1070,7 @@ NinetalesEvosMoves: PikachuEvosMoves: ; Evolutions - db EV_ITEM, THUNDER_STONE, 1, RAICHU + db EVOLVE_ITEM, THUNDER_STONE, 1, RAICHU db 0 ; Learnset db 9, THUNDER_WAVE @@ -1100,7 +1100,7 @@ MissingNo57EvosMoves: DratiniEvosMoves: ; Evolutions - db EV_LEVEL, 30, DRAGONAIR + db EVOLVE_LEVEL, 30, DRAGONAIR db 0 ; Learnset db 10, THUNDER_WAVE @@ -1112,7 +1112,7 @@ DratiniEvosMoves: DragonairEvosMoves: ; Evolutions - db EV_LEVEL, 55, DRAGONITE + db EVOLVE_LEVEL, 55, DRAGONITE db 0 ; Learnset db 10, THUNDER_WAVE @@ -1124,7 +1124,7 @@ DragonairEvosMoves: KabutoEvosMoves: ; Evolutions - db EV_LEVEL, 40, KABUTOPS + db EVOLVE_LEVEL, 40, KABUTOPS db 0 ; Learnset db 34, ABSORB @@ -1145,7 +1145,7 @@ KabutopsEvosMoves: HorseaEvosMoves: ; Evolutions - db EV_LEVEL, 32, SEADRA + db EVOLVE_LEVEL, 32, SEADRA db 0 ; Learnset db 19, SMOKESCREEN @@ -1180,7 +1180,7 @@ MissingNo5FEvosMoves: SandshrewEvosMoves: ; Evolutions - db EV_LEVEL, 22, SANDSLASH + db EVOLVE_LEVEL, 22, SANDSLASH db 0 ; Learnset db 10, SAND_ATTACK @@ -1203,7 +1203,7 @@ SandslashEvosMoves: OmanyteEvosMoves: ; Evolutions - db EV_LEVEL, 40, OMASTAR + db EVOLVE_LEVEL, 40, OMASTAR db 0 ; Learnset db 34, HORN_ATTACK @@ -1224,7 +1224,7 @@ OmastarEvosMoves: JigglypuffEvosMoves: ; Evolutions - db EV_ITEM, MOON_STONE, 1, WIGGLYTUFF + db EVOLVE_ITEM, MOON_STONE, 1, WIGGLYTUFF db 0 ; Learnset db 9, POUND @@ -1244,9 +1244,9 @@ WigglytuffEvosMoves: EeveeEvosMoves: ; Evolutions - db EV_ITEM, FIRE_STONE, 1, FLAREON - db EV_ITEM, THUNDER_STONE, 1, JOLTEON - db EV_ITEM, WATER_STONE, 1, VAPOREON + db EVOLVE_ITEM, FIRE_STONE, 1, FLAREON + db EVOLVE_ITEM, THUNDER_STONE, 1, JOLTEON + db EVOLVE_ITEM, WATER_STONE, 1, VAPOREON db 0 ; Learnset db 27, QUICK_ATTACK @@ -1299,7 +1299,7 @@ VaporeonEvosMoves: MachopEvosMoves: ; Evolutions - db EV_LEVEL, 28, MACHOKE + db EVOLVE_LEVEL, 28, MACHOKE db 0 ; Learnset db 20, LOW_KICK @@ -1311,7 +1311,7 @@ MachopEvosMoves: ZubatEvosMoves: ; Evolutions - db EV_LEVEL, 22, GOLBAT + db EVOLVE_LEVEL, 22, GOLBAT db 0 ; Learnset db 10, SUPERSONIC @@ -1323,7 +1323,7 @@ ZubatEvosMoves: EkansEvosMoves: ; Evolutions - db EV_LEVEL, 22, ARBOK + db EVOLVE_LEVEL, 22, ARBOK db 0 ; Learnset db 10, POISON_STING @@ -1335,7 +1335,7 @@ EkansEvosMoves: ParasEvosMoves: ; Evolutions - db EV_LEVEL, 24, PARASECT + db EVOLVE_LEVEL, 24, PARASECT db 0 ; Learnset db 13, STUN_SPORE @@ -1347,7 +1347,7 @@ ParasEvosMoves: PoliwhirlEvosMoves: ; Evolutions - db EV_ITEM, WATER_STONE, 1, POLIWRATH + db EVOLVE_ITEM, WATER_STONE, 1, POLIWRATH db 0 ; Learnset db 16, HYPNOSIS @@ -1368,14 +1368,14 @@ PoliwrathEvosMoves: WeedleEvosMoves: ; Evolutions - db EV_LEVEL, 7, KAKUNA + db EVOLVE_LEVEL, 7, KAKUNA db 0 ; Learnset db 0 KakunaEvosMoves: ; Evolutions - db EV_LEVEL, 10, BEEDRILL + db EVOLVE_LEVEL, 10, BEEDRILL db 0 ; Learnset db 0 @@ -1469,14 +1469,14 @@ MissingNo7AEvosMoves: CaterpieEvosMoves: ; Evolutions - db EV_LEVEL, 7, METAPOD + db EVOLVE_LEVEL, 7, METAPOD db 0 ; Learnset db 0 MetapodEvosMoves: ; Evolutions - db EV_LEVEL, 10, BUTTERFREE + db EVOLVE_LEVEL, 10, BUTTERFREE db 0 ; Learnset db 0 @@ -1568,7 +1568,7 @@ SnorlaxEvosMoves: MagikarpEvosMoves: ; Evolutions - db EV_LEVEL, 20, GYARADOS + db EVOLVE_LEVEL, 20, GYARADOS db 0 ; Learnset db 15, TACKLE @@ -1686,7 +1686,7 @@ MissingNo92EvosMoves: HaunterEvosMoves: ; Evolutions - db EV_TRADE, 1, GENGAR + db EVOLVE_TRADE, 1, GENGAR db 0 ; Learnset db 29, HYPNOSIS @@ -1695,7 +1695,7 @@ HaunterEvosMoves: AbraEvosMoves: ; Evolutions - db EV_LEVEL, 16, KADABRA + db EVOLVE_LEVEL, 16, KADABRA db 0 ; Learnset db 0 @@ -1714,7 +1714,7 @@ AlakazamEvosMoves: PidgeottoEvosMoves: ; Evolutions - db EV_LEVEL, 36, PIDGEOT + db EVOLVE_LEVEL, 36, PIDGEOT db 0 ; Learnset db 5, SAND_ATTACK @@ -1745,7 +1745,7 @@ StarmieEvosMoves: BulbasaurEvosMoves: ; Evolutions - db EV_LEVEL, 16, IVYSAUR + db EVOLVE_LEVEL, 16, IVYSAUR db 0 ; Learnset db 7, LEECH_SEED @@ -1792,7 +1792,7 @@ MissingNo9CEvosMoves: GoldeenEvosMoves: ; Evolutions - db EV_LEVEL, 33, SEAKING + db EVOLVE_LEVEL, 33, SEAKING db 0 ; Learnset db 19, SUPERSONIC @@ -1841,7 +1841,7 @@ MissingNoA2EvosMoves: PonytaEvosMoves: ; Evolutions - db EV_LEVEL, 40, RAPIDASH + db EVOLVE_LEVEL, 40, RAPIDASH db 0 ; Learnset db 30, TAIL_WHIP @@ -1866,7 +1866,7 @@ RapidashEvosMoves: RattataEvosMoves: ; Evolutions - db EV_LEVEL, 20, RATICATE + db EVOLVE_LEVEL, 20, RATICATE db 0 ; Learnset db 7, QUICK_ATTACK @@ -1887,7 +1887,7 @@ RaticateEvosMoves: NidorinoEvosMoves: ; Evolutions - db EV_ITEM, MOON_STONE, 1, NIDOKING + db EVOLVE_ITEM, MOON_STONE, 1, NIDOKING db 0 ; Learnset db 8, HORN_ATTACK @@ -1900,7 +1900,7 @@ NidorinoEvosMoves: NidorinaEvosMoves: ; Evolutions - db EV_ITEM, MOON_STONE, 1, NIDOQUEEN + db EVOLVE_ITEM, MOON_STONE, 1, NIDOQUEEN db 0 ; Learnset db 8, SCRATCH @@ -1913,7 +1913,7 @@ NidorinaEvosMoves: GeodudeEvosMoves: ; Evolutions - db EV_LEVEL, 25, GRAVELER + db EVOLVE_LEVEL, 25, GRAVELER db 0 ; Learnset db 11, DEFENSE_CURL @@ -1952,7 +1952,7 @@ MissingNoACEvosMoves: MagnemiteEvosMoves: ; Evolutions - db EV_LEVEL, 30, MAGNETON + db EVOLVE_LEVEL, 30, MAGNETON db 0 ; Learnset db 21, SONICBOOM @@ -1977,7 +1977,7 @@ MissingNoAFEvosMoves: CharmanderEvosMoves: ; Evolutions - db EV_LEVEL, 16, CHARMELEON + db EVOLVE_LEVEL, 16, CHARMELEON db 0 ; Learnset db 9, EMBER @@ -1990,7 +1990,7 @@ CharmanderEvosMoves: SquirtleEvosMoves: ; Evolutions - db EV_LEVEL, 16, WARTORTLE + db EVOLVE_LEVEL, 16, WARTORTLE db 0 ; Learnset db 8, BUBBLE @@ -2003,7 +2003,7 @@ SquirtleEvosMoves: CharmeleonEvosMoves: ; Evolutions - db EV_LEVEL, 36, CHARIZARD + db EVOLVE_LEVEL, 36, CHARIZARD db 0 ; Learnset db 9, EMBER @@ -2016,7 +2016,7 @@ CharmeleonEvosMoves: WartortleEvosMoves: ; Evolutions - db EV_LEVEL, 36, BLASTOISE + db EVOLVE_LEVEL, 36, BLASTOISE db 0 ; Learnset db 8, BUBBLE @@ -2065,7 +2065,7 @@ MonGhostEvosMoves: OddishEvosMoves: ; Evolutions - db EV_LEVEL, 21, GLOOM + db EVOLVE_LEVEL, 21, GLOOM db 0 ; Learnset db 15, POISONPOWDER @@ -2078,7 +2078,7 @@ OddishEvosMoves: GloomEvosMoves: ; Evolutions - db EV_ITEM, LEAF_STONE, 1, VILEPLUME + db EVOLVE_ITEM, LEAF_STONE, 1, VILEPLUME db 0 ; Learnset db 15, POISONPOWDER @@ -2100,7 +2100,7 @@ VileplumeEvosMoves: BellsproutEvosMoves: ; Evolutions - db EV_LEVEL, 21, WEEPINBELL + db EVOLVE_LEVEL, 21, WEEPINBELL db 0 ; Learnset db 13, WRAP @@ -2114,7 +2114,7 @@ BellsproutEvosMoves: WeepinbellEvosMoves: ; Evolutions - db EV_ITEM, LEAF_STONE, 1, VICTREEBEL + db EVOLVE_ITEM, LEAF_STONE, 1, VICTREEBEL db 0 ; Learnset db 13, WRAP diff --git a/engine/menus/party_menu.asm b/engine/menus/party_menu.asm index f77beb263..5a473ccf4 100644 --- a/engine/menus/party_menu.asm +++ b/engine/menus/party_menu.asm @@ -142,7 +142,7 @@ RedrawPartyMenu_:: jr z, .placeEvolutionStoneString ; if so, place the "NOT ABLE" string inc hl inc hl - cp EV_ITEM + cp EVOLVE_ITEM jr nz, .checkEvolutionsLoop ; if it's a stone evolution entry dec hl diff --git a/engine/pokemon/evos_moves.asm b/engine/pokemon/evos_moves.asm index 7e41d58d2..d6b51ee50 100644 --- a/engine/pokemon/evos_moves.asm +++ b/engine/pokemon/evos_moves.asm @@ -67,20 +67,20 @@ Evolution_PartyMonLoop: ; loop over party mons and a ; have we reached the end of the evolution data? jr z, Evolution_PartyMonLoop ld b, a ; evolution type - cp EV_TRADE + cp EVOLVE_TRADE jr z, .checkTradeEvo ; not trade evolution ld a, [wLinkState] cp LINK_STATE_TRADING jr z, Evolution_PartyMonLoop ; if trading, go the next mon ld a, b - cp EV_ITEM + cp EVOLVE_ITEM jr z, .checkItemEvo ld a, [wForceEvolution] and a jr nz, Evolution_PartyMonLoop ld a, b - cp EV_LEVEL + cp EVOLVE_LEVEL jr z, .checkLevel .checkTradeEvo ld a, [wLinkState] From 465b859c4c75ae7a36d532cc5d8186e96cc16311 Mon Sep 17 00:00:00 2001 From: RainbowMetalPigeon <118711812+RainbowMetalPigeon@users.noreply.github.com> Date: Tue, 21 Nov 2023 17:01:20 -0800 Subject: [PATCH 45/53] Replace some `$a` with `EFFECTIVE` (#399) --- engine/battle/core.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 19ebdfcfa..ed2c4b7a0 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -3076,7 +3076,7 @@ ExecutePlayerMove: ld [wMoveMissed], a ld [wMonIsDisobedient], a ld [wMoveDidntMiss], a - ld a, $a + ld a, EFFECTIVE ld [wDamageMultipliers], a ld a, [wActionResultOrTookBattleTurn] and a ; has the player already used the turn (e.g. by using an item, trying to run or switching pokemon) @@ -5602,7 +5602,7 @@ ExecuteEnemyMove: xor a ld [wMoveMissed], a ld [wMoveDidntMiss], a - ld a, $a + ld a, EFFECTIVE ld [wDamageMultipliers], a call CheckEnemyStatusConditions jr nz, .enemyHasNoSpecialConditions From d4e7a39dd89a32c7af13fed31b3178cc769fb797 Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Tue, 21 Nov 2023 20:15:30 -0500 Subject: [PATCH 46/53] Use some more constants in place of raw numbers --- constants/battle_constants.asm | 9 +++++++-- engine/battle/core.asm | 32 ++++++++++++++++---------------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index 2ae1cdeff..44a85e8dc 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -1,15 +1,20 @@ DEF MAX_LEVEL EQU 100 +; maximum moves known per mon DEF NUM_MOVES EQU 4 +; significant stat values +DEF BASE_STAT_LEVEL EQU 7 +DEF MAX_STAT_LEVEL EQU 13 + ; VitaminStats indexes (see data/battle/stat_names.asm) - const_def + const_def 1 const STAT_HEALTH const STAT_ATTACK const STAT_DEFENSE const STAT_SPEED const STAT_SPECIAL -DEF NUM_STATS EQU const_value +DEF NUM_STATS EQU const_value - 1 ; StatModTextStrings indexes (see data/battle/stat_mod_names.asm) const_def diff --git a/engine/battle/core.asm b/engine/battle/core.asm index ed2c4b7a0..b93b6fa77 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -18,7 +18,7 @@ SlidePlayerAndEnemySilhouettesOnScreen: call LoadFontTilePatterns call LoadHudAndHpBarAndStatusTilePatterns ld hl, vBGMap0 - ld bc, $400 + ld bc, BG_MAP_WIDTH * BG_MAP_HEIGHT .clearBackgroundLoop ld a, " " ld [hli], a @@ -29,9 +29,9 @@ SlidePlayerAndEnemySilhouettesOnScreen: ; copy the work RAM tile map to VRAM hlcoord 0, 0 ld de, vBGMap0 - ld b, 18 ; number of rows + ld b, SCREEN_HEIGHT .copyRowLoop - ld c, 20 ; number of columns + ld c, SCREEN_WIDTH .copyColumnLoop ld a, [hli] ld [de], a @@ -825,7 +825,7 @@ FaintEnemyPokemon: ; the enemy mon base stats are added to stat exp, so they are halved ; the base exp (which determines normal exp) is also halved ld hl, wEnemyMonBaseStats - ld b, $7 + ld b, NUM_STATS + 2 .halveExpDataLoop srl [hl] inc hl @@ -1259,7 +1259,7 @@ SlideTrainerPicOffScreen: dec c jr nz, .columnLoop pop hl - ld de, 20 + ld de, SCREEN_WIDTH add hl, de dec b jr nz, .rowLoop @@ -4183,7 +4183,7 @@ GetDamageVarsForPlayerAttack: and a ; check for critical hit jr z, .scaleStats ; in the case of a critical hit, reset the player's attack and the enemy's defense to their base values - ld c, 3 ; defense stat + ld c, STAT_DEFENSE call GetEnemyMonStat ldh a, [hProduct + 2] ld b, a @@ -4215,7 +4215,7 @@ GetDamageVarsForPlayerAttack: and a ; check for critical hit jr z, .scaleStats ; in the case of a critical hit, reset the player's and enemy's specials to their base values - ld c, 5 ; special stat + ld c, STAT_SPECIAL call GetEnemyMonStat ldh a, [hProduct + 2] ld b, a @@ -4304,7 +4304,7 @@ GetDamageVarsForEnemyAttack: ld b, a ld c, [hl] push bc - ld c, 2 ; attack stat + ld c, STAT_ATTACK call GetEnemyMonStat ld hl, hProduct + 2 pop bc @@ -4336,7 +4336,7 @@ GetDamageVarsForEnemyAttack: ld b, a ld c, [hl] push bc - ld c, 5 ; special stat + ld c, STAT_SPECIAL call GetEnemyMonStat ld hl, hProduct + 2 pop bc @@ -4380,7 +4380,7 @@ GetDamageVarsForEnemyAttack: ret ; get stat c of enemy mon -; c: stat to get (HP=1,Attack=2,Defense=3,Speed=4,Special=5) +; c: stat to get (STAT_* constant) GetEnemyMonStat: push de push bc @@ -5287,7 +5287,7 @@ AdjustDamageForMoveType: call Multiply ld a, 10 ldh [hDivisor], a - ld b, $04 + ld b, 4 call Divide ldh a, [hQuotient + 2] ld [hli], a @@ -5315,7 +5315,6 @@ AdjustDamageForMoveType: ; this doesn't take into account the effects that dual types can have ; (e.g. 4x weakness / resistance, weaknesses and resistances canceling) ; the result is stored in [wTypeEffectiveness] -; ($05 is not very effective, $10 is neutral, $14 is super effective) ; as far is can tell, this is only used once in some AI code to help decide which move to use AIGetTypeEffectiveness: ld a, [wEnemyMoveType] @@ -5324,8 +5323,10 @@ AIGetTypeEffectiveness: ld b, [hl] ; b = type 1 of player's pokemon inc hl ld c, [hl] ; c = type 2 of player's pokemon - ld a, $10 - ld [wTypeEffectiveness], a ; initialize to neutral effectiveness + ; initialize to neutral effectiveness + ; bug: this is $10 (MORE_EFFECTIVE + 1) but should be 10 (EFFECTIVE) + ld a, MORE_EFFECTIVE + 1 + ld [wTypeEffectiveness], a ld hl, TypeEffects .loop ld a, [hli] @@ -6909,7 +6910,6 @@ _InitBattleCommon: db "@" _LoadTrainerPic: -; wd033-wd034 contain pointer to pic ld a, [wTrainerPicPointer] ld e, a ld a, [wTrainerPicPointer + 1] @@ -7043,7 +7043,7 @@ LoadMonBackPic: call InterlaceMergeSpriteBuffers ; combine the two buffers to a single 2bpp sprite ld hl, vSprites ld de, vBackPic - ld c, (2*SPRITEBUFFERSIZE)/16 ; count of 16-byte chunks to be copied + ld c, (2 * SPRITEBUFFERSIZE) / 16 ; count of 16-byte chunks to be copied ldh a, [hLoadedROMBank] ld b, a jp CopyVideoData From 13079730acb01df16724d9cc11d9592bc4a10958 Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Tue, 21 Nov 2023 20:21:14 -0500 Subject: [PATCH 47/53] Rename two unused items as `ITEM_XX` like pokecrystal --- constants/item_constants.asm | 8 ++++---- data/items/key_items.asm | 4 ++-- data/items/names.asm | 6 +++--- data/items/prices.asm | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/constants/item_constants.asm b/constants/item_constants.asm index e25aadba4..a7132670c 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -28,9 +28,9 @@ const SUPER_POTION ; $13 const POTION ; $14 const BOULDERBADGE ; $15 +DEF SAFARI_BAIT EQU BOULDERBADGE ; overload const CASCADEBADGE ; $16 -DEF SAFARI_BAIT EQU $15 ; overload -DEF SAFARI_ROCK EQU $16 ; overload +DEF SAFARI_ROCK EQU CASCADEBADGE ; overload const THUNDERBADGE ; $17 const RAINBOWBADGE ; $18 const SOULBADGE ; $19 @@ -52,13 +52,13 @@ DEF SAFARI_ROCK EQU $16 ; overload const DOME_FOSSIL ; $29 const HELIX_FOSSIL ; $2A const SECRET_KEY ; $2B - const UNUSED_ITEM ; $2C "?????" + const ITEM_2C ; $2C const BIKE_VOUCHER ; $2D const X_ACCURACY ; $2E const LEAF_STONE ; $2F const CARD_KEY ; $30 const NUGGET ; $31 - const PP_UP_2 ; $32 + const ITEM_32 ; $32 const POKE_DOLL ; $33 const FULL_HEAL ; $34 const REVIVE ; $35 diff --git a/data/items/key_items.asm b/data/items/key_items.asm index b0c4b1ad3..97f5f093c 100644 --- a/data/items/key_items.asm +++ b/data/items/key_items.asm @@ -43,13 +43,13 @@ KeyItemFlags: dbit TRUE ; DOME_FOSSIL dbit TRUE ; HELIX_FOSSIL dbit TRUE ; SECRET_KEY - dbit TRUE ; UNUSED_ITEM + dbit TRUE ; ITEM_2C dbit TRUE ; BIKE_VOUCHER dbit FALSE ; X_ACCURACY dbit FALSE ; LEAF_STONE dbit TRUE ; CARD_KEY dbit FALSE ; NUGGET - dbit FALSE ; PP_UP_2 + dbit FALSE ; ITEM_32 dbit FALSE ; POKE_DOLL dbit FALSE ; FULL_HEAL dbit FALSE ; REVIVE diff --git a/data/items/names.asm b/data/items/names.asm index af51446b5..44a21c38a 100644 --- a/data/items/names.asm +++ b/data/items/names.asm @@ -6,7 +6,7 @@ ItemNames:: li "POKé BALL" li "TOWN MAP" li "BICYCLE" - li "?????" + li "?????" ; SURFBOARD li "SAFARI BALL" li "POKéDEX" li "MOON STONE" @@ -43,13 +43,13 @@ ItemNames:: li "DOME FOSSIL" li "HELIX FOSSIL" li "SECRET KEY" - li "?????" + li "?????" ; ITEM_2C li "BIKE VOUCHER" li "X ACCURACY" li "LEAF STONE" li "CARD KEY" li "NUGGET" - li "PP UP" + li "PP UP" ; ITEM_32 li "POKé DOLL" li "FULL HEAL" li "REVIVE" diff --git a/data/items/prices.asm b/data/items/prices.asm index 6c1c2891c..d01c0b7e3 100644 --- a/data/items/prices.asm +++ b/data/items/prices.asm @@ -43,13 +43,13 @@ ItemPrices:: bcd3 0 ; DOME_FOSSIL bcd3 0 ; HELIX_FOSSIL bcd3 0 ; SECRET_KEY - bcd3 0 ; XXX + bcd3 0 ; ITEM_2C bcd3 0 ; BIKE_VOUCHER bcd3 950 ; X_ACCURACY bcd3 2100 ; LEAF_STONE bcd3 0 ; CARD_KEY bcd3 10000 ; NUGGET - bcd3 9800 ; XXX PP_UP + bcd3 9800 ; ITEM_32 bcd3 1000 ; POKE_DOLL bcd3 600 ; FULL_HEAL bcd3 1500 ; REVIVE From 0a616ae5606031ce27b4c987ae0e1d9da511cec9 Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Tue, 21 Nov 2023 20:33:03 -0500 Subject: [PATCH 48/53] Get rid of wEvosMoves, MAX_EVOLUTIONS, and EVOLUTION_SIZE Fixes #430 --- constants/pokemon_data_constants.asm | 3 --- data/pokemon/evos_moves.asm | 11 +++++++++-- engine/menus/party_menu.asm | 10 +++++----- ram/wram.asm | 4 ---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 3c594ae1b..5cc2d3449 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -83,9 +83,6 @@ DEF HOF_TEAM_CAPACITY EQU 50 const EVOLVE_ITEM ; 2 const EVOLVE_TRADE ; 3 -DEF MAX_EVOLUTIONS EQU 3 -DEF EVOLUTION_SIZE EQU 4 - ; wMonHGrowthRate values ; GrowthRateTable indexes (see data/growth_rates.asm) diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index a555579e1..d900dde69 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -1,5 +1,12 @@ -; See constants/pokemon_data_constants.asm -; The max number of evolutions per monster is MAX_EVOLUTIONS +; Evos+moves data structure: +; - Evolution methods: +; * db EVOLVE_LEVEL, level, species +; * db EVOLVE_ITEM, used item, min level (1), species +; * db EVOLVE_TRADE, min level (1), species +; - db 0 ; no more evolutions +; - Learnset (in increasing level order): +; * db level, move +; - db 0 ; no more level-up moves EvosMovesPointerTable: table_width 2, EvosMovesPointerTable diff --git a/engine/menus/party_menu.asm b/engine/menus/party_menu.asm index 5a473ccf4..46b828eb4 100644 --- a/engine/menus/party_menu.asm +++ b/engine/menus/party_menu.asm @@ -121,19 +121,19 @@ RedrawPartyMenu_:: rl b ld c, a add hl, bc - ld de, wEvosMoves + ld de, wcd6d ld a, BANK(EvosMovesPointerTable) ld bc, 2 call FarCopyData - ld hl, wEvosMoves + ld hl, wcd6d ld a, [hli] ld h, [hl] ld l, a - ld de, wEvosMoves + ld de, wcd6d ld a, BANK(EvosMovesPointerTable) - ld bc, wEvosMovesEnd - wEvosMoves + ld bc, 4 * 3 + 1 ; enough for Eevee's three 4-byte evolutions and 0 terminator call FarCopyData - ld hl, wEvosMoves + ld hl, wcd6d ld de, .notAbleToEvolveText ; loop through the pokemon's evolution entries .checkEvolutionsLoop diff --git a/ram/wram.asm b/ram/wram.asm index 32749db37..82a5f14cd 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -886,10 +886,6 @@ wNumMovesMinusOne:: db UNION wcd6d:: ds NAME_BUFFER_LENGTH ; buffer for various data -NEXTU -wEvosMoves:: ds MAX_EVOLUTIONS * EVOLUTION_SIZE + 1 -wEvosMovesEnd:: - NEXTU ds 4 ; temp variable used to print a move's current PP on the status screen From 41ec74e1f0481ec995a5ad9e9dd73e7ad91c181f Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Tue, 21 Nov 2023 20:36:00 -0500 Subject: [PATCH 49/53] Fix inaccurate comment in UpdateNPCSprite Fixes #404 --- engine/overworld/movement.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index eb186f1eb..fd26f9cbb 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -129,7 +129,7 @@ UpdateNPCSprite: and a jp z, InitializeSpriteStatus call CheckSpriteAvailability - ret c ; if sprite is invisible, on tile >=MAP_TILESET_SIZE, in grass or player is currently walking + ret c ; don't do anything if sprite is invisible ld h, HIGH(wSpriteStateData1) ldh a, [hCurrentSpriteOffset] ld l, a @@ -148,7 +148,7 @@ UpdateNPCSprite: jp z, UpdateSpriteInWalkingAnimation ; [x#SPRITESTATEDATA1_MOVEMENTSTATUS] == 3 ld a, [wWalkCounter] and a - ret nz ; don't do anything yet if player is currently moving (redundant, already tested in CheckSpriteAvailability) + ret nz ; don't do anything yet if player is currently moving call InitializeSpriteScreenPosition ld h, HIGH(wSpriteStateData2) ldh a, [hCurrentSpriteOffset] From a247120ac115c7c7f48d487dbaf9aaaf26e18757 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Tue, 21 Nov 2023 20:18:04 -0600 Subject: [PATCH 50/53] Fix a few usages of EFFECTIVE --- engine/battle/core.asm | 3 +-- engine/battle/display_effectiveness.asm | 2 +- engine/overworld/sprite_collisions.asm | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/engine/battle/core.asm b/engine/battle/core.asm index b93b6fa77..ca3294b81 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -5324,8 +5324,7 @@ AIGetTypeEffectiveness: inc hl ld c, [hl] ; c = type 2 of player's pokemon ; initialize to neutral effectiveness - ; bug: this is $10 (MORE_EFFECTIVE + 1) but should be 10 (EFFECTIVE) - ld a, MORE_EFFECTIVE + 1 + ld a, $10 ; bug: should be EFFECTIVE (10) ld [wTypeEffectiveness], a ld hl, TypeEffects .loop diff --git a/engine/battle/display_effectiveness.asm b/engine/battle/display_effectiveness.asm index b23695cf8..2879f8473 100644 --- a/engine/battle/display_effectiveness.asm +++ b/engine/battle/display_effectiveness.asm @@ -1,7 +1,7 @@ DisplayEffectiveness: ld a, [wDamageMultipliers] and $7F - cp $0A + cp EFFECTIVE ret z ld hl, SuperEffectiveText jr nc, .done diff --git a/engine/overworld/sprite_collisions.asm b/engine/overworld/sprite_collisions.asm index ffed37083..e6d894802 100644 --- a/engine/overworld/sprite_collisions.asm +++ b/engine/overworld/sprite_collisions.asm @@ -1,5 +1,5 @@ _UpdateSprites:: - ld h, $c1 + ld h, HIGH(wSpriteStateData1) inc h ld a, SPRITESTATEDATA2_IMAGEBASEOFFSET .spriteLoop From 3c768716001b6ee92e33458b4af5c2689dd35472 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Tue, 21 Nov 2023 20:25:12 -0600 Subject: [PATCH 51/53] Fix some map text constants --- data/maps/objects/FightingDojo.asm | 10 +++++----- data/maps/objects/PewterNidoranHouse.asm | 6 +++--- data/maps/objects/Route18.asm | 10 +++++----- data/maps/objects/SSAnneB1FRooms.asm | 6 +++--- scripts/Route18.asm | 10 +++++----- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/data/maps/objects/FightingDojo.asm b/data/maps/objects/FightingDojo.asm index 9d364a46d..daf1112c1 100644 --- a/data/maps/objects/FightingDojo.asm +++ b/data/maps/objects/FightingDojo.asm @@ -17,11 +17,11 @@ FightingDojo_Object: def_bg_events def_object_events - object_event 5, 3, SPRITE_HIKER, STAY, DOWN, 1, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_KARATE_MASTER - object_event 3, 4, SPRITE_HIKER, STAY, RIGHT, 2, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_BLACKBELT1 - object_event 3, 6, SPRITE_HIKER, STAY, RIGHT, 3, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_BLACKBELT2 - object_event 5, 5, SPRITE_HIKER, STAY, LEFT, 4, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_BLACKBELT3 - object_event 5, 7, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_BLACKBELT4 + object_event 5, 3, SPRITE_HIKER, STAY, DOWN, TEXT_FIGHTINGDOJO_KARATE_MASTER, OPP_BLACKBELT, 1 + object_event 3, 4, SPRITE_HIKER, STAY, RIGHT, TEXT_FIGHTINGDOJO_BLACKBELT1, OPP_BLACKBELT, 2 + object_event 3, 6, SPRITE_HIKER, STAY, RIGHT, TEXT_FIGHTINGDOJO_BLACKBELT2, OPP_BLACKBELT, 3 + object_event 5, 5, SPRITE_HIKER, STAY, LEFT, TEXT_FIGHTINGDOJO_BLACKBELT3, OPP_BLACKBELT, 4 + object_event 5, 7, SPRITE_HIKER, STAY, LEFT, TEXT_FIGHTINGDOJO_BLACKBELT4, OPP_BLACKBELT, 5 object_event 4, 1, SPRITE_POKE_BALL, STAY, NONE, TEXT_FIGHTINGDOJO_HITMONLEE_POKE_BALL object_event 5, 1, SPRITE_POKE_BALL, STAY, NONE, TEXT_FIGHTINGDOJO_HITMONCHAN_POKE_BALL diff --git a/data/maps/objects/PewterNidoranHouse.asm b/data/maps/objects/PewterNidoranHouse.asm index 15419cba7..8065c1485 100644 --- a/data/maps/objects/PewterNidoranHouse.asm +++ b/data/maps/objects/PewterNidoranHouse.asm @@ -13,8 +13,8 @@ PewterNidoranHouse_Object: def_bg_events def_object_events - object_event 4, 5, SPRITE_MONSTER, STAY, LEFT, PEWTERNIDORANHOUSE_NIDORAN - object_event 3, 5, SPRITE_LITTLE_BOY, STAY, RIGHT, PEWTERNIDORANHOUSE_LITTLE_BOY - object_event 1, 2, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, PEWTERNIDORANHOUSE_MIDDLE_AGED_MAN + object_event 4, 5, SPRITE_MONSTER, STAY, LEFT, TEXT_PEWTERNIDORANHOUSE_NIDORAN + object_event 3, 5, SPRITE_LITTLE_BOY, STAY, RIGHT, TEXT_PEWTERNIDORANHOUSE_LITTLE_BOY + object_event 1, 2, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, TEXT_PEWTERNIDORANHOUSE_MIDDLE_AGED_MAN def_warps_to PEWTER_NIDORAN_HOUSE diff --git a/data/maps/objects/Route18.asm b/data/maps/objects/Route18.asm index bf585e3d2..9226c9991 100644 --- a/data/maps/objects/Route18.asm +++ b/data/maps/objects/Route18.asm @@ -13,12 +13,12 @@ Route18_Object: warp_event 40, 9, ROUTE_18_GATE_1F, 4 def_bg_events - bg_event 43, 7, SCRIPT_ROUTE18_SIGN - bg_event 33, 5, SCRIPT_ROUTE18_CYCLING_ROAD_SIGN + bg_event 43, 7, TEXT_ROUTE18_SIGN + bg_event 33, 5, TEXT_ROUTE18_CYCLING_ROAD_SIGN def_object_events - object_event 36, 11, SPRITE_COOLTRAINER_M, STAY, RIGHT, SCRIPT_ROUTE18_COOLTRAINER_M1, OPP_BIRD_KEEPER, 8 - object_event 40, 15, SPRITE_COOLTRAINER_M, STAY, LEFT, SCRIPT_ROUTE18_COOLTRAINER_M2, OPP_BIRD_KEEPER, 9 - object_event 42, 13, SPRITE_COOLTRAINER_M, STAY, LEFT, SCRIPT_ROUTE18_COOLTRAINER_M3, OPP_BIRD_KEEPER, 10 + object_event 36, 11, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_ROUTE18_COOLTRAINER_M1, OPP_BIRD_KEEPER, 8 + object_event 40, 15, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE18_COOLTRAINER_M2, OPP_BIRD_KEEPER, 9 + object_event 42, 13, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE18_COOLTRAINER_M3, OPP_BIRD_KEEPER, 10 def_warps_to ROUTE_18 diff --git a/data/maps/objects/SSAnneB1FRooms.asm b/data/maps/objects/SSAnneB1FRooms.asm index 7846186e5..10b56e622 100644 --- a/data/maps/objects/SSAnneB1FRooms.asm +++ b/data/maps/objects/SSAnneB1FRooms.asm @@ -37,8 +37,8 @@ SSAnneB1FRooms_Object: object_event 0, 4, SPRITE_FISHER, STAY, RIGHT, TEXT_SSANNEB1FROOMS_FISHER, OPP_FISHER, 2 object_event 10, 13, SPRITE_SUPER_NERD, STAY, RIGHT, TEXT_SSANNEB1FROOMS_SUPER_NERD object_event 11, 12, SPRITE_MONSTER, STAY, NONE, TEXT_SSANNEB1FROOMS_MACHOKE - object_event 20, 2, SPRITE_POKE_BALL, STAY, NONE, 9, ETHER - object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 10, TM_REST - object_event 12, 11, SPRITE_POKE_BALL, STAY, NONE, 11, MAX_POTION + object_event 20, 2, SPRITE_POKE_BALL, STAY, NONE, TEXT_SSANNEB1FROOMS_ETHER, ETHER + object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, TEXT_SSANNEB1FROOMS_TM_REST, TM_REST + object_event 12, 11, SPRITE_POKE_BALL, STAY, NONE, TEXT_SSANNEB1FROOMS_MAX_POTION, MAX_POTION def_warps_to SS_ANNE_B1F_ROOMS diff --git a/scripts/Route18.asm b/scripts/Route18.asm index 26d660c80..43ae93184 100644 --- a/scripts/Route18.asm +++ b/scripts/Route18.asm @@ -15,11 +15,11 @@ Route18_ScriptPointers: Route18_TextPointers: def_text_pointers - dw_const Route18CooltrainerM1Text, SCRIPT_ROUTE18_COOLTRAINER_M1 - dw_const Route18CooltrainerM2Text, SCRIPT_ROUTE18_COOLTRAINER_M2 - dw_const Route18CooltrainerM3Text, SCRIPT_ROUTE18_COOLTRAINER_M3 - dw_const Route18SignText, SCRIPT_ROUTE18_SIGN - dw_const Route18CyclingRoadSignText, SCRIPT_ROUTE18_CYCLING_ROAD_SIGN + dw_const Route18CooltrainerM1Text, TEXT_ROUTE18_COOLTRAINER_M1 + dw_const Route18CooltrainerM2Text, TEXT_ROUTE18_COOLTRAINER_M2 + dw_const Route18CooltrainerM3Text, TEXT_ROUTE18_COOLTRAINER_M3 + dw_const Route18SignText, TEXT_ROUTE18_SIGN + dw_const Route18CyclingRoadSignText, TEXT_ROUTE18_CYCLING_ROAD_SIGN Route18TrainerHeaders: def_trainers From 1dcc16b34791510e478fc04675d79b2b6a63f9e8 Mon Sep 17 00:00:00 2001 From: vulcandth Date: Wed, 22 Nov 2023 15:09:21 +0000 Subject: [PATCH 52/53] Delete a couple EOL whitespace. --- engine/overworld/special_warps.asm | 2 +- ram/wram.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/overworld/special_warps.asm b/engine/overworld/special_warps.asm index c538938bd..0cc2a4749 100644 --- a/engine/overworld/special_warps.asm +++ b/engine/overworld/special_warps.asm @@ -14,7 +14,7 @@ PrepareForSpecialWarp:: .setNewGameMatWarp ; This is called by OakSpeech during StartNewGame and ; loads the first warp event for the specified map index. - ld a, PALLET_TOWN + ld a, PALLET_TOWN .next ld b, a ld a, [wd72d] diff --git a/ram/wram.asm b/ram/wram.asm index 82a5f14cd..3deb114ac 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -1796,7 +1796,7 @@ wUnusedD366:: db wCurMapHeader:: wCurMapTileset:: db -wCurMapHeight:: db +wCurMapHeight:: db wCurMapWidth:: db wCurMapDataPtr:: dw wCurMapTextPtr:: dw From d4d7b91aecf651b06d1f466ecc22b65da234a299 Mon Sep 17 00:00:00 2001 From: vulcandth Date: Wed, 22 Nov 2023 15:12:40 +0000 Subject: [PATCH 53/53] Convert a couple ds 2 to dw --- macros/ram.asm | 4 ++-- ram/hram.asm | 2 +- ram/wram.asm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/macros/ram.asm b/macros/ram.asm index df5dcf909..5f2b8a6f5 100644 --- a/macros/ram.asm +++ b/macros/ram.asm @@ -23,7 +23,7 @@ MACRO box_struct \1DefenseExp:: dw \1SpeedExp:: dw \1SpecialExp:: dw -\1DVs:: ds 2 +\1DVs:: dw \1PP:: ds NUM_MOVES ENDM @@ -49,7 +49,7 @@ MACRO battle_struct \1Type2:: db \1CatchRate:: db \1Moves:: ds NUM_MOVES -\1DVs:: ds 2 +\1DVs:: dw \1Level:: db \1Stats:: \1MaxHP:: dw diff --git a/ram/hram.asm b/ram/hram.asm index 72e9e13a2..fc2f45bc3 100644 --- a/ram/hram.asm +++ b/ram/hram.asm @@ -173,7 +173,7 @@ hMoney:: ds 3 ; BCD number NEXTU ; some code zeroes this for no reason when writing a coin amount hUnusedCoinsByte:: db -hCoins:: ds 2 ; BCD number +hCoins:: dw ; BCD number ENDU hDivideBCDDivisor:: diff --git a/ram/wram.asm b/ram/wram.asm index 3deb114ac..ecd0602bc 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -1904,7 +1904,7 @@ wNumHoFTeams:: db wUnusedD5A3:: db -wPlayerCoins:: ds 2 ; BCD +wPlayerCoins:: dw ; BCD ; bit array of missable objects. set = removed wMissableObjectFlags:: flag_array $100