From 919250bd73e93b7f0a152e138e82afa11a93f4ca Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+ShiraTheMogul@users.noreply.github.com> Date: Fri, 25 Jul 2025 17:31:12 +0100 Subject: [PATCH] revert `093bda0` --- constants/battle_anim_constants.asm | 2 - constants/battle_constants.asm | 2 +- constants/collision_constants.asm | 4 +- constants/item_constants.asm | 6 - constants/menu_constants.asm | 5 - constants/move_effect_constants.asm | 3 - constants/sprite_constants.asm | 1 - constants/wram_constants.asm | 13 +- data/battle/effect_command_pointers.asm | 1 - data/battle_anims/objects.asm | 2 - data/collision/collision_permissions.asm | 6 +- data/items/attributes.asm | 20 +- data/items/names.asm | 11 +- data/mon_menu.asm | 7 +- data/moves/animations.asm | 40 +-- data/moves/descriptions.asm | 4 +- data/moves/effects.asm | 65 ----- data/moves/effects_pointers.asm | 3 - data/moves/moves.asm | 8 +- data/sprites/player_sprites.asm | 3 - data/sprites/sprites.asm | 1 - data/text/common_2.asm | 61 +---- data/tilesets/cave_attributes.bin | Bin 1488 -> 1456 bytes data/tilesets/cave_collision.asm | 2 - data/tilesets/cave_metatiles.bin | Bin 1488 -> 1456 bytes data/tilesets/dark_cave_attributes.bin | Bin 1056 -> 1024 bytes data/tilesets/dark_cave_collision.asm | 2 - data/tilesets/dark_cave_metatiles.bin | 2 +- data/tilesets/kanto_attributes.bin | Bin 3040 -> 3024 bytes data/tilesets/kanto_collision.asm | 1 - data/tilesets/kanto_metatiles.bin | Bin 3040 -> 3024 bytes engine/battle/ai/scoring.asm | 44 +--- engine/battle/core.asm | 18 -- engine/battle/effect_commands.asm | 158 +++-------- engine/battle_anims/bg_effects.asm | 6 - engine/events/overworld.asm | 317 +---------------------- engine/gfx/color.asm | 2 - engine/overworld/events.asm | 11 +- engine/overworld/map_setup.asm | 14 - engine/overworld/player_movement.asm | 2 - engine/overworld/scripting.asm | 37 --- engine/overworld/tile_events.asm | 1 - engine/overworld/warp_connection.asm | 1 - engine/pokemon/mon_menu.asm | 42 --- engine/tilesets/tileset_anims.asm | 118 +-------- engine/tilesets/tileset_palettes.asm | 5 - gfx/sprites.asm | 1 - gfx/sprites/dive.png | Bin 343 -> 0 bytes gfx/tileset_palette_maps.asm | 3 - gfx/tilesets/bubble/1.png | Bin 88 -> 0 bytes gfx/tilesets/bubble/2.png | Bin 90 -> 0 bytes gfx/tilesets/bubble/3.png | Bin 86 -> 0 bytes gfx/tilesets/bubble/4.png | Bin 88 -> 0 bytes gfx/tilesets/bubble/5.png | Bin 86 -> 0 bytes gfx/tilesets/johto_palette_map.asm | 9 +- gfx/tilesets/seaweed/1.png | Bin 87 -> 0 bytes gfx/tilesets/seaweed/2.png | Bin 90 -> 0 bytes gfx/tilesets/water/deep-water.png | Bin 234 -> 0 bytes home/flag.asm | 6 - home/hm_moves.asm | 5 - home/map_objects.asm | 12 +- macros/scripts/battle_commands.asm | 1 - macros/scripts/events.asm | 24 -- maps/CinnabarIsland.ablk | 4 +- maps/RockTunnelB1F.ablk | 2 +- maps/SilverCaveRoom2.ablk | 4 +- ram/wram.asm | 7 +- 67 files changed, 94 insertions(+), 1035 deletions(-) delete mode 100644 gfx/sprites/dive.png delete mode 100644 gfx/tilesets/bubble/1.png delete mode 100644 gfx/tilesets/bubble/2.png delete mode 100644 gfx/tilesets/bubble/3.png delete mode 100644 gfx/tilesets/bubble/4.png delete mode 100644 gfx/tilesets/bubble/5.png delete mode 100644 gfx/tilesets/seaweed/1.png delete mode 100644 gfx/tilesets/seaweed/2.png delete mode 100644 gfx/tilesets/water/deep-water.png diff --git a/constants/battle_anim_constants.asm b/constants/battle_anim_constants.asm index c0194d0..518eb2c 100644 --- a/constants/battle_anim_constants.asm +++ b/constants/battle_anim_constants.asm @@ -220,8 +220,6 @@ DEF BATTLEANIM_BASE_TILE EQU 7 * 7 ; Maximum size of a pokemon picture const ANIM_OBJ_PLAYERHEAD_2ROW const ANIM_OBJ_COIN_HURL const ANIM_OBJ_SHOOTING_MIST - const ANIM_OBJ_WATER_SPORT_1 - const ANIM_OBJ_WATER_SPORT_2 DEF NUM_ANIM_OBJS EQU const_value ; DoBattleAnimFrame arguments (see engine/battle_anims/functions.asm) diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index be245a6..d18abd8 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -195,7 +195,7 @@ DEF ALL_STATUS EQU (1 << PSN) | (1 << BRN) | (1 << FRZ) | (1 << PAR) | SLP_MASK const SUBSTATUS_X_ACCURACY const SUBSTATUS_MIST const SUBSTATUS_FOCUS_ENERGY - const SUBSTATUS_UNDERWATER + const_skip const SUBSTATUS_SUBSTITUTE const SUBSTATUS_RECHARGE const SUBSTATUS_RAGE diff --git a/constants/collision_constants.asm b/constants/collision_constants.asm index 5bbdef0..c683ff6 100644 --- a/constants/collision_constants.asm +++ b/constants/collision_constants.asm @@ -10,7 +10,6 @@ DEF COLL_FLOOR EQU $00 DEF COLL_01 EQU $01 ; garbage DEF COLL_03 EQU $03 ; garbage DEF COLL_04 EQU $04 ; garbage -DEF COLL_ROCKY_WALL EQU $06 ; added using this tutorial https://github.com/pret/pokecrystal/wiki/Rock-Climb DEF COLL_WALL EQU $07 DEF COLL_CUT_08 EQU $08 ; unused DEF COLL_TALL_GRASS_10 EQU $10 ; unused @@ -27,8 +26,7 @@ DEF COLL_WHIRLPOOL EQU $24 DEF COLL_BUOY EQU $27 DEF COLL_CUT_28 EQU $28 ; garbage DEF COLL_WATER EQU $29 -DEF COLL_DIVE_DOWN EQU $2a -DEF COLL_DIVE_UP EQU $2b +DEF COLL_ICE_2B EQU $2b ; unused DEF COLL_WHIRLPOOL_2C EQU $2c ; unused DEF COLL_WATERFALL_RIGHT EQU $30 ; unused DEF COLL_WATERFALL_LEFT EQU $31 ; unused diff --git a/constants/item_constants.asm b/constants/item_constants.asm index 8adc55c..5d026d2 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -291,12 +291,6 @@ DEF HM01 EQU const_value add_hm FLASH ; f8 add_hm WHIRLPOOL ; f9 add_hm WATERFALL ; fa - ; nihon hms - Bounce is left out under the pretense of it being Waterfall. We are making it a field move, though. - add_hm UPROOT - add_hm WATER_SPORT - add_hm STRONG_ARM - add_hm BRIGHT_MOSS - add_hm WIND_RIDE ; ADDME: this is impossible to add until 16bit items exist. add once it's there. DEF NUM_HMS EQU __tmhm_value__ - NUM_TMS - 1 MACRO add_mt diff --git a/constants/menu_constants.asm b/constants/menu_constants.asm index 45d3738..63b0f5d 100644 --- a/constants/menu_constants.asm +++ b/constants/menu_constants.asm @@ -55,11 +55,6 @@ const MONMENUITEM_ROCKSMASH ; 12 const MONMENUITEM_MILKDRINK ; 13 const MONMENUITEM_SWEETSCENT ; 14 - const MONMENUITEM_UPROOT - const MONMENUITEM_WATER_SPORT - const MONMENUITEM_STRONG_ARM - const MONMENUITEM_BRIGHT_MOSS - const MONMENUITEM_WIND_RIDE ; options const MONMENUITEM_STATS ; 15 const MONMENUITEM_SWITCH ; 16 diff --git a/constants/move_effect_constants.asm b/constants/move_effect_constants.asm index f8e7921..a4dfd2a 100644 --- a/constants/move_effect_constants.asm +++ b/constants/move_effect_constants.asm @@ -158,7 +158,4 @@ const EFFECT_FLY const EFFECT_DEFENSE_CURL const EFFECT_COIN_HURL - const EFFECT_SURF - const EFFECT_WHIRLPOOL - const EFFECT_BOUNCE DEF NUM_MOVE_EFFECTS EQU const_value diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index e2f5dbb..d851509 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -145,7 +145,6 @@ const SPRITE_BALDING_GUY const SPRITE_GAMEBOY_GIRL const SPRITE_OVERWORLD_PIKACHU - const SPRITE_DIVE DEF NUM_OVERWORLD_SPRITES EQU const_value - 1 ; SpriteMons indexes (see data/sprites/sprite_mons.asm) diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index c5626fd..6437d17 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -267,13 +267,12 @@ DEF REGISTERED_POCKET EQU %11000000 DEF REGISTERED_NUMBER EQU %00111111 ; wPlayerState:: -DEF PLAYER_NORMAL EQU 0 -DEF PLAYER_BIKE EQU 1 -DEF PLAYER_SKATE EQU 2 -DEF PLAYER_SURF EQU 4 -DEF PLAYER_SURF_PIKA EQU 8 -DEF PLAYER_RUN EQU 16 -DEF PLAYER_WATER_SPORT EQU 16 +DEF PLAYER_NORMAL EQU 0 +DEF PLAYER_BIKE EQU 1 +DEF PLAYER_SKATE EQU 2 +DEF PLAYER_SURF EQU 4 +DEF PLAYER_SURF_PIKA EQU 8 +DEF PLAYER_RUN EQU 16 ; wCelebiEvent:: DEF CELEBIEVENT_FOREST_IS_RESTLESS_F EQU 2 diff --git a/data/battle/effect_command_pointers.asm b/data/battle/effect_command_pointers.asm index 63d611c..53ea3fd 100644 --- a/data/battle/effect_command_pointers.asm +++ b/data/battle/effect_command_pointers.asm @@ -181,5 +181,4 @@ BattleCommandPointers: dw BattleCommand_StartLoop dw BattleCommand_Curl dw BattleCommand_CoinHurlPower - dw BattleCommand_DoubleUnderwaterDamage assert_table_length NUM_EFFECT_COMMANDS diff --git a/data/battle_anims/objects.asm b/data/battle_anims/objects.asm index 7788359..e64f596 100644 --- a/data/battle_anims/objects.asm +++ b/data/battle_anims/objects.asm @@ -399,6 +399,4 @@ BattleAnimObjects: battleanimobj ABSOLUTE_X, $ff, BATTLEANIMFRAMESET_75, BATTLEANIMFUNC_COINHURL, PAL_BATTLE_OB_BROWN, ANIM_GFX_STATUS ; ANIM_OBJ_SHOOTING_MIST battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_MIST, BATTLEANIMFUNC_USER_TO_TARGET_DISAPPEAR, PAL_BATTLE_OB_GRAY, ANIM_GFX_HAZE - battleanimobj RELATIVE_X | X_FLIP, $a8, BATTLEANIMFRAMESET_67, BATTLEANIMFUNC_RAZOR_WIND, PAL_BATTLE_OB_BLUE, $1a ; ANIM_OBJ_DIVE_1 - battleanimobj RELATIVE_X | X_FLIP, $a8, BATTLEANIMFRAMESET_68, BATTLEANIMFUNC_NULL, PAL_BATTLE_OB_BLUE, $1a ; ANIM_OBJ_DIVE_2 assert_table_length NUM_ANIM_OBJS diff --git a/data/collision/collision_permissions.asm b/data/collision/collision_permissions.asm index a543e69..f2d28d8 100644 --- a/data/collision/collision_permissions.asm +++ b/data/collision/collision_permissions.asm @@ -7,7 +7,7 @@ TileCollisionTable:: db LAND_TILE ; COLL_03 db LAND_TILE ; COLL_04 db LAND_TILE ; 05 - db WALL_TILE ; COLL_ROCKY_WALL + db LAND_TILE ; 06 db WALL_TILE ; COLL_WALL db LAND_TILE ; COLL_CUT_08 db LAND_TILE ; 09 @@ -43,8 +43,8 @@ TileCollisionTable:: db WALL_TILE ; COLL_BUOY db WATER_TILE ; COLL_CUT_28 db WATER_TILE ; COLL_WATER - db WATER_TILE | TALK ; COLL_DIVE_DOWN - db LAND_TILE | TALK ; COLL_DIVE_UP + db WATERTILE | TALK ; COLL_DIVE_DOWN (unused) + db LANDTILE | TALK ; COLL_DIVE_UP (unused) db WATER_TILE | TALK ; COLL_WHIRLPOOL_2C db WATER_TILE ; 2d db WATER_TILE ; 2e diff --git a/data/items/attributes.asm b/data/items/attributes.asm index 5a2c59b..bc41826 100644 --- a/data/items/attributes.asm +++ b/data/items/attributes.asm @@ -510,17 +510,17 @@ ItemAttributes: item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; HM07 item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE -; HM08 - item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE -; HM09 - item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE -; HM10 - item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE -; HM11 - item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE -; HM12 - item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE assert_table_length NUM_ITEMS + NUM_TMS + NUM_HMS +; $fb + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE +; $fc + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE +; $fd + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE +; $fe + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE +; $ff + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; $00 item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE assert_table_length $100 diff --git a/data/items/names.asm b/data/items/names.asm index aaaecf3..45c76b9 100644 --- a/data/items/names.asm +++ b/data/items/names.asm @@ -252,12 +252,11 @@ ItemNames:: li "HM05" li "HM06" li "HM07" - li "HM08" - ; nihon hms - li "HM09" - li "HM10" ; BUG: HMSs over 9 display numbers incorrectly. Need to account for more than 9 HMs in bag display. The bug isn't here, it should be in the bag script. - li "HM11" - li "HM12" assert_list_length NUM_ITEMS + NUM_TMS + NUM_HMS + li "TERU-SAMA" + li "TERU-SAMA" + li "TERU-SAMA" + li "TERU-SAMA" + li "TERU-SAMA" li "?" assert_list_length $100 diff --git a/data/mon_menu.asm b/data/mon_menu.asm index 702fa4a..dec1293 100644 --- a/data/mon_menu.asm +++ b/data/mon_menu.asm @@ -14,13 +14,8 @@ MonMenuOptions: dbbw MONMENU_FIELD_MOVE, MONMENUITEM_SOFTBOILED, SOFTBOILED dbbw MONMENU_FIELD_MOVE, MONMENUITEM_HEADBUTT, HEADBUTT dbbw MONMENU_FIELD_MOVE, MONMENUITEM_ROCKSMASH, ROCK_SMASH - dbbw MONMENU_FIELD_MOVE, MONMENUITEM_MILKDRINK, MILK_DRINK ; TESTME: Am I high or is this wrong? + dbbw MONMENU_FIELD_MOVE, MONMENUITEM_MILKDRINK, MILK_DRINK dbbw MONMENU_FIELD_MOVE, MONMENUITEM_SWEETSCENT, SWEET_SCENT - dbbw MONMENU_FIELD_MOVE, MONMENUITEM_UPROOT, UPROOT - dbbw MONMENU_FIELD_MOVE, MONMENUITEM_WATER_SPORT, WATER_SPORT - dbbw MONMENU_FIELD_MOVE, MONMENUITEM_STRONG_ARM, STRONG_ARM - dbbw MONMENU_FIELD_MOVE, MONMENUITEM_BRIGHT_MOSS, BRIGHT_MOSS - dbbw MONMENU_FIELD_MOVE, MONMENUITEM_WIND_RIDE, WIND_RIDE ; options dbbw MONMENU_MENUOPTION, MONMENUITEM_STATS, .stats dbbw MONMENU_MENUOPTION, MONMENUITEM_SWITCH, .switch diff --git a/data/moves/animations.asm b/data/moves/animations.asm index 1918087..6c7d3e5 100644 --- a/data/moves/animations.asm +++ b/data/moves/animations.asm @@ -291,7 +291,7 @@ BattleAnimations:: dw BattleAnim_Psybeam ; Synchronize dw BattleAnim_StrongArm dw BattleAnim_Uppercut - dw BattleAnim_WaterSport + dw BattleAnim_WaterGun ; uhhh dw BattleAnim_Wind_Ride ; Wind Ride but real dw BattleAnim_Flash ; Dazzling Gleam dw BattleAnim_Sing ; Disarming Voice @@ -5055,40 +5055,4 @@ BattleAnim_ShowMon_1: anim_incobj 1 anim_wait 1 anim_ret - -BattleAnim_WaterSport: - anim_2gfx ANIM_GFX_SAND, ANIM_GFX_WATER - anim_if_param_equal $0, .hit - anim_if_param_equal $2, .fail - anim_call BattleAnim_TargetObj_2Row - anim_bgeffect ANIM_BG_DIG, $0, $1, $1 - anim_obj ANIM_OBJ_WATER_SPORT_2, 72, 104, $0 - anim_sound 0, 0, SFX_BUBBLEBEAM -.loop - anim_obj ANIM_OBJ_WATER_SPORT_1, 56, 104, $0 - anim_wait 16 - anim_loop 6, .loop - anim_wait 32 - anim_bgeffect ANIM_BG_HIDE_MON, $0, $1, $0 - anim_wait 8 - anim_incbgeffect ANIM_BG_DIG - anim_call BattleAnim_ShowMon_0 - anim_ret -.hit - anim_bgeffect ANIM_BG_SHAKE_SCREEN_X, $0, $0, $0 - anim_sound 0, 1, SFX_HYDRO_PUMP - anim_obj ANIM_OBJ_HYDRO_PUMP, 124, 72, $0 - anim_obj ANIM_OBJ_HYDRO_PUMP, 140, 72, $0 - anim_bgeffect ANIM_BG_SHAKE_SCREEN_X, $30, $0, $0 - anim_wait 12 - anim_obj ANIM_OBJ_HYDRO_PUMP, 132, 72, $0 - anim_bgeffect ANIM_BG_SHAKE_SCREEN_Y, $1c, $0, $0 - anim_wait 24 - anim_bgeffect ANIM_BG_SHAKE_SCREEN_Y, $8, $0, $0 - anim_wait 24 - anim_bgeffect ANIM_BG_WITHDRAW, $0, $0, $0 - anim_wait 16 -.fail - anim_bgeffect ANIM_BG_ENTER_MON, $0, $1, $0 - anim_wait 32 - anim_ret + diff --git a/data/moves/descriptions.asm b/data/moves/descriptions.asm index e647828..8b43d4e 100644 --- a/data/moves/descriptions.asm +++ b/data/moves/descriptions.asm @@ -1324,8 +1324,8 @@ UppercutDescription: next "cause flinching.@" WaterSportDescription: - db "Lowers FIRE move" - next "power to attack.@" + db "Lowers FIRE move" ; I really want to change this tbh + next "power.@" DazzlingGleamDescription: db "Flashes a bright" diff --git a/data/moves/effects.asm b/data/moves/effects.asm index 26c9e00..57a3b59 100644 --- a/data/moves/effects.asm +++ b/data/moves/effects.asm @@ -2097,68 +2097,3 @@ CoinHurl: ; Identical to Return, except it calculates damage differently, and do checkfaint buildopponentrage endmove - -Surf: - checkobedience - usedmovetext - doturn - critical - damagestats - damagecalc - stab - damagevariation - doubleunderwaterdamage - checkhit - moveanim - failuretext - applydamage - criticaltext - supereffectivetext - buildopponentrage - kingsrock - endmove - -Whirlpool: - checkobedience - usedmovetext - doturn - checkhit - critical - damagestats - damagecalc - stab - damagevariation - doubleunderwaterdamage - clearmissdamage - moveanim - failuretext - applydamage - criticaltext - supereffectivetext - buildopponentrage - traptarget - endmove - -Bounce: - checkcharge - checkobedience - doturn - charge - usedmovetext - critical - damagestats - damagecalc - stab - damagevariation - checkhit - moveanimnosub - raisesub - failuretext - applydamage - criticaltext - supereffectivetext - checkfaint - buildopponentrage - paralyzetarget - kingsrock - endmove diff --git a/data/moves/effects_pointers.asm b/data/moves/effects_pointers.asm index 6248f73..7661887 100644 --- a/data/moves/effects_pointers.asm +++ b/data/moves/effects_pointers.asm @@ -159,7 +159,4 @@ MoveEffectsPointers: dw Fly dw DefenseCurl dw CoinHurl - dw Surf - dw Whirlpool - dw Bounce assert_table_length NUM_MOVE_EFFECTS diff --git a/data/moves/moves.asm b/data/moves/moves.asm index bd26838..9d26639 100644 --- a/data/moves/moves.asm +++ b/data/moves/moves.asm @@ -74,7 +74,7 @@ Moves1: move EFFECT_MIST, 0, ICE, 100, 30, 0 ;MIST move EFFECT_NORMAL_HIT, 40, WATER, 100, 25, 0 ;WATER_GUN move EFFECT_NORMAL_HIT, 120, WATER, 80, 5, 0 ;HYDRO_PUMP - move EFFECT_SURF, 95, WATER, 100, 15, 0 ;SURF + move EFFECT_NORMAL_HIT, 95, WATER, 100, 15, 0 ;SURF move EFFECT_FREEZE_HIT, 95, ICE, 100, 10, 10 ;ICE_BEAM move EFFECT_FREEZE_HIT, 120, ICE, 70, 5, 10 ;BLIZZARD move EFFECT_CONFUSE_HIT, 65, PSYCHIC_TYPE, 100, 20, 10 ;PSYBEAM @@ -267,21 +267,21 @@ Moves1: move EFFECT_SP_DEF_DOWN_HIT, 80, GHOST, 100, 15, 20 ;SHADOW_BALL move EFFECT_FUTURE_SIGHT, 80, PSYCHIC_TYPE, 90, 15, 0 ;FUTURE_SIGHT move EFFECT_DEFENSE_DOWN_HIT, 20, FIGHTING, 100, 15, 50 ;ROCK_SMASH - move EFFECT_WHIRLPOOL, 15, WATER, 70, 15, 0 ;WHIRLPOOL + move EFFECT_TRAP_TARGET, 15, WATER, 70, 15, 0 ;WHIRLPOOL move EFFECT_BEAT_UP, 10, DARK, 100, 10, 0 ;BEAT_UP move EFFECT_FLINCH_HIT, 80, ROCK, 100, 15, 30 ;ROCK_HEAD move EFFECT_NORMAL_HIT, 140, ROCK, 70, 5, 0 ;ROCK_SLASH move EFFECT_NORMAL_HIT, 50, BUG, 100, 15, 0 ;CROSS_CUTTER move EFFECT_SP_ATK_DOWN, 0, NORMAL, 100, 40, 0 ;MEGAPHONE move EFFECT_FREEZE_HIT, 100, ICE, 95, 5, 30 ;MYSTIC_ICE - move EFFECT_BOUNCE, 85, FLYING, 85, 5, 0 ; BOUNCE - with Water Sport now in the game, Bounce's SW97 Water typing is no longer necessary. + move EFFECT_FLY, 85, WATER, 85, 5, 0 ; BOUNCE - went back and forth on type (making it modern or keeping it spaceworldy), chose spaceworld to diversify the "fly" move category move EFFECT_ACCURACY_UP, 85, GRASS, 0, 20, 0 ; BRIGHT_MOSS move EFFECT_COIN_HURL, 1, NORMAL, 100, 20, 0 ; COIN_HURL move EFFECT_NORMAL_HIT, 85, GROUND, 100, 10, 0 ; UPROOT move EFFECT_MIRROR_COAT, 1, PSYCHIC_TYPE, 100, 10, 0 ; SYNCHRONIZE - effect not implemented move EFFECT_ATTACK_UP_HIT, 70, STEEL, 90, 10, 10 ; STRONG_ARM move EFFECT_FLINCH_HIT, 55, FIGHTING, 80, 15, 30 ; UPPERCUT - move EFFECT_FLY, 80, WATER, 100, 10, 0 ; WATER_SPORT - Now a Dive clone. + move EFFECT_NORMAL_HIT, 1, WATER, 1, 15, 0 ; WATER_SPORT - effect not implemented move EFFECT_NORMAL_HIT, 55, FLYING, 95, 10, 0 ; WIND_RIDE move EFFECT_NORMAL_HIT, 80, FAIRY, 100, 10, 0 ; DAZZLING_GLEAM move EFFECT_ALWAYS_HIT, 40, FAIRY, 100, 15, 0 ; DISARMING_VOICE diff --git a/data/sprites/player_sprites.asm b/data/sprites/player_sprites.asm index 862dd71..3555e33 100644 --- a/data/sprites/player_sprites.asm +++ b/data/sprites/player_sprites.asm @@ -4,7 +4,6 @@ ChrisStateSprites: db PLAYER_SURF, SPRITE_SURF db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU db PLAYER_RUN, SPRITE_CHRIS_RUN - db PLAYER_WATER_SPORT, SPRITE_DIVE db -1 ; end KrisStateSprites: @@ -13,7 +12,6 @@ KrisStateSprites: db PLAYER_SURF, SPRITE_SURF db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU db PLAYER_RUN, SPRITE_KRIS_RUN - db PLAYER_WATER_SPORT, SPRITE_DIVE db -1 ; end EnbyStateSprites: @@ -22,6 +20,5 @@ EnbyStateSprites: db PLAYER_SURF, SPRITE_SURF db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU db PLAYER_RUN, SPRITE_TOPAZ_RUN - db PLAYER_WATER_SPORT, SPRITE_DIVE db -1 ; end \ No newline at end of file diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm index 6e0f9f8..c5c46c1 100644 --- a/data/sprites/sprites.asm +++ b/data/sprites/sprites.asm @@ -150,5 +150,4 @@ OverworldSprites: overworld_sprite BaldingGuyGFX, 12, STANDING_SPRITE, PAL_OW_BROWN overworld_sprite GameboyGirlGFX, 12, STANDING_SPRITE, PAL_OW_RED overworld_sprite OverworldPikachuGFX, 12, STANDING_SPRITE, PAL_OW_BROWN - overworld_sprite DiveSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE assert_table_length NUM_OVERWORLD_SPRITES diff --git a/data/text/common_2.asm b/data/text/common_2.asm index 0ad2fba..b0fafff 100644 --- a/data/text/common_2.asm +++ b/data/text/common_2.asm @@ -1502,6 +1502,8 @@ _OakText3:: text_promptbutton text_end + text_end ; unreferenced + _OakText4:: text "People and #MON" line "live together by" @@ -1526,62 +1528,3 @@ _OakText5:: para "That's why I study" line "#MON every day." prompt - -_AskStrongArmText:: - text "The wall is very" - line "rockyā€¦" - - para "Want to use" - line "STRONG ARM?" - done - -_UsedStrongArmText:: - text_ram wStringBuffer2 - text " used" - line "STRONG ARM!" - prompt - -_CantStrongArmText:: - text "The wall is very" - line "rockyā€¦" - - para "Can a #MON's" - line "move scale it?" - done - -_CantWaterSportText:: - text "Can't use" - line "WATER SPORT" - cont "here!" - prompt - -_CanWaterSportText:: - text "The sea is deep." - para "A #MON can" - line "dive here." - done - -_AskWaterSportDownText:: - text "The sea is deep." - line "Want to use" - cont "WATER SPORT?" - done - -_AskWaterSportUpText:: - text "Light is filter-" - line "ing from above." - - para "Want to use" - line "WATER SPORT?" - done - -_UsedWaterSportText:: - text_from_ram wStringBuffer2 - text " used" - line "WATER SPORT!" - done - -HidUnderwaterText:: - text_start - line "hid underwater!" - prompt diff --git a/data/tilesets/cave_attributes.bin b/data/tilesets/cave_attributes.bin index 20ca69522f0510b7ff2b93a797bb17f01f5b7173..5e327a804d969dbbdf27db18302fc0b4117397f4 100644 GIT binary patch delta 7 Ocmcb>y@7kf237zK3IhB9 delta 14 WcmdnMeSv$!2G+?7Shyw%hyegAm<03y diff --git a/data/tilesets/cave_collision.asm b/data/tilesets/cave_collision.asm index 5120fd7..0ef5556 100644 --- a/data/tilesets/cave_collision.asm +++ b/data/tilesets/cave_collision.asm @@ -89,5 +89,3 @@ tilecoll FLOOR, WALL, FLOOR, WARP_CARPET_DOWN ; 58 tilecoll FLOOR, SWITCH, FLOOR, FLOOR ; 59 tilecoll WALL, FLOOR, FLOOR, WARP_CARPET_DOWN ; 5a - tilecoll FLOOR, FLOOR, ROCKY_WALL, WALL ; 5b - tilecoll FLOOR, FLOOR, WALL, ROCKY_WALL ; 5c diff --git a/data/tilesets/cave_metatiles.bin b/data/tilesets/cave_metatiles.bin index 1bcf8a3c4cfee625e69c86d5912069c37fad6be9..d4996cdedc07bc096cfbd2c5e3ae81947c38d63a 100644 GIT binary patch delta 7 Ocmcb>y@7kf237zK3IhB9 delta 40 fcmdnMeSv$!237?zC~$OAQwt1IQ-kr<)F2`Nx}pd8 diff --git a/data/tilesets/dark_cave_attributes.bin b/data/tilesets/dark_cave_attributes.bin index 6cd8eeef520d34cf9910551f95e48e0b4c8140a8..0c79ad384da5a94f33d34b68b01e2005a881c5f8 100644 GIT binary patch delta 6 NcmZ3$(ZI2Q1po(10o4Ei delta 9 QcmZqRSirG>Wukxr01kWtmH+?% diff --git a/data/tilesets/dark_cave_collision.asm b/data/tilesets/dark_cave_collision.asm index ccbf13b..18f9b80 100644 --- a/data/tilesets/dark_cave_collision.asm +++ b/data/tilesets/dark_cave_collision.asm @@ -62,5 +62,3 @@ tilecoll WATER, WATER, WATER, WATER ; 3d tilecoll WATER, WATER, WATER, WATER ; 3e tilecoll FLOOR, FLOOR, PIT, FLOOR ; 3f - tilecoll FLOOR, FLOOR, ROCKY_WALL, WALL ; 40 - tilecoll FLOOR, FLOOR, WALL, ROCKY_WALL ; 41 diff --git a/data/tilesets/dark_cave_metatiles.bin b/data/tilesets/dark_cave_metatiles.bin index 8033d27..a41b5b0 100644 --- a/data/tilesets/dark_cave_metatiles.bin +++ b/data/tilesets/dark_cave_metatiles.bin @@ -3,4 +3,4 @@ &  &&67&&67&&&&$$$$*+:;$$$$"#23     ()89       !01     $$&&&&    @@@@@@@@@@@@@@@@%&&&%&&&%&&&%&&&&&&&&&&&&&&&&&&&&&&'&&&'&&&'&&&'67&&67&&$$%&&'%' &&&&&&&&  & 67'67&'&&&&&&&&&&&&%&&&&&&&&&&'&&&  -&&&AB&&QR&&&&AB&&QR \ No newline at end of file +&&& \ No newline at end of file diff --git a/data/tilesets/kanto_attributes.bin b/data/tilesets/kanto_attributes.bin index 2fcd8af216c0b9ccc1e2c6e44fb8f62f196f60c1..3d972271369ec4ca2aadcd2dc4959efd685115db 100644 GIT binary patch delta 7 OcmaDLenEW01#SQi*aK<+ delta 24 Xcmca0{y==g1#SUWDB$H~Wd&gXO)3NG diff --git a/data/tilesets/kanto_collision.asm b/data/tilesets/kanto_collision.asm index 898894b..34271e5 100644 --- a/data/tilesets/kanto_collision.asm +++ b/data/tilesets/kanto_collision.asm @@ -187,4 +187,3 @@ tilecoll WALL, WALL, WALL, WATER ; ba tilecoll WALL, WALL, WATER, WALL ; bb tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; bc - tilecoll FLOOR, FLOOR, ROCKY_WALL, WALL ; bd diff --git a/data/tilesets/kanto_metatiles.bin b/data/tilesets/kanto_metatiles.bin index 1e6ef197d1f91a54aebc10f59969aae84733f92f..b75222ee14a1efac824b90379faade5968c5d5a1 100644 GIT binary patch delta 7 OcmaDLenEW01#SQi*aK<+ delta 24 acmca0{y==g1#SUBDB$BaHS8cw60!6jYH zytE6QdIF~3Sqj!Mu36-X!PLo`7?4&)u2iH|U2a)bo>$^k9*M0|@;*V(y2)&HfNOcgzk!!u0C zHb#wlgelpC_ENj*WI& k-%w?KQpCcO3__8t425?&b3;rYD}l6ly85}Sb4q9e0H)>`6951J diff --git a/gfx/tilesets/bubble/2.png b/gfx/tilesets/bubble/2.png deleted file mode 100644 index 4e42dc9664b0b50e5099130253950b11545a6f1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 90 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}edAhHit1XSVpp0ty#G3HAs`EtDnm{r-UW|jE){L diff --git a/gfx/tilesets/bubble/3.png b/gfx/tilesets/bubble/3.png deleted file mode 100644 index 121b9db5c20ec0676f0ce5efcdfdc3b81a930176..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 86 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e<$$GjthE&{2zVUxPW5>1YhHIjZ iPT1O&c-2cF`I;6(cNW**8&NE#APt_belF{r5}E+(dm9x1 diff --git a/gfx/tilesets/bubble/4.png b/gfx/tilesets/bubble/4.png deleted file mode 100644 index 0720f8a5e773c30171fade1b53f67525f4ab1846..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 88 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e<$$PpuhE&{2uGrp}_&u+!w326a km|@D=q=>CTM`mp0VrX*UYI5P)>I~B2>FVdQ&MBb@0ONxhyZ`_I diff --git a/gfx/tilesets/bubble/5.png b/gfx/tilesets/bubble/5.png deleted file mode 100644 index 545fa4166429263095794881e63f13d28f3ce78f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 86 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e<$$GjthE&{2j@a6jc+IOVG?K@` h?V46wsJ3HIQH jmb67?Ds0i|dYEd)P%6wBv@D$`5TwJ?)z4*}Q$iB}&s7;< diff --git a/gfx/tilesets/seaweed/2.png b/gfx/tilesets/seaweed/2.png deleted file mode 100644 index a86a8a16f2dc03d7a30100278b14a085081c0cf7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 90 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}eQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XBj({-ZRBb+KprB-lYeY$Kep*R+Vo@qXL1JcJiC$i6iGqoq zfu51!M}^F(Kt)lWE{-7<{>do`2|xIcL>ycdy83{L2O}4o*MXZAz6^|N8oj~`G#YMp z@^oxxnw=-0kmHn*p)sXX`oLeFLk_$eHCpY=91C`LT4;ax*}~T6!hYE0U`7=K6B`>t YxVYi}8;`$v18rgOboFyt=akR{0M1%P^8f$< diff --git a/home/flag.asm b/home/flag.asm index bc323af..243b0e0 100644 --- a/home/flag.asm +++ b/home/flag.asm @@ -29,12 +29,6 @@ EventFlagAction:: call FlagAction ret -ResetDiveMap:: - xor a - ld [wDiveMapGroup], a - ld [wDiveMapNumber], a - ret - FlagAction:: ; Perform action b on bit de in flag array hl. diff --git a/home/hm_moves.asm b/home/hm_moves.asm index d483031..3862a7a 100644 --- a/home/hm_moves.asm +++ b/home/hm_moves.asm @@ -25,9 +25,4 @@ IsHMMove:: dw FLASH dw WATERFALL dw WHIRLPOOL - dw UPROOT - dw WATER_SPORT - dw STRONG_ARM - dw BRIGHT_MOSS ; this will be added as a hm in the 16bit patch - dw WIND_RIDE dw -1 ; end diff --git a/home/map_objects.asm b/home/map_objects.asm index e54d740..9bd0377 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -159,6 +159,8 @@ CheckPitTile:: CheckIceTile:: cp COLL_ICE ret z + cp COLL_ICE_2B + ret z scf ret @@ -171,12 +173,6 @@ CheckWhirlpoolTile:: scf ret -CheckDiveTile:: - cp COLL_DIVE_UP - ret z - cp COLL_DIVE_DOWN - ret - CheckWaterfallTile:: cp COLL_WATERFALL ret z @@ -567,7 +563,3 @@ GetSpriteDirection:: ld a, [hl] maskbits NUM_DIRECTIONS, 2 ret - -CheckRockyWallTile:: - cp COLL_ROCKY_WALL - ret diff --git a/macros/scripts/battle_commands.asm b/macros/scripts/battle_commands.asm index 59a50b9..e023b72 100644 --- a/macros/scripts/battle_commands.asm +++ b/macros/scripts/battle_commands.asm @@ -181,7 +181,6 @@ ENDM command startloop ; ae command curl ; af command coinhurlpower - command doubleunderwaterdamage DEF NUM_EFFECT_COMMANDS EQU const_value - 1 const_def -1, -1 diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index 104fef5..182f4d8 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -1054,30 +1054,6 @@ MACRO getname db \1 ; memory ENDM -; divemap macro. -; When adding a divemap to an area, you do it like so; -; callback MAPCALLBACK_NEWMAP, .DiveMap -;.DiveMap: -; divemap MAPCONSTHERE -; return -; Got it? - - const divemap_command -MACRO divemap -if _NARG == 1 - divemap \1, 0, 0 -else - db divemap_command - map_id \1 ; map - db \2 ; delta x - db \3 ; delta y -endc -ENDM - const divewarp_command -MACRO divewarp - db divewarp_command -ENDM - const wait_command ; $a8 MACRO wait db wait_command diff --git a/maps/CinnabarIsland.ablk b/maps/CinnabarIsland.ablk index 8923029..09ec62e 100644 --- a/maps/CinnabarIsland.ablk +++ b/maps/CinnabarIsland.ablk @@ -1,2 +1,2 @@ -”dbQQ>>??;”dN>?,(“µ)”dN$½*(¶·)”dN1($W½%”dP\Ž*,)”d{{y|r(,)”-{ -{t(,)”C-$½%˜™™™™™™™™™ \ No newline at end of file +”dbQQ>???;”dN>?,,“µ)”dN$W*,¶·)”dN1(,,,)”dP\Ž*,)”d{{y|r(,)”-{ +{t(,)”C-$W%˜™™™™™™™™™ \ No newline at end of file diff --git a/maps/RockTunnelB1F.ablk b/maps/RockTunnelB1F.ablk index 6e926f3..8c2a3e4 100644 --- a/maps/RockTunnelB1F.ablk +++ b/maps/RockTunnelB1F.ablk @@ -12,5 +12,5 @@ )++ !" (*! +  -  A*  +  *  (!)+  \ No newline at end of file diff --git a/maps/SilverCaveRoom2.ablk b/maps/SilverCaveRoom2.ablk index 21ff169..19e352b 100644 --- a/maps/SilverCaveRoom2.ablk +++ b/maps/SilverCaveRoom2.ablk @@ -19,8 +19,8 @@ )-..7. - -/'' - \- + - -  - \    \*-./ +     *-./ -/,,,-/$$$$-./ %)$$$$ # \ No newline at end of file diff --git a/ram/wram.asm b/ram/wram.asm index 826d003..5d4b7a0 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -387,7 +387,7 @@ wAttackMissed:: wPlayerSubStatus1:: db wPlayerSubStatus2:: db wPlayerSubStatus3:: db -wPlayerSubStatus4:: db ; bit 3 is underwater now +wPlayerSubStatus4:: db wPlayerSubStatus5:: db wEnemySubStatus1:: db @@ -3291,10 +3291,7 @@ wBackupWarpNumber:: db wBackupMapGroup:: db wBackupMapNumber:: db -wDiveMapGroup:: db -wDiveMapNumber:: db -wDiveDeltaX:: db -wDiveDeltaY:: db + ds 3 wLastSpawnMapGroup:: db wLastSpawnMapNumber:: db