From 573f9083c0fae753b2d7bc72ae00cdcabcf3f582 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Sun, 7 Jan 2024 18:34:07 +0000 Subject: [PATCH] All TMs are now renewable Added the TMs that weren't already available in either Celadon or Citrine to Citrine. --- data/maps/objects/CitrineRocketHouse.asm | 12 +++++++----- scripts/CitrineRocketHouse.asm | 12 ++++++++++-- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/data/maps/objects/CitrineRocketHouse.asm b/data/maps/objects/CitrineRocketHouse.asm index 70445c11..ad0c06d4 100644 --- a/data/maps/objects/CitrineRocketHouse.asm +++ b/data/maps/objects/CitrineRocketHouse.asm @@ -10,10 +10,12 @@ CitrineRocketHouse_Object: def_object_events object_event 4, 1, SPRITE_ROCKET, STAY, DOWN, 1 ; Mart Guy object_event 5, 1, SPRITE_ROCKET, STAY, DOWN, 2 ; Mart Guy - object_event 1, 6, SPRITE_ROCKET, STAY, RIGHT, 3 ; person - object_event 9, 3, SPRITE_ROCKET, STAY, UP, 4 ; person - object_event 9, 8, SPRITE_CAT, STAY, UP, 5 ; Meowth - object_event 9, 5, SPRITE_JAMES, STAY, DOWN, 6 ; James - object_event 7, 6, SPRITE_JESSIE, STAY, RIGHT, 7 ; Jessie + object_event 6, 1, SPRITE_ROCKET, STAY, DOWN, 3 ; Mart Guy + object_event 7, 1, SPRITE_ROCKET, STAY, DOWN, 4 ; Mart Guy + object_event 1, 6, SPRITE_ROCKET, STAY, RIGHT, 5 ; person + object_event 9, 3, SPRITE_ROCKET, STAY, UP, 6 ; person + object_event 9, 8, SPRITE_CAT, STAY, UP, 7 ; Meowth + object_event 9, 5, SPRITE_JAMES, STAY, DOWN, 8 ; James + object_event 7, 6, SPRITE_JESSIE, STAY, RIGHT, 9 ; Jessie def_warps_to CITRINE_ROCKET_HOUSE \ No newline at end of file diff --git a/scripts/CitrineRocketHouse.asm b/scripts/CitrineRocketHouse.asm index baff9072..f566e945 100644 --- a/scripts/CitrineRocketHouse.asm +++ b/scripts/CitrineRocketHouse.asm @@ -4,6 +4,8 @@ CitrineRocketHouse_Script: CitrineRocketHouse_TextPointers: dw MartGuy1Text dw MartGuy2Text + dw MartGuy3Text + dw MartGuy4Text dw RocketText1 dw RocketText2 dw MeowthText @@ -11,10 +13,16 @@ CitrineRocketHouse_TextPointers: dw JessieFight MartGuy1Text: - script_mart TM_SWORDS_DANCE, TM_TOXIC, TM_BODY_SLAM, TM_DOUBLE_EDGE, TM_BUBBLEBEAM, TM_ICE_BEAM, TM_BLIZZARD, TM_PAY_DAY, TM_COUNTER, TM_SEISMIC_TOSS, TM_MEGA_DRAIN, TM_THUNDERBOLT, TM_EARTHQUAKE, TM_DIG, + script_mart TM_SWORDS_DANCE, TM_WHIRLWIND, TM_TOXIC, TM_BODY_SLAM, TM_DOUBLE_EDGE, TM_BUBBLEBEAM, TM_WATER_GUN, TM_ICE_BEAM, TM_BLIZZARD, TM_HYPER_BEAM, TM_PAY_DAY, TM_COUNTER, TM_SEISMIC_TOSS, TM_RAGE MartGuy2Text: - script_mart TM_PSYCHIC_M, TM_FIRE_BLAST, TM_THUNDER_WAVE, TM_EXPLOSION, TM_ROCK_SLIDE, PROTECTOR, UP_GRADE, DUBIOUS_DISC, METAL_COAT, BLK_AUGURITE, DOME_FOSSIL, HELIX_FOSSIL, WING_FOSSIL, OLD_AMBER + script_mart TM_MEGA_DRAIN, TM_SOLARBEAM, TM_DRAGON_RAGE, TM_THUNDERBOLT, TM_THUNDER, TM_EARTHQUAKE, TM_DIG, TM_PSYCHIC_M, TM_TELEPORT, TM_MIMIC, TM_BIDE, TM_METRONOME, TM_SELFDESTRUCT, TM_FIRE_BLAST + +MartGuy3Text: + script_mart TM_SWIFT, TM_SKULL_BASH, TM_SOFTBOILED, TM_DREAM_EATER, TM_SKY_ATTACK, TM_REST, TM_THUNDER_WAVE, TM_PSYWAVE, TM_EXPLOSION, TM_ROCK_SLIDE, TM_TRI_ATTACK, TM_SUBSTITUTE + +MartGuy4Text: + script_mart PROTECTOR, UP_GRADE, DUBIOUS_DISC, METAL_COAT, BLK_AUGURITE, DOME_FOSSIL, HELIX_FOSSIL, WING_FOSSIL, OLD_AMBER RocketText1: text_far _RocketText1