diff options
671 files changed, 1146 insertions, 1164 deletions
diff --git a/audio/music_pointers.asm b/audio/music_pointers.asm index 2e467c0d..2e467c0d 100755..100644 --- a/audio/music_pointers.asm +++ b/audio/music_pointers.asm diff --git a/constants/audio_constants.asm b/constants/audio_constants.asm index f5895dd9..f5895dd9 100755..100644 --- a/constants/audio_constants.asm +++ b/constants/audio_constants.asm diff --git a/constants/collision_constants.asm b/constants/collision_constants.asm index 420122ac..420122ac 100755..100644 --- a/constants/collision_constants.asm +++ b/constants/collision_constants.asm diff --git a/constants/cry_constants.asm b/constants/cry_constants.asm index 654aac52..654aac52 100755..100644 --- a/constants/cry_constants.asm +++ b/constants/cry_constants.asm diff --git a/constants/event_flags.asm b/constants/event_flags.asm index bb1476b1..712b0609 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -1682,7 +1682,7 @@ const EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE const EVENT_TIN_TOWER_3F_FULL_HEAL const EVENT_TIN_TOWER_4F_ULTRA_BALL - const EVENT_TIN_TOWER_4F_PP_UP + const EVENT_TIN_TOWER_4F_SUPER_POTION const EVENT_TIN_TOWER_4F_ESCAPE_ROPE const EVENT_TIN_TOWER_5F_RARE_CANDY const EVENT_TIN_TOWER_7F_MAX_REVIVE ; 650 @@ -1696,8 +1696,8 @@ const EVENT_NATIONAL_PARK_PARLYZ_HEAL const EVENT_NATIONAL_PARK_TM_DIG const EVENT_UNION_CAVE_1F_GREAT_BALL - const EVENT_UNION_CAVE_1F_X_ATTACK const EVENT_UNION_CAVE_1F_POTION + const EVENT_UNION_CAVE_1F_X_ATTACK const EVENT_UNION_CAVE_1F_AWAKENING const EVENT_UNION_CAVE_B1F_TM_SWIFT const EVENT_UNION_CAVE_B1F_X_DEFEND @@ -1772,7 +1772,7 @@ const EVENT_VICTORY_ROAD_MAX_REVIVE const EVENT_VICTORY_ROAD_FULL_RESTORE const EVENT_VICTORY_ROAD_FULL_HEAL - const EVENT_VICTORY_ROAD_HP_UP + const EVENT_UNION_CAVE_X_SPECIAL const EVENT_DRAGONS_DEN_B1F_DRAGON_FANG const EVENT_TOHJO_FALLS_MOON_STONE const EVENT_ROUTE_26_MAX_ELIXER diff --git a/constants/hardware_constants.asm b/constants/hardware_constants.asm index 835b9bae..835b9bae 100755..100644 --- a/constants/hardware_constants.asm +++ b/constants/hardware_constants.asm diff --git a/constants/mart_constants.asm b/constants/mart_constants.asm index cffdfae0..cffdfae0 100755..100644 --- a/constants/mart_constants.asm +++ b/constants/mart_constants.asm diff --git a/constants/printer_constants.asm b/constants/printer_constants.asm index f0b8b481..f0b8b481 100755..100644 --- a/constants/printer_constants.asm +++ b/constants/printer_constants.asm diff --git a/data/battle_anims/ball_colors.asm b/data/battle_anims/ball_colors.asm index 0453c14b..0453c14b 100755..100644 --- a/data/battle_anims/ball_colors.asm +++ b/data/battle_anims/ball_colors.asm diff --git a/data/battle_anims/framesets.asm b/data/battle_anims/framesets.asm index a5641570..a5641570 100755..100644 --- a/data/battle_anims/framesets.asm +++ b/data/battle_anims/framesets.asm diff --git a/data/battle_anims/oam.asm b/data/battle_anims/oam.asm index 4bf4a331..4bf4a331 100755..100644 --- a/data/battle_anims/oam.asm +++ b/data/battle_anims/oam.asm diff --git a/data/battle_anims/object_gfx.asm b/data/battle_anims/object_gfx.asm index 432e513d..432e513d 100755..100644 --- a/data/battle_anims/object_gfx.asm +++ b/data/battle_anims/object_gfx.asm diff --git a/data/battle_anims/objects.asm b/data/battle_anims/objects.asm index 7c6e0759..7c6e0759 100755..100644 --- a/data/battle_anims/objects.asm +++ b/data/battle_anims/objects.asm diff --git a/data/collision_permissions.asm b/data/collision_permissions.asm index 57172ca5..57172ca5 100755..100644 --- a/data/collision_permissions.asm +++ b/data/collision_permissions.asm diff --git a/data/credits_script.asm b/data/credits_script.asm index 5c1dc40d..5c1dc40d 100755..100644 --- a/data/credits_script.asm +++ b/data/credits_script.asm diff --git a/data/events/collision_stdscripts.asm b/data/events/collision_stdscripts.asm index dff26dd8..dff26dd8 100755..100644 --- a/data/events/collision_stdscripts.asm +++ b/data/events/collision_stdscripts.asm diff --git a/data/growth_rates.asm b/data/growth_rates.asm index aee2a16e..aee2a16e 100755..100644 --- a/data/growth_rates.asm +++ b/data/growth_rates.asm diff --git a/data/icon_pointers.asm b/data/icon_pointers.asm index bfe07abb..bfe07abb 100755..100644 --- a/data/icon_pointers.asm +++ b/data/icon_pointers.asm diff --git a/data/items/fruit_trees.asm b/data/items/fruit_trees.asm index 9c4e4793..9c4e4793 100755..100644 --- a/data/items/fruit_trees.asm +++ b/data/items/fruit_trees.asm diff --git a/data/moves/moves.asm b/data/moves/moves.asm index 49c17d9b..49c17d9b 100755..100644 --- a/data/moves/moves.asm +++ b/data/moves/moves.asm diff --git a/data/party_menu_qualities.asm b/data/party_menu_qualities.asm index 0f8b19bf..0f8b19bf 100755..100644 --- a/data/party_menu_qualities.asm +++ b/data/party_menu_qualities.asm diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index f378cbfb..f378cbfb 100755..100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm diff --git a/data/pokemon/unused_pic_banks.asm b/data/pokemon/unused_pic_banks.asm index 2ede9c3f..2ede9c3f 100755..100644 --- a/data/pokemon/unused_pic_banks.asm +++ b/data/pokemon/unused_pic_banks.asm diff --git a/data/predef_pointers.asm b/data/predef_pointers.asm index 8f7fd669..8f7fd669 100755..100644 --- a/data/predef_pointers.asm +++ b/data/predef_pointers.asm diff --git a/data/sprite_anims/framesets.asm b/data/sprite_anims/framesets.asm index 0f05fdda..0f05fdda 100755..100644 --- a/data/sprite_anims/framesets.asm +++ b/data/sprite_anims/framesets.asm diff --git a/data/sprite_anims/oam.asm b/data/sprite_anims/oam.asm index dde96fca..dde96fca 100755..100644 --- a/data/sprite_anims/oam.asm +++ b/data/sprite_anims/oam.asm diff --git a/data/sprite_anims/sequences.asm b/data/sprite_anims/sequences.asm index 2c240d24..2c240d24 100755..100644 --- a/data/sprite_anims/sequences.asm +++ b/data/sprite_anims/sequences.asm diff --git a/data/text/battle.asm b/data/text/battle.asm index 58fad4a9..58fad4a9 100755..100644 --- a/data/text/battle.asm +++ b/data/text/battle.asm diff --git a/data/text/common_1.asm b/data/text/common_1.asm index 0bea4456..0bea4456 100755..100644 --- a/data/text/common_1.asm +++ b/data/text/common_1.asm diff --git a/data/text/unused_gen1_trainer_names.asm b/data/text/unused_gen1_trainer_names.asm index fa839f36..fa839f36 100755..100644 --- a/data/text/unused_gen1_trainer_names.asm +++ b/data/text/unused_gen1_trainer_names.asm diff --git a/data/types/names.asm b/data/types/names.asm index 62d8e13b..62d8e13b 100755..100644 --- a/data/types/names.asm +++ b/data/types/names.asm diff --git a/data/types/search_strings.asm b/data/types/search_strings.asm index d03d2786..d03d2786 100755..100644 --- a/data/types/search_strings.asm +++ b/data/types/search_strings.asm diff --git a/data/types/search_types.asm b/data/types/search_types.asm index c3aba3c9..c3aba3c9 100755..100644 --- a/data/types/search_types.asm +++ b/data/types/search_types.asm diff --git a/engine/battle/anim_hp_bar.asm b/engine/battle/anim_hp_bar.asm index 9248ad4f..9248ad4f 100755..100644 --- a/engine/battle/anim_hp_bar.asm +++ b/engine/battle/anim_hp_bar.asm diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index 4de4d347..4de4d347 100755..100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm diff --git a/engine/battle/start_battle.asm b/engine/battle/start_battle.asm index 7627a100..7627a100 100755..100644 --- a/engine/battle/start_battle.asm +++ b/engine/battle/start_battle.asm diff --git a/engine/battle/unreferenced_getgen1trainerclassname.asm b/engine/battle/unreferenced_getgen1trainerclassname.asm index 04532523..04532523 100755..100644 --- a/engine/battle/unreferenced_getgen1trainerclassname.asm +++ b/engine/battle/unreferenced_getgen1trainerclassname.asm diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm index 6ec670d0..a60a2645 100755..100644 --- a/engine/battle_anims/anim_commands.asm +++ b/engine/battle_anims/anim_commands.asm @@ -131,6 +131,7 @@ BattleAnimRestoreHuds: call BattleAnimDelayFrame call WaitTop +; this block should just be "call UpdateBattleHuds" ld hl, UpdateBattleHuds ld a, BANK(UpdatePlayerHUD) rst FarCall @@ -539,7 +540,6 @@ BattleAnimCmd_IfParamEqual: ld [hl], d ret - BattleAnimCmd_IfParamAnd: call GetBattleAnimByte ld e, a @@ -892,7 +892,7 @@ BattleAnimCmd_Transform: ret BattleAnimCmd_RaiseSub: - xor a + xor a ; sScratch call OpenSRAM GetSubstitutePic: ; used only for BANK(GetSubstitutePic) diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm index 2c20b40d..2c20b40d 100755..100644 --- a/engine/battle_anims/bg_effects.asm +++ b/engine/battle_anims/bg_effects.asm diff --git a/engine/battle_anims/core.asm b/engine/battle_anims/core.asm index fcde1be6..fcde1be6 100755..100644 --- a/engine/battle_anims/core.asm +++ b/engine/battle_anims/core.asm diff --git a/engine/battle_anims/functions.asm b/engine/battle_anims/functions.asm index e7bd9beb..e7bd9beb 100755..100644 --- a/engine/battle_anims/functions.asm +++ b/engine/battle_anims/functions.asm diff --git a/engine/battle_anims/helpers.asm b/engine/battle_anims/helpers.asm index 208ab614..208ab614 100755..100644 --- a/engine/battle_anims/helpers.asm +++ b/engine/battle_anims/helpers.asm diff --git a/engine/events/basement_key.asm b/engine/events/basement_key.asm index ab8c39ce..ab8c39ce 100755..100644 --- a/engine/events/basement_key.asm +++ b/engine/events/basement_key.asm diff --git a/engine/events/bug_contest/contest.asm b/engine/events/bug_contest/contest.asm index 6a3f7799..6a3f7799 100755..100644 --- a/engine/events/bug_contest/contest.asm +++ b/engine/events/bug_contest/contest.asm diff --git a/engine/events/bug_contest/display_stats.asm b/engine/events/bug_contest/display_stats.asm index bfa6d90b..bfa6d90b 100755..100644 --- a/engine/events/bug_contest/display_stats.asm +++ b/engine/events/bug_contest/display_stats.asm diff --git a/engine/events/card_key.asm b/engine/events/card_key.asm index c15b1def..c15b1def 100755..100644 --- a/engine/events/card_key.asm +++ b/engine/events/card_key.asm diff --git a/engine/events/engine_flags.asm b/engine/events/engine_flags.asm index 4099dfda..4099dfda 100755..100644 --- a/engine/events/engine_flags.asm +++ b/engine/events/engine_flags.asm diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm index 3423f840..3423f840 100755..100644 --- a/engine/events/field_moves.asm +++ b/engine/events/field_moves.asm diff --git a/engine/events/fishing_gfx.asm b/engine/events/fishing_gfx.asm index c4a0b9fa..c4a0b9fa 100755..100644 --- a/engine/events/fishing_gfx.asm +++ b/engine/events/fishing_gfx.asm diff --git a/engine/events/forced_movement.asm b/engine/events/forced_movement.asm index fcd2793f..fcd2793f 100755..100644 --- a/engine/events/forced_movement.asm +++ b/engine/events/forced_movement.asm diff --git a/engine/events/fruit_trees.asm b/engine/events/fruit_trees.asm index 0177eb6f..0177eb6f 100755..100644 --- a/engine/events/fruit_trees.asm +++ b/engine/events/fruit_trees.asm diff --git a/engine/events/haircut.asm b/engine/events/haircut.asm index 32043af1..32043af1 100755..100644 --- a/engine/events/haircut.asm +++ b/engine/events/haircut.asm diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index 53ab9f9a..53ab9f9a 100755..100644 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm diff --git a/engine/events/happiness_egg.asm b/engine/events/happiness_egg.asm index bb2e949c..bb2e949c 100755..100644 --- a/engine/events/happiness_egg.asm +++ b/engine/events/happiness_egg.asm diff --git a/engine/events/heal_machine_anim.asm b/engine/events/heal_machine_anim.asm index 002d4ad4..002d4ad4 100755..100644 --- a/engine/events/heal_machine_anim.asm +++ b/engine/events/heal_machine_anim.asm diff --git a/engine/events/lucky_number.asm b/engine/events/lucky_number.asm index 2a6991ac..2a6991ac 100755..100644 --- a/engine/events/lucky_number.asm +++ b/engine/events/lucky_number.asm diff --git a/engine/events/magnet_train.asm b/engine/events/magnet_train.asm index 715c801c..715c801c 100755..100644 --- a/engine/events/magnet_train.asm +++ b/engine/events/magnet_train.asm diff --git a/engine/events/misc_scripts.asm b/engine/events/misc_scripts.asm index e9006332..e9006332 100755..100644 --- a/engine/events/misc_scripts.asm +++ b/engine/events/misc_scripts.asm diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 4f2ba801..4f2ba801 100755..100644 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm diff --git a/engine/events/poisonstep.asm b/engine/events/poisonstep.asm index 98a6e25a..98a6e25a 100755..100644 --- a/engine/events/poisonstep.asm +++ b/engine/events/poisonstep.asm diff --git a/engine/events/poisonstep_pals.asm b/engine/events/poisonstep_pals.asm index 2752f5a7..2752f5a7 100755..100644 --- a/engine/events/poisonstep_pals.asm +++ b/engine/events/poisonstep_pals.asm diff --git a/engine/events/pokerus/check_pokerus.asm b/engine/events/pokerus/check_pokerus.asm index 201a3713..201a3713 100755..100644 --- a/engine/events/pokerus/check_pokerus.asm +++ b/engine/events/pokerus/check_pokerus.asm diff --git a/engine/events/sacred_ash.asm b/engine/events/sacred_ash.asm index d105b2fb..d105b2fb 100755..100644 --- a/engine/events/sacred_ash.asm +++ b/engine/events/sacred_ash.asm diff --git a/engine/events/shuckle.asm b/engine/events/shuckle.asm index 668a99b0..668a99b0 100755..100644 --- a/engine/events/shuckle.asm +++ b/engine/events/shuckle.asm diff --git a/engine/events/specials.asm b/engine/events/specials.asm index 91ca4208..91ca4208 100755..100644 --- a/engine/events/specials.asm +++ b/engine/events/specials.asm diff --git a/engine/events/squirtbottle.asm b/engine/events/squirtbottle.asm index 411b5c2e..411b5c2e 100755..100644 --- a/engine/events/squirtbottle.asm +++ b/engine/events/squirtbottle.asm diff --git a/engine/events/std_collision.asm b/engine/events/std_collision.asm index 8c54c041..8c54c041 100755..100644 --- a/engine/events/std_collision.asm +++ b/engine/events/std_collision.asm diff --git a/engine/events/sweet_scent.asm b/engine/events/sweet_scent.asm index 9b99a256..9b99a256 100755..100644 --- a/engine/events/sweet_scent.asm +++ b/engine/events/sweet_scent.asm diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm index 635be636..635be636 100755..100644 --- a/engine/events/whiteout.asm +++ b/engine/events/whiteout.asm diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm index a9a2038a..a9a2038a 100755..100644 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index 37b1d7ba..37b1d7ba 100755..100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm diff --git a/engine/gfx/mon_icons.asm b/engine/gfx/mon_icons.asm index d0d3856e..d0d3856e 100755..100644 --- a/engine/gfx/mon_icons.asm +++ b/engine/gfx/mon_icons.asm diff --git a/engine/gfx/place_graphic.asm b/engine/gfx/place_graphic.asm index 4092ad35..4092ad35 100755..100644 --- a/engine/gfx/place_graphic.asm +++ b/engine/gfx/place_graphic.asm diff --git a/engine/gfx/sgb_layouts.asm b/engine/gfx/sgb_layouts.asm index db4e929f..db4e929f 100755..100644 --- a/engine/gfx/sgb_layouts.asm +++ b/engine/gfx/sgb_layouts.asm diff --git a/engine/gfx/sprite_anims.asm b/engine/gfx/sprite_anims.asm index a6e717e8..a6e717e8 100755..100644 --- a/engine/gfx/sprite_anims.asm +++ b/engine/gfx/sprite_anims.asm diff --git a/engine/gfx/sprites.asm b/engine/gfx/sprites.asm index 824ceac4..824ceac4 100755..100644 --- a/engine/gfx/sprites.asm +++ b/engine/gfx/sprites.asm diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 35a7cd6c..35a7cd6c 100755..100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm diff --git a/engine/items/items.asm b/engine/items/items.asm index ef0f10dd..ef0f10dd 100755..100644 --- a/engine/items/items.asm +++ b/engine/items/items.asm diff --git a/engine/items/pack.asm b/engine/items/pack.asm index e7caceca..e7caceca 100755..100644 --- a/engine/items/pack.asm +++ b/engine/items/pack.asm diff --git a/engine/items/tmhm2.asm b/engine/items/tmhm2.asm index eb3eb58e..eb3eb58e 100755..100644 --- a/engine/items/tmhm2.asm +++ b/engine/items/tmhm2.asm diff --git a/engine/link/init_list.asm b/engine/link/init_list.asm index b85cf001..b85cf001 100755..100644 --- a/engine/link/init_list.asm +++ b/engine/link/init_list.asm diff --git a/engine/link/place_waiting_text.asm b/engine/link/place_waiting_text.asm index 5c31c314..5c31c314 100755..100644 --- a/engine/link/place_waiting_text.asm +++ b/engine/link/place_waiting_text.asm diff --git a/engine/math/math.asm b/engine/math/math.asm index d5df3c34..d5df3c34 100755..100644 --- a/engine/math/math.asm +++ b/engine/math/math.asm diff --git a/engine/menus/delete_save.asm b/engine/menus/delete_save.asm index a3ea661d..a3ea661d 100755..100644 --- a/engine/menus/delete_save.asm +++ b/engine/menus/delete_save.asm diff --git a/engine/menus/savemenu_copytilemapatonce.asm b/engine/menus/savemenu_copytilemapatonce.asm index 4b567a58..4b567a58 100755..100644 --- a/engine/menus/savemenu_copytilemapatonce.asm +++ b/engine/menus/savemenu_copytilemapatonce.asm diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm index 533c3d79..533c3d79 100755..100644 --- a/engine/movie/credits.asm +++ b/engine/movie/credits.asm diff --git a/engine/movie/init_hof_credits.asm b/engine/movie/init_hof_credits.asm index 70a9b6e7..70a9b6e7 100755..100644 --- a/engine/movie/init_hof_credits.asm +++ b/engine/movie/init_hof_credits.asm diff --git a/engine/overworld/map_object_action.asm b/engine/overworld/map_object_action.asm index 8f749f84..8f749f84 100755..100644 --- a/engine/overworld/map_object_action.asm +++ b/engine/overworld/map_object_action.asm diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index 62b1df41..62b1df41 100755..100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index 1a819acb..1a819acb 100755..100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index 01d49d21..01d49d21 100755..100644 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm index 6747c0ef..6747c0ef 100755..100644 --- a/engine/overworld/player_movement.asm +++ b/engine/overworld/player_movement.asm diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm index cd886bc3..cd886bc3 100755..100644 --- a/engine/overworld/player_object.asm +++ b/engine/overworld/player_object.asm diff --git a/engine/overworld/player_step.asm b/engine/overworld/player_step.asm index a290730c..a290730c 100755..100644 --- a/engine/overworld/player_step.asm +++ b/engine/overworld/player_step.asm diff --git a/engine/overworld/time.asm b/engine/overworld/time.asm index a829cd4f..a829cd4f 100755..100644 --- a/engine/overworld/time.asm +++ b/engine/overworld/time.asm diff --git a/engine/overworld/variables.asm b/engine/overworld/variables.asm index 406cf715..406cf715 100755..100644 --- a/engine/overworld/variables.asm +++ b/engine/overworld/variables.asm diff --git a/engine/phone/phonering_copytilemapatonce.asm b/engine/phone/phonering_copytilemapatonce.asm index 6ce141b5..6ce141b5 100755..100644 --- a/engine/phone/phonering_copytilemapatonce.asm +++ b/engine/phone/phonering_copytilemapatonce.asm diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm index 039766e7..039766e7 100755..100644 --- a/engine/pokedex/pokedex.asm +++ b/engine/pokedex/pokedex.asm diff --git a/engine/pokemon/caught_data.asm b/engine/pokemon/caught_data.asm index 408e284a..408e284a 100755..100644 --- a/engine/pokemon/caught_data.asm +++ b/engine/pokemon/caught_data.asm diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm index 5c6d68b0..5c6d68b0 100755..100644 --- a/engine/pokemon/evolve.asm +++ b/engine/pokemon/evolve.asm diff --git a/engine/pokemon/experience.asm b/engine/pokemon/experience.asm index 7d026704..7d026704 100755..100644 --- a/engine/pokemon/experience.asm +++ b/engine/pokemon/experience.asm diff --git a/engine/pokemon/health.asm b/engine/pokemon/health.asm index d11a073b..d11a073b 100755..100644 --- a/engine/pokemon/health.asm +++ b/engine/pokemon/health.asm diff --git a/engine/pokemon/mail.asm b/engine/pokemon/mail.asm index 9da39149..9da39149 100755..100644 --- a/engine/pokemon/mail.asm +++ b/engine/pokemon/mail.asm diff --git a/engine/pokemon/mon_stats.asm b/engine/pokemon/mon_stats.asm index 04285f87..04285f87 100755..100644 --- a/engine/pokemon/mon_stats.asm +++ b/engine/pokemon/mon_stats.asm diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index b1988f68..b1988f68 100755..100644 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm index 93f9b93b..93f9b93b 100755..100644 --- a/engine/pokemon/party_menu.asm +++ b/engine/pokemon/party_menu.asm diff --git a/engine/pokemon/switchpartymons.asm b/engine/pokemon/switchpartymons.asm index 24d19df6..24d19df6 100755..100644 --- a/engine/pokemon/switchpartymons.asm +++ b/engine/pokemon/switchpartymons.asm diff --git a/engine/pokemon/tempmon.asm b/engine/pokemon/tempmon.asm index 97ce1ee7..97ce1ee7 100755..100644 --- a/engine/pokemon/tempmon.asm +++ b/engine/pokemon/tempmon.asm diff --git a/engine/pokemon/types.asm b/engine/pokemon/types.asm index 3c9d28cd..3c9d28cd 100755..100644 --- a/engine/pokemon/types.asm +++ b/engine/pokemon/types.asm diff --git a/engine/predef.asm b/engine/predef.asm index e18765b0..e18765b0 100755..100644 --- a/engine/predef.asm +++ b/engine/predef.asm diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm index df8ca355..df8ca355 100755..100644 --- a/engine/printer/printer.asm +++ b/engine/printer/printer.asm diff --git a/engine/printer/printer_serial.asm b/engine/printer/printer_serial.asm index 37b06a9f..37b06a9f 100755..100644 --- a/engine/printer/printer_serial.asm +++ b/engine/printer/printer_serial.asm diff --git a/engine/rtc/reset_password.asm b/engine/rtc/reset_password.asm index b935d747..b935d747 100755..100644 --- a/engine/rtc/reset_password.asm +++ b/engine/rtc/reset_password.asm diff --git a/engine/tilesets/timeofday_pals.asm b/engine/tilesets/timeofday_pals.asm index 8a92484a..8a92484a 100755..100644 --- a/engine/tilesets/timeofday_pals.asm +++ b/engine/tilesets/timeofday_pals.asm diff --git a/gfx/battle/expbarend.2bpp b/gfx/battle/expbarend.2bpp Binary files differindex 24f32e15..24f32e15 100755..100644 --- a/gfx/battle/expbarend.2bpp +++ b/gfx/battle/expbarend.2bpp diff --git a/gfx/battle/expbarend.png b/gfx/battle/expbarend.png Binary files differindex 51c0e720..51c0e720 100755..100644 --- a/gfx/battle/expbarend.png +++ b/gfx/battle/expbarend.png diff --git a/gfx/battle/expbarend_sgb.2bpp b/gfx/battle/expbarend_sgb.2bpp Binary files differindex dbeb3fde..dbeb3fde 100755..100644 --- a/gfx/battle/expbarend_sgb.2bpp +++ b/gfx/battle/expbarend_sgb.2bpp diff --git a/gfx/battle/expbarend_sgb.png b/gfx/battle/expbarend_sgb.png Binary files differindex 25eed4a6..25eed4a6 100755..100644 --- a/gfx/battle/expbarend_sgb.png +++ b/gfx/battle/expbarend_sgb.png diff --git a/gfx/battle/minimize.2bpp b/gfx/battle/minimize.2bpp Binary files differindex 66b554de..66b554de 100755..100644 --- a/gfx/battle/minimize.2bpp +++ b/gfx/battle/minimize.2bpp diff --git a/gfx/battle/minimize.png b/gfx/battle/minimize.png Binary files differindex 95502f19..95502f19 100755..100644 --- a/gfx/battle/minimize.png +++ b/gfx/battle/minimize.png diff --git a/gfx/battle_anims.asm b/gfx/battle_anims.asm index 7f8f5918..7f8f5918 100755..100644 --- a/gfx/battle_anims.asm +++ b/gfx/battle_anims.asm diff --git a/gfx/battle_anims/aeroblast.2bpp.lz b/gfx/battle_anims/aeroblast.2bpp.lz Binary files differindex 5e203cb6..5e203cb6 100755..100644 --- a/gfx/battle_anims/aeroblast.2bpp.lz +++ b/gfx/battle_anims/aeroblast.2bpp.lz diff --git a/gfx/battle_anims/aeroblast.png b/gfx/battle_anims/aeroblast.png Binary files differindex 1fdc07c2..1fdc07c2 100755..100644 --- a/gfx/battle_anims/aeroblast.png +++ b/gfx/battle_anims/aeroblast.png diff --git a/gfx/battle_anims/angels.2bpp.lz b/gfx/battle_anims/angels.2bpp.lz Binary files differindex 61d89d22..61d89d22 100755..100644 --- a/gfx/battle_anims/angels.2bpp.lz +++ b/gfx/battle_anims/angels.2bpp.lz diff --git a/gfx/battle_anims/angels.png b/gfx/battle_anims/angels.png Binary files differindex ef38c61d..ef38c61d 100755..100644 --- a/gfx/battle_anims/angels.png +++ b/gfx/battle_anims/angels.png diff --git a/gfx/battle_anims/beam.2bpp.lz b/gfx/battle_anims/beam.2bpp.lz Binary files differindex 1ce9ab82..1ce9ab82 100755..100644 --- a/gfx/battle_anims/beam.2bpp.lz +++ b/gfx/battle_anims/beam.2bpp.lz diff --git a/gfx/battle_anims/beam.png b/gfx/battle_anims/beam.png Binary files differindex e8bc6cde..e8bc6cde 100755..100644 --- a/gfx/battle_anims/beam.png +++ b/gfx/battle_anims/beam.png diff --git a/gfx/battle_anims/bubble.2bpp.lz b/gfx/battle_anims/bubble.2bpp.lz Binary files differindex 3d546191..3d546191 100755..100644 --- a/gfx/battle_anims/bubble.2bpp.lz +++ b/gfx/battle_anims/bubble.2bpp.lz diff --git a/gfx/battle_anims/bubble.png b/gfx/battle_anims/bubble.png Binary files differindex b6febb0a..b6febb0a 100755..100644 --- a/gfx/battle_anims/bubble.png +++ b/gfx/battle_anims/bubble.png diff --git a/gfx/battle_anims/charge.2bpp.lz b/gfx/battle_anims/charge.2bpp.lz Binary files differindex 32c82243..32c82243 100755..100644 --- a/gfx/battle_anims/charge.2bpp.lz +++ b/gfx/battle_anims/charge.2bpp.lz diff --git a/gfx/battle_anims/charge.png b/gfx/battle_anims/charge.png Binary files differindex 90cb72f9..90cb72f9 100755..100644 --- a/gfx/battle_anims/charge.png +++ b/gfx/battle_anims/charge.png diff --git a/gfx/battle_anims/cut.2bpp.lz b/gfx/battle_anims/cut.2bpp.lz Binary files differindex 740a4879..740a4879 100755..100644 --- a/gfx/battle_anims/cut.2bpp.lz +++ b/gfx/battle_anims/cut.2bpp.lz diff --git a/gfx/battle_anims/cut.png b/gfx/battle_anims/cut.png Binary files differindex e227ad41..e227ad41 100755..100644 --- a/gfx/battle_anims/cut.png +++ b/gfx/battle_anims/cut.png diff --git a/gfx/battle_anims/egg.2bpp.lz b/gfx/battle_anims/egg.2bpp.lz Binary files differindex fb55f2ed..fb55f2ed 100755..100644 --- a/gfx/battle_anims/egg.2bpp.lz +++ b/gfx/battle_anims/egg.2bpp.lz diff --git a/gfx/battle_anims/egg.png b/gfx/battle_anims/egg.png Binary files differindex 38aab505..38aab505 100755..100644 --- a/gfx/battle_anims/egg.png +++ b/gfx/battle_anims/egg.png diff --git a/gfx/battle_anims/explosion.2bpp.lz b/gfx/battle_anims/explosion.2bpp.lz Binary files differindex 4303302a..4303302a 100755..100644 --- a/gfx/battle_anims/explosion.2bpp.lz +++ b/gfx/battle_anims/explosion.2bpp.lz diff --git a/gfx/battle_anims/explosion.png b/gfx/battle_anims/explosion.png Binary files differindex 0af9f1a0..0af9f1a0 100755..100644 --- a/gfx/battle_anims/explosion.png +++ b/gfx/battle_anims/explosion.png diff --git a/gfx/battle_anims/fire.2bpp.lz b/gfx/battle_anims/fire.2bpp.lz Binary files differindex e15e9f9b..e15e9f9b 100755..100644 --- a/gfx/battle_anims/fire.2bpp.lz +++ b/gfx/battle_anims/fire.2bpp.lz diff --git a/gfx/battle_anims/fire.png b/gfx/battle_anims/fire.png Binary files differindex 19f01141..19f01141 100755..100644 --- a/gfx/battle_anims/fire.png +++ b/gfx/battle_anims/fire.png diff --git a/gfx/battle_anims/flower.2bpp.lz b/gfx/battle_anims/flower.2bpp.lz Binary files differindex ef628afb..ef628afb 100755..100644 --- a/gfx/battle_anims/flower.2bpp.lz +++ b/gfx/battle_anims/flower.2bpp.lz diff --git a/gfx/battle_anims/flower.png b/gfx/battle_anims/flower.png Binary files differindex 61b4f58c..61b4f58c 100755..100644 --- a/gfx/battle_anims/flower.png +++ b/gfx/battle_anims/flower.png diff --git a/gfx/battle_anims/globe.2bpp.lz b/gfx/battle_anims/globe.2bpp.lz Binary files differindex 99fa15c6..99fa15c6 100755..100644 --- a/gfx/battle_anims/globe.2bpp.lz +++ b/gfx/battle_anims/globe.2bpp.lz diff --git a/gfx/battle_anims/globe.png b/gfx/battle_anims/globe.png Binary files differindex 8d3a3568..8d3a3568 100755..100644 --- a/gfx/battle_anims/globe.png +++ b/gfx/battle_anims/globe.png diff --git a/gfx/battle_anims/haze.2bpp.lz b/gfx/battle_anims/haze.2bpp.lz Binary files differindex e0cdc644..e0cdc644 100755..100644 --- a/gfx/battle_anims/haze.2bpp.lz +++ b/gfx/battle_anims/haze.2bpp.lz diff --git a/gfx/battle_anims/haze.png b/gfx/battle_anims/haze.png Binary files differindex 8a870ba9..8a870ba9 100755..100644 --- a/gfx/battle_anims/haze.png +++ b/gfx/battle_anims/haze.png diff --git a/gfx/battle_anims/hit.2bpp.lz b/gfx/battle_anims/hit.2bpp.lz Binary files differindex 5d9ffbe5..5d9ffbe5 100755..100644 --- a/gfx/battle_anims/hit.2bpp.lz +++ b/gfx/battle_anims/hit.2bpp.lz diff --git a/gfx/battle_anims/hit.png b/gfx/battle_anims/hit.png Binary files differindex 22806633..22806633 100755..100644 --- a/gfx/battle_anims/hit.png +++ b/gfx/battle_anims/hit.png diff --git a/gfx/battle_anims/horn.2bpp.lz b/gfx/battle_anims/horn.2bpp.lz Binary files differindex a92f7479..a92f7479 100755..100644 --- a/gfx/battle_anims/horn.2bpp.lz +++ b/gfx/battle_anims/horn.2bpp.lz diff --git a/gfx/battle_anims/horn.png b/gfx/battle_anims/horn.png Binary files differindex 56e8ca24..56e8ca24 100755..100644 --- a/gfx/battle_anims/horn.png +++ b/gfx/battle_anims/horn.png diff --git a/gfx/battle_anims/ice.2bpp.lz b/gfx/battle_anims/ice.2bpp.lz Binary files differindex 3d059700..3d059700 100755..100644 --- a/gfx/battle_anims/ice.2bpp.lz +++ b/gfx/battle_anims/ice.2bpp.lz diff --git a/gfx/battle_anims/ice.png b/gfx/battle_anims/ice.png Binary files differindex 62a67641..62a67641 100755..100644 --- a/gfx/battle_anims/ice.png +++ b/gfx/battle_anims/ice.png diff --git a/gfx/battle_anims/lightning.2bpp.lz b/gfx/battle_anims/lightning.2bpp.lz Binary files differindex 81de5850..81de5850 100755..100644 --- a/gfx/battle_anims/lightning.2bpp.lz +++ b/gfx/battle_anims/lightning.2bpp.lz diff --git a/gfx/battle_anims/lightning.png b/gfx/battle_anims/lightning.png Binary files differindex fcc9376f..fcc9376f 100755..100644 --- a/gfx/battle_anims/lightning.png +++ b/gfx/battle_anims/lightning.png diff --git a/gfx/battle_anims/misc.2bpp.lz b/gfx/battle_anims/misc.2bpp.lz Binary files differindex d0c5f0df..d0c5f0df 100755..100644 --- a/gfx/battle_anims/misc.2bpp.lz +++ b/gfx/battle_anims/misc.2bpp.lz diff --git a/gfx/battle_anims/misc.png b/gfx/battle_anims/misc.png Binary files differindex 7540508a..7540508a 100755..100644 --- a/gfx/battle_anims/misc.png +++ b/gfx/battle_anims/misc.png diff --git a/gfx/battle_anims/noise.2bpp.lz b/gfx/battle_anims/noise.2bpp.lz Binary files differindex e195da45..e195da45 100755..100644 --- a/gfx/battle_anims/noise.2bpp.lz +++ b/gfx/battle_anims/noise.2bpp.lz diff --git a/gfx/battle_anims/noise.png b/gfx/battle_anims/noise.png Binary files differindex 328d94c9..328d94c9 100755..100644 --- a/gfx/battle_anims/noise.png +++ b/gfx/battle_anims/noise.png diff --git a/gfx/battle_anims/objects.2bpp.lz b/gfx/battle_anims/objects.2bpp.lz Binary files differindex 1a52d635..1a52d635 100755..100644 --- a/gfx/battle_anims/objects.2bpp.lz +++ b/gfx/battle_anims/objects.2bpp.lz diff --git a/gfx/battle_anims/objects.png b/gfx/battle_anims/objects.png Binary files differindex 80117f18..80117f18 100755..100644 --- a/gfx/battle_anims/objects.png +++ b/gfx/battle_anims/objects.png diff --git a/gfx/battle_anims/plant.2bpp.lz b/gfx/battle_anims/plant.2bpp.lz Binary files differindex 589fc48b..589fc48b 100755..100644 --- a/gfx/battle_anims/plant.2bpp.lz +++ b/gfx/battle_anims/plant.2bpp.lz diff --git a/gfx/battle_anims/plant.png b/gfx/battle_anims/plant.png Binary files differindex ec112505..ec112505 100755..100644 --- a/gfx/battle_anims/plant.png +++ b/gfx/battle_anims/plant.png diff --git a/gfx/battle_anims/poison.2bpp.lz b/gfx/battle_anims/poison.2bpp.lz Binary files differindex df2cbe60..df2cbe60 100755..100644 --- a/gfx/battle_anims/poison.2bpp.lz +++ b/gfx/battle_anims/poison.2bpp.lz diff --git a/gfx/battle_anims/poison.png b/gfx/battle_anims/poison.png Binary files differindex ebbbc52b..ebbbc52b 100755..100644 --- a/gfx/battle_anims/poison.png +++ b/gfx/battle_anims/poison.png diff --git a/gfx/battle_anims/pokeball.2bpp.lz b/gfx/battle_anims/pokeball.2bpp.lz Binary files differindex e09b082d..e09b082d 100755..100644 --- a/gfx/battle_anims/pokeball.2bpp.lz +++ b/gfx/battle_anims/pokeball.2bpp.lz diff --git a/gfx/battle_anims/pokeball.png b/gfx/battle_anims/pokeball.png Binary files differindex ff76a3f7..ff76a3f7 100755..100644 --- a/gfx/battle_anims/pokeball.png +++ b/gfx/battle_anims/pokeball.png diff --git a/gfx/battle_anims/powder.2bpp.lz b/gfx/battle_anims/powder.2bpp.lz Binary files differindex 375d0bf9..375d0bf9 100755..100644 --- a/gfx/battle_anims/powder.2bpp.lz +++ b/gfx/battle_anims/powder.2bpp.lz diff --git a/gfx/battle_anims/powder.png b/gfx/battle_anims/powder.png Binary files differindex b2cb4d45..b2cb4d45 100755..100644 --- a/gfx/battle_anims/powder.png +++ b/gfx/battle_anims/powder.png diff --git a/gfx/battle_anims/psychic.2bpp.lz b/gfx/battle_anims/psychic.2bpp.lz Binary files differindex d6402dd3..d6402dd3 100755..100644 --- a/gfx/battle_anims/psychic.2bpp.lz +++ b/gfx/battle_anims/psychic.2bpp.lz diff --git a/gfx/battle_anims/psychic.png b/gfx/battle_anims/psychic.png Binary files differindex a6d22db2..a6d22db2 100755..100644 --- a/gfx/battle_anims/psychic.png +++ b/gfx/battle_anims/psychic.png diff --git a/gfx/battle_anims/reflect.2bpp.lz b/gfx/battle_anims/reflect.2bpp.lz Binary files differindex a563de1a..a563de1a 100755..100644 --- a/gfx/battle_anims/reflect.2bpp.lz +++ b/gfx/battle_anims/reflect.2bpp.lz diff --git a/gfx/battle_anims/reflect.png b/gfx/battle_anims/reflect.png Binary files differindex 48fbd7d0..48fbd7d0 100755..100644 --- a/gfx/battle_anims/reflect.png +++ b/gfx/battle_anims/reflect.png diff --git a/gfx/battle_anims/rocks.2bpp.lz b/gfx/battle_anims/rocks.2bpp.lz Binary files differindex d5481ea6..d5481ea6 100755..100644 --- a/gfx/battle_anims/rocks.2bpp.lz +++ b/gfx/battle_anims/rocks.2bpp.lz diff --git a/gfx/battle_anims/rocks.png b/gfx/battle_anims/rocks.png Binary files differindex 78814028..78814028 100755..100644 --- a/gfx/battle_anims/rocks.png +++ b/gfx/battle_anims/rocks.png diff --git a/gfx/battle_anims/rope.2bpp.lz b/gfx/battle_anims/rope.2bpp.lz Binary files differindex f7d6a480..f7d6a480 100755..100644 --- a/gfx/battle_anims/rope.2bpp.lz +++ b/gfx/battle_anims/rope.2bpp.lz diff --git a/gfx/battle_anims/rope.png b/gfx/battle_anims/rope.png Binary files differindex a12553c7..a12553c7 100755..100644 --- a/gfx/battle_anims/rope.png +++ b/gfx/battle_anims/rope.png diff --git a/gfx/battle_anims/sand.2bpp.lz b/gfx/battle_anims/sand.2bpp.lz Binary files differindex 3508a1f5..3508a1f5 100755..100644 --- a/gfx/battle_anims/sand.2bpp.lz +++ b/gfx/battle_anims/sand.2bpp.lz diff --git a/gfx/battle_anims/sand.png b/gfx/battle_anims/sand.png Binary files differindex 7ecdeaee..7ecdeaee 100755..100644 --- a/gfx/battle_anims/sand.png +++ b/gfx/battle_anims/sand.png diff --git a/gfx/battle_anims/shapes.2bpp.lz b/gfx/battle_anims/shapes.2bpp.lz Binary files differindex d7d48020..d7d48020 100755..100644 --- a/gfx/battle_anims/shapes.2bpp.lz +++ b/gfx/battle_anims/shapes.2bpp.lz diff --git a/gfx/battle_anims/shapes.png b/gfx/battle_anims/shapes.png Binary files differindex b99fc601..b99fc601 100755..100644 --- a/gfx/battle_anims/shapes.png +++ b/gfx/battle_anims/shapes.png diff --git a/gfx/battle_anims/shine.2bpp.lz b/gfx/battle_anims/shine.2bpp.lz Binary files differindex 3e47170b..3e47170b 100755..100644 --- a/gfx/battle_anims/shine.2bpp.lz +++ b/gfx/battle_anims/shine.2bpp.lz diff --git a/gfx/battle_anims/shine.png b/gfx/battle_anims/shine.png Binary files differindex 1b7e9834..1b7e9834 100755..100644 --- a/gfx/battle_anims/shine.png +++ b/gfx/battle_anims/shine.png diff --git a/gfx/battle_anims/skyattack.2bpp.lz b/gfx/battle_anims/skyattack.2bpp.lz Binary files differindex e0412dd8..e0412dd8 100755..100644 --- a/gfx/battle_anims/skyattack.2bpp.lz +++ b/gfx/battle_anims/skyattack.2bpp.lz diff --git a/gfx/battle_anims/skyattack.png b/gfx/battle_anims/skyattack.png Binary files differindex e731c691..e731c691 100755..100644 --- a/gfx/battle_anims/skyattack.png +++ b/gfx/battle_anims/skyattack.png diff --git a/gfx/battle_anims/smoke.2bpp.lz b/gfx/battle_anims/smoke.2bpp.lz Binary files differindex bf26fed2..bf26fed2 100755..100644 --- a/gfx/battle_anims/smoke.2bpp.lz +++ b/gfx/battle_anims/smoke.2bpp.lz diff --git a/gfx/battle_anims/smoke.png b/gfx/battle_anims/smoke.png Binary files differindex 1b09874b..1b09874b 100755..100644 --- a/gfx/battle_anims/smoke.png +++ b/gfx/battle_anims/smoke.png diff --git a/gfx/battle_anims/speed.2bpp.lz b/gfx/battle_anims/speed.2bpp.lz Binary files differindex 5d09f9a6..5d09f9a6 100755..100644 --- a/gfx/battle_anims/speed.2bpp.lz +++ b/gfx/battle_anims/speed.2bpp.lz diff --git a/gfx/battle_anims/speed.png b/gfx/battle_anims/speed.png Binary files differindex e219b38c..e219b38c 100755..100644 --- a/gfx/battle_anims/speed.png +++ b/gfx/battle_anims/speed.png diff --git a/gfx/battle_anims/status.2bpp.lz b/gfx/battle_anims/status.2bpp.lz Binary files differindex e5ce7df8..e5ce7df8 100755..100644 --- a/gfx/battle_anims/status.2bpp.lz +++ b/gfx/battle_anims/status.2bpp.lz diff --git a/gfx/battle_anims/status.png b/gfx/battle_anims/status.png Binary files differindex cb852796..cb852796 100755..100644 --- a/gfx/battle_anims/status.png +++ b/gfx/battle_anims/status.png diff --git a/gfx/battle_anims/water.2bpp.lz b/gfx/battle_anims/water.2bpp.lz Binary files differindex 6a81bbb6..6a81bbb6 100755..100644 --- a/gfx/battle_anims/water.2bpp.lz +++ b/gfx/battle_anims/water.2bpp.lz diff --git a/gfx/battle_anims/water.png b/gfx/battle_anims/water.png Binary files differindex 4e3c3b71..4e3c3b71 100755..100644 --- a/gfx/battle_anims/water.png +++ b/gfx/battle_anims/water.png diff --git a/gfx/battle_anims/wave.2bpp.lz b/gfx/battle_anims/wave.2bpp.lz Binary files differindex d94a5cb3..d94a5cb3 100755..100644 --- a/gfx/battle_anims/wave.2bpp.lz +++ b/gfx/battle_anims/wave.2bpp.lz diff --git a/gfx/battle_anims/wave.png b/gfx/battle_anims/wave.png Binary files differindex 55d4faa5..55d4faa5 100755..100644 --- a/gfx/battle_anims/wave.png +++ b/gfx/battle_anims/wave.png diff --git a/gfx/battle_anims/web.2bpp.lz b/gfx/battle_anims/web.2bpp.lz Binary files differindex 84b4018e..84b4018e 100755..100644 --- a/gfx/battle_anims/web.2bpp.lz +++ b/gfx/battle_anims/web.2bpp.lz diff --git a/gfx/battle_anims/web.png b/gfx/battle_anims/web.png Binary files differindex 2aeffef0..2aeffef0 100755..100644 --- a/gfx/battle_anims/web.png +++ b/gfx/battle_anims/web.png diff --git a/gfx/battle_anims/whip.2bpp.lz b/gfx/battle_anims/whip.2bpp.lz Binary files differindex da62ba91..da62ba91 100755..100644 --- a/gfx/battle_anims/whip.2bpp.lz +++ b/gfx/battle_anims/whip.2bpp.lz diff --git a/gfx/battle_anims/whip.png b/gfx/battle_anims/whip.png Binary files differindex 92d7ded6..92d7ded6 100755..100644 --- a/gfx/battle_anims/whip.png +++ b/gfx/battle_anims/whip.png diff --git a/gfx/battle_anims/wind.2bpp.lz b/gfx/battle_anims/wind.2bpp.lz Binary files differindex 9c2769b8..9c2769b8 100755..100644 --- a/gfx/battle_anims/wind.2bpp.lz +++ b/gfx/battle_anims/wind.2bpp.lz diff --git a/gfx/battle_anims/wind.png b/gfx/battle_anims/wind.png Binary files differindex b0203139..b0203139 100755..100644 --- a/gfx/battle_anims/wind.png +++ b/gfx/battle_anims/wind.png diff --git a/gfx/credits/bellossom.2bpp b/gfx/credits/bellossom.2bpp Binary files differindex d5f0b80c..d5f0b80c 100755..100644 --- a/gfx/credits/bellossom.2bpp +++ b/gfx/credits/bellossom.2bpp diff --git a/gfx/credits/border.2bpp b/gfx/credits/border.2bpp Binary files differindex 32b3fead..32b3fead 100755..100644 --- a/gfx/credits/border.2bpp +++ b/gfx/credits/border.2bpp diff --git a/gfx/credits/credits.pal b/gfx/credits/credits.pal index 69d550cc..69d550cc 100755..100644 --- a/gfx/credits/credits.pal +++ b/gfx/credits/credits.pal diff --git a/gfx/credits/elekid.2bpp b/gfx/credits/elekid.2bpp Binary files differindex 297a827d..297a827d 100755..100644 --- a/gfx/credits/elekid.2bpp +++ b/gfx/credits/elekid.2bpp diff --git a/gfx/credits/elekid.png b/gfx/credits/elekid.png Binary files differindex 900a921f..900a921f 100755..100644 --- a/gfx/credits/elekid.png +++ b/gfx/credits/elekid.png diff --git a/gfx/credits/sentret.2bpp b/gfx/credits/sentret.2bpp Binary files differindex 852dff70..852dff70 100755..100644 --- a/gfx/credits/sentret.2bpp +++ b/gfx/credits/sentret.2bpp diff --git a/gfx/credits/sentret.png b/gfx/credits/sentret.png Binary files differindex 0c704c6a..0c704c6a 100755..100644 --- a/gfx/credits/sentret.png +++ b/gfx/credits/sentret.png diff --git a/gfx/credits/theend.2bpp b/gfx/credits/theend.2bpp Binary files differindex b689688b..b689688b 100755..100644 --- a/gfx/credits/theend.2bpp +++ b/gfx/credits/theend.2bpp diff --git a/gfx/credits/togepi.2bpp b/gfx/credits/togepi.2bpp Binary files differindex 145c391c..145c391c 100755..100644 --- a/gfx/credits/togepi.2bpp +++ b/gfx/credits/togepi.2bpp diff --git a/gfx/credits/togepi.png b/gfx/credits/togepi.png Binary files differindex a60cc4b8..a60cc4b8 100755..100644 --- a/gfx/credits/togepi.png +++ b/gfx/credits/togepi.png diff --git a/gfx/icons.asm b/gfx/icons.asm index c664516f..c664516f 100755..100644 --- a/gfx/icons.asm +++ b/gfx/icons.asm diff --git a/gfx/icons/bat.2bpp b/gfx/icons/bat.2bpp Binary files differindex 0e5cd7d4..0e5cd7d4 100755..100644 --- a/gfx/icons/bat.2bpp +++ b/gfx/icons/bat.2bpp diff --git a/gfx/icons/bat.png b/gfx/icons/bat.png Binary files differindex 3ea2ea83..3ea2ea83 100755..100644 --- a/gfx/icons/bat.png +++ b/gfx/icons/bat.png diff --git a/gfx/icons/bigmon.2bpp b/gfx/icons/bigmon.2bpp Binary files differindex 6883bd80..6883bd80 100755..100644 --- a/gfx/icons/bigmon.2bpp +++ b/gfx/icons/bigmon.2bpp diff --git a/gfx/icons/bigmon.png b/gfx/icons/bigmon.png Binary files differindex 4a77f1ec..4a77f1ec 100755..100644 --- a/gfx/icons/bigmon.png +++ b/gfx/icons/bigmon.png diff --git a/gfx/icons/bird.2bpp b/gfx/icons/bird.2bpp Binary files differindex fb1793da..fb1793da 100755..100644 --- a/gfx/icons/bird.2bpp +++ b/gfx/icons/bird.2bpp diff --git a/gfx/icons/bird.png b/gfx/icons/bird.png Binary files differindex e13bc6cb..e13bc6cb 100755..100644 --- a/gfx/icons/bird.png +++ b/gfx/icons/bird.png diff --git a/gfx/icons/blob.2bpp b/gfx/icons/blob.2bpp Binary files differindex a855f008..a855f008 100755..100644 --- a/gfx/icons/blob.2bpp +++ b/gfx/icons/blob.2bpp diff --git a/gfx/icons/blob.png b/gfx/icons/blob.png Binary files differindex aef74ae6..aef74ae6 100755..100644 --- a/gfx/icons/blob.png +++ b/gfx/icons/blob.png diff --git a/gfx/icons/bug.2bpp b/gfx/icons/bug.2bpp Binary files differindex e57e4c80..e57e4c80 100755..100644 --- a/gfx/icons/bug.2bpp +++ b/gfx/icons/bug.2bpp diff --git a/gfx/icons/bug.png b/gfx/icons/bug.png Binary files differindex 97504f72..97504f72 100755..100644 --- a/gfx/icons/bug.png +++ b/gfx/icons/bug.png diff --git a/gfx/icons/bulbasaur.2bpp b/gfx/icons/bulbasaur.2bpp Binary files differindex 56dd284c..56dd284c 100755..100644 --- a/gfx/icons/bulbasaur.2bpp +++ b/gfx/icons/bulbasaur.2bpp diff --git a/gfx/icons/bulbasaur.png b/gfx/icons/bulbasaur.png Binary files differindex 1de6636f..1de6636f 100755..100644 --- a/gfx/icons/bulbasaur.png +++ b/gfx/icons/bulbasaur.png diff --git a/gfx/icons/caterpillar.2bpp b/gfx/icons/caterpillar.2bpp Binary files differindex 964b6a6a..964b6a6a 100755..100644 --- a/gfx/icons/caterpillar.2bpp +++ b/gfx/icons/caterpillar.2bpp diff --git a/gfx/icons/caterpillar.png b/gfx/icons/caterpillar.png Binary files differindex 85558104..85558104 100755..100644 --- a/gfx/icons/caterpillar.png +++ b/gfx/icons/caterpillar.png diff --git a/gfx/icons/charmander.2bpp b/gfx/icons/charmander.2bpp Binary files differindex 4e218263..4e218263 100755..100644 --- a/gfx/icons/charmander.2bpp +++ b/gfx/icons/charmander.2bpp diff --git a/gfx/icons/charmander.png b/gfx/icons/charmander.png Binary files differindex 3d85f131..3d85f131 100755..100644 --- a/gfx/icons/charmander.png +++ b/gfx/icons/charmander.png diff --git a/gfx/icons/clefairy.2bpp b/gfx/icons/clefairy.2bpp Binary files differindex 6a5aed32..6a5aed32 100755..100644 --- a/gfx/icons/clefairy.2bpp +++ b/gfx/icons/clefairy.2bpp diff --git a/gfx/icons/clefairy.png b/gfx/icons/clefairy.png Binary files differindex 0017d9dd..0017d9dd 100755..100644 --- a/gfx/icons/clefairy.png +++ b/gfx/icons/clefairy.png diff --git a/gfx/icons/diglett.2bpp b/gfx/icons/diglett.2bpp Binary files differindex 6a997c1c..6a997c1c 100755..100644 --- a/gfx/icons/diglett.2bpp +++ b/gfx/icons/diglett.2bpp diff --git a/gfx/icons/diglett.png b/gfx/icons/diglett.png Binary files differindex 307181f7..307181f7 100755..100644 --- a/gfx/icons/diglett.png +++ b/gfx/icons/diglett.png diff --git a/gfx/icons/egg.2bpp b/gfx/icons/egg.2bpp Binary files differindex 03a62377..03a62377 100755..100644 --- a/gfx/icons/egg.2bpp +++ b/gfx/icons/egg.2bpp diff --git a/gfx/icons/egg.png b/gfx/icons/egg.png Binary files differindex 129346fd..129346fd 100755..100644 --- a/gfx/icons/egg.png +++ b/gfx/icons/egg.png diff --git a/gfx/icons/equine.2bpp b/gfx/icons/equine.2bpp Binary files differindex 8853b5bd..8853b5bd 100755..100644 --- a/gfx/icons/equine.2bpp +++ b/gfx/icons/equine.2bpp diff --git a/gfx/icons/equine.png b/gfx/icons/equine.png Binary files differindex b3da7181..b3da7181 100755..100644 --- a/gfx/icons/equine.png +++ b/gfx/icons/equine.png diff --git a/gfx/icons/fighter.2bpp b/gfx/icons/fighter.2bpp Binary files differindex 671b7e8a..671b7e8a 100755..100644 --- a/gfx/icons/fighter.2bpp +++ b/gfx/icons/fighter.2bpp diff --git a/gfx/icons/fighter.png b/gfx/icons/fighter.png Binary files differindex 9deab976..9deab976 100755..100644 --- a/gfx/icons/fighter.png +++ b/gfx/icons/fighter.png diff --git a/gfx/icons/fish.2bpp b/gfx/icons/fish.2bpp Binary files differindex e99315b5..e99315b5 100755..100644 --- a/gfx/icons/fish.2bpp +++ b/gfx/icons/fish.2bpp diff --git a/gfx/icons/fish.png b/gfx/icons/fish.png Binary files differindex 35dbb1d2..35dbb1d2 100755..100644 --- a/gfx/icons/fish.png +++ b/gfx/icons/fish.png diff --git a/gfx/icons/fox.2bpp b/gfx/icons/fox.2bpp Binary files differindex bbe04c03..bbe04c03 100755..100644 --- a/gfx/icons/fox.2bpp +++ b/gfx/icons/fox.2bpp diff --git a/gfx/icons/fox.png b/gfx/icons/fox.png Binary files differindex 0419c87c..0419c87c 100755..100644 --- a/gfx/icons/fox.png +++ b/gfx/icons/fox.png diff --git a/gfx/icons/geodude.2bpp b/gfx/icons/geodude.2bpp Binary files differindex ff8bdfde..ff8bdfde 100755..100644 --- a/gfx/icons/geodude.2bpp +++ b/gfx/icons/geodude.2bpp diff --git a/gfx/icons/geodude.png b/gfx/icons/geodude.png Binary files differindex 02db8771..02db8771 100755..100644 --- a/gfx/icons/geodude.png +++ b/gfx/icons/geodude.png diff --git a/gfx/icons/ghost.2bpp b/gfx/icons/ghost.2bpp Binary files differindex d47e8b62..d47e8b62 100755..100644 --- a/gfx/icons/ghost.2bpp +++ b/gfx/icons/ghost.2bpp diff --git a/gfx/icons/ghost.png b/gfx/icons/ghost.png Binary files differindex 7ecf8ed0..7ecf8ed0 100755..100644 --- a/gfx/icons/ghost.png +++ b/gfx/icons/ghost.png diff --git a/gfx/icons/gyarados.2bpp b/gfx/icons/gyarados.2bpp Binary files differindex ffe536ad..ffe536ad 100755..100644 --- a/gfx/icons/gyarados.2bpp +++ b/gfx/icons/gyarados.2bpp diff --git a/gfx/icons/gyarados.png b/gfx/icons/gyarados.png Binary files differindex fad5d8ae..fad5d8ae 100755..100644 --- a/gfx/icons/gyarados.png +++ b/gfx/icons/gyarados.png diff --git a/gfx/icons/ho_oh.2bpp b/gfx/icons/ho_oh.2bpp Binary files differindex db4277a3..db4277a3 100755..100644 --- a/gfx/icons/ho_oh.2bpp +++ b/gfx/icons/ho_oh.2bpp diff --git a/gfx/icons/ho_oh.png b/gfx/icons/ho_oh.png Binary files differindex 6ee91781..6ee91781 100755..100644 --- a/gfx/icons/ho_oh.png +++ b/gfx/icons/ho_oh.png diff --git a/gfx/icons/humanshape.2bpp b/gfx/icons/humanshape.2bpp Binary files differindex 4dbbac0c..4dbbac0c 100755..100644 --- a/gfx/icons/humanshape.2bpp +++ b/gfx/icons/humanshape.2bpp diff --git a/gfx/icons/humanshape.png b/gfx/icons/humanshape.png Binary files differindex f5d0b929..f5d0b929 100755..100644 --- a/gfx/icons/humanshape.png +++ b/gfx/icons/humanshape.png diff --git a/gfx/icons/item.2bpp b/gfx/icons/item.2bpp index 5d47aba7..5d47aba7 100755..100644 --- a/gfx/icons/item.2bpp +++ b/gfx/icons/item.2bpp diff --git a/gfx/icons/item.png b/gfx/icons/item.png Binary files differindex a47d5500..a47d5500 100755..100644 --- a/gfx/icons/item.png +++ b/gfx/icons/item.png diff --git a/gfx/icons/jellyfish.2bpp b/gfx/icons/jellyfish.2bpp Binary files differindex cfda6ecc..cfda6ecc 100755..100644 --- a/gfx/icons/jellyfish.2bpp +++ b/gfx/icons/jellyfish.2bpp diff --git a/gfx/icons/jellyfish.png b/gfx/icons/jellyfish.png Binary files differindex 8583d5cd..8583d5cd 100755..100644 --- a/gfx/icons/jellyfish.png +++ b/gfx/icons/jellyfish.png diff --git a/gfx/icons/jigglypuff.2bpp b/gfx/icons/jigglypuff.2bpp Binary files differindex bc00c535..bc00c535 100755..100644 --- a/gfx/icons/jigglypuff.2bpp +++ b/gfx/icons/jigglypuff.2bpp diff --git a/gfx/icons/jigglypuff.png b/gfx/icons/jigglypuff.png Binary files differindex 70f87b0d..70f87b0d 100755..100644 --- a/gfx/icons/jigglypuff.png +++ b/gfx/icons/jigglypuff.png diff --git a/gfx/icons/lapras.2bpp b/gfx/icons/lapras.2bpp Binary files differindex 47684bae..47684bae 100755..100644 --- a/gfx/icons/lapras.2bpp +++ b/gfx/icons/lapras.2bpp diff --git a/gfx/icons/lapras.png b/gfx/icons/lapras.png Binary files differindex 89ad063d..89ad063d 100755..100644 --- a/gfx/icons/lapras.png +++ b/gfx/icons/lapras.png diff --git a/gfx/icons/lugia.2bpp b/gfx/icons/lugia.2bpp Binary files differindex fc146754..fc146754 100755..100644 --- a/gfx/icons/lugia.2bpp +++ b/gfx/icons/lugia.2bpp diff --git a/gfx/icons/lugia.png b/gfx/icons/lugia.png Binary files differindex 56dbf283..56dbf283 100755..100644 --- a/gfx/icons/lugia.png +++ b/gfx/icons/lugia.png diff --git a/gfx/icons/mail.2bpp b/gfx/icons/mail.2bpp index a04f4eff..a04f4eff 100755..100644 --- a/gfx/icons/mail.2bpp +++ b/gfx/icons/mail.2bpp diff --git a/gfx/icons/mail.png b/gfx/icons/mail.png Binary files differindex 53db461e..53db461e 100755..100644 --- a/gfx/icons/mail.png +++ b/gfx/icons/mail.png diff --git a/gfx/icons/monster.2bpp b/gfx/icons/monster.2bpp Binary files differindex ce8863cd..ce8863cd 100755..100644 --- a/gfx/icons/monster.2bpp +++ b/gfx/icons/monster.2bpp diff --git a/gfx/icons/monster.png b/gfx/icons/monster.png Binary files differindex f97c67b6..f97c67b6 100755..100644 --- a/gfx/icons/monster.png +++ b/gfx/icons/monster.png diff --git a/gfx/icons/moth.2bpp b/gfx/icons/moth.2bpp Binary files differindex 96d5d42f..96d5d42f 100755..100644 --- a/gfx/icons/moth.2bpp +++ b/gfx/icons/moth.2bpp diff --git a/gfx/icons/moth.png b/gfx/icons/moth.png Binary files differindex f44440f5..f44440f5 100755..100644 --- a/gfx/icons/moth.png +++ b/gfx/icons/moth.png diff --git a/gfx/icons/oddish.2bpp b/gfx/icons/oddish.2bpp Binary files differindex c9c7665e..c9c7665e 100755..100644 --- a/gfx/icons/oddish.2bpp +++ b/gfx/icons/oddish.2bpp diff --git a/gfx/icons/oddish.png b/gfx/icons/oddish.png Binary files differindex c069bd44..c069bd44 100755..100644 --- a/gfx/icons/oddish.png +++ b/gfx/icons/oddish.png diff --git a/gfx/icons/pikachu.2bpp b/gfx/icons/pikachu.2bpp Binary files differindex ec73af11..ec73af11 100755..100644 --- a/gfx/icons/pikachu.2bpp +++ b/gfx/icons/pikachu.2bpp diff --git a/gfx/icons/pikachu.png b/gfx/icons/pikachu.png Binary files differindex 7b7d23db..7b7d23db 100755..100644 --- a/gfx/icons/pikachu.png +++ b/gfx/icons/pikachu.png diff --git a/gfx/icons/poliwag.2bpp b/gfx/icons/poliwag.2bpp Binary files differindex 3d3da674..3d3da674 100755..100644 --- a/gfx/icons/poliwag.2bpp +++ b/gfx/icons/poliwag.2bpp diff --git a/gfx/icons/poliwag.png b/gfx/icons/poliwag.png Binary files differindex b6b63a81..b6b63a81 100755..100644 --- a/gfx/icons/poliwag.png +++ b/gfx/icons/poliwag.png diff --git a/gfx/icons/serpent.2bpp b/gfx/icons/serpent.2bpp Binary files differindex 4be1a62a..4be1a62a 100755..100644 --- a/gfx/icons/serpent.2bpp +++ b/gfx/icons/serpent.2bpp diff --git a/gfx/icons/serpent.png b/gfx/icons/serpent.png Binary files differindex de575f08..de575f08 100755..100644 --- a/gfx/icons/serpent.png +++ b/gfx/icons/serpent.png diff --git a/gfx/icons/shell.2bpp b/gfx/icons/shell.2bpp Binary files differindex 9e9dd787..9e9dd787 100755..100644 --- a/gfx/icons/shell.2bpp +++ b/gfx/icons/shell.2bpp diff --git a/gfx/icons/shell.png b/gfx/icons/shell.png Binary files differindex 4daf2763..4daf2763 100755..100644 --- a/gfx/icons/shell.png +++ b/gfx/icons/shell.png diff --git a/gfx/icons/slowpoke.2bpp b/gfx/icons/slowpoke.2bpp index 045980e5..045980e5 100755..100644 --- a/gfx/icons/slowpoke.2bpp +++ b/gfx/icons/slowpoke.2bpp diff --git a/gfx/icons/slowpoke.png b/gfx/icons/slowpoke.png Binary files differindex 221f3f7a..221f3f7a 100755..100644 --- a/gfx/icons/slowpoke.png +++ b/gfx/icons/slowpoke.png diff --git a/gfx/icons/snorlax.2bpp b/gfx/icons/snorlax.2bpp Binary files differindex 1adb5c84..1adb5c84 100755..100644 --- a/gfx/icons/snorlax.2bpp +++ b/gfx/icons/snorlax.2bpp diff --git a/gfx/icons/snorlax.png b/gfx/icons/snorlax.png Binary files differindex f2c1b0b7..f2c1b0b7 100755..100644 --- a/gfx/icons/snorlax.png +++ b/gfx/icons/snorlax.png diff --git a/gfx/icons/squirtle.2bpp b/gfx/icons/squirtle.2bpp Binary files differindex b6558faa..b6558faa 100755..100644 --- a/gfx/icons/squirtle.2bpp +++ b/gfx/icons/squirtle.2bpp diff --git a/gfx/icons/squirtle.png b/gfx/icons/squirtle.png Binary files differindex 614aa21b..614aa21b 100755..100644 --- a/gfx/icons/squirtle.png +++ b/gfx/icons/squirtle.png diff --git a/gfx/icons/staryu.2bpp b/gfx/icons/staryu.2bpp Binary files differindex 890cfe20..890cfe20 100755..100644 --- a/gfx/icons/staryu.2bpp +++ b/gfx/icons/staryu.2bpp diff --git a/gfx/icons/staryu.png b/gfx/icons/staryu.png Binary files differindex 52361c78..52361c78 100755..100644 --- a/gfx/icons/staryu.png +++ b/gfx/icons/staryu.png diff --git a/gfx/icons/sudowoodo.2bpp b/gfx/icons/sudowoodo.2bpp Binary files differindex 1c939093..1c939093 100755..100644 --- a/gfx/icons/sudowoodo.2bpp +++ b/gfx/icons/sudowoodo.2bpp diff --git a/gfx/icons/sudowoodo.png b/gfx/icons/sudowoodo.png Binary files differindex d115356b..d115356b 100755..100644 --- a/gfx/icons/sudowoodo.png +++ b/gfx/icons/sudowoodo.png diff --git a/gfx/icons/unown.2bpp b/gfx/icons/unown.2bpp Binary files differindex b1cddd8b..b1cddd8b 100755..100644 --- a/gfx/icons/unown.2bpp +++ b/gfx/icons/unown.2bpp diff --git a/gfx/icons/unown.png b/gfx/icons/unown.png Binary files differindex 0a4d0e42..0a4d0e42 100755..100644 --- a/gfx/icons/unown.png +++ b/gfx/icons/unown.png diff --git a/gfx/icons/voltorb.2bpp b/gfx/icons/voltorb.2bpp Binary files differindex b75cafe3..b75cafe3 100755..100644 --- a/gfx/icons/voltorb.2bpp +++ b/gfx/icons/voltorb.2bpp diff --git a/gfx/icons/voltorb.png b/gfx/icons/voltorb.png Binary files differindex ef289541..ef289541 100755..100644 --- a/gfx/icons/voltorb.png +++ b/gfx/icons/voltorb.png diff --git a/gfx/overworld/heal_machine.pal b/gfx/overworld/heal_machine.pal index 28a76de4..28a76de4 100755..100644 --- a/gfx/overworld/heal_machine.pal +++ b/gfx/overworld/heal_machine.pal diff --git a/gfx/overworld/magnet_train_bg.tilemap b/gfx/overworld/magnet_train_bg.tilemap index 3a70aecc..3a70aecc 100755..100644 --- a/gfx/overworld/magnet_train_bg.tilemap +++ b/gfx/overworld/magnet_train_bg.tilemap diff --git a/gfx/overworld/magnet_train_fg.tilemap b/gfx/overworld/magnet_train_fg.tilemap Binary files differindex 2f542683..2f542683 100755..100644 --- a/gfx/overworld/magnet_train_fg.tilemap +++ b/gfx/overworld/magnet_train_fg.tilemap diff --git a/gfx/overworld/trainer_battle_day.pal b/gfx/overworld/trainer_battle_day.pal index b7d67891..b7d67891 100755..100644 --- a/gfx/overworld/trainer_battle_day.pal +++ b/gfx/overworld/trainer_battle_day.pal diff --git a/gfx/overworld/trainer_battle_nite.pal b/gfx/overworld/trainer_battle_nite.pal index d1a35f33..d1a35f33 100755..100644 --- a/gfx/overworld/trainer_battle_nite.pal +++ b/gfx/overworld/trainer_battle_nite.pal diff --git a/gfx/overworld/trainer_battle_pokeball_tiles.2bpp b/gfx/overworld/trainer_battle_pokeball_tiles.2bpp index 09e51fd6..09e51fd6 100755..100644 --- a/gfx/overworld/trainer_battle_pokeball_tiles.2bpp +++ b/gfx/overworld/trainer_battle_pokeball_tiles.2bpp diff --git a/gfx/overworld/trainer_battle_pokeball_tiles.png b/gfx/overworld/trainer_battle_pokeball_tiles.png Binary files differindex a4655d26..a4655d26 100755..100644 --- a/gfx/overworld/trainer_battle_pokeball_tiles.png +++ b/gfx/overworld/trainer_battle_pokeball_tiles.png diff --git a/gfx/pokedex/pokedex.2bpp.lz b/gfx/pokedex/pokedex.2bpp.lz Binary files differindex 8f7e3aaf..8f7e3aaf 100755..100644 --- a/gfx/pokedex/pokedex.2bpp.lz +++ b/gfx/pokedex/pokedex.2bpp.lz diff --git a/gfx/pokedex/slowpoke.2bpp.lz b/gfx/pokedex/slowpoke.2bpp.lz Binary files differindex b8d0e490..b8d0e490 100755..100644 --- a/gfx/pokedex/slowpoke.2bpp.lz +++ b/gfx/pokedex/slowpoke.2bpp.lz diff --git a/gfx/sgb/gold_border.pal b/gfx/sgb/gold_border.pal index 047c676e..047c676e 100755..100644 --- a/gfx/sgb/gold_border.pal +++ b/gfx/sgb/gold_border.pal diff --git a/gfx/sgb/silver_border.pal b/gfx/sgb/silver_border.pal index cafa90ad..cafa90ad 100755..100644 --- a/gfx/sgb/silver_border.pal +++ b/gfx/sgb/silver_border.pal diff --git a/gfx/title/logo.tilemap b/gfx/title/logo.tilemap Binary files differindex f214ff8b..f214ff8b 100755..100644 --- a/gfx/title/logo.tilemap +++ b/gfx/title/logo.tilemap diff --git a/gfx/title/logo_bottom_gold.2bpp.lz b/gfx/title/logo_bottom_gold.2bpp.lz Binary files differindex eb9ff7f8..eb9ff7f8 100755..100644 --- a/gfx/title/logo_bottom_gold.2bpp.lz +++ b/gfx/title/logo_bottom_gold.2bpp.lz diff --git a/gfx/title/logo_bottom_silver.2bpp.lz b/gfx/title/logo_bottom_silver.2bpp.lz Binary files differindex 09683bb6..09683bb6 100755..100644 --- a/gfx/title/logo_bottom_silver.2bpp.lz +++ b/gfx/title/logo_bottom_silver.2bpp.lz diff --git a/gfx/title/logo_top_gold.2bpp.lz b/gfx/title/logo_top_gold.2bpp.lz Binary files differindex 615d2f30..615d2f30 100755..100644 --- a/gfx/title/logo_top_gold.2bpp.lz +++ b/gfx/title/logo_top_gold.2bpp.lz diff --git a/gfx/title/logo_top_silver.2bpp.lz b/gfx/title/logo_top_silver.2bpp.lz Binary files differindex 9620ec0c..9620ec0c 100755..100644 --- a/gfx/title/logo_top_silver.2bpp.lz +++ b/gfx/title/logo_top_silver.2bpp.lz diff --git a/home/array.asm b/home/array.asm index 0abf9b7d..0abf9b7d 100755..100644 --- a/home/array.asm +++ b/home/array.asm diff --git a/home/battle_vars.asm b/home/battle_vars.asm index 2ed86484..2ed86484 100755..100644 --- a/home/battle_vars.asm +++ b/home/battle_vars.asm diff --git a/home/call_regs.asm b/home/call_regs.asm index d0a4be1b..d0a4be1b 100755..100644 --- a/home/call_regs.asm +++ b/home/call_regs.asm diff --git a/home/clear_sprites.asm b/home/clear_sprites.asm index 69977461..69977461 100755..100644 --- a/home/clear_sprites.asm +++ b/home/clear_sprites.asm diff --git a/home/compare.asm b/home/compare.asm index 26b7567f..26b7567f 100755..100644 --- a/home/compare.asm +++ b/home/compare.asm diff --git a/home/copy_name.asm b/home/copy_name.asm index 59c8cf6c..59c8cf6c 100755..100644 --- a/home/copy_name.asm +++ b/home/copy_name.asm diff --git a/home/copy_tilemap.asm b/home/copy_tilemap.asm index dd683bb6..dd683bb6 100755..100644 --- a/home/copy_tilemap.asm +++ b/home/copy_tilemap.asm diff --git a/home/header.asm b/home/header.asm index 75b43056..75b43056 100755..100644 --- a/home/header.asm +++ b/home/header.asm diff --git a/home/hm_moves.asm b/home/hm_moves.asm index 30a9786a..30a9786a 100755..100644 --- a/home/hm_moves.asm +++ b/home/hm_moves.asm diff --git a/home/names.asm b/home/names.asm index e3da8793..e3da8793 100755..100644 --- a/home/names.asm +++ b/home/names.asm diff --git a/home/pokemon.asm b/home/pokemon.asm index d035a2e4..d035a2e4 100755..100644 --- a/home/pokemon.asm +++ b/home/pokemon.asm diff --git a/home/print_bcd.asm b/home/print_bcd.asm index 74e2d161..74e2d161 100755..100644 --- a/home/print_bcd.asm +++ b/home/print_bcd.asm diff --git a/home/print_num.asm b/home/print_num.asm index 5bea7696..5bea7696 100755..100644 --- a/home/print_num.asm +++ b/home/print_num.asm diff --git a/home/print_text.asm b/home/print_text.asm index 04bc8ece..04bc8ece 100755..100644 --- a/home/print_text.asm +++ b/home/print_text.asm diff --git a/home/queue_script.asm b/home/queue_script.asm index 27dafa3f..27dafa3f 100755..100644 --- a/home/queue_script.asm +++ b/home/queue_script.asm diff --git a/home/region.asm b/home/region.asm index ee781759..ee781759 100755..100644 --- a/home/region.asm +++ b/home/region.asm diff --git a/home/scrolling_menu.asm b/home/scrolling_menu.asm index cde0e021..cde0e021 100755..100644 --- a/home/scrolling_menu.asm +++ b/home/scrolling_menu.asm diff --git a/home/sprite_anims.asm b/home/sprite_anims.asm index e20c63ac..e20c63ac 100755..100644 --- a/home/sprite_anims.asm +++ b/home/sprite_anims.asm diff --git a/home/sprite_updates.asm b/home/sprite_updates.asm index e070a2bb..e070a2bb 100755..100644 --- a/home/sprite_updates.asm +++ b/home/sprite_updates.asm diff --git a/home/stone_queue.asm b/home/stone_queue.asm index e0a976a4..e0a976a4 100755..100644 --- a/home/stone_queue.asm +++ b/home/stone_queue.asm diff --git a/home/tilemap.asm b/home/tilemap.asm index fac8d372..fac8d372 100755..100644 --- a/home/tilemap.asm +++ b/home/tilemap.asm diff --git a/home/trainers.asm b/home/trainers.asm index 04f74f2f..04f74f2f 100755..100644 --- a/home/trainers.asm +++ b/home/trainers.asm diff --git a/macros/coords.asm b/macros/coords.asm index 5a87e1d3..5a87e1d3 100755..100644 --- a/macros/coords.asm +++ b/macros/coords.asm diff --git a/macros/data.asm b/macros/data.asm index 5b9614fe..5b9614fe 100755..100644 --- a/macros/data.asm +++ b/macros/data.asm diff --git a/macros/enum.asm b/macros/enum.asm index 8fe5b534..8fe5b534 100755..100644 --- a/macros/enum.asm +++ b/macros/enum.asm diff --git a/macros/gfx.asm b/macros/gfx.asm index 2c67cfc8..2c67cfc8 100755..100644 --- a/macros/gfx.asm +++ b/macros/gfx.asm diff --git a/macros/predef.asm b/macros/predef.asm index 7850350a..7850350a 100755..100644 --- a/macros/predef.asm +++ b/macros/predef.asm diff --git a/macros/rst.asm b/macros/rst.asm index c8b80aab..c8b80aab 100755..100644 --- a/macros/rst.asm +++ b/macros/rst.asm diff --git a/macros/scripts/gfx_anims.asm b/macros/scripts/gfx_anims.asm index a6241a0d..a6241a0d 100755..100644 --- a/macros/scripts/gfx_anims.asm +++ b/macros/scripts/gfx_anims.asm diff --git a/macros/scripts/text.asm b/macros/scripts/text.asm index bb1701f8..bb1701f8 100755..100644 --- a/macros/scripts/text.asm +++ b/macros/scripts/text.asm diff --git a/macros/scripts/trade_anims.asm b/macros/scripts/trade_anims.asm index 6fe55945..6fe55945 100755..100644 --- a/macros/scripts/trade_anims.asm +++ b/macros/scripts/trade_anims.asm diff --git a/macros/wram.asm b/macros/wram.asm index 590d1b9d..590d1b9d 100755..100644 --- a/macros/wram.asm +++ b/macros/wram.asm diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 7df72482..89a2a216 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const AZALEAGYM_BUGSY const AZALEAGYM_BUG_CATCHER1 const AZALEAGYM_BUG_CATCHER2 diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index c98ff31a..c6d8fbbb 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const AZALEAMART_CLERK const AZALEAMART_COOLTRAINER_M const AZALEAMART_BUG_CATCHER diff --git a/maps/AzaleaPokecenter1F.asm b/maps/AzaleaPokecenter1F.asm index 27b5ff1d..1004e835 100644 --- a/maps/AzaleaPokecenter1F.asm +++ b/maps/AzaleaPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const AZALEAPOKECENTER1F_NURSE const AZALEAPOKECENTER1F_GENTLEMAN const AZALEAPOKECENTER1F_FISHING_GURU diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 2eec0d1b..c9bc34b6 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const AZALEATOWN_AZALEA_ROCKET1 const AZALEATOWN_GRAMPS const AZALEATOWN_TEACHER diff --git a/maps/BillsBrothersHouse.asm b/maps/BillsBrothersHouse.asm index e669586e..b9c6d469 100644 --- a/maps/BillsBrothersHouse.asm +++ b/maps/BillsBrothersHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BILLSBROTHERSHOUSE_POKEFAN_F const BILLSBROTHERSHOUSE_YOUNGSTER diff --git a/maps/BillsFamilysHouse.asm b/maps/BillsFamilysHouse.asm index aad86012..c424cd6c 100644 --- a/maps/BillsFamilysHouse.asm +++ b/maps/BillsFamilysHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BILLSFAMILYSHOUSE_BILL const BILLSFAMILYSHOUSE_POKEFAN_F const BILLSFAMILYSHOUSE_TWIN @@ -54,13 +54,13 @@ BillsMomScript: opentext checkevent EVENT_MET_BILL iffalse .HaventMetBill - writetext BillsPopText + writetext BillsMomText_BeforeEcruteak waitbutton closetext end .HaventMetBill: - writetext BillsMomText + writetext BillsMomText_AfterEcruteak waitbutton closetext end @@ -171,7 +171,7 @@ BillPopWontWorkText: line "follow-up." done -BillsPopText: +BillsMomText_BeforeEcruteak: text "Oh, you collect" line "#MON? My son" cont "BILL is an expert." @@ -183,7 +183,7 @@ BillsPopText: line "CITY." done -BillsMomText: +BillsMomText_AfterEcruteak: text "I am so glad to" line "see my son again." done diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index a0b52077..61a81cc5 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BILLSHOUSE_GRAMPS BillsHouse_MapScripts: diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index d891fa3c..914e7254 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BLACKTHORNCITY_SUPER_NERD1 const BLACKTHORNCITY_SUPER_NERD2 const BLACKTHORNCITY_GRAMPS1 diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 260a3a3c..32cf9be3 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BLACKTHORNDRAGONSPEECHHOUSE_GRANNY const BLACKTHORNDRAGONSPEECHHOUSE_EKANS diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm index 01fffb4d..f59ef4b8 100644 --- a/maps/BlackthornEmysHouse.asm +++ b/maps/BlackthornEmysHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BLACKTHORNEMYSHOUSE_EMY BlackthornEmysHouse_MapScripts: diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 240a1ece..89a59fc9 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BLACKTHORNGYM1F_CLAIR const BLACKTHORNGYM1F_COOLTRAINER_M1 const BLACKTHORNGYM1F_COOLTRAINER_M2 @@ -58,7 +58,7 @@ BlackthornGymClairScript: .FightDone: checkitem DRAGON_FANG iftrue .HasDragonFang - writetext ClairText_TooMuchToExpect + writetext ClairText_WhatsTheMatter waitbutton closetext end @@ -85,6 +85,7 @@ BlackthornGymClairScript: .GotTM24: writetext BlackthornGymClairText_League waitbutton + .BagFull: closetext end @@ -218,7 +219,7 @@ ClairText_GoToDragonsDen: cont "BADGE." done -ClairText_TooMuchToExpect: +ClairText_WhatsTheMatter: text "CLAIR: What's" line "the matter?" @@ -268,7 +269,6 @@ BlackthornGymClairText_DescribeTM24: cont "to take it." done -BlackthornGymClairText_BagFull: BlackthornGymClairText_League: text "So you've col-" line "lected all the" diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 29bc5b2a..bd1dd21a 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BLACKTHORNGYM2F_COOLTRAINER_M const BLACKTHORNGYM2F_COOLTRAINER_F const BLACKTHORNGYM2F_BOULDER1 diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index c7a61af0..a05ae1eb 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BLACKTHORNMART_CLERK const BLACKTHORNMART_COOLTRAINER_M const BLACKTHORNMART_BLACK_BELT diff --git a/maps/BlackthornPokecenter1F.asm b/maps/BlackthornPokecenter1F.asm index a6e44a88..530736dd 100644 --- a/maps/BlackthornPokecenter1F.asm +++ b/maps/BlackthornPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BLACKTHORNPOKECENTER1F_NURSE const BLACKTHORNPOKECENTER1F_GENTLEMAN const BLACKTHORNPOKECENTER1F_TWIN diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 58dda54b..56351efb 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BLUESHOUSE_DAISY BluesHouse_MapScripts: diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 032ee1dc..03a1099c 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BRUNOSROOM_BRUNO BrunosRoom_MapScripts: diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index d2836328..a7115718 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object constants + object_const_def ; object_event constants const BURNEDTOWER1F_FIREBREATHER_DICK const BURNEDTOWER1F_FIREBREATHER_NED const BURNEDTOWER1F_ROCK1 diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index b2c58474..fd54492b 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object constants + object_const_def ; object_event constants const BURNEDTOWERB1F_BOULDER const BURNEDTOWERB1F_RAIKOU1 const BURNEDTOWERB1F_ENTEI1 diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index a7aa5d72..7344a5a4 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONCAFE_SUPER_NERD const CELADONCAFE_FISHER1 const CELADONCAFE_FISHER2 diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index cf2c4c3f..349c8a45 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONCITY_FISHER const CELADONCITY_POLIWAG const CELADONCITY_TEACHER1 diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index ccf7b2e4..215b3cda 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONDEPTSTORE1F_RECEPTIONIST const CELADONDEPTSTORE1F_GENTLEMAN const CELADONDEPTSTORE1F_TEACHER diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index bf367adf..8e80329d 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONDEPTSTORE2F_CLERK1 const CELADONDEPTSTORE2F_CLERK2 const CELADONDEPTSTORE2F_POKEFAN_M diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index 638ff3c3..4fd72c8c 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONDEPTSTORE3F_CLERK const CELADONDEPTSTORE3F_YOUNGSTER const CELADONDEPTSTORE3F_GAMEBOY_KID1 diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index 9e7dddc2..8c6f1c64 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONDEPTSTORE4F_CLERK const CELADONDEPTSTORE4F_SUPER_NERD const CELADONDEPTSTORE4F_YOUNGSTER diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index 2c5ae22f..7704d942 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONDEPTSTORE5F_CLERK1 const CELADONDEPTSTORE5F_CLERK2 const CELADONDEPTSTORE5F_GENTLEMAN diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 144dde62..a04525c2 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -1,4 +1,8 @@ - const_def 2 ; object constants +CELADONDEPTSTORE6F_FRESH_WATER_PRICE EQU 200 +CELADONDEPTSTORE6F_SODA_POP_PRICE EQU 300 +CELADONDEPTSTORE6F_LEMONADE_PRICE EQU 350 + + object_const_def ; object_event constants const CELADONDEPTSTORE6F_SUPER_NERD const CELADONDEPTSTORE6F_YOUNGSTER @@ -28,29 +32,29 @@ CeladonDeptStore6FVendingMachine: end .FreshWater: - checkmoney YOUR_MONEY, 200 + checkmoney YOUR_MONEY, CELADONDEPTSTORE6F_FRESH_WATER_PRICE ifequal HAVE_LESS, .NotEnoughMoney giveitem FRESH_WATER iffalse .NotEnoughSpace - takemoney YOUR_MONEY, 200 + takemoney YOUR_MONEY, CELADONDEPTSTORE6F_FRESH_WATER_PRICE getitemname STRING_BUFFER_3, FRESH_WATER sjump .VendItem .SodaPop: - checkmoney YOUR_MONEY, 300 + checkmoney YOUR_MONEY, CELADONDEPTSTORE6F_SODA_POP_PRICE ifequal HAVE_LESS, .NotEnoughMoney giveitem SODA_POP iffalse .NotEnoughSpace - takemoney YOUR_MONEY, 300 + takemoney YOUR_MONEY, CELADONDEPTSTORE6F_SODA_POP_PRICE getitemname STRING_BUFFER_3, SODA_POP sjump .VendItem .Lemonade: - checkmoney YOUR_MONEY, 350 + checkmoney YOUR_MONEY, CELADONDEPTSTORE6F_LEMONADE_PRICE ifequal HAVE_LESS, .NotEnoughMoney giveitem LEMONADE iffalse .NotEnoughSpace - takemoney YOUR_MONEY, 350 + takemoney YOUR_MONEY, CELADONDEPTSTORE6F_LEMONADE_PRICE getitemname STRING_BUFFER_3, LEMONADE sjump .VendItem diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index b2d1f3be..7d38b39f 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONGAMECORNER_CLERK const CELADONGAMECORNER_RECEPTIONIST const CELADONGAMECORNER_POKEFAN_M diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index e6695f46..eabdf0fe 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -1,4 +1,11 @@ - const_def 2 ; object constants +CELADONGAMECORNERPRIZEROOM_TM32_COINS EQU 1500 +CELADONGAMECORNERPRIZEROOM_TM29_COINS EQU 3500 +CELADONGAMECORNERPRIZEROOM_TM15_COINS EQU 7500 +CELADONGAMECORNERPRIZEROOM_MR_MIME_COINS EQU 3333 +CELADONGAMECORNERPRIZEROOM_EEVEE_COINS EQU 6666 +CELADONGAMECORNERPRIZEROOM_PORYGON_COINS EQU 9999 + + object_const_def ; object_event constants const CELADONGAMECORNERPRIZEROOM_GENTLEMAN const CELADONGAMECORNERPRIZEROOM_PHARMACIST @@ -26,42 +33,42 @@ CeladonPrizeRoom_tmcounterloop: loadmenu CeladonPrizeRoom_TMMenuHeader verticalmenu closewindow - ifequal 1, .doubleteam - ifequal 2, .psychic - ifequal 3, .hyperbeam - sjump CeladonPrizeRoom_cancel + ifequal 1, .DoubleTeam + ifequal 2, .Psychic + ifequal 3, .HyperBeam + sjump CeladonPrizeRoom_CancelPurchaseScript -.doubleteam - checkcoins 1500 +.DoubleTeam: + checkcoins CELADONGAMECORNERPRIZEROOM_TM32_COINS ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins getitemname STRING_BUFFER_3, TM_DOUBLE_TEAM scall CeladonPrizeRoom_askbuy - iffalse CeladonPrizeRoom_cancel + iffalse CeladonPrizeRoom_CancelPurchaseScript giveitem TM_DOUBLE_TEAM iffalse CeladonPrizeRoom_notenoughroom - takecoins 1500 + takecoins CELADONGAMECORNERPRIZEROOM_TM32_COINS sjump CeladonPrizeRoom_purchased -.psychic - checkcoins 3500 +.Psychic: + checkcoins CELADONGAMECORNERPRIZEROOM_TM29_COINS ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins getitemname STRING_BUFFER_3, TM_PSYCHIC_M scall CeladonPrizeRoom_askbuy - iffalse CeladonPrizeRoom_cancel + iffalse CeladonPrizeRoom_CancelPurchaseScript giveitem TM_PSYCHIC_M iffalse CeladonPrizeRoom_notenoughroom - takecoins 3500 + takecoins CELADONGAMECORNERPRIZEROOM_TM29_COINS sjump CeladonPrizeRoom_purchased -.hyperbeam - checkcoins 7500 +.HyperBeam: + checkcoins CELADONGAMECORNERPRIZEROOM_TM15_COINS ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins getitemname STRING_BUFFER_3, TM_HYPER_BEAM scall CeladonPrizeRoom_askbuy - iffalse CeladonPrizeRoom_cancel + iffalse CeladonPrizeRoom_CancelPurchaseScript giveitem TM_HYPER_BEAM iffalse CeladonPrizeRoom_notenoughroom - takecoins 7500 + takecoins CELADONGAMECORNERPRIZEROOM_TM15_COINS sjump CeladonPrizeRoom_purchased CeladonPrizeRoom_askbuy: @@ -88,7 +95,7 @@ CeladonPrizeRoom_notenoughroom: closetext end -CeladonPrizeRoom_cancel: +CeladonPrizeRoom_CancelPurchaseScript: writetext CeladonPrizeRoom_ComeAgainText waitbutton closetext @@ -127,19 +134,19 @@ CeladonGameCornerPrizeRoomPokemonVendor: loadmenu .MenuHeader verticalmenu closewindow - ifequal 1, .mrmime - ifequal 2, .eevee - ifequal 3, .porygon - sjump CeladonPrizeRoom_cancel + ifequal 1, .MrMime + ifequal 2, .Eevee + ifequal 3, .Porygon + sjump CeladonPrizeRoom_CancelPurchaseScript -.mrmime - checkcoins 3333 +.MrMime: + checkcoins CELADONGAMECORNERPRIZEROOM_MR_MIME_COINS ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom getmonname STRING_BUFFER_3, MR__MIME scall CeladonPrizeRoom_askbuy - iffalse CeladonPrizeRoom_cancel + iffalse CeladonPrizeRoom_CancelPurchaseScript waitsfx playsound SFX_TRANSACTION writetext CeladonPrizeRoom_HereYouGoText @@ -147,17 +154,17 @@ CeladonGameCornerPrizeRoomPokemonVendor: setval MR__MIME special GameCornerPrizeMonCheckDex givepoke MR__MIME, 15 - takecoins 3333 + takecoins CELADONGAMECORNERPRIZEROOM_MR_MIME_COINS sjump .loop -.eevee - checkcoins 6666 +.Eevee: + checkcoins CELADONGAMECORNERPRIZEROOM_EEVEE_COINS ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom getmonname STRING_BUFFER_3, EEVEE scall CeladonPrizeRoom_askbuy - iffalse CeladonPrizeRoom_cancel + iffalse CeladonPrizeRoom_CancelPurchaseScript waitsfx playsound SFX_TRANSACTION writetext CeladonPrizeRoom_HereYouGoText @@ -165,17 +172,17 @@ CeladonGameCornerPrizeRoomPokemonVendor: setval EEVEE special GameCornerPrizeMonCheckDex givepoke EEVEE, 15 - takecoins 6666 + takecoins CELADONGAMECORNERPRIZEROOM_EEVEE_COINS sjump .loop -.porygon - checkcoins 9999 +.Porygon: + checkcoins CELADONGAMECORNERPRIZEROOM_PORYGON_COINS ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom getmonname STRING_BUFFER_3, PORYGON scall CeladonPrizeRoom_askbuy - iffalse CeladonPrizeRoom_cancel + iffalse CeladonPrizeRoom_CancelPurchaseScript waitsfx playsound SFX_TRANSACTION writetext CeladonPrizeRoom_HereYouGoText @@ -183,7 +190,7 @@ CeladonGameCornerPrizeRoomPokemonVendor: setval PORYGON special GameCornerPrizeMonCheckDex givepoke PORYGON, 20 - takecoins 9999 + takecoins CELADONGAMECORNERPRIZEROOM_PORYGON_COINS sjump .loop .MenuHeader: diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 0cce0b17..f29a462e 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONGYM_ERIKA const CELADONGYM_LASS1 const CELADONGYM_LASS2 diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index 0494249e..edadeced 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONMANSION1F_GRANNY const CELADONMANSION1F_GROWLITHE1 const CELADONMANSION1F_CLEFAIRY diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 08b0934b..66711e99 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONMANSION3F_COOLTRAINER_M const CELADONMANSION3F_GYM_GUY const CELADONMANSION3F_SUPER_NERD diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index cd1afe33..91e9a5d1 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -1,5 +1,4 @@ - const_def 2 ; object constants - const CELADONMANSIONROOF_FISHER + object_const_def ; object_event constants CeladonMansionRoof_MapScripts: db 0 ; scene scripts diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index cadbe89e..6b19b14d 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONMANSIONROOFHOUSE_PHARMACIST CeladonMansionRoofHouse_MapScripts: diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index 297a4564..b29f7d41 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONPOKECENTER1F_NURSE const CELADONPOKECENTER1F_GENTLEMAN const CELADONPOKECENTER1F_PHARMACIST diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 39bd8e9f..e6fdbc4d 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CERULEANCITY_COOLTRAINER_M const CERULEANCITY_SUPER_NERD const CERULEANCITY_SLOWPOKE diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index f033299b..aa2fee46 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CERULEANGYM_ROCKET const CERULEANGYM_MISTY const CERULEANGYM_SWIMMER_GIRL1 @@ -26,18 +26,18 @@ CeruleanGym_MapScripts: applymovement CERULEANGYM_ROCKET, CeruleanGymGruntRunsIntoYouMovement playmusic MUSIC_ROCKET_ENCOUNTER opentext - writetext UnknownText_0x1884fb + writetext CeruleanGymGruntIntroText waitbutton closetext showemote EMOTE_SHOCK, CERULEANGYM_ROCKET, 15 applymovement CERULEANGYM_ROCKET, CeruleanGymGruntBacksAwayMovement opentext - writetext UnknownText_0x188574 + writetext CeruleanGymGruntBigMistakeText waitbutton closetext applymovement CERULEANGYM_ROCKET, CeruleanGymGruntMovesCloseMovement opentext - writetext UnknownText_0x1885a5 + writetext CeruleanGymGruntByeText waitbutton closetext applymovement CERULEANGYM_ROCKET, CeruleanGymGruntRunsOutMovement @@ -61,10 +61,10 @@ CeruleanGymMistyScript: opentext checkflag ENGINE_CASCADEBADGE iftrue .FightDone - writetext UnknownText_0x188674 + writetext MistyIntroText waitbutton closetext - winlosstext UnknownText_0x18870c, 0 + winlosstext MistyWinLossText, 0 loadtrainer MISTY, MISTY1 startbattle reloadmapafterbattle @@ -73,12 +73,12 @@ CeruleanGymMistyScript: setevent EVENT_BEAT_SWIMMERF_BRIANA setevent EVENT_BEAT_SWIMMERM_PARKER opentext - writetext UnknownText_0x188768 + writetext ReceivedCascadeBadgeText playsound SFX_GET_BADGE waitsfx setflag ENGINE_CASCADEBADGE .FightDone: - writetext UnknownText_0x188782 + writetext MistyFightDoneText waitbutton closetext end @@ -139,7 +139,7 @@ CeruleanGymStatue1: checkevent EVENT_TRAINERS_IN_CERULEAN_GYM iffalse CeruleanGymStatue opentext - writetext CeruleanGymNote1 + writetext CeruleanGymNote1Text waitbutton closetext end @@ -148,7 +148,7 @@ CeruleanGymStatue2: checkevent EVENT_TRAINERS_IN_CERULEAN_GYM iffalse CeruleanGymStatue opentext - writetext CeruleanGymNote2 + writetext CeruleanGymNote2Text waitbutton closetext end @@ -195,7 +195,7 @@ CeruleanGymGruntBacksAwayMovement: remove_fixed_facing step_end -UnknownText_0x1884fb: +CeruleanGymGruntIntroText: text "Oops! I so sorry!" line "You not hurt," cont "okay?" @@ -207,13 +207,13 @@ UnknownText_0x1884fb: cont "seen by somebody." done -UnknownText_0x188574: +CeruleanGymGruntBigMistakeText: text "Oh no! You seen" line "me already! I make" cont "big mistake!" done -UnknownText_0x1885a5: +CeruleanGymGruntByeText: text "Hey, you! Forget" line "you see me, okay?" @@ -226,19 +226,19 @@ UnknownText_0x1885a5: para "Bye-bye a go-go!" done -CeruleanGymNote1: +CeruleanGymNote1Text: text "Sorry, I'll be out" line "for a while." cont "MISTY, GYM LEADER" done -CeruleanGymNote2: +CeruleanGymNote2Text: text "Since MISTY's out," line "we'll be away too." cont "GYM TRAINERS" done -UnknownText_0x188674: +MistyIntroText: text "MISTY: I was ex-" line "pecting you, you" cont "pest!" @@ -254,7 +254,7 @@ UnknownText_0x188674: line "#MON are tough!" done -UnknownText_0x18870c: +MistyWinLossText: text "MISTY: You really" line "are good…" @@ -265,12 +265,12 @@ UnknownText_0x18870c: line "CASCADEBADGE." done -UnknownText_0x188768: +ReceivedCascadeBadgeText: text "<PLAYER> received" line "CASCADEBADGE." done -UnknownText_0x188782: +MistyFightDoneText: text "MISTY: Are there" line "many strong train-" cont "ers in JOHTO? Like" diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index 6d94bae0..33aad16b 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CERULEANGYMBADGESPEECHHOUSE_POKEFAN_M CeruleanGymBadgeSpeechHouse_MapScripts: diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index 6fd5c9b8..7d55c48b 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CERULEANMART_CLERK const CERULEANMART_COOLTRAINER_M const CERULEANMART_COOLTRAINER_F diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm index 2968cb10..7d0526b1 100644 --- a/maps/CeruleanPokecenter1F.asm +++ b/maps/CeruleanPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CERULEANPOKECENTER1F_NURSE const CERULEANPOKECENTER1F_SUPER_NERD const CERULEANPOKECENTER1F_GYM_GUY diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index 1c97dc0e..507f0d5b 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CERULEANPOLICESTATION_FISHING_GURU const CERULEANPOLICESTATION_POKEFAN_F const CERULEANPOLICESTATION_DIGLETT diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index d1a3caea..97ae15f7 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CERULEANTRADESPEECHHOUSE_GRANNY const CERULEANTRADESPEECHHOUSE_GRAMPS const CERULEANTRADESPEECHHOUSE_RHYDON diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index 165b5074..69efe53d 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CHARCOALKILN_BLACK_BELT const CHARCOALKILN_YOUNGSTER const CHARCOALKILN_MOLTRES diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index d9ad3e3e..7219e67c 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CHERRYGROVECITY_GRAMPS const CHERRYGROVECITY_SILVER const CHERRYGROVECITY_TEACHER diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index 78ea3fc6..3612f315 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CHERRYGROVEEVOLUTIONSPEECHHOUSE_LASS const CHERRYGROVEEVOLUTIONSPEECHHOUSE_YOUNGSTER diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index 95aa6c91..28bf6153 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CHERRYGROVEGYMSPEECHHOUSE_POKEFAN_M const CHERRYGROVEGYMSPEECHHOUSE_BUG_CATCHER diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 366df35e..601ff753 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CHERRYGROVEMART_CLERK const CHERRYGROVEMART_COOLTRAINER_M const CHERRYGROVEMART_YOUNGSTER diff --git a/maps/CherrygrovePokecenter1F.asm b/maps/CherrygrovePokecenter1F.asm index cfd02430..60c6414e 100644 --- a/maps/CherrygrovePokecenter1F.asm +++ b/maps/CherrygrovePokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CHERRYGROVEPOKECENTER1F_NURSE const CHERRYGROVEPOKECENTER1F_FISHER const CHERRYGROVEPOKECENTER1F_GENTLEMAN diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 335d9e00..aabf41cd 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CIANWOODCITY_STANDING_YOUNGSTER const CIANWOODCITY_POKEFAN_M const CIANWOODCITY_LASS diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 62b15126..3097d8fb 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CIANWOODGYM_CHUCK const CIANWOODGYM_BLACK_BELT1 const CIANWOODGYM_BLACK_BELT2 diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index 33d42030..0f2d432a 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CIANWOODLUGIASPEECHHOUSE_TEACHER const CIANWOODLUGIASPEECHHOUSE_LASS const CIANWOODLUGIASPEECHHOUSE_TWIN diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 771c5932..b55e3d07 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CIANWOODPHARMACY_PHARMACIST CianwoodPharmacy_MapScripts: diff --git a/maps/CianwoodPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm index d59df9b9..2bbb623a 100644 --- a/maps/CianwoodPhotoStudio.asm +++ b/maps/CianwoodPhotoStudio.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CIANWOODPHOTOSTUDIO_FISHING_GURU CianwoodPhotoStudio_MapScripts: diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm index 31e16ee8..6cefb6ef 100644 --- a/maps/CianwoodPokecenter1F.asm +++ b/maps/CianwoodPokecenter1F.asm @@ -1,8 +1,7 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CIANWOODPOKECENTER1F_NURSE const CIANWOODPOKECENTER1F_LASS const CIANWOODPOKECENTER1F_GYM_GUY - const CIANWOODPOKECENTER1F_SUPER_NERD CianwoodPokecenter1F_MapScripts: db 0 ; scene scripts diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 54656768..0cd60316 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CINNABARISLAND_BLUE CinnabarIsland_MapScripts: diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm index 9100f73b..f6ca9554 100644 --- a/maps/CinnabarPokecenter1F.asm +++ b/maps/CinnabarPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CINNABARPOKECENTER1F_NURSE const CINNABARPOKECENTER1F_COOLTRAINER_F const CINNABARPOKECENTER1F_FISHER diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index ae4f2fd7..863ca4bb 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const COLOSSEUM_CHRIS1 const COLOSSEUM_CHRIS2 diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index f35fa487..0d0d9596 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const COPYCATSHOUSE1F_POKEFAN_M const COPYCATSHOUSE1F_POKEFAN_F const COPYCATSHOUSE1F_CLEFAIRY diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 1c86d68b..51292a05 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const COPYCATSHOUSE2F_COPYCAT const COPYCATSHOUSE2F_DODRIO const COPYCATSHOUSE2F_FAIRYDOLL ; lost item diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index 7b6b5ed5..83aee34e 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const DANCETHEATRE_KIMONO_GIRL1 const DANCETHEATRE_KIMONO_GIRL2 const DANCETHEATRE_KIMONO_GIRL3 @@ -14,13 +14,13 @@ DanceTheatre_MapScripts: db 0 ; callbacks -TrainerKimonoGirlNaoko2: - trainer KIMONO_GIRL, NAOKO, EVENT_BEAT_KIMONO_GIRL_NAOKO, KimonoGirlNaoko2SeenText, KimonoGirlNaoko2BeatenText, 0, .Script +TrainerKimonoGirlNaoko: + trainer KIMONO_GIRL, NAOKO, EVENT_BEAT_KIMONO_GIRL_NAOKO, KimonoGirlNaokoSeenText, KimonoGirlNaokoBeatenText, 0, .Script .Script: endifjustbattled opentext - writetext KimonoGirlNaoko2AfterBattleText + writetext KimonoGirlNaokoAfterBattleText waitbutton closetext end @@ -127,18 +127,18 @@ DanceTheatreGrannyScript: DanceTheatreFancyPanel: jumptext DanceTheatreFancyPanelText -KimonoGirlNaoko2SeenText: +KimonoGirlNaokoSeenText: text "You have lovely" line "#MON. May I see" cont "them in battle?" done -KimonoGirlNaoko2BeatenText: +KimonoGirlNaokoBeatenText: text "Oh, you are very" line "strong." done -KimonoGirlNaoko2AfterBattleText: +KimonoGirlNaokoAfterBattleText: text "I enjoyed that" line "bout. I would like" cont "to see you again." @@ -333,7 +333,7 @@ DanceTheatre_MapEvents: bg_event 6, 6, BGEVENT_UP, DanceTheatreFancyPanel db 9 ; object events - object_event 0, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlNaoko2, -1 + object_event 0, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlNaoko, -1 object_event 2, 1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlSayo, -1 object_event 6, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlZuki, -1 object_event 9, 1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlKuni, -1 diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index d1ac6082..196c352f 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const DARKCAVEBLACKTHORNENTRANCE_PHARMACIST const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL1 const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL2 diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index e6dd4b83..da943b90 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const DARKCAVEVIOLETENTRANCE_POKE_BALL1 const DARKCAVEVIOLETENTRANCE_ROCK1 const DARKCAVEVIOLETENTRANCE_ROCK2 @@ -6,7 +6,6 @@ const DARKCAVEVIOLETENTRANCE_ROCK4 const DARKCAVEVIOLETENTRANCE_POKE_BALL2 const DARKCAVEVIOLETENTRANCE_POKE_BALL3 - const DARKCAVEVIOLETENTRANCE_POKE_BALL4 DarkCaveVioletEntrance_MapScripts: db 0 ; scene scripts diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 06adf095..360bb50c 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const DAYCARE_GRAMPS const DAYCARE_GRANNY diff --git a/maps/DayOfWeekSiblingsHouse.asm b/maps/DayOfWeekSiblingsHouse.asm index 73eca15d..299e0e1c 100644 --- a/maps/DayOfWeekSiblingsHouse.asm +++ b/maps/DayOfWeekSiblingsHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const DAYOFWEEKSIBLINGSHOUSE_POKEDEX DayOfWeekSiblingsHouse_MapScripts: diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 8475c141..d77f3e8e 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const DIGLETTSCAVE_POKEFAN_M DiglettsCave_MapScripts: diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 537be0aa..77ca2610 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -1,13 +1,7 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const DRAGONSDENB1F_POKE_BALL1 const DRAGONSDENB1F_CLAIR const DRAGONSDENB1F_SILVER - const DRAGONSDENB1F_COOLTRAINER_M - const DRAGONSDENB1F_COOLTRAINER_F - const DRAGONSDENB1F_TWIN1 - const DRAGONSDENB1F_TWIN2 - const DRAGONSDENB1F_POKE_BALL2 - const DRAGONSDENB1F_POKE_BALL3 DragonsDenB1F_MapScripts: db 0 ; scene scripts @@ -70,7 +64,7 @@ DragonsDenB1FDragonFangScript: promptbutton sjump .ClairLastText .ClairLastText - writetext ClairText_WhatsTheMatterDragonDen + writetext ClairText_CollectedAllBadges waitbutton closetext applymovement DRAGONSDENB1F_CLAIR, MovementDragonsDen_ClairWalksAway @@ -185,7 +179,7 @@ ClairText_DescribeDragonbreathDragonDen: cont "to take it." done -ClairText_WhatsTheMatterDragonDen: +ClairText_CollectedAllBadges: text "So, you've col-" line "lected all the" cont "BADGES." diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index c787c08c..37994ad8 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const EARLSPOKEMONACADEMY_EARL const EARLSPOKEMONACADEMY_YOUNGSTER1 const EARLSPOKEMONACADEMY_GAMEBOY_KID1 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 57be1eb4..b06ce58e 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -1,11 +1,10 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ECRUTEAKCITY_GRAMPS1 const ECRUTEAKCITY_GRAMPS2 const ECRUTEAKCITY_LASS1 const ECRUTEAKCITY_LASS2 const ECRUTEAKCITY_FISHER const ECRUTEAKCITY_YOUNGSTER - const ECRUTEAKCITY_GRAMPS3 EcruteakCity_MapScripts: db 0 ; scene scripts diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 969e4d78..7959cf5f 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -1,11 +1,10 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ECRUTEAKGYM_MORTY const ECRUTEAKGYM_SAGE1 const ECRUTEAKGYM_SAGE2 const ECRUTEAKGYM_GRANNY1 const ECRUTEAKGYM_GRANNY2 const ECRUTEAKGYM_GYM_GUY - const ECRUTEAKGYM_GRAMPS EcruteakGym_MapScripts: db 0 ; scene scripts diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index 299a80e5..440d2d6c 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ECRUTEAKITEMFINDERHOUSE_COOLTRAINER_M const ECRUTEAKITEMFINDERHOUSE_POKEDEX diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index 8b02bd15..cd93d0d0 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ECRUTEAKLUGIASPEECHHOUSE_GRAMPS const ECRUTEAKLUGIASPEECHHOUSE_YOUNGSTER diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index 13259932..34cb3e60 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ECRUTEAKMART_CLERK const ECRUTEAKMART_SUPER_NERD const ECRUTEAKMART_GRANNY diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm index 2d97125b..0f398bfd 100644 --- a/maps/EcruteakPokecenter1F.asm +++ b/maps/EcruteakPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ECRUTEAKPOKECENTER1F_NURSE const ECRUTEAKPOKECENTER1F_POKEFAN_M const ECRUTEAKPOKECENTER1F_COOLTRAINER_F diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm index c775d6ac..5356757e 100644 --- a/maps/EcruteakTinTowerEntrance.asm +++ b/maps/EcruteakTinTowerEntrance.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ECRUTEAKTINTOWERENTRANCE_SAGE1 const ECRUTEAKTINTOWERENTRANCE_SAGE2 const ECRUTEAKTINTOWERENTRANCE_SAGE3 @@ -19,7 +19,7 @@ EcruteakTinTowerEntrance_MapScripts: EcruteakTinTowerEntrance_CoordEvent1: checkevent EVENT_RANG_CLEAR_BELL_2 - iftrue EcruteakTinTowerEntrance_CoordEventEmpty + iftrue EcruteakTinTowerEntrance_CoordEvent_DontMove applymovement ECRUTEAKTINTOWERENTRANCE_SAGE2, MovementData_0x980c7 moveobject ECRUTEAKTINTOWERENTRANCE_SAGE1, 4, 6 appear ECRUTEAKTINTOWERENTRANCE_SAGE1 @@ -29,7 +29,7 @@ EcruteakTinTowerEntrance_CoordEvent1: EcruteakTinTowerEntrance_CoordEvent2: checkevent EVENT_RANG_CLEAR_BELL_1 - iftrue EcruteakTinTowerEntrance_CoordEventEmpty + iftrue EcruteakTinTowerEntrance_CoordEvent_DontMove applymovement ECRUTEAKTINTOWERENTRANCE_SAGE1, MovementData_0x980cc moveobject ECRUTEAKTINTOWERENTRANCE_SAGE2, 5, 6 appear ECRUTEAKTINTOWERENTRANCE_SAGE2 @@ -37,7 +37,7 @@ EcruteakTinTowerEntrance_CoordEvent2: disappear ECRUTEAKTINTOWERENTRANCE_SAGE1 end -EcruteakTinTowerEntrance_CoordEventEmpty: +EcruteakTinTowerEntrance_CoordEvent_DontMove: end EcruteakTinTowerEntranceSageScript: @@ -67,7 +67,7 @@ EcruteakTinTowerEntranceWanderingSageScript: end .GotRainbowWing: - writetext EcruteakTinTowerEntranceWanderingSageText_GotClearBell + writetext EcruteakTinTowerEntranceWanderingSageText_GotRainbowWing waitbutton closetext end @@ -122,7 +122,7 @@ EcruteakTinTowerEntranceWanderingSageText: line "flying #MON." done -EcruteakTinTowerEntranceWanderingSageText_GotClearBell: +EcruteakTinTowerEntranceWanderingSageText_GotRainbowWing: text "The TIN TOWER" line "shook! A #MON" diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index 49f06126..a1d98073 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ELMSHOUSE_ELMS_WIFE const ELMSHOUSE_ELMS_SON diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 41839262..0ba7d46a 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ELMSLAB_ELM const ELMSLAB_ELMS_AIDE const ELMSLAB_POKE_BALL1 diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 0eb09324..21ae9739 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const FASTSHIP1F_SAILOR1 const FASTSHIP1F_SAILOR2 const FASTSHIP1F_SAILOR3 diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index a1375427..8848abfc 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const FASTSHIPB1F_SAILOR1 const FASTSHIPB1F_SAILOR2 const FASTSHIPB1F_SAILOR3 @@ -28,7 +28,7 @@ FastShipB1F_MapScripts: FastShipB1FSailorBlocksLeft: checkevent EVENT_FAST_SHIP_B1F_SAILOR_RIGHT iftrue FastShipB1FAlreadyBlocked - applymovement FASTSHIPB1F_SAILOR2, FashShipB1FSailorBlocksLeftMovement + applymovement FASTSHIPB1F_SAILOR2, FastShipB1FSailorBlocksLeftMovement moveobject FASTSHIPB1F_SAILOR1, 30, 6 appear FASTSHIPB1F_SAILOR1 pause 5 @@ -38,7 +38,7 @@ FastShipB1FSailorBlocksLeft: FastShipB1FSailorBlocksRight: checkevent EVENT_FAST_SHIP_B1F_SAILOR_LEFT iftrue FastShipB1FAlreadyBlocked - applymovement FASTSHIPB1F_SAILOR1, FashShipB1FSailorBlocksRightMovement + applymovement FASTSHIPB1F_SAILOR1, FastShipB1FSailorBlocksRightMovement moveobject FASTSHIPB1F_SAILOR2, 31, 6 appear FASTSHIPB1F_SAILOR2 pause 5 @@ -201,17 +201,17 @@ TrainerSchoolboyRicky: closetext end -FashShipB1FTrashcan: +FastShipB1FTrashcan: jumpstd trashcan -FashShipB1FSailorBlocksRightMovement: +FastShipB1FSailorBlocksRightMovement: fix_facing big_step RIGHT remove_fixed_facing turn_head DOWN step_end -FashShipB1FSailorBlocksLeftMovement: +FastShipB1FSailorBlocksLeftMovement: fix_facing big_step LEFT remove_fixed_facing @@ -458,7 +458,7 @@ FastShipB1F_MapEvents: coord_event 31, 7, SCENE_DEFAULT, FastShipB1FSailorBlocksRight db 1 ; bg events - bg_event 27, 9, BGEVENT_READ, FashShipB1FTrashcan + bg_event 27, 9, BGEVENT_READ, FastShipB1FTrashcan db 12 ; object events object_event 30, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FastShipB1FSailorScript, EVENT_FAST_SHIP_B1F_SAILOR_LEFT diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index 92866b9f..9ed61ca4 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const FASTSHIPCABINS_NNW_NNE_NE_COOLTRAINER_M const FASTSHIPCABINS_NNW_NNE_NE_COOLTRAINER_F const FASTSHIPCABINS_NNW_NNE_NE_SUPER_NERD diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index c9f7842c..8d0e3179 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_CAPTAIN const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1 diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index fbef49f9..355d02fd 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const FASTSHIPCABINS_SW_SSW_NW_FISHER const FASTSHIPCABINS_SW_SSW_NW_BUG_CATCHER const FASTSHIPCABINS_SW_SSW_NW_BUENA diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index e097febb..7b81f5f4 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const FIGHTINGDOJO_BLACK_BELT const FIGHTINGDOJO_POKE_BALL diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 0d44b0e8..e5a96e9f 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const FUCHSIACITY_YOUNGSTER const FUCHSIACITY_POKEFAN_M const FUCHSIACITY_TEACHER diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index bd791476..ea4d64bf 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const FUCHSIAGYM_JANINE const FUCHSIAGYM_FUCHSIA_GYM_1 const FUCHSIAGYM_FUCHSIA_GYM_2 diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index b57e8259..413aed07 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const FUCHSIAMART_CLERK const FUCHSIAMART_FISHER const FUCHSIAMART_COOLTRAINER_F diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm index b0555704..8dad06da 100644 --- a/maps/FuchsiaPokecenter1F.asm +++ b/maps/FuchsiaPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const FUCHSIAPOKECENTER1F_NURSE const FUCHSIAPOKECENTER1F_COOLTRAINER_M const FUCHSIAPOKECENTER1F_COOLTRAINER_F diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index a8d484a5..c4a05e3f 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODBIKESHOP_CLERK GoldenrodBikeShop_MapScripts: diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index baf39888..ce12284b 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODCITY_POKEFAN_M1 const GOLDENRODCITY_YOUNGSTER1 const GOLDENRODCITY_COOLTRAINER_F1 diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index ec79e968..a3c41a78 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODDEPTSTORE1F_RECEPTIONIST const GOLDENRODDEPTSTORE1F_POKEFAN_F const GOLDENRODDEPTSTORE1F_BUG_CATCHER diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index d13fb9f2..e344256a 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODDEPTSTORE2F_CLERK1 const GOLDENRODDEPTSTORE2F_CLERK2 const GOLDENRODDEPTSTORE2F_YOUNGSTER diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index 83232dda..7e692267 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODDEPTSTORE3F_CLERK const GOLDENRODDEPTSTORE3F_SUPER_NERD const GOLDENRODDEPTSTORE3F_ROCKER diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index 895c8a4f..655cfbbb 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODDEPTSTORE4F_CLERK const GOLDENRODDEPTSTORE4F_COOLTRAINER_M const GOLDENRODDEPTSTORE4F_BUG_CATCHER diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index d8ba879a..eda75e15 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODDEPTSTORE5F_CLERK const GOLDENRODDEPTSTORE5F_LASS const GOLDENRODDEPTSTORE5F_MIKE @@ -64,14 +64,14 @@ GoldenrodDeptStore5FReceptionistScript: checkflag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN iftrue .EventIsOver special GetFirstPokemonHappiness - writetext UnknownText_0x56143 + writetext GoldenrodDeptStore5FReceptionistOhYourMonDotDotDotText promptbutton ifgreater 150 - 1, .VeryHappy ifgreater 50 - 1, .SomewhatHappy sjump .NotVeryHappy .VeryHappy: - writetext UnknownText_0x5615a + writetext GoldenrodDeptStore5FReceptionistThisMoveShouldBePerfectText promptbutton verbosegiveitem TM_RETURN iffalse .Done @@ -80,13 +80,13 @@ GoldenrodDeptStore5FReceptionistScript: end .SomewhatHappy: - writetext UnknownText_0x561a6 + writetext GoldenrodDeptStore5FReceptionistItsAdorableText waitbutton closetext end .NotVeryHappy: - writetext UnknownText_0x561d8 + writetext GoldenrodDeptStore5FReceptionistItLooksEvilHowAboutThisTMText promptbutton verbosegiveitem TM_FRUSTRATION iffalse .Done @@ -95,7 +95,7 @@ GoldenrodDeptStore5FReceptionistScript: end .EventIsOver: - writetext UnknownText_0x56202 + writetext GoldenrodDeptStore5FReceptionistThereAreTMsPerfectForMonText waitbutton .Done: closetext @@ -106,14 +106,14 @@ Carrie: opentext special GameboyCheck ifnotequal GBCHECK_CGB, .NotGBC ; This is a dummy check from Gold/Silver - writetext UnknownText_0x56241 + writetext GoldenrodDeptStore5FCarrieMysteryGiftExplanationText waitbutton closetext special UnlockMysteryGift end .NotGBC: - writetext UnknownText_0x56279 + writetext GoldenrodDeptStore5FCarrieMysteryGiftRequiresGBCText waitbutton closetext end @@ -138,12 +138,12 @@ GoldenrodDeptStore5FDirectory: GoldenrodDeptStore5FElevatorButton: jumpstd elevatorbutton -UnknownText_0x56143: +GoldenrodDeptStore5FReceptionistOhYourMonDotDotDotText: text "Hello. Oh, your" line "#MON…" done -UnknownText_0x5615a: +GoldenrodDeptStore5FReceptionistThisMoveShouldBePerfectText: text "It's very attached" line "to you." @@ -152,20 +152,20 @@ UnknownText_0x5615a: cont "pair like you." done -UnknownText_0x561a6: +GoldenrodDeptStore5FReceptionistItsAdorableText: text "It's adorable!" para "You should teach" line "it good TM moves." done -UnknownText_0x561d8: +GoldenrodDeptStore5FReceptionistItLooksEvilHowAboutThisTMText: text "It looks evil. How" line "about this TM for" cont "it?" done -UnknownText_0x56202: +GoldenrodDeptStore5FReceptionistThereAreTMsPerfectForMonText: text "There are sure to" line "be TMs that are" @@ -173,7 +173,7 @@ UnknownText_0x56202: line "your #MON." done -UnknownText_0x56241: +GoldenrodDeptStore5FCarrieMysteryGiftExplanationText: text "MYSTERY GIFT." para "With just a" @@ -181,7 +181,7 @@ UnknownText_0x56241: cont "get a gift." done -UnknownText_0x56279: +GoldenrodDeptStore5FCarrieMysteryGiftRequiresGBCText: text "The MYSTERY GIFT" line "option requires a" cont "Game Boy Color." diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 61425193..3b4c39cc 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -1,4 +1,8 @@ - const_def 2 ; object constants +GOLDENRODDEPTSTORE6F_FRESH_WATER_PRICE EQU 200 +GOLDENRODDEPTSTORE6F_SODA_POP_PRICE EQU 300 +GOLDENRODDEPTSTORE6F_LEMONADE_PRICE EQU 350 + + object_const_def ; object_event constants const GOLDENRODDEPTSTORE6F_LASS const GOLDENRODDEPTSTORE6F_SUPER_NERD @@ -22,29 +26,29 @@ GoldenrodVendingMachine: end .FreshWater: - checkmoney YOUR_MONEY, 200 + checkmoney YOUR_MONEY, GOLDENRODDEPTSTORE6F_FRESH_WATER_PRICE ifequal HAVE_LESS, .NotEnoughMoney giveitem FRESH_WATER iffalse .NotEnoughSpace - takemoney YOUR_MONEY, 200 + takemoney YOUR_MONEY, GOLDENRODDEPTSTORE6F_FRESH_WATER_PRICE getitemname STRING_BUFFER_3, FRESH_WATER sjump .VendItem .SodaPop: - checkmoney YOUR_MONEY, 300 + checkmoney YOUR_MONEY, GOLDENRODDEPTSTORE6F_SODA_POP_PRICE ifequal HAVE_LESS, .NotEnoughMoney giveitem SODA_POP iffalse .NotEnoughSpace - takemoney YOUR_MONEY, 300 + takemoney YOUR_MONEY, GOLDENRODDEPTSTORE6F_SODA_POP_PRICE getitemname STRING_BUFFER_3, SODA_POP sjump .VendItem .Lemonade: - checkmoney YOUR_MONEY, 350 + checkmoney YOUR_MONEY, GOLDENRODDEPTSTORE6F_LEMONADE_PRICE ifequal HAVE_LESS, .NotEnoughMoney giveitem LEMONADE iffalse .NotEnoughSpace - takemoney YOUR_MONEY, 350 + takemoney YOUR_MONEY, GOLDENRODDEPTSTORE6F_LEMONADE_PRICE getitemname STRING_BUFFER_3, LEMONADE sjump .VendItem diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 4e7a36f1..e86cbcb3 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODDEPTSTOREB1F_POKE_BALL1 const GOLDENRODDEPTSTOREB1F_POKE_BALL2 const GOLDENRODDEPTSTOREB1F_POKE_BALL3 diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 9aff3cbd..571e5a5e 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -14,7 +14,7 @@ FlowerShopTeacherScript: iffalse .Lalala faceplayer opentext - writetext UnknownText_0x554c2 + writetext GoldenrodFlowerShopTeacherBetterThanWhitneyText promptbutton verbosegiveitem SQUIRTBOTTLE setevent EVENT_GOT_SQUIRTBOTTLE @@ -23,7 +23,7 @@ FlowerShopTeacherScript: .Lalala: turnobject GOLDENRODFLOWERSHOP_TEACHER, LEFT opentext - writetext UnknownText_0x5552e + writetext GoldenrodFlowerShopTeacherLalalaHavePlentyOfWaterText waitbutton closetext end @@ -33,13 +33,13 @@ FlowerShopFloriaScript: opentext checkflag ENGINE_PLAINBADGE iffalse .NoPlainBadge - writetext UnknownText_0x555e6 + writetext GoldenrodFlowerShopFloriaJumpsInSurpriseText waitbutton closetext end .NoPlainBadge: - writetext UnknownText_0x55561 + writetext GoldenrodFlowerShopFloriaMustBeAMonText waitbutton closetext end @@ -56,7 +56,7 @@ FlowerShopRadio: ; unused jumpstd radio2 -UnknownText_0x554c2: +GoldenrodFlowerShopTeacherBetterThanWhitneyText: text "Oh, you're better" line "than WHITNEY." @@ -72,13 +72,13 @@ UnknownText_0x554c2: cont "you should be OK." done -UnknownText_0x5552e: +GoldenrodFlowerShopTeacherLalalaHavePlentyOfWaterText: text "Lalala lalalala." line "Have plenty of" cont "water, my lovely!" done -UnknownText_0x55561: +GoldenrodFlowerShopFloriaMustBeAMonText: text "When I watered" line "that moving tree" @@ -94,7 +94,7 @@ UnknownText_0x55561: cont "ER, to beat it." done -UnknownText_0x555e6: +GoldenrodFlowerShopFloriaJumpsInSurpriseText: text "Do you know about" line "the moving tree?" diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index b7a092f5..ff92d4ec 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -1,4 +1,12 @@ - const_def 2 ; object constants +GOLDENRODGAMECORNER_TM25_COINS EQU 5500 +GOLDENRODGAMECORNER_TM14_COINS EQU 5500 +GOLDENRODGAMECORNER_TM38_COINS EQU 5500 +GOLDENRODGAMECORNER_ABRA_COINS EQU 200 +GOLDENRODGAMECORNER_SANDSHREW_COINS EQU 700 +GOLDENRODGAMECORNER_EKANS_COINS EQU 700 +GOLDENRODGAMECORNER_DRATINI_COINS EQU 2100 + + object_const_def ; object_event constants const GOLDENRODGAMECORNER_CLERK const GOLDENRODGAMECORNER_RECEPTIONIST1 const GOLDENRODGAMECORNER_RECEPTIONIST2 @@ -38,36 +46,36 @@ GoldenrodGameCornerTMVendor_LoopScript: sjump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript .Thunder: - checkcoins 5500 + checkcoins GOLDENRODGAMECORNER_TM25_COINS ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript getitemname STRING_BUFFER_3, TM_THUNDER scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript giveitem TM_THUNDER iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript - takecoins 5500 + takecoins GOLDENRODGAMECORNER_TM25_COINS sjump GoldenrodGameCornerTMVendor_FinishScript .Blizzard: - checkcoins 5500 + checkcoins GOLDENRODGAMECORNER_TM14_COINS ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript getitemname STRING_BUFFER_3, TM_BLIZZARD scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript giveitem TM_BLIZZARD iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript - takecoins 5500 + takecoins GOLDENRODGAMECORNER_TM14_COINS sjump GoldenrodGameCornerTMVendor_FinishScript .FireBlast: - checkcoins 5500 + checkcoins GOLDENRODGAMECORNER_TM38_COINS ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript getitemname STRING_BUFFER_3, TM_FIRE_BLAST scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript giveitem TM_FIRE_BLAST iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript - takecoins 5500 + takecoins GOLDENRODGAMECORNER_TM38_COINS sjump GoldenrodGameCornerTMVendor_FinishScript GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript: @@ -128,20 +136,21 @@ GoldenrodGameCornerPrizeMonVendorScript: checkitem COIN_CASE iffalse GoldenrodGameCornerPrizeVendor_NoCoinCaseScript checkver - iftrue .silver_loop -.gold_loop + iftrue .Silver_Loop + +.Gold_Loop: writetext GoldenrodGameCornerPrizeVendorWhichPrizeText special DisplayCoinCaseBalance - loadmenu .gold_MenuHeader + loadmenu .Gold_MenuHeader verticalmenu closewindow - ifequal 1, .gold_abra - ifequal 2, .gold_ekans - ifequal 3, .gold_dratini + ifequal 1, .Gold_Abra + ifequal 2, .Gold_Ekans + ifequal 3, .Gold_Dratini sjump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript -.gold_abra - checkcoins 200 +.Gold_Abra: + checkcoins GOLDENRODGAMECORNER_ABRA_COINS ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript @@ -155,11 +164,11 @@ GoldenrodGameCornerPrizeMonVendorScript: setval ABRA special GameCornerPrizeMonCheckDex givepoke ABRA, 10 - takecoins 200 - sjump .gold_loop + takecoins GOLDENRODGAMECORNER_ABRA_COINS + sjump .Gold_Loop -.gold_ekans - checkcoins 700 +.Gold_Ekans: + checkcoins GOLDENRODGAMECORNER_EKANS_COINS ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript @@ -173,11 +182,11 @@ GoldenrodGameCornerPrizeMonVendorScript: setval EKANS special GameCornerPrizeMonCheckDex givepoke EKANS, 10 - takecoins 700 - sjump .gold_loop + takecoins GOLDENRODGAMECORNER_EKANS_COINS + sjump .Gold_Loop -.gold_dratini - checkcoins 2100 +.Gold_Dratini: + checkcoins GOLDENRODGAMECORNER_DRATINI_COINS ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript @@ -191,16 +200,16 @@ GoldenrodGameCornerPrizeMonVendorScript: setval DRATINI special GameCornerPrizeMonCheckDex givepoke DRATINI, 10 - takecoins 2100 - sjump .gold_loop + takecoins GOLDENRODGAMECORNER_DRATINI_COINS + sjump .Gold_Loop -.gold_MenuHeader: +.Gold_MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, 17, TEXTBOX_Y - 1 - dw .gold_MenuData + dw .Gold_MenuData db 1 ; default option -.gold_MenuData: +.Gold_MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "ABRA 200@" @@ -208,19 +217,19 @@ GoldenrodGameCornerPrizeMonVendorScript: db "DRATINI 2100@" db "CANCEL@" -.silver_loop +.Silver_Loop: writetext GoldenrodGameCornerPrizeVendorWhichPrizeText special DisplayCoinCaseBalance - loadmenu .silver_MenuHeader + loadmenu .Silver_MenuHeader verticalmenu closewindow - ifequal 1, .silver_abra - ifequal 2, .silver_sandshrew - ifequal 3, .silver_dratini + ifequal 1, .Silver_Abra + ifequal 2, .Silver_Sandshrew + ifequal 3, .Silver_Dratini sjump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript -.silver_abra - checkcoins 200 +.Silver_Abra: + checkcoins GOLDENRODGAMECORNER_ABRA_COINS ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript @@ -234,11 +243,11 @@ GoldenrodGameCornerPrizeMonVendorScript: setval ABRA special GameCornerPrizeMonCheckDex givepoke ABRA, 10 - takecoins 200 - sjump .silver_loop + takecoins GOLDENRODGAMECORNER_ABRA_COINS + sjump .Silver_Loop -.silver_sandshrew - checkcoins 700 +.Silver_Sandshrew: + checkcoins GOLDENRODGAMECORNER_SANDSHREW_COINS ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript @@ -252,11 +261,11 @@ GoldenrodGameCornerPrizeMonVendorScript: setval SANDSHREW special GameCornerPrizeMonCheckDex givepoke SANDSHREW, 10 - takecoins 700 - sjump .silver_loop + takecoins GOLDENRODGAMECORNER_SANDSHREW_COINS + sjump .Silver_Loop -.silver_dratini - checkcoins 2100 +.Silver_Dratini: + checkcoins GOLDENRODGAMECORNER_DRATINI_COINS ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript @@ -270,16 +279,16 @@ GoldenrodGameCornerPrizeMonVendorScript: setval DRATINI special GameCornerPrizeMonCheckDex givepoke DRATINI, 10 - takecoins 2100 - sjump .silver_loop + takecoins GOLDENRODGAMECORNER_DRATINI_COINS + sjump .Silver_Loop -.silver_MenuHeader: +.Silver_MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, 17, TEXTBOX_Y - 1 - dw .silver_MenuData + dw .Silver_MenuData db 1 ; default option -.silver_MenuData: +.Silver_MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "ABRA 200@" diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 88a48a3b..7b5e7ea0 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODGYM_WHITNEY const GOLDENRODGYM_LASS1 const GOLDENRODGYM_LASS2 diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 95418751..5958c181 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODHAPPINESSRATER_TEACHER const GOLDENRODHAPPINESSRATER_POKEFAN_M const GOLDENRODHAPPINESSRATER_TWIN diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index 4e4a0aa0..ad2eff10 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODMAGNETTRAINSTATION_OFFICER const GOLDENRODMAGNETTRAINSTATION_GENTLEMAN @@ -16,22 +16,22 @@ GoldenrodMagnetTrainStationOfficerScript: opentext checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .MagnetTrainToSaffron - writetext UnknownText_0x55160 + writetext GoldenrodMagnetTrainStationOfficerTheTrainHasntComeInText waitbutton closetext end .MagnetTrainToSaffron: - writetext UnknownText_0x551b7 + writetext GoldenrodMagnetTrainStationOfficerAreYouComingAboardText yesorno iffalse .DecidedNotToRide checkitem PASS iffalse .PassNotInBag - writetext UnknownText_0x551ed + writetext GoldenrodMagnetTrainStationOfficerRightThisWayText waitbutton closetext - applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, MovementData_0x55146 - applymovement PLAYER, MovementData_0x5514f + applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, GoldenrodMagnetTrainStationOfficerApproachTrainDoorMovement + applymovement PLAYER, GoldenrodMagnetTrainStationPlayerApproachAndEnterTrainMovement setval FALSE special MagnetTrain warpcheck @@ -39,23 +39,23 @@ GoldenrodMagnetTrainStationOfficerScript: end .PassNotInBag: - writetext UnknownText_0x5522c + writetext GoldenrodMagnetTrainStationOfficerYouDontHaveARailPassText waitbutton closetext end .DecidedNotToRide: - writetext UnknownText_0x5524f + writetext GoldenrodMagnetTrainStationOfficerHopeToSeeYouAgainText waitbutton closetext end Script_ArriveFromSaffron: - applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, MovementData_0x55146 - applymovement PLAYER, MovementData_0x55158 - applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, MovementData_0x5514b + applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, GoldenrodMagnetTrainStationOfficerApproachTrainDoorMovement + applymovement PLAYER, GoldenrodMagnetTrainStationPlayerLeaveTrainAndEnterStationMovement + applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, GoldenrodMagnetTrainStationOfficerReturnToBoardingGateMovement opentext - writetext UnknownText_0x5526a + writetext GoldenrodMagnetTrainStationOfficerArrivedInGoldenrodText waitbutton closetext end @@ -63,20 +63,20 @@ Script_ArriveFromSaffron: GoldenrodMagnetTrainStationGentlemanScript: jumptextfaceplayer GoldenrodMagnetTrainStationGentlemanText -MovementData_0x55146: +GoldenrodMagnetTrainStationOfficerApproachTrainDoorMovement: step UP step UP step RIGHT turn_head LEFT step_end -MovementData_0x5514b: +GoldenrodMagnetTrainStationOfficerReturnToBoardingGateMovement: step LEFT step DOWN step DOWN step_end -MovementData_0x5514f: +GoldenrodMagnetTrainStationPlayerApproachAndEnterTrainMovement: step UP step UP step UP @@ -87,7 +87,7 @@ MovementData_0x5514f: step UP step_end -MovementData_0x55158: +GoldenrodMagnetTrainStationPlayerLeaveTrainAndEnterStationMovement: step LEFT step LEFT step DOWN @@ -97,7 +97,7 @@ MovementData_0x55158: turn_head UP step_end -UnknownText_0x55160: +GoldenrodMagnetTrainStationOfficerTheTrainHasntComeInText: text "The train hasn't" line "come in…" @@ -108,7 +108,7 @@ UnknownText_0x55160: para "That won't work." done -UnknownText_0x551b7: +GoldenrodMagnetTrainStationOfficerAreYouComingAboardText: text "We'll soon depart" line "for SAFFRON." @@ -116,7 +116,7 @@ UnknownText_0x551b7: line "aboard?" done -UnknownText_0x551ed: +GoldenrodMagnetTrainStationOfficerRightThisWayText: text "May I see your" line "rail PASS, please?" @@ -124,17 +124,17 @@ UnknownText_0x551ed: line "way, sir." done -UnknownText_0x5522c: +GoldenrodMagnetTrainStationOfficerYouDontHaveARailPassText: text "Sorry. You don't" line "have a rail PASS." done -UnknownText_0x5524f: +GoldenrodMagnetTrainStationOfficerHopeToSeeYouAgainText: text "We hope to see you" line "again!" done -UnknownText_0x5526a: +GoldenrodMagnetTrainStationOfficerArrivedInGoldenrodText: text "We have arrived in" line "GOLDENROD." diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index e0e090b4..92a25118 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODNAMERATER_NAME_RATER GoldenrodNameRater_MapScripts: diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index 816258fa..1bb24417 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODPPSPEECHHOUSE_FISHER const GOLDENRODPPSPEECHHOUSE_LASS diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index 1ec3e27d..dab2500a 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -1,7 +1,8 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODPOKECENTER1F_NURSE const GOLDENRODPOKECENTER1F_GAMEBOY_KID - const GOLDENRODPOKECENTER1F_LASS + const GOLDENRODPOKECENTER1F_FISHER + const GOLDENRODPOKECENTER1F_TWIN GoldenrodPokecenter1F_MapScripts: db 0 ; scene scripts diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index c4f3ef16..c59ed938 100644 --- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -31,7 +31,7 @@ doorstate: MACRO changeblock UGDOOR_\1_YCOORD, UGDOOR_\1_XCOORD, UNDERGROUND_DOOR_\2 ENDM - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST1 const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST2 const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_ROCKET1 diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm index 0ac3dadd..e0f95e38 100644 --- a/maps/GoldenrodUndergroundWarehouse.asm +++ b/maps/GoldenrodUndergroundWarehouse.asm @@ -1,11 +1,10 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET1 const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET2 const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET3 const GOLDENRODUNDERGROUNDWAREHOUSE_GENTLEMAN const GOLDENRODUNDERGROUNDWAREHOUSE_POKE_BALL1 const GOLDENRODUNDERGROUNDWAREHOUSE_POKE_BALL2 - const GOLDENRODUNDERGROUNDWAREHOUSE_POKE_BALL3 GoldenrodUndergroundWarehouse_MapScripts: db 0 ; scene scripts diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index 376aa0d0..0fd391ce 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GUIDEGENTSHOUSE_GRAMPS GuideGentsHouse_MapScripts: diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index 151166d0..5c2d83ae 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const HALLOFFAME_LANCE HallOfFame_MapScripts: diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index 23c16580..8d0aa7c7 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -1,7 +1,6 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ICEPATH1F_POKE_BALL1 const ICEPATH1F_POKE_BALL2 - const ICEPATH1F_POKE_BALL3 IcePath1F_MapScripts: db 0 ; scene scripts diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index a8e07480..f0e93ea0 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ICEPATHB1F_BOULDER1 const ICEPATHB1F_BOULDER2 const ICEPATHB1F_BOULDER3 diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index 23ba9377..deb4f3cc 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ICEPATHB2FBLACKTHORNSIDE_POKE_BALL IcePathB2FBlackthornSide_MapScripts: diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index 86a706db..c9a60a18 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ICEPATHB2FMAHOGANYSIDE_BOULDER1 const ICEPATHB2FMAHOGANYSIDE_BOULDER2 const ICEPATHB2FMAHOGANYSIDE_BOULDER3 diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index 1130705a..c35fd454 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ICEPATHB3F_POKE_BALL const ICEPATHB3F_ROCK diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 213939b3..634011ee 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ILEXFOREST_FARFETCHD1 const ILEXFOREST_FARFETCHD2 const ILEXFOREST_FARFETCHD3 @@ -9,14 +9,10 @@ const ILEXFOREST_FARFETCHD8 const ILEXFOREST_FARFETCHD9 const ILEXFOREST_FARFETCHD10 - const ILEXFOREST_YOUNGSTER1 + const ILEXFOREST_YOUNGSTER const ILEXFOREST_BLACK_BELT const ILEXFOREST_ROCKER - const ILEXFOREST_POKE_BALL1 - const ILEXFOREST_YOUNGSTER2 - const ILEXFOREST_POKE_BALL2 - const ILEXFOREST_POKE_BALL3 - const ILEXFOREST_POKE_BALL4 + const ILEXFOREST_POKE_BALL IlexForest_MapScripts: db 0 ; scene scripts diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index 0e992960..33f7bf9c 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ILEXFORESTAZALEAGATE_OFFICER const ILEXFORESTAZALEAGATE_GRANNY diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index c8fd52c4..c5cf3c57 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const INDIGOPLATEAUPOKECENTER1F_NURSE const INDIGOPLATEAUPOKECENTER1F_CLERK const INDIGOPLATEAUPOKECENTER1F_COOLTRAINER_M diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index c7266a7f..1d5a16ab 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const KARENSROOM_KAREN KarensRoom_MapScripts: diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index cec81d71..ec86adba 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const KOGASROOM_KOGA KogasRoom_MapScripts: diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 5d48decf..ed4a92c6 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -1,9 +1,8 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const KURTSHOUSE_KURT1 - const KURTSHOUSE_TWIN1 + const KURTSHOUSE_TWIN const KURTSHOUSE_SLOWPOKE const KURTSHOUSE_KURT2 - const KURTSHOUSE_TWIN2 KurtsHouse_MapScripts: db 0 ; scene scripts @@ -33,7 +32,7 @@ Kurt1: iftrue .GotLureBall checkevent EVENT_CLEARED_SLOWPOKE_WELL iftrue .ClearedSlowpokeWell - writetext UnknownText_0x18e473 + writetext KurtsHouseKurtMakingBallsMustWaitText waitbutton closetext special FadeOutMusic @@ -42,7 +41,7 @@ Kurt1: ifequal UP, .RunAround turnobject PLAYER, DOWN playsound SFX_FLY - applymovement KURTSHOUSE_KURT1, MovementData_0x18e466 + applymovement KURTSHOUSE_KURT1, KurtsHouseKurtExitHouseMovement playsound SFX_EXIT_BUILDING disappear KURTSHOUSE_KURT1 waitsfx @@ -52,7 +51,7 @@ Kurt1: .RunAround: turnobject PLAYER, DOWN playsound SFX_FLY - applymovement KURTSHOUSE_KURT1, MovementData_0x18e46c + applymovement KURTSHOUSE_KURT1, KurtsHouseKurtGoAroundPlayerThenExitHouseMovement playsound SFX_EXIT_BUILDING disappear KURTSHOUSE_KURT1 waitsfx @@ -60,7 +59,7 @@ Kurt1: end .ClearedSlowpokeWell: - writetext UnknownText_0x18e615 + writetext KurtsHouseKurtHonoredToMakeBallsText promptbutton verbosegiveitem LURE_BALL iffalse .NoRoomForBall @@ -84,7 +83,7 @@ Kurt1: iftrue .GiveHeavyBall checkevent EVENT_GAVE_KURT_PNK_APRICORN iftrue .GiveLoveBall - writetext UnknownText_0x18e6c9 + writetext KurtsHouseKurtBallsFromApricornsText promptbutton .CheckApricorns: checkitem RED_APRICORN @@ -105,7 +104,7 @@ Kurt1: end .AskApricorn: - writetext UnknownText_0x18e736 + writetext KurtsHouseKurtAskYouHaveAnApricornText promptbutton special SelectApricornForKurt ifequal FALSE, .Cancel @@ -147,19 +146,19 @@ Kurt1: setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 setflag ENGINE_KURT_MAKING_BALLS .WaitForApricorns: - writetext UnknownText_0x18e779 + writetext KurtsHouseKurtItWillTakeADayText waitbutton closetext end .Cancel: - writetext UnknownText_0x18e7bc + writetext KurtsHouseKurtThatsALetdownText waitbutton closetext end .KurtMakingBallsScript: - writetext UnknownText_0x18e7d8 + writetext KurtsHouseKurtDontBotherMeText waitbutton closetext end @@ -167,7 +166,7 @@ Kurt1: ._ThatTurnedOutGreat: setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 .ThatTurnedOutGreat: - writetext UnknownText_0x18e82a + writetext KurtsHouseKurtTurnedOutGreatText waitbutton .NoRoomForBall: closetext @@ -176,7 +175,7 @@ Kurt1: .GiveLevelBall: checkflag ENGINE_KURT_MAKING_BALLS iftrue .KurtMakingBallsScript - writetext UnknownText_0x18e7fb + writetext KurtsHouseKurtJustFinishedYourBallText promptbutton verbosegiveitem LEVEL_BALL iffalse .NoRoomForBall @@ -186,7 +185,7 @@ Kurt1: .GiveLureBall: checkflag ENGINE_KURT_MAKING_BALLS iftrue .KurtMakingBallsScript - writetext UnknownText_0x18e7fb + writetext KurtsHouseKurtJustFinishedYourBallText promptbutton verbosegiveitem LURE_BALL iffalse .NoRoomForBall @@ -196,7 +195,7 @@ Kurt1: .GiveMoonBall: checkflag ENGINE_KURT_MAKING_BALLS iftrue .KurtMakingBallsScript - writetext UnknownText_0x18e7fb + writetext KurtsHouseKurtJustFinishedYourBallText promptbutton verbosegiveitem MOON_BALL iffalse .NoRoomForBall @@ -206,7 +205,7 @@ Kurt1: .GiveFriendBall: checkflag ENGINE_KURT_MAKING_BALLS iftrue .KurtMakingBallsScript - writetext UnknownText_0x18e7fb + writetext KurtsHouseKurtJustFinishedYourBallText promptbutton verbosegiveitem FRIEND_BALL iffalse .NoRoomForBall @@ -216,7 +215,7 @@ Kurt1: .GiveFastBall: checkflag ENGINE_KURT_MAKING_BALLS iftrue .KurtMakingBallsScript - writetext UnknownText_0x18e7fb + writetext KurtsHouseKurtJustFinishedYourBallText promptbutton verbosegiveitem FAST_BALL iffalse .NoRoomForBall @@ -226,7 +225,7 @@ Kurt1: .GiveHeavyBall: checkflag ENGINE_KURT_MAKING_BALLS iftrue .KurtMakingBallsScript - writetext UnknownText_0x18e7fb + writetext KurtsHouseKurtJustFinishedYourBallText promptbutton verbosegiveitem HEAVY_BALL iffalse .NoRoomForBall @@ -236,7 +235,7 @@ Kurt1: .GiveLoveBall: checkflag ENGINE_KURT_MAKING_BALLS iftrue .KurtMakingBallsScript - writetext UnknownText_0x18e7fb + writetext KurtsHouseKurtJustFinishedYourBallText promptbutton verbosegiveitem LOVE_BALL iffalse .NoRoomForBall @@ -296,7 +295,7 @@ KurtsHouseBookshelf: KurtsHouseRadio: jumpstd radio2 -MovementData_0x18e466: +KurtsHouseKurtExitHouseMovement: big_step DOWN big_step DOWN big_step DOWN @@ -304,7 +303,7 @@ MovementData_0x18e466: big_step DOWN step_end -MovementData_0x18e46c: +KurtsHouseKurtGoAroundPlayerThenExitHouseMovement: big_step RIGHT big_step DOWN big_step DOWN @@ -313,7 +312,7 @@ MovementData_0x18e46c: big_step DOWN step_end -UnknownText_0x18e473: +KurtsHouseKurtMakingBallsMustWaitText: text "Hm? Who are you?" para "<PLAYER>, eh? You" @@ -354,7 +353,7 @@ UnknownText_0x18e473: cont "way!" done -UnknownText_0x18e615: +KurtsHouseKurtHonoredToMakeBallsText: text "KURT: Hi, <PLAYER>!" para "You handled your-" @@ -373,7 +372,7 @@ UnknownText_0x18e615: line "now, but take it." done -UnknownText_0x18e6c9: +KurtsHouseKurtBallsFromApricornsText: text "KURT: I make BALLS" line "from APRICORNS." @@ -385,7 +384,7 @@ UnknownText_0x18e6c9: line "out of them." done -UnknownText_0x18e736: +KurtsHouseKurtAskYouHaveAnApricornText: text "KURT: You have an" line "APRICORN for me?" @@ -393,7 +392,7 @@ UnknownText_0x18e736: line "into a BALL." done -UnknownText_0x18e779: +KurtsHouseKurtItWillTakeADayText: text "KURT: It'll take a" line "day to make you a" @@ -401,23 +400,23 @@ UnknownText_0x18e779: line "for it later." done -UnknownText_0x18e7bc: +KurtsHouseKurtThatsALetdownText: text "KURT: Oh…" line "That's a letdown." done -UnknownText_0x18e7d8: +KurtsHouseKurtDontBotherMeText: text "KURT: I'm working!" line "Don't bother me!" done -UnknownText_0x18e7fb: +KurtsHouseKurtJustFinishedYourBallText: text "KURT: Ah, <PLAYER>!" line "I just finished" cont "your BALL. Here!" done -UnknownText_0x18e82a: +KurtsHouseKurtTurnedOutGreatText: text "KURT: That turned" line "out great." diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index 5f3109da..00b6fb00 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const LAKEOFRAGE_LANCE const LAKEOFRAGE_GRAMPS const LAKEOFRAGE_SUPER_NERD1 @@ -45,18 +45,18 @@ LakeOfRageLanceScript: checkevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE iftrue .AskAgainForHelp opentext - writetext UnknownText_0x70157 + writetext LakeOfRageLanceForcedToEvolveText promptbutton faceplayer - writetext UnknownText_0x701b4 + writetext LakeOfRageLanceIntroText yesorno iffalse .RefusedToHelp .AgreedToHelp: - writetext UnknownText_0x702c6 + writetext LakeOfRageLanceRadioSignalText waitbutton closetext playsound SFX_WARP_TO - applymovement LAKEOFRAGE_LANCE, MovementData_0x70155 + applymovement LAKEOFRAGE_LANCE, LakeOfRageLanceTeleportIntoSkyMovement disappear LAKEOFRAGE_LANCE clearevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE setevent EVENT_DECIDED_TO_HELP_LANCE @@ -64,7 +64,7 @@ LakeOfRageLanceScript: end .RefusedToHelp: - writetext UnknownText_0x70371 + writetext LakeOfRageLanceRefusedText waitbutton closetext setevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE @@ -73,28 +73,28 @@ LakeOfRageLanceScript: .AskAgainForHelp: faceplayer opentext - writetext UnknownText_0x703a5 + writetext LakeOfRageLanceAskHelpText yesorno iffalse .RefusedToHelp sjump .AgreedToHelp RedGyarados: opentext - writetext UnknownText_0x703cb + writetext LakeOfRageGyaradosCryText pause 15 cry GYARADOS closetext loadwildmon GYARADOS, 30 loadvar VAR_BATTLETYPE, BATTLETYPE_SHINY startbattle - ifequal $1, .NotBeaten + ifequal LOSE, .NotBeaten disappear LAKEOFRAGE_GYARADOS .NotBeaten: reloadmapafterbattle opentext giveitem RED_SCALE waitsfx - writetext UnknownText_0x703df + writetext LakeOfRageGotRedScaleText playsound SFX_ITEM waitsfx itemnotify @@ -238,11 +238,11 @@ LakeOfRageHiddenRareCandy: LakeOfRageHiddenMaxPotion: hiddenitem MAX_POTION, EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION -MovementData_0x70155: +LakeOfRageLanceTeleportIntoSkyMovement: teleport_from step_end -UnknownText_0x70157: +LakeOfRageLanceForcedToEvolveText: text "This lake is full" line "of GYARADOS but" cont "nothing else…" @@ -252,7 +252,7 @@ UnknownText_0x70157: cont "to evolve…" done -UnknownText_0x701b4: +LakeOfRageLanceIntroText: text "Did you come here" line "because of the" cont "rumors?" @@ -280,7 +280,7 @@ UnknownText_0x701b4: cont "investigate?" done -UnknownText_0x702c6: +LakeOfRageLanceRadioSignalText: text "LANCE: Excellent!" para "It seems that the" @@ -299,22 +299,22 @@ UnknownText_0x702c6: line "for you, <PLAYER>." done -UnknownText_0x70371: +LakeOfRageLanceRefusedText: text "Oh… Well, if you" line "change your mind," cont "please help me." done -UnknownText_0x703a5: +LakeOfRageLanceAskHelpText: text "LANCE: Hm? Are you" line "going to help me?" done -UnknownText_0x703cb: +LakeOfRageGyaradosCryText: text "GYARADOS: Gyashaa!" done -UnknownText_0x703df: +LakeOfRageGotRedScaleText: text "<PLAYER> obtained a" line "RED SCALE." done diff --git a/maps/LakeOfRageHiddenPowerHouse.asm b/maps/LakeOfRageHiddenPowerHouse.asm index b8662867..20e4a560 100644 --- a/maps/LakeOfRageHiddenPowerHouse.asm +++ b/maps/LakeOfRageHiddenPowerHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const LAKEOFRAGEHIDDENPOWERHOUSE_FISHER LakeOfRageHiddenPowerHouse_MapScripts: diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm index 005b8444..867c52dc 100644 --- a/maps/LakeOfRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const LAKEOFRAGEMAGIKARPHOUSE_FISHING_GURU LakeOfRageMagikarpHouse_MapScripts: @@ -203,7 +203,9 @@ LakeOfRageMagikarpHouseUnusedRecordText: text " caught by" line "@" text_ram wStringBuffer4 - db "@@" + text_end + + text_end ; unused LakeOfRageMagikarpHouse_MapEvents: db 0, 0 ; filler diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 6f55b17f..ae302a49 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const LANCESROOM_LANCE const LANCESROOM_MARY const LANCESROOM_OAK @@ -80,7 +80,7 @@ LancesRoomLanceScript: appear LANCESROOM_MARY applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRushesIn opentext - writetext UnknownText_0x1811dd + writetext LancesRoomMaryOhNoOakText waitbutton closetext appear LANCESROOM_OAK @@ -91,19 +91,19 @@ LancesRoomLanceScript: turnobject LANCESROOM_OAK, UP turnobject LANCESROOM_LANCE, LEFT opentext - writetext UnknownText_0x18121b + writetext LancesRoomOakCongratulationsText waitbutton closetext applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryInterviewChampion turnobject PLAYER, LEFT opentext - writetext UnknownText_0x18134b + writetext LancesRoomMaryInterviewText waitbutton closetext applymovement LANCESROOM_LANCE, LancesRoomMovementData_LancePositionsSelfToGuidePlayerAway turnobject PLAYER, UP opentext - writetext UnknownText_0x18137b + writetext LancesRoomNoisyText waitbutton closetext follow LANCESROOM_LANCE, PLAYER @@ -119,7 +119,7 @@ LancesRoomLanceScript: applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryTriesToFollow showemote EMOTE_SHOCK, LANCESROOM_MARY, 15 opentext - writetext UnknownText_0x1813c5 + writetext LancesRoomMaryNoInterviewText pause 30 closetext applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRunsBackAndForth @@ -277,7 +277,7 @@ LanceBattleAfterText: line "your #MON." done -UnknownText_0x1811dd: +LancesRoomMaryOhNoOakText: text "MARY: Oh, no!" line "It's all over!" @@ -285,7 +285,7 @@ UnknownText_0x1811dd: line "weren't so slow…" done -UnknownText_0x18121b: +LancesRoomOakCongratulationsText: text "PROF.OAK: Ah," line "<PLAYER>!" @@ -318,13 +318,13 @@ UnknownText_0x18121b: line "<PLAYER>!" done -UnknownText_0x18134b: +LancesRoomMaryInterviewText: text "MARY: Let's inter-" line "view the brand new" cont "CHAMPION!" done -UnknownText_0x18137b: +LancesRoomNoisyText: text "LANCE: This is" line "getting to be a" cont "bit too noisy…" @@ -333,7 +333,7 @@ UnknownText_0x18137b: line "come with me?" done -UnknownText_0x1813c5: +LancesRoomMaryNoInterviewText: text "MARY: Oh, wait!" line "We haven't done" cont "the interview!" diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 474d76ff..f9722972 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const LAVRADIOTOWER1F_RECEPTIONIST const LAVRADIOTOWER1F_OFFICER const LAVRADIOTOWER1F_SUPER_NERD1 diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index 51e172cb..a009b87a 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const LAVENDERMART_CLERK const LAVENDERMART_POKEFAN_M const LAVENDERMART_ROCKER diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index 7d2b44c9..333011a5 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const LAVENDERNAMERATER_NAME_RATER LavenderNameRater_MapScripts: diff --git a/maps/LavenderPokecenter1F.asm b/maps/LavenderPokecenter1F.asm index cfef8b8b..e4ed6a1b 100644 --- a/maps/LavenderPokecenter1F.asm +++ b/maps/LavenderPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const LAVENDERPOKECENTER1F_NURSE const LAVENDERPOKECENTER1F_GENTLEMAN const LAVENDERPOKECENTER1F_TEACHER diff --git a/maps/LavenderSpeechHouse.asm b/maps/LavenderSpeechHouse.asm index dd73aa81..7d43c2b9 100644 --- a/maps/LavenderSpeechHouse.asm +++ b/maps/LavenderSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const LAVENDERSPEECHHOUSE_POKEFAN_F LavenderSpeechHouse_MapScripts: diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 9aeec7ab..5beb0fec 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const LAVENDERTOWN_POKEFAN_M const LAVENDERTOWN_TEACHER const LAVENDERTOWN_GRAMPS diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index ad3584ec..cb49e16a 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MAHOGANYGYM_PRYCE const MAHOGANYGYM_BUENA1 const MAHOGANYGYM_ROCKER1 diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index f2d0f674..572be600 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -1,8 +1,8 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MAHOGANYMART1F_PHARMACIST const MAHOGANYMART1F_BLACK_BELT const MAHOGANYMART1F_LANCE - const MAHOGANYMART1F_DRAGON + const MAHOGANYMART1F_DRAGONITE const MAHOGANYMART1F_GRANNY MahoganyMart1F_MapScripts: @@ -29,7 +29,7 @@ MahoganyMart1F_MapScripts: changeblock 6, 2, $1e ; stairs return -MahogayMart1FPharmacistScript: +MahoganyMart1FPharmacistScript: faceplayer opentext checkevent EVENT_DECIDED_TO_HELP_LANCE @@ -39,23 +39,23 @@ MahogayMart1FPharmacistScript: end .LanceEntered: - writetext MahogayMart1FPharmacistText_LanceEntered + writetext MahoganyMart1FPharmacistText_LanceEntered waitbutton closetext end -MahogayMart1FBlackBeltScript: +MahoganyMart1FBlackBeltScript: faceplayer opentext checkevent EVENT_DECIDED_TO_HELP_LANCE iftrue .LanceEntered - writetext MahogayMart1FBlackBeltText + writetext MahoganyMart1FBlackBeltText waitbutton closetext end .LanceEntered: - writetext MahogayMart1FBlackBeltText_LanceEntered + writetext MahoganyMart1FBlackBeltText_LanceEntered waitbutton closetext end @@ -63,27 +63,27 @@ MahogayMart1FBlackBeltScript: MahoganyMart1FLanceUncoversStaircaseScript: pause 15 opentext - writetext UnknownText_0x6c52a + writetext MahoganyMart1FLanceDragoniteHyperBeamText pause 15 closetext playsound SFX_TACKLE - applymovement MAHOGANYMART1F_DRAGON, MovementData_0x6c3f6 - applymovement MAHOGANYMART1F_BLACK_BELT, MovementData_0x6c3fb + applymovement MAHOGANYMART1F_DRAGONITE, MahoganyMart1FDragoniteTackleMovement + applymovement MAHOGANYMART1F_BLACK_BELT, MahoganyMart1FBlackBeltKnockedBackMovement pause 15 - disappear MAHOGANYMART1F_DRAGON + disappear MAHOGANYMART1F_DRAGONITE pause 15 - applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c407 + applymovement MAHOGANYMART1F_LANCE, MahoganyMart1FLanceApproachPlayerMovement opentext - writetext UnknownText_0x6c549 + writetext MahoganyMart1FLanceRadioText waitbutton closetext follow MAHOGANYMART1F_LANCE, PLAYER - applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c40a - applymovement MAHOGANYMART1F_PHARMACIST, MovementData_0x6c403 - applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c40e + applymovement MAHOGANYMART1F_LANCE, MahoganyMart1FLanceApproachPharmacistMovement + applymovement MAHOGANYMART1F_PHARMACIST, MahoganyMart1FPharmacistShovedAsideMovement + applymovement MAHOGANYMART1F_LANCE, MahoganyMart1FLanceApproachHiddenStairsMovement stopfollow opentext - writetext UnknownText_0x6c59e + writetext MahoganyMart1FLanceStairsText waitbutton showemote EMOTE_SHOCK, MAHOGANYMART1F_PHARMACIST, 10 playsound SFX_FAINT @@ -93,31 +93,31 @@ MahoganyMart1FLanceUncoversStaircaseScript: setevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART turnobject MAHOGANYMART1F_LANCE, LEFT opentext - writetext UnknownText_0x6c5ba + writetext MahoganyMart1FLanceSplitUpText waitbutton closetext - applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c412 + applymovement MAHOGANYMART1F_LANCE, MahoganyMart1FLanceGoDownStairsMovement playsound SFX_EXIT_BUILDING disappear MAHOGANYMART1F_LANCE setscene SCENE_MAHOGANYMART1F_NOTHING waitsfx end -MahogayMart1FGrannyScript: +MahoganyMart1FGrannyScript: faceplayer opentext pokemart MARTTYPE_STANDARD, MART_MAHOGANY_2 closetext end -MovementData_0x6c3f6: +MahoganyMart1FDragoniteTackleMovement: fix_facing big_step LEFT big_step RIGHT remove_fixed_facing step_end -MovementData_0x6c3fb: +MahoganyMart1FBlackBeltKnockedBackMovement: fix_facing big_step LEFT remove_fixed_facing @@ -127,30 +127,30 @@ MovementData_0x6c3fb: turn_head RIGHT step_end -MovementData_0x6c403: +MahoganyMart1FPharmacistShovedAsideMovement: fix_facing big_step LEFT remove_fixed_facing step_end -MovementData_0x6c407: +MahoganyMart1FLanceApproachPlayerMovement: slow_step LEFT turn_head DOWN step_end -MovementData_0x6c40a: +MahoganyMart1FLanceApproachPharmacistMovement: slow_step RIGHT slow_step UP slow_step UP step_end -MovementData_0x6c40e: +MahoganyMart1FLanceApproachHiddenStairsMovement: slow_step UP slow_step RIGHT slow_step RIGHT step_end -MovementData_0x6c412: +MahoganyMart1FLanceGoDownStairsMovement: slow_step RIGHT step_end @@ -164,13 +164,13 @@ UnknownText_0x6c414: line "eat in MAHOGANY!" done -MahogayMart1FPharmacistText_LanceEntered: +MahoganyMart1FPharmacistText_LanceEntered: text "Arrgh… You found" line "the secret stair-" cont "way…" done -MahogayMart1FBlackBeltText: +MahoganyMart1FBlackBeltText: text "Heheh! The experi-" line "ment worked like a" cont "charm." @@ -182,19 +182,19 @@ MahogayMart1FBlackBeltText: line "moneymakers." done -MahogayMart1FBlackBeltText_LanceEntered: +MahoganyMart1FBlackBeltText_LanceEntered: text "Urrgh…" para "That guy's dragon" line "#MON are tough…" done -UnknownText_0x6c52a: +MahoganyMart1FLanceDragoniteHyperBeamText: text "LANCE: DRAGONITE," line "HYPER BEAM." done -UnknownText_0x6c549: +MahoganyMart1FLanceRadioText: text "What took you," line "<PLAYER>?" @@ -205,12 +205,12 @@ UnknownText_0x6c549: line "from here." done -UnknownText_0x6c59e: +MahoganyMart1FLanceStairsText: text "The stairs are" line "right here." done -UnknownText_0x6c5ba: +MahoganyMart1FLanceSplitUpText: text "LANCE: <PLAYER>, we" line "should split up to" @@ -231,8 +231,8 @@ MahoganyMart1F_MapEvents: db 0 ; bg events db 5 ; object events - object_event 4, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahogayMart1FPharmacistScript, EVENT_TEAM_ROCKET_BASE_POPULATION - object_event 1, 6, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahogayMart1FBlackBeltScript, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event 4, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyMart1FPharmacistScript, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event 1, 6, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyMart1FBlackBeltScript, EVENT_TEAM_ROCKET_BASE_POPULATION object_event 4, 6, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE object_event 3, 6, SPRITE_DRAGON, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE - object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahogayMart1FGrannyScript, EVENT_MAHOGANY_MART_OWNERS + object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyMart1FGrannyScript, EVENT_MAHOGANY_MART_OWNERS diff --git a/maps/MahoganyPokecenter1F.asm b/maps/MahoganyPokecenter1F.asm index caad5e04..8e5666c8 100644 --- a/maps/MahoganyPokecenter1F.asm +++ b/maps/MahoganyPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MAHOGANYPOKECENTER1F_NURSE const MAHOGANYPOKECENTER1F_POKEFAN_M const MAHOGANYPOKECENTER1F_YOUNGSTER diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index 5984c89f..71c1aa5a 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MAHOGANYREDGYARADOSSPEECHHOUSE_BLACK_BELT const MAHOGANYREDGYARADOSSPEECHHOUSE_TEACHER diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index dbd7bb9f..0aea3fa3 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -1,4 +1,6 @@ - const_def 2 ; object constants +MAHOGANYTOWN_RAGECANDYBAR_PRICE EQU 300 + + object_const_def ; object_event constants const MAHOGANYTOWN_POKEFAN_M const MAHOGANYTOWN_GRAMPS const MAHOGANYTOWN_FISHER @@ -54,13 +56,13 @@ RageCandyBarMerchantScript: special PlaceMoneyTopRight yesorno iffalse .Refused - checkmoney YOUR_MONEY, 300 + checkmoney YOUR_MONEY, MAHOGANYTOWN_RAGECANDYBAR_PRICE ifequal HAVE_LESS, .NotEnoughMoney giveitem RAGECANDYBAR iffalse .NoRoom waitsfx playsound SFX_TRANSACTION - takemoney YOUR_MONEY, 300 + takemoney YOUR_MONEY, MAHOGANYTOWN_RAGECANDYBAR_PRICE special PlaceMoneyTopRight writetext RageCandyBarMerchantSavorItText waitbutton diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index 1c203beb..233acd17 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MANIASHOUSE_ROCKER ManiasHouse_MapScripts: diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 09982fd1..1b0ef248 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MOUNTMOON_SILVER MountMoon_MapScripts: diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index 54616ea1..01b881f8 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MOUNTMOONGIFTSHOP_GRAMPS1 ; morning only const MOUNTMOONGIFTSHOP_GRAMPS2 ; day only const MOUNTMOONGIFTSHOP_LASS1 ; morning only diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 628ac17b..5f8ee54d 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MOUNTMOONSQUARE_FAIRY1 const MOUNTMOONSQUARE_FAIRY2 const MOUNTMOONSQUARE_ROCK diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 3e837835..488c9eaa 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -1,14 +1,8 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MOUNTMORTAR1FINSIDE_BOULDER const MOUNTMORTAR1FINSIDE_POKE_BALL1 const MOUNTMORTAR1FINSIDE_POKE_BALL2 const MOUNTMORTAR1FINSIDE_POKE_BALL3 - const MOUNTMORTAR1FINSIDE_POKE_BALL4 - const MOUNTMORTAR1FINSIDE_POKE_BALL5 - const MOUNTMORTAR1FINSIDE_SUPER_NERD1 - const MOUNTMORTAR1FINSIDE_SUPER_NERD2 - const MOUNTMORTAR1FINSIDE_POKE_BALL6 - const MOUNTMORTAR1FINSIDE_POKE_BALL7 MountMortar1FInside_MapScripts: db 0 ; scene scripts diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index d1f123c7..28308b8d 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MOUNTMORTAR1FOUTSIDE_POKE_BALL1 const MOUNTMORTAR1FOUTSIDE_POKE_BALL2 diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index 10eb78dc..e5aafd3d 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -1,11 +1,10 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MOUNTMORTAR2FINSIDE_POKE_BALL1 const MOUNTMORTAR2FINSIDE_POKE_BALL2 const MOUNTMORTAR2FINSIDE_POKE_BALL3 const MOUNTMORTAR2FINSIDE_POKE_BALL4 const MOUNTMORTAR2FINSIDE_POKE_BALL5 const MOUNTMORTAR2FINSIDE_POKE_BALL6 - const MOUNTMORTAR2FINSIDE_SUPER_NERD MountMortar2FInside_MapScripts: db 0 ; scene scripts diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index ea5e4cf3..80f90216 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -1,11 +1,8 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MOUNTMORTARB1F_POKE_BALL1 const MOUNTMORTARB1F_POKE_BALL2 const MOUNTMORTARB1F_BOULDER - const MOUNTMORTARB1F_BLACK_BELT - const MOUNTMORTARB1F_POKE_BALL3 - const MOUNTMORTARB1F_POKE_BALL4 - const MOUNTMORTARB1F_POKE_BALL5 + const MOUNTMORTARB1F_KIYO MountMortarB1F_MapScripts: db 0 ; scene scripts @@ -19,34 +16,34 @@ MountMortarB1FKiyoScript: iftrue .GotTyrogue checkevent EVENT_BEAT_BLACKBELT_KIYO iftrue .BeatKiyo - writetext UnknownText_0x7e24d + writetext MountMortarB1FKiyoIntroText waitbutton closetext - winlosstext UnknownText_0x7e2a9, 0 + winlosstext MountMortarB1FKiyoWinText, 0 loadtrainer BLACKBELT_T, KIYO startbattle reloadmapafterbattle setevent EVENT_BEAT_BLACKBELT_KIYO opentext .BeatKiyo: - writetext UnknownText_0x7e2c0 + writetext MountMortarB1FTyrogueRewardText promptbutton waitsfx readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, .NoRoom - writetext UnknownText_0x7e355 + writetext MountMortarB1FReceiveMonText playsound SFX_CAUGHT_MON waitsfx givepoke TYROGUE, 10 setevent EVENT_GOT_TYROGUE_FROM_KIYO .GotTyrogue: - writetext UnknownText_0x7e36a + writetext MountMortarB1FKiyoGotTyrogueText waitbutton closetext end .NoRoom: - writetext UnknownText_0x7e3df + writetext MountMortarB1FKiyoFullPartyText waitbutton closetext end @@ -63,7 +60,7 @@ MountMortarB1FFullHeal: MountMortarB1FHiddenMaxRevive: hiddenitem MAX_REVIVE, EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE -UnknownText_0x7e24d: +MountMortarB1FKiyoIntroText: text "Hey!" para "I am the KARATE" @@ -78,12 +75,12 @@ UnknownText_0x7e24d: para "Hwaaarggh!" done -UnknownText_0x7e2a9: +MountMortarB1FKiyoWinText: text "Waaaarggh!" line "I'm beaten!" done -UnknownText_0x7e2c0: +MountMortarB1FTyrogueRewardText: text "I… I'm crushed…" para "My training is" @@ -99,12 +96,12 @@ UnknownText_0x7e2c0: line "fighting #MON." done -UnknownText_0x7e355: +MountMortarB1FReceiveMonText: text "<PLAYER> received" line "TYROGUE." done -UnknownText_0x7e36a: +MountMortarB1FKiyoGotTyrogueText: text "TYROGUE is a" line "fighting-type." @@ -118,7 +115,7 @@ UnknownText_0x7e36a: para "Farewell!" done -UnknownText_0x7e3df: +MountMortarB1FKiyoFullPartyText: text "You have no room" line "in your party!" done diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index e382cf22..3fe4d378 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MOVEDELETERSHOUSE_SUPER_NERD MoveDeletersHouse_MapScripts: diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index 4396e707..d1edd158 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MRFUJISHOUSE_SUPER_NERD const MRFUJISHOUSE_LASS const MRFUJISHOUSE_PSYDUCK diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 1f93028c..5b5c92cb 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MRPOKEMONSHOUSE_GENTLEMAN const MRPOKEMONSHOUSE_OAK diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 2913d2e3..3725ed4f 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MRPSYCHICSHOUSE_FISHING_GURU MrPsychicsHouse_MapScripts: diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 8d89f2c3..efdefb54 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const NATIONALPARK_LASS1 const NATIONALPARK_POKEFAN_F1 const NATIONALPARK_TEACHER1 @@ -81,7 +81,7 @@ TrainerSchoolboyJack1: iftrue .NumberAccepted checkevent EVENT_JACK_ASKED_FOR_PHONE_NUMBER iftrue .AskAgain - writetext UnknownText_0x5c4f3 + writetext SchoolboyJackTradeMonText promptbutton setevent EVENT_JACK_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 @@ -175,7 +175,7 @@ TrainerPokefanfBeverly1: iftrue .NumberAccepted checkevent EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER iftrue .AskAgain - writetext UnknownText_0x5c68a + writetext PokefanBeverlyCuteMonText promptbutton setevent EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 @@ -375,7 +375,7 @@ SchoolboyJack1BeatenText: text "Wha-wha-what?" done -UnknownText_0x5c4f3: +SchoolboyJackTradeMonText: text "There is a lot" line "to learn." @@ -402,7 +402,7 @@ PokefanfBeverly1BeatenText: line "lot nicer." done -UnknownText_0x5c68a: +PokefanBeverlyCuteMonText: text "My friend has a" line "MARILL. It's so" diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index 2125c341..59f3ebd0 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const NATIONALPARKBUGCONTEST_YOUNGSTER1 const NATIONALPARKBUGCONTEST_YOUNGSTER2 const NATIONALPARKBUGCONTEST_ROCKER @@ -20,7 +20,7 @@ NationalParkBugContest_MapScripts: BugCatchingContestant1AScript: faceplayer opentext - writetext UnknownText_0x5c94c + writetext BugCatchingContestant1AText waitbutton closetext end @@ -28,7 +28,7 @@ BugCatchingContestant1AScript: BugCatchingContestant2AScript: faceplayer opentext - writetext UnknownText_0x5c973 + writetext BugCatchingContestant2AText waitbutton closetext end @@ -36,7 +36,7 @@ BugCatchingContestant2AScript: BugCatchingContestant3AScript: faceplayer opentext - writetext UnknownText_0x5c9a3 + writetext BugCatchingContestant3AText waitbutton closetext end @@ -44,7 +44,7 @@ BugCatchingContestant3AScript: BugCatchingContestant4AScript: faceplayer opentext - writetext UnknownText_0x5c9cc + writetext BugCatchingContestant4AText waitbutton closetext end @@ -52,7 +52,7 @@ BugCatchingContestant4AScript: BugCatchingContestant5AScript: faceplayer opentext - writetext UnknownText_0x5ca15 + writetext BugCatchingContestant5AText waitbutton closetext end @@ -60,7 +60,7 @@ BugCatchingContestant5AScript: BugCatchingContestant6AScript: faceplayer opentext - writetext UnknownText_0x5ca52 + writetext BugCatchingContestant6AText waitbutton closetext end @@ -68,7 +68,7 @@ BugCatchingContestant6AScript: BugCatchingContestant7AScript: faceplayer opentext - writetext UnknownText_0x5ca8f + writetext BugCatchingContestant7AText waitbutton closetext end @@ -76,7 +76,7 @@ BugCatchingContestant7AScript: BugCatchingContestant8AScript: faceplayer opentext - writetext UnknownText_0x5cac8 + writetext BugCatchingContestant8AText waitbutton closetext end @@ -84,7 +84,7 @@ BugCatchingContestant8AScript: BugCatchingContestant9AScript: faceplayer opentext - writetext UnknownText_0x5cb25 + writetext BugCatchingContestant9AText waitbutton closetext end @@ -92,7 +92,7 @@ BugCatchingContestant9AScript: BugCatchingContestant10AScript: faceplayer opentext - writetext UnknownText_0x5cb64 + writetext BugCatchingContestant10AText waitbutton closetext end @@ -115,25 +115,25 @@ NationalParkBugContestTMDig: NationalParkBugContestHiddenFullHeal: hiddenitem FULL_HEAL, EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL -UnknownText_0x5c94c: +BugCatchingContestant1AText: text "DON: I'm going to" line "win! Don't bother" cont "me." done -UnknownText_0x5c973: +BugCatchingContestant2AText: text "ED: My PARASECT" line "puts #MON to" cont "sleep with SPORE." done -UnknownText_0x5c9a3: +BugCatchingContestant3AText: text "NICK: I'm raising" line "fast #MON for" cont "battles." done -UnknownText_0x5c9cc: +BugCatchingContestant4AText: text "WILLIAM: I'm not" line "concerned about" cont "winning." @@ -142,7 +142,7 @@ UnknownText_0x5c9cc: line "for rare #MON." done -UnknownText_0x5ca15: +BugCatchingContestant5AText: text "BENNY: Ssh! You'll" line "scare off SCYTHER." @@ -150,7 +150,7 @@ UnknownText_0x5ca15: line "later." done -UnknownText_0x5ca52: +BugCatchingContestant6AText: text "BARRY: You should" line "weaken bug #MON" @@ -158,7 +158,7 @@ UnknownText_0x5ca52: line "a # BALL." done -UnknownText_0x5ca8f: +BugCatchingContestant7AText: text "CINDY: What is it?" para "Do you find it" @@ -168,7 +168,7 @@ UnknownText_0x5ca8f: line "#MON?" done -UnknownText_0x5cac8: +BugCatchingContestant8AText: text "JOSH: I've been" line "collecting bug" @@ -179,7 +179,7 @@ UnknownText_0x5cac8: line "going to lose!" done -UnknownText_0x5cb25: +BugCatchingContestant9AText: text "SAMUEL: If you've" line "got the time to" @@ -187,7 +187,7 @@ UnknownText_0x5cb25: line "bug #MON." done -UnknownText_0x5cb64: +BugCatchingContestant10AText: text "KIPP: I've studied" line "about bug #MON" cont "a lot." diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 432e97e8..5f9a98d5 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const NEWBARKTOWN_TEACHER const NEWBARKTOWN_FISHER const NEWBARKTOWN_SILVER diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index d16fac60..753e679b 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OAKSLAB_OAK const OAKSLAB_SCIENTIST1 const OAKSLAB_SCIENTIST2 diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index e36f9625..9e9ed432 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -1,7 +1,6 @@ - const_def 2 ; object constants - const OLIVINECAFE_SAILOR1 + object_const_def ; object_event constants + const OLIVINECAFE_SAILOR const OLIVINECAFE_FISHING_GURU - const OLIVINECAFE_SAILOR2 OlivineCafe_MapScripts: db 0 ; scene scripts diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index e025fcbf..fc55553a 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINECITY_SAILOR1 const OLIVINECITY_STANDING_YOUNGSTER const OLIVINECITY_SAILOR2 diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index ee2a11f1..33a57ec4 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINEGOODRODHOUSE_FISHING_GURU OlivineGoodRodHouse_MapScripts: diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index de380f44..694aecd3 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINEGYM_JASMINE const OLIVINEGYM_GYM_GUY diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index 2570de37..57709db7 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINEHOUSEBETA_TEACHER const OLIVINEHOUSEBETA_RHYDON diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index f411731e..6e1a2c72 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINELIGHTHOUSE1F_SAILOR const OLIVINELIGHTHOUSE1F_POKEFAN_F diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index aa92ab95..fe239e36 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINELIGHTHOUSE2F_SAILOR const OLIVINELIGHTHOUSE2F_GENTLEMAN diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index 53b2c591..3d71124f 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINELIGHTHOUSE3F_SAILOR const OLIVINELIGHTHOUSE3F_GENTLEMAN const OLIVINELIGHTHOUSE3F_YOUNGSTER diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index 50a4d17f..6d74f53f 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINELIGHTHOUSE4F_SAILOR const OLIVINELIGHTHOUSE4F_LASS diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 0fd8e4e2..1b59147a 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINELIGHTHOUSE5F_SAILOR const OLIVINELIGHTHOUSE5F_YOUNGSTER const OLIVINELIGHTHOUSE5F_POKE_BALL1 @@ -35,7 +35,7 @@ TrainerSailorErnest: OlivineLighthouse5FRareCandy: itemball RARE_CANDY -OlivineLighthouse5FSuperRepel: +OlivineLighthouse5FGreatBall: itemball GREAT_BALL OlivineLighthouse5FTMSwagger: @@ -109,5 +109,5 @@ OlivineLighthouse5F_MapEvents: object_event 8, 11, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorErnest, -1 object_event 8, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerBirdKeeperDenis, -1 object_event 15, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FRareCandy, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY - object_event 6, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FSuperRepel, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL + object_event 6, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FGreatBall, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL object_event 2, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FTMSwagger, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index a83c0762..94792f8b 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINELIGHTHOUSE6F_JASMINE const OLIVINELIGHTHOUSE6F_MONSTER const OLIVINELIGHTHOUSE6F_POKE_BALL diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index f06aeebd..3f331f77 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINEMART_CLERK const OLIVINEMART_COOLTRAINER_F const OLIVINEMART_LASS diff --git a/maps/OlivinePokecenter1F.asm b/maps/OlivinePokecenter1F.asm index 7ef22925..2f0b5971 100644 --- a/maps/OlivinePokecenter1F.asm +++ b/maps/OlivinePokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINEPOKECENTER1F_NURSE const OLIVINEPOKECENTER1F_FISHING_GURU const OLIVINEPOKECENTER1F_FISHER diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 8cb7aa68..5489724e 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINEPORT_SAILOR1 const OLIVINEPORT_SAILOR2 const OLIVINEPORT_SAILOR3 @@ -34,7 +34,7 @@ OlivinePortSailorAtGangwayScript: opentext checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue OlivinePortAlreadyRodeScript - writetext UnknownText_0x74a55 + writetext OlivinePortSailorGetOnBoardText waitbutton closetext turnobject OLIVINEPORT_SAILOR1, DOWN @@ -67,7 +67,7 @@ OlivinePortSailorAtGangwayScript: end OlivinePortAlreadyRodeScript: - writetext UnknownText_0x74a80 + writetext OlivinePortCantBoardText waitbutton closetext end @@ -89,14 +89,14 @@ OlivinePortWalkUpToShipScript: ifequal WEDNESDAY, .NextShipFriday ifequal THURSDAY, .NextShipFriday .FirstTime: - writetext UnknownText_0x74a9c + writetext OlivinePortAskBoardText yesorno iffalse OlivinePortNotRidingMoveAwayScript - writetext UnknownText_0x74ada + writetext OlivinePortAskTicketText promptbutton checkitem S_S_TICKET iffalse .NoTicket - writetext UnknownText_0x74b11 + writetext OlivinePortFlashTicketText waitbutton closetext setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 @@ -104,21 +104,21 @@ OlivinePortWalkUpToShipScript: sjump OlivinePortSailorAtGangwayScript .NoTicket: - writetext UnknownText_0x74b41 + writetext OlivinePortNoTicketText waitbutton closetext applymovement PLAYER, MovementData_0x74a34 end .NextShipMonday: - writetext UnknownText_0x74ba8 + writetext OlivinePortMondayShipText waitbutton closetext applymovement PLAYER, MovementData_0x74a34 end .NextShipFriday: - writetext UnknownText_0x74bce + writetext OlivinePortFridayShipText waitbutton closetext applymovement PLAYER, MovementData_0x74a34 @@ -128,13 +128,13 @@ OlivinePortWalkUpToShipScript: end OlivinePortNotRidingScript: - writetext UnknownText_0x74af6 + writetext OlivinePortComeAgainText waitbutton closetext end OlivinePortNotRidingMoveAwayScript: - writetext UnknownText_0x74af6 + writetext OlivinePortComeAgainText waitbutton closetext applymovement PLAYER, MovementData_0x74a34 @@ -154,14 +154,14 @@ OlivinePortSailorAfterHOFScript: ifequal WEDNESDAY, .NextShipFriday ifequal THURSDAY, .NextShipFriday .FirstTime: - writetext UnknownText_0x74a9c + writetext OlivinePortAskBoardText yesorno iffalse OlivinePortNotRidingScript - writetext UnknownText_0x74ada + writetext OlivinePortAskTicketText promptbutton checkitem S_S_TICKET iffalse .NoTicket - writetext UnknownText_0x74b11 + writetext OlivinePortFlashTicketText waitbutton closetext setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 @@ -175,19 +175,19 @@ OlivinePortSailorAfterHOFScript: sjump OlivinePortSailorAtGangwayScript .NoTicket: - writetext UnknownText_0x74b41 + writetext OlivinePortNoTicketText waitbutton closetext end .NextShipMonday: - writetext UnknownText_0x74ba8 + writetext OlivinePortMondayShipText waitbutton closetext end .NextShipFriday: - writetext UnknownText_0x74bce + writetext OlivinePortFridayShipText waitbutton closetext end @@ -283,18 +283,18 @@ MovementData_0x74a49: step DOWN step_end -UnknownText_0x74a55: +OlivinePortSailorGetOnBoardText: text "We're departing" line "soon. Please get" cont "on board." done -UnknownText_0x74a80: +OlivinePortCantBoardText: text "Sorry. You can't" line "board now." done -UnknownText_0x74a9c: +OlivinePortAskBoardText: text "Welcome to FAST" line "SHIP S.S.AQUA." @@ -302,17 +302,17 @@ UnknownText_0x74a9c: line "ing today?" done -UnknownText_0x74ada: +OlivinePortAskTicketText: text "May I see your" line "S.S.TICKET, sir?" done -UnknownText_0x74af6: +OlivinePortComeAgainText: text "We hope to see you" line "again!" done -UnknownText_0x74b11: +OlivinePortFlashTicketText: text "<PLAYER> flashed" line "the S.S.TICKET." @@ -320,7 +320,7 @@ UnknownText_0x74b11: line "Thank you, sir!" done -UnknownText_0x74b41: +OlivinePortNoTicketText: text "<PLAYER> tried to" line "show the S.S." cont "TICKET…" @@ -334,12 +334,12 @@ UnknownText_0x74b41: line "S.S.TICKET." done -UnknownText_0x74ba8: +OlivinePortMondayShipText: text "The FAST SHIP will" line "sail next Monday." done -UnknownText_0x74bce: +OlivinePortFridayShipText: text "The FAST SHIP will" line "sail next Friday." done diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index 98040307..a92b5d45 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINEPORTPASSAGE_POKEFAN_M OlivinePortPassage_MapScripts: diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index e590f158..c5309674 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINEPUNISHMENTSPEECHHOUSE_POKEFAN_M const OLIVINEPUNISHMENTSPEECHHOUSE_LASS diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm index 60263cf3..aaa0689e 100644 --- a/maps/OlivineTimsHouse.asm +++ b/maps/OlivineTimsHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINETIMSHOUSE_TIM OlivineTimsHouse_MapScripts: diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index 0bc82010..9907e719 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const PALLETTOWN_TEACHER const PALLETTOWN_FISHER diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index fcc2f7c5..971318ce 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const PEWTERCITY_COOLTRAINER_F const PEWTERCITY_BUG_CATCHER const PEWTERCITY_GRAMPS diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 8f10abe9..58e3d362 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const PEWTERGYM_BROCK const PEWTERGYM_YOUNGSTER const PEWTERGYM_GYM_GUY diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index ad6df159..26fe796e 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const PEWTERMART_CLERK const PEWTERMART_YOUNGSTER const PEWTERMART_SUPER_NERD diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index cf90488b..b9376def 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const PEWTERNIDORANSPEECHHOUSE_SUPER_NERD const PEWTERNIDORANSPEECHHOUSE_NIDORAN_M diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm index 3ec7bf91..ddc053ac 100644 --- a/maps/PewterPokecenter1F.asm +++ b/maps/PewterPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const PEWTERPOKECENTER1F_NURSE const PEWTERPOKECENTER1F_TEACHER const PEWTERPOKECENTER1F_JIGGLYPUFF diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index 61a96a50..f8d8fd08 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const PEWTERSNOOZESPEECHHOUSE_GRAMPS PewterSnoozeSpeechHouse_MapScripts: diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm index e29a9f8a..b9b109ed 100644 --- a/maps/PlayersHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const PLAYERSHOUSE1F_MOM1 const PLAYERSHOUSE1F_MOM2 const PLAYERSHOUSE1F_MOM3 @@ -27,7 +27,7 @@ MeetMomScript: opentext writetext ElmsLookingForYouText promptbutton - getstring STRING_BUFFER_4, GearName + getstring STRING_BUFFER_4, PokegearName scall PlayersHouse1FReceiveItemStd setflag ENGINE_POKEGEAR setflag ENGINE_PHONE_CARD @@ -71,11 +71,11 @@ MeetMomScript: writetext InstructionsNextText waitbutton closetext - applymovement PLAYERSHOUSE1F_MOM1, MomTurnsBackMovement + applymovement PLAYERSHOUSE1F_MOM1, MomWalksBackMovement special RestartMapMusic end -GearName: +PokegearName: db "#GEAR@" PlayersHouse1FReceiveItemStd: @@ -141,7 +141,7 @@ MomWalksToPlayerMovement: slow_step UP step_end -MomTurnsBackMovement: +MomWalksBackMovement: slow_step DOWN slow_step LEFT slow_step LEFT diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index 65b4dbe1..32f57167 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const PLAYERSHOUSE2F_CONSOLE const PLAYERSHOUSE2F_DOLL_1 const PLAYERSHOUSE2F_DOLL_2 @@ -59,6 +59,7 @@ PlayersHouseRadioScript: pause 45 closetext end + PlayersHouseBookshelfScript: jumpstd picturebookshelf diff --git a/maps/PlayersNeighborsHouse.asm b/maps/PlayersNeighborsHouse.asm index e587dc32..a04f127d 100644 --- a/maps/PlayersNeighborsHouse.asm +++ b/maps/PlayersNeighborsHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const PLAYERSNEIGHBORSHOUSE_COOLTRAINER_F PlayersNeighborsHouse_MapScripts: diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index 6a4296c8..1baa9b97 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const POKECENTER2F_TRADE_RECEPTIONIST const POKECENTER2F_BATTLE_RECEPTIONIST const POKECENTER2F_TIME_CAPSULE_RECEPTIONIST @@ -90,7 +90,7 @@ LinkReceptionistScript_Trade: .FriendNotReady: special WaitForOtherPlayerToExit - writetext Text_FriendNotReady + writetext YourFriendIsNotReadyText closetext end @@ -151,7 +151,7 @@ LinkReceptionistScript_Battle: .FriendNotReady: special WaitForOtherPlayerToExit - writetext Text_FriendNotReady + writetext YourFriendIsNotReadyText closetext end @@ -227,16 +227,16 @@ LinkReceptionistScript_TimeCapsule: waitbutton closetext readvar VAR_FACING - ifequal LEFT, .MaleFacingLeft - ifequal RIGHT, .MaleFacingRight - applymovementlasttalked Pokecenter2FMovementData_ReceptionistWalksLeft_LookRight + ifequal LEFT, .FacingLeft + ifequal RIGHT, .FacingRight + applymovementlasttalked Pokecenter2FMovementData_ReceptionistStepsLeftLooksDown applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsUp warpcheck end .FriendNotReady: special WaitForOtherPlayerToExit - writetext Text_FriendNotReady + writetext YourFriendIsNotReadyText closetext end @@ -266,15 +266,15 @@ LinkReceptionistScript_TimeCapsule: closetext end -.MaleFacingLeft: - applymovementlasttalked Pokecenter2FMovementData_ReceptionistWalksLeft_LookRight - applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesStepsLeftUp +.FacingLeft: + applymovementlasttalked Pokecenter2FMovementData_ReceptionistStepsLeftLooksDown + applymovement PLAYER, Pokecenter2FMovementData_PlayerWalksLeftAndUp warpcheck end -.MaleFacingRight: +.FacingRight: applymovementlasttalked Pokecenter2FMovementData_ReceptionistStepsRightLooksDown - applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesStepsRightUp + applymovement PLAYER, Pokecenter2FMovementData_PlayerWalksRightAndUp warpcheck end @@ -282,7 +282,7 @@ Script_LeftCableTradeCenter: special WaitForOtherPlayerToExit applymovement POKECENTER2F_TRADE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_3 applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesThreeStepsDown - applymovement POKECENTER2F_TRADE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_1 + applymovement POKECENTER2F_TRADE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightAndDown setscene SCENE_DEFAULT setmapscene TRADE_CENTER, SCENE_DEFAULT end @@ -291,7 +291,7 @@ Script_LeftCableColosseum: special WaitForOtherPlayerToExit applymovement POKECENTER2F_BATTLE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_3 applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesThreeStepsDown - applymovement POKECENTER2F_BATTLE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_1 + applymovement POKECENTER2F_BATTLE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightAndDown setscene SCENE_DEFAULT setmapscene COLOSSEUM, SCENE_DEFAULT end @@ -346,7 +346,7 @@ Pokecenter2FOfficerScript: Pokecenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight: slow_step UP -Pokecenter2FMovementData_ReceptionistWalksLeft_LookRight: +Pokecenter2FMovementData_ReceptionistStepsLeftLooksDown: slow_step LEFT turn_head DOWN step_end @@ -363,12 +363,12 @@ Pokecenter2FMovementData_PlayerTakesTwoStepsUp: step UP step_end -Pokecenter2FMovementData_PlayerTakesStepsLeftUp: +Pokecenter2FMovementData_PlayerWalksLeftAndUp: step LEFT step UP step_end -Pokecenter2FMovementData_PlayerTakesStepsRightUp: +Pokecenter2FMovementData_PlayerWalksRightAndUp: step RIGHT step UP step_end @@ -384,7 +384,7 @@ Pokecenter2FMovementData_PlayerTakesTwoStepsDown: step DOWN step_end -Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_1: +Pokecenter2FMovementData_ReceptionistStepsRightAndDown: slow_step RIGHT slow_step DOWN step_end @@ -440,7 +440,7 @@ Text_TimeCapsuleReceptionistIntro: line "trade across time?" done -Text_FriendNotReady: +YourFriendIsNotReadyText: text "Your friend is not" line "ready." prompt diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index fdd1579f..5f38a573 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -1,7 +1,7 @@ - const_def 2 ; object constants - const POKEMONFANCLUB_GENTLEMAN + object_const_def ; object_event constants + const POKEMONFANCLUB_CHAIRMAN const POKEMONFANCLUB_RECEPTIONIST - const POKEMONFANCLUB_FISHER + const POKEMONFANCLUB_CLEFAIRY_GUY const POKEMONFANCLUB_TEACHER const POKEMONFANCLUB_FAIRY const POKEMONFANCLUB_ODDISH @@ -11,37 +11,37 @@ PokemonFanClub_MapScripts: db 0 ; callbacks -PokemonFanClubPresidentScript: +PokemonFanClubChairmanScript: faceplayer opentext checkevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT iftrue .HeardSpeech checkevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT_BUT_BAG_WAS_FULL iftrue .HeardSpeechButBagFull - writetext UnknownText_0x191881 + writetext PokemonFanClubChairmanDidYouVisitToHearAboutMyMonText yesorno iffalse .NotListening - writetext UnknownText_0x191911 + writetext PokemonFanClubChairmanRapidashText promptbutton .HeardSpeechButBagFull: - writetext UnknownText_0x191a3d + writetext PokemonFanClubChairmanIWantYouToHaveThisText promptbutton verbosegiveitem RARE_CANDY iffalse .BagFull setevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT - writetext UnknownText_0x191a72 + writetext PokemonFanClubChairmanItsARareCandyText waitbutton closetext end .HeardSpeech: - writetext UnknownText_0x191ae0 + writetext PokemonFanClubChairmanMoreTalesToTellText waitbutton closetext end .NotListening: - writetext UnknownText_0x191b38 + writetext PokemonFanClubChairmanHowDisappointingText waitbutton .BagFull: closetext @@ -57,13 +57,13 @@ PokemonFanClubClefairyGuyScript: iftrue .GotLostItem checkevent EVENT_RETURNED_MACHINE_PART iftrue .FoundClefairyDoll - writetext UnknownText_0x191ba0 + writetext PokemonFanClubClefairyGuyClefairyIsSoAdorableText waitbutton closetext end .FoundClefairyDoll: - writetext UnknownText_0x191bff + writetext PokemonFanClubClefairyGuyMakingDoWithADollIFoundText checkevent EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM iftrue .MetCopycat waitbutton @@ -72,13 +72,13 @@ PokemonFanClubClefairyGuyScript: .MetCopycat: promptbutton - writetext UnknownText_0x191c5a + writetext PokemonFanClubClefairyGuyTakeThisDollBackToGirlText promptbutton waitsfx giveitem LOST_ITEM iffalse .NoRoom disappear POKEMONFANCLUB_FAIRY - writetext UnknownText_0x191d0a + writetext PokemonFanClubPlayerReceivedDollText playsound SFX_KEY_ITEM waitsfx itemnotify @@ -87,13 +87,13 @@ PokemonFanClubClefairyGuyScript: end .GotLostItem: - writetext UnknownText_0x191d1e + writetext PokemonFanClubClefairyGuyGoingToGetARealClefairyText waitbutton closetext end .NoRoom: - writetext UnknownText_0x191d58 + writetext PokemonFanClubClefairyGuyPackIsJammedFullText waitbutton closetext end @@ -102,11 +102,11 @@ PokemonFanClubTeacherScript: jumptextfaceplayer PokemonFanClubTeacherText PokemonFanClubClefairyDollScript: - jumptext ClefairyDollText + jumptext PokemonFanClubClefairyDollText PokemonFanClubBayleefScript: opentext - writetext FanClubBayleefText + writetext PokemonFanClubBayleefText cry BAYLEEF waitbutton closetext @@ -118,7 +118,7 @@ PokemonFanClubListenSign: PokemonFanClubBraggingSign: jumptext PokemonFanClubBraggingSignText -UnknownText_0x191881: +PokemonFanClubChairmanDidYouVisitToHearAboutMyMonText: text "I'm the CHAIRMAN" line "of the #MON FAN" cont "CLUB." @@ -135,7 +135,7 @@ UnknownText_0x191881: cont "#MON?" done -UnknownText_0x191911: +PokemonFanClubChairmanRapidashText: text "Good!" line "Then listen up!" @@ -161,13 +161,13 @@ UnknownText_0x191911: cont "you too long!" done -UnknownText_0x191a3d: +PokemonFanClubChairmanIWantYouToHaveThisText: text "Thanks for hearing" line "me out. I want you" cont "to have this!" done -UnknownText_0x191a72: +PokemonFanClubChairmanItsARareCandyText: text "It's a RARE CANDY" line "that makes #MON" cont "stronger." @@ -179,7 +179,7 @@ UnknownText_0x191a72: line "you can have it." done -UnknownText_0x191ae0: +PokemonFanClubChairmanMoreTalesToTellText: text "Hello, <PLAYER>!" para "Did you come see" @@ -190,7 +190,7 @@ UnknownText_0x191ae0: line "tales to tell…" done -UnknownText_0x191b38: +PokemonFanClubChairmanHowDisappointingText: text "How disappointing…" para "Come back if you" @@ -203,7 +203,7 @@ PokemonFanClubReceptionistText: cont "comes to #MON…" done -UnknownText_0x191ba0: +PokemonFanClubClefairyGuyClefairyIsSoAdorableText: text "I love the way" line "CLEFAIRY waggles" @@ -214,7 +214,7 @@ UnknownText_0x191ba0: line "It's so adorable!" done -UnknownText_0x191bff: +PokemonFanClubClefairyGuyMakingDoWithADollIFoundText: text "I love CLEFAIRY," line "but I could never" @@ -225,7 +225,7 @@ UnknownText_0x191bff: line "found." done -UnknownText_0x191c5a: +PokemonFanClubClefairyGuyTakeThisDollBackToGirlText: text "Oh, I see now. The" line "girl who lost this" @@ -244,12 +244,12 @@ UnknownText_0x191c5a: line "No worries!" done -UnknownText_0x191d0a: +PokemonFanClubPlayerReceivedDollText: text "<PLAYER> received" line "# DOLL." done -UnknownText_0x191d1e: +PokemonFanClubClefairyGuyGoingToGetARealClefairyText: text "You watch. I'm" line "going to get a" @@ -257,7 +257,7 @@ UnknownText_0x191d1e: line "my friend." done -UnknownText_0x191d58: +PokemonFanClubClefairyGuyPackIsJammedFullText: text "Your PACK is" line "jammed full." done @@ -270,7 +270,7 @@ PokemonFanClubTeacherText: line "head is so cute!" done -ClefairyDollText: +PokemonFanClubClefairyDollText: text "It's a CLEFAIRY!" line "Huh?" @@ -279,7 +279,7 @@ ClefairyDollText: cont "DOLL." done -FanClubBayleefText: +PokemonFanClubBayleefText: text "BAYLEEF: Li liif!" done @@ -308,7 +308,7 @@ PokemonFanClub_MapEvents: bg_event 9, 0, BGEVENT_READ, PokemonFanClubBraggingSign db 6 ; object events - object_event 3, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubPresidentScript, -1 + object_event 3, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubChairmanScript, -1 object_event 4, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokemonFanClubReceptionistScript, -1 object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubClefairyGuyScript, -1 object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubTeacherScript, -1 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 5f0e49ae..aaf4d357 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -1,11 +1,10 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const POWERPLANT_OFFICER1 const POWERPLANT_GYM_GUY1 const POWERPLANT_GYM_GUY2 const POWERPLANT_OFFICER2 const POWERPLANT_GYM_GUY3 - const POWERPLANT_FISHER - const POWERPLANT_FOREST + const POWERPLANT_MANAGER PowerPlant_MapScripts: db 2 ; scene scripts @@ -25,21 +24,21 @@ PowerPlantGuardPhoneScript: showemote EMOTE_SHOCK, POWERPLANT_OFFICER1, 15 waitsfx pause 30 - applymovement POWERPLANT_OFFICER1, MovementData_0x188ed5 + applymovement POWERPLANT_OFFICER1, PowerPlantOfficer1ApproachGymGuy2Movement turnobject POWERPLANT_GYM_GUY1, DOWN turnobject POWERPLANT_GYM_GUY2, DOWN opentext - writetext UnknownText_0x188f22 + writetext PowerPlantOfficer1CeruleanShadyCharacterText waitbutton closetext turnobject POWERPLANT_OFFICER1, LEFT turnobject PLAYER, RIGHT opentext - writetext UnknownText_0x188f7f + writetext PowerPlantOfficer1CouldIAskForYourCooperationText waitbutton closetext turnobject PLAYER, DOWN - applymovement POWERPLANT_OFFICER1, MovementData_0x188eda + applymovement POWERPLANT_OFFICER1, PowerPlantOfficer1ReturnToPostMovement setscene SCENE_POWERPLANT_NOTHING end @@ -50,19 +49,19 @@ PowerPlantOfficerScript: iftrue .ReturnedMachinePart checkevent EVENT_MET_MANAGER_AT_POWER_PLANT iftrue .MetManager - writetext UnknownText_0x188ee0 + writetext PowerPlantOfficer1AThiefBrokeInText waitbutton closetext end .MetManager: - writetext UnknownText_0x188f7f + writetext PowerPlantOfficer1CouldIAskForYourCooperationText waitbutton closetext end .ReturnedMachinePart: - writetext UnknownText_0x188fa2 + writetext PowerPlantOfficer1HaveToBeefUpSecurityText waitbutton closetext end @@ -72,13 +71,13 @@ PowerPlantGymGuy1Script: opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue .ReturnedMachinePart - writetext UnknownText_0x188fcf + writetext PowerPlantGymGuy1SomeoneStoleAPartText waitbutton closetext end .ReturnedMachinePart: - writetext UnknownText_0x189038 + writetext PowerPlantGymGuy1GeneratorUpAndRunningText waitbutton closetext end @@ -88,29 +87,29 @@ PowerPlantGymGuy2Script: opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue .ReturnedMachinePart - writetext UnknownText_0x189079 + writetext PowerPlantGymGuy2PowerPlantUpAndRunningText waitbutton closetext end .ReturnedMachinePart: - writetext UnknownText_0x1890ef + writetext PowerPlantGymGuy2GeneratorIsRunningAgainText waitbutton closetext end -PowerPlantGymGuy3Script: +PowerPlantOfficer2Script: faceplayer opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue .ReturnedMachinePart - writetext UnknownText_0x18910e + writetext PowerPlantOfficer2ManagerHasBeenSadAndFuriousText waitbutton closetext end .ReturnedMachinePart: - writetext UnknownText_0x18917f + writetext PowerPlantOfficer2ManagerHasBeenCheerfulText waitbutton closetext end @@ -120,13 +119,13 @@ PowerPlantGymGuy4Script: opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue .ReturnedMachinePart - writetext UnknownText_0x1891c2 + writetext PowerPlantGymGuy4MagnetTrainConsumesElectricityText waitbutton closetext end .ReturnedMachinePart: - writetext UnknownText_0x189225 + writetext PowerPlantGymGuy4WeCanGetMagnetTrainRunningText waitbutton closetext end @@ -140,7 +139,7 @@ PowerPlantManager: iftrue .FoundMachinePart checkevent EVENT_MET_MANAGER_AT_POWER_PLANT iftrue .MetManager - writetext UnknownText_0x189264 + writetext PowerPlantManagerWhoWouldRuinMyGeneratorText waitbutton closetext setevent EVENT_MET_MANAGER_AT_POWER_PLANT @@ -151,13 +150,13 @@ PowerPlantManager: end .MetManager: - writetext UnknownText_0x189308 + writetext PowerPlantManagerIWontForgiveCulpritText waitbutton closetext end .FoundMachinePart: - writetext UnknownText_0x18936e + writetext PowerPlantManagerThatsThePartText promptbutton takeitem MACHINE_PART setevent EVENT_RETURNED_MACHINE_PART @@ -169,19 +168,19 @@ PowerPlantManager: .ReturnedMachinePart: checkevent EVENT_GOT_TM07_ZAP_CANNON iftrue .GotZapCannon - writetext UnknownText_0x1893c4 + writetext PowerPlantManagerTakeThisTMText promptbutton verbosegiveitem TM_ZAP_CANNON iffalse .NoRoom setevent EVENT_GOT_TM07_ZAP_CANNON - writetext UnknownText_0x1893f4 + writetext PowerPlantManagerTM07IsZapCannonText waitbutton .NoRoom: closetext end .GotZapCannon: - writetext UnknownText_0x189475 + writetext PowerPlantManagerMyBelovedGeneratorText waitbutton closetext end @@ -189,14 +188,14 @@ PowerPlantManager: PowerPlantBookshelf: jumpstd difficultbookshelf -MovementData_0x188ed5: +PowerPlantOfficer1ApproachGymGuy2Movement: step RIGHT step RIGHT step UP step UP step_end -MovementData_0x188eda: +PowerPlantOfficer1ReturnToPostMovement: step DOWN step DOWN step LEFT @@ -204,7 +203,7 @@ MovementData_0x188eda: turn_head DOWN step_end -UnknownText_0x188ee0: +PowerPlantOfficer1AThiefBrokeInText: text "A thief broke into" line "the POWER PLANT…" @@ -212,7 +211,7 @@ UnknownText_0x188ee0: line "coming to?" done -UnknownText_0x188f22: +PowerPlantOfficer1CeruleanShadyCharacterText: text "I just got word" line "from CERULEAN." @@ -223,18 +222,18 @@ UnknownText_0x188f22: line "around." done -UnknownText_0x188f7f: +PowerPlantOfficer1CouldIAskForYourCooperationText: text "Could I ask for" line "your cooperation?" done -UnknownText_0x188fa2: +PowerPlantOfficer1HaveToBeefUpSecurityText: text "We'll have to beef" line "up our security" cont "presence." done -UnknownText_0x188fcf: +PowerPlantGymGuy1SomeoneStoleAPartText: text "Someone made off" line "with a part that's" @@ -246,7 +245,7 @@ UnknownText_0x188fcf: cont "useless!" done -UnknownText_0x189038: +PowerPlantGymGuy1GeneratorUpAndRunningText: text "The generator's up" line "and running. It's" @@ -254,7 +253,7 @@ UnknownText_0x189038: line "to spare." done -UnknownText_0x189079: +PowerPlantGymGuy2PowerPlantUpAndRunningText: text "This POWER PLANT" line "had been abandoned" cont "in the past." @@ -266,12 +265,12 @@ UnknownText_0x189079: line "the MAGNET TRAIN." done -UnknownText_0x1890ef: +PowerPlantGymGuy2GeneratorIsRunningAgainText: text "The generator's" line "running again!" done -UnknownText_0x18910e: +PowerPlantOfficer2ManagerHasBeenSadAndFuriousText: text "The POWER PLANT's" line "MANAGER is up" cont "ahead." @@ -283,7 +282,7 @@ UnknownText_0x18910e: cont "furious…" done -UnknownText_0x18917f: +PowerPlantOfficer2ManagerHasBeenCheerfulText: text "Since the gener-" line "ator's been fixed," @@ -291,7 +290,7 @@ UnknownText_0x18917f: line "been cheerful." done -UnknownText_0x1891c2: +PowerPlantGymGuy4MagnetTrainConsumesElectricityText: text "The MAGNET TRAIN" line "consumes a lot of" cont "electricity." @@ -301,7 +300,7 @@ UnknownText_0x1891c2: cont "isn't operating." done -UnknownText_0x189225: +PowerPlantGymGuy4WeCanGetMagnetTrainRunningText: text "All right! We can" line "finally get the" @@ -309,7 +308,7 @@ UnknownText_0x189225: line "running again." done -UnknownText_0x189264: +PowerPlantManagerWhoWouldRuinMyGeneratorText: text "MANAGER: I, I, I'm" line "ready to blast" cont "someone!" @@ -327,7 +326,7 @@ UnknownText_0x189264: line "CANNON!" done -UnknownText_0x189308: +PowerPlantManagerIWontForgiveCulpritText: text "MANAGER: I won't" line "forgive him!" @@ -340,7 +339,7 @@ UnknownText_0x189308: para "Gahahahah!" done -UnknownText_0x18936e: +PowerPlantManagerThatsThePartText: text "MANAGER: Ah! Yeah!" para "That's the missing" @@ -349,14 +348,14 @@ UnknownText_0x18936e: cont "You found it?" done -UnknownText_0x1893c4: +PowerPlantManagerTakeThisTMText: text "Wahah! Thanks!" para "Here! Take this TM" line "as a reward!" done -UnknownText_0x1893f4: +PowerPlantManagerTM07IsZapCannonText: text "MANAGER: TM07 is" line "my ZAP CANNON." @@ -370,7 +369,7 @@ UnknownText_0x1893f4: line "packs a wallop!" done -UnknownText_0x189475: +PowerPlantManagerMyBelovedGeneratorText: text "MANAGER: My be-" line "loved generator!" @@ -396,6 +395,6 @@ PowerPlant_MapEvents: object_event 4, 14, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PowerPlantOfficerScript, -1 object_event 2, 9, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuy1Script, -1 object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuy2Script, -1 - object_event 9, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuy3Script, -1 + object_event 9, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PowerPlantOfficer2Script, -1 object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuy4Script, -1 object_event 14, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PowerPlantManager, -1 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 66ad3a39..80836f92 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -1,10 +1,10 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const RADIOTOWER1F_RECEPTIONIST const RADIOTOWER1F_LASS const RADIOTOWER1F_YOUNGSTER const RADIOTOWER1F_ROCKET - const RADIOTOWER1F_GENTLEMAN - const RADIOTOWER1F_COOLTRAINER_F + const RADIOTOWER1F_LUCKYNUMBERMAN + const RADIOTOWER1F_CARD_WOMAN RadioTower1F_MapScripts: db 0 ; scene scripts @@ -16,13 +16,13 @@ RadioTower1FReceptionistScript: opentext checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue .Rockets - writetext UnknownText_0x5ce77 + writetext RadioTower1FReceptionistWelcomeText waitbutton closetext end .Rockets: - writetext UnknownText_0x5ce81 + writetext RadioTower1FReceptionistNoToursText waitbutton closetext end @@ -30,7 +30,7 @@ RadioTower1FReceptionistScript: RadioTower1FLuckyNumberManScript: faceplayer opentext - writetext UnknownText_0x5ceba + writetext RadioTower1FLuckyNumberManAskToPlayText promptbutton special CheckLuckyNumberShowFlag iffalse .skip @@ -39,21 +39,21 @@ RadioTower1FLuckyNumberManScript: special PrintTodaysLuckyNumber checkflag ENGINE_LUCKY_NUMBER_SHOW iftrue .GameOver - writetext UnknownText_0x5cf3a + writetext RadioTower1FLuckyNumberManThisWeeksIdIsText promptbutton closetext - applymovement RADIOTOWER1F_GENTLEMAN, MovementData_0x5ce71 + applymovement RADIOTOWER1F_LUCKYNUMBERMAN, RadioTower1FLuckyNumberManGoToPCMovement opentext - writetext UnknownText_0x5cf5a + writetext RadioTower1FLuckyNumberManCheckIfMatchText promptbutton waitsfx - writetext UnknownText_0x5cf79 + writetext RadioTower1FLuckyNumberManDotDotDotText playsound SFX_DEX_FANFARE_20_49 waitsfx promptbutton special CheckForLuckyNumberWinners closetext - applymovement RADIOTOWER1F_GENTLEMAN, MovementData_0x5ce74 + applymovement RADIOTOWER1F_LUCKYNUMBERMAN, RadioTower1FLuckyNumberManReturnToPlayerMovement opentext ifequal 1, .FirstPlace ifequal 2, .SecondPlace @@ -61,13 +61,13 @@ RadioTower1FLuckyNumberManScript: sjump .NoPrize .GameOver: - writetext UnknownText_0x5cf7e + writetext RadioTower1FLuckyNumberManComeAgainText waitbutton closetext end .FirstPlace: - writetext UnknownText_0x5cfb5 + writetext RadioTower1FLuckyNumberManPerfectMatchText playsound SFX_1ST_PLACE waitsfx promptbutton @@ -78,7 +78,7 @@ RadioTower1FLuckyNumberManScript: sjump .GameOver .SecondPlace: - writetext UnknownText_0x5d023 + writetext RadioTower1FLuckyNumberManOkayMatchText playsound SFX_2ND_PLACE waitsfx promptbutton @@ -89,7 +89,7 @@ RadioTower1FLuckyNumberManScript: sjump .GameOver .ThirdPlace: - writetext UnknownText_0x5d076 + writetext RadioTower1FLuckyNumberManWeakMatchText playsound SFX_3RD_PLACE waitsfx promptbutton @@ -100,13 +100,13 @@ RadioTower1FLuckyNumberManScript: sjump .GameOver .NoPrize: - writetext UnknownText_0x5d0c0 + writetext RadioTower1FLuckyNumberManNoneOfYourIDNumbersMatchText waitbutton closetext end .BagFull: - writetext UnknownText_0x5d0e6 + writetext RadioTower1FLuckyNumberManNoRoomForYourPrizeText waitbutton closetext end @@ -116,43 +116,43 @@ RadioTower1FRadioCardWomanScript: opentext checkflag ENGINE_RADIO_CARD iftrue .GotCard - writetext UnknownText_0x5d12d + writetext RadioTower1FRadioCardWomanOfferQuizText yesorno iffalse .NoQuiz - writetext UnknownText_0x5d1f2 + writetext RadioTower1FRadioCardWomanQuestion1Text yesorno iffalse .WrongAnswer playsound SFX_ELEVATOR_END waitsfx - writetext UnknownText_0x5d231 + writetext RadioTower1FRadioCardWomanQuestion2Text yesorno iffalse .WrongAnswer playsound SFX_ELEVATOR_END waitsfx - writetext UnknownText_0x5d282 + writetext RadioTower1FRadioCardWomanQuestion3Text yesorno iftrue .WrongAnswer playsound SFX_ELEVATOR_END waitsfx - writetext UnknownText_0x5d2bc + writetext RadioTower1FRadioCardWomanQuestion4Text yesorno iffalse .WrongAnswer playsound SFX_ELEVATOR_END waitsfx - writetext UnknownText_0x5d30e + writetext RadioTower1FRadioCardWomanQuestion5Text yesorno iftrue .WrongAnswer playsound SFX_ELEVATOR_END waitsfx - writetext UnknownText_0x5d37b + writetext RadioTower1FRadioCardWomanYouWinText promptbutton getstring STRING_BUFFER_4, .RadioCardText scall .ReceiveItem - writetext UnknownText_0x5d3c0 + writetext RadioTower1FPokegearIsARadioText promptbutton setflag ENGINE_RADIO_CARD .GotCard: - writetext UnknownText_0x5d3e5 + writetext RadioTower1FRadioCardWomanTuneInText waitbutton closetext end @@ -166,13 +166,13 @@ RadioTower1FRadioCardWomanScript: .WrongAnswer: playsound SFX_WRONG - writetext UnknownText_0x5d409 + writetext RadioTower1FRadioCardWomanWrongAnswerText waitbutton closetext end .NoQuiz: - writetext UnknownText_0x5d443 + writetext RadioTower1FRadioCardWomanNotTakingQuizText waitbutton closetext end @@ -200,28 +200,28 @@ RadioTower1FDirectory: RadioTower1FLuckyChannelSign: jumptext RadioTower1FLuckyChannelSignText -MovementData_0x5ce71: +RadioTower1FLuckyNumberManGoToPCMovement: step RIGHT turn_head UP step_end -MovementData_0x5ce74: +RadioTower1FLuckyNumberManReturnToPlayerMovement: step LEFT turn_head UP step_end -UnknownText_0x5ce77: +RadioTower1FReceptionistWelcomeText: text "Welcome!" done -UnknownText_0x5ce81: +RadioTower1FReceptionistNoToursText: text "Hello. I'm sorry," line "but we're not" cont "offering any tours" cont "today." done -UnknownText_0x5ceba: +RadioTower1FLuckyNumberManAskToPlayText: text "Hi, are you here" line "for the LUCKY NUM-" cont "BER SHOW?" @@ -234,30 +234,30 @@ UnknownText_0x5ceba: line "you win a prize." done -UnknownText_0x5cf3a: +RadioTower1FLuckyNumberManThisWeeksIdIsText: text "This week's ID" line "number is @" text_ram wStringBuffer3 text "." done -UnknownText_0x5cf5a: +RadioTower1FLuckyNumberManCheckIfMatchText: text "Let's see if you" line "have a match." done -UnknownText_0x5cf79: +RadioTower1FLuckyNumberManDotDotDotText: text "<……>" line "<……>" done -UnknownText_0x5cf7e: +RadioTower1FLuckyNumberManComeAgainText: text "Please come back" line "next week for the" cont "next LUCKY NUMBER." done -UnknownText_0x5cfb5: +RadioTower1FLuckyNumberManPerfectMatchText: text "Wow! You have a" line "perfect match of" cont "all five numbers!" @@ -269,7 +269,7 @@ UnknownText_0x5cfb5: line "MASTER BALL!" done -UnknownText_0x5d023: +RadioTower1FLuckyNumberManOkayMatchText: text "Hey! You've" line "matched the last" cont "three numbers!" @@ -279,7 +279,7 @@ UnknownText_0x5d023: cont "SHARE!" done -UnknownText_0x5d076: +RadioTower1FLuckyNumberManWeakMatchText: text "Ooh, you've" line "matched the last" cont "two numbers." @@ -288,12 +288,12 @@ UnknownText_0x5d076: line "prize, a PP UP." done -UnknownText_0x5d0c0: +RadioTower1FLuckyNumberManNoneOfYourIDNumbersMatchText: text "Nope, none of your" line "ID numbers match." done -UnknownText_0x5d0e6: +RadioTower1FLuckyNumberManNoRoomForYourPrizeText: text "You've got no room" line "for your prize." @@ -301,7 +301,7 @@ UnknownText_0x5d0e6: line "back right away." done -UnknownText_0x5d12d: +RadioTower1FRadioCardWomanOfferQuizText: text "We have a special" line "quiz campaign on" cont "right now." @@ -320,7 +320,7 @@ UnknownText_0x5d12d: line "take the quiz?" done -UnknownText_0x5d1f2: +RadioTower1FRadioCardWomanQuestion1Text: text "Question 1:" para "Can the TOWN MAP" @@ -328,7 +328,7 @@ UnknownText_0x5d1f2: cont "#GEAR?" done -UnknownText_0x5d231: +RadioTower1FRadioCardWomanQuestion2Text: text "Correct!" line "Question 2:" @@ -336,7 +336,7 @@ UnknownText_0x5d231: line "female only?" done -UnknownText_0x5d282: +RadioTower1FRadioCardWomanQuestion3Text: text "Bull's-eye!" line "Question 3:" @@ -345,7 +345,7 @@ UnknownText_0x5d282: cont "man, use APRIKORN?" done -UnknownText_0x5d2bc: +RadioTower1FRadioCardWomanQuestion4Text: text "So far so good!" line "Question 4:" @@ -353,7 +353,7 @@ UnknownText_0x5d2bc: line "learn any TM move?" done -UnknownText_0x5d30e: +RadioTower1FRadioCardWomanQuestion5Text: text "Wow! Right again!" line "Here's the final" cont "question:" @@ -366,7 +366,7 @@ UnknownText_0x5d30e: line "host of the show?" done -UnknownText_0x5d37b: +RadioTower1FRadioCardWomanYouWinText: text "Bingo! You got it!" line "Congratulations!" @@ -374,18 +374,18 @@ UnknownText_0x5d37b: line "a RADIO CARD!" done -UnknownText_0x5d3c0: +RadioTower1FPokegearIsARadioText: text "<PLAYER>'s #GEAR" line "can now double as" cont "a radio!" done -UnknownText_0x5d3e5: +RadioTower1FRadioCardWomanTuneInText: text "Please tune in to" line "our radio shows." done -UnknownText_0x5d409: +RadioTower1FRadioCardWomanWrongAnswerText: text "Oh, dear." line "Sorry, but you" @@ -393,7 +393,7 @@ UnknownText_0x5d409: line "Please try again!" done -UnknownText_0x5d443: +RadioTower1FRadioCardWomanNotTakingQuizText: text "Oh. I see. Please" line "try if you change" cont "your mind." diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 4e016173..c46137b0 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const RADIOTOWER2F_SUPER_NERD const RADIOTOWER2F_TEACHER const RADIOTOWER2F_ROCKET1 diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index a6c61667..b61529ca 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const RADIOTOWER3F_SUPER_NERD const RADIOTOWER3F_GYM_GUY const RADIOTOWER3F_COOLTRAINER_F @@ -51,30 +51,30 @@ RadioTower3FCooltrainerFScript: iftrue .NoRockets checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER iftrue .UsedCardKey - writetext UnknownText_0x5e754 + writetext RadioTower3FCooltrainerFPleaseSaveDirectorText waitbutton closetext end .UsedCardKey: - writetext UnknownText_0x5e7cb + writetext RadioTower3FCooltrainerFIsDirectorSafeText waitbutton closetext end .NoRockets: - writetext UnknownText_0x5e7e2 + writetext RadioTower3FCooltrainerFYoureMyHeroText promptbutton verbosegiveitem TM_SUNNY_DAY iffalse .NoRoom - writetext UnknownText_0x5e821 + writetext RadioTower3FCooltrainerFItsSunnyDayText waitbutton closetext setevent EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER end .GotSunnyDay: - writetext UnknownText_0x5e85c + writetext RadioTower3FCooltrainerFYouWereMarvelousText waitbutton .NoRoom: closetext @@ -189,7 +189,7 @@ RadioTower3FGymGuyText: cont "clock too!" done -UnknownText_0x5e754: +RadioTower3FCooltrainerFPleaseSaveDirectorText: text "The TEAM ROCKET" line "boss has locked" cont "himself in." @@ -203,12 +203,12 @@ UnknownText_0x5e754: para "Please save him!" done -UnknownText_0x5e7cb: +RadioTower3FCooltrainerFIsDirectorSafeText: text "Is the DIRECTOR" line "safe?" done -UnknownText_0x5e7e2: +RadioTower3FCooltrainerFYoureMyHeroText: text "Thank you!" line "You're my hero!" @@ -216,14 +216,14 @@ UnknownText_0x5e7e2: line "my appreciation." done -UnknownText_0x5e821: +RadioTower3FCooltrainerFItsSunnyDayText: text "It's SUNNY DAY." line "It powers up fire-" cont "type moves for a" cont "while." done -UnknownText_0x5e85c: +RadioTower3FCooltrainerFYouWereMarvelousText: text "You were simply" line "marvelous!" done diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 08f3f82e..3def3cc4 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const RADIOTOWER4F_FISHER const RADIOTOWER4F_TEACHER const RADIOTOWER4F_GROWLITHE diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index ad19c63f..bafeb185 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -1,9 +1,8 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const RADIOTOWER5F_DIRECTOR const RADIOTOWER5F_ROCKET const RADIOTOWER5F_ROCKET_GIRL const RADIOTOWER5F_ROCKER - const RADIOTOWER5F_POKE_BALL RadioTower5F_MapScripts: db 3 ; scene scripts @@ -129,16 +128,16 @@ RadioTower5FRocketBossScene: setscene SCENE_RADIOTOWER5F_NOTHING setevent EVENT_GOT_RAINBOW_WING setevent EVENT_TEAM_ROCKET_DISBANDED - sjump .UselessJump -.SilverWing + sjump .GotWing + +.SilverWing: verbosegiveitem SILVER_WING writetext RadioTower5FDirectorDescribeSilverWingText waitbutton closetext setscene SCENE_RADIOTOWER5F_NOTHING setevent EVENT_GOT_SILVER_WING - -.UselessJump: +.GotWing: applymovement RADIOTOWER5F_DIRECTOR, RadioTower5FDirectorWalksOut playsound SFX_EXIT_BUILDING disappear RADIOTOWER5F_DIRECTOR diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index a07b231a..6e2324c6 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const REDSHOUSE1F_REDS_MOM RedsHouse1F_MapScripts: diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index 008f7aec..aa5d8147 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROCKTUNNEL1F_POKE_BALL1 const ROCKTUNNEL1F_POKE_BALL2 diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index 82cea792..0a070745 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROCKTUNNELB1F_POKE_BALL1 const ROCKTUNNELB1F_POKE_BALL2 const ROCKTUNNELB1F_POKE_BALL3 diff --git a/maps/Route1.asm b/maps/Route1.asm index ee928caf..d277670f 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE1_YOUNGSTER const ROUTE1_COOLTRAINER_F const ROUTE1_FRUIT_TREE diff --git a/maps/Route10Pokecenter1F.asm b/maps/Route10Pokecenter1F.asm index 82a6c73a..11a0b3e6 100644 --- a/maps/Route10Pokecenter1F.asm +++ b/maps/Route10Pokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE10POKECENTER1F_NURSE const ROUTE10POKECENTER1F_GENTLEMAN const ROUTE10POKECENTER1F_GYM_GUY diff --git a/maps/Route10South.asm b/maps/Route10South.asm index 61d6405a..8d52abf4 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE10SOUTH_POKEFAN_M1 const ROUTE10SOUTH_POKEFAN_M2 diff --git a/maps/Route11.asm b/maps/Route11.asm index f28ef1e0..f562df1a 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE11_YOUNGSTER1 const ROUTE11_YOUNGSTER2 const ROUTE11_YOUNGSTER3 diff --git a/maps/Route12.asm b/maps/Route12.asm index dc3d8af4..2564408d 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE12_FISHER1 const ROUTE12_FISHER2 const ROUTE12_FISHER3 diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index 420e8782..23ff65c8 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE12SUPERRODHOUSE_FISHING_GURU Route12SuperRodHouse_MapScripts: diff --git a/maps/Route13.asm b/maps/Route13.asm index dd203538..30371002 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE13_YOUNGSTER1 const ROUTE13_YOUNGSTER2 const ROUTE13_POKEFAN_M1 diff --git a/maps/Route14.asm b/maps/Route14.asm index 0e04a72d..81bf9c20 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE14_POKEFAN_M1 const ROUTE14_YOUNGSTER const ROUTE14_POKEFAN_M2 diff --git a/maps/Route15.asm b/maps/Route15.asm index 190d123b..9955f77f 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE15_YOUNGSTER1 const ROUTE15_YOUNGSTER2 const ROUTE15_YOUNGSTER3 diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index 002b3134..e9f03e5f 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE15FUCHSIAGATE_OFFICER Route15FuchsiaGate_MapScripts: diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index 53af80d3..ccfd4232 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE16FUCHSIASPEECHHOUSE_SUPER_NERD Route16FuchsiaSpeechHouse_MapScripts: diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index fb135e1b..878ac468 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE16GATE_OFFICER Route16Gate_MapScripts: diff --git a/maps/Route17.asm b/maps/Route17.asm index 4e0c0b97..8dc90d12 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE17_BIKER1 const ROUTE17_BIKER2 const ROUTE17_BIKER3 diff --git a/maps/Route17Route18Gate.asm b/maps/Route17Route18Gate.asm index 0e434a71..be69ccdf 100644 --- a/maps/Route17Route18Gate.asm +++ b/maps/Route17Route18Gate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE17ROUTE18GATE_OFFICER Route17Route18Gate_MapScripts: diff --git a/maps/Route18.asm b/maps/Route18.asm index 23d6cb4e..af529282 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE18_YOUNGSTER1 const ROUTE18_YOUNGSTER2 diff --git a/maps/Route19.asm b/maps/Route19.asm index 103370a5..59749480 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE19_SWIMMER_GIRL const ROUTE19_SWIMMER_GUY1 const ROUTE19_SWIMMER_GUY2 diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index 4c2d6abd..a65a847c 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE19FUCHSIAGATE_OFFICER Route19FuchsiaGate_MapScripts: diff --git a/maps/Route2.asm b/maps/Route2.asm index e31035af..8f47eeb8 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE2_BUG_CATCHER1 const ROUTE2_BUG_CATCHER2 const ROUTE2_BUG_CATCHER3 diff --git a/maps/Route20.asm b/maps/Route20.asm index 8339bb5d..9169212e 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE20_SWIMMER_GIRL1 const ROUTE20_SWIMMER_GIRL2 const ROUTE20_SWIMMER_GUY diff --git a/maps/Route21.asm b/maps/Route21.asm index da757267..c2edff08 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE21_SWIMMER_GIRL const ROUTE21_SWIMMER_GUY const ROUTE21_FISHER diff --git a/maps/Route24.asm b/maps/Route24.asm index 09f41b1f..2220fae5 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE24_ROCKET Route24_MapScripts: diff --git a/maps/Route25.asm b/maps/Route25.asm index 84f25af2..91126ef4 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE25_MISTY const ROUTE25_COOLTRAINER_M1 const ROUTE25_YOUNGSTER1 diff --git a/maps/Route26.asm b/maps/Route26.asm index 00f3956a..823efda9 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE26_COOLTRAINER_M1 const ROUTE26_COOLTRAINER_M2 const ROUTE26_COOLTRAINER_F1 diff --git a/maps/Route26HealHouse.asm b/maps/Route26HealHouse.asm index d7dc3ae0..fa8a93f2 100644 --- a/maps/Route26HealHouse.asm +++ b/maps/Route26HealHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE26HEALHOUSE_TEACHER Route26HealHouse_MapScripts: diff --git a/maps/Route27.asm b/maps/Route27.asm index 0ab76c2c..cf6ab0a5 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE27_COOLTRAINER_M1 const ROUTE27_COOLTRAINER_M2 const ROUTE27_COOLTRAINER_F1 diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index 9415e961..682663f0 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE27SANDSTORMHOUSE_GRANNY Route27SandstormHouse_MapScripts: diff --git a/maps/Route28SteelWingHouse.asm b/maps/Route28SteelWingHouse.asm index 270bf715..1d773b0a 100644 --- a/maps/Route28SteelWingHouse.asm +++ b/maps/Route28SteelWingHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE28STEELWINGHOUSE_CELEBRITY const ROUTE28STEELWINGHOUSE_FEAROW diff --git a/maps/Route29.asm b/maps/Route29.asm index e5d97a65..fe5a8257 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE29_COOLTRAINER_M1 const ROUTE29_YOUNGSTER const ROUTE29_TEACHER1 diff --git a/maps/Route29Route46Gate.asm b/maps/Route29Route46Gate.asm index f575df1c..46f34df1 100644 --- a/maps/Route29Route46Gate.asm +++ b/maps/Route29Route46Gate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE29ROUTE46GATE_OFFICER const ROUTE29ROUTE46GATE_YOUNGSTER diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index a9f37b2e..da417527 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE2GATE_SCIENTIST Route2Gate_MapScripts: diff --git a/maps/Route2NuggetHouse.asm b/maps/Route2NuggetHouse.asm index 402cf169..775b2b73 100644 --- a/maps/Route2NuggetHouse.asm +++ b/maps/Route2NuggetHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE2NUGGETHOUSE_FISHER Route2NuggetHouse_MapScripts: diff --git a/maps/Route3.asm b/maps/Route3.asm index 054e6fe3..d7bf26a6 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE3_FISHER1 const ROUTE3_YOUNGSTER1 const ROUTE3_YOUNGSTER2 diff --git a/maps/Route30.asm b/maps/Route30.asm index 8a7834b0..2e60d300 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE30_YOUNGSTER1 const ROUTE30_YOUNGSTER2 const ROUTE30_YOUNGSTER3 @@ -9,7 +9,6 @@ const ROUTE30_FRUIT_TREE1 const ROUTE30_FRUIT_TREE2 const ROUTE30_COOLTRAINER_F - const ROUTE30_POKE_BALL Route30_MapScripts: db 0 ; scene scripts diff --git a/maps/Route30BerryHouse.asm b/maps/Route30BerryHouse.asm index 43935d21..81a11516 100644 --- a/maps/Route30BerryHouse.asm +++ b/maps/Route30BerryHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE30BERRYHOUSE_POKEFAN_M Route30BerryHouse_MapScripts: diff --git a/maps/Route31.asm b/maps/Route31.asm index 18283726..bbbca57b 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE31_FISHER const ROUTE31_YOUNGSTER const ROUTE31_BUG_CATCHER diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index aeb5b868..9c508bd0 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE31VIOLETGATE_OFFICER const ROUTE31VIOLETGATE_COOLTRAINER_F diff --git a/maps/Route32.asm b/maps/Route32.asm index 2378cd99..e34a3c69 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE32_FISHER1 const ROUTE32_FISHER2 const ROUTE32_FISHER3 diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm index 7a51f73d..1f0a226e 100644 --- a/maps/Route32Pokecenter1F.asm +++ b/maps/Route32Pokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE32POKECENTER1F_NURSE const ROUTE32POKECENTER1F_FISHING_GURU const ROUTE32POKECENTER1F_COOLTRAINER_F diff --git a/maps/Route32RuinsOfAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm index 3329d54f..f35403ba 100644 --- a/maps/Route32RuinsOfAlphGate.asm +++ b/maps/Route32RuinsOfAlphGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE32RUINSOFALPHGATE_OFFICER const ROUTE32RUINSOFALPHGATE_POKEFAN_M const ROUTE32RUINSOFALPHGATE_YOUNGSTER diff --git a/maps/Route33.asm b/maps/Route33.asm index 8a9e8e33..1e1be5bd 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -1,6 +1,5 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE33_POKEFAN_M - const ROUTE33_LASS const ROUTE33_FRUIT_TREE Route33_MapScripts: diff --git a/maps/Route34.asm b/maps/Route34.asm index 3e9b8a08..6b40dfec 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE34_YOUNGSTER1 const ROUTE34_YOUNGSTER2 const ROUTE34_YOUNGSTER3 @@ -11,7 +11,6 @@ const ROUTE34_COOLTRAINER_F1 const ROUTE34_COOLTRAINER_F2 const ROUTE34_COOLTRAINER_F3 - const ROUTE34_POKE_BALL Route34_MapScripts: db 0 ; scene scripts diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 7978afff..bf424102 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -1,8 +1,7 @@ - const_def 2 ; object constants - const ROUTE34ILEXFORESTGATE_TEACHER1 + object_const_def ; object_event constants + const ROUTE34ILEXFORESTGATE_TEACHER const ROUTE34ILEXFORESTGATE_BUTTERFREE const ROUTE34ILEXFORESTGATE_LASS - const ROUTE34ILEXFORESTGATE_TEACHER2 Route34IlexForestGate_MapScripts: db 0 ; scene scripts diff --git a/maps/Route35.asm b/maps/Route35.asm index 5301a709..77540483 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE35_YOUNGSTER1 const ROUTE35_YOUNGSTER2 const ROUTE35_LASS1 diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm index 00b33f0a..b3d8b048 100644 --- a/maps/Route35GoldenrodGate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -1,7 +1,6 @@ - const_def 2 ; object constants - const ROUTE35GOLDENRODGATE_OFFICER + object_const_def ; object_event constants + const ROUTE35GOLDENRODGATE_RANDY const ROUTE35GOLDENRODGATE_POKEFAN_F - const ROUTE35GOLDENRODGATE_FISHER Route35GoldenrodGate_MapScripts: db 0 ; scene scripts @@ -17,46 +16,46 @@ RandyScript: iftrue .questcomplete checkevent EVENT_GOT_KENYA iftrue .alreadyhavekenya - writetext UnknownText_0x69ddd + writetext Route35GoldenrodGateRandyAskTakeThisMonToMyFriendText yesorno iffalse .refused - writetext UnknownText_0x69e48 + writetext Route35GoldenrodGateRandyThanksText promptbutton waitsfx readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, .partyfull - writetext UnknownText_0x69eb8 + writetext Route35GoldenrodGatePlayerReceivedAMonWithMailText playsound SFX_KEY_ITEM waitsfx givepoke SPEAROW, 10, NO_ITEM, TRUE, GiftSpearowName, GiftSpearowOTName givepokemail GiftSpearowMail setevent EVENT_GOT_KENYA .alreadyhavekenya - writetext UnknownText_0x69ed6 + writetext Route35GoldenrodGateRandyWeirdTreeBlockingRoadText waitbutton closetext end .partyfull - writetext UnknownText_0x69f56 + writetext Route35GoldenrodGateRandyCantCarryAnotherMonText waitbutton closetext end .refused - writetext UnknownText_0x69f74 + writetext Route35GoldenrodGateRandyOhNeverMindThenText waitbutton closetext end .questcomplete - writetext UnknownText_0x69f8b + writetext Route35GoldenrodGateRandySomethingForYourTroubleText promptbutton verbosegiveitem HP_UP iffalse .bagfull setevent EVENT_GOT_HP_UP_FROM_RANDY .gothpup - writetext UnknownText_0x69fd9 + writetext Route35GoldenrodGateRandyMyPalWasSnoozingRightText waitbutton .bagfull closetext @@ -89,7 +88,7 @@ Route35GoldenrodGatePokefanFScript: closetext end -UnknownText_0x69ddd: +Route35GoldenrodGateRandyAskTakeThisMonToMyFriendText: text "Excuse me, guy!" line "Can you do a guy" cont "a favor?" @@ -101,7 +100,7 @@ UnknownText_0x69ddd: para "He's on ROUTE 31." done -UnknownText_0x69e48: +Route35GoldenrodGateRandyThanksText: text "You will? Perfect!" line "Thanks, guy!" @@ -113,12 +112,12 @@ UnknownText_0x69e48: line "him right away!" done -UnknownText_0x69eb8: +Route35GoldenrodGatePlayerReceivedAMonWithMailText: text "<PLAYER> received a" line "#MON with MAIL." done -UnknownText_0x69ed6: +Route35GoldenrodGateRandyWeirdTreeBlockingRoadText: text "You can read it," line "but don't lose it!" cont "ROUTE 31!" @@ -131,17 +130,17 @@ UnknownText_0x69ed6: line "been cleared?" done -UnknownText_0x69f56: +Route35GoldenrodGateRandyCantCarryAnotherMonText: text "You can't carry" line "another #MON…" done -UnknownText_0x69f74: +Route35GoldenrodGateRandyOhNeverMindThenText: text "Oh… Never mind," line "then…" done -UnknownText_0x69f8b: +Route35GoldenrodGateRandySomethingForYourTroubleText: text "Thanks, guy! You" line "made the delivery" cont "for me!" @@ -150,7 +149,7 @@ UnknownText_0x69f8b: line "for your trouble!" done -UnknownText_0x69fd9: +Route35GoldenrodGateRandyMyPalWasSnoozingRightText: text "My pal was snooz-" line "ing, right? Heh," cont "what'd I say?" diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index 435e48ce..e2eee6c4 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE35NATIONALPARKGATE_OFFICER1 const ROUTE35NATIONALPARKGATE_YOUNGSTER const ROUTE35NATIONALPARKGATE_OFFICER2 @@ -52,22 +52,22 @@ Route35NationalParkGate_MapScripts: return .LeavingContestEarly: - applymovement PLAYER, MovementData_0x6a2e2 + applymovement PLAYER, Route35NationalParkGatePlayerApproachOfficer1Movement turnobject ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT opentext readvar VAR_CONTESTMINUTES addval 1 getnum STRING_BUFFER_3 - writetext UnknownText_0x6a79a + writetext Route35NationalParkGateOfficer1WantToFinishText yesorno iffalse .GoBackToContest - writetext UnknownText_0x6a7db + writetext Route35NationalParkGateOfficer1WaitAtNorthGateText waitbutton closetext jumpstd bugcontestresultswarp .GoBackToContest: - writetext UnknownText_0x6a823 + writetext Route35NationalParkGateOfficer1OkGoFinishText waitbutton closetext scall Route35NationalParkGate_EnterContest @@ -88,7 +88,7 @@ Route35OfficerScriptContest: checkflag ENGINE_DAILY_BUG_CONTEST iftrue Route35NationalParkGate_ContestIsOver scall Route35NationalParkGate_GetDayOfWeek - writetext UnknownText_0x6a2eb + writetext Route35NationalParkGateOfficer1AskToParticipateText yesorno iffalse Route35NationalParkGate_DeclinedToParticipate readvar VAR_PARTYCOUNT @@ -98,12 +98,12 @@ Route35OfficerScriptContest: Route35NationalParkGate_OkayToProceed: setflag ENGINE_BUG_CONTEST_TIMER special PlayMapMusic - writetext UnknownText_0x6a39d + writetext Route35NationalParkGateOfficer1GiveParkBallsText promptbutton - writetext UnknownText_0x6a3c7 + writetext Route35NationalParkGatePlayerReceivedParkBallsText playsound SFX_ITEM waitsfx - writetext UnknownText_0x6a3e2 + writetext Route35NationalParkGateOfficer1ExplainsRulesText waitbutton closetext special GiveParkBalls @@ -118,11 +118,11 @@ Route35NationalParkGate_OkayToProceed: Route35NationalParkGate_EnterContest: readvar VAR_FACING ifequal LEFT, Route35NationalParkGate_FacingLeft - applymovement PLAYER, MovementData_0x6a2e5 + applymovement PLAYER, Route35NationalParkGatePlayerGoAroundOfficerAndEnterParkMovement end Route35NationalParkGate_FacingLeft: - applymovement PLAYER, MovementData_0x6a2e9 + applymovement PLAYER, Route35NationalParkGatePlayerEnterParkMovement end Route35NationalParkGate_LeaveTheRestBehind: @@ -134,65 +134,65 @@ Route35NationalParkGate_LeaveTheRestBehind: Route35NationalParkGate_LessThanFullParty: special CheckFirstMonIsEgg ifequal TRUE, Route35NationalParkGate_FirstMonIsEgg - writetext UnknownText_0x6a4c6 + writetext Route35NationalParkGateOfficer1AskToUseFirstMonText yesorno iffalse Route35NationalParkGate_DeclinedToLeaveMonsBehind special ContestDropOffMons iftrue Route35NationalParkGate_FirstMonIsFainted setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER - writetext UnknownText_0x6a537 + writetext Route35NationalParkGateOfficer1WellHoldYourMonText promptbutton - writetext UnknownText_0x6a56b + writetext Route35NationalParkGatePlayersMonLeftWithHelperText playsound SFX_GOT_SAFARI_BALLS waitsfx promptbutton sjump Route35NationalParkGate_OkayToProceed Route35NationalParkGate_DeclinedToParticipate: - writetext UnknownText_0x6a5dc + writetext Route35NationalParkGateOfficer1TakePartInFutureText waitbutton closetext end Route35NationalParkGate_DeclinedToLeaveMonsBehind: - writetext UnknownText_0x6a597 + writetext Route35NationalParkGateOfficer1ChooseMonAndComeBackText waitbutton closetext end Route35NationalParkGate_FirstMonIsFainted: - writetext UnknownText_0x6a608 + writetext Route35NationalParkGateOfficer1FirstMonCantBattleText waitbutton closetext end Route35NationalParkGate_NoRoomInBox: - writetext UnknownText_0x6a67c + writetext Route35NationalParkGateOfficer1MakeRoomText waitbutton closetext end Route35NationalParkGate_FirstMonIsEgg: - writetext UnknownText_0x6a71f + writetext Route35NationalParkGateOfficer1EggAsFirstMonText waitbutton closetext end Route35NationalParkGate_ContestIsOver: - writetext UnknownText_0x6a84f + writetext Route35NationalParkGateOfficer1ContestIsOverText waitbutton closetext end Route35NationalParkGate_NoContestToday: - jumptextfaceplayer UnknownText_0x6a894 + jumptextfaceplayer Route35NationalParkGateOfficer1WeHoldContestsText Route35NationalParkGateOfficerScript: faceplayer opentext checkflag ENGINE_DAILY_BUG_CONTEST iftrue Route35NationalParkGate_ContestIsOver - writetext UnknownText_0x6a894 + writetext Route35NationalParkGateOfficer1WeHoldContestsText waitbutton closetext end @@ -207,22 +207,22 @@ Route35NationalParkGate_GetDayOfWeek: jumpstd daytotext end -MovementData_0x6a2e2: +Route35NationalParkGatePlayerApproachOfficer1Movement: step DOWN turn_head LEFT step_end -MovementData_0x6a2e5: +Route35NationalParkGatePlayerGoAroundOfficerAndEnterParkMovement: step RIGHT step UP step UP step_end -MovementData_0x6a2e9: +Route35NationalParkGatePlayerEnterParkMovement: step UP step_end -UnknownText_0x6a2eb: +Route35NationalParkGateOfficer1AskToParticipateText: text "Today's @" text_ram wStringBuffer3 text "." @@ -244,18 +244,18 @@ UnknownText_0x6a2eb: line "give it a try?" done -UnknownText_0x6a39d: +Route35NationalParkGateOfficer1GiveParkBallsText: text "Here are the PARK" line "BALLS for the" cont "Contest." done -UnknownText_0x6a3c7: +Route35NationalParkGatePlayerReceivedParkBallsText: text "<PLAYER> received" line "20 PARK BALLS." done -UnknownText_0x6a3e2: +Route35NationalParkGateOfficer1ExplainsRulesText: text "The person who" line "gets the strong-" cont "est bug #MON" @@ -279,7 +279,7 @@ UnknownText_0x6a3e2: line "find!" done -UnknownText_0x6a4c6: +Route35NationalParkGateOfficer1AskToUseFirstMonText: text "Uh-oh…" para "You have more than" @@ -297,19 +297,19 @@ UnknownText_0x6a4c6: line "you?" done -UnknownText_0x6a537: +Route35NationalParkGateOfficer1WellHoldYourMonText: text "Fine, we'll hold" line "your other #MON" cont "while you compete." done -UnknownText_0x6a56b: +Route35NationalParkGatePlayersMonLeftWithHelperText: text "<PLAYER>'s #MON" line "were left with the" cont "CONTEST HELPER." done -UnknownText_0x6a597: +Route35NationalParkGateOfficer1ChooseMonAndComeBackText: text "Please choose the" line "#MON to be used" @@ -317,13 +317,13 @@ UnknownText_0x6a597: line "then come see me." done -UnknownText_0x6a5dc: +Route35NationalParkGateOfficer1TakePartInFutureText: text "OK. We hope you'll" line "take part in the" cont "future." done -UnknownText_0x6a608: +Route35NationalParkGateOfficer1FirstMonCantBattleText: text "Uh-oh…" line "The first #MON" @@ -337,7 +337,7 @@ UnknownText_0x6a608: line "then come see me." done -UnknownText_0x6a67c: +Route35NationalParkGateOfficer1MakeRoomText: text "Uh-oh…" line "Both your party" @@ -355,7 +355,7 @@ UnknownText_0x6a67c: line "come see me." done -UnknownText_0x6a71f: +Route35NationalParkGateOfficer1EggAsFirstMonText: text "Uh-oh…" line "You have an EGG as" @@ -369,7 +369,7 @@ UnknownText_0x6a71f: line "then come see me." done -UnknownText_0x6a79a: +Route35NationalParkGateOfficer1WantToFinishText: text "You still have @" text_ram wStringBuffer3 text_start @@ -379,7 +379,7 @@ UnknownText_0x6a79a: line "finish now?" done -UnknownText_0x6a7db: +Route35NationalParkGateOfficer1WaitAtNorthGateText: text "OK. Please wait at" line "the North Gate for" @@ -387,13 +387,13 @@ UnknownText_0x6a7db: line "of the winners." done -UnknownText_0x6a823: +Route35NationalParkGateOfficer1OkGoFinishText: text "OK. Please get" line "back outside and" cont "finish up." done -UnknownText_0x6a84f: +Route35NationalParkGateOfficer1ContestIsOverText: text "Today's Contest is" line "over. We hope you" @@ -401,7 +401,7 @@ UnknownText_0x6a84f: line "in the future." done -UnknownText_0x6a894: +Route35NationalParkGateOfficer1WeHoldContestsText: text "We hold Contests" line "regularly in the" diff --git a/maps/Route36.asm b/maps/Route36.asm index 7700c5ef..47a0ef7e 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE36_YOUNGSTER1 const ROUTE36_YOUNGSTER2 const ROUTE36_WEIRD_TREE @@ -53,7 +53,7 @@ WateredWeirdTreeScript:: ; export (for when you use Squirtbottle from pack) loadwildmon SUDOWOODO, 20 startbattle setevent EVENT_FOUGHT_SUDOWOODO - ifequal $2, DidntCatchSudowoodo + ifequal DRAW, DidntCatchSudowoodo disappear ROUTE36_WEIRD_TREE variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN reloadmapafterbattle @@ -124,7 +124,7 @@ TrainerSchoolboyAlan1: iftrue .NumberAccepted checkevent EVENT_ALAN_ASKED_FOR_PHONE_NUMBER iftrue .AskAgainForPhoneNumber - writetext UnknownText_0x1947aa + writetext SchoolboyAlanBooksText promptbutton setevent EVENT_ALAN_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 @@ -307,7 +307,7 @@ RockSmashGuyText2: cont "have this." done -UnknownText_0x19451a: +UnusedReceivedTM08Text: text "<PLAYER> received" line "TM08." done @@ -376,7 +376,7 @@ SchoolboyAlan1BeatenText: line "error?" done -UnknownText_0x1947aa: +SchoolboyAlanBooksText: text "Darn. I study five" line "hours a day too." diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index 00da020c..c6bb5e31 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE36NATIONALPARKGATE_OFFICER1 const ROUTE36NATIONALPARKGATE_YOUNGSTER1 const ROUTE36NATIONALPARKGATE_YOUNGSTER2 @@ -67,10 +67,10 @@ Route36NationalParkGate_MapScripts: readvar VAR_CONTESTMINUTES addval 1 getnum STRING_BUFFER_3 - writetext UnknownText_0x6b284 + writetext Route36NationalParkGateOfficer1WantToFinishText yesorno iffalse .GoBackToContest - writetext UnknownText_0x6b2c5 + writetext Route36NationalParkGateOfficer1WaitHereForAnnouncementText waitbutton closetext special FadeBlackQuickly @@ -78,13 +78,13 @@ Route36NationalParkGate_MapScripts: scall .CopyContestants disappear ROUTE36NATIONALPARKGATE_OFFICER1 appear ROUTE36NATIONALPARKGATE_OFFICER2 - applymovement PLAYER, MovementData_0x6add1 + applymovement PLAYER, Route36NationalParkGatePlayerWaitWithContestantsMovement pause 15 special FadeInQuickly jumpstd bugcontestresults .GoBackToContest: - writetext UnknownText_0x6b300 + writetext Route36NationalParkGateOfficer1OkGoFinishText waitbutton closetext turnobject PLAYER, LEFT @@ -149,7 +149,7 @@ Route36OfficerScriptContest: checkflag ENGINE_DAILY_BUG_CONTEST iftrue Route36Officer_ContestHasConcluded scall Route36ParkGate_DayToText - writetext UnknownText_0x6add5 + writetext Route36NationalParkGateOfficer1AskToParticipateText yesorno iffalse .DecidedNotToJoinContest readvar VAR_PARTYCOUNT @@ -159,13 +159,13 @@ Route36OfficerScriptContest: .ResumeStartingContest: setflag ENGINE_BUG_CONTEST_TIMER special PlayMapMusic - writetext UnknownText_0x6ae87 + writetext Route36NationalParkGateOfficer1GiveParkBallsText promptbutton waitsfx - writetext UnknownText_0x6aeb1 + writetext Route36NationalParkGatePlayerReceivedParkBallsText playsound SFX_ITEM waitsfx - writetext UnknownText_0x6aecc + writetext Route36NationalParkGateOfficer1ExplainsRulesText waitbutton closetext setflag ENGINE_BUG_CONTEST_TIMER @@ -186,46 +186,46 @@ Route36OfficerScriptContest: .ContinueLeavingMons: special CheckFirstMonIsEgg ifequal TRUE, .FirstMonIsEgg - writetext UnknownText_0x6afb0 + writetext Route36NationalParkGateOfficer1AskToUseFirstMonText yesorno iffalse .RefusedToLeaveMons special ContestDropOffMons iftrue .FirstMonIsFainted setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER - writetext UnknownText_0x6b021 + writetext Route36NationalParkGateOfficer1WellHoldYourMonText promptbutton - writetext UnknownText_0x6b055 + writetext Route36NationalParkGatePlayersMonLeftWithHelperText playsound SFX_GOT_SAFARI_BALLS waitsfx promptbutton sjump .ResumeStartingContest .DecidedNotToJoinContest: - writetext UnknownText_0x6b0c6 + writetext Route36NationalParkGateOfficer1TakePartInFutureText waitbutton closetext end .RefusedToLeaveMons: - writetext UnknownText_0x6b081 + writetext Route36NationalParkGateOfficer1ChooseMonAndComeBackText waitbutton closetext end .FirstMonIsFainted: - writetext UnknownText_0x6b0f2 + writetext Route36NationalParkGateOfficer1FirstMonCantBattleText waitbutton closetext end .BoxFull: - writetext UnknownText_0x6b166 + writetext Route36NationalParkGateOfficer1MakeRoomText waitbutton closetext end .FirstMonIsEgg: - writetext UnknownText_0x6b209 + writetext Route36NationalParkGateOfficer1EggAsFirstMonText waitbutton closetext end @@ -239,13 +239,13 @@ Route36Officer_ContestHasConcluded: iftrue .GoldBerry checkevent EVENT_CONTEST_OFFICER_HAS_BERRY iftrue .Berry - writetext UnknownText_0x6b32b + writetext Route36NationalParkGateOfficer1ContestIsOverText waitbutton closetext end .Sunstone: - writetext UnknownText_0x6b97f + writetext Route36NationalParkGateOfficer1HeresThePrizeText promptbutton verbosegiveitem SUN_STONE iffalse .BagFull @@ -254,7 +254,7 @@ Route36Officer_ContestHasConcluded: end .Everstone: - writetext UnknownText_0x6b97f + writetext Route36NationalParkGateOfficer1HeresThePrizeText promptbutton verbosegiveitem EVERSTONE iffalse .BagFull @@ -263,7 +263,7 @@ Route36Officer_ContestHasConcluded: end .GoldBerry: - writetext UnknownText_0x6b97f + writetext Route36NationalParkGateOfficer1HeresThePrizeText promptbutton verbosegiveitem GOLD_BERRY iffalse .BagFull @@ -272,7 +272,7 @@ Route36Officer_ContestHasConcluded: end .Berry: - writetext UnknownText_0x6b97f + writetext Route36NationalParkGateOfficer1HeresThePrizeText promptbutton verbosegiveitem BERRY iffalse .BagFull @@ -281,20 +281,20 @@ Route36Officer_ContestHasConcluded: end .BagFull: - writetext UnknownText_0x6b910 + writetext Route36NationalParkGateOfficer1WellHoldPrizeText waitbutton closetext end _ContestNotOn: - jumptextfaceplayer UnknownText_0x6b370 + jumptextfaceplayer Route36NationalParkGateOfficer1SomeMonOnlySeenInParkText Route36NationalParkGateOfficerScript: faceplayer opentext checkflag ENGINE_DAILY_BUG_CONTEST iftrue Route36Officer_ContestHasConcluded - writetext UnknownText_0x6b370 + writetext Route36NationalParkGateOfficer1SomeMonOnlySeenInParkText waitbutton closetext end @@ -467,13 +467,13 @@ UnusedBugCatchingContestExplanationSign: ; duplicate of BugCatchingContestExplanationSign in Route35NationalParkGate.asm jumptext UnusedBugCatchingContestExplanationText -MovementData_0x6add1: +Route36NationalParkGatePlayerWaitWithContestantsMovement: big_step DOWN big_step RIGHT turn_head UP step_end -UnknownText_0x6add5: +Route36NationalParkGateOfficer1AskToParticipateText: text "Today's @" text_ram wStringBuffer3 text "." @@ -495,18 +495,18 @@ UnknownText_0x6add5: line "give it a try?" done -UnknownText_0x6ae87: +Route36NationalParkGateOfficer1GiveParkBallsText: text "Here are the PARK" line "BALLS for the" cont "Contest." done -UnknownText_0x6aeb1: +Route36NationalParkGatePlayerReceivedParkBallsText: text "<PLAYER> received" line "20 PARK BALLS." done -UnknownText_0x6aecc: +Route36NationalParkGateOfficer1ExplainsRulesText: text "The person who" line "gets the strong-" cont "est bug #MON" @@ -530,7 +530,7 @@ UnknownText_0x6aecc: line "find!" done -UnknownText_0x6afb0: +Route36NationalParkGateOfficer1AskToUseFirstMonText: text "Uh-oh…" para "You have more than" @@ -548,19 +548,19 @@ UnknownText_0x6afb0: line "you?" done -UnknownText_0x6b021: +Route36NationalParkGateOfficer1WellHoldYourMonText: text "Fine. We'll hold" line "your other #MON" cont "while you compete." done -UnknownText_0x6b055: +Route36NationalParkGatePlayersMonLeftWithHelperText: text "<PLAYER>'s #MON" line "were left with the" cont "CONTEST HELPER." done -UnknownText_0x6b081: +Route36NationalParkGateOfficer1ChooseMonAndComeBackText: text "Please choose the" line "#MON to be used" @@ -568,13 +568,13 @@ UnknownText_0x6b081: line "then come see me." done -UnknownText_0x6b0c6: +Route36NationalParkGateOfficer1TakePartInFutureText: text "OK. We hope you'll" line "take part in the" cont "future." done -UnknownText_0x6b0f2: +Route36NationalParkGateOfficer1FirstMonCantBattleText: text "Uh-oh…" line "The first #MON" @@ -588,7 +588,7 @@ UnknownText_0x6b0f2: line "then come see me." done -UnknownText_0x6b166: +Route36NationalParkGateOfficer1MakeRoomText: text "Uh-oh…" line "Both your party" @@ -606,7 +606,7 @@ UnknownText_0x6b166: line "come see me." done -UnknownText_0x6b209: +Route36NationalParkGateOfficer1EggAsFirstMonText: text "Uh-oh…" line "You have an EGG as" @@ -620,7 +620,7 @@ UnknownText_0x6b209: line "then come see me." done -UnknownText_0x6b284: +Route36NationalParkGateOfficer1WantToFinishText: text "You still have @" text_ram wStringBuffer3 text_start @@ -630,7 +630,7 @@ UnknownText_0x6b284: line "finish now?" done -UnknownText_0x6b2c5: +Route36NationalParkGateOfficer1WaitHereForAnnouncementText: text "OK. Please wait" line "here for the" @@ -638,13 +638,13 @@ UnknownText_0x6b2c5: line "the winners." done -UnknownText_0x6b300: +Route36NationalParkGateOfficer1OkGoFinishText: text "OK. Please go back" line "outside and finish" cont "up." done -UnknownText_0x6b32b: +Route36NationalParkGateOfficer1ContestIsOverText: text "Today's Contest is" line "over. We hope you" @@ -652,7 +652,7 @@ UnknownText_0x6b32b: line "in the future." done -UnknownText_0x6b370: +Route36NationalParkGateOfficer1SomeMonOnlySeenInParkText: text "Some #MON can" line "only be seen in" cont "the PARK." @@ -826,7 +826,7 @@ UnusedBugCatchingContestExplanationText: line "that you catch." done -UnknownText_0x6b910: +Route36NationalParkGateOfficer1WellHoldPrizeText: text "Uh-oh… Your PACK" line "is full." @@ -838,7 +838,7 @@ UnknownText_0x6b910: line "then come see me." done -UnknownText_0x6b97f: +Route36NationalParkGateOfficer1HeresThePrizeText: text "<PLAYER>?" para "Here's the prize" diff --git a/maps/Route36RuinsOfAlphGate.asm b/maps/Route36RuinsOfAlphGate.asm index ed894445..bced6d8d 100644 --- a/maps/Route36RuinsOfAlphGate.asm +++ b/maps/Route36RuinsOfAlphGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE36RUINSOFALPHGATE_OFFICER const ROUTE36RUINSOFALPHGATE_GRAMPS diff --git a/maps/Route37.asm b/maps/Route37.asm index 0c7c8778..549670b1 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE37_WEIRD_TREE1 const ROUTE37_WEIRD_TREE2 const ROUTE37_YOUNGSTER diff --git a/maps/Route38.asm b/maps/Route38.asm index 4675464d..8864e428 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -1,11 +1,10 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE38_STANDING_YOUNGSTER1 const ROUTE38_LASS const ROUTE38_STANDING_YOUNGSTER2 - const ROUTE38_BUENA1 + const ROUTE38_BUENA const ROUTE38_SAILOR const ROUTE38_FRUIT_TREE - const ROUTE38_BUENA2 Route38_MapScripts: db 0 ; scene scripts @@ -46,7 +45,7 @@ TrainerLassDana1: iftrue .NumberAccepted checkevent EVENT_DANA_ASKED_FOR_PHONE_NUMBER iftrue .SecondTimeAsking - writetext UnknownText_0x1a20ec + writetext LassDanaMoomooMilkText promptbutton setevent EVENT_DANA_ASKED_FOR_PHONE_NUMBER scall .AskNumber1F @@ -129,7 +128,7 @@ TrainerSchoolboyChad1: iftrue .HaveChadsNumber checkevent EVENT_CHAD_ASKED_FOR_PHONE_NUMBER iftrue .SecondTimeAsking - writetext UnknownText_0x1a200e + writetext SchoolboyChadSoManyTestsText promptbutton setevent EVENT_CHAD_ASKED_FOR_PHONE_NUMBER scall .AskPhoneNumber1 @@ -250,7 +249,7 @@ SchoolboyChad1BeatenText: line "enough, I guess." done -UnknownText_0x1a200e: +SchoolboyChadSoManyTestsText: text "I have to take so" line "many tests, I" @@ -275,7 +274,7 @@ LassDana1BeatenText: line "battle that way." done -UnknownText_0x1a20ec: +LassDanaMoomooMilkText: text "I know something" line "good!" diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index 2277c3a1..7b6aaee4 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE38ECRUTEAKGATE_OFFICER Route38EcruteakGate_MapScripts: diff --git a/maps/Route39.asm b/maps/Route39.asm index b7d15425..4e93e4f1 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -1,14 +1,13 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE39_SAILOR const ROUTE39_POKEFAN_M - const ROUTE39_POKEFAN_F1 + const ROUTE39_POKEFAN_F const ROUTE39_MILTANK1 const ROUTE39_MILTANK2 const ROUTE39_MILTANK3 const ROUTE39_MILTANK4 const ROUTE39_PSYCHIC_NORMAN const ROUTE39_FRUIT_TREE - const ROUTE39_POKEFAN_F2 Route39_MapScripts: db 0 ; scene scripts diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 1b558a50..2030c1e7 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE39BARN_TWIN1 const ROUTE39BARN_TWIN2 const ROUTE39BARN_MOOMOO diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index e6835bc1..5f49a099 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -1,4 +1,6 @@ - const_def 2 ; object constants +ROUTE39FARMHOUSE_MILK_PRICE EQU 500 + + object_const_def ; object_event constants const ROUTE39FARMHOUSE_POKEFAN_M const ROUTE39FARMHOUSE_POKEFAN_F @@ -25,11 +27,11 @@ FarmerMScript_SellMilk: special PlaceMoneyTopRight yesorno iffalse FarmerMScript_NoSale - checkmoney YOUR_MONEY, 500 + checkmoney YOUR_MONEY, ROUTE39FARMHOUSE_MILK_PRICE ifequal HAVE_LESS, FarmerMScript_NoMoney giveitem MOOMOO_MILK iffalse FarmerMScript_NoRoom - takemoney YOUR_MONEY, 500 + takemoney YOUR_MONEY, ROUTE39FARMHOUSE_MILK_PRICE special PlaceMoneyTopRight waitsfx playsound SFX_TRANSACTION diff --git a/maps/Route4.asm b/maps/Route4.asm index 8f50b750..50605063 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE4_YOUNGSTER const ROUTE4_LASS1 const ROUTE4_LASS2 @@ -124,6 +124,6 @@ Route4_MapEvents: db 4 ; object events object_event 17, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperHank, -1 - object_event 10, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerPicnickerHope, -1 + object_event 10, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerPicnickerHope, -1 object_event 21, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerSharon, -1 object_event 26, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route4HPUp, EVENT_ROUTE_4_HP_UP diff --git a/maps/Route40.asm b/maps/Route40.asm index dc87cca4..45ca3c04 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE40_OLIVINE_RIVAL1 const ROUTE40_OLIVINE_RIVAL2 const ROUTE40_SWIMMER_GIRL1 @@ -6,11 +6,8 @@ const ROUTE40_ROCK1 const ROUTE40_ROCK2 const ROUTE40_ROCK3 - const ROUTE40_LASS1 + const ROUTE40_LASS const ROUTE40_MONICA - const ROUTE40_POKEFAN_M - const ROUTE40_LASS2 - const ROUTE40_STANDING_YOUNGSTER Route40_MapScripts: db 0 ; scene scripts diff --git a/maps/Route41.asm b/maps/Route41.asm index d851a41e..994a2b2e 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE41_OLIVINE_RIVAL1 const ROUTE41_OLIVINE_RIVAL2 const ROUTE41_OLIVINE_RIVAL3 diff --git a/maps/Route42.asm b/maps/Route42.asm index 1477d33e..4da5a238 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE42_FISHER const ROUTE42_POKEFAN_M const ROUTE42_SUPER_NERD @@ -7,7 +7,6 @@ const ROUTE42_FRUIT_TREE3 const ROUTE42_POKE_BALL1 const ROUTE42_POKE_BALL2 - const ROUTE42_SUICUNE Route42_MapScripts: db 0 ; scene scripts diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index 577cf0a7..9f019db7 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE42ECRUTEAKGATE_OFFICER Route42EcruteakGate_MapScripts: diff --git a/maps/Route43.asm b/maps/Route43.asm index c237679e..58a4de1e 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE43_SUPER_NERD1 const ROUTE43_SUPER_NERD2 const ROUTE43_SUPER_NERD3 diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 5a949eee..e1f16337 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -1,6 +1,6 @@ ROUTE43GATE_TOLL EQU 1000 - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE43GATE_OFFICER const ROUTE43GATE_ROCKET1 const ROUTE43GATE_ROCKET2 diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index 671b64ae..971cd85b 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE43MAHOGANYGATE_OFFICER Route43MahoganyGate_MapScripts: diff --git a/maps/Route44.asm b/maps/Route44.asm index f302429f..de935698 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE44_FISHER1 const ROUTE44_FISHER2 const ROUTE44_YOUNGSTER1 @@ -9,7 +9,6 @@ const ROUTE44_FRUIT_TREE const ROUTE44_POKE_BALL1 const ROUTE44_POKE_BALL2 - const ROUTE44_POKE_BALL3 Route44_MapScripts: db 0 ; scene scripts diff --git a/maps/Route45.asm b/maps/Route45.asm index dfa57687..ab746436 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE45_POKEFAN_M1 const ROUTE45_POKEFAN_M2 const ROUTE45_POKEFAN_M3 @@ -11,7 +11,6 @@ const ROUTE45_POKE_BALL2 const ROUTE45_POKE_BALL3 const ROUTE45_POKE_BALL4 - const ROUTE45_YOUNGSTER Route45_MapScripts: db 0 ; scene scripts diff --git a/maps/Route46.asm b/maps/Route46.asm index 8e2d0383..5814107b 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE46_POKEFAN_M const ROUTE46_YOUNGSTER const ROUTE46_LASS diff --git a/maps/Route5.asm b/maps/Route5.asm index 103c17d5..5806ddb9 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE5_POKEFAN_M Route5_MapScripts: diff --git a/maps/Route5CleanseTagHouse.asm b/maps/Route5CleanseTagHouse.asm index a5b86f7d..08a7ec2f 100644 --- a/maps/Route5CleanseTagHouse.asm +++ b/maps/Route5CleanseTagHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE5CLEANSETAGHOUSE_GRANNY const ROUTE5CLEANSETAGHOUSE_TEACHER diff --git a/maps/Route5SaffronGate.asm b/maps/Route5SaffronGate.asm index 3a0161af..2c8898b9 100644 --- a/maps/Route5SaffronGate.asm +++ b/maps/Route5SaffronGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE5SAFFRONGATE_OFFICER Route5SaffronGate_MapScripts: diff --git a/maps/Route5UndergroundPathEntrance.asm b/maps/Route5UndergroundPathEntrance.asm index d62a042b..3f5544d0 100644 --- a/maps/Route5UndergroundPathEntrance.asm +++ b/maps/Route5UndergroundPathEntrance.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE5UNDERGROUNDPATHENTRANCE_TEACHER Route5UndergroundPathEntrance_MapScripts: diff --git a/maps/Route6.asm b/maps/Route6.asm index f5716db8..6a489ab3 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE6_POKEFAN_M Route6_MapScripts: diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index c0de7ff5..555fce4c 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE6SAFFRONGATE_OFFICER Route6SaffronGate_MapScripts: diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index 67a8c681..4835a87e 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE7SAFFRONGATE_OFFICER Route7SaffronGate_MapScripts: diff --git a/maps/Route8.asm b/maps/Route8.asm index cbc11f58..880c5d7f 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE8_BIKER1 const ROUTE8_BIKER2 const ROUTE8_BIKER3 @@ -194,5 +194,5 @@ Route8_MapEvents: object_event 10, 9, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerBikerHarris, -1 object_event 10, 10, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerBikerZeke, -1 object_event 20, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerSupernerdSam, -1 - object_event 27, 9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdTom, -1 + object_event 27, 9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdTom, -1 object_event 33, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route8FruitTree, -1 diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index bcaf7f02..83f4492a 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE8SAFFRONGATE_OFFICER Route8SaffronGate_MapScripts: diff --git a/maps/Route9.asm b/maps/Route9.asm index 6b8c63e5..7febff29 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE9_YOUNGSTER1 const ROUTE9_LASS1 const ROUTE9_YOUNGSTER2 @@ -213,12 +213,12 @@ Route9_MapEvents: db 2 ; bg events bg_event 15, 7, BGEVENT_READ, Route9Sign - bg_event 10, 5, BGEVENT_ITEM, Route9HiddenEther + bg_event 10, 5, BGEVENT_ITEM, Route9HiddenEther db 6 ; object events object_event 23, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperDean, -1 object_event 35, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerHeidi, -1 object_event 11, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperSid, -1 - object_event 9, 10, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerEdna, -1 + object_event 9, 10, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerEdna, -1 object_event 32, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerHikerTim, -1 object_event 33, 15, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerHikerSidney, -1 diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm index 04b327be..4137b255 100644 --- a/maps/RuinsOfAlphInnerChamber.asm +++ b/maps/RuinsOfAlphInnerChamber.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const RUINSOFALPHINNERCHAMBER_FISHER const RUINSOFALPHINNERCHAMBER_TEACHER const RUINSOFALPHINNERCHAMBER_GRAMPS diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index 23a82575..7e8377b1 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -1,6 +1,5 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const RUINSOFALPHKABUTOCHAMBER_RECEPTIONIST - const RUINSOFALPHKABUTOCHAMBER_SCIENTIST RuinsOfAlphKabutoChamber_MapScripts: db 0 ; scene scripts diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 32e52bd6..5600660c 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const RUINSOFALPHOUTSIDE_YOUNGSTER1 const RUINSOFALPHOUTSIDE_SCIENTIST const RUINSOFALPHOUTSIDE_FISHER diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index 1e4df3f3..c5840c41 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const RUINSOFALPHRESEARCHCENTER_SCIENTIST1 const RUINSOFALPHRESEARCHCENTER_SCIENTIST2 const RUINSOFALPHRESEARCHCENTER_SCIENTIST3 @@ -118,13 +118,14 @@ RuinsOfAlphResearchCenterComputer: checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST iftrue .SkipChecking readvar VAR_UNOWNCOUNT - ifequal NUM_UNOWN, .FullUnownDex + ifequal NUM_UNOWN, .GotAllUnown .SkipChecking: writetext RuinsOfAlphResearchCenterComputerText waitbutton closetext end -.FullUnownDex: + +.GotAllUnown: writetext RuinsOfAlphResearchCenterComputerText_GotAllUnown waitbutton closetext diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index 41a2db11..4dde5009 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SAFARIZONEWARDENSHOME_LASS SafariZoneWardensHome_MapScripts: diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 5ea760c8..51da9178 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SAFFRONCITY_LASS1 const SAFFRONCITY_POKEFAN_M const SAFFRONCITY_COOLTRAINER_M diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 3fd5578b..4be26042 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SAFFRONGYM_SABRINA const SAFFRONGYM_GRANNY1 const SAFFRONGYM_YOUNGSTER1 @@ -16,10 +16,10 @@ SaffronGymSabrinaScript: opentext checkflag ENGINE_MARSHBADGE iftrue .FightDone - writetext UnknownText_0x189cdf + writetext SabrinaIntroText waitbutton closetext - winlosstext UnknownText_0x189df4, 0 + winlosstext SabrinaWinLossText, 0 loadtrainer SABRINA, SABRINA1 startbattle reloadmapafterbattle @@ -29,17 +29,17 @@ SaffronGymSabrinaScript: setevent EVENT_BEAT_PSYCHIC_FRANKLIN setevent EVENT_BEAT_PSYCHIC_JARED opentext - writetext UnknownText_0x189e95 + writetext ReceivedMarshBadgeText playsound SFX_GET_BADGE waitsfx setflag ENGINE_MARSHBADGE - writetext UnknownText_0x189ead + writetext SabrinaMarshBadgeText waitbutton closetext end .FightDone: - writetext UnknownText_0x189f6c + writetext SabrinaFightDoneText waitbutton closetext end @@ -112,7 +112,7 @@ SaffronGymStatue: gettrainername STRING_BUFFER_4, SABRINA, SABRINA1 jumpstd gymstatue2 -UnknownText_0x189cdf: +SabrinaIntroText: text "SABRINA: I knew" line "you were coming…" @@ -138,7 +138,7 @@ UnknownText_0x189cdf: cont "psychic powers!" done -UnknownText_0x189df4: +SabrinaWinLossText: text "SABRINA: Your" line "power…" @@ -156,12 +156,12 @@ UnknownText_0x189df4: cont "MARSHBADGE." done -UnknownText_0x189e95: +ReceivedMarshBadgeText: text "<PLAYER> received" line "MARSHBADGE." done -UnknownText_0x189ead: +SabrinaMarshBadgeText: text "SABRINA: MARSH-" line "BADGE draws out" @@ -179,7 +179,7 @@ UnknownText_0x189ead: cont "beloved CHAMPION!" done -UnknownText_0x189f6c: +SabrinaFightDoneText: text "SABRINA: Your love" line "for your #MON" diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm index 8744675e..fc083b19 100644 --- a/maps/SaffronMagnetTrainStation.asm +++ b/maps/SaffronMagnetTrainStation.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SAFFRONMAGNETTRAINSTATION_OFFICER const SAFFRONMAGNETTRAINSTATION_GYM_GUY const SAFFRONMAGNETTRAINSTATION_TEACHER @@ -18,22 +18,22 @@ SaffronMagnetTrainStationOfficerScript: opentext checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .MagnetTrainToGoldenrod - writetext UnknownText_0x18a8a9 + writetext SaffronMagnetTrainStationOfficerTrainIsntOperatingText waitbutton closetext end .MagnetTrainToGoldenrod: - writetext UnknownText_0x18a8dd + writetext SaffronMagnetTrainStationOfficerAreYouComingOnBoardText yesorno iffalse .DecidedNotToRide checkitem PASS iffalse .PassNotInBag - writetext UnknownText_0x18a917 + writetext SaffronMagnetTrainStationOfficerRightThisWayText waitbutton closetext - applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, MovementData_0x18a88f - applymovement PLAYER, MovementData_0x18a898 + applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, SaffronMagnetTrainStationOfficerApproachTrainDoorMovement + applymovement PLAYER, SaffronMagnetTrainStationPlayerApproachAndEnterTrainMovement setval TRUE special MagnetTrain warpcheck @@ -41,23 +41,23 @@ SaffronMagnetTrainStationOfficerScript: end .PassNotInBag: - writetext UnknownText_0x18a956 + writetext SaffronMagnetTrainStationOfficerYouDontHaveAPassText waitbutton closetext end .DecidedNotToRide: - writetext UnknownText_0x18a978 + writetext SaffronMagnetTrainStationOfficerHopeToSeeYouAgainText waitbutton closetext end Script_ArriveFromGoldenrod: - applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, MovementData_0x18a88f - applymovement PLAYER, MovementData_0x18a8a1 - applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, MovementData_0x18a894 + applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, SaffronMagnetTrainStationOfficerApproachTrainDoorMovement + applymovement PLAYER, SaffronMagnetTrainStationPlayerLeaveTrainAndEnterStationMovement + applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, SaffronMagnetTrainStationOfficerReturnToBoardingGateMovement opentext - writetext UnknownText_0x18a993 + writetext SaffronMagnetTrainStationOfficerArrivedInSaffronText waitbutton closetext end @@ -84,20 +84,20 @@ SaffronMagnetTrainStationTeacherScript: SaffronMagnetTrainStationLassScript: jumptextfaceplayer SaffronMagnetTrainStationLassText -MovementData_0x18a88f: +SaffronMagnetTrainStationOfficerApproachTrainDoorMovement: step UP step UP step RIGHT turn_head LEFT step_end -MovementData_0x18a894: +SaffronMagnetTrainStationOfficerReturnToBoardingGateMovement: step LEFT step DOWN step DOWN step_end -MovementData_0x18a898: +SaffronMagnetTrainStationPlayerApproachAndEnterTrainMovement: step UP step UP step UP @@ -108,7 +108,7 @@ MovementData_0x18a898: step UP step_end -MovementData_0x18a8a1: +SaffronMagnetTrainStationPlayerLeaveTrainAndEnterStationMovement: step LEFT step LEFT step DOWN @@ -118,13 +118,13 @@ MovementData_0x18a8a1: turn_head UP step_end -UnknownText_0x18a8a9: +SaffronMagnetTrainStationOfficerTrainIsntOperatingText: text "I'm sorry, but the" line "MAGNET TRAIN isn't" cont "operating now." done -UnknownText_0x18a8dd: +SaffronMagnetTrainStationOfficerAreYouComingOnBoardText: text "We'll soon depart" line "for GOLDENROD." @@ -132,7 +132,7 @@ UnknownText_0x18a8dd: line "board?" done -UnknownText_0x18a917: +SaffronMagnetTrainStationOfficerRightThisWayText: text "May I see your" line "rail PASS, please?" @@ -140,17 +140,17 @@ UnknownText_0x18a917: line "way, sir." done -UnknownText_0x18a956: +SaffronMagnetTrainStationOfficerYouDontHaveAPassText: text "Sorry, but you" line "don't have a PASS." done -UnknownText_0x18a978: +SaffronMagnetTrainStationOfficerHopeToSeeYouAgainText: text "We hope to see you" line "again." done -UnknownText_0x18a993: +SaffronMagnetTrainStationOfficerArrivedInSaffronText: text "We have arrived in" line "SAFFRON." diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index 55e078d8..35dbfb22 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SAFFRONMART_CLERK const SAFFRONMART_COOLTRAINER_M const SAFFRONMART_COOLTRAINER_F diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm index b403b37e..bcd0d2ec 100644 --- a/maps/SaffronPokecenter1F.asm +++ b/maps/SaffronPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SAFFRONPOKECENTER1F_NURSE const SAFFRONPOKECENTER1F_TEACHER const SAFFRONPOKECENTER1F_FISHER @@ -13,20 +13,20 @@ SaffronPokecenter1FNurseScript: jumpstd pokecenternurse SaffronPokecenter1FTeacherScript: - jumptextfaceplayer UnknownText_0x18a4a3 + jumptextfaceplayer SaffronPokecenter1FTeacherText SaffronPokecenter1FFisherScript: faceplayer opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue .SolvedKantoPowerCrisis - writetext UnknownText_0x18a5d3 + writetext SaffronPokecenter1FFisherText waitbutton closetext end .SolvedKantoPowerCrisis: - writetext UnknownText_0x18a62e + writetext SaffronPokecenter1FFisherReturnedMachinePartText waitbutton closetext end @@ -34,13 +34,13 @@ SaffronPokecenter1FFisherScript: SaffronPokecenter1FYoungsterScript: jumptextfaceplayer SaffronPokecenter1FYoungsterText -UnknownText_0x18a4a3: +SaffronPokecenter1FTeacherText: text "There's a huge" line "POWER PLANT north" cont "of LAVENDER TOWN." done -UnknownText_0x18a5d3: +SaffronPokecenter1FFisherText: text "I just happened to" line "come through ROCK" @@ -49,7 +49,7 @@ UnknownText_0x18a5d3: cont "the POWER PLANT." done -UnknownText_0x18a62e: +SaffronPokecenter1FFisherReturnedMachinePartText: text "Caves collapse" line "easily." diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index 5aa09720..c992d845 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SEAFOAMGYM_BLAINE const SEAFOAMGYM_GYM_GUY diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index 157496c5..2ede997a 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SILPHCO1F_RECEPTIONIST const SILPHCO1F_OFFICER diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index e2f48638..eded4dee 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SILVERCAVEITEMROOMS_POKE_BALL1 const SILVERCAVEITEMROOMS_POKE_BALL2 diff --git a/maps/SilverCavePokecenter1F.asm b/maps/SilverCavePokecenter1F.asm index 7c293a36..866e269a 100644 --- a/maps/SilverCavePokecenter1F.asm +++ b/maps/SilverCavePokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SILVERCAVEPOKECENTER1F_NURSE const SILVERCAVEPOKECENTER1F_GRANNY diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 15398351..285f3c0c 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -1,8 +1,7 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SILVERCAVEROOM1_POKE_BALL1 const SILVERCAVEROOM1_POKE_BALL2 const SILVERCAVEROOM1_POKE_BALL3 - const SILVERCAVEROOM1_POKE_BALL4 SilverCaveRoom1_MapScripts: db 0 ; scene scripts diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index a9df9969..db93c32a 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -1,8 +1,3 @@ - const_def 2 ; object constants - const SILVERCAVEROOM2_POKE_BALL1 - const SILVERCAVEROOM2_POKE_BALL2 - const SILVERCAVEROOM2_POKE_BALL3 - SilverCaveRoom2_MapScripts: db 0 ; scene scripts diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 3f071288..93bfd7bd 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SILVERCAVEROOM3_RED SilverCaveRoom3_MapScripts: @@ -10,17 +10,17 @@ Red: special FadeOutMusic faceplayer opentext - writetext .Text1 + writetext RedSeenText waitbutton closetext - winlosstext .Text2, .Text2 + winlosstext RedWinLossText, RedWinLossText loadtrainer RED, RED1 startbattle dontrestartmapmusic reloadmapafterbattle special FadeOutMusic opentext - writetext .Text3 + writetext RedLeavesText waitbutton closetext special FadeBlackQuickly @@ -34,16 +34,16 @@ Red: credits end -.Text1: +RedSeenText: text "…" line "…" done -.Text2: +RedWinLossText: text "…" done -.Text3: +RedLeavesText: text "…" line "…" done diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 59952c26..604d83ab 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SLOWPOKEWELLB1F_ROCKET1 const SLOWPOKEWELLB1F_ROCKET2 const SLOWPOKEWELLB1F_ROCKET3 diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index 25b022d8..9449b609 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SLOWPOKEWELLB2F_GYM_GUY const SLOWPOKEWELLB2F_POKE_BALL diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index 3c7f77ee..cef42433 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SOULHOUSE_MRFUJI const SOULHOUSE_TEACHER const SOULHOUSE_LASS diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 180ae90e..371ec53e 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SPROUTTOWER1F_SAGE1 const SPROUTTOWER1F_SAGE2 const SPROUTTOWER1F_GRANNY diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index 8dea4e7f..108fb136 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SPROUTTOWER2F_SAGE1 const SPROUTTOWER2F_SAGE2 const SPROUTTOWER2F_POKE_BALL diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 71322d1e..7f521c65 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SPROUTTOWER3F_SAGE1 const SPROUTTOWER3F_SAGE2 const SPROUTTOWER3F_SAGE3 @@ -34,7 +34,7 @@ SproutTower3FRivalScene: applymovement PLAYER, MovementData_0x184a1d applymovement SPROUTTOWER3F_SILVER, MovementData_0x184a22 opentext - writetext UnknownText_0x184a27 + writetext SproutTowerElderLecturesRivalText waitbutton closetext showemote EMOTE_SHOCK, SPROUTTOWER3F_SILVER, 15 @@ -151,7 +151,7 @@ MovementData_0x184a24: step DOWN step_end -UnknownText_0x184a27: +SproutTowerElderLecturesRivalText: text "ELDER: You are in-" line "deed skilled as a" cont "trainer." diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 40a45fb0..9163497f 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TEAMROCKETBASEB1F_ROCKET1 const TEAMROCKETBASEB1F_ROCKET2 const TEAMROCKETBASEB1F_SCIENTIST diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 9dbc2820..cdceacc3 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TEAMROCKETBASEB2F_ROCKET1 const TEAMROCKETBASEB2F_ROCKET_GIRL const TEAMROCKETBASEB2F_LANCE @@ -58,7 +58,7 @@ RocketBaseBossFScript: appear TEAMROCKETBASEB2F_ROCKET_GIRL appear TEAMROCKETBASEB2F_ROCKET1 opentext - writetext UnknownText_0x6d2ad + writetext RocketBaseExecutiveFHoldItText waitbutton closetext turnobject PLAYER, DOWN @@ -69,7 +69,7 @@ RocketBaseBossFScript: turnobject PLAYER, UP applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d22f opentext - writetext UnknownText_0x6d2c3 + writetext RocketBaseBossFThrashText waitbutton closetext cry DRAGONITE @@ -82,18 +82,18 @@ RocketBaseBossFScript: appear TEAMROCKETBASEB2F_LANCE applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d244 opentext - writetext UnknownText_0x6d38c + writetext RocketBaseLanceShareFunText waitbutton closetext turnobject PLAYER, RIGHT applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d241 opentext - writetext UnknownText_0x6d3bd + writetext RocketBaseBossDontMeddleText waitbutton closetext applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d24a applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d248 - winlosstext UnknownText_0x6d45c, 0 + winlosstext RocketBaseBossWinText, 0 setlasttalked TEAMROCKETBASEB2F_ROCKET_GIRL loadtrainer EXECUTIVEF, EXECUTIVEF_2 startbattle @@ -104,7 +104,7 @@ RocketBaseBossFScript: reloadmapafterbattle setevent EVENT_BEAT_ROCKET_EXECUTIVEF_2 opentext - writetext UnknownText_0x6d4c6 + writetext RocketBaseBossRetreatText waitbutton closetext special FadeBlackQuickly @@ -120,13 +120,13 @@ RocketBaseBossFScript: clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE turnobject TEAMROCKETBASEB2F_LANCE, DOWN opentext - writetext UnknownText_0x6d5d8 + writetext RocketBaseLancePostBattleText waitbutton closetext applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d250 turnobject PLAYER, UP opentext - writetext UnknownText_0x6d64e + writetext RocketBaseLancePowerOffText waitbutton closetext follow TEAMROCKETBASEB2F_LANCE, PLAYER @@ -134,7 +134,7 @@ RocketBaseBossFScript: stopfollow applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d258 opentext - writetext UnknownText_0x6d6cf + writetext RockerBaseLanceElectrodeFaintText waitbutton closetext applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d267 @@ -146,7 +146,7 @@ RocketBaseCantLeaveScript: RocketBaseLancesSideScript: opentext - writetext UnknownText_0x6d7ea + writetext RocketBaseLancesSideText waitbutton closetext applymovement PLAYER, MovementData_0x6d278 @@ -282,16 +282,16 @@ RocketBaseElectrodeScript: applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d27a turnobject PLAYER, RIGHT opentext - writetext UnknownText_0x6d809 + writetext RocketBaseLanceElectrodeDoneText promptbutton verbosegiveitem HM_WHIRLPOOL setevent EVENT_GOT_HM06_WHIRLPOOL - writetext UnknownText_0x6d8f8 + writetext RocketBaseLanceWhirlpoolText waitbutton closetext turnobject TEAMROCKETBASEB2F_LANCE, DOWN opentext - writetext UnknownText_0x6d994 + writetext RocketBaseLanceMonMasterText waitbutton closetext turnobject PLAYER, DOWN @@ -318,13 +318,13 @@ TeamRocketBaseB2FLockedDoor: opentext checkevent EVENT_LEARNED_HAIL_GIOVANNI iftrue .KnowsPassword - writetext UnknownText_0x6dd39 + writetext RocketBaseDoorNoPasswordText waitbutton closetext end .KnowsPassword: - writetext UnknownText_0x6dd6b + writetext RocketBaseDoorKnowPasswordText waitbutton playsound SFX_ENTER_DOOR changeblock 14, 12, $07 ; floor @@ -338,13 +338,13 @@ TeamRocketBaseB2FTransmitterScript: opentext checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue .Deactivated - writetext UnknownText_0x6dda7 + writetext RocketBaseB2FTransmitterText waitbutton closetext end .Deactivated: - writetext UnknownText_0x6de03 + writetext RocketBaseB2FDeactivateTransmitterText waitbutton closetext end @@ -556,12 +556,12 @@ MovementData_0x6d2a4: step RIGHT step_end -UnknownText_0x6d2ad: +RocketBaseExecutiveFHoldItText: text "Hold it right" line "there!" done -UnknownText_0x6d2c3: +RocketBaseBossFThrashText: text "We can't have a" line "brat like you on" cont "the loose." @@ -581,13 +581,13 @@ UnknownText_0x6d2c3: cont "thrashed." done -UnknownText_0x6d38c: +RocketBaseLanceShareFunText: text "Hey! Don't be so" line "selfish. Spread" cont "the fun around." done -UnknownText_0x6d3bd: +RocketBaseBossDontMeddleText: text "What? You had an" line "accomplice?" @@ -604,7 +604,7 @@ UnknownText_0x6d3bd: line "with TEAM ROCKET!" done -UnknownText_0x6d45c: +RocketBaseBossWinText: text "Tch, you really" line "are strong." @@ -617,7 +617,7 @@ UnknownText_0x6d45c: line "an EXECUTIVE." done -UnknownText_0x6d4c6: +RocketBaseBossRetreatText: text "…This hideout is" line "done for…" @@ -645,7 +645,7 @@ UnknownText_0x6d4c6: para "Fufufufu…" done -UnknownText_0x6d5d8: +RocketBaseLancePostBattleText: text "LANCE: That did" line "it. We defeated" @@ -659,7 +659,7 @@ UnknownText_0x6d5d8: line "the process…" done -UnknownText_0x6d64e: +RocketBaseLancePowerOffText: text "Sorry, <PLAYER>." line "I saw how well you" @@ -673,7 +673,7 @@ UnknownText_0x6d64e: line "radio signal." done -UnknownText_0x6d6cf: +RockerBaseLanceElectrodeFaintText: text "It's this machine" line "that's causing all" cont "the problems." @@ -703,12 +703,12 @@ UnknownText_0x6d6cf: line "split the job." done -UnknownText_0x6d7ea: +RocketBaseLancesSideText: text "LANCE: Leave this" line "side to me." done -UnknownText_0x6d809: +RocketBaseLanceElectrodeDoneText: text "LANCE: That odd" line "signal has finally" cont "stopped." @@ -730,12 +730,13 @@ UnknownText_0x6d809: cont "any need for it." done +; unused UnknownText_0x6d8e6: text "<PLAYER> received" line "HM06." done -UnknownText_0x6d8f8: +RocketBaseLanceWhirlpoolText: text "That's WHIRLPOOL." line "Teach it to a" @@ -752,7 +753,7 @@ UnknownText_0x6d8f8: line "from MAHOGANY GYM." done -UnknownText_0x6d994: +RocketBaseLanceMonMasterText: text "<PLAYER>…" para "The journey to be-" @@ -870,14 +871,14 @@ GruntM19AfterBattleText: cont "for yourself." done -UnknownText_0x6dd39: +RocketBaseDoorNoPasswordText: text "The door's closed…" para "It needs a pass-" line "word to open." done -UnknownText_0x6dd6b: +RocketBaseDoorKnowPasswordText: text "The door's closed…" para "<PLAYER> entered" @@ -886,7 +887,7 @@ UnknownText_0x6dd6b: para "The door opened!" done -UnknownText_0x6dda7: +RocketBaseB2FTransmitterText: text "It's the radio" line "transmitter that's" @@ -897,7 +898,7 @@ UnknownText_0x6dda7: line "full capacity." done -UnknownText_0x6de03: +RocketBaseB2FDeactivateTransmitterText: text "The radio trans-" line "mitter has finally" diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index d5493f85..abe4cac5 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TEAMROCKETBASEB3F_LANCE const TEAMROCKETBASEB3F_ROCKET1 const TEAMROCKETBASEB3F_MOLTRES @@ -12,7 +12,6 @@ const TEAMROCKETBASEB3F_POKE_BALL2 const TEAMROCKETBASEB3F_POKE_BALL3 const TEAMROCKETBASEB3F_POKE_BALL4 - const TEAMROCKETBASEB3F_POKE_BALL5 TeamRocketBaseB3F_MapScripts: db 4 ; scene scripts diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index b0fd42df..7edc4499 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TIMECAPSULE_CHRIS1 const TIMECAPSULE_CHRIS2 diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index 57a165ab..b0b1b76a 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -1,3 +1,6 @@ + object_const_def ; object_event constants + const TINTOWER1F_SAGE + TinTower1F_MapScripts: db 0 ; scene scripts diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index c089d812..59ee1d49 100644 --- a/maps/TinTower3F.asm +++ b/maps/TinTower3F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TINTOWER3F_POKE_BALL TinTower3F_MapScripts: diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index fbf08dc8..d03d630d 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TINTOWER4F_POKE_BALL1 const TINTOWER4F_POKE_BALL2 const TINTOWER4F_POKE_BALL3 @@ -11,7 +11,7 @@ TinTower4F_MapScripts: TinTower4FUltraBall: itemball ULTRA_BALL -TinTower4FPPUp: +TinTower4FSuperPotion: itemball SUPER_POTION TinTower4FEscapeRope: @@ -36,5 +36,5 @@ TinTower4F_MapEvents: db 3 ; object events object_event 14, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FUltraBall, EVENT_TIN_TOWER_4F_ULTRA_BALL - object_event 17, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FPPUp, EVENT_TIN_TOWER_4F_PP_UP + object_event 17, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FSuperPotion, EVENT_TIN_TOWER_4F_SUPER_POTION object_event 2, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index cff375b3..4cab0c3b 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TINTOWER5F_POKE_BALL TinTower5F_MapScripts: diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index 5025fbbe..04ea5c50 100644 --- a/maps/TinTower7F.asm +++ b/maps/TinTower7F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TINTOWER7F_POKE_BALL TinTower7F_MapScripts: diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index c39f118e..5cb76ca3 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TINTOWER8F_POKE_BALL1 const TINTOWER8F_POKE_BALL2 const TINTOWER8F_POKE_BALL3 diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index 2bfbaf9a..08108cc8 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TINTOWERROOF_HO_OH TinTowerRoof_MapScripts: diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index 4a57e3d2..7a743151 100644 --- a/maps/TohjoFalls.asm +++ b/maps/TohjoFalls.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TOHJOFALLS_POKE_BALL TohjoFalls_MapScripts: diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 6dc1983f..b7b70897 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TRADECENTER_CHRIS1 const TRADECENTER_CHRIS2 diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index ca682723..d38b4511 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TRAINERHOUSE1F_RECEPTIONIST const TRAINERHOUSE1F_COOLTRAINER_M const TRAINERHOUSE1F_COOLTRAINER_F diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index 072e51cb..8ea9adf6 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TRAINERHOUSEB1F_RECEPTIONIST const TRAINERHOUSEB1F_CHRIS diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index e5a5d8bb..ac960fea 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const UNIONCAVE1F_POKEFAN_M1 const UNIONCAVE1F_SUPER_NERD const UNIONCAVE1F_POKEFAN_M2 @@ -72,10 +72,10 @@ TrainerFirebreatherRay: UnionCave1FGreatBall: itemball GREAT_BALL -UnionCave1FXAttack: +UnionCave1FPotion: itemball POTION -UnionCave1FPotion: +UnionCave1FXAttack: itemball X_ATTACK UnionCave1FAwakening: @@ -218,6 +218,6 @@ UnionCave1F_MapEvents: object_event 16, 31, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerFirebreatherRay, -1 object_event 15, 15, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherBill, -1 object_event 17, 21, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FGreatBall, EVENT_UNION_CAVE_1F_GREAT_BALL - object_event 4, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FXAttack, EVENT_UNION_CAVE_1F_X_ATTACK - object_event 4, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FPotion, EVENT_UNION_CAVE_1F_POTION + object_event 4, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FPotion, EVENT_UNION_CAVE_1F_POTION + object_event 4, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FXAttack, EVENT_UNION_CAVE_1F_X_ATTACK object_event 12, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FAwakening, EVENT_UNION_CAVE_1F_AWAKENING diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index f13b821a..bb5d2929 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const UNIONCAVEB1F_POKEFAN_M1 const UNIONCAVEB1F_POKEFAN_M2 const UNIONCAVEB1F_SUPER_NERD1 @@ -165,8 +165,8 @@ UnionCaveB1F_MapEvents: db 0 ; bg events db 7 ; object events - object_event 10, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerPhillip, -1 - object_event 17, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerLeonard, -1 + object_event 10, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerPhillip, -1 + object_event 17, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerLeonard, -1 object_event 5, 32, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacAndrew, -1 object_event 17, 30, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacCalvin, -1 object_event 2, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB1FTMSwift, EVENT_UNION_CAVE_B1F_TM_SWIFT diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index a33c5416..71973831 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const UNIONCAVEB2F_ROCKER const UNIONCAVEB2F_COOLTRAINER_F1 const UNIONCAVEB2F_COOLTRAINER_F2 diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 52aedf1f..101f73b3 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VERMILIONCITY_TEACHER const VERMILIONCITY_GRAMPS const VERMILIONCITY_MACHOP @@ -42,13 +42,13 @@ VermilionSnorlax: opentext special SnorlaxAwake iftrue .Awake - writetext UnknownText_0x1aab64 + writetext VermilionCitySnorlaxSleepingText waitbutton closetext end .Awake: - writetext UnknownText_0x1aab84 + writetext VermilionCityRadioNearSnorlaxText pause 15 cry SNORLAX closetext @@ -69,31 +69,31 @@ VermilionGymBadgeGuy: ifequal NUM_BADGES, .AllBadges ifgreater 13, .MostBadges ifgreater 9, .SomeBadges - writetext UnknownText_0x1aabc8 + writetext VermilionCityBadgeGuyTrainerText waitbutton closetext end .SomeBadges: - writetext UnknownText_0x1aac2b + writetext VermilionCityBadgeGuySomeBadgesText waitbutton closetext end .MostBadges: - writetext UnknownText_0x1aac88 + writetext VermilionCityBadgeGuyMostBadgesText waitbutton closetext end .AllBadges: - writetext UnknownText_0x1aacf3 + writetext VermilionCityBadgeGuyAllBadgesText promptbutton verbosegiveitem HP_UP iffalse .Done setevent EVENT_GOT_HP_UP_FROM_VERMILION_GUY .AlreadyGotItem: - writetext UnknownText_0x1aad4a + writetext VermilionCityBadgeGuyBattleEdgeText waitbutton .Done: closetext @@ -163,12 +163,12 @@ VermilionCitySuperNerdText: cont "#MON GYM." done -UnknownText_0x1aab64: +VermilionCitySnorlaxSleepingText: text "SNORLAX is snoring" line "peacefully…" done -UnknownText_0x1aab84: +VermilionCityRadioNearSnorlaxText: text "The #GEAR was" line "placed near the" cont "sleeping SNORLAX…" @@ -178,7 +178,7 @@ UnknownText_0x1aab84: para "SNORLAX woke up!" done -UnknownText_0x1aabc8: +VermilionCityBadgeGuyTrainerText: text "Skilled trainers" line "gather in KANTO." @@ -189,7 +189,7 @@ UnknownText_0x1aabc8: line "to defeat." done -UnknownText_0x1aac2b: +VermilionCityBadgeGuySomeBadgesText: text "You've started to" line "collect KANTO GYM" cont "BADGES?" @@ -199,7 +199,7 @@ UnknownText_0x1aac2b: cont "here are tough?" done -UnknownText_0x1aac88: +VermilionCityBadgeGuyMostBadgesText: text "I guess you'll be" line "finished with your" @@ -211,7 +211,7 @@ UnknownText_0x1aac88: cont "BADGES." done -UnknownText_0x1aacf3: +VermilionCityBadgeGuyAllBadgesText: text "Congratulations!" para "You got all the" @@ -221,7 +221,7 @@ UnknownText_0x1aacf3: line "for your efforts." done -UnknownText_0x1aad4a: +VermilionCityBadgeGuyBattleEdgeText: text "Having a variety" line "of #MON types" diff --git a/maps/VermilionDiglettsCaveSpeechHouse.asm b/maps/VermilionDiglettsCaveSpeechHouse.asm index e6225afa..1113ef8b 100644 --- a/maps/VermilionDiglettsCaveSpeechHouse.asm +++ b/maps/VermilionDiglettsCaveSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VERMILIONDIGLETTSCAVESPEECHHOUSE_GENTLEMAN VermilionDiglettsCaveSpeechHouse_MapScripts: diff --git a/maps/VermilionFishingSpeechHouse.asm b/maps/VermilionFishingSpeechHouse.asm index d69319d6..1e20f926 100644 --- a/maps/VermilionFishingSpeechHouse.asm +++ b/maps/VermilionFishingSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VERMILIONFISHINGSPEECHHOUSE_FISHING_GURU VermilionFishingSpeechHouse_MapScripts: diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 7a5830dd..0b01fd22 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VERMILIONGYM_SURGE const VERMILIONGYM_GENTLEMAN const VERMILIONGYM_ROCKER diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index db7f34db..0b87e3cd 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VERMILIONMAGNETTRAINSPEECHHOUSE_POKEFAN_F const VERMILIONMAGNETTRAINSPEECHHOUSE_YOUNGSTER diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index a258df7b..cd5401c1 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VERMILIONMART_CLERK const VERMILIONMART_SUPER_NERD const VERMILIONMART_BUENA diff --git a/maps/VermilionPokecenter1F.asm b/maps/VermilionPokecenter1F.asm index c5ab46c3..ffb09d70 100644 --- a/maps/VermilionPokecenter1F.asm +++ b/maps/VermilionPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VERMILIONPOKECENTER1F_NURSE const VERMILIONPOKECENTER1F_FISHING_GURU const VERMILIONPOKECENTER1F_SAILOR diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 5da38619..409c3d73 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VERMILIONPORT_SAILOR1 const VERMILIONPORT_SAILOR2 const VERMILIONPORT_SUPER_NERD @@ -40,7 +40,7 @@ VermilionPortSailorAtGangwayScript: opentext checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue VermilionPortAlreadyRodeScript - writetext UnknownText_0x74f06 + writetext VermilionPortDepartingText waitbutton closetext turnobject VERMILIONPORT_SAILOR1, DOWN @@ -71,7 +71,7 @@ VermilionPortSailorAtGangwayScript: end VermilionPortAlreadyRodeScript: - writetext UnknownText_0x74f31 + writetext VermilionPortCantBoardText waitbutton closetext end @@ -90,10 +90,10 @@ VermilionPortWalkUpToShipScript: ifequal THURSDAY, .NextShipSunday ifequal FRIDAY, .NextShipSunday ifequal SATURDAY, .NextShipSunday - writetext UnknownText_0x74f4d + writetext VermilionPortAskBoardingText yesorno iffalse VermilionPortNotRidingMoveAwayScript - writetext UnknownText_0x74f8b + writetext VermilionPortAskTicketText promptbutton checkitem S_S_TICKET iffalse .NoTicket @@ -105,21 +105,21 @@ VermilionPortWalkUpToShipScript: sjump VermilionPortSailorAtGangwayScript .NoTicket: - writetext UnknownText_0x74ff2 + writetext VermilionPortNoTicketText waitbutton closetext applymovement PLAYER, MovementData_0x74ef5 end .NextShipWednesday: - writetext UnknownText_0x75059 + writetext VermilionPortSailMondayText waitbutton closetext applymovement PLAYER, MovementData_0x74ef5 end .NextShipSunday: - writetext UnknownText_0x75080 + writetext VermilionPortSailSundayText waitbutton closetext applymovement PLAYER, MovementData_0x74ef5 @@ -129,13 +129,13 @@ VermilionPortWalkUpToShipScript: end VermilionPortNotRidingScript: - writetext UnknownText_0x74fa7 + writetext VermilionPortComeAgainText waitbutton closetext end VermilionPortNotRidingMoveAwayScript: - writetext UnknownText_0x74fa7 + writetext VermilionPortComeAgainText waitbutton closetext applymovement PLAYER, MovementData_0x74ef5 @@ -152,10 +152,10 @@ VermilionPortSailorScript: ifequal THURSDAY, .NextShipSunday ifequal FRIDAY, .NextShipSunday ifequal SATURDAY, .NextShipSunday - writetext UnknownText_0x74f4d + writetext VermilionPortAskBoardingText yesorno iffalse VermilionPortNotRidingScript - writetext UnknownText_0x74f8b + writetext VermilionPortAskTicketText promptbutton checkitem S_S_TICKET iffalse .NoTicket @@ -167,19 +167,19 @@ VermilionPortSailorScript: sjump VermilionPortSailorAtGangwayScript .NoTicket: - writetext UnknownText_0x74ff2 + writetext VermilionPortNoTicketText waitbutton closetext end .NextShipWednesday: - writetext UnknownText_0x75059 + writetext VermilionPortSailMondayText waitbutton closetext end .NextShipSunday: - writetext UnknownText_0x75080 + writetext VermilionPortSailSundayText waitbutton closetext end @@ -187,7 +187,7 @@ VermilionPortSailorScript: VermilionPortSuperNerdScript: faceplayer opentext - writetext UnknownText_0x750a6 + writetext VermilionPortSuperNerdText waitbutton closetext end @@ -226,18 +226,18 @@ MovementData_0x74efe: step DOWN step_end -UnknownText_0x74f06: +VermilionPortDepartingText: text "We're departing" line "soon. Please get" cont "on board." done -UnknownText_0x74f31: +VermilionPortCantBoardText: text "Sorry. You can't" line "board now." done -UnknownText_0x74f4d: +VermilionPortAskBoardingText: text "Welcome to FAST" line "SHIP S.S.AQUA." @@ -245,12 +245,12 @@ UnknownText_0x74f4d: line "ing today?" done -UnknownText_0x74f8b: +VermilionPortAskTicketText: text "May I see your" line "S.S.TICKET, sir?" done -UnknownText_0x74fa7: +VermilionPortComeAgainText: text "We hope to see you" line "again!" done @@ -263,7 +263,7 @@ VermilionPortSSTicketText: line "Thank you, sir!" done -UnknownText_0x74ff2: +VermilionPortNoTicketText: text "<PLAYER> tried to" line "show the S.S." cont "TICKET…" @@ -277,17 +277,17 @@ UnknownText_0x74ff2: line "S.S.TICKET." done -UnknownText_0x75059: +VermilionPortSailMondayText: text "The FAST SHIP will" line "sail on Wednesday." done -UnknownText_0x75080: +VermilionPortSailSundayText: text "The FAST SHIP will" line "sail next Sunday." done -UnknownText_0x750a6: +VermilionPortSuperNerdText: text "You came from" line "JOHTO?" diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index 1ea12457..09894fdd 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VERMILIONPORTPASSAGE_TEACHER VermilionPortPassage_MapScripts: diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index ac300930..589736c4 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VICTORYROAD_SILVER const VICTORYROAD_POKE_BALL1 const VICTORYROAD_POKE_BALL2 @@ -106,7 +106,7 @@ VictoryRoadFullRestore: VictoryRoadFullHeal: itemball FULL_HEAL -VictoryRoadHPUp: +VictoryRoadXSpecial: itemball X_SPECIAL VictoryRoadHiddenMaxPotion: @@ -265,4 +265,4 @@ VictoryRoad_MapEvents: object_event 12, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadMaxRevive, EVENT_VICTORY_ROAD_MAX_REVIVE object_event 18, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullRestore, EVENT_VICTORY_ROAD_FULL_RESTORE object_event 15, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullHeal, EVENT_VICTORY_ROAD_FULL_HEAL - object_event 7, 38, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadHPUp, EVENT_VICTORY_ROAD_HP_UP + object_event 7, 38, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadXSpecial, EVENT_UNION_CAVE_X_SPECIAL diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 940280ff..2938cfe0 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VICTORYROADGATE_OFFICER const VICTORYROADGATE_BLACK_BELT1 const VICTORYROADGATE_BLACK_BELT2 diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index cce516cd..2a880da6 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VIOLETCITY_EARL const VIOLETCITY_LASS const VIOLETCITY_SUPER_NERD diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 49b41789..6d2f4f8a 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VIOLETGYM_FALKNER const VIOLETGYM_YOUNGSTER1 const VIOLETGYM_YOUNGSTER2 diff --git a/maps/VioletKylesHouse.asm b/maps/VioletKylesHouse.asm index eb906270..95dc95e8 100644 --- a/maps/VioletKylesHouse.asm +++ b/maps/VioletKylesHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VIOLETKYLESHOUSE_POKEFAN_M const VIOLETKYLESHOUSE_KYLE diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index d3e4ce73..ff389875 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VIOLETMART_CLERK const VIOLETMART_GRANNY const VIOLETMART_COOLTRAINER_M diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index ec274786..b193bf01 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VIOLETNICKNAMESPEECHHOUSE_TEACHER const VIOLETNICKNAMESPEECHHOUSE_LASS const VIOLETNICKNAMESPEECHHOUSE_BIRD diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index a8e5723e..6c525598 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -1,9 +1,9 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VIOLETPOKECENTER1F_NURSE - const VIOLETPOKECENTER1F_GAMEBOY_KID + const VIOLETPOKECENTER1F_SUPER_NERD const VIOLETPOKECENTER1F_GENTLEMAN const VIOLETPOKECENTER1F_YOUNGSTER - const VIOLETPOKECENTER1F_SCIENTIST + const VIOLETPOKECENTER1F_ELMS_AIDE VioletPokecenter1F_MapScripts: db 0 ; scene scripts @@ -18,7 +18,7 @@ VioletPokecenter1F_ElmsAideScript: opentext checkevent EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE iftrue .SecondTimeAsking - writetext UnknownText_0x69555 + writetext VioletPokecenterElmsAideFavorText .AskTakeEgg: yesorno iffalse .RefusedEgg @@ -31,24 +31,24 @@ VioletPokecenter1F_ElmsAideScript: clearevent EVENT_ELMS_AIDE_IN_LAB clearevent EVENT_TOGEPI_HATCHED setmapscene ROUTE_32, SCENE_ROUTE32_OFFER_SLOWPOKETAIL - writetext UnknownText_0x695c5 + writetext VioletPokecenterElmsAideGiveEggText waitbutton closetext readvar VAR_FACING ifequal UP, .AideWalksAroundPlayer turnobject PLAYER, DOWN - applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideWalksStraightOutOfPokecenter + applymovement VIOLETPOKECENTER1F_ELMS_AIDE, MovementData_AideWalksStraightOutOfPokecenter playsound SFX_EXIT_BUILDING - disappear VIOLETPOKECENTER1F_SCIENTIST + disappear VIOLETPOKECENTER1F_ELMS_AIDE waitsfx end .AideWalksAroundPlayer: - applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideWalksLeftToExitPokecenter + applymovement VIOLETPOKECENTER1F_ELMS_AIDE, MovementData_AideWalksLeftToExitPokecenter turnobject PLAYER, DOWN - applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideFinishesLeavingPokecenter + applymovement VIOLETPOKECENTER1F_ELMS_AIDE, MovementData_AideFinishesLeavingPokecenter playsound SFX_EXIT_BUILDING - disappear VIOLETPOKECENTER1F_SCIENTIST + disappear VIOLETPOKECENTER1F_ELMS_AIDE waitsfx end @@ -60,24 +60,24 @@ VioletPokecenter1F_ElmsAideScript: end .PartyFull: - writetext UnknownText_0x69693 + writetext VioletCityElmsAideFullPartyText waitbutton closetext end .RefusedEgg: - writetext UnknownText_0x696f2 + writetext VioletPokecenterElmsAideRefuseText waitbutton closetext setevent EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE end .SecondTimeAsking: - writetext UnknownText_0x69712 + writetext VioletPokecenterElmsAideAskEggText sjump .AskTakeEgg -VioletPokecenter1FGameboyKidScript: - jumptextfaceplayer VioletPokecenter1FGameboyKidText +VioletPokecenter1FSuperNerdScript: + jumptextfaceplayer VioletPokecenter1FSuperNerdText VioletPokecenter1FGentlemanScript: jumptextfaceplayer VioletPokecenter1FGentlemanText @@ -103,7 +103,7 @@ MovementData_AideFinishesLeavingPokecenter: step DOWN step_end -UnknownText_0x69555: +VioletPokecenterElmsAideFavorText: text "<PLAYER>, long" line "time, no see." @@ -117,7 +117,7 @@ UnknownText_0x69555: line "#MON EGG?" done -UnknownText_0x695c5: +VioletPokecenterElmsAideGiveEggText: text "We discovered that" line "a #MON will not" @@ -137,7 +137,7 @@ UnknownText_0x695c5: cont "hatches!" done -UnknownText_0x69693: +VioletCityElmsAideFullPartyText: text "Oh, no. You can't" line "carry any more" cont "#MON with you." @@ -147,17 +147,17 @@ UnknownText_0x69693: cont "room for the EGG." done -UnknownText_0x696f2: +VioletPokecenterElmsAideRefuseText: text "B-but… PROF.ELM" line "asked for you…" done -UnknownText_0x69712: +VioletPokecenterElmsAideAskEggText: text "<PLAYER>, will you" line "take the EGG?" done -VioletPokecenter1FGameboyKidText: +VioletPokecenter1FSuperNerdText: text "A guy named BILL" line "made the #MON" cont "PC storage system." @@ -204,7 +204,7 @@ VioletPokecenter1F_MapEvents: db 5 ; object events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenterNurse, -1 - object_event 7, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGameboyKidScript, -1 + object_event 7, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FSuperNerdScript, -1 object_event 1, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGentlemanScript, -1 object_event 8, 1, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FYoungsterScript, -1 object_event 4, 3, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1F_ElmsAideScript, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index f7586655..7315ed96 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VIRIDIANCITY_GRAMPS1 const VIRIDIANCITY_GRAMPS2 const VIRIDIANCITY_FISHER diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index 90e5a40b..5d3175ec 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VIRIDIANGYM_BLUE const VIRIDIANGYM_GYM_GUY diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index 6045fab2..82bbf896 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VIRIDIANMART_CLERK const VIRIDIANMART_LASS const VIRIDIANMART_COOLTRAINER_M diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index 8fd12eb2..58472619 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VIRIDIANNICKNAMESPEECHHOUSE_POKEFAN_M const VIRIDIANNICKNAMESPEECHHOUSE_LASS const VIRIDIANNICKNAMESPEECHHOUSE_SPEARY diff --git a/maps/ViridianPokecenter1F.asm b/maps/ViridianPokecenter1F.asm index 431bda18..0b9349f5 100644 --- a/maps/ViridianPokecenter1F.asm +++ b/maps/ViridianPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VIRIDIANPOKECENTER1F_NURSE const VIRIDIANPOKECENTER1F_COOLTRAINER_M const VIRIDIANPOKECENTER1F_COOLTRAINER_F diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index a38e53a1..b456dd86 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const WHIRLISLANDB1F_POKE_BALL1 const WHIRLISLANDB1F_POKE_BALL2 const WHIRLISLANDB1F_POKE_BALL3 diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index acee9670..87c3ca91 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const WHIRLISLANDB2F_POKE_BALL1 const WHIRLISLANDB2F_POKE_BALL2 const WHIRLISLANDB2F_POKE_BALL3 diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index a97fb888..c3446319 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const WHIRLISLANDLUGIACHAMBER_LUGIA WhirlIslandLugiaChamber_MapScripts: @@ -32,7 +32,6 @@ Lugia: setevent EVENT_FOUGHT_LUGIA checkver iftrue .Silver - loadvar VAR_BATTLETYPE, BATTLETYPE_FORCEITEM loadwildmon LUGIA, 70 startbattle diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index c13cd7a9..212a35c3 100644 --- a/maps/WhirlIslandNE.asm +++ b/maps/WhirlIslandNE.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const WHIRLISLANDNE_POKE_BALL WhirlIslandNE_MapScripts: diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index 9cedc665..a3592bdb 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const WHIRLISLANDSW_POKE_BALL WhirlIslandSW_MapScripts: diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index f9024983..42451e12 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const WILLSROOM_WILL WillsRoom_MapScripts: diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index c8577ac2..53f2ec88 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -1,5 +1,3 @@ - const_def 2 ; object constants - WiseTriosRoom_MapScripts: db 0 ; scene scripts |
