From e12a7790cf294db7fd656eba85ec4bbfb3bc211e Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 22 Feb 2019 04:01:38 -0500 Subject: [PATCH 01/25] Start porting pokeruby vars to pokeemerald --- data/event_scripts.s | 30 ++++----- data/maps/DewfordTown/scripts.inc | 6 +- data/maps/DewfordTown_Gym/scripts.inc | 4 +- .../EverGrandeCity_DrakesRoom/scripts.inc | 6 +- .../EverGrandeCity_GlaciasRoom/scripts.inc | 6 +- .../EverGrandeCity_PhoebesRoom/scripts.inc | 6 +- .../EverGrandeCity_SidneysRoom/scripts.inc | 6 +- data/maps/FallarborTown/scripts.inc | 2 +- data/maps/InsideOfTruck/map.json | 6 +- data/maps/InsideOfTruck/scripts.inc | 8 +-- data/maps/LavaridgeTown/scripts.inc | 8 +-- data/maps/LavaridgeTown_Gym_1F/scripts.inc | 6 +- data/maps/LilycoveCity/scripts.inc | 2 +- .../LilycoveCity_ContestLobby/scripts.inc | 32 +++++----- .../scripts.inc | 4 +- data/maps/LinkContestRoom1/scripts.inc | 8 +-- data/maps/LittlerootTown/scripts.inc | 18 +++--- .../LittlerootTown_BrendansHouse_1F/map.json | 8 +-- .../scripts.inc | 22 +++---- .../scripts.inc | 14 ++-- .../maps/LittlerootTown_MaysHouse_1F/map.json | 8 +-- .../LittlerootTown_MaysHouse_1F/scripts.inc | 24 +++---- .../LittlerootTown_MaysHouse_2F/scripts.inc | 14 ++-- .../scripts.inc | 18 +++--- data/maps/MagmaHideout_4F/scripts.inc | 2 +- data/maps/MauvilleCity/scripts.inc | 2 +- data/maps/MauvilleCity_Gym/scripts.inc | 22 +++---- .../MossdeepCity_GameCorner_1F/scripts.inc | 4 +- data/maps/OldaleTown/map.json | 2 +- data/maps/OldaleTown/scripts.inc | 2 +- data/maps/PetalburgCity/map.json | 8 +-- data/maps/PetalburgCity/scripts.inc | 18 +++--- data/maps/PetalburgCity_Gym/scripts.inc | 32 +++++----- .../PetalburgCity_WallysHouse/scripts.inc | 6 +- data/maps/PetalburgWoods/map.json | 4 +- data/maps/PetalburgWoods/scripts.inc | 2 +- data/maps/Route101/map.json | 18 +++--- data/maps/Route101/scripts.inc | 10 +-- data/maps/Route103/scripts.inc | 2 +- data/maps/Route104/scripts.inc | 10 +-- data/maps/Route104_MrBrineysHouse/scripts.inc | 6 +- data/maps/Route109/scripts.inc | 2 +- data/maps/Route110/map.json | 6 +- data/maps/Route110/scripts.inc | 2 +- data/maps/Route116/map.json | 2 +- data/maps/Route116/scripts.inc | 4 +- data/maps/Route118/map.json | 6 +- data/maps/Route118/scripts.inc | 2 +- data/maps/Route119/map.json | 4 +- data/maps/Route119/scripts.inc | 2 +- data/maps/Route121/map.json | 8 +-- data/maps/Route121/scripts.inc | 2 +- data/maps/Route128/scripts.inc | 4 +- data/maps/RustboroCity/map.json | 42 ++++++------ data/maps/RustboroCity/scripts.inc | 20 +++--- .../RustboroCity_DevonCorp_2F/scripts.inc | 2 +- .../RustboroCity_DevonCorp_3F/scripts.inc | 12 ++-- data/maps/RustboroCity_Gym/scripts.inc | 6 +- data/maps/RusturfTunnel/scripts.inc | 4 +- data/maps/SeafloorCavern_Room9/scripts.inc | 2 +- data/maps/SlateportCity/scripts.inc | 20 +++--- data/maps/VerdanturfTown/scripts.inc | 2 +- data/scripts/cable_club.inc | 64 +++++++++---------- data/scripts/contest_hall.inc | 52 +++++++-------- data/scripts/players_house.inc | 18 +++--- include/constants/vars.h | 64 +++++++++---------- src/contest_link_80F57C4.c | 6 +- src/rom_8011DC0.c | 4 +- 68 files changed, 389 insertions(+), 389 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index 1b8807ed76..b3ad9f771f 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1148,8 +1148,8 @@ EverGrandeCity_HallOfFame_EventScript_27183F:: @ 827183F return EverGrandeCity_HallOfFame_EventScript_271843:: @ 8271843 - setvar VAR_0x4082, 3 - setvar VAR_0x408C, 3 + setvar VAR_LITTLEROOT_HOUSES_STATE, 3 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 3 clearflag FLAG_HIDE_PLAYERS_HOUSE_DAD return @@ -1163,11 +1163,11 @@ EventScript_WhiteOut:: @ 8271857 end EventScript_271862:: @ 8271862 - compare VAR_0x4096, 1 + compare VAR_BRINEY_LOCATION, 1 goto_if_eq EverGrandeCity_HallOfFame_EventScript_271884 - compare VAR_0x4096, 2 + compare VAR_BRINEY_LOCATION, 2 goto_if_eq EverGrandeCity_HallOfFame_EventScript_27189A - compare VAR_0x4096, 3 + compare VAR_BRINEY_LOCATION, 3 goto_if_eq EverGrandeCity_HallOfFame_EventScript_2718B3 end @@ -1208,7 +1208,7 @@ EverGrandeCity_HallOfFame_EventScript_2718CC:: @ 82718CC clearflag FLAG_DEFEATED_ELITE_4_PHOEBE clearflag FLAG_DEFEATED_ELITE_4_GLACIA clearflag FLAG_DEFEATED_ELITE_4_DRAKE - setvar VAR_0x409C, 0 + setvar VAR_ELITE_4_STATE, 0 return DewfordTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE @@ -1228,15 +1228,15 @@ VerdanturfTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE return OldaleTown_PokemonCenter_1F_EventScript_27190C:: @ 827190C - setvar VAR_0x4096, 1 + setvar VAR_BRINEY_LOCATION, 1 return OldaleTown_PokemonCenter_1F_EventScript_271912:: @ 8271912 - setvar VAR_0x4096, 2 + setvar VAR_BRINEY_LOCATION, 2 return OldaleTown_PokemonCenter_1F_EventScript_271918:: @ 8271918 - setvar VAR_0x4096, 3 + setvar VAR_BRINEY_LOCATION, 3 return BattleFrontier_PokemonCenter_1F_EventScript_27191E:: @ 827191E @@ -1756,8 +1756,8 @@ DewfordTown_Hall_EventScript_271E8B:: @ 8271E8B DewfordTown_EventScript_271E95:: @ 8271E95 Route104_MrBrineysHouse_EventScript_271E95:: @ 8271E95 Route109_EventScript_271E95:: @ 8271E95 - copyvar VAR_0x8008, VAR_0x4096 - setvar VAR_0x4096, 0 + copyvar VAR_0x8008, VAR_BRINEY_LOCATION + setvar VAR_BRINEY_LOCATION, 0 return EventScript_UseSurf:: @ 8271EA0 @@ -2085,7 +2085,7 @@ Route109_EventScript_2720A8:: @ 82720A8 LittlerootTown_ProfessorBirchsLab_EventScript_2720AD:: @ 82720AD Route101_EventScript_2720AD:: @ 82720AD Route103_EventScript_2720AD:: @ 82720AD - compare VAR_0x4085, 0 + compare VAR_PETALBURG_GYM_STATE, 0 goto_if_eq Route101_EventScript_27374E goto_if_set FLAG_SYS_GAME_CLEAR, Route101_EventScript_27211A compare VAR_BIRCH_STATE, 0 @@ -2204,7 +2204,7 @@ PetalburgCity_Gym_EventScript_2721F8:: @ 82721F8 setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO - setvar VAR_0x4096, 0 + setvar VAR_BRINEY_LOCATION, 0 return RusturfTunnel_EventScript_272216:: @ 8272216 @@ -4467,13 +4467,13 @@ LilycoveCity_ContestLobby_EventScript_28CB21:: @ 828CB21 end LilycoveCity_ContestLobby_EventScript_28CB2B:: @ 828CB2B - compare VAR_0x4086, 2 + compare VAR_LINK_CONTEST_ROOM_STATE, 2 goto_if_ne LilycoveCity_ContestLobby_EventScript_28CB95 setvar VAR_0x8005, 6 special InterviewBefore compare VAR_RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB95 - switch VAR_0x4088 + switch VAR_CONTEST_LOCATION case 0, LilycoveCity_ContestLobby_EventScript_28CB95 case 2, LilycoveCity_ContestLobby_EventScript_28CB91 case 1, LilycoveCity_ContestLobby_EventScript_28CB91 diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 6c66f48609..92946cb67c 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -138,10 +138,10 @@ DewfordTown_EventScript_1E9660:: @ 81E9660 clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN hideobjectat 4, MAP_DEWFORD_TOWN - setvar VAR_0x408E, 2 + setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 2 resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 - copyvar VAR_0x4096, VAR_0x8008 + copyvar VAR_BRINEY_LOCATION, VAR_0x8008 waitstate release end @@ -177,7 +177,7 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7 call_if_unset FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_1E9790 call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_1E9799 closemessage - copyvar VAR_0x4096, VAR_0x8008 + copyvar VAR_BRINEY_LOCATION, VAR_0x8008 resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN resetobjectpriority 2, MAP_ROUTE109 moveobjectoffscreen 2 diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 90fd3d4ae4..4419dc28f5 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -173,8 +173,8 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 msgbox DewfordTown_Gym_Text_1FD0A8, MSGBOX_DEFAULT setflag FLAG_DEFEATED_DEWFORD_GYM setflag FLAG_BADGE02_GET - addvar VAR_0x4085, 1 - compare VAR_0x4085, 6 + addvar VAR_PETALBURG_GYM_STATE, 1 + compare VAR_PETALBURG_GYM_STATE, 6 call_if_eq DewfordTown_Gym_EventScript_271E84 setvar VAR_0x8008, 2 call DewfordTown_Gym_EventScript_271F43 diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index 2c09498428..d16560f048 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -13,19 +13,19 @@ EverGrandeCity_DrakesRoom_EventScript_2286B6:: @ 82286B6 end EverGrandeCity_DrakesRoom_MapScript2_2286BB: @ 82286BB - map_script_2 VAR_0x409C, 3, EverGrandeCity_DrakesRoom_EventScript_2286C5 + map_script_2 VAR_ELITE_4_STATE, 3, EverGrandeCity_DrakesRoom_EventScript_2286C5 .2byte 0 EverGrandeCity_DrakesRoom_EventScript_2286C5:: @ 82286C5 lockall call EverGrandeCity_DrakesRoom_EventScript_272475 - setvar VAR_0x409C, 4 + setvar VAR_ELITE_4_STATE, 4 releaseall end EverGrandeCity_DrakesRoom_MapScript1_2286D2: @ 82286D2 call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_2286E7 - compare VAR_0x409C, 4 + compare VAR_ELITE_4_STATE, 4 call_if_eq EverGrandeCity_DrakesRoom_EventScript_2286ED end diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index 7510f468fd..e60a364a80 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -13,19 +13,19 @@ EverGrandeCity_GlaciasRoom_EventScript_22842C:: @ 822842C end EverGrandeCity_GlaciasRoom_MapScript2_228431: @ 8228431 - map_script_2 VAR_0x409C, 2, EverGrandeCity_GlaciasRoom_EventScript_22843B + map_script_2 VAR_ELITE_4_STATE, 2, EverGrandeCity_GlaciasRoom_EventScript_22843B .2byte 0 EverGrandeCity_GlaciasRoom_EventScript_22843B:: @ 822843B lockall call EverGrandeCity_GlaciasRoom_EventScript_272475 - setvar VAR_0x409C, 3 + setvar VAR_ELITE_4_STATE, 3 releaseall end EverGrandeCity_GlaciasRoom_MapScript1_228448: @ 8228448 call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_22845D - compare VAR_0x409C, 3 + compare VAR_ELITE_4_STATE, 3 call_if_eq EverGrandeCity_GlaciasRoom_EventScript_228463 end diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index 77f951d76b..e369d2c3f7 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -13,19 +13,19 @@ EverGrandeCity_PhoebesRoom_EventScript_22818E:: @ 822818E end EverGrandeCity_PhoebesRoom_MapScript2_228193: @ 8228193 - map_script_2 VAR_0x409C, 1, EverGrandeCity_PhoebesRoom_EventScript_22819D + map_script_2 VAR_ELITE_4_STATE, 1, EverGrandeCity_PhoebesRoom_EventScript_22819D .2byte 0 EverGrandeCity_PhoebesRoom_EventScript_22819D:: @ 822819D lockall call EverGrandeCity_PhoebesRoom_EventScript_272475 - setvar VAR_0x409C, 2 + setvar VAR_ELITE_4_STATE, 2 releaseall end EverGrandeCity_PhoebesRoom_MapScript1_2281AA: @ 82281AA call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_2281BF - compare VAR_0x409C, 2 + compare VAR_ELITE_4_STATE, 2 call_if_eq EverGrandeCity_PhoebesRoom_EventScript_2281C5 end diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index 9152254b31..5be612a6fc 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -12,7 +12,7 @@ EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16 EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D call_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_227F32 - compare VAR_0x409C, 1 + compare VAR_ELITE_4_STATE, 1 call_if_eq EverGrandeCity_SidneysRoom_EventScript_227F38 end @@ -34,13 +34,13 @@ EverGrandeCity_SidneysRoom_EventScript_227F48:: @ 8227F48 end EverGrandeCity_SidneysRoom_MapScript2_227F4D: @ 8227F4D - map_script_2 VAR_0x409C, 0, EverGrandeCity_SidneysRoom_EventScript_227F57 + map_script_2 VAR_ELITE_4_STATE, 0, EverGrandeCity_SidneysRoom_EventScript_227F57 .2byte 0 EverGrandeCity_SidneysRoom_EventScript_227F57:: @ 8227F57 lockall call EverGrandeCity_SidneysRoom_EventScript_272475 - setvar VAR_0x409C, 1 + setvar VAR_ELITE_4_STATE, 1 releaseall end diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc index 5e06ed4cbe..dbb554814e 100644 --- a/data/maps/FallarborTown/scripts.inc +++ b/data/maps/FallarborTown/scripts.inc @@ -4,7 +4,7 @@ FallarborTown_MapScripts:: @ 81EB1FA FallarborTown_MapScript1_1EB200: @ 81EB200 setflag FLAG_VISITED_FALLARBOR_TOWN - setvar VAR_0x4086, 0 + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 clearflag FLAG_CONTEST_SKETCH_CREATED end diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json index d6bbd2f46e..eefeed3654 100644 --- a/data/maps/InsideOfTruck/map.json +++ b/data/maps/InsideOfTruck/map.json @@ -83,7 +83,7 @@ "x": 3, "y": 1, "elevation": 3, - "var": "VAR_0x4092", + "var": "VAR_LITTLEROOT_INTRO_STATE", "var_value": "0", "script": "InsideOfTruck_EventScript_23BF04" }, @@ -92,7 +92,7 @@ "x": 3, "y": 2, "elevation": 3, - "var": "VAR_0x4092", + "var": "VAR_LITTLEROOT_INTRO_STATE", "var_value": "0", "script": "InsideOfTruck_EventScript_23BF04" }, @@ -101,7 +101,7 @@ "x": 3, "y": 3, "elevation": 3, - "var": "VAR_0x4092", + "var": "VAR_LITTLEROOT_INTRO_STATE", "var_value": "0", "script": "InsideOfTruck_EventScript_23BF04" } diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc index 858975d7af..b61e2e0c95 100644 --- a/data/maps/InsideOfTruck/scripts.inc +++ b/data/maps/InsideOfTruck/scripts.inc @@ -25,26 +25,26 @@ InsideOfTruck_EventScript_23BF04:: @ 823BF04 InsideOfTruck_EventScript_23BF20:: @ 823BF20 setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F - setvar VAR_0x4092, 1 + setvar VAR_LITTLEROOT_INTRO_STATE, 1 setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL - setvar VAR_0x408C, 1 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 1 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10 releaseall end InsideOfTruck_EventScript_23BF46:: @ 823BF46 setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F - setvar VAR_0x4092, 2 + setvar VAR_LITTLEROOT_INTRO_STATE, 2 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL - setvar VAR_0x4082, 1 + setvar VAR_LITTLEROOT_HOUSES_STATE, 1 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10 releaseall end diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index 899df4d2cd..84f04055fd 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -9,9 +9,9 @@ LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_1EA53F call LavaridgeTown_EventScript_271ED7 call LavaridgeTown_EventScript_271EFB - compare VAR_0x4053, 1 + compare VAR_LAVARIDGE_RIVAL_STATE, 1 call_if_eq LavaridgeTown_EventScript_1EA518 - compare VAR_0x4053, 1 + compare VAR_LAVARIDGE_RIVAL_STATE, 1 call_if_eq LavaridgeTown_EventScript_1EA543 end @@ -41,7 +41,7 @@ LavaridgeTown_EventScript_1EA543:: @ 81EA543 return LavaridgeTown_MapScript2_1EA547: @ 81EA547 - map_script_2 VAR_0x4053, 1, LavaridgeTown_EventScript_1EA551 + map_script_2 VAR_LAVARIDGE_RIVAL_STATE, 1, LavaridgeTown_EventScript_1EA551 .2byte 0 LavaridgeTown_EventScript_1EA551:: @ 81EA551 @@ -94,7 +94,7 @@ LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF compare VAR_0x8008, 9 call_if_ne LavaridgeTown_EventScript_1EA6C9 removeobject 7 - setvar VAR_0x4053, 2 + setvar VAR_LAVARIDGE_RIVAL_STATE, 2 clearflag FLAG_SPECIAL_FLAG_0x4000 savebgm MUS_DUMMY fadedefaultbgm diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index bf48225eca..0c3741f201 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -76,13 +76,13 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 setflag FLAG_FLANNERY_GIVES_BADGE_INFO setflag FLAG_DEFEATED_LAVARIDGE_GYM setflag FLAG_BADGE04_GET - addvar VAR_0x4085, 1 - compare VAR_0x4085, 6 + addvar VAR_PETALBURG_GYM_STATE, 1 + compare VAR_PETALBURG_GYM_STATE, 6 call_if_eq LavaridgeTown_Gym_1F_EventScript_271E84 setvar VAR_0x8008, 4 call LavaridgeTown_Gym_1F_EventScript_271F43 setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY - setvar VAR_0x4053, 1 + setvar VAR_LAVARIDGE_RIVAL_STATE, 1 call LavaridgeTown_Gym_1F_EventScript_1FE841 closemessage delay 30 diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index cfa6b38675..a6ec91e62b 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -5,7 +5,7 @@ LilycoveCity_MapScripts:: @ 81E2B3C LilycoveCity_MapScript1_1E2B47: @ 81E2B47 setflag FLAG_VISITED_LILYCOVE_CITY - setvar VAR_0x4086, 0 + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER call_if_set FLAG_SYS_WEATHER_CTRL, LilycoveCity_EventScript_27207A call LilycoveCity_EventScript_271ED7 diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 42ce7beeb0..3d6ac6c4ff 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -22,13 +22,13 @@ LilycoveCity_ContestLobby_EventScript_21A23C:: @ 821A23C return LilycoveCity_ContestLobby_MapScript2_21A243: @ 821A243 - map_script_2 VAR_0x4099, 1, LilycoveCity_ContestLobby_EventScript_21A255 - map_script_2 VAR_0x4099, 2, LilycoveCity_ContestLobby_EventScript_21A427 + map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1, LilycoveCity_ContestLobby_EventScript_21A255 + map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2, LilycoveCity_ContestLobby_EventScript_21A427 .2byte 0 LilycoveCity_ContestLobby_EventScript_21A255:: @ 821A255 goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_21A264 - setvar VAR_0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 end LilycoveCity_ContestLobby_EventScript_21A264:: @ 821A264 @@ -55,7 +55,7 @@ LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA msgbox LilycoveCity_ContestLobby_Text_21AF63, MSGBOX_DEFAULT closemessage special sub_80F88DC - setvar VAR_0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 specialvar VAR_RESULT, GiveMonArtistRibbon compare VAR_RESULT, 1 call_if_eq LilycoveCity_ContestLobby_EventScript_21A314 @@ -75,7 +75,7 @@ LilycoveCity_ContestLobby_EventScript_21A2E4:: @ 821A2E4 closemessage applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F waitmovement 0 - setvar VAR_0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 removeobject 4 releaseall end @@ -202,7 +202,7 @@ LilycoveCity_ContestLobby_Movement_21A41E: @ 821A41E LilycoveCity_ContestLobby_EventScript_21A427:: @ 821A427 goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_21A436 - setvar VAR_0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 end LilycoveCity_ContestLobby_EventScript_21A436:: @ 821A436 @@ -227,7 +227,7 @@ LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A msgbox LilycoveCity_ContestLobby_Text_21AF63, MSGBOX_DEFAULT closemessage special sub_80F88DC - setvar VAR_0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 specialvar VAR_RESULT, GiveMonArtistRibbon compare VAR_RESULT, 1 call_if_eq LilycoveCity_ContestLobby_EventScript_21A4E4 @@ -247,7 +247,7 @@ LilycoveCity_ContestLobby_EventScript_21A4B4:: @ 821A4B4 closemessage applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C waitmovement 0 - setvar VAR_0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 removeobject 11 releaseall end @@ -338,28 +338,28 @@ LilycoveCity_ContestLobby_EventScript_21A585:: @ 821A585 return LilycoveCity_ContestLobby_EventScript_21A5B7:: @ 821A5B7 - setvar VAR_0x4088, 1 + setvar VAR_CONTEST_LOCATION, 1 return LilycoveCity_ContestLobby_EventScript_21A5BD:: @ 821A5BD - setvar VAR_0x4088, 2 + setvar VAR_CONTEST_LOCATION, 2 return LilycoveCity_ContestLobby_EventScript_21A5C3:: @ 821A5C3 - setvar VAR_0x4088, 3 + setvar VAR_CONTEST_LOCATION, 3 return LilycoveCity_ContestLobby_EventScript_21A5C9:: @ 821A5C9 - setvar VAR_0x4088, 4 + setvar VAR_CONTEST_LOCATION, 4 return LilycoveCity_ContestLobby_EventScript_21A5CF:: @ 821A5CF setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR - copyvar VAR_0x4094, 0x1 + copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1 giveitem ITEM_CONTEST_PASS, 1 setvar VAR_0x800B, 8 setvar VAR_CONTEST_RANK, 3 - setvar VAR_0x4099, 1 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1 setflag FLAG_SYS_RIBBON_GET end @@ -833,9 +833,9 @@ LilycoveCity_ContestLobby_EventScript_21AB17:: @ 821AB17 waitmessage subvar VAR_0x8004, 1 call LilycoveCity_ContestLobby_EventScript_21AC49 - setvar VAR_0x4086, 1 + setvar VAR_LINK_CONTEST_ROOM_STATE, 1 special sub_80F8AFC - setvar VAR_0x4088, 5 + setvar VAR_CONTEST_LOCATION, 5 setvar VAR_CONTEST_RANK, 3 call LilycoveCity_ContestLobby_EventScript_21A5EF end diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index f73fbf092e..6d37e13c1d 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -57,7 +57,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB:: @ 82197EB end LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE: @ 82197FE - map_script_2 VAR_0x4094, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219808 + map_script_2 VAR_LILYCOVE_MUSEUM_2F_STATE, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219808 .2byte 0 LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808 @@ -76,7 +76,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808 applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219861 waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_219BC4, MSGBOX_SIGN - copyvar VAR_0x4094, 0x1 + copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1 releaseall end diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc index e756c2bc6d..fa3f2d9484 100644 --- a/data/maps/LinkContestRoom1/scripts.inc +++ b/data/maps/LinkContestRoom1/scripts.inc @@ -61,11 +61,11 @@ LinkContestRoom1_EventScript_23B80F:: @ 823B80F return LinkContestRoom1_MapScript2_23B815: @ 823B815 - map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B829 + map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_23B829 .2byte 0 LinkContestRoom1_MapScript2_23B81F: @ 823B81F - map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B834 + map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_23B834 .2byte 0 LinkContestRoom1_EventScript_23B829:: @ 823B829 @@ -303,7 +303,7 @@ LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B specialvar VAR_RESULT, sub_80F9160 compare VAR_RESULT, 1 goto_if_eq LinkContestRoom1_EventScript_23BD86 - switch VAR_0x4088 + switch VAR_CONTEST_LOCATION case 1, LinkContestRoom1_EventScript_23BB78 case 2, LinkContestRoom1_EventScript_23BB8B case 3, LinkContestRoom1_EventScript_23BBE6 @@ -407,7 +407,7 @@ LinkContestRoom1_EventScript_23BD86:: @ 823BD86 LinkContestRoom1_EventScript_23BE44:: @ 823BE44 special sub_80F9154 - switch VAR_0x4088 + switch VAR_CONTEST_LOCATION case 1, LinkContestRoom1_EventScript_23BE84 case 2, LinkContestRoom1_EventScript_23BE8E case 3, LinkContestRoom1_EventScript_23BE98 diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 5d9161cb42..10ff40cb12 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -7,18 +7,18 @@ LittlerootTown_MapScripts:: @ 81E7DCB LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB setflag FLAG_VISITED_LITTLEROOT_TOWN call LittlerootTown_EventScript_271ED7 - compare VAR_0x4092, 2 + compare VAR_LITTLEROOT_INTRO_STATE, 2 call_if_eq LittlerootTown_EventScript_1E7E67 call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E7E6F compare VAR_0x4050, 3 call_if_eq LittlerootTown_EventScript_1E7E92 - compare VAR_0x4082, 4 + compare VAR_LITTLEROOT_HOUSES_STATE, 4 call_if_eq LittlerootTown_EventScript_1E7E5C - compare VAR_0x408C, 4 + compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 call_if_eq LittlerootTown_EventScript_1E7E5C compare VAR_0x40C7, 1 call_if_eq LittlerootTown_EventScript_1E7E53 - compare VAR_0x408D, 3 + compare VAR_LITTLEROOT_RIVAL_STATE, 3 call_if_eq LittlerootTown_EventScript_1E7E4F compare VAR_0x40D3, 1 call_if_eq LittlerootTown_EventScript_1E7E4B @@ -44,8 +44,8 @@ LittlerootTown_EventScript_1E7E53:: @ 81E7E53 return LittlerootTown_EventScript_1E7E5C:: @ 81E7E5C - setvar VAR_0x4082, 5 - setvar VAR_0x408C, 5 + setvar VAR_LITTLEROOT_HOUSES_STATE, 5 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 5 return LittlerootTown_EventScript_1E7E67:: @ 81E7E67 @@ -83,8 +83,8 @@ LittlerootTown_EventScript_1E7EB9:: @ 81E7EB9 return LittlerootTown_MapScript2_1E7EC1: @ 81E7EC1 - map_script_2 VAR_0x4092, 1, LittlerootTown_EventScript_1E7EDB - map_script_2 VAR_0x4092, 2, LittlerootTown_EventScript_1E7EF9 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 1, LittlerootTown_EventScript_1E7EDB + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 2, LittlerootTown_EventScript_1E7EF9 map_script_2 VAR_0x40D3, 1, LittlerootTown_EventScript_1E7FB1 .2byte 0 @@ -136,7 +136,7 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17 applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E7FA9 waitmovement 0 setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE - setvar VAR_0x4092, 3 + setvar VAR_LITTLEROOT_INTRO_STATE, 3 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor VAR_0x8004, VAR_0x8005 waitdooranim diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json index ca5ee92de9..d6d4af86c3 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json @@ -135,7 +135,7 @@ "x": 8, "y": 8, "elevation": 0, - "var": "VAR_0x4092", + "var": "VAR_LITTLEROOT_INTRO_STATE", "var_value": "4", "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78A3" }, @@ -144,7 +144,7 @@ "x": 7, "y": 3, "elevation": 0, - "var": "VAR_0x408D", + "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78BE" }, @@ -153,7 +153,7 @@ "x": 8, "y": 4, "elevation": 0, - "var": "VAR_0x408D", + "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78CA" }, @@ -162,7 +162,7 @@ "x": 9, "y": 3, "elevation": 0, - "var": "VAR_0x408D", + "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78D6" } diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 42cfe308b3..728cf099dc 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -5,7 +5,7 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 81F7755 .byte 0 LittlerootTown_BrendansHouse_1F_MapScript1_1F7765: @ 81F7765 - compare VAR_0x4092, 6 + compare VAR_LITTLEROOT_INTRO_STATE, 6 call_if_lt LittlerootTown_BrendansHouse_1F_EventScript_1F777A call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_BrendansHouse_1F_EventScript_1F778D end @@ -26,11 +26,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F779A:: @ 81F779A return LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4: @ 81F77A4 - compare VAR_0x4092, 3 + compare VAR_LITTLEROOT_INTRO_STATE, 3 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77DE - compare VAR_0x4092, 5 + compare VAR_LITTLEROOT_INTRO_STATE, 5 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77C6 - compare VAR_0x4092, 6 + compare VAR_LITTLEROOT_INTRO_STATE, 6 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77D2 end @@ -50,11 +50,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F77DE:: @ 81F77DE return LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA: @ 81F77EA - map_script_2 VAR_0x4092, 3, LittlerootTown_BrendansHouse_1F_EventScript_1F783C - map_script_2 VAR_0x4092, 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7814 - map_script_2 VAR_0x4092, 6, LittlerootTown_BrendansHouse_1F_EventScript_1F784D - map_script_2 VAR_0x4082, 1, LittlerootTown_BrendansHouse_1F_EventScript_1F785E - map_script_2 VAR_0x4082, 3, LittlerootTown_BrendansHouse_1F_EventScript_292AF2 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_1F783C + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7814 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_BrendansHouse_1F_EventScript_1F784D + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 1, LittlerootTown_BrendansHouse_1F_EventScript_1F785E + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_292AF2 .2byte 0 LittlerootTown_BrendansHouse_1F_EventScript_1F7814:: @ 81F7814 @@ -100,7 +100,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1F8BC5, MSGBOX_DEFAULT setflag FLAG_MET_RIVAL_MOM - setvar VAR_0x4082, 2 + setvar VAR_LITTLEROOT_HOUSES_STATE, 2 releaseall end @@ -173,7 +173,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM delay 30 - setvar VAR_0x408D, 3 + setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setvar VAR_0x4050, 1 savebgm MUS_DUMMY fadedefaultbgm diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index ea00693a83..fc0a68a276 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -4,11 +4,11 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81F83E3 .byte 0 LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE - compare VAR_0x408D, 2 + compare VAR_LITTLEROOT_RIVAL_STATE, 2 call_if_lt LittlerootTown_BrendansHouse_2F_EventScript_1F8457 - compare VAR_0x408D, 3 + compare VAR_LITTLEROOT_RIVAL_STATE, 3 call_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F841A - compare VAR_0x4092, 4 + compare VAR_LITTLEROOT_INTRO_STATE, 4 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_2926FE call LittlerootTown_BrendansHouse_2F_EventScript_275CE1 setvar VAR_0x4089, 0 @@ -16,7 +16,7 @@ LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE LittlerootTown_BrendansHouse_2F_EventScript_1F841A:: @ 81F841A goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_1F8433 - compare VAR_0x4084, 2 + compare VAR_BIRCH_LAB_STATE, 2 goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F8456 goto LittlerootTown_BrendansHouse_2F_EventScript_1F8433 @@ -40,7 +40,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8457:: @ 81F8457 return LittlerootTown_BrendansHouse_2F_EventScript_1F8464:: @ 81F8464 - setvar VAR_0x408D, 2 + setvar VAR_LITTLEROOT_RIVAL_STATE, 2 return LittlerootTown_BrendansHouse_2F_MapScript2_1F846A: @ 81F846A @@ -55,7 +55,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8474:: @ 81F8474 LittlerootTown_BrendansHouse_2F_EventScript_1F8481:: @ 81F8481 lockall - compare VAR_0x408D, 2 + compare VAR_LITTLEROOT_RIVAL_STATE, 2 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8497 msgbox LittlerootTown_BrendansHouse_2F_Text_1F9991, MSGBOX_DEFAULT releaseall @@ -81,7 +81,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8565 compare VAR_FACING, 4 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8594 - setvar VAR_0x408D, 3 + setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM setvar VAR_0x4050, 1 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json index e1f7d823ac..0938e69660 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json @@ -135,7 +135,7 @@ "x": 2, "y": 8, "elevation": 0, - "var": "VAR_0x4092", + "var": "VAR_LITTLEROOT_INTRO_STATE", "var_value": "4", "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A4C" }, @@ -144,7 +144,7 @@ "x": 1, "y": 3, "elevation": 0, - "var": "VAR_0x408D", + "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A67" }, @@ -153,7 +153,7 @@ "x": 2, "y": 4, "elevation": 0, - "var": "VAR_0x408D", + "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A73" }, @@ -162,7 +162,7 @@ "x": 3, "y": 3, "elevation": 0, - "var": "VAR_0x408D", + "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A7F" } diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 36bda7e036..185a1f6a37 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -5,7 +5,7 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 81F88A5 .byte 0 LittlerootTown_MaysHouse_1F_MapScript1_1F88B5: @ 81F88B5 - compare VAR_0x4092, 6 + compare VAR_LITTLEROOT_INTRO_STATE, 6 call_if_lt LittlerootTown_MaysHouse_1F_EventScript_1F88CA call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_MaysHouse_1F_EventScript_1F88DD end @@ -26,11 +26,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1F88EA:: @ 81F88EA return LittlerootTown_MaysHouse_1F_MapScript1_1F88F4: @ 81F88F4 - compare VAR_0x4092, 3 + compare VAR_LITTLEROOT_INTRO_STATE, 3 call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F892E - compare VAR_0x4092, 5 + compare VAR_LITTLEROOT_INTRO_STATE, 5 call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8916 - compare VAR_0x4092, 6 + compare VAR_LITTLEROOT_INTRO_STATE, 6 call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8922 end @@ -50,11 +50,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1F892E:: @ 81F892E return LittlerootTown_MaysHouse_1F_MapScript2_1F893A: @ 81F893A - map_script_2 VAR_0x4092, 3, LittlerootTown_MaysHouse_1F_EventScript_1F898C - map_script_2 VAR_0x4092, 5, LittlerootTown_MaysHouse_1F_EventScript_1F8964 - map_script_2 VAR_0x4092, 6, LittlerootTown_MaysHouse_1F_EventScript_1F899D - map_script_2 VAR_0x408C, 1, LittlerootTown_MaysHouse_1F_EventScript_1F89AE - map_script_2 VAR_0x4082, 3, LittlerootTown_MaysHouse_1F_EventScript_292AF2 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_1F898C + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_MaysHouse_1F_EventScript_1F8964 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_MaysHouse_1F_EventScript_1F899D + map_script_2 VAR_LITTLEROOT_HOUSES_STATE_2, 1, LittlerootTown_MaysHouse_1F_EventScript_1F89AE + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_292AF2 .2byte 0 LittlerootTown_MaysHouse_1F_EventScript_1F8964:: @ 81F8964 @@ -100,7 +100,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE special GetRivalSonDaughterString msgbox LittlerootTown_MaysHouse_1F_Text_1F8BC5, MSGBOX_DEFAULT setflag FLAG_MET_RIVAL_MOM - setvar VAR_0x408C, 2 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 2 releaseall end @@ -119,7 +119,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89F3:: @ 81F89F3 faceplayer goto_if_set FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_BrendansHouse_1F_EventScript_1F8A33 goto_if_set FLAG_SYS_POKEMON_GET, LittlerootTown_BrendansHouse_1F_EventScript_1F8A29 - compare VAR_0x408D, 3 + compare VAR_LITTLEROOT_RIVAL_STATE, 3 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1F8CA5, MSGBOX_DEFAULT @@ -210,7 +210,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM delay 30 - setvar VAR_0x408D, 3 + setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setvar VAR_0x4050, 1 savebgm MUS_DUMMY fadedefaultbgm diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index 353437ad4f..2217d12cd1 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -4,11 +4,11 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 81F9296 .byte 0 LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1 - compare VAR_0x408D, 2 + compare VAR_LITTLEROOT_RIVAL_STATE, 2 call_if_lt LittlerootTown_MaysHouse_2F_EventScript_1F930A - compare VAR_0x408D, 3 + compare VAR_LITTLEROOT_RIVAL_STATE, 3 call_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F92CD - compare VAR_0x4092, 4 + compare VAR_LITTLEROOT_INTRO_STATE, 4 call_if_eq LittlerootTown_MaysHouse_2F_EventScript_2926FE call LittlerootTown_MaysHouse_2F_EventScript_275CE1 setvar VAR_0x4089, 0 @@ -16,7 +16,7 @@ LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1 LittlerootTown_MaysHouse_2F_EventScript_1F92CD:: @ 81F92CD goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_MaysHouse_2F_EventScript_1F92E6 - compare VAR_0x4084, 2 + compare VAR_BIRCH_LAB_STATE, 2 goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309 goto LittlerootTown_MaysHouse_2F_EventScript_1F92E6 @@ -41,7 +41,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F930A:: @ 81F930A return LittlerootTown_MaysHouse_2F_EventScript_1F9317:: @ 81F9317 - setvar VAR_0x408D, 2 + setvar VAR_LITTLEROOT_RIVAL_STATE, 2 return LittlerootTown_MaysHouse_2F_MapScript2_1F931D: @ 81F931D @@ -56,7 +56,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9327:: @ 81F9327 LittlerootTown_MaysHouse_2F_EventScript_1F9334:: @ 81F9334 lockall - compare VAR_0x408D, 2 + compare VAR_LITTLEROOT_RIVAL_STATE, 2 goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F934A msgbox LittlerootTown_MaysHouse_2F_Text_1F9991, MSGBOX_DEFAULT releaseall @@ -82,7 +82,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9418 compare VAR_FACING, 4 call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9440 - setvar VAR_0x408D, 3 + setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM setvar VAR_0x4050, 1 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 5c762743ca..f035702430 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -38,7 +38,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7:: @ 81F9CF7 end LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06: @ 81F9D06 - map_script_2 VAR_0x4084, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40 + map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40 map_script_2 VAR_0x40D3, 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45 map_script_2 VAR_0x40D3, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45 map_script_2 VAR_0x40D3, 3, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71 @@ -85,8 +85,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75:: @ 81F9D75 end LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9: @ 81F9DB9 - map_script_2 VAR_0x4084, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB - map_script_2 VAR_0x4084, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67 + map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB + map_script_2 VAR_BIRCH_LAB_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67 map_script_2 VAR_0x40D3, 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80 map_script_2 VAR_0x40D3, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62 .2byte 0 @@ -122,7 +122,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17:: @ 81F9E17 LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36:: @ 81F9E36 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA9D5, MSGBOX_DEFAULT clearflag FLAG_HIDE_ROUTE_101_BOY - setvar VAR_0x4084, 3 + setvar VAR_BIRCH_LAB_STATE, 3 releaseall end @@ -264,7 +264,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C: @ 81F9F7C LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84:: @ 81F9F84 lock faceplayer - compare VAR_0x4084, 3 + compare VAR_BIRCH_LAB_STATE, 3 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1 goto_if_set FLAG_BIRCH_AIDE_MET, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA4E2, MSGBOX_DEFAULT @@ -502,7 +502,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_272141 compare VAR_0x40D3, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_272141 - compare VAR_0x4084, 5 + compare VAR_BIRCH_LAB_STATE, 5 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, MSGBOX_DEFAULT release @@ -537,10 +537,10 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA352 compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F - setvar VAR_0x4084, 5 + setvar VAR_BIRCH_LAB_STATE, 5 setflag FLAG_ADVENTURE_STARTED - setvar VAR_0x4051, 1 - setvar VAR_0x408D, 4 + setvar VAR_ROUTE102_ACCESSIBLE, 1 + setvar VAR_LITTLEROOT_RIVAL_STATE, 4 setvar VAR_0x4050, 3 releaseall end diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index ba585c98a3..1bca8dac78 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -62,7 +62,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 closemessage clearflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN clearflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY - setvar VAR_0x4058, 1 + setvar VAR_SLATEPORT_STATE, 1 setflag FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT setvar VAR_0x40A0, 1 fadescreen 1 diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 21f654888c..8d2971c438 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -8,7 +8,7 @@ MauvilleCity_MapScript1_1DF38B: @ 81DF38B clearflag FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION setflag FLAG_SYS_TV_START clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE - setvar VAR_0x4093, 0 + setvar VAR_MAUVILLE_GYM_STATE, 0 call_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF3A9 end diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index 76bceae56d..a095e8ff32 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -4,7 +4,7 @@ MauvilleCity_Gym_MapScripts:: @ 820DD6E MauvilleCity_Gym_MapScript1_20DD74: @ 820DD74 goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20DEE7 - switch VAR_0x4093 + switch VAR_MAUVILLE_GYM_STATE case 0, MauvilleCity_Gym_EventScript_20DDBA case 1, MauvilleCity_Gym_EventScript_20DEAF case 2, MauvilleCity_Gym_EventScript_20DEBD @@ -94,8 +94,8 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B clearflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT setflag FLAG_DEFEATED_MAUVILLE_GYM setflag FLAG_BADGE03_GET - addvar VAR_0x4085, 1 - compare VAR_0x4085, 6 + addvar VAR_PETALBURG_GYM_STATE, 1 + compare VAR_PETALBURG_GYM_STATE, 6 call_if_eq MauvilleCity_Gym_EventScript_271E84 setvar VAR_0x8008, 3 call MauvilleCity_Gym_EventScript_271F43 @@ -144,9 +144,9 @@ MauvilleCity_Gym_EventScript_20DFDE:: @ 820DFDE MauvilleCity_Gym_EventScript_20DFF9:: @ 820DFF9 lockall goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD - compare VAR_0x4093, 1 + compare VAR_MAUVILLE_GYM_STATE, 1 goto_if_eq MauvilleCity_Gym_EventScript_20E0AD - setvar VAR_0x4093, 1 + setvar VAR_MAUVILLE_GYM_STATE, 1 setvar VAR_0x8004, 0 goto MauvilleCity_Gym_EventScript_20E08D end @@ -154,9 +154,9 @@ MauvilleCity_Gym_EventScript_20DFF9:: @ 820DFF9 MauvilleCity_Gym_EventScript_20E01E:: @ 820E01E lockall goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD - compare VAR_0x4093, 2 + compare VAR_MAUVILLE_GYM_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_20E0AD - setvar VAR_0x4093, 2 + setvar VAR_MAUVILLE_GYM_STATE, 2 setvar VAR_0x8004, 1 goto MauvilleCity_Gym_EventScript_20E08D end @@ -164,9 +164,9 @@ MauvilleCity_Gym_EventScript_20E01E:: @ 820E01E MauvilleCity_Gym_EventScript_20E043:: @ 820E043 lockall goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD - compare VAR_0x4093, 3 + compare VAR_MAUVILLE_GYM_STATE, 3 goto_if_eq MauvilleCity_Gym_EventScript_20E0AD - setvar VAR_0x4093, 3 + setvar VAR_MAUVILLE_GYM_STATE, 3 setvar VAR_0x8004, 2 goto MauvilleCity_Gym_EventScript_20E08D end @@ -174,9 +174,9 @@ MauvilleCity_Gym_EventScript_20E043:: @ 820E043 MauvilleCity_Gym_EventScript_20E068:: @ 820E068 lockall goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD - compare VAR_0x4093, 4 + compare VAR_MAUVILLE_GYM_STATE, 4 goto_if_eq MauvilleCity_Gym_EventScript_20E0AD - setvar VAR_0x4093, 4 + setvar VAR_MAUVILLE_GYM_STATE, 4 setvar VAR_0x8004, 3 goto MauvilleCity_Gym_EventScript_20E08D end diff --git a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc index ed10a83099..a68774e345 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc @@ -5,11 +5,11 @@ MossdeepCity_GameCorner_1F_MapScripts:: @ 8224B27 .byte 0 MossdeepCity_GameCorner_1F_MapScript2_224B37: @ 8224B37 - map_script_2 VAR_0x4087, 8, MossdeepCity_GameCorner_1F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, 8, MossdeepCity_GameCorner_1F_EventScript_276BAE .2byte 0 MossdeepCity_GameCorner_1F_MapScript2_224B41: @ 8224B41 - map_script_2 VAR_0x4087, 8, MossdeepCity_GameCorner_1F_EventScript_276C9D + map_script_2 VAR_CABLE_CLUB_STATE, 8, MossdeepCity_GameCorner_1F_EventScript_276C9D .2byte 0 MossdeepCity_GameCorner_1F_EventScript_224B4B:: @ 8224B4B diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index 164cd3eae0..279960febb 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -119,7 +119,7 @@ "x": 0, "y": 10, "elevation": 3, - "var": "VAR_0x4051", + "var": "VAR_ROUTE102_ACCESSIBLE", "var_value": "0", "script": "OldaleTown_EventScript_1E903F" }, diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index 7431cbf2aa..2c4cd2bd18 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -11,7 +11,7 @@ OldaleTown_MapScript1_1E8EA8: @ 81E8EA8 end OldaleTown_EventScript_1E8ECC:: @ 81E8ECC - setvar VAR_0x4051, 1 + setvar VAR_ROUTE102_ACCESSIBLE, 1 return OldaleTown_EventScript_1E8ED2:: @ 81E8ED2 diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index d8f77168b2..50e1a55610 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -193,7 +193,7 @@ "x": 8, "y": 10, "elevation": 3, - "var": "VAR_0x4057", + "var": "VAR_PETALBURG_STATE", "var_value": "0", "script": "PetalburgCity_EventScript_1DC49A" }, @@ -202,7 +202,7 @@ "x": 8, "y": 11, "elevation": 3, - "var": "VAR_0x4057", + "var": "VAR_PETALBURG_STATE", "var_value": "0", "script": "PetalburgCity_EventScript_1DC4A6" }, @@ -211,7 +211,7 @@ "x": 8, "y": 12, "elevation": 3, - "var": "VAR_0x4057", + "var": "VAR_PETALBURG_STATE", "var_value": "0", "script": "PetalburgCity_EventScript_1DC4B2" }, @@ -220,7 +220,7 @@ "x": 8, "y": 13, "elevation": 3, - "var": "VAR_0x4057", + "var": "VAR_PETALBURG_STATE", "var_value": "0", "script": "PetalburgCity_EventScript_1DC4BE" }, diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index f69eb3a3a1..3d9c018b94 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -5,13 +5,13 @@ PetalburgCity_MapScripts:: PetalburgCity_MapScript1_1DC2D7: @ 81DC2D7 setflag FLAG_VISITED_PETALBURG_CITY - compare VAR_0x4057, 0 + compare VAR_PETALBURG_STATE, 0 call_if_eq PetalburgCity_EventScript_1DC307 - compare VAR_0x4057, 2 + compare VAR_PETALBURG_STATE, 2 call_if_eq PetalburgCity_EventScript_1DC30F - compare VAR_0x4057, 4 + compare VAR_PETALBURG_STATE, 4 call_if_eq PetalburgCity_EventScript_1DC30F - compare VAR_0x4085, 8 + compare VAR_PETALBURG_GYM_STATE, 8 call_if_eq PetalburgCity_EventScript_1DC316 end @@ -25,12 +25,12 @@ PetalburgCity_EventScript_1DC30F:: @ 81DC30F return PetalburgCity_EventScript_1DC316:: @ 81DC316 - setvar VAR_0x4085, 7 + setvar VAR_PETALBURG_GYM_STATE, 7 return PetalburgCity_MapScript2_1DC31C: @ 81DC31C - map_script_2 VAR_0x4057, 2, PetalburgCity_EventScript_1DC32E - map_script_2 VAR_0x4057, 4, PetalburgCity_EventScript_1DC390 + map_script_2 VAR_PETALBURG_STATE, 2, PetalburgCity_EventScript_1DC32E + map_script_2 VAR_PETALBURG_STATE, 4, PetalburgCity_EventScript_1DC390 .2byte 0 PetalburgCity_EventScript_1DC32E:: @ 81DC32E @@ -49,11 +49,11 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E msgbox PetalburgCity_Text_1EC297, MSGBOX_DEFAULT closemessage clearflag FLAG_SPECIAL_FLAG_0x4000 - setvar VAR_0x4057, 3 + setvar VAR_PETALBURG_STATE, 3 fadedefaultbgm clearflag FLAG_SPECIAL_FLAG_0x4001 special LoadPlayerParty - setvar VAR_0x4085, 1 + setvar VAR_PETALBURG_GYM_STATE, 1 warp MAP_PETALBURG_CITY_GYM, 255, 4, 108 waitstate releaseall diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 915cdc93e1..89eb7e51e1 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -6,9 +6,9 @@ PetalburgCity_Gym_MapScripts:: @ 8204889 .byte 0 PetalburgCity_Gym_MapScript1_20489E: @ 820489E - compare VAR_0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 goto_if_eq PetalburgCity_Gym_EventScript_2048B5 - compare VAR_0x4085, 7 + compare VAR_PETALBURG_GYM_STATE, 7 call_if_ge PetalburgCity_Gym_EventScript_2048FF end @@ -44,9 +44,9 @@ PetalburgCity_Gym_EventScript_2048FF:: @ 82048FF return PetalburgCity_Gym_MapScript1_20492D: @ 820492D - compare VAR_0x4085, 1 + compare VAR_PETALBURG_GYM_STATE, 1 call_if_eq PetalburgCity_Gym_EventScript_20494D - compare VAR_0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 call_if_lt PetalburgCity_Gym_EventScript_204955 call_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_20495D end @@ -64,17 +64,17 @@ PetalburgCity_Gym_EventScript_20495D:: @ 820495D specialvar VAR_RESULT, IsTrainerReadyForRematch compare VAR_RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_204985 - compare VAR_0x4085, 8 + compare VAR_PETALBURG_GYM_STATE, 8 goto_if_eq PetalburgCity_Gym_EventScript_204985 setobjectxyperm 1, 4, 107 return PetalburgCity_Gym_EventScript_204985:: @ 8204985 - setvar VAR_0x4085, 8 + setvar VAR_PETALBURG_GYM_STATE, 8 end PetalburgCity_Gym_MapScript2_20498B: @ 820498B - map_script_2 VAR_0x4085, 1, PetalburgCity_Gym_EventScript_204995 + map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_204995 .2byte 0 PetalburgCity_Gym_EventScript_204995:: @ 8204995 @@ -82,7 +82,7 @@ PetalburgCity_Gym_EventScript_204995:: @ 8204995 end PetalburgCity_Gym_MapScript2_20499A: @ 820499A - map_script_2 VAR_0x4085, 1, PetalburgCity_Gym_EventScript_2049A4 + map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_2049A4 .2byte 0 PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4 @@ -100,7 +100,7 @@ PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4 applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A6 waitmovement 0 msgbox PetalburgCity_Gym_Text_205C40, MSGBOX_DEFAULT - setvar VAR_0x4085, 2 + setvar VAR_PETALBURG_GYM_STATE, 2 releaseall end @@ -114,7 +114,7 @@ PetalburgCity_Gym_Movement_2049EC: @ 82049EC PetalburgCity_Gym_EventScript_2049F1:: @ 82049F1 lock faceplayer - switch VAR_0x4085 + switch VAR_PETALBURG_GYM_STATE case 2, PetalburgCity_Gym_EventScript_204D4A case 3, PetalburgCity_Gym_EventScript_204D54 case 4, PetalburgCity_Gym_EventScript_204D5E @@ -216,8 +216,8 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC call_if_eq PetalburgCity_Gym_EventScript_204CB5 removeobject 10 setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT - setvar VAR_0x4085, 1 - setvar VAR_0x4057, 2 + setvar VAR_PETALBURG_GYM_STATE, 1 + setvar VAR_PETALBURG_STATE, 2 clearflag FLAG_HIDE_PETALBURG_CITY_WALLY clearflag FLAG_HIDE_PETALBURG_GYM_WALLY setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL @@ -416,7 +416,7 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B call PetalburgCity_Gym_EventScript_27207E msgbox PetalburgCity_Gym_Text_20618A, MSGBOX_DEFAULT setflag FLAG_DEFEATED_PETALBURG_GYM - setvar VAR_0x4085, 7 + setvar VAR_PETALBURG_GYM_STATE, 7 setflag FLAG_BADGE05_GET special sub_813B9A0 call PetalburgCity_Gym_EventScript_2721F8 @@ -496,7 +496,7 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 compare VAR_0x8008, 3 call_if_eq PetalburgCity_Gym_EventScript_20506C removeobject 11 - setvar VAR_0x4057, 4 + setvar VAR_PETALBURG_STATE, 4 clearflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE warp MAP_PETALBURG_CITY, 255, 15, 8 waitstate @@ -783,7 +783,7 @@ PetalburgCity_Gym_EventScript_20512D:: @ 820512D PetalburgCity_Gym_EventScript_205137:: @ 8205137 lockall - compare VAR_0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 85 @@ -813,7 +813,7 @@ PetalburgCity_Gym_EventScript_20517D:: @ 820517D PetalburgCity_Gym_EventScript_205187:: @ 8205187 lockall - compare VAR_0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 98 diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc index ac41aaa28f..d410e1f5a1 100644 --- a/data/maps/PetalburgCity_WallysHouse/scripts.inc +++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc @@ -4,7 +4,7 @@ PetalburgCity_WallysHouse_MapScripts:: @ 8204229 .byte 0 PetalburgCity_WallysHouse_MapScript2_204234: @ 8204234 - map_script_2 VAR_0x4057, 4, PetalburgCity_WallysHouse_EventScript_20423E + map_script_2 VAR_PETALBURG_STATE, 4, PetalburgCity_WallysHouse_EventScript_20423E .2byte 0 PetalburgCity_WallysHouse_EventScript_20423E:: @ 820423E @@ -13,7 +13,7 @@ PetalburgCity_WallysHouse_EventScript_20423E:: @ 820423E end PetalburgCity_WallysHouse_MapScript2_204247: @ 8204247 - map_script_2 VAR_0x4057, 4, PetalburgCity_WallysHouse_EventScript_204251 + map_script_2 VAR_PETALBURG_STATE, 4, PetalburgCity_WallysHouse_EventScript_204251 .2byte 0 PetalburgCity_WallysHouse_EventScript_204251:: @ 8204251 @@ -22,7 +22,7 @@ PetalburgCity_WallysHouse_EventScript_204251:: @ 8204251 giveitem_std ITEM_HM03 setflag FLAG_RECEIVED_HM03 msgbox PetalburgCity_WallysHouse_Text_20461A, MSGBOX_DEFAULT - setvar VAR_0x4057, 5 + setvar VAR_PETALBURG_STATE, 5 releaseall end diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json index 4921b88ae8..4bca7bb5ef 100644 --- a/data/maps/PetalburgWoods/map.json +++ b/data/maps/PetalburgWoods/map.json @@ -234,7 +234,7 @@ "x": 26, "y": 23, "elevation": 3, - "var": "VAR_0x4098", + "var": "VAR_PETALBURG_WOODS_STATE", "var_value": "0", "script": "PetalburgWoods_EventScript_22DFD7" }, @@ -243,7 +243,7 @@ "x": 27, "y": 23, "elevation": 3, - "var": "VAR_0x4098", + "var": "VAR_PETALBURG_WOODS_STATE", "var_value": "0", "script": "PetalburgWoods_EventScript_22E079" } diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index eec9100f1a..493800afc3 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -109,7 +109,7 @@ PetalburgWoods_EventScript_22E18B:: @ 822E18B PetalburgWoods_EventScript_22E1A7:: @ 822E1A7 removeobject 4 - setvar VAR_0x4098, 1 + setvar VAR_PETALBURG_WOODS_STATE, 1 releaseall end diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json index 97c303c1ce..44d8b2137d 100644 --- a/data/maps/Route101/map.json +++ b/data/maps/Route101/map.json @@ -111,7 +111,7 @@ "x": 10, "y": 19, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_ROUTE101_STATE", "var_value": "1", "script": "Route101_EventScript_1EBCDE" }, @@ -120,7 +120,7 @@ "x": 11, "y": 19, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_ROUTE101_STATE", "var_value": "1", "script": "Route101_EventScript_1EBCDE" }, @@ -129,7 +129,7 @@ "x": 10, "y": 18, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_ROUTE101_STATE", "var_value": "2", "script": "Route101_EventScript_1EBD4E" }, @@ -138,7 +138,7 @@ "x": 11, "y": 18, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_ROUTE101_STATE", "var_value": "2", "script": "Route101_EventScript_1EBD4E" }, @@ -147,7 +147,7 @@ "x": 6, "y": 16, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_ROUTE101_STATE", "var_value": "2", "script": "Route101_EventScript_1EBD64" }, @@ -156,7 +156,7 @@ "x": 6, "y": 15, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_ROUTE101_STATE", "var_value": "2", "script": "Route101_EventScript_1EBD64" }, @@ -165,7 +165,7 @@ "x": 6, "y": 17, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_ROUTE101_STATE", "var_value": "2", "script": "Route101_EventScript_1EBD64" }, @@ -174,7 +174,7 @@ "x": 6, "y": 18, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_ROUTE101_STATE", "var_value": "2", "script": "Route101_EventScript_1EBD64" }, @@ -183,7 +183,7 @@ "x": 7, "y": 13, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_ROUTE101_STATE", "var_value": "2", "script": "Route101_EventScript_1EBD7A" } diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 15722a3f33..06a9cd52ed 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -8,12 +8,12 @@ Route101_MapScript1_1EBCC5: @ 81EBCC5 end Route101_MapScript2_1EBCCB: @ 81EBCCB - map_script_2 VAR_0x4060, 0, Route101_EventScript_1EBCD5 + map_script_2 VAR_ROUTE101_STATE, 0, Route101_EventScript_1EBCD5 .2byte 0 Route101_EventScript_1EBCD5:: @ 81EBCD5 setflag FLAG_SPECIAL_FLAG_0x4000 - setvar VAR_0x4060, 1 + setvar VAR_ROUTE101_STATE, 1 end Route101_EventScript_1EBCDE:: @ 81EBCDE @@ -37,7 +37,7 @@ Route101_EventScript_1EBCDE:: @ 81EBCDE waitmovement 0 msgbox Route101_Text_1EBE9A, MSGBOX_DEFAULT closemessage - setvar VAR_0x4060, 2 + setvar VAR_ROUTE101_STATE, 2 releaseall end @@ -234,8 +234,8 @@ Route101_EventScript_1EBE16:: @ 81EBE16 setflag FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH setflag FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG - setvar VAR_0x4084, 2 - setvar VAR_0x4060, 3 + setvar VAR_BIRCH_LAB_STATE, 2 + setvar VAR_ROUTE101_STATE, 3 clearflag FLAG_SPECIAL_FLAG_0x4000 checkplayergender compare VAR_RESULT, MALE diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index e13bad76df..208f1cb5a1 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -140,7 +140,7 @@ Route103_EventScript_1EC585:: @ 81EC585 Route103_EventScript_1EC5A2:: @ 81EC5A2 removeobject 2 - setvar VAR_0x4084, 4 + setvar VAR_BIRCH_LAB_STATE, 4 clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL setflag FLAG_DEFEATED_RIVAL_ROUTE103 setvar VAR_0x40C7, 1 diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index e904f69b74..525b7d327d 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -4,7 +4,7 @@ Route104_MapScripts:: @ 81ECC32 .byte 0 Route104_MapScript2_1ECC3D: @ 81ECC3D - map_script_2 VAR_0x408E, 1, Route104_EventScript_1ECC47 + map_script_2 VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1, Route104_EventScript_1ECC47 .2byte 0 Route104_EventScript_1ECC47:: @ 81ECC47 @@ -29,7 +29,7 @@ Route104_EventScript_1ECC74:: @ 81ECC74 return Route104_EventScript_1ECC78:: @ 81ECC78 - compare VAR_0x408E, 1 + compare VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1 goto_if_ge Route104_EventScript_1ECC9D goto_if_set FLAG_MET_RIVAL_RUSTBORO, Route104_EventScript_1ECC9D goto_if_unset FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_1ECC9D @@ -49,7 +49,7 @@ Route104_EventScript_1ECC9E:: @ 81ECC9E Route104_EventScript_1ECCB3:: @ 81ECCB3 lockall setflag FLAG_HIDE_RUSBORO_CITY_RIVAL - setvar VAR_0x405A, 8 + setvar VAR_RUSTBORO_STATE, 8 setvar VAR_0x4063, 2 applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_2725A6 waitmovement 0 @@ -413,11 +413,11 @@ Route104_EventScript_1ED139:: @ 81ED139 call Route104_EventScript_2720A8 setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT hideobjectat 7, MAP_ROUTE104 - copyvar VAR_0x4096, VAR_0x8008 + copyvar VAR_BRINEY_LOCATION, VAR_0x8008 resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 - setvar VAR_0x408E, 0 + setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 0 goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1B4 goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1BE end diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc index 17ed47206a..44eeca81f2 100644 --- a/data/maps/Route104_MrBrineysHouse/scripts.inc +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -4,7 +4,7 @@ Route104_MrBrineysHouse_MapScripts:: @ 8229D2E Route104_MrBrineysHouse_MapScript1_229D34: @ 8229D34 setflag FLAG_LANDMARK_MR_BRINEY_HOUSE - compare VAR_0x4090, 1 + compare VAR_BRINEY_HOUSE_STATE, 1 call_if_eq Route104_MrBrineysHouse_EventScript_229D50 call_if_set FLAG_RECEIVED_POKENAV, Route104_MrBrineysHouse_EventScript_229D4C end @@ -75,11 +75,11 @@ Route104_MrBrineysHouse_EventScript_229E1D:: @ 8229E1D Route104_MrBrineysHouse_EventScript_229E27:: @ 8229E27 msgbox Route104_MrBrineysHouse_Text_229FE9, MSGBOX_DEFAULT call Route104_MrBrineysHouse_EventScript_271E95 - setvar VAR_0x408E, 1 + setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1 clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO - setvar VAR_0x405A, 8 + setvar VAR_RUSTBORO_STATE, 8 setvar VAR_0x4063, 2 setflag FLAG_HIDE_RUSBORO_CITY_RIVAL setflag FLAG_HIDE_ROUTE_104_RIVAL diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index ebf9398d13..63c3bb629e 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -55,7 +55,7 @@ Route109_EventScript_1EE7D5:: @ 81EE7D5 hideobjectat 1, MAP_ROUTE109 msgbox Route109_Text_1E9C1D, MSGBOX_DEFAULT closemessage - copyvar VAR_0x4096, VAR_0x8008 + copyvar VAR_BRINEY_LOCATION, VAR_0x8008 resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json index 404155652e..a9ac7796a8 100644 --- a/data/maps/Route110/map.json +++ b/data/maps/Route110/map.json @@ -567,7 +567,7 @@ "x": 33, "y": 56, "elevation": 3, - "var": "VAR_0x4069", + "var": "VAR_ROUTE110_STATE", "var_value": "0", "script": "Route110_EventScript_1EF74D" }, @@ -576,7 +576,7 @@ "x": 34, "y": 56, "elevation": 3, - "var": "VAR_0x4069", + "var": "VAR_ROUTE110_STATE", "var_value": "0", "script": "Route110_EventScript_1EF758" }, @@ -585,7 +585,7 @@ "x": 35, "y": 56, "elevation": 3, - "var": "VAR_0x4069", + "var": "VAR_ROUTE110_STATE", "var_value": "0", "script": "Route110_EventScript_1EF763" }, diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 7c98cc6035..0446ac09ef 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -496,7 +496,7 @@ Route110_EventScript_1EF8EC:: @ 81EF8EC compare VAR_0x8008, 3 call_if_eq Route110_EventScript_1EF985 removeobject 29 - setvar VAR_0x4069, 1 + setvar VAR_ROUTE110_STATE, 1 savebgm MUS_DUMMY fadedefaultbgm releaseall diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json index 79aa60e75a..27eb381d0c 100644 --- a/data/maps/Route116/map.json +++ b/data/maps/Route116/map.json @@ -433,7 +433,7 @@ "x": 47, "y": 9, "elevation": 3, - "var": "VAR_0x406F", + "var": "VAR_ROUTE116_STATE", "var_value": "1", "script": "Route116_EventScript_1F2D95" } diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 623c74e3ca..fd1e77af12 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -145,7 +145,7 @@ Route116_EventScript_1F2D84:: @ 81F2D84 lock faceplayer msgbox Route116_Text_1F309D, MSGBOX_DEFAULT - setvar VAR_0x406F, 2 + setvar VAR_ROUTE116_STATE, 2 release end @@ -155,7 +155,7 @@ Route116_EventScript_1F2D95:: @ 81F2D95 applymovement EVENT_OBJ_ID_PLAYER, Route116_Movement_2725A4 waitmovement 0 msgbox Route116_Text_1F309D, MSGBOX_DEFAULT - setvar VAR_0x406F, 2 + setvar VAR_ROUTE116_STATE, 2 releaseall end diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json index 66b7a17899..7fc1e45c73 100644 --- a/data/maps/Route118/map.json +++ b/data/maps/Route118/map.json @@ -326,7 +326,7 @@ "x": 43, "y": 11, "elevation": 3, - "var": "VAR_0x4071", + "var": "VAR_ROUTE118_STATE", "var_value": "0", "script": "Route118_EventScript_1F3E8E" }, @@ -335,7 +335,7 @@ "x": 44, "y": 11, "elevation": 3, - "var": "VAR_0x4071", + "var": "VAR_ROUTE118_STATE", "var_value": "0", "script": "Route118_EventScript_1F3EAE" }, @@ -344,7 +344,7 @@ "x": 45, "y": 11, "elevation": 3, - "var": "VAR_0x4071", + "var": "VAR_ROUTE118_STATE", "var_value": "0", "script": "Route118_EventScript_1F3EC4" } diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 45b8665b0d..fac602f7e8 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -107,7 +107,7 @@ Route118_EventScript_1F3EE4:: @ 81F3EE4 call_if_eq Route118_EventScript_1F3F3A compare VAR_0x8008, 2 call_if_eq Route118_EventScript_1F3F4C - setvar VAR_0x4071, 1 + setvar VAR_ROUTE118_STATE, 1 removeobject 19 releaseall end diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json index bdb3e923d3..2146d5ec7a 100644 --- a/data/maps/Route119/map.json +++ b/data/maps/Route119/map.json @@ -607,7 +607,7 @@ "x": 25, "y": 31, "elevation": 0, - "var": "VAR_0x4072", + "var": "VAR_ROUTE119_STATE", "var_value": "0", "script": "Route119_EventScript_1F4472" }, @@ -616,7 +616,7 @@ "x": 26, "y": 31, "elevation": 0, - "var": "VAR_0x4072", + "var": "VAR_ROUTE119_STATE", "var_value": "0", "script": "Route119_EventScript_1F447D" }, diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index dee76d71d5..4a5e60ada9 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -156,7 +156,7 @@ Route119_EventScript_1F460F:: @ 81F460F compare VAR_TEMP_1, 2 call_if_eq Route119_EventScript_1F46EE removeobject 25 - setvar VAR_0x4072, 1 + setvar VAR_ROUTE119_STATE, 1 savebgm MUS_DUMMY fadedefaultbgm delay 60 diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json index ad20a81197..4339b149dc 100644 --- a/data/maps/Route121/map.json +++ b/data/maps/Route121/map.json @@ -423,7 +423,7 @@ "x": 25, "y": 5, "elevation": 3, - "var": "VAR_0x4074", + "var": "VAR_ROUTE121_STATE", "var_value": "0", "script": "Route121_EventScript_1F5E18" }, @@ -432,7 +432,7 @@ "x": 25, "y": 6, "elevation": 3, - "var": "VAR_0x4074", + "var": "VAR_ROUTE121_STATE", "var_value": "0", "script": "Route121_EventScript_1F5E18" }, @@ -441,7 +441,7 @@ "x": 25, "y": 7, "elevation": 3, - "var": "VAR_0x4074", + "var": "VAR_ROUTE121_STATE", "var_value": "0", "script": "Route121_EventScript_1F5E18" }, @@ -450,7 +450,7 @@ "x": 25, "y": 8, "elevation": 3, - "var": "VAR_0x4074", + "var": "VAR_ROUTE121_STATE", "var_value": "0", "script": "Route121_EventScript_1F5E18" } diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index ee361d30cf..edca585c92 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -28,7 +28,7 @@ Route121_EventScript_1F5E18:: @ 81F5E18 removeobject 12 removeobject 13 removeobject 14 - setvar VAR_0x4074, 1 + setvar VAR_ROUTE121_STATE, 1 releaseall end diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index bb4f8d1505..19f0acdae5 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -8,7 +8,7 @@ Route128_MapScript1_1F6B43: @ 81F6B43 end Route128_MapScript2_1F6B4D: @ 81F6B4D - map_script_2 VAR_0x407B, 1, Route128_EventScript_1F6B57 + map_script_2 VAR_ROUTE128_STATE, 1, Route128_EventScript_1F6B57 .2byte 0 Route128_EventScript_1F6B57:: @ 81F6B57 @@ -74,7 +74,7 @@ Route128_EventScript_1F6B57:: @ 81F6B57 removeobject 3 waitfieldeffect 30 clearflag FLAG_SPECIAL_FLAG_0x4000 - setvar VAR_0x407B, 2 + setvar VAR_ROUTE128_STATE, 2 releaseall end diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json index d43f7c33b5..1dcaaa3823 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -331,7 +331,7 @@ "x": 23, "y": 20, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "1", "script": "RustboroCity_EventScript_1E095A" }, @@ -340,7 +340,7 @@ "x": 23, "y": 21, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "1", "script": "RustboroCity_EventScript_1E0971" }, @@ -349,7 +349,7 @@ "x": 23, "y": 22, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "1", "script": "RustboroCity_EventScript_1E0988" }, @@ -358,7 +358,7 @@ "x": 23, "y": 23, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "1", "script": "RustboroCity_EventScript_1E099F" }, @@ -367,7 +367,7 @@ "x": 23, "y": 24, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "1", "script": "RustboroCity_EventScript_1E09B6" }, @@ -376,7 +376,7 @@ "x": 30, "y": 9, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "2", "script": "RustboroCity_EventScript_1E0AFE" }, @@ -385,7 +385,7 @@ "x": 29, "y": 10, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "2", "script": "RustboroCity_EventScript_1E0B0A" }, @@ -394,7 +394,7 @@ "x": 30, "y": 11, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "2", "script": "RustboroCity_EventScript_1E0B16" }, @@ -403,7 +403,7 @@ "x": 30, "y": 12, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "2", "script": "RustboroCity_EventScript_1E0B22" }, @@ -412,7 +412,7 @@ "x": 30, "y": 9, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "4", "script": "RustboroCity_EventScript_1E0C2B" }, @@ -421,7 +421,7 @@ "x": 31, "y": 10, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "4", "script": "RustboroCity_EventScript_1E0C37" }, @@ -430,7 +430,7 @@ "x": 30, "y": 11, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "4", "script": "RustboroCity_EventScript_1E0C43" }, @@ -439,7 +439,7 @@ "x": 30, "y": 12, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "4", "script": "RustboroCity_EventScript_1E0C4F" }, @@ -448,7 +448,7 @@ "x": 12, "y": 53, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "7", "script": "RustboroCity_EventScript_1E0DF3" }, @@ -457,7 +457,7 @@ "x": 13, "y": 53, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "7", "script": "RustboroCity_EventScript_1E0E33" }, @@ -466,7 +466,7 @@ "x": 14, "y": 53, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "7", "script": "RustboroCity_EventScript_1E0E73" }, @@ -475,7 +475,7 @@ "x": 15, "y": 53, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "7", "script": "RustboroCity_EventScript_1E0EB3" }, @@ -484,7 +484,7 @@ "x": 16, "y": 53, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "7", "script": "RustboroCity_EventScript_1E0EF3" }, @@ -493,7 +493,7 @@ "x": 17, "y": 53, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "7", "script": "RustboroCity_EventScript_1E0F33" }, @@ -502,7 +502,7 @@ "x": 18, "y": 53, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "7", "script": "RustboroCity_EventScript_1E0F73" }, @@ -511,7 +511,7 @@ "x": 19, "y": 53, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "7", "script": "RustboroCity_EventScript_1E0FB3" } diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 8ffbf8373d..8686bc18ed 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -6,10 +6,10 @@ RustboroCity_MapScripts:: @ 81E06BD RustboroCity_MapScript1_1E06C8: @ 81E06C8 setflag FLAG_VISITED_RUSTBORO_CITY call RustboroCity_EventScript_271ED7 - compare VAR_0x405A, 6 + compare VAR_RUSTBORO_STATE, 6 call_if_eq RustboroCity_EventScript_1E0707 getplayerxy VAR_TEMP_0, VAR_TEMP_1 - compare VAR_0x405A, 6 + compare VAR_RUSTBORO_STATE, 6 goto_if_eq RustboroCity_EventScript_1E06EC end @@ -28,7 +28,7 @@ RustboroCity_EventScript_1E0707:: @ 81E0707 return RustboroCity_MapScript2_1E070B: @ 81E070B - map_script_2 VAR_0x405A, 6, RustboroCity_EventScript_1E0715 + map_script_2 VAR_RUSTBORO_STATE, 6, RustboroCity_EventScript_1E0715 .2byte 0 RustboroCity_EventScript_1E0715:: @ 81E0715 @@ -99,7 +99,7 @@ RustboroCity_EventScript_1E07BD:: @ 81E07BD playse SE_KAIDAN removeobject 15 setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST - setvar VAR_0x405A, 7 + setvar VAR_RUSTBORO_STATE, 7 clearflag FLAG_SPECIAL_FLAG_0x4000 releaseall end @@ -302,9 +302,9 @@ RustboroCity_EventScript_1E09CD:: @ 81E09CD setobjectxyperm 9, 30, 10 clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 setflag FLAG_DEVON_GOODS_STOLEN - setvar VAR_0x405A, 2 + setvar VAR_RUSTBORO_STATE, 2 setvar VAR_RUSTURF_TUNNEL_STATE, 2 - setvar VAR_0x406F, 1 + setvar VAR_ROUTE116_STATE, 1 clearflag FLAG_HIDE_ROUTE_116_MR_BRINEY clearflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO clearflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT @@ -493,7 +493,7 @@ RustboroCity_EventScript_1E0B2E:: @ 81E0B2E compare VAR_TEMP_1, 3 call_if_eq RustboroCity_EventScript_1E0BF3 setflag FLAG_INTERACTED_WITH_DEVON_EMPLOYEE_GOODS_STOLEN - setvar VAR_0x405A, 3 + setvar VAR_RUSTBORO_STATE, 3 moveobjectoffscreen 9 msgbox RustboroCity_Text_1E183E, MSGBOX_DEFAULT releaseall @@ -596,7 +596,7 @@ RustboroCity_EventScript_1E0C5B:: @ 81E0C5B closemessage setflag FLAG_RETURNED_DEVON_GOODS setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 - setvar VAR_0x405A, 5 + setvar VAR_RUSTBORO_STATE, 5 delay 30 warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2 waitstate @@ -840,7 +840,7 @@ RustboroCity_EventScript_1E100B:: @ 81E100B closemessage delay 30 setflag FLAG_ENABLE_RIVAL_MATCH_CALL - setvar VAR_0x405A, 8 + setvar VAR_RUSTBORO_STATE, 8 setvar VAR_0x4063, 2 setvar VAR_0x8008, 0 msgbox RustboroCity_Text_1E1AFA, MSGBOX_YESNO @@ -911,7 +911,7 @@ RustboroCity_EventScript_1E1114:: @ 81E1114 closemessage delay 30 setflag FLAG_ENABLE_RIVAL_MATCH_CALL - setvar VAR_0x405A, 8 + setvar VAR_RUSTBORO_STATE, 8 setvar VAR_0x4063, 2 msgbox RustboroCity_Text_1E1E34, MSGBOX_YESNO compare VAR_RESULT, 1 diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index cce9ae394b..cd088382d0 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -281,7 +281,7 @@ RustboroCity_DevonCorp_2F_EventScript_211BCF:: @ 8211BCF faceplayer compare VAR_0x40C4, 1 call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 - compare VAR_0x405A, 6 + compare VAR_RUSTBORO_STATE, 6 goto_if_ge RustboroCity_DevonCorp_2F_EventScript_211BF1 msgbox RustboroCity_DevonCorp_2F_Text_212338, MSGBOX_DEFAULT release diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index 9d5fbe58bc..3478717838 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -5,7 +5,7 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 821242D .byte 0 RustboroCity_DevonCorp_3F_MapScript1_21243D: @ 821243D - compare VAR_0x408F, 0 + compare VAR_DEVON_CORP_3F_STATE, 0 call_if_eq RustboroCity_DevonCorp_3F_EventScript_212449 end @@ -15,7 +15,7 @@ RustboroCity_DevonCorp_3F_EventScript_212449:: @ 8212449 return RustboroCity_DevonCorp_3F_MapScript2_212455: @ 8212455 - map_script_2 VAR_0x408F, 0, RustboroCity_DevonCorp_3F_EventScript_21245F + map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_21245F .2byte 0 RustboroCity_DevonCorp_3F_EventScript_21245F:: @ 821245F @@ -23,7 +23,7 @@ RustboroCity_DevonCorp_3F_EventScript_21245F:: @ 821245F end RustboroCity_DevonCorp_3F_MapScript2_212464: @ 8212464 - map_script_2 VAR_0x408F, 0, RustboroCity_DevonCorp_3F_EventScript_21246E + map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_21246E .2byte 0 RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E @@ -65,10 +65,10 @@ RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO - setvar VAR_0x4096, 1 + setvar VAR_BRINEY_LOCATION, 1 clearflag FLAG_HIDE_RUSBORO_CITY_RIVAL - setvar VAR_0x408F, 1 - setvar VAR_0x405A, 6 + setvar VAR_DEVON_CORP_3F_STATE, 1 + setvar VAR_RUSTBORO_STATE, 6 releaseall end diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index 4581707ce7..6e844b0002 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -18,11 +18,11 @@ RustboroCity_Gym_EventScript_212F66:: @ 8212F66 msgbox RustboroCity_Gym_Text_213816, MSGBOX_DEFAULT setflag FLAG_DEFEATED_RUSTBORO_GYM setflag FLAG_BADGE01_GET - setvar VAR_0x405A, 1 - addvar VAR_0x4085, 1 + setvar VAR_RUSTBORO_STATE, 1 + addvar VAR_PETALBURG_GYM_STATE, 1 setvar VAR_0x8008, 1 call RustboroCity_Gym_EventScript_271F43 - compare VAR_0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 call_if_eq RustboroCity_Gym_EventScript_271E84 goto RustboroCity_Gym_EventScript_212FA4 end diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 59d0789ba6..f10ae75bac 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -345,8 +345,8 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 removeobject 7 clearflag FLAG_DEVON_GOODS_STOLEN setflag FLAG_RECOVERED_DEVON_GOODS - setvar VAR_0x405A, 4 - setvar VAR_0x4090, 1 + setvar VAR_RUSTBORO_STATE, 4 + setvar VAR_BRINEY_HOUSE_STATE, 1 setflag FLAG_HIDE_ROUTE_116_MR_BRINEY release end diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 6ab802ee48..151550dec0 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -118,7 +118,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23503A waitmovement 0 msgbox SeafloorCavern_Room9_Text_235723, MSGBOX_DEFAULT - setvar VAR_0x407B, 1 + setvar VAR_ROUTE128_STATE, 1 setvar VAR_0x405E, 1 clearflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN clearflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 2e7859fba2..05e4bc0307 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -6,7 +6,7 @@ SlateportCity_MapScripts:: @ 81DCC61 SlateportCity_MapScript1_1DCC6C: @ 81DCC6C setvar VAR_0x40AA, 0 call SlateportCity_EventScript_1DCC8D - compare VAR_0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if_eq SlateportCity_EventScript_1DCC99 compare VAR_0x40D2, 1 call_if_eq SlateportCity_EventScript_1DCCE7 @@ -14,7 +14,7 @@ SlateportCity_MapScript1_1DCC6C: @ 81DCC6C SlateportCity_EventScript_1DCC8D:: @ 81DCC8D setflag FLAG_VISITED_SLATEPORT_CITY - setvar VAR_0x4086, 0 + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER return @@ -170,7 +170,7 @@ SlateportCity_EventScript_1DCE38:: @ 81DCE38 SlateportCity_EventScript_1DCE42:: @ 81DCE42 lock faceplayer - compare VAR_0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if_eq SlateportCity_EventScript_1DCE59 msgbox SlateportCity_Text_1DD81A, MSGBOX_DEFAULT release @@ -184,7 +184,7 @@ SlateportCity_EventScript_1DCE59:: @ 81DCE59 SlateportCity_EventScript_1DCE63:: @ 81DCE63 lock faceplayer - compare VAR_0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if_eq SlateportCity_EventScript_1DCE7A msgbox SlateportCity_Text_1DD8A6, MSGBOX_DEFAULT release @@ -198,7 +198,7 @@ SlateportCity_EventScript_1DCE7A:: @ 81DCE7A SlateportCity_EventScript_1DCE84:: @ 81DCE84 lock faceplayer - compare VAR_0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if_eq SlateportCity_EventScript_1DCEA4 goto_if_set FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_1DCEAE msgbox SlateportCity_Text_1DD93D, MSGBOX_DEFAULT @@ -218,7 +218,7 @@ SlateportCity_EventScript_1DCEAE:: @ 81DCEAE SlateportCity_EventScript_1DCEB8:: @ 81DCEB8 lock faceplayer - compare VAR_0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if_eq SlateportCity_EventScript_1DCECF msgbox SlateportCity_Text_1DDA34, MSGBOX_DEFAULT release @@ -230,7 +230,7 @@ SlateportCity_EventScript_1DCECF:: @ 81DCECF end SlateportCity_EventScript_1DCED9:: @ 81DCED9 - compare VAR_0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 goto_if_eq SlateportCity_EventScript_1DCEED msgbox SlateportCity_Text_1DDA9A, MSGBOX_NPC end @@ -242,7 +242,7 @@ SlateportCity_EventScript_1DCEED:: @ 81DCEED SlateportCity_EventScript_1DCEF6:: @ 81DCEF6 lock faceplayer - compare VAR_0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if_eq SlateportCity_EventScript_1DCF0D msgbox SlateportCity_Text_1DDB21, MSGBOX_DEFAULT release @@ -323,7 +323,7 @@ SlateportCity_EventScript_1DCFB2:: @ 81DCFB2 SlateportCity_EventScript_1DCFBB:: @ 81DCFBB lock faceplayer - compare VAR_0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if_eq SlateportCity_EventScript_1DCFD2 msgbox SlateportCity_Text_1DE10E, MSGBOX_DEFAULT release @@ -609,7 +609,7 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE - setvar VAR_0x4058, 2 + setvar VAR_SLATEPORT_STATE, 2 warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14 waitstate releaseall diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc index c929633dd0..5c3fe86dbb 100644 --- a/data/maps/VerdanturfTown/scripts.inc +++ b/data/maps/VerdanturfTown/scripts.inc @@ -4,7 +4,7 @@ VerdanturfTown_MapScripts:: @ 81EB566 VerdanturfTown_MapScript1_1EB56C: @ 81EB56C setflag FLAG_VISITED_VERDANTURF_TOWN - setvar VAR_0x4086, 0 + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 end VerdanturfTown_EventScript_1EB575:: @ 81EB575 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index b73d7e1fac..94c883363c 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -101,14 +101,14 @@ RustboroCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C SlateportCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C SootopolisCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C - map_script_2 VAR_0x4087, 1, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_0x4087, 2, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_0x4087, 5, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_0x4087, 3, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_0x4087, 4, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_0x4087, 6, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_0x4087, 7, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_0x4087, 8, OldaleTown_PokemonCenter_2F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, 2, OldaleTown_PokemonCenter_2F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, 5, OldaleTown_PokemonCenter_2F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, 3, OldaleTown_PokemonCenter_2F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, 4, OldaleTown_PokemonCenter_2F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, 6, OldaleTown_PokemonCenter_2F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, 7, OldaleTown_PokemonCenter_2F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, 8, OldaleTown_PokemonCenter_2F_EventScript_276BAE .2byte 0 MossdeepCity_GameCorner_1F_EventScript_276BAE:: @ 8276BAE @@ -138,21 +138,21 @@ RustboroCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE SlateportCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE SootopolisCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE - compare VAR_0x4087, 1 + compare VAR_CABLE_CLUB_STATE, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 - compare VAR_0x4087, 2 + compare VAR_CABLE_CLUB_STATE, 2 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 - compare VAR_0x4087, 5 + compare VAR_CABLE_CLUB_STATE, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 - compare VAR_0x4087, 3 + compare VAR_CABLE_CLUB_STATE, 3 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C1D - compare VAR_0x4087, 4 + compare VAR_CABLE_CLUB_STATE, 4 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C23 - compare VAR_0x4087, 6 + compare VAR_CABLE_CLUB_STATE, 6 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C29 - compare VAR_0x4087, 7 + compare VAR_CABLE_CLUB_STATE, 7 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C2F - compare VAR_0x4087, 8 + compare VAR_CABLE_CLUB_STATE, 8 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C35 end @@ -198,14 +198,14 @@ SlateportCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B SootopolisCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B map_script_2 VAR_0x40CD, 1, OldaleTown_PokemonCenter_2F_EventScript_276DE0 - map_script_2 VAR_0x4087, 1, OldaleTown_PokemonCenter_2F_EventScript_276C85 - map_script_2 VAR_0x4087, 2, OldaleTown_PokemonCenter_2F_EventScript_276C85 - map_script_2 VAR_0x4087, 5, OldaleTown_PokemonCenter_2F_EventScript_276C85 - map_script_2 VAR_0x4087, 3, OldaleTown_PokemonCenter_2F_EventScript_276CE7 - map_script_2 VAR_0x4087, 4, OldaleTown_PokemonCenter_2F_EventScript_276D2C - map_script_2 VAR_0x4087, 6, OldaleTown_PokemonCenter_2F_EventScript_276D6C - map_script_2 VAR_0x4087, 7, OldaleTown_PokemonCenter_2F_EventScript_276C85 - map_script_2 VAR_0x4087, 8, OldaleTown_PokemonCenter_2F_EventScript_276C9D + map_script_2 VAR_CABLE_CLUB_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276C85 + map_script_2 VAR_CABLE_CLUB_STATE, 2, OldaleTown_PokemonCenter_2F_EventScript_276C85 + map_script_2 VAR_CABLE_CLUB_STATE, 5, OldaleTown_PokemonCenter_2F_EventScript_276C85 + map_script_2 VAR_CABLE_CLUB_STATE, 3, OldaleTown_PokemonCenter_2F_EventScript_276CE7 + map_script_2 VAR_CABLE_CLUB_STATE, 4, OldaleTown_PokemonCenter_2F_EventScript_276D2C + map_script_2 VAR_CABLE_CLUB_STATE, 6, OldaleTown_PokemonCenter_2F_EventScript_276D6C + map_script_2 VAR_CABLE_CLUB_STATE, 7, OldaleTown_PokemonCenter_2F_EventScript_276C85 + map_script_2 VAR_CABLE_CLUB_STATE, 8, OldaleTown_PokemonCenter_2F_EventScript_276C9D .2byte 0 OldaleTown_PokemonCenter_2F_EventScript_276C85:: @ 8276C85 @@ -231,7 +231,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276C9D:: @ 8276C9D OldaleTown_PokemonCenter_2F_EventScript_276CB5:: @ 8276CB5 special CloseLink - setvar VAR_0x4087, 0 + setvar VAR_CABLE_CLUB_STATE, 0 compare VAR_0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D @@ -254,7 +254,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276CE7:: @ 8276CE7 OldaleTown_PokemonCenter_2F_EventScript_276CFF:: @ 8276CFF special CloseLink - setvar VAR_0x4087, 0 + setvar VAR_CABLE_CLUB_STATE, 0 compare VAR_0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735E @@ -276,7 +276,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276D2C:: @ 8276D2C OldaleTown_PokemonCenter_2F_EventScript_276D44:: @ 8276D44 special CloseLink - setvar VAR_0x4087, 0 + setvar VAR_CABLE_CLUB_STATE, 0 applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F waitmovement 0 compare VAR_0x8007, 0 @@ -298,7 +298,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276D6C:: @ 8276D6C end OldaleTown_PokemonCenter_2F_EventScript_276D84:: @ 8276D84 - setvar VAR_0x4087, 0 + setvar VAR_CABLE_CLUB_STATE, 0 compare VAR_0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735E @@ -450,7 +450,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD special HealPlayerParty special SavePlayerParty special LoadPlayerBag - copyvar VAR_0x4087, VAR_0x8004 + copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197 waitmessage call OldaleTown_PokemonCenter_2F_EventScript_277BE4 @@ -554,7 +554,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2770B2:: @ 82770B2 OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A setvar VAR_0x8004, 3 - copyvar VAR_0x4087, VAR_0x8004 + copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197 waitmessage call OldaleTown_PokemonCenter_2F_EventScript_277BE4 @@ -629,7 +629,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C setvar VAR_0x8004, 4 - copyvar VAR_0x4087, VAR_0x8004 + copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197 waitmessage call OldaleTown_PokemonCenter_2F_EventScript_277BE4 @@ -1030,7 +1030,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F closemessage special HealPlayerParty setvar VAR_0x8004, 6 - copyvar VAR_0x4087, VAR_0x8004 + copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 call OldaleTown_PokemonCenter_2F_EventScript_277BBE special DrawWholeMapView playse SE_TK_KASYA diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index f85ebd3d2a..b42b6505ff 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -1,7 +1,7 @@ LilycoveCity_ContestLobby_EventScript_279CC5:: @ 8279CC5 lock faceplayer - compare VAR_0x408A, 0 + compare VAR_CONTEST_PRIZE_PICKUP, 0 goto_if_ne LilycoveCity_ContestLobby_EventScript_279D13 call_if_set FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_279CEA call_if_unset FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_279CF3 @@ -21,7 +21,7 @@ LilycoveCity_ContestLobby_EventScript_279CF3:: @ 8279CF3 LilycoveCity_ContestLobby_EventScript_279D13:: @ 8279D13 msgbox LilycoveCity_ContestLobby_Text_27B67B, MSGBOX_DEFAULT - switch VAR_0x408A + switch VAR_CONTEST_PRIZE_PICKUP case 4, LilycoveCity_ContestLobby_EventScript_279D2C end @@ -29,7 +29,7 @@ LilycoveCity_ContestLobby_EventScript_279D2C:: @ 8279D2C giveitem_std ITEM_LUXURY_BALL compare VAR_RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_279D4B - setvar VAR_0x408A, 0 + setvar VAR_CONTEST_PRIZE_PICKUP, 0 closemessage release end @@ -181,7 +181,7 @@ LilycoveCity_ContestLobby_EventScript_279F87:: @ 8279F87 msgbox LilycoveCity_ContestLobby_Text_27B5E2, MSGBOX_DEFAULT closemessage releaseall - setvar VAR_0x4086, 1 + setvar VAR_LINK_CONTEST_ROOM_STATE, 1 return LinkContestRoom1_EventScript_279F97:: @ 8279F97 @@ -204,7 +204,7 @@ LinkContestRoom1_EventScript_279F97:: @ 8279F97 call LinkContestRoom1_EventScript_27A9D4 call LinkContestRoom1_EventScript_27AA1B call LinkContestRoom1_EventScript_27AB36 - setvar VAR_0x4086, 2 + setvar VAR_LINK_CONTEST_ROOM_STATE, 2 return LinkContestRoom1_EventScript_279FF2:: @ 8279FF2 @@ -271,7 +271,7 @@ LinkContestRoom1_EventScript_27A097:: @ 827A097 return LinkContestRoom1_EventScript_27A0B1:: @ 827A0B1 - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27A0C7 lockall msgbox LinkContestRoom1_Text_27B711, MSGBOX_DEFAULT @@ -391,7 +391,7 @@ LinkContestRoom1_EventScript_27A1D2:: @ 827A1D2 return LinkContestRoom1_EventScript_27A217:: @ 827A217 - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27A229 message LinkContestRoom1_Text_27B815 waitmessage @@ -419,7 +419,7 @@ LinkContestRoom1_EventScript_27A230:: @ 827A230 return LinkContestRoom1_EventScript_27A26C:: @ 827A26C - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27A280 msgbox LinkContestRoom1_Text_27B830, MSGBOX_DEFAULT return @@ -445,7 +445,7 @@ LinkContestRoom1_EventScript_27A297:: @ 827A297 return LinkContestRoom1_EventScript_27A2B9:: @ 827A2B9 - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27A2CA message LinkContestRoom1_Text_27B8F2 return @@ -483,15 +483,15 @@ LinkContestRoom1_EventScript_27A2D5:: @ 827A2D5 LinkContestRoom1_EventScript_27A34F:: @ 827A34F special sub_80F82FC - compare VAR_0x4088, 1 + compare VAR_CONTEST_LOCATION, 1 call_if_eq LinkContestRoom1_EventScript_27A454 - compare VAR_0x4088, 2 + compare VAR_CONTEST_LOCATION, 2 call_if_eq LinkContestRoom1_EventScript_27A4B2 - compare VAR_0x4088, 3 + compare VAR_CONTEST_LOCATION, 3 call_if_eq LinkContestRoom1_EventScript_27A510 - compare VAR_0x4088, 4 + compare VAR_CONTEST_LOCATION, 4 call_if_eq LinkContestRoom1_EventScript_27A56E - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 call_if_eq LinkContestRoom1_EventScript_27A5CC setvar VAR_TEMP_1, 9 setvar VAR_TEMP_2, 9 @@ -843,7 +843,7 @@ LinkContestRoom1_EventScript_27A801:: @ 827A801 return LinkContestRoom1_EventScript_27A853:: @ 827A853 - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27A867 msgbox LinkContestRoom1_Text_27B904, MSGBOX_DEFAULT return @@ -893,7 +893,7 @@ LinkContestRoom1_EventScript_27A8A5:: @ 827A8A5 return LinkContestRoom1_EventScript_27A8FB:: @ 827A8FB - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27A90F msgbox LinkContestRoom1_Text_27BA15, MSGBOX_DEFAULT return @@ -906,7 +906,7 @@ LinkContestRoom1_EventScript_27A90F:: @ 827A90F return LinkContestRoom1_EventScript_27A91E:: @ 827A91E - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27A932 msgbox LinkContestRoom1_Text_27BA30, MSGBOX_DEFAULT return @@ -919,7 +919,7 @@ LinkContestRoom1_EventScript_27A932:: @ 827A932 return LinkContestRoom1_EventScript_27A941:: @ 827A941 - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27A955 msgbox LinkContestRoom1_Text_27BAAC, MSGBOX_DEFAULT return @@ -932,7 +932,7 @@ LinkContestRoom1_EventScript_27A955:: @ 827A955 return LinkContestRoom1_EventScript_27A964:: @ 827A964 - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27A978 msgbox LinkContestRoom1_Text_27BB25, MSGBOX_DEFAULT return @@ -983,7 +983,7 @@ LinkContestRoom1_EventScript_27A9D4:: @ 827A9D4 return LinkContestRoom1_EventScript_27AA00:: @ 827AA00 - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27AA14 msgbox LinkContestRoom1_Text_27BB4C, MSGBOX_DEFAULT return @@ -996,7 +996,7 @@ LinkContestRoom1_EventScript_27AA14:: @ 827AA14 LinkContestRoom1_EventScript_27AA1B:: @ 827AA1B addvar VAR_TEMP_1, 1 lockall - compare VAR_0x4088, 1 + compare VAR_CONTEST_LOCATION, 1 call_if_gt LinkContestRoom1_EventScript_27AA6F applymovement 9, LinkContestRoom1_Movement_27AD3B applymovement 12, LinkContestRoom1_Movement_27AD3F @@ -1081,7 +1081,7 @@ LinkContestRoom1_EventScript_27AA6F:: @ 827AA6F return LinkContestRoom1_EventScript_27AB36:: @ 827AB36 - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27ABD8 call LinkContestRoom1_EventScript_27AB9E goto_if_set FLAG_TEMP_2, LinkContestRoom1_EventScript_27AB82 @@ -1135,7 +1135,7 @@ LinkContestRoom1_EventScript_27ABCE:: @ 827ABCE return LinkContestRoom1_EventScript_27ABD2:: @ 827ABD2 - setvar VAR_0x4099, 1 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1 return LinkContestRoom1_EventScript_27ABD8:: @ 827ABD8 @@ -1149,7 +1149,7 @@ LinkContestRoom1_EventScript_27ABD8:: @ 827ABD8 return LinkContestRoom1_EventScript_27ABF1:: @ 827ABF1 - setvar VAR_0x4099, 2 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2 return LinkContestRoom1_EventScript_27ABF7:: @ 827ABF7 @@ -1201,7 +1201,7 @@ LinkContestRoom1_EventScript_27AC5E:: @ 827AC5E return LinkContestRoom1_EventScript_27AC77:: @ 827AC77 - compare VAR_0x4088, 2 + compare VAR_CONTEST_LOCATION, 2 call_if_eq LinkContestRoom1_EventScript_27ABCE specialvar VAR_RESULT, sub_80F7F7C compare VAR_RESULT, 0 @@ -1218,7 +1218,7 @@ LinkContestRoom1_EventScript_27ACA8:: @ 827ACA8 call LinkContestRoom1_EventScript_27205E msgbox LinkContestRoom1_Text_27BC2F, MSGBOX_DEFAULT releaseall - setvar VAR_0x408A, 4 + setvar VAR_CONTEST_PRIZE_PICKUP, 4 return LinkContestRoom1_EventScript_27ACBD:: @ 827ACBD diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index eb29ef6e07..7214d43727 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -1,6 +1,6 @@ LittlerootTown_BrendansHouse_2F_EventScript_2926FE:: @ 82926FE LittlerootTown_MaysHouse_2F_EventScript_2926FE:: @ 82926FE - setvar VAR_0x4092, 5 + setvar VAR_LITTLEROOT_INTRO_STATE, 5 return LittlerootTown_BrendansHouse_1F_EventScript_292704:: @ 8292704 @@ -14,7 +14,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292758 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A46, MSGBOX_DEFAULT closemessage - setvar VAR_0x4092, 4 + setvar VAR_LITTLEROOT_INTRO_STATE, 4 applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292763 applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A6 waitmovement 0 @@ -63,7 +63,7 @@ LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799 msgbox LittlerootTown_BrendansHouse_2F_Text_1F8668, MSGBOX_DEFAULT call LittlerootTown_BrendansHouse_2F_EventScript_292849 delay 30 - setvar VAR_0x4092, 6 + setvar VAR_LITTLEROOT_INTRO_STATE, 6 setflag FLAG_SET_WALL_CLOCK setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1 setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 @@ -149,7 +149,7 @@ LittlerootTown_BrendansHouse_2F_Movement_292862: @ 8292862 LittlerootTown_BrendansHouse_1F_EventScript_292866:: @ 8292866 LittlerootTown_MaysHouse_1F_EventScript_292866:: @ 8292866 - setvar VAR_0x4092, 7 + setvar VAR_LITTLEROOT_INTRO_STATE, 7 releaseall end @@ -313,15 +313,15 @@ LittlerootTown_BrendansHouse_1F_EventScript_2929C5:: @ 82929C5 LittlerootTown_MaysHouse_1F_EventScript_2929C5:: @ 82929C5 lock faceplayer - compare VAR_0x4082, 4 + compare VAR_LITTLEROOT_HOUSES_STATE, 4 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F - compare VAR_0x408C, 4 + compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F goto_if_set FLAG_HAS_MATCH_CALL, LittlerootTown_BrendansHouse_1F_EventScript_292A19 goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_BrendansHouse_1F_EventScript_292A86 compare VAR_TEMP_1, 1 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A94 - compare VAR_0x4092, 7 + compare VAR_LITTLEROOT_INTRO_STATE, 7 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292AB0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT release @@ -513,8 +513,8 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 copyvar VAR_0x40D5, VAR_RESULT msgbox LittlerootTown_BrendansHouse_1F_Text_1F83A1, MSGBOX_DEFAULT closemessage - setvar VAR_0x4082, 4 - setvar VAR_0x408C, 4 + setvar VAR_LITTLEROOT_HOUSES_STATE, 4 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 4 releaseall end diff --git a/include/constants/vars.h b/include/constants/vars.h index fedc856572..a66b72cd0b 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -60,7 +60,7 @@ #define VAR_POISON_STEP_COUNTER 0x402B #define VAR_RESET_RTC_ENABLE 0x402C #define VAR_ENIGMA_BERRY_AVAILABLE 0x402D -#define VAR_0x402E 0x402E +#define VAR_0x402E 0x402E // Seems to be unused. #define VAR_FRONTIER_MANIAC_FACILITY 0x402F #define VAR_FRONTIER_GAMBLER_FACILITY 0x4030 @@ -97,22 +97,22 @@ #define VAR_0x404E 0x404E #define VAR_LOTAD_SIZE_RECORD 0x404F #define VAR_0x4050 0x4050 -#define VAR_0x4051 0x4051 +#define VAR_ROUTE102_ACCESSIBLE 0x4051 #define VAR_0x4052 0x4052 -#define VAR_0x4053 0x4053 +#define VAR_LAVARIDGE_RIVAL_STATE 0x4053 #define VAR_CURRENT_SECRET_BASE 0x4054 #define VAR_0x4055 0x4055 #define VAR_0x4056 0x4056 -#define VAR_0x4057 0x4057 -#define VAR_0x4058 0x4058 +#define VAR_PETALBURG_STATE 0x4057 +#define VAR_SLATEPORT_STATE 0x4058 #define VAR_0x4059 0x4059 -#define VAR_0x405A 0x405A +#define VAR_RUSTBORO_STATE 0x405A #define VAR_0x405B 0x405B #define VAR_0x405C 0x405C #define VAR_0x405D 0x405D #define VAR_0x405E 0x405E #define VAR_0x405F 0x405F -#define VAR_0x4060 0x4060 +#define VAR_ROUTE101_STATE 0x4060 #define VAR_0x4061 0x4061 #define VAR_0x4062 0x4062 #define VAR_0x4063 0x4063 @@ -121,58 +121,58 @@ #define VAR_0x4066 0x4066 #define VAR_0x4067 0x4067 #define VAR_0x4068 0x4068 -#define VAR_0x4069 0x4069 +#define VAR_ROUTE110_STATE 0x4069 #define VAR_0x406A 0x406A #define VAR_0x406B 0x406B #define VAR_0x406C 0x406C #define VAR_0x406D 0x406D #define VAR_0x406E 0x406E -#define VAR_0x406F 0x406F +#define VAR_ROUTE116_STATE 0x406F #define VAR_0x4070 0x4070 -#define VAR_0x4071 0x4071 -#define VAR_0x4072 0x4072 +#define VAR_ROUTE118_STATE 0x4071 +#define VAR_ROUTE119_STATE 0x4072 #define VAR_0x4073 0x4073 -#define VAR_0x4074 0x4074 +#define VAR_ROUTE121_STATE 0x4074 #define VAR_0x4075 0x4075 #define VAR_0x4076 0x4076 #define VAR_0x4077 0x4077 #define VAR_0x4078 0x4078 #define VAR_0x4079 0x4079 #define VAR_0x407A 0x407A -#define VAR_0x407B 0x407B +#define VAR_ROUTE128_STATE 0x407B #define VAR_0x407C 0x407C #define VAR_0x407D 0x407D #define VAR_0x407E 0x407E #define VAR_0x407F 0x407F #define VAR_0x4080 0x4080 #define VAR_0x4081 0x4081 -#define VAR_0x4082 0x4082 +#define VAR_LITTLEROOT_HOUSES_STATE 0x4082 #define VAR_0x4083 0x4083 -#define VAR_0x4084 0x4084 -#define VAR_0x4085 0x4085 -#define VAR_0x4086 0x4086 -#define VAR_0x4087 0x4087 -#define VAR_0x4088 0x4088 +#define VAR_BIRCH_LAB_STATE 0x4084 +#define VAR_PETALBURG_GYM_STATE 0x4085 +#define VAR_LINK_CONTEST_ROOM_STATE 0x4086 +#define VAR_CABLE_CLUB_STATE 0x4087 +#define VAR_CONTEST_LOCATION 0x4088 #define VAR_0x4089 0x4089 -#define VAR_0x408A 0x408A +#define VAR_CONTEST_PRIZE_PICKUP 0x408A #define VAR_0x408B 0x408B -#define VAR_0x408C 0x408C -#define VAR_0x408D 0x408D -#define VAR_0x408E 0x408E -#define VAR_0x408F 0x408F -#define VAR_0x4090 0x4090 +#define VAR_LITTLEROOT_HOUSES_STATE_2 0x408C +#define VAR_LITTLEROOT_RIVAL_STATE 0x408D +#define VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE 0x408E +#define VAR_DEVON_CORP_3F_STATE 0x408F +#define VAR_BRINEY_HOUSE_STATE 0x4090 #define VAR_0x4091 0x4091 -#define VAR_0x4092 0x4092 -#define VAR_0x4093 0x4093 -#define VAR_0x4094 0x4094 +#define VAR_LITTLEROOT_INTRO_STATE 0x4092 +#define VAR_MAUVILLE_GYM_STATE 0x4093 +#define VAR_LILYCOVE_MUSEUM_2F_STATE 0x4094 #define VAR_LILYCOVE_FAN_CLUB_STATE 0x4095 -#define VAR_0x4096 0x4096 +#define VAR_BRINEY_LOCATION 0x4096 #define VAR_0x4097 0x4097 -#define VAR_0x4098 0x4098 -#define VAR_0x4099 0x4099 +#define VAR_PETALBURG_WOODS_STATE 0x4098 +#define VAR_LILYCOVE_CONTEST_LOBBY_STATE 0x4099 #define VAR_RUSTURF_TUNNEL_STATE 0x409A #define VAR_0x409B 0x409B -#define VAR_0x409C 0x409C +#define VAR_ELITE_4_STATE 0x409C #define VAR_0x409D 0x409D #define VAR_0x409E 0x409E #define VAR_0x409F 0x409F diff --git a/src/contest_link_80F57C4.c b/src/contest_link_80F57C4.c index 485065d714..c0a79af814 100644 --- a/src/contest_link_80F57C4.c +++ b/src/contest_link_80F57C4.c @@ -372,12 +372,12 @@ static void sub_80F5CE4(u8 taskId) sub_80DEDA8(0xFE); gUnknown_02039F5C = 1; gUnknown_02039F5D = sub_80DEFA8(0xFE, 0); - var = VarGet(VAR_0x4086); - VarSet(VAR_0x4086, 0); + var = VarGet(VAR_LINK_CONTEST_ROOM_STATE); + VarSet(VAR_LINK_CONTEST_ROOM_STATE, 0); SetContinueGameWarpStatusToDynamicWarp(); TrySavingData(SAVE_LINK); ClearContinueGameWarpStatus2(); - VarSet(VAR_0x4086, var); + VarSet(VAR_LINK_CONTEST_ROOM_STATE, var); gTasks[taskId].data[0]++; break; case 1: diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index baed26cf81..c8adfbe0bc 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -1630,7 +1630,7 @@ void sub_8014210(u16 battleFlags) void sub_8014290(u16 arg0, u16 x, u16 y) { - VarSet(VAR_0x4087, arg0); + VarSet(VAR_CABLE_CLUB_STATE, arg0); SetWarpDestination(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x, y); SetDynamicWarpWithCoords(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x, y); WarpIntoMap(); @@ -1639,7 +1639,7 @@ void sub_8014290(u16 arg0, u16 x, u16 y) void sub_8014304(s8 mapGroup, s8 mapNum, s32 x, s32 y, u16 arg4) { gSpecialVar_0x8004 = arg4; - VarSet(VAR_0x4087, arg4); + VarSet(VAR_CABLE_CLUB_STATE, arg4); gFieldLinkPlayerCount = GetLinkPlayerCount(); gUnknown_03005DB4 = GetMultiplayerId(); SetCableClubWarp(); From cea5696f238acc7c2b868e46e92775f4a05ae1f4 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 22 Feb 2019 04:18:43 -0500 Subject: [PATCH 02/25] Finish moving pokeruby vars --- data/event_scripts.s | 4 +- .../scripts.inc | 12 +- .../BattleFrontier_OutsideEast/scripts.inc | 2 +- .../BattleFrontier_OutsideWest/scripts.inc | 2 +- data/maps/JaggedPass/scripts.inc | 2 +- data/maps/LittlerootTown/scripts.inc | 4 +- data/maps/MagmaHideout_1F/scripts.inc | 2 +- data/maps/MagmaHideout_4F/scripts.inc | 2 +- data/maps/MauvilleCity/scripts.inc | 2 +- data/maps/MauvilleCity_Gym/scripts.inc | 2 +- data/maps/MeteorFalls_1F_1R/map.json | 2 +- data/maps/MeteorFalls_1F_1R/scripts.inc | 2 +- .../MossdeepCity_SpaceCenter_2F/scripts.inc | 2 +- .../MossdeepCity_StevensHouse/scripts.inc | 6 +- data/maps/MtChimney/scripts.inc | 2 +- .../MtChimney_CableCarStation/scripts.inc | 8 +- data/maps/MtPyre_Summit/map.json | 12 +- data/maps/MtPyre_Summit/scripts.inc | 8 +- data/maps/NewMauville_Entrance/map.json | 2 +- data/maps/NewMauville_Entrance/scripts.inc | 4 +- data/maps/NewMauville_Inside/map.json | 2 +- data/maps/NewMauville_Inside/scripts.inc | 6 +- data/maps/OldaleTown/map.json | 6 +- data/maps/OldaleTown/scripts.inc | 2 +- data/maps/Route103/scripts.inc | 2 +- .../Route110_TrickHouseCorridor/scripts.inc | 2 +- data/maps/Route110_TrickHouseEnd/scripts.inc | 20 ++-- .../maps/Route110_TrickHouseEntrance/map.json | 8 +- .../Route110_TrickHouseEntrance/scripts.inc | 110 +++++++++--------- .../Route110_TrickHousePuzzle1/scripts.inc | 6 +- .../Route110_TrickHousePuzzle2/scripts.inc | 4 +- .../Route110_TrickHousePuzzle3/scripts.inc | 4 +- .../Route110_TrickHousePuzzle4/scripts.inc | 4 +- .../Route110_TrickHousePuzzle5/scripts.inc | 4 +- .../Route110_TrickHousePuzzle6/scripts.inc | 4 +- .../Route110_TrickHousePuzzle7/scripts.inc | 14 +-- .../Route110_TrickHousePuzzle8/scripts.inc | 4 +- data/maps/Route112/scripts.inc | 2 +- .../maps/Route112_CableCarStation/scripts.inc | 8 +- data/maps/Route113_GlassWorkshop/scripts.inc | 32 ++--- .../Route121_SafariZoneEntrance/scripts.inc | 6 +- .../RustboroCity_DevonCorp_2F/scripts.inc | 34 +++--- data/maps/SafariZone_South/scripts.inc | 8 +- data/maps/SeafloorCavern_Room9/map.json | 2 +- data/maps/SeafloorCavern_Room9/scripts.inc | 4 +- data/maps/SlateportCity/scripts.inc | 2 +- data/maps/SlateportCity_Harbor/map.json | 8 +- data/maps/SlateportCity_Harbor/scripts.inc | 6 +- .../SlateportCity_OceanicMuseum_1F/map.json | 4 +- .../scripts.inc | 4 +- .../SlateportCity_PokemonFanClub/scripts.inc | 8 +- data/maps/SootopolisCity/scripts.inc | 2 +- .../scripts.inc | 16 +-- .../scripts.inc | 6 +- data/maps/VictoryRoad_1F/map.json | 4 +- data/maps/VictoryRoad_1F/scripts.inc | 6 +- data/scripts/safari_zone.inc | 4 +- include/constants/vars.h | 64 +++++----- src/tv.c | 2 +- 59 files changed, 258 insertions(+), 258 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index b3ad9f771f..88a0f52ea1 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1114,7 +1114,7 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1 setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY clearflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY - setvar VAR_0x40C6, 2 + setvar VAR_STEVENS_HOUSE_STATE, 2 setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY clearflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL @@ -4560,7 +4560,7 @@ BattleFrontier_BattleTowerLobby_EventScript_28CC7A:: @ 828CC7A end BattleFrontier_BattleTowerLobby_EventScript_28CC84:: @ 828CC84 - compare VAR_0x40BC, 0 + compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 setvar VAR_0x8005, 7 special InterviewBefore diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index e1bec2c213..53c3335c31 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -231,7 +231,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE end BattleFrontier_BattleTowerLobby_EventScript_23E930:: @ 823E930 - setvar VAR_0x40BC, 1 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1 return BattleFrontier_BattleTowerLobby_EventScript_23E936:: @ 823E936 @@ -305,7 +305,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 - setvar VAR_0x40BC, 1 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1 goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 end @@ -385,7 +385,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 - setvar VAR_0x40BC, 0 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 end @@ -466,7 +466,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 - setvar VAR_0x40BC, 0 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 end @@ -995,7 +995,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3A6:: @ 823F3A6 BattleFrontier_BattleTowerLobby_EventScript_23F3AF:: @ 823F3AF incrementgamestat 30 - setvar VAR_0x40BC, 0 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 message BattleFrontier_BattleTowerLobby_Text_24144D waitmessage setvar VAR_0x8004, 6 @@ -1058,7 +1058,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F463:: @ 823F463 BattleFrontier_BattleTowerLobby_EventScript_23F496:: @ 823F496 incrementgamestat 30 - setvar VAR_0x40BC, 0 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 message BattleFrontier_BattleTowerLobby_Text_24144D waitmessage setvar VAR_0x8004, 6 diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index 9a90f23f95..2016df74cd 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -15,7 +15,7 @@ BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19 return BattleFrontier_OutsideEast_MapScript1_242C2D: @ 8242C2D - setvar VAR_0x40BC, 0 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 setflag FLAG_HIDE_BATTLE_TOWER_REPORTER call_if_unset FLAG_DEFEATED_SUDOWOODO, BattleFrontier_OutsideEast_EventScript_242C3F end diff --git a/data/maps/BattleFrontier_OutsideWest/scripts.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc index da57242597..e1ff2d0880 100644 --- a/data/maps/BattleFrontier_OutsideWest/scripts.inc +++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc @@ -3,7 +3,7 @@ BattleFrontier_OutsideWest_MapScripts:: @ 823D3E1 .byte 0 BattleFrontier_OutsideWest_MapScript1_23D3E7: @ 823D3E7 - setvar VAR_0x40BC, 0 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 setflag FLAG_HIDE_BATTLE_TOWER_REPORTER end diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 93788a7032..630b04b338 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -21,7 +21,7 @@ JaggedPass_EventScript_230685:: @ 8230685 return JaggedPass_MapScript1_23068B: @ 823068B - compare VAR_0x40BD, 1 + compare VAR_JAGGED_PASS_ASH_WEATHER, 1 call_if_eq JaggedPass_EventScript_230697 end diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 10ff40cb12..1487f999f6 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -16,7 +16,7 @@ LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB call_if_eq LittlerootTown_EventScript_1E7E5C compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 call_if_eq LittlerootTown_EventScript_1E7E5C - compare VAR_0x40C7, 1 + compare VAR_OLDALE_STATE, 1 call_if_eq LittlerootTown_EventScript_1E7E53 compare VAR_LITTLEROOT_RIVAL_STATE, 3 call_if_eq LittlerootTown_EventScript_1E7E4F @@ -39,7 +39,7 @@ LittlerootTown_EventScript_1E7E4F:: @ 81E7E4F return LittlerootTown_EventScript_1E7E53:: @ 81E7E53 - setvar VAR_0x40C7, 2 + setvar VAR_OLDALE_STATE, 2 setflag FLAG_HIDE_OLDALE_TOWN_RIVAL return diff --git a/data/maps/MagmaHideout_1F/scripts.inc b/data/maps/MagmaHideout_1F/scripts.inc index 56ad204a93..59bc42a7df 100644 --- a/data/maps/MagmaHideout_1F/scripts.inc +++ b/data/maps/MagmaHideout_1F/scripts.inc @@ -3,7 +3,7 @@ MagmaHideout_1F_MapScripts:: @ 8239880 .byte 0 MagmaHideout_1F_MapScript1_239886: @ 8239886 - setvar VAR_0x40BD, 0 + setvar VAR_JAGGED_PASS_ASH_WEATHER, 0 end MagmaHideout_1F_EventScript_23988C:: @ 823988C diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index 1bca8dac78..1fc5e777b3 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -64,7 +64,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 clearflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY setvar VAR_SLATEPORT_STATE, 1 setflag FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT - setvar VAR_0x40A0, 1 + setvar VAR_SLATEPORT_HARBOR_STATE, 1 fadescreen 1 removeobject 6 removeobject 2 diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 8d2971c438..5274d40db6 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -421,7 +421,7 @@ MauvilleCity_EventScript_1DF73A:: @ 81DF73A lock faceplayer goto_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF7B0 - compare VAR_0x40BA, 2 + compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq MauvilleCity_EventScript_1DF784 goto_if_set FLAG_GOT_BASEMENT_KEY_FROM_WATTSON, MauvilleCity_EventScript_1DF77A msgbox MauvilleCity_Text_1DFFE4, MSGBOX_DEFAULT diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index a095e8ff32..6611248e47 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -79,7 +79,7 @@ MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB compare VAR_RESULT, 1 goto_if_eq MauvilleCity_Gym_EventScript_20DFDE goto_if_unset FLAG_RECEIVED_TM34, MauvilleCity_Gym_EventScript_20DF8D - compare VAR_0x40BA, 2 + compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_20DFD4 msgbox MauvilleCity_Gym_Text_20E8E3, MSGBOX_DEFAULT release diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json index 3492e05bc6..586de013f4 100644 --- a/data/maps/MeteorFalls_1F_1R/map.json +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -195,7 +195,7 @@ "x": 14, "y": 18, "elevation": 4, - "var": "VAR_0x40BF", + "var": "VAR_METEOR_FALLS_STATE", "var_value": "0", "script": "MeteorFalls_1F_1R_EventScript_22BD5F" } diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index ea161ba232..07a0911b02 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -86,7 +86,7 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F setflag FLAG_HIDE_ROUTE_112_TEAM_MAGMA setflag FLAG_MET_ARCHIE_METEOR_FALLS setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT - setvar VAR_0x40BF, 1 + setvar VAR_METEOR_FALLS_STATE, 1 releaseall end diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 0602c9dad1..9ee00e67c4 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -315,7 +315,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 removeobject 4 setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN - setvar VAR_0x40C6, 1 + setvar VAR_STEVENS_HOUSE_STATE, 1 setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT removeobject 3 setobjectxyperm 3, 5, 6 diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 51f1ac16e1..0f6470de84 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -13,7 +13,7 @@ MossdeepCity_StevensHouse_EventScript_22279E:: @ 822279E return MossdeepCity_StevensHouse_MapScript1_2227A8: @ 82227A8 - compare VAR_0x40C6, 2 + compare VAR_STEVENS_HOUSE_STATE, 2 call_if_eq MossdeepCity_StevensHouse_EventScript_2227B4 end @@ -23,7 +23,7 @@ MossdeepCity_StevensHouse_EventScript_2227B4:: @ 82227B4 return MossdeepCity_StevensHouse_MapScript2_2227C0: @ 82227C0 - map_script_2 VAR_0x40C6, 1, MossdeepCity_StevensHouse_EventScript_2227CA + map_script_2 VAR_STEVENS_HOUSE_STATE, 1, MossdeepCity_StevensHouse_EventScript_2227CA .2byte 0 MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA @@ -48,7 +48,7 @@ MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA waitmovement 0 setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT setflag FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT - setvar VAR_0x40C6, 2 + setvar VAR_STEVENS_HOUSE_STATE, 2 releaseall end diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 3bfc33f6ab..65d1bf77d4 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -4,7 +4,7 @@ MtChimney_MapScripts:: @ 822EDC1 .byte 0 MtChimney_MapScript1_22EDCC: @ 822EDCC - setvar VAR_0x40BD, 1 + setvar VAR_JAGGED_PASS_ASH_WEATHER, 1 end MtChimney_MapScript1_22EDD2: @ 822EDD2 diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index 6c389e2ad3..850fd44d5b 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -4,7 +4,7 @@ MtChimney_CableCarStation_MapScripts:: @ 822ABFA .byte 0 MtChimney_CableCarStation_MapScript1_22AC05: @ 822AC05 - compare VAR_0x40A3, 1 + compare VAR_CABLE_CAR_STATION_STATE, 1 call_if_eq MtChimney_CableCarStation_EventScript_22AC11 end @@ -14,7 +14,7 @@ MtChimney_CableCarStation_EventScript_22AC11:: @ 822AC11 return MtChimney_CableCarStation_MapScript2_22AC1D: @ 822AC1D - map_script_2 VAR_0x40A3, 1, MtChimney_CableCarStation_EventScript_22AC27 + map_script_2 VAR_CABLE_CAR_STATION_STATE, 1, MtChimney_CableCarStation_EventScript_22AC27 .2byte 0 MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27 @@ -22,7 +22,7 @@ MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27 applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_22ACB4 applymovement 1, MtChimney_CableCarStation_Movement_22ACAA waitmovement 0 - setvar VAR_0x40A3, 0 + setvar VAR_CABLE_CAR_STATION_STATE, 0 setobjectxyperm 1, 6, 7 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN releaseall @@ -45,7 +45,7 @@ MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_22ACAF waitmovement 0 setvar VAR_0x8004, 1 - setvar VAR_0x40A3, 2 + setvar VAR_CABLE_CAR_STATION_STATE, 2 incrementgamestat 48 special CableCarWarp special CableCar diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json index fedde68e80..78780ba195 100644 --- a/data/maps/MtPyre_Summit/map.json +++ b/data/maps/MtPyre_Summit/map.json @@ -148,7 +148,7 @@ "x": 22, "y": 7, "elevation": 3, - "var": "VAR_0x40B9", + "var": "VAR_MT_PYRE_STATE", "var_value": "0", "script": "MtPyre_Summit_EventScript_232018" }, @@ -157,7 +157,7 @@ "x": 23, "y": 7, "elevation": 3, - "var": "VAR_0x40B9", + "var": "VAR_MT_PYRE_STATE", "var_value": "0", "script": "MtPyre_Summit_EventScript_232024" }, @@ -166,7 +166,7 @@ "x": 24, "y": 7, "elevation": 3, - "var": "VAR_0x40B9", + "var": "VAR_MT_PYRE_STATE", "var_value": "0", "script": "MtPyre_Summit_EventScript_232030" }, @@ -175,7 +175,7 @@ "x": 22, "y": 9, "elevation": 3, - "var": "VAR_0x40B9", + "var": "VAR_MT_PYRE_STATE", "var_value": "2", "script": "MtPyre_Summit_EventScript_2321EC" }, @@ -184,7 +184,7 @@ "x": 23, "y": 9, "elevation": 3, - "var": "VAR_0x40B9", + "var": "VAR_MT_PYRE_STATE", "var_value": "2", "script": "MtPyre_Summit_EventScript_2321F8" }, @@ -193,7 +193,7 @@ "x": 24, "y": 9, "elevation": 3, - "var": "VAR_0x40B9", + "var": "VAR_MT_PYRE_STATE", "var_value": "2", "script": "MtPyre_Summit_EventScript_232204" } diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 6eaf6265f0..8c83b1c56a 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -3,7 +3,7 @@ MtPyre_Summit_MapScripts:: @ 8231FF7 .byte 0 MtPyre_Summit_MapScript1_231FFD: @ 8231FFD - compare VAR_0x40B9, 2 + compare VAR_MT_PYRE_STATE, 2 call_if_eq MtPyre_Summit_EventScript_232009 end @@ -56,7 +56,7 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C fadedefaultbgm fadescreen 0 delay 20 - setvar VAR_0x40B9, 1 + setvar VAR_MT_PYRE_STATE, 1 compare VAR_0x8008, 0 call_if_eq MtPyre_Summit_EventScript_2320F7 compare VAR_0x8008, 1 @@ -165,7 +165,7 @@ MtPyre_Summit_EventScript_2321A2:: @ 82321A2 lock faceplayer goto_if_set FLAG_RETURNED_RED_OR_BLUE_ORB, MtPyre_Summit_EventScript_2321E2 - compare VAR_0x40B9, 3 + compare VAR_MT_PYRE_STATE, 3 call_if_ge MtPyre_Summit_EventScript_2321CB goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, MtPyre_Summit_EventScript_2321D8 msgbox MtPyre_Summit_Text_232AD8, MSGBOX_DEFAULT @@ -242,7 +242,7 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 waitmovement 0 removeobject 2 removeobject 8 - setvar VAR_0x40B9, 3 + setvar VAR_MT_PYRE_STATE, 3 releaseall end diff --git a/data/maps/NewMauville_Entrance/map.json b/data/maps/NewMauville_Entrance/map.json index 00467c1d9d..d36763350a 100644 --- a/data/maps/NewMauville_Entrance/map.json +++ b/data/maps/NewMauville_Entrance/map.json @@ -36,7 +36,7 @@ "x": 4, "y": 2, "elevation": 3, - "var": "VAR_0x40BA", + "var": "VAR_NEW_MAUVILLE_STATE", "var_value": "0", "script": "NewMauville_Entrance_EventScript_2372FF" } diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index d841f0374c..cc64f9eea1 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -4,7 +4,7 @@ NewMauville_Entrance_MapScripts:: @ 82372AD .byte 0 NewMauville_Entrance_MapScript1_2372B8: @ 82372B8 - compare VAR_0x40BA, 0 + compare VAR_NEW_MAUVILLE_STATE, 0 call_if_eq NewMauville_Entrance_EventScript_2372C4 end @@ -41,7 +41,7 @@ NewMauville_Entrance_EventScript_2372FF:: @ 82372FF setmetatile 5, 1, 717, 1 special DrawWholeMapView playse SE_BAN - setvar VAR_0x40BA, 1 + setvar VAR_NEW_MAUVILLE_STATE, 1 releaseall end diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json index fe79597031..b13d6059d5 100644 --- a/data/maps/NewMauville_Inside/map.json +++ b/data/maps/NewMauville_Inside/map.json @@ -215,7 +215,7 @@ "x": 33, "y": 6, "elevation": 3, - "var": "VAR_0x40BA", + "var": "VAR_NEW_MAUVILLE_STATE", "var_value": "1", "script": "NewMauville_Inside_EventScript_237725" } diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc index b3d9d868f9..1736617e96 100644 --- a/data/maps/NewMauville_Inside/scripts.inc +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -40,7 +40,7 @@ NewMauville_Inside_EventScript_237449:: @ 8237449 return NewMauville_Inside_MapScript1_23744D: @ 823744D - compare VAR_0x40BA, 2 + compare VAR_NEW_MAUVILLE_STATE, 2 call_if_eq NewMauville_Inside_EventScript_23773A end @@ -148,7 +148,7 @@ NewMauville_Inside_EventScript_237725:: @ 8237725 lockall msgbox NewMauville_Inside_Text_237932, MSGBOX_DEFAULT call NewMauville_Inside_EventScript_23773A - setvar VAR_0x40BA, 2 + setvar VAR_NEW_MAUVILLE_STATE, 2 releaseall end @@ -167,7 +167,7 @@ NewMauville_Inside_EventScript_23773A:: @ 823773A NewMauville_Inside_EventScript_23778F:: @ 823778F lockall - compare VAR_0x40BA, 2 + compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq NewMauville_Inside_EventScript_2377A5 msgbox NewMauville_Inside_Text_237896, MSGBOX_DEFAULT releaseall diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index 279960febb..98dcc9cf31 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -128,7 +128,7 @@ "x": 8, "y": 19, "elevation": 3, - "var": "VAR_0x40C7", + "var": "VAR_OLDALE_STATE", "var_value": "1", "script": "OldaleTown_EventScript_1E9086" }, @@ -137,7 +137,7 @@ "x": 9, "y": 19, "elevation": 3, - "var": "VAR_0x40C7", + "var": "VAR_OLDALE_STATE", "var_value": "1", "script": "OldaleTown_EventScript_1E90A6" }, @@ -146,7 +146,7 @@ "x": 10, "y": 19, "elevation": 3, - "var": "VAR_0x40C7", + "var": "VAR_OLDALE_STATE", "var_value": "1", "script": "OldaleTown_EventScript_1E90C6" } diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index 2c4cd2bd18..c112899131 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -280,7 +280,7 @@ OldaleTown_EventScript_1E911A:: @ 81E911A applymovement 4, OldaleTown_Movement_1E9177 waitmovement 0 removeobject 4 - setvar VAR_0x40C7, 2 + setvar VAR_OLDALE_STATE, 2 setflag FLAG_HIDE_OLDALE_TOWN_RIVAL releaseall end diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 208f1cb5a1..94644f69b3 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -143,7 +143,7 @@ Route103_EventScript_1EC5A2:: @ 81EC5A2 setvar VAR_BIRCH_LAB_STATE, 4 clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL setflag FLAG_DEFEATED_RIVAL_ROUTE103 - setvar VAR_0x40C7, 1 + setvar VAR_OLDALE_STATE, 1 clearflag FLAG_HIDE_OLDALE_TOWN_RIVAL savebgm MUS_DUMMY fadedefaultbgm diff --git a/data/maps/Route110_TrickHouseCorridor/scripts.inc b/data/maps/Route110_TrickHouseCorridor/scripts.inc index cf520c81f7..fee9476fa3 100644 --- a/data/maps/Route110_TrickHouseCorridor/scripts.inc +++ b/data/maps/Route110_TrickHouseCorridor/scripts.inc @@ -3,6 +3,6 @@ Route110_TrickHouseCorridor_MapScripts:: @ 826B903 .byte 0 Route110_TrickHouseCorridor_MapScript1_26B909: @ 826B909 - setvar VAR_0x40B5, 1 + setvar VAR_TRICK_HOUSE_STATE, 1 end diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 8326a7c02e..71766659ad 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -59,7 +59,7 @@ Route110_TrickHouseEnd_EventScript_26AD17:: @ 826AD17 Route110_TrickHouseEnd_EventScript_26AD84:: @ 826AD84 msgbox Route110_TrickHouseEnd_Text_26B0BC, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT - setvar VAR_0x40C1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_RARE_CANDY compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF @@ -72,7 +72,7 @@ Route110_TrickHouseEnd_EventScript_26AD84:: @ 826AD84 Route110_TrickHouseEnd_EventScript_26ADC0:: @ 826ADC0 msgbox Route110_TrickHouseEnd_Text_26B13B, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT - setvar VAR_0x40C1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_TIMER_BALL compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF @@ -85,7 +85,7 @@ Route110_TrickHouseEnd_EventScript_26ADC0:: @ 826ADC0 Route110_TrickHouseEnd_EventScript_26ADFC:: @ 826ADFC msgbox Route110_TrickHouseEnd_Text_26B1AD, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT - setvar VAR_0x40C1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_HARD_STONE compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF @@ -98,7 +98,7 @@ Route110_TrickHouseEnd_EventScript_26ADFC:: @ 826ADFC Route110_TrickHouseEnd_EventScript_26AE38:: @ 826AE38 msgbox Route110_TrickHouseEnd_Text_26B223, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT - setvar VAR_0x40C1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_SMOKE_BALL compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF @@ -111,7 +111,7 @@ Route110_TrickHouseEnd_EventScript_26AE38:: @ 826AE38 Route110_TrickHouseEnd_EventScript_26AE74:: @ 826AE74 msgbox Route110_TrickHouseEnd_Text_26B293, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT - setvar VAR_0x40C1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_TM12 compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF @@ -124,7 +124,7 @@ Route110_TrickHouseEnd_EventScript_26AE74:: @ 826AE74 Route110_TrickHouseEnd_EventScript_26AEB0:: @ 826AEB0 msgbox Route110_TrickHouseEnd_Text_26B315, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT - setvar VAR_0x40C1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_MAGNET compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF @@ -137,7 +137,7 @@ Route110_TrickHouseEnd_EventScript_26AEB0:: @ 826AEB0 Route110_TrickHouseEnd_EventScript_26AEEC:: @ 826AEEC msgbox Route110_TrickHouseEnd_Text_26B365, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT - setvar VAR_0x40C1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_PP_MAX compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF @@ -165,7 +165,7 @@ Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 waitmovement 0 delay 30 msgbox Route110_TrickHouseEnd_Text_26B485, MSGBOX_DEFAULT - setvar VAR_0x40C1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 call Route110_TrickHouseEnd_EventScript_26AFA5 compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_26B002 @@ -202,13 +202,13 @@ Route110_TrickHouseEnd_EventScript_26AFCF:: @ 826AFCF Route110_TrickHouseEnd_EventScript_26AFEF:: @ 826AFEF call Route110_TrickHouseEnd_EventScript_27205E msgbox Route110_TrickHouseEnd_Text_26B760, MSGBOX_DEFAULT - setvar VAR_0x40C1, 1 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 return Route110_TrickHouseEnd_EventScript_26B002:: @ 826B002 call Route110_TrickHouseEnd_EventScript_272071 msgbox Route110_TrickHouseEnd_Text_26B615, MSGBOX_DEFAULT - setvar VAR_0x40C1, 1 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 return Route110_TrickHouseEnd_EventScript_26B015:: @ 826B015 diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json index 59280848e1..ce188feecf 100644 --- a/data/maps/Route110_TrickHouseEntrance/map.json +++ b/data/maps/Route110_TrickHouseEntrance/map.json @@ -57,7 +57,7 @@ "x": 4, "y": 7, "elevation": 3, - "var": "VAR_0x40A5", + "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1", "var_value": "0", "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" }, @@ -66,7 +66,7 @@ "x": 5, "y": 6, "elevation": 3, - "var": "VAR_0x40A5", + "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1", "var_value": "0", "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" }, @@ -75,7 +75,7 @@ "x": 6, "y": 6, "elevation": 3, - "var": "VAR_0x40A5", + "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1", "var_value": "0", "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" }, @@ -84,7 +84,7 @@ "x": 7, "y": 7, "elevation": 3, - "var": "VAR_0x40A5", + "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1", "var_value": "0", "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" } diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index b2aa22f6c1..898d8d3742 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -6,19 +6,19 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8269A50 Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60 setflag FLAG_LANDMARK_TRICK_HOUSE - compare VAR_0x40B5, 1 + compare VAR_TRICK_HOUSE_STATE, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_269AF3 - compare VAR_0x40C1, 1 + compare VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_269AD7 - compare VAR_0x40A6, 1 + compare VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_269BB3 - compare VAR_0x40A7, 5 + compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 call_if_eq Route110_TrickHouseEntrance_EventScript_269B03 - compare VAR_0x40A7, 3 + compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 call_if_eq Route110_TrickHouseEntrance_EventScript_269B03 - compare VAR_0x40A7, 0 + compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0 call_if_eq Route110_TrickHouseEntrance_EventScript_269B03 - switch VAR_0x40A7 + switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 case 0, Route110_TrickHouseEntrance_EventScript_269BBB case 1, Route110_TrickHouseEntrance_EventScript_269BC1 case 3, Route110_TrickHouseEntrance_EventScript_269BC7 @@ -26,24 +26,24 @@ Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60 end Route110_TrickHouseEntrance_EventScript_269AD7:: @ 8269AD7 - setvar VAR_0x40A5, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1 compare VAR_0x4044, 8 goto_if_eq Route110_TrickHouseEntrance_EventScript_269AED - setvar VAR_0x40A7, 2 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2 end Route110_TrickHouseEntrance_EventScript_269AED:: @ 8269AED - setvar VAR_0x40A7, 6 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6 end Route110_TrickHouseEntrance_EventScript_269AF3:: @ 8269AF3 - setvar VAR_0x40B5, 0 - setvar VAR_0x40A7, 5 - setvar VAR_0x40A5, 1 + setvar VAR_TRICK_HOUSE_STATE, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1 end Route110_TrickHouseEntrance_EventScript_269B03:: @ 8269B03 - setvar VAR_0x40A7, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0 compare VAR_0x4044, 1 call_if_eq Route110_TrickHouseEntrance_EventScript_269B61 compare VAR_0x4044, 2 @@ -91,11 +91,11 @@ Route110_TrickHouseEntrance_EventScript_269B9D:: @ 8269B9D return Route110_TrickHouseEntrance_EventScript_269BA7:: @ 8269BA7 - setvar VAR_0x40A7, 4 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4 return Route110_TrickHouseEntrance_EventScript_269BAD:: @ 8269BAD - setvar VAR_0x40A7, 3 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 return Route110_TrickHouseEntrance_EventScript_269BB3:: @ 8269BB3 @@ -103,30 +103,30 @@ Route110_TrickHouseEntrance_EventScript_269BB3:: @ 8269BB3 end Route110_TrickHouseEntrance_EventScript_269BBB:: @ 8269BBB - setvar VAR_0x40A5, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 0 end Route110_TrickHouseEntrance_EventScript_269BC1:: @ 8269BC1 - setvar VAR_0x40A5, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1 end Route110_TrickHouseEntrance_EventScript_269BC7:: @ 8269BC7 - setvar VAR_0x40A5, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1 end Route110_TrickHouseEntrance_EventScript_269BCD:: @ 8269BCD - setvar VAR_0x40A5, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1 end Route110_TrickHouseEntrance_MapScript2_269BD3: @ 8269BD3 - map_script_2 VAR_0x40A6, 1, Route110_TrickHouseEntrance_EventScript_269C15 - map_script_2 VAR_0x40A7, 0, Route110_TrickHouseEntrance_EventScript_269C26 - map_script_2 VAR_0x40A7, 1, Route110_TrickHouseEntrance_EventScript_269CCC - map_script_2 VAR_0x40A7, 2, Route110_TrickHouseEntrance_EventScript_269CD0 - map_script_2 VAR_0x40A7, 3, Route110_TrickHouseEntrance_EventScript_269CD0 - map_script_2 VAR_0x40A7, 4, Route110_TrickHouseEntrance_EventScript_269CCC - map_script_2 VAR_0x40A7, 5, Route110_TrickHouseEntrance_EventScript_269CCC - map_script_2 VAR_0x40A7, 6, Route110_TrickHouseEntrance_EventScript_269CDF + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_269C15 + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0, Route110_TrickHouseEntrance_EventScript_269C26 + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1, Route110_TrickHouseEntrance_EventScript_269CCC + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2, Route110_TrickHouseEntrance_EventScript_269CD0 + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3, Route110_TrickHouseEntrance_EventScript_269CD0 + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4, Route110_TrickHouseEntrance_EventScript_269CCC + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5, Route110_TrickHouseEntrance_EventScript_269CCC + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6, Route110_TrickHouseEntrance_EventScript_269CDF .2byte 0 Route110_TrickHouseEntrance_EventScript_269C15:: @ 8269C15 @@ -199,7 +199,7 @@ Route110_TrickHouseEntrance_EventScript_269CDF:: @ 8269CDF end Route110_TrickHouseEntrance_MapScript2_269CEE: @ 8269CEE - map_script_2 VAR_0x40A6, 1, Route110_TrickHouseEntrance_EventScript_269CF8 + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_269CF8 .2byte 0 Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8 @@ -216,8 +216,8 @@ Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8 applymovement 1, Route110_TrickHouseEntrance_Movement_269E3F waitmovement 0 removeobject 1 - setvar VAR_0x40A7, 1 - setvar VAR_0x40A6, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 0 releaseall end @@ -227,7 +227,7 @@ Route110_TrickHouseEntrance_EventScript_269D39:: @ 8269D39 Route110_TrickHouseEntrance_EventScript_269D3B:: @ 8269D3B lockall - switch VAR_0x40A7 + switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 case 0, Route110_TrickHouseEntrance_EventScript_269D6E case 2, Route110_TrickHouseEntrance_EventScript_269E8F case 3, Route110_TrickHouseEntrance_EventScript_269E51 @@ -257,7 +257,7 @@ Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E compare VAR_0x4044, 7 call_if_eq Route110_TrickHouseEntrance_EventScript_269E2D closemessage - setvar VAR_0x40A6, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1 warpsilent MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2 waitstate releaseall @@ -430,8 +430,8 @@ Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7 end Route110_TrickHouseEntrance_EventScript_26A023:: @ 826A023 - setvar VAR_0x40C1, 0 - setvar VAR_0x40A7, 3 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6 waitmovement 0 releaseall @@ -475,14 +475,14 @@ Route110_TrickHouseEntrance_EventScript_26A09A:: @ 826A09A applymovement 1, Route110_TrickHouseEntrance_Movement_269E3F waitmovement 0 removeobject 1 - setvar VAR_0x40C1, 0 - setvar VAR_0x40A7, 5 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 releaseall end Route110_TrickHouseEntrance_EventScript_26A0D3:: @ 826A0D3 lockall - switch VAR_0x40A7 + switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 case 0, Route110_TrickHouseEntrance_EventScript_26A106 case 1, Route110_TrickHouseEntrance_EventScript_26A110 case 4, Route110_TrickHouseEntrance_EventScript_26A201 @@ -604,88 +604,88 @@ Route110_TrickHouseEntrance_EventScript_26A22A:: @ 826A22A end Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289 - compare VAR_0x40AB, 0 + compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle1_Text_26B98D, MSGBOX_DEFAULT playse SE_PIN - setvar VAR_0x40AB, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2 - compare VAR_0x40AC, 0 + compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle2_Text_26BCBA, MSGBOX_DEFAULT playse SE_PIN - setvar VAR_0x40AC, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB - compare VAR_0x40AD, 0 + compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle3_Text_26C609, MSGBOX_DEFAULT playse SE_PIN - setvar VAR_0x40AD, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304 - compare VAR_0x40AE, 0 + compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle4_Text_26C8C3, MSGBOX_DEFAULT playse SE_PIN - setvar VAR_0x40AE, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D - compare VAR_0x40AF, 0 + compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle5_Text_26D660, MSGBOX_DEFAULT playse SE_PIN - setvar VAR_0x40AF, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356 - compare VAR_0x40B0, 0 + compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle6_Text_26DE26, MSGBOX_DEFAULT playse SE_PIN - setvar VAR_0x40B0, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F - compare VAR_0x40B1, 0 + compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle7_EventScript_26E413, MSGBOX_DEFAULT playse SE_PIN - setvar VAR_0x40B1, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8 - compare VAR_0x40B2, 0 + compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle8_EventScript_26E864, MSGBOX_DEFAULT playse SE_PIN - setvar VAR_0x40B2, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall @@ -733,7 +733,7 @@ Route110_TrickHouseEntrance_EventScript_26A3F8:: @ 826A3F8 call_if_eq Route110_TrickHouseEntrance_EventScript_26A439 compare VAR_0x4044, 2 call_if_eq Route110_TrickHouseEntrance_EventScript_26A449 - setvar VAR_0x40A5, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1 end Route110_TrickHouseEntrance_EventScript_26A429:: @ 826A429 diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc index b34a9d5552..163f89e17f 100644 --- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle1_MapScripts:: @ 826B90F .byte 0 Route110_TrickHousePuzzle1_MapScript1_26B915: @ 826B915 - compare VAR_0x40AB, 2 + compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2 goto_if_eq Route110_TrickHousePuzzle1_EventScript_26B921 end @@ -13,13 +13,13 @@ Route110_TrickHousePuzzle1_EventScript_26B921:: @ 826B921 Route110_TrickHousePuzzle1_EventScript_26B92B:: @ 826B92B lockall - compare VAR_0x40AB, 0 + compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0 goto_if_eq Route110_TrickHousePuzzle1_EventScript_26B93D goto Route110_TrickHousePuzzle1_EventScript_26A3DB end Route110_TrickHousePuzzle1_EventScript_26B93D:: @ 826B93D - setvar VAR_0x40AB, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 1 goto Route110_TrickHousePuzzle1_EventScript_26A3E5 end diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc index 560d100601..8e13c9c8a3 100644 --- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -23,13 +23,13 @@ Route110_TrickHousePuzzle2_MapScript1_26BBAB: @ 826BBAB Route110_TrickHousePuzzle2_EventScript_26BBC0:: @ 826BBC0 lockall - compare VAR_0x40AC, 0 + compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0 goto_if_eq Route110_TrickHousePuzzle2_EventScript_26BBD2 goto Route110_TrickHousePuzzle2_EventScript_26A3DB end Route110_TrickHousePuzzle2_EventScript_26BBD2:: @ 826BBD2 - setvar VAR_0x40AC, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 1 goto Route110_TrickHousePuzzle2_EventScript_26A3E5 end diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc index b26c5473d3..40aea279f8 100644 --- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc @@ -291,13 +291,13 @@ Route110_TrickHousePuzzle3_EventScript_26C5A0:: @ 826C5A0 Route110_TrickHousePuzzle3_EventScript_26C5A7:: @ 826C5A7 lockall - compare VAR_0x40AD, 0 + compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0 goto_if_eq Route110_TrickHousePuzzle3_EventScript_26C5B9 goto Route110_TrickHousePuzzle3_EventScript_26A3DB end Route110_TrickHousePuzzle3_EventScript_26C5B9:: @ 826C5B9 - setvar VAR_0x40AD, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 1 goto Route110_TrickHousePuzzle3_EventScript_26A3E5 end diff --git a/data/maps/Route110_TrickHousePuzzle4/scripts.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc index 71bb32db8a..fcb10b3abc 100644 --- a/data/maps/Route110_TrickHousePuzzle4/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc @@ -3,13 +3,13 @@ Route110_TrickHousePuzzle4_MapScripts:: @ 826C860 Route110_TrickHousePuzzle4_EventScript_26C861:: @ 826C861 lockall - compare VAR_0x40AE, 0 + compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0 goto_if_eq Route110_TrickHousePuzzle4_EventScript_26C873 goto Route110_TrickHousePuzzle4_EventScript_26A3DB end Route110_TrickHousePuzzle4_EventScript_26C873:: @ 826C873 - setvar VAR_0x40AE, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 1 goto Route110_TrickHousePuzzle4_EventScript_26A3E5 end diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index 4c199a9933..acdf1279d7 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -13,13 +13,13 @@ Route110_TrickHousePuzzle5_MapScript1_26CAF6: @ 826CAF6 Route110_TrickHousePuzzle5_EventScript_26CB15:: @ 826CB15 lockall - compare VAR_0x40AF, 0 + compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0 goto_if_eq Route110_TrickHousePuzzle5_EventScript_26CB27 goto Route110_TrickHousePuzzle5_EventScript_26A3DB end Route110_TrickHousePuzzle5_EventScript_26CB27:: @ 826CB27 - setvar VAR_0x40AF, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 1 goto Route110_TrickHousePuzzle5_EventScript_26A3E5 end diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc index 2cb784b505..7e675b1e61 100644 --- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc @@ -17,13 +17,13 @@ Route110_TrickHousePuzzle6_EventScript_26DDC0:: @ 826DDC0 Route110_TrickHousePuzzle6_EventScript_26DDC4:: @ 826DDC4 lockall - compare VAR_0x40B0, 0 + compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0 goto_if_eq Route110_TrickHousePuzzle6_EventScript_26DDD6 goto Route110_TrickHousePuzzle6_EventScript_26A3DB end Route110_TrickHousePuzzle6_EventScript_26DDD6:: @ 826DDD6 - setvar VAR_0x40B0, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 1 goto Route110_TrickHousePuzzle6_EventScript_26A3E5 end diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index 3babdbd453..293621def7 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -68,7 +68,7 @@ Route110_TrickHousePuzzle7_EventScript_26E185:: @ 826E185 return Route110_TrickHousePuzzle7_MapScript1_26E198: @ 826E198 - compare VAR_0x40B6, 1 + compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 goto_if_eq Route110_TrickHousePuzzle7_EventScript_26E1B3 clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 @@ -81,33 +81,33 @@ Route110_TrickHousePuzzle7_EventScript_26E1B3:: @ 826E1B3 end Route110_TrickHousePuzzle7_MapScript1_26E1B4: @ 826E1B4 - compare VAR_0x40B6, 1 + compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 call_if_eq Route110_TrickHousePuzzle7_EventScript_26E0AC end Route110_TrickHousePuzzle7_MapScript2_26E1C0: @ 826E1C0 - map_script_2 VAR_0x40B6, 1, Route110_TrickHousePuzzle7_EventScript_26E1CA + map_script_2 VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1, Route110_TrickHousePuzzle7_EventScript_26E1CA .2byte 0 Route110_TrickHousePuzzle7_EventScript_26E1CA:: @ 826E1CA - setvar VAR_0x40B6, 0 + setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 0 end Route110_TrickHousePuzzle7_EventScript_26E1D0:: @ 826E1D0 lockall - compare VAR_0x40B1, 0 + compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0 goto_if_eq Route110_TrickHousePuzzle7_EventScript_26E1E2 goto Route110_TrickHousePuzzle7_EventScript_26A3DB end Route110_TrickHousePuzzle7_EventScript_26E1E2:: @ 826E1E2 - setvar VAR_0x40B1, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 1 goto Route110_TrickHousePuzzle7_EventScript_26A3E5 end Route110_TrickHousePuzzle7_EventScript_26E1ED:: @ 826E1ED lockall - setvar VAR_0x40B6, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 warpteleport MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 3, 19 waitstate releaseall diff --git a/data/maps/Route110_TrickHousePuzzle8/scripts.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc index 7efb9f67bb..dcb12e3663 100644 --- a/data/maps/Route110_TrickHousePuzzle8/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc @@ -3,13 +3,13 @@ Route110_TrickHousePuzzle8_MapScripts:: @ 826E801 Route110_TrickHousePuzzle8_EventScript_26E802:: @ 826E802 lockall - compare VAR_0x40B2, 0 + compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0 goto_if_eq Route110_TrickHousePuzzle8_EventScript_26E814 goto Route110_TrickHousePuzzle8_EventScript_26A3DB end Route110_TrickHousePuzzle8_EventScript_26E814:: @ 826E814 - setvar VAR_0x40B2, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 1 goto Route110_TrickHousePuzzle8_EventScript_26A3E5 end diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 995102fe73..787f680fb3 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -4,7 +4,7 @@ Route112_MapScripts:: @ 81F1DA8 Route112_MapScript1_1F1DAE: @ 81F1DAE clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE - setvar VAR_0x40BD, 0 + setvar VAR_JAGGED_PASS_ASH_WEATHER, 0 end Route112_EventScript_1F1DB7:: @ 81F1DB7 diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index a430a497e5..7a8fc9e8c4 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -5,7 +5,7 @@ Route112_CableCarStation_MapScripts:: @ 822AABE Route112_CableCarStation_MapScript1_22AAC9: @ 822AAC9 setescapewarp MAP_ROUTE112, 255, 28, 28 - compare VAR_0x40A3, 2 + compare VAR_CABLE_CAR_STATION_STATE, 2 call_if_eq Route112_CableCarStation_EventScript_22AADD end @@ -15,7 +15,7 @@ Route112_CableCarStation_EventScript_22AADD:: @ 822AADD return Route112_CableCarStation_MapScript2_22AAE9: @ 822AAE9 - map_script_2 VAR_0x40A3, 2, Route112_CableCarStation_EventScript_22AAF3 + map_script_2 VAR_CABLE_CAR_STATION_STATE, 2, Route112_CableCarStation_EventScript_22AAF3 .2byte 0 Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3 @@ -23,7 +23,7 @@ Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3 applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_22AB80 applymovement 1, Route112_CableCarStation_Movement_22AB76 waitmovement 0 - setvar VAR_0x40A3, 0 + setvar VAR_CABLE_CAR_STATION_STATE, 0 setobjectxyperm 1, 6, 7 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN releaseall @@ -46,7 +46,7 @@ Route112_CableCarStation_EventScript_22AB38:: @ 822AB38 applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_22AB7B waitmovement 0 setvar VAR_0x8004, 0 - setvar VAR_0x40A3, 1 + setvar VAR_CABLE_CAR_STATION_STATE, 1 incrementgamestat 48 special CableCarWarp special CableCar diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc index 959c277995..a42f92fc7d 100644 --- a/data/maps/Route113_GlassWorkshop/scripts.inc +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -4,26 +4,26 @@ Route113_GlassWorkshop_MapScripts:: @ 826ED03 Route113_GlassWorkshop_MapScript1_26ED09: @ 826ED09 setflag FLAG_LANDMARK_GLASS_WORKSHOP - compare VAR_0x40BE, 1 + compare VAR_GLASS_WORKSHOP_STATE, 1 call_if_eq Route113_GlassWorkshop_EventScript_26ED18 end Route113_GlassWorkshop_EventScript_26ED18:: @ 826ED18 - setvar VAR_0x40BE, 2 + setvar VAR_GLASS_WORKSHOP_STATE, 2 return Route113_GlassWorkshop_EventScript_26ED1E:: @ 826ED1E lock faceplayer - compare VAR_0x40BE, 10 + compare VAR_GLASS_WORKSHOP_STATE, 10 goto_if_ge Route113_GlassWorkshop_EventScript_26F090 - compare VAR_0x40BE, 2 + compare VAR_GLASS_WORKSHOP_STATE, 2 goto_if_eq Route113_GlassWorkshop_EventScript_26ED6E - compare VAR_0x40BE, 1 + compare VAR_GLASS_WORKSHOP_STATE, 1 goto_if_eq Route113_GlassWorkshop_EventScript_26ED64 msgbox Route113_GlassWorkshop_Text_26F19D, MSGBOX_DEFAULT giveitem_std ITEM_SOOT_SACK - setvar VAR_0x40BE, 1 + setvar VAR_GLASS_WORKSHOP_STATE, 1 msgbox Route113_GlassWorkshop_Text_26F252, MSGBOX_DEFAULT release end @@ -76,7 +76,7 @@ Route113_GlassWorkshop_EventScript_26EE1E:: @ 826EE1E msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_26F003 - setvar VAR_0x40BE, 10 + setvar VAR_GLASS_WORKSHOP_STATE, 10 subvar VAR_ASH_GATHER_COUNT, 250 goto Route113_GlassWorkshop_EventScript_26F00F end @@ -90,7 +90,7 @@ Route113_GlassWorkshop_EventScript_26EE5A:: @ 826EE5A msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_26F003 - setvar VAR_0x40BE, 11 + setvar VAR_GLASS_WORKSHOP_STATE, 11 subvar VAR_ASH_GATHER_COUNT, 500 goto Route113_GlassWorkshop_EventScript_26F00F end @@ -104,7 +104,7 @@ Route113_GlassWorkshop_EventScript_26EE96:: @ 826EE96 msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_26F003 - setvar VAR_0x40BE, 12 + setvar VAR_GLASS_WORKSHOP_STATE, 12 subvar VAR_ASH_GATHER_COUNT, 500 goto Route113_GlassWorkshop_EventScript_26F00F end @@ -118,7 +118,7 @@ Route113_GlassWorkshop_EventScript_26EED2:: @ 826EED2 msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_26F003 - setvar VAR_0x40BE, 13 + setvar VAR_GLASS_WORKSHOP_STATE, 13 subvar VAR_ASH_GATHER_COUNT, 1000 goto Route113_GlassWorkshop_EventScript_26F00F end @@ -132,7 +132,7 @@ Route113_GlassWorkshop_EventScript_26EF0E:: @ 826EF0E msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_26F003 - setvar VAR_0x40BE, 14 + setvar VAR_GLASS_WORKSHOP_STATE, 14 subvar VAR_ASH_GATHER_COUNT, 1000 goto Route113_GlassWorkshop_EventScript_26F00F end @@ -147,7 +147,7 @@ Route113_GlassWorkshop_EventScript_26EF4A:: @ 826EF4A msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_26F003 - setvar VAR_0x40BE, 15 + setvar VAR_GLASS_WORKSHOP_STATE, 15 subvar VAR_ASH_GATHER_COUNT, 6000 goto Route113_GlassWorkshop_EventScript_26F00F end @@ -162,7 +162,7 @@ Route113_GlassWorkshop_EventScript_26EF8B:: @ 826EF8B msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_26F003 - setvar VAR_0x40BE, 16 + setvar VAR_GLASS_WORKSHOP_STATE, 16 subvar VAR_ASH_GATHER_COUNT, 8000 goto Route113_GlassWorkshop_EventScript_26F00F end @@ -206,7 +206,7 @@ Route113_GlassWorkshop_EventScript_26F00F:: @ 826F00F call_if_eq Route113_GlassWorkshop_EventScript_26F047 compare VAR_0x8009, 1 call_if_eq Route113_GlassWorkshop_EventScript_26F05F - setvar VAR_0x40BE, 2 + setvar VAR_GLASS_WORKSHOP_STATE, 2 release end @@ -235,7 +235,7 @@ Route113_GlassWorkshop_EventScript_26F081:: @ 826F081 end Route113_GlassWorkshop_EventScript_26F090:: @ 826F090 - switch VAR_0x40BE + switch VAR_GLASS_WORKSHOP_STATE case 10, Route113_GlassWorkshop_EventScript_26F0E3 case 11, Route113_GlassWorkshop_EventScript_26F0F7 case 12, Route113_GlassWorkshop_EventScript_26F10B @@ -300,7 +300,7 @@ Route113_GlassWorkshop_EventScript_26F16F:: @ 826F16F call_if_eq Route113_GlassWorkshop_EventScript_26F047 compare VAR_0x8009, 1 call_if_eq Route113_GlassWorkshop_EventScript_26F05F - setvar VAR_0x40BE, 2 + setvar VAR_GLASS_WORKSHOP_STATE, 2 release end diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index d4ef73f9b1..d5afabfff2 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -3,14 +3,14 @@ Route121_SafariZoneEntrance_MapScripts:: @ 822BBBB .byte 0 Route121_SafariZoneEntrance_MapScript2_22BBC1: @ 822BBC1 - map_script_2 VAR_0x40A4, 1, Route121_SafariZoneEntrance_EventScript_22BBCB + map_script_2 VAR_SAFARI_ZONE_STATE, 1, Route121_SafariZoneEntrance_EventScript_22BBCB .2byte 0 Route121_SafariZoneEntrance_EventScript_22BBCB:: @ 822BBCB lockall applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BBDD waitmovement 0 - setvar VAR_0x40A4, 0 + setvar VAR_SAFARI_ZONE_STATE, 0 releaseall end @@ -81,7 +81,7 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48 applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BD18 waitmovement 0 special EnterSafariMode - setvar VAR_0x40A4, 2 + setvar VAR_SAFARI_ZONE_STATE, 2 clearflag FLAG_GOOD_LUCK_SAFARI_ZONE warp MAP_SAFARI_ZONE_SOUTH, 255, 32, 33 waitstate diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index cd088382d0..d5f50c25f5 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -3,18 +3,18 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 8211857 .byte 0 RustboroCity_DevonCorp_2F_MapScript1_21185D: @ 821185D - compare VAR_0x40C4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 end RustboroCity_DevonCorp_2F_EventScript_211869:: @ 8211869 - setvar VAR_0x40C4, 2 + setvar VAR_FOSSIL_RESURRECTION_STATE, 2 return RustboroCity_DevonCorp_2F_EventScript_21186F:: @ 821186F lock faceplayer - compare VAR_0x40C4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 msgbox RustboroCity_DevonCorp_2F_Text_211BFB, MSGBOX_DEFAULT release @@ -23,7 +23,7 @@ RustboroCity_DevonCorp_2F_EventScript_21186F:: @ 821186F RustboroCity_DevonCorp_2F_EventScript_211886:: @ 8211886 lock faceplayer - compare VAR_0x40C4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_2118A6 msgbox RustboroCity_DevonCorp_2F_Text_211C50, MSGBOX_DEFAULT @@ -38,7 +38,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118A6:: @ 82118A6 RustboroCity_DevonCorp_2F_EventScript_2118B0:: @ 82118B0 lock faceplayer - compare VAR_0x40C4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_2118D0 msgbox RustboroCity_DevonCorp_2F_Text_211D9F, MSGBOX_DEFAULT @@ -53,7 +53,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118D0:: @ 82118D0 RustboroCity_DevonCorp_2F_EventScript_2118DA:: @ 82118DA lock faceplayer - compare VAR_0x40C4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 msgbox RustboroCity_DevonCorp_2F_Text_211EE0, MSGBOX_DEFAULT release @@ -62,9 +62,9 @@ RustboroCity_DevonCorp_2F_EventScript_2118DA:: @ 82118DA RustboroCity_DevonCorp_2F_EventScript_2118F1:: @ 82118F1 lock faceplayer - compare VAR_0x40C4, 2 + compare VAR_FOSSIL_RESURRECTION_STATE, 2 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A03 - compare VAR_0x40C4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_2119F9 msgbox RustboroCity_DevonCorp_2F_Text_211F48, MSGBOX_DEFAULT checkitem ITEM_ROOT_FOSSIL, 1 @@ -96,8 +96,8 @@ RustboroCity_DevonCorp_2F_EventScript_211974:: @ 8211974 bufferitemname 0, ITEM_ROOT_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_212153, MSGBOX_DEFAULT takeitem ITEM_ROOT_FOSSIL, 1 - setvar VAR_0x40C4, 1 - setvar VAR_0x40C5, 1 + setvar VAR_FOSSIL_RESURRECTION_STATE, 1 + setvar VAR_WHICH_FOSSIL_REVIVED, 1 release end @@ -121,8 +121,8 @@ RustboroCity_DevonCorp_2F_EventScript_2119D2:: @ 82119D2 bufferitemname 0, ITEM_CLAW_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_212153, MSGBOX_DEFAULT takeitem ITEM_CLAW_FOSSIL, 1 - setvar VAR_0x40C4, 1 - setvar VAR_0x40C5, 2 + setvar VAR_FOSSIL_RESURRECTION_STATE, 1 + setvar VAR_WHICH_FOSSIL_REVIVED, 2 release end @@ -137,9 +137,9 @@ RustboroCity_DevonCorp_2F_EventScript_2119F9:: @ 82119F9 end RustboroCity_DevonCorp_2F_EventScript_211A03:: @ 8211A03 - compare VAR_0x40C5, 1 + compare VAR_WHICH_FOSSIL_REVIVED, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A1A - compare VAR_0x40C5, 2 + compare VAR_WHICH_FOSSIL_REVIVED, 2 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A2C end @@ -199,7 +199,7 @@ RustboroCity_DevonCorp_2F_EventScript_211AC4:: @ 8211AC4 return RustboroCity_DevonCorp_2F_EventScript_211AD7:: @ 8211AD7 - setvar VAR_0x40C4, 0 + setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_REVIVED_FOSSIL_MON release end @@ -248,7 +248,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B67:: @ 8211B67 return RustboroCity_DevonCorp_2F_EventScript_211B7A:: @ 8211B7A - setvar VAR_0x40C4, 0 + setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_REVIVED_FOSSIL_MON release end @@ -279,7 +279,7 @@ RustboroCity_DevonCorp_2F_EventScript_211BCD:: @ 8211BCD RustboroCity_DevonCorp_2F_EventScript_211BCF:: @ 8211BCF lock faceplayer - compare VAR_0x40C4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 compare VAR_RUSTBORO_STATE, 6 goto_if_ge RustboroCity_DevonCorp_2F_EventScript_211BF1 diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc index ab6f70f865..f43c4cb220 100644 --- a/data/maps/SafariZone_South/scripts.inc +++ b/data/maps/SafariZone_South/scripts.inc @@ -4,7 +4,7 @@ SafariZone_South_MapScripts:: @ 823D279 .byte 0 SafariZone_South_MapScript2_23D284: @ 823D284 - map_script_2 VAR_0x40A4, 2, SafariZone_South_EventScript_23D28E + map_script_2 VAR_SAFARI_ZONE_STATE, 2, SafariZone_South_EventScript_23D28E .2byte 0 SafariZone_South_EventScript_23D28E:: @ 823D28E @@ -14,12 +14,12 @@ SafariZone_South_EventScript_23D28E:: @ 823D28E applymovement 1, SafariZone_South_Movement_23D2C7 waitmovement 0 setobjectxyperm 1, 32, 34 - setvar VAR_0x40A4, 0 + setvar VAR_SAFARI_ZONE_STATE, 0 releaseall end SafariZone_South_MapScript1_23D2B1: @ 823D2B1 - compare VAR_0x40A4, 2 + compare VAR_SAFARI_ZONE_STATE, 2 call_if_eq SafariZone_South_EventScript_23D2BD end @@ -90,7 +90,7 @@ SafariZone_South_EventScript_23D359:: @ 823D359 end SafariZone_South_EventScript_23D373:: @ 823D373 - setvar VAR_0x40A4, 1 + setvar VAR_SAFARI_ZONE_STATE, 1 special ExitSafariMode warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json index fe02ad28b6..f4f7fd3362 100644 --- a/data/maps/SeafloorCavern_Room9/map.json +++ b/data/maps/SeafloorCavern_Room9/map.json @@ -121,7 +121,7 @@ "x": 17, "y": 42, "elevation": 3, - "var": "VAR_0x40A2", + "var": "VAR_SEAFLOOR_CAVERN_STATE", "var_value": "0", "script": "SeafloorCavern_Room9_EventScript_234DC9" } diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 151550dec0..cc13e7dc6a 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -133,8 +133,8 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setflag FLAG_SYS_WEATHER_CTRL setflag FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN - setvar VAR_0x40C6, 2 - setvar VAR_0x40A2, 1 + setvar VAR_STEVENS_HOUSE_STATE, 2 + setvar VAR_SEAFLOOR_CAVERN_STATE, 1 setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 05e4bc0307..a19696ecf8 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -4,7 +4,7 @@ SlateportCity_MapScripts:: @ 81DCC61 .byte 0 SlateportCity_MapScript1_1DCC6C: @ 81DCC6C - setvar VAR_0x40AA, 0 + setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0 call SlateportCity_EventScript_1DCC8D compare VAR_SLATEPORT_STATE, 1 call_if_eq SlateportCity_EventScript_1DCC99 diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json index 4c9b45683e..c61c5a5e66 100644 --- a/data/maps/SlateportCity_Harbor/map.json +++ b/data/maps/SlateportCity_Harbor/map.json @@ -155,7 +155,7 @@ "x": 8, "y": 11, "elevation": 3, - "var": "VAR_0x40A0", + "var": "VAR_SLATEPORT_HARBOR_STATE", "var_value": "1", "script": "SlateportCity_Harbor_EventScript_20C9BB" }, @@ -164,7 +164,7 @@ "x": 8, "y": 12, "elevation": 3, - "var": "VAR_0x40A0", + "var": "VAR_SLATEPORT_HARBOR_STATE", "var_value": "1", "script": "SlateportCity_Harbor_EventScript_20C9C7" }, @@ -173,7 +173,7 @@ "x": 8, "y": 13, "elevation": 3, - "var": "VAR_0x40A0", + "var": "VAR_SLATEPORT_HARBOR_STATE", "var_value": "1", "script": "SlateportCity_Harbor_EventScript_20C9D3" }, @@ -182,7 +182,7 @@ "x": 8, "y": 14, "elevation": 3, - "var": "VAR_0x40A0", + "var": "VAR_SLATEPORT_HARBOR_STATE", "var_value": "1", "script": "SlateportCity_Harbor_EventScript_20C9DF" } diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 24e139edfd..33f07f15b2 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -5,7 +5,7 @@ SlateportCity_Harbor_MapScripts:: @ 820C97D SlateportCity_Harbor_MapScript1_20C983: @ 820C983 setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 setvar VAR_TEMP_1, 0 - compare VAR_0x40A0, 1 + compare VAR_SLATEPORT_HARBOR_STATE, 1 call_if_eq SlateportCity_Harbor_EventScript_20C9A9 call_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_20C9A5 end @@ -62,7 +62,7 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 removeobject 6 removeobject 7 removeobject 8 - setvar VAR_0x40A0, 2 + setvar VAR_SLATEPORT_HARBOR_STATE, 2 setflag FLAG_MET_TEAM_AQUA_HARBOR setflag FLAG_HIDE_LILCOVE_MOTEL_SCOTT compare VAR_0x8008, 0 @@ -296,7 +296,7 @@ SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2 goto_if_set FLAG_BADGE07_GET, SlateportCity_Harbor_EventScript_20CD00 goto_if_set FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE, SlateportCity_Harbor_EventScript_20CCF6 goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, SlateportCity_Harbor_EventScript_20CCE9 - compare VAR_0x40A0, 2 + compare VAR_SLATEPORT_HARBOR_STATE, 2 goto_if_eq SlateportCity_Harbor_EventScript_20CCDF msgbox SlateportCity_Harbor_Text_20D232, MSGBOX_DEFAULT closemessage diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json index 517647bd10..eefb843f41 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json @@ -226,7 +226,7 @@ "x": 9, "y": 7, "elevation": 3, - "var": "VAR_0x40AA", + "var": "VAR_SLATEPORT_MUSEUM_1F_STATE", "var_value": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD9F" }, @@ -235,7 +235,7 @@ "x": 10, "y": 7, "elevation": 3, - "var": "VAR_0x40AA", + "var": "VAR_SLATEPORT_MUSEUM_1F_STATE", "var_value": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20ADB0" } diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index b574ce4489..a886905c03 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -42,7 +42,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8 updatemoneybox 0, 0 nop msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, MSGBOX_DEFAULT - setvar VAR_0x40AA, 1 + setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1 hidemoneybox nop nop @@ -63,7 +63,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AE18:: @ 820AE18 SlateportCity_OceanicMuseum_1F_EventScript_20AE39:: @ 820AE39 msgbox SlateportCity_OceanicMuseum_1F_Text_20B075, MSGBOX_DEFAULT - setvar VAR_0x40AA, 1 + setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1 hidemoneybox nop nop diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc index 3faf350fc4..be411211a3 100644 --- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -6,7 +6,7 @@ SlateportCity_PokemonFanClub_EventScript_209E96:: @ 8209E96 faceplayer goto_if_unset FLAG_ENTERED_LINK_CONTEST, SlateportCity_PokemonFanClub_EventScript_20A152 call_if_unset FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN, SlateportCity_PokemonFanClub_EventScript_20A172 - switch VAR_0x40B7 + switch VAR_SLATEPORT_FAN_CLUB_STATE case 0, SlateportCity_PokemonFanClub_EventScript_209ED2 case 1, SlateportCity_PokemonFanClub_EventScript_209EE5 case 2, SlateportCity_PokemonFanClub_EventScript_209F3B @@ -14,7 +14,7 @@ SlateportCity_PokemonFanClub_EventScript_209E96:: @ 8209E96 end SlateportCity_PokemonFanClub_EventScript_209ED2:: @ 8209ED2 - setvar VAR_0x40B7, 1 + setvar VAR_SLATEPORT_FAN_CLUB_STATE, 1 msgbox SlateportCity_PokemonFanClub_Text_20A445, MSGBOX_DEFAULT goto SlateportCity_PokemonFanClub_EventScript_209F45 end @@ -28,7 +28,7 @@ SlateportCity_PokemonFanClub_EventScript_209EE5:: @ 8209EE5 call_if_set FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_209FD0 compare VAR_TEMP_2, 5 call_if_eq SlateportCity_PokemonFanClub_EventScript_209FCA - compare VAR_0x40B7, 2 + compare VAR_SLATEPORT_FAN_CLUB_STATE, 2 goto_if_eq SlateportCity_PokemonFanClub_EventScript_209F3B msgbox SlateportCity_PokemonFanClub_Text_20A62A, MSGBOX_DEFAULT goto SlateportCity_PokemonFanClub_EventScript_209F45 @@ -59,7 +59,7 @@ SlateportCity_PokemonFanClub_EventScript_209F45:: @ 8209F45 end SlateportCity_PokemonFanClub_EventScript_209FCA:: @ 8209FCA - setvar VAR_0x40B7, 2 + setvar VAR_SLATEPORT_FAN_CLUB_STATE, 2 return SlateportCity_PokemonFanClub_EventScript_209FD0:: @ 8209FD0 diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 1cd4611e9e..dd85149128 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -1435,7 +1435,7 @@ SootopolisCity_EventScript_1E654C:: @ 81E654C setflag FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE clearflag FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE clearflag FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE - setvar VAR_0x40B9, 2 + setvar VAR_MT_PYRE_STATE, 2 warpsilent MAP_SOOTOPOLIS_CITY, 255, 31, 34 waitstate releaseall diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index 5db2042935..36e4ac18d3 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -8,7 +8,7 @@ SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E special CallFrontierUtilFunc compare VAR_RESULT, 0 call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D - compare VAR_0x40C0, 0 + compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 0 call_if_ne SootopolisCity_MysteryEventsHouse_1F_EventScript_227991 end @@ -25,9 +25,9 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227991:: @ 8227991 return SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D: @ 822799D - map_script_2 VAR_0x40C0, 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7 - map_script_2 VAR_0x40C0, 2, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7 - map_script_2 VAR_0x40C0, 3, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7 + map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7 + map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 2, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7 + map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 3, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7 .2byte 0 SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7 @@ -39,14 +39,14 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7 moveobjectoffscreen 1 applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6 waitmovement 0 - compare VAR_0x40C0, 1 + compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1 call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04 - compare VAR_0x40C0, 2 + compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 2 call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D - compare VAR_0x40C0, 3 + compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 3 call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16 special LoadPlayerParty - setvar VAR_0x40C0, 0 + setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 0 releaseall end diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc index 0de8651d7f..69c5412b8b 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc @@ -40,19 +40,19 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68 end SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF:: @ 8227ECF - setvar VAR_0x40C0, 3 + setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 3 msgbox SootopolisCity_MysteryEventsHouse_B1F_Text_227D40, MSGBOX_DEFAULT return SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD:: @ 8227EDD - setvar VAR_0x40C0, 1 + setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1 special ShowFieldMessageStringVar4 waitmessage waitbuttonpress return SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8:: @ 8227EE8 - setvar VAR_0x40C0, 2 + setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 2 special ShowFieldMessageStringVar4 waitmessage waitbuttonpress diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 65636a49e1..05eb2b7959 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -175,7 +175,7 @@ "x": 2, "y": 23, "elevation": 4, - "var": "VAR_0x40C3", + "var": "VAR_VICTORY_ROAD_1F_STATE", "var_value": "0", "script": "VictoryRoad_1F_EventScript_235DAF" }, @@ -184,7 +184,7 @@ "x": 3, "y": 23, "elevation": 4, - "var": "VAR_0x40C3", + "var": "VAR_VICTORY_ROAD_1F_STATE", "var_value": "0", "script": "VictoryRoad_1F_EventScript_235DC8" } diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 2d1c630273..20002c6c9e 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -3,9 +3,9 @@ VictoryRoad_1F_MapScripts:: @ 8235D7A .byte 0 VictoryRoad_1F_MapScript1_235D80: @ 8235D80 - compare VAR_0x40C3, 1 + compare VAR_VICTORY_ROAD_1F_STATE, 1 call_if_eq VictoryRoad_1F_EventScript_235D97 - compare VAR_0x40C3, 2 + compare VAR_VICTORY_ROAD_1F_STATE, 2 call_if_eq VictoryRoad_1F_EventScript_235DA3 end @@ -46,7 +46,7 @@ VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1 clearflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY moveobjectoffscreen 4 setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD - copyvar VAR_0x40C3, VAR_0x8008 + copyvar VAR_VICTORY_ROAD_1F_STATE, VAR_0x8008 releaseall end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 1fcf5d1662..3539e09706 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -1,11 +1,11 @@ EventScript_2A4B4C:: @ 82A4B4C - setvar VAR_0x40A4, 1 + setvar VAR_SAFARI_ZONE_STATE, 1 special ExitSafariMode setwarp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 end EventScript_2A4B5D:: @ 82A4B5D - setvar VAR_0x40A4, 1 + setvar VAR_SAFARI_ZONE_STATE, 1 special ExitSafariMode warp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate diff --git a/include/constants/vars.h b/include/constants/vars.h index a66b72cd0b..889b6692e5 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -176,46 +176,46 @@ #define VAR_0x409D 0x409D #define VAR_0x409E 0x409E #define VAR_0x409F 0x409F -#define VAR_0x40A0 0x40A0 +#define VAR_SLATEPORT_HARBOR_STATE 0x40A0 #define VAR_0x40A1 0x40A1 -#define VAR_0x40A2 0x40A2 -#define VAR_0x40A3 0x40A3 -#define VAR_0x40A4 0x40A4 -#define VAR_0x40A5 0x40A5 -#define VAR_0x40A6 0x40A6 -#define VAR_0x40A7 0x40A7 +#define VAR_SEAFLOOR_CAVERN_STATE 0x40A2 +#define VAR_CABLE_CAR_STATION_STATE 0x40A3 +#define VAR_SAFARI_ZONE_STATE 0x40A4 +#define VAR_TRICK_HOUSE_ENTRANCE_STATE_1 0x40A5 +#define VAR_TRICK_HOUSE_ENTRANCE_STATE_2 0x40A6 +#define VAR_TRICK_HOUSE_ENTRANCE_STATE_3 0x40A7 #define VAR_0x40A8 0x40A8 #define VAR_CYCLING_CHALLENGE_STATE 0x40A9 -#define VAR_0x40AA 0x40AA -#define VAR_0x40AB 0x40AB -#define VAR_0x40AC 0x40AC -#define VAR_0x40AD 0x40AD -#define VAR_0x40AE 0x40AE -#define VAR_0x40AF 0x40AF -#define VAR_0x40B0 0x40B0 -#define VAR_0x40B1 0x40B1 -#define VAR_0x40B2 0x40B2 +#define VAR_SLATEPORT_MUSEUM_1F_STATE 0x40AA +#define VAR_TRICK_HOUSE_PUZZLE_1_STATE 0x40AB +#define VAR_TRICK_HOUSE_PUZZLE_2_STATE 0x40AC +#define VAR_TRICK_HOUSE_PUZZLE_3_STATE 0x40AD +#define VAR_TRICK_HOUSE_PUZZLE_4_STATE 0x40AE +#define VAR_TRICK_HOUSE_PUZZLE_5_STATE 0x40AF +#define VAR_TRICK_HOUSE_PUZZLE_6_STATE 0x40B0 +#define VAR_TRICK_HOUSE_PUZZLE_7_STATE 0x40B1 +#define VAR_TRICK_HOUSE_PUZZLE_8_STATE 0x40B2 #define VAR_WEATHER_INSTITUTE_STATE 0x40B3 #define VAR_PORTHOLE_STATE 0x40B4 -#define VAR_0x40B5 0x40B5 -#define VAR_0x40B6 0x40B6 -#define VAR_0x40B7 0x40B7 +#define VAR_TRICK_HOUSE_STATE 0x40B5 // TODO: needs some further investigation +#define VAR_TRICK_HOUSE_PUZZLE_7_STATE_2 0x40B6 +#define VAR_SLATEPORT_FAN_CLUB_STATE 0x40B7 #define VAR_0x40B8 0x40B8 -#define VAR_0x40B9 0x40B9 -#define VAR_0x40BA 0x40BA +#define VAR_MT_PYRE_STATE 0x40B9 +#define VAR_NEW_MAUVILLE_STATE 0x40BA #define VAR_0x40BB 0x40BB -#define VAR_0x40BC 0x40BC -#define VAR_0x40BD 0x40BD -#define VAR_0x40BE 0x40BE -#define VAR_0x40BF 0x40BF -#define VAR_0x40C0 0x40C0 -#define VAR_0x40C1 0x40C1 +#define VAR_BRAVO_TRAINER_BATTLE_TOWER_ON 0x40BC +#define VAR_JAGGED_PASS_ASH_WEATHER 0x40BD +#define VAR_GLASS_WORKSHOP_STATE 0x40BE +#define VAR_METEOR_FALLS_STATE 0x40BF +#define VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE 0x40C0 +#define VAR_TRICK_HOUSE_PRIZE_PICKUP 0x40C1 #define VAR_PACIFIDLOG_TM_RECEIVED_DAY 0x40C2 -#define VAR_0x40C3 0x40C3 -#define VAR_0x40C4 0x40C4 -#define VAR_0x40C5 0x40C5 -#define VAR_0x40C6 0x40C6 -#define VAR_0x40C7 0x40C7 +#define VAR_VICTORY_ROAD_1F_STATE 0x40C3 +#define VAR_FOSSIL_RESURRECTION_STATE 0x40C4 +#define VAR_WHICH_FOSSIL_REVIVED 0x40C5 +#define VAR_STEVENS_HOUSE_STATE 0x40C6 +#define VAR_OLDALE_STATE 0x40C7 #define VAR_0x40C8 0x40C8 #define VAR_0x40C9 0x40C9 #define VAR_0x40CA 0x40CA diff --git a/src/tv.c b/src/tv.c index 5904efeb8d..2487210837 100644 --- a/src/tv.c +++ b/src/tv.c @@ -3603,7 +3603,7 @@ void GetMomOrDadStringForTVMessage(void) void sub_80F01B8(void) { - VarSet(VAR_0x40BC, 0); + VarSet(VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0); RemoveEventObjectByLocalIdAndMap(5, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); FlagSet(FLAG_HIDE_BATTLE_TOWER_REPORTER); } From b2866fae2126012f7d7b4db8b60e07ba344a5f97 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 22 Feb 2019 22:20:42 -0500 Subject: [PATCH 03/25] Document the weather state functions All weather types are now documented (including WEATHER_15) --- data/event_scripts.s | 8 +-- data/maps/SkyPillar_Outside/scripts.inc | 2 +- data/maps/SootopolisCity/scripts.inc | 4 +- data/specials.inc | 2 +- include/constants/weather.h | 2 +- include/field_weather.h | 10 ++-- src/cable_car.c | 8 +-- src/egg_hatch.c | 2 +- src/field_screen_effect.c | 10 ++-- src/field_specials.c | 5 +- src/field_weather.c | 15 +++--- src/field_weather_effect.c | 71 +++++++++++++------------ src/overworld.c | 2 +- src/start_menu.c | 18 +++---- 14 files changed, 81 insertions(+), 78 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index 1b8807ed76..4e7fa16223 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -2031,7 +2031,7 @@ Route130_EventScript_27207A:: @ 827207A Route131_EventScript_27207A:: @ 827207A SkyPillar_Outside_EventScript_27207A:: @ 827207A SootopolisCity_EventScript_27207A:: @ 827207A - setweather 15 + setweather WEATHER_ALTERNATING return DewfordTown_Gym_EventScript_27207E:: @ 827207E @@ -3655,14 +3655,14 @@ Route105_EventScript_273D17:: @ 8273D17 Route125_EventScript_273D17:: @ 8273D17 Route127_EventScript_273D17:: @ 8273D17 Route129_EventScript_273D17:: @ 8273D17 - setweather 13 + setweather WEATHER_RAIN_HEAVY return Route114_EventScript_273D1B:: @ 8273D1B Route115_EventScript_273D1B:: @ 8273D1B Route116_EventScript_273D1B:: @ 8273D1B Route118_EventScript_273D1B:: @ 8273D1B - setweather 12 + setweather WEATHER_DROUGHT return gUnknown_08273D1F:: @ 8273D1F @@ -3677,7 +3677,7 @@ gUnknown_08273D1F:: @ 8273D1F Route105_EventScript_273D31:: @ 8273D31 closemessage fadescreenswapbuffers 1 - setweather 2 + setweather WEATHER_SUNNY doweather call Route105_EventScript_273D6D special DrawWholeMapView diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index eb57d12277..abf8a6730a 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -72,7 +72,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 msgbox SkyPillar_Outside_Text_23950C, MSGBOX_DEFAULT closemessage setflag FLAG_SYS_WEATHER_CTRL - setweather WEATHER_15 + setweather WEATHER_ALTERNATING doweather special WaitWeather waitstate diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 1cd4611e9e..3ec8ebb808 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -214,7 +214,7 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946 special RemoveCameraObject delay 60 fadescreenspeed 1, 8 - setweather WEATHER_15 + setweather WEATHER_ALTERNATING doweather setvar VAR_0x8004, 0 special sub_813B7D8 @@ -314,7 +314,7 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82 special RemoveCameraObject delay 60 fadescreenspeed 1, 8 - setweather WEATHER_15 + setweather WEATHER_ALTERNATING doweather setvar VAR_0x8004, 0 special sub_813B7D8 diff --git a/data/specials.inc b/data/specials.inc index cbbd81dc1a..965bef117f 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -503,7 +503,7 @@ gSpecials:: @ 81DBA64 def_special sub_813B374 def_special sub_813B490 def_special sub_80A08CC - def_special sub_813B484 + def_special Unused_SetWeatherSunny def_special sub_81AFDA0 def_special sub_813B4E0 def_special ShouldDoBrailleRegicePuzzle diff --git a/include/constants/weather.h b/include/constants/weather.h index d0a81c34cc..d62e07474a 100644 --- a/include/constants/weather.h +++ b/include/constants/weather.h @@ -16,7 +16,7 @@ #define WEATHER_DROUGHT 12 #define WEATHER_RAIN_HEAVY 13 #define WEATHER_BUBBLES 14 -#define WEATHER_15 15 +#define WEATHER_ALTERNATING 15 #define WEATHER_ROUTE119_CYCLE 20 #define WEATHER_ROUTE123_CYCLE 21 diff --git a/include/field_weather.h b/include/field_weather.h index 2d73f2b949..ced8e255cc 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -140,9 +140,9 @@ extern const u16 gUnknown_083970E8[]; extern const u8 gWeatherFog1Tiles[]; void StartWeather(void); -void ChangeWeather(u8 weather); -void sub_80AB104(u8 weather); -void sub_80AB130(u8 weather); +void SetNextWeather(u8 weather); +void SetCurrentAndNextWeather(u8 weather); +void SetCurrentAndNextWeatherNoDelay(u8 weather); void sub_80ABC48(s8 gammaIndex); void sub_80ABC7C(u8 gammaIndex, u8 gammaTargetIndex, u8 gammaStepDelay); void FadeScreen(u8 mode, s8 delay); @@ -162,7 +162,7 @@ bool8 Weather_UpdateBlend(void); void sub_80AC274(u8 a); u8 GetCurrentWeather(void); void SetRainStrengthFromSoundEffect(u16 soundEffect); -void PlayRainSoundEffect(void); +void PlayRainStoppingSoundEffect(void); u8 IsWeatherChangeComplete(void); void SetWeatherScreenFadeOut(void); void sub_80AC3E4(void); @@ -233,6 +233,6 @@ void SetSav1WeatherFromCurrMapHeader(void); void SetWeather(u32 weather); void DoCurrentWeather(void); void UpdateWeatherPerDay(u16 increment); -void sub_80AEE84(void); +void DoPausedWeather(void); #endif // GUARD_WEATHER_H diff --git a/src/cable_car.c b/src/cable_car.c index 207a0c22d2..420bdd30f6 100755 --- a/src/cable_car.c +++ b/src/cable_car.c @@ -358,7 +358,7 @@ static void CleanupCableCar(void) HideBg(3); sub_8150B6C(0); gSpriteCoordOffsetX = 0; - sub_80AB130(WEATHER_NONE); + SetCurrentAndNextWeatherNoDelay(WEATHER_NONE); for (i = 0; i < 20; i++) gWeatherPtr->sprites.s2.ashSprites[i] = NULL; @@ -394,7 +394,7 @@ static void sub_81503E4(u8 taskId) case 0: if (sCableCar->timer == sCableCar->unk4) { - ChangeWeather(sCableCar->weather); + SetNextWeather(sCableCar->weather); sCableCar->state = 1; } break; @@ -798,7 +798,7 @@ static void LoadCableCarSprites(void) gSprites[spriteId].data[1] = 99; sCableCar->weather = WEATHER_ASH; sCableCar->unk4 = 0x15e; - sub_80AB130(WEATHER_SUNNY); + SetCurrentAndNextWeatherNoDelay(WEATHER_SUNNY); break; case 1: CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x24, 24, 26, 12, 3, 17); @@ -822,7 +822,7 @@ static void LoadCableCarSprites(void) gSprites[spriteId].data[1] = 0x41; sCableCar->weather = WEATHER_SUNNY; sCableCar->unk4 = 0x109; - sub_80AB130(WEATHER_ASH); + SetCurrentAndNextWeatherNoDelay(WEATHER_ASH); break; } for (i = 0; i < 9; i++) diff --git a/src/egg_hatch.c b/src/egg_hatch.c index e1d94889a8..ba10206696 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -574,7 +574,7 @@ static void Task_EggHatchPlayBGM(u8 taskID) if (gTasks[taskID].data[0] == 0) { StopMapMusic(); - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); } if (gTasks[taskID].data[0] == 1) PlayBGM(MUS_ME_SHINKA); diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index 93017f1251..0a4f3212b6 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -503,7 +503,7 @@ void DoWarp(void) ScriptContext2_Enable(); TryFadeOutOldMapMusic(); WarpFadeScreen(); - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); PlaySE(SE_KAIDAN); gFieldCallback = mapldr_default; CreateTask(sub_80AFA0C, 10); @@ -514,7 +514,7 @@ void DoDiveWarp(void) ScriptContext2_Enable(); TryFadeOutOldMapMusic(); WarpFadeScreen(); - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); gFieldCallback = mapldr_default; CreateTask(sub_80AFA0C, 10); } @@ -524,7 +524,7 @@ void sub_80AF79C(void) ScriptContext2_Enable(); TryFadeOutOldMapMusic(); FadeScreen(FADE_TO_WHITE, 8); - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); gFieldCallback = sub_80AF3B0; CreateTask(sub_80AFA0C, 10); } @@ -734,7 +734,7 @@ static void sub_80AFA88(u8 taskId) case 4: TryFadeOutOldMapMusic(); WarpFadeScreen(); - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); task->data[0] = 0; task->func = sub_80AFA0C; break; @@ -771,7 +771,7 @@ void sub_80AFC60(void) ScriptContext2_Enable(); TryFadeOutOldMapMusic(); WarpFadeScreen(); - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); PlaySE(SE_KAIDAN); gFieldCallback = sub_80AF3C8; CreateTask(task0A_fade_n_map_maybe, 10); diff --git a/src/field_specials.c b/src/field_specials.c index 3c26085dde..307f813992 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -54,6 +54,7 @@ #include "constants/moves.h" #include "constants/vars.h" #include "constants/battle_frontier.h" +#include "constants/weather.h" EWRAM_DATA bool8 gBikeCyclingChallenge = FALSE; EWRAM_DATA u8 gBikeCollisions = 0; @@ -3527,9 +3528,9 @@ bool8 sub_813B3B0(void) } } -void sub_813B484(void) +void Unused_SetWeatherSunny(void) { - sub_80AB104(2); + SetCurrentAndNextWeather(WEATHER_SUNNY); } bool32 sub_813B490(void) diff --git a/src/field_weather.c b/src/field_weather.c index 0db635c604..9913e9a617 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -186,11 +186,11 @@ void StartWeather(void) } } -void ChangeWeather(u8 weather) +void SetNextWeather(u8 weather) { if (weather != WEATHER_RAIN_LIGHT && weather != WEATHER_RAIN_MED && weather != WEATHER_RAIN_HEAVY) { - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); } if (gWeatherPtr->nextWeather != weather && gWeatherPtr->currWeather == weather) @@ -203,18 +203,19 @@ void ChangeWeather(u8 weather) gWeatherPtr->finishStep = 0; } -void sub_80AB104(u8 weather) +void SetCurrentAndNextWeather(u8 weather) { - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); gWeatherPtr->currWeather = weather; gWeatherPtr->nextWeather = weather; } -void sub_80AB130(u8 weather) +void SetCurrentAndNextWeatherNoDelay(u8 weather) { - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); gWeatherPtr->currWeather = weather; gWeatherPtr->nextWeather = weather; + // Overrides the normal delay during screen fading. gWeatherPtr->readyForInit = TRUE; } @@ -1053,7 +1054,7 @@ void SetRainStrengthFromSoundEffect(u16 soundEffect) } } -void PlayRainSoundEffect(void) +void PlayRainStoppingSoundEffect(void) { if (IsSpecialSEPlaying()) { diff --git a/src/field_weather_effect.c b/src/field_weather_effect.c index 2ec51a7223..b81a8f5d25 100644 --- a/src/field_weather_effect.c +++ b/src/field_weather_effect.c @@ -16,8 +16,8 @@ void sub_80AC6B4(struct Sprite *); // EWRAM -EWRAM_DATA static u8 gUnknown_02038BC4 = 0; -EWRAM_DATA static u16 gUnknown_02038BC6 = 0; +EWRAM_DATA static u8 gCurrentAlternatingWeather = 0; +EWRAM_DATA static u16 gUnusedWeatherRelated = 0; // CONST const u16 gUnknown_0854C290[] = INCBIN_U16("graphics/weather/1.gbapal"); @@ -2286,13 +2286,14 @@ void unc_0807DAB4(struct Sprite *sprite) //------------------------------------------------------------------------------ -static void sub_80AEC94(u32 a0, u32 a1) +// Unused function. +static void UnusedSetCurrentAlternatingWeather(u32 a0, u32 a1) { - gUnknown_02038BC4 = a0; - gUnknown_02038BC6 = a1; + gCurrentAlternatingWeather = a0; + gUnusedWeatherRelated = a1; } -static void sub_80AECA8(u8 taskId) +static void Task_DoAlternatingWeather(u8 taskId) { s16 *data = gTasks[taskId].data; @@ -2301,8 +2302,8 @@ static void sub_80AECA8(u8 taskId) case 0: if (data[15]-- <= 0) { - ChangeWeather(data[1]); - gUnknown_02038BC4 = data[1]; + SetNextWeather(data[1]); + gCurrentAlternatingWeather = data[1]; data[15] = 600; data[0]++; } @@ -2310,8 +2311,8 @@ static void sub_80AECA8(u8 taskId) case 1: if (data[15]-- <= 0) { - ChangeWeather(data[2]); - gUnknown_02038BC4 = data[2]; + SetNextWeather(data[2]); + gCurrentAlternatingWeather = data[2]; data[15] = 600; data[0] = 0; } @@ -2319,25 +2320,25 @@ static void sub_80AECA8(u8 taskId) } } -static void sub_80AED28(void) +static void CreateAlternatingWeatherTask(void) { - u8 taskId = CreateTask(sub_80AECA8, 0); + u8 taskId = CreateTask(Task_DoAlternatingWeather, 0); s16 *data = gTasks[taskId].data; data[15] = 600; - if (gUnknown_02038BC4 == WEATHER_RAIN_HEAVY) + if (gCurrentAlternatingWeather == WEATHER_RAIN_HEAVY) { data[1] = WEATHER_DROUGHT; data[2] = WEATHER_RAIN_HEAVY; } - else if (gUnknown_02038BC4 == WEATHER_DROUGHT) + else if (gCurrentAlternatingWeather == WEATHER_DROUGHT) { data[1] = WEATHER_RAIN_HEAVY; data[2] = WEATHER_DROUGHT; } else { - gUnknown_02038BC4 = WEATHER_RAIN_HEAVY; + gCurrentAlternatingWeather = WEATHER_RAIN_HEAVY; data[1] = WEATHER_DROUGHT; data[2] = WEATHER_RAIN_HEAVY; } @@ -2368,51 +2369,51 @@ void SetSav1WeatherFromCurrMapHeader(void) void SetWeather(u32 weather) { SetSav1Weather(weather); - ChangeWeather(GetSav1Weather()); + SetNextWeather(GetSav1Weather()); } void SetWeather_Unused(u32 weather) { SetSav1Weather(weather); - sub_80AB104(GetSav1Weather()); + SetCurrentAndNextWeather(GetSav1Weather()); } void DoCurrentWeather(void) { u8 weather = GetSav1Weather(); - if (weather == WEATHER_15) + if (weather == WEATHER_ALTERNATING) { - if (!FuncIsActiveTask(sub_80AECA8)) - sub_80AED28(); - weather = gUnknown_02038BC4; + if (!FuncIsActiveTask(Task_DoAlternatingWeather)) + CreateAlternatingWeatherTask(); + weather = gCurrentAlternatingWeather; } else { - if (FuncIsActiveTask(sub_80AECA8)) - DestroyTask(FindTaskIdByFunc(sub_80AECA8)); - gUnknown_02038BC4 = WEATHER_RAIN_HEAVY; + if (FuncIsActiveTask(Task_DoAlternatingWeather)) + DestroyTask(FindTaskIdByFunc(Task_DoAlternatingWeather)); + gCurrentAlternatingWeather = WEATHER_RAIN_HEAVY; } - ChangeWeather(weather); + SetNextWeather(weather); } -void sub_80AEE84(void) +void DoPausedWeather(void) { u8 weather = GetSav1Weather(); - if (weather == WEATHER_15) + if (weather == WEATHER_ALTERNATING) { - if (!FuncIsActiveTask(sub_80AECA8)) - sub_80AED28(); - weather = gUnknown_02038BC4; + if (!FuncIsActiveTask(Task_DoAlternatingWeather)) + CreateAlternatingWeatherTask(); + weather = gCurrentAlternatingWeather; } else { - if (FuncIsActiveTask(sub_80AECA8)) - DestroyTask(FindTaskIdByFunc(sub_80AECA8)); - gUnknown_02038BC4 = WEATHER_RAIN_HEAVY; + if (FuncIsActiveTask(Task_DoAlternatingWeather)) + DestroyTask(FindTaskIdByFunc(Task_DoAlternatingWeather)); + gCurrentAlternatingWeather = WEATHER_RAIN_HEAVY; } - sub_80AB104(weather); + SetCurrentAndNextWeather(weather); } static const u8 sWeatherCycleRoute119[] = @@ -2449,7 +2450,7 @@ static u8 TranslateWeatherNum(u8 weather) case WEATHER_DROUGHT: return WEATHER_DROUGHT; case WEATHER_RAIN_HEAVY: return WEATHER_RAIN_HEAVY; case WEATHER_BUBBLES: return WEATHER_BUBBLES; - case WEATHER_15: return WEATHER_15; + case WEATHER_ALTERNATING: return WEATHER_ALTERNATING; case WEATHER_ROUTE119_CYCLE: return sWeatherCycleRoute119[gSaveBlock1Ptr->weatherCycleStage]; case WEATHER_ROUTE123_CYCLE: return sWeatherCycleRoute123[gSaveBlock1Ptr->weatherCycleStage]; default: return WEATHER_NONE; diff --git a/src/overworld.c b/src/overworld.c index 08fd94c1be..6f973f16be 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -2123,7 +2123,7 @@ static void sub_8086988(u32 a1) FieldEffectActiveListClear(); StartWeather(); - sub_80AEE84(); + DoPausedWeather(); if (!a1) SetUpFieldTasks(); mapheader_run_script_with_tag_x5(); diff --git a/src/start_menu.c b/src/start_menu.c index d5eec76d23..6efd7a04a1 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -91,7 +91,7 @@ extern void sub_80AF688(void); extern void var_800D_set_xB(void); extern void sub_808B864(void); extern void CB2_Pokedex(void); -extern void PlayRainSoundEffect(void); +extern void PlayRainStoppingSoundEffect(void); extern void CB2_PokeNav(void); extern void ScriptUnfreezeEventObjects(void); extern void save_serialize_map(void); @@ -608,7 +608,7 @@ static bool8 StartMenuPokedexCallback(void) if (!gPaletteFade.active) { IncrementGameStat(GAME_STAT_CHECKED_POKEDEX); - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); RemoveExtraStartMenuWindows(); CleanupOverworldWindowsAndTilemaps(); SetMainCallback2(CB2_Pokedex); @@ -623,7 +623,7 @@ static bool8 StartMenuPokemonCallback(void) { if (!gPaletteFade.active) { - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); RemoveExtraStartMenuWindows(); CleanupOverworldWindowsAndTilemaps(); SetMainCallback2(CB2_PartyMenuFromStartMenu); // Display party menu @@ -638,7 +638,7 @@ static bool8 StartMenuBagCallback(void) { if (!gPaletteFade.active) { - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); RemoveExtraStartMenuWindows(); CleanupOverworldWindowsAndTilemaps(); SetMainCallback2(CB2_BagMenuFromStartMenu); // Display bag menu @@ -653,7 +653,7 @@ static bool8 StartMenuPokeNavCallback(void) { if (!gPaletteFade.active) { - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); RemoveExtraStartMenuWindows(); CleanupOverworldWindowsAndTilemaps(); SetMainCallback2(CB2_PokeNav); // Display PokeNav @@ -668,7 +668,7 @@ static bool8 StartMenuPlayerNameCallback(void) { if (!gPaletteFade.active) { - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); RemoveExtraStartMenuWindows(); CleanupOverworldWindowsAndTilemaps(); @@ -699,7 +699,7 @@ static bool8 StartMenuOptionCallback(void) { if (!gPaletteFade.active) { - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); RemoveExtraStartMenuWindows(); CleanupOverworldWindowsAndTilemaps(); SetMainCallback2(CB2_InitOptionMenu); // Display option menu @@ -732,7 +732,7 @@ static bool8 StartMenuLinkModePlayerNameCallback(void) { if (!gPaletteFade.active) { - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); CleanupOverworldWindowsAndTilemaps(); ShowTrainerCardInLink(gUnknown_03005DB4, CB2_ReturnToFieldWithOpenMenu); @@ -761,7 +761,7 @@ static bool8 StartMenuBattlePyramidBagCallback(void) { if (!gPaletteFade.active) { - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); RemoveExtraStartMenuWindows(); CleanupOverworldWindowsAndTilemaps(); SetMainCallback2(CB2_PyramidBagMenuFromStartMenu); From 788caa4fe2fcc7bd4673e947f8f30a0a0d3899ef Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 23 Feb 2019 13:34:01 +0100 Subject: [PATCH 04/25] pokenav --- asm/pokenav.s | 1204 +++++++++++--------------------------------- include/graphics.h | 1 + src/pokenav.c | 734 +++++++++++++++++---------- 3 files changed, 763 insertions(+), 1176 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index 01ba420aa2..d568f4281f 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,645 +5,9 @@ .text - thumb_func_start sub_81C7CE4 -sub_81C7CE4: @ 81C7CE4 - push {r4,lr} - movs r0, 0 - bl sub_81C763C - ldr r2, [r0, 0x18] - movs r4, 0 - movs r1, 0xDC - strh r1, [r2, 0x20] - ldr r2, [r0, 0x18] - movs r1, 0xC - strh r1, [r2, 0x22] - ldr r2, [r0, 0x18] - ldr r1, =sub_81C7CB4 - str r1, [r2, 0x1C] - adds r2, 0x3E - ldrb r3, [r2] - movs r1, 0x5 - negs r1, r1 - ands r1, r3 - strb r1, [r2] - ldr r3, [r0, 0x18] - ldrb r2, [r3, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r2 - strb r1, [r3, 0x5] - ldr r0, [r0, 0x18] - adds r0, 0x43 - strb r4, [r0] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C7CE4 - thumb_func_start sub_81C7D28 -sub_81C7D28: @ 81C7D28 - push {r4-r7,lr} - mov r7, r8 - push {r7} - movs r0, 0 - bl sub_81C763C - adds r6, r0, 0 - ldr r0, =gUnknown_0861FA64 - bl LoadCompressedSpriteSheet - movs r0, 0x1 - bl AllocSpritePalette - movs r0, 0x2 - bl AllocSpritePalette - movs r5, 0 - ldr r0, =gSprites - mov r8, r0 - movs r7, 0x4 -_081C7D50: - ldr r0, =gUnknown_0861FB2C - movs r1, 0 - movs r2, 0 - movs r3, 0x1 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - lsls r4, r5, 2 - adds r2, r6, 0 - adds r2, 0x1C - adds r2, r4 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - add r0, r8 - str r0, [r2] - adds r0, 0x3E - ldrb r1, [r0] - orrs r1, r7 - strb r1, [r0] - ldr r1, [r2] - lsls r0, r5, 6 - strh r0, [r1, 0x24] - ldr r0, =gUnknown_0861FB44 - movs r1, 0 - movs r2, 0 - movs r3, 0x2 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - adds r2, r6, 0 - adds r2, 0x24 - adds r2, r4 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - add r0, r8 - str r0, [r2] - adds r0, 0x3E - ldrb r1, [r0] - orrs r1, r7 - strb r1, [r0] - ldr r1, [r2] - lsls r0, r5, 5 - strh r0, [r1, 0x24] - ldr r1, [r2] - movs r0, 0x12 - strh r0, [r1, 0x26] - ldr r3, [r2] - ldrh r2, [r3, 0x4] - lsls r1, r2, 22 - lsrs r1, 22 - lsls r0, r5, 3 - adds r0, 0x40 - adds r1, r0 - ldr r4, =0x000003ff - adds r0, r4, 0 - ands r1, r0 - ldr r4, =0xfffffc00 - adds r0, r4, 0 - ands r2, r0 - orrs r2, r1 - strh r2, [r3, 0x4] - adds r5, 0x1 - cmp r5, 0x1 - ble _081C7D50 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C7D28 - thumb_func_start sub_81C7DFC -sub_81C7DFC: @ 81C7DFC - push {lr} - cmp r0, 0x5 - bhi _081C7E08 - bl sub_81C7E58 - b _081C7E0E -_081C7E08: - subs r0, 0x6 - bl sub_81C7F24 -_081C7E0E: - pop {r0} - bx r0 - thumb_func_end sub_81C7DFC - thumb_func_start sub_81C7E14 -sub_81C7E14: @ 81C7E14 - push {r4,r5,lr} - adds r4, r0, 0 - movs r0, 0 - bl sub_81C763C - adds r5, r0, 0 - cmp r4, 0x4 - bne _081C7E30 - movs r0, 0x2 - bl GetSpriteTileStartByTag - ldr r3, [r5, 0x20] - adds r0, 0x20 - b _081C7E3A -_081C7E30: - movs r0, 0x2 - bl GetSpriteTileStartByTag - ldr r3, [r5, 0x20] - adds r0, 0x40 -_081C7E3A: - ldr r2, =0x000003ff - adds r1, r2, 0 - ands r0, r1 - ldrh r2, [r3, 0x4] - ldr r1, =0xfffffc00 - ands r1, r2 - orrs r1, r0 - strh r1, [r3, 0x4] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C7E14 - - thumb_func_start sub_81C7E58 -sub_81C7E58: @ 81C7E58 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - mov r9, r0 - cmp r0, 0x5 - bhi _081C7F16 - movs r0, 0 - bl sub_81C763C - adds r7, r0, 0 - ldr r0, =gUnknown_0861FA6C - mov r1, r9 - lsls r6, r1, 3 - adds r6, r0 - ldrh r4, [r6, 0x6] - ldr r2, [r6] - mov r8, r2 - mov r0, r8 - bl GetDecompressedDataSize - adds r5, r0, 0 - lsls r4, 5 - ldr r0, =gPokenavLeftHeader_Pal - adds r4, r0 - movs r0, 0x1 - bl IndexOfSpritePaletteTag - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 4 - movs r0, 0x80 - lsls r0, 17 - adds r1, r0 - lsrs r1, 16 - adds r0, r4, 0 - movs r2, 0x20 - bl LoadPalette - ldr r4, =gDecompressionBuffer - mov r0, r8 - adds r1, r4, 0 - bl LZ77UnCompWram - movs r0, 0x2 - bl GetSpriteTileStartByTag - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 11 - ldr r2, =0x06010000 - adds r1, r2 - lsls r5, 16 - lsrs r5, 16 - adds r0, r4, 0 - adds r2, r5, 0 - movs r3, 0x1 - bl RequestDma3Copy - movs r0, 0x2 - bl GetSpriteTileStartByTag - ldr r3, [r7, 0x20] - ldrh r1, [r6, 0x4] - adds r0, r1 - ldr r2, =0x000003ff - adds r1, r2, 0 - ands r0, r1 - ldrh r2, [r3, 0x4] - ldr r1, =0xfffffc00 - ands r1, r2 - orrs r1, r0 - strh r1, [r3, 0x4] - mov r0, r9 - subs r0, 0x4 - cmp r0, 0x1 - bhi _081C7F10 - ldr r1, [r7, 0x20] - movs r0, 0x38 - b _081C7F14 - .pool -_081C7F10: - ldr r1, [r7, 0x20] - movs r0, 0x40 -_081C7F14: - strh r0, [r1, 0x24] -_081C7F16: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_81C7E58 - - thumb_func_start sub_81C7F24 -sub_81C7F24: @ 81C7F24 - push {r4-r6,lr} - cmp r0, 0x6 - bhi _081C7F8A - ldr r2, =gUnknown_0861FA9C - lsls r1, r0, 3 - adds r0, r2, 0x4 - adds r0, r1, r0 - ldr r4, [r0] - adds r1, r2 - ldr r6, [r1] - adds r0, r6, 0 - bl GetDecompressedDataSize - adds r5, r0, 0 - lsls r4, 5 - ldr r0, =gPokenavLeftHeader_Pal - adds r4, r0 - movs r0, 0x2 - bl IndexOfSpritePaletteTag - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 4 - movs r0, 0x80 - lsls r0, 17 - adds r1, r0 - lsrs r1, 16 - adds r0, r4, 0 - movs r2, 0x20 - bl LoadPalette - ldr r4, =gDecompressionBuffer+0x1000 - adds r0, r6, 0 - adds r1, r4, 0 - bl LZ77UnCompWram - movs r0, 0x2 - bl GetSpriteTileStartByTag - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 11 - ldr r0, =0x06010800 - adds r1, r0 - lsls r5, 16 - lsrs r5, 16 - adds r0, r4, 0 - adds r2, r5, 0 - movs r3, 0x1 - bl RequestDma3Copy -_081C7F8A: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C7F24 - - thumb_func_start sub_81C7FA0 -sub_81C7FA0: @ 81C7FA0 - push {lr} - adds r3, r0, 0 - movs r0, 0x10 - cmp r1, 0 - bne _081C7FAC - movs r0, 0x30 -_081C7FAC: - cmp r3, 0x5 - bhi _081C7FB8 - adds r1, r2, 0 - bl sub_81C803C - b _081C7FBE -_081C7FB8: - adds r1, r2, 0 - bl sub_81C8088 -_081C7FBE: - pop {r0} - bx r0 - thumb_func_end sub_81C7FA0 - - thumb_func_start sub_81C7FC4 -sub_81C7FC4: @ 81C7FC4 - push {lr} - cmp r0, 0x5 - bhi _081C7FD2 - adds r0, r1, 0 - bl sub_81C80D4 - b _081C7FD8 -_081C7FD2: - adds r0, r1, 0 - bl sub_81C8110 -_081C7FD8: - pop {r0} - bx r0 - thumb_func_end sub_81C7FC4 - - thumb_func_start sub_81C7FDC -sub_81C7FDC: @ 81C7FDC - push {r4,lr} - movs r0, 0 - bl sub_81C763C - movs r4, 0x4 - adds r2, r0, 0 - adds r2, 0x1C - movs r3, 0x1 -_081C7FEC: - ldr r1, [r2] - adds r1, 0x3E - ldrb r0, [r1] - orrs r0, r4 - strb r0, [r1] - ldr r1, [r2, 0x8] - adds r1, 0x3E - ldrb r0, [r1] - orrs r0, r4 - strb r0, [r1] - adds r2, 0x4 - subs r3, 0x1 - cmp r3, 0 - bge _081C7FEC - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81C7FDC - - thumb_func_start sub_81C8010 -sub_81C8010: @ 81C8010 - push {lr} - movs r0, 0 - bl sub_81C763C - adds r1, r0, 0 - ldr r0, [r1, 0x1C] - ldr r2, [r0, 0x1C] - ldr r0, =SpriteCallbackDummy - cmp r2, r0 - bne _081C8034 - ldr r0, [r1, 0x24] - ldr r0, [r0, 0x1C] - cmp r0, r2 - bne _081C8034 - movs r0, 0 - b _081C8036 - .pool -_081C8034: - movs r0, 0x1 -_081C8036: - pop {r1} - bx r1 - thumb_func_end sub_81C8010 - - thumb_func_start sub_81C803C -sub_81C803C: @ 81C803C - push {r4-r7,lr} - mov r7, r8 - push {r7} - mov r8, r0 - adds r4, r1, 0 - movs r0, 0 - bl sub_81C763C - cmp r4, 0 - bne _081C8058 - movs r7, 0x60 - negs r7, r7 - movs r6, 0x20 - b _081C805E -_081C8058: - movs r7, 0x80 - lsls r7, 1 - movs r6, 0xA0 -_081C805E: - adds r4, r0, 0 - adds r4, 0x1C - movs r5, 0x1 -_081C8064: - ldr r0, [r4] - mov r1, r8 - strh r1, [r0, 0x22] - ldm r4!, {r0} - adds r1, r7, 0 - adds r2, r6, 0 - movs r3, 0xC - bl sub_81C814C - subs r5, 0x1 - cmp r5, 0 - bge _081C8064 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_81C803C - - thumb_func_start sub_81C8088 -sub_81C8088: @ 81C8088 - push {r4-r7,lr} - mov r7, r8 - push {r7} - mov r8, r0 - adds r4, r1, 0 - movs r0, 0 - bl sub_81C763C - cmp r4, 0 - bne _081C80A4 - movs r7, 0x60 - negs r7, r7 - movs r6, 0x10 - b _081C80AA -_081C80A4: - movs r7, 0x80 - lsls r7, 1 - movs r6, 0xC0 -_081C80AA: - adds r4, r0, 0 - adds r4, 0x24 - movs r5, 0x1 -_081C80B0: - ldr r0, [r4] - mov r1, r8 - strh r1, [r0, 0x22] - ldm r4!, {r0} - adds r1, r7, 0 - adds r2, r6, 0 - movs r3, 0xC - bl sub_81C814C - subs r5, 0x1 - cmp r5, 0 - bge _081C80B0 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_81C8088 - - thumb_func_start sub_81C80D4 -sub_81C80D4: @ 81C80D4 - push {r4-r7,lr} - adds r4, r0, 0 - movs r0, 0 - bl sub_81C763C - cmp r4, 0 - bne _081C80EA - movs r6, 0x20 - movs r5, 0x60 - negs r5, r5 - b _081C80F0 -_081C80EA: - movs r6, 0xC0 - movs r5, 0x80 - lsls r5, 1 -_081C80F0: - adds r7, r0, 0 - adds r7, 0x1C - movs r4, 0x1 -_081C80F6: - ldm r7!, {r0} - adds r1, r6, 0 - adds r2, r5, 0 - movs r3, 0xC - bl sub_81C814C - subs r4, 0x1 - cmp r4, 0 - bge _081C80F6 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_81C80D4 - - thumb_func_start sub_81C8110 -sub_81C8110: @ 81C8110 - push {r4-r7,lr} - adds r4, r0, 0 - movs r0, 0 - bl sub_81C763C - cmp r4, 0 - bne _081C8126 - movs r6, 0x10 - movs r5, 0x60 - negs r5, r5 - b _081C812C -_081C8126: - movs r6, 0xC0 - movs r5, 0x80 - lsls r5, 1 -_081C812C: - adds r7, r0, 0 - adds r7, 0x24 - movs r4, 0x1 -_081C8132: - ldm r7!, {r0} - adds r1, r6, 0 - adds r2, r5, 0 - movs r3, 0xC - bl sub_81C814C - subs r4, 0x1 - cmp r4, 0 - bge _081C8132 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_81C8110 - - thumb_func_start sub_81C814C -sub_81C814C: @ 81C814C - push {r4-r6,lr} - adds r4, r0, 0 - adds r0, r1, 0 - adds r6, r2, 0 - adds r5, r3, 0 - strh r0, [r4, 0x20] - lsls r1, r0, 4 - strh r1, [r4, 0x2E] - subs r0, r6, r0 - lsls r0, 4 - adds r1, r5, 0 - bl __divsi3 - strh r0, [r4, 0x30] - strh r5, [r4, 0x32] - strh r6, [r4, 0x3C] - ldr r0, =sub_81C817C - str r0, [r4, 0x1C] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C814C - - thumb_func_start sub_81C817C -sub_81C817C: @ 81C817C - push {lr} - adds r2, r0, 0 - ldrh r1, [r2, 0x32] - movs r3, 0x32 - ldrsh r0, [r2, r3] - cmp r0, 0 - beq _081C81C4 - subs r0, r1, 0x1 - strh r0, [r2, 0x32] - ldrh r0, [r2, 0x30] - ldrh r1, [r2, 0x2E] - adds r0, r1 - strh r0, [r2, 0x2E] - lsls r0, 16 - asrs r0, 20 - strh r0, [r2, 0x20] - adds r0, 0x10 - lsls r0, 16 - movs r1, 0x88 - lsls r1, 17 - cmp r0, r1 - bls _081C81B6 - adds r0, r2, 0 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] - b _081C81CC -_081C81B6: - adds r2, 0x3E - ldrb r1, [r2] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - strb r0, [r2] - b _081C81CC -_081C81C4: - ldrh r0, [r2, 0x3C] - strh r0, [r2, 0x20] - ldr r0, =SpriteCallbackDummy - str r0, [r2, 0x1C] -_081C81CC: - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C817C thumb_func_start sub_81C81D4 sub_81C81D4: @ 81C81D4 @@ -653,7 +17,7 @@ sub_81C81D4: @ 81C81D4 adds r7, r2, 0 ldr r1, =0x000008a4 movs r0, 0x11 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081C821C @@ -696,13 +60,13 @@ sub_81C8224: @ 81C8224 sub_81C8234: @ 81C8234 push {r4,lr} movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 bl sub_81C8FE0 ldrb r0, [r4, 0x8] bl RemoveWindow movs r0, 0x11 - bl sub_81C7650 + bl FreeSubstruct pop {r4} pop {r0} bx r0 @@ -717,7 +81,7 @@ sub_81C8254: @ 81C8254 cmp r0, 0 bne _081C82C0 movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr adds r2, r0, 0 cmp r4, 0x4 bhi _081C82D6 @@ -921,7 +285,7 @@ sub_81C83F0: @ 81C83F0 sub sp, 0xC adds r6, r0, 0 movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 cmp r6, 0 beq _081C8408 @@ -1014,7 +378,7 @@ _081C849C: sub_81C84A4: @ 81C84A4 push {lr} movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr ldr r1, =0x00000888 adds r0, r1 ldrh r1, [r0] @@ -1030,7 +394,7 @@ sub_81C84A4: @ 81C84A4 sub_81C84C0: @ 81C84C0 push {lr} movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr ldr r1, =0x00000888 adds r0, r1 movs r3, 0 @@ -1055,7 +419,7 @@ sub_81C84E8: @ 81C84E8 adds r6, r0, 0 adds r4, r1, 0 movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr adds r7, r0, 0 ldr r0, =0x00000888 adds r5, r7, r0 @@ -1149,7 +513,7 @@ sub_81C85A0: @ 81C85A0 push {r4-r6,lr} adds r5, r0, 0 movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 cmp r5, 0 beq _081C85B8 @@ -1228,7 +592,7 @@ _081C862A: sub_81C8630: @ 81C8630 push {lr} movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x28] bl sub_81C70D8 pop {r1} @@ -1239,7 +603,7 @@ sub_81C8630: @ 81C8630 sub_81C8644: @ 81C8644 push {lr} movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr ldr r1, =0x00000888 adds r0, r1 pop {r1} @@ -1423,7 +787,7 @@ sub_81C8770: @ 81C8770 sub_81C877C: @ 81C877C push {r4,lr} movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 ldr r0, =0x0000089c adds r1, r4, r0 @@ -1449,7 +813,7 @@ sub_81C87AC: @ 81C87AC lsls r4, 16 lsrs r4, 16 movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 ldr r0, =0x00000888 adds r1, r5, r0 @@ -1477,7 +841,7 @@ sub_81C87AC: @ 81C87AC sub_81C87F0: @ 81C87F0 push {r4,lr} movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 ldr r0, =0x0000089c adds r1, r4, r0 @@ -1500,7 +864,7 @@ sub_81C87F0: @ 81C87F0 sub_81C8820: @ 81C8820 push {lr} movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr movs r1, 0x8A lsls r1, 4 adds r0, r1 @@ -1514,7 +878,7 @@ sub_81C8820: @ 81C8820 sub_81C8838: @ 81C8838 push {r4,lr} movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 ldr r0, =0x00000888 adds r2, r4, r0 @@ -1542,7 +906,7 @@ sub_81C8870: @ 81C8870 push {r4,r5,lr} adds r5, r0, 0 movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 cmp r5, 0x4 bhi _081C894C @@ -1651,7 +1015,7 @@ sub_81C8958: @ 81C8958 push {r4,r5,lr} adds r5, r0, 0 movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 @@ -1753,7 +1117,7 @@ sub_81C8A28: @ 81C8A28 cmp r0, 0 bne _081C8AA6 movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 ldr r0, =0x00000888 adds r6, r4, r0 @@ -2525,7 +1889,7 @@ sub_81C9080: @ 81C9080 push {r4,lr} adds r4, r0, 0 movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr ldr r1, =0x0000088e adds r0, r1 ldrh r0, [r0] @@ -2637,7 +2001,7 @@ sub_81C9148: @ 81C9148 push {r4,lr} adds r4, r0, 0 movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr ldr r1, [r0, 0x40] strh r4, [r1, 0x3C] ldr r0, [r0, 0x44] @@ -2812,7 +2176,7 @@ sub_81C9298: @ 81C9298 push {r4,lr} movs r0, 0x1 movs r1, 0x10 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081C92C4 @@ -2841,7 +2205,7 @@ sub_81C92CC: @ 81C92CC push {r4,lr} movs r0, 0x1 movs r1, 0x10 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081C92FA @@ -2871,7 +2235,7 @@ sub_81C9304: @ 81C9304 push {r4,lr} movs r0, 0x1 movs r1, 0x10 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081C932E @@ -2899,7 +2263,7 @@ sub_81C9338: @ 81C9338 push {lr} movs r0, 0x1 movs r1, 0x10 - bl sub_81C761C + bl AllocSubstruct adds r2, r0, 0 cmp r2, 0 beq _081C9360 @@ -2926,7 +2290,7 @@ sub_81C9368: @ 81C9368 push {r4,r5,lr} movs r0, 0x1 movs r1, 0x10 - bl sub_81C761C + bl AllocSubstruct adds r5, r0, 0 cmp r5, 0 beq _081C9394 @@ -2972,7 +2336,7 @@ _081C93B4: .4byte _081C93DC _081C93C8: movs r0, 0 - bl sub_81C7688 + bl SetPokenavMode _081C93CE: bl sub_81C93EC b _081C93DE @@ -2994,7 +2358,7 @@ _081C93E0: thumb_func_start sub_81C93EC sub_81C93EC: @ 81C93EC push {lr} - bl sub_81C767C + bl GetPokenavMode cmp r0, 0x1 beq _081C9408 cmp r0, 0x1 @@ -3021,7 +2385,7 @@ _081C9412: sub_81C941C: @ 81C941C push {lr} movs r0, 0x1 - bl sub_81C763C + bl GetSubstructPtr ldr r1, [r0, 0xC] bl _call_via_r1 pop {r1} @@ -3032,7 +2396,7 @@ sub_81C941C: @ 81C941C sub_81C9430: @ 81C9430 push {lr} movs r0, 0x1 - bl sub_81C7650 + bl FreeSubstruct pop {r0} bx r0 thumb_func_end sub_81C9430 @@ -3113,7 +2477,7 @@ _081C94D4: b _081C94EE .pool _081C94E0: - bl sub_81C76B8 + bl CanViewRibbonsMenu cmp r0, 0 beq _081C94FC movs r0, 0x9 @@ -3601,7 +2965,7 @@ _081C988E: sub_81C9894: @ 81C9894 push {lr} movs r0, 0x1 - bl sub_81C763C + bl GetSubstructPtr ldrh r0, [r0] pop {r1} bx r1 @@ -3611,7 +2975,7 @@ sub_81C9894: @ 81C9894 sub_81C98A4: @ 81C98A4 push {lr} movs r0, 0x1 - bl sub_81C763C + bl GetSubstructPtr movs r1, 0x2 ldrsh r0, [r0, r1] pop {r1} @@ -3622,7 +2986,7 @@ sub_81C98A4: @ 81C98A4 sub_81C98B4: @ 81C98B4 push {lr} movs r0, 0x1 - bl sub_81C763C + bl GetSubstructPtr ldrh r0, [r0, 0x4] pop {r1} bx r1 @@ -3632,7 +2996,7 @@ sub_81C98B4: @ 81C98B4 sub_81C98C4: @ 81C98C4 push {lr} movs r0, 0x1 - bl sub_81C763C + bl GetSubstructPtr ldrh r0, [r0, 0x6] pop {r1} bx r1 @@ -3717,7 +3081,7 @@ sub_81C9958: @ 81C9958 push {r4,lr} ldr r1, =0x0000088c movs r0, 0x2 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081C997A @@ -3742,7 +3106,7 @@ sub_81C9990: @ 81C9990 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 ldr r0, =gUnknown_086201A0 lsls r4, 2 @@ -3763,7 +3127,7 @@ sub_81C9990: @ 81C9990 sub_81C99C0: @ 81C99C0 push {lr} movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0] bl _call_via_r0 pop {r1} @@ -3774,7 +3138,7 @@ sub_81C99C0: @ 81C99C0 sub_81C99D4: @ 81C99D4 push {r4,lr} movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 bl sub_81CA7F4 ldrb r0, [r4, 0x8] @@ -3782,7 +3146,7 @@ sub_81C99D4: @ 81C99D4 bl sub_81C9FEC bl sub_81CA994 movs r0, 0x2 - bl sub_81C7650 + bl FreeSubstruct pop {r4} pop {r0} bx r0 @@ -3792,7 +3156,7 @@ sub_81C99D4: @ 81C99D4 sub_81C99FC: @ 81C99FC push {lr} movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x4] bl sub_81C70D8 pop {r1} @@ -3805,7 +3169,7 @@ sub_81C9A10: @ 81C9A10 sub sp, 0x4 adds r4, r0, 0 movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x9 bls _081C9A24 @@ -3832,7 +3196,7 @@ _081C9A34: _081C9A5C: ldr r0, =gUnknown_08620194 movs r1, 0x3 - bl sub_81C7B54 + bl InitBgTemplates ldr r1, =gPokenavMessageBox_Gfx movs r0, 0 str r0, [sp] @@ -4428,7 +3792,7 @@ _081C9F42: movs r0, 0 b _081C9FBE _081C9F52: - bl sub_81C7BE8 + bl IsDma3ManagerBusyWithBgCopy_ cmp r0, 0 bne _081C9FB8 bl sub_81C7880 @@ -4532,7 +3896,7 @@ sub_81CA02C: @ 81CA02C mov r7, r8 push {r7} movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr movs r2, 0 adds r0, 0x2C mov r8, r0 @@ -4582,7 +3946,7 @@ _081CA054: sub_81CA094: @ 81CA094 push {r4-r7,lr} movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr movs r1, 0 adds r7, r0, 0 adds r7, 0x2C @@ -4638,7 +4002,7 @@ sub_81CA0EC: @ 81CA0EC str r1, [sp, 0x14] str r2, [sp] movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr mov r10, r0 movs r0, 0x3 bl GetSpriteTileStartByTag @@ -4778,7 +4142,7 @@ sub_81CA20C: @ 81CA20C mov r7, r8 push {r7} movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr adds r6, r0, 0 bl sub_81C98A4 mov r8, r0 @@ -4833,7 +4197,7 @@ _081CA264: sub_81CA278: @ 81CA278 push {r4,r5,lr} movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 bl sub_81C98A4 adds r3, r0, 0 @@ -4886,7 +4250,7 @@ _081CA2B2: sub_81CA2DC: @ 81CA2DC push {r4-r6,lr} movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr adds r6, r0, 0 movs r5, 0 adds r4, r6, 0 @@ -4926,7 +4290,7 @@ _081CA316: sub_81CA324: @ 81CA324 push {r4,lr} movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr adds r3, r0, 0 movs r2, 0 ldr r4, =SpriteCallbackDummy @@ -5008,7 +4372,7 @@ sub_81CA3B4: @ 81CA3B4 push {r7} adds r4, r0, 0 movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr adds r7, r0, 0 movs r5, 0 mov r8, r5 @@ -5321,7 +4685,7 @@ _081CA5F6: cmp r0, 0xC bne _081CA638 movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr ldrb r1, [r0, 0xC] subs r1, 0x1 strb r1, [r0, 0xC] @@ -5345,7 +4709,7 @@ _081CA638: sub_81CA640: @ 81CA640 push {r4,lr} movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 ldr r0, =gUnknown_0862036C movs r1, 0x10 @@ -5385,7 +4749,7 @@ _081CA690: sub_81CA698: @ 81CA698 push {lr} movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x28] bl DestroySprite pop {r0} @@ -5426,7 +4790,7 @@ _081CA6DA: sub_81CA6E0: @ 81CA6E0 push {r4,lr} movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 ldr r0, =gUnknown_086202CC bl AddWindow @@ -5451,7 +4815,7 @@ sub_81CA714: @ 81CA714 push {r4-r6,lr} sub sp, 0xC movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 bl sub_81C98B4 ldr r1, =gUnknown_086202D4 @@ -5493,7 +4857,7 @@ sub_81CA770: @ 81CA770 push {r4-r6,lr} sub sp, 0xC movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 ldr r6, =gText_NoRibbonWinners movs r2, 0x1 @@ -5540,7 +4904,7 @@ sub_81CA7C4: @ 81CA7C4 sub_81CA7D4: @ 81CA7D4 push {r4,lr} movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 ldr r0, =sub_81CA808 movs r1, 0x2 @@ -5556,7 +4920,7 @@ sub_81CA7D4: @ 81CA7D4 sub_81CA7F4: @ 81CA7F4 push {lr} movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr ldrb r0, [r0, 0xA] bl DestroyTask pop {r0} @@ -5738,7 +5102,7 @@ titlescreen_0: @ 81CA92C ldr r2, [r2, 0x8] bl ScanlineEffect_SetParams ldr r0, =sub_81CA914 - bl IndirectSetVBlankCallback + bl SetVBlankCallback_ ldr r0, =sub_81CA9EC movs r1, 0x3 bl CreateTask @@ -5763,7 +5127,7 @@ sub_81CA994: @ 81CA994 lsls r0, 24 lsrs r0, 24 bl DestroyTask - bl sub_81C760C + bl SetPokenavVBlankCallback pop {r0} bx r0 .pool @@ -5913,7 +5277,7 @@ sub_81CAAE8: @ 81CAAE8 movs r1, 0xD4 lsls r1, 1 movs r0, 0x5 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CAB1C @@ -5941,7 +5305,7 @@ _081CAB1E: sub_81CAB24: @ 81CAB24 push {lr} movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr ldr r1, [r0, 0x18] bl _call_via_r1 pop {r1} @@ -5952,7 +5316,7 @@ sub_81CAB24: @ 81CAB24 sub_81CAB38: @ 81CAB38 push {lr} movs r0, 0x5 - bl sub_81C7650 + bl FreeSubstruct pop {r0} bx r0 thumb_func_end sub_81CAB38 @@ -6033,7 +5397,7 @@ _081CABD0: ands r0, r1 cmp r0, 0 beq _081CABF2 - bl sub_81C767C + bl GetPokenavMode cmp r0, 0x1 beq _081CABEC ldr r0, =sub_81CABFC @@ -6112,11 +5476,11 @@ _081CAC5E: bne _081CAC98 b _081CACA6 _081CAC64: - bl sub_81C767C + bl GetPokenavMode cmp r0, 0x1 bne _081CAC72 movs r0, 0x2 - bl sub_81C7688 + bl SetPokenavMode _081CAC72: ldr r0, =sub_81CACF8 str r0, [r4, 0x18] @@ -6220,7 +5584,7 @@ sub_81CAD20: @ 81CAD20 push {r4-r7,lr} adds r5, r0, 0 movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 cmp r5, 0x1 beq _081CAD4C @@ -6367,7 +5731,7 @@ _081CAE24: sub_81CAE28: @ 81CAE28 push {lr} movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x10] pop {r1} bx r1 @@ -6377,7 +5741,7 @@ sub_81CAE28: @ 81CAE28 sub_81CAE38: @ 81CAE38 push {lr} movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr ldrh r0, [r0, 0xA] pop {r1} bx r1 @@ -6387,7 +5751,7 @@ sub_81CAE38: @ 81CAE38 sub_81CAE48: @ 81CAE48 push {lr} movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr ldrh r0, [r0, 0xC] pop {r1} bx r1 @@ -6397,7 +5761,7 @@ sub_81CAE48: @ 81CAE48 sub_81CAE58: @ 81CAE58 push {lr} movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr adds r1, r0, 0 ldrh r0, [r1, 0xA] ldrh r1, [r1, 0xC] @@ -6411,7 +5775,7 @@ sub_81CAE6C: @ 81CAE6C push {r4,lr} adds r4, r0, 0 movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr adds r1, r0, 0 ldrh r0, [r1, 0xC] adds r4, r0 @@ -6434,7 +5798,7 @@ _081CAE8C: sub_81CAE94: @ 81CAE94 push {lr} movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr adds r0, 0x1C pop {r1} bx r1 @@ -6445,7 +5809,7 @@ sub_81CAEA4: @ 81CAEA4 push {r4,lr} adds r4, r0, 0 movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr lsls r4, 2 adds r0, r4 ldrb r0, [r0, 0x1D] @@ -6459,7 +5823,7 @@ sub_81CAEBC: @ 81CAEBC push {r4,lr} adds r4, r0, 0 movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr lsls r1, r4, 2 adds r1, r0, r1 ldrb r0, [r1, 0x1C] @@ -6498,7 +5862,7 @@ sub_81CAF04: @ 81CAF04 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr lsls r1, r4, 2 adds r1, r0, r1 ldrb r0, [r1, 0x1C] @@ -6553,7 +5917,7 @@ sub_81CAF78: @ 81CAF78 adds r5, r0, 0 adds r6, r1, 0 movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 movs r0, 0 strb r0, [r6] @@ -6598,7 +5962,7 @@ sub_81CAFD8: @ 81CAFD8 adds r4, r0, 0 adds r5, r1, 0 movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr lsls r4, 2 adds r4, r0, r4 ldrb r0, [r4, 0x1C] @@ -6633,7 +5997,7 @@ _081CB012: sub_81CB01C: @ 81CB01C push {lr} movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr ldrh r0, [r0] pop {r1} bx r1 @@ -6644,7 +6008,7 @@ sub_81CB02C: @ 81CB02C push {r4,lr} adds r4, r0, 0 movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr adds r1, r0, 0 ldrh r0, [r1, 0x2] cmp r0, r4 @@ -6742,7 +6106,7 @@ sub_81CB0E4: @ 81CB0E4 push {r4-r7,lr} adds r5, r0, 0 movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr adds r7, r0, 0 movs r6, 0x1 adds r5, 0x1 @@ -6783,7 +6147,7 @@ sub_81CB128: @ 81CB128 push {r4-r6,lr} adds r5, r0, 0 movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr adds r1, r0, 0 movs r6, 0x1 negs r6, r6 @@ -6874,7 +6238,7 @@ _081CB1C8: sub_81CB1D0: @ 81CB1D0 push {r4,lr} movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 bl sub_81C875C adds r1, r0, 0 @@ -6940,7 +6304,7 @@ sub_81CB260: @ 81CB260 push {r4,lr} ldr r1, =0x00002048 movs r0, 0x6 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CB294 @@ -6968,7 +6332,7 @@ sub_81CB29C: @ 81CB29C push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 ldr r0, =gUnknown_08622798 lsls r4, 2 @@ -6989,7 +6353,7 @@ sub_81CB29C: @ 81CB29C sub_81CB2CC: @ 81CB2CC push {lr} movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0] bl _call_via_r0 pop {r1} @@ -7000,7 +6364,7 @@ sub_81CB2CC: @ 81CB2CC sub_81CB2E0: @ 81CB2E0 push {r4,lr} movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 bl sub_81CC2B4 bl sub_81CBC1C @@ -7011,7 +6375,7 @@ sub_81CB2E0: @ 81CB2E0 ldrb r0, [r4, 0x14] bl RemoveWindow movs r0, 0x6 - bl sub_81C7650 + bl FreeSubstruct pop {r4} pop {r0} bx r0 @@ -7021,7 +6385,7 @@ sub_81CB2E0: @ 81CB2E0 sub_81CB310: @ 81CB310 push {lr} movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x4] bl sub_81C70D8 pop {r1} @@ -7034,7 +6398,7 @@ sub_81CB324: @ 81CB324 sub sp, 0x8 adds r4, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x7 bls _081CB338 @@ -7059,7 +6423,7 @@ _081CB348: _081CB368: ldr r0, =gUnknown_0862278C movs r1, 0x3 - bl sub_81C7B54 + bl InitBgTemplates movs r0, 0x2 movs r1, 0 movs r2, 0 @@ -7234,7 +6598,7 @@ sub_81CB510: @ 81CB510 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081CB55E @@ -7303,7 +6667,7 @@ sub_81CB588: @ 81CB588 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081CB5D6 @@ -7372,7 +6736,7 @@ sub_81CB600: @ 81CB600 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081CB64E @@ -7441,7 +6805,7 @@ sub_81CB678: @ 81CB678 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081CB6C6 @@ -7510,7 +6874,7 @@ sub_81CB6F0: @ 81CB6F0 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0 beq _081CB706 @@ -7547,7 +6911,7 @@ sub_81CB734: @ 81CB734 movs r0, 0x5 bl PlaySE movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 bl sub_81CB01C adds r1, r0, 0 @@ -7566,7 +6930,7 @@ sub_81CB75C: @ 81CB75C push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0 beq _081CB772 @@ -7602,7 +6966,7 @@ sub_81CB7A0: @ 81CB7A0 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081CB7D4 @@ -7668,7 +7032,7 @@ sub_81CB824: @ 81CB824 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081CB85E @@ -7722,7 +7086,7 @@ sub_81CB888: @ 81CB888 push {r4-r6,lr} adds r5, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 movs r6, 0 cmp r5, 0x6 @@ -7780,7 +7144,7 @@ _081CB904: bl sub_81C7BA4 b _081CB934 _081CB90C: - bl sub_81C7BE8 + bl IsDma3ManagerBusyWithBgCopy_ cmp r0, 0 bne _081CB8EC ldrb r0, [r4, 0xF] @@ -7810,7 +7174,7 @@ sub_81CB93C: @ 81CB93C push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081CB974 @@ -7860,7 +7224,7 @@ _081CB9A0: bl sub_81CC42C cmp r0, 0 bne _081CB9BA - bl sub_81C7BE8 + bl IsDma3ManagerBusyWithBgCopy_ cmp r0, 0 beq _081CB9BE _081CB9BA: @@ -7879,7 +7243,7 @@ sub_81CB9C8: @ 81CB9C8 push {r4,r5,lr} adds r5, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 cmp r5, 0x4 bhi _081CBA60 @@ -7955,7 +7319,7 @@ sub_81CBA68: @ 81CBA68 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081CBA9C @@ -8011,7 +7375,7 @@ sub_81CBAD4: @ 81CBAD4 push {r4,r5,lr} adds r5, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 cmp r5, 0x4 bhi _081CBB6C @@ -8933,7 +8297,7 @@ sub_81CC214: @ 81CC214 push {r4-r6,lr} sub sp, 0x8 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r6, r0, 0 movs r5, 0 ldr r4, =gUnknown_08622810 @@ -8998,7 +8362,7 @@ _081CC224: sub_81CC2B4: @ 81CC2B4 push {r4,lr} movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 ldr r0, [r4, 0x1C] cmp r0, 0 @@ -9279,13 +8643,13 @@ sub_81CC4D4: @ 81CC4D4 push {r4,lr} movs r0, 0x3 movs r1, 0x14 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CC4F0 ldr r1, =0x00000884 movs r0, 0x10 - bl sub_81C761C + bl AllocSubstruct cmp r0, 0 bne _081CC4F8 _081CC4F0: @@ -9330,9 +8694,9 @@ sub_81CC524: @ 81CC524 orrs r0, r1 strb r0, [r3, 0x15] movs r0, 0x10 - bl sub_81C7650 + bl FreeSubstruct movs r0, 0x3 - bl sub_81C7650 + bl FreeSubstruct pop {r0} bx r0 .pool @@ -9342,7 +8706,7 @@ sub_81CC524: @ 81CC524 sub_81CC554: @ 81CC554 push {lr} movs r0, 0x3 - bl sub_81C763C + bl GetSubstructPtr ldr r1, [r0, 0x10] bl _call_via_r1 pop {r1} @@ -9428,7 +8792,7 @@ sub_81CC5DC: @ 81CC5DC sub_81CC5E4: @ 81CC5E4 push {lr} movs r0, 0x3 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0xC] pop {r1} bx r1 @@ -9439,7 +8803,7 @@ sub_81CC5F4: @ 81CC5F4 push {r4,lr} ldr r1, =0x00001948 movs r0, 0x4 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CC624 @@ -9465,7 +8829,7 @@ sub_81CC62C: @ 81CC62C push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x4 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 ldr r0, =gUnknown_086230E4 lsls r4, 2 @@ -9486,7 +8850,7 @@ sub_81CC62C: @ 81CC62C sub_81CC65C: @ 81CC65C push {lr} movs r0, 0x4 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0] bl _call_via_r0 pop {r1} @@ -9497,17 +8861,17 @@ sub_81CC65C: @ 81CC65C sub_81CC670: @ 81CC670 push {r4,lr} movs r0, 0x4 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 bl FreeRegionMapIconResources bl sub_81CC9EC ldrb r0, [r4, 0x8] bl RemoveWindow movs r0, 0x10 - bl sub_81C7650 + bl FreeSubstruct movs r0, 0x4 - bl sub_81C7650 - bl sub_81C760C + bl FreeSubstruct + bl SetPokenavVBlankCallback movs r0, 0 bl SetBgMode pop {r4} @@ -9530,7 +8894,7 @@ sub_81CC6A4: @ 81CC6A4 sub_81CC6BC: @ 81CC6BC push {lr} movs r0, 0x4 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x4] bl sub_81C70D8 pop {r1} @@ -9563,7 +8927,7 @@ sub_81CC6F4: @ 81CC6F4 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x4 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x7 bls _081CC706 @@ -9587,7 +8951,7 @@ _081CC714: .4byte _081CC82A _081CC734: movs r0, 0 - bl IndirectSetVBlankCallback + bl SetVBlankCallback_ movs r0, 0x1 bl HideBg movs r0, 0x2 @@ -9599,9 +8963,9 @@ _081CC734: ldr r4, =gUnknown_086230D8 adds r0, r4, 0 movs r1, 0x2 - bl sub_81C7B54 + bl InitBgTemplates movs r0, 0x10 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 adds r4, 0x4 bl sub_81CC6D0 @@ -9667,7 +9031,7 @@ _081CC7E2: movs r0, 0x2 bl ShowBg ldr r0, =sub_81CC6A4 - bl IndirectSetVBlankCallback + bl SetVBlankCallback_ b _081CC77C .pool _081CC804: @@ -9710,7 +9074,7 @@ sub_81CC848: @ 81CC848 push {r4,lr} adds r4, r0, 0 movs r0, 0x4 - bl sub_81C763C + bl GetSubstructPtr cmp r4, 0 beq _081CC85C cmp r4, 0x1 @@ -9769,7 +9133,7 @@ _081CC8A2: movs r0, 0 b _081CC8D2 _081CC8BE: - bl sub_81C7BE8 + bl IsDma3ManagerBusyWithBgCopy_ cmp r0, 0 beq _081CC8CA _081CC8C6: @@ -9790,7 +9154,7 @@ sub_81CC8D8: @ 81CC8D8 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x4 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081CC90C @@ -9835,7 +9199,7 @@ _081CC924: movs r0, 0 b _081CC954 _081CC940: - bl sub_81C7BE8 + bl IsDma3ManagerBusyWithBgCopy_ cmp r0, 0 beq _081CC94C _081CC948: @@ -9929,7 +9293,7 @@ _081CC9C6: sub_81CC9EC: @ 81CC9EC push {r4,r5,lr} movs r0, 0x4 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 movs r0, 0x6 bl FreeSpriteTilesByTag @@ -10055,7 +9419,7 @@ sub_81CCB0C: @ 81CCB0C sub sp, 0xC adds r4, r0, 0 movs r0, 0x10 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 ldrb r0, [r5, 0x2] cmp r0, 0x4 @@ -10318,7 +9682,7 @@ sub_81CCD34: @ 81CCD34 push {r4,lr} adds r4, r0, 0 movs r0, 0x4 - bl sub_81C763C + bl GetSubstructPtr adds r2, r0, 0 cmp r4, 0x15 ble _081CCD48 @@ -10467,7 +9831,7 @@ sub_81CCE58: @ 81CCE58 mov r7, r8 push {r7} movs r0, 0x4 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 bl sub_8124658 lsls r0, 24 @@ -10612,7 +9976,7 @@ _081CCF70: sub_81CCF78: @ 81CCF78 push {r4,lr} movs r0, 0x4 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 movs r0, 0x1 bl GetBgY @@ -10637,7 +10001,7 @@ sub_81CCFA4: @ 81CCFA4 push {r4-r6,lr} adds r4, r0, 0 movs r0, 0x4 - bl sub_81C763C + bl GetSubstructPtr movs r1, 0x1 ands r4, r1 lsls r5, r4, 2 @@ -10667,7 +10031,7 @@ sub_81CCFD8: @ 81CCFD8 push {r4,lr} ldr r1, =0x0000678c movs r0, 0xB - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CD01C @@ -10698,7 +10062,7 @@ sub_81CD024: @ 81CD024 push {r4,lr} ldr r1, =0x0000678c movs r0, 0xB - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CD068 @@ -10728,7 +10092,7 @@ _081CD06A: sub_81CD070: @ 81CD070 push {lr} movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr ldr r2, =0x00006304 adds r1, r0, r2 ldr r1, [r1] @@ -10743,7 +10107,7 @@ sub_81CD08C: @ 81CD08C push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 adds r0, r4, 0 bl sub_81CD1E4 @@ -10818,7 +10182,7 @@ sub_81CD110: @ 81CD110 adds r1, r4, r1 strb r0, [r1] movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr ldrh r1, [r0, 0x2] lsls r1, 2 adds r0, r1 @@ -10886,7 +10250,7 @@ _081CD1B6: sub_81CD1C0: @ 81CD1C0 push {lr} movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr movs r1, 0xC6 lsls r1, 7 adds r0, r1 @@ -10894,10 +10258,10 @@ sub_81CD1C0: @ 81CD1C0 cmp r0, 0 bne _081CD1DA movs r0, 0x12 - bl sub_81C7650 + bl FreeSubstruct _081CD1DA: movs r0, 0xB - bl sub_81C7650 + bl FreeSubstruct pop {r0} bx r0 thumb_func_end sub_81CD1C0 @@ -10907,7 +10271,7 @@ sub_81CD1E4: @ 81CD1E4 push {r4,lr} adds r4, r0, 0 movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr adds r2, r0, 0 movs r3, 0 ldr r0, =gMain @@ -10971,10 +10335,10 @@ sub_81CD258: @ 81CD258 lsrs r0, 24 mov r8, r0 movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 mov r0, r8 cmp r0, 0 @@ -11141,10 +10505,10 @@ _081CD3BA: sub_81CD3C4: @ 81CD3C4 push {r4,lr} movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr adds r2, r0, 0 ldr r1, =0x0000678a adds r0, r4, r1 @@ -11329,7 +10693,7 @@ sub_81CD548: @ 81CD548 lsrs r4, r0, 24 adds r5, r4, 0 movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr adds r1, r0, 0 cmp r4, 0x1 beq _081CD588 @@ -11449,7 +10813,7 @@ sub_81CD624: @ 81CD624 lsrs r2, 24 mov r10, r2 movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr lsls r4, 2 adds r0, r4 ldrb r4, [r0, 0x4] @@ -11697,10 +11061,10 @@ sub_81CD824: @ 81CD824 lsls r1, 24 lsrs r6, r1, 24 movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr adds r7, r0, 0 mov r1, r8 lsls r0, r1, 16 @@ -11841,11 +11205,11 @@ _081CD95C: sub_81CD970: @ 81CD970 push {r4-r7,lr} movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr adds r7, r0, 0 ldr r1, =0x000006ac movs r0, 0x12 - bl sub_81C761C + bl AllocSubstruct adds r6, r0, 0 movs r0, 0xC6 lsls r0, 7 @@ -11908,7 +11272,7 @@ _081CD9C4: sub_81CD9F8: @ 81CD9F8 push {lr} movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr movs r1, 0xC6 lsls r1, 7 adds r2, r0, r1 @@ -11935,10 +11299,10 @@ sub_81CDA1C: @ 81CDA1C lsrs r1, 24 mov r9, r1 movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr mov r8, r0 movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 lsls r0, r6, 16 asrs r5, r0, 16 @@ -12107,10 +11471,10 @@ sub_81CDB98: @ 81CDB98 lsrs r1, 24 mov r9, r1 movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr adds r7, r0, 0 movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 lsls r0, r6, 16 asrs r5, r0, 16 @@ -12187,7 +11551,7 @@ _081CDC3E: sub_81CDC50: @ 81CDC50 push {lr} movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr ldrh r0, [r0] pop {r1} bx r1 @@ -12197,7 +11561,7 @@ sub_81CDC50: @ 81CDC50 sub_81CDC60: @ 81CDC60 push {lr} movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr ldrh r0, [r0, 0x2] pop {r1} bx r1 @@ -12207,7 +11571,7 @@ sub_81CDC60: @ 81CDC60 sub_81CDC70: @ 81CDC70 push {lr} movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr ldr r1, =0x00006428 adds r0, r1 pop {r1} @@ -12219,7 +11583,7 @@ sub_81CDC70: @ 81CDC70 sub_81CDC84: @ 81CDC84 push {lr} movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr ldr r1, =0x00006786 adds r0, r1 ldrb r0, [r0] @@ -12232,7 +11596,7 @@ sub_81CDC84: @ 81CDC84 sub_81CDC9C: @ 81CDC9C push {lr} movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr ldr r1, =0x00006302 adds r0, r1 ldrb r0, [r0] @@ -12248,7 +11612,7 @@ sub_81CDCB4: @ 81CDCB4 lsls r4, 24 lsrs r4, 24 movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr lsls r4, 13 movs r1, 0xC0 lsls r1, 2 @@ -12266,7 +11630,7 @@ sub_81CDCD4: @ 81CDCD4 lsls r4, 24 lsrs r4, 24 movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr lsls r4, 7 adds r0, r4 pop {r4} @@ -12278,7 +11642,7 @@ sub_81CDCD4: @ 81CDCD4 sub_81CDCEC: @ 81CDCEC push {lr} movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr ldr r1, =0x00006789 adds r0, r1 ldrb r0, [r0] @@ -12294,7 +11658,7 @@ sub_81CDD04: @ 81CDD04 lsls r4, 24 lsrs r4, 24 movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr lsls r4, 6 ldr r1, =0x00006368 adds r4, r1 @@ -12312,7 +11676,7 @@ sub_81CDD24: @ 81CDD24 lsls r4, 24 lsrs r4, 24 movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr lsls r1, r4, 1 adds r1, r4 lsls r1, 3 @@ -12329,7 +11693,7 @@ sub_81CDD24: @ 81CDD24 sub_81CDD48: @ 81CDD48 push {lr} movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr ldrh r1, [r0, 0x2] lsls r1, 2 adds r0, r1 @@ -12342,7 +11706,7 @@ sub_81CDD48: @ 81CDD48 sub_81CDD5C: @ 81CDD5C push {lr} movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr movs r1, 0xC6 lsls r1, 7 adds r0, r1 @@ -12362,7 +11726,7 @@ _081CDD76: sub_81CDD7C: @ 81CDD7C push {lr} movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr adds r2, r0, 0 movs r1, 0xC6 lsls r1, 7 @@ -12391,7 +11755,7 @@ _081CDDA6: sub_81CDDB0: @ 81CDDB0 push {lr} movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr ldr r2, =0x00006786 adds r1, r0, r2 ldrb r1, [r1] @@ -12411,7 +11775,7 @@ sub_81CDDD4: @ 81CDDD4 push {r4,lr} ldr r1, =0x000038ac movs r0, 0xC - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CDE24 @@ -12447,7 +11811,7 @@ sub_81CDE2C: @ 81CDE2C push {r4,r5,lr} adds r4, r0, 0 movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 ldr r0, =gUnknown_08623384 lsls r4, 2 @@ -12470,7 +11834,7 @@ sub_81CDE2C: @ 81CDE2C sub_81CDE64: @ 81CDE64 push {lr} movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr ldr r1, =0x00001810 adds r0, r1 ldr r0, [r0] @@ -12484,7 +11848,7 @@ sub_81CDE64: @ 81CDE64 sub_81CDE80: @ 81CDE80 push {lr} movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0] bl sub_81C70D8 pop {r1} @@ -12497,7 +11861,7 @@ sub_81CDE94: @ 81CDE94 sub sp, 0xC adds r4, r0, 0 movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x14 bls _081CDEA8 @@ -12542,7 +11906,7 @@ _081CDF16: _081CDF18: ldr r0, =gUnknown_08623358 movs r1, 0x3 - bl sub_81C7B54 + bl InitBgTemplates movs r0, 0x1 movs r1, 0 movs r2, 0 @@ -12853,7 +12217,7 @@ _081CE218: bne _081CE2C0 _081CE230: ldr r0, =sub_81CEE44 - bl IndirectSetVBlankCallback + bl SetVBlankCallback_ b _081CDFB0 .pool _081CE23C: @@ -12924,7 +12288,7 @@ sub_81CE2D0: @ 81CE2D0 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081CE308 @@ -13006,7 +12370,7 @@ sub_81CE37C: @ 81CE37C push {r4-r6,lr} adds r4, r0, 0 movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr adds r6, r0, 0 bl sub_81CDC70 adds r2, r0, 0 @@ -13160,7 +12524,7 @@ sub_81CE4D8: @ 81CE4D8 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x8 bhi _081CE5DC @@ -13282,7 +12646,7 @@ sub_81CE5E4: @ 81CE5E4 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x7 bhi _081CE6B2 @@ -13408,7 +12772,7 @@ _081CE6E6: bl sub_81C7BA4 b _081CE6E2 _081CE6EE: - bl sub_81C7BE8 + bl IsDma3ManagerBusyWithBgCopy_ cmp r0, 0x1 bne _081CE6E2 movs r0, 0x2 @@ -13444,7 +12808,7 @@ _081CE71E: bl sub_81C7BA4 b _081CE71A _081CE726: - bl sub_81C7BE8 + bl IsDma3ManagerBusyWithBgCopy_ cmp r0, 0x1 bne _081CE71A movs r0, 0x2 @@ -13486,7 +12850,7 @@ sub_81CE754: @ 81CE754 lsls r2, 24 lsrs r5, r2, 24 movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr adds r6, r0, 0 cmp r4, 0x1 beq _081CE7B8 @@ -13700,7 +13064,7 @@ _081CE926: sub_81CE934: @ 81CE934 push {r4,lr} movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 ldr r1, =0x00001822 adds r0, r4, r1 @@ -13798,7 +13162,7 @@ sub_81CE9E4: @ 81CE9E4 push {r5-r7} sub sp, 0x58 movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr adds r6, r0, 0 add r4, sp, 0x20 add r5, sp, 0x38 @@ -14101,7 +13465,7 @@ _081CEC8E: sub_81CECA0: @ 81CECA0 push {r4,lr} movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 movs r1, 0xC1 lsls r1, 5 @@ -14136,7 +13500,7 @@ _081CECF0: bl sub_81CEBF4 bl sub_81CEE68 movs r0, 0xC - bl sub_81C7650 + bl FreeSubstruct pop {r4} pop {r0} bx r0 @@ -14147,7 +13511,7 @@ sub_81CED10: @ 81CED10 push {r4,lr} adds r4, r0, 0 movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr ldr r1, =0x00001814 adds r0, r1 ldrh r0, [r0] @@ -14168,7 +13532,7 @@ sub_81CED30: @ 81CED30 lsls r0, 24 lsrs r6, r0, 24 movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr mov r8, r0 ldr r7, =0x00001816 add r7, r8 @@ -14291,7 +13655,7 @@ sub_81CEE44: @ 81CEE44 thumb_func_start sub_81CEE68 sub_81CEE68: @ 81CEE68 push {lr} - bl sub_81C760C + bl SetPokenavVBlankCallback pop {r0} bx r0 thumb_func_end sub_81CEE68 @@ -14381,7 +13745,7 @@ _081CEF0C: sub_81CEF14: @ 81CEF14 push {r4,lr} movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 bl sub_81CDD5C cmp r0, 0x1 @@ -14404,13 +13768,13 @@ sub_81CEF3C: @ 81CEF3C push {r4,lr} movs r0, 0x7 movs r1, 0x24 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CEF90 ldr r1, =0x000006ac movs r0, 0x12 - bl sub_81C761C + bl AllocSubstruct str r0, [r4, 0x20] cmp r0, 0 beq _081CEF90 @@ -14444,12 +13808,12 @@ sub_81CEF98: @ 81CEF98 push {r4,lr} movs r0, 0x7 movs r1, 0x24 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CEFD4 movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr str r0, [r4, 0x20] ldr r0, =sub_81CF030 str r0, [r4] @@ -14476,7 +13840,7 @@ _081CEFD6: sub_81CEFDC: @ 81CEFDC push {lr} movs r0, 0x7 - bl sub_81C763C + bl GetSubstructPtr ldr r1, [r0] bl _call_via_r1 pop {r1} @@ -14487,15 +13851,15 @@ sub_81CEFDC: @ 81CEFDC sub_81CEFF0: @ 81CEFF0 push {lr} movs r0, 0x7 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x1C] cmp r0, 0 bne _081CF004 movs r0, 0x12 - bl sub_81C7650 + bl FreeSubstruct _081CF004: movs r0, 0x7 - bl sub_81C7650 + bl FreeSubstruct pop {r0} bx r0 thumb_func_end sub_81CEFF0 @@ -14607,7 +13971,7 @@ sub_81CF0B8: @ 81CF0B8 sub_81CF0C0: @ 81CF0C0 push {lr} movs r0, 0x7 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x18] pop {r1} bx r1 @@ -14617,7 +13981,7 @@ sub_81CF0C0: @ 81CF0C0 sub_81CF0D0: @ 81CF0D0 push {lr} movs r0, 0x7 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x20] adds r0, 0x4 pop {r1} @@ -14628,7 +13992,7 @@ sub_81CF0D0: @ 81CF0D0 sub_81CF0E0: @ 81CF0E0 push {lr} movs r0, 0x7 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x20] ldrh r0, [r0] pop {r1} @@ -14639,7 +14003,7 @@ sub_81CF0E0: @ 81CF0E0 sub_81CF0F0: @ 81CF0F0 push {r4,lr} movs r0, 0x7 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 bl sub_81C875C ldr r1, [r4, 0x20] @@ -14655,7 +14019,7 @@ sub_81CF0F0: @ 81CF0F0 sub_81CF10C: @ 81CF10C push {lr} movs r0, 0x7 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x20] ldrh r0, [r0, 0x2] pop {r1} @@ -14680,7 +14044,7 @@ sub_81CF134: @ 81CF134 push {r4-r6,lr} sub sp, 0x4 movs r0, 0x7 - bl sub_81C763C + bl GetSubstructPtr adds r6, r0, 0 ldr r0, [r6, 0x20] movs r1, 0 @@ -14746,7 +14110,7 @@ _081CF1AA: sub_81CF1C4: @ 81CF1C4 push {lr} movs r0, 0x7 - bl sub_81C763C + bl GetSubstructPtr movs r1, 0 str r1, [r0, 0x10] str r1, [r0, 0xC] @@ -14762,7 +14126,7 @@ sub_81CF1D8: @ 81CF1D8 push {r7} sub sp, 0x4 movs r0, 0x7 - bl sub_81C763C + bl GetSubstructPtr adds r6, r0, 0 ldr r5, [r6, 0xC] ldr r4, [r6, 0x10] @@ -14839,7 +14203,7 @@ _081CF26A: sub_81CF278: @ 81CF278 push {r4-r6,lr} movs r0, 0x7 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 ldr r0, [r5, 0x20] ldrh r6, [r0] @@ -14950,7 +14314,7 @@ sub_81CF330: @ 81CF330 movs r1, 0x81 lsls r1, 4 movs r0, 0x8 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CF360 @@ -14979,7 +14343,7 @@ sub_81CF368: @ 81CF368 movs r1, 0x81 lsls r1, 4 movs r0, 0x8 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CF398 @@ -15006,7 +14370,7 @@ sub_81CF3A0: @ 81CF3A0 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x8 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 ldr r0, =gUnknown_08623598 lsls r4, 2 @@ -15027,7 +14391,7 @@ sub_81CF3A0: @ 81CF3A0 sub_81CF3D0: @ 81CF3D0 push {lr} movs r0, 0x8 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0] bl _call_via_r0 pop {r1} @@ -15038,7 +14402,7 @@ sub_81CF3D0: @ 81CF3D0 sub_81CF3E4: @ 81CF3E4 push {lr} movs r0, 0x8 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x4] bl sub_81C70D8 pop {r1} @@ -15049,13 +14413,13 @@ sub_81CF3E4: @ 81CF3E4 sub_81CF3F8: @ 81CF3F8 push {r4,lr} movs r0, 0x8 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 bl sub_81C8234 ldrb r0, [r4, 0x8] bl RemoveWindow movs r0, 0x8 - bl sub_81C7650 + bl FreeSubstruct pop {r4} pop {r0} bx r0 @@ -15067,7 +14431,7 @@ sub_81CF418: @ 81CF418 sub sp, 0x4 adds r4, r0, 0 movs r0, 0x8 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x5 bls _081CF42C @@ -15090,7 +14454,7 @@ _081CF43C: _081CF454: ldr r0, =gUnknown_08623590 movs r1, 0x2 - bl sub_81C7B54 + bl InitBgTemplates ldr r1, =gUnknown_086233E4 movs r0, 0 str r0, [sp] @@ -15214,7 +14578,7 @@ sub_81CF578: @ 81CF578 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x8 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081CF5C6 @@ -15282,7 +14646,7 @@ sub_81CF5F0: @ 81CF5F0 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x8 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081CF63E @@ -15350,7 +14714,7 @@ sub_81CF668: @ 81CF668 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x8 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081CF6B6 @@ -15418,7 +14782,7 @@ sub_81CF6E0: @ 81CF6E0 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x8 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081CF72E @@ -15773,13 +15137,13 @@ sub_81CF9BC: @ 81CF9BC push {r4,lr} movs r0, 0x9 movs r1, 0x20 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CF9FC ldr r1, =0x000006ac movs r0, 0x12 - bl sub_81C761C + bl AllocSubstruct str r0, [r4, 0x1C] cmp r0, 0 beq _081CF9FC @@ -15807,12 +15171,12 @@ sub_81CFA04: @ 81CFA04 push {r4,lr} movs r0, 0x9 movs r1, 0x20 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CFA2C movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr str r0, [r4, 0x1C] ldr r0, =sub_81CFA88 str r0, [r4] @@ -15832,7 +15196,7 @@ _081CFA2E: sub_81CFA34: @ 81CFA34 push {lr} movs r0, 0x9 - bl sub_81C763C + bl GetSubstructPtr ldr r1, [r0] bl _call_via_r1 pop {r1} @@ -15843,15 +15207,15 @@ sub_81CFA34: @ 81CFA34 sub_81CFA48: @ 81CFA48 push {lr} movs r0, 0x9 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x18] cmp r0, 0 bne _081CFA5C movs r0, 0x12 - bl sub_81C7650 + bl FreeSubstruct _081CFA5C: movs r0, 0x9 - bl sub_81C7650 + bl FreeSubstruct pop {r0} bx r0 thumb_func_end sub_81CFA48 @@ -15963,7 +15327,7 @@ sub_81CFB10: @ 81CFB10 sub_81CFB18: @ 81CFB18 push {lr} movs r0, 0x9 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x14] pop {r1} bx r1 @@ -15973,7 +15337,7 @@ sub_81CFB18: @ 81CFB18 sub_81CFB28: @ 81CFB28 push {lr} movs r0, 0x9 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x1C] adds r0, 0x4 pop {r1} @@ -15984,7 +15348,7 @@ sub_81CFB28: @ 81CFB28 sub_81CFB38: @ 81CFB38 push {lr} movs r0, 0x9 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x1C] ldrh r0, [r0] pop {r1} @@ -15995,7 +15359,7 @@ sub_81CFB38: @ 81CFB38 sub_81CFB48: @ 81CFB48 push {r4,lr} movs r0, 0x9 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 bl sub_81C875C ldr r1, [r4, 0x1C] @@ -16011,7 +15375,7 @@ sub_81CFB48: @ 81CFB48 sub_81CFB64: @ 81CFB64 push {lr} movs r0, 0x9 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x1C] ldrh r0, [r0, 0x2] pop {r1} @@ -16036,7 +15400,7 @@ sub_81CFB8C: @ 81CFB8C push {r4-r6,lr} sub sp, 0x4 movs r0, 0x9 - bl sub_81C763C + bl GetSubstructPtr adds r6, r0, 0 ldr r0, [r6, 0x1C] movs r1, 0 @@ -16108,7 +15472,7 @@ _081CFC10: sub_81CFC2C: @ 81CFC2C push {lr} movs r0, 0x9 - bl sub_81C763C + bl GetSubstructPtr movs r1, 0 str r1, [r0, 0x10] str r1, [r0, 0xC] @@ -16125,7 +15489,7 @@ sub_81CFC40: @ 81CFC40 push {r6,r7} sub sp, 0x4 movs r0, 0x9 - bl sub_81C763C + bl GetSubstructPtr mov r8, r0 ldr r7, [r0, 0xC] ldr r6, [r0, 0x10] @@ -16336,7 +15700,7 @@ sub_81CFDD0: @ 81CFDD0 movs r1, 0x81 lsls r1, 4 movs r0, 0xA - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CFE00 @@ -16365,7 +15729,7 @@ sub_81CFE08: @ 81CFE08 movs r1, 0x81 lsls r1, 4 movs r0, 0xA - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CFE38 @@ -16392,7 +15756,7 @@ sub_81CFE40: @ 81CFE40 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0xA - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 ldr r0, =gUnknown_086237B8 lsls r4, 2 @@ -16413,7 +15777,7 @@ sub_81CFE40: @ 81CFE40 sub_81CFE70: @ 81CFE70 push {lr} movs r0, 0xA - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0] bl _call_via_r0 pop {r1} @@ -16424,7 +15788,7 @@ sub_81CFE70: @ 81CFE70 sub_81CFE84: @ 81CFE84 push {lr} movs r0, 0xA - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x4] bl sub_81C70D8 pop {r1} @@ -16435,13 +15799,13 @@ sub_81CFE84: @ 81CFE84 sub_81CFE98: @ 81CFE98 push {r4,lr} movs r0, 0xA - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 bl sub_81C8234 ldrb r0, [r4, 0x8] bl RemoveWindow movs r0, 0xA - bl sub_81C7650 + bl FreeSubstruct pop {r4} pop {r0} bx r0 @@ -16453,7 +15817,7 @@ sub_81CFEB8: @ 81CFEB8 sub sp, 0x4 adds r4, r0, 0 movs r0, 0xA - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x5 bls _081CFECC @@ -16476,7 +15840,7 @@ _081CFEDC: _081CFEF4: ldr r0, =gUnknown_086237B0 movs r1, 0x2 - bl sub_81C7B54 + bl InitBgTemplates ldr r1, =gUnknown_08623604 movs r0, 0 str r0, [sp] @@ -16588,7 +15952,7 @@ sub_81CFFFC: @ 81CFFFC push {r4,r5,lr} adds r4, r0, 0 movs r0, 0xA - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081D004A @@ -16656,7 +16020,7 @@ sub_81D0074: @ 81D0074 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0xA - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081D00C2 @@ -16724,7 +16088,7 @@ sub_81D00EC: @ 81D00EC push {r4,r5,lr} adds r4, r0, 0 movs r0, 0xA - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081D013A @@ -16792,7 +16156,7 @@ sub_81D0164: @ 81D0164 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0xA - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081D01B2 @@ -17158,12 +16522,12 @@ sub_81D0450: @ 81D0450 push {r4,lr} movs r0, 0xD movs r1, 0x9C - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081D0498 movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr str r0, [r4, 0x8] cmp r0, 0 beq _081D0498 @@ -17194,7 +16558,7 @@ _081D049A: sub_81D04A0: @ 81D04A0 push {lr} movs r0, 0xD - bl sub_81C763C + bl GetSubstructPtr adds r1, r0, 0 adds r1, 0x98 ldr r1, [r1] @@ -17207,7 +16571,7 @@ sub_81D04A0: @ 81D04A0 sub_81D04B8: @ 81D04B8 push {lr} movs r0, 0xD - bl sub_81C7650 + bl FreeSubstruct pop {r0} bx r0 thumb_func_end sub_81D04B8 @@ -17513,7 +16877,7 @@ _081D06BE: sub_81D06C4: @ 81D06C4 push {lr} movs r0, 0xD - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x8] ldrh r0, [r0, 0x2] pop {r1} @@ -17524,7 +16888,7 @@ sub_81D06C4: @ 81D06C4 sub_81D06D4: @ 81D06D4 push {lr} movs r0, 0xD - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x8] ldrh r0, [r0] pop {r1} @@ -17538,7 +16902,7 @@ sub_81D06E4: @ 81D06E4 adds r7, r1, 0 adds r6, r2, 0 movs r0, 0xD - bl sub_81C763C + bl GetSubstructPtr ldr r1, [r0, 0x8] ldrh r0, [r1, 0x2] lsls r0, 2 @@ -17594,7 +16958,7 @@ sub_81D0760: @ 81D0760 adds r6, r1, 0 adds r7, r2, 0 movs r0, 0xD - bl sub_81C763C + bl GetSubstructPtr ldr r1, [r0, 0x8] ldrh r0, [r1, 0x2] lsls r0, 2 @@ -17648,7 +17012,7 @@ _081D07D0: sub_81D07D8: @ 81D07D8 push {lr} movs r0, 0xD - bl sub_81C763C + bl GetSubstructPtr ldr r1, [r0, 0x8] ldrh r0, [r1, 0x2] lsls r0, 2 @@ -17815,7 +17179,7 @@ sub_81D0914: @ 81D0914 push {r4,lr} adds r4, r0, 0 movs r0, 0xD - bl sub_81C763C + bl GetSubstructPtr ldrh r1, [r0, 0x10] str r1, [r4] adds r0, 0x14 @@ -17829,7 +17193,7 @@ sub_81D092C: @ 81D092C push {r4,lr} adds r4, r0, 0 movs r0, 0xD - bl sub_81C763C + bl GetSubstructPtr ldrh r1, [r0, 0x12] str r1, [r4] adds r0, 0x78 @@ -17842,7 +17206,7 @@ sub_81D092C: @ 81D092C sub_81D0944: @ 81D0944 push {lr} movs r0, 0xD - bl sub_81C763C + bl GetSubstructPtr ldrh r0, [r0, 0xC] pop {r1} bx r1 @@ -17852,7 +17216,7 @@ sub_81D0944: @ 81D0944 sub_81D0954: @ 81D0954 push {lr} movs r0, 0xD - bl sub_81C763C + bl GetSubstructPtr adds r1, r0, 0 ldrh r0, [r1, 0xC] cmp r0, 0x18 @@ -17876,7 +17240,7 @@ sub_81D0978: @ 81D0978 push {r4,lr} ldr r1, =0x0000101c movs r0, 0xE - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081D09A8 @@ -17902,7 +17266,7 @@ sub_81D09B0: @ 81D09B0 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0xE - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 ldr r0, =gUnknown_08624BA0 lsls r4, 2 @@ -17923,7 +17287,7 @@ sub_81D09B0: @ 81D09B0 sub_81D09E0: @ 81D09E0 push {lr} movs r0, 0xE - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0] bl _call_via_r0 pop {r1} @@ -17934,7 +17298,7 @@ sub_81D09E0: @ 81D09E0 sub_81D09F4: @ 81D09F4 push {r4,lr} movs r0, 0xE - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 ldrb r0, [r4, 0xA] bl RemoveWindow @@ -17963,7 +17327,7 @@ sub_81D09F4: @ 81D09F4 ldr r0, [r4, 0x14] bl DestroySprite movs r0, 0xE - bl sub_81C7650 + bl FreeSubstruct pop {r4} pop {r0} bx r0 @@ -17973,7 +17337,7 @@ sub_81D09F4: @ 81D09F4 sub_81D0A58: @ 81D0A58 push {lr} movs r0, 0xE - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x4] bl sub_81C70D8 pop {r1} @@ -17986,7 +17350,7 @@ sub_81D0A6C: @ 81D0A6C sub sp, 0x8 adds r4, r0, 0 movs r0, 0xE - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x9 bls _081D0A80 @@ -18013,7 +17377,7 @@ _081D0A90: _081D0AB8: ldr r0, =gUnknown_08624B98 movs r1, 0x2 - bl sub_81C7B54 + bl InitBgTemplates ldr r1, =gUnknown_08DDE030 movs r0, 0 str r0, [sp] @@ -18215,7 +17579,7 @@ sub_81D0C84: @ 81D0C84 push {r4,r5,lr} adds r5, r0, 0 movs r0, 0xE - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 cmp r5, 0x6 bhi _081D0D24 @@ -18295,7 +17659,7 @@ sub_81D0D2C: @ 81D0D2C push {r4,r5,lr} adds r4, r0, 0 movs r0, 0xE - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081D0D5C @@ -18347,7 +17711,7 @@ sub_81D0D8C: @ 81D0D8C push {r4,r5,lr} adds r4, r0, 0 movs r0, 0xE - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081D0DC0 @@ -18408,7 +17772,7 @@ sub_81D0E00: @ 81D0E00 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0xE - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081D0E30 diff --git a/include/graphics.h b/include/graphics.h index 48c00943b1..d4696bc8b1 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4010,6 +4010,7 @@ extern const u32 gCreditsCopyrightEnd_Gfx[]; //pokenav extern const u8 gPokenavConditionMarker_Gfx[]; extern const u16 gPokenavConditionMarker_Pal[]; +extern const u16 gPokenavLeftHeader_Pal[]; extern const u16 gPokenavHeader_Pal[]; extern const u32 gPokenavHeader_Gfx[]; extern const u32 gPokenavHeader_Tilemap[]; diff --git a/src/pokenav.c b/src/pokenav.c index ff687e8dc5..d09c3da94b 100644 --- a/src/pokenav.c +++ b/src/pokenav.c @@ -13,26 +13,45 @@ #include "bg.h" #include "menu.h" #include "graphics.h" +#include "dma3.h" #include "gba/macro.h" #include "decompress.h" #include "strings.h" #include "constants/rgb.h" +enum +{ + MODE_NORMAL, // Chosen from Start menu. + MODE_FORCE_CALL_1, // Used for the script's special. Has to choose Match Call and make a call. + MODE_FORCE_CALL_2, // Set after making a call, has to exit Pokenav. +}; + #define UNKNOWN_OFFSET 100000 +struct UnknownSubStruct_0203CF40 +{ + void (*unk0)(u32); + u32 (*unk4)(void); + u32 unk8; + u32 unkC; + u32 unk10; + u32 unk14; + struct Sprite *unk18; + struct Sprite *unk1C[2]; + struct Sprite *unk24[2]; + u8 tilemapBuffer[0x1000]; +}; + +#define SUBSTRUCT_COUNT 19 + struct UnknownStruct_0203CF40 { u32 (*field0)(void); u32 field4; - u16 field8; + u16 mode; u16 fieldA; - u32 fieldC; - void *field10[19]; -}; - -struct UnknownStruct_sub_81C76C4 -{ - u32 data[523]; + bool32 hasAnyRibbons; + struct UnknownSubStruct_0203CF40 *field10[SUBSTRUCT_COUNT]; }; extern u32 sub_81C9430(void); @@ -101,34 +120,42 @@ extern u32 sub_81CFE08(void); u32 sub_81C791C(s32 a0); bool32 sub_81C756C(u32 a0); bool32 sub_81C76C4(void); -u32 AnyMonHasRibbon(void); +static bool32 AnyMonHasRibbon(void); u32 sub_81C75E0(void); u32 sub_81C75D4(void); u32 sub_81C76FC(void); u32 sub_81C786C(void); u32 sub_81C7764(s32 a0); -u32 atk47_cmd47(s32 a0); +u32 sub_81C78D4(s32 a0); bool32 sub_81C7738(void); void CopyPaletteIntoBufferUnfaded(const u16 *palette, u32 a1, u32 a2); -void sub_81C7834(u32 (*a0)(void), u32(*a1)(void)); -void sub_81C7360(struct UnknownStruct_0203CF40 *a0); -void sub_81C7650(u32 index); +void sub_81C7834(void *func1, void *func2); +static void InitMainStruct(struct UnknownStruct_0203CF40 *a0); +void FreeSubstruct(u32 index); void sub_81C7850(u32 a0); void sub_81C7BF8(u32 a0); void sub_81C71E4(u8 a0); -void sub_81C7170(u8 a0); +void sub_81C7170(u8 taskId); void sub_81C742C(u8 taskId); void sub_81C7710(void); -void sub_81C75F4(void); -void sub_81C7334(void); -void sub_81C7418(void); -void sub_81C7400(void); +static void InitKeys_(void); +static void FreeVars(void); +static void VblankCb_Pokenav(void); +static void Cb2_Pokenav(void); void sub_81C7C28(void); void sub_81C72BC(void); void sub_81C7B74(void); void sub_81C7C94(void); +void sub_81C7F24(u32 arg0); +void sub_81C7E58(u32 arg0); +void sub_81C8110(bool32 arg0); +void sub_81C80D4(bool32 arg0); +void sub_81C803C(u32 arg0, bool32 arg1); +void sub_81C8088(u32 arg0, bool32 arg1); +void sub_81C814C(struct Sprite *sprite, s32 arg1, s32 arg2, s32 arg3); +void sub_81C817C(struct Sprite *sprite); - +// Const rom data. u32 (*const gUnknown_0861F3EC[15][7])(void) = { { @@ -272,15 +299,17 @@ const u16 gUnknown_0861F590[] = INCBIN_U16("graphics/pokenav/icon2.gbapal"); const u32 gUnknown_0861F5B0[] = INCBIN_U32("graphics/pokenav/icon2.4bpp.lz"); const u32 gUnknown_0861F994[] = INCBIN_U32("graphics/pokenav/icon2_unused.4bpp.lz"); -const struct BgTemplate gUnknown_0861FA04 = +const struct BgTemplate gUnknown_0861FA04[] = { - .bg = 0, - .charBaseIndex = 0, - .mapBaseIndex = 5, - .screenSize = 0, - .paletteMode = 0, - .priority = 0, - .baseTile = 0, + { + .bg = 0, + .charBaseIndex = 0, + .mapBaseIndex = 5, + .screenSize = 0, + .paletteMode = 0, + .priority = 0, + .baseTile = 0, + } }; const struct WindowTemplate gUnknown_0861FA08[2] = @@ -305,7 +334,7 @@ const struct WindowTemplate gUnknown_0861FA08[2] = }, }; -const u8 *const (MenuButtonReminders[12]) = +const u8 *const (sMenuButtonReminders[12]) = { gText_Navgear_ClearButtonList, gText_NavgearMap_ZoomedOutButtons, @@ -341,10 +370,6 @@ const struct SpritePalette gUnknown_0861FA54[2] = .data = gUnknown_0861F590, .tag = 0, }, - { - .data = NULL, - .tag = 0, - } }; const struct CompressedSpriteSheet gUnknown_0861FA64 = @@ -358,16 +383,17 @@ extern struct UnknownStruct_0203CF40 *gUnknown_0203CF40; extern u8 gUnknown_0203CF3C; extern const struct SpriteTemplate gUnknown_0861FB04; -u32 sub_81C7078(u32 (*a0)(s32), u32 a1) +// code +u32 sub_81C7078(u32 (*func)(s32), u32 priority) { u16 taskId; if (!is_c1_link_related_active()) - taskId = CreateTask(sub_81C7170, a1); + taskId = CreateTask(sub_81C7170, priority); else - taskId = CreateTask(sub_81C71E4, a1); + taskId = CreateTask(sub_81C71E4, priority); - SetWordTaskArg(taskId, 1, (u32)a0); + SetWordTaskArg(taskId, 1, (u32)func); gTasks[taskId].data[3] = gUnknown_0203CF3C; return ((gUnknown_0203CF3C++) << 16) | taskId; @@ -375,62 +401,52 @@ u32 sub_81C7078(u32 (*a0)(s32), u32 a1) bool32 sub_81C70D8(u32 a0) { - u32 v1 = a0 & 0xFFFF; + u32 taskId = a0 & 0xFFFF; u32 v2 = a0 >> 16; - if (gTasks[v1].isActive - && (gTasks[v1].func == sub_81C7170 || gTasks[v1].func == sub_81C71E4) - && gTasks[v1].data[3] == v2) - { - + + if (gTasks[taskId].isActive + && (gTasks[taskId].func == sub_81C7170 || gTasks[taskId].func == sub_81C71E4) + && gTasks[taskId].data[3] == v2) return TRUE; - } else - { return FALSE; - } } bool32 sub_81C7124(u32 a0) { s32 i; - for (i = 0; i < 16; i++) + for (i = 0; i < NUM_TASKS; i++) { if (gTasks[i].isActive - && (gTasks[i].func == sub_81C7170 || gTasks[i].func == sub_81C71E4)) - { - u32 arg = GetWordTaskArg((u8)i, 1); - if (arg == a0) - return TRUE; - } + && (gTasks[i].func == sub_81C7170 || gTasks[i].func == sub_81C71E4) + && GetWordTaskArg(i, 1) == a0) + return TRUE; } return FALSE; } void sub_81C7170(u8 taskId) { - s16 *dataPtr; - u32 (*func)(u32); - bool32 exitLoop; + u32 (*func)(s32) = (void *)GetWordTaskArg(taskId, 1); + s16 *data = gTasks[taskId].data; + bool32 exitLoop = FALSE; - func = (u32 (*)(u32))GetWordTaskArg(taskId, 1); - dataPtr = gTasks[taskId].data; - exitLoop = FALSE; while (!exitLoop) { - u32 v1 =((u32 (*)(u32))func)(dataPtr[0]); - switch (v1) + u32 var = func(data[0]); + switch (var) { case 1: - dataPtr[0] = dataPtr[0] + 1; + data[0] = data[0] + 1; break; case 0: - dataPtr[0]++; + data[0]++; return; case 4: DestroyTask(taskId); return; default: - dataPtr[0] = v1 - 5; + data[0] = var - 5; break; case 3: break; @@ -471,91 +487,81 @@ void sub_81C71E4(u8 taskId) void CB2_PokeNav(void) { - gUnknown_0203CF40 = Alloc(sizeof(struct UnknownStruct_0203CF40)); + gUnknown_0203CF40 = Alloc(sizeof(*gUnknown_0203CF40)); if (gUnknown_0203CF40 == NULL) { SetMainCallback2(CB2_ReturnToFieldWithOpenMenu); } else { - sub_81C7360(gUnknown_0203CF40); + InitMainStruct(gUnknown_0203CF40); ResetTasks(); SetVBlankCallback(NULL); CreateTask(sub_81C742C, 0); - SetMainCallback2(sub_81C7400); - SetVBlankCallback(sub_81C7418); + SetMainCallback2(Cb2_Pokenav); + SetVBlankCallback(VblankCb_Pokenav); } } -void sub_81C72A4() +void sub_81C72A4(void) { SetMainCallback2(sub_81C72BC); FadeScreen(1, 0); } -void sub_81C72BC() +void sub_81C72BC(void) { UpdatePaletteFade(); - if (!gPaletteFade.active) + if (gPaletteFade.active) + return; + + gUnknown_0203CF40 = Alloc(sizeof(*gUnknown_0203CF40)); + if (gUnknown_0203CF40 == NULL) { - gUnknown_0203CF40 = Alloc(sizeof(struct UnknownStruct_0203CF40)); - if (gUnknown_0203CF40 == NULL) - { - SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); - } - else - { - sub_81C7360(gUnknown_0203CF40); - gUnknown_0203CF40->field8 = 1; - ResetTasks(); - ResetSpriteData(); - FreeAllSpritePalettes(); - SetVBlankCallback(NULL); - CreateTask(sub_81C742C, 0); - SetMainCallback2(sub_81C7400); - SetVBlankCallback(sub_81C7418); - } + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); + } + else + { + InitMainStruct(gUnknown_0203CF40); + gUnknown_0203CF40->mode = MODE_FORCE_CALL_1; + ResetTasks(); + ResetSpriteData(); + FreeAllSpritePalettes(); + SetVBlankCallback(NULL); + CreateTask(sub_81C742C, 0); + SetMainCallback2(Cb2_Pokenav); + SetVBlankCallback(VblankCb_Pokenav); } } -void sub_81C7334() +static void FreeVars(void) { s32 i; - for (i = 0; i < 19; i++) - { - sub_81C7650(i); - } - Free(gUnknown_0203CF40); - gUnknown_0203CF40 = NULL; + for (i = 0; i < SUBSTRUCT_COUNT; i++) + FreeSubstruct(i); + + FREE_AND_SET_NULL(gUnknown_0203CF40); InitKeys(); } // Clears UnknownStruct_0203CF40 -void sub_81C7360(struct UnknownStruct_0203CF40 *a0) +static void InitMainStruct(struct UnknownStruct_0203CF40 *a0) { s32 i; - void **arrayPtr; - void *fill; - fill = NULL; - i = 18; - arrayPtr = &(a0->field10[18]); - for (i; i >= 0; i--) - { - *arrayPtr = fill; - arrayPtr -= 1; - } - a0->field8 = 0; + for (i = 0; i < SUBSTRUCT_COUNT; i++) + a0->field10[i] = NULL; + + a0->mode = MODE_NORMAL; a0->field4 = 0; - a0->fieldC = AnyMonHasRibbon(); + a0->hasAnyRibbons = AnyMonHasRibbon(); a0->field0 = NULL; } -bool32 AnyMonHasRibbon() +static bool32 AnyMonHasRibbon(void) { - s32 i; - s32 j; + s32 i, j; for (i = 0; i < PARTY_SIZE; i++) { @@ -569,7 +575,7 @@ bool32 AnyMonHasRibbon() for (j = 0; j < TOTAL_BOXES_COUNT; j++) { - for (i = 0; i < IN_BOX_COUNT; i++) + for (i = 0; i < IN_BOX_COUNT; i++) { if (CheckBoxMonSanityAt(j, i) && GetBoxMonDataAt(j, i, MON_DATA_RIBBON_COUNT) != 0) @@ -582,7 +588,7 @@ bool32 AnyMonHasRibbon() return FALSE; } -void sub_81C7400() +static void Cb2_Pokenav(void) { RunTasks(); AnimateSprites(); @@ -590,7 +596,7 @@ void sub_81C7400() UpdatePaletteFade(); } -void sub_81C7418() +static void VblankCb_Pokenav(void) { TransferPlttBuffer(); LoadOam(); @@ -599,34 +605,31 @@ void sub_81C7418() void sub_81C742C(u8 taskId) { - s16 *dataPtr; u32 v1; - bool32 v2; + s16 *data = gTasks[taskId].data; - dataPtr = gTasks[taskId].data; - - switch (dataPtr[0]) + switch (data[0]) { case 0: sub_81C76C4(); - dataPtr[0] = 1; + data[0] = 1; break; case 1: if (sub_81C76FC()) break; sub_81C756C(UNKNOWN_OFFSET); - dataPtr[0] = 4; + data[0] = 4; break; case 2: if (sub_81C786C()) break; - dataPtr[0] = 3; + data[0] = 3; case 3: v1 = sub_81C75E0(); if (v1 == -1) { sub_81C7710(); - dataPtr[0] = 5; + data[0] = 5; } else if (v1 >= UNKNOWN_OFFSET) { @@ -634,32 +637,33 @@ void sub_81C742C(u8 taskId) gUnknown_0861F3EC[gUnknown_0203CF40->field4][5](); if (sub_81C756C(v1)) { - dataPtr[0] = 4; + data[0] = 4; } else { sub_81C7710(); - dataPtr[0] = 5; + data[0] = 5; } } else if (v1 != 0) { sub_81C7850(v1); if (sub_81C786C()) - dataPtr[0] = 2; + data[0] = 2; } break; case 4: if (!sub_81C75D4()) - dataPtr[0] = 3; + data[0] = 3; break; case 5: if (!sub_81C7738()) { - v2 = gUnknown_0203CF40->field8 != 0; + bool32 calledFromScript = (gUnknown_0203CF40->mode != MODE_NORMAL); + sub_81C9430(); - sub_81C7334(); - if (v2) + FreeVars(); + if (calledFromScript) SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); else SetMainCallback2(CB2_ReturnToFieldWithOpenMenu); @@ -670,14 +674,14 @@ void sub_81C742C(u8 taskId) bool32 sub_81C756C(u32 a0) { - u32 index; + u32 index = a0 - UNKNOWN_OFFSET; - index = a0 - UNKNOWN_OFFSET; - sub_81C75F4(); + InitKeys_(); if (!gUnknown_0861F3EC[index][0]()) return FALSE; if (!gUnknown_0861F3EC[index][2]()) return FALSE; + sub_81C7834(gUnknown_0861F3EC[index][3], gUnknown_0861F3EC[index][4]); gUnknown_0203CF40->field0 = gUnknown_0861F3EC[index][1]; gUnknown_0203CF40->field4 = index; @@ -694,52 +698,52 @@ u32 sub_81C75E0(void) return gUnknown_0203CF40->field0(); } -void sub_81C75F4(void) +static void InitKeys_(void) { InitKeys(); } -void IndirectSetVBlankCallback(IntrCallback callback) +void SetVBlankCallback_(IntrCallback callback) { SetVBlankCallback(callback); } -void sub_81C760C(void) +void SetPokenavVBlankCallback(void) { - SetVBlankCallback(sub_81C7418); + SetVBlankCallback(VblankCb_Pokenav); } -void *sub_81C761C(u32 index, u32 size) +void *AllocSubstruct(u32 index, u32 size) { - return gUnknown_0203CF40->field10[index] = (void*)Alloc(size); + return gUnknown_0203CF40->field10[index] = Alloc(size); } -void *sub_81C763C(u32 index) +struct UnknownSubStruct_0203CF40 *GetSubstructPtr(u32 index) { return gUnknown_0203CF40->field10[index]; } -void sub_81C7650(u32 index) +void FreeSubstruct(u32 index) { if (gUnknown_0203CF40->field10[index] != NULL) FREE_AND_SET_NULL(gUnknown_0203CF40->field10[index]); } -u16 sub_81C767C(void) +u16 GetPokenavMode(void) { - return gUnknown_0203CF40->field8; + return gUnknown_0203CF40->mode; } -void sub_81C7688(u16 a0) +void SetPokenavMode(u16 mode) { - gUnknown_0203CF40->field8 = a0; + gUnknown_0203CF40->mode = mode; } void sub_81C7694(u32 a0) { - u32 value; - value = a0; - if (a0 > 4) + u32 value = a0; + + if (value > 4) value = 0; gUnknown_0203CF40->fieldA = value; } @@ -749,34 +753,27 @@ u16 sub_81C76AC(void) return gUnknown_0203CF40->fieldA; } -u32 sub_81C76B8(void) +bool32 CanViewRibbonsMenu(void) { - return gUnknown_0203CF40->fieldC; + return gUnknown_0203CF40->hasAnyRibbons; } bool32 sub_81C76C4(void) { - struct UnknownStruct_sub_81C76C4 *v1; - - v1 = (struct UnknownStruct_sub_81C76C4*)sub_81C761C(0, sizeof(struct UnknownStruct_sub_81C76C4)); - if (v1 == NULL) - { + struct UnknownSubStruct_0203CF40 *structPtr = AllocSubstruct(0, 0x82C); + if (structPtr == NULL) return FALSE; - } - else - { - ResetSpriteData(); - FreeAllSpritePalettes(); - v1->data[3] = sub_81C7078(sub_81C7764, 1); - return TRUE; - } + + ResetSpriteData(); + FreeAllSpritePalettes(); + structPtr->unkC = sub_81C7078(sub_81C7764, 1); + return TRUE; } u32 sub_81C76FC(void) { - u32 *v1; - v1 = sub_81C763C(0); - return sub_81C70D8(v1[3]); + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + return sub_81C70D8(structPtr->unkC); } void sub_81C7710(void) @@ -794,15 +791,14 @@ bool32 sub_81C7738(void) sub_81C7C94(); FreeAllWindowBuffers(); return FALSE; - } else - { - return TRUE; } + + return TRUE; } u32 sub_81C7764(s32 a0) { - u32 *v1; + struct UnknownSubStruct_0203CF40 *structPtr; switch (a0) { @@ -810,14 +806,14 @@ u32 sub_81C7764(s32 a0) SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); FreeAllWindowBuffers(); ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(0, &gUnknown_0861FA04, 1); + InitBgsFromTemplates(0, gUnknown_0861FA04, ARRAY_COUNT(gUnknown_0861FA04)); sub_8199D98(); reset_temp_tile_data_buffers(); return 1; case 1: - v1 = sub_81C763C(0); + structPtr = GetSubstructPtr(0); decompress_and_copy_tile_data_to_vram(0, &gPokenavHeader_Gfx, 0, 0, 0); - SetBgTilemapBuffer(0, &v1[11]); + SetBgTilemapBuffer(0, structPtr->tilemapBuffer); CopyToBgTilemapBuffer(0, &gPokenavHeader_Tilemap, 0, 0); CopyPaletteIntoBufferUnfaded(gPokenavHeader_Pal, 0, 0x20); CopyBgTilemapBufferToVram(0); @@ -825,7 +821,7 @@ u32 sub_81C7764(s32 a0) case 2: if (free_temp_tile_data_buffers_if_possible()) return 2; - + sub_81C7B74(); return 0; case 3: @@ -841,58 +837,46 @@ u32 sub_81C7764(s32 a0) } } -void sub_81C7834(u32 (*a0)(void), u32(*a1)(void)) +void sub_81C7834(void *func1, void *func2) // Fix types later. { - u32 (**v1)(void); - - v1 = sub_81C763C(0); - v1[0] = a0; - v1[1] = a1; - v1[2] = NULL; + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + structPtr->unk0 = func1; + structPtr->unk4 = func2; + structPtr->unk8 = 0; } void sub_81C7850(u32 a0) { - void (**v1)(u32); - - v1 = sub_81C763C(0); - v1[2] = NULL; - v1[0](a0); + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + structPtr->unk8 = 0; + structPtr->unk0(a0); } u32 sub_81C786C(void) { - u32 (**v1)(void); - - v1 = sub_81C763C(0); - return v1[1](); + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + return structPtr->unk4(); } void sub_81C7880(void) { - u32 *v1; - - v1 = sub_81C763C(0); - v1[3] = sub_81C7078(atk47_cmd47, 4); + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + structPtr->unkC = sub_81C7078(sub_81C78D4, 4); } void sub_81C78A0(void) { - u32 *v1; - - v1 = sub_81C763C(0); - v1[3] = sub_81C7078(sub_81C791C, 4); + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + structPtr->unkC = sub_81C7078(sub_81C791C, 4); } bool32 sub_81C78C0(void) { - u32 *v1; - - v1 = sub_81C763C(0); - return sub_81C70D8(v1[3]); + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + return sub_81C70D8(structPtr->unkC); } -u32 atk47_cmd47(s32 a0) +u32 sub_81C78D4(s32 a0) { switch (a0) { @@ -903,12 +887,12 @@ u32 atk47_cmd47(s32 a0) case 0: return 0; case 2: - if ((u32)ChangeBgY(0, 384, 1) >= 0x2000) + if (ChangeBgY(0, 384, 1) >= 0x2000u) { ChangeBgY(0, 0x2000, 0); return 4; } - + return 2; } } @@ -923,7 +907,8 @@ u32 sub_81C791C(s32 a0) return 2; } -void CopyPaletteIntoBufferUnfaded(const u16 *palette, u32 bufferOffset, u32 size) { +void CopyPaletteIntoBufferUnfaded(const u16 *palette, u32 bufferOffset, u32 size) +{ CpuCopy16(palette, gPlttBufferUnfaded + bufferOffset, size); } @@ -932,7 +917,7 @@ void sub_81C795C(const struct SpritePalette *palettes) const struct SpritePalette *current; u32 index; - for (current = palettes; current->data != NULL; current++) + for (current = palettes; current->data != NULL; current++) { index = AllocSpritePalette(current->tag); if (index == 0xFF) @@ -953,7 +938,7 @@ void sub_81C7990(u32 a0, u16 a1) } __attribute__((naked)) -void sub_81C79BC(u16 *a0, u16 *a1, u32 a2, u32 a3, u32 unused, u32 a5, u32 a6) +void sub_81C79BC(u16 *a0, u16 *a1, u32 a2, u32 a3, u32 a4, u32 a5) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ @@ -1090,15 +1075,15 @@ _081C7AAE:\n\ void sub_81C7AC0(s32 a0) { - u32 *v1; - v1 = sub_81C763C(0); + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + switch (a0) { case 0: - BeginNormalPaletteFade(v1[5], -2, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(structPtr->unk14, -2, 0, 16, RGB_BLACK); break; case 1: - BeginNormalPaletteFade(v1[5], -2, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(structPtr->unk14, -2, 16, 0, RGB_BLACK); break; case 2: BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_BLACK); @@ -1119,93 +1104,330 @@ void sub_81C7B40(void) BlendPalettes(0xFFFEFFFE, 16, RGB_BLACK); } -void sub_81C7B54(const struct BgTemplate *a0, s32 a1) +void InitBgTemplates(const struct BgTemplate *templates, s32 count) { s32 i; - if (a1 <= 0) - return; - for (i = a1; i != 0; i--) - { - InitBgFromTemplate(a0++); - } + + for (i = 0; i < count; i++) + InitBgFromTemplate(templates++); } void sub_81C7B74(void) { - u32 *v1; + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); - v1 = sub_81C763C(0); InitWindows(&gUnknown_0861FA08[0]); - v1[4] = 0; - sub_81C7BF8(0); - PutWindowTilemap(v1[4]); - CopyWindowToVram(v1[4], 3); // TODO: Use a defined constant here. + structPtr->unk10 = 0; + sub_81C7BF8(structPtr->unk10); + PutWindowTilemap(structPtr->unk10); + CopyWindowToVram(structPtr->unk10, 3); // TODO: Use a defined constant here. } void sub_81C7BA4(u32 a0) { - u32 *v1; + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); - v1 = sub_81C763C(0); - sub_81C7BF8(v1[4]); - AddTextPrinterParameterized3(v1[4], 1, 0, 1, gMenuButtonReminderColor, 0, MenuButtonReminders[a0]); + sub_81C7BF8(structPtr->unk10); + AddTextPrinterParameterized3(structPtr->unk10, 1, 0, 1, gMenuButtonReminderColor, 0, sMenuButtonReminders[a0]); } -bool8 sub_81C7BE8(void) +bool32 IsDma3ManagerBusyWithBgCopy_(void) { return IsDma3ManagerBusyWithBgCopy(); } -void sub_81C7BF8(u32 a0) +void sub_81C7BF8(u32 windowId) { - FillWindowPixelBuffer(a0, 0x44); - FillWindowPixelRect(a0, 0x55, 0, 0, 0x80, 1); + FillWindowPixelBuffer(windowId, 0x44); + FillWindowPixelRect(windowId, 0x55, 0, 0, 0x80, 1); } void sub_81C7C28(void) { - u32 *v1; - u32 i; - u8 v2; - u32 v3; - u32 v4; + s32 i; u8 spriteId; + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); - v1 = sub_81C763C(0); for (i = 0; i < ARRAY_COUNT(gUnknown_0861FA4C); i++) - { LoadCompressedSpriteSheet(&gUnknown_0861FA4C[i]); - } sub_81C795C(gUnknown_0861FA54); - v2 = IndexOfSpritePaletteTag(0); - v1[5] = ~1 & ~(0x10000 << v2); + structPtr->unk14 = ~1 & ~(0x10000 << IndexOfSpritePaletteTag(0)); spriteId = CreateSprite(&gUnknown_0861FB04, 220, 12, 0); - v1[6] = (u32)(&gSprites[spriteId]); + structPtr->unk18 = &gSprites[spriteId]; } void sub_81C7C94(void) { - void **v1; - v1 = sub_81C763C(0); - DestroySprite(v1[6]); + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + + DestroySprite(structPtr->unk18); FreeSpriteTilesByTag(0); FreeSpritePaletteByTag(0); } -void sub_81C7CB4(u16 *a0) +void sub_81C7CB4(struct Sprite *sprite) { - u32 v1; - v1 = GetBgY(0); - a0[19] = (v1 >> 8) * -1; + sprite->pos2.y = (GetBgY(0) / 256u) * -1; } struct Sprite *sub_81C7CCC(void) { - struct Sprite **v1; - struct Sprite *v2; - v1 = sub_81C763C(0); - v2 = v1[6]; - v2->callback = SpriteCallbackDummy; - return v2; + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + + structPtr->unk18->callback = SpriteCallbackDummy; + return structPtr->unk18; } + +void sub_81C7CE4(void) +{ + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + + structPtr->unk18->pos1.x = 220; + structPtr->unk18->pos1.y = 12; + structPtr->unk18->callback = sub_81C7CB4; + structPtr->unk18->invisible = FALSE; + structPtr->unk18->oam.priority = 0; + structPtr->unk18->subpriority = 0; +} + +extern const struct SpriteTemplate gUnknown_0861FB2C; +extern const struct SpriteTemplate gUnknown_0861FB44; +extern const struct CompressedSpriteSheet gUnknown_0861FA6C[]; + +void sub_81C7D28(void) +{ + s32 i, spriteId; + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + + LoadCompressedSpriteSheet(&gUnknown_0861FA64); + AllocSpritePalette(1); + AllocSpritePalette(2); + for (i = 0; i < 2; i++) + { + spriteId = CreateSprite(&gUnknown_0861FB2C, 0, 0, 1); + structPtr->unk1C[i] = &gSprites[spriteId]; + structPtr->unk1C[i]->invisible = TRUE; + structPtr->unk1C[i]->pos2.x = i * 64; + + spriteId = CreateSprite(&gUnknown_0861FB44, 0, 0, 2); + structPtr->unk24[i] = &gSprites[spriteId]; + structPtr->unk24[i]->invisible = TRUE; + structPtr->unk24[i]->pos2.x = i * 32; + structPtr->unk24[i]->pos2.y = 18; + structPtr->unk24[i]->oam.tileNum += (i * 8) + 64; + } +} + +void sub_81C7DFC(u32 arg0) +{ + if (arg0 < 6) + sub_81C7E58(arg0); + else + sub_81C7F24(arg0 - 6); +} + +void sub_81C7E14(u32 arg0) +{ + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + + if (arg0 == 4) + structPtr->unk1C[1]->oam.tileNum = GetSpriteTileStartByTag(2) + 32; + else + structPtr->unk1C[1]->oam.tileNum = GetSpriteTileStartByTag(2) + 64; +} + +void sub_81C7E58(u32 arg0) +{ + struct UnknownSubStruct_0203CF40 *structPtr; + u32 size, tag; + + if (arg0 >= 6) + return; + + structPtr = GetSubstructPtr(0); + tag = gUnknown_0861FA6C[arg0].tag; + size = GetDecompressedDataSize(gUnknown_0861FA6C[arg0].data); + LoadPalette(&gPokenavLeftHeader_Pal[tag * 16], (IndexOfSpritePaletteTag(1) * 16) + 0x100, 0x20); + LZ77UnCompWram(gUnknown_0861FA6C[arg0].data, gDecompressionBuffer); + RequestDma3Copy(gDecompressionBuffer, (void *)VRAM + 0x10000 + (GetSpriteTileStartByTag(2) * 32), size, 1); + structPtr->unk1C[1]->oam.tileNum = GetSpriteTileStartByTag(2) + gUnknown_0861FA6C[arg0].size; + + if (arg0 == 4 || arg0 == 5) + structPtr->unk1C[1]->pos2.x = 56; + else + structPtr->unk1C[1]->pos2.x = 64; +} + +// Needed to match u32/u16 tag field difference. +struct CompressedSpritePalette_ +{ + const u32 *data; // LZ77 compressed palette data + u32 tag; +}; + +extern const struct CompressedSpritePalette_ gUnknown_0861FA9C[]; + +void sub_81C7F24(u32 arg0) +{ + u32 size, tag; + + if (arg0 >= 7) + return; + + tag = gUnknown_0861FA9C[arg0].tag; + size = GetDecompressedDataSize(gUnknown_0861FA9C[arg0].data); + LoadPalette(&gPokenavLeftHeader_Pal[tag * 16], (IndexOfSpritePaletteTag(2) * 16) + 0x100, 0x20); + LZ77UnCompWram(gUnknown_0861FA9C[arg0].data, &gDecompressionBuffer[0x1000]); + RequestDma3Copy(&gDecompressionBuffer[0x1000], (void *)VRAM + 0x10800 + (GetSpriteTileStartByTag(2) * 32), size, 1); +} + +void sub_81C7FA0(u32 arg0, bool32 arg1, bool32 arg2) +{ + u32 var; + + if (!arg1) + var = 0x30; + else + var = 0x10; + + if (arg0 < 6) + sub_81C803C(var, arg2); + else + sub_81C8088(var, arg2); +} + +void sub_81C7FC4(u32 arg0, bool32 arg1) +{ + if (arg0 < 6) + sub_81C80D4(arg1); + else + sub_81C8110(arg1); +} + +void sub_81C7FDC(void) +{ + s32 i; + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + + for (i = 0; i < 2; i++) + { + structPtr->unk1C[i]->invisible = TRUE; + structPtr->unk24[i]->invisible = TRUE; + } +} + +bool32 sub_81C8010(void) +{ + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + + if (structPtr->unk1C[0]->callback == SpriteCallbackDummy && structPtr->unk24[0]->callback == SpriteCallbackDummy) + return FALSE; + else + return TRUE; +} + +void sub_81C803C(u32 arg0, bool32 arg1) +{ + s32 var1, var2, i; + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + + if (!arg1) + var1 = -96, var2 = 32; + else + var1 = 256, var2 = 160; + + for (i = 0; i < 2; i++) + { + structPtr->unk1C[i]->pos1.y = arg0; + sub_81C814C(structPtr->unk1C[i], var1, var2, 12); + } +} + +void sub_81C8088(u32 arg0, bool32 arg1) +{ + s32 var1, var2, i; + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + + if (!arg1) + var1 = -96, var2 = 16; + else + var1 = 256, var2 = 192; + + for (i = 0; i < 2; i++) + { + structPtr->unk24[i]->pos1.y = arg0; + sub_81C814C(structPtr->unk24[i], var1, var2, 12); + } +} + +void sub_81C80D4(bool32 arg0) +{ + s32 var1, var2, i; + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + + if (!arg0) + var1 = 32, var2 = -96; + else + var1 = 192, var2 = 256; + + for (i = 0; i < 2; i++) + { + sub_81C814C(structPtr->unk1C[i], var1, var2, 12); + } +} + +void sub_81C8110(bool32 arg0) +{ + s32 var1, var2, i; + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + + if (!arg0) + var1 = 16, var2 = -96; + else + var1 = 192, var2 = 256; + + for (i = 0; i < 2; i++) + { + sub_81C814C(structPtr->unk24[i], var1, var2, 12); + } +} + +void sub_81C814C(struct Sprite *sprite, s32 arg1, s32 arg2, s32 arg3) +{ + sprite->pos1.x = arg1; + sprite->data[0] = arg1 * 16; + sprite->data[1] = (arg2 - arg1) * 16 / arg3; + sprite->data[2] = arg3; + sprite->data[7] = arg2; + sprite->callback = sub_81C817C; +} + +void sub_81C817C(struct Sprite *sprite) +{ + if (sprite->data[2] != 0) + { + sprite->data[2]--; + sprite->data[0] += sprite->data[1]; + sprite->pos1.x = sprite->data[0] >> 4; + if (sprite->pos1.x < -16 || sprite->pos1.x > 256) + sprite->invisible = TRUE; + else + sprite->invisible = FALSE; + } + else + { + sprite->pos1.x = sprite->data[7]; + sprite->callback = SpriteCallbackDummy; + } +} + +/* +bool32 sub_81C81D4(const void *arg0, void *arg1, s32 arg3) +{ + struct UnknownSubStruct_0203CF40 *structPtr = AllocSubstruct(0x11, 0x8A4); + + if (structPtr == NULL) + return FALSE; +} +*/ From 74a3c062706c3889c08a567ee9d9803a8a689592 Mon Sep 17 00:00:00 2001 From: Ariel Antonitis Date: Tue, 19 Feb 2019 04:09:42 -0500 Subject: [PATCH 05/25] Documented/polished pokemon_summary_screen.c Mostly variables mislabeled as global and some formerly unknown stuff. --- include/graphics.h | 14 +- include/pokemon.h | 8 +- include/pokemon_summary_screen.h | 2 +- src/battle_factory_screen.c | 4 +- src/graphics.c | 14 +- src/party_menu.c | 6 +- src/pokemon.c | 24 +- src/pokemon_storage_system.c | 4 +- src/pokemon_summary_screen.c | 426 ++++++++++++++++--------------- src/trade.c | 4 +- 10 files changed, 254 insertions(+), 252 deletions(-) diff --git a/include/graphics.h b/include/graphics.h index d313bae118..6e6d2b4fc0 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4020,22 +4020,22 @@ extern const u32 gPokenavLeftHeaderCondition_Gfx[]; extern const u32 gPokenavLeftHeaderRibbons_Gfx[]; extern const u32 gPokenavLeftHeaderMatchCall_Gfx[]; -extern const u32 gUnknown_08D9862C[]; +extern const u32 gPageInfoTilemap[]; extern const u32 gUnknown_08D98CC8[]; -extern const u32 gUnknown_08D987FC[]; -extern const u32 gUnknown_08D9898C[]; -extern const u32 gUnknown_08D98B28[]; -extern const u32 gUnknown_08D9853C[]; +extern const u32 gPageSkillsTilemap[]; +extern const u32 gPageBattleMovesTilemap[]; +extern const u32 gPageContestMovesTilemap[]; +extern const u32 gStatusScreenPalette[]; extern const u16 gUnknown_08D85620[]; extern const u16 gSummaryScreenWindow_Tilemap[]; extern const u32 gMoveTypes_Pal[]; -extern const u32 gUnknown_08D97D0C[]; +extern const u32 gStatusScreenBitmap[]; extern const u16 gSummaryScreenPowAcc_Tilemap[]; extern const u16 gUnknown_08DC3C34[]; extern const u32 gMoveTypes_Gfx[]; -extern const u32 gUnknown_08D97BEC[]; +extern const u32 gMoveSelectorBitmap[]; extern const u32 gUnknown_08D97CF4[]; extern const u32 gStatusGfx_Icons[]; extern const u32 gStatusPal_Icons[]; diff --git a/include/pokemon.h b/include/pokemon.h index 5074976838..60ccb27f41 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -431,9 +431,9 @@ extern const u8 *const gItemEffectTable[]; extern const struct Evolution gEvolutionTable[][EVOS_PER_MON]; extern const u32 gExperienceTables[][MAX_LEVEL + 1]; extern const u16 *const gLevelUpLearnsets[]; -extern const u8 gUnknown_08329D22[]; -extern const u8 gUnknown_08329D26[]; -extern const u8 gUnknown_08329D2A[]; +extern const u8 gPPUpGetMask[]; +extern const u8 gPPUpSetMask[]; +extern const u8 gPPUpAddMask[]; extern const u8 gStatStageRatios[][2]; extern const u16 gUnknown_08329D54[]; extern const struct SpriteTemplate gUnknown_08329D98[]; @@ -583,7 +583,7 @@ const u8 *GetTrainerPartnerName(void); void BattleAnimateFrontSprite(struct Sprite* sprite, u16 species, bool8 noCry, u8 arg3); void DoMonFrontSpriteAnimation(struct Sprite* sprite, u16 species, bool8 noCry, u8 arg3); void PokemonSummaryDoMonAnimation(struct Sprite* sprite, u16 species, bool8 oneFrame); -void sub_806EE98(void); +void StopPokemonAnimationDelayTask(void); void BattleAnimateBackSprite(struct Sprite* sprite, u16 species); u8 sub_806EF08(u8 arg0); u8 sub_806EF84(u8 arg0, u8 arg1); diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h index e2226b1e19..bd99fed0ec 100755 --- a/include/pokemon_summary_screen.h +++ b/include/pokemon_summary_screen.h @@ -1,7 +1,7 @@ #ifndef GUARD_POKEMON_SUMMARY_SCREEN_H #define GUARD_POKEMON_SUMMARY_SCREEN_H -extern u8 gUnknown_0203CF20; +extern u8 gLastViewedMonIndex; void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void)); void sub_81C4F98(u8, void(*)(void)); diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index bb9fe8e280..e48dbd30b8 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -1183,7 +1183,7 @@ static void CB2_InitSelectScreen(void) break; case 5: if (sFactorySelectScreen->fromSummaryScreen == TRUE) - sFactorySelectScreen->cursorPos = gUnknown_0203CF20; + sFactorySelectScreen->cursorPos = gLastViewedMonIndex; Select_InitMonsData(); Select_InitAllSprites(); if (sFactorySelectScreen->fromSummaryScreen == TRUE) @@ -3172,7 +3172,7 @@ static void CB2_InitSwapScreen(void) break; case 5: if (sFactorySwapScreen->fromSummaryScreen == TRUE) - sFactorySwapScreen->cursorPos = gUnknown_0203CF20; + sFactorySwapScreen->cursorPos = gLastViewedMonIndex; gMain.state++; break; case 6: diff --git a/src/graphics.c b/src/graphics.c index c6af134770..a3b9eb9131 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1152,16 +1152,16 @@ const u32 gStatusPal_Icons[] = INCBIN_U32("graphics/interface/status_icons.gbapa const u32 gMoveTypes_Gfx[] = INCBIN_U32("graphics/types/move_types.4bpp.lz"); const u32 gMoveTypes_Pal[] = INCBIN_U32("graphics/types/move_types.gbapal.lz"); -const u32 gUnknown_08D97BEC[] = INCBIN_U32("graphics/interface/summary_frames.4bpp.lz"); +const u32 gMoveSelectorBitmap[] = INCBIN_U32("graphics/interface/summary_frames.4bpp.lz"); const u32 gUnknown_08D97CF4[] = INCBIN_U32("graphics/interface/summary_frames.gbapal.lz"); -const u32 gUnknown_08D97D0C[] = INCBIN_U32("graphics/interface/status_screen.4bpp.lz"); -const u32 gUnknown_08D9853C[] = INCBIN_U32("graphics/interface/status_screen.gbapal.lz"); -const u32 gUnknown_08D9862C[] = INCBIN_U32("graphics/interface/status_screen.bin.lz"); +const u32 gStatusScreenBitmap[] = INCBIN_U32("graphics/interface/status_screen.4bpp.lz"); +const u32 gStatusScreenPalette[] = INCBIN_U32("graphics/interface/status_screen.gbapal.lz"); +const u32 gPageInfoTilemap[] = INCBIN_U32("graphics/interface/status_screen.bin.lz"); -const u32 gUnknown_08D987FC[] = INCBIN_U32("graphics/interface/status_tilemap1.bin.lz"); -const u32 gUnknown_08D9898C[] = INCBIN_U32("graphics/interface/status_tilemap2.bin.lz"); -const u32 gUnknown_08D98B28[] = INCBIN_U32("graphics/interface/status_tilemap3.bin.lz"); +const u32 gPageSkillsTilemap[] = INCBIN_U32("graphics/interface/status_tilemap1.bin.lz"); +const u32 gPageBattleMovesTilemap[] = INCBIN_U32("graphics/interface/status_tilemap2.bin.lz"); +const u32 gPageContestMovesTilemap[] = INCBIN_U32("graphics/interface/status_tilemap3.bin.lz"); const u32 gUnknown_08D98CC8[] = INCBIN_U32("graphics/interface/status_tilemap0.bin.lz"); const u32 gBagMaleTiles[] = INCBIN_U32("graphics/misc/bag_male.4bpp.lz"); diff --git a/src/party_menu.c b/src/party_menu.c index 15b5d24d8e..645390affd 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -3833,7 +3833,7 @@ static void sub_81B3828(void) static void sub_81B3894(void) { gPaletteFade.bufferTransferDisabled = TRUE; - gUnknown_0203CEC8.unk9 = gUnknown_0203CF20; + gUnknown_0203CEC8.unk9 = gLastViewedMonIndex; InitPartyMenu(gUnknown_0203CEC8.unk8_0, 0xFF, gUnknown_0203CEC8.unkB, 1, 21, sub_81B36FC, gUnknown_0203CEC8.exitCallback); } @@ -7319,9 +7319,9 @@ static void sub_81B97DC(struct Pokemon *mon, u8 slotTo, u8 slotFrom) u8 pp1 = GetMonData(mon, MON_DATA_PP1 + slotTo); u8 pp0 = GetMonData(mon, MON_DATA_PP1 + slotFrom); u8 ppBonuses = GetMonData(mon, MON_DATA_PP_BONUSES); - u8 ppBonusMask1 = gUnknown_08329D22[slotTo]; + u8 ppBonusMask1 = gPPUpGetMask[slotTo]; u8 ppBonusMove1 = (ppBonuses & ppBonusMask1) >> (slotTo * 2); - u8 ppBonusMask2 = gUnknown_08329D22[slotFrom]; + u8 ppBonusMask2 = gPPUpGetMask[slotFrom]; u8 ppBonusMove2 = (ppBonuses & ppBonusMask2) >> (slotFrom * 2); ppBonuses &= ~ppBonusMask1; ppBonuses &= ~ppBonusMask2; diff --git a/src/pokemon.c b/src/pokemon.c index 9553fdf17f..a35033d498 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2227,9 +2227,9 @@ static const u8 sMonAnimationDelayTable[] = [SPECIES_CHIMECHO - 1] = 0x00, }; -const u8 gUnknown_08329D22[] = {0x03, 0x0c, 0x30, 0xc0}; // Masks for getting PP Up count, also PP Max values -const u8 gUnknown_08329D26[] = {0xfc, 0xf3, 0xcf, 0x3f}; // Masks for setting PP Up count -const u8 gUnknown_08329D2A[] = {0x01, 0x04, 0x10, 0x40}; // Values added to PP Up count +const u8 gPPUpGetMask[] = {0x03, 0x0c, 0x30, 0xc0}; // Masks for getting PP Up count, also PP Max values +const u8 gPPUpSetMask[] = {0xfc, 0xf3, 0xcf, 0x3f}; // Masks for setting PP Up count +const u8 gPPUpAddMask[] = {0x01, 0x04, 0x10, 0x40}; // Values added to PP Up count const u8 gStatStageRatios[][2] = { @@ -4914,19 +4914,19 @@ void GetSpeciesName(u8 *name, u16 species) u8 CalculatePPWithBonus(u16 move, u8 ppBonuses, u8 moveIndex) { u8 basePP = gBattleMoves[move].pp; - return basePP + ((basePP * 20 * ((gUnknown_08329D22[moveIndex] & ppBonuses) >> (2 * moveIndex))) / 100); + return basePP + ((basePP * 20 * ((gPPUpGetMask[moveIndex] & ppBonuses) >> (2 * moveIndex))) / 100); } void RemoveMonPPBonus(struct Pokemon *mon, u8 moveIndex) { u8 ppBonuses = GetMonData(mon, MON_DATA_PP_BONUSES, NULL); - ppBonuses &= gUnknown_08329D26[moveIndex]; + ppBonuses &= gPPUpSetMask[moveIndex]; SetMonData(mon, MON_DATA_PP_BONUSES, &ppBonuses); } void RemoveBattleMonPPBonus(struct BattlePokemon *mon, u8 moveIndex) { - mon->ppBonuses &= gUnknown_08329D26[moveIndex]; + mon->ppBonuses &= gPPUpSetMask[moveIndex]; } void CopyPlayerPartyMonToBattleData(u8 battlerId, u8 partyIndex) @@ -5169,11 +5169,11 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov if (r10 & 0x20) { r10 &= ~0x20; - dataUnsigned = (GetMonData(mon, MON_DATA_PP_BONUSES, NULL) & gUnknown_08329D22[moveIndex]) >> (moveIndex * 2); + dataUnsigned = (GetMonData(mon, MON_DATA_PP_BONUSES, NULL) & gPPUpGetMask[moveIndex]) >> (moveIndex * 2); var_38 = CalculatePPWithBonus(GetMonData(mon, MON_DATA_MOVE1 + moveIndex, NULL), GetMonData(mon, MON_DATA_PP_BONUSES, NULL), moveIndex); if (dataUnsigned <= 2 && var_38 > 4) { - dataUnsigned = GetMonData(mon, MON_DATA_PP_BONUSES, NULL) + gUnknown_08329D2A[moveIndex]; + dataUnsigned = GetMonData(mon, MON_DATA_PP_BONUSES, NULL) + gPPUpAddMask[moveIndex]; SetMonData(mon, MON_DATA_PP_BONUSES, &dataUnsigned); dataUnsigned = CalculatePPWithBonus(GetMonData(mon, MON_DATA_MOVE1 + moveIndex, NULL), dataUnsigned, moveIndex) - var_38; @@ -5429,13 +5429,13 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov var_3C++; break; case 4: - dataUnsigned = (GetMonData(mon, MON_DATA_PP_BONUSES, NULL) & gUnknown_08329D22[moveIndex]) >> (moveIndex * 2); + dataUnsigned = (GetMonData(mon, MON_DATA_PP_BONUSES, NULL) & gPPUpGetMask[moveIndex]) >> (moveIndex * 2); r5 = CalculatePPWithBonus(GetMonData(mon, MON_DATA_MOVE1 + moveIndex, NULL), GetMonData(mon, MON_DATA_PP_BONUSES, NULL), moveIndex); if (dataUnsigned < 3 && r5 > 4) { dataUnsigned = GetMonData(mon, MON_DATA_PP_BONUSES, NULL); - dataUnsigned &= gUnknown_08329D26[moveIndex]; - dataUnsigned += gUnknown_08329D2A[moveIndex] * 3; + dataUnsigned &= gPPUpSetMask[moveIndex]; + dataUnsigned += gPPUpAddMask[moveIndex] * 3; SetMonData(mon, MON_DATA_PP_BONUSES, &dataUnsigned); dataUnsigned = CalculatePPWithBonus(GetMonData(mon, MON_DATA_MOVE1 + moveIndex, NULL), dataUnsigned, moveIndex) - r5; @@ -7025,7 +7025,7 @@ void PokemonSummaryDoMonAnimation(struct Sprite* sprite, u16 species, bool8 oneF } } -void sub_806EE98(void) +void StopPokemonAnimationDelayTask(void) { u8 delayTaskId = FindTaskIdByFunc(Task_PokemonSummaryAnimateAfterDelay); if (delayTaskId != 0xFF) diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index c1ebe91b47..6f2382290d 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -1218,7 +1218,7 @@ static const u16 gWallpaperPalettes_Plain[][16] = static const u32 gWallpaperTiles_Plain[] = INCBIN_U32("graphics/pokemon_storage/plain.4bpp.lz"); static const u32 gWallpaperTilemap_Plain[] = INCBIN_U32("graphics/pokemon_storage/plain.bin.lz"); -// 12×18 tilemap +// 12�18 tilemap static const u32 gUnknown_085773C4[] = INCBIN_U32("graphics/unused/tilemap_5773C4.bin"); static const u16 gUnknown_08577574[][2] = @@ -6654,7 +6654,7 @@ static void sub_80CE8E4(void) if (sIsMonBeingMoved) sub_80CE790(); else - sBoxCursorPosition = gUnknown_0203CF20; + sBoxCursorPosition = gLastViewedMonIndex; } s16 CompactPartySlots(void) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 46bdc9ef36..bb49e6dc1e 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -97,24 +97,24 @@ static EWRAM_DATA struct PssData u8 currPageIndex; u8 minPageIndex; u8 maxPageIndex; - bool8 unk40C3; + bool8 lockMonFlag; // This is used to prevent the player from changing pokemon in the move deleter select, etc, but it is not needed because the input is handled differently there u16 newMove; u8 firstMoveIndex; u8 secondMoveIndex; bool8 unk40C8; - u8 unk40C9; + u8 bgDisplayOrder; // Determines the order page backgrounds are loaded while scrolling between them u8 filler40CA; u8 windowIds[8]; u8 spriteIds[28]; bool8 unk40EF; - s16 unk40F0; + s16 switchCounter; // Used for various switch statement cases that decompress/load graphics or pokemon data u8 unk_filler4[6]; } *pssData = NULL; -EWRAM_DATA u8 gUnknown_0203CF20 = 0; -static EWRAM_DATA u8 gUnknown_0203CF21 = 0; -static EWRAM_DATA u8 gFiller_0203CF22[2] = {0}; +EWRAM_DATA u8 gLastViewedMonIndex = 0; +static EWRAM_DATA u8 sUnknown_0203CF21 = 0; +static EWRAM_DATA u8 sFiller_0203CF22[2] = {0}; static EWRAM_DATA u8 sUnknownTaskId = 0; -static EWRAM_DATA u8 gFiller_0203CF25[3] = {0}; +static EWRAM_DATA u8 sFiller_0203CF25[3] = {0}; extern const struct CompressedSpriteSheet gMonFrontPicTable[]; @@ -144,11 +144,11 @@ static s8 sub_81C08F8(s8 a); static s8 sub_81C09B4(s8 a); static bool8 sub_81C0A50(struct Pokemon* mon); static void ChangePage(u8 taskId, s8 a); -static void sub_81C0B8C(u8 taskId); -static void sub_81C0C68(u8 taskId); -static void sub_81C0CC4(u8 taskId); -static void sub_81C0D44(u8 taskId); -static void sub_81C0E24(void); +static void PssScrollRight(u8 taskId); +static void PssScrollRightEnd(u8 taskId); +static void PssScrollLeft(u8 taskId); +static void PssScrollLeftEnd(u8 taskId); +static void CheckExperienceProgressBar(void); static void sub_81C0E48(u8 taskId); static void HandleInput_MoveSelect(u8 taskId); static bool8 sub_81C1040(void); @@ -160,11 +160,11 @@ static void sub_81C13B0(u8 taskId, bool8 b); static void SwapMonMoves(struct Pokemon *mon, u8 moveIndex1, u8 moveIndex2); static void SwapBoxMonMoves(struct BoxPokemon *mon, u8 moveIndex1, u8 moveIndex2); static void sub_81C171C(u8 taskId); -static void sub_81C174C(u8 taskId); -static bool8 sub_81C18A8(void); -static void sub_81C18F4(u8 a); -static void sub_81C1940(u8 taskId); -static void sub_81C1BA0(void); +static void HandleReplaceMoveInput(u8 taskId); +static bool8 CanReplaceMove(void); +static void ShowHMMovesCantBeForgottenWindow(u8 a); +static void HandleHMMovesCantBeForgottenInput(u8 taskId); +static void DrawPagination(void); static void sub_81C1DA4(u16 a, s16 b); static void sub_81C1E20(u8 taskId); static void sub_81C1EFC(u16 a, s16 b, u16 c); @@ -172,10 +172,10 @@ static void sub_81C1F80(u8 taskId); static void sub_81C2074(u16 a, s16 b); static void sub_81C20F0(u8 taskId); static void sub_81C2194(u16 *a, u16 b, u8 c); -static void sub_81C2228(struct Pokemon* mon); +static void DrawPokerusCuredSymbol(struct Pokemon* mon); static void DrawExperienceProgressBar(struct Pokemon* mon); static void DrawContestMoveHearts(u16 move); -static void sub_81C2524(void); +static void LimitEggSummaryPageDisplay(void); static void ResetWindows(void); static void sub_81C25E8(void); static void sub_81C2628(void); @@ -237,7 +237,7 @@ static void sub_81C4568(u8 a, u8 b); static u8 CreatePokemonSprite(struct Pokemon *a, s16 *b); static u8 sub_81C47B4(struct Pokemon *unused); static void SpriteCB_Pokemon(struct Sprite *); -static void sub_81C48F0(void); +static void StopPokemonAnimations(void); static void CreateMonMarkingsSprite(struct Pokemon *mon); static void RemoveAndCreateMonMarkingsSprite(struct Pokemon *mon); static void CreateCaughtBallSprite(struct Pokemon *mon); @@ -252,7 +252,7 @@ static void sub_81C4D18(u8 a); #include "data/text/move_descriptions.h" #include "data/text/nature_names.h" -static const struct BgTemplate gUnknown_0861CBB4[] = +static const struct BgTemplate sUnknown_0861CBB4[] = { { .bg = 0, @@ -292,25 +292,25 @@ static const struct BgTemplate gUnknown_0861CBB4[] = }, }; -static const u16 gUnknown_0861CBC4[] = INCBIN_U16("graphics/interface/unk_tilemap2.bin"); -static const struct UnkStruct_61CC04 gUnknown_0861CBEC = +static const u16 sUnknown_0861CBC4[] = INCBIN_U16("graphics/interface/unk_tilemap2.bin"); +static const struct UnkStruct_61CC04 sUnknown_0861CBEC = { - gUnknown_0861CBC4, 1, 10, 2, 0, 18 + sUnknown_0861CBC4, 1, 10, 2, 0, 18 }; -static const struct UnkStruct_61CC04 gUnknown_0861CBF8 = +static const struct UnkStruct_61CC04 sUnknown_0861CBF8 = { - gUnknown_0861CBC4, 1, 10, 2, 0, 50 + sUnknown_0861CBC4, 1, 10, 2, 0, 50 }; -static const struct UnkStruct_61CC04 gUnknown_0861CC04 = +static const struct UnkStruct_61CC04 sUnknown_0861CC04 = { gSummaryScreenPowAcc_Tilemap, 0, 10, 7, 0, 45 }; -static const struct UnkStruct_61CC04 gUnknown_0861CC10 = +static const struct UnkStruct_61CC04 sUnknown_0861CC10 = { gUnknown_08DC3C34, 0, 10, 7, 0, 45 }; static const s8 gUnknown_0861CC1C[] = {0, 2, 3, 1, 4, 5}; -static const struct WindowTemplate gUnknown_0861CC24[] = +static const struct WindowTemplate sSummaryTemplate[] = { {//Text for Pokemon Info .bg = 0, @@ -494,7 +494,7 @@ static const struct WindowTemplate gUnknown_0861CC24[] = }, DUMMY_WIN_TEMPLATE }; -static const struct WindowTemplate gUnknown_0861CCCC[] = +static const struct WindowTemplate sPageInfoTemplate[] = { {//Original Trainer .bg = 0, @@ -533,7 +533,7 @@ static const struct WindowTemplate gUnknown_0861CCCC[] = .baseBlock = 557, }, }; -static const struct WindowTemplate gUnknown_0861CCEC[] = +static const struct WindowTemplate sPageSkillsTemplate[] = { {//Held Item string .bg = 0, @@ -581,7 +581,7 @@ static const struct WindowTemplate gUnknown_0861CCEC[] = .baseBlock = 543, }, }; -static const struct WindowTemplate gUnknown_0861CD14[] = +static const struct WindowTemplate sPageMovesTemplate[] = // This is used for both battle and contest moves { {//Move names? .bg = 0, @@ -628,8 +628,8 @@ static const u8 sTextColors_861CD2C[][3] = {0, 7, 8} }; -static const u8 gUnknown_0861CD53[] = INCBIN_U8("graphics/interface/summary_a_button.4bpp"); -static const u8 gUnknown_0861CDD3[] = INCBIN_U8("graphics/interface/summary_b_button.4bpp"); +static const u8 sSummaryAButtonBitmap[] = INCBIN_U8("graphics/interface/summary_a_button.4bpp"); +static const u8 sSummaryBButtonBitmap[] = INCBIN_U8("graphics/interface/summary_b_button.4bpp"); static void (*const sTextPrinterFunctions[])(void) = { @@ -647,11 +647,11 @@ static void (*const sTextPrinterTasks[])(u8 taskId) = Task_PrintContestMoves }; -static const u8 gUnknown_0861CE74[] = _("{COLOR LIGHT_RED}{SHADOW GREEN}"); -static const u8 gUnknown_0861CE7B[] = _("{COLOR WHITE}{SHADOW DARK_GREY}"); -static const u8 gUnknown_0861CE82[] = _("{SPECIAL_F7 0x00}/{SPECIAL_F7 0x01}\n{SPECIAL_F7 0x02}\n{SPECIAL_F7 0x03}"); -static const u8 gUnknown_0861CE8E[] = _("{SPECIAL_F7 0x00}\n{SPECIAL_F7 0x01}\n{SPECIAL_F7 0x02}"); -static const u8 gUnknown_0861CE97[] = _("{PP}{SPECIAL_F7 0x00}/{SPECIAL_F7 0x01}"); +static const u8 sMemoNatureTextColor[] = _("{COLOR LIGHT_RED}{SHADOW GREEN}"); +static const u8 sMemoMiscTextColor[] = _("{COLOR WHITE}{SHADOW DARK_GREY}"); // This is also affected by palettes, apparently +static const u8 sStatsLeftColumnLayout[] = _("{SPECIAL_F7 0x00}/{SPECIAL_F7 0x01}\n{SPECIAL_F7 0x02}\n{SPECIAL_F7 0x03}"); +static const u8 sStatsRightColumnLayout[] = _("{SPECIAL_F7 0x00}\n{SPECIAL_F7 0x01}\n{SPECIAL_F7 0x02}"); +static const u8 sMovesPPLayout[] = _("{PP}{SPECIAL_F7 0x00}/{SPECIAL_F7 0x01}"); #define TAG_MOVE_TYPES 30002 @@ -847,61 +847,61 @@ static const struct OamData gOamData_861CFF4 = .paletteNum = 0, .affineParam = 0, }; -static const union AnimCmd gSpriteAnim_861CFFC[] = { +static const union AnimCmd sSpriteAnim_861CFFC[] = { ANIMCMD_FRAME(0, 0, FALSE, FALSE), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_861D004[] = { +static const union AnimCmd sSpriteAnim_861D004[] = { ANIMCMD_FRAME(4, 0, FALSE, FALSE), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_861D00C[] = { +static const union AnimCmd sSpriteAnim_861D00C[] = { ANIMCMD_FRAME(8, 0, FALSE, FALSE), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_861D014[] = { +static const union AnimCmd sSpriteAnim_861D014[] = { ANIMCMD_FRAME(12, 0, FALSE, FALSE), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_861D01C[] = { +static const union AnimCmd sSpriteAnim_861D01C[] = { ANIMCMD_FRAME(16, 0, FALSE, FALSE), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_861D024[] = { +static const union AnimCmd sSpriteAnim_861D024[] = { ANIMCMD_FRAME(16, 0, TRUE, FALSE), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_861D02C[] = { +static const union AnimCmd sSpriteAnim_861D02C[] = { ANIMCMD_FRAME(20, 0, FALSE, FALSE), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_861D034[] = { +static const union AnimCmd sSpriteAnim_861D034[] = { ANIMCMD_FRAME(24, 0, FALSE, FALSE), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_861D03C[] = { +static const union AnimCmd sSpriteAnim_861D03C[] = { ANIMCMD_FRAME(24, 0, TRUE, FALSE), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_861D044[] = { +static const union AnimCmd sSpriteAnim_861D044[] = { ANIMCMD_FRAME(28, 0, FALSE, FALSE), ANIMCMD_END }; -static const union AnimCmd *const gSpriteAnimTable_861D04C[] = { - gSpriteAnim_861CFFC, - gSpriteAnim_861D004, - gSpriteAnim_861D00C, - gSpriteAnim_861D014, - gSpriteAnim_861D01C, - gSpriteAnim_861D024, - gSpriteAnim_861D02C, - gSpriteAnim_861D034, - gSpriteAnim_861D03C, - gSpriteAnim_861D044, +static const union AnimCmd *const sSpriteAnimTable_861D04C[] = { + sSpriteAnim_861CFFC, + sSpriteAnim_861D004, + sSpriteAnim_861D00C, + sSpriteAnim_861D014, + sSpriteAnim_861D01C, + sSpriteAnim_861D024, + sSpriteAnim_861D02C, + sSpriteAnim_861D034, + sSpriteAnim_861D03C, + sSpriteAnim_861D044, }; -static const struct CompressedSpriteSheet gUnknown_0861D074 = +static const struct CompressedSpriteSheet sMoveSelectorSpriteSheet = { - .data = gUnknown_08D97BEC, + .data = gMoveSelectorBitmap, .size = 0x400, .tag = 30000 }; @@ -915,7 +915,7 @@ static const struct SpriteTemplate gUnknown_0861D084 = .tileTag = 30000, .paletteTag = 30000, .oam = &gOamData_861CFF4, - .anims = gSpriteAnimTable_861D04C, + .anims = sSpriteAnimTable_861D04C, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy @@ -994,7 +994,7 @@ static const struct SpriteTemplate sSpriteTemplate_StatusCondition = .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy }; -static const u16 gUnknown_0861D120[] = INCBIN_U16("graphics/interface/summary_markings.gbapal"); +static const u16 sSummaryMarkingsPalette[] = INCBIN_U16("graphics/interface/summary_markings.gbapal"); // code void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void)) @@ -1026,7 +1026,7 @@ void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, case PSS_MODE_SELECT_MOVE: pssData->minPageIndex = 2; pssData->maxPageIndex = 3; - pssData->unk40C3 = TRUE; + pssData->lockMonFlag = TRUE; break; } @@ -1101,7 +1101,7 @@ static bool8 SummaryScreen_LoadGraphics(void) break; case 5: InitBGs(); - pssData->unk40F0 = 0; + pssData->switchCounter = 0; gMain.state++; break; case 6: @@ -1113,12 +1113,12 @@ static bool8 SummaryScreen_LoadGraphics(void) gMain.state++; break; case 8: - sub_81C1BA0(); + DrawPagination(); gMain.state++; break; case 9: CopyMonToSummaryStruct(&pssData->currentMon); - pssData->unk40F0 = 0; + pssData->switchCounter = 0; gMain.state++; break; case 10: @@ -1148,14 +1148,14 @@ static bool8 SummaryScreen_LoadGraphics(void) case 16: ResetSpriteIds(); CreateMoveTypeIcons(); - pssData->unk40F0 = 0; + pssData->switchCounter = 0; gMain.state++; break; case 17: - pssData->spriteIds[0] = CreatePokemonSprite(&pssData->currentMon, &pssData->unk40F0); + pssData->spriteIds[0] = CreatePokemonSprite(&pssData->currentMon, &pssData->switchCounter); if (pssData->spriteIds[0] != 0xFF) { - pssData->unk40F0 = 0; + pssData->switchCounter = 0; gMain.state++; } break; @@ -1202,7 +1202,7 @@ static bool8 SummaryScreen_LoadGraphics(void) static void InitBGs(void) { ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(0, gUnknown_0861CBB4, ARRAY_COUNT(gUnknown_0861CBB4)); + InitBgsFromTemplates(0, sUnknown_0861CBB4, ARRAY_COUNT(sUnknown_0861CBB4)); SetBgTilemapBuffer(1, pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0]); SetBgTilemapBuffer(2, pssData->bgTilemapBuffers[PSS_PAGE_SKILLS][0]); SetBgTilemapBuffer(3, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0]); @@ -1220,64 +1220,64 @@ static void InitBGs(void) static bool8 SummaryScreen_DecompressGraphics(void) { - switch (pssData->unk40F0) + switch (pssData->switchCounter) { case 0: reset_temp_tile_data_buffers(); - decompress_and_copy_tile_data_to_vram(1, &gUnknown_08D97D0C, 0, 0, 0); - pssData->unk40F0++; + decompress_and_copy_tile_data_to_vram(1, &gStatusScreenBitmap, 0, 0, 0); + pssData->switchCounter++; break; case 1: if (free_temp_tile_data_buffers_if_possible() != 1) { - LZDecompressWram(gUnknown_08D9862C, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0]); - pssData->unk40F0++; + LZDecompressWram(gPageInfoTilemap, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0]); + pssData->switchCounter++; } break; case 2: LZDecompressWram(gUnknown_08D98CC8, pssData->bgTilemapBuffers[PSS_PAGE_INFO][1]); - pssData->unk40F0++; + pssData->switchCounter++; break; case 3: - LZDecompressWram(gUnknown_08D987FC, pssData->bgTilemapBuffers[PSS_PAGE_SKILLS][1]); - pssData->unk40F0++; + LZDecompressWram(gPageSkillsTilemap, pssData->bgTilemapBuffers[PSS_PAGE_SKILLS][1]); + pssData->switchCounter++; break; case 4: - LZDecompressWram(gUnknown_08D9898C, pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][1]); - pssData->unk40F0++; + LZDecompressWram(gPageBattleMovesTilemap, pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][1]); + pssData->switchCounter++; break; case 5: - LZDecompressWram(gUnknown_08D98B28, pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][1]); - pssData->unk40F0++; + LZDecompressWram(gPageContestMovesTilemap, pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][1]); + pssData->switchCounter++; break; case 6: - LoadCompressedPalette(gUnknown_08D9853C, 0, 0x100); + LoadCompressedPalette(gStatusScreenPalette, 0, 0x100); LoadPalette(&gUnknown_08D85620, 0x81, 0x1E); - pssData->unk40F0++; + pssData->switchCounter++; break; case 7: LoadCompressedSpriteSheet(&sSpriteSheet_MoveTypes); - pssData->unk40F0++; + pssData->switchCounter++; break; case 8: - LoadCompressedSpriteSheet(&gUnknown_0861D074); - pssData->unk40F0++; + LoadCompressedSpriteSheet(&sMoveSelectorSpriteSheet); + pssData->switchCounter++; break; case 9: LoadCompressedSpriteSheet(&sStatusIconsSpriteSheet); - pssData->unk40F0++; + pssData->switchCounter++; break; case 10: LoadCompressedSpritePalette(&sStatusIconsSpritePalette); - pssData->unk40F0++; + pssData->switchCounter++; break; case 11: LoadCompressedSpritePalette(&gUnknown_0861D07C); - pssData->unk40F0++; + pssData->switchCounter++; break; case 12: LoadCompressedPalette(gMoveTypes_Pal, 0x1D0, 0x60); - pssData->unk40F0 = 0; + pssData->switchCounter = 0; return TRUE; } return FALSE; @@ -1301,7 +1301,7 @@ static bool8 ExtractMonDataToSummaryStruct(struct Pokemon *a) { u32 i; struct PokeSummary *sum = &pssData->summary; - switch (pssData->unk40F0) + switch (pssData->switchCounter) { case 0: sum->species = GetMonData(a, MON_DATA_SPECIES); @@ -1366,7 +1366,7 @@ static bool8 ExtractMonDataToSummaryStruct(struct Pokemon *a) sum->ribbonCount = GetMonData(a, MON_DATA_RIBBON_COUNT); return TRUE; } - pssData->unk40F0++; + pssData->switchCounter++; return FALSE; } @@ -1397,8 +1397,8 @@ static void sub_81C0348(void) if (pssData->currPageIndex != PSS_PAGE_BATTLE_MOVES && pssData->currPageIndex != PSS_PAGE_CONTEST_MOVES) PutWindowTilemap(13); } - sub_81C2524(); - sub_81C2228(&pssData->currentMon); + LimitEggSummaryPageDisplay(); + DrawPokerusCuredSymbol(&pssData->currentMon); } static void sub_81C0434(void) @@ -1418,7 +1418,7 @@ static void CloseSummaryScreen(u8 taskId) if (sub_81221EC() != TRUE && !gPaletteFade.active) { SetMainCallback2(pssData->callback); - gUnknown_0203CF20 = pssData->curMonIndex; + gLastViewedMonIndex = pssData->curMonIndex; SummaryScreen_DestroyUnknownTask(); ResetSpriteData(); FreeAllSpritePalettes(); @@ -1457,7 +1457,7 @@ static void HandleInput(u8 taskId) { if (pssData->currPageIndex == PSS_PAGE_INFO) { - sub_81C48F0(); + StopPokemonAnimations(); PlaySE(SE_SELECT); BeginCloseSummaryScreen(taskId); } @@ -1470,7 +1470,7 @@ static void HandleInput(u8 taskId) } else if (gMain.newKeys & B_BUTTON) { - sub_81C48F0(); + StopPokemonAnimations(); PlaySE(SE_SELECT); BeginCloseSummaryScreen(taskId); } @@ -1481,7 +1481,7 @@ static void ChangePokemon(u8 taskId, s8 a) { s8 r4_2; - if (!pssData->unk40C3) + if (!pssData->lockMonFlag) { if (pssData->isBoxMon == TRUE) { @@ -1545,7 +1545,7 @@ static void sub_81C0704(u8 taskId) break; case 3: CopyMonToSummaryStruct(&pssData->currentMon); - pssData->unk40F0 = 0; + pssData->switchCounter = 0; break; case 4: if (ExtractMonDataToSummaryStruct(&pssData->currentMon) == FALSE) @@ -1560,7 +1560,7 @@ static void sub_81C0704(u8 taskId) case 7: if (pssData->summary.unk7) sub_81C2074(10, -2); - sub_81C2228(&pssData->currentMon); + DrawPokerusCuredSymbol(&pssData->currentMon); data[1] = 0; break; case 8: @@ -1568,7 +1568,7 @@ static void sub_81C0704(u8 taskId) if (pssData->spriteIds[0] == 0xFF) return; gSprites[pssData->spriteIds[0]].data[2] = 1; - sub_81C0E24(); + CheckExperienceProgressBar(); data[1] = 0; break; case 9: @@ -1579,7 +1579,7 @@ static void sub_81C0704(u8 taskId) break; case 11: PrintPageSpecificText(pssData->currPageIndex); - sub_81C2524(); + LimitEggSummaryPageDisplay(); break; case 12: gSprites[pssData->spriteIds[0]].data[2] = 0; @@ -1678,19 +1678,19 @@ static void ChangePage(u8 taskId, s8 b) pssData->currPageIndex += b; data[0] = 0; if (b == 1) - SetTaskFuncWithFollowupFunc(taskId, sub_81C0B8C, gTasks[taskId].func); + SetTaskFuncWithFollowupFunc(taskId, PssScrollRight, gTasks[taskId].func); else - SetTaskFuncWithFollowupFunc(taskId, sub_81C0CC4, gTasks[taskId].func); + SetTaskFuncWithFollowupFunc(taskId, PssScrollLeft, gTasks[taskId].func); CreateTextPrinterTask(pssData->currPageIndex); HidePageSpecificSprites(); } -static void sub_81C0B8C(u8 taskId) +static void PssScrollRight(u8 taskId) // Scroll right { s16 *data = gTasks[taskId].data; if (data[0] == 0) { - if (pssData->unk40C9 == 0) + if (pssData->bgDisplayOrder == 0) { data[1] = 1; SetBgAttribute(1, BG_ATTR_PRIORITY, 1); @@ -1712,28 +1712,28 @@ static void sub_81C0B8C(u8 taskId) ChangeBgX(data[1], 0x2000, 1); data[0] += 32; if (data[0] > 0xFF) - gTasks[taskId].func = sub_81C0C68; + gTasks[taskId].func = PssScrollRightEnd; } -static void sub_81C0C68(u8 taskId) +static void PssScrollRightEnd(u8 taskId) // display right { s16 *data = gTasks[taskId].data; - pssData->unk40C9 ^= 1; + pssData->bgDisplayOrder ^= 1; data[1] = 0; data[0] = 0; - sub_81C1BA0(); + DrawPagination(); CreatePageWindowTilemaps(pssData->currPageIndex); SetTypeIcons(); - sub_81C0E24(); + CheckExperienceProgressBar(); SwitchTaskToFollowupFunc(taskId); } -static void sub_81C0CC4(u8 taskId) +static void PssScrollLeft(u8 taskId) // Scroll left { s16 *data = gTasks[taskId].data; if (data[0] == 0) { - if (pssData->unk40C9 == 0) + if (pssData->bgDisplayOrder == 0) data[1] = 2; else data[1] = 1; @@ -1742,13 +1742,13 @@ static void sub_81C0CC4(u8 taskId) ChangeBgX(data[1], 0x2000, 2); data[0] += 32; if (data[0] > 0xFF) - gTasks[taskId].func = sub_81C0D44; + gTasks[taskId].func = PssScrollLeftEnd; } -static void sub_81C0D44(u8 taskId) +static void PssScrollLeftEnd(u8 taskId) // display left { s16 *data = gTasks[taskId].data; - if (pssData->unk40C9 == 0) + if (pssData->bgDisplayOrder == 0) { SetBgAttribute(1, BG_ATTR_PRIORITY, 1); SetBgAttribute(2, BG_ATTR_PRIORITY, 2); @@ -1767,17 +1767,17 @@ static void sub_81C0D44(u8 taskId) } ShowBg(1); ShowBg(2); - pssData->unk40C9 ^= 1; + pssData->bgDisplayOrder ^= 1; data[1] = 0; data[0] = 0; - sub_81C1BA0(); + DrawPagination(); CreatePageWindowTilemaps(pssData->currPageIndex); SetTypeIcons(); - sub_81C0E24(); + CheckExperienceProgressBar(); SwitchTaskToFollowupFunc(taskId); } -static void sub_81C0E24(void) +static void CheckExperienceProgressBar(void) { if (pssData->currPageIndex == 1) DrawExperienceProgressBar(&pssData->currentMon); @@ -2025,9 +2025,9 @@ static void SwapMonMoves(struct Pokemon *mon, u8 moveIndex1, u8 moveIndex2) u8 ppBonuses = summary->ppBonuses; // Calculate PP bonuses - u8 ppUpMask1 = gUnknown_08329D22[moveIndex1]; + u8 ppUpMask1 = gPPUpGetMask[moveIndex1]; u8 ppBonusMove1 = (ppBonuses & ppUpMask1) >> (moveIndex1 * 2); - u8 ppUpMask2 = gUnknown_08329D22[moveIndex2]; + u8 ppUpMask2 = gPPUpGetMask[moveIndex2]; u8 ppBonusMove2 = (ppBonuses & ppUpMask2) >> (moveIndex2 * 2); ppBonuses &= ~ppUpMask1; ppBonuses &= ~ppUpMask2; @@ -2060,9 +2060,9 @@ static void SwapBoxMonMoves(struct BoxPokemon *mon, u8 moveIndex1, u8 moveIndex2 u8 ppBonuses = summary->ppBonuses; // Calculate PP bonuses - u8 ppUpMask1 = gUnknown_08329D22[moveIndex1]; + u8 ppUpMask1 = gPPUpGetMask[moveIndex1]; u8 ppBonusMove1 = (ppBonuses & ppUpMask1) >> (moveIndex1 * 2); - u8 ppUpMask2 = gUnknown_08329D22[moveIndex2]; + u8 ppUpMask2 = gPPUpGetMask[moveIndex2]; u8 ppBonusMove2 = (ppBonuses & ppUpMask2) >> (moveIndex2 * 2); ppBonuses &= ~ppUpMask1; ppBonuses &= ~ppUpMask2; @@ -2088,10 +2088,10 @@ static void sub_81C171C(u8 taskId) { SetNewMoveTypeIcon(); sub_81C4AF8(8); - gTasks[taskId].func = sub_81C174C; + gTasks[taskId].func = HandleReplaceMoveInput; } -static void sub_81C174C(u8 taskId) +static void HandleReplaceMoveInput(u8 taskId) { s16* data = gTasks[taskId].data; @@ -2119,26 +2119,26 @@ static void sub_81C174C(u8 taskId) } else if (gMain.newKeys & A_BUTTON) { - if (sub_81C18A8() == TRUE) + if (CanReplaceMove() == TRUE) { - sub_81C48F0(); + StopPokemonAnimations(); PlaySE(SE_SELECT); - gUnknown_0203CF21 = pssData->firstMoveIndex; - gSpecialVar_0x8005 = gUnknown_0203CF21; + sUnknown_0203CF21 = pssData->firstMoveIndex; + gSpecialVar_0x8005 = sUnknown_0203CF21; BeginCloseSummaryScreen(taskId); } else { PlaySE(SE_HAZURE); - sub_81C18F4(taskId); + ShowHMMovesCantBeForgottenWindow(taskId); } } else if (gMain.newKeys & B_BUTTON) { u32 var1; - sub_81C48F0(); + StopPokemonAnimations(); PlaySE(SE_SELECT); - gUnknown_0203CF21 = 4; + sUnknown_0203CF21 = 4; gSpecialVar_0x8005 = 4; BeginCloseSummaryScreen(taskId); } @@ -2146,7 +2146,7 @@ static void sub_81C174C(u8 taskId) } } -static bool8 sub_81C18A8(void) +static bool8 CanReplaceMove(void) { if (pssData->firstMoveIndex == MAX_MON_MOVES || pssData->newMove == MOVE_NONE || IsMoveHm(pssData->summary.moves[pssData->firstMoveIndex]) != 1) return TRUE; @@ -2154,7 +2154,7 @@ static bool8 sub_81C18A8(void) return FALSE; } -static void sub_81C18F4(u8 taskId) +static void ShowHMMovesCantBeForgottenWindow(u8 taskId) { ClearWindowTilemap(14); ClearWindowTilemap(15); @@ -2162,10 +2162,11 @@ static void sub_81C18F4(u8 taskId) sub_81C1DA4(0, 3); sub_81C1EFC(0, 3, 0); PrintHMMovesCantBeForgotten(); - gTasks[taskId].func = sub_81C1940; + gTasks[taskId].func = HandleHMMovesCantBeForgottenInput; } -static void sub_81C1940(u8 taskId) +// This redraws the power/accuracy window when the player scrolls out of the "HM Moves can't be forgotten" message +static void HandleHMMovesCantBeForgottenInput(u8 taskId) { s16* data = gTasks[taskId].data; u16 move; @@ -2177,7 +2178,7 @@ static void sub_81C1940(u8 taskId) data[0] = 4; sub_81C1070(&data[0], -1, &pssData->firstMoveIndex); data[1] = 0; - gTasks[taskId].func = sub_81C174C; + gTasks[taskId].func = HandleReplaceMoveInput; } else if (gMain.newKeys & DPAD_DOWN) { @@ -2185,7 +2186,7 @@ static void sub_81C1940(u8 taskId) data[0] = 4; sub_81C1070(&data[0], 1, &pssData->firstMoveIndex); data[1] = 0; - gTasks[taskId].func = sub_81C174C; + gTasks[taskId].func = HandleReplaceMoveInput; } else if (gMain.newKeys & DPAD_LEFT || GetLRKeysState() == 1) { @@ -2195,7 +2196,7 @@ static void sub_81C1940(u8 taskId) if (!gSprites[pssData->spriteIds[2]].invisible) ClearWindowTilemap(13); move = pssData->summary.moves[pssData->firstMoveIndex]; - gTasks[taskId].func = sub_81C174C; + gTasks[taskId].func = HandleReplaceMoveInput; ChangePage(taskId, -1); sub_81C1DA4(9, -2); sub_81C1EFC(9, -2, move); @@ -2209,7 +2210,7 @@ static void sub_81C1940(u8 taskId) if (!gSprites[pssData->spriteIds[2]].invisible) ClearWindowTilemap(13); move = pssData->summary.moves[pssData->firstMoveIndex]; - gTasks[taskId].func = sub_81C174C; + gTasks[taskId].func = HandleReplaceMoveInput; ChangePage(taskId, 1); sub_81C1DA4(9, -2); sub_81C1EFC(9, -2, move); @@ -2225,17 +2226,17 @@ static void sub_81C1940(u8 taskId) schedule_bg_copy_tilemap_to_vram(0); sub_81C1DA4(9, -3); sub_81C1EFC(9, -3, move); - gTasks[taskId].func = sub_81C174C; + gTasks[taskId].func = HandleReplaceMoveInput; } } } u8 sub_81C1B94(void) { - return gUnknown_0203CF21; + return sUnknown_0203CF21; } -static void sub_81C1BA0(void) +static void DrawPagination(void) // Updates the pagination dots at the top of the summary screen { u16 *alloced = Alloc(32); u8 i; @@ -2333,11 +2334,11 @@ static void sub_81C1CB0(const struct UnkStruct_61CC04 *unkStruct, u16 *dest, u8 static void sub_81C1DA4(u16 a, s16 b) { - if (b > gUnknown_0861CC04.field_6) - b = gUnknown_0861CC04.field_6; - if (b == 0 || b == gUnknown_0861CC04.field_6) + if (b > sUnknown_0861CC04.field_6) + b = sUnknown_0861CC04.field_6; + if (b == 0 || b == sUnknown_0861CC04.field_6) { - sub_81C1CB0(&gUnknown_0861CC04, pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], b, 1); + sub_81C1CB0(&sUnknown_0861CC04, pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], b, 1); } else { @@ -2359,12 +2360,12 @@ static void sub_81C1E20(u8 taskId) { data[1] = 0; } - else if (data[1] > gUnknown_0861CC04.field_6) + else if (data[1] > sUnknown_0861CC04.field_6) { - data[1] = gUnknown_0861CC04.field_6; + data[1] = sUnknown_0861CC04.field_6; } - sub_81C1CB0(&gUnknown_0861CC04, pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], data[1], 1); - if (data[1] <= 0 || data[1] >= gUnknown_0861CC04.field_6) + sub_81C1CB0(&sUnknown_0861CC04, pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], data[1], 1); + if (data[1] <= 0 || data[1] >= sUnknown_0861CC04.field_6) { if (data[0] < 0) { @@ -2386,10 +2387,10 @@ static void sub_81C1E20(u8 taskId) static void sub_81C1EFC(u16 a, s16 b, u16 move) { - if (b > gUnknown_0861CC10.field_6) - b = gUnknown_0861CC10.field_6; - if (b == 0 || b == gUnknown_0861CC10.field_6) - sub_81C1CB0(&gUnknown_0861CC10, pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], b, 1); + if (b > sUnknown_0861CC10.field_6) + b = sUnknown_0861CC10.field_6; + if (b == 0 || b == sUnknown_0861CC10.field_6) + sub_81C1CB0(&sUnknown_0861CC10, pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], b, 1); else { u8 taskId = FindTaskIdByFunc(sub_81C1F80); @@ -2409,16 +2410,16 @@ static void sub_81C1F80(u8 taskId) { data[1] = 0; } - else if (data[1] > gUnknown_0861CC10.field_6) + else if (data[1] > sUnknown_0861CC10.field_6) { - data[1] = gUnknown_0861CC10.field_6; + data[1] = sUnknown_0861CC10.field_6; } - sub_81C1CB0(&gUnknown_0861CC10, pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], data[1], 1); - if (data[1] <= 0 || data[1] >= gUnknown_0861CC10.field_6) + sub_81C1CB0(&sUnknown_0861CC10, pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], data[1], 1); + if (data[1] <= 0 || data[1] >= sUnknown_0861CC10.field_6) { if (data[0] < 0) { - if (pssData->currPageIndex == 3 && FuncIsActiveTask(sub_81C0B8C) == 0) + if (pssData->currPageIndex == 3 && FuncIsActiveTask(PssScrollRight) == 0) PutWindowTilemap(15); DrawContestMoveHearts(data[2]); } @@ -2439,12 +2440,12 @@ static void sub_81C1F80(u8 taskId) static void sub_81C2074(u16 a, s16 b) { - if (b > gUnknown_0861CBEC.field_6) - b = gUnknown_0861CBEC.field_6; - if (b == 0 || b == gUnknown_0861CBEC.field_6) + if (b > sUnknown_0861CBEC.field_6) + b = sUnknown_0861CBEC.field_6; + if (b == 0 || b == sUnknown_0861CBEC.field_6) { - sub_81C1CB0(&gUnknown_0861CBEC, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0], b, 0); - sub_81C1CB0(&gUnknown_0861CBF8, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0], b, 0); + sub_81C1CB0(&sUnknown_0861CBEC, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0], b, 0); + sub_81C1CB0(&sUnknown_0861CBF8, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0], b, 0); } else { @@ -2460,12 +2461,12 @@ static void sub_81C20F0(u8 taskId) data[1] += data[0]; if (data[1] < 0) data[1] = 0; - else if (data[1] > gUnknown_0861CBEC.field_6) - data[1] = gUnknown_0861CBEC.field_6; - sub_81C1CB0(&gUnknown_0861CBEC, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0], data[1], 0); - sub_81C1CB0(&gUnknown_0861CBF8, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0], data[1], 0); + else if (data[1] > sUnknown_0861CBEC.field_6) + data[1] = sUnknown_0861CBEC.field_6; + sub_81C1CB0(&sUnknown_0861CBEC, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0], data[1], 0); + sub_81C1CB0(&sUnknown_0861CBF8, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0], data[1], 0); schedule_bg_copy_tilemap_to_vram(3); - if (data[1] <= 0 || data[1] >= gUnknown_0861CBEC.field_6) + if (data[1] <= 0 || data[1] >= sUnknown_0861CBEC.field_6) { if (data[0] < 0) { @@ -2505,9 +2506,9 @@ static void sub_81C2194(u16 *output, u16 palette, bool8 c) } } -static void sub_81C2228(struct Pokemon *mon) +static void DrawPokerusCuredSymbol(struct Pokemon *mon) // This checks if the mon has been cured of pokerus { - if (!CheckPartyPokerus(mon, 0) && CheckPartyHasHadPokerus(mon, 0)) + if (!CheckPartyPokerus(mon, 0) && CheckPartyHasHadPokerus(mon, 0)) // If yes it draws the cured symbol { pssData->bgTilemapBuffers[PSS_PAGE_INFO][0][0x223] = 0x2C; pssData->bgTilemapBuffers[PSS_PAGE_INFO][1][0x223] = 0x2C; @@ -2615,7 +2616,7 @@ static void DrawContestMoveHearts(u16 move) } } -static void sub_81C2524(void) +static void LimitEggSummaryPageDisplay(void) // If the pokemon is an egg, limit the number of pages displayed to 1 { if (pssData->summary.isEgg) ChangeBgX(3, 0x10000, 0); @@ -2626,7 +2627,7 @@ static void sub_81C2524(void) static void ResetWindows(void) { u8 i; - InitWindows(gUnknown_0861CC24); + InitWindows(sSummaryTemplate); DeactivateAllTextPrinters(); for (i = 0; i < 20; i++) @@ -2729,7 +2730,8 @@ static void sub_81C27DC(struct Pokemon *mon, u16 species) static void PrintAOrBButtonIcon(u8 windowId, bool8 bButton, u32 x) { - BlitBitmapToWindow(windowId, (bButton) ? gUnknown_0861CDD3 : gUnknown_0861CDD3 - 0x80, x, 0, 16, 16); + // sSummaryBButtonBitmap - 0x80 = sSummaryAButtonBitmap + BlitBitmapToWindow(windowId, (bButton) ? sSummaryBButtonBitmap : sSummaryBButtonBitmap - 0x80, x, 0, 16, 16); } static void PrintPageNamesAndStatsPageToWindows(void) @@ -2987,7 +2989,7 @@ static void PrintMonOTName(void) int x; if (InBattleFactory() != TRUE && sub_81B9E94() != TRUE) { - windowId = AddWindowFromTemplateList(gUnknown_0861CCCC, 0); + windowId = AddWindowFromTemplateList(sPageInfoTemplate, 0); SummaryScreen_PrintTextOnWindow(windowId, gText_OTSlash, 0, 1, 0, 1); x = GetStringWidth(1, gText_OTSlash, 0); if (pssData->summary.OTGender == 0) @@ -3004,20 +3006,20 @@ static void PrintMonOTID(void) { ConvertIntToDecimalStringN(StringCopy(gStringVar1, gText_UnkCtrlF907F908), (u16)pssData->summary.OTID, 2, 5); xPos = GetStringRightAlignXOffset(1, gStringVar1, 56); - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(gUnknown_0861CCCC, 1), gStringVar1, xPos, 1, 0, 1); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, 1), gStringVar1, xPos, 1, 0, 1); } } static void PrintMonAbilityName(void) { u8 ability = GetAbilityBySpecies(pssData->summary.species, pssData->summary.altAbility); - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(gUnknown_0861CCCC, 2), gAbilityNames[ability], 0, 1, 0, 1); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, 2), gAbilityNames[ability], 0, 1, 0, 1); } static void PrintMonAbilityDescription(void) { u8 ability = GetAbilityBySpecies(pssData->summary.species, pssData->summary.altAbility); - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(gUnknown_0861CCCC, 2), gAbilityDescriptionPointers[ability], 0, 17, 0, 0); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, 2), gAbilityDescriptionPointers[ability], 0, 17, 0, 0); } static void BufferMonTrainerMemo(void) @@ -3026,8 +3028,8 @@ static void BufferMonTrainerMemo(void) const u8 *text; DynamicPlaceholderTextUtil_Reset(); - DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gUnknown_0861CE74); - DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gUnknown_0861CE7B); + DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, sMemoNatureTextColor); + DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, sMemoMiscTextColor); BufferNatureString(); if (InBattleFactory() == TRUE || sub_81B9E94() == TRUE || IsInGamePartnerMon() == TRUE) @@ -3074,7 +3076,7 @@ static void BufferMonTrainerMemo(void) static void PrintMonTrainerMemo(void) { - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(gUnknown_0861CCCC, 3), gStringVar4, 0, 1, 0, 0); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, 3), gStringVar4, 0, 1, 0, 0); } static void BufferNatureString(void) @@ -3147,7 +3149,7 @@ static bool8 IsInGamePartnerMon(void) static void PrintEggOTName(void) { - u32 windowId = AddWindowFromTemplateList(gUnknown_0861CCCC, 0); + u32 windowId = AddWindowFromTemplateList(sPageInfoTemplate, 0); u32 width = GetStringWidth(1, gText_OTSlash, 0); SummaryScreen_PrintTextOnWindow(windowId, gText_OTSlash, 0, 1, 0, 1); SummaryScreen_PrintTextOnWindow(windowId, gText_FiveMarks, width, 1, 0, 1); @@ -3159,7 +3161,7 @@ static void PrintEggOTID(void) StringCopy(gStringVar1, gText_UnkCtrlF907F908); StringAppend(gStringVar1, gText_FiveMarks); x = GetStringRightAlignXOffset(1, gStringVar1, 56); - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(gUnknown_0861CCCC, 1), gStringVar1, x, 1, 0, 1); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, 1), gStringVar1, x, 1, 0, 1); } static void PrintEggState(void) @@ -3178,7 +3180,7 @@ static void PrintEggState(void) else text = gText_EggWillTakeALongTime; - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(gUnknown_0861CCCC, 2), text, 0, 1, 0, 0); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, 2), text, 0, 1, 0, 0); } static void PrintEggMemo(void) @@ -3202,7 +3204,7 @@ static void PrintEggMemo(void) text = gText_OddEggFoundByCouple; } - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(gUnknown_0861CCCC, 3), text, 0, 1, 0, 0); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, 3), text, 0, 1, 0, 0); } static void PrintSkillsPageText(void) @@ -3270,7 +3272,7 @@ static void PrintHeldItemName(void) } offset = GetStringCenterAlignXOffset(1, text, 72) + 6; - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(gUnknown_0861CCEC, 0), text, offset, 1, 0, 0); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageSkillsTemplate, 0), text, offset, 1, 0, 0); } static void PrintRibbonCount(void) @@ -3290,7 +3292,7 @@ static void PrintRibbonCount(void) } offset = GetStringCenterAlignXOffset(1, text, 70) + 6; - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(gUnknown_0861CCEC, 1), text, offset, 1, 0, 0); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageSkillsTemplate, 1), text, offset, 1, 0, 0); } static void BufferLeftColumnStats(void) @@ -3310,7 +3312,7 @@ static void BufferLeftColumnStats(void) DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, maxHPString); DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, attackString); DynamicPlaceholderTextUtil_SetPlaceholderPtr(3, defenseString); - DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gUnknown_0861CE82); + DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, sStatsLeftColumnLayout); Free(currentHPString); Free(maxHPString); @@ -3320,7 +3322,7 @@ static void BufferLeftColumnStats(void) static void PrintLeftColumnStats(void) { - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(gUnknown_0861CCEC, 2), gStringVar4, 4, 1, 0, 0); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageSkillsTemplate, 2), gStringVar4, 4, 1, 0, 0); } static void BufferRightColumnStats(void) @@ -3333,18 +3335,18 @@ static void BufferRightColumnStats(void) DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gStringVar2); DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, gStringVar3); - DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gUnknown_0861CE8E); + DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, sStatsRightColumnLayout); } static void PrintRightColumnStats(void) { - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(gUnknown_0861CCEC, 3), gStringVar4, 2, 1, 0, 0); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageSkillsTemplate, 3), gStringVar4, 2, 1, 0, 0); } static void PrintExpPointsNextLevel(void) { struct PokeSummary *sum = &pssData->summary; - u8 windowId = AddWindowFromTemplateList(gUnknown_0861CCEC, 4); + u8 windowId = AddWindowFromTemplateList(sPageSkillsTemplate, 4); int offset; u32 expToNextLevel; @@ -3436,8 +3438,8 @@ static void PrintMoveNameAndPP(u8 moveIndex) const u8 *text; u32 offset; struct PssData *summaryStruct = pssData; - u8 moveNameWindowId = AddWindowFromTemplateList(gUnknown_0861CD14, 0); - u8 ppValueWindowId = AddWindowFromTemplateList(gUnknown_0861CD14, 1); + u8 moveNameWindowId = AddWindowFromTemplateList(sPageMovesTemplate, 0); + u8 ppValueWindowId = AddWindowFromTemplateList(sPageMovesTemplate, 1); u16 move = summaryStruct->summary.moves[moveIndex]; if (move != 0) @@ -3449,7 +3451,7 @@ static void PrintMoveNameAndPP(u8 moveIndex) DynamicPlaceholderTextUtil_Reset(); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gStringVar2); - DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gUnknown_0861CE97); + DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, sMovesPPLayout); text = gStringVar4; ppState = GetCurrentPpToMaxPpState(summaryStruct->summary.pp[moveIndex], pp) + 9; offset = GetStringRightAlignXOffset(1, text, 44); @@ -3560,14 +3562,14 @@ static void PrintContestMoveDescription(u8 moveSlot) if (move != MOVE_NONE) { - u8 windowId = AddWindowFromTemplateList(gUnknown_0861CD14, 2); + u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, 2); SummaryScreen_PrintTextOnWindow(windowId, gContestEffectDescriptionPointers[gContestMoves[move].effect], 6, 1, 0, 0); } } static void PrintMoveDetails(u16 move) { - u8 windowId = AddWindowFromTemplateList(gUnknown_0861CD14, 2); + u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, 2); FillWindowPixelBuffer(windowId, 0); if (move != MOVE_NONE) { @@ -3592,8 +3594,8 @@ static void PrintMoveDetails(u16 move) static void PrintNewMoveDetailsOrCancelText(void) { - u8 windowId1 = AddWindowFromTemplateList(gUnknown_0861CD14, 0); - u8 windowId2 = AddWindowFromTemplateList(gUnknown_0861CD14, 1); + u8 windowId1 = AddWindowFromTemplateList(sPageMovesTemplate, 0); + u8 windowId2 = AddWindowFromTemplateList(sPageMovesTemplate, 1); if (pssData->newMove == MOVE_NONE) { @@ -3612,22 +3614,22 @@ static void PrintNewMoveDetailsOrCancelText(void) DynamicPlaceholderTextUtil_Reset(); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gStringVar1); - DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gUnknown_0861CE97); + DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, sMovesPPLayout); SummaryScreen_PrintTextOnWindow(windowId2, gStringVar4, GetStringRightAlignXOffset(1, gStringVar4, 0x2C), 0x41, 0, 12); } } static void sub_81C4064(void) { - u8 windowId = AddWindowFromTemplateList(gUnknown_0861CD14, 0); + u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, 0); FillWindowPixelRect(windowId, 0, 0, 66, 72, 16); CopyWindowToVram(windowId, 2); } static void sub_81C40A0(u8 moveIndex1, u8 moveIndex2) { - u8 windowId1 = AddWindowFromTemplateList(gUnknown_0861CD14, 0); - u8 windowId2 = AddWindowFromTemplateList(gUnknown_0861CD14, 1); + u8 windowId1 = AddWindowFromTemplateList(sPageMovesTemplate, 0); + u8 windowId2 = AddWindowFromTemplateList(sPageMovesTemplate, 1); FillWindowPixelRect(windowId1, 0, 0, moveIndex1 * 16, 0x48, 0x10); FillWindowPixelRect(windowId1, 0, 0, moveIndex2 * 16, 0x48, 0x10); @@ -3641,7 +3643,7 @@ static void sub_81C40A0(u8 moveIndex1, u8 moveIndex2) static void PrintHMMovesCantBeForgotten(void) { - u8 windowId = AddWindowFromTemplateList(gUnknown_0861CD14, 2); + u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, 2); FillWindowPixelBuffer(windowId, 0); SummaryScreen_PrintTextOnWindow(windowId, gText_HMMovesCantBeForgotten2, 6, 1, 0, 0); } @@ -3942,14 +3944,14 @@ static bool32 SummaryScreen_DoesSpriteHaveCallback(void) } } -static void sub_81C48F0(void) +static void StopPokemonAnimations(void) // A subtle effect, this function stops pokemon animations when leaving the PSS { u16 i; u16 paletteIndex; gSprites[pssData->spriteIds[0]].animPaused = TRUE; gSprites[pssData->spriteIds[0]].callback = SpriteCallbackDummy; - sub_806EE98(); + StopPokemonAnimationDelayTask(); paletteIndex = (gSprites[pssData->spriteIds[0]].oam.paletteNum * 16) | 0x100; @@ -3961,7 +3963,7 @@ static void sub_81C48F0(void) static void CreateMonMarkingsSprite(struct Pokemon *mon) { - struct Sprite *sprite = sub_811FF94(30003, 30003, gUnknown_0861D120); + struct Sprite *sprite = sub_811FF94(30003, 30003, sSummaryMarkingsPalette); pssData->markingsSprite = sprite; diff --git a/src/trade.c b/src/trade.c index 70b57fbc77..6dfb6e2c4e 100644 --- a/src/trade.c +++ b/src/trade.c @@ -1834,9 +1834,9 @@ static void sub_8077B74(void) } if (gUnknown_0203229C->tradeMenuCursorPosition < PARTY_SIZE) - gUnknown_0203229C->tradeMenuCursorPosition = gUnknown_0203CF20; + gUnknown_0203229C->tradeMenuCursorPosition = gLastViewedMonIndex; else - gUnknown_0203229C->tradeMenuCursorPosition = gUnknown_0203CF20 + PARTY_SIZE; + gUnknown_0203229C->tradeMenuCursorPosition = gLastViewedMonIndex + PARTY_SIZE; gUnknown_0203229C->tradeMenuCursorSpriteIdx = CreateSprite(&gSpriteTemplate_832DC94, gTradeMonSpriteCoords[gUnknown_0203229C->tradeMenuCursorPosition][0] * 8 + 32, gTradeMonSpriteCoords[gUnknown_0203229C->tradeMenuCursorPosition][1] * 8, 2); gMain.state = 16; From 42bb5dc53de366c0b22bf220cc382f7cc86d7f35 Mon Sep 17 00:00:00 2001 From: Ariel Antonitis Date: Sat, 23 Feb 2019 21:55:24 -0500 Subject: [PATCH 06/25] Removed unused filler by aligning adjacent variables --- src/pokemon_summary_screen.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index bb49e6dc1e..367ff2aff8 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -112,11 +112,8 @@ static EWRAM_DATA struct PssData } *pssData = NULL; EWRAM_DATA u8 gLastViewedMonIndex = 0; static EWRAM_DATA u8 sUnknown_0203CF21 = 0; -static EWRAM_DATA u8 sFiller_0203CF22[2] = {0}; -static EWRAM_DATA u8 sUnknownTaskId = 0; -static EWRAM_DATA u8 sFiller_0203CF25[3] = {0}; - -extern const struct CompressedSpriteSheet gMonFrontPicTable[]; +ALIGNED(4) static EWRAM_DATA u8 sUnknownTaskId = 0; +ALIGNED(4) extern const struct CompressedSpriteSheet gMonFrontPicTable[]; struct UnkStruct_61CC04 { From d24cd4f0a8d810ec225a4b76a7fa2099092560e1 Mon Sep 17 00:00:00 2001 From: Ariel Antonitis Date: Sat, 23 Feb 2019 22:04:21 -0500 Subject: [PATCH 07/25] Fixed broken encoding. --- src/pokemon_storage_system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 6f2382290d..cdfc4ba6b8 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -1218,7 +1218,7 @@ static const u16 gWallpaperPalettes_Plain[][16] = static const u32 gWallpaperTiles_Plain[] = INCBIN_U32("graphics/pokemon_storage/plain.4bpp.lz"); static const u32 gWallpaperTilemap_Plain[] = INCBIN_U32("graphics/pokemon_storage/plain.bin.lz"); -// 12�18 tilemap +// 12x18 tilemap static const u32 gUnknown_085773C4[] = INCBIN_U32("graphics/unused/tilemap_5773C4.bin"); static const u16 gUnknown_08577574[][2] = From 0c47744a63a324fe92e8dddcbc07c33292524635 Mon Sep 17 00:00:00 2001 From: Ariel Antonitis Date: Sat, 23 Feb 2019 22:22:38 -0500 Subject: [PATCH 08/25] Moved ALIGNED(4) from extern to unknown struct. --- src/pokemon_summary_screen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 367ff2aff8..bd1ae78027 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -113,7 +113,7 @@ static EWRAM_DATA struct PssData EWRAM_DATA u8 gLastViewedMonIndex = 0; static EWRAM_DATA u8 sUnknown_0203CF21 = 0; ALIGNED(4) static EWRAM_DATA u8 sUnknownTaskId = 0; -ALIGNED(4) extern const struct CompressedSpriteSheet gMonFrontPicTable[]; +extern const struct CompressedSpriteSheet gMonFrontPicTable[]; struct UnkStruct_61CC04 { @@ -249,7 +249,7 @@ static void sub_81C4D18(u8 a); #include "data/text/move_descriptions.h" #include "data/text/nature_names.h" -static const struct BgTemplate sUnknown_0861CBB4[] = +ALIGNED(4) static const struct BgTemplate sUnknown_0861CBB4[] = { { .bg = 0, From bb508ade64bd152fa146b71e6734a4ea704b31f3 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 24 Feb 2019 10:04:40 -0600 Subject: [PATCH 09/25] Decompile more of easy_chat.c --- asm/easy_chat.s | 1862 ---------------------------------------------- data/easy_chat.s | 4 +- src/easy_chat.c | 731 ++++++++++++++++-- 3 files changed, 679 insertions(+), 1918 deletions(-) diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 50e707ac37..10536929e6 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -5,1868 +5,6 @@ .text - thumb_func_start sub_811DADC -sub_811DADC: @ 811DADC - push {r4,lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r4, r0, 24 - movs r0, 0x1E - str r0, [sp] - movs r0, 0xA - str r0, [sp, 0x4] - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - movs r3, 0xA - bl FillBgTilemapBufferRect_Palette0 - cmp r4, 0x16 - bls _0811DAFE - b _0811DC1A -_0811DAFE: - lsls r0, r4, 2 - ldr r1, =_0811DB0C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0811DB0C: - .4byte _0811DC1A - .4byte _0811DB68 - .4byte _0811DB70 - .4byte _0811DB78 - .4byte _0811DB80 - .4byte _0811DB88 - .4byte _0811DB90 - .4byte _0811DC00 - .4byte _0811DBF2 - .4byte _0811DBE4 - .4byte _0811DBD6 - .4byte _0811DB9E - .4byte _0811DBA6 - .4byte _0811DBAE - .4byte _0811DBB6 - .4byte _0811DBBE - .4byte _0811DBC6 - .4byte _0811DBCE - .4byte _0811DBD6 - .4byte _0811DBE4 - .4byte _0811DBF2 - .4byte _0811DC00 - .4byte _0811DC0E -_0811DB68: - movs r0, 0xB - movs r1, 0xE - movs r2, 0x3 - b _0811DB96 -_0811DB70: - movs r0, 0x9 - movs r1, 0xE - movs r2, 0x7 - b _0811DB96 -_0811DB78: - movs r0, 0x7 - movs r1, 0xE - movs r2, 0xB - b _0811DB96 -_0811DB80: - movs r0, 0x5 - movs r1, 0xE - movs r2, 0xF - b _0811DB96 -_0811DB88: - movs r0, 0x3 - movs r1, 0xE - movs r2, 0x13 - b _0811DB96 -_0811DB90: - movs r0, 0x1 - movs r1, 0xE - movs r2, 0x17 -_0811DB96: - movs r3, 0x2 - bl sub_811DC28 - b _0811DC1A -_0811DB9E: - movs r0, 0x1 - movs r1, 0xA - movs r2, 0x18 - b _0811DBDC -_0811DBA6: - movs r0, 0x1 - movs r1, 0xA - movs r2, 0x19 - b _0811DBDC -_0811DBAE: - movs r0, 0x1 - movs r1, 0xA - movs r2, 0x1A - b _0811DBDC -_0811DBB6: - movs r0, 0x1 - movs r1, 0xA - movs r2, 0x1B - b _0811DBDC -_0811DBBE: - movs r0, 0x1 - movs r1, 0xA - movs r2, 0x1C - b _0811DBDC -_0811DBC6: - movs r0, 0x1 - movs r1, 0xA - movs r2, 0x1D - b _0811DBDC -_0811DBCE: - movs r0, 0 - movs r1, 0xA - movs r2, 0x1E - b _0811DBDC -_0811DBD6: - movs r0, 0x1 - movs r1, 0xA - movs r2, 0x17 -_0811DBDC: - movs r3, 0xA - bl sub_811DC28 - b _0811DC1A -_0811DBE4: - movs r0, 0x1 - movs r1, 0xB - movs r2, 0x17 - movs r3, 0x8 - bl sub_811DC28 - b _0811DC1A -_0811DBF2: - movs r0, 0x1 - movs r1, 0xC - movs r2, 0x17 - movs r3, 0x6 - bl sub_811DC28 - b _0811DC1A -_0811DC00: - movs r0, 0x1 - movs r1, 0xD - movs r2, 0x17 - movs r3, 0x4 - bl sub_811DC28 - b _0811DC1A -_0811DC0E: - movs r0, 0x1 - movs r1, 0xE - movs r2, 0x17 - movs r3, 0x2 - bl sub_811DC28 -_0811DC1A: - movs r0, 0x1 - bl CopyBgTilemapBufferToVram - add sp, 0x8 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_811DADC - - thumb_func_start sub_811DC28 -sub_811DC28: @ 811DC28 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - mov r12, r0 - adds r7, r1, 0 - mov r9, r2 - mov r10, r3 - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - movs r1, 0xC0 - lsls r1, 2 - adds r6, r0, r1 - mov r0, r12 - add r0, r9 - subs r5, r0, 0x1 - adds r0, r7, r3 - subs r0, 0x1 - mov r8, r0 - mov r2, r12 - adds r3, r7, 0 - lsls r0, r3, 5 - adds r0, r2 - lsls r0, 1 - adds r0, r6 - ldr r4, =0x00004001 - adds r1, r4, 0 - strh r1, [r0] - adds r2, 0x1 - cmp r2, r5 - bge _0811DC84 - ldr r0, =0x00004002 - adds r4, r0, 0 - lsls r1, r2, 1 - lsls r0, r3, 6 - adds r0, r6 - adds r1, r0 - subs r2, r5, r2 -_0811DC78: - strh r4, [r1] - adds r1, 0x2 - subs r2, 0x1 - cmp r2, 0 - bne _0811DC78 - adds r2, r5, 0 -_0811DC84: - lsls r0, r3, 5 - adds r0, r2 - lsls r0, 1 - adds r0, r6 - ldr r2, =0x00004003 - adds r1, r2, 0 - strh r1, [r0] - adds r3, 0x1 - mov r4, r12 - adds r4, 0x1 - adds r0, r7, 0x1 - str r0, [sp, 0x4] - mov r1, r9 - subs r1, 0x2 - str r1, [sp] - movs r2, 0x2 - negs r2, r2 - add r10, r2 - cmp r3, r8 - bge _0811DCF4 - lsls r7, r4, 1 - mov r9, r7 -_0811DCB0: - lsls r0, r3, 5 - add r0, r12 - lsls r0, 1 - adds r0, r6 - ldr r2, =0x00004005 - adds r1, r2, 0 - strh r1, [r0] - adds r2, r4, 0 - adds r7, r3, 0x1 - cmp r4, r5 - bge _0811DCE0 - movs r0, 0x80 - lsls r0, 7 - adds r1, r0, 0 - lsls r0, r3, 6 - adds r0, r6 - add r0, r9 - subs r2, r5, r4 -_0811DCD4: - strh r1, [r0] - adds r0, 0x2 - subs r2, 0x1 - cmp r2, 0 - bne _0811DCD4 - adds r2, r5, 0 -_0811DCE0: - lsls r0, r3, 5 - adds r0, r2 - lsls r0, 1 - adds r0, r6 - ldr r2, =0x00004007 - adds r1, r2, 0 - strh r1, [r0] - adds r3, r7, 0 - cmp r3, r8 - blt _0811DCB0 -_0811DCF4: - lsls r0, r3, 5 - mov r7, r12 - adds r1, r0, r7 - lsls r1, 1 - adds r1, r6 - ldr r7, =0x00004009 - adds r2, r7, 0 - strh r2, [r1] - adds r2, r4, 0 - mov r12, r0 - cmp r4, r5 - bge _0811DD26 - ldr r0, =0x0000400a - adds r7, r0, 0 - lsls r1, r4, 1 - lsls r0, r3, 6 - adds r0, r6 - adds r0, r1, r0 - subs r2, r5, r4 -_0811DD1A: - strh r7, [r0] - adds r0, 0x2 - subs r2, 0x1 - cmp r2, 0 - bne _0811DD1A - adds r2, r5, 0 -_0811DD26: - mov r1, r12 - adds r0, r1, r2 - lsls r0, 1 - adds r0, r6 - ldr r2, =0x0000400b - adds r1, r2, 0 - strh r1, [r0] - lsls r0, r4, 27 - lsrs r0, 24 - ldr r3, [sp, 0x4] - lsls r1, r3, 27 - lsrs r1, 24 - ldr r4, [sp] - lsls r2, r4, 27 - lsrs r2, 24 - mov r7, r10 - lsls r3, r7, 27 - lsrs r3, 24 - bl sub_811DE5C - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811DC28 - - thumb_func_start sub_811DD84 -sub_811DD84: @ 811DD84 - push {lr} - movs r1, 0x80 - lsls r1, 4 - movs r0, 0x2 - movs r2, 0 - bl ChangeBgY - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - ldr r1, =0x000002ce - adds r0, r1 - movs r1, 0 - strh r1, [r0] - pop {r0} - bx r0 - .pool - thumb_func_end sub_811DD84 - - thumb_func_start sub_811DDAC -sub_811DDAC: @ 811DDAC - push {r4,r5,lr} - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - lsls r1, 24 - lsrs r5, r1, 24 - movs r0, 0x2 - bl GetBgY - adds r2, r0, 0 - ldr r0, =gUnknown_0203A11C - ldr r3, [r0] - ldr r0, =0x000002ce - adds r1, r3, r0 - ldrh r0, [r1] - adds r0, r4 - strh r0, [r1] - lsls r4, 20 - asrs r4, 16 - lsls r0, r4, 8 - adds r2, r0 - cmp r5, 0 - beq _0811DE00 - movs r1, 0xB4 - lsls r1, 2 - adds r0, r3, r1 - str r2, [r0] - movs r0, 0xB5 - lsls r0, 2 - adds r1, r3, r0 - lsls r0, r5, 8 - str r0, [r1] - cmp r4, 0 - bge _0811DE0A - negs r0, r0 - str r0, [r1] - b _0811DE0A - .pool -_0811DE00: - movs r0, 0x2 - adds r1, r2, 0 - movs r2, 0 - bl ChangeBgY -_0811DE0A: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_811DDAC - - thumb_func_start sub_811DE10 -sub_811DE10: @ 811DE10 - push {lr} - movs r0, 0x2 - bl GetBgY - ldr r1, =gUnknown_0203A11C - ldr r2, [r1] - movs r3, 0xB4 - lsls r3, 2 - adds r1, r2, r3 - ldr r1, [r1] - cmp r0, r1 - beq _0811DE40 - movs r1, 0xB5 - lsls r1, 2 - adds r0, r2, r1 - ldr r1, [r0] - movs r0, 0x2 - movs r2, 0x1 - bl ChangeBgY - movs r0, 0x1 - b _0811DE42 - .pool -_0811DE40: - movs r0, 0 -_0811DE42: - pop {r1} - bx r1 - thumb_func_end sub_811DE10 - - thumb_func_start sub_811DE48 -sub_811DE48: @ 811DE48 - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - ldr r1, =0x000002ce - adds r0, r1 - ldrh r0, [r0] - bx lr - .pool - thumb_func_end sub_811DE48 - - thumb_func_start sub_811DE5C -sub_811DE5C: @ 811DE5C - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r1, 24 - lsls r2, 24 - lsrs r2, 24 - lsls r3, 24 - lsrs r3, 24 - lsls r4, r0, 8 - adds r0, r2 - orrs r4, r0 - lsls r5, r1, 8 - adds r1, r3 - orrs r5, r1 - movs r0, 0x40 - adds r1, r4, 0 - bl SetGpuReg - movs r0, 0x44 - adds r1, r5, 0 - bl SetGpuReg - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_811DE5C - - thumb_func_start sub_811DE90 -sub_811DE90: @ 811DE90 - push {r4,r5,lr} - ldr r0, =gUnknown_08597CA0 - bl LoadSpriteSheets - ldr r0, =gUnknown_08597CC0 - bl LoadSpritePalettes - movs r5, 0 - ldr r4, =gUnknown_08597CE8 -_0811DEA2: - adds r0, r4, 0 - bl LoadCompressedSpriteSheet - adds r4, 0x8 - adds r5, 0x1 - cmp r5, 0x3 - bls _0811DEA2 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811DE90 - - thumb_func_start sub_811DEC4 -sub_811DEC4: @ 811DEC4 - push {lr} - bl sub_811BA68 - lsls r0, 24 - ldr r1, =gUnknown_08597C30 - lsrs r0, 22 - adds r0, r1 - ldrb r2, [r0] - lsls r1, r2, 27 - lsrs r1, 8 - lsrs r2, 5 - lsls r2, 19 - ldr r0, =gUnknown_08597D18 - movs r3, 0xD0 - lsls r3, 12 - adds r1, r3 - asrs r1, 16 - movs r3, 0x80 - lsls r3, 12 - adds r2, r3 - asrs r2, 16 - movs r3, 0x2 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gUnknown_0203A11C - ldr r2, [r1] - movs r1, 0xB6 - lsls r1, 2 - adds r2, r1 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - ldr r0, =gSprites - adds r1, r0 - str r1, [r2] - movs r0, 0x1 - strh r0, [r1, 0x30] - pop {r0} - bx r0 - .pool - thumb_func_end sub_811DEC4 - - thumb_func_start sub_811DF28 -sub_811DF28: @ 811DF28 - push {lr} - adds r1, r0, 0 - movs r2, 0x30 - ldrsh r0, [r1, r2] - cmp r0, 0 - beq _0811DF56 - ldrh r0, [r1, 0x2E] - adds r0, 0x1 - strh r0, [r1, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x2 - ble _0811DF56 - movs r0, 0 - strh r0, [r1, 0x2E] - ldrh r0, [r1, 0x24] - adds r0, 0x1 - strh r0, [r1, 0x24] - lsls r0, 16 - cmp r0, 0 - ble _0811DF56 - ldr r0, =0x0000fffa - strh r0, [r1, 0x24] -_0811DF56: - pop {r0} - bx r0 - .pool - thumb_func_end sub_811DF28 - - thumb_func_start sub_811DF60 -sub_811DF60: @ 811DF60 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r1, 24 - ldr r2, =gUnknown_0203A11C - ldr r2, [r2] - movs r3, 0xB6 - lsls r3, 2 - adds r2, r3 - ldr r3, [r2] - movs r4, 0 - strh r0, [r3, 0x20] - ldr r0, [r2] - strh r1, [r0, 0x22] - ldr r0, [r2] - strh r4, [r0, 0x24] - ldr r0, [r2] - strh r4, [r0, 0x2E] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811DF60 - - thumb_func_start sub_811DF90 -sub_811DF90: @ 811DF90 - ldr r0, =gUnknown_0203A11C - ldr r1, [r0] - movs r0, 0xB6 - lsls r0, 2 - adds r1, r0 - ldr r0, [r1] - movs r2, 0 - strh r2, [r0, 0x2E] - ldr r0, [r1] - strh r2, [r0, 0x30] - ldr r0, [r1] - strh r2, [r0, 0x24] - bx lr - .pool - thumb_func_end sub_811DF90 - - thumb_func_start sub_811DFB0 -sub_811DFB0: @ 811DFB0 - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - movs r1, 0xB6 - lsls r1, 2 - adds r0, r1 - ldr r1, [r0] - movs r0, 0x1 - strh r0, [r1, 0x30] - bx lr - .pool - thumb_func_end sub_811DFB0 - - thumb_func_start sub_811DFC8 -sub_811DFC8: @ 811DFC8 - push {r4-r6,lr} - mov r6, r8 - push {r6} - ldr r6, =gUnknown_08597D68 - adds r0, r6, 0 - movs r1, 0 - movs r2, 0 - movs r3, 0x3 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_0203A11C - ldr r2, [r5] - movs r1, 0xB7 - lsls r1, 2 - mov r8, r1 - add r2, r8 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - ldr r4, =gSprites - adds r1, r4 - str r1, [r2] - movs r0, 0x20 - strh r0, [r1, 0x24] - adds r0, r6, 0 - movs r1, 0 - movs r2, 0 - movs r3, 0x3 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r2, [r5] - movs r1, 0xB8 - lsls r1, 2 - adds r3, r2, r1 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r4 - str r1, [r3] - ldr r0, =0x0000ffe0 - strh r0, [r1, 0x24] - add r2, r8 - ldr r1, [r2] - adds r1, 0x3F - ldrb r0, [r1] - movs r2, 0x1 - orrs r0, r2 - strb r0, [r1] - bl sub_811E088 - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811DFC8 - - thumb_func_start sub_811E050 -sub_811E050: @ 811E050 - push {r4-r6,lr} - ldr r5, =gUnknown_0203A11C - ldr r0, [r5] - movs r4, 0xB7 - lsls r4, 2 - adds r0, r4 - ldr r0, [r0] - bl DestroySprite - ldr r0, [r5] - adds r4, r0, r4 - movs r6, 0 - str r6, [r4] - movs r4, 0xB8 - lsls r4, 2 - adds r0, r4 - ldr r0, [r0] - bl DestroySprite - ldr r0, [r5] - adds r0, r4 - str r6, [r0] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E050 - - thumb_func_start sub_811E088 -sub_811E088: @ 811E088 - push {r4,lr} - sub sp, 0x4 - ldr r0, =gUnknown_0203A11C - ldr r1, [r0] - movs r2, 0xB7 - lsls r2, 2 - adds r0, r1, r2 - ldr r0, [r0] - cmp r0, 0 - beq _0811E0E4 - adds r2, 0x4 - adds r0, r1, r2 - ldr r0, [r0] - cmp r0, 0 - beq _0811E0E4 - mov r4, sp - adds r4, 0x1 - mov r0, sp - adds r1, r4, 0 - bl sub_811BB9C - bl sub_811BBB0 - lsls r0, 24 - cmp r0, 0 - bne _0811E0D4 - mov r0, sp - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - movs r1, 0 - ldrsb r1, [r4, r1] - bl sub_811E0EC - b _0811E0E4 - .pool -_0811E0D4: - mov r0, sp - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - movs r1, 0 - ldrsb r1, [r4, r1] - bl sub_811E1A4 -_0811E0E4: - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_811E088 - - thumb_func_start sub_811E0EC -sub_811E0EC: @ 811E0EC - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r1, 24 - lsrs r7, r1, 24 - lsls r0, 24 - asrs r5, r0, 24 - movs r0, 0x1 - negs r0, r0 - cmp r5, r0 - beq _0811E150 - ldr r0, =gUnknown_0203A11C - mov r8, r0 - ldr r0, [r0] - movs r4, 0xB7 - lsls r4, 2 - adds r0, r4 - ldr r0, [r0] - movs r1, 0 - bl StartSpriteAnim - mov r2, r8 - ldr r1, [r2] - adds r4, r1, r4 - ldr r2, [r4] - movs r0, 0x54 - muls r5, r0 - adds r5, 0x3A - strh r5, [r2, 0x20] - ldr r0, [r4] - lsls r4, r7, 24 - asrs r4, 20 - adds r4, 0x60 - strh r4, [r0, 0x22] - movs r6, 0xB8 - lsls r6, 2 - adds r1, r6 - ldr r0, [r1] - movs r1, 0 - bl StartSpriteAnim - mov r1, r8 - ldr r0, [r1] - adds r0, r6 - ldr r1, [r0] - strh r5, [r1, 0x20] - b _0811E192 - .pool -_0811E150: - ldr r6, =gUnknown_0203A11C - ldr r0, [r6] - movs r4, 0xB7 - lsls r4, 2 - adds r0, r4 - ldr r0, [r0] - movs r1, 0x1 - bl StartSpriteAnim - ldr r1, [r6] - adds r4, r1, r4 - ldr r0, [r4] - movs r2, 0xD8 - mov r8, r2 - mov r2, r8 - strh r2, [r0, 0x20] - ldr r0, [r4] - lsls r4, r7, 24 - asrs r4, 20 - adds r4, 0x70 - strh r4, [r0, 0x22] - movs r5, 0xB8 - lsls r5, 2 - adds r1, r5 - ldr r0, [r1] - movs r1, 0x1 - bl StartSpriteAnim - ldr r0, [r6] - adds r0, r5 - ldr r1, [r0] - mov r2, r8 - strh r2, [r1, 0x20] -_0811E192: - ldr r0, [r0] - strh r4, [r0, 0x22] - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E0EC - - thumb_func_start sub_811E1A4 -sub_811E1A4: @ 811E1A4 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsls r1, 24 - lsrs r5, r1, 24 - lsrs r4, r0, 24 - asrs r2, r0, 24 - movs r0, 0x1 - negs r0, r0 - cmp r2, r0 - beq _0811E234 - lsls r0, r5, 24 - asrs r1, r0, 24 - lsls r0, r1, 4 - adds r0, 0x60 - mov r8, r0 - movs r7, 0x20 - cmp r2, 0x6 - bne _0811E1D6 - cmp r1, 0 - bne _0811E1D6 - movs r7, 0x9E - movs r6, 0x2 - b _0811E1EC -_0811E1D6: - ldr r3, =gUnknown_08597D08 - lsls r1, r4, 24 - lsrs r0, r1, 24 - movs r2, 0 - cmp r0, 0x6 - bhi _0811E1E4 - asrs r2, r1, 24 -_0811E1E4: - adds r0, r2, r3 - ldrb r0, [r0] - adds r7, r0 - movs r6, 0x3 -_0811E1EC: - ldr r5, =gUnknown_0203A11C - ldr r0, [r5] - movs r4, 0xB7 - lsls r4, 2 - adds r0, r4 - ldr r0, [r0] - adds r1, r6, 0 - bl StartSpriteAnim - ldr r1, [r5] - adds r4, r1, r4 - ldr r0, [r4] - strh r7, [r0, 0x20] - ldr r0, [r4] - mov r2, r8 - strh r2, [r0, 0x22] - movs r4, 0xB8 - lsls r4, 2 - adds r1, r4 - ldr r0, [r1] - adds r1, r6, 0 - bl StartSpriteAnim - ldr r0, [r5] - adds r0, r4 - ldr r1, [r0] - strh r7, [r1, 0x20] - ldr r0, [r0] - mov r1, r8 - strh r1, [r0, 0x22] - b _0811E27A - .pool -_0811E234: - ldr r6, =gUnknown_0203A11C - ldr r0, [r6] - movs r4, 0xB7 - lsls r4, 2 - adds r0, r4 - ldr r0, [r0] - movs r1, 0x1 - bl StartSpriteAnim - ldr r1, [r6] - adds r4, r1, r4 - ldr r0, [r4] - movs r2, 0xD8 - mov r8, r2 - mov r2, r8 - strh r2, [r0, 0x20] - ldr r0, [r4] - lsls r4, r5, 24 - asrs r4, 20 - adds r4, 0x70 - strh r4, [r0, 0x22] - movs r5, 0xB8 - lsls r5, 2 - adds r1, r5 - ldr r0, [r1] - movs r1, 0x1 - bl StartSpriteAnim - ldr r0, [r6] - adds r0, r5 - ldr r1, [r0] - mov r2, r8 - strh r2, [r1, 0x20] - ldr r0, [r0] - strh r4, [r0, 0x22] -_0811E27A: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E1A4 - - thumb_func_start sub_811E288 -sub_811E288: @ 811E288 - push {lr} - ldr r0, =gUnknown_08597D18 - movs r1, 0 - movs r2, 0 - movs r3, 0x4 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gUnknown_0203A11C - ldr r2, [r1] - movs r1, 0xB9 - lsls r1, 2 - adds r2, r1 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - ldr r0, =gSprites - adds r1, r0 - str r1, [r2] - ldr r0, =sub_811E2DC - str r0, [r1, 0x1C] - ldrb r2, [r1, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - movs r2, 0x8 - orrs r0, r2 - strb r0, [r1, 0x5] - bl sub_811E30C - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E288 - - thumb_func_start sub_811E2DC -sub_811E2DC: @ 811E2DC - push {lr} - adds r1, r0, 0 - ldrh r0, [r1, 0x2E] - adds r0, 0x1 - strh r0, [r1, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x2 - ble _0811E302 - movs r0, 0 - strh r0, [r1, 0x2E] - ldrh r0, [r1, 0x24] - adds r0, 0x1 - strh r0, [r1, 0x24] - lsls r0, 16 - cmp r0, 0 - ble _0811E302 - ldr r0, =0x0000fffa - strh r0, [r1, 0x24] -_0811E302: - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E2DC - - thumb_func_start sub_811E30C -sub_811E30C: @ 811E30C - push {r4,lr} - sub sp, 0x4 - mov r4, sp - adds r4, 0x1 - mov r0, sp - adds r1, r4, 0 - bl sub_811BBC8 - mov r0, sp - movs r1, 0 - ldrsb r1, [r0, r1] - movs r0, 0xD - muls r0, r1 - lsls r0, 27 - movs r1, 0 - ldrsb r1, [r4, r1] - lsls r1, 28 - movs r2, 0xE0 - lsls r2, 21 - adds r0, r2 - lsrs r0, 24 - movs r2, 0xC0 - lsls r2, 23 - adds r1, r2 - lsrs r1, 24 - bl sub_811E34C - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_811E30C - - thumb_func_start sub_811E34C -sub_811E34C: @ 811E34C - push {r4,lr} - lsls r0, 24 - lsrs r3, r0, 24 - lsls r1, 24 - lsrs r4, r1, 24 - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - movs r1, 0xB9 - lsls r1, 2 - adds r2, r0, r1 - ldr r0, [r2] - cmp r0, 0 - beq _0811E376 - movs r1, 0 - strh r3, [r0, 0x20] - ldr r0, [r2] - strh r4, [r0, 0x22] - ldr r0, [r2] - strh r1, [r0, 0x24] - ldr r0, [r2] - strh r1, [r0, 0x2E] -_0811E376: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E34C - - thumb_func_start sub_811E380 -sub_811E380: @ 811E380 - push {r4,lr} - ldr r4, =gUnknown_0203A11C - ldr r0, [r4] - movs r1, 0xB9 - lsls r1, 2 - adds r0, r1 - ldr r0, [r0] - cmp r0, 0 - beq _0811E3A2 - bl DestroySprite - ldr r0, [r4] - movs r1, 0xB9 - lsls r1, 2 - adds r0, r1 - movs r1, 0 - str r1, [r0] -_0811E3A2: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E380 - - thumb_func_start sub_811E3AC -sub_811E3AC: @ 811E3AC - push {r4-r6,lr} - ldr r0, =gUnknown_08597DF0 - movs r1, 0xD0 - movs r2, 0x80 - movs r3, 0x6 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_0203A11C - ldr r2, [r5] - movs r1, 0xBA - lsls r1, 2 - adds r2, r1 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - ldr r4, =gSprites - adds r1, r4 - str r1, [r2] - movs r6, 0 - ldr r0, =0x0000ffc0 - strh r0, [r1, 0x24] - ldr r0, =gUnknown_08597DD0 - movs r1, 0xD0 - movs r2, 0x50 - movs r3, 0x5 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r2, [r5] - movs r1, 0xBB - lsls r1, 2 - adds r3, r2, r1 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r4 - str r1, [r3] - strb r6, [r2, 0x9] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E3AC - - thumb_func_start sub_811E418 -sub_811E418: @ 811E418 - push {r4,lr} - ldr r4, =gUnknown_0203A11C - ldr r2, [r4] - ldrb r3, [r2, 0x9] - cmp r3, 0 - beq _0811E430 - cmp r3, 0x1 - beq _0811E488 - movs r0, 0 - b _0811E4A6 - .pool -_0811E430: - movs r0, 0xBA - lsls r0, 2 - adds r2, r0 - ldr r1, [r2] - ldrh r0, [r1, 0x24] - adds r0, 0x8 - strh r0, [r1, 0x24] - ldr r2, [r2] - movs r1, 0x24 - ldrsh r0, [r2, r1] - cmp r0, 0 - blt _0811E4A4 - strh r3, [r2, 0x24] - bl sub_811BBB0 - lsls r0, 24 - cmp r0, 0 - bne _0811E466 - ldr r0, [r4] - movs r1, 0xBB - lsls r1, 2 - adds r0, r1 - ldr r0, [r0] - movs r1, 0x1 - bl StartSpriteAnim - b _0811E476 -_0811E466: - ldr r0, [r4] - movs r1, 0xBB - lsls r1, 2 - adds r0, r1 - ldr r0, [r0] - movs r1, 0x2 - bl StartSpriteAnim -_0811E476: - ldr r0, =gUnknown_0203A11C - ldr r1, [r0] - ldrb r0, [r1, 0x9] - adds r0, 0x1 - strb r0, [r1, 0x9] - b _0811E4A4 - .pool -_0811E488: - movs r1, 0xBB - lsls r1, 2 - adds r0, r2, r1 - ldr r0, [r0] - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _0811E4A4 - movs r0, 0x2 - strb r0, [r2, 0x9] - movs r0, 0 - b _0811E4A6 -_0811E4A4: - movs r0, 0x1 -_0811E4A6: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811E418 - - thumb_func_start sub_811E4AC -sub_811E4AC: @ 811E4AC - push {lr} - ldr r2, =gUnknown_0203A11C - ldr r1, [r2] - movs r0, 0 - strb r0, [r1, 0x9] - ldr r0, [r2] - movs r1, 0xBB - lsls r1, 2 - adds r0, r1 - ldr r0, [r0] - movs r1, 0x3 - bl StartSpriteAnim - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E4AC - - thumb_func_start sub_811E4D0 -sub_811E4D0: @ 811E4D0 - push {r4-r6,lr} - ldr r5, =gUnknown_0203A11C - ldr r3, [r5] - ldrb r0, [r3, 0x9] - cmp r0, 0 - beq _0811E4E8 - cmp r0, 0x1 - beq _0811E502 - movs r0, 0 - b _0811E554 - .pool -_0811E4E8: - movs r1, 0xBB - lsls r1, 2 - adds r0, r3, r1 - ldr r0, [r0] - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _0811E552 - movs r0, 0x1 - strb r0, [r3, 0x9] - b _0811E552 -_0811E502: - movs r0, 0xBA - lsls r0, 2 - adds r2, r3, r0 - ldr r1, [r2] - ldrh r0, [r1, 0x24] - subs r0, 0x8 - movs r6, 0 - strh r0, [r1, 0x24] - ldr r0, [r2] - movs r2, 0x24 - ldrsh r1, [r0, r2] - movs r0, 0x40 - negs r0, r0 - cmp r1, r0 - bgt _0811E552 - movs r4, 0xBB - lsls r4, 2 - adds r0, r3, r4 - ldr r0, [r0] - bl DestroySprite - ldr r0, [r5] - movs r1, 0xBA - lsls r1, 2 - adds r0, r1 - ldr r0, [r0] - bl DestroySprite - ldr r1, [r5] - adds r4, r1, r4 - str r6, [r4] - movs r2, 0xBA - lsls r2, 2 - adds r0, r1, r2 - str r6, [r0] - ldrb r0, [r1, 0x9] - adds r0, 0x1 - strb r0, [r1, 0x9] - movs r0, 0 - b _0811E554 -_0811E552: - movs r0, 0x1 -_0811E554: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_811E4D0 - - thumb_func_start sub_811E55C -sub_811E55C: @ 811E55C - push {lr} - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - movs r1, 0xBB - lsls r1, 2 - adds r0, r1 - ldr r0, [r0] - movs r1, 0x4 - bl StartSpriteAnim - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E55C - - thumb_func_start sub_811E578 -sub_811E578: @ 811E578 - push {lr} - bl sub_811BBB0 - lsls r0, 24 - cmp r0, 0 - bne _0811E59C - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - movs r1, 0xBB - lsls r1, 2 - adds r0, r1 - ldr r0, [r0] - movs r1, 0x1 - bl StartSpriteAnim - b _0811E5AE - .pool -_0811E59C: - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - movs r1, 0xBB - lsls r1, 2 - adds r0, r1 - ldr r0, [r0] - movs r1, 0x2 - bl StartSpriteAnim -_0811E5AE: - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E578 - - thumb_func_start sub_811E5B8 -sub_811E5B8: @ 811E5B8 - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - movs r1, 0xBB - lsls r1, 2 - adds r0, r1 - ldr r0, [r0] - adds r0, 0x3F - ldrb r1, [r0] - lsrs r1, 4 - movs r0, 0x1 - bics r0, r1 - bx lr - .pool - thumb_func_end sub_811E5B8 - - thumb_func_start sub_811E5D4 -sub_811E5D4: @ 811E5D4 - push {r4,lr} - ldr r4, =gUnknown_08597E48 - adds r0, r4, 0 - movs r1, 0x60 - movs r2, 0x50 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - beq _0811E602 - ldr r0, =gUnknown_0203A11C - ldr r2, [r0] - movs r0, 0xBC - lsls r0, 2 - adds r2, r0 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, =gSprites - adds r0, r1 - str r0, [r2] -_0811E602: - adds r0, r4, 0 - movs r1, 0x60 - movs r2, 0x9C - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - beq _0811E636 - ldr r0, =gUnknown_0203A11C - ldr r2, [r0] - movs r0, 0xBD - lsls r0, 2 - adds r2, r0 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, =gSprites - adds r0, r1 - str r0, [r2] - adds r0, 0x3F - ldrb r1, [r0] - movs r2, 0x2 - orrs r1, r2 - strb r1, [r0] -_0811E636: - bl sub_811E6B0 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E5D4 - - thumb_func_start sub_811E64C -sub_811E64C: @ 811E64C - push {r4-r6,lr} - bl sub_811BBF8 - ldr r6, =gUnknown_0203A11C - ldr r1, [r6] - movs r2, 0xBC - lsls r2, 2 - adds r1, r2 - ldr r1, [r1] - movs r2, 0 - cmp r0, 0 - bne _0811E666 - movs r2, 0x1 -_0811E666: - adds r3, r1, 0 - adds r3, 0x3E - movs r4, 0x1 - lsls r2, 2 - ldrb r1, [r3] - movs r5, 0x5 - negs r5, r5 - adds r0, r5, 0 - ands r0, r1 - orrs r0, r2 - strb r0, [r3] - bl sub_811BC2C - ldr r1, [r6] - movs r2, 0xBD - lsls r2, 2 - adds r1, r2 - ldr r1, [r1] - movs r2, 0 - cmp r0, 0 - bne _0811E692 - movs r2, 0x1 -_0811E692: - adds r3, r1, 0 - adds r3, 0x3E - adds r1, r4, 0 - ands r1, r2 - lsls r1, 2 - ldrb r2, [r3] - adds r0, r5, 0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E64C - - thumb_func_start sub_811E6B0 -sub_811E6B0: @ 811E6B0 - ldr r3, =gUnknown_0203A11C - ldr r0, [r3] - movs r1, 0xBC - lsls r1, 2 - adds r0, r1 - ldr r1, [r0] - adds r1, 0x3E - ldrb r0, [r1] - movs r2, 0x4 - orrs r0, r2 - strb r0, [r1] - ldr r0, [r3] - movs r1, 0xBD - lsls r1, 2 - adds r0, r1 - ldr r1, [r0] - adds r1, 0x3E - ldrb r0, [r1] - orrs r0, r2 - strb r0, [r1] - bx lr - .pool - thumb_func_end sub_811E6B0 - - thumb_func_start sub_811E6E0 -sub_811E6E0: @ 811E6E0 - push {lr} - cmp r0, 0 - bne _0811E6FC - ldr r0, =gUnknown_0203A11C - ldr r2, [r0] - movs r1, 0xBC - lsls r1, 2 - adds r0, r2, r1 - ldr r0, [r0] - movs r1, 0x60 - b _0811E70A - .pool -_0811E6FC: - ldr r0, =gUnknown_0203A11C - ldr r2, [r0] - movs r1, 0xBC - lsls r1, 2 - adds r0, r2, r1 - ldr r0, [r0] - movs r1, 0x78 -_0811E70A: - strh r1, [r0, 0x20] - movs r3, 0xBD - lsls r3, 2 - adds r0, r2, r3 - ldr r0, [r0] - strh r1, [r0, 0x20] - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E6E0 - - thumb_func_start sub_811E720 -sub_811E720: @ 811E720 - push {r4,lr} - ldr r4, =gUnknown_08597E30 - adds r0, r4, 0 - movs r1, 0xDC - movs r2, 0x54 - movs r3, 0x1 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - beq _0811E74E - ldr r0, =gUnknown_0203A11C - ldr r2, [r0] - movs r0, 0xBE - lsls r0, 2 - adds r2, r0 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, =gSprites - adds r0, r1 - str r0, [r2] -_0811E74E: - adds r0, r4, 0 - movs r1, 0xDC - movs r2, 0x9C - movs r3, 0x1 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - beq _0811E77E - ldr r0, =gUnknown_0203A11C - ldr r2, [r0] - movs r0, 0xBF - lsls r0, 2 - adds r2, r0 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, =gSprites - adds r0, r1 - str r0, [r2] - movs r1, 0x1 - bl StartSpriteAnim -_0811E77E: - bl sub_811E7F8 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E720 - - thumb_func_start sub_811E794 -sub_811E794: @ 811E794 - push {r4-r6,lr} - bl sub_811BBF8 - ldr r6, =gUnknown_0203A11C - ldr r1, [r6] - movs r2, 0xBE - lsls r2, 2 - adds r1, r2 - ldr r1, [r1] - movs r2, 0 - cmp r0, 0 - bne _0811E7AE - movs r2, 0x1 -_0811E7AE: - adds r3, r1, 0 - adds r3, 0x3E - movs r4, 0x1 - lsls r2, 2 - ldrb r1, [r3] - movs r5, 0x5 - negs r5, r5 - adds r0, r5, 0 - ands r0, r1 - orrs r0, r2 - strb r0, [r3] - bl sub_811BC2C - ldr r1, [r6] - movs r2, 0xBF - lsls r2, 2 - adds r1, r2 - ldr r1, [r1] - movs r2, 0 - cmp r0, 0 - bne _0811E7DA - movs r2, 0x1 -_0811E7DA: - adds r3, r1, 0 - adds r3, 0x3E - adds r1, r4, 0 - ands r1, r2 - lsls r1, 2 - ldrb r2, [r3] - adds r0, r5, 0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E794 - - thumb_func_start sub_811E7F8 -sub_811E7F8: @ 811E7F8 - ldr r3, =gUnknown_0203A11C - ldr r0, [r3] - movs r1, 0xBE - lsls r1, 2 - adds r0, r1 - ldr r1, [r0] - adds r1, 0x3E - ldrb r0, [r1] - movs r2, 0x4 - orrs r0, r2 - strb r0, [r1] - ldr r0, [r3] - movs r1, 0xBF - lsls r1, 2 - adds r0, r1 - ldr r1, [r0] - adds r1, 0x3E - ldrb r0, [r1] - orrs r0, r2 - strb r0, [r1] - bx lr - .pool - thumb_func_end sub_811E7F8 - - thumb_func_start sub_811E828 -sub_811E828: @ 811E828 - push {r4,r5,lr} - sub sp, 0x4 - bl sub_811BCBC - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _0811E84C - cmp r0, 0x1 - bgt _0811E842 - cmp r0, 0 - beq _0811E848 - b _0811E8D0 -_0811E842: - cmp r0, 0x2 - beq _0811E850 - b _0811E8D0 -_0811E848: - movs r4, 0x43 - b _0811E852 -_0811E84C: - movs r4, 0x44 - b _0811E852 -_0811E850: - movs r4, 0x7 -_0811E852: - bl sub_811BA68 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x4 - bne _0811E8D0 - adds r0, r4, 0 - ldr r5, =SpriteCallbackDummy - movs r4, 0 - str r4, [sp] - adds r1, r5, 0 - movs r2, 0x4C - movs r3, 0x28 - bl AddPseudoEventObject - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x40 - beq _0811E892 - ldr r1, =gSprites - lsls r0, r2, 4 - adds r0, r2 - lsls r0, 2 - adds r0, r1 - ldrb r2, [r0, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r2 - strb r1, [r0, 0x5] - movs r1, 0x2 - bl StartSpriteAnim -_0811E892: - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldrb r0, [r0, 0x8] - movs r1, 0x69 - cmp r0, 0 - bne _0811E8A0 - movs r1, 0x64 -_0811E8A0: - str r4, [sp] - adds r0, r1, 0 - adds r1, r5, 0 - movs r2, 0x34 - movs r3, 0x28 - bl AddPseudoEventObject - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x40 - beq _0811E8D0 - ldr r1, =gSprites - lsls r0, r2, 4 - adds r0, r2 - lsls r0, 2 - adds r0, r1 - ldrb r2, [r0, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r2 - strb r1, [r0, 0x5] - movs r1, 0x3 - bl StartSpriteAnim -_0811E8D0: - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E828 - - thumb_func_start sub_811E8E4 -sub_811E8E4: @ 811E8E4 - push {lr} - bl sub_811BA68 - lsls r0, 24 - ldr r1, =gUnknown_08597C30 - lsrs r0, 22 - adds r0, r1 - ldrb r0, [r0, 0x3] - cmp r0, 0x1 - beq _0811E90E - cmp r0, 0x1 - bgt _0811E908 - cmp r0, 0 - beq _0811E916 - b _0811E91A - .pool -_0811E908: - cmp r0, 0x2 - beq _0811E912 - b _0811E91A -_0811E90E: - movs r0, 0x1 - b _0811E91C -_0811E912: - movs r0, 0x2 - b _0811E91C -_0811E916: - movs r0, 0 - b _0811E91C -_0811E91A: - movs r0, 0x3 -_0811E91C: - pop {r1} - bx r1 - thumb_func_end sub_811E8E4 - - thumb_func_start sub_811E920 -sub_811E920: @ 811E920 - push {r4,lr} - adds r4, r0, 0 - bl sub_811E8E4 - adds r1, r0, 0 - cmp r1, 0x2 - ble _0811E932 - movs r0, 0 - b _0811E93E -_0811E932: - ldr r0, =gUnknown_08597E60 - lsls r1, 2 - adds r1, r4, r1 - adds r1, r0 - ldrb r0, [r1] - adds r0, 0x4 -_0811E93E: - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_811E920 - thumb_func_start sub_811E948 sub_811E948: @ 811E948 push {r4-r7,lr} diff --git a/data/easy_chat.s b/data/easy_chat.s index b8df93d7a2..ef632c69f9 100644 --- a/data/easy_chat.s +++ b/data/easy_chat.s @@ -443,7 +443,9 @@ gUnknown_08597E48:: @ 8597E48 spr_template 0x0002, 0x0002, gUnknown_08597E10, gUnknown_08597E28, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_08597E60:: @ 8597E60 - .byte 0x10, 0x6f, 0xc4, 0x00, 0x10, 0x4e, 0x82, 0xa0, 0x10, 0x50, 0x86, 0xaa + .byte 0x10, 0x6f, 0xc4, 0x00 + .byte 0x10, 0x4e, 0x82, 0xa0 + .byte 0x10, 0x50, 0x86, 0xaa .align 2 gUnknown_08597E6C:: @ 8597E6C diff --git a/src/easy_chat.c b/src/easy_chat.c index 5c55cd2ca5..1b1bd105b5 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -3,10 +3,12 @@ #include "global.h" #include "alloc.h" #include "bg.h" +#include "decompress.h" #include "dewford_trend.h" #include "dynamic_placeholder_text_util.h" #include "easy_chat.h" #include "event_data.h" +#include "event_object_movement.h" #include "field_weather.h" #include "gpu_regs.h" #include "graphics.h" @@ -22,6 +24,7 @@ #include "task.h" #include "text_window.h" #include "window.h" +#include "constants/event_objects.h" #include "constants/flags.h" #include "constants/songs.h" @@ -82,20 +85,23 @@ struct Unk203A11C u8 unk6; u8 unk7; s8 unk8; - u8 filler9[0x1]; + u8 unk9; u8 unkA; u8 unkB[0xC1]; - u8 unkCC[0x20C]; - int unk2D8; - int unk2DC; - int unk2E0; - int unk2E4; - int unk2E8; - int unk2EC; - int unk2F0; - int unk2F4; - int unk2F8; - int unk2FC; + u8 unkCC[0x202]; + u16 unk2CE; + int unk2D0; + int unk2D4; + struct Sprite *unk2D8; + struct Sprite *unk2DC; + struct Sprite *unk2E0; + struct Sprite *unk2E4; + struct Sprite *unk2E8; + struct Sprite *unk2EC; + struct Sprite *unk2F0; + struct Sprite *unk2F4; + struct Sprite *unk2F8; + struct Sprite *unk2FC; u16 unk300[BG_SCREEN_SIZE / 2]; u16 unkB00[BG_SCREEN_SIZE / 2]; }; @@ -202,12 +208,12 @@ static void sub_811CFCC(void); static void sub_811D0BC(void); static void sub_811D2C8(void); static void sub_811D684(void); -void sub_811DE90(void); -void sub_811DEC4(void); -void sub_811DE5C(u8, u8, u8, u8); -void sub_811E5D4(void); -void sub_811E720(void); -void sub_811E828(void); +static void sub_811DE90(void); +static void sub_811DEC4(void); +static void sub_811DE5C(u8, u8, u8, u8); +static void sub_811E5D4(void); +static void sub_811E720(void); +static void sub_811E828(void); static bool8 sub_811C2D4(void); static bool8 sub_811C30C(void); static bool8 sub_811C3E4(void); @@ -237,51 +243,56 @@ static bool8 sub_811CD94(void); static bool8 sub_811CDD4(void); static bool8 sub_811CE14(void); static bool8 sub_811CE54(void); -void sub_811DF60(u8, u8); -int sub_811E920(int); -void sub_811DF90(void); +static void sub_811DF60(u8, u8); +static int sub_811E920(int); +static void sub_811DF90(void); static void sub_811D104(u8); static void sub_811D214(u8); -void sub_811DFB0(void); +static void sub_811DFB0(void); static void sub_811D6D4(void); static void sub_811D9CC(int); -void sub_811E3AC(void); -bool8 sub_811E418(void); -void sub_811DFC8(void); -void sub_811E6E0(int); +static void sub_811E3AC(void); +static bool8 sub_811E418(void); +static void sub_811DFC8(void); +static void sub_811E6E0(int); static bool8 sub_811DAA4(void); -void sub_811E64C(void); -void sub_811E050(void); -void sub_811E4AC(void); -void sub_811E6B0(void); -void sub_811E55C(void); -bool8 sub_811E4D0(void); -bool8 sub_811E5B8(void); -void sub_811E578(void); -void sub_811E088(void); -void sub_811DDAC(s16, u8); -bool8 sub_811DE10(void); +static void sub_811E64C(void); +static void sub_811E050(void); +static void sub_811E4AC(void); +static void sub_811E6B0(void); +static void sub_811E55C(void); +static bool8 sub_811E4D0(void); +static bool8 sub_811E5B8(void); +static void sub_811E578(void); +static void sub_811E088(void); +static void sub_811DDAC(s16, u8); +static bool8 sub_811DE10(void); static void sub_811D9B4(void); static void sub_811D698(u32); -void sub_811E288(void); -void sub_811E794(void); -void sub_811E380(void); -void sub_811E7F8(void); -void sub_811E30C(void); +static void sub_811E288(void); +static void sub_811E794(void); +static void sub_811E380(void); +static void sub_811E7F8(void); +static void sub_811E30C(void); static void sub_811D7A4(void); static void sub_811D7C8(void); -int sub_811DE48(void); +static int sub_811DE48(void); static void sub_811D7EC(void); static void sub_811D830(void); void sub_811D058(u8, u8, const u8 *, u8, u8, u8, u8, u8, u8); -void sub_811DD84(void); +static void sub_811DD84(void); static void sub_811D6F4(void); static void sub_811D758(void); static void sub_811D794(void); const u8 *sub_811F424(u8); static void sub_811D864(u8, u8); static void sub_811D950(u8, u8); -void sub_811DADC(u8); +static void sub_811DADC(u8); +static void sub_811DC28(int, int, int, int); +static void sub_811E0EC(s8, s8); +static void sub_811E1A4(s8, s8); +static void sub_811E2DC(struct Sprite *); +static void sub_811E34C(u8, u8); u8 *CopyEasyChatWordPadded(u8 *, u16, u16); extern const struct { @@ -304,6 +315,17 @@ extern const u16 gUnknown_08597C24[]; extern const struct WindowTemplate gUnknown_08597C84; extern const u8 gUnknown_08597C8C[4]; extern const u8 *const gUnknown_08597C90[4]; +extern const struct SpriteSheet gUnknown_08597CA0[]; +extern const struct SpritePalette gUnknown_08597CC0[]; +extern const struct CompressedSpriteSheet gUnknown_08597CE8[]; +extern const struct SpriteTemplate gUnknown_08597D18; +extern const struct SpriteTemplate gUnknown_08597D68; +extern const struct SpriteTemplate gUnknown_08597DF0; +extern const struct SpriteTemplate gUnknown_08597DD0; +extern const struct SpriteTemplate gUnknown_08597E48; +extern const struct SpriteTemplate gUnknown_08597E30; +extern const u8 gUnknown_08597D08[]; +extern const u8 gUnknown_08597E60[][4]; void sub_811A20C(u8 kind, u16 *words, MainCallback callback, u8 sizeParam) { @@ -3228,16 +3250,16 @@ static bool8 sub_811CE94(void) return FALSE; gUnknown_0203A11C->unk0 = 0; - gUnknown_0203A11C->unk2D8 = 0; - gUnknown_0203A11C->unk2DC = 0; - gUnknown_0203A11C->unk2E0 = 0; - gUnknown_0203A11C->unk2E4 = 0; - gUnknown_0203A11C->unk2E8 = 0; - gUnknown_0203A11C->unk2EC = 0; - gUnknown_0203A11C->unk2F0 = 0; - gUnknown_0203A11C->unk2F4 = 0; - gUnknown_0203A11C->unk2F8 = 0; - gUnknown_0203A11C->unk2FC = 0; + gUnknown_0203A11C->unk2D8 = NULL; + gUnknown_0203A11C->unk2DC = NULL; + gUnknown_0203A11C->unk2E0 = NULL; + gUnknown_0203A11C->unk2E4 = NULL; + gUnknown_0203A11C->unk2E8 = NULL; + gUnknown_0203A11C->unk2EC = NULL; + gUnknown_0203A11C->unk2F0 = NULL; + gUnknown_0203A11C->unk2F4 = NULL; + gUnknown_0203A11C->unk2F8 = NULL; + gUnknown_0203A11C->unk2FC = NULL; gUnknown_0203A11C->unkA = sub_811BC70(); return TRUE; } @@ -3752,3 +3774,602 @@ static bool8 sub_811DAA4(void) var1 = gUnknown_0203A11C->unk7; return (var0 ^ var1) > 0; } + +static void sub_811DADC(u8 arg0) +{ + FillBgTilemapBufferRect_Palette0(1, 0, 0, 10, 30, 10); + switch (arg0) + { + case 0: + break; + case 1: + sub_811DC28(11, 14, 3, 2); + break; + case 2: + sub_811DC28(9, 14, 7, 2); + break; + case 3: + sub_811DC28(7, 14, 11, 2); + break; + case 4: + sub_811DC28(5, 14, 15, 2); + break; + case 5: + sub_811DC28(3, 14, 19, 2); + break; + case 6: + sub_811DC28(1, 14, 23, 2); + break; + case 11: + sub_811DC28(1, 10, 24, 10); + break; + case 12: + sub_811DC28(1, 10, 25, 10); + break; + case 13: + sub_811DC28(1, 10, 26, 10); + break; + case 14: + sub_811DC28(1, 10, 27, 10); + break; + case 15: + sub_811DC28(1, 10, 28, 10); + break; + case 16: + sub_811DC28(1, 10, 29, 10); + break; + case 17: + sub_811DC28(0, 10, 30, 10); + break; + case 10: + case 18: + sub_811DC28(1, 10, 23, 10); + break; + case 9: + case 19: + sub_811DC28(1, 11, 23, 8); + break; + case 8: + case 20: + sub_811DC28(1, 12, 23, 6); + break; + case 7: + case 21: + sub_811DC28(1, 13, 23, 4); + break; + case 22: + sub_811DC28(1, 14, 23, 2); + break; + } + + CopyBgTilemapBufferToVram(1); +} + +static void sub_811DC28(int left, int top, int width, int height) +{ + u16 *tilemap; + int right; + int bottom; + int x, y; + + tilemap = gUnknown_0203A11C->unk300; + right = left + width - 1; + bottom = top + height - 1; + x = left; + y = top; + tilemap[y * 32 + x] = 0x4001; + x++; + for (; x < right; x++) + tilemap[y * 32 + x] = 0x4002; + + tilemap[y * 32 + x] = 0x4003; + y++; + for (; y < bottom; y++) + { + tilemap[y * 32 + left] = 0x4005; + x = left + 1; + for (; x < right; x++) + tilemap[y * 32 + x] = 0x4000; + + tilemap[y * 32 + x] = 0x4007; + } + + tilemap[y * 32 + left] = 0x4009; + x = left + 1; + for (; x < right; x++) + tilemap[y * 32 + x] = 0x400A; + + tilemap[y * 32 + x] = 0x400B; + sub_811DE5C((left + 1) * 8, (top + 1) * 8, (width - 2) * 8, (height - 2) * 8); +} + +static void sub_811DD84(void) +{ + ChangeBgY(2, 0x800, 0); + gUnknown_0203A11C->unk2CE = 0; +} + +static void sub_811DDAC(s16 arg0, u8 arg1) +{ + int bgY; + s16 var0; + + bgY = GetBgY(2); + gUnknown_0203A11C->unk2CE += arg0; + var0 = arg0 * 16; + bgY += var0 << 8; + if (arg1) + { + gUnknown_0203A11C->unk2D0 = bgY; + gUnknown_0203A11C->unk2D4 = arg1 * 256; + if (var0 < 0) + gUnknown_0203A11C->unk2D4 = -gUnknown_0203A11C->unk2D4; + } + else + { + ChangeBgY(2, bgY, 0); + } +} + +static bool8 sub_811DE10(void) +{ + int bgY; + + bgY = GetBgY(2); + if (bgY == gUnknown_0203A11C->unk2D0) + { + return FALSE; + } + else + { + ChangeBgY(2, gUnknown_0203A11C->unk2D4, 1); + return TRUE; + } +} + +static int sub_811DE48(void) +{ + return gUnknown_0203A11C->unk2CE; +} + +static void sub_811DE5C(u8 left, u8 top, u8 width, u8 height) +{ + u16 horizontalDimensions = WIN_RANGE(left, left + width); + u16 verticalDimensions = WIN_RANGE(top, top + height); + SetGpuReg(REG_OFFSET_WIN0H, horizontalDimensions); + SetGpuReg(REG_OFFSET_WIN0V, verticalDimensions); +} + +static void sub_811DE90(void) +{ + u32 i; + + LoadSpriteSheets(gUnknown_08597CA0); + LoadSpritePalettes(gUnknown_08597CC0); + for (i = 0; i < 4; i++) + LoadCompressedSpriteSheet(&gUnknown_08597CE8[i]); +} + +static void sub_811DEC4(void) +{ + u8 var0 = sub_811BA68(); + int x = gUnknown_08597C30[var0].unk0_0 * 8 + 13; + int y = gUnknown_08597C30[var0].unk0_5 * 8 + 8; + u8 spriteId = CreateSprite(&gUnknown_08597D18, x, y, 2); + gUnknown_0203A11C->unk2D8 = &gSprites[spriteId]; + gSprites[spriteId].data[1] = 1; +} + +void sub_811DF28(struct Sprite *sprite) +{ + if (sprite->data[1]) + { + if (++sprite->data[0] > 2) + { + sprite->data[0] = 0; + if (++sprite->pos2.x > 0) + sprite->pos2.x = -6; + } + } +} + +static void sub_811DF60(u8 x, u8 y) +{ + gUnknown_0203A11C->unk2D8->pos1.x = x; + gUnknown_0203A11C->unk2D8->pos1.y = y; + gUnknown_0203A11C->unk2D8->pos2.x = 0; + gUnknown_0203A11C->unk2D8->data[0] = 0; +} + +static void sub_811DF90(void) +{ + gUnknown_0203A11C->unk2D8->data[0] = 0; + gUnknown_0203A11C->unk2D8->data[1] = 0; + gUnknown_0203A11C->unk2D8->pos2.x = 0; +} + +static void sub_811DFB0(void) +{ + gUnknown_0203A11C->unk2D8->data[1] = 1; +} + +static void sub_811DFC8(void) +{ + u8 spriteId = CreateSprite(&gUnknown_08597D68, 0, 0, 3); + gUnknown_0203A11C->unk2DC = &gSprites[spriteId]; + gUnknown_0203A11C->unk2DC->pos2.x = 32; + + spriteId = CreateSprite(&gUnknown_08597D68, 0, 0, 3); + gUnknown_0203A11C->unk2E0 = &gSprites[spriteId]; + gUnknown_0203A11C->unk2E0->pos2.x = -32; + + gUnknown_0203A11C->unk2DC->hFlip = 1; + sub_811E088(); +} + +static void sub_811E050(void) +{ + DestroySprite(gUnknown_0203A11C->unk2DC); + gUnknown_0203A11C->unk2DC = NULL; + DestroySprite(gUnknown_0203A11C->unk2E0); + gUnknown_0203A11C->unk2E0 = NULL; +} + +static void sub_811E088(void) +{ + u8 var0; + u8 var1; + + if (gUnknown_0203A11C->unk2DC && gUnknown_0203A11C->unk2E0) + { + sub_811BB9C(&var0, &var1); + if (!sub_811BBB0()) + sub_811E0EC(var0, var1); + else + sub_811E1A4(var0, var1); + } +} + +static void sub_811E0EC(s8 arg0, s8 arg1) +{ + if (arg0 != -1) + { + StartSpriteAnim(gUnknown_0203A11C->unk2DC, 0); + gUnknown_0203A11C->unk2DC->pos1.x = arg0 * 84 + 58; + gUnknown_0203A11C->unk2DC->pos1.y = arg1 * 16 + 96; + + StartSpriteAnim(gUnknown_0203A11C->unk2E0, 0); + gUnknown_0203A11C->unk2E0->pos1.x = arg0 * 84 + 58; + gUnknown_0203A11C->unk2E0->pos1.y = arg1 * 16 + 96; + } + else + { + StartSpriteAnim(gUnknown_0203A11C->unk2DC, 1); + gUnknown_0203A11C->unk2DC->pos1.x = 216; + gUnknown_0203A11C->unk2DC->pos1.y = arg1 * 16 + 112; + + StartSpriteAnim(gUnknown_0203A11C->unk2E0, 1); + gUnknown_0203A11C->unk2E0->pos1.x = 216; + gUnknown_0203A11C->unk2E0->pos1.y = arg1 * 16 + 112; + } +} + +static void sub_811E1A4(s8 arg0, s8 arg1) +{ + int anim; + int x, y; + + if (arg0 != -1) + { + y = arg1 * 16 + 96; + x = 32; + if (arg0 == 6 && arg1 == 0) + { + x = 158; + anim = 2; + } + else + { + x += gUnknown_08597D08[(u8)arg0 < 7 ? arg0 : 0]; + anim = 3; + } + + StartSpriteAnim(gUnknown_0203A11C->unk2DC, anim); + gUnknown_0203A11C->unk2DC->pos1.x = x; + gUnknown_0203A11C->unk2DC->pos1.y = y; + + StartSpriteAnim(gUnknown_0203A11C->unk2E0, anim); + gUnknown_0203A11C->unk2E0->pos1.x = x; + gUnknown_0203A11C->unk2E0->pos1.y = y; + } + else + { + StartSpriteAnim(gUnknown_0203A11C->unk2DC, 1); + gUnknown_0203A11C->unk2DC->pos1.x = 216; + gUnknown_0203A11C->unk2DC->pos1.y = arg1 * 16 + 112; + + StartSpriteAnim(gUnknown_0203A11C->unk2E0, 1); + gUnknown_0203A11C->unk2E0->pos1.x = 216; + gUnknown_0203A11C->unk2E0->pos1.y = arg1 * 16 + 112; + } +} + +static void sub_811E288(void) +{ + u8 spriteId = CreateSprite(&gUnknown_08597D18, 0, 0, 4); + gUnknown_0203A11C->unk2E4 = &gSprites[spriteId]; + gUnknown_0203A11C->unk2E4->callback = sub_811E2DC; + gUnknown_0203A11C->unk2E4->oam.priority = 2; + sub_811E30C(); +} + +static void sub_811E2DC(struct Sprite *sprite) +{ + if (++sprite->data[0] > 2) + { + sprite->data[0] = 0; + if (++sprite->pos2.x > 0) + sprite->pos2.x = -6; + } +} + +static void sub_811E30C(void) +{ + s8 var0, var1, x, y; + + sub_811BBC8(&var0, &var1); + x = var0 * 13; + x = x * 8 + 28; + y = var1 * 16 + 96; + sub_811E34C(x, y); +} + +static void sub_811E34C(u8 x, u8 y) +{ + if (gUnknown_0203A11C->unk2E4) + { + gUnknown_0203A11C->unk2E4->pos1.x = x; + gUnknown_0203A11C->unk2E4->pos1.y = y; + gUnknown_0203A11C->unk2E4->pos2.x = 0; + gUnknown_0203A11C->unk2E4->data[0] = 0; + } +} + +static void sub_811E380(void) +{ + if (gUnknown_0203A11C->unk2E4) + { + DestroySprite(gUnknown_0203A11C->unk2E4); + gUnknown_0203A11C->unk2E4 = NULL; + } +} + +static void sub_811E3AC(void) +{ + u8 spriteId = CreateSprite(&gUnknown_08597DF0, 208, 128, 6); + gUnknown_0203A11C->unk2E8 = &gSprites[spriteId]; + gUnknown_0203A11C->unk2E8->pos2.x = -64; + + spriteId = CreateSprite(&gUnknown_08597DD0, 208, 80, 5); + gUnknown_0203A11C->unk2EC = &gSprites[spriteId]; + gUnknown_0203A11C->unk9 = 0; +} + +static bool8 sub_811E418(void) +{ + switch (gUnknown_0203A11C->unk9) + { + default: + return FALSE; + case 0: + gUnknown_0203A11C->unk2E8->pos2.x += 8; + if (gUnknown_0203A11C->unk2E8->pos2.x >= 0) + { + gUnknown_0203A11C->unk2E8->pos2.x = 0; + if (!sub_811BBB0()) + StartSpriteAnim(gUnknown_0203A11C->unk2EC, 1); + else + StartSpriteAnim(gUnknown_0203A11C->unk2EC, 2); + + gUnknown_0203A11C->unk9++; + } + break; + case 1: + if (gUnknown_0203A11C->unk2EC->animEnded) + { + gUnknown_0203A11C->unk9 = 2; + return FALSE; + } + } + + return TRUE; +} + +static void sub_811E4AC(void) +{ + gUnknown_0203A11C->unk9 = 0; + StartSpriteAnim(gUnknown_0203A11C->unk2EC, 3); +} + +static bool8 sub_811E4D0(void) +{ + switch (gUnknown_0203A11C->unk9) + { + default: + return FALSE; + case 0: + if (gUnknown_0203A11C->unk2EC->animEnded) + gUnknown_0203A11C->unk9 = 1; + break; + case 1: + gUnknown_0203A11C->unk2E8->pos2.x -= 8; + if (gUnknown_0203A11C->unk2E8->pos2.x <= -64) + { + DestroySprite(gUnknown_0203A11C->unk2EC); + DestroySprite(gUnknown_0203A11C->unk2E8); + gUnknown_0203A11C->unk2EC = NULL; + gUnknown_0203A11C->unk2E8 = NULL; + gUnknown_0203A11C->unk9++; + return FALSE; + } + } + + return TRUE; +} + +static void sub_811E55C(void) +{ + StartSpriteAnim(gUnknown_0203A11C->unk2EC, 4); +} + +static void sub_811E578(void) +{ + if (!sub_811BBB0()) + StartSpriteAnim(gUnknown_0203A11C->unk2EC, 1); + else + StartSpriteAnim(gUnknown_0203A11C->unk2EC, 2); +} + +static bool8 sub_811E5B8(void) +{ + return !gUnknown_0203A11C->unk2EC->animEnded; +} + +static void sub_811E5D4(void) +{ + u8 spriteId = CreateSprite(&gUnknown_08597E48, 96, 80, 0); + if (spriteId != MAX_SPRITES) + gUnknown_0203A11C->unk2F0 = &gSprites[spriteId]; + + spriteId = CreateSprite(&gUnknown_08597E48, 96, 156, 0); + if (spriteId != MAX_SPRITES) + { + gUnknown_0203A11C->unk2F4 = &gSprites[spriteId]; + gUnknown_0203A11C->unk2F4->vFlip = 1; + } + + sub_811E6B0(); +} + +static void sub_811E64C(void) +{ + gUnknown_0203A11C->unk2F0->invisible = !sub_811BBF8(); + gUnknown_0203A11C->unk2F4->invisible = !sub_811BC2C(); +} + +static void sub_811E6B0(void) +{ + gUnknown_0203A11C->unk2F0->invisible = 1; + gUnknown_0203A11C->unk2F4->invisible = 1; +} + +static void sub_811E6E0(int arg0) +{ + if (!arg0) + { + gUnknown_0203A11C->unk2F0->pos1.x = 96; + gUnknown_0203A11C->unk2F4->pos1.x = 96; + } + else + { + gUnknown_0203A11C->unk2F0->pos1.x = 120; + gUnknown_0203A11C->unk2F4->pos1.x = 120; + } +} + +static void sub_811E720(void) +{ + u8 spriteId = CreateSprite(&gUnknown_08597E30, 220, 84, 1); + if (spriteId != MAX_SPRITES) + gUnknown_0203A11C->unk2F8 = &gSprites[spriteId]; + + spriteId = CreateSprite(&gUnknown_08597E30, 220, 156, 1); + if (spriteId != MAX_SPRITES) + { + gUnknown_0203A11C->unk2FC = &gSprites[spriteId]; + StartSpriteAnim(gUnknown_0203A11C->unk2FC, 1); + } + + sub_811E7F8(); +} + +static void sub_811E794(void) +{ + gUnknown_0203A11C->unk2F8->invisible = !sub_811BBF8(); + gUnknown_0203A11C->unk2FC->invisible = !sub_811BC2C(); +} + +static void sub_811E7F8(void) +{ + gUnknown_0203A11C->unk2F8->invisible = 1; + gUnknown_0203A11C->unk2FC->invisible = 1; +} + +static void sub_811E828(void) +{ + int graphicsId; + u8 spriteId; + + switch (sub_811BCBC()) + { + case 0: + graphicsId = EVENT_OBJ_GFX_REPORTER_M; + break; + case 1: + graphicsId = EVENT_OBJ_GFX_REPORTER_F; + break; + case 2: + graphicsId = EVENT_OBJ_GFX_BOY_1; + break; + default: + return; + } + + if (sub_811BA68() != 4) + return; + + spriteId = AddPseudoEventObject(graphicsId, SpriteCallbackDummy, 76, 40, 0); + if (spriteId != MAX_SPRITES) + { + gSprites[spriteId].oam.priority = 0; + StartSpriteAnim(&gSprites[spriteId], 2); + } + + spriteId = AddPseudoEventObject( + gSaveBlock2Ptr->playerGender == MALE ? EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL : EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, + SpriteCallbackDummy, + 52, + 40, + 0); + + if (spriteId != MAX_SPRITES) + { + gSprites[spriteId].oam.priority = 0; + StartSpriteAnim(&gSprites[spriteId], 3); + } +} + +int sub_811E8E4(void) +{ + u8 var0 = sub_811BA68(); + switch (gUnknown_08597C30[var0].unk3) + { + case 1: + return 1; + case 2: + return 2; + case 0: + return 0; + default: + return 3; + } +} + +static int sub_811E920(int arg0) +{ + int var0 = sub_811E8E4(); + if (var0 < 3) + return gUnknown_08597E60[var0][arg0] + 4; + else + return 0; +} From 4582fd15456e2c84588026cdfbe70d6b6e558a35 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 22 Feb 2019 19:52:11 -0500 Subject: [PATCH 10/25] Name a ton of commonly used event scripts --- data/event_scripts.s | 196 +++--------------- .../scripts.inc | 2 +- .../scripts.inc | 2 +- .../scripts.inc | 2 +- .../scripts.inc | 2 +- .../scripts.inc | 2 +- .../scripts.inc | 2 +- .../scripts.inc | 8 +- data/maps/BattleFrontier_OutsideEast/map.json | 4 +- data/maps/BattleFrontier_OutsideWest/map.json | 4 +- data/maps/DewfordTown/map.json | 4 +- data/maps/DewfordTown_Gym/scripts.inc | 6 +- data/maps/DewfordTown_Hall/scripts.inc | 2 +- data/maps/EverGrandeCity/map.json | 4 +- data/maps/EverGrandeCity/scripts.inc | 2 +- .../EverGrandeCity_ChampionsRoom/scripts.inc | 2 +- data/maps/FallarborTown/map.json | 8 +- .../FallarborTown_BattleTentLobby/scripts.inc | 2 +- data/maps/FallarborTown_House1/scripts.inc | 2 +- data/maps/FortreeCity/map.json | 8 +- data/maps/FortreeCity_Gym/scripts.inc | 6 +- data/maps/FortreeCity_House2/scripts.inc | 2 +- data/maps/FortreeCity_House4/scripts.inc | 2 +- data/maps/LavaridgeTown/map.json | 8 +- data/maps/LavaridgeTown/scripts.inc | 4 +- data/maps/LavaridgeTown_Gym_1F/scripts.inc | 6 +- data/maps/LavaridgeTown_HerbShop/scripts.inc | 2 +- data/maps/LilycoveCity/map.json | 4 +- data/maps/LilycoveCity/scripts.inc | 6 +- .../LilycoveCity_ContestLobby/scripts.inc | 2 +- .../LilycoveCity_CoveLilyMotel_2F/scripts.inc | 2 +- data/maps/LilycoveCity_House2/scripts.inc | 2 +- .../scripts.inc | 2 +- data/maps/LittlerootTown/scripts.inc | 2 +- .../scripts.inc | 2 +- .../scripts.inc | 10 +- data/maps/MauvilleCity/map.json | 8 +- data/maps/MauvilleCity/scripts.inc | 2 +- data/maps/MauvilleCity_GameCorner/scripts.inc | 6 +- data/maps/MauvilleCity_Gym/scripts.inc | 6 +- data/maps/MossdeepCity/map.json | 8 +- data/maps/MossdeepCity/scripts.inc | 4 +- data/maps/MossdeepCity_Gym/scripts.inc | 6 +- .../MossdeepCity_SpaceCenter_1F/scripts.inc | 4 +- .../MossdeepCity_StevensHouse/scripts.inc | 2 +- data/maps/MtChimney/scripts.inc | 2 +- data/maps/MtPyre_1F/scripts.inc | 2 +- data/maps/OldaleTown/map.json | 8 +- data/maps/OldaleTown/scripts.inc | 4 +- data/maps/PacifidlogTown/map.json | 4 +- data/maps/PacifidlogTown_House2/scripts.inc | 4 +- data/maps/PetalburgCity/map.json | 8 +- data/maps/PetalburgCity_Gym/scripts.inc | 6 +- data/maps/PetalburgWoods/scripts.inc | 2 +- data/maps/Route103/scripts.inc | 2 +- data/maps/Route104/scripts.inc | 8 +- .../scripts.inc | 2 +- data/maps/Route109/scripts.inc | 2 +- data/maps/Route109_SeashoreHouse/scripts.inc | 2 +- data/maps/Route110/scripts.inc | 4 +- data/maps/Route110_TrickHouseEnd/scripts.inc | 4 +- .../Route110_TrickHouseEntrance/scripts.inc | 16 +- data/maps/Route111/scripts.inc | 2 +- .../Route111_OldLadysRestStop/scripts.inc | 2 +- .../scripts.inc | 2 +- data/maps/Route113_GlassWorkshop/scripts.inc | 4 +- data/maps/Route114/scripts.inc | 4 +- .../Route114_FossilManiacsHouse/scripts.inc | 2 +- data/maps/Route119/scripts.inc | 4 +- .../Route119_WeatherInstitute_1F/scripts.inc | 2 +- .../Route119_WeatherInstitute_2F/scripts.inc | 2 +- data/maps/Route120/scripts.inc | 2 +- data/maps/Route123/scripts.inc | 2 +- .../Route123_BerryMastersHouse/scripts.inc | 16 +- data/maps/Route124/scripts.inc | 2 +- data/maps/Route125/scripts.inc | 2 +- data/maps/Route126/scripts.inc | 2 +- data/maps/Route127/scripts.inc | 2 +- data/maps/Route128/scripts.inc | 2 +- data/maps/Route129/scripts.inc | 2 +- data/maps/Route130/scripts.inc | 2 +- data/maps/Route131/scripts.inc | 2 +- data/maps/RustboroCity/map.json | 8 +- data/maps/RustboroCity/scripts.inc | 2 +- .../RustboroCity_DevonCorp_2F/scripts.inc | 4 +- .../RustboroCity_DevonCorp_3F/scripts.inc | 4 +- data/maps/RustboroCity_Flat2_2F/scripts.inc | 2 +- data/maps/RustboroCity_Gym/scripts.inc | 4 +- .../RustboroCity_PokemonSchool/scripts.inc | 2 +- data/maps/SSTidalRooms/scripts.inc | 4 +- .../ShoalCave_LowTideEntranceRoom/scripts.inc | 2 +- .../ShoalCave_LowTideInnerRoom/scripts.inc | 12 +- .../ShoalCave_LowTideLowerRoom/scripts.inc | 4 +- .../ShoalCave_LowTideStairsRoom/scripts.inc | 2 +- data/maps/SkyPillar_Outside/scripts.inc | 2 +- data/maps/SlateportCity/map.json | 8 +- .../SlateportCity_BattleTentLobby/scripts.inc | 4 +- data/maps/SlateportCity_Harbor/scripts.inc | 4 +- data/maps/SlateportCity_House1/scripts.inc | 2 +- .../SlateportCity_PokemonFanClub/scripts.inc | 2 +- data/maps/SootopolisCity/map.json | 8 +- data/maps/SootopolisCity/scripts.inc | 8 +- data/maps/SootopolisCity_Gym_1F/scripts.inc | 6 +- data/maps/SootopolisCity_House1/scripts.inc | 2 +- data/maps/SootopolisCity_House6/scripts.inc | 2 +- .../scripts.inc | 2 +- data/maps/TrainerHill_Entrance/scripts.inc | 2 +- data/maps/VerdanturfTown/map.json | 8 +- .../scripts.inc | 4 +- data/scripts/cable_club.inc | 14 +- data/scripts/contest_hall.inc | 4 +- data/scripts/players_house.inc | 4 +- data/scripts/pokeblocks.inc | 2 +- data/scripts/secret_base.inc | 20 +- 114 files changed, 264 insertions(+), 406 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index 1b8807ed76..76b2866982 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -824,27 +824,12 @@ Std_10: @ 8271347 EventScript_27134E: @ 827134E return -BattleFrontier_BattleArenaLobby_EventScript_27134F:: @ 827134F -BattleFrontier_BattleDomeLobby_EventScript_27134F:: @ 827134F -BattleFrontier_BattleFactoryLobby_EventScript_27134F:: @ 827134F -BattleFrontier_BattlePalaceLobby_EventScript_27134F:: @ 827134F -BattleFrontier_BattlePikeLobby_EventScript_27134F:: @ 827134F -BattleFrontier_BattlePyramidLobby_EventScript_27134F:: @ 827134F -BattleFrontier_BattleTowerLobby_EventScript_27134F:: @ 827134F -FallarborTown_BattleTentLobby_EventScript_27134F:: @ 827134F -LilycoveCity_ContestLobby_EventScript_27134F:: @ 827134F -MossdeepCity_GameCorner_1F_EventScript_27134F:: @ 827134F -OldaleTown_PokemonCenter_2F_EventScript_27134F:: @ 827134F -SecretBase_RedCave1_EventScript_27134F:: @ 827134F -SlateportCity_BattleTentLobby_EventScript_27134F:: @ 827134F -SootopolisCity_MysteryEventsHouse_1F_EventScript_27134F:: @ 827134F -TrainerHill_Entrance_EventScript_27134F:: @ 827134F -VerdanturfTown_BattleTentLobby_EventScript_27134F:: @ 827134F +Common_EventScript_SaveGame:: @ 827134F special SaveGame waitstate return - EventScript_271354:: @ 8271354 +EventScript_271354:: @ 8271354 cmdD8 cmdD9 @@ -1542,7 +1527,7 @@ EventScript_271C9B:: @ 8271C9B EventScript_271CA1:: @ 8271CA1 msgbox gUnknown_08272A78, MSGBOX_DEFAULT - msgbox gUnknown_08272AD0, MSGBOX_DEFAULT + msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT setvar VAR_RESULT, 0 return @@ -1594,7 +1579,7 @@ EventScript_271D2A:: @ 8271D2A EventScript_271D47:: @ 8271D47 msgbox gUnknown_08272ABF, MSGBOX_DEFAULT - msgbox gUnknown_08272AD0, MSGBOX_DEFAULT + msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT setvar VAR_RESULT, 0 releaseall end @@ -1689,38 +1674,12 @@ EventScript_271E54:: @ 8271E54 goto EventScript_271DBC end -BattleFrontier_OutsideWest_EventScript_271E6A:: @ 8271E6A -FallarborTown_EventScript_271E6A:: @ 8271E6A -FortreeCity_EventScript_271E6A:: @ 8271E6A -LavaridgeTown_EventScript_271E6A:: @ 8271E6A -MauvilleCity_EventScript_271E6A:: @ 8271E6A -MossdeepCity_EventScript_271E6A:: @ 8271E6A -OldaleTown_EventScript_271E6A:: @ 8271E6A -PetalburgCity_EventScript_271E6A:: @ 8271E6A -RustboroCity_EventScript_271E6A:: @ 8271E6A -SlateportCity_EventScript_271E6A:: @ 8271E6A -SootopolisCity_EventScript_271E6A:: @ 8271E6A -VerdanturfTown_EventScript_271E6A:: @ 8271E6A - msgbox gUnknown_08272B6A, MSGBOX_SIGN +Common_EventScript_ShowPokemartSign:: @ 8271E6A + msgbox gText_PokemartSign, MSGBOX_SIGN end -BattleFrontier_OutsideEast_EventScript_271E73:: @ 8271E73 -DewfordTown_EventScript_271E73:: @ 8271E73 -EverGrandeCity_EventScript_271E73:: @ 8271E73 -FallarborTown_EventScript_271E73:: @ 8271E73 -FortreeCity_EventScript_271E73:: @ 8271E73 -LavaridgeTown_EventScript_271E73:: @ 8271E73 -LilycoveCity_EventScript_271E73:: @ 8271E73 -MauvilleCity_EventScript_271E73:: @ 8271E73 -MossdeepCity_EventScript_271E73:: @ 8271E73 -OldaleTown_EventScript_271E73:: @ 8271E73 -PacifidlogTown_EventScript_271E73:: @ 8271E73 -PetalburgCity_EventScript_271E73:: @ 8271E73 -RustboroCity_EventScript_271E73:: @ 8271E73 -SlateportCity_EventScript_271E73:: @ 8271E73 -SootopolisCity_EventScript_271E73:: @ 8271E73 -VerdanturfTown_EventScript_271E73:: @ 8271E73 - msgbox gUnknown_08272B9E, MSGBOX_SIGN +Common_EventScript_ShowPokemonCenterSign:: @ 8271E73 + msgbox gText_PokemonCenterSign, MSGBOX_SIGN end BattleFrontier_BattleTowerLobby_EventScript_271E7C:: @ 8271E7C @@ -1779,17 +1738,7 @@ EventScript_271ED5:: @ 8271ED5 EventScript_271ED6:: @ 8271ED6 end -EverGrandeCity_ChampionsRoom_EventScript_271ED7:: @ 8271ED7 -LavaridgeTown_EventScript_271ED7:: @ 8271ED7 -LilycoveCity_EventScript_271ED7:: @ 8271ED7 -LittlerootTown_EventScript_271ED7:: @ 8271ED7 -LittlerootTown_ProfessorBirchsLab_EventScript_271ED7:: @ 8271ED7 -OldaleTown_EventScript_271ED7:: @ 8271ED7 -Route103_EventScript_271ED7:: @ 8271ED7 -Route104_EventScript_271ED7:: @ 8271ED7 -Route110_EventScript_271ED7:: @ 8271ED7 -Route119_EventScript_271ED7:: @ 8271ED7 -RustboroCity_EventScript_271ED7:: @ 8271ED7 +Common_EventScript_SetupRivalGender:: @ 8271ED7 checkplayergender compare VAR_RESULT, MALE goto_if_eq RustboroCity_EventScript_271EEF @@ -1805,9 +1754,7 @@ RustboroCity_EventScript_271EF5:: @ 8271EF5 setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL return -LavaridgeTown_EventScript_271EFB:: @ 8271EFB -Route110_EventScript_271EFB:: @ 8271EFB -Route119_EventScript_271EFB:: @ 8271EFB +Common_EventScript_SetupRivalOnBikeGender:: @ 8271EFB checkplayergender compare VAR_RESULT, MALE goto_if_eq LavaridgeTown_EventScript_271F13 @@ -1939,119 +1886,34 @@ DewfordTown_Gym_EventScript_272035:: @ 8272035 settrainerflag TRAINER_DAPHNE return -DewfordTown_Gym_EventScript_272054:: @ 8272054 -DewfordTown_Hall_EventScript_272054:: @ 8272054 -FallarborTown_House1_EventScript_272054:: @ 8272054 -FortreeCity_Gym_EventScript_272054:: @ 8272054 -FortreeCity_House2_EventScript_272054:: @ 8272054 -FortreeCity_House4_EventScript_272054:: @ 8272054 -LavaridgeTown_Gym_1F_EventScript_272054:: @ 8272054 -LavaridgeTown_HerbShop_EventScript_272054:: @ 8272054 -LilycoveCity_EventScript_272054:: @ 8272054 -LilycoveCity_House2_EventScript_272054:: @ 8272054 -LittlerootTown_BrendansHouse_1F_EventScript_272054:: @ 8272054 -MauvilleCity_EventScript_272054:: @ 8272054 -MauvilleCity_Gym_EventScript_272054:: @ 8272054 -MossdeepCity_EventScript_272054:: @ 8272054 -MossdeepCity_Gym_EventScript_272054:: @ 8272054 -MossdeepCity_SpaceCenter_1F_EventScript_272054:: @ 8272054 -MtPyre_1F_EventScript_272054:: @ 8272054 -PacifidlogTown_House2_EventScript_272054:: @ 8272054 -PetalburgCity_Gym_EventScript_272054:: @ 8272054 -PetalburgWoods_EventScript_272054:: @ 8272054 -Route104_EventScript_272054:: @ 8272054 -Route104_PrettyPetalFlowerShop_EventScript_272054:: @ 8272054 -Route109_EventScript_272054:: @ 8272054 -Route111_EventScript_272054:: @ 8272054 -Route111_WinstrateFamilysHouse_EventScript_272054:: @ 8272054 -Route114_EventScript_272054:: @ 8272054 -Route114_FossilManiacsHouse_EventScript_272054:: @ 8272054 -Route120_EventScript_272054:: @ 8272054 -Route123_BerryMastersHouse_EventScript_272054:: @ 8272054 -Route123_EventScript_272054:: @ 8272054 -RustboroCity_DevonCorp_3F_EventScript_272054:: @ 8272054 -RustboroCity_Flat2_2F_EventScript_272054:: @ 8272054 -RustboroCity_Gym_EventScript_272054:: @ 8272054 -RustboroCity_PokemonSchool_EventScript_272054:: @ 8272054 -SSTidalRooms_EventScript_272054:: @ 8272054 -ShoalCave_LowTideEntranceRoom_EventScript_272054:: @ 8272054 -ShoalCave_LowTideInnerRoom_EventScript_272054:: @ 8272054 -ShoalCave_LowTideLowerRoom_EventScript_272054:: @ 8272054 -ShoalCave_LowTideStairsRoom_EventScript_272054:: @ 8272054 -SlateportCity_BattleTentLobby_EventScript_272054:: @ 8272054 -SlateportCity_Harbor_EventScript_272054:: @ 8272054 -SlateportCity_PokemonFanClub_EventScript_272054:: @ 8272054 -SootopolisCity_EventScript_272054:: @ 8272054 -SootopolisCity_Gym_1F_EventScript_272054:: @ 8272054 -SootopolisCity_House1_EventScript_272054:: @ 8272054 -VerdanturfTown_BattleTentLobby_EventScript_272054:: @ 8272054 - msgbox gUnknown_08272AD0, MSGBOX_DEFAULT +Common_EventScript_ShowBagIsFull:: @ 8272054 + msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT release end -DewfordTown_Gym_EventScript_27205E:: @ 827205E -FortreeCity_Gym_EventScript_27205E:: @ 827205E -LavaridgeTown_Gym_1F_EventScript_27205E:: @ 827205E -LilycoveCity_ContestLobby_EventScript_27205E:: @ 827205E -LinkContestRoom1_EventScript_27205E:: @ 827205E -MauvilleCity_GameCorner_EventScript_27205E:: @ 827205E -MauvilleCity_Gym_EventScript_27205E:: @ 827205E -MossdeepCity_Gym_EventScript_27205E:: @ 827205E -PetalburgCity_Gym_EventScript_27205E:: @ 827205E -Route110_TrickHouseEnd_EventScript_27205E:: @ 827205E -Route110_TrickHouseEntrance_EventScript_27205E:: @ 827205E -Route113_GlassWorkshop_EventScript_27205E:: @ 827205E -SootopolisCity_Gym_1F_EventScript_27205E:: @ 827205E - msgbox gUnknown_08272AD0, MSGBOX_DEFAULT +Common_EventScript_BagIsFull:: @ 827205E + msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT return Route114_LanettesHouse_EventScript_272067:: @ 8272067 - msgbox gUnknown_08272B1A, MSGBOX_DEFAULT + msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT release end -LilycoveCity_LilycoveMuseum_2F_EventScript_272071:: @ 8272071 -MauvilleCity_GameCorner_EventScript_272071:: @ 8272071 -Route110_TrickHouseEnd_EventScript_272071:: @ 8272071 -Route110_TrickHouseEntrance_EventScript_272071:: @ 8272071 -Route113_GlassWorkshop_EventScript_272071:: @ 8272071 - msgbox gUnknown_08272B1A, MSGBOX_DEFAULT +Common_EventScript_NoRoomLeftForAnother:: @ 8272071 + msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT return -EverGrandeCity_EventScript_27207A:: @ 827207A -LilycoveCity_EventScript_27207A:: @ 827207A -MossdeepCity_EventScript_27207A:: @ 827207A -Route124_EventScript_27207A:: @ 827207A -Route125_EventScript_27207A:: @ 827207A -Route126_EventScript_27207A:: @ 827207A -Route127_EventScript_27207A:: @ 827207A -Route128_EventScript_27207A:: @ 827207A -Route129_EventScript_27207A:: @ 827207A -Route130_EventScript_27207A:: @ 827207A -Route131_EventScript_27207A:: @ 827207A -SkyPillar_Outside_EventScript_27207A:: @ 827207A -SootopolisCity_EventScript_27207A:: @ 827207A - setweather 15 +Common_EventScript_SetWeather15:: @ 827207A + setweather WEATHER_15 return -DewfordTown_Gym_EventScript_27207E:: @ 827207E -FortreeCity_Gym_EventScript_27207E:: @ 827207E -LavaridgeTown_Gym_1F_EventScript_27207E:: @ 827207E -LilycoveCity_CoveLilyMotel_2F_EventScript_27207E:: @ 827207E -MauvilleCity_Gym_EventScript_27207E:: @ 827207E -MossdeepCity_Gym_EventScript_27207E:: @ 827207E -PetalburgCity_Gym_EventScript_27207E:: @ 827207E -RustboroCity_Gym_EventScript_27207E:: @ 827207E -SootopolisCity_Gym_1F_EventScript_27207E:: @ 827207E +Common_EventScript_PlayGymBadgeFanfare:: @ 827207E playfanfare MUS_ME_BACHI waitfanfare return -LittlerootTown_BrendansHouse_1F_EventScript_272083:: @ 8272083 -Route111_OldLadysRestStop_EventScript_272083:: @ 8272083 -Route119_WeatherInstitute_1F_EventScript_272083:: @ 8272083 -RustboroCity_DevonCorp_3F_EventScript_272083:: @ 8272083 -SSTidalRooms_EventScript_272083:: @ 8272083 +Common_EventScript_OutOfCenterPartyHeal:: @ 8272083 fadescreen 1 playfanfare MUS_ME_ASA waitfanfare @@ -2061,7 +1923,7 @@ SSTidalRooms_EventScript_272083:: @ 8272083 EventScript_RegionMap:: @ 827208F lockall - msgbox LittlerootTown_BrendansHouse_2F_Text_1F8820, MSGBOX_DEFAULT + msgbox Common_Text_LookCloserAtMap, MSGBOX_DEFAULT fadescreen 1 special FieldShowRegionMap waitstate @@ -2413,11 +2275,7 @@ Route120_Movement_2723C7: @ 82723C7 set_visible step_end -LittlerootTown_ProfessorBirchsLab_EventScript_2723DD:: @ 82723DD -MossdeepCity_StevensHouse_EventScript_2723DD:: @ 82723DD -Route119_WeatherInstitute_2F_EventScript_2723DD:: @ 82723DD -RustboroCity_DevonCorp_2F_EventScript_2723DD:: @ 82723DD -SlateportCity_House1_EventScript_2723DD:: @ 82723DD +Common_EventScript_NameReceivedPokemon:: @ 82723DD fadescreen 1 special ChangePokemonNickname waitstate @@ -3033,7 +2891,7 @@ gUnknown_08272A9A:: @ 8272A9A gUnknown_08272ABF:: @ 8272ABF .string "{PLAYER} found one {STR_VAR_2}!$" -gUnknown_08272AD0:: @ 8272AD0 +gText_TooBadBagIsFull:: @ 8272AD0 .string "Too bad!\nThe BAG is full…$" gUnknown_08272AEA:: @ 8272AEA @@ -3042,16 +2900,16 @@ gUnknown_08272AEA:: @ 8272AEA gUnknown_08272B09:: @ 8272B09 .string "Obtained the {STR_VAR_2}!$" -gUnknown_08272B1A:: @ 8272B1A +gText_NoRoomLeftForAnother:: @ 8272B1A .string "Too bad! There's no room left for\nanother {STR_VAR_2}…$" gUnknown_08272B48:: @ 8272B48 .string "The {STR_VAR_2} was transferred\nto the PC.$" -gUnknown_08272B6A:: @ 8272B6A +gText_PokemartSign:: @ 8272B6A .string "“Selected items for your convenience!â€\nPOKéMON MART$" -gUnknown_08272B9E:: @ 8272B9E +gText_PokemonCenterSign:: @ 8272B9E .string "“Rejuvenate your tired partners!â€\nPOKéMON CENTER$" gUnknown_08272BCF:: @ 8272BCF diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index 2c53b7ed65..9d588b6663 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -199,7 +199,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8 special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattleArenaLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255FE1 diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index 35c32c3fa4..8b01eba0ab 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -248,7 +248,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60 special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattleDomeLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc index 39d7298469..956cede17f 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc @@ -208,7 +208,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9 special CallFrontierUtilFunc closemessage delay 2 - call BattleFrontier_BattleFactoryLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_258783 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index 56edda8ada..5d7f7aaf5f 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -223,7 +223,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87 special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattlePalaceLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB7A diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index 70d7f3c6cd..ab53d4c23b 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -195,7 +195,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattlePikeLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 setvar VAR_0x8004, 26 special CallBattlePikeFunction diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index 686a1bfb29..bafe61ae66 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -200,7 +200,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattlePyramidLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250AAA diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index e1bec2c213..29be452300 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -300,7 +300,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattleTowerLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 @@ -380,7 +380,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattleTowerLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 @@ -461,7 +461,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattleTowerLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 @@ -544,7 +544,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68 setvar VAR_0x8004, 6 setvar VAR_0x8005, 0 special sub_8161F74 - call BattleFrontier_BattleTowerLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 diff --git a/data/maps/BattleFrontier_OutsideEast/map.json b/data/maps/BattleFrontier_OutsideEast/map.json index e119f89a0f..341b203218 100644 --- a/data/maps/BattleFrontier_OutsideEast/map.json +++ b/data/maps/BattleFrontier_OutsideEast/map.json @@ -515,7 +515,7 @@ "y": 51, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "BattleFrontier_OutsideEast_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -523,7 +523,7 @@ "y": 51, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "BattleFrontier_OutsideEast_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" } ] } \ No newline at end of file diff --git a/data/maps/BattleFrontier_OutsideWest/map.json b/data/maps/BattleFrontier_OutsideWest/map.json index 6f97192ed0..a2972e0b40 100644 --- a/data/maps/BattleFrontier_OutsideWest/map.json +++ b/data/maps/BattleFrontier_OutsideWest/map.json @@ -444,7 +444,7 @@ "y": 51, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "BattleFrontier_OutsideWest_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -452,7 +452,7 @@ "y": 51, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "BattleFrontier_OutsideWest_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" } ] } \ No newline at end of file diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json index 8cd8635887..32fe0c313b 100644 --- a/data/maps/DewfordTown/map.json +++ b/data/maps/DewfordTown/map.json @@ -152,7 +152,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "DewfordTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -160,7 +160,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "DewfordTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 90fd3d4ae4..bafdc6c231 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -169,7 +169,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 call DewfordTown_Gym_EventScript_1FC75D message DewfordTown_Gym_Text_1FD07D waitmessage - call DewfordTown_Gym_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox DewfordTown_Gym_Text_1FD0A8, MSGBOX_DEFAULT setflag FLAG_DEFEATED_DEWFORD_GYM setflag FLAG_BADGE02_GET @@ -195,7 +195,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 DewfordTown_Gym_EventScript_1FC855:: @ 81FC855 giveitem_std ITEM_TM08 compare VAR_RESULT, 0 - goto_if_eq DewfordTown_Gym_EventScript_27205E + goto_if_eq Common_EventScript_BagIsFull msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM08 return @@ -203,7 +203,7 @@ DewfordTown_Gym_EventScript_1FC855:: @ 81FC855 DewfordTown_Gym_EventScript_1FC878:: @ 81FC878 giveitem_std ITEM_TM08 compare VAR_RESULT, 0 - goto_if_eq DewfordTown_Gym_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM08 release diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index 0d9cf514cd..a89b7f0247 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -256,7 +256,7 @@ DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA msgbox DewfordTown_Hall_Text_1FE142, MSGBOX_DEFAULT giveitem_std ITEM_TM36 compare VAR_RESULT, 0 - goto_if_eq DewfordTown_Hall_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM36 release end diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json index 502aae2fc6..90175db1d1 100644 --- a/data/maps/EverGrandeCity/map.json +++ b/data/maps/EverGrandeCity/map.json @@ -166,7 +166,7 @@ "y": 48, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "EverGrandeCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -190,7 +190,7 @@ "y": 48, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "EverGrandeCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" } ] } \ No newline at end of file diff --git a/data/maps/EverGrandeCity/scripts.inc b/data/maps/EverGrandeCity/scripts.inc index 75327b839b..99d5ab8112 100644 --- a/data/maps/EverGrandeCity/scripts.inc +++ b/data/maps/EverGrandeCity/scripts.inc @@ -3,7 +3,7 @@ EverGrandeCity_MapScripts:: @ 81E7D1B .byte 0 EverGrandeCity_MapScript1_1E7D21: @ 81E7D21 - call_if_set FLAG_SYS_WEATHER_CTRL, EverGrandeCity_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end EverGrandeCity_EventScript_1E7D2B:: @ 81E7D2B diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 149c54cd8b..f1db8df846 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -5,7 +5,7 @@ EverGrandeCity_ChampionsRoom_MapScripts:: @ 82289EF .byte 0 EverGrandeCity_ChampionsRoom_MapScript1_2289FF: @ 82289FF - call EverGrandeCity_ChampionsRoom_EventScript_271ED7 + call Common_EventScript_SetupRivalGender end EverGrandeCity_ChampionsRoom_MapScript2_228A05: @ 8228A05 diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json index 4afffa73c2..8633191843 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -123,7 +123,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FallarborTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -131,7 +131,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FallarborTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -147,7 +147,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FallarborTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -163,7 +163,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FallarborTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index 5d05570cc4..1128540e9c 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -191,7 +191,7 @@ FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2 special LoadPlayerParty closemessage delay 2 - call FallarborTown_BattleTentLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq FallarborTown_BattleTentLobby_EventScript_2001AB diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc index caf915e858..2255f90d3e 100644 --- a/data/maps/FallarborTown_House1/scripts.inc +++ b/data/maps/FallarborTown_House1/scripts.inc @@ -20,7 +20,7 @@ FallarborTown_House1_EventScript_200F38:: @ 8200F38 msgbox FallarborTown_House1_Text_201159, MSGBOX_DEFAULT giveitem_std ITEM_TM27 compare VAR_RESULT, 0 - goto_if_eq FallarborTown_House1_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setvar VAR_0x8004, 280 call FallarborTown_House1_EventScript_2723E4 setflag FLAG_RECEIVED_TM27 diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json index d66ec1f4b3..454fc34d39 100644 --- a/data/maps/FortreeCity/map.json +++ b/data/maps/FortreeCity/map.json @@ -198,7 +198,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FortreeCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -206,7 +206,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FortreeCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -222,7 +222,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FortreeCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -230,7 +230,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FortreeCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" } ] } \ No newline at end of file diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index 17633c0d57..59cbfefa6b 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -28,7 +28,7 @@ FortreeCity_Gym_EventScript_2165C8:: @ 82165C8 FortreeCity_Gym_EventScript_2165FD:: @ 82165FD message FortreeCity_Gym_Text_216EEC waitmessage - call FortreeCity_Gym_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox FortreeCity_Gym_Text_216F17, MSGBOX_DEFAULT setflag FLAG_DEFEATED_FORTREE_GYM setflag FLAG_BADGE06_GET @@ -51,7 +51,7 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD FortreeCity_Gym_EventScript_216646:: @ 8216646 giveitem_std ITEM_TM40 compare VAR_RESULT, 0 - goto_if_eq FortreeCity_Gym_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM40 release @@ -60,7 +60,7 @@ FortreeCity_Gym_EventScript_216646:: @ 8216646 FortreeCity_Gym_EventScript_21666A:: @ 821666A giveitem_std ITEM_TM40 compare VAR_RESULT, 0 - goto_if_eq FortreeCity_Gym_EventScript_27205E + goto_if_eq Common_EventScript_BagIsFull msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM40 return diff --git a/data/maps/FortreeCity_House2/scripts.inc b/data/maps/FortreeCity_House2/scripts.inc index cebd18884c..34344bca36 100644 --- a/data/maps/FortreeCity_House2/scripts.inc +++ b/data/maps/FortreeCity_House2/scripts.inc @@ -21,7 +21,7 @@ FortreeCity_House2_EventScript_2177CB:: @ 82177CB msgbox FortreeCity_House2_Text_217A28, MSGBOX_DEFAULT giveitem_std ITEM_TM10 compare VAR_RESULT, 0 - goto_if_eq FortreeCity_House2_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM10 msgbox FortreeCity_House2_Text_217A91, MSGBOX_DEFAULT release diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc index fe4aefe5fc..43db341d99 100644 --- a/data/maps/FortreeCity_House4/scripts.inc +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -33,7 +33,7 @@ FortreeCity_House4_EventScript_217CD8:: @ 8217CD8 msgbox FortreeCity_House4_Text_217E05, MSGBOX_DEFAULT giveitem_std ITEM_MENTAL_HERB compare VAR_RESULT, 0 - goto_if_eq FortreeCity_House4_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_MENTAL_HERB releaseall end diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json index 9bec14bd1a..65a6a25d38 100644 --- a/data/maps/LavaridgeTown/map.json +++ b/data/maps/LavaridgeTown/map.json @@ -216,7 +216,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LavaridgeTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -232,7 +232,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LavaridgeTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -240,7 +240,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LavaridgeTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -248,7 +248,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LavaridgeTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "hidden_item", diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index 899df4d2cd..9109008b27 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -7,8 +7,8 @@ LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE setflag FLAG_VISITED_LAVARIDGE_TOWN call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, LavaridgeTown_EventScript_1EA514 call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_1EA53F - call LavaridgeTown_EventScript_271ED7 - call LavaridgeTown_EventScript_271EFB + call Common_EventScript_SetupRivalGender + call Common_EventScript_SetupRivalOnBikeGender compare VAR_0x4053, 1 call_if_eq LavaridgeTown_EventScript_1EA518 compare VAR_0x4053, 1 diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index bf48225eca..89dc30f474 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -71,7 +71,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE78C:: @ 81FE78C LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 message LavaridgeTown_Gym_1F_Text_1FF32F waitmessage - call LavaridgeTown_Gym_1F_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox LavaridgeTown_Gym_1F_Text_1FF359, MSGBOX_DEFAULT setflag FLAG_FLANNERY_GIVES_BADGE_INFO setflag FLAG_DEFEATED_LAVARIDGE_GYM @@ -98,7 +98,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D giveitem_std ITEM_TM50 compare VAR_RESULT, 0 - goto_if_eq LavaridgeTown_Gym_1F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM50 release @@ -107,7 +107,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D LavaridgeTown_Gym_1F_EventScript_1FE841:: @ 81FE841 giveitem_std ITEM_TM50 compare VAR_RESULT, 0 - goto_if_eq LavaridgeTown_Gym_1F_EventScript_27205E + goto_if_eq Common_EventScript_BagIsFull msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM50 return diff --git a/data/maps/LavaridgeTown_HerbShop/scripts.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc index e579963185..f6ad8e26bc 100644 --- a/data/maps/LavaridgeTown_HerbShop/scripts.inc +++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc @@ -32,7 +32,7 @@ LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505 msgbox LavaridgeTown_HerbShop_Text_1FE584, MSGBOX_DEFAULT giveitem_std ITEM_CHARCOAL compare VAR_RESULT, 0 - goto_if_eq LavaridgeTown_HerbShop_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLFLAG_RECEIVED_CHARCOAL release end diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json index 63c5925fdd..ea771c3b58 100644 --- a/data/maps/LilycoveCity/map.json +++ b/data/maps/LilycoveCity/map.json @@ -428,7 +428,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LilycoveCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -444,7 +444,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LilycoveCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index cfa6b38675..5a4ef5d431 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -7,8 +7,8 @@ LilycoveCity_MapScript1_1E2B47: @ 81E2B47 setflag FLAG_VISITED_LILYCOVE_CITY setvar VAR_0x4086, 0 setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER - call_if_set FLAG_SYS_WEATHER_CTRL, LilycoveCity_EventScript_27207A - call LilycoveCity_EventScript_271ED7 + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 + call Common_EventScript_SetupRivalGender end LilycoveCity_MapScript1_1E2B61: @ 81E2B61 @@ -40,7 +40,7 @@ LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_LILYCOVE_RECEIVED_BERRY msgbox LilycoveCity_Text_2A72E3, MSGBOX_DEFAULT release diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 42ce7beeb0..f57aae096e 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -642,7 +642,7 @@ LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856 msgbox LilycoveCity_ContestLobby_Text_27BD17, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F - call LilycoveCity_ContestLobby_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F message LilycoveCity_ContestLobby_Text_27C8FD diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc index 03ac733f98..4a761a7061 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc @@ -26,7 +26,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_218702:: @ 8218702 LilycoveCity_CoveLilyMotel_2F_EventScript_21870F:: @ 821870F message LilycoveCity_CoveLilyMotel_2F_Text_21881C waitmessage - call LilycoveCity_CoveLilyMotel_2F_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare special Special_ShowDiploma waitstate release diff --git a/data/maps/LilycoveCity_House2/scripts.inc b/data/maps/LilycoveCity_House2/scripts.inc index 92adafe5a4..0a0792bfda 100644 --- a/data/maps/LilycoveCity_House2/scripts.inc +++ b/data/maps/LilycoveCity_House2/scripts.inc @@ -8,7 +8,7 @@ LilycoveCity_House2_EventScript_21ED75:: @ 821ED75 msgbox LilycoveCity_House2_Text_21EDB6, MSGBOX_DEFAULT giveitem_std ITEM_TM44 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_House2_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM44 msgbox LilycoveCity_House2_Text_21EDF9, MSGBOX_DEFAULT release diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index f73fbf092e..204b2cee3b 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -127,7 +127,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA end LilycoveCity_LilycoveMuseum_2F_EventScript_219911:: @ 8219911 - call LilycoveCity_LilycoveMuseum_2F_EventScript_272071 + call Common_EventScript_NoRoomLeftForAnother msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EED, MSGBOX_DEFAULT closemessage releaseall diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 5d9161cb42..c7bb25ba77 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -6,7 +6,7 @@ LittlerootTown_MapScripts:: @ 81E7DCB LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB setflag FLAG_VISITED_LITTLEROOT_TOWN - call LittlerootTown_EventScript_271ED7 + call Common_EventScript_SetupRivalGender compare VAR_0x4092, 2 call_if_eq LittlerootTown_EventScript_1E7E67 call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E7E6F diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index ea00693a83..ca57959de6 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -307,7 +307,7 @@ LittlerootTown_BrendansHouse_2F_Text_1F877F: @ 81F877F .string "Record your progress with SAVE.\p" .string "The remaining pages are blank…$" -LittlerootTown_BrendansHouse_2F_Text_1F8820: @ 81F8820 +Common_Text_LookCloserAtMap: @ 81F8820 .string "{PLAYER} took a closer look at the\n" .string "HOENN region map.$" diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 5c762743ca..5565d2934c 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -5,7 +5,7 @@ LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91 .byte 0 LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1 - call LittlerootTown_ProfessorBirchsLab_EventScript_271ED7 + call Common_EventScript_SetupRivalGender call LittlerootTown_ProfessorBirchsLab_EventScript_2720AD compare VAR_0x40D3, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7 @@ -107,7 +107,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB:: @ 81F9DDB LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07:: @ 81F9E07 setvar VAR_0x8004, 0 - call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17 end @@ -351,7 +351,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1 compare VAR_RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD call LittlerootTown_ProfessorBirchsLab_EventScript_27378B - call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD end @@ -396,7 +396,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142 compare VAR_RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E call LittlerootTown_ProfessorBirchsLab_EventScript_27378B - call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E end @@ -441,7 +441,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3 compare VAR_RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F call LittlerootTown_ProfessorBirchsLab_EventScript_27378B - call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F end diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json index f3bde6eb96..e44bc78dd0 100644 --- a/data/maps/MauvilleCity/map.json +++ b/data/maps/MauvilleCity/map.json @@ -238,7 +238,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MauvilleCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -254,7 +254,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MauvilleCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -262,7 +262,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MauvilleCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -270,7 +270,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MauvilleCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 21f654888c..454adb60d1 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -440,7 +440,7 @@ MauvilleCity_EventScript_1DF784:: @ 81DF784 msgbox MauvilleCity_Text_1E020E, MSGBOX_DEFAULT giveitem_std ITEM_TM24 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_GOT_TM24_FROM_WATTSON msgbox MauvilleCity_Text_1E02AA, MSGBOX_DEFAULT release diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index 34125b421d..3b1a5fe084 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -215,7 +215,7 @@ MauvilleCity_GameCorner_EventScript_20FE79:: @ 820FE79 end MauvilleCity_GameCorner_EventScript_20FE87:: @ 820FE87 - call MauvilleCity_GameCorner_EventScript_272071 + call Common_EventScript_NoRoomLeftForAnother goto MauvilleCity_GameCorner_EventScript_20FD20 end @@ -383,7 +383,7 @@ MauvilleCity_GameCorner_EventScript_2100FF:: @ 82100FF end MauvilleCity_GameCorner_EventScript_21010D:: @ 821010D - call MauvilleCity_GameCorner_EventScript_27205E + call Common_EventScript_BagIsFull goto MauvilleCity_GameCorner_EventScript_20FECE end @@ -448,7 +448,7 @@ MauvilleCity_GameCorner_EventScript_2101D0:: @ 82101D0 end MauvilleCity_GameCorner_EventScript_2101FA:: @ 82101FA - call MauvilleCity_GameCorner_EventScript_272071 + call Common_EventScript_NoRoomLeftForAnother msgbox MauvilleCity_GameCorner_Text_2107A9, MSGBOX_DEFAULT release end diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index 76bceae56d..4d555fe79b 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -88,7 +88,7 @@ MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B message MauvilleCity_Gym_Text_20E77F waitmessage - call MauvilleCity_Gym_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox MauvilleCity_Gym_Text_20E7AA, MSGBOX_DEFAULT setvar VAR_0x40D2, 3 clearflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT @@ -117,7 +117,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D giveitem_std ITEM_TM34 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_Gym_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM34 release @@ -126,7 +126,7 @@ MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D MauvilleCity_Gym_EventScript_20DFB1:: @ 820DFB1 giveitem_std ITEM_TM34 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_Gym_EventScript_27205E + goto_if_eq Common_EventScript_BagIsFull msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM34 return diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json index 767a99584c..952ff253ca 100644 --- a/data/maps/MossdeepCity/map.json +++ b/data/maps/MossdeepCity/map.json @@ -439,7 +439,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MossdeepCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -447,7 +447,7 @@ "y": 18, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MossdeepCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -463,7 +463,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MossdeepCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -471,7 +471,7 @@ "y": 18, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MossdeepCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index b504d70048..3e4da5776c 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -7,7 +7,7 @@ MossdeepCity_MapScript1_1E4A9C: @ 81E4A9C clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 - call_if_set FLAG_SYS_WEATHER_CTRL, MossdeepCity_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2 @@ -231,7 +231,7 @@ MossdeepCity_EventScript_1E4C26:: @ 81E4C26 msgbox MossdeepCity_Text_1E4D5B, MSGBOX_DEFAULT giveitem_std ITEM_KINGS_ROCK compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_KINGS_ROCK release end diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index fc1a73b4dc..6e5b461cd6 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -57,7 +57,7 @@ MossdeepCity_Gym_EventScript_220898:: @ 8220898 MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 message MossdeepCity_Gym_Text_22196A waitmessage - call MossdeepCity_Gym_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox MossdeepCity_Gym_Text_221999, MSGBOX_DEFAULT setflag FLAG_DEFEATED_MOSSDEEP_GYM setflag FLAG_BADGE07_GET @@ -89,7 +89,7 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 MossdeepCity_Gym_EventScript_220937:: @ 8220937 giveitem_std ITEM_TM04 compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_Gym_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM04 release @@ -98,7 +98,7 @@ MossdeepCity_Gym_EventScript_220937:: @ 8220937 MossdeepCity_Gym_EventScript_22095B:: @ 822095B giveitem_std ITEM_TM04 compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_Gym_EventScript_27205E + goto_if_eq Common_EventScript_BagIsFull msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM04 return diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 6d9022065e..b20524262f 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -120,7 +120,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22308E:: @ 822308E msgbox MossdeepCity_SpaceCenter_1F_Text_223540, MSGBOX_DEFAULT giveitem_std ITEM_SUN_STONE compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, MSGBOX_DEFAULT release @@ -136,7 +136,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_2230DA:: @ 82230DA msgbox MossdeepCity_SpaceCenter_1F_Text_2235F0, MSGBOX_DEFAULT giveitem_std ITEM_SUN_STONE compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 51f1ac16e1..16da558c8d 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -99,7 +99,7 @@ MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895 compare VAR_RESULT, 0 goto_if_eq MossdeepCity_StevensHouse_EventScript_222901 call MossdeepCity_StevensHouse_EventScript_27378B - call MossdeepCity_StevensHouse_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto MossdeepCity_StevensHouse_EventScript_222901 end diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 3bfc33f6ab..aa1d947be1 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -121,7 +121,7 @@ MtChimney_EventScript_22EEF3:: @ 822EEF3 end MtChimney_EventScript_22EF51:: @ 822EF51 - msgbox gUnknown_08272AD0, MSGBOX_DEFAULT + msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT hidemoneybox nop nop diff --git a/data/maps/MtPyre_1F/scripts.inc b/data/maps/MtPyre_1F/scripts.inc index 676df4aee6..a06f34a298 100644 --- a/data/maps/MtPyre_1F/scripts.inc +++ b/data/maps/MtPyre_1F/scripts.inc @@ -8,7 +8,7 @@ MtPyre_1F_EventScript_230F3F:: @ 8230F3F msgbox MtPyre_1F_Text_230F8A, MSGBOX_DEFAULT giveitem_std ITEM_CLEANSE_TAG compare VAR_RESULT, 0 - goto_if_eq MtPyre_1F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_CLEANSE_TAG release end diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index 164cd3eae0..6826155ed3 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -166,7 +166,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "OldaleTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -174,7 +174,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "OldaleTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -182,7 +182,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "OldaleTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -190,7 +190,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "OldaleTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" } ] } \ No newline at end of file diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index 7431cbf2aa..73b3e4d959 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -3,7 +3,7 @@ OldaleTown_MapScripts:: @ 81E8EA2 .byte 0 OldaleTown_MapScript1_1E8EA8: @ 81E8EA8 - call OldaleTown_EventScript_271ED7 + call Common_EventScript_SetupRivalGender setflag FLAG_VISITED_OLDALE_TOWN call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E8ED2 call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_1E8EDE @@ -85,7 +85,7 @@ OldaleTown_EventScript_1E8FB9:: @ 81E8FB9 end OldaleTown_EventScript_1E8FC3:: @ 81E8FC3 - msgbox gUnknown_08272AD0, MSGBOX_DEFAULT + msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT fadedefaultbgm release end diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json index 971bf5b860..3070d9c07a 100644 --- a/data/maps/PacifidlogTown/map.json +++ b/data/maps/PacifidlogTown/map.json @@ -117,7 +117,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PacifidlogTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -133,7 +133,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PacifidlogTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" } ] } \ No newline at end of file diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc index c7c04c0bd8..57169cc170 100644 --- a/data/maps/PacifidlogTown_House2/scripts.inc +++ b/data/maps/PacifidlogTown_House2/scripts.inc @@ -43,7 +43,7 @@ PacifidlogTown_House2_EventScript_203816:: @ 8203816 msgbox PacifidlogTown_House2_Text_20396D, MSGBOX_DEFAULT giveitem_std ITEM_TM27 compare VAR_RESULT, 0 - goto_if_eq PacifidlogTown_House2_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK special SetPacifidlogTMReceivedDay msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT @@ -59,7 +59,7 @@ PacifidlogTown_House2_EventScript_20384F:: @ 820384F msgbox PacifidlogTown_House2_Text_203A2F, MSGBOX_DEFAULT giveitem_std ITEM_TM21 compare VAR_RESULT, 0 - goto_if_eq PacifidlogTown_House2_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK special SetPacifidlogTMReceivedDay msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index d8f77168b2..0b01b5ddb9 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -276,7 +276,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PetalburgCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -284,7 +284,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PetalburgCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -300,7 +300,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PetalburgCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -308,7 +308,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PetalburgCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 915cdc93e1..b4733ab090 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -403,7 +403,7 @@ PetalburgCity_Gym_EventScript_204E17:: @ 8204E17 PetalburgCity_Gym_EventScript_204E1D:: @ 8204E1D giveitem_std ITEM_ENIGMA_BERRY compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setvar VAR_ENIGMA_BERRY_AVAILABLE, 0 release end @@ -413,7 +413,7 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B trainerbattle_no_intro TRAINER_NORMAN_1, PetalburgCity_Gym_Text_206107 message PetalburgCity_Gym_Text_206162 waitmessage - call PetalburgCity_Gym_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox PetalburgCity_Gym_Text_20618A, MSGBOX_DEFAULT setflag FLAG_DEFEATED_PETALBURG_GYM setvar VAR_0x4085, 7 @@ -444,7 +444,7 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B PetalburgCity_Gym_EventScript_204ED2:: @ 8204ED2 giveitem_std ITEM_TM42 compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_27205E + goto_if_eq Common_EventScript_BagIsFull setflag FLAG_RECEIVED_TM42 msgbox PetalburgCity_Gym_Text_206254, MSGBOX_DEFAULT return diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index eec9100f1a..e296b8447f 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -253,7 +253,7 @@ PetalburgWoods_EventScript_22E222:: @ 822E222 msgbox PetalburgWoods_Text_22EAFE, MSGBOX_DEFAULT giveitem_std ITEM_MIRACLE_SEED compare VAR_RESULT, 0 - goto_if_eq PetalburgWoods_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_MIRACLE_SEED release end diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index e13bad76df..1cb912bd0d 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -4,7 +4,7 @@ Route103_MapScripts:: @ 81EC38E .byte 0 Route103_MapScript1_1EC399: @ 81EC399 - call Route103_EventScript_271ED7 + call Common_EventScript_SetupRivalGender call Route103_EventScript_2720AD end diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index e904f69b74..d50a8a9a39 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -13,7 +13,7 @@ Route104_EventScript_1ECC47:: @ 81ECC47 end Route104_MapScript1_1ECC4E: @ 81ECC4E - call Route104_EventScript_271ED7 + call Common_EventScript_SetupRivalGender call Route104_EventScript_1ECC78 call Route104_EventScript_1ECC5E end @@ -270,7 +270,7 @@ Route104_EventScript_1ECF8C:: @ 81ECF8C msgbox Route104_Text_2A6D86, MSGBOX_DEFAULT giveitem_std ITEM_CHESTO_BERRY compare VAR_RESULT, 0 - goto_if_eq Route104_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104 msgbox Route104_Text_2A6E32, MSGBOX_DEFAULT release @@ -288,7 +288,7 @@ Route104_EventScript_1ECFCD:: @ 81ECFCD msgbox Route104_Text_1ED96A, MSGBOX_DEFAULT giveitem_std ITEM_WHITE_HERB compare VAR_RESULT, 0 - goto_if_eq Route104_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_WHITE_HERB release end @@ -341,7 +341,7 @@ Route104_EventScript_1ED057:: @ 81ED057 msgbox Route104_Text_1ED838, MSGBOX_DEFAULT giveitem_std ITEM_TM09 compare VAR_RESULT, 0 - goto_if_eq Route104_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM09 release end diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc index 7f5e352876..a1f0706510 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -91,7 +91,7 @@ Route104_PrettyPetalFlowerShop_EventScript_22A442:: @ 822A442 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_FLOWER_SHOP_RECEIVED_BERRY msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, MSGBOX_DEFAULT release diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index ebf9398d13..490f1d2552 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -332,7 +332,7 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 msgbox Route109_Text_1EEFDE, MSGBOX_DEFAULT giveitem_std ITEM_SOFT_SAND compare VAR_RESULT, 0 - goto_if_eq Route109_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull closemessage applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 waitmovement 0 diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index 951356409d..89e31d639b 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -75,7 +75,7 @@ Route109_SeashoreHouse_EventScript_2694C8:: @ 82694C8 end Route109_SeashoreHouse_EventScript_2694D5:: @ 82694D5 - msgbox gUnknown_08272AD0, MSGBOX_DEFAULT + msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT hidemoneybox nop nop diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 7c98cc6035..958f3a36a0 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -9,8 +9,8 @@ Route110_MapScript1_1EF279: @ 81EF279 end Route110_MapScript1_1EF27D: @ 81EF27D - call Route110_EventScript_271ED7 - call Route110_EventScript_271EFB + call Common_EventScript_SetupRivalGender + call Common_EventScript_SetupRivalOnBikeGender compare VAR_CYCLING_CHALLENGE_STATE, 1 call_if_eq Route110_EventScript_1EF293 end diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 8326a7c02e..de6aa2119d 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -200,13 +200,13 @@ Route110_TrickHouseEnd_EventScript_26AFCF:: @ 826AFCF return Route110_TrickHouseEnd_EventScript_26AFEF:: @ 826AFEF - call Route110_TrickHouseEnd_EventScript_27205E + call Common_EventScript_BagIsFull msgbox Route110_TrickHouseEnd_Text_26B760, MSGBOX_DEFAULT setvar VAR_0x40C1, 1 return Route110_TrickHouseEnd_EventScript_26B002:: @ 826B002 - call Route110_TrickHouseEnd_EventScript_272071 + call Common_EventScript_NoRoomLeftForAnother msgbox Route110_TrickHouseEnd_Text_26B615, MSGBOX_DEFAULT setvar VAR_0x40C1, 1 return diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index b2aa22f6c1..ac27d3af62 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -364,7 +364,7 @@ Route110_TrickHouseEntrance_EventScript_269EEF:: @ 8269EEF compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -374,7 +374,7 @@ Route110_TrickHouseEntrance_EventScript_269F1B:: @ 8269F1B compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -384,7 +384,7 @@ Route110_TrickHouseEntrance_EventScript_269F47:: @ 8269F47 compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -394,7 +394,7 @@ Route110_TrickHouseEntrance_EventScript_269F73:: @ 8269F73 compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -404,7 +404,7 @@ Route110_TrickHouseEntrance_EventScript_269F9F:: @ 8269F9F compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -414,7 +414,7 @@ Route110_TrickHouseEntrance_EventScript_269FCB:: @ 8269FCB compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -424,7 +424,7 @@ Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7 compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -445,7 +445,7 @@ Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039 compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A09A compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_272071 + call_if_eq Common_EventScript_NoRoomLeftForAnother msgbox Route110_TrickHouseEntrance_Text_26ABBD, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 74ee42c646..d9d5ea7ea9 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -164,7 +164,7 @@ Route111_EventScript_1F0EB9:: @ 81F0EB9 msgbox Route111_Text_2A6EBD, MSGBOX_DEFAULT giveitem_std ITEM_RAZZ_BERRY compare VAR_RESULT, 0 - goto_if_eq Route111_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_ROUTE_111_RECEIVED_BERRY special GetPlayerBigGuyGirlString msgbox Route111_Text_2A6F3D, MSGBOX_DEFAULT diff --git a/data/maps/Route111_OldLadysRestStop/scripts.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc index 5a89f40ed5..23dca6f0b3 100644 --- a/data/maps/Route111_OldLadysRestStop/scripts.inc +++ b/data/maps/Route111_OldLadysRestStop/scripts.inc @@ -19,7 +19,7 @@ Route111_OldLadysRestStop_EventScript_22A920:: @ 822A920 Route111_OldLadysRestStop_EventScript_22A941:: @ 822A941 msgbox Route111_OldLadysRestStop_Text_22A9EC, MSGBOX_DEFAULT closemessage - call Route111_OldLadysRestStop_EventScript_272083 + call Common_EventScript_OutOfCenterPartyHeal msgbox Route111_OldLadysRestStop_Text_22AA16, MSGBOX_YESNO compare VAR_RESULT, 1 goto_if_eq Route111_OldLadysRestStop_EventScript_22A941 diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc index b54fe564e2..2890011b40 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc @@ -17,7 +17,7 @@ Route111_WinstrateFamilysHouse_EventScript_22A4A2:: @ 822A4A2 msgbox Route111_WinstrateFamilysHouse_Text_22A5F4, MSGBOX_DEFAULT giveitem_std ITEM_MACHO_BRACE compare VAR_RESULT, 0 - goto_if_eq Route111_WinstrateFamilysHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_MACHO_BRACE goto Route111_WinstrateFamilysHouse_EventScript_22A52C end diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc index 959c277995..b5b082d4d1 100644 --- a/data/maps/Route113_GlassWorkshop/scripts.inc +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -223,13 +223,13 @@ Route113_GlassWorkshop_EventScript_26F05F:: @ 826F05F return Route113_GlassWorkshop_EventScript_26F072:: @ 826F072 - call Route113_GlassWorkshop_EventScript_27205E + call Common_EventScript_BagIsFull msgbox Route113_GlassWorkshop_Text_26F6B7, MSGBOX_DEFAULT release end Route113_GlassWorkshop_EventScript_26F081:: @ 826F081 - call Route113_GlassWorkshop_EventScript_272071 + call Common_EventScript_NoRoomLeftForAnother msgbox Route113_GlassWorkshop_Text_26F715, MSGBOX_DEFAULT release end diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index cccc8de5fa..3c07facf3d 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -35,7 +35,7 @@ Route114_EventScript_1F2582:: @ 81F2582 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route114_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_ROUTE_114_RECEIVED_BERRY msgbox Route114_Text_2A7034, MSGBOX_DEFAULT release @@ -53,7 +53,7 @@ Route114_EventScript_1F25D1:: @ 81F25D1 msgbox Route114_Text_1F2809, MSGBOX_DEFAULT giveitem_std ITEM_TM05 compare VAR_RESULT, 0 - goto_if_eq Route114_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM05 msgbox Route114_Text_1F2872, MSGBOX_DEFAULT release diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc index e229c756d1..0d942e4469 100644 --- a/data/maps/Route114_FossilManiacsHouse/scripts.inc +++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc @@ -13,7 +13,7 @@ Route114_FossilManiacsHouse_EventScript_22AD3A:: @ 822AD3A msgbox Route114_FossilManiacsHouse_Text_22AD85, MSGBOX_DEFAULT giveitem_std ITEM_TM28 compare VAR_RESULT, 0 - goto_if_eq Route114_FossilManiacsHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM28 release end diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index dee76d71d5..15f124bb0e 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -15,8 +15,8 @@ Route119_EventScript_1F4439:: @ 81F4439 return Route119_MapScript1_1F444D: @ 81F444D - call Route119_EventScript_271ED7 - call Route119_EventScript_271EFB + call Common_EventScript_SetupRivalGender + call Common_EventScript_SetupRivalOnBikeGender compare VAR_WEATHER_INSTITUTE_STATE, 1 call_if_eq Route119_EventScript_1F4466 special SetRoute119Weather diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index ae0fea2591..8d57356fdf 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -57,7 +57,7 @@ Route119_WeatherInstitute_1F_EventScript_26FB18:: @ 826FB18 lockall msgbox Route119_WeatherInstitute_1F_Text_26FEFC, MSGBOX_DEFAULT closemessage - call Route119_WeatherInstitute_1F_EventScript_272083 + call Common_EventScript_OutOfCenterPartyHeal releaseall end diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index bbee65df8a..6826e5fe04 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -98,7 +98,7 @@ Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085 compare VAR_RESULT, 0 goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700EA call Route119_WeatherInstitute_2F_EventScript_27378B - call Route119_WeatherInstitute_2F_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto Route119_WeatherInstitute_2F_EventScript_2700EA end diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index a66026283e..88a950be79 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -147,7 +147,7 @@ Route120_EventScript_1F55F6:: @ 81F55F6 Route120_EventScript_1F5601:: @ 81F5601 giveitem_std VAR_0x8004 compare VAR_RESULT, 0 - goto_if_eq Route120_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_ROUTE_120_RECEIVED_BERRY msgbox Route120_Text_2A71D5, MSGBOX_DEFAULT release diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index 86a6e767ed..132a068e36 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -17,7 +17,7 @@ Route123_EventScript_1F6151:: @ 81F6151 msgbox Route123_Text_1F645D, MSGBOX_DEFAULT giveitem_std ITEM_TM19 compare VAR_RESULT, 0 - goto_if_eq Route123_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM19 msgbox Route123_Text_1F64CF, MSGBOX_DEFAULT release diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc index a7175e6981..3500578efa 100644 --- a/data/maps/Route123_BerryMastersHouse/scripts.inc +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -17,7 +17,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_BERRY_MASTER_RECEIVED_BERRY msgbox Route123_BerryMastersHouse_Text_2A7428, MSGBOX_DEFAULT random 10 @@ -25,7 +25,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox Route123_BerryMastersHouse_Text_2A7445, MSGBOX_DEFAULT release end @@ -78,7 +78,7 @@ Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull goto Route123_BerryMastersHouse_EventScript_26FA79 release end @@ -88,7 +88,7 @@ Route123_BerryMastersHouse_EventScript_26F97A:: @ 826F97A msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_SPELON_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SPELON_BERRY goto Route123_BerryMastersHouse_EventScript_26FA79 end @@ -98,7 +98,7 @@ Route123_BerryMastersHouse_EventScript_26F9AB:: @ 826F9AB msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_PAMTRE_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_PAMTRE_BERRY goto Route123_BerryMastersHouse_EventScript_26FA79 end @@ -108,7 +108,7 @@ Route123_BerryMastersHouse_EventScript_26F9DC:: @ 826F9DC msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_WATMEL_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_WATMEL_BERRY goto Route123_BerryMastersHouse_EventScript_26FA79 end @@ -118,7 +118,7 @@ Route123_BerryMastersHouse_EventScript_26FA0D:: @ 826FA0D msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_DURIN_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_DURIN_BERRY goto Route123_BerryMastersHouse_EventScript_26FA79 end @@ -128,7 +128,7 @@ Route123_BerryMastersHouse_EventScript_26FA3E:: @ 826FA3E msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_BELUE_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_BELUE_BERRY goto Route123_BerryMastersHouse_EventScript_26FA79 end diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 97aa6f4be0..9968d3a040 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -3,7 +3,7 @@ Route124_MapScripts:: @ 81F656C .byte 0 Route124_MapScript1_1F6572: @ 81F6572 - call_if_set FLAG_SYS_WEATHER_CTRL, Route124_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end Route124_EventScript_1F657C:: @ 81F657C diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index e5ad32697e..c979577d85 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -5,7 +5,7 @@ Route125_MapScripts:: @ 81F6748 .byte 0 Route125_MapScript1_1F6758: @ 81F6758 - call_if_set FLAG_SYS_WEATHER_CTRL, Route125_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 compare VAR_0x4039, 1 call_if_eq Route125_EventScript_273D13 compare VAR_0x4037, 11 diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index 4fa47e0bb6..29846af227 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -3,7 +3,7 @@ Route126_MapScripts:: @ 81F68C6 .byte 0 Route126_MapScript1_1F68CC: @ 81F68CC - call_if_set FLAG_SYS_WEATHER_CTRL, Route126_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end Route126_EventScript_1F68D6:: @ 81F68D6 diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 28f20bfb3c..76ade14f3f 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -5,7 +5,7 @@ Route127_MapScripts:: @ 81F69D9 .byte 0 Route127_MapScript1_1F69E9: @ 81F69E9 - call_if_set FLAG_SYS_WEATHER_CTRL, Route127_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 compare VAR_0x4039, 1 call_if_eq Route127_EventScript_273D13 compare VAR_0x4037, 13 diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index bb4f8d1505..5d32a7bdf5 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -4,7 +4,7 @@ Route128_MapScripts:: @ 81F6B38 .byte 0 Route128_MapScript1_1F6B43: @ 81F6B43 - call_if_set FLAG_SYS_WEATHER_CTRL, Route128_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end Route128_MapScript2_1F6B4D: @ 81F6B4D diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index 177dc626aa..c1bd91f0a2 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -23,7 +23,7 @@ Route129_MapScript1_1F72AB: @ 81F72AB end Route129_EventScript_1F72D8:: @ 81F72D8 - call_if_set FLAG_SYS_WEATHER_CTRL, Route129_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 return Route129_MapScript2_1F72E2: @ 81F72E2 diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 8ca9dcbb0d..797cc302c6 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -31,7 +31,7 @@ Route130_EventScript_1F73B1:: @ 81F73B1 end Route130_EventScript_1F73B5:: @ 81F73B5 - call_if_set FLAG_SYS_WEATHER_CTRL, Route130_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 return Route130_EventScript_1F73BF:: @ 81F73BF diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index e709a14ef1..9cbd6eb6d3 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -13,7 +13,7 @@ Route131_EventScript_1F741B:: @ 81F741B return Route131_EventScript_1F741F:: @ 81F741F - call_if_set FLAG_SYS_WEATHER_CTRL, Route131_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 return Route131_EventScript_1F7429:: @ 81F7429 diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json index d43f7c33b5..8b8f8fd04b 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -539,7 +539,7 @@ "y": 45, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -547,7 +547,7 @@ "y": 38, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -563,7 +563,7 @@ "y": 45, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -571,7 +571,7 @@ "y": 38, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 8ffbf8373d..e5f034f1de 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -5,7 +5,7 @@ RustboroCity_MapScripts:: @ 81E06BD RustboroCity_MapScript1_1E06C8: @ 81E06C8 setflag FLAG_VISITED_RUSTBORO_CITY - call RustboroCity_EventScript_271ED7 + call Common_EventScript_SetupRivalGender compare VAR_0x405A, 6 call_if_eq RustboroCity_EventScript_1E0707 getplayerxy VAR_TEMP_0, VAR_TEMP_1 diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index cce9ae394b..d9fe5819f6 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -171,7 +171,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E compare VAR_RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211AD7 call RustboroCity_DevonCorp_2F_EventScript_27378B - call RustboroCity_DevonCorp_2F_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto RustboroCity_DevonCorp_2F_EventScript_211AD7 end @@ -220,7 +220,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11 compare VAR_RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B7A call RustboroCity_DevonCorp_2F_EventScript_27378B - call RustboroCity_DevonCorp_2F_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto RustboroCity_DevonCorp_2F_EventScript_211B7A end diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index 9d5fbe58bc..b2f13ea865 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -58,7 +58,7 @@ RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E setflag FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT msgbox RustboroCity_DevonCorp_3F_Text_212837, MSGBOX_DEFAULT closemessage - call RustboroCity_DevonCorp_3F_EventScript_272083 + call Common_EventScript_OutOfCenterPartyHeal msgbox RustboroCity_DevonCorp_3F_Text_2129D2, MSGBOX_DEFAULT setflag FLAG_HIDE_ROUTE_116_TUNNELER clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN @@ -163,7 +163,7 @@ RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595 msgbox RustboroCity_DevonCorp_3F_Text_212A29, MSGBOX_DEFAULT giveitem_std ITEM_EXP_SHARE compare VAR_RESULT, 0 - goto_if_eq RustboroCity_DevonCorp_3F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_EXP_SHARE msgbox RustboroCity_DevonCorp_3F_Text_212A9E, MSGBOX_DEFAULT closemessage diff --git a/data/maps/RustboroCity_Flat2_2F/scripts.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc index 639e938849..d4b940c9fa 100644 --- a/data/maps/RustboroCity_Flat2_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc @@ -12,7 +12,7 @@ RustboroCity_Flat2_2F_EventScript_215FE1:: @ 8215FE1 msgbox RustboroCity_Flat2_2F_Text_21605A, MSGBOX_DEFAULT giveitem_std ITEM_PREMIER_BALL compare VAR_RESULT, 0 - goto_if_eq RustboroCity_Flat2_2F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO release end diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index 4581707ce7..d35f7787c0 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -14,7 +14,7 @@ RustboroCity_Gym_EventScript_212F31:: @ 8212F31 RustboroCity_Gym_EventScript_212F66:: @ 8212F66 message RustboroCity_Gym_Text_2137EC waitmessage - call RustboroCity_Gym_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox RustboroCity_Gym_Text_213816, MSGBOX_DEFAULT setflag FLAG_DEFEATED_RUSTBORO_GYM setflag FLAG_BADGE01_GET @@ -30,7 +30,7 @@ RustboroCity_Gym_EventScript_212F66:: @ 8212F66 RustboroCity_Gym_EventScript_212FA4:: @ 8212FA4 giveitem_std ITEM_TM39 compare VAR_RESULT, 0 - goto_if_eq RustboroCity_Gym_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM39 msgbox RustboroCity_Gym_Text_2138B1, MSGBOX_DEFAULT release diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index c01e4a4365..2d3c6a8f94 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -85,7 +85,7 @@ RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 msgbox RustboroCity_PokemonSchool_Text_214433, MSGBOX_DEFAULT giveitem_std ITEM_QUICK_CLAW compare VAR_RESULT, 0 - goto_if_eq RustboroCity_PokemonSchool_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull closemessage applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA waitmovement 0 diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc index a021f5272d..3b8df90a3c 100644 --- a/data/maps/SSTidalRooms/scripts.inc +++ b/data/maps/SSTidalRooms/scripts.inc @@ -8,7 +8,7 @@ SSTidalRooms_EventScript_23C9F2:: @ 823C9F2 msgbox SSTidalRooms_Text_23D098, MSGBOX_DEFAULT giveitem_std ITEM_TM49 compare VAR_RESULT, 0 - goto_if_eq SSTidalRooms_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM49 msgbox SSTidalRooms_Text_23D145, MSGBOX_DEFAULT release @@ -23,7 +23,7 @@ SSTidalRooms_EventScript_23CA33:: @ 823CA33 lockall msgbox SSTidalRooms_Text_23CAF2, MSGBOX_DEFAULT closemessage - call SSTidalRooms_EventScript_272083 + call Common_EventScript_OutOfCenterPartyHeal call SSTidalRooms_EventScript_23C0A7 releaseall end diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index 2874da9633..fa2aca8e0d 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -39,7 +39,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 takeitem ITEM_SHOAL_SHELL, 4 giveitem_std ITEM_SHELL_BELL compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox ShoalCave_LowTideEntranceRoom_Text_2A8012, MSGBOX_DEFAULT setflag FLAG_TEMP_2 release diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc index c54aa1d4ff..7a7c3e337a 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc @@ -64,7 +64,7 @@ ShoalCave_LowTideInnerRoom_EventScript_236FBA:: @ 8236FBA goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 41, 20, 859, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SHELL_1 @@ -81,7 +81,7 @@ ShoalCave_LowTideInnerRoom_EventScript_236FF6:: @ 8236FF6 goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 41, 10, 859, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SHELL_2 @@ -93,7 +93,7 @@ ShoalCave_LowTideInnerRoom_EventScript_237028:: @ 8237028 goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 6, 9, 859, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SHELL_3 @@ -105,7 +105,7 @@ ShoalCave_LowTideInnerRoom_EventScript_23705A:: @ 823705A goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 16, 13, 859, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SHELL_4 @@ -117,7 +117,7 @@ ShoalCave_LowTideInnerRoom_EventScript_23708C:: @ 823708C goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_2370BE giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 31, 8, 858, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SALT_1 @@ -134,7 +134,7 @@ ShoalCave_LowTideInnerRoom_EventScript_2370C8:: @ 82370C8 goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_2370BE giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 14, 26, 858, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SALT_2 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc index 60a6039be5..d493469fab 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc @@ -19,7 +19,7 @@ ShoalCave_LowTideLowerRoom_EventScript_237176:: @ 8237176 goto_if_set FLAG_RECEIVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_2371A8 giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 18, 2, 858, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SALT_4 @@ -38,7 +38,7 @@ ShoalCave_LowTideLowerRoom_EventScript_2371B2:: @ 82371B2 msgbox ShoalCave_LowTideLowerRoom_Text_2371EB, MSGBOX_DEFAULT giveitem_std ITEM_FOCUS_BAND compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_FOCUS_BAND release end diff --git a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc index 40275d809f..6e3bb63fe4 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc @@ -19,7 +19,7 @@ ShoalCave_LowTideStairsRoom_EventScript_23711A:: @ 823711A goto_if_set FLAG_RECEIVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_23714C giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 11, 11, 858, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SALT_3 diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index eb57d12277..f65d0d4ecb 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -16,7 +16,7 @@ SkyPillar_Outside_EventScript_2392CF:: @ 82392CF return SkyPillar_Outside_EventScript_2392D3:: @ 82392D3 - call_if_set FLAG_SYS_WEATHER_CTRL, SkyPillar_Outside_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 return SkyPillar_Outside_MapScript1_2392DD: @ 82392DD diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json index ee9f3c379c..1265190969 100644 --- a/data/maps/SlateportCity/map.json +++ b/data/maps/SlateportCity/map.json @@ -591,7 +591,7 @@ "y": 19, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SlateportCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -599,7 +599,7 @@ "y": 19, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SlateportCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -607,7 +607,7 @@ "y": 26, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SlateportCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -623,7 +623,7 @@ "y": 26, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SlateportCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc index 8851c5fa8a..bf84162954 100644 --- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -165,7 +165,7 @@ SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950 special CallFrontierUtilFunc closemessage delay 2 - call SlateportCity_BattleTentLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq SlateportCity_BattleTentLobby_EventScript_208A14 @@ -249,7 +249,7 @@ SlateportCity_BattleTentLobby_EventScript_208A3D:: @ 8208A3D msgbox SlateportCity_BattleTentLobby_Text_208B4E, MSGBOX_DEFAULT giveitem_std ITEM_TM41 compare VAR_RESULT, 0 - goto_if_eq SlateportCity_BattleTentLobby_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM41 msgbox SlateportCity_BattleTentLobby_Text_208C5C, MSGBOX_DEFAULT release diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 24e139edfd..771cc149f2 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -358,7 +358,7 @@ SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B goto_if_eq SlateportCity_Harbor_EventScript_20CE05 giveitem_std ITEM_DEEP_SEA_TOOTH compare VAR_RESULT, 0 - goto_if_eq SlateportCity_Harbor_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_20D94A, MSGBOX_DEFAULT setflag FLAG_EXCHANGED_SCANNER @@ -371,7 +371,7 @@ SlateportCity_Harbor_EventScript_20CDBB:: @ 820CDBB goto_if_eq SlateportCity_Harbor_EventScript_20CE05 giveitem_std ITEM_DEEP_SEA_SCALE compare VAR_RESULT, 0 - goto_if_eq SlateportCity_Harbor_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_20D94A, MSGBOX_DEFAULT setflag FLAG_EXCHANGED_SCANNER diff --git a/data/maps/SlateportCity_House1/scripts.inc b/data/maps/SlateportCity_House1/scripts.inc index 2e973663bc..155081a1bd 100644 --- a/data/maps/SlateportCity_House1/scripts.inc +++ b/data/maps/SlateportCity_House1/scripts.inc @@ -57,7 +57,7 @@ SlateportCity_House1_EventScript_209B50:: @ 8209B50 SlateportCity_House1_EventScript_209B5A:: @ 8209B5A msgbox SlateportCity_House1_Text_209CA4, MSGBOX_DEFAULT - call SlateportCity_House1_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged special TV_CopyNicknameToStringVar1AndEnsureTerminated compare VAR_RESULT, 1 diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc index 3faf350fc4..c63ef37067 100644 --- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -218,7 +218,7 @@ SlateportCity_PokemonFanClub_EventScript_20A1A3:: @ 820A1A3 msgbox SlateportCity_PokemonFanClub_Text_20AB63, MSGBOX_DEFAULT giveitem_std ITEM_SOOTHE_BELL compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SOOTHE_BELL release end diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json index 76ababed86..183c3ce46a 100644 --- a/data/maps/SootopolisCity/map.json +++ b/data/maps/SootopolisCity/map.json @@ -358,7 +358,7 @@ "y": 29, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SootopolisCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -366,7 +366,7 @@ "y": 31, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SootopolisCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -374,7 +374,7 @@ "y": 31, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SootopolisCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -382,7 +382,7 @@ "y": 29, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SootopolisCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 1cd4611e9e..bdc36c4689 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -110,7 +110,7 @@ SootopolisCity_EventScript_1E5805:: @ 81E5805 compare VAR_0x40CA, 1 goto_if_eq SootopolisCity_EventScript_1E583E compare VAR_0x40CA, 1 - goto_if_le SootopolisCity_EventScript_27207A + goto_if_le Common_EventScript_SetWeather15 return SootopolisCity_EventScript_1E583D:: @ 81E583D @@ -751,7 +751,7 @@ SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_SOOTOPOLIS_RECEIVED_BERRY msgbox SootopolisCity_Text_2A7C7C, MSGBOX_DEFAULT random 2 @@ -764,7 +764,7 @@ SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B SootopolisCity_EventScript_1E5F79:: @ 81E5F79 giveitem_std ITEM_FIGY_BERRY compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox SootopolisCity_Text_2A7CB7, MSGBOX_DEFAULT release end @@ -772,7 +772,7 @@ SootopolisCity_EventScript_1E5F79:: @ 81E5F79 SootopolisCity_EventScript_1E5F9A:: @ 81E5F9A giveitem_std ITEM_IAPAPA_BERRY compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox SootopolisCity_Text_2A7CB7, MSGBOX_DEFAULT release end diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index 22cd864cfc..d5bb3d790e 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -99,7 +99,7 @@ SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44 SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 message SootopolisCity_Gym_1F_Text_225598 waitmessage - call SootopolisCity_Gym_1F_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox SootopolisCity_Gym_1F_Text_2255BE, MSGBOX_DEFAULT setflag FLAG_DEFEATED_SOOTOPOLIS_GYM setflag FLAG_BADGE08_GET @@ -125,7 +125,7 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4 giveitem_std ITEM_TM03 compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_Gym_1F_EventScript_27205E + goto_if_eq Common_EventScript_BagIsFull msgbox SootopolisCity_Gym_1F_Text_2256C1, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM03 return @@ -133,7 +133,7 @@ SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4 SootopolisCity_Gym_1F_EventScript_224FF7:: @ 8224FF7 giveitem_std ITEM_TM03 compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_Gym_1F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox SootopolisCity_Gym_1F_Text_2256C1, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM03 release diff --git a/data/maps/SootopolisCity_House1/scripts.inc b/data/maps/SootopolisCity_House1/scripts.inc index 9dcc1031d2..13b581c717 100644 --- a/data/maps/SootopolisCity_House1/scripts.inc +++ b/data/maps/SootopolisCity_House1/scripts.inc @@ -8,7 +8,7 @@ SootopolisCity_House1_EventScript_22694D:: @ 822694D msgbox SootopolisCity_House1_Text_2269A1, MSGBOX_DEFAULT giveitem_std ITEM_TM31 compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_House1_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM31 msgbox SootopolisCity_House1_Text_226A13, MSGBOX_DEFAULT release diff --git a/data/maps/SootopolisCity_House6/scripts.inc b/data/maps/SootopolisCity_House6/scripts.inc index efa197c8de..0f175478af 100644 --- a/data/maps/SootopolisCity_House6/scripts.inc +++ b/data/maps/SootopolisCity_House6/scripts.inc @@ -28,7 +28,7 @@ SootopolisCity_House6_EventScript_226FA3:: @ 8226FA3 SootopolisCity_House6_EventScript_226FAD:: @ 8226FAD bufferdecorationname 1, 117 - msgbox gUnknown_08272B1A, MSGBOX_DEFAULT + msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT msgbox SootopolisCity_House6_Text_22704A, MSGBOX_DEFAULT release end diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index 5db2042935..0eb4ffaef7 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -102,7 +102,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 compare VAR_RESULT, 0 goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 special LoadPlayerParty - call SootopolisCity_MysteryEventsHouse_1F_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 special SavePlayerParty diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index 846b7f6c3e..57dbbe13d1 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -194,7 +194,7 @@ TrainerHill_Entrance_EventScript_26832E:: @ 826832E setvar VAR_0x8004, 14 special CallTrainerHillFunction setvar VAR_TEMP_5, 1 - call TrainerHill_Entrance_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq TrainerHill_Entrance_EventScript_26835C setvar VAR_0x8004, 14 diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json index 3f8f4fe455..7aef487242 100644 --- a/data/maps/VerdanturfTown/map.json +++ b/data/maps/VerdanturfTown/map.json @@ -137,7 +137,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "VerdanturfTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -153,7 +153,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "VerdanturfTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -169,7 +169,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "VerdanturfTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -177,7 +177,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "VerdanturfTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index df56f41ed5..e699e6427d 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -192,7 +192,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954 special LoadPlayerParty closemessage delay 2 - call VerdanturfTown_BattleTentLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_201A1D @@ -281,7 +281,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201A7B:: @ 8201A7B msgbox VerdanturfTown_BattleTentLobby_Text_201D9E, MSGBOX_DEFAULT giveitem_std ITEM_TM45 compare VAR_RESULT, 0 - goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM45 msgbox VerdanturfTown_BattleTentLobby_Text_201E43, MSGBOX_DEFAULT release diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index b73d7e1fac..79747540d1 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -425,7 +425,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276F55:: @ 8276F55 end OldaleTown_PokemonCenter_2F_EventScript_276F60:: @ 8276F60 - call OldaleTown_PokemonCenter_2F_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC message gText_PleaseWaitForLink @@ -527,7 +527,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2770B2:: @ 82770B2 call OldaleTown_PokemonCenter_2F_EventScript_277199 compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC - call OldaleTown_PokemonCenter_2F_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC message gText_PleaseWaitForLink @@ -602,7 +602,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2771CD:: @ 82771CD OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB copyvar VAR_0x8007, VAR_LAST_TALKED - call OldaleTown_PokemonCenter_2F_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC message gText_PleaseWaitForLink @@ -1023,7 +1023,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F call OldaleTown_PokemonCenter_2F_EventScript_277626 compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC - call OldaleTown_PokemonCenter_2F_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC msgbox OldaleTown_PokemonCenter_2F_Text_27961C, MSGBOX_DEFAULT @@ -1234,7 +1234,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277923:: @ 8277923 end OldaleTown_PokemonCenter_2F_EventScript_277931:: @ 8277931 - call OldaleTown_PokemonCenter_2F_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC switch VAR_0x8004 @@ -1513,7 +1513,7 @@ MossdeepCity_GameCorner_1F_EventScript_277CE9:: @ 8277CE9 waitstate compare VAR_0x8004, 6 goto_if_ge MossdeepCity_GameCorner_1F_EventScript_2772F9 - call MossdeepCity_GameCorner_1F_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 setvar VAR_0x8004, 4 @@ -1532,7 +1532,7 @@ MossdeepCity_GameCorner_1F_EventScript_277D35:: @ 8277D35 waitstate compare VAR_0x8004, 6 goto_if_ge MossdeepCity_GameCorner_1F_EventScript_2772F9 - call MossdeepCity_GameCorner_1F_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 setvar VAR_0x8004, 6 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index f85ebd3d2a..fa09c5e156 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -35,7 +35,7 @@ LilycoveCity_ContestLobby_EventScript_279D2C:: @ 8279D2C end LilycoveCity_ContestLobby_EventScript_279D4B:: @ 8279D4B - call LilycoveCity_ContestLobby_EventScript_27205E + call Common_EventScript_BagIsFull msgbox LilycoveCity_ContestLobby_Text_27B6E7, MSGBOX_DEFAULT release end @@ -1215,7 +1215,7 @@ LinkContestRoom1_EventScript_27AC77:: @ 827AC77 LinkContestRoom1_EventScript_27ACA8:: @ 827ACA8 lockall - call LinkContestRoom1_EventScript_27205E + call Common_EventScript_BagIsFull msgbox LinkContestRoom1_Text_27BC2F, MSGBOX_DEFAULT releaseall setvar VAR_0x408A, 4 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index eb29ef6e07..985a2f93ad 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -355,7 +355,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A51:: @ 8292A51 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D73, MSGBOX_DEFAULT giveitem_std ITEM_AMULET_COIN compare VAR_RESULT, 0 - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, MSGBOX_DEFAULT setflag FLAG_MOM_SAYS_GOODBYE release @@ -373,7 +373,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A94:: @ 8292A94 LittlerootTown_BrendansHouse_1F_EventScript_292A9E:: @ 8292A9E closemessage - call LittlerootTown_BrendansHouse_1F_EventScript_272083 + call Common_EventScript_OutOfCenterPartyHeal incrementgamestat 16 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D5C, MSGBOX_DEFAULT release diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index c2a580a617..7b8b52cd00 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -602,7 +602,7 @@ EventScript_PblocLink_NoBerries: @ 82940B1 end EventScript_PblocLink_TryConnect: @ 82940BB - call LilycoveCity_ContestLobby_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq EventScript_PblocLink_End specialvar VAR_RESULT, IsWirelessAdapterConnected diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index db8aece85b..770bc9a5b5 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -660,7 +660,7 @@ SecretBase_RedCave1_EventScript_275DD6:: @ 8275DD6 goto_if_eq SecretBase_RedCave1_EventScript_275E2F setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_275E2F msgbox SecretBase_RedCave1_Text_274939, MSGBOX_DEFAULT @@ -696,7 +696,7 @@ SecretBase_RedCave1_EventScript_275E4E:: @ 8275E4E goto_if_eq SecretBase_RedCave1_EventScript_275EA7 setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_275EA7 msgbox SecretBase_RedCave1_Text_274CB0, MSGBOX_DEFAULT @@ -732,7 +732,7 @@ SecretBase_RedCave1_EventScript_275EC6:: @ 8275EC6 goto_if_eq SecretBase_RedCave1_EventScript_275F1F setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_275F1F msgbox SecretBase_RedCave1_Text_274FCA, MSGBOX_DEFAULT @@ -768,7 +768,7 @@ SecretBase_RedCave1_EventScript_275F3E:: @ 8275F3E goto_if_eq SecretBase_RedCave1_EventScript_275F97 setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_275F97 msgbox SecretBase_RedCave1_Text_275315, MSGBOX_DEFAULT @@ -804,7 +804,7 @@ SecretBase_RedCave1_EventScript_275FB6:: @ 8275FB6 goto_if_eq SecretBase_RedCave1_EventScript_27600F setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_27600F msgbox SecretBase_RedCave1_Text_275679, MSGBOX_DEFAULT @@ -840,7 +840,7 @@ SecretBase_RedCave1_EventScript_27602E:: @ 827602E goto_if_eq SecretBase_RedCave1_EventScript_276087 setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_276087 msgbox SecretBase_RedCave1_Text_274AFA, MSGBOX_DEFAULT @@ -876,7 +876,7 @@ SecretBase_RedCave1_EventScript_2760A6:: @ 82760A6 goto_if_eq SecretBase_RedCave1_EventScript_2760FF setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_2760FF msgbox SecretBase_RedCave1_Text_274E41, MSGBOX_DEFAULT @@ -912,7 +912,7 @@ SecretBase_RedCave1_EventScript_27611E:: @ 827611E goto_if_eq SecretBase_RedCave1_EventScript_276177 setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_276177 msgbox SecretBase_RedCave1_Text_2751AF, MSGBOX_DEFAULT @@ -948,7 +948,7 @@ SecretBase_RedCave1_EventScript_276196:: @ 8276196 goto_if_eq SecretBase_RedCave1_EventScript_2761EF setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_2761EF msgbox SecretBase_RedCave1_Text_2754B2, MSGBOX_DEFAULT @@ -984,7 +984,7 @@ SecretBase_RedCave1_EventScript_27620E:: @ 827620E goto_if_eq SecretBase_RedCave1_EventScript_276267 setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_276267 msgbox SecretBase_RedCave1_Text_275884, MSGBOX_DEFAULT From 0de831fd290b44b6b7236fb849e2e0318f9ebe3f Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 22 Feb 2019 20:09:14 -0500 Subject: [PATCH 11/25] Name some common single-entry movements --- data/event_scripts.s | 367 ++---------------- data/maps/AquaHideout_B2F/scripts.inc | 12 +- .../scripts.inc | 12 +- .../scripts.inc | 8 +- .../scripts.inc | 2 +- .../scripts.inc | 4 +- .../scripts.inc | 4 +- .../scripts.inc | 4 +- data/maps/BattleFrontier_Lounge3/scripts.inc | 2 +- data/maps/BattleFrontier_Mart/scripts.inc | 2 +- .../BattleFrontier_OutsideWest/scripts.inc | 16 +- .../BattleFrontier_ReceptionGate/scripts.inc | 16 +- .../BattleFrontier_ScottsHouse/scripts.inc | 10 +- data/maps/BirthIsland_Harbor/scripts.inc | 2 +- data/maps/CaveOfOrigin_B1F/scripts.inc | 8 +- data/maps/DewfordTown_Hall/scripts.inc | 12 +- .../EverGrandeCity_ChampionsRoom/scripts.inc | 20 +- .../EverGrandeCity_HallOfFame/scripts.inc | 12 +- .../scripts.inc | 4 +- data/maps/FallarborTown_House2/scripts.inc | 2 +- data/maps/FarawayIsland_Entrance/scripts.inc | 2 +- data/maps/FarawayIsland_Interior/scripts.inc | 4 +- data/maps/FortreeCity_House4/scripts.inc | 6 +- data/maps/JaggedPass/scripts.inc | 12 +- data/maps/LavaridgeTown/scripts.inc | 14 +- data/maps/LilycoveCity/scripts.inc | 10 +- .../maps/LilycoveCity_ContestHall/scripts.inc | 56 +-- .../LilycoveCity_ContestLobby/scripts.inc | 6 +- .../LilycoveCity_CoveLilyMotel_1F/scripts.inc | 18 +- .../scripts.inc | 2 +- .../scripts.inc | 4 +- .../scripts.inc | 4 +- data/maps/LilycoveCity_Harbor/scripts.inc | 26 +- data/maps/LilycoveCity_House3/scripts.inc | 6 +- .../scripts.inc | 4 +- .../scripts.inc | 8 +- .../scripts.inc | 2 +- .../scripts.inc | 6 +- data/maps/LittlerootTown/scripts.inc | 36 +- .../scripts.inc | 14 +- .../scripts.inc | 12 +- .../LittlerootTown_MaysHouse_1F/scripts.inc | 14 +- .../LittlerootTown_MaysHouse_2F/scripts.inc | 14 +- .../scripts.inc | 16 +- data/maps/MagmaHideout_4F/scripts.inc | 6 +- data/maps/MarineCave_End/scripts.inc | 2 +- data/maps/MauvilleCity/scripts.inc | 26 +- data/maps/MauvilleCity_GameCorner/scripts.inc | 2 +- data/maps/MauvilleCity_House2/scripts.inc | 4 +- data/maps/MeteorFalls_1F_1R/scripts.inc | 24 +- data/maps/MeteorFalls_StevensCave/scripts.inc | 8 +- data/maps/MossdeepCity/scripts.inc | 2 +- .../MossdeepCity_SpaceCenter_1F/scripts.inc | 16 +- .../MossdeepCity_SpaceCenter_2F/scripts.inc | 24 +- .../MossdeepCity_StevensHouse/scripts.inc | 6 +- data/maps/MtChimney/scripts.inc | 10 +- data/maps/MtPyre_Summit/scripts.inc | 20 +- data/maps/NavelRock_Harbor/scripts.inc | 2 +- data/maps/NewMauville_Entrance/scripts.inc | 2 +- data/maps/OldaleTown/scripts.inc | 10 +- data/maps/PetalburgCity/scripts.inc | 30 +- data/maps/PetalburgCity_Gym/scripts.inc | 68 ++-- data/maps/PetalburgWoods/scripts.inc | 10 +- data/maps/Route101/scripts.inc | 4 +- data/maps/Route103/scripts.inc | 12 +- data/maps/Route104/scripts.inc | 8 +- data/maps/Route109/scripts.inc | 6 +- data/maps/Route110/scripts.inc | 26 +- data/maps/Route110_TrickHouseEnd/scripts.inc | 14 +- .../Route110_TrickHouseEntrance/scripts.inc | 18 +- .../Route110_TrickHousePuzzle5/scripts.inc | 30 +- data/maps/Route111/scripts.inc | 12 +- .../scripts.inc | 2 +- data/maps/Route112/scripts.inc | 16 +- .../Route114_FossilManiacsTunnel/scripts.inc | 4 +- data/maps/Route116/scripts.inc | 4 +- data/maps/Route118/scripts.inc | 6 +- data/maps/Route119/scripts.inc | 6 +- .../Route119_WeatherInstitute_2F/scripts.inc | 4 +- data/maps/Route120/scripts.inc | 12 +- .../Route121_SafariZoneEntrance/scripts.inc | 2 +- data/maps/Route128/scripts.inc | 14 +- data/maps/RustboroCity/scripts.inc | 148 +++---- .../RustboroCity_DevonCorp_2F/scripts.inc | 8 +- .../RustboroCity_DevonCorp_3F/scripts.inc | 6 +- data/maps/RustboroCity_Flat1_2F/scripts.inc | 2 +- .../RustboroCity_PokemonSchool/scripts.inc | 4 +- data/maps/RusturfTunnel/scripts.inc | 20 +- data/maps/SSTidalCorridor/scripts.inc | 2 +- data/maps/SeafloorCavern_Entrance/scripts.inc | 14 +- data/maps/SeafloorCavern_Room9/scripts.inc | 22 +- data/maps/SkyPillar_Outside/scripts.inc | 8 +- data/maps/SkyPillar_Top/scripts.inc | 2 +- data/maps/SlateportCity/scripts.inc | 56 +-- .../scripts.inc | 2 +- data/maps/SlateportCity_Harbor/scripts.inc | 16 +- .../scripts.inc | 8 +- .../scripts.inc | 12 +- .../SlateportCity_PokemonFanClub/scripts.inc | 4 +- .../scripts.inc | 14 +- data/maps/SootopolisCity/scripts.inc | 44 +-- .../scripts.inc | 2 +- data/maps/SouthernIsland_Exterior/scripts.inc | 2 +- data/maps/TerraCave_End/scripts.inc | 2 +- data/maps/VerdanturfTown/scripts.inc | 4 +- .../scripts.inc | 8 +- data/maps/VictoryRoad_1F/scripts.inc | 2 +- data/scripts/cable_club.inc | 2 +- data/scripts/gabby_and_ty.inc | 4 +- data/scripts/players_house.inc | 46 +-- data/scripts/pokeblocks.inc | 6 +- 111 files changed, 719 insertions(+), 1038 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index 76b2866982..415541475a 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1280,11 +1280,11 @@ OldaleTown_PokemonCenter_1F_EventScript_27198D:: @ 827198D return OldaleTown_PokemonCenter_1F_EventScript_271993:: @ 8271993 - applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_2725A4 + applymovement VAR_0x800B, Common_Movement_WalkInPlaceLeft waitmovement 0 dofieldeffect FLDEFF_POKECENTER_HEAL waitfieldeffect FLDEFF_POKECENTER_HEAL - applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_2725AA + applymovement VAR_0x800B, Common_Movement_WalkInPlaceDown waitmovement 0 special HealPlayerParty return @@ -1348,9 +1348,9 @@ OldaleTown_PokemonCenter_1F_EventScript_271A68:: @ 8271A68 setflag FLAG_OLDALE_NURSE_MENTIONS_GOLD_CARD msgbox gUnknown_082727F5, MSGBOX_DEFAULT playse SE_PIN - applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_272598 + applymovement VAR_0x800B, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_27259A + applymovement VAR_0x800B, Common_Movement_Delay48 waitmovement 0 msgbox gUnknown_08272860, MSGBOX_YESNO compare VAR_RESULT, 1 @@ -2080,7 +2080,7 @@ RusturfTunnel_EventScript_272216:: @ 8272216 EventScript_27222B:: @ 827222B delay 30 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 showobjectat 255, MAP_PETALBURG_CITY delay 30 @@ -2223,7 +2223,7 @@ Route119_EventScript_272350:: @ 8272350 Route119_EventScript_272365:: @ 8272365 msgbox Route119_Text_1F5D63, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Route119_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 applymovement VAR_LAST_TALKED, Route119_Movement_2723C7 waitmovement 0 @@ -2370,354 +2370,41 @@ SlateportCity_Movement_272596: @ 8272596 emote_question_mark step_end -AquaHideout_B2F_Movement_272598: @ 8272598 -BattleFrontier_BattleTowerBattleRoom_Movement_272598: @ 8272598 -BattleFrontier_ReceptionGate_Movement_272598: @ 8272598 -CaveOfOrigin_B1F_Movement_272598: @ 8272598 -EverGrandeCity_ChampionsRoom_Movement_272598: @ 8272598 -FarawayIsland_Interior_Movement_272598: @ 8272598 -JaggedPass_Movement_272598: @ 8272598 -LavaridgeTown_Movement_272598: @ 8272598 -LilycoveCity_ContestLobby_Movement_272598: @ 8272598 -LilycoveCity_CoveLilyMotel_1F_Movement_272598: @ 8272598 -LilycoveCity_Harbor_Movement_272598: @ 8272598 -LittlerootTown_BrendansHouse_1F_Movement_272598: @ 8272598 -LittlerootTown_BrendansHouse_2F_Movement_272598: @ 8272598 -LittlerootTown_MaysHouse_1F_Movement_272598: @ 8272598 -LittlerootTown_MaysHouse_2F_Movement_272598: @ 8272598 -LittlerootTown_Movement_272598: @ 8272598 -MauvilleCity_House2_Movement_272598: @ 8272598 -MauvilleCity_Movement_272598: @ 8272598 -MeteorFalls_1F_1R_Movement_272598: @ 8272598 -MeteorFalls_StevensCave_Movement_272598: @ 8272598 -MossdeepCity_SpaceCenter_2F_Movement_272598: @ 8272598 -MossdeepCity_StevensHouse_Movement_272598: @ 8272598 -MtChimney_Movement_272598: @ 8272598 -MtPyre_Summit_Movement_272598: @ 8272598 -OldaleTown_PokemonCenter_1F_Movement_272598: @ 8272598 -PetalburgCity_Gym_Movement_272598: @ 8272598 -PetalburgCity_Movement_272598: @ 8272598 -Route103_Movement_272598: @ 8272598 -Route104_Movement_272598: @ 8272598 -Route110_Movement_272598: @ 8272598 -Route110_TrickHouseEnd_Movement_272598: @ 8272598 -Route110_TrickHouseEntrance_Movement_272598: @ 8272598 -Route110_TrickHousePuzzle5_Movement_272598: @ 8272598 -Route119_WeatherInstitute_2F_Movement_272598: @ 8272598 -RustboroCity_DevonCorp_2F_Movement_272598: @ 8272598 -RustboroCity_Movement_272598: @ 8272598 -RusturfTunnel_Movement_272598: @ 8272598 -SeafloorCavern_Entrance_Movement_272598: @ 8272598 -SeafloorCavern_Room9_Movement_272598: @ 8272598 -SlateportCity_Movement_272598: @ 8272598 -SlateportCity_OceanicMuseum_1F_Movement_272598: @ 8272598 -SlateportCity_PokemonFanClub_Movement_272598: @ 8272598 +Common_Movement_ExclamationMark: @ 8272598 emote_exclamation_mark step_end -BattleFrontier_BattleTowerBattleRoom_Movement_27259A: @ 827259A -BattleFrontier_ReceptionGate_Movement_27259A: @ 827259A -CaveOfOrigin_B1F_Movement_27259A: @ 827259A -EverGrandeCity_ChampionsRoom_Movement_27259A: @ 827259A -FarawayIsland_Interior_Movement_27259A: @ 827259A -JaggedPass_Movement_27259A: @ 827259A -LavaridgeTown_Movement_27259A: @ 827259A -LilycoveCity_CoveLilyMotel_1F_Movement_27259A: @ 827259A -LilycoveCity_Harbor_Movement_27259A: @ 827259A -LittlerootTown_BrendansHouse_1F_Movement_27259A: @ 827259A -LittlerootTown_BrendansHouse_2F_Movement_27259A: @ 827259A -LittlerootTown_MaysHouse_1F_Movement_27259A: @ 827259A -LittlerootTown_MaysHouse_2F_Movement_27259A: @ 827259A -MauvilleCity_House2_Movement_27259A: @ 827259A -MauvilleCity_Movement_27259A: @ 827259A -MeteorFalls_1F_1R_Movement_27259A: @ 827259A -MeteorFalls_StevensCave_Movement_27259A: @ 827259A -MossdeepCity_SpaceCenter_2F_Movement_27259A: @ 827259A -MossdeepCity_StevensHouse_Movement_27259A: @ 827259A -MtChimney_Movement_27259A: @ 827259A -MtPyre_Summit_Movement_27259A: @ 827259A -OldaleTown_PokemonCenter_1F_Movement_27259A: @ 827259A -PetalburgCity_Gym_Movement_27259A: @ 827259A -PetalburgCity_Movement_27259A: @ 827259A -Route103_Movement_27259A: @ 827259A -Route104_Movement_27259A: @ 827259A -Route110_Movement_27259A: @ 827259A -Route110_TrickHouseEntrance_Movement_27259A: @ 827259A -Route110_TrickHousePuzzle5_Movement_27259A: @ 827259A -Route119_WeatherInstitute_2F_Movement_27259A: @ 827259A -RustboroCity_DevonCorp_2F_Movement_27259A: @ 827259A -RustboroCity_Movement_27259A: @ 827259A -RusturfTunnel_Movement_27259A: @ 827259A -SeafloorCavern_Entrance_Movement_27259A: @ 827259A -SeafloorCavern_Room9_Movement_27259A: @ 827259A -SlateportCity_Movement_27259A: @ 827259A -SlateportCity_OceanicMuseum_1F_Movement_27259A: @ 827259A -SlateportCity_PokemonFanClub_Movement_27259A: @ 827259A +Common_Movement_Delay48: @ 827259A delay_16 delay_16 delay_16 step_end -AquaHideout_B2F_Movement_27259E: @ 827259E -BattleFrontier_BattlePyramidLobby_Movement_27259E: @ 827259E -BattleFrontier_ScottsHouse_Movement_27259E: @ 827259E -CaveOfOrigin_B1F_Movement_27259E: @ 827259E -EverGrandeCity_PokemonLeague_1F_Movement_27259E: @ 827259E -FallarborTown_House2_Movement_27259E: @ 827259E -FortreeCity_House4_Movement_27259E: @ 827259E -JaggedPass_Movement_27259E: @ 827259E -LilycoveCity_ContestHall_Movement_27259E: @ 827259E -LilycoveCity_CoveLilyMotel_1F_Movement_27259E: @ 827259E -LilycoveCity_DepartmentStore_1F_Movement_27259E: @ 827259E -LilycoveCity_DepartmentStore_5F_Movement_27259E: @ 827259E -LilycoveCity_Harbor_Movement_27259E: @ 827259E -LilycoveCity_LilycoveMuseum_1F_Movement_27259E: @ 827259E -LilycoveCity_LilycoveMuseum_2F_Movement_27259E: @ 827259E -LilycoveCity_MoveDeletersHouse_Movement_27259E: @ 827259E -LilycoveCity_Movement_27259E: @ 827259E -LittlerootTown_BrendansHouse_1F_Movement_27259E: @ 827259E -LittlerootTown_BrendansHouse_2F_Movement_27259E: @ 827259E -MagmaHideout_4F_Movement_27259E: @ 827259E -MauvilleCity_Movement_27259E: @ 827259E -MeteorFalls_StevensCave_Movement_27259E: @ 827259E -MossdeepCity_SpaceCenter_2F_Movement_27259E: @ 827259E -MtChimney_Movement_27259E: @ 827259E -OldaleTown_Movement_27259E: @ 827259E -PetalburgCity_Gym_Movement_27259E: @ 827259E -PetalburgCity_Movement_27259E: @ 827259E -Route103_Movement_27259E: @ 827259E -Route104_Movement_27259E: @ 827259E -Route110_TrickHouseEnd_Movement_27259E: @ 827259E -Route110_TrickHouseEntrance_Movement_27259E: @ 827259E -Route110_TrickHousePuzzle5_Movement_27259E: @ 827259E -Route111_Movement_27259E: @ 827259E -Route119_Movement_27259E: @ 827259E -RustboroCity_Flat1_2F_Movement_27259E: @ 827259E -RustboroCity_Movement_27259E: @ 827259E -RusturfTunnel_Movement_27259E: @ 827259E -SeafloorCavern_Room9_Movement_27259E: @ 827259E -SlateportCity_Movement_27259E: @ 827259E -SlateportCity_SternsShipyard_1F_Movement_27259E: @ 827259E -SootopolisCity_Movement_27259E: @ 827259E +Common_Movement_FacePlayer: @ 827259E face_player step_end -BattleFrontier_OutsideWest_Movement_2725A0: @ 82725A0 +Common_Movement_FaceAwayPlayer: @ 82725A0 face_away_player step_end -BattleFrontier_Lounge3_Movement_2725A2: @ 82725A2 -BattleFrontier_OutsideWest_Movement_2725A2: @ 82725A2 -EverGrandeCity_PokemonLeague_1F_Movement_2725A2: @ 82725A2 -JaggedPass_Movement_2725A2: @ 82725A2 -LilycoveCity_ContestHall_Movement_2725A2: @ 82725A2 -LilycoveCity_ContestLobby_Movement_2725A2: @ 82725A2 -LilycoveCity_CoveLilyMotel_1F_Movement_2725A2: @ 82725A2 -LilycoveCity_House3_Movement_2725A2: @ 82725A2 -LilycoveCity_LilycoveMuseum_1F_Movement_2725A2: @ 82725A2 -LilycoveCity_Movement_2725A2: @ 82725A2 -LittlerootTown_Movement_2725A2: @ 82725A2 -MauvilleCity_GameCorner_Movement_2725A2: @ 82725A2 -MauvilleCity_Movement_2725A2: @ 82725A2 -MossdeepCity_Movement_2725A2: @ 82725A2 -MossdeepCity_SpaceCenter_1F_Movement_2725A2: @ 82725A2 -MossdeepCity_SpaceCenter_2F_Movement_2725A2: @ 82725A2 -MtChimney_Movement_2725A2: @ 82725A2 -OldaleTown_Movement_2725A2: @ 82725A2 -PetalburgCity_Movement_2725A2: @ 82725A2 -Route109_Movement_2725A2: @ 82725A2 -Route110_Movement_2725A2: @ 82725A2 -Route111_Movement_2725A2: @ 82725A2 -Route111_WinstrateFamilysHouse_Movement_2725A2: @ 82725A2 -Route112_Movement_2725A2: @ 82725A2 -Route119_Movement_2725A2: @ 82725A2 -RustboroCity_DevonCorp_3F_Movement_2725A2: @ 82725A2 -RustboroCity_Movement_2725A2: @ 82725A2 -RusturfTunnel_Movement_2725A2: @ 82725A2 -SlateportCity_Harbor_Movement_2725A2: @ 82725A2 -SlateportCity_Movement_2725A2: @ 82725A2 -SlateportCity_OceanicMuseum_2F_Movement_2725A2: @ 82725A2 -SlateportCity_SternsShipyard_1F_Movement_2725A2: @ 82725A2 -SootopolisCity_Movement_2725A2: @ 82725A2 -VerdanturfTown_Movement_2725A2: @ 82725A2 +Common_Movement_FaceOriginalDirection: @ 82725A2 face_original_direction step_end -AquaHideout_B2F_Movement_2725A4: @ 82725A4 -BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4: @ 82725A4 -BattleFrontier_OutsideWest_Movement_2725A4: @ 82725A4 -BattleFrontier_ScottsHouse_Movement_2725A4: @ 82725A4 -DewfordTown_Hall_Movement_2725A4: @ 82725A4 -EverGrandeCity_ChampionsRoom_Movement_2725A4: @ 82725A4 -EverGrandeCity_HallOfFame_Movement_2725A4: @ 82725A4 -LavaridgeTown_Movement_2725A4: @ 82725A4 -LilycoveCity_Harbor_Movement_2725A4: @ 82725A4 -LilycoveCity_PokemonTrainerFanClub_Movement_2725A4: @ 82725A4 -LittlerootTown_BrendansHouse_1F_Movement_2725A4: @ 82725A4 -LittlerootTown_BrendansHouse_2F_Movement_2725A4: @ 82725A4 -LittlerootTown_MaysHouse_1F_Movement_2725A4: @ 82725A4 -LittlerootTown_MaysHouse_2F_Movement_2725A4: @ 82725A4 -LittlerootTown_Movement_2725A4: @ 82725A4 -LittlerootTown_ProfessorBirchsLab_Movement_2725A4: @ 82725A4 -MeteorFalls_1F_1R_Movement_2725A4: @ 82725A4 -MossdeepCity_SpaceCenter_2F_Movement_2725A4: @ 82725A4 -MossdeepCity_StevensHouse_Movement_2725A4: @ 82725A4 -MtChimney_Movement_2725A4: @ 82725A4 -MtPyre_Summit_Movement_2725A4: @ 82725A4 -OldaleTown_PokemonCenter_1F_Movement_2725A4: @ 82725A4 -PetalburgCity_Gym_Movement_2725A4: @ 82725A4 -PetalburgCity_Movement_2725A4: @ 82725A4 -PetalburgWoods_Movement_2725A4: @ 82725A4 -Route101_Movement_2725A4: @ 82725A4 -Route110_Movement_2725A4: @ 82725A4 -Route110_TrickHouseEnd_Movement_2725A4: @ 82725A4 -Route111_Movement_2725A4: @ 82725A4 -Route112_Movement_2725A4: @ 82725A4 -Route116_Movement_2725A4: @ 82725A4 -Route120_Movement_2725A4: @ 82725A4 -Route128_Movement_2725A4: @ 82725A4 -RustboroCity_Movement_2725A4: @ 82725A4 -SeafloorCavern_Entrance_Movement_2725A4: @ 82725A4 -SeafloorCavern_Room9_Movement_2725A4: @ 82725A4 -SkyPillar_Outside_Movement_2725A4: @ 82725A4 -SlateportCity_Movement_2725A4: @ 82725A4 -SlateportCity_OceanicMuseum_1F_Movement_2725A4: @ 82725A4 -SlateportCity_OceanicMuseum_2F_Movement_2725A4: @ 82725A4 -SootopolisCity_Movement_2725A4: @ 82725A4 +Common_Movement_WalkInPlaceLeft: @ 82725A4 walk_in_place_fastest_left step_end -BattleFrontier_BattleTowerCorridor2_Movement_2725A6: @ 82725A6 -BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6: @ 82725A6 -BattleFrontier_OutsideWest_Movement_2725A6: @ 82725A6 -BattleFrontier_ReceptionGate_Movement_2725A6: @ 82725A6 -BattleFrontier_ScottsHouse_Movement_2725A6: @ 82725A6 -CaveOfOrigin_B1F_Movement_2725A6: @ 82725A6 -DewfordTown_Hall_Movement_2725A6: @ 82725A6 -EverGrandeCity_ChampionsRoom_Movement_2725A6: @ 82725A6 -EverGrandeCity_HallOfFame_Movement_2725A6: @ 82725A6 -LavaridgeTown_Movement_2725A6: @ 82725A6 -LilycoveCity_DepartmentStore_5F_Movement_2725A6: @ 82725A6 -LilycoveCity_Harbor_Movement_2725A6: @ 82725A6 -LittlerootTown_BrendansHouse_1F_Movement_2725A6: @ 82725A6 -LittlerootTown_BrendansHouse_2F_Movement_2725A6: @ 82725A6 -LittlerootTown_MaysHouse_2F_Movement_2725A6: @ 82725A6 -LittlerootTown_Movement_2725A6: @ 82725A6 -LittlerootTown_ProfessorBirchsLab_Movement_2725A6: @ 82725A6 -MagmaHideout_4F_Movement_2725A6: @ 82725A6 -MeteorFalls_1F_1R_Movement_2725A6: @ 82725A6 -MossdeepCity_SpaceCenter_2F_Movement_2725A6: @ 82725A6 -MtPyre_Summit_Movement_2725A6: @ 82725A6 -NewMauville_Entrance_Movement_2725A6: @ 82725A6 -OldaleTown_PokemonCenter_2F_Movement_2725A6: @ 82725A6 -PetalburgCity_Gym_Movement_2725A6: @ 82725A6 -PetalburgCity_Movement_2725A6: @ 82725A6 -PetalburgWoods_Movement_2725A6: @ 82725A6 -Route104_Movement_2725A6: @ 82725A6 -Route110_TrickHouseEnd_Movement_2725A6: @ 82725A6 -Route110_TrickHouseEntrance_Movement_2725A6: @ 82725A6 -Route111_Movement_2725A6: @ 82725A6 -Route114_FossilManiacsTunnel_Movement_2725A6: @ 82725A6 -Route120_Movement_2725A6: @ 82725A6 -Route121_SafariZoneEntrance_Movement_2725A6: @ 82725A6 -Route128_Movement_2725A6: @ 82725A6 -RustboroCity_Movement_2725A6: @ 82725A6 -RusturfTunnel_Movement_2725A6: @ 82725A6 -SeafloorCavern_Entrance_Movement_2725A6: @ 82725A6 -SeafloorCavern_Room9_Movement_2725A6: @ 82725A6 -SlateportCity_BattleTentCorridor_Movement_2725A6: @ 82725A6 -SlateportCity_Harbor_Movement_2725A6: @ 82725A6 -SlateportCity_Movement_2725A6: @ 82725A6 -SlateportCity_OceanicMuseum_2F_Movement_2725A6: @ 82725A6 -SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6: @ 82725A6 -VerdanturfTown_BattleTentBattleRoom_Movement_2725A6: @ 82725A6 +Common_Movement_WalkInPlaceUp: @ 82725A6 walk_in_place_fastest_up step_end -BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8: @ 82725A8 -BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8: @ 82725A8 -BattleFrontier_OutsideWest_Movement_2725A8: @ 82725A8 -BattleFrontier_ScottsHouse_Movement_2725A8: @ 82725A8 -DewfordTown_Hall_Movement_2725A8: @ 82725A8 -EverGrandeCity_ChampionsRoom_Movement_2725A8: @ 82725A8 -EverGrandeCity_HallOfFame_Movement_2725A8: @ 82725A8 -LavaridgeTown_Movement_2725A8: @ 82725A8 -LilycoveCity_DepartmentStore_1F_Movement_2725A8: @ 82725A8 -LilycoveCity_PokemonTrainerFanClub_Movement_2725A8: @ 82725A8 -LittlerootTown_BrendansHouse_1F_Movement_2725A8: @ 82725A8 -LittlerootTown_BrendansHouse_2F_Movement_2725A8: @ 82725A8 -LittlerootTown_MaysHouse_1F_Movement_2725A8: @ 82725A8 -LittlerootTown_Movement_2725A8: @ 82725A8 -LittlerootTown_ProfessorBirchsLab_Movement_2725A8: @ 82725A8 -MagmaHideout_4F_Movement_2725A8: @ 82725A8 -MauvilleCity_Movement_2725A8: @ 82725A8 -MossdeepCity_SpaceCenter_1F_Movement_2725A8: @ 82725A8 -MossdeepCity_SpaceCenter_2F_Movement_2725A8: @ 82725A8 -MtPyre_Summit_Movement_2725A8: @ 82725A8 -OldaleTown_Movement_2725A8: @ 82725A8 -PetalburgCity_Gym_Movement_2725A8: @ 82725A8 -PetalburgCity_Movement_2725A8: @ 82725A8 -Route101_Movement_2725A8: @ 82725A8 -Route110_Movement_2725A8: @ 82725A8 -Route110_TrickHouseEnd_Movement_2725A8: @ 82725A8 -Route112_Movement_2725A8: @ 82725A8 -Route116_Movement_2725A8: @ 82725A8 -Route120_Movement_2725A8: @ 82725A8 -Route128_Movement_2725A8: @ 82725A8 -RustboroCity_Movement_2725A8: @ 82725A8 -SSTidalCorridor_Movement_2725A8: @ 82725A8 -SeafloorCavern_Entrance_Movement_2725A8: @ 82725A8 -SkyPillar_Outside_Movement_2725A8: @ 82725A8 -SlateportCity_Harbor_Movement_2725A8: @ 82725A8 -SlateportCity_Movement_2725A8: @ 82725A8 -SlateportCity_OceanicMuseum_1F_Movement_2725A8: @ 82725A8 -SlateportCity_OceanicMuseum_2F_Movement_2725A8: @ 82725A8 -SootopolisCity_Movement_2725A8: @ 82725A8 -VerdanturfTown_BattleTentBattleRoom_Movement_2725A8: @ 82725A8 +Common_Movement_WalkInPlaceRight: @ 82725A8 walk_in_place_fastest_right step_end -BattleFrontier_OutsideWest_Movement_2725AA: @ 82725AA -BattleFrontier_ScottsHouse_Movement_2725AA: @ 82725AA -BirthIsland_Harbor_Movement_2725AA: @ 82725AA -DewfordTown_Hall_Movement_2725AA: @ 82725AA -EverGrandeCity_ChampionsRoom_Movement_2725AA: @ 82725AA -FarawayIsland_Entrance_Movement_2725AA: @ 82725AA -LilycoveCity_CoveLilyMotel_1F_Movement_2725AA: @ 82725AA -LilycoveCity_DepartmentStoreElevator_Movement_2725AA: @ 82725AA -LilycoveCity_Harbor_Movement_2725AA: @ 82725AA -LilycoveCity_Movement_2725AA: @ 82725AA -LilycoveCity_PokemonTrainerFanClub_Movement_2725AA: @ 82725AA -LittlerootTown_BrendansHouse_1F_Movement_2725AA: @ 82725AA -LittlerootTown_MaysHouse_1F_Movement_2725AA: @ 82725AA -LittlerootTown_Movement_2725AA: @ 82725AA -MauvilleCity_Movement_2725AA: @ 82725AA -MeteorFalls_1F_1R_Movement_2725AA: @ 82725AA -MossdeepCity_SpaceCenter_2F_Movement_2725AA: @ 82725AA -MtPyre_Summit_Movement_2725AA: @ 82725AA -NavelRock_Harbor_Movement_2725AA: @ 82725AA -OldaleTown_PokemonCenter_1F_Movement_2725AA: @ 82725AA -PetalburgCity_Gym_Movement_2725AA: @ 82725AA -PetalburgCity_Movement_2725AA: @ 82725AA -PetalburgWoods_Movement_2725AA: @ 82725AA -Route110_Movement_2725AA: @ 82725AA -Route110_TrickHouseEnd_Movement_2725AA: @ 82725AA -Route114_FossilManiacsTunnel_Movement_2725AA: @ 82725AA -Route119_Movement_2725AA: @ 82725AA -Route120_Movement_2725AA: @ 82725AA -Route128_Movement_2725AA: @ 82725AA -RustboroCity_Movement_2725AA: @ 82725AA -RustboroCity_PokemonSchool_Movement_2725AA: @ 82725AA -RusturfTunnel_Movement_2725AA: @ 82725AA -SeafloorCavern_Entrance_Movement_2725AA: @ 82725AA -SeafloorCavern_Room9_Movement_2725AA: @ 82725AA -SkyPillar_Outside_Movement_2725AA: @ 82725AA -SlateportCity_Harbor_Movement_2725AA: @ 82725AA -SlateportCity_Movement_2725AA: @ 82725AA -SlateportCity_OceanicMuseum_2F_Movement_2725AA: @ 82725AA -SouthernIsland_Exterior_Movement_2725AA: @ 82725AA -VerdanturfTown_BattleTentBattleRoom_Movement_2725AA: @ 82725AA -VictoryRoad_1F_Movement_2725AA: @ 82725AA +Common_Movement_WalkInPlaceDown: @ 82725AA walk_in_place_fastest_down step_end @@ -2729,17 +2416,11 @@ RustboroCity_Movement_2725AE: @ 82725AE face_left step_end -BattleFrontier_Mart_Movement_2725B0: @ 82725B0 -MeteorFalls_1F_1R_Movement_2725B0: @ 82725B0 +Common_Movement_FaceDown: @ 82725B0 face_down step_end -MarineCave_End_Movement_2725B2: @ 82725B2 -MtPyre_Summit_Movement_2725B2: @ 82725B2 -Route118_Movement_2725B2: @ 82725B2 -SkyPillar_Top_Movement_2725B2: @ 82725B2 -SlateportCity_Movement_2725B2: @ 82725B2 -TerraCave_End_Movement_2725B2: @ 82725B2 +Common_Movement_FaceUp: @ 82725B2 face_up step_end @@ -3298,12 +2979,12 @@ EventScript_Questionnaire:: @ 827381B EventScript_27386D:: @ 827386D goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF goto_if_set FLAG_SYS_MYSTERY_EVENT_ENABLE, EventScript_2738FF - applymovement VAR_0x8008, BattleFrontier_Mart_Movement_2725B0 + applymovement VAR_0x8008, Common_Movement_FaceDown waitmovement 0 playse SE_PIN - applymovement VAR_0x8008, BattleFrontier_ReceptionGate_Movement_272598 + applymovement VAR_0x8008, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8008, BattleFrontier_ReceptionGate_Movement_27259A + applymovement VAR_0x8008, Common_Movement_Delay48 waitmovement 0 msgbox gUnknown_08273506, MSGBOX_DEFAULT setflag FLAG_SYS_MYSTERY_EVENT_ENABLE @@ -3314,12 +2995,12 @@ EventScript_27386D:: @ 827386D EventScript_2738B5:: @ 82738B5 goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF goto_if_set FLAG_SYS_MYSTERY_GIFT_ENABLE, EventScript_2738FF - applymovement VAR_0x8008, BattleFrontier_Mart_Movement_2725B0 + applymovement VAR_0x8008, Common_Movement_FaceDown waitmovement 0 playse SE_PIN - applymovement VAR_0x8008, BattleFrontier_ReceptionGate_Movement_272598 + applymovement VAR_0x8008, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8008, BattleFrontier_ReceptionGate_Movement_27259A + applymovement VAR_0x8008, Common_Movement_Delay48 waitmovement 0 msgbox gUnknown_08273446, MSGBOX_DEFAULT setflag FLAG_SYS_MYSTERY_GIFT_ENABLE @@ -3332,7 +3013,7 @@ EventScript_2738FD:: @ 82738FD end EventScript_2738FF:: @ 82738FF - applymovement VAR_0x8008, BattleFrontier_Mart_Movement_2725B0 + applymovement VAR_0x8008, Common_Movement_FaceDown waitmovement 0 msgbox gUnknown_082733D8, MSGBOX_DEFAULT releaseall diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index ba20cb681a..daa508d321 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -14,9 +14,9 @@ AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5 lockall setvar VAR_0x8008, 1 playse SE_PIN - applymovement VAR_0x8008, AquaHideout_B2F_Movement_272598 + applymovement VAR_0x8008, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E + applymovement VAR_0x8008, Common_Movement_FacePlayer waitmovement 0 setvar VAR_TEMP_1, 1 releaseall @@ -31,19 +31,19 @@ AquaHideout_B2F_EventScript_233E09:: @ 8233E09 AquaHideout_B2F_EventScript_233E25:: @ 8233E25 setvar VAR_0x8008, 1 setvar VAR_0x8009, 4 - applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4 + applymovement VAR_0x8008, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 20 - applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E + applymovement VAR_0x8008, Common_Movement_FacePlayer waitmovement 0 msgbox AquaHideout_B2F_Text_233FA6, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4 + applymovement VAR_0x8008, Common_Movement_WalkInPlaceLeft applymovement VAR_0x8009, AquaHideout_B2F_Movement_233E80 waitmovement 0 removeobject VAR_0x8009 delay 20 - applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E + applymovement VAR_0x8008, Common_Movement_FacePlayer waitmovement 0 msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT setflag FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index 8c22a9bc97..5ed2e97daa 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -304,12 +304,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA:: @ 825B1AA end BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4:: @ 825B1B4 - applymovement 1, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8 - applymovement 3, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8 - applymovement 4, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8 - applymovement 5, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4 - applymovement 6, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4 - applymovement 7, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 3, Common_Movement_WalkInPlaceRight + applymovement 4, Common_Movement_WalkInPlaceRight + applymovement 5, Common_Movement_WalkInPlaceLeft + applymovement 6, Common_Movement_WalkInPlaceLeft + applymovement 7, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index 529bcd0c33..be11039dfd 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -280,8 +280,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 special CallFrontierUtilFunc applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6 waitmovement 0 - applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 - applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 3, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250412, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 @@ -323,8 +323,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 special CallFrontierUtilFunc applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6 waitmovement 0 - applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 - applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 3, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2506C4, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index bafe61ae66..14e1a5557d 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -260,7 +260,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250ACC:: @ 8250ACC BattleFrontier_BattlePyramidLobby_EventScript_250ACE:: @ 8250ACE lockall - applymovement 2, BattleFrontier_BattlePyramidLobby_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 msgbox BattleFrontier_BattlePyramidLobby_Text_251C3B, MSGBOX_DEFAULT call BattleFrontier_BattlePyramidLobby_EventScript_250AF0 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index b89d2e061d..cf646a3d39 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -233,9 +233,9 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3 applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2725B6 waitmovement 0 playse SE_PIN - applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2421A6 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_2421AB diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc index 73b14fc2e5..545ea04b2b 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc @@ -68,8 +68,8 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_248ED5 waitmovement 0 delay 40 - applymovement 3, BattleFrontier_BattleTowerCorridor2_Movement_2725A6 - applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceUp + applymovement 2, Common_Movement_WalkInPlaceUp waitmovement 0 opendoor 7, 1 waitdooranim diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index 7dbfbbc138..ce0c9b3a48 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -64,7 +64,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41 applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77 waitmovement 0 moveobjectoffscreen 1 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, MSGBOX_DEFAULT special HealPlayerParty @@ -104,7 +104,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D:: @ 8243E9D BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5 msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244149, MSGBOX_DEFAULT closemessage - applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 opendoor 10, 1 waitdooranim diff --git a/data/maps/BattleFrontier_Lounge3/scripts.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc index 6a817d50af..7977e75b4b 100644 --- a/data/maps/BattleFrontier_Lounge3/scripts.inc +++ b/data/maps/BattleFrontier_Lounge3/scripts.inc @@ -198,7 +198,7 @@ BattleFrontier_Lounge3_EventScript_261FE1:: @ 8261FE1 BattleFrontier_Lounge3_EventScript_261FF1:: @ 8261FF1 closemessage - applymovement VAR_LAST_TALKED, BattleFrontier_Lounge3_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/BattleFrontier_Mart/scripts.inc b/data/maps/BattleFrontier_Mart/scripts.inc index 725fce8632..d84b2cb0ad 100644 --- a/data/maps/BattleFrontier_Mart/scripts.inc +++ b/data/maps/BattleFrontier_Mart/scripts.inc @@ -36,7 +36,7 @@ BattleFrontier_Mart_EventScript_267B02:: @ 8267B02 BattleFrontier_Mart_EventScript_267B0B:: @ 8267B0B lock - applymovement 2, BattleFrontier_Mart_Movement_2725B0 + applymovement 2, Common_Movement_FaceDown waitmovement 0 msgbox BattleFrontier_Mart_Text_267B8F, MSGBOX_DEFAULT release diff --git a/data/maps/BattleFrontier_OutsideWest/scripts.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc index da57242597..b2b2a8d415 100644 --- a/data/maps/BattleFrontier_OutsideWest/scripts.inc +++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc @@ -63,7 +63,7 @@ BattleFrontier_OutsideWest_EventScript_23D4AE:: @ 823D4AE BattleFrontier_OutsideWest_EventScript_23D4BA:: @ 823D4BA closemessage - applymovement VAR_LAST_TALKED, BattleFrontier_OutsideWest_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 hideobjectat 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST @@ -105,7 +105,7 @@ BattleFrontier_OutsideWest_EventScript_23D518:: @ 823D518 faceplayer message BattleFrontier_OutsideWest_Text_23DA60 waitmessage - applymovement 18, BattleFrontier_OutsideWest_Movement_2725A0 + applymovement 18, Common_Movement_FaceAwayPlayer waitmovement 0 waitbuttonpress release @@ -126,16 +126,16 @@ BattleFrontier_OutsideWest_EventScript_23D53D:: @ 823D53D end BattleFrontier_OutsideWest_EventScript_23D544:: @ 823D544 - applymovement 9, BattleFrontier_OutsideWest_Movement_2725A8 + applymovement 9, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox BattleFrontier_OutsideWest_Text_23DB7D, MSGBOX_DEFAULT - applymovement 10, BattleFrontier_OutsideWest_Movement_2725A4 + applymovement 10, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox BattleFrontier_OutsideWest_Text_23DBCE, MSGBOX_DEFAULT closemessage delay 25 - applymovement 9, BattleFrontier_OutsideWest_Movement_2725A6 - applymovement 10, BattleFrontier_OutsideWest_Movement_2725A6 + applymovement 9, Common_Movement_WalkInPlaceUp + applymovement 10, Common_Movement_WalkInPlaceUp waitmovement 0 release end @@ -157,7 +157,7 @@ BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F end BattleFrontier_OutsideWest_EventScript_23D5BA:: @ 823D5BA - applymovement 14, BattleFrontier_OutsideWest_Movement_2725A6 + applymovement 14, Common_Movement_WalkInPlaceUp waitmovement 0 return @@ -298,7 +298,7 @@ BattleFrontier_OutsideWest_EventScript_23D6D7:: @ 823D6D7 faceplayer msgbox BattleFrontier_OutsideWest_Text_23E410, MSGBOX_DEFAULT closemessage - applymovement 23, BattleFrontier_OutsideWest_Movement_2725A2 + applymovement 23, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc index 5ed97bd60f..89f0ee8e9c 100644 --- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc +++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc @@ -15,9 +15,9 @@ BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3 lockall setvar VAR_0x40D0, 1 playse SE_PIN - applymovement 1, BattleFrontier_ReceptionGate_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, BattleFrontier_ReceptionGate_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 msgbox BattleFrontier_ReceptionGate_Text_266580, MSGBOX_DEFAULT closemessage @@ -38,14 +38,14 @@ BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229 msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT msgbox BattleFrontier_ReceptionGate_Text_266703, MSGBOX_DEFAULT closemessage - applymovement 1, BattleFrontier_ReceptionGate_Movement_2725A6 - applymovement 2, BattleFrontier_ReceptionGate_Movement_2725A6 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 2, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 1, BattleFrontier_ReceptionGate_Movement_272598 - applymovement 2, BattleFrontier_ReceptionGate_Movement_272598 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark + applymovement 2, Common_Movement_ExclamationMark + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 msgbox BattleFrontier_ReceptionGate_Text_266733, MSGBOX_DEFAULT closemessage diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc index 6f8d6ee4b6..9278252e6d 100644 --- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc +++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc @@ -181,7 +181,7 @@ BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943 compare VAR_FACING, 3 call_if_eq BattleFrontier_ScottsHouse_EventScript_263A34 msgbox BattleFrontier_ScottsHouse_Text_263B29, MSGBOX_DEFAULT - applymovement 1, BattleFrontier_ScottsHouse_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox BattleFrontier_ScottsHouse_Text_263BD4, MSGBOX_DEFAULT compare VAR_0x40D1, 13 @@ -227,22 +227,22 @@ BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8 end BattleFrontier_ScottsHouse_EventScript_263A13:: @ 8263A13 - applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 return BattleFrontier_ScottsHouse_EventScript_263A1E:: @ 8263A1E - applymovement 1, BattleFrontier_ScottsHouse_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return BattleFrontier_ScottsHouse_EventScript_263A29:: @ 8263A29 - applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 return BattleFrontier_ScottsHouse_EventScript_263A34:: @ 8263A34 - applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc index 1a5ef87ecb..5f850ed7be 100644 --- a/data/maps/BirthIsland_Harbor/scripts.inc +++ b/data/maps/BirthIsland_Harbor/scripts.inc @@ -9,7 +9,7 @@ BirthIsland_Harbor_EventScript_26805D:: @ 826805D goto_if_eq BirthIsland_Harbor_EventScript_2680A2 msgbox BirthIsland_Harbor_Text_2A6A5D, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, BirthIsland_Harbor_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 hideobjectat 1, MAP_BIRTH_ISLAND_HARBOR diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc index 371ea1ba53..c36b60111f 100644 --- a/data/maps/CaveOfOrigin_B1F/scripts.inc +++ b/data/maps/CaveOfOrigin_B1F/scripts.inc @@ -6,16 +6,16 @@ CaveOfOrigin_B1F_EventScript_2357A9:: @ 82357A9 faceplayer msgbox CaveOfOrigin_B1F_Text_23586E, MSGBOX_DEFAULT closemessage - applymovement 1, CaveOfOrigin_B1F_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 delay 60 playse SE_PIN - applymovement 1, CaveOfOrigin_B1F_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, CaveOfOrigin_B1F_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 delay 30 - applymovement 1, CaveOfOrigin_B1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 message CaveOfOrigin_B1F_Text_235ACE waitmessage diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index a89b7f0247..22bf5ed6ab 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -53,7 +53,7 @@ DewfordTown_Hall_EventScript_1FD547:: @ 81FD547 call DewfordTown_Hall_EventScript_271E8B msgbox DewfordTown_Hall_Text_1FDA5C, MSGBOX_DEFAULT closemessage - applymovement 4, DewfordTown_Hall_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 release end @@ -64,7 +64,7 @@ DewfordTown_Hall_EventScript_1FD563:: @ 81FD563 call DewfordTown_Hall_EventScript_271E8B msgbox DewfordTown_Hall_Text_1FDA99, MSGBOX_DEFAULT closemessage - applymovement 5, DewfordTown_Hall_Movement_2725A6 + applymovement 5, Common_Movement_WalkInPlaceUp waitmovement 0 release end @@ -200,7 +200,7 @@ DewfordTown_Hall_EventScript_1FD73A:: @ 81FD73A DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B compare VAR_FACING, 4 goto_if_eq DewfordTown_Hall_EventScript_1FD739 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -224,19 +224,19 @@ DewfordTown_Hall_EventScript_1FD793:: @ 81FD793 return DewfordTown_Hall_EventScript_1FD7AA:: @ 81FD7AA - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0 compare VAR_FACING, 3 goto_if_eq DewfordTown_Hall_EventScript_1FD739 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index f1db8df846..31a9b91b84 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -78,9 +78,9 @@ EverGrandeCity_ChampionsRoom_EventScript_228AC6:: @ 8228AC6 msgbox EverGrandeCity_ChampionsRoom_Text_2290CA, MSGBOX_DEFAULT delay 40 playse SE_PIN - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 call EverGrandeCity_ChampionsRoom_EventScript_228C12 msgbox EverGrandeCity_ChampionsRoom_Text_22910B, MSGBOX_DEFAULT @@ -91,9 +91,9 @@ EverGrandeCity_ChampionsRoom_EventScript_228AFB:: @ 8228AFB msgbox EverGrandeCity_ChampionsRoom_Text_229152, MSGBOX_DEFAULT delay 40 playse SE_PIN - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 call EverGrandeCity_ChampionsRoom_EventScript_228C12 msgbox EverGrandeCity_ChampionsRoom_Text_2291A2, MSGBOX_DEFAULT @@ -105,26 +105,26 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 addobject 3 applymovement 3, EverGrandeCity_ChampionsRoom_Movement_228C43 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, MSGBOX_DEFAULT call EverGrandeCity_ChampionsRoom_EventScript_272184 msgbox EverGrandeCity_ChampionsRoom_Text_22934D, MSGBOX_DEFAULT - applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 delay 20 - applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_229399, MSGBOX_DEFAULT closemessage delay 30 applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3B applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228C1D - applymovement 3, EverGrandeCity_ChampionsRoom_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceUp applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C38 waitmovement 0 delay 20 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, MSGBOX_DEFAULT checkplayergender @@ -153,7 +153,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228BF4:: @ 8228BF4 EverGrandeCity_ChampionsRoom_EventScript_228BFD:: @ 8228BFD applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C26 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index ddb9ade89d..04134d30f0 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -20,8 +20,8 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 applymovement 1, EverGrandeCity_HallOfFame_Movement_229901 applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229901 waitmovement 0 - applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_22990E, MSGBOX_DEFAULT closemessage @@ -29,13 +29,13 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229908 waitmovement 0 delay 20 - applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_2299A3, MSGBOX_DEFAULT closemessage - applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A6 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 delay 20 dofieldeffect 62 diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index ce4be66f86..4794fb99e4 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -90,11 +90,11 @@ EverGrandeCity_PokemonLeague_1F_EventScript_2296AE:: @ 82296AE end EverGrandeCity_PokemonLeague_1F_EventScript_2296BB:: @ 82296BB - applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox EverGrandeCity_PokemonLeague_1F_Text_2297EF, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc index 962c4f64e3..2f2ec1b3fb 100644 --- a/data/maps/FallarborTown_House2/scripts.inc +++ b/data/maps/FallarborTown_House2/scripts.inc @@ -3,7 +3,7 @@ FallarborTown_House2_MapScripts:: @ 8201382 FallarborTown_House2_EventScript_201383:: @ 8201383 lockall - applymovement 1, FallarborTown_House2_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 goto_if_set FLAG_TEMP_1, FallarborTown_House2_EventScript_2013A8 msgbox FallarborTown_House2_Text_20145C, MSGBOX_DEFAULT diff --git a/data/maps/FarawayIsland_Entrance/scripts.inc b/data/maps/FarawayIsland_Entrance/scripts.inc index 37c16885f8..7c68dd2466 100644 --- a/data/maps/FarawayIsland_Entrance/scripts.inc +++ b/data/maps/FarawayIsland_Entrance/scripts.inc @@ -24,7 +24,7 @@ FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2 goto_if_eq FarawayIsland_Entrance_EventScript_267CE7 msgbox FarawayIsland_Entrance_Text_2A6A5D, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, FarawayIsland_Entrance_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 hideobjectat 1, MAP_FARAWAY_ISLAND_ENTRANCE diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index a1038edac3..b541ac081f 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -56,9 +56,9 @@ FarawayIsland_Interior_MapScript2_267D98: @ 8267D98 FarawayIsland_Interior_EventScript_267DA2:: @ 8267DA2 lockall playse SE_PIN - applymovement 1, FarawayIsland_Interior_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, FarawayIsland_Interior_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 applymovement 1, FarawayIsland_Interior_Movement_267DCE waitmovement 0 diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc index 43db341d99..5dc9d769ac 100644 --- a/data/maps/FortreeCity_House4/scripts.inc +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -21,14 +21,14 @@ FortreeCity_House4_EventScript_217C8A:: @ 8217C8A end FortreeCity_House4_EventScript_217CC4:: @ 8217CC4 - applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox FortreeCity_House4_Text_217DD2, MSGBOX_DEFAULT releaseall end FortreeCity_House4_EventScript_217CD8:: @ 8217CD8 - applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox FortreeCity_House4_Text_217E05, MSGBOX_DEFAULT giveitem_std ITEM_MENTAL_HERB @@ -39,7 +39,7 @@ FortreeCity_House4_EventScript_217CD8:: @ 8217CD8 end FortreeCity_House4_EventScript_217D06:: @ 8217D06 - applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox FortreeCity_House4_Text_217EA8, MSGBOX_DEFAULT releaseall diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 93788a7032..fd9947ac4c 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -71,27 +71,27 @@ JaggedPass_EventScript_230718:: @ 8230718 goto_if_set FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS, JaggedPass_EventScript_230766 waitse playse SE_PIN - applymovement 5, JaggedPass_Movement_272598 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, JaggedPass_Movement_27259A + applymovement 5, Common_Movement_Delay48 waitmovement 0 - applymovement 5, JaggedPass_Movement_27259E + applymovement 5, Common_Movement_FacePlayer waitmovement 0 msgbox JaggedPass_Text_230CCB, MSGBOX_DEFAULT closemessage trainerbattle_no_intro TRAINER_GRUNT_30, JaggedPass_Text_230D2D setflag FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS - applymovement 5, JaggedPass_Movement_2725A2 + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end JaggedPass_EventScript_230766:: @ 8230766 - applymovement 5, JaggedPass_Movement_27259E + applymovement 5, Common_Movement_FacePlayer waitmovement 0 msgbox JaggedPass_Text_230D65, MSGBOX_DEFAULT closemessage - applymovement 5, JaggedPass_Movement_2725A2 + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index 9109008b27..aaf550d0d4 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -110,12 +110,12 @@ LavaridgeTown_EventScript_1EA635:: @ 81EA635 return LavaridgeTown_EventScript_1EA63A:: @ 81EA63A - applymovement 8, LavaridgeTown_Movement_2725A6 + applymovement 8, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 8, LavaridgeTown_Movement_272598 + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 - applymovement 8, LavaridgeTown_Movement_27259A + applymovement 8, Common_Movement_Delay48 waitmovement 0 return @@ -127,14 +127,14 @@ LavaridgeTown_EventScript_1EA65C:: @ 81EA65C waitmovement 0 closedoor 12, 15 waitdooranim - applymovement 8, LavaridgeTown_Movement_2725A4 + applymovement 8, Common_Movement_WalkInPlaceLeft waitmovement 0 playse SE_PIN - applymovement 8, LavaridgeTown_Movement_272598 + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 - applymovement 8, LavaridgeTown_Movement_27259A + applymovement 8, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LavaridgeTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 5a4ef5d431..02d88bf5a1 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -134,13 +134,13 @@ LilycoveCity_EventScript_1E2CD4:: @ 81E2CD4 LilycoveCity_EventScript_1E2CDD:: @ 81E2CDD lockall msgbox LilycoveCity_Text_1E494D, MSGBOX_NPC - applymovement 20, LilycoveCity_Movement_2725A2 + applymovement 20, Common_Movement_FaceOriginalDirection end LilycoveCity_EventScript_1E2CEE:: @ 81E2CEE lockall msgbox LilycoveCity_Text_1E49F4, MSGBOX_NPC - applymovement 19, LilycoveCity_Movement_2725A2 + applymovement 19, Common_Movement_FaceOriginalDirection end LilycoveCity_EventScript_1E2CFF:: @ 81E2CFF @@ -197,10 +197,10 @@ LilycoveCity_EventScript_1E2D7D:: @ 81E2D7D lockall goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_1E2DB0 msgbox LilycoveCity_Text_1E3D1F, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, LilycoveCity_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_Text_1E3D4A, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, LilycoveCity_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_MET_WAILMER_TRAINER releaseall @@ -387,7 +387,7 @@ LilycoveCity_EventScript_1E2FFD:: @ 81E2FFD LilycoveCity_EventScript_1E3006:: @ 81E3006 closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 50 setfieldeffectargument 0, 1 diff --git a/data/maps/LilycoveCity_ContestHall/scripts.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc index f6a53cc5e5..5823b6da4c 100644 --- a/data/maps/LilycoveCity_ContestHall/scripts.inc +++ b/data/maps/LilycoveCity_ContestHall/scripts.inc @@ -22,7 +22,7 @@ LilycoveCity_ContestHall_EventScript_21B4A9:: @ 821B4A9 faceplayer msgbox LilycoveCity_ContestHall_Text_21B977, MSGBOX_DEFAULT closemessage - applymovement 4, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 4, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -32,7 +32,7 @@ LilycoveCity_ContestHall_EventScript_21B4C0:: @ 821B4C0 faceplayer msgbox LilycoveCity_ContestHall_Text_21B9DC, MSGBOX_DEFAULT closemessage - applymovement 5, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -42,7 +42,7 @@ LilycoveCity_ContestHall_EventScript_21B4D7:: @ 821B4D7 faceplayer msgbox LilycoveCity_ContestHall_Text_21BA44, MSGBOX_DEFAULT closemessage - applymovement 6, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 6, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -52,7 +52,7 @@ LilycoveCity_ContestHall_EventScript_21B4EE:: @ 821B4EE faceplayer msgbox LilycoveCity_ContestHall_Text_21BAD5, MSGBOX_DEFAULT closemessage - applymovement 7, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -62,7 +62,7 @@ LilycoveCity_ContestHall_EventScript_21B505:: @ 821B505 faceplayer msgbox LilycoveCity_ContestHall_Text_21BB84, MSGBOX_DEFAULT closemessage - applymovement 8, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -72,7 +72,7 @@ LilycoveCity_ContestHall_EventScript_21B51C:: @ 821B51C faceplayer msgbox LilycoveCity_ContestHall_Text_21BBDD, MSGBOX_DEFAULT closemessage - applymovement 9, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 9, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -86,7 +86,7 @@ LilycoveCity_ContestHall_EventScript_21B53C:: @ 821B53C faceplayer msgbox LilycoveCity_ContestHall_Text_21BC89, MSGBOX_DEFAULT closemessage - applymovement 12, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 12, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -96,7 +96,7 @@ LilycoveCity_ContestHall_EventScript_21B553:: @ 821B553 faceplayer msgbox LilycoveCity_ContestHall_Text_21BD30, MSGBOX_DEFAULT closemessage - applymovement 22, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 22, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -106,7 +106,7 @@ LilycoveCity_ContestHall_EventScript_21B56A:: @ 821B56A faceplayer msgbox LilycoveCity_ContestHall_Text_21BD70, MSGBOX_DEFAULT closemessage - applymovement 11, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 11, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -116,7 +116,7 @@ LilycoveCity_ContestHall_EventScript_21B581:: @ 821B581 faceplayer msgbox LilycoveCity_ContestHall_Text_21BDDD, MSGBOX_DEFAULT closemessage - applymovement 13, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 13, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -126,7 +126,7 @@ LilycoveCity_ContestHall_EventScript_21B598:: @ 821B598 faceplayer msgbox LilycoveCity_ContestHall_Text_21BE16, MSGBOX_DEFAULT closemessage - applymovement 14, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 14, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -136,7 +136,7 @@ LilycoveCity_ContestHall_EventScript_21B5AF:: @ 821B5AF faceplayer msgbox LilycoveCity_ContestHall_Text_21BE77, MSGBOX_DEFAULT closemessage - applymovement 15, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 15, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -146,7 +146,7 @@ LilycoveCity_ContestHall_EventScript_21B5C6:: @ 821B5C6 faceplayer msgbox LilycoveCity_ContestHall_Text_21BEDE, MSGBOX_DEFAULT closemessage - applymovement 16, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 16, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -156,7 +156,7 @@ LilycoveCity_ContestHall_EventScript_21B5DD:: @ 821B5DD faceplayer msgbox LilycoveCity_ContestHall_Text_21BF6E, MSGBOX_DEFAULT closemessage - applymovement 17, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 17, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -166,7 +166,7 @@ LilycoveCity_ContestHall_EventScript_21B5F4:: @ 821B5F4 faceplayer msgbox LilycoveCity_ContestHall_Text_21BFE3, MSGBOX_DEFAULT closemessage - applymovement 18, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 18, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -176,7 +176,7 @@ LilycoveCity_ContestHall_EventScript_21B60B:: @ 821B60B faceplayer msgbox LilycoveCity_ContestHall_Text_21C07F, MSGBOX_DEFAULT closemessage - applymovement 19, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 19, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -186,7 +186,7 @@ LilycoveCity_ContestHall_EventScript_21B622:: @ 821B622 faceplayer msgbox LilycoveCity_ContestHall_Text_21C0D8, MSGBOX_DEFAULT closemessage - applymovement 21, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 21, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -196,7 +196,7 @@ LilycoveCity_ContestHall_EventScript_21B639:: @ 821B639 faceplayer msgbox LilycoveCity_ContestHall_Text_21C137, MSGBOX_DEFAULT closemessage - applymovement 20, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 20, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -206,7 +206,7 @@ LilycoveCity_ContestHall_EventScript_21B650:: @ 821B650 faceplayer msgbox LilycoveCity_ContestHall_Text_21C1A4, MSGBOX_DEFAULT closemessage - applymovement 23, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 23, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -216,7 +216,7 @@ LilycoveCity_ContestHall_EventScript_21B667:: @ 821B667 faceplayer msgbox LilycoveCity_ContestHall_Text_21C215, MSGBOX_DEFAULT closemessage - applymovement 24, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 24, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -226,7 +226,7 @@ LilycoveCity_ContestHall_EventScript_21B67E:: @ 821B67E faceplayer msgbox LilycoveCity_ContestHall_Text_21C27F, MSGBOX_DEFAULT closemessage - applymovement 25, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 25, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -236,7 +236,7 @@ LilycoveCity_ContestHall_EventScript_21B695:: @ 821B695 faceplayer msgbox LilycoveCity_ContestHall_Text_21C2BB, MSGBOX_DEFAULT closemessage - applymovement 26, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 26, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -246,7 +246,7 @@ LilycoveCity_ContestHall_EventScript_21B6AC:: @ 821B6AC faceplayer msgbox LilycoveCity_ContestHall_Text_21C307, MSGBOX_DEFAULT closemessage - applymovement 27, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 27, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -256,18 +256,18 @@ LilycoveCity_ContestHall_EventScript_21B6C3:: @ 821B6C3 faceplayer msgbox LilycoveCity_ContestHall_Text_21C365, MSGBOX_DEFAULT closemessage - applymovement 28, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 28, Common_Movement_FaceOriginalDirection waitmovement 0 release end LilycoveCity_ContestHall_EventScript_21B6DA:: @ 821B6DA lockall - applymovement 29, LilycoveCity_ContestHall_Movement_27259E + applymovement 29, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_ContestHall_Text_21C3F4, MSGBOX_DEFAULT closemessage - applymovement 29, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 29, Common_Movement_FaceOriginalDirection waitmovement 0 delay 25 msgbox LilycoveCity_ContestHall_Text_21C411, MSGBOX_DEFAULT @@ -279,7 +279,7 @@ LilycoveCity_ContestHall_EventScript_21B705:: @ 821B705 faceplayer msgbox LilycoveCity_ContestHall_Text_21C4B1, MSGBOX_DEFAULT closemessage - applymovement 31, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 31, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -289,7 +289,7 @@ LilycoveCity_ContestHall_EventScript_21B71C:: @ 821B71C faceplayer msgbox LilycoveCity_ContestHall_Text_21C445, MSGBOX_DEFAULT closemessage - applymovement 30, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 30, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index f57aae096e..ae276cf9c3 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -86,7 +86,7 @@ LilycoveCity_ContestLobby_EventScript_21A314:: @ 821A314 applymovement 4, LilycoveCity_ContestLobby_Movement_21A41A waitmovement 0 playse SE_PIN - applymovement 4, LilycoveCity_ContestLobby_Movement_272598 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 applymovement 4, LilycoveCity_ContestLobby_Movement_21A41E waitmovement 0 @@ -259,7 +259,7 @@ LilycoveCity_ContestLobby_EventScript_21A4E4:: @ 821A4E4 applymovement 11, LilycoveCity_ContestLobby_Movement_21A547 waitmovement 0 playse SE_PIN - applymovement 11, LilycoveCity_ContestLobby_Movement_272598 + applymovement 11, Common_Movement_ExclamationMark waitmovement 0 applymovement 11, LilycoveCity_ContestLobby_Movement_21A54B waitmovement 0 @@ -614,7 +614,7 @@ LilycoveCity_ContestLobby_EventScript_21A7E9:: @ 821A7E9 LilycoveCity_ContestLobby_EventScript_21A7F9:: @ 821A7F9 closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_ContestLobby_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc index 7ccc8b82fa..87e4c0afdb 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc @@ -6,33 +6,33 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_218189:: @ 8218189 goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3 msgbox LilycoveCity_CoveLilyMotel_1F_Text_218264, MSGBOX_DEFAULT - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_21831E, MSGBOX_DEFAULT closemessage - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3:: @ 82181C3 msgbox LilycoveCity_CoveLilyMotel_1F_Text_2183C3, MSGBOX_DEFAULT - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_218470, MSGBOX_DEFAULT closemessage - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA:: @ 82181EA msgbox LilycoveCity_CoveLilyMotel_1F_Text_218544, MSGBOX_DEFAULT - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_2185F4, MSGBOX_DEFAULT closemessage - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -40,11 +40,11 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA:: @ 82181EA LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211 lockall playse SE_PIN - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_CoveLilyMotel_1F_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_21839B, MSGBOX_DEFAULT closemessage diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc index 80a93df47e..18fc0404bf 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc @@ -114,7 +114,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2207E0:: @ 82207E0 LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5 special sub_8139C10 closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 waitse special ShakeScreenInElevator diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc index ffa2244f4c..ec1d89b66f 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc @@ -22,7 +22,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C copyvar VAR_0x8008, VAR_RESULT special BufferLottoTicketNumber msgbox LilycoveCity_DepartmentStore_1F_Text_2A650B, MSGBOX_DEFAULT - applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 playse SE_PC_ON special DoLotteryCornerComputerEffect @@ -30,7 +30,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C delay 220 special EndLotteryCornerComputerEffect delay 10 - applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x8004, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7A1 diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc index b278d3e141..899ea98f04 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -123,7 +123,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_22006C:: @ 822006C LilycoveCity_DepartmentStore_5F_EventScript_220075:: @ 8220075 lockall - applymovement 7, LilycoveCity_DepartmentStore_5F_Movement_27259E + applymovement 7, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 0 goto_if_eq LilycoveCity_DepartmentStore_5F_EventScript_22009C @@ -141,7 +141,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_22009C:: @ 822009C LilycoveCity_DepartmentStore_5F_EventScript_2200A7:: @ 82200A7 msgbox LilycoveCity_DepartmentStore_5F_Text_2201C4, MSGBOX_DEFAULT closemessage - applymovement 7, LilycoveCity_DepartmentStore_5F_Movement_2725A6 + applymovement 7, Common_Movement_WalkInPlaceUp waitmovement 0 releaseall end diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 5e91578262..c1126d5753 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -246,12 +246,12 @@ LilycoveCity_Harbor_EventScript_21E350:: @ 821E350 call LilycoveCity_Harbor_EventScript_21E4EE msgbox LilycoveCity_Harbor_Text_2C68A5, MSGBOX_DEFAULT closemessage - applymovement 4, LilycoveCity_Harbor_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 4, LilycoveCity_Harbor_Movement_272598 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 - applymovement 4, LilycoveCity_Harbor_Movement_27259A + applymovement 4, Common_Movement_Delay48 waitmovement 0 compare VAR_FACING, 2 call_if_eq LilycoveCity_Harbor_EventScript_21E656 @@ -328,12 +328,12 @@ LilycoveCity_Harbor_EventScript_21E44D:: @ 821E44D LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6 msgbox LilycoveCity_Harbor_Text_2A6A82, MSGBOX_DEFAULT closemessage - applymovement 4, LilycoveCity_Harbor_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 delay 30 removeobject 4 delay 30 - applymovement 1, LilycoveCity_Harbor_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 showobjectat 1, MAP_LILYCOVE_CITY_HARBOR delay 30 @@ -342,19 +342,19 @@ LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6 end LilycoveCity_Harbor_EventScript_21E4EE:: @ 821E4EE - applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR delay 60 addobject 4 delay 30 - applymovement 4, LilycoveCity_Harbor_Movement_27259E + applymovement 4, Common_Movement_FacePlayer waitmovement 0 return LilycoveCity_Harbor_EventScript_21E514:: @ 821E514 - applymovement 4, LilycoveCity_Harbor_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 delay 30 removeobject 4 @@ -415,7 +415,7 @@ LilycoveCity_Harbor_EventScript_21E5C0:: @ 821E5C0 LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC msgbox LilycoveCity_Harbor_Text_21E89D, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR @@ -494,22 +494,22 @@ LilycoveCity_Harbor_Movement_21E671: @ 821E671 step_end LilycoveCity_Harbor_EventScript_21E675:: @ 821E675 - applymovement 5, LilycoveCity_Harbor_Movement_2725A4 + applymovement 5, Common_Movement_WalkInPlaceLeft waitmovement 0 return LilycoveCity_Harbor_EventScript_21E680:: @ 821E680 - applymovement 5, LilycoveCity_Harbor_Movement_2725AA + applymovement 5, Common_Movement_WalkInPlaceDown waitmovement 0 return LilycoveCity_Harbor_EventScript_21E68B:: @ 821E68B - applymovement 5, LilycoveCity_Harbor_Movement_2725AA + applymovement 5, Common_Movement_WalkInPlaceDown waitmovement 0 return LilycoveCity_Harbor_EventScript_21E696:: @ 821E696 - applymovement 5, LilycoveCity_Harbor_Movement_2725A4 + applymovement 5, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc index 644c501135..3f5b349d27 100644 --- a/data/maps/LilycoveCity_House3/scripts.inc +++ b/data/maps/LilycoveCity_House3/scripts.inc @@ -15,7 +15,7 @@ LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B goto_if_eq LilycoveCity_House3_EventScript_21EE75 msgbox LilycoveCity_House3_Text_21F0F8, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -23,7 +23,7 @@ LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B LilycoveCity_House3_EventScript_21EE75:: @ 821EE75 msgbox LilycoveCity_House3_Text_21F0A9, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -33,7 +33,7 @@ LilycoveCity_House3_EventScript_21EE8A:: @ 821EE8A faceplayer msgbox LilycoveCity_House3_Text_21F430, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc index 89ac90dc68..8f2cdde28d 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc @@ -7,7 +7,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9:: @ 8218CB9 LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2:: @ 8218CC2 lockall - applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_27259E + applymovement 2, Common_Movement_FacePlayer message LilycoveCity_LilycoveMuseum_1F_Text_218EBC waitmessage multichoice 20, 8, 16, 1 @@ -154,7 +154,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B:: @ 8218E2B faceplayer msgbox LilycoveCity_LilycoveMuseum_1F_Text_2195FF, MSGBOX_DEFAULT closemessage - applymovement 8, LilycoveCity_LilycoveMuseum_1F_Movement_2725A2 + applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index 204b2cee3b..0669b74613 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -62,7 +62,7 @@ LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE: @ 82197FE LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808 lockall - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219861 waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_2199EB, MSGBOX_SIGN @@ -71,7 +71,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808 applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219863 waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_219A0D, MSGBOX_SIGN - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219861 waitmovement 0 @@ -107,7 +107,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA:: @ 82198BA end LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3:: @ 82198C3 - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DD4, MSGBOX_DEFAULT applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863 @@ -116,7 +116,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3:: @ 82198C3 end LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EC5, MSGBOX_DEFAULT givedecoration_std 44 compare VAR_RESULT, 0 diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc index c5c2188e52..e94fa43f12 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc @@ -3,7 +3,7 @@ LilycoveCity_MoveDeletersHouse_MapScripts:: @ 821EA0A LilycoveCity_MoveDeletersHouse_EventScript_21EA0B:: @ 821EA0B lockall - applymovement 1, LilycoveCity_MoveDeletersHouse_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_MoveDeletersHouse_Text_21EAFD, MSGBOX_YESNO switch VAR_RESULT diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index 77bc40635b..698ef95f24 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -9,18 +9,18 @@ LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790 LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A lockall - applymovement 1, LilycoveCity_PokemonTrainerFanClub_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF00, MSGBOX_DEFAULT applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_PokemonTrainerFanClub_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, MSGBOX_DEFAULT applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C804 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_PokemonTrainerFanClub_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C807 waitmovement 0 diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index c7bb25ba77..e4b69eb133 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -186,7 +186,7 @@ LittlerootTown_Movement_1E7FAC: @ 81E7FAC LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1 lockall playse SE_PIN - applymovement 8, LittlerootTown_Movement_272598 + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 delay 80 msgbox LittlerootTown_Text_1E8DA2, MSGBOX_DEFAULT @@ -246,7 +246,7 @@ LittlerootTown_EventScript_1E805D:: @ 81E805D special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT closemessage - applymovement 1, LittlerootTown_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 setvar VAR_0x4050, 2 release @@ -357,14 +357,14 @@ LittlerootTown_Movement_1E8118: @ 81E8118 LittlerootTown_EventScript_1E811F:: @ 81E811F lockall - applymovement 1, LittlerootTown_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT closemessage - applymovement 1, LittlerootTown_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 setvar VAR_0x4050, 2 releaseall @@ -490,12 +490,12 @@ LittlerootTown_EventScript_1E828C:: @ 81E828C return LittlerootTown_EventScript_1E8297:: @ 81E8297 - applymovement 4, LittlerootTown_Movement_2725A8 + applymovement 4, Common_Movement_WalkInPlaceRight waitmovement 0 return LittlerootTown_EventScript_1E82A2:: @ 81E82A2 - applymovement 4, LittlerootTown_Movement_2725A4 + applymovement 4, Common_Movement_WalkInPlaceLeft waitmovement 0 return @@ -530,70 +530,70 @@ LittlerootTown_EventScript_1E82F0:: @ 81E82F0 return LittlerootTown_EventScript_1E8333:: @ 81E8333 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85D1 waitmovement 0 return LittlerootTown_EventScript_1E8348:: @ 81E8348 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85D8 waitmovement 0 return LittlerootTown_EventScript_1E835D:: @ 81E835D - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85DF waitmovement 0 return LittlerootTown_EventScript_1E8372:: @ 81E8372 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85E4 waitmovement 0 return LittlerootTown_EventScript_1E8387:: @ 81E8387 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85EA waitmovement 0 return LittlerootTown_EventScript_1E839C:: @ 81E839C - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85ED waitmovement 0 return LittlerootTown_EventScript_1E83B1:: @ 81E83B1 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F1 waitmovement 0 return LittlerootTown_EventScript_1E83C6:: @ 81E83C6 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F5 waitmovement 0 return LittlerootTown_EventScript_1E83DB:: @ 81E83DB - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F8 waitmovement 0 return LittlerootTown_EventScript_1E83F0:: @ 81E83F0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85FE waitmovement 0 @@ -894,7 +894,7 @@ LittlerootTown_EventScript_1E863D:: @ 81E863D compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_EventScript_1E828C call LittlerootTown_EventScript_1E8693 - applymovement 4, LittlerootTown_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 42cfe308b3..13736130f9 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -90,11 +90,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F784D:: @ 81F784D LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E lockall playse SE_PIN - applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_272598 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 - applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_27259A + applymovement 4, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C waitmovement 0 special GetRivalSonDaughterString @@ -117,7 +117,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78A3:: @ 81F78A3 lockall setvar VAR_0x8004, 1 setvar VAR_0x8005, 0 - applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceLeft waitmovement 0 goto LittlerootTown_BrendansHouse_1F_EventScript_292765 end @@ -146,9 +146,9 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 addobject 7 delay 30 playse SE_PIN - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_272598 + applymovement 7, Common_Movement_ExclamationMark waitmovement 0 - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_27259A + applymovement 7, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 1 call_if_ne LittlerootTown_BrendansHouse_1F_EventScript_1F7981 @@ -181,7 +181,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 end LittlerootTown_BrendansHouse_1F_EventScript_1F7981:: @ 81F7981 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index ca57959de6..9758ba2503 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -67,9 +67,9 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85BC waitmovement 0 playse SE_PIN - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 delay 10 playbgm MUS_BOY_SUP, 1 @@ -93,7 +93,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage @@ -105,7 +105,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507 LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85D7 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage @@ -117,7 +117,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536 LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85E8 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage @@ -129,7 +129,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565 LittlerootTown_BrendansHouse_2F_EventScript_1F8594:: @ 81F8594 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85FD waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 36bda7e036..8f40d7c13f 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -90,11 +90,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1F899D:: @ 81F899D LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE lockall playse SE_PIN - applymovement 4, LittlerootTown_MaysHouse_1F_Movement_272598 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 - applymovement 4, LittlerootTown_MaysHouse_1F_Movement_27259A + applymovement 4, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC waitmovement 0 special GetRivalSonDaughterString @@ -154,7 +154,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A4C:: @ 81F8A4C lockall setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 - applymovement VAR_0x8004, LittlerootTown_MaysHouse_1F_Movement_2725A8 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceRight waitmovement 0 goto LittlerootTown_MaysHouse_1F_EventScript_292765 end @@ -183,9 +183,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B addobject 7 delay 30 playse SE_PIN - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_272598 + applymovement 7, Common_Movement_ExclamationMark waitmovement 0 - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_27259A + applymovement 7, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 1 call_if_ne LittlerootTown_MaysHouse_1F_EventScript_1F8B2A @@ -218,7 +218,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B end LittlerootTown_MaysHouse_1F_EventScript_1F8B2A:: @ 81F8B2A - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index 353437ad4f..b946201efb 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -68,9 +68,9 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F946F waitmovement 0 playse SE_PIN - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 delay 10 playbgm MUS_GIRL_SUP, 1 @@ -94,7 +94,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9473 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage @@ -106,7 +106,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage @@ -118,7 +118,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9 LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F949D waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage @@ -129,7 +129,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418 LittlerootTown_MaysHouse_2F_EventScript_1F9440:: @ 81F9440 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94AD waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage @@ -268,7 +268,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F94ED:: @ 81F94ED end LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7 - applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 checkplayergender compare VAR_RESULT, MALE diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 5565d2934c..1bf27c0bd0 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -167,8 +167,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 delay 10 playse SE_TK_KASYA delay 20 - applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A4 + applymovement 3, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 checkplayergender compare VAR_RESULT, MALE @@ -180,8 +180,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 delay 20 applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F58 waitmovement 0 - applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_2725A6 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, MSGBOX_DEFAULT playfanfare MUS_FANFA4 @@ -286,7 +286,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB release compare VAR_0x40D3, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 - applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 drawmonpic SPECIES_CYNDAQUIL, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, MSGBOX_YESNO @@ -299,7 +299,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF release compare VAR_0x40D3, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 - applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 drawmonpic SPECIES_TOTODILE, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, MSGBOX_YESNO @@ -312,7 +312,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023 release compare VAR_0x40D3, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 - applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 drawmonpic SPECIES_CHIKORITA, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, MSGBOX_YESNO @@ -530,7 +530,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 closemessage applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 checkplayergender compare VAR_RESULT, MALE diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index ba585c98a3..f43222d151 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -18,7 +18,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 playfanfare MUS_ME_TAMA playse SE_TAMA special sub_80B0534 - applymovement EVENT_OBJ_ID_PLAYER, MagmaHideout_4F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 delay 150 removeobject 7 @@ -50,10 +50,10 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 waitmovement 0 msgbox MagmaHideout_4F_Text_23AADA, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, MagmaHideout_4F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 delay 30 - applymovement 6, MagmaHideout_4F_Movement_27259E + applymovement 6, Common_Movement_FacePlayer waitmovement 0 msgbox MagmaHideout_4F_Text_23AB33, MSGBOX_DEFAULT closemessage diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index aae89cb8a2..c2c90d5c2f 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -25,7 +25,7 @@ MarineCave_End_EventScript_23B012:: @ 823B012 MarineCave_End_EventScript_23B01B:: @ 823B01B lockall - applymovement EVENT_OBJ_ID_PLAYER, MarineCave_End_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 1, MarineCave_End_Movement_23B09D waitmovement 0 diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 454adb60d1..6c2ae69fc9 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -70,7 +70,7 @@ MauvilleCity_EventScript_1DF41D:: @ 81DF41D goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF43D msgbox MauvilleCity_Text_1DF7DC, MSGBOX_DEFAULT closemessage - applymovement 7, MauvilleCity_Movement_2725A2 + applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -78,7 +78,7 @@ MauvilleCity_EventScript_1DF41D:: @ 81DF41D MauvilleCity_EventScript_1DF43D:: @ 81DF43D msgbox MauvilleCity_Text_1DFAA5, MSGBOX_DEFAULT closemessage - applymovement 7, MauvilleCity_Movement_2725A2 + applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -86,17 +86,17 @@ MauvilleCity_EventScript_1DF43D:: @ 81DF43D MauvilleCity_EventScript_1DF452:: @ 81DF452 lockall goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF690 - applymovement 6, MauvilleCity_Movement_2725A8 + applymovement 6, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox MauvilleCity_Text_1DF845, MSGBOX_DEFAULT msgbox MauvilleCity_Text_1DF8B9, MSGBOX_DEFAULT msgbox MauvilleCity_Text_1DF963, MSGBOX_DEFAULT - applymovement 6, MauvilleCity_Movement_27259E + applymovement 6, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement 6, MauvilleCity_Movement_272598 + applymovement 6, Common_Movement_ExclamationMark waitmovement 0 - applymovement 6, MauvilleCity_Movement_27259A + applymovement 6, Common_Movement_Delay48 waitmovement 0 msgbox MauvilleCity_Text_1DF9B2, MSGBOX_YESNO goto MauvilleCity_EventScript_1DF4AD @@ -118,7 +118,7 @@ MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0 applymovement 6, MauvilleCity_Movement_1DF6A8 applymovement 7, MauvilleCity_Movement_1DF6E2 waitmovement 0 - applymovement 6, MauvilleCity_Movement_2725A8 + applymovement 6, Common_Movement_WalkInPlaceRight waitmovement 0 delay 30 applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6EE @@ -138,7 +138,7 @@ MauvilleCity_EventScript_1DF53D:: @ 81DF53D applymovement 6, MauvilleCity_Movement_1DF6AE applymovement 7, MauvilleCity_Movement_1DF6E8 waitmovement 0 - applymovement 6, MauvilleCity_Movement_2725A8 + applymovement 6, Common_Movement_WalkInPlaceRight waitmovement 0 delay 30 applymovement 7, MauvilleCity_Movement_1DF6F7 @@ -164,7 +164,7 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593 call_if_eq MauvilleCity_EventScript_1DF5F3 compare VAR_FACING, 4 call_if_eq MauvilleCity_EventScript_1DF601 - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT closemessage @@ -205,13 +205,13 @@ MauvilleCity_EventScript_1DF628:: @ 81DF628 MauvilleCity_EventScript_1DF63A:: @ 81DF63A msgbox MauvilleCity_Text_1DFB6D, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_1DFB96 - applymovement 6, MauvilleCity_Movement_2725A8 + applymovement 6, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox MauvilleCity_Text_1DFBC3, MSGBOX_DEFAULT - applymovement 6, MauvilleCity_Movement_27259E + applymovement 6, Common_Movement_FacePlayer waitmovement 0 msgbox MauvilleCity_Text_1DFBED, MSGBOX_DEFAULT - applymovement 6, MauvilleCity_Movement_2725A8 + applymovement 6, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox MauvilleCity_Text_1DFC8A, MSGBOX_DEFAULT return @@ -223,7 +223,7 @@ MauvilleCity_EventScript_1DF683:: @ 81DF683 end MauvilleCity_EventScript_1DF690:: @ 81DF690 - applymovement 6, MauvilleCity_Movement_27259E + applymovement 6, Common_Movement_FacePlayer waitmovement 0 msgbox MauvilleCity_Text_1DFB42, MSGBOX_YESNO goto MauvilleCity_EventScript_1DF4AD diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index 3b1a5fe084..88b1ded163 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -513,7 +513,7 @@ MauvilleCity_GameCorner_EventScript_210299:: @ 8210299 MauvilleCity_GameCorner_EventScript_2102A9:: @ 82102A9 closemessage - applymovement VAR_LAST_TALKED, MauvilleCity_GameCorner_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/MauvilleCity_House2/scripts.inc b/data/maps/MauvilleCity_House2/scripts.inc index c49052914f..b683b8c155 100644 --- a/data/maps/MauvilleCity_House2/scripts.inc +++ b/data/maps/MauvilleCity_House2/scripts.inc @@ -14,9 +14,9 @@ MauvilleCity_House2_EventScript_210C5D:: @ 8210C5D MauvilleCity_House2_EventScript_210C82:: @ 8210C82 playse SE_PIN - applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_272598 + applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_27259A + applymovement VAR_LAST_TALKED, Common_Movement_Delay48 waitmovement 0 msgbox MauvilleCity_House2_Text_210D76, MSGBOX_YESNO compare VAR_RESULT, 1 diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index ea161ba232..466b1ee3ba 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -16,20 +16,20 @@ MeteorFalls_1F_1R_EventScript_22BD3A:: @ 822BD3A MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F lockall playbgm MUS_MGM0, 0 - applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_2725B0 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceDown waitmovement 0 delay 30 applymovement 5, MeteorFalls_1F_1R_Movement_2725B4 waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22BF47, MSGBOX_DEFAULT closemessage - applymovement 5, MeteorFalls_1F_1R_Movement_2725A6 - applymovement 6, MeteorFalls_1F_1R_Movement_2725A6 + applymovement 5, Common_Movement_WalkInPlaceUp + applymovement 6, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 5, MeteorFalls_1F_1R_Movement_272598 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, MeteorFalls_1F_1R_Movement_27259A + applymovement 5, Common_Movement_Delay48 waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22BF84, MSGBOX_DEFAULT closemessage @@ -37,9 +37,9 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22BFE4, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_2725A4 - applymovement 5, MeteorFalls_1F_1R_Movement_2725A4 - applymovement 6, MeteorFalls_1F_1R_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement 5, Common_Movement_WalkInPlaceLeft + applymovement 6, Common_Movement_WalkInPlaceLeft waitmovement 0 addobject 7 addobject 8 @@ -49,8 +49,8 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F applymovement 8, MeteorFalls_1F_1R_Movement_22BEE0 applymovement 9, MeteorFalls_1F_1R_Movement_22BEE8 waitmovement 0 - applymovement 5, MeteorFalls_1F_1R_Movement_2725A4 - applymovement 6, MeteorFalls_1F_1R_Movement_2725A4 + applymovement 5, Common_Movement_WalkInPlaceLeft + applymovement 6, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C04E, MSGBOX_DEFAULT closemessage @@ -68,10 +68,10 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F applymovement 9, MeteorFalls_1F_1R_Movement_22BF18 waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C268, MSGBOX_DEFAULT - applymovement 7, MeteorFalls_1F_1R_Movement_2725AA + applymovement 7, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C292, MSGBOX_DEFAULT - applymovement 7, MeteorFalls_1F_1R_Movement_2725A4 + applymovement 7, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C2FC, MSGBOX_DEFAULT closemessage diff --git a/data/maps/MeteorFalls_StevensCave/scripts.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc index ba8d807c5b..31baad43c4 100644 --- a/data/maps/MeteorFalls_StevensCave/scripts.inc +++ b/data/maps/MeteorFalls_StevensCave/scripts.inc @@ -6,11 +6,11 @@ MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182 goto_if_set FLAG_DEFEATED_METEOR_FALLS_STEVEN, MeteorFalls_StevensCave_EventScript_23B1CD waitse playse SE_PIN - applymovement 1, MeteorFalls_StevensCave_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, MeteorFalls_StevensCave_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 - applymovement 1, MeteorFalls_StevensCave_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox MeteorFalls_StevensCave_Text_23B1E1, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_STEVEN, MeteorFalls_StevensCave_Text_23B32D @@ -20,7 +20,7 @@ MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182 end MeteorFalls_StevensCave_EventScript_23B1CD:: @ 823B1CD - applymovement 1, MeteorFalls_StevensCave_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox MeteorFalls_StevensCave_Text_23B358, MSGBOX_DEFAULT release diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index 3e4da5776c..3e2bd4cf9c 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -216,7 +216,7 @@ MossdeepCity_EventScript_1E4C10:: @ 81E4C10 lock faceplayer msgbox MossdeepCity_Text_1E5213, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index b20524262f..662774d64f 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -60,7 +60,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8 compare VAR_RESULT, 1 call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_22301B closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -82,7 +82,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024 compare VAR_RESULT, 1 call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_22305A closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight waitmovement 0 release end @@ -106,7 +106,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063 MossdeepCity_SpaceCenter_1F_EventScript_22307A:: @ 822307A msgbox MossdeepCity_SpaceCenter_1F_Text_2234B7, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight waitmovement 0 release end @@ -139,14 +139,14 @@ MossdeepCity_SpaceCenter_1F_EventScript_2230DA:: @ 82230DA goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight waitmovement 0 release end MossdeepCity_SpaceCenter_1F_EventScript_223119:: @ 8223119 msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight waitmovement 0 release end @@ -186,7 +186,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223168:: @ 8223168 MossdeepCity_SpaceCenter_1F_EventScript_22318F:: @ 822318F msgbox MossdeepCity_SpaceCenter_1F_Text_22375B, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -194,7 +194,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22318F:: @ 822318F MossdeepCity_SpaceCenter_1F_EventScript_2231A4:: @ 82231A4 msgbox MossdeepCity_SpaceCenter_1F_Text_2237B5, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -203,7 +203,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_2231B9:: @ 82231B9 lock faceplayer msgbox MossdeepCity_SpaceCenter_1F_Text_223849, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 0602c9dad1..bfc33a10f5 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -32,9 +32,9 @@ MossdeepCity_SpaceCenter_2F_MapScript2_223DB5: @ 8223DB5 MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF playse SE_PIN - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_272598 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_27259A + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48 waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2243A4, MSGBOX_YESNO compare VAR_RESULT, 1 @@ -57,13 +57,13 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09 trainerbattle_no_intro TRAINER_GRUNT_34, MossdeepCity_SpaceCenter_2F_Text_224461 applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_223E85 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_22446E, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_35, MossdeepCity_SpaceCenter_2F_Text_224499 applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_223E81 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2244AB, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_36, MossdeepCity_SpaceCenter_2F_Text_2244F1 @@ -173,7 +173,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F59:: @ 8223F59 lock faceplayer msgbox MossdeepCity_SpaceCenter_2F_Text_2245D9, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -231,20 +231,20 @@ MossdeepCity_SpaceCenter_2F_Movement_223FCF: @ 8223FCF step_end MossdeepCity_SpaceCenter_2F_EventScript_223FDA:: @ 8223FDA - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2247FF, MSGBOX_YESNO compare VAR_RESULT, 1 goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_22400C msgbox MossdeepCity_SpaceCenter_2F_Text_224854, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 releaseall end MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 special SavePlayerParty fadescreen 1 @@ -277,12 +277,12 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 msgbox MossdeepCity_SpaceCenter_2F_Text_2248C2, MSGBOX_DEFAULT closemessage delay 20 - applymovement 9, MossdeepCity_SpaceCenter_2F_Movement_2725A4 - applymovement 8, MossdeepCity_SpaceCenter_2F_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceLeft + applymovement 8, Common_Movement_WalkInPlaceDown waitmovement 0 delay 60 - applymovement 9, MossdeepCity_SpaceCenter_2F_Movement_2725A6 - applymovement 8, MossdeepCity_SpaceCenter_2F_Movement_2725A8 + applymovement 9, Common_Movement_WalkInPlaceUp + applymovement 8, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, MSGBOX_DEFAULT diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 16da558c8d..d669302922 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -28,12 +28,12 @@ MossdeepCity_StevensHouse_MapScript2_2227C0: @ 82227C0 MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA lockall - applymovement 1, MossdeepCity_StevensHouse_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 playse SE_PIN - applymovement 1, MossdeepCity_StevensHouse_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, MossdeepCity_StevensHouse_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 applymovement 1, MossdeepCity_StevensHouse_Movement_222833 waitmovement 0 diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index aa1d947be1..7282ca944d 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -17,7 +17,7 @@ MtChimney_EventScript_22EDD5:: @ 822EDD5 call_if_unset FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_22EDF9 call_if_set FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_22EE02 closemessage - applymovement 1, MtChimney_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_EVIL_LEADER_PLEASE_STOP release @@ -35,12 +35,12 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B lockall playbgm MUS_MGM0, 0 msgbox MtChimney_Text_22F26A, MSGBOX_DEFAULT - applymovement 2, MtChimney_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement 2, MtChimney_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, MtChimney_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 msgbox MtChimney_Text_22F32E, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_MAXIE_2, MtChimney_Text_22F5CF @@ -60,7 +60,7 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B call_if_eq MtChimney_EventScript_22EEC7 compare VAR_FACING, 2 call_if_eq MtChimney_EventScript_22EED2 - applymovement EVENT_OBJ_ID_PLAYER, MtChimney_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox MtChimney_Text_22FC3D, MSGBOX_DEFAULT closemessage diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 6eaf6265f0..6b9805fbf4 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -32,9 +32,9 @@ MtPyre_Summit_EventScript_232030:: @ 8232030 MtPyre_Summit_EventScript_23203C:: @ 823203C playbgm MUS_AQA_0, 0 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725AA + applymovement 2, Common_Movement_WalkInPlaceDown waitmovement 0 delay 50 compare VAR_0x8008, 0 @@ -86,7 +86,7 @@ MtPyre_Summit_EventScript_2320EC:: @ 82320EC MtPyre_Summit_EventScript_2320F7:: @ 82320F7 applymovement 3, MtPyre_Summit_Movement_23212C waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -98,7 +98,7 @@ MtPyre_Summit_EventScript_23210C:: @ 823210C MtPyre_Summit_EventScript_232117:: @ 8232117 applymovement 3, MtPyre_Summit_Movement_232132 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return @@ -207,7 +207,7 @@ MtPyre_Summit_EventScript_232204:: @ 8232204 end MtPyre_Summit_EventScript_232210:: @ 8232210 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 delay 60 compare VAR_0x8008, 0 @@ -217,9 +217,9 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 compare VAR_0x8008, 2 call_if_eq MtPyre_Summit_EventScript_2322F6 playse SE_PIN - applymovement 8, MtPyre_Summit_Movement_272598 + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 - applymovement 8, MtPyre_Summit_Movement_27259A + applymovement 8, Common_Movement_Delay48 waitmovement 0 delay 30 compare VAR_0x8008, 0 @@ -292,7 +292,7 @@ MtPyre_Summit_EventScript_23235A:: @ 823235A applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement 8, MtPyre_Summit_Movement_2323ED waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -300,7 +300,7 @@ MtPyre_Summit_EventScript_232376:: @ 8232376 applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement 8, MtPyre_Summit_Movement_2323F3 waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -308,7 +308,7 @@ MtPyre_Summit_EventScript_232392:: @ 8232392 applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement 8, MtPyre_Summit_Movement_2323F8 waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 return diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc index 4df8343fbd..332e6dbea9 100644 --- a/data/maps/NavelRock_Harbor/scripts.inc +++ b/data/maps/NavelRock_Harbor/scripts.inc @@ -9,7 +9,7 @@ NavelRock_Harbor_EventScript_2690BD:: @ 82690BD goto_if_eq NavelRock_Harbor_EventScript_269102 msgbox NavelRock_Harbor_Text_2A6A5D, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, NavelRock_Harbor_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 hideobjectat 1, MAP_NAVEL_ROCK_HARBOR diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index d841f0374c..9d0452b6b6 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -23,7 +23,7 @@ NewMauville_Entrance_MapScript1_2372FB: @ 82372FB NewMauville_Entrance_EventScript_2372FF:: @ 82372FF lockall - applymovement EVENT_OBJ_ID_PLAYER, NewMauville_Entrance_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox NewMauville_Entrance_Text_237382, MSGBOX_DEFAULT checkitem ITEM_BASEMENT_KEY, 1 diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index 73b3e4d959..a635b2f5cb 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -193,7 +193,7 @@ OldaleTown_EventScript_1E901F:: @ 81E901F goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E9066 msgbox OldaleTown_Text_1E939A, MSGBOX_DEFAULT closemessage - applymovement 3, OldaleTown_Movement_2725A2 + applymovement 3, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -217,7 +217,7 @@ OldaleTown_EventScript_1E9066:: @ 81E9066 OldaleTown_EventScript_1E9070:: @ 81E9070 lockall - applymovement 4, OldaleTown_Movement_27259E + applymovement 4, Common_Movement_FacePlayer waitmovement 0 setvar VAR_0x8009, 0 goto OldaleTown_EventScript_1E90E6 @@ -227,7 +227,7 @@ OldaleTown_EventScript_1E9086:: @ 81E9086 lockall applymovement 4, OldaleTown_Movement_1E9170 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 setvar VAR_0x8009, 1 goto OldaleTown_EventScript_1E90E6 @@ -237,7 +237,7 @@ OldaleTown_EventScript_1E90A6:: @ 81E90A6 lockall applymovement 4, OldaleTown_Movement_1E9173 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 setvar VAR_0x8009, 1 goto OldaleTown_EventScript_1E90E6 @@ -247,7 +247,7 @@ OldaleTown_EventScript_1E90C6:: @ 81E90C6 lockall applymovement 4, OldaleTown_Movement_1E9175 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 setvar VAR_0x8009, 1 goto OldaleTown_EventScript_1E90E6 diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index f69eb3a3a1..0253a799fc 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -44,7 +44,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E special StartWallyTutorialBattle waitstate msgbox PetalburgCity_Text_1EC271, MSGBOX_DEFAULT - applymovement 2, PetalburgCity_Movement_2725A4, MAP_PETALBURG_CITY + applymovement 2, Common_Movement_WalkInPlaceLeft, MAP_PETALBURG_CITY waitmovement 2, MAP_PETALBURG_CITY msgbox PetalburgCity_Text_1EC297, MSGBOX_DEFAULT closemessage @@ -89,7 +89,7 @@ PetalburgCity_EventScript_1DC3E6:: @ 81DC3E6 faceplayer msgbox PetalburgCity_Text_1DC985, MSGBOX_DEFAULT closemessage - applymovement 3, PetalburgCity_Movement_2725A2 + applymovement 3, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -263,13 +263,13 @@ PetalburgCity_EventScript_1DC4BE:: @ 81DC4BE end PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA - applymovement 8, PetalburgCity_Movement_27259E + applymovement 8, Common_Movement_FacePlayer waitmovement 0 playbgm MUS_TSURETEK, 0 playse SE_PIN - applymovement 8, PetalburgCity_Movement_272598 + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 - applymovement 8, PetalburgCity_Movement_27259A + applymovement 8, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 0 call_if_eq PetalburgCity_EventScript_1DC57F @@ -290,8 +290,8 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA compare VAR_0x8008, 3 call_if_eq PetalburgCity_EventScript_1DC5FF msgbox PetalburgCity_Text_1DC91B, MSGBOX_DEFAULT - applymovement 8, PetalburgCity_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A8 + applymovement 8, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox PetalburgCity_Text_1DC93E, MSGBOX_DEFAULT closemessage @@ -304,7 +304,7 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA PetalburgCity_EventScript_1DC57F:: @ 81DC57F applymovement 8, PetalburgCity_Movement_1DC615 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return @@ -316,14 +316,14 @@ PetalburgCity_EventScript_1DC594:: @ 81DC594 PetalburgCity_EventScript_1DC59F:: @ 81DC59F applymovement 8, PetalburgCity_Movement_1DC61D waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return PetalburgCity_EventScript_1DC5B4:: @ 81DC5B4 applymovement 8, PetalburgCity_Movement_1DC622 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return @@ -543,23 +543,23 @@ PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9 applymovement 9, PetalburgCity_Movement_1DC7D6 waitmovement 0 playse SE_PIN - applymovement 9, PetalburgCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, PetalburgCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 applymovement 9, PetalburgCity_Movement_1DC7DB waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 setvar VAR_0x40D1, 1 msgbox PetalburgCity_Text_1DCB31, MSGBOX_DEFAULT closemessage - applymovement 9, PetalburgCity_Movement_2725A8 + applymovement 9, Common_Movement_WalkInPlaceRight waitmovement 0 delay 30 msgbox PetalburgCity_Text_1DCB82, MSGBOX_DEFAULT closemessage - applymovement 9, PetalburgCity_Movement_2725A4 + applymovement 9, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 30 msgbox PetalburgCity_Text_1DCC09, MSGBOX_DEFAULT diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index b4733ab090..474fe0df56 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -90,14 +90,14 @@ PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4 msgbox PetalburgCity_Gym_Text_205B32, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_205B4C, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement 10, PetalburgCity_Gym_Movement_2049EC waitmovement 0 playse SE_KAIDAN removeobject 10 setflag FLAG_HIDE_PETALBURG_CITY_WALLY delay 30 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox PetalburgCity_Gym_Text_205C40, MSGBOX_DEFAULT setvar VAR_0x4085, 2 @@ -228,7 +228,7 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC end PetalburgCity_Gym_EventScript_204C31:: @ 8204C31 - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown applymovement 10, PetalburgCity_Gym_Movement_2050EB waitmovement 0 return @@ -236,20 +236,20 @@ PetalburgCity_Gym_EventScript_204C31:: @ 8204C31 PetalburgCity_Gym_EventScript_204C43:: @ 8204C43 applymovement 10, PetalburgCity_Gym_Movement_2050E1 waitmovement 0 - applymovement 1, PetalburgCity_Gym_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return PetalburgCity_Gym_EventScript_204C5F:: @ 8204C5F - applymovement 1, PetalburgCity_Gym_Movement_2725AA - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement 10, PetalburgCity_Gym_Movement_2050EB waitmovement 0 return PetalburgCity_Gym_EventScript_204C78:: @ 8204C78 - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown applymovement 10, PetalburgCity_Gym_Movement_205102 applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_205111 waitmovement 0 @@ -274,55 +274,55 @@ PetalburgCity_Gym_EventScript_204CB5:: @ 8204CB5 return PetalburgCity_Gym_EventScript_204CC7:: @ 8204CC7 - applymovement 1, PetalburgCity_Gym_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 return PetalburgCity_Gym_EventScript_204CD2:: @ 8204CD2 - applymovement 1, PetalburgCity_Gym_Movement_2725AA - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return PetalburgCity_Gym_EventScript_204CE4:: @ 8204CE4 - applymovement 1, PetalburgCity_Gym_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return PetalburgCity_Gym_EventScript_204CF6:: @ 8204CF6 - applymovement 1, PetalburgCity_Gym_Movement_2725A4 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return PetalburgCity_Gym_EventScript_204D08:: @ 8204D08 - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return PetalburgCity_Gym_EventScript_204D13:: @ 8204D13 - applymovement 1, PetalburgCity_Gym_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 return PetalburgCity_Gym_EventScript_204D1E:: @ 8204D1E - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return PetalburgCity_Gym_EventScript_204D29:: @ 8204D29 - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return PetalburgCity_Gym_EventScript_204D34:: @ 8204D34 - applymovement 10, PetalburgCity_Gym_Movement_27259E + applymovement 10, Common_Movement_FacePlayer waitmovement 0 return PetalburgCity_Gym_EventScript_204D3F:: @ 8204D3F - applymovement 10, PetalburgCity_Gym_Movement_2725AA + applymovement 10, Common_Movement_WalkInPlaceDown waitmovement 0 return @@ -350,7 +350,7 @@ PetalburgCity_Gym_EventScript_204D72:: @ 8204D72 return PetalburgCity_Gym_EventScript_204D73:: @ 8204D73 - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return @@ -465,9 +465,9 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 applymovement 11, PetalburgCity_Gym_Movement_2050BB waitmovement 0 playse SE_PIN - applymovement 11, PetalburgCity_Gym_Movement_272598 + applymovement 11, Common_Movement_ExclamationMark waitmovement 0 - applymovement 11, PetalburgCity_Gym_Movement_27259A + applymovement 11, Common_Movement_Delay48 waitmovement 0 delay 10 compare VAR_0x8008, 1 @@ -504,47 +504,47 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 end PetalburgCity_Gym_EventScript_204FCC:: @ 8204FCC - applymovement 11, PetalburgCity_Gym_Movement_2725A6 + applymovement 11, Common_Movement_WalkInPlaceUp waitmovement 0 return PetalburgCity_Gym_EventScript_204FD7:: @ 8204FD7 - applymovement 11, PetalburgCity_Gym_Movement_2725A8 + applymovement 11, Common_Movement_WalkInPlaceRight waitmovement 0 return PetalburgCity_Gym_EventScript_204FE2:: @ 8204FE2 - applymovement 11, PetalburgCity_Gym_Movement_2725A4 + applymovement 11, Common_Movement_WalkInPlaceLeft waitmovement 0 return PetalburgCity_Gym_EventScript_204FED:: @ 8204FED applymovement 11, PetalburgCity_Gym_Movement_2050C3 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A4 - applymovement 1, PetalburgCity_Gym_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 return PetalburgCity_Gym_EventScript_205009:: @ 8205009 applymovement 11, PetalburgCity_Gym_Movement_2050CA waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return PetalburgCity_Gym_EventScript_205025:: @ 8205025 applymovement 11, PetalburgCity_Gym_Movement_2050D0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return PetalburgCity_Gym_EventScript_205041:: @ 8205041 applymovement 11, PetalburgCity_Gym_Movement_20507E - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2050A1 waitmovement 0 return diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index e296b8447f..7efad7dc1a 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -15,7 +15,7 @@ PetalburgWoods_EventScript_22DFD7:: @ 822DFD7 closemessage applymovement 3, PetalburgWoods_Movement_22E1F6 waitmovement 0 - applymovement 4, PetalburgWoods_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox PetalburgWoods_Text_22E428, MSGBOX_DEFAULT closemessage @@ -41,7 +41,7 @@ PetalburgWoods_EventScript_22E079:: @ 822E079 call PetalburgWoods_EventScript_22E124 applymovement 4, PetalburgWoods_Movement_22E1D0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox PetalburgWoods_Text_22E34F, MSGBOX_DEFAULT closemessage @@ -52,14 +52,14 @@ PetalburgWoods_EventScript_22E079:: @ 822E079 closemessage applymovement 3, PetalburgWoods_Movement_22E205 waitmovement 0 - applymovement 4, PetalburgWoods_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox PetalburgWoods_Text_22E428, MSGBOX_DEFAULT closemessage applymovement 4, PetalburgWoods_Movement_22E1EA waitmovement 0 msgbox PetalburgWoods_Text_22E457, MSGBOX_DEFAULT - applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox PetalburgWoods_Text_22E4A5, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_22E542 @@ -85,7 +85,7 @@ PetalburgWoods_EventScript_22E138:: @ 822E138 applymovement 3, PetalburgWoods_Movement_22E1FD waitmovement 0 removeobject 3 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox PetalburgWoods_Text_22E63D, MSGBOX_DEFAULT giveitem_std ITEM_GREAT_BALL diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 15722a3f33..ca9d94127c 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -30,7 +30,7 @@ Route101_EventScript_1EBCDE:: @ 81EBCDE applymovement 4, Route101_Movement_1EBD96 applymovement 2, Route101_Movement_1EBDC8 waitmovement 0 - applymovement 2, Route101_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, Route101_Movement_1EBDBD applymovement 2, Route101_Movement_1EBDEF @@ -223,7 +223,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16 fadescreen 1 removeobject 4 setobjectxy EVENT_OBJ_ID_PLAYER, 6, 13 - applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 special ChooseStarter waitstate diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 1cb912bd0d..798e32715a 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -30,11 +30,11 @@ Route103_EventScript_1EC3DA:: @ 81EC3DA msgbox Route103_Text_1EC7A6, MSGBOX_DEFAULT closemessage playbgm MUS_GIRL_SUP, 1 - applymovement 2, Route103_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 - applymovement 2, Route103_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, Route103_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 msgbox Route103_Text_1EC7DE, MSGBOX_DEFAULT switch VAR_STARTER_MON @@ -47,11 +47,11 @@ Route103_EventScript_1EC434:: @ 81EC434 msgbox Route103_Text_1EC989, MSGBOX_DEFAULT closemessage playbgm MUS_BOY_SUP, 1 - applymovement 2, Route103_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 - applymovement 2, Route103_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, Route103_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 msgbox Route103_Text_1EC9CE, MSGBOX_DEFAULT switch VAR_STARTER_MON diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index d50a8a9a39..7d2e06876e 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -42,7 +42,7 @@ Route104_EventScript_1ECC9D:: @ 81ECC9D Route104_EventScript_1ECC9E:: @ 81ECC9E lockall setvar VAR_0x8008, 1 - applymovement 34, Route104_Movement_27259E + applymovement 34, Common_Movement_FacePlayer waitmovement 0 goto Route104_EventScript_1ECD33 @@ -51,7 +51,7 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3 setflag FLAG_HIDE_RUSBORO_CITY_RIVAL setvar VAR_0x405A, 8 setvar VAR_0x4063, 2 - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 delay 10 addobject 34 @@ -64,9 +64,9 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3 setvar VAR_0x8008, 0 call Route104_EventScript_1E0DD1 playse SE_PIN - applymovement 34, Route104_Movement_272598 + applymovement 34, Common_Movement_ExclamationMark waitmovement 0 - applymovement 34, Route104_Movement_27259A + applymovement 34, Common_Movement_Delay48 waitmovement 0 goto Route104_EventScript_1ECD33 diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index 490f1d2552..f0719c2e8b 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -319,7 +319,7 @@ Route109_EventScript_1EE99E:: @ 81EE99E faceplayer msgbox Route109_Text_1EEFB0, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -334,7 +334,7 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull closemessage - applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_RECEIVED_SOFT_SAND release @@ -342,7 +342,7 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 Route109_EventScript_1EE9F2:: @ 81EE9F2 msgbox Route109_Text_1EEFF1, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 958f3a36a0..578a19a21a 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -32,7 +32,7 @@ Route110_EventScript_1EF2AA:: @ 81EF2AA lock faceplayer msgbox Route110_Text_1EFB5D, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -41,7 +41,7 @@ Route110_EventScript_1EF2C0:: @ 81EF2C0 lock faceplayer msgbox Route110_Text_1EFB93, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -50,7 +50,7 @@ Route110_EventScript_1EF2D6:: @ 81EF2D6 lock faceplayer msgbox Route110_Text_1EFBCA, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -59,7 +59,7 @@ Route110_EventScript_1EF2EC:: @ 81EF2EC lock faceplayer msgbox Route110_Text_1EFC0D, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -307,7 +307,7 @@ Route110_EventScript_1EF64A:: @ 81EF64A Route110_EventScript_1EF661:: @ 81EF661 lockall - applymovement 21, Route110_Movement_2725A8 + applymovement 21, Common_Movement_WalkInPlaceRight waitmovement 0 call Route110_EventScript_1EF673 releaseall @@ -383,11 +383,11 @@ Route110_EventScript_1EF76E:: @ 81EF76E call_if_eq Route110_EventScript_1EF7E1 compare VAR_RESULT, FEMALE call_if_eq Route110_EventScript_1EF7E6 - applymovement 28, Route110_Movement_2725AA + applymovement 28, Common_Movement_WalkInPlaceDown waitmovement 0 - applymovement 28, Route110_Movement_272598 + applymovement 28, Common_Movement_ExclamationMark waitmovement 0 - applymovement 28, Route110_Movement_27259A + applymovement 28, Common_Movement_Delay48 waitmovement 0 delay 30 compare VAR_0x8008, 1 @@ -616,9 +616,9 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 applymovement 36, Route110_Movement_1EFB30 waitmovement 0 playse SE_PIN - applymovement 36, Route110_Movement_272598 + applymovement 36, Common_Movement_ExclamationMark waitmovement 0 - applymovement 36, Route110_Movement_27259A + applymovement 36, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 1 call_if_eq Route110_EventScript_1EFAD8 @@ -631,13 +631,13 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 msgbox Route110_Text_1F0AB5, MSGBOX_DEFAULT closemessage delay 20 - applymovement 36, Route110_Movement_2725A4 + applymovement 36, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 10 - applymovement 36, Route110_Movement_2725A8 + applymovement 36, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 - applymovement 36, Route110_Movement_2725AA + applymovement 36, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 msgbox Route110_Text_1F0AFF, MSGBOX_DEFAULT diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index de6aa2119d..770c397682 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -161,7 +161,7 @@ Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 delay 30 msgbox Route110_TrickHouseEnd_Text_26B3FA, MSGBOX_DEFAULT closemessage - applymovement 1, Route110_TrickHouseEnd_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 delay 30 msgbox Route110_TrickHouseEnd_Text_26B485, MSGBOX_DEFAULT @@ -212,22 +212,22 @@ Route110_TrickHouseEnd_EventScript_26B002:: @ 826B002 return Route110_TrickHouseEnd_EventScript_26B015:: @ 826B015 - applymovement 1, Route110_TrickHouseEnd_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return Route110_TrickHouseEnd_EventScript_26B020:: @ 826B020 - applymovement 1, Route110_TrickHouseEnd_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 return Route110_TrickHouseEnd_EventScript_26B02B:: @ 826B02B - applymovement 1, Route110_TrickHouseEnd_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 return Route110_TrickHouseEnd_EventScript_26B036:: @ 826B036 - applymovement 1, Route110_TrickHouseEnd_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -235,13 +235,13 @@ Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041 lockall turnobject 1, 3 playse SE_PIN - applymovement 1, Route110_TrickHouseEnd_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 delay 20 applymovement 1, Route110_TrickHouseEnd_Movement_26B08B waitmovement 0 playse SE_W153 - applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEnd_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox Route110_TrickHouseEnd_Text_26B8BD, MSGBOX_DEFAULT closemessage diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index ac27d3af62..7dc918f2d4 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -236,9 +236,9 @@ Route110_TrickHouseEntrance_EventScript_269D3B:: @ 8269D3B Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E playse SE_PIN - applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_272598 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_27259A + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48 waitmovement 0 compare VAR_0x4044, 0 call_if_eq Route110_TrickHouseEntrance_EventScript_269DEE @@ -326,21 +326,21 @@ Route110_TrickHouseEntrance_EventScript_269E48:: @ 8269E48 Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51 msgbox Route110_TrickHouseEntrance_Text_26A921, MSGBOX_DEFAULT closemessage - applymovement 1, Route110_TrickHouseEntrance_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement 1, Route110_TrickHouseEntrance_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, Route110_TrickHouseEntrance_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_26A9AF, MSGBOX_DEFAULT - applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 releaseall end Route110_TrickHouseEntrance_EventScript_269E8F:: @ 8269E8F - applymovement 1, Route110_TrickHouseEntrance_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_26AA82, MSGBOX_DEFAULT compare VAR_0x4044, 1 @@ -432,13 +432,13 @@ Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7 Route110_TrickHouseEntrance_EventScript_26A023:: @ 826A023 setvar VAR_0x40C1, 0 setvar VAR_0x40A7, 3 - applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 releaseall end Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039 - applymovement 1, Route110_TrickHouseEntrance_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_26AB2C, MSGBOX_DEFAULT call Route110_TrickHouseEntrance_EventScript_26A070 diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index 4c199a9933..48ce6be8c2 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -25,7 +25,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB27:: @ 826CB27 Route110_TrickHousePuzzle5_EventScript_26CB32:: @ 826CB32 lockall - applymovement 1, Route110_TrickHousePuzzle5_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_1, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA @@ -35,7 +35,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB32:: @ 826CB32 Route110_TrickHousePuzzle5_EventScript_26CB53:: @ 826CB53 lockall - applymovement 2, Route110_TrickHousePuzzle5_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_2, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA @@ -45,7 +45,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB53:: @ 826CB53 Route110_TrickHousePuzzle5_EventScript_26CB74:: @ 826CB74 lockall - applymovement 3, Route110_TrickHousePuzzle5_Movement_27259E + applymovement 3, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_3, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA @@ -55,7 +55,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB74:: @ 826CB74 Route110_TrickHousePuzzle5_EventScript_26CB95:: @ 826CB95 lockall - applymovement 4, Route110_TrickHousePuzzle5_Movement_27259E + applymovement 4, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_4, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA @@ -65,7 +65,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB95:: @ 826CB95 Route110_TrickHousePuzzle5_EventScript_26CBB6:: @ 826CBB6 lockall - applymovement 5, Route110_TrickHousePuzzle5_Movement_27259E + applymovement 5, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_5, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA @@ -215,9 +215,9 @@ Route110_TrickHousePuzzle5_EventScript_26CCEB:: @ 826CCEB setvar VAR_TEMP_1, 1 setvar VAR_TEMP_8, 1 playse SE_PIN - applymovement 1, Route110_TrickHousePuzzle5_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, Route110_TrickHousePuzzle5_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4 @@ -239,9 +239,9 @@ Route110_TrickHousePuzzle5_EventScript_26CD6A:: @ 826CD6A setvar VAR_TEMP_2, 1 setvar VAR_TEMP_8, 2 playse SE_PIN - applymovement 2, Route110_TrickHousePuzzle5_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, Route110_TrickHousePuzzle5_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 call_if_eq Route110_TrickHousePuzzle5_EventScript_26D2CC @@ -265,9 +265,9 @@ Route110_TrickHousePuzzle5_EventScript_26CDF4:: @ 826CDF4 setvar VAR_TEMP_3, 1 setvar VAR_TEMP_8, 3 playse SE_PIN - applymovement 3, Route110_TrickHousePuzzle5_Movement_272598 + applymovement 3, Common_Movement_ExclamationMark waitmovement 0 - applymovement 3, Route110_TrickHousePuzzle5_Movement_27259A + applymovement 3, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4 @@ -289,9 +289,9 @@ Route110_TrickHousePuzzle5_EventScript_26CE73:: @ 826CE73 setvar VAR_TEMP_4, 1 setvar VAR_TEMP_8, 4 playse SE_PIN - applymovement 4, Route110_TrickHousePuzzle5_Movement_272598 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 - applymovement 4, Route110_TrickHousePuzzle5_Movement_27259A + applymovement 4, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4 @@ -313,9 +313,9 @@ Route110_TrickHousePuzzle5_EventScript_26CEF2:: @ 826CEF2 setvar VAR_TEMP_5, 1 setvar VAR_TEMP_8, 5 playse SE_PIN - applymovement 5, Route110_TrickHousePuzzle5_Movement_272598 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, Route110_TrickHousePuzzle5_Movement_27259A + applymovement 5, Common_Movement_Delay48 waitmovement 0 msgbox Route110_TrickHousePuzzle5_Text_26DC78, MSGBOX_DEFAULT random 3 diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index d9d5ea7ea9..c33dc6f115 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -285,7 +285,7 @@ Route111_EventScript_1F0FC5:: @ 81F0FC5 Route111_EventScript_1F0FE7:: @ 81F0FE7 msgbox Route111_Text_1F1523, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_1F1542 - applymovement 1, Route111_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 call Route111_EventScript_1F113C msgbox Route111_Text_1F156F, MSGBOX_DEFAULT @@ -303,7 +303,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 call Route111_EventScript_1F1143 msgbox Route111_Text_1F159D, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_1F1616 - applymovement 2, Route111_Movement_2725A6 + applymovement 2, Common_Movement_WalkInPlaceUp waitmovement 0 call Route111_EventScript_1F113C msgbox Route111_Text_1F1645, MSGBOX_DEFAULT @@ -321,7 +321,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 call Route111_EventScript_1F1143 msgbox Route111_Text_1F167E, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VIVI, Route111_Text_1F16C6 - applymovement 3, Route111_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceUp waitmovement 0 call Route111_EventScript_1F113C msgbox Route111_Text_1F16DC, MSGBOX_DEFAULT @@ -341,7 +341,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 trainerbattle_no_intro TRAINER_VICKY, Route111_Text_1F1756 msgbox Route111_Text_1F1788, MSGBOX_DEFAULT closemessage - applymovement 4, Route111_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 call Route111_EventScript_1F113C applymovement 4, Route111_Movement_1F114A @@ -437,11 +437,11 @@ Route111_EventScript_1F11DA:: @ 81F11DA Route111_EventScript_1F11E4:: @ 81F11E4 lockall - applymovement 46, Route111_Movement_27259E + applymovement 46, Common_Movement_FacePlayer waitmovement 0 msgbox Route111_Text_1F1CCA, MSGBOX_DEFAULT closemessage - applymovement 46, Route111_Movement_2725A2 + applymovement 46, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc index 2890011b40..312bf739f2 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc @@ -52,7 +52,7 @@ Route111_WinstrateFamilysHouse_EventScript_22A51E:: @ 822A51E Route111_WinstrateFamilysHouse_EventScript_22A52C:: @ 822A52C closemessage - applymovement VAR_0x8008, Route111_WinstrateFamilysHouse_Movement_2725A2 + applymovement VAR_0x8008, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 995102fe73..7f479d9f25 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -10,36 +10,36 @@ Route112_MapScript1_1F1DAE: @ 81F1DAE Route112_EventScript_1F1DB7:: @ 81F1DB7 lockall delay 40 - applymovement 1, Route112_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 msgbox Route112_Text_1F1F3F, MSGBOX_DEFAULT closemessage - applymovement 1, Route112_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 delay 40 - applymovement 6, Route112_Movement_2725A4 + applymovement 6, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 20 msgbox Route112_Text_1F1F7A, MSGBOX_DEFAULT closemessage - applymovement 6, Route112_Movement_2725A2 + applymovement 6, Common_Movement_FaceOriginalDirection waitmovement 0 delay 40 - applymovement 1, Route112_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 msgbox Route112_Text_1F1FBA, MSGBOX_DEFAULT closemessage - applymovement 1, Route112_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 delay 40 - applymovement 6, Route112_Movement_2725A4 + applymovement 6, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 20 msgbox Route112_Text_1F2003, MSGBOX_DEFAULT closemessage - applymovement 6, Route112_Movement_2725A2 + applymovement 6, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index 96d591d2da..c36abfe3b5 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -23,8 +23,8 @@ Route114_FossilManiacsTunnel_EventScript_22AF53:: @ 822AF53 Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66 lockall - applymovement 1, Route114_FossilManiacsTunnel_Movement_2725A6 - applymovement EVENT_OBJ_ID_PLAYER, Route114_FossilManiacsTunnel_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox Route114_FossilManiacsTunnel_Text_22B1F7, MSGBOX_DEFAULT setvar VAR_0x40CC, 2 diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 623c74e3ca..1addad5ecb 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -151,8 +151,8 @@ Route116_EventScript_1F2D84:: @ 81F2D84 Route116_EventScript_1F2D95:: @ 81F2D95 lockall - applymovement 11, Route116_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, Route116_Movement_2725A4 + applymovement 11, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox Route116_Text_1F309D, MSGBOX_DEFAULT setvar VAR_0x406F, 2 diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 45b8665b0d..4e5279510e 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -69,7 +69,7 @@ Route118_EventScript_1F3E85:: @ 81F3E85 Route118_EventScript_1F3E8E:: @ 81F3E8E lockall setvar VAR_0x8008, 0 - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 19, Route118_Movement_1F3F61 waitmovement 0 @@ -79,7 +79,7 @@ Route118_EventScript_1F3E8E:: @ 81F3E8E Route118_EventScript_1F3EAE:: @ 81F3EAE lockall setvar VAR_0x8008, 1 - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 goto Route118_EventScript_1F3EE4 end @@ -87,7 +87,7 @@ Route118_EventScript_1F3EAE:: @ 81F3EAE Route118_EventScript_1F3EC4:: @ 81F3EC4 lockall setvar VAR_0x8008, 2 - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 19, Route118_Movement_1F3F63 waitmovement 0 diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 15f124bb0e..d0ab5f5780 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -51,7 +51,7 @@ Route119_EventScript_1F4488:: @ 81F4488 call_if_eq Route119_EventScript_1F46C6 compare VAR_TEMP_1, 2 call_if_eq Route119_EventScript_1F46D1 - applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 compare VAR_TEMP_1, 1 @@ -459,7 +459,7 @@ Route119_EventScript_1F49A3:: @ 81F49A3 faceplayer msgbox Route119_Text_1F50EB, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Route119_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -469,7 +469,7 @@ Route119_EventScript_1F49BA:: @ 81F49BA faceplayer msgbox Route119_Text_1F5147, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Route119_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 6826e5fe04..21d34eed1a 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -55,9 +55,9 @@ Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8 msgbox Route119_WeatherInstitute_2F_Text_270568, MSGBOX_DEFAULT closemessage playse SE_PIN - applymovement 3, Route119_WeatherInstitute_2F_Movement_272598 + applymovement 3, Common_Movement_ExclamationMark waitmovement 0 - applymovement 3, Route119_WeatherInstitute_2F_Movement_27259A + applymovement 3, Common_Movement_Delay48 waitmovement 0 msgbox Route119_WeatherInstitute_2F_Text_2705DD, MSGBOX_DEFAULT closemessage diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 88a950be79..c16b37691a 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -196,12 +196,12 @@ Route120_EventScript_1F568B:: @ 81F568B call_if_eq Route120_EventScript_1F57A3 compare VAR_FACING, 3 call_if_eq Route120_EventScript_1F57AE - applymovement 31, Route120_Movement_2725A4 + applymovement 31, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 20 msgbox Route120_Text_1F5B43, MSGBOX_DEFAULT closemessage - applymovement 30, Route120_Movement_2725A8 + applymovement 30, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 30, Route120_Movement_2723C7 waitmovement 0 @@ -233,15 +233,15 @@ Route120_EventScript_1F571C:: @ 81F571C end Route120_EventScript_1F572C:: @ 81F572C - applymovement 31, Route120_Movement_2725AA - applymovement EVENT_OBJ_ID_PLAYER, Route120_Movement_2725A6 + applymovement 31, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox Route120_Text_1F5BAF, MSGBOX_DEFAULT giveitem_std ITEM_DEVON_SCOPE setflag FLAG_RECEIVED_DEVON_SCOPE msgbox Route120_Text_1F5C7B, MSGBOX_DEFAULT closemessage - applymovement 31, Route120_Movement_2725AA + applymovement 31, Common_Movement_WalkInPlaceDown waitmovement 0 delay 50 setfieldeffectargument 0, 1 @@ -258,7 +258,7 @@ Route120_EventScript_1F572C:: @ 81F572C end Route120_EventScript_1F57A3:: @ 81F57A3 - applymovement EVENT_OBJ_ID_PLAYER, Route120_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index d4ef73f9b1..f5e2fb088a 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -46,7 +46,7 @@ Route121_SafariZoneEntrance_EventScript_22BC0E:: @ 822BC0E Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18 lockall - applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 showmoneybox 0, 0, 0 msgbox Route121_SafariZoneEntrance_Text_2A4F74, MSGBOX_YESNO diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 5d32a7bdf5..3ec3d2fe7e 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -24,18 +24,18 @@ Route128_EventScript_1F6B57:: @ 81F6B57 closemessage applymovement 5, Route128_Movement_1F6CAD waitmovement 0 - applymovement 4, Route128_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox Route128_Text_1F6E5A, MSGBOX_DEFAULT closemessage applymovement 5, Route128_Movement_1F6CBB waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox Route128_Text_1F6F1E, MSGBOX_DEFAULT closemessage applymovement 4, Route128_Movement_1F6C96 - applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement 5, Route128_Movement_1F6CA8 waitmovement 0 msgbox Route128_Text_1F704F, MSGBOX_DEFAULT @@ -53,19 +53,19 @@ Route128_EventScript_1F6B57:: @ 81F6B57 addobject 3 applymovement 3, Route128_Movement_1F6C87 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox Route128_Text_1F70C9, MSGBOX_DEFAULT closemessage applymovement 3, Route128_Movement_1F6C85 - applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox Route128_Text_1F70EA, MSGBOX_DEFAULT - applymovement 3, Route128_Movement_2725AA + applymovement 3, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox Route128_Text_1F721B, MSGBOX_DEFAULT closemessage - applymovement 3, Route128_Movement_2725AA + applymovement 3, Common_Movement_WalkInPlaceDown waitmovement 0 delay 50 setfieldeffectargument 0, 1 diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index e5f034f1de..f475f02e3b 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -42,18 +42,18 @@ RustboroCity_EventScript_1E0715:: @ 81E0715 applymovement 15, RustboroCity_Movement_1E0852 waitmovement 0 playse SE_PIN - applymovement 15, RustboroCity_Movement_272598 + applymovement 15, Common_Movement_ExclamationMark waitmovement 0 - applymovement 15, RustboroCity_Movement_27259A + applymovement 15, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 applymovement 15, RustboroCity_Movement_1E084E waitmovement 0 msgbox RustboroCity_Text_1E22A5, MSGBOX_DEFAULT closemessage setflag FLAG_HAS_MATCH_CALL - applymovement 15, RustboroCity_Movement_2725A4 + applymovement 15, Common_Movement_WalkInPlaceLeft waitmovement 0 playse SE_TK_KASYA delay 10 @@ -63,7 +63,7 @@ RustboroCity_EventScript_1E0715:: @ 81E0715 delay 10 playse SE_TK_KASYA delay 20 - applymovement 15, RustboroCity_Movement_2725AA + applymovement 15, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox RustboroCity_Text_1E2331, MSGBOX_DEFAULT closemessage @@ -221,7 +221,7 @@ RustboroCity_EventScript_1E0922:: @ 81E0922 lock faceplayer msgbox RustboroCity_Text_1E16F4, MSGBOX_DEFAULT - applymovement 7, RustboroCity_Movement_2725A2 + applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -230,7 +230,7 @@ RustboroCity_EventScript_1E0938:: @ 81E0938 lock faceplayer msgbox RustboroCity_Text_1E174B, MSGBOX_DEFAULT - applymovement 8, RustboroCity_Movement_2725A2 + applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -344,7 +344,7 @@ RustboroCity_EventScript_1E0A6E:: @ 81E0A6E RustboroCity_EventScript_1E0A79:: @ 81E0A79 applymovement 9, RustboroCity_Movement_1E0AD5 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return @@ -500,52 +500,52 @@ RustboroCity_EventScript_1E0B2E:: @ 81E0B2E end RustboroCity_EventScript_1E0B6F:: @ 81E0B6F - applymovement 9, RustboroCity_Movement_2725A6 + applymovement 9, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return RustboroCity_EventScript_1E0B9B:: @ 81E0B9B - applymovement 9, RustboroCity_Movement_2725A4 + applymovement 9, Common_Movement_WalkInPlaceLeft waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AC waitmovement 0 return RustboroCity_EventScript_1E0BC7:: @ 81E0BC7 - applymovement 9, RustboroCity_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return RustboroCity_EventScript_1E0BF3:: @ 81E0BF3 - applymovement 9, RustboroCity_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 applymovement 9, RustboroCity_Movement_1E0C29 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return @@ -608,69 +608,69 @@ RustboroCity_EventScript_1E0CD3:: @ 81E0CD3 return RustboroCity_EventScript_1E0CDC:: @ 81E0CDC - applymovement 9, RustboroCity_Movement_2725A6 + applymovement 9, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return RustboroCity_EventScript_1E0D08:: @ 81E0D08 - applymovement 9, RustboroCity_Movement_2725A8 + applymovement 9, Common_Movement_WalkInPlaceRight waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AE waitmovement 0 return RustboroCity_EventScript_1E0D34:: @ 81E0D34 - applymovement 9, RustboroCity_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return RustboroCity_EventScript_1E0D60:: @ 81E0D60 - applymovement 9, RustboroCity_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 applymovement 9, RustboroCity_Movement_1E0C29 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return RustboroCity_EventScript_1E0D96:: @ 81E0D96 - applymovement 9, RustboroCity_Movement_2725A4 + applymovement 9, Common_Movement_WalkInPlaceLeft waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 return RustboroCity_EventScript_1E0DB8:: @ 81E0DB8 lockall call_if_unset FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_27259E + applymovement 14, Common_Movement_FacePlayer waitmovement 0 goto RustboroCity_EventScript_1E0FF3 @@ -694,128 +694,128 @@ RustboroCity_EventScript_1E0DEE:: @ 81E0DEE RustboroCity_EventScript_1E0DF3:: @ 81E0DF3 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E120E waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0E33:: @ 81E0E33 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1215 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0E73:: @ 81E0E73 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E121B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0EB3:: @ 81E0EB3 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1220 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0EF3:: @ 81E0EF3 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1224 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0F33:: @ 81E0F33 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1227 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0F73:: @ 81E0F73 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E122B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0FB3:: @ 81E0FB3 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1230 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index d9fe5819f6..1631d923d4 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -79,9 +79,9 @@ RustboroCity_DevonCorp_2F_EventScript_2118F1:: @ 82118F1 RustboroCity_DevonCorp_2F_EventScript_211933:: @ 8211933 closemessage playse SE_PIN - applymovement 5, RustboroCity_DevonCorp_2F_Movement_272598 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, RustboroCity_DevonCorp_2F_Movement_27259A + applymovement 5, Common_Movement_Delay48 waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO compare VAR_RESULT, 0 @@ -104,9 +104,9 @@ RustboroCity_DevonCorp_2F_EventScript_211974:: @ 8211974 RustboroCity_DevonCorp_2F_EventScript_211991:: @ 8211991 closemessage playse SE_PIN - applymovement 5, RustboroCity_DevonCorp_2F_Movement_272598 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, RustboroCity_DevonCorp_2F_Movement_27259A + applymovement 5, Common_Movement_Delay48 waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO compare VAR_RESULT, 0 diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index b2f13ea865..7c45570588 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -154,7 +154,7 @@ RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_212595 msgbox RustboroCity_DevonCorp_3F_Text_212A09, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -167,7 +167,7 @@ RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595 setflag FLAG_RECEIVED_EXP_SHARE msgbox RustboroCity_DevonCorp_3F_Text_212A9E, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -175,7 +175,7 @@ RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595 RustboroCity_DevonCorp_3F_EventScript_2125CC:: @ 82125CC msgbox RustboroCity_DevonCorp_3F_Text_212B78, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/RustboroCity_Flat1_2F/scripts.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc index 7798e72e62..ec59115ef5 100644 --- a/data/maps/RustboroCity_Flat1_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc @@ -59,7 +59,7 @@ RustboroCity_Flat1_2F_EventScript_2151F8:: @ 82151F8 msgbox RustboroCity_Flat1_2F_Text_215535, MSGBOX_DEFAULT call RustboroCity_Flat1_2F_EventScript_215238 msgbox RustboroCity_Flat1_2F_Text_215565, MSGBOX_DEFAULT - applymovement 6, RustboroCity_Flat1_2F_Movement_27259E + applymovement 6, Common_Movement_FacePlayer waitmovement 0 msgbox RustboroCity_Flat1_2F_Text_215792, MSGBOX_DEFAULT release diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index 2d3c6a8f94..74394f9a51 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -87,7 +87,7 @@ RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull closemessage - applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 setflag FLAG_RECEIVED_QUICK_CLAW release @@ -106,7 +106,7 @@ RustboroCity_PokemonSchool_EventScript_213FF0:: @ 8213FF0 RustboroCity_PokemonSchool_EventScript_213FFB:: @ 8213FFB msgbox RustboroCity_PokemonSchool_Text_2144C8, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 release end diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 59d0789ba6..325e4186b9 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -23,7 +23,7 @@ RusturfTunnel_EventScript_22CE5F:: @ 822CE5F faceplayer msgbox RusturfTunnel_Text_22D7A3, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -35,7 +35,7 @@ RusturfTunnel_EventScript_22CE76:: @ 822CE76 setflag FLAG_TEMP_1 msgbox RusturfTunnel_Text_22D510, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -43,7 +43,7 @@ RusturfTunnel_EventScript_22CE76:: @ 822CE76 RusturfTunnel_EventScript_22CE99:: @ 822CE99 msgbox RusturfTunnel_Text_22D5F3, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -94,7 +94,7 @@ RusturfTunnel_EventScript_22CF6F:: @ 822CF6F applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045 applymovement 1, RusturfTunnel_Movement_22D06C waitmovement 0 - applymovement 10, RusturfTunnel_Movement_2725AA + applymovement 10, Common_Movement_WalkInPlaceDown waitmovement 0 return @@ -102,14 +102,14 @@ RusturfTunnel_EventScript_22CF8B:: @ 822CF8B applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045 applymovement 1, RusturfTunnel_Movement_22D06C waitmovement 0 - applymovement 10, RusturfTunnel_Movement_2725AA + applymovement 10, Common_Movement_WalkInPlaceDown waitmovement 0 return RusturfTunnel_EventScript_22CFA7:: @ 822CFA7 - applymovement 1, RusturfTunnel_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return @@ -142,9 +142,9 @@ RusturfTunnel_EventScript_22CFE6:: @ 822CFE6 RusturfTunnel_EventScript_22CFFF:: @ 822CFFF playse SE_PIN - applymovement 1, RusturfTunnel_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, RusturfTunnel_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 return @@ -328,7 +328,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 applymovement 5, RusturfTunnel_Movement_22D1A4 waitmovement 0 msgbox RusturfTunnel_Text_22D395, MSGBOX_DEFAULT - applymovement 5, RusturfTunnel_Movement_27259E + applymovement 5, Common_Movement_FacePlayer waitmovement 0 message RusturfTunnel_Text_22D3BA waitmessage diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 204d70e142..20d0c72d48 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -201,7 +201,7 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219 lockall applymovement 5, SSTidalCorridor_Movement_23C26D waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SSTidalCorridor_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox SSTidalCorridor_Text_23C28F, MSGBOX_DEFAULT closemessage diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc index 9bbb9cbdc5..13b65c7227 100644 --- a/data/maps/SeafloorCavern_Entrance/scripts.inc +++ b/data/maps/SeafloorCavern_Entrance/scripts.inc @@ -13,9 +13,9 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 goto_if_eq SeafloorCavern_Entrance_EventScript_2344ED waitse playse SE_PIN - applymovement 1, SeafloorCavern_Entrance_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, SeafloorCavern_Entrance_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 delay 20 compare VAR_FACING, 3 @@ -29,7 +29,7 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 moveobjectoffscreen 1 msgbox SeafloorCavern_Entrance_Text_234544, MSGBOX_DEFAULT closemessage - applymovement 1, SeafloorCavern_Entrance_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 releaseall end @@ -43,23 +43,23 @@ SeafloorCavern_Entrance_EventScript_2344ED:: @ 82344ED call_if_eq SeafloorCavern_Entrance_EventScript_234539 msgbox SeafloorCavern_Entrance_Text_2346C8, MSGBOX_DEFAULT closemessage - applymovement 1, SeafloorCavern_Entrance_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 releaseall end SeafloorCavern_Entrance_EventScript_234523:: @ 8234523 - applymovement 1, SeafloorCavern_Entrance_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 return SeafloorCavern_Entrance_EventScript_23452E:: @ 823452E - applymovement 1, SeafloorCavern_Entrance_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 return SeafloorCavern_Entrance_EventScript_234539:: @ 8234539 - applymovement 1, SeafloorCavern_Entrance_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 6ab802ee48..f246900d83 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setvar VAR_0x8005, 3 setvar VAR_0x8006, 4 setvar VAR_0x8007, 5 - applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_23505C waitmovement 0 @@ -15,15 +15,15 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 msgbox SeafloorCavern_Room9_Text_23505F, MSGBOX_DEFAULT closemessage addobject VAR_0x8004 - applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23502A waitmovement 0 msgbox SeafloorCavern_Room9_Text_23507C, MSGBOX_DEFAULT - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox SeafloorCavern_Room9_Text_2350A6, MSGBOX_DEFAULT - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259E + applymovement VAR_0x8004, Common_Movement_FacePlayer waitmovement 0 msgbox SeafloorCavern_Room9_Text_23512C, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_ARCHIE, SeafloorCavern_Room9_Text_2351BC @@ -47,8 +47,8 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 playfanfare MUS_ME_TAMA playse SE_TAMA special sub_80B0534 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6 - applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A6 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 delay 150 removeobject 7 @@ -82,7 +82,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setvar VAR_0x8007, 5 msgbox SeafloorCavern_Room9_Text_2352A7, MSGBOX_DEFAULT playse SE_PC_LOGIN - applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox SeafloorCavern_Room9_Text_2352F6, MSGBOX_DEFAULT closemessage @@ -92,7 +92,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 closemessage playse SE_PC_OFF delay 20 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725AA + applymovement VAR_0x8004, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox SeafloorCavern_Room9_Text_23546F, MSGBOX_DEFAULT closemessage @@ -103,13 +103,13 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 applymovement VAR_0x8006, SeafloorCavern_Room9_Movement_235057 applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_23504E waitmovement 0 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A4 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox SeafloorCavern_Room9_Text_2354F0, MSGBOX_DEFAULT playse SE_PIN - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_272598 + applymovement VAR_0x8004, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259A + applymovement VAR_0x8004, Common_Movement_Delay48 waitmovement 0 msgbox SeafloorCavern_Room9_Text_2355C2, MSGBOX_DEFAULT msgbox SeafloorCavern_Room9_Text_235692, MSGBOX_DEFAULT diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index f65d0d4ecb..a6e7b05cc0 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -36,7 +36,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 lockall applymovement 1, SkyPillar_Outside_Movement_2393D3 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Outside_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox SkyPillar_Outside_Text_239416, MSGBOX_DEFAULT closemessage @@ -60,13 +60,13 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 special sub_8139560 waitstate delay 20 - applymovement 1, SkyPillar_Outside_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 10 - applymovement 1, SkyPillar_Outside_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 - applymovement 1, SkyPillar_Outside_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 msgbox SkyPillar_Outside_Text_23950C, MSGBOX_DEFAULT diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index 4ca4c4681d..a878b2efcb 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -94,7 +94,7 @@ SkyPillar_Top_EventScript_239785:: @ 8239785 SkyPillar_Top_EventScript_23979A:: @ 823979A lockall fadeoutbgm 1 - applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Top_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 special SpawnCameraObject applymovement EVENT_OBJ_ID_CAMERA, SkyPillar_Top_Movement_239858 diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 2e7859fba2..efce9cde82 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -61,11 +61,11 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C waitmovement 0 msgbox SlateportCity_Text_1DF032, MSGBOX_DEFAULT closemessage - applymovement 35, SlateportCity_Movement_2725A4 + applymovement 35, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 60 msgbox SlateportCity_Text_1DF0FE, MSGBOX_DEFAULT - applymovement 35, SlateportCity_Movement_2725A8 + applymovement 35, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox SlateportCity_Text_1DF12B, MSGBOX_DEFAULT closemessage @@ -359,7 +359,7 @@ SlateportCity_EventScript_1DD009:: @ 81DD009 faceplayer msgbox SlateportCity_Text_1DDC4F, MSGBOX_DEFAULT closemessage - applymovement 5, SlateportCity_Movement_2725A2 + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -369,7 +369,7 @@ SlateportCity_EventScript_1DD020:: @ 81DD020 faceplayer msgbox SlateportCity_Text_1DDC8A, MSGBOX_DEFAULT closemessage - applymovement 18, SlateportCity_Movement_2725A2 + applymovement 18, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -379,7 +379,7 @@ SlateportCity_EventScript_1DD037:: @ 81DD037 faceplayer msgbox SlateportCity_Text_1DDCD5, MSGBOX_DEFAULT closemessage - applymovement 19, SlateportCity_Movement_2725A2 + applymovement 19, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -389,7 +389,7 @@ SlateportCity_EventScript_1DD04E:: @ 81DD04E faceplayer msgbox SlateportCity_Text_1DDD18, MSGBOX_DEFAULT closemessage - applymovement 26, SlateportCity_Movement_2725A2 + applymovement 26, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -399,7 +399,7 @@ SlateportCity_EventScript_1DD065:: @ 81DD065 faceplayer msgbox SlateportCity_Text_1DDD7D, MSGBOX_DEFAULT closemessage - applymovement 27, SlateportCity_Movement_2725A2 + applymovement 27, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -409,7 +409,7 @@ SlateportCity_EventScript_1DD07C:: @ 81DD07C faceplayer msgbox SlateportCity_Text_1DDDC0, MSGBOX_DEFAULT closemessage - applymovement 28, SlateportCity_Movement_2725A2 + applymovement 28, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -419,7 +419,7 @@ SlateportCity_EventScript_1DD093:: @ 81DD093 faceplayer msgbox SlateportCity_Text_1DDDDF, MSGBOX_DEFAULT closemessage - applymovement 29, SlateportCity_Movement_2725A2 + applymovement 29, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -429,7 +429,7 @@ SlateportCity_EventScript_1DD0AA:: @ 81DD0AA faceplayer msgbox SlateportCity_Text_1DDE2F, MSGBOX_DEFAULT closemessage - applymovement 30, SlateportCity_Movement_2725A2 + applymovement 30, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -438,31 +438,31 @@ SlateportCity_EventScript_1DD0C1:: @ 81DD0C1 lock faceplayer playse SE_PIN - applymovement 31, SlateportCity_Movement_272598 + applymovement 31, Common_Movement_ExclamationMark waitmovement 0 - applymovement 31, SlateportCity_Movement_27259A + applymovement 31, Common_Movement_Delay48 waitmovement 0 msgbox SlateportCity_Text_1DDE6E, MSGBOX_DEFAULT closemessage - applymovement 31, SlateportCity_Movement_2725A2 + applymovement 31, Common_Movement_FaceOriginalDirection waitmovement 0 applymovement 31, SlateportCity_Movement_1DD147 waitmovement 0 - applymovement 31, SlateportCity_Movement_27259E + applymovement 31, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_Text_1DDE86, MSGBOX_DEFAULT closemessage - applymovement 31, SlateportCity_Movement_2725A2 + applymovement 31, Common_Movement_FaceOriginalDirection waitmovement 0 applymovement 31, SlateportCity_Movement_1DD147 waitmovement 0 msgbox SlateportCity_Text_1DDEB8, MSGBOX_DEFAULT closemessage - applymovement 31, SlateportCity_Movement_27259E + applymovement 31, Common_Movement_FacePlayer waitmovement 0 applymovement 31, SlateportCity_Movement_1DD147 waitmovement 0 - applymovement 31, SlateportCity_Movement_2725A2 + applymovement 31, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -481,7 +481,7 @@ SlateportCity_EventScript_1DD153:: @ 81DD153 faceplayer msgbox SlateportCity_Text_1DDF8D, MSGBOX_DEFAULT closemessage - applymovement 33, SlateportCity_Movement_2725A2 + applymovement 33, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -563,10 +563,10 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 msgbox SlateportCity_Text_1DE502, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DE54A, MSGBOX_DEFAULT closemessage - applymovement 10, SlateportCity_Movement_2725A8 + applymovement 10, Common_Movement_WalkInPlaceRight waitmovement 0 delay 10 - applymovement 9, SlateportCity_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceDown waitmovement 0 delay 25 applymovement 11, SlateportCity_Movement_1DD33C @@ -577,26 +577,26 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 removeobject 10 removeobject 9 msgbox SlateportCity_Text_1DE5F7, MSGBOX_DEFAULT - applymovement 11, SlateportCity_Movement_2725A6 + applymovement 11, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox SlateportCity_Text_1DE64F, MSGBOX_DEFAULT playbgm MUS_AQA_0, 0 msgbox SlateportCity_Text_1DE724, MSGBOX_DEFAULT - applymovement 6, SlateportCity_Movement_2725A4 - applymovement 1, SlateportCity_Movement_2725A4 + applymovement 6, Common_Movement_WalkInPlaceLeft + applymovement 1, Common_Movement_WalkInPlaceLeft applymovement 7, SlateportCity_Movement_1DD309 applymovement 3, SlateportCity_Movement_272596 applymovement 2, SlateportCity_Movement_1DD311 waitmovement 0 - applymovement 11, SlateportCity_Movement_2725AA + applymovement 11, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox SlateportCity_Text_1DE7F7, MSGBOX_DEFAULT playse SE_PIN - applymovement 11, SlateportCity_Movement_272598 + applymovement 11, Common_Movement_ExclamationMark waitmovement 0 - applymovement 11, SlateportCity_Movement_27259A + applymovement 11, Common_Movement_Delay48 waitmovement 0 - applymovement 11, SlateportCity_Movement_2725A6 + applymovement 11, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox SlateportCity_Text_1DE860, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DE8A0, MSGBOX_DEFAULT @@ -885,7 +885,7 @@ SlateportCity_EventScript_1DD5CE:: @ 81DD5CE SlateportCity_EventScript_1DD5DC:: @ 81DD5DC lockall - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 opendoor 10, 12 waitdooranim diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index 4bd28996b2..400146b3bb 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -44,7 +44,7 @@ SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65 SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4 msgbox SlateportCity_BattleTentCorridor_Text_25AB96, MSGBOX_DEFAULT closemessage - applymovement 1, SlateportCity_BattleTentCorridor_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 opendoor 2, 1 waitdooranim diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 771cc149f2..138ca9859c 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -48,10 +48,10 @@ SlateportCity_Harbor_EventScript_20C9DF:: @ 820C9DF end SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 - applymovement 7, SlateportCity_Harbor_Movement_2725AA + applymovement 7, Common_Movement_WalkInPlaceDown waitmovement 0 - applymovement 6, SlateportCity_Harbor_Movement_2725AA - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725A6 + applymovement 6, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox SlateportCity_Harbor_Text_20D291, MSGBOX_DEFAULT closemessage @@ -85,21 +85,21 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 SlateportCity_Harbor_EventScript_20CA89:: @ 820CA89 applymovement 4, SlateportCity_Harbor_Movement_20CAE0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return SlateportCity_Harbor_EventScript_20CA9E:: @ 820CA9E applymovement 4, SlateportCity_Harbor_Movement_20CAE6 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return SlateportCity_Harbor_EventScript_20CAB3:: @ 820CAB3 applymovement 4, SlateportCity_Harbor_Movement_20CAEB waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -226,7 +226,7 @@ SlateportCity_Harbor_EventScript_20CBDD:: @ 820CBDD SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9 msgbox SlateportCity_Harbor_Text_20CFCB, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A6 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR @@ -300,7 +300,7 @@ SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2 goto_if_eq SlateportCity_Harbor_EventScript_20CCDF msgbox SlateportCity_Harbor_Text_20D232, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index b574ce4489..05445cfbfd 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -7,14 +7,14 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AD96:: @ 820AD96 SlateportCity_OceanicMuseum_1F_EventScript_20AD9F:: @ 820AD9F lockall - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1 end SlateportCity_OceanicMuseum_1F_EventScript_20ADB0:: @ 820ADB0 lockall - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1 end @@ -155,9 +155,9 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8 faceplayer delay 8 playse SE_PIN - applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_272598 + applymovement 13, Common_Movement_ExclamationMark waitmovement 0 - applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_27259A + applymovement 13, Common_Movement_Delay48 waitmovement 0 msgbox SlateportCity_OceanicMuseum_1F_Text_20B3AB, MSGBOX_DEFAULT giveitem_std ITEM_TM46 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 204ffb4ebd..641c4dd86f 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -43,8 +43,8 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 trainerbattle_no_intro TRAINER_GRUNT_15, SlateportCity_OceanicMuseum_2F_Text_20BF66 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCEF waitmovement 0 - applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_2725AA - applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceDown + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_20BF7A, MSGBOX_DEFAULT closemessage @@ -68,7 +68,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 fadescreen 0 delay 30 setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_20C2BE, MSGBOX_DEFAULT setvar VAR_0x8004, 269 @@ -96,12 +96,12 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BC8C:: @ 820BC8C return SlateportCity_OceanicMuseum_2F_EventScript_20BC92:: @ 820BC92 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return SlateportCity_OceanicMuseum_2F_EventScript_20BC9D:: @ 820BC9D - applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 return @@ -268,7 +268,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BD76:: @ 820BD76 faceplayer msgbox SlateportCity_OceanicMuseum_2F_Text_20C4C2, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc index c63ef37067..4bc1b86604 100644 --- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -211,9 +211,9 @@ SlateportCity_PokemonFanClub_EventScript_20A17E:: @ 820A17E SlateportCity_PokemonFanClub_EventScript_20A1A3:: @ 820A1A3 playse SE_PIN - applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_272598 + applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_27259A + applymovement VAR_LAST_TALKED, Common_Movement_Delay48 waitmovement 0 msgbox SlateportCity_PokemonFanClub_Text_20AB63, MSGBOX_DEFAULT giveitem_std ITEM_SOOTHE_BELL diff --git a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc index adf1bd3a26..6c554387af 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc @@ -8,11 +8,11 @@ SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40 goto_if_set FLAG_DELIVERED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_207FD9 goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_207FBA msgbox SlateportCity_SternsShipyard_1F_Text_208008, MSGBOX_DEFAULT - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_2080A5, MSGBOX_DEFAULT closemessage - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_DOCK_REJECTED_DEVON_GOODS setflag FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA @@ -20,31 +20,31 @@ SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40 end SlateportCity_SternsShipyard_1F_EventScript_207F92:: @ 8207F92 - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_208323, MSGBOX_DEFAULT releaseall end SlateportCity_SternsShipyard_1F_EventScript_207FA6:: @ 8207FA6 - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_2082A8, MSGBOX_DEFAULT releaseall end SlateportCity_SternsShipyard_1F_EventScript_207FBA:: @ 8207FBA - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_2081A5, MSGBOX_DEFAULT closemessage - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end SlateportCity_SternsShipyard_1F_EventScript_207FD9:: @ 8207FD9 - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_208213, MSGBOX_DEFAULT releaseall diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index bdc36c4689..bfebcf0559 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -219,8 +219,8 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946 setvar VAR_0x8004, 0 special sub_813B7D8 waitstate - applymovement 10, SootopolisCity_Movement_2725A4 - applymovement 9, SootopolisCity_Movement_2725A8 + applymovement 10, Common_Movement_WalkInPlaceLeft + applymovement 9, Common_Movement_WalkInPlaceRight waitmovement 0 delay 60 waitse @@ -319,8 +319,8 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82 setvar VAR_0x8004, 0 special sub_813B7D8 waitstate - applymovement 10, SootopolisCity_Movement_2725A4 - applymovement 9, SootopolisCity_Movement_2725A8 + applymovement 10, Common_Movement_WalkInPlaceLeft + applymovement 9, Common_Movement_WalkInPlaceRight waitmovement 0 delay 60 waitse @@ -730,7 +730,7 @@ SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8 goto_if_eq SootopolisCity_EventScript_1E5F10 msgbox SootopolisCity_Text_1E6BFF, MSGBOX_DEFAULT closemessage - applymovement 3, SootopolisCity_Movement_2725A2 + applymovement 3, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -792,13 +792,13 @@ SootopolisCity_EventScript_1E5FD8:: @ 81E5FD8 SootopolisCity_EventScript_1E5FE2:: @ 81E5FE2 lockall - applymovement 2, SootopolisCity_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E600D msgbox SootopolisCity_Text_1E71A1, MSGBOX_DEFAULT closemessage - applymovement 2, SootopolisCity_Movement_2725A2 + applymovement 2, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -838,7 +838,7 @@ SootopolisCity_EventScript_1E6038:: @ 81E6038 SootopolisCity_EventScript_1E6065:: @ 81E6065 msgbox SootopolisCity_Text_1E7078, MSGBOX_DEFAULT closemessage - applymovement 8, SootopolisCity_Movement_2725A2 + applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -855,7 +855,7 @@ SootopolisCity_EventScript_1E6084:: @ 81E6084 SootopolisCity_EventScript_1E608E:: @ 81E608E lockall - applymovement 4, SootopolisCity_Movement_27259E + applymovement 4, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E60D9 @@ -865,7 +865,7 @@ SootopolisCity_EventScript_1E608E:: @ 81E608E goto_if_le SootopolisCity_EventScript_1E60CF msgbox SootopolisCity_Text_1E690B, MSGBOX_DEFAULT closemessage - applymovement 4, SootopolisCity_Movement_2725A2 + applymovement 4, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -882,7 +882,7 @@ SootopolisCity_EventScript_1E60D9:: @ 81E60D9 SootopolisCity_EventScript_1E60E3:: @ 81E60E3 lockall - applymovement 5, SootopolisCity_Movement_27259E + applymovement 5, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E612D @@ -893,7 +893,7 @@ SootopolisCity_EventScript_1E60E3:: @ 81E60E3 goto_if_le SootopolisCity_EventScript_1E6141 msgbox SootopolisCity_Text_1E6692, MSGBOX_DEFAULT closemessage - applymovement 5, SootopolisCity_Movement_2725A2 + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -927,7 +927,7 @@ EventScript_ClosedSootopolisDoor:: @ 81E615D SootopolisCity_EventScript_1E6166:: @ 81E6166 lockall - applymovement 7, SootopolisCity_Movement_27259E + applymovement 7, Common_Movement_FacePlayer waitmovement 0 call_if_unset FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN, SootopolisCity_EventScript_1E61CC compare VAR_0x405E, 2 @@ -1261,13 +1261,13 @@ SootopolisCity_Movement_1E635A: @ 81E635A SootopolisCity_EventScript_1E635D:: @ 81E635D lockall - applymovement 15, SootopolisCity_Movement_27259E + applymovement 15, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E6388 msgbox SootopolisCity_Text_1E67DC, MSGBOX_DEFAULT closemessage - applymovement 15, SootopolisCity_Movement_2725A2 + applymovement 15, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -1284,17 +1284,17 @@ SootopolisCity_EventScript_1E6393:: @ 81E6393 goto_if_eq SootopolisCity_EventScript_1E63C7 msgbox SootopolisCity_Text_1E6936, MSGBOX_DEFAULT closemessage - applymovement 14, SootopolisCity_Movement_27259E + applymovement 14, Common_Movement_FacePlayer waitmovement 0 msgbox SootopolisCity_Text_1E696C, MSGBOX_DEFAULT closemessage - applymovement 14, SootopolisCity_Movement_2725A2 + applymovement 14, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end SootopolisCity_EventScript_1E63C7:: @ 81E63C7 - applymovement 14, SootopolisCity_Movement_27259E + applymovement 14, Common_Movement_FacePlayer waitmovement 0 msgbox SootopolisCity_Text_1E69B8, MSGBOX_DEFAULT releaseall @@ -1302,13 +1302,13 @@ SootopolisCity_EventScript_1E63C7:: @ 81E63C7 SootopolisCity_EventScript_1E63DB:: @ 81E63DB lockall - applymovement 13, SootopolisCity_Movement_27259E + applymovement 13, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E6406 msgbox SootopolisCity_Text_1E6C7C, MSGBOX_DEFAULT closemessage - applymovement 13, SootopolisCity_Movement_2725A2 + applymovement 13, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -1321,13 +1321,13 @@ SootopolisCity_EventScript_1E6406:: @ 81E6406 SootopolisCity_EventScript_1E6411:: @ 81E6411 lockall - applymovement 12, SootopolisCity_Movement_27259E + applymovement 12, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E643C msgbox SootopolisCity_Text_1E6A50, MSGBOX_DEFAULT closemessage - applymovement 12, SootopolisCity_Movement_2725A2 + applymovement 12, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index 0eb4ffaef7..a44615e9fd 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -37,7 +37,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7 applymovement 1, SootopolisCity_MysteryEventsHouse_1F_Movement_227A21 waitmovement 0 moveobjectoffscreen 1 - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 compare VAR_0x40C0, 1 call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04 diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc index 388410821f..8eb00337f4 100644 --- a/data/maps/SouthernIsland_Exterior/scripts.inc +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -14,7 +14,7 @@ SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2 goto_if_eq SouthernIsland_Exterior_EventScript_242A17 msgbox SouthernIsland_Exterior_Text_2A6A5D, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, SouthernIsland_Exterior_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index a3164136dd..7478097bf9 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -25,7 +25,7 @@ TerraCave_End_EventScript_23B0E3:: @ 823B0E3 TerraCave_End_EventScript_23B0EC:: @ 823B0EC lockall - applymovement EVENT_OBJ_ID_PLAYER, TerraCave_End_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 1, TerraCave_End_Movement_23B16E waitmovement 0 diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc index c929633dd0..74aa613c78 100644 --- a/data/maps/VerdanturfTown/scripts.inc +++ b/data/maps/VerdanturfTown/scripts.inc @@ -12,14 +12,14 @@ VerdanturfTown_EventScript_1EB575:: @ 81EB575 faceplayer goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_1EB594 msgbox VerdanturfTown_Text_1EB5FD, MSGBOX_DEFAULT - applymovement 2, VerdanturfTown_Movement_2725A2 + applymovement 2, Common_Movement_FaceOriginalDirection waitmovement 0 release end VerdanturfTown_EventScript_1EB594:: @ 81EB594 msgbox VerdanturfTown_Text_1EB6E0, MSGBOX_DEFAULT - applymovement 2, VerdanturfTown_Movement_2725A2 + applymovement 2, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index 52aed76181..c5f3186637 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -77,8 +77,8 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_202581 waitmovement 0 removeobject 2 - applymovement 3, VerdanturfTown_BattleTentBattleRoom_Movement_2725AA - applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox VerdanturfTown_BattleTentBattleRoom_Text_24FF00, MSGBOX_DEFAULT special LoadPlayerParty @@ -121,8 +121,8 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2024B8:: @ 82024B8 case 127, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C VerdanturfTown_BattleTentBattleRoom_EventScript_2024EA:: @ 82024EA - applymovement 3, VerdanturfTown_BattleTentBattleRoom_Movement_2725A8 - applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_2725A8 + applymovement 3, Common_Movement_WalkInPlaceRight + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 closemessage goto VerdanturfTown_BattleTentBattleRoom_EventScript_20236F diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 2d1c630273..fdb0947d8e 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -38,7 +38,7 @@ VictoryRoad_1F_EventScript_235DC8:: @ 8235DC8 end VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1 - applymovement EVENT_OBJ_ID_PLAYER, VictoryRoad_1F_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox VictoryRoad_1F_Text_235EE6, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_235FFC diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 79747540d1..8499528b7b 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -328,7 +328,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276DD5:: @ 8276DD5 OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0 lockall - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox OldaleTown_PokemonCenter_2F_Text_27964A, MSGBOX_DEFAULT closemessage diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 39de44ba63..ee0e533bc1 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -232,13 +232,13 @@ Route111_EventScript_28CF94:: @ 828CF94 Route111_EventScript_28CF9F:: @ 828CF9F applymovement VAR_0x8004, Route111_Movement_28D04F - applymovement VAR_0x8005, Route111_Movement_2725A6 + applymovement VAR_0x8005, Common_Movement_WalkInPlaceUp waitmovement 0 return Route111_EventScript_28CFB1:: @ 828CFB1 applymovement VAR_0x8004, Route111_Movement_28D051 - applymovement VAR_0x8005, Route111_Movement_2725A4 + applymovement VAR_0x8005, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 985a2f93ad..c2abe6eff6 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -6,7 +6,7 @@ LittlerootTown_MaysHouse_2F_EventScript_2926FE:: @ 82926FE LittlerootTown_BrendansHouse_1F_EventScript_292704:: @ 8292704 LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT - applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_27259E + applymovement VAR_0x8004, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x8005, 0 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_29274D @@ -16,18 +16,18 @@ LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704 closemessage setvar VAR_0x4092, 4 applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292763 - applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A6 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp waitmovement 0 releaseall end LittlerootTown_BrendansHouse_1F_EventScript_29274D:: @ 829274D - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292758:: @ 8292758 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return @@ -39,7 +39,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292765:: @ 8292765 LittlerootTown_MaysHouse_1F_EventScript_292765:: @ 8292765 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B24, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A6 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AF0 waitmovement 0 releaseall @@ -82,7 +82,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_2927DF:: @ 82927DF addobject VAR_0x8008 applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292850 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT closemessage @@ -95,7 +95,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_29280F:: @ 829280F addobject VAR_0x8008 applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_29285B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT closemessage @@ -154,7 +154,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292866:: @ 8292866 end LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D - applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2725A8 + applymovement VAR_0x8005, Common_Movement_WalkInPlaceRight waitmovement 0 call LittlerootTown_BrendansHouse_1F_EventScript_29294B applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE0 @@ -167,7 +167,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE6 waitmovement 0 call LittlerootTown_BrendansHouse_1F_EventScript_29296C - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT msgbox LittlerootTown_BrendansHouse_1F_Text_1F7C35, MSGBOX_DEFAULT @@ -179,7 +179,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D end LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC - applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2725A4 + applymovement VAR_0x8005, Common_Movement_WalkInPlaceLeft waitmovement 0 call LittlerootTown_MaysHouse_1F_EventScript_29294B applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AE8 @@ -192,7 +192,7 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AEE waitmovement 0 call LittlerootTown_MaysHouse_1F_EventScript_29296C - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox LittlerootTown_MaysHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT msgbox LittlerootTown_MaysHouse_1F_Text_1F7C35, MSGBOX_DEFAULT @@ -206,9 +206,9 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC LittlerootTown_BrendansHouse_1F_EventScript_29294B:: @ 829294B LittlerootTown_MaysHouse_1F_EventScript_29294B:: @ 829294B playse SE_PIN - applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_272598 + applymovement VAR_0x8005, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_27259A + applymovement VAR_0x8005, Common_Movement_Delay48 waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B96, MSGBOX_DEFAULT closemessage @@ -216,7 +216,7 @@ LittlerootTown_MaysHouse_1F_EventScript_29294B:: @ 829294B LittlerootTown_BrendansHouse_1F_EventScript_29296C:: @ 829296C LittlerootTown_MaysHouse_1F_EventScript_29296C:: @ 829296C - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EC6, MSGBOX_DEFAULT fadedefaultbgm @@ -446,12 +446,12 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D08 compare VAR_0x8008, 1 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D13 - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_27259E + applymovement VAR_0x8009, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_272598 + applymovement VAR_0x8009, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_27259A + applymovement VAR_0x8009, Common_Movement_Delay48 waitmovement 0 delay 20 compare VAR_0x8008, 0 @@ -585,28 +585,28 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D13:: @ 8292D13 LittlerootTown_BrendansHouse_1F_EventScript_292D1E:: @ 8292D1E applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DD7 waitmovement 0 - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement VAR_0x800A, Common_Movement_WalkInPlaceLeft waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D33:: @ 8292D33 applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DDE waitmovement 0 - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2725A8 + applymovement VAR_0x800A, Common_Movement_WalkInPlaceRight waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D48:: @ 8292D48 applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292999 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D5D:: @ 8292D5D applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_29299B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -623,14 +623,14 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D7D:: @ 8292D7D LittlerootTown_BrendansHouse_1F_EventScript_292D88:: @ 8292D88 applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929AF waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D9D:: @ 8292D9D applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929B3 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 7b8b52cd00..a26ecb4c91 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -333,7 +333,7 @@ EventScript_Pblock1_NoPokeblock: @ 8293D43 LilycoveCity_ContestLobby_EventScript_293D4D:: @ 8293D4D lockall setvar VAR_0x8009, 2 - applymovement 10, LilycoveCity_ContestLobby_Movement_2725A2 + applymovement 10, Common_Movement_FaceOriginalDirection applymovement 3, LilycoveCity_ContestLobby_Movement_294053 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_293201, MSGBOX_YESNO @@ -398,8 +398,8 @@ LilycoveCity_ContestLobby_EventScript_293E1E:: @ 8293E1E lockall setvar VAR_0x8008, 15 setvar VAR_0x8009, 3 - applymovement 9, LilycoveCity_ContestLobby_Movement_2725A2 - applymovement 17, LilycoveCity_ContestLobby_Movement_2725A2 + applymovement 9, Common_Movement_FaceOriginalDirection + applymovement 17, Common_Movement_FaceOriginalDirection applymovement VAR_0x8008, LilycoveCity_ContestLobby_Movement_294053 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_293842, MSGBOX_YESNO From 04db99bb0a5d79b43a22f5b9ba16a3faabf2b914 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 22 Feb 2019 20:21:26 -0500 Subject: [PATCH 12/25] More misc event names --- data/event_scripts.s | 62 +++++-------------- data/maps/AncientTomb/scripts.inc | 2 +- data/maps/AquaHideout_B1F/scripts.inc | 2 +- .../scripts.inc | 4 +- .../BattleFrontier_OutsideEast/scripts.inc | 2 +- data/maps/BirthIsland_Exterior/scripts.inc | 4 +- data/maps/DesertRuins/scripts.inc | 2 +- .../scripts.inc | 2 +- data/maps/FarawayIsland_Interior/scripts.inc | 4 +- data/maps/IslandCave/scripts.inc | 2 +- data/maps/LilycoveCity_Harbor/scripts.inc | 24 +++---- data/maps/MarineCave_End/scripts.inc | 2 +- data/maps/NavelRock_Bottom/scripts.inc | 4 +- data/maps/NavelRock_Top/scripts.inc | 4 +- data/maps/NewMauville_Inside/scripts.inc | 2 +- data/maps/PacifidlogTown_House2/scripts.inc | 2 +- data/maps/Route119/scripts.inc | 2 +- data/maps/Route120/scripts.inc | 4 +- data/maps/SkyPillar_Top/scripts.inc | 2 +- data/maps/SouthernIsland_Interior/scripts.inc | 2 +- data/maps/TerraCave_End/scripts.inc | 2 +- 21 files changed, 53 insertions(+), 83 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index 415541475a..cf5695d3bc 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1205,8 +1205,8 @@ PetalburgCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE RustboroCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE SlateportCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE VerdanturfTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE - goto_if_unset FLAG_RECEIVED_POKENAV, OldaleTown_PokemonCenter_1F_EventScript_27374E - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, OldaleTown_PokemonCenter_1F_EventScript_27374E + goto_if_unset FLAG_RECEIVED_POKENAV, Common_EventScript_NopReturn + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, Common_EventScript_NopReturn goto_if_unset FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT, OldaleTown_PokemonCenter_1F_EventScript_27190C goto_if_unset FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, OldaleTown_PokemonCenter_1F_EventScript_271912 goto_if_unset FLAG_HIDE_ROUTE_108_MR_BRINEY, OldaleTown_PokemonCenter_1F_EventScript_271918 @@ -1948,7 +1948,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_2720AD:: @ 82720AD Route101_EventScript_2720AD:: @ 82720AD Route103_EventScript_2720AD:: @ 82720AD compare VAR_0x4085, 0 - goto_if_eq Route101_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn goto_if_set FLAG_SYS_GAME_CLEAR, Route101_EventScript_27211A compare VAR_BIRCH_STATE, 0 call_if_eq Route101_EventScript_27211A @@ -2029,7 +2029,7 @@ Route101_EventScript_272184:: @ 8272184 msgbox gUnknown_082A5D2C, MSGBOX_DEFAULT call Route101_EventScript_272179 compare VAR_0x800A, 0 - goto_if_eq Route101_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn setvar VAR_0x8004, 1 specialvar VAR_RESULT, ScriptGetPokedexInfo copyvar VAR_0x8008, VAR_0x8005 @@ -2768,28 +2768,7 @@ EventScript_2736F8:: @ 82736F8 waitstate end -AncientTomb_EventScript_27374E:: @ 827374E -AquaHideout_B1F_EventScript_27374E:: @ 827374E -BattleFrontier_BattleDomeBattleRoom_EventScript_27374E:: @ 827374E -BattleFrontier_OutsideEast_EventScript_27374E:: @ 827374E -BirthIsland_Exterior_EventScript_27374E:: @ 827374E -DesertRuins_EventScript_27374E:: @ 827374E -EverGrandeCity_PokemonCenter_1F_EventScript_27374E:: @ 827374E -FarawayIsland_Interior_EventScript_27374E:: @ 827374E -IslandCave_EventScript_27374E:: @ 827374E -LilycoveCity_Harbor_EventScript_27374E:: @ 827374E -MarineCave_End_EventScript_27374E:: @ 827374E -NavelRock_Bottom_EventScript_27374E:: @ 827374E -NavelRock_Top_EventScript_27374E:: @ 827374E -NewMauville_Inside_EventScript_27374E:: @ 827374E -OldaleTown_PokemonCenter_1F_EventScript_27374E:: @ 827374E -PacifidlogTown_House2_EventScript_27374E:: @ 827374E -Route101_EventScript_27374E:: @ 827374E -Route119_EventScript_27374E:: @ 827374E -Route120_EventScript_27374E:: @ 827374E -SkyPillar_Top_EventScript_27374E:: @ 827374E -SouthernIsland_Interior_EventScript_27374E:: @ 827374E -TerraCave_End_EventScript_27374E:: @ 827374E +Common_EventScript_NopReturn:: @ 827374E return EventScript_27374F:: @ 827374F @@ -6652,7 +6631,7 @@ SlateportCity_PokemonFanClub_EventScript_2C7F16:: @ 82C7F16 goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A msgbox SlateportCity_PokemonFanClub_Text_2C6F66, MSGBOX_DEFAULT setvar VAR_0x8005, 23 - call SlateportCity_PokemonFanClub_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A setflag FLAG_MOVE_TUTOR_TAUGHT_SWAGGER @@ -6681,7 +6660,7 @@ MauvilleCity_EventScript_2C7F7E:: @ 82C7F7E goto_if_eq MauvilleCity_EventScript_2C7FD2 msgbox MauvilleCity_Text_2C70F3, MSGBOX_DEFAULT setvar VAR_0x8005, 16 - call MauvilleCity_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq MauvilleCity_EventScript_2C7FD2 setflag FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT @@ -6710,7 +6689,7 @@ VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6:: @ 82C7FE6 goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7243, MSGBOX_DEFAULT setvar VAR_0x8005, 29 - call VerdanturfTown_PokemonCenter_1F_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A setflag FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER @@ -6739,7 +6718,7 @@ LavaridgeTown_House_EventScript_2C804E:: @ 82C804E goto_if_eq LavaridgeTown_House_EventScript_2C80A2 msgbox LavaridgeTown_House_Text_2C73B1, MSGBOX_DEFAULT setvar VAR_0x8005, 7 - call LavaridgeTown_House_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq LavaridgeTown_House_EventScript_2C80A2 setflag FLAG_MOVE_TUTOR_TAUGHT_MIMIC @@ -6768,7 +6747,7 @@ FallarborTown_Mart_EventScript_2C80B6:: @ 82C80B6 goto_if_eq FallarborTown_Mart_EventScript_2C810A msgbox FallarborTown_Mart_Text_2C7582, MSGBOX_DEFAULT setvar VAR_0x8005, 8 - call FallarborTown_Mart_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq FallarborTown_Mart_EventScript_2C810A setflag FLAG_MOVE_TUTOR_TAUGHT_METRONOME @@ -6797,7 +6776,7 @@ FortreeCity_House2_EventScript_2C811E:: @ 82C811E goto_if_eq FortreeCity_House2_EventScript_2C8172 msgbox FortreeCity_House2_Text_2C7721, MSGBOX_DEFAULT setvar VAR_0x8005, 24 - call FortreeCity_House2_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq FortreeCity_House2_EventScript_2C8172 setflag FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK @@ -6826,7 +6805,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186:: @ 82C8186 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C7911, MSGBOX_DEFAULT setvar VAR_0x8005, 14 - call LilycoveCity_DepartmentStoreRooftop_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA setflag FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE @@ -6855,7 +6834,7 @@ MossdeepCity_EventScript_2C81EE:: @ 82C81EE goto_if_eq MossdeepCity_EventScript_2C8242 msgbox MossdeepCity_Text_2C7B0D, MSGBOX_DEFAULT setvar VAR_0x8005, 15 - call MossdeepCity_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq MossdeepCity_EventScript_2C8242 setflag FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH @@ -6884,7 +6863,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_2C8256:: @ 82C8256 goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C98, MSGBOX_DEFAULT setvar VAR_0x8005, 4 - call SootopolisCity_PokemonCenter_1F_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA setflag FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE @@ -6913,7 +6892,7 @@ PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE:: @ 82C82BE goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E40, MSGBOX_DEFAULT setvar VAR_0x8005, 12 - call PacifidlogTown_PokemonCenter_1F_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 setflag FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION @@ -6930,16 +6909,7 @@ PacifidlogTown_PokemonCenter_1F_EventScript_2C831C:: @ 82C831C release end -FallarborTown_Mart_EventScript_2C8326:: @ 82C8326 -FortreeCity_House2_EventScript_2C8326:: @ 82C8326 -LavaridgeTown_House_EventScript_2C8326:: @ 82C8326 -LilycoveCity_DepartmentStoreRooftop_EventScript_2C8326:: @ 82C8326 -MauvilleCity_EventScript_2C8326:: @ 82C8326 -MossdeepCity_EventScript_2C8326:: @ 82C8326 -PacifidlogTown_PokemonCenter_1F_EventScript_2C8326:: @ 82C8326 -SlateportCity_PokemonFanClub_EventScript_2C8326:: @ 82C8326 -SootopolisCity_PokemonCenter_1F_EventScript_2C8326:: @ 82C8326 -VerdanturfTown_PokemonCenter_1F_EventScript_2C8326:: @ 82C8326 +EventScript_ShowPartyMenu:: @ 82C8326 special sub_81B892C waitstate lock diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc index 241cb50f13..9cc369fb4b 100644 --- a/data/maps/AncientTomb/scripts.inc +++ b/data/maps/AncientTomb/scripts.inc @@ -11,7 +11,7 @@ AncientTomb_MapScript1_238FC3: @ 8238FC3 AncientTomb_EventScript_238FCD:: @ 8238FCD specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne AncientTomb_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index 1763bcd5da..a74c7a33e0 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -10,7 +10,7 @@ AquaHideout_B1F_MapScript1_2339B2: @ 82339B2 AquaHideout_B1F_EventScript_2339BC:: @ 82339BC specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne AquaHideout_B1F_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index 7dbeee0427..e1c5991e71 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -966,14 +966,14 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C919:: @ 824C919 random 2 copyvar VAR_TEMP_D, VAR_RESULT compare VAR_TEMP_D, 0 - goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn setobjectxyperm 6, 2, 0 setobjectmovementtype 6, MOVEMENT_TYPE_FACE_RIGHT return BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938 compare VAR_TEMP_D, 0 - goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn applymovement 6, BattleFrontier_BattleDomeBattleRoom_Movement_24C95E return diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index 9a90f23f95..0d493d4e75 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -10,7 +10,7 @@ BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne BattleFrontier_OutsideEast_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 5bff32eb63..a7737654be 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -23,7 +23,7 @@ BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E return BirthIsland_Exterior_EventScript_267F55:: @ 8267F55 - goto_if_set FLAG_DEFEATED_DEOXYS, BirthIsland_Exterior_EventScript_27374E + goto_if_set FLAG_DEFEATED_DEOXYS, Common_EventScript_NopReturn clearflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE clearflag FLAG_DEOXYS_ROCK_COMPLETE return @@ -35,7 +35,7 @@ BirthIsland_Exterior_MapScript1_267F65: @ 8267F65 BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne BirthIsland_Exterior_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject 2 return diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index 34ae212245..2ae1f9e2e6 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -11,7 +11,7 @@ DesertRuins_MapScript1_22D96B: @ 822D96B DesertRuins_EventScript_22D975:: @ 822D975 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne DesertRuins_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index 0ec0acbb21..f63f636cd1 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -9,7 +9,7 @@ EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F end EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C - goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonCenter_1F_EventScript_27374E + goto_if_unset FLAG_BADGE06_GET, Common_EventScript_NopReturn clearflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT return diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index b541ac081f..fdb13d19db 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -33,7 +33,7 @@ FarawayIsland_Interior_MapScript1_267D54: @ 8267D54 FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne FarawayIsland_Interior_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return @@ -44,7 +44,7 @@ FarawayIsland_Interior_MapScript1_267D72: @ 8267D72 end FarawayIsland_Interior_EventScript_267D86:: @ 8267D86 - goto_if_set FLAG_DEFEATED_MEW, FarawayIsland_Interior_EventScript_27374E + goto_if_set FLAG_DEFEATED_MEW, Common_EventScript_NopReturn clearflag FLAG_HIDE_MEW setvar VAR_TEMP_1, 0 return diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index 3d0efa1ca8..33ae51f8d8 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -11,7 +11,7 @@ IslandCave_MapScript1_238E3A: @ 8238E3A IslandCave_EventScript_238E44:: @ 8238E44 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne IslandCave_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index c1126d5753..ea70156aaa 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -107,45 +107,45 @@ LilycoveCity_Harbor_EventScript_21E171:: @ 821E171 LilycoveCity_Harbor_EventScript_21E194:: @ 821E194 setvar VAR_TEMP_E, 0 - goto_if_unset FLAG_SYS_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_SYS_HAS_EON_TICKET, Common_EventScript_NopReturn checkitem ITEM_EON_TICKET, 1 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn setvar VAR_TEMP_E, 1 - goto_if_set FLAG_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_HAS_EON_TICKET, Common_EventScript_NopReturn setvar VAR_TEMP_E, 2 return LilycoveCity_Harbor_EventScript_21E1C6:: @ 821E1C6 setvar VAR_TEMP_D, 0 - goto_if_unset FLAG_ENABLE_SHIP_BIRTH_ISLAND, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_ENABLE_SHIP_BIRTH_ISLAND, Common_EventScript_NopReturn checkitem ITEM_AURORA_TICKET, 1 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn setvar VAR_TEMP_D, 1 - goto_if_set FLAG_HAS_AURORA_TICKET, LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_HAS_AURORA_TICKET, Common_EventScript_NopReturn setvar VAR_TEMP_D, 2 return LilycoveCity_Harbor_EventScript_21E1F8:: @ 821E1F8 setvar VAR_TEMP_C, 0 - goto_if_unset FLAG_ENABLE_SHIP_FARAWAY_ISLAND, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_ENABLE_SHIP_FARAWAY_ISLAND, Common_EventScript_NopReturn checkitem ITEM_OLD_SEA_MAP, 1 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn setvar VAR_TEMP_C, 1 - goto_if_set FLAG_HAS_OLD_SEA_MAP, LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_HAS_OLD_SEA_MAP, Common_EventScript_NopReturn setvar VAR_TEMP_C, 2 return LilycoveCity_Harbor_EventScript_21E22A:: @ 821E22A setvar VAR_TEMP_9, 0 - goto_if_unset FLAG_ENABLE_SHIP_NAVEL_ROCK, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_ENABLE_SHIP_NAVEL_ROCK, Common_EventScript_NopReturn checkitem ITEM_MYSTIC_TICKET, 1 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn setvar VAR_TEMP_9, 1 - goto_if_set FLAG_HAS_MYSTIC_TICKET, LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_HAS_MYSTIC_TICKET, Common_EventScript_NopReturn setvar VAR_TEMP_9, 2 return diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index c2c90d5c2f..b66ab17c43 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -10,7 +10,7 @@ MarineCave_End_MapScript1_23AFEA: @ 823AFEA MarineCave_End_EventScript_23AFF4:: @ 823AFF4 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne MarineCave_End_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject 1 return diff --git a/data/maps/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc index cd26de91de..83185bc4d3 100644 --- a/data/maps/NavelRock_Bottom/scripts.inc +++ b/data/maps/NavelRock_Bottom/scripts.inc @@ -13,7 +13,7 @@ NavelRock_Bottom_EventScript_269273:: @ 8269273 return NavelRock_Bottom_EventScript_269277:: @ 8269277 - goto_if_set FLAG_DEFEATED_LUGIA, NavelRock_Bottom_EventScript_27374E + goto_if_set FLAG_DEFEATED_LUGIA, Common_EventScript_NopReturn clearflag FLAG_HIDE_LUGIA return @@ -24,7 +24,7 @@ NavelRock_Bottom_MapScript1_269284: @ 8269284 NavelRock_Bottom_EventScript_26928E:: @ 826928E specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne NavelRock_Bottom_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject 1 return diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc index 423d998a7b..795bcf0e5f 100644 --- a/data/maps/NavelRock_Top/scripts.inc +++ b/data/maps/NavelRock_Top/scripts.inc @@ -15,7 +15,7 @@ NavelRock_Top_EventScript_269131:: @ 8269131 NavelRock_Top_EventScript_26913A:: @ 826913A setvar VAR_TEMP_1, 1 - goto_if_set FLAG_DEFEATED_HO_OH, NavelRock_Top_EventScript_27374E + goto_if_set FLAG_DEFEATED_HO_OH, Common_EventScript_NopReturn setvar VAR_TEMP_1, 0 clearflag FLAG_HIDE_HO_OH return @@ -27,7 +27,7 @@ NavelRock_Top_MapScript1_269151: @ 8269151 NavelRock_Top_EventScript_26915B:: @ 826915B specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne NavelRock_Top_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject 1 return diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc index b3d9d868f9..38bacbde3b 100644 --- a/data/maps/NewMauville_Inside/scripts.inc +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -15,7 +15,7 @@ NewMauville_Inside_MapScript1_2373E7: @ 82373E7 NewMauville_Inside_EventScript_237407:: @ 8237407 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne NewMauville_Inside_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc index 57169cc170..4f646ff435 100644 --- a/data/maps/PacifidlogTown_House2/scripts.inc +++ b/data/maps/PacifidlogTown_House2/scripts.inc @@ -20,7 +20,7 @@ PacifidlogTown_House2_EventScript_203792:: @ 8203792 end PacifidlogTown_House2_EventScript_2037DE:: @ 82037DE - goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_27374E + goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, Common_EventScript_NopReturn specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable compare VAR_RESULT, 0 call_if_eq PacifidlogTown_House2_EventScript_203812 diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index d0ab5f5780..8356df0635 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -10,7 +10,7 @@ Route119_MapScript1_1F442F: @ 81F442F Route119_EventScript_1F4439:: @ 81F4439 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne Route119_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index c16b37691a..5a29c1bb72 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -26,7 +26,7 @@ Route120_EventScript_1F5406:: @ 81F5406 Route120_EventScript_1F5449:: @ 81F5449 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne Route120_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject 30 removeobject 36 return @@ -34,7 +34,7 @@ Route120_EventScript_1F5449:: @ 81F5449 Route120_EventScript_1F5460:: @ 81F5460 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne Route120_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index a878b2efcb..de4706f847 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -11,7 +11,7 @@ SkyPillar_Top_MapScript1_2396C8: @ 82396C8 SkyPillar_Top_EventScript_2396D2:: @ 82396D2 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne SkyPillar_Top_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index 4f8dba7e58..c5cbe0f5e0 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -10,7 +10,7 @@ SouthernIsland_Interior_MapScript1_242A50: @ 8242A50 SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne SouthernIsland_Interior_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject 2 return diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index 7478097bf9..9e88be494e 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -10,7 +10,7 @@ TerraCave_End_MapScript1_23B0BB: @ 823B0BB TerraCave_End_EventScript_23B0C5:: @ 823B0C5 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne TerraCave_End_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject 1 return From 8711bc5156f0acda34ed651c78092e0a4f534722 Mon Sep 17 00:00:00 2001 From: tustin2121 Date: Sat, 16 Feb 2019 23:33:00 -0500 Subject: [PATCH 13/25] Document HEALTHBOX_GRX_* in battle_interface.c Most of these are referenced via offsets, like the HP bar, which uses [0 pixels] + (number of pixels) to reference which chunk to draw. Each corresponds to a 16x16 pixel in the graphic named. Up to you guys if you want to rename the constants. --- src/battle_interface.c | 162 ++++++++++++++++++++--------------------- 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/src/battle_interface.c b/src/battle_interface.c index 0eb494db4b..eab91b3480 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -35,125 +35,125 @@ struct TestingBar }; enum -{ - HEALTHBOX_GFX_0, - HEALTHBOX_GFX_1, - HEALTHBOX_GFX_2, - HEALTHBOX_GFX_HP_BAR_GREEN, - HEALTHBOX_GFX_4, - HEALTHBOX_GFX_5, - HEALTHBOX_GFX_6, - HEALTHBOX_GFX_7, - HEALTHBOX_GFX_8, - HEALTHBOX_GFX_9, - HEALTHBOX_GFX_10, - HEALTHBOX_GFX_11, - HEALTHBOX_GFX_12, - HEALTHBOX_GFX_13, - HEALTHBOX_GFX_14, - HEALTHBOX_GFX_15, - HEALTHBOX_GFX_16, - HEALTHBOX_GFX_17, - HEALTHBOX_GFX_18, - HEALTHBOX_GFX_19, - HEALTHBOX_GFX_20, - HEALTHBOX_GFX_STATUS_PSN_BATTLER0, - HEALTHBOX_GFX_22, - HEALTHBOX_GFX_23, - HEALTHBOX_GFX_STATUS_PRZ_BATTLER0, +{ // Corresponds to gHealthboxElementsGfxTable (and the tables after it) in graphics.c + HEALTHBOX_GFX_0, //hpbar.png + HEALTHBOX_GFX_1, //hpbar.png "H" + HEALTHBOX_GFX_2, //hpbar.png "P" + HEALTHBOX_GFX_HP_BAR_GREEN, //hpbar.png [0 pixels] + HEALTHBOX_GFX_4, //hpbar.png [1 pixels] + HEALTHBOX_GFX_5, //hpbar.png [2 pixels] + HEALTHBOX_GFX_6, //hpbar.png [3 pixels] + HEALTHBOX_GFX_7, //hpbar.png [4 pixels] + HEALTHBOX_GFX_8, //hpbar.png [5 pixels] + HEALTHBOX_GFX_9, //hpbar.png [6 pixels] + HEALTHBOX_GFX_10, //hpbar.png [7 pixels] + HEALTHBOX_GFX_11, //hpbar.png [8 pixels] + HEALTHBOX_GFX_12, //expbar.png [0 pixels] + HEALTHBOX_GFX_13, //expbar.png [1 pixels] + HEALTHBOX_GFX_14, //expbar.png [2 pixels] + HEALTHBOX_GFX_15, //expbar.png [3 pixels] + HEALTHBOX_GFX_16, //expbar.png [4 pixels] + HEALTHBOX_GFX_17, //expbar.png [5 pixels] + HEALTHBOX_GFX_18, //expbar.png [6 pixels] + HEALTHBOX_GFX_19, //expbar.png [7 pixels] + HEALTHBOX_GFX_20, //expbar.png [8 pixels] + HEALTHBOX_GFX_STATUS_PSN_BATTLER0, //status_psn.png "(P" + HEALTHBOX_GFX_22, //status_psn.png "SN" + HEALTHBOX_GFX_23, //status_psn.png "|)"" + HEALTHBOX_GFX_STATUS_PRZ_BATTLER0, //status_prz.png HEALTHBOX_GFX_25, HEALTHBOX_GFX_26, - HEALTHBOX_GFX_STATUS_SLP_BATTLER0, + HEALTHBOX_GFX_STATUS_SLP_BATTLER0, //status_slp.png HEALTHBOX_GFX_28, HEALTHBOX_GFX_29, - HEALTHBOX_GFX_STATUS_FRZ_BATTLER0, + HEALTHBOX_GFX_STATUS_FRZ_BATTLER0, //status_frz.png HEALTHBOX_GFX_31, HEALTHBOX_GFX_32, - HEALTHBOX_GFX_STATUS_BRN_BATTLER0, + HEALTHBOX_GFX_STATUS_BRN_BATTLER0, //status_brn.png HEALTHBOX_GFX_34, HEALTHBOX_GFX_35, - HEALTHBOX_GFX_36, - HEALTHBOX_GFX_37, - HEALTHBOX_GFX_38, - HEALTHBOX_GFX_39, - HEALTHBOX_GFX_40, - HEALTHBOX_GFX_41, - HEALTHBOX_GFX_42, - HEALTHBOX_GFX_43, - HEALTHBOX_GFX_44, - HEALTHBOX_GFX_45, - HEALTHBOX_GFX_46, - HEALTHBOX_GFX_HP_BAR_YELLOW, - HEALTHBOX_GFX_48, - HEALTHBOX_GFX_49, - HEALTHBOX_GFX_50, - HEALTHBOX_GFX_51, - HEALTHBOX_GFX_52, - HEALTHBOX_GFX_53, - HEALTHBOX_GFX_54, - HEALTHBOX_GFX_55, - HEALTHBOX_GFX_HP_BAR_RED, - HEALTHBOX_GFX_57, - HEALTHBOX_GFX_58, - HEALTHBOX_GFX_59, - HEALTHBOX_GFX_60, - HEALTHBOX_GFX_61, - HEALTHBOX_GFX_62, - HEALTHBOX_GFX_63, - HEALTHBOX_GFX_64, - HEALTHBOX_GFX_65, - HEALTHBOX_GFX_66, - HEALTHBOX_GFX_67, - HEALTHBOX_GFX_68, - HEALTHBOX_GFX_69, - HEALTHBOX_GFX_70, - HEALTHBOX_GFX_STATUS_PSN_BATTLER1, + HEALTHBOX_GFX_36, //misc.png [Black] + HEALTHBOX_GFX_37, //misc.png [Black] + HEALTHBOX_GFX_38, //misc.png [Black] + HEALTHBOX_GFX_39, //misc.png [Blank Health Window] + HEALTHBOX_GFX_40, //misc.png [Blank Health Window] + HEALTHBOX_GFX_41, //misc.png [Blank Health Window] + HEALTHBOX_GFX_42, //misc.png [Blank Health Window] + HEALTHBOX_GFX_43, //misc.png [Top of Health Window] + HEALTHBOX_GFX_44, //misc.png [Top of Health Window] + HEALTHBOX_GFX_45, //misc.png [Top of Health Window] + HEALTHBOX_GFX_46, //misc.png [Blank Health Window] + HEALTHBOX_GFX_HP_BAR_YELLOW, //hpbar_anim.png [0 pixels] + HEALTHBOX_GFX_48, //hpbar_anim.png [1 pixels] + HEALTHBOX_GFX_49, //hpbar_anim.png [2 pixels] + HEALTHBOX_GFX_50, //hpbar_anim.png [3 pixels] + HEALTHBOX_GFX_51, //hpbar_anim.png [4 pixels] + HEALTHBOX_GFX_52, //hpbar_anim.png [5 pixels] + HEALTHBOX_GFX_53, //hpbar_anim.png [6 pixels] + HEALTHBOX_GFX_54, //hpbar_anim.png [7 pixels] + HEALTHBOX_GFX_55, //hpbar_anim.png [8 pixels] + HEALTHBOX_GFX_HP_BAR_RED, //hpbar_anim.png [0 pixels yellow] + HEALTHBOX_GFX_57, //hpbar_anim.png [1 pixels yellow] + HEALTHBOX_GFX_58, //hpbar_anim.png [2 pixels yellow] + HEALTHBOX_GFX_59, //hpbar_anim.png [3 pixels yellow] + HEALTHBOX_GFX_60, //hpbar_anim.png [4 pixels yellow] + HEALTHBOX_GFX_61, //hpbar_anim.png [5 pixels yellow] + HEALTHBOX_GFX_62, //hpbar_anim.png [6 pixels yellow] + HEALTHBOX_GFX_63, //hpbar_anim.png [7 pixels yellow] + HEALTHBOX_GFX_64, //hpbar_anim.png [8 pixels yellow] + HEALTHBOX_GFX_65, //misc_frameend.png + HEALTHBOX_GFX_66, //ball_display.png [full] + HEALTHBOX_GFX_67, //ball_display.png [empty] + HEALTHBOX_GFX_68, //ball_display.png [fainted] + HEALTHBOX_GFX_69, //ball_display.png [statused] + HEALTHBOX_GFX_70, //ball_display_unused_extra.png + HEALTHBOX_GFX_STATUS_PSN_BATTLER1, //status2.png "PSN" HEALTHBOX_GFX_72, HEALTHBOX_GFX_73, - HEALTHBOX_GFX_STATUS_PRZ_BATTLER1, + HEALTHBOX_GFX_STATUS_PRZ_BATTLER1, //status2.png "PRZ" HEALTHBOX_GFX_75, HEALTHBOX_GFX_76, - HEALTHBOX_GFX_STATUS_SLP_BATTLER1, + HEALTHBOX_GFX_STATUS_SLP_BATTLER1, //status2.png "SLP" HEALTHBOX_GFX_78, HEALTHBOX_GFX_79, - HEALTHBOX_GFX_STATUS_FRZ_BATTLER1, + HEALTHBOX_GFX_STATUS_FRZ_BATTLER1, //status2.png "FRZ" HEALTHBOX_GFX_81, HEALTHBOX_GFX_82, - HEALTHBOX_GFX_STATUS_BRN_BATTLER1, + HEALTHBOX_GFX_STATUS_BRN_BATTLER1, //status2.png "BRN" HEALTHBOX_GFX_84, HEALTHBOX_GFX_85, - HEALTHBOX_GFX_STATUS_PSN_BATTLER2, + HEALTHBOX_GFX_STATUS_PSN_BATTLER2, //status3.png "PSN" HEALTHBOX_GFX_87, HEALTHBOX_GFX_88, - HEALTHBOX_GFX_STATUS_PRZ_BATTLER2, + HEALTHBOX_GFX_STATUS_PRZ_BATTLER2, //status3.png "PRZ" HEALTHBOX_GFX_90, HEALTHBOX_GFX_91, - HEALTHBOX_GFX_STATUS_SLP_BATTLER2, + HEALTHBOX_GFX_STATUS_SLP_BATTLER2, //status3.png "SLP" HEALTHBOX_GFX_93, HEALTHBOX_GFX_94, - HEALTHBOX_GFX_STATUS_FRZ_BATTLER2, + HEALTHBOX_GFX_STATUS_FRZ_BATTLER2, //status3.png "FRZ" HEALTHBOX_GFX_96, HEALTHBOX_GFX_97, - HEALTHBOX_GFX_STATUS_BRN_BATTLER2, + HEALTHBOX_GFX_STATUS_BRN_BATTLER2, //status3.png "BRN" HEALTHBOX_GFX_99, HEALTHBOX_GFX_100, - HEALTHBOX_GFX_STATUS_PSN_BATTLER3, + HEALTHBOX_GFX_STATUS_PSN_BATTLER3, //status4.png "PSN" HEALTHBOX_GFX_102, HEALTHBOX_GFX_103, - HEALTHBOX_GFX_STATUS_PRZ_BATTLER3, + HEALTHBOX_GFX_STATUS_PRZ_BATTLER3, //status4.png "PRZ" HEALTHBOX_GFX_105, HEALTHBOX_GFX_106, - HEALTHBOX_GFX_STATUS_SLP_BATTLER3, + HEALTHBOX_GFX_STATUS_SLP_BATTLER3, //status4.png "SLP" HEALTHBOX_GFX_108, HEALTHBOX_GFX_109, - HEALTHBOX_GFX_STATUS_FRZ_BATTLER3, + HEALTHBOX_GFX_STATUS_FRZ_BATTLER3, //status4.png "FRZ" HEALTHBOX_GFX_111, HEALTHBOX_GFX_112, - HEALTHBOX_GFX_STATUS_BRN_BATTLER3, + HEALTHBOX_GFX_STATUS_BRN_BATTLER3, //status4.png "BRN" HEALTHBOX_GFX_114, HEALTHBOX_GFX_115, - HEALTHBOX_GFX_116, - HEALTHBOX_GFX_117, + HEALTHBOX_GFX_116, //unknown_D12FEC.png + HEALTHBOX_GFX_117, //unknown_D1300C.png }; extern const u8 *const gNatureNamePointers[]; From 4a785e66ba0d7f5f5b48705a72895a8a9a934363 Mon Sep 17 00:00:00 2001 From: Tustin2121 Date: Sat, 23 Feb 2019 20:01:48 -0500 Subject: [PATCH 14/25] Changing descriptions to not be file names --- src/battle_interface.c | 161 +++++++++++++++++++++-------------------- 1 file changed, 81 insertions(+), 80 deletions(-) diff --git a/src/battle_interface.c b/src/battle_interface.c index eab91b3480..4a6ac67f1f 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -36,124 +36,125 @@ struct TestingBar enum { // Corresponds to gHealthboxElementsGfxTable (and the tables after it) in graphics.c - HEALTHBOX_GFX_0, //hpbar.png - HEALTHBOX_GFX_1, //hpbar.png "H" - HEALTHBOX_GFX_2, //hpbar.png "P" - HEALTHBOX_GFX_HP_BAR_GREEN, //hpbar.png [0 pixels] - HEALTHBOX_GFX_4, //hpbar.png [1 pixels] - HEALTHBOX_GFX_5, //hpbar.png [2 pixels] - HEALTHBOX_GFX_6, //hpbar.png [3 pixels] - HEALTHBOX_GFX_7, //hpbar.png [4 pixels] - HEALTHBOX_GFX_8, //hpbar.png [5 pixels] - HEALTHBOX_GFX_9, //hpbar.png [6 pixels] - HEALTHBOX_GFX_10, //hpbar.png [7 pixels] - HEALTHBOX_GFX_11, //hpbar.png [8 pixels] - HEALTHBOX_GFX_12, //expbar.png [0 pixels] - HEALTHBOX_GFX_13, //expbar.png [1 pixels] - HEALTHBOX_GFX_14, //expbar.png [2 pixels] - HEALTHBOX_GFX_15, //expbar.png [3 pixels] - HEALTHBOX_GFX_16, //expbar.png [4 pixels] - HEALTHBOX_GFX_17, //expbar.png [5 pixels] - HEALTHBOX_GFX_18, //expbar.png [6 pixels] - HEALTHBOX_GFX_19, //expbar.png [7 pixels] - HEALTHBOX_GFX_20, //expbar.png [8 pixels] - HEALTHBOX_GFX_STATUS_PSN_BATTLER0, //status_psn.png "(P" - HEALTHBOX_GFX_22, //status_psn.png "SN" - HEALTHBOX_GFX_23, //status_psn.png "|)"" - HEALTHBOX_GFX_STATUS_PRZ_BATTLER0, //status_prz.png + // These are indexes into the tables, which are filled with 8x8 square pixel data. + HEALTHBOX_GFX_0, //hp bar [black section] + HEALTHBOX_GFX_1, //hp bar "H" + HEALTHBOX_GFX_2, //hp bar "P" + HEALTHBOX_GFX_HP_BAR_GREEN, //hp bar [0 pixels] + HEALTHBOX_GFX_4, //hp bar [1 pixels] + HEALTHBOX_GFX_5, //hp bar [2 pixels] + HEALTHBOX_GFX_6, //hp bar [3 pixels] + HEALTHBOX_GFX_7, //hp bar [4 pixels] + HEALTHBOX_GFX_8, //hp bar [5 pixels] + HEALTHBOX_GFX_9, //hp bar [6 pixels] + HEALTHBOX_GFX_10, //hp bar [7 pixels] + HEALTHBOX_GFX_11, //hp bar [8 pixels] + HEALTHBOX_GFX_12, //exp bar [0 pixels] + HEALTHBOX_GFX_13, //exp bar [1 pixels] + HEALTHBOX_GFX_14, //exp bar [2 pixels] + HEALTHBOX_GFX_15, //exp bar [3 pixels] + HEALTHBOX_GFX_16, //exp bar [4 pixels] + HEALTHBOX_GFX_17, //exp bar [5 pixels] + HEALTHBOX_GFX_18, //exp bar [6 pixels] + HEALTHBOX_GFX_19, //exp bar [7 pixels] + HEALTHBOX_GFX_20, //exp bar [8 pixels] + HEALTHBOX_GFX_STATUS_PSN_BATTLER0, //status psn "(P" + HEALTHBOX_GFX_22, //status psn "SN" + HEALTHBOX_GFX_23, //status psn "|)"" + HEALTHBOX_GFX_STATUS_PRZ_BATTLER0, //status prz HEALTHBOX_GFX_25, HEALTHBOX_GFX_26, - HEALTHBOX_GFX_STATUS_SLP_BATTLER0, //status_slp.png + HEALTHBOX_GFX_STATUS_SLP_BATTLER0, //status slp HEALTHBOX_GFX_28, HEALTHBOX_GFX_29, - HEALTHBOX_GFX_STATUS_FRZ_BATTLER0, //status_frz.png + HEALTHBOX_GFX_STATUS_FRZ_BATTLER0, //status frz HEALTHBOX_GFX_31, HEALTHBOX_GFX_32, - HEALTHBOX_GFX_STATUS_BRN_BATTLER0, //status_brn.png + HEALTHBOX_GFX_STATUS_BRN_BATTLER0, //status brn HEALTHBOX_GFX_34, HEALTHBOX_GFX_35, - HEALTHBOX_GFX_36, //misc.png [Black] - HEALTHBOX_GFX_37, //misc.png [Black] - HEALTHBOX_GFX_38, //misc.png [Black] - HEALTHBOX_GFX_39, //misc.png [Blank Health Window] - HEALTHBOX_GFX_40, //misc.png [Blank Health Window] - HEALTHBOX_GFX_41, //misc.png [Blank Health Window] - HEALTHBOX_GFX_42, //misc.png [Blank Health Window] - HEALTHBOX_GFX_43, //misc.png [Top of Health Window] - HEALTHBOX_GFX_44, //misc.png [Top of Health Window] - HEALTHBOX_GFX_45, //misc.png [Top of Health Window] - HEALTHBOX_GFX_46, //misc.png [Blank Health Window] - HEALTHBOX_GFX_HP_BAR_YELLOW, //hpbar_anim.png [0 pixels] - HEALTHBOX_GFX_48, //hpbar_anim.png [1 pixels] - HEALTHBOX_GFX_49, //hpbar_anim.png [2 pixels] - HEALTHBOX_GFX_50, //hpbar_anim.png [3 pixels] - HEALTHBOX_GFX_51, //hpbar_anim.png [4 pixels] - HEALTHBOX_GFX_52, //hpbar_anim.png [5 pixels] - HEALTHBOX_GFX_53, //hpbar_anim.png [6 pixels] - HEALTHBOX_GFX_54, //hpbar_anim.png [7 pixels] - HEALTHBOX_GFX_55, //hpbar_anim.png [8 pixels] - HEALTHBOX_GFX_HP_BAR_RED, //hpbar_anim.png [0 pixels yellow] - HEALTHBOX_GFX_57, //hpbar_anim.png [1 pixels yellow] - HEALTHBOX_GFX_58, //hpbar_anim.png [2 pixels yellow] - HEALTHBOX_GFX_59, //hpbar_anim.png [3 pixels yellow] - HEALTHBOX_GFX_60, //hpbar_anim.png [4 pixels yellow] - HEALTHBOX_GFX_61, //hpbar_anim.png [5 pixels yellow] - HEALTHBOX_GFX_62, //hpbar_anim.png [6 pixels yellow] - HEALTHBOX_GFX_63, //hpbar_anim.png [7 pixels yellow] - HEALTHBOX_GFX_64, //hpbar_anim.png [8 pixels yellow] - HEALTHBOX_GFX_65, //misc_frameend.png - HEALTHBOX_GFX_66, //ball_display.png [full] - HEALTHBOX_GFX_67, //ball_display.png [empty] - HEALTHBOX_GFX_68, //ball_display.png [fainted] - HEALTHBOX_GFX_69, //ball_display.png [statused] - HEALTHBOX_GFX_70, //ball_display_unused_extra.png - HEALTHBOX_GFX_STATUS_PSN_BATTLER1, //status2.png "PSN" + HEALTHBOX_GFX_36, //misc [Black section] + HEALTHBOX_GFX_37, //misc [Black section] + HEALTHBOX_GFX_38, //misc [Black section] + HEALTHBOX_GFX_39, //misc [Blank Health Window?] + HEALTHBOX_GFX_40, //misc [Blank Health Window?] + HEALTHBOX_GFX_41, //misc [Blank Health Window?] + HEALTHBOX_GFX_42, //misc [Blank Health Window?] + HEALTHBOX_GFX_43, //misc [Top of Health Window?] + HEALTHBOX_GFX_44, //misc [Top of Health Window?] + HEALTHBOX_GFX_45, //misc [Top of Health Window?] + HEALTHBOX_GFX_46, //misc [Blank Health Window?] + HEALTHBOX_GFX_HP_BAR_YELLOW, //hp bar yellow [0 pixels] + HEALTHBOX_GFX_48, //hp bar yellow [1 pixels] + HEALTHBOX_GFX_49, //hp bar yellow [2 pixels] + HEALTHBOX_GFX_50, //hp bar yellow [3 pixels] + HEALTHBOX_GFX_51, //hp bar yellow [4 pixels] + HEALTHBOX_GFX_52, //hp bar yellow [5 pixels] + HEALTHBOX_GFX_53, //hp bar yellow [6 pixels] + HEALTHBOX_GFX_54, //hp bar yellow [7 pixels] + HEALTHBOX_GFX_55, //hp bar yellow [8 pixels] + HEALTHBOX_GFX_HP_BAR_RED, //hp bar red [0 pixels] + HEALTHBOX_GFX_57, //hp bar red [1 pixels] + HEALTHBOX_GFX_58, //hp bar red [2 pixels] + HEALTHBOX_GFX_59, //hp bar red [3 pixels] + HEALTHBOX_GFX_60, //hp bar red [4 pixels] + HEALTHBOX_GFX_61, //hp bar red [5 pixels] + HEALTHBOX_GFX_62, //hp bar red [6 pixels] + HEALTHBOX_GFX_63, //hp bar red [7 pixels] + HEALTHBOX_GFX_64, //hp bar red [8 pixels] + HEALTHBOX_GFX_65, //hp bar frame end + HEALTHBOX_GFX_66, //status ball [full] + HEALTHBOX_GFX_67, //status ball [empty] + HEALTHBOX_GFX_68, //status ball [fainted] + HEALTHBOX_GFX_69, //status ball [statused] + HEALTHBOX_GFX_70, //status ball [unused extra] + HEALTHBOX_GFX_STATUS_PSN_BATTLER1, //status2 "PSN" HEALTHBOX_GFX_72, HEALTHBOX_GFX_73, - HEALTHBOX_GFX_STATUS_PRZ_BATTLER1, //status2.png "PRZ" + HEALTHBOX_GFX_STATUS_PRZ_BATTLER1, //status2 "PRZ" HEALTHBOX_GFX_75, HEALTHBOX_GFX_76, - HEALTHBOX_GFX_STATUS_SLP_BATTLER1, //status2.png "SLP" + HEALTHBOX_GFX_STATUS_SLP_BATTLER1, //status2 "SLP" HEALTHBOX_GFX_78, HEALTHBOX_GFX_79, - HEALTHBOX_GFX_STATUS_FRZ_BATTLER1, //status2.png "FRZ" + HEALTHBOX_GFX_STATUS_FRZ_BATTLER1, //status2 "FRZ" HEALTHBOX_GFX_81, HEALTHBOX_GFX_82, - HEALTHBOX_GFX_STATUS_BRN_BATTLER1, //status2.png "BRN" + HEALTHBOX_GFX_STATUS_BRN_BATTLER1, //status2 "BRN" HEALTHBOX_GFX_84, HEALTHBOX_GFX_85, - HEALTHBOX_GFX_STATUS_PSN_BATTLER2, //status3.png "PSN" + HEALTHBOX_GFX_STATUS_PSN_BATTLER2, //status3 "PSN" HEALTHBOX_GFX_87, HEALTHBOX_GFX_88, - HEALTHBOX_GFX_STATUS_PRZ_BATTLER2, //status3.png "PRZ" + HEALTHBOX_GFX_STATUS_PRZ_BATTLER2, //status3 "PRZ" HEALTHBOX_GFX_90, HEALTHBOX_GFX_91, - HEALTHBOX_GFX_STATUS_SLP_BATTLER2, //status3.png "SLP" + HEALTHBOX_GFX_STATUS_SLP_BATTLER2, //status3 "SLP" HEALTHBOX_GFX_93, HEALTHBOX_GFX_94, - HEALTHBOX_GFX_STATUS_FRZ_BATTLER2, //status3.png "FRZ" + HEALTHBOX_GFX_STATUS_FRZ_BATTLER2, //status3 "FRZ" HEALTHBOX_GFX_96, HEALTHBOX_GFX_97, - HEALTHBOX_GFX_STATUS_BRN_BATTLER2, //status3.png "BRN" + HEALTHBOX_GFX_STATUS_BRN_BATTLER2, //status3 "BRN" HEALTHBOX_GFX_99, HEALTHBOX_GFX_100, - HEALTHBOX_GFX_STATUS_PSN_BATTLER3, //status4.png "PSN" + HEALTHBOX_GFX_STATUS_PSN_BATTLER3, //status4 "PSN" HEALTHBOX_GFX_102, HEALTHBOX_GFX_103, - HEALTHBOX_GFX_STATUS_PRZ_BATTLER3, //status4.png "PRZ" + HEALTHBOX_GFX_STATUS_PRZ_BATTLER3, //status4 "PRZ" HEALTHBOX_GFX_105, HEALTHBOX_GFX_106, - HEALTHBOX_GFX_STATUS_SLP_BATTLER3, //status4.png "SLP" + HEALTHBOX_GFX_STATUS_SLP_BATTLER3, //status4 "SLP" HEALTHBOX_GFX_108, HEALTHBOX_GFX_109, - HEALTHBOX_GFX_STATUS_FRZ_BATTLER3, //status4.png "FRZ" + HEALTHBOX_GFX_STATUS_FRZ_BATTLER3, //status4 "FRZ" HEALTHBOX_GFX_111, HEALTHBOX_GFX_112, - HEALTHBOX_GFX_STATUS_BRN_BATTLER3, //status4.png "BRN" + HEALTHBOX_GFX_STATUS_BRN_BATTLER3, //status4 "BRN" HEALTHBOX_GFX_114, HEALTHBOX_GFX_115, - HEALTHBOX_GFX_116, //unknown_D12FEC.png - HEALTHBOX_GFX_117, //unknown_D1300C.png + HEALTHBOX_GFX_116, //unknown_D12FEC + HEALTHBOX_GFX_117, //unknown_D1300C }; extern const u8 *const gNatureNamePointers[]; From a589d4a630a130e78bdf0819b807a133562d4449 Mon Sep 17 00:00:00 2001 From: huderlem Date: Sun, 24 Feb 2019 10:22:11 -0600 Subject: [PATCH 15/25] Delete porymap.project.cfg --- porymap.project.cfg | 1 - 1 file changed, 1 deletion(-) delete mode 100755 porymap.project.cfg diff --git a/porymap.project.cfg b/porymap.project.cfg deleted file mode 100755 index c6ba8781eb..0000000000 --- a/porymap.project.cfg +++ /dev/null @@ -1 +0,0 @@ -base_game_version=pokeemerald From 87859a655b810aeaad7e7e1f5b066731f7e79ece Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 25 Feb 2019 02:20:38 -0500 Subject: [PATCH 16/25] Fix flag formatting for fun --- include/constants/vars.h | 444 +++++++++++++++++++-------------------- 1 file changed, 222 insertions(+), 222 deletions(-) diff --git a/include/constants/vars.h b/include/constants/vars.h index 889b6692e5..fc3b3263d5 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -46,232 +46,232 @@ #define VAR_OBJ_GFX_ID_F 0x401F // general purpose vars -#define VAR_RECYCLE_GOODS 0x4020 -#define VAR_REPEL_STEP_COUNT 0x4021 -#define VAR_ICE_STEP_COUNT 0x4022 -#define VAR_STARTER_MON 0x4023 // 0=Treecko, 1=Torchic, 2=Mudkip -#define VAR_MIRAGE_RND_H 0x4024 -#define VAR_MIRAGE_RND_L 0x4025 -#define VAR_SECRET_BASE_MAP 0x4026 -#define VAR_CYCLING_ROAD_RECORD_COLLISIONS 0x4027 -#define VAR_CYCLING_ROAD_RECORD_TIME_L 0x4028 -#define VAR_CYCLING_ROAD_RECORD_TIME_H 0x4029 -#define VAR_HAPPINESS_STEP_COUNTER 0x402A -#define VAR_POISON_STEP_COUNTER 0x402B -#define VAR_RESET_RTC_ENABLE 0x402C -#define VAR_ENIGMA_BERRY_AVAILABLE 0x402D -#define VAR_0x402E 0x402E // Seems to be unused. +#define VAR_RECYCLE_GOODS 0x4020 +#define VAR_REPEL_STEP_COUNT 0x4021 +#define VAR_ICE_STEP_COUNT 0x4022 +#define VAR_STARTER_MON 0x4023 // 0=Treecko, 1=Torchic, 2=Mudkip +#define VAR_MIRAGE_RND_H 0x4024 +#define VAR_MIRAGE_RND_L 0x4025 +#define VAR_SECRET_BASE_MAP 0x4026 +#define VAR_CYCLING_ROAD_RECORD_COLLISIONS 0x4027 +#define VAR_CYCLING_ROAD_RECORD_TIME_L 0x4028 +#define VAR_CYCLING_ROAD_RECORD_TIME_H 0x4029 +#define VAR_HAPPINESS_STEP_COUNTER 0x402A +#define VAR_POISON_STEP_COUNTER 0x402B +#define VAR_RESET_RTC_ENABLE 0x402C +#define VAR_ENIGMA_BERRY_AVAILABLE 0x402D +#define VAR_0x402E 0x402E // Seems to be unused. -#define VAR_FRONTIER_MANIAC_FACILITY 0x402F -#define VAR_FRONTIER_GAMBLER_FACILITY 0x4030 -#define VAR_FRONTIER_GAMBLER_SET_FACILITY_F 0x4031 -#define VAR_FRONTIER_GAMBLER_AMOUNT_BET 0x4032 -#define VAR_FRONTIER_GAMBLER_PLACED_BET_F 0x4033 +#define VAR_FRONTIER_MANIAC_FACILITY 0x402F +#define VAR_FRONTIER_GAMBLER_FACILITY 0x4030 +#define VAR_FRONTIER_GAMBLER_SET_FACILITY_F 0x4031 +#define VAR_FRONTIER_GAMBLER_AMOUNT_BET 0x4032 +#define VAR_FRONTIER_GAMBLER_PLACED_BET_F 0x4033 -#define VAR_DEOXYS_ROCK_STEP_COUNT 0x4034 -#define VAR_DEOXYS_ROCK_LEVEL 0x4035 -#define VAR_STORAGE_UNKNOWN 0x4036 -#define VAR_0x4037 0x4037 -#define VAR_0x4038 0x4038 -#define VAR_0x4039 0x4039 -#define VAR_0x403A 0x403A -#define VAR_REGICE_STEPS_1 0x403B -#define VAR_REGICE_STEPS_2 0x403C -#define VAR_REGICE_STEPS_3 0x403D -#define VAR_ALTERING_CAVE_WILD_SET 0x403E -#define VAR_0x403F 0x403F -#define VAR_DAYS 0x4040 -#define VAR_FANCLUB_UNKNOWN_1 0x4041 -#define VAR_FANCLUB_UNKNOWN_2 0x4042 -#define VAR_DEPT_STORE_FLOOR 0x4043 -#define VAR_0x4044 0x4044 -#define VAR_POKELOT_PRIZE 0x4045 -#define VAR_NATIONAL_DEX 0x4046 -#define VAR_SEEDOT_SIZE_RECORD 0x4047 -#define VAR_ASH_GATHER_COUNT 0x4048 -#define VAR_BIRCH_STATE 0x4049 -#define VAR_CRUISE_STEP_COUNT 0x404A -#define VAR_POKELOT_RND1 0x404B -#define VAR_POKELOT_RND2 0x404C -#define VAR_0x404D 0x404D -#define VAR_0x404E 0x404E -#define VAR_LOTAD_SIZE_RECORD 0x404F -#define VAR_0x4050 0x4050 -#define VAR_ROUTE102_ACCESSIBLE 0x4051 -#define VAR_0x4052 0x4052 -#define VAR_LAVARIDGE_RIVAL_STATE 0x4053 -#define VAR_CURRENT_SECRET_BASE 0x4054 -#define VAR_0x4055 0x4055 -#define VAR_0x4056 0x4056 -#define VAR_PETALBURG_STATE 0x4057 -#define VAR_SLATEPORT_STATE 0x4058 -#define VAR_0x4059 0x4059 -#define VAR_RUSTBORO_STATE 0x405A -#define VAR_0x405B 0x405B -#define VAR_0x405C 0x405C -#define VAR_0x405D 0x405D -#define VAR_0x405E 0x405E -#define VAR_0x405F 0x405F -#define VAR_ROUTE101_STATE 0x4060 -#define VAR_0x4061 0x4061 -#define VAR_0x4062 0x4062 -#define VAR_0x4063 0x4063 -#define VAR_0x4064 0x4064 -#define VAR_0x4065 0x4065 -#define VAR_0x4066 0x4066 -#define VAR_0x4067 0x4067 -#define VAR_0x4068 0x4068 -#define VAR_ROUTE110_STATE 0x4069 -#define VAR_0x406A 0x406A -#define VAR_0x406B 0x406B -#define VAR_0x406C 0x406C -#define VAR_0x406D 0x406D -#define VAR_0x406E 0x406E -#define VAR_ROUTE116_STATE 0x406F -#define VAR_0x4070 0x4070 -#define VAR_ROUTE118_STATE 0x4071 -#define VAR_ROUTE119_STATE 0x4072 -#define VAR_0x4073 0x4073 -#define VAR_ROUTE121_STATE 0x4074 -#define VAR_0x4075 0x4075 -#define VAR_0x4076 0x4076 -#define VAR_0x4077 0x4077 -#define VAR_0x4078 0x4078 -#define VAR_0x4079 0x4079 -#define VAR_0x407A 0x407A -#define VAR_ROUTE128_STATE 0x407B -#define VAR_0x407C 0x407C -#define VAR_0x407D 0x407D -#define VAR_0x407E 0x407E -#define VAR_0x407F 0x407F -#define VAR_0x4080 0x4080 -#define VAR_0x4081 0x4081 -#define VAR_LITTLEROOT_HOUSES_STATE 0x4082 -#define VAR_0x4083 0x4083 -#define VAR_BIRCH_LAB_STATE 0x4084 -#define VAR_PETALBURG_GYM_STATE 0x4085 -#define VAR_LINK_CONTEST_ROOM_STATE 0x4086 +#define VAR_DEOXYS_ROCK_STEP_COUNT 0x4034 +#define VAR_DEOXYS_ROCK_LEVEL 0x4035 +#define VAR_STORAGE_UNKNOWN 0x4036 +#define VAR_0x4037 0x4037 +#define VAR_0x4038 0x4038 +#define VAR_0x4039 0x4039 +#define VAR_0x403A 0x403A +#define VAR_REGICE_STEPS_1 0x403B +#define VAR_REGICE_STEPS_2 0x403C +#define VAR_REGICE_STEPS_3 0x403D +#define VAR_ALTERING_CAVE_WILD_SET 0x403E +#define VAR_0x403F 0x403F +#define VAR_DAYS 0x4040 +#define VAR_FANCLUB_UNKNOWN_1 0x4041 +#define VAR_FANCLUB_UNKNOWN_2 0x4042 +#define VAR_DEPT_STORE_FLOOR 0x4043 +#define VAR_0x4044 0x4044 +#define VAR_POKELOT_PRIZE 0x4045 +#define VAR_NATIONAL_DEX 0x4046 +#define VAR_SEEDOT_SIZE_RECORD 0x4047 +#define VAR_ASH_GATHER_COUNT 0x4048 +#define VAR_BIRCH_STATE 0x4049 +#define VAR_CRUISE_STEP_COUNT 0x404A +#define VAR_POKELOT_RND1 0x404B +#define VAR_POKELOT_RND2 0x404C +#define VAR_0x404D 0x404D +#define VAR_0x404E 0x404E +#define VAR_LOTAD_SIZE_RECORD 0x404F +#define VAR_0x4050 0x4050 +#define VAR_ROUTE102_ACCESSIBLE 0x4051 +#define VAR_0x4052 0x4052 +#define VAR_LAVARIDGE_RIVAL_STATE 0x4053 +#define VAR_CURRENT_SECRET_BASE 0x4054 +#define VAR_0x4055 0x4055 +#define VAR_0x4056 0x4056 +#define VAR_PETALBURG_STATE 0x4057 +#define VAR_SLATEPORT_STATE 0x4058 +#define VAR_0x4059 0x4059 +#define VAR_RUSTBORO_STATE 0x405A +#define VAR_0x405B 0x405B +#define VAR_0x405C 0x405C +#define VAR_0x405D 0x405D +#define VAR_0x405E 0x405E +#define VAR_0x405F 0x405F +#define VAR_ROUTE101_STATE 0x4060 +#define VAR_0x4061 0x4061 +#define VAR_0x4062 0x4062 +#define VAR_0x4063 0x4063 +#define VAR_0x4064 0x4064 +#define VAR_0x4065 0x4065 +#define VAR_0x4066 0x4066 +#define VAR_0x4067 0x4067 +#define VAR_0x4068 0x4068 +#define VAR_ROUTE110_STATE 0x4069 +#define VAR_0x406A 0x406A +#define VAR_0x406B 0x406B +#define VAR_0x406C 0x406C +#define VAR_0x406D 0x406D +#define VAR_0x406E 0x406E +#define VAR_ROUTE116_STATE 0x406F +#define VAR_0x4070 0x4070 +#define VAR_ROUTE118_STATE 0x4071 +#define VAR_ROUTE119_STATE 0x4072 +#define VAR_0x4073 0x4073 +#define VAR_ROUTE121_STATE 0x4074 +#define VAR_0x4075 0x4075 +#define VAR_0x4076 0x4076 +#define VAR_0x4077 0x4077 +#define VAR_0x4078 0x4078 +#define VAR_0x4079 0x4079 +#define VAR_0x407A 0x407A +#define VAR_ROUTE128_STATE 0x407B +#define VAR_0x407C 0x407C +#define VAR_0x407D 0x407D +#define VAR_0x407E 0x407E +#define VAR_0x407F 0x407F +#define VAR_0x4080 0x4080 +#define VAR_0x4081 0x4081 +#define VAR_LITTLEROOT_HOUSES_STATE 0x4082 +#define VAR_0x4083 0x4083 +#define VAR_BIRCH_LAB_STATE 0x4084 +#define VAR_PETALBURG_GYM_STATE 0x4085 +#define VAR_LINK_CONTEST_ROOM_STATE 0x4086 #define VAR_CABLE_CLUB_STATE 0x4087 #define VAR_CONTEST_LOCATION 0x4088 -#define VAR_0x4089 0x4089 -#define VAR_CONTEST_PRIZE_PICKUP 0x408A -#define VAR_0x408B 0x408B -#define VAR_LITTLEROOT_HOUSES_STATE_2 0x408C -#define VAR_LITTLEROOT_RIVAL_STATE 0x408D -#define VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE 0x408E -#define VAR_DEVON_CORP_3F_STATE 0x408F -#define VAR_BRINEY_HOUSE_STATE 0x4090 -#define VAR_0x4091 0x4091 -#define VAR_LITTLEROOT_INTRO_STATE 0x4092 -#define VAR_MAUVILLE_GYM_STATE 0x4093 -#define VAR_LILYCOVE_MUSEUM_2F_STATE 0x4094 -#define VAR_LILYCOVE_FAN_CLUB_STATE 0x4095 -#define VAR_BRINEY_LOCATION 0x4096 -#define VAR_0x4097 0x4097 -#define VAR_PETALBURG_WOODS_STATE 0x4098 -#define VAR_LILYCOVE_CONTEST_LOBBY_STATE 0x4099 -#define VAR_RUSTURF_TUNNEL_STATE 0x409A -#define VAR_0x409B 0x409B -#define VAR_ELITE_4_STATE 0x409C -#define VAR_0x409D 0x409D -#define VAR_0x409E 0x409E -#define VAR_0x409F 0x409F -#define VAR_SLATEPORT_HARBOR_STATE 0x40A0 -#define VAR_0x40A1 0x40A1 -#define VAR_SEAFLOOR_CAVERN_STATE 0x40A2 -#define VAR_CABLE_CAR_STATION_STATE 0x40A3 -#define VAR_SAFARI_ZONE_STATE 0x40A4 -#define VAR_TRICK_HOUSE_ENTRANCE_STATE_1 0x40A5 -#define VAR_TRICK_HOUSE_ENTRANCE_STATE_2 0x40A6 -#define VAR_TRICK_HOUSE_ENTRANCE_STATE_3 0x40A7 -#define VAR_0x40A8 0x40A8 -#define VAR_CYCLING_CHALLENGE_STATE 0x40A9 -#define VAR_SLATEPORT_MUSEUM_1F_STATE 0x40AA -#define VAR_TRICK_HOUSE_PUZZLE_1_STATE 0x40AB -#define VAR_TRICK_HOUSE_PUZZLE_2_STATE 0x40AC -#define VAR_TRICK_HOUSE_PUZZLE_3_STATE 0x40AD -#define VAR_TRICK_HOUSE_PUZZLE_4_STATE 0x40AE -#define VAR_TRICK_HOUSE_PUZZLE_5_STATE 0x40AF -#define VAR_TRICK_HOUSE_PUZZLE_6_STATE 0x40B0 -#define VAR_TRICK_HOUSE_PUZZLE_7_STATE 0x40B1 -#define VAR_TRICK_HOUSE_PUZZLE_8_STATE 0x40B2 -#define VAR_WEATHER_INSTITUTE_STATE 0x40B3 -#define VAR_PORTHOLE_STATE 0x40B4 -#define VAR_TRICK_HOUSE_STATE 0x40B5 // TODO: needs some further investigation -#define VAR_TRICK_HOUSE_PUZZLE_7_STATE_2 0x40B6 -#define VAR_SLATEPORT_FAN_CLUB_STATE 0x40B7 -#define VAR_0x40B8 0x40B8 -#define VAR_MT_PYRE_STATE 0x40B9 -#define VAR_NEW_MAUVILLE_STATE 0x40BA -#define VAR_0x40BB 0x40BB -#define VAR_BRAVO_TRAINER_BATTLE_TOWER_ON 0x40BC -#define VAR_JAGGED_PASS_ASH_WEATHER 0x40BD -#define VAR_GLASS_WORKSHOP_STATE 0x40BE -#define VAR_METEOR_FALLS_STATE 0x40BF -#define VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE 0x40C0 -#define VAR_TRICK_HOUSE_PRIZE_PICKUP 0x40C1 -#define VAR_PACIFIDLOG_TM_RECEIVED_DAY 0x40C2 -#define VAR_VICTORY_ROAD_1F_STATE 0x40C3 -#define VAR_FOSSIL_RESURRECTION_STATE 0x40C4 -#define VAR_WHICH_FOSSIL_REVIVED 0x40C5 -#define VAR_STEVENS_HOUSE_STATE 0x40C6 -#define VAR_OLDALE_STATE 0x40C7 -#define VAR_0x40C8 0x40C8 -#define VAR_0x40C9 0x40C9 -#define VAR_0x40CA 0x40CA -#define VAR_0x40CB 0x40CB -#define VAR_0x40CC 0x40CC -#define VAR_0x40CD 0x40CD -#define VAR_FRONTIER_BATTLE_MODE 0x40CE -#define VAR_FRONTIER_FACILITY 0x40CF -#define VAR_0x40D0 0x40D0 -#define VAR_0x40D1 0x40D1 -#define VAR_0x40D2 0x40D2 -#define VAR_0x40D3 0x40D3 -#define VAR_0x40D4 0x40D4 -#define VAR_0x40D5 0x40D5 -#define VAR_0x40D6 0x40D6 -#define VAR_0x40D7 0x40D7 -#define VAR_0x40D8 0x40D8 -#define VAR_0x40D9 0x40D9 -#define VAR_0x40DA 0x40DA -#define VAR_0x40DB 0x40DB -#define VAR_0x40DC 0x40DC -#define VAR_EVENT_PICHU_SLOT 0x40DD -#define VAR_0x40DE 0x40DE -#define VAR_0x40DF 0x40DF -#define VAR_0x40E0 0x40E0 -#define VAR_0x40E1 0x40E1 -#define VAR_0x40E2 0x40E2 -#define VAR_0x40E3 0x40E3 -#define VAR_0x40E4 0x40E4 -#define VAR_0x40E5 0x40E5 -#define VAR_DAILY_SLOTS 0x40E6 -#define VAR_DAILY_WILDS 0x40E7 -#define VAR_DAILY_BLENDER 0x40E8 -#define VAR_DAILY_PLANTED_BERRIES 0x40E9 -#define VAR_DAILY_PICKED_BERRIES 0x40EA -#define VAR_DAILY_ROULETTE 0x40EB -#define VAR_0x40EC 0x40EC -#define VAR_0x40ED 0x40ED -#define VAR_0x40EE 0x40EE -#define VAR_0x40EF 0x40EF -#define VAR_0x40F0 0x40F0 -#define VAR_DAILY_BP 0x40F1 -#define VAR_0x40F2 0x40F2 -#define VAR_0x40F3 0x40F3 -#define VAR_0x40F4 0x40F4 -#define VAR_0x40F5 0x40F5 -#define VAR_0x40F6 0x40F6 -#define VAR_0x40F7 0x40F7 -#define VAR_0x40F8 0x40F8 -#define VAR_0x40F9 0x40F9 -#define VAR_0x40FA 0x40FA -#define VAR_0x40FB 0x40FB -#define VAR_0x40FC 0x40FC -#define VAR_0x40FD 0x40FD -#define VAR_0x40FE 0x40FE -#define VAR_0x40FF 0x40FF +#define VAR_0x4089 0x4089 +#define VAR_CONTEST_PRIZE_PICKUP 0x408A +#define VAR_0x408B 0x408B +#define VAR_LITTLEROOT_HOUSES_STATE_2 0x408C +#define VAR_LITTLEROOT_RIVAL_STATE 0x408D +#define VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE 0x408E +#define VAR_DEVON_CORP_3F_STATE 0x408F +#define VAR_BRINEY_HOUSE_STATE 0x4090 +#define VAR_0x4091 0x4091 +#define VAR_LITTLEROOT_INTRO_STATE 0x4092 +#define VAR_MAUVILLE_GYM_STATE 0x4093 +#define VAR_LILYCOVE_MUSEUM_2F_STATE 0x4094 +#define VAR_LILYCOVE_FAN_CLUB_STATE 0x4095 +#define VAR_BRINEY_LOCATION 0x4096 +#define VAR_0x4097 0x4097 +#define VAR_PETALBURG_WOODS_STATE 0x4098 +#define VAR_LILYCOVE_CONTEST_LOBBY_STATE 0x4099 +#define VAR_RUSTURF_TUNNEL_STATE 0x409A +#define VAR_0x409B 0x409B +#define VAR_ELITE_4_STATE 0x409C +#define VAR_0x409D 0x409D +#define VAR_0x409E 0x409E +#define VAR_0x409F 0x409F +#define VAR_SLATEPORT_HARBOR_STATE 0x40A0 +#define VAR_0x40A1 0x40A1 +#define VAR_SEAFLOOR_CAVERN_STATE 0x40A2 +#define VAR_CABLE_CAR_STATION_STATE 0x40A3 +#define VAR_SAFARI_ZONE_STATE 0x40A4 +#define VAR_TRICK_HOUSE_ENTRANCE_STATE_1 0x40A5 +#define VAR_TRICK_HOUSE_ENTRANCE_STATE_2 0x40A6 +#define VAR_TRICK_HOUSE_ENTRANCE_STATE_3 0x40A7 +#define VAR_0x40A8 0x40A8 +#define VAR_CYCLING_CHALLENGE_STATE 0x40A9 +#define VAR_SLATEPORT_MUSEUM_1F_STATE 0x40AA +#define VAR_TRICK_HOUSE_PUZZLE_1_STATE 0x40AB +#define VAR_TRICK_HOUSE_PUZZLE_2_STATE 0x40AC +#define VAR_TRICK_HOUSE_PUZZLE_3_STATE 0x40AD +#define VAR_TRICK_HOUSE_PUZZLE_4_STATE 0x40AE +#define VAR_TRICK_HOUSE_PUZZLE_5_STATE 0x40AF +#define VAR_TRICK_HOUSE_PUZZLE_6_STATE 0x40B0 +#define VAR_TRICK_HOUSE_PUZZLE_7_STATE 0x40B1 +#define VAR_TRICK_HOUSE_PUZZLE_8_STATE 0x40B2 +#define VAR_WEATHER_INSTITUTE_STATE 0x40B3 +#define VAR_PORTHOLE_STATE 0x40B4 +#define VAR_TRICK_HOUSE_STATE 0x40B5 // TODO: needs some further investigation +#define VAR_TRICK_HOUSE_PUZZLE_7_STATE_2 0x40B6 +#define VAR_SLATEPORT_FAN_CLUB_STATE 0x40B7 +#define VAR_0x40B8 0x40B8 +#define VAR_MT_PYRE_STATE 0x40B9 +#define VAR_NEW_MAUVILLE_STATE 0x40BA +#define VAR_0x40BB 0x40BB +#define VAR_BRAVO_TRAINER_BATTLE_TOWER_ON 0x40BC +#define VAR_JAGGED_PASS_ASH_WEATHER 0x40BD +#define VAR_GLASS_WORKSHOP_STATE 0x40BE +#define VAR_METEOR_FALLS_STATE 0x40BF +#define VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE 0x40C0 +#define VAR_TRICK_HOUSE_PRIZE_PICKUP 0x40C1 +#define VAR_PACIFIDLOG_TM_RECEIVED_DAY 0x40C2 +#define VAR_VICTORY_ROAD_1F_STATE 0x40C3 +#define VAR_FOSSIL_RESURRECTION_STATE 0x40C4 +#define VAR_WHICH_FOSSIL_REVIVED 0x40C5 +#define VAR_STEVENS_HOUSE_STATE 0x40C6 +#define VAR_OLDALE_STATE 0x40C7 +#define VAR_0x40C8 0x40C8 +#define VAR_0x40C9 0x40C9 +#define VAR_0x40CA 0x40CA +#define VAR_0x40CB 0x40CB +#define VAR_0x40CC 0x40CC +#define VAR_0x40CD 0x40CD +#define VAR_FRONTIER_BATTLE_MODE 0x40CE +#define VAR_FRONTIER_FACILITY 0x40CF +#define VAR_0x40D0 0x40D0 +#define VAR_0x40D1 0x40D1 +#define VAR_0x40D2 0x40D2 +#define VAR_0x40D3 0x40D3 +#define VAR_0x40D4 0x40D4 +#define VAR_0x40D5 0x40D5 +#define VAR_0x40D6 0x40D6 +#define VAR_0x40D7 0x40D7 +#define VAR_0x40D8 0x40D8 +#define VAR_0x40D9 0x40D9 +#define VAR_0x40DA 0x40DA +#define VAR_0x40DB 0x40DB +#define VAR_0x40DC 0x40DC +#define VAR_EVENT_PICHU_SLOT 0x40DD +#define VAR_0x40DE 0x40DE +#define VAR_0x40DF 0x40DF +#define VAR_0x40E0 0x40E0 +#define VAR_0x40E1 0x40E1 +#define VAR_0x40E2 0x40E2 +#define VAR_0x40E3 0x40E3 +#define VAR_0x40E4 0x40E4 +#define VAR_0x40E5 0x40E5 +#define VAR_DAILY_SLOTS 0x40E6 +#define VAR_DAILY_WILDS 0x40E7 +#define VAR_DAILY_BLENDER 0x40E8 +#define VAR_DAILY_PLANTED_BERRIES 0x40E9 +#define VAR_DAILY_PICKED_BERRIES 0x40EA +#define VAR_DAILY_ROULETTE 0x40EB +#define VAR_0x40EC 0x40EC +#define VAR_0x40ED 0x40ED +#define VAR_0x40EE 0x40EE +#define VAR_0x40EF 0x40EF +#define VAR_0x40F0 0x40F0 +#define VAR_DAILY_BP 0x40F1 +#define VAR_0x40F2 0x40F2 +#define VAR_0x40F3 0x40F3 +#define VAR_0x40F4 0x40F4 +#define VAR_0x40F5 0x40F5 +#define VAR_0x40F6 0x40F6 +#define VAR_0x40F7 0x40F7 +#define VAR_0x40F8 0x40F8 +#define VAR_0x40F9 0x40F9 +#define VAR_0x40FA 0x40FA +#define VAR_0x40FB 0x40FB +#define VAR_0x40FC 0x40FC +#define VAR_0x40FD 0x40FD +#define VAR_0x40FE 0x40FE +#define VAR_0x40FF 0x40FF #define SPECIAL_VARS_START 0x8000 // special vars From e1b2460748dfd9d1a4b3c6eb760e86fb616a7ce6 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 25 Feb 2019 02:28:41 -0500 Subject: [PATCH 17/25] Adjust formatting, rename function --- include/field_weather.h | 2 +- src/field_weather_effect.c | 36 ++++++++++++++++++------------------ src/overworld.c | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/include/field_weather.h b/include/field_weather.h index ced8e255cc..76399200d1 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -233,6 +233,6 @@ void SetSav1WeatherFromCurrMapHeader(void); void SetWeather(u32 weather); void DoCurrentWeather(void); void UpdateWeatherPerDay(u16 increment); -void DoPausedWeather(void); +void ResumePausedWeather(void); #endif // GUARD_WEATHER_H diff --git a/src/field_weather_effect.c b/src/field_weather_effect.c index b81a8f5d25..be8fdc6cb2 100644 --- a/src/field_weather_effect.c +++ b/src/field_weather_effect.c @@ -2397,7 +2397,7 @@ void DoCurrentWeather(void) SetNextWeather(weather); } -void DoPausedWeather(void) +void ResumePausedWeather(void) { u8 weather = GetSav1Weather(); @@ -2435,25 +2435,25 @@ static u8 TranslateWeatherNum(u8 weather) { switch (weather) { - case WEATHER_NONE: return WEATHER_NONE; - case WEATHER_CLOUDS: return WEATHER_CLOUDS; - case WEATHER_SUNNY: return WEATHER_SUNNY; - case WEATHER_RAIN_LIGHT: return WEATHER_RAIN_LIGHT; - case WEATHER_SNOW: return WEATHER_SNOW; - case WEATHER_RAIN_MED: return WEATHER_RAIN_MED; - case WEATHER_FOG_1: return WEATHER_FOG_1; - case WEATHER_ASH: return WEATHER_ASH; - case WEATHER_SANDSTORM: return WEATHER_SANDSTORM; - case WEATHER_FOG_2: return WEATHER_FOG_2; - case WEATHER_FOG_3: return WEATHER_FOG_3; - case WEATHER_SHADE: return WEATHER_SHADE; - case WEATHER_DROUGHT: return WEATHER_DROUGHT; - case WEATHER_RAIN_HEAVY: return WEATHER_RAIN_HEAVY; - case WEATHER_BUBBLES: return WEATHER_BUBBLES; - case WEATHER_ALTERNATING: return WEATHER_ALTERNATING; + case WEATHER_NONE: return WEATHER_NONE; + case WEATHER_CLOUDS: return WEATHER_CLOUDS; + case WEATHER_SUNNY: return WEATHER_SUNNY; + case WEATHER_RAIN_LIGHT: return WEATHER_RAIN_LIGHT; + case WEATHER_SNOW: return WEATHER_SNOW; + case WEATHER_RAIN_MED: return WEATHER_RAIN_MED; + case WEATHER_FOG_1: return WEATHER_FOG_1; + case WEATHER_ASH: return WEATHER_ASH; + case WEATHER_SANDSTORM: return WEATHER_SANDSTORM; + case WEATHER_FOG_2: return WEATHER_FOG_2; + case WEATHER_FOG_3: return WEATHER_FOG_3; + case WEATHER_SHADE: return WEATHER_SHADE; + case WEATHER_DROUGHT: return WEATHER_DROUGHT; + case WEATHER_RAIN_HEAVY: return WEATHER_RAIN_HEAVY; + case WEATHER_BUBBLES: return WEATHER_BUBBLES; + case WEATHER_ALTERNATING: return WEATHER_ALTERNATING; case WEATHER_ROUTE119_CYCLE: return sWeatherCycleRoute119[gSaveBlock1Ptr->weatherCycleStage]; case WEATHER_ROUTE123_CYCLE: return sWeatherCycleRoute123[gSaveBlock1Ptr->weatherCycleStage]; - default: return WEATHER_NONE; + default: return WEATHER_NONE; } } diff --git a/src/overworld.c b/src/overworld.c index 6f973f16be..2650a619c3 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -2123,7 +2123,7 @@ static void sub_8086988(u32 a1) FieldEffectActiveListClear(); StartWeather(); - DoPausedWeather(); + ResumePausedWeather(); if (!a1) SetUpFieldTasks(); mapheader_run_script_with_tag_x5(); From 5f7a9713134d7694120dac27bef5ac14467f2734 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 22 Feb 2019 02:23:46 -0500 Subject: [PATCH 18/25] Source file part of map script renaming --- data/event_scripts.s | 1 + data/map_events.s | 1 + data/mystery_event_msg.s | 1 + include/constants/map_scripts.h | 12 ++++++++++ include/overworld.h | 2 +- include/script.h | 20 ++++++++-------- src/battle_pyramid.c | 2 +- src/field_control_avatar.c | 2 +- src/fieldmap.c | 6 ++--- src/overworld.c | 18 +++++++------- src/script.c | 42 ++++++++++++++++----------------- src/trainer_hill.c | 2 +- 12 files changed, 62 insertions(+), 47 deletions(-) create mode 100644 include/constants/map_scripts.h diff --git a/data/event_scripts.s b/data/event_scripts.s index cf5695d3bc..5e8a35f982 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -8,6 +8,7 @@ #include "constants/items.h" #include "constants/heal_locations.h" #include "constants/layouts.h" +#include "constants/map_scripts.h" #include "constants/maps.h" #include "constants/moves.h" #include "constants/songs.h" diff --git a/data/map_events.s b/data/map_events.s index c6f88d305c..cd42bfe759 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -3,6 +3,7 @@ #include "constants/event_objects.h" #include "constants/flags.h" #include "constants/items.h" +#include "constants/map_scripts.h" #include "constants/maps.h" #include "constants/secret_bases.h" #include "constants/vars.h" diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index aa904b0bf3..24a075181f 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -1,5 +1,6 @@ #include "constants/flags.h" #include "constants/items.h" +#include "constants/map_scripts.h" #include "constants/moves.h" #include "constants/songs.h" #include "constants/species.h" diff --git a/include/constants/map_scripts.h b/include/constants/map_scripts.h new file mode 100644 index 0000000000..d5fd40156d --- /dev/null +++ b/include/constants/map_scripts.h @@ -0,0 +1,12 @@ +#ifndef GUARD_CONSTANTS_MAP_SCRIPTS_H +#define GUARD_CONSTANTS_MAP_SCRIPTS_H + +#define MAP_SCRIPT_ON_LOAD 1 +#define MAP_SCRIPT_ON_FRAME_TABLE 2 +#define MAP_SCRIPT_ON_TRANSITION 3 +#define MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE 4 +#define MAP_SCRIPT_ON_RESUME 5 +#define MAP_SCRIPT_ON_DIVE_WARP 6 +#define MAP_SCRIPT_ON_RETURN_TO_FIELD 7 + +#endif // GUARD_CONSTANTS_MAP_SCRIPTS_H \ No newline at end of file diff --git a/include/overworld.h b/include/overworld.h index 79cbf1da32..8caba06736 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -68,7 +68,7 @@ void SetContinueGameWarpToDynamicWarp(int unused); const struct MapConnection *GetMapConnection(u8 dir); bool8 SetDiveWarpEmerge(u16 x, u16 y); bool8 SetDiveWarpDive(u16 x, u16 y); -void mliX_load_map(u8 mapGroup, u8 mapNum); +void LoadMapFromCameraTransition(u8 mapGroup, u8 mapNum); void ResetInitialPlayerAvatarState(void); void StoreInitialPlayerAvatarState(void); bool32 Overworld_IsBikingAllowed(void); diff --git a/include/script.h b/include/script.h index 755ff19a38..386b388d02 100644 --- a/include/script.h +++ b/include/script.h @@ -43,16 +43,16 @@ void ScriptContext1_SetupScript(const u8 *ptr); void ScriptContext1_Stop(void); void EnableBothScriptContexts(void); void ScriptContext2_RunNewScript(const u8 *ptr); -u8 *mapheader_get_tagged_pointer(u8 tag); -void mapheader_run_script_by_tag(u8 tag); -u8 *mapheader_get_first_match_from_tagged_ptr_list(u8 tag); -void mapheader_run_script_with_tag_x1(void); -void mapheader_run_script_with_tag_x3(void); -void mapheader_run_script_with_tag_x5(void); -void mapheader_run_script_with_tag_x7(void); -void mapheader_run_script_with_tag_x6(void); -bool8 mapheader_run_first_tag2_script_list_match(void); -void mapheader_run_first_tag4_script_list_match(void); +u8 *MapHeaderGetScriptTable(u8 tag); +void MapHeaderRunScriptType(u8 tag); +u8 *MapHeaderCheckScriptTable(u8 tag); +void RunOnLoadMapScript(void); +void RunOnTransitionMapScript(void); +void RunOnResumeMapScript(void); +void RunOnReturnToFieldMapScript(void); +void RunOnDiveWarpMapScript(void); +bool8 TryRunOnFrameMapScript(void); +void TryRunOnWarpIntoMapScript(void); u32 CalculateRamScriptChecksum(void); void ClearRamScript(void); bool8 InitRamScript(const u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId); diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index a2fa4120f4..340c17c597 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -1590,7 +1590,7 @@ void GenerateBattlePyramidFloorLayout(u16 *backupMapData, bool8 setPlayerPositio layoutMap += mapLayout->width; } } - mapheader_run_script_with_tag_x1(); + RunOnLoadMapScript(); free(floorLayoutOffsets); } diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 00dce4c7d0..cffafaf9f7 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -147,7 +147,7 @@ int ProcessPlayerFieldInput(struct FieldInput *input) if (CheckForTrainersWantingBattle() == TRUE) return TRUE; - if (mapheader_run_first_tag2_script_list_match() == 1) + if (TryRunOnFrameMapScript() == TRUE) return TRUE; if (input->pressedBButton && TrySetupDiveEmergeScript() == TRUE) diff --git a/src/fieldmap.c b/src/fieldmap.c index 7d9d079fc3..cf5f0356e1 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -53,7 +53,7 @@ void InitMap(void) { InitMapLayoutData(&gMapHeader); sub_80E8EE0(gMapHeader.events); - mapheader_run_script_with_tag_x1(); + RunOnLoadMapScript(); } void InitMapFromSavedGame(void) @@ -62,7 +62,7 @@ void InitMapFromSavedGame(void) sub_80E9238(0); sub_80E8EE0(gMapHeader.events); LoadSavedMapView(); - mapheader_run_script_with_tag_x1(); + RunOnLoadMapScript(); UpdateTVScreensOnMap(gBackupMapLayout.width, gBackupMapLayout.height); } @@ -775,7 +775,7 @@ bool8 CameraMove(int x, int y) old_y = gSaveBlock1Ptr->pos.y; connection = sub_8088950(direction, gSaveBlock1Ptr->pos.x, gSaveBlock1Ptr->pos.y); sub_80887F8(connection, direction, x, y); - mliX_load_map(connection->mapGroup, connection->mapNum); + LoadMapFromCameraTransition(connection->mapGroup, connection->mapNum); gCamera.active = TRUE; gCamera.x = old_x - gSaveBlock1Ptr->pos.x; gCamera.y = old_y - gSaveBlock1Ptr->pos.y; diff --git a/src/overworld.c b/src/overworld.c index 08fd94c1be..d5584efc38 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -761,7 +761,7 @@ static bool8 SetDiveWarp(u8 dir, u16 x, u16 y) } else { - mapheader_run_script_with_tag_x6(); + RunOnDiveWarpMapScript(); if (IsDummyWarp(&gFixedDiveWarp)) return FALSE; SetWarpDestinationToDiveWarp(); @@ -779,7 +779,7 @@ bool8 SetDiveWarpDive(u16 x, u16 y) return SetDiveWarp(CONNECTION_DIVE, x, y); } -void mliX_load_map(u8 mapGroup, u8 mapNum) +void LoadMapFromCameraTransition(u8 mapGroup, u8 mapNum) { s32 paletteIndex; @@ -800,7 +800,7 @@ void mliX_load_map(u8 mapGroup, u8 mapNum) ChooseAmbientCrySpecies(); SetDefaultFlashLevel(); Overworld_ClearSavedMusic(); - mapheader_run_script_with_tag_x3(); + RunOnTransitionMapScript(); InitMap(); copy_map_tileset2_to_vram_2(gMapHeader.mapLayout); apply_map_tileset2_palette(gMapHeader.mapLayout); @@ -813,7 +813,7 @@ void mliX_load_map(u8 mapGroup, u8 mapNum) RoamerMove(); DoCurrentWeather(); ResetFieldTasksArgs(); - mapheader_run_script_with_tag_x5(); + RunOnResumeMapScript(); if (gMapHeader.regionMapSectionId != MAPSEC_BATTLE_FRONTIER || gMapHeader.regionMapSectionId != sLastMapSectionId) ShowMapNamePopup(); @@ -852,7 +852,7 @@ static void mli0_load_map(u32 a1) FlagClear(FLAG_SYS_USE_FLASH); SetDefaultFlashLevel(); Overworld_ClearSavedMusic(); - mapheader_run_script_with_tag_x3(); + RunOnTransitionMapScript(); UpdateLocationHistoryForRoamer(); RoamerMoveToOtherLocationSet(); if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) @@ -2126,7 +2126,7 @@ static void sub_8086988(u32 a1) sub_80AEE84(); if (!a1) SetUpFieldTasks(); - mapheader_run_script_with_tag_x5(); + RunOnResumeMapScript(); TryStartMirageTowerPulseBlendEffect(); } @@ -2136,7 +2136,7 @@ static void sub_80869DC(void) gTotalCameraPixelOffsetY = 0; ResetEventObjects(); TrySpawnEventObjects(0, 0); - mapheader_run_first_tag4_script_list_match(); + TryRunOnWarpIntoMapScript(); } static void mli4_mapscripts_and_other(void) @@ -2153,14 +2153,14 @@ static void mli4_mapscripts_and_other(void) SetPlayerAvatarTransitionFlags(player->transitionFlags); ResetInitialPlayerAvatarState(); TrySpawnEventObjects(0, 0); - mapheader_run_first_tag4_script_list_match(); + TryRunOnWarpIntoMapScript(); } static void sub_8086A68(void) { sub_808E16C(0, 0); RotatingGate_InitPuzzleAndGraphics(); - mapheader_run_script_with_tag_x7(); + RunOnReturnToFieldMapScript(); } static void sub_8086A80(void) diff --git a/src/script.c b/src/script.c index c61ae71838..dff99609bd 100644 --- a/src/script.c +++ b/src/script.c @@ -241,7 +241,7 @@ void ScriptContext2_RunNewScript(const u8 *ptr) while (RunScriptCommand(&sScriptContext2) == TRUE); } -u8 *mapheader_get_tagged_pointer(u8 tag) +u8 *MapHeaderGetScriptTable(u8 tag) { const u8 *mapScripts = gMapHeader.mapScripts; @@ -261,16 +261,16 @@ u8 *mapheader_get_tagged_pointer(u8 tag) } } -void mapheader_run_script_by_tag(u8 tag) +void MapHeaderRunScriptType(u8 tag) { - u8 *ptr = mapheader_get_tagged_pointer(tag); + u8 *ptr = MapHeaderGetScriptTable(tag); if (ptr) ScriptContext2_RunNewScript(ptr); } -u8 *mapheader_get_first_match_from_tagged_ptr_list(u8 tag) +u8 *MapHeaderCheckScriptTable(u8 tag) { - u8 *ptr = mapheader_get_tagged_pointer(tag); + u8 *ptr = MapHeaderGetScriptTable(tag); if (!ptr) return NULL; @@ -291,45 +291,45 @@ u8 *mapheader_get_first_match_from_tagged_ptr_list(u8 tag) } } -void mapheader_run_script_with_tag_x1(void) +void RunOnLoadMapScript(void) { - mapheader_run_script_by_tag(1); + MapHeaderRunScriptType(1); } -void mapheader_run_script_with_tag_x3(void) +void RunOnTransitionMapScript(void) { - mapheader_run_script_by_tag(3); + MapHeaderRunScriptType(3); } -void mapheader_run_script_with_tag_x5(void) +void RunOnResumeMapScript(void) { - mapheader_run_script_by_tag(5); + MapHeaderRunScriptType(5); } -void mapheader_run_script_with_tag_x7(void) +void RunOnReturnToFieldMapScript(void) { - mapheader_run_script_by_tag(7); + MapHeaderRunScriptType(7); } -void mapheader_run_script_with_tag_x6(void) +void RunOnDiveWarpMapScript(void) { - mapheader_run_script_by_tag(6); + MapHeaderRunScriptType(6); } -bool8 mapheader_run_first_tag2_script_list_match(void) +bool8 TryRunOnFrameMapScript(void) { - u8 *ptr = mapheader_get_first_match_from_tagged_ptr_list(2); + u8 *ptr = MapHeaderCheckScriptTable(2); if (!ptr) - return 0; + return FALSE; ScriptContext1_SetupScript(ptr); - return 1; + return TRUE; } -void mapheader_run_first_tag4_script_list_match(void) +void TryRunOnWarpIntoMapScript(void) { - u8 *ptr = mapheader_get_first_match_from_tagged_ptr_list(4); + u8 *ptr = MapHeaderCheckScriptTable(4); if (ptr) ScriptContext2_RunNewScript(ptr); } diff --git a/src/trainer_hill.c b/src/trainer_hill.c index efe11b0c7d..42b196abd7 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -796,7 +796,7 @@ void sub_81D5FB4(u16 *mapArg) dst += 31; } - mapheader_run_script_with_tag_x1(); + RunOnLoadMapScript(); FreeDataStruct(); } From 8816aa527d7f3adfa10988ac661b9842bf78e64b Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 22 Feb 2019 02:28:32 -0500 Subject: [PATCH 19/25] Update map script files --- data/event_scripts.s | 4 ++-- data/maps/AbandonedShip_Corridors_B1F/scripts.inc | 4 ++-- data/maps/AbandonedShip_Deck/scripts.inc | 2 +- .../AbandonedShip_HiddenFloorCorridors/scripts.inc | 4 ++-- data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc | 2 +- data/maps/AbandonedShip_Rooms_B1F/scripts.inc | 2 +- data/maps/AbandonedShip_Underwater1/scripts.inc | 2 +- data/maps/AbandonedShip_Underwater2/scripts.inc | 2 +- data/maps/AlteringCave/scripts.inc | 2 +- data/maps/AncientTomb/scripts.inc | 6 +++--- data/maps/AquaHideout_B1F/scripts.inc | 4 ++-- data/maps/AquaHideout_B2F/scripts.inc | 2 +- data/maps/ArtisanCave_B1F/scripts.inc | 2 +- .../BattleFrontier_BattleArenaBattleRoom/scripts.inc | 8 ++++---- .../BattleFrontier_BattleArenaCorridor/scripts.inc | 2 +- data/maps/BattleFrontier_BattleArenaLobby/scripts.inc | 4 ++-- .../BattleFrontier_BattleDomeBattleRoom/scripts.inc | 8 ++++---- .../maps/BattleFrontier_BattleDomeCorridor/scripts.inc | 2 +- data/maps/BattleFrontier_BattleDomeLobby/scripts.inc | 6 +++--- .../BattleFrontier_BattleDomePreBattleRoom/scripts.inc | 4 ++-- .../BattleFrontier_BattleFactoryBattleRoom/scripts.inc | 6 +++--- .../maps/BattleFrontier_BattleFactoryLobby/scripts.inc | 4 ++-- .../scripts.inc | 4 ++-- .../BattleFrontier_BattlePalaceBattleRoom/scripts.inc | 6 +++--- .../BattleFrontier_BattlePalaceCorridor/scripts.inc | 2 +- data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc | 4 ++-- .../maps/BattleFrontier_BattlePikeCorridor/scripts.inc | 4 ++-- data/maps/BattleFrontier_BattlePikeLobby/scripts.inc | 4 ++-- .../BattleFrontier_BattlePikeRandomRoom1/scripts.inc | 8 ++++---- .../BattleFrontier_BattlePikeRandomRoom2/scripts.inc | 4 ++-- .../BattleFrontier_BattlePikeRandomRoom3/scripts.inc | 6 +++--- .../BattleFrontier_BattlePikeThreePathRoom/scripts.inc | 6 +++--- .../scripts.inc | 6 +++--- .../maps/BattleFrontier_BattlePyramidLobby/scripts.inc | 4 ++-- data/maps/BattleFrontier_BattlePyramidTop/scripts.inc | 8 ++++---- .../BattleFrontier_BattleTowerBattleRoom/scripts.inc | 4 ++-- .../BattleFrontier_BattleTowerBattleRoom2/scripts.inc | 6 +++--- .../BattleFrontier_BattleTowerCorridor/scripts.inc | 4 ++-- .../BattleFrontier_BattleTowerCorridor2/scripts.inc | 6 +++--- .../BattleFrontier_BattleTowerElevator/scripts.inc | 4 ++-- data/maps/BattleFrontier_BattleTowerLobby/scripts.inc | 8 ++++---- .../scripts.inc | 8 ++++---- data/maps/BattleFrontier_OutsideEast/scripts.inc | 4 ++-- data/maps/BattleFrontier_OutsideWest/scripts.inc | 2 +- data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/BattleFrontier_ReceptionGate/scripts.inc | 4 ++-- data/maps/BirthIsland_Exterior/scripts.inc | 6 +++--- data/maps/CaveOfOrigin_1F/scripts.inc | 2 +- data/maps/CaveOfOrigin_Entrance/scripts.inc | 2 +- .../CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc | 2 +- .../CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc | 2 +- .../CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc | 2 +- data/maps/DesertRuins/scripts.inc | 6 +++--- data/maps/DesertUnderpass/scripts.inc | 2 +- data/maps/DewfordTown/scripts.inc | 2 +- data/maps/DewfordTown_Gym/scripts.inc | 2 +- data/maps/DewfordTown_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/DewfordTown_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/EverGrandeCity/scripts.inc | 2 +- data/maps/EverGrandeCity_ChampionsRoom/scripts.inc | 6 +++--- data/maps/EverGrandeCity_DrakesRoom/scripts.inc | 6 +++--- data/maps/EverGrandeCity_GlaciasRoom/scripts.inc | 6 +++--- data/maps/EverGrandeCity_Hall1/scripts.inc | 2 +- data/maps/EverGrandeCity_Hall2/scripts.inc | 2 +- data/maps/EverGrandeCity_Hall3/scripts.inc | 2 +- data/maps/EverGrandeCity_Hall4/scripts.inc | 2 +- data/maps/EverGrandeCity_Hall5/scripts.inc | 2 +- data/maps/EverGrandeCity_HallOfFame/scripts.inc | 4 ++-- data/maps/EverGrandeCity_PhoebesRoom/scripts.inc | 6 +++--- data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc | 4 ++-- data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc | 8 ++++---- data/maps/EverGrandeCity_SidneysRoom/scripts.inc | 8 ++++---- data/maps/FallarborTown/scripts.inc | 2 +- .../FallarborTown_BattleTentBattleRoom/scripts.inc | 6 +++--- data/maps/FallarborTown_BattleTentCorridor/scripts.inc | 2 +- data/maps/FallarborTown_BattleTentLobby/scripts.inc | 4 ++-- data/maps/FallarborTown_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/FallarborTown_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/FarawayIsland_Entrance/scripts.inc | 2 +- data/maps/FarawayIsland_Interior/scripts.inc | 8 ++++---- data/maps/FieryPath/scripts.inc | 2 +- data/maps/FortreeCity/scripts.inc | 4 ++-- data/maps/FortreeCity_Gym/scripts.inc | 4 ++-- data/maps/FortreeCity_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/FortreeCity_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/GraniteCave_B1F/scripts.inc | 6 +++--- data/maps/InsideOfTruck/scripts.inc | 4 ++-- data/maps/IslandCave/scripts.inc | 6 +++--- data/maps/JaggedPass/scripts.inc | 6 +++--- data/maps/LavaridgeTown/scripts.inc | 4 ++-- data/maps/LavaridgeTown_Gym_1F/scripts.inc | 2 +- data/maps/LavaridgeTown_Gym_B1F/scripts.inc | 2 +- data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/LilycoveCity/scripts.inc | 4 ++-- data/maps/LilycoveCity_ContestLobby/scripts.inc | 4 ++-- .../LilycoveCity_DepartmentStoreRooftop/scripts.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc | 2 +- data/maps/LilycoveCity_Harbor/scripts.inc | 2 +- data/maps/LilycoveCity_House3/scripts.inc | 2 +- data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc | 4 ++-- data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc | 8 ++++---- .../LilycoveCity_PokemonTrainerFanClub/scripts.inc | 4 ++-- data/maps/LinkContestRoom1/scripts.inc | 10 +++++----- data/maps/LittlerootTown/scripts.inc | 6 +++--- data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc | 6 +++--- data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc | 4 ++-- data/maps/LittlerootTown_MaysHouse_1F/scripts.inc | 6 +++--- data/maps/LittlerootTown_MaysHouse_2F/scripts.inc | 4 ++-- .../maps/LittlerootTown_ProfessorBirchsLab/scripts.inc | 6 +++--- data/maps/MagmaHideout_1F/scripts.inc | 2 +- data/maps/MarineCave_End/scripts.inc | 4 ++-- data/maps/MarineCave_Entrance/scripts.inc | 2 +- data/maps/MauvilleCity/scripts.inc | 2 +- data/maps/MauvilleCity_Gym/scripts.inc | 2 +- data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/MeteorFalls_1F_1R/scripts.inc | 2 +- data/maps/MirageTower_1F/scripts.inc | 2 +- data/maps/MirageTower_2F/scripts.inc | 6 +++--- data/maps/MirageTower_3F/scripts.inc | 6 +++--- data/maps/MossdeepCity/scripts.inc | 2 +- data/maps/MossdeepCity_GameCorner_1F/scripts.inc | 6 +++--- data/maps/MossdeepCity_Gym/scripts.inc | 2 +- data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc | 4 ++-- data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc | 4 ++-- data/maps/MossdeepCity_StevensHouse/scripts.inc | 6 +++--- data/maps/MtChimney/scripts.inc | 4 ++-- data/maps/MtChimney_CableCarStation/scripts.inc | 4 ++-- data/maps/MtPyre_2F/scripts.inc | 6 +++--- data/maps/MtPyre_Exterior/scripts.inc | 2 +- data/maps/MtPyre_Summit/scripts.inc | 2 +- data/maps/NavelRock_Bottom/scripts.inc | 4 ++-- data/maps/NavelRock_Exterior/scripts.inc | 2 +- data/maps/NavelRock_Top/scripts.inc | 4 ++-- data/maps/NewMauville_Entrance/scripts.inc | 4 ++-- data/maps/NewMauville_Inside/scripts.inc | 6 +++--- data/maps/OldaleTown/scripts.inc | 2 +- data/maps/OldaleTown_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/OldaleTown_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/PacifidlogTown/scripts.inc | 4 ++-- data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/PetalburgCity/scripts.inc | 4 ++-- data/maps/PetalburgCity_Gym/scripts.inc | 8 ++++---- data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/PetalburgCity_WallysHouse/scripts.inc | 4 ++-- data/maps/Route101/scripts.inc | 4 ++-- data/maps/Route103/scripts.inc | 4 ++-- data/maps/Route104/scripts.inc | 4 ++-- data/maps/Route104_MrBrineysHouse/scripts.inc | 2 +- data/maps/Route104_PrettyPetalFlowerShop/scripts.inc | 2 +- data/maps/Route105/scripts.inc | 6 +++--- data/maps/Route109_SeashoreHouse/scripts.inc | 2 +- data/maps/Route110/scripts.inc | 6 +++--- .../scripts.inc | 2 +- data/maps/Route110_TrickHouseCorridor/scripts.inc | 2 +- data/maps/Route110_TrickHouseEnd/scripts.inc | 8 ++++---- data/maps/Route110_TrickHouseEntrance/scripts.inc | 6 +++--- data/maps/Route110_TrickHousePuzzle1/scripts.inc | 2 +- data/maps/Route110_TrickHousePuzzle2/scripts.inc | 4 ++-- data/maps/Route110_TrickHousePuzzle3/scripts.inc | 4 ++-- data/maps/Route110_TrickHousePuzzle5/scripts.inc | 2 +- data/maps/Route110_TrickHousePuzzle6/scripts.inc | 4 ++-- data/maps/Route110_TrickHousePuzzle7/scripts.inc | 8 ++++---- data/maps/Route111/scripts.inc | 8 ++++---- data/maps/Route111_OldLadysRestStop/scripts.inc | 2 +- data/maps/Route112/scripts.inc | 2 +- data/maps/Route112_CableCarStation/scripts.inc | 4 ++-- data/maps/Route113/scripts.inc | 4 ++-- data/maps/Route113_GlassWorkshop/scripts.inc | 2 +- data/maps/Route114/scripts.inc | 6 +++--- data/maps/Route114_FossilManiacsHouse/scripts.inc | 2 +- data/maps/Route114_FossilManiacsTunnel/scripts.inc | 4 ++-- data/maps/Route114_LanettesHouse/scripts.inc | 2 +- data/maps/Route115/scripts.inc | 6 +++--- data/maps/Route116/scripts.inc | 6 +++--- data/maps/Route116_TunnelersRestHouse/scripts.inc | 2 +- data/maps/Route117/scripts.inc | 2 +- data/maps/Route117_PokemonDayCare/scripts.inc | 2 +- data/maps/Route118/scripts.inc | 6 +++--- data/maps/Route119/scripts.inc | 4 ++-- data/maps/Route119_WeatherInstitute_1F/scripts.inc | 2 +- data/maps/Route119_WeatherInstitute_2F/scripts.inc | 2 +- data/maps/Route120/scripts.inc | 6 +++--- data/maps/Route121_SafariZoneEntrance/scripts.inc | 2 +- data/maps/Route123/scripts.inc | 2 +- data/maps/Route123_BerryMastersHouse/scripts.inc | 2 +- data/maps/Route124/scripts.inc | 2 +- .../Route124_DivingTreasureHuntersHouse/scripts.inc | 2 +- data/maps/Route125/scripts.inc | 6 +++--- data/maps/Route126/scripts.inc | 2 +- data/maps/Route127/scripts.inc | 6 +++--- data/maps/Route128/scripts.inc | 4 ++-- data/maps/Route129/scripts.inc | 6 +++--- data/maps/Route130/scripts.inc | 2 +- data/maps/Route131/scripts.inc | 2 +- data/maps/Route134/scripts.inc | 2 +- data/maps/RustboroCity/scripts.inc | 4 ++-- data/maps/RustboroCity_DevonCorp_1F/scripts.inc | 2 +- data/maps/RustboroCity_DevonCorp_2F/scripts.inc | 2 +- data/maps/RustboroCity_DevonCorp_3F/scripts.inc | 6 +++--- data/maps/RustboroCity_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/RustboroCity_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/RusturfTunnel/scripts.inc | 4 ++-- data/maps/SSTidalCorridor/scripts.inc | 2 +- data/maps/SafariZone_South/scripts.inc | 4 ++-- data/maps/ScorchedSlab/scripts.inc | 2 +- data/maps/SeafloorCavern_Entrance/scripts.inc | 2 +- data/maps/SealedChamber_OuterRoom/scripts.inc | 6 +++--- data/maps/SecretBase_YellowCave4/scripts.inc | 8 ++++---- data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc | 2 +- data/maps/ShoalCave_LowTideInnerRoom/scripts.inc | 4 ++-- data/maps/ShoalCave_LowTideLowerRoom/scripts.inc | 2 +- data/maps/ShoalCave_LowTideStairsRoom/scripts.inc | 2 +- data/maps/SkyPillar_1F/scripts.inc | 2 +- data/maps/SkyPillar_2F/scripts.inc | 6 +++--- data/maps/SkyPillar_3F/scripts.inc | 2 +- data/maps/SkyPillar_4F/scripts.inc | 6 +++--- data/maps/SkyPillar_5F/scripts.inc | 2 +- data/maps/SkyPillar_Entrance/scripts.inc | 2 +- data/maps/SkyPillar_Outside/scripts.inc | 6 +++--- data/maps/SkyPillar_Top/scripts.inc | 6 +++--- data/maps/SlateportCity/scripts.inc | 4 ++-- .../SlateportCity_BattleTentBattleRoom/scripts.inc | 6 +++--- data/maps/SlateportCity_BattleTentCorridor/scripts.inc | 4 ++-- data/maps/SlateportCity_BattleTentLobby/scripts.inc | 4 ++-- data/maps/SlateportCity_Harbor/scripts.inc | 2 +- data/maps/SlateportCity_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/SlateportCity_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/SootopolisCity/scripts.inc | 10 +++++----- data/maps/SootopolisCity_Gym_1F/scripts.inc | 8 ++++---- .../SootopolisCity_MysteryEventsHouse_1F/scripts.inc | 4 ++-- .../SootopolisCity_MysteryEventsHouse_B1F/scripts.inc | 4 ++-- data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/SouthernIsland_Exterior/scripts.inc | 2 +- data/maps/SouthernIsland_Interior/scripts.inc | 4 ++-- data/maps/TerraCave_End/scripts.inc | 4 ++-- data/maps/TerraCave_Entrance/scripts.inc | 2 +- data/maps/TrainerHill_1F/scripts.inc | 6 +++--- data/maps/TrainerHill_2F/scripts.inc | 6 +++--- data/maps/TrainerHill_3F/scripts.inc | 4 ++-- data/maps/TrainerHill_4F/scripts.inc | 4 ++-- data/maps/TrainerHill_Elevator/scripts.inc | 2 +- data/maps/TrainerHill_Entrance/scripts.inc | 10 +++++----- data/maps/TrainerHill_Roof/scripts.inc | 4 ++-- data/maps/Underwater3/scripts.inc | 2 +- data/maps/Underwater5/scripts.inc | 2 +- data/maps/Underwater6/scripts.inc | 2 +- data/maps/Underwater7/scripts.inc | 2 +- data/maps/Underwater_MarineCave/scripts.inc | 4 ++-- data/maps/Underwater_Route134/scripts.inc | 2 +- data/maps/Underwater_SeafloorCavern/scripts.inc | 6 +++--- data/maps/Underwater_SealedChamber/scripts.inc | 2 +- data/maps/Underwater_SootopolisCity/scripts.inc | 2 +- data/maps/UnionRoom/scripts.inc | 4 ++-- data/maps/VerdanturfTown/scripts.inc | 2 +- .../VerdanturfTown_BattleTentBattleRoom/scripts.inc | 6 +++--- .../maps/VerdanturfTown_BattleTentCorridor/scripts.inc | 2 +- data/maps/VerdanturfTown_BattleTentLobby/scripts.inc | 4 ++-- data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/VictoryRoad_1F/scripts.inc | 2 +- 271 files changed, 564 insertions(+), 564 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index 5e8a35f982..328bff8484 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -5493,8 +5493,8 @@ gBattleDomeMatchNumberText15:: .string "Final Match$" BattleFrontier_BattlePikeRandomRoom1_MapScripts_2C3E1B: @ 82C3E1B - map_script 3, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25 - map_script 4, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25: @ 82C3E25 setvar VAR_0x8004, 4 diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc index e89d72c236..e696661201 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc @@ -1,6 +1,6 @@ AbandonedShip_Corridors_B1F_MapScripts:: @ 8237D84 - map_script 5, AbandonedShip_Corridors_B1F_MapScript1_237D8F - map_script 1, AbandonedShip_Corridors_B1F_MapScript1_237D98 + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Corridors_B1F_MapScript1_237D8F + map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_Corridors_B1F_MapScript1_237D98 .byte 0 AbandonedShip_Corridors_B1F_MapScript1_237D8F: @ 8237D8F diff --git a/data/maps/AbandonedShip_Deck/scripts.inc b/data/maps/AbandonedShip_Deck/scripts.inc index 1f0c0e2f2b..041c545938 100644 --- a/data/maps/AbandonedShip_Deck/scripts.inc +++ b/data/maps/AbandonedShip_Deck/scripts.inc @@ -1,5 +1,5 @@ AbandonedShip_Deck_MapScripts:: @ 823799A - map_script 3, AbandonedShip_Deck_MapScript1_2379A0 + map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_MapScript1_2379A0 .byte 0 AbandonedShip_Deck_MapScript1_2379A0: @ 82379A0 diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc index f8b5bcc656..1c495c377e 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc @@ -1,6 +1,6 @@ AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 823896C - map_script 5, AbandonedShip_HiddenFloorCorridors_MapScript1_238977 - map_script 1, AbandonedShip_HiddenFloorCorridors_MapScript1_238980 + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_HiddenFloorCorridors_MapScript1_238977 + map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_HiddenFloorCorridors_MapScript1_238980 .byte 0 AbandonedShip_HiddenFloorCorridors_MapScript1_238977: @ 8238977 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc index f8ecc9001d..1c517735ee 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc @@ -1,5 +1,5 @@ AbandonedShip_HiddenFloorRooms_MapScripts:: @ 8238C49 - map_script 2, AbandonedShip_HiddenFloorRooms_MapScript2_238C4F + map_script MAP_SCRIPT_ON_FRAME_TABLE, AbandonedShip_HiddenFloorRooms_MapScript2_238C4F .byte 0 AbandonedShip_HiddenFloorRooms_MapScript2_238C4F: @ 8238C4F diff --git a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc index 470ae89872..05223592ee 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc @@ -1,5 +1,5 @@ AbandonedShip_Rooms_B1F_MapScripts:: @ 8237FB7 - map_script 5, AbandonedShip_Rooms_B1F_MapScript1_237FBD + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Rooms_B1F_MapScript1_237FBD .byte 0 AbandonedShip_Rooms_B1F_MapScript1_237FBD: @ 8237FBD diff --git a/data/maps/AbandonedShip_Underwater1/scripts.inc b/data/maps/AbandonedShip_Underwater1/scripts.inc index 7e39b1939f..b957bb6bef 100644 --- a/data/maps/AbandonedShip_Underwater1/scripts.inc +++ b/data/maps/AbandonedShip_Underwater1/scripts.inc @@ -1,5 +1,5 @@ AbandonedShip_Underwater1_MapScripts:: @ 8238096 - map_script 5, AbandonedShip_Underwater1_MapScript1_23809C + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater1_MapScript1_23809C .byte 0 AbandonedShip_Underwater1_MapScript1_23809C: @ 823809C diff --git a/data/maps/AbandonedShip_Underwater2/scripts.inc b/data/maps/AbandonedShip_Underwater2/scripts.inc index 17f52c6918..cc000b09c7 100644 --- a/data/maps/AbandonedShip_Underwater2/scripts.inc +++ b/data/maps/AbandonedShip_Underwater2/scripts.inc @@ -1,5 +1,5 @@ AbandonedShip_Underwater2_MapScripts:: @ 823895D - map_script 5, AbandonedShip_Underwater2_MapScript1_238963 + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater2_MapScript1_238963 .byte 0 AbandonedShip_Underwater2_MapScript1_238963: @ 8238963 diff --git a/data/maps/AlteringCave/scripts.inc b/data/maps/AlteringCave/scripts.inc index a9faddc36e..185466c80a 100644 --- a/data/maps/AlteringCave/scripts.inc +++ b/data/maps/AlteringCave/scripts.inc @@ -1,5 +1,5 @@ AlteringCave_MapScripts:: @ 823B177 - map_script 3, AlteringCave_MapScript1_23B17D + map_script MAP_SCRIPT_ON_TRANSITION, AlteringCave_MapScript1_23B17D .byte 0 AlteringCave_MapScript1_23B17D: @ 823B17D diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc index 9cc369fb4b..8d1c029c36 100644 --- a/data/maps/AncientTomb/scripts.inc +++ b/data/maps/AncientTomb/scripts.inc @@ -1,7 +1,7 @@ AncientTomb_MapScripts:: @ 8238FB3 - map_script 5, AncientTomb_MapScript1_238FC3 - map_script 1, AncientTomb_MapScript1_238FF2 - map_script 3, AncientTomb_MapScript1_238FE1 + map_script MAP_SCRIPT_ON_RESUME, AncientTomb_MapScript1_238FC3 + map_script MAP_SCRIPT_ON_LOAD, AncientTomb_MapScript1_238FF2 + map_script MAP_SCRIPT_ON_TRANSITION, AncientTomb_MapScript1_238FE1 .byte 0 AncientTomb_MapScript1_238FC3: @ 8238FC3 diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index a74c7a33e0..2995f48dc5 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -1,6 +1,6 @@ AquaHideout_B1F_MapScripts:: @ 82339A7 - map_script 5, AquaHideout_B1F_MapScript1_2339B2 - map_script 3, AquaHideout_B1F_MapScript1_2339D0 + map_script MAP_SCRIPT_ON_RESUME, AquaHideout_B1F_MapScript1_2339B2 + map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B1F_MapScript1_2339D0 .byte 0 AquaHideout_B1F_MapScript1_2339B2: @ 82339B2 diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index daa508d321..cdfe3f58ef 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -1,5 +1,5 @@ AquaHideout_B2F_MapScripts:: @ 8233DCF - map_script 3, AquaHideout_B2F_MapScript1_233DD5 + map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B2F_MapScript1_233DD5 .byte 0 AquaHideout_B2F_MapScript1_233DD5: @ 8233DD5 diff --git a/data/maps/ArtisanCave_B1F/scripts.inc b/data/maps/ArtisanCave_B1F/scripts.inc index e46737583a..433991beae 100644 --- a/data/maps/ArtisanCave_B1F/scripts.inc +++ b/data/maps/ArtisanCave_B1F/scripts.inc @@ -1,5 +1,5 @@ ArtisanCave_B1F_MapScripts:: @ 823AFAD - map_script 3, ArtisanCave_B1F_MapScript1_23AFB3 + map_script MAP_SCRIPT_ON_TRANSITION, ArtisanCave_B1F_MapScript1_23AFB3 .byte 0 ArtisanCave_B1F_MapScript1_23AFB3: @ 823AFB3 diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index cec596b2da..f3a0ecfb46 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_BattleArenaBattleRoom_MapScripts:: @ 8257487 - map_script 3, BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0 - map_script 2, BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2 - map_script 4, BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C - map_script 5, BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C .byte 0 BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C: @ 825749C diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc index f83f6f3394..cc362f5f04 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleArenaCorridor_MapScripts:: @ 82573B9 - map_script 2, BattleFrontier_BattleArenaCorridor_MapScript2_2573BF + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaCorridor_MapScript2_2573BF .byte 0 BattleFrontier_BattleArenaCorridor_MapScript2_2573BF: @ 82573BF diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index 9d588b6663..5df47aed16 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattleArenaLobby_MapScripts:: @ 8255C36 - map_script 2, BattleFrontier_BattleArenaLobby_MapScript2_255C55 - map_script 4, BattleFrontier_BattleArenaLobby_MapScript2_255C41 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaLobby_MapScript2_255C55 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleArenaLobby_MapScript2_255C41 .byte 0 BattleFrontier_BattleArenaLobby_MapScript2_255C41: @ 8255C41 diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index e1c5991e71..e50ad9f0a1 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_BattleDomeBattleRoom_MapScripts:: @ 824BC9C - map_script 3, BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1 - map_script 2, BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00 - map_script 4, BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481 - map_script 5, BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481 + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0 .byte 0 BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1 diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc index ac43ee9a41..c777f7a7a0 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleDomeCorridor_MapScripts:: @ 824B0FE - map_script 2, BattleFrontier_BattleDomeCorridor_MapScript2_24B104 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeCorridor_MapScript2_24B104 .byte 0 BattleFrontier_BattleDomeCorridor_MapScript2_24B104: @ 824B104 diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index 8b01eba0ab..68ecf802bd 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattleDomeLobby_MapScripts:: @ 82497E2 - map_script 5, BattleFrontier_BattleDomeLobby_MapScript1_2497F2 - map_script 2, BattleFrontier_BattleDomeLobby_MapScript2_24980F - map_script 4, BattleFrontier_BattleDomeLobby_MapScript2_2497FB + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeLobby_MapScript1_2497F2 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeLobby_MapScript2_24980F + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeLobby_MapScript2_2497FB .byte 0 BattleFrontier_BattleDomeLobby_MapScript1_2497F2: @ 82497F2 diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index 6cf1c78177..3901201bb2 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattleDomePreBattleRoom_MapScripts:: @ 824B1F9 - map_script 2, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218 - map_script 4, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204 .byte 0 BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204: @ 824B204 diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index 5ed2e97daa..9c76544f67 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattleFactoryBattleRoom_MapScripts:: @ 825ADAB - map_script 3, BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB - map_script 4, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00 - map_script 2, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31 .byte 0 BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc index 956cede17f..a9e57dde6d 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattleFactoryLobby_MapScripts:: @ 82583E8 - map_script 2, BattleFrontier_BattleFactoryLobby_MapScript2_258407 - map_script 4, BattleFrontier_BattleFactoryLobby_MapScript2_2583F3 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryLobby_MapScript2_258407 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryLobby_MapScript2_2583F3 .byte 0 BattleFrontier_BattleFactoryLobby_MapScript2_2583F3: @ 82583F3 diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index 21681b70ac..0049b3f58c 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattleFactoryPreBattleRoom_MapScripts:: @ 8259ABA - map_script 2, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF - map_script 4, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5 .byte 0 BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5: @ 8259AC5 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index be11039dfd..bdd4a9ff4f 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattlePalaceBattleRoom_MapScripts:: @ 824F815 - map_script 3, BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825 - map_script 2, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861 - map_script 4, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34 .byte 0 BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825 diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc index 071f61a09b..d5219636c5 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePalaceCorridor_MapScripts:: @ 824F4A3 - map_script 2, BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9 .byte 0 BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9: @ 824F4A9 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index 5d7f7aaf5f..40205e9b5d 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePalaceLobby_MapScripts:: @ 824D77E - map_script 2, BattleFrontier_BattlePalaceLobby_MapScript2_24D79D - map_script 4, BattleFrontier_BattlePalaceLobby_MapScript2_24D789 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceLobby_MapScript2_24D79D + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePalaceLobby_MapScript2_24D789 .byte 0 BattleFrontier_BattlePalaceLobby_MapScript2_24D789: @ 824D789 diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc index 1155cd67bd..c7421c2c86 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePikeCorridor_MapScripts:: @ 825C771 - map_script 2, BattleFrontier_BattlePikeCorridor_MapScript2_25C77C - map_script 4, BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeCorridor_MapScript2_25C77C + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7 .byte 0 BattleFrontier_BattlePikeCorridor_MapScript2_25C77C: @ 825C77C diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index ab53d4c23b..51d6023c8c 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePikeLobby_MapScripts:: @ 825B6C6 - map_script 2, BattleFrontier_BattlePikeLobby_MapScript2_25B6D1 - map_script 4, BattleFrontier_BattlePikeLobby_MapScript2_25B6F3 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeLobby_MapScript2_25B6D1 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeLobby_MapScript2_25B6F3 .byte 0 BattleFrontier_BattlePikeLobby_MapScript2_25B6D1: @ 825B6D1 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc index 1c810900ce..87f83371c8 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_BattlePikeRandomRoom1_MapScripts:: @ 825D152 - map_script 5, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E - map_script 3, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25 - map_script 2, BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167 - map_script 4, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE .byte 0 BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167: @ 825D167 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc index f46760e17b..5d438d8bd8 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePikeRandomRoom2_MapScripts:: @ 825E392 - map_script 2, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D - map_script 4, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE .byte 0 BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D: @ 825E39D diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc index 4beb26724f..9f2dfec16c 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattlePikeRandomRoom3_MapScripts:: @ 825E41A - map_script 5, BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A - map_script 2, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A - map_script 4, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466 + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466 .byte 0 BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A: @ 825E42A diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc index cac5945167..54f11f071e 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattlePikeThreePathRoom_MapScripts:: @ 825C843 - map_script 5, BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E - map_script 2, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853 - map_script 4, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D .byte 0 BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853: @ 825C853 diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc index 43586bba0d..723c666d81 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattlePyramidEmptySquare_MapScripts:: @ 8252A33 - map_script 5, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2 - map_script 2, BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43 - map_script 3, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA .byte 0 BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43: @ 8252A43 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index 14e1a5557d..667c4847e6 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePyramidLobby_MapScripts:: @ 8250716 - map_script 2, BattleFrontier_BattlePyramidLobby_MapScript2_250735 - map_script 4, BattleFrontier_BattlePyramidLobby_MapScript2_2497FB + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidLobby_MapScript2_250735 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePyramidLobby_MapScript2_2497FB .byte 0 BattleFrontier_BattlePyramidLobby_MapScript2_250721: @ 8250721 diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc index d04fe23f23..39bb39f498 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_BattlePyramidTop_MapScripts:: @ 82550A1 - map_script 5, BattleFrontier_BattlePyramidTop_MapScript1_2550F4 - map_script 2, BattleFrontier_BattlePyramidTop_MapScript2_25516E - map_script 3, BattleFrontier_BattlePyramidTop_MapScript1_2550B6 - map_script 4, BattleFrontier_BattlePyramidTop_MapScript2_2550CE + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidTop_MapScript1_2550F4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidTop_MapScript2_25516E + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidTop_MapScript1_2550B6 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePyramidTop_MapScript2_2550CE .byte 0 BattleFrontier_BattlePyramidTop_MapScript1_2550B6: @ 82550B6 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index cf646a3d39..6e3f0c8fa1 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattleTowerBattleRoom_MapScripts:: @ 8241B40 - map_script 2, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62 - map_script 4, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B .byte 0 BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B: @ 8241B4B diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc index 2699fe9d60..8ebb7ed25c 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattleTowerBattleRoom2_MapScripts:: @ 8248EE8 - map_script 3, BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8 - map_script 4, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33 - map_script 2, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43 .byte 0 BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc index 55e21dedbf..cf0a50e98e 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattleTowerCorridor_MapScripts:: @ 8241AAA - map_script 1, BattleFrontier_BattleTowerCorridor_MapScript1_241AB5 - map_script 2, BattleFrontier_BattleTowerCorridor_MapScript2_241AE6 + map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_BattleTowerCorridor_MapScript1_241AB5 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerCorridor_MapScript2_241AE6 .byte 0 BattleFrontier_BattleTowerCorridor_MapScript1_241AB5: @ 8241AB5 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc index 545ea04b2b..efab7be70d 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattleTowerCorridor2_MapScripts:: @ 8248D4A - map_script 3, BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A - map_script 4, BattleFrontier_BattleTowerCorridor2_MapScript2_248D95 - map_script 2, BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerCorridor2_MapScript2_248D95 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2 .byte 0 BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A: @ 8248D5A diff --git a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc index 3dbd5eca3f..0d07f5be22 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattleTowerElevator_MapScripts:: @ 82419DB - map_script 2, BattleFrontier_BattleTowerElevator_MapScript2_2419E6 - map_script 4, BattleFrontier_BattleTowerElevator_MapScript2_241A96 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerElevator_MapScript2_2419E6 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerElevator_MapScript2_241A96 .byte 0 BattleFrontier_BattleTowerElevator_MapScript2_2419E6: @ 82419E6 diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 29be452300..af76ee5740 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_BattleTowerLobby_MapScripts:: @ 823E67B - map_script 5, BattleFrontier_BattleTowerLobby_MapScript1_23E690 - map_script 3, BattleFrontier_BattleTowerLobby_MapScript1_23E694 - map_script 2, BattleFrontier_BattleTowerLobby_MapScript2_23E6DD - map_script 4, BattleFrontier_BattleTowerLobby_MapScript2_23E6C9 + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleTowerLobby_MapScript1_23E690 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerLobby_MapScript1_23E694 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerLobby_MapScript2_23E6DD + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerLobby_MapScript2_23E6C9 .byte 0 BattleFrontier_BattleTowerLobby_MapScript1_23E690: @ 823E690 diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index ce0c9b3a48..0bc74b1bd9 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScripts:: @ 8243D92 - map_script 5, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7 - map_script 3, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0 - map_script 4, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14 - map_script 2, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23 + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23 .byte 0 BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7 diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index 0d493d4e75..32ef121125 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_OutsideEast_MapScripts:: @ 8242C04 - map_script 5, BattleFrontier_OutsideEast_MapScript1_242C0F - map_script 3, BattleFrontier_OutsideEast_MapScript1_242C2D + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_OutsideEast_MapScript1_242C0F + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_OutsideEast_MapScript1_242C2D .byte 0 BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F diff --git a/data/maps/BattleFrontier_OutsideWest/scripts.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc index b2b2a8d415..926a3c1091 100644 --- a/data/maps/BattleFrontier_OutsideWest/scripts.inc +++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc @@ -1,5 +1,5 @@ BattleFrontier_OutsideWest_MapScripts:: @ 823D3E1 - map_script 3, BattleFrontier_OutsideWest_MapScript1_23D3E7 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_OutsideWest_MapScript1_23D3E7 .byte 0 BattleFrontier_OutsideWest_MapScript1_23D3E7: @ 823D3E7 diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc index 42c6db053a..c99a0de381 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9 - map_script 3, BattleFrontier_PokemonCenter_1F_MapScript1_267904 - map_script 5, BattleFrontier_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_MapScript1_267904 + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_PokemonCenter_1F_MapScript1_277C30 .byte 0 BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904 diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc index 7d3c3a2f1e..c6ae8da2a5 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_PokemonCenter_2F_MapScripts:: @ 8267AA4 - map_script 2, BattleFrontier_PokemonCenter_2F_MapScript2_276C3B - map_script 4, BattleFrontier_PokemonCenter_2F_MapScript2_276B6C - map_script 1, BattleFrontier_PokemonCenter_2F_MapScript1_276BBE - map_script 3, BattleFrontier_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_2F_MapScript1_276ACF .byte 0 BattleFrontier_PokemonCenter_2F_EventScript_267AB9:: @ 8267AB9 diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc index 89f0ee8e9c..574415c4cb 100644 --- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc +++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_ReceptionGate_MapScripts:: @ 82661DA - map_script 2, BattleFrontier_ReceptionGate_MapScript2_2661E9 - map_script 3, BattleFrontier_ReceptionGate_MapScript1_2661E5 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_ReceptionGate_MapScript2_2661E9 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_ReceptionGate_MapScript1_2661E5 .byte 0 BattleFrontier_ReceptionGate_MapScript1_2661E5: @ 82661E5 diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index a7737654be..594790ff3f 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -1,7 +1,7 @@ BirthIsland_Exterior_MapScripts:: @ 8267F15 - map_script 3, BirthIsland_Exterior_MapScript1_267F29 - map_script 5, BirthIsland_Exterior_MapScript1_267F65 - map_script 7, BirthIsland_Exterior_MapScript1_267F25 + map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_MapScript1_267F29 + map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_MapScript1_267F65 + map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, BirthIsland_Exterior_MapScript1_267F25 .byte 0 BirthIsland_Exterior_MapScript1_267F25: @ 8267F25 diff --git a/data/maps/CaveOfOrigin_1F/scripts.inc b/data/maps/CaveOfOrigin_1F/scripts.inc index 1804e58eaa..e8d722dee9 100644 --- a/data/maps/CaveOfOrigin_1F/scripts.inc +++ b/data/maps/CaveOfOrigin_1F/scripts.inc @@ -1,5 +1,5 @@ CaveOfOrigin_1F_MapScripts:: @ 8235768 - map_script 3, CaveOfOrigin_1F_MapScript1_23576E + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_1F_MapScript1_23576E .byte 0 CaveOfOrigin_1F_MapScript1_23576E: @ 823576E diff --git a/data/maps/CaveOfOrigin_Entrance/scripts.inc b/data/maps/CaveOfOrigin_Entrance/scripts.inc index 1a771ae82e..53228f63c8 100644 --- a/data/maps/CaveOfOrigin_Entrance/scripts.inc +++ b/data/maps/CaveOfOrigin_Entrance/scripts.inc @@ -1,5 +1,5 @@ CaveOfOrigin_Entrance_MapScripts:: @ 8235759 - map_script 5, CaveOfOrigin_Entrance_MapScript1_23575F + map_script MAP_SCRIPT_ON_RESUME, CaveOfOrigin_Entrance_MapScript1_23575F .byte 0 CaveOfOrigin_Entrance_MapScript1_23575F: @ 823575F diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc index 79c00f28ca..e3e2969453 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc @@ -1,5 +1,5 @@ CaveOfOrigin_UnusedRubySapphireMap1_MapScripts:: @ 8235778 - map_script 3, CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E .byte 0 CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E: @ 823577E diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc index 6f9812c385..417a7369a1 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc @@ -1,5 +1,5 @@ CaveOfOrigin_UnusedRubySapphireMap2_MapScripts:: @ 8235788 - map_script 3, CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E .byte 0 CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E: @ 823578E diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc index baa40934a9..51d9b86546 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc @@ -1,5 +1,5 @@ CaveOfOrigin_UnusedRubySapphireMap3_MapScripts:: @ 8235798 - map_script 3, CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E .byte 0 CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E: @ 823579E diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index 2ae1f9e2e6..75fcf061c3 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -1,7 +1,7 @@ DesertRuins_MapScripts:: @ 822D95B - map_script 5, DesertRuins_MapScript1_22D96B - map_script 1, DesertRuins_MapScript1_22D989 - map_script 3, DesertRuins_MapScript1_22D9CA + map_script MAP_SCRIPT_ON_RESUME, DesertRuins_MapScript1_22D96B + map_script MAP_SCRIPT_ON_LOAD, DesertRuins_MapScript1_22D989 + map_script MAP_SCRIPT_ON_TRANSITION, DesertRuins_MapScript1_22D9CA .byte 0 DesertRuins_MapScript1_22D96B: @ 822D96B diff --git a/data/maps/DesertUnderpass/scripts.inc b/data/maps/DesertUnderpass/scripts.inc index c64597d6ca..9c5e831805 100644 --- a/data/maps/DesertUnderpass/scripts.inc +++ b/data/maps/DesertUnderpass/scripts.inc @@ -1,5 +1,5 @@ DesertUnderpass_MapScripts:: @ 823AF37 - map_script 3, DesertUnderpass_MapScript1_23AF3D + map_script MAP_SCRIPT_ON_TRANSITION, DesertUnderpass_MapScript1_23AF3D .byte 0 DesertUnderpass_MapScript1_23AF3D: @ 823AF3D diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 6c66f48609..2e283ef70b 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -1,5 +1,5 @@ DewfordTown_MapScripts:: @ 81E9507 - map_script 3, DewfordTown_MapScript1_1E950D + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_MapScript1_1E950D .byte 0 DewfordTown_MapScript1_1E950D: @ 81E950D diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index bafdc6c231..63279937ea 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -1,5 +1,5 @@ DewfordTown_Gym_MapScripts:: @ 81FC63C - map_script 3, DewfordTown_Gym_MapScript1_1FC642 + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_Gym_MapScript1_1FC642 .byte 0 DewfordTown_Gym_MapScript1_1FC642: @ 81FC642 diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc index e21fd13afd..b4f5fc4c67 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523 - map_script 3, DewfordTown_PokemonCenter_1F_MapScript1_1FC52E - map_script 5, DewfordTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_MapScript1_1FC52E + map_script MAP_SCRIPT_ON_RESUME, DewfordTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 DewfordTown_PokemonCenter_1F_MapScript1_1FC52E: @ 81FC52E diff --git a/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc index f2a30ecd2d..58b0b63a1a 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ DewfordTown_PokemonCenter_2F_MapScripts:: @ 81FC615 - map_script 2, DewfordTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, DewfordTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, DewfordTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, DewfordTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, DewfordTown_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_2F_MapScript1_276ACF .byte 0 DewfordTown_PokemonCenter_2F_EventScript_1FC62A:: @ 81FC62A diff --git a/data/maps/EverGrandeCity/scripts.inc b/data/maps/EverGrandeCity/scripts.inc index 99d5ab8112..ffbf5a6cda 100644 --- a/data/maps/EverGrandeCity/scripts.inc +++ b/data/maps/EverGrandeCity/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_MapScripts:: @ 81E7D1B - map_script 3, EverGrandeCity_MapScript1_1E7D21 + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_MapScript1_1E7D21 .byte 0 EverGrandeCity_MapScript1_1E7D21: @ 81E7D21 diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 31a9b91b84..49411aeb46 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -1,7 +1,7 @@ EverGrandeCity_ChampionsRoom_MapScripts:: @ 82289EF - map_script 3, EverGrandeCity_ChampionsRoom_MapScript1_2289FF - map_script 4, EverGrandeCity_ChampionsRoom_MapScript2_228A05 - map_script 2, EverGrandeCity_ChampionsRoom_MapScript2_228A14 + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_ChampionsRoom_MapScript1_2289FF + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_228A05 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_228A14 .byte 0 EverGrandeCity_ChampionsRoom_MapScript1_2289FF: @ 82289FF diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index 2c09498428..a9f5835adf 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -1,7 +1,7 @@ EverGrandeCity_DrakesRoom_MapScripts:: @ 822869C - map_script 2, EverGrandeCity_DrakesRoom_MapScript2_2286BB - map_script 1, EverGrandeCity_DrakesRoom_MapScript1_2286D2 - map_script 4, EverGrandeCity_DrakesRoom_MapScript2_227F3E + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_DrakesRoom_MapScript2_2286BB + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_DrakesRoom_MapScript1_2286D2 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_DrakesRoom_MapScript2_227F3E .byte 0 EverGrandeCity_DrakesRoom_MapScript2_2286AC: @ 82286AC diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index 7510f468fd..e4a2a36947 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -1,7 +1,7 @@ EverGrandeCity_GlaciasRoom_MapScripts:: @ 8228412 - map_script 2, EverGrandeCity_GlaciasRoom_MapScript2_228431 - map_script 1, EverGrandeCity_GlaciasRoom_MapScript1_228448 - map_script 4, EverGrandeCity_GlaciasRoom_MapScript2_228422 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_GlaciasRoom_MapScript2_228431 + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_GlaciasRoom_MapScript1_228448 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_GlaciasRoom_MapScript2_228422 .byte 0 EverGrandeCity_GlaciasRoom_MapScript2_228422: @ 8228422 diff --git a/data/maps/EverGrandeCity_Hall1/scripts.inc b/data/maps/EverGrandeCity_Hall1/scripts.inc index a5b7764d74..d9a7adfe32 100644 --- a/data/maps/EverGrandeCity_Hall1/scripts.inc +++ b/data/maps/EverGrandeCity_Hall1/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall1_MapScripts:: @ 8229569 - map_script 4, EverGrandeCity_Hall1_MapScript2_22956F + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall1_MapScript2_22956F .byte 0 EverGrandeCity_Hall1_MapScript2_22956F: @ 822956F diff --git a/data/maps/EverGrandeCity_Hall2/scripts.inc b/data/maps/EverGrandeCity_Hall2/scripts.inc index 565d681686..b831d0fd58 100644 --- a/data/maps/EverGrandeCity_Hall2/scripts.inc +++ b/data/maps/EverGrandeCity_Hall2/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall2_MapScripts:: @ 822957E - map_script 4, EverGrandeCity_Hall2_MapScript2_229584 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall2_MapScript2_229584 .byte 0 EverGrandeCity_Hall2_MapScript2_229584: @ 8229584 diff --git a/data/maps/EverGrandeCity_Hall3/scripts.inc b/data/maps/EverGrandeCity_Hall3/scripts.inc index 85d0bb2f6c..d75cf95b60 100644 --- a/data/maps/EverGrandeCity_Hall3/scripts.inc +++ b/data/maps/EverGrandeCity_Hall3/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall3_MapScripts:: @ 8229593 - map_script 4, EverGrandeCity_Hall3_MapScript2_229599 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall3_MapScript2_229599 .byte 0 EverGrandeCity_Hall3_MapScript2_229599: @ 8229599 diff --git a/data/maps/EverGrandeCity_Hall4/scripts.inc b/data/maps/EverGrandeCity_Hall4/scripts.inc index 29f56829a8..faf20646aa 100644 --- a/data/maps/EverGrandeCity_Hall4/scripts.inc +++ b/data/maps/EverGrandeCity_Hall4/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall4_MapScripts:: @ 82295A8 - map_script 4, EverGrandeCity_Hall4_MapScript2_2295AE + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall4_MapScript2_2295AE .byte 0 EverGrandeCity_Hall4_MapScript2_2295AE: @ 82295AE diff --git a/data/maps/EverGrandeCity_Hall5/scripts.inc b/data/maps/EverGrandeCity_Hall5/scripts.inc index d492c28d26..e586958c2a 100644 --- a/data/maps/EverGrandeCity_Hall5/scripts.inc +++ b/data/maps/EverGrandeCity_Hall5/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall5_MapScripts:: @ 82295BD - map_script 4, EverGrandeCity_Hall5_MapScript2_2295C3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall5_MapScript2_2295C3 .byte 0 EverGrandeCity_Hall5_MapScript2_2295C3: @ 82295C3 diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index 04134d30f0..f61547c148 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -1,6 +1,6 @@ EverGrandeCity_HallOfFame_MapScripts:: @ 822982C - map_script 2, EverGrandeCity_HallOfFame_MapScript2_229846 - map_script 4, EverGrandeCity_HallOfFame_MapScript2_229837 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_HallOfFame_MapScript2_229846 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_HallOfFame_MapScript2_229837 .byte 0 EverGrandeCity_HallOfFame_MapScript2_229837: @ 8229837 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index 77f951d76b..4eef4ba583 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -1,7 +1,7 @@ EverGrandeCity_PhoebesRoom_MapScripts:: @ 8228174 - map_script 1, EverGrandeCity_PhoebesRoom_MapScript1_2281AA - map_script 4, EverGrandeCity_PhoebesRoom_MapScript2_228184 - map_script 2, EverGrandeCity_PhoebesRoom_MapScript2_228193 + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PhoebesRoom_MapScript1_2281AA + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PhoebesRoom_MapScript2_228184 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PhoebesRoom_MapScript2_228193 .byte 0 EverGrandeCity_PhoebesRoom_MapScript2_228184: @ 8228184 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index f63f636cd1..827c08e547 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34 - map_script 3, EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F - map_script 5, EverGrandeCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F + map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc index 09d382b2b3..40408c1f84 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ EverGrandeCity_PokemonCenter_2F_MapScripts:: @ 8229CE0 - map_script 2, EverGrandeCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, EverGrandeCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, EverGrandeCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, EverGrandeCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 EverGrandeCity_PokemonCenter_2F_EventScript_229CF5:: @ 8229CF5 diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index 4794fb99e4..95345af5cc 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -1,6 +1,6 @@ EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2 - map_script 3, EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD - map_script 5, EverGrandeCity_PokemonLeague_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD + map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonLeague_1F_MapScript1_277C30 .byte 0 EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD: @ 82295DD diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc index d3a77a0511..2d2d916a3b 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc @@ -1,8 +1,8 @@ EverGrandeCity_PokemonLeague_2F_MapScripts:: @ 8229D07 - map_script 2, EverGrandeCity_PokemonLeague_2F_MapScript2_276C3B - map_script 4, EverGrandeCity_PokemonLeague_2F_MapScript2_276B6C - map_script 1, EverGrandeCity_PokemonLeague_2F_MapScript1_276BBE - map_script 3, EverGrandeCity_PokemonLeague_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonLeague_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonLeague_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonLeague_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_2F_MapScript1_276ACF .byte 0 EverGrandeCity_PokemonLeague_2F_EventScript_229D1C:: @ 8229D1C diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index 9152254b31..f917e4bd88 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -1,8 +1,8 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 8227F01 - map_script 1, EverGrandeCity_SidneysRoom_MapScript1_227F1D - map_script 4, EverGrandeCity_SidneysRoom_MapScript2_227F3E - map_script 3, EverGrandeCity_SidneysRoom_MapScript1_227F16 - map_script 2, EverGrandeCity_SidneysRoom_MapScript2_227F4D + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_SidneysRoom_MapScript1_227F1D + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_MapScript2_227F3E + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_SidneysRoom_MapScript1_227F16 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_SidneysRoom_MapScript2_227F4D .byte 0 EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16 diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc index 5e06ed4cbe..b59d4c2207 100644 --- a/data/maps/FallarborTown/scripts.inc +++ b/data/maps/FallarborTown/scripts.inc @@ -1,5 +1,5 @@ FallarborTown_MapScripts:: @ 81EB1FA - map_script 3, FallarborTown_MapScript1_1EB200 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_MapScript1_1EB200 .byte 0 FallarborTown_MapScript1_1EB200: @ 81EB200 diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index dff1d26e02..b376f72e4d 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -1,7 +1,7 @@ FallarborTown_BattleTentBattleRoom_MapScripts:: @ 8200899 - map_script 3, FallarborTown_BattleTentBattleRoom_MapScript1_2008A9 - map_script 2, FallarborTown_BattleTentBattleRoom_MapScript2_2008DD - map_script 4, FallarborTown_BattleTentBattleRoom_MapScript2_200BB0 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_BattleTentBattleRoom_MapScript1_2008A9 + map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentBattleRoom_MapScript2_2008DD + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_BattleTentBattleRoom_MapScript2_200BB0 .byte 0 FallarborTown_BattleTentBattleRoom_MapScript1_2008A9: @ 82008A9 diff --git a/data/maps/FallarborTown_BattleTentCorridor/scripts.inc b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc index f3d0a924e9..3270338295 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/scripts.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc @@ -1,5 +1,5 @@ FallarborTown_BattleTentCorridor_MapScripts:: @ 82006A7 - map_script 2, FallarborTown_BattleTentCorridor_MapScript2_2006AD + map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentCorridor_MapScript2_2006AD .byte 0 FallarborTown_BattleTentCorridor_MapScript2_2006AD: @ 82006AD diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index 1128540e9c..6d7ea6be5e 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -1,6 +1,6 @@ FallarborTown_BattleTentLobby_MapScripts:: @ 81FFE66 - map_script 2, FallarborTown_BattleTentLobby_MapScript2_1FFE85 - map_script 4, FallarborTown_BattleTentLobby_MapScript2_1FFE71 + map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentLobby_MapScript2_1FFE85 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_BattleTentLobby_MapScript2_1FFE71 .byte 0 FallarborTown_BattleTentLobby_MapScript2_1FFE71: @ 81FFE71 diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index c9a7ef27c5..d34e139eb3 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD - map_script 3, FallarborTown_PokemonCenter_1F_MapScript1_200BD8 - map_script 5, FallarborTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_MapScript1_200BD8 + map_script MAP_SCRIPT_ON_RESUME, FallarborTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 FallarborTown_PokemonCenter_1F_MapScript1_200BD8: @ 8200BD8 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc index 93482e860c..8fce8e7297 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ FallarborTown_PokemonCenter_2F_MapScripts:: @ 8200EEB - map_script 2, FallarborTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, FallarborTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, FallarborTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, FallarborTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, FallarborTown_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_2F_MapScript1_276ACF .byte 0 FallarborTown_PokemonCenter_2F_EventScript_200F00:: @ 8200F00 diff --git a/data/maps/FarawayIsland_Entrance/scripts.inc b/data/maps/FarawayIsland_Entrance/scripts.inc index 7c68dd2466..347c89aa0f 100644 --- a/data/maps/FarawayIsland_Entrance/scripts.inc +++ b/data/maps/FarawayIsland_Entrance/scripts.inc @@ -1,5 +1,5 @@ FarawayIsland_Entrance_MapScripts:: @ 8267C8E - map_script 3, FarawayIsland_Entrance_MapScript1_267C94 + map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Entrance_MapScript1_267C94 .byte 0 FarawayIsland_Entrance_MapScript1_267C94: @ 8267C94 diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index fdb13d19db..7051d376c9 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -1,8 +1,8 @@ FarawayIsland_Interior_MapScripts:: @ 8267CFA - map_script 5, FarawayIsland_Interior_MapScript1_267D54 - map_script 3, FarawayIsland_Interior_MapScript1_267D72 - map_script 2, FarawayIsland_Interior_MapScript2_267D98 - map_script 7, FarawayIsland_Interior_MapScript1_267D0F + map_script MAP_SCRIPT_ON_RESUME, FarawayIsland_Interior_MapScript1_267D54 + map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Interior_MapScript1_267D72 + map_script MAP_SCRIPT_ON_FRAME_TABLE, FarawayIsland_Interior_MapScript2_267D98 + map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, FarawayIsland_Interior_MapScript1_267D0F .byte 0 FarawayIsland_Interior_MapScript1_267D0F: @ 8267D0F diff --git a/data/maps/FieryPath/scripts.inc b/data/maps/FieryPath/scripts.inc index 3888c61efd..ddba0dc0b7 100644 --- a/data/maps/FieryPath/scripts.inc +++ b/data/maps/FieryPath/scripts.inc @@ -1,5 +1,5 @@ FieryPath_MapScripts:: @ 8230F24 - map_script 3, FieryPath_MapScript1_230F2A + map_script MAP_SCRIPT_ON_TRANSITION, FieryPath_MapScript1_230F2A .byte 0 FieryPath_MapScript1_230F2A: @ 8230F2A diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc index d5c1ab29e9..1c464df9d3 100644 --- a/data/maps/FortreeCity/scripts.inc +++ b/data/maps/FortreeCity/scripts.inc @@ -1,6 +1,6 @@ FortreeCity_MapScripts:: @ 81E25A4 - map_script 3, FortreeCity_MapScript1_1E25AF - map_script 5, FortreeCity_MapScript1_1E25B3 + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_MapScript1_1E25AF + map_script MAP_SCRIPT_ON_RESUME, FortreeCity_MapScript1_1E25B3 .byte 0 FortreeCity_MapScript1_1E25AF: @ 81E25AF diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index 59cbfefa6b..30cf8736a3 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -1,6 +1,6 @@ FortreeCity_Gym_MapScripts:: @ 82165AB - map_script 3, FortreeCity_Gym_MapScript1_2165B6 - map_script 4, FortreeCity_Gym_MapScript2_2165BA + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_Gym_MapScript1_2165B6 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_Gym_MapScript2_2165BA .byte 0 FortreeCity_Gym_MapScript1_2165B6: @ 82165B6 diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc index 339cae9eb1..0709565909 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ FortreeCity_PokemonCenter_1F_MapScripts:: @ 82173D8 - map_script 3, FortreeCity_PokemonCenter_1F_MapScript1_2173E3 - map_script 5, FortreeCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_MapScript1_2173E3 + map_script MAP_SCRIPT_ON_RESUME, FortreeCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 FortreeCity_PokemonCenter_1F_MapScript1_2173E3: @ 82173E3 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc index f631aa3c63..dbe2e31ecf 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ FortreeCity_PokemonCenter_2F_MapScripts:: @ 821763E - map_script 2, FortreeCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, FortreeCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, FortreeCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, FortreeCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, FortreeCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 FortreeCity_PokemonCenter_2F_EventScript_217653:: @ 8217653 diff --git a/data/maps/GraniteCave_B1F/scripts.inc b/data/maps/GraniteCave_B1F/scripts.inc index 360b10a08b..099e5a501c 100644 --- a/data/maps/GraniteCave_B1F/scripts.inc +++ b/data/maps/GraniteCave_B1F/scripts.inc @@ -1,7 +1,7 @@ GraniteCave_B1F_MapScripts:: @ 822DC5E - map_script 2, GraniteCave_B1F_MapScript2_2A8327 - map_script 3, GraniteCave_B1F_MapScript1_2A8331 - map_script 5, GraniteCave_B1F_MapScript1_22DC6E + map_script MAP_SCRIPT_ON_FRAME_TABLE, GraniteCave_B1F_MapScript2_2A8327 + map_script MAP_SCRIPT_ON_TRANSITION, GraniteCave_B1F_MapScript1_2A8331 + map_script MAP_SCRIPT_ON_RESUME, GraniteCave_B1F_MapScript1_22DC6E .byte 0 GraniteCave_B1F_MapScript1_22DC6E: @ 822DC6E diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc index 858975d7af..d4f0c0b5de 100644 --- a/data/maps/InsideOfTruck/scripts.inc +++ b/data/maps/InsideOfTruck/scripts.inc @@ -1,6 +1,6 @@ InsideOfTruck_MapScripts:: @ 823BEDA - map_script 1, InsideOfTruck_MapScript1_23BEE5 - map_script 5, InsideOfTruck_MapScript1_23BF01 + map_script MAP_SCRIPT_ON_LOAD, InsideOfTruck_MapScript1_23BEE5 + map_script MAP_SCRIPT_ON_RESUME, InsideOfTruck_MapScript1_23BF01 .byte 0 InsideOfTruck_MapScript1_23BEE5: @ 823BEE5 diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index 33ae51f8d8..cb400e817f 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -1,7 +1,7 @@ IslandCave_MapScripts:: @ 8238E2A - map_script 5, IslandCave_MapScript1_238E3A - map_script 1, IslandCave_MapScript1_238E58 - map_script 3, IslandCave_MapScript1_238E99 + map_script MAP_SCRIPT_ON_RESUME, IslandCave_MapScript1_238E3A + map_script MAP_SCRIPT_ON_LOAD, IslandCave_MapScript1_238E58 + map_script MAP_SCRIPT_ON_TRANSITION, IslandCave_MapScript1_238E99 .byte 0 IslandCave_MapScript1_238E3A: @ 8238E3A diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index fd9947ac4c..79aaae9633 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -1,7 +1,7 @@ JaggedPass_MapScripts:: @ 8230656 - map_script 5, JaggedPass_MapScript1_230666 - map_script 3, JaggedPass_MapScript1_23068B - map_script 1, JaggedPass_MapScript1_23069C + map_script MAP_SCRIPT_ON_RESUME, JaggedPass_MapScript1_230666 + map_script MAP_SCRIPT_ON_TRANSITION, JaggedPass_MapScript1_23068B + map_script MAP_SCRIPT_ON_LOAD, JaggedPass_MapScript1_23069C .byte 0 JaggedPass_MapScript1_230666: @ 8230666 diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index aaf550d0d4..3910c4978b 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -1,6 +1,6 @@ LavaridgeTown_MapScripts:: @ 81EA4D3 - map_script 3, LavaridgeTown_MapScript1_1EA4DE - map_script 2, LavaridgeTown_MapScript2_1EA547 + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_MapScript1_1EA4DE + map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_MapScript2_1EA547 .byte 0 LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index 89dc30f474..06714058ed 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -1,5 +1,5 @@ LavaridgeTown_Gym_1F_MapScripts:: @ 81FE6F4 - map_script 3, LavaridgeTown_Gym_1F_MapScript1_1FE6FA + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_1F_MapScript1_1FE6FA .byte 0 LavaridgeTown_Gym_1F_MapScript1_1FE6FA: @ 81FE6FA diff --git a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc index a8a6eaa545..d2e8d90b54 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc @@ -1,5 +1,5 @@ LavaridgeTown_Gym_B1F_MapScripts:: @ 81FF87E - map_script 3, LavaridgeTown_Gym_B1F_MapScript1_1FF884 + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_B1F_MapScript1_1FF884 .byte 0 LavaridgeTown_Gym_B1F_MapScript1_1FF884: @ 81FF884 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc index f4fabbf721..2a0cb4a1ef 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 81FFAFA - map_script 3, LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05 - map_script 5, LavaridgeTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05 + map_script MAP_SCRIPT_ON_RESUME, LavaridgeTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05: @ 81FFB05 diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc index b1491f6216..b022df141e 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ LavaridgeTown_PokemonCenter_2F_MapScripts:: @ 81FFC97 - map_script 2, LavaridgeTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, LavaridgeTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, LavaridgeTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, LavaridgeTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, LavaridgeTown_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_2F_MapScript1_276ACF .byte 0 LavaridgeTown_PokemonCenter_2F_EventScript_1FFCAC:: @ 81FFCAC diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 02d88bf5a1..977581f80d 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -1,6 +1,6 @@ LilycoveCity_MapScripts:: @ 81E2B3C - map_script 3, LilycoveCity_MapScript1_1E2B47 - map_script 1, LilycoveCity_MapScript1_1E2B61 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_MapScript1_1E2B47 + map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_MapScript1_1E2B61 .byte 0 LilycoveCity_MapScript1_1E2B47: @ 81E2B47 diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index ae276cf9c3..83a2644d87 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -1,6 +1,6 @@ LilycoveCity_ContestLobby_MapScripts:: @ 821A211 - map_script 3, LilycoveCity_ContestLobby_MapScript1_21A21C - map_script 2, LilycoveCity_ContestLobby_MapScript2_21A243 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_ContestLobby_MapScript1_21A21C + map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_ContestLobby_MapScript2_21A243 .byte 0 LilycoveCity_ContestLobby_MapScript1_21A21C: @ 821A21C diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index d5379f96a3..f1c974dd9d 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 8220207 - map_script 3, LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D .byte 0 LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D: @ 822020D diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc index 899ea98f04..e625374220 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStore_5F_MapScripts:: @ 821FF7A - map_script 4, LilycoveCity_DepartmentStore_5F_MapScript2_21FF80 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_DepartmentStore_5F_MapScript2_21FF80 .byte 0 LilycoveCity_DepartmentStore_5F_MapScript2_21FF80: @ 821FF80 diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index ea70156aaa..67b05c692b 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -1,5 +1,5 @@ LilycoveCity_Harbor_MapScripts:: @ 821E000 - map_script 3, LilycoveCity_Harbor_MapScript1_21E006 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_Harbor_MapScript1_21E006 .byte 0 LilycoveCity_Harbor_MapScript1_21E006: @ 821E006 diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc index 3f5b349d27..ad8989b4cc 100644 --- a/data/maps/LilycoveCity_House3/scripts.inc +++ b/data/maps/LilycoveCity_House3/scripts.inc @@ -1,5 +1,5 @@ LilycoveCity_House3_MapScripts:: @ 821EE3C - map_script 3, LilycoveCity_House3_MapScript1_21EE42 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_House3_MapScript1_21EE42 .byte 0 LilycoveCity_House3_MapScript1_21EE42: @ 821EE42 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index 0669b74613..f568a98976 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -1,6 +1,6 @@ LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 821973A - map_script 1, LilycoveCity_LilycoveMuseum_2F_MapScript1_219745 - map_script 2, LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE + map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_LilycoveMuseum_2F_MapScript1_219745 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE .byte 0 LilycoveCity_LilycoveMuseum_2F_MapScript1_219745: @ 8219745 diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc index dd0dff376e..0d8da38d5c 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ LilycoveCity_PokemonCenter_1F_MapScripts:: @ 821C5B2 - map_script 3, LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD - map_script 5, LilycoveCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD + map_script MAP_SCRIPT_ON_RESUME, LilycoveCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD: @ 821C5BD diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc index f4a25f1377..1e80354837 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ LilycoveCity_PokemonCenter_2F_MapScripts:: @ 821C75D - map_script 2, LilycoveCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, LilycoveCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, LilycoveCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, LilycoveCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 LilycoveCity_PokemonCenter_2F_EventScript_21C772:: @ 821C772 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index 698ef95f24..f65d901bb5 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -1,6 +1,6 @@ LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 821C785 - map_script 2, LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790 - map_script 3, LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D + map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D .byte 0 LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790 diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc index e756c2bc6d..8d5101a952 100644 --- a/data/maps/LinkContestRoom1/scripts.inc +++ b/data/maps/LinkContestRoom1/scripts.inc @@ -1,9 +1,9 @@ LinkContestRoom1_MapScripts:: @ 823B781 - map_script 4, LinkContestRoom1_MapScript2_23B81F - map_script 2, LinkContestRoom1_MapScript2_23B815 - map_script 3, LinkContestRoom1_MapScript1_23B79F - map_script 5, LinkContestRoom1_MapScript1_23B803 - map_script 7, LinkContestRoom1_MapScript1_23B79B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LinkContestRoom1_MapScript2_23B81F + map_script MAP_SCRIPT_ON_FRAME_TABLE, LinkContestRoom1_MapScript2_23B815 + map_script MAP_SCRIPT_ON_TRANSITION, LinkContestRoom1_MapScript1_23B79F + map_script MAP_SCRIPT_ON_RESUME, LinkContestRoom1_MapScript1_23B803 + map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, LinkContestRoom1_MapScript1_23B79B .byte 0 LinkContestRoom1_MapScript1_23B79B: @ 823B79B diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index e4b69eb133..67eab89865 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -1,7 +1,7 @@ LittlerootTown_MapScripts:: @ 81E7DCB - map_script 3, LittlerootTown_MapScript1_1E7DDB - map_script 2, LittlerootTown_MapScript2_1E7EC1 - map_script 4, LittlerootTown_MapScript2_1E7FE2 + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MapScript1_1E7DDB + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MapScript2_1E7EC1 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_MapScript2_1E7FE2 .byte 0 LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 13736130f9..3aba7f4a9f 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -1,7 +1,7 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 81F7755 - map_script 1, LittlerootTown_BrendansHouse_1F_MapScript1_1F7765 - map_script 3, LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4 - map_script 2, LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA + map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_BrendansHouse_1F_MapScript1_1F7765 + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA .byte 0 LittlerootTown_BrendansHouse_1F_MapScript1_1F7765: @ 81F7765 diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index 9758ba2503..087310211c 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -1,6 +1,6 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81F83E3 - map_script 3, LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE - map_script 4, LittlerootTown_BrendansHouse_2F_MapScript2_1F846A + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_BrendansHouse_2F_MapScript2_1F846A .byte 0 LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 8f40d7c13f..ff8c965a41 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -1,7 +1,7 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 81F88A5 - map_script 1, LittlerootTown_MaysHouse_1F_MapScript1_1F88B5 - map_script 3, LittlerootTown_MaysHouse_1F_MapScript1_1F88F4 - map_script 2, LittlerootTown_MaysHouse_1F_MapScript2_1F893A + map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_MaysHouse_1F_MapScript1_1F88B5 + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_1F_MapScript1_1F88F4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MaysHouse_1F_MapScript2_1F893A .byte 0 LittlerootTown_MaysHouse_1F_MapScript1_1F88B5: @ 81F88B5 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index b946201efb..a639643a54 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -1,6 +1,6 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 81F9296 - map_script 3, LittlerootTown_MaysHouse_2F_MapScript1_1F92A1 - map_script 4, LittlerootTown_MaysHouse_2F_MapScript2_1F931D + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_2F_MapScript1_1F92A1 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_MaysHouse_2F_MapScript2_1F931D .byte 0 LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 1bf27c0bd0..adfe3c3870 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -1,7 +1,7 @@ LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91 - map_script 3, LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1 - map_script 4, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06 - map_script 2, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9 + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9 .byte 0 LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1 diff --git a/data/maps/MagmaHideout_1F/scripts.inc b/data/maps/MagmaHideout_1F/scripts.inc index 56ad204a93..c67cbd4474 100644 --- a/data/maps/MagmaHideout_1F/scripts.inc +++ b/data/maps/MagmaHideout_1F/scripts.inc @@ -1,5 +1,5 @@ MagmaHideout_1F_MapScripts:: @ 8239880 - map_script 3, MagmaHideout_1F_MapScript1_239886 + map_script MAP_SCRIPT_ON_TRANSITION, MagmaHideout_1F_MapScript1_239886 .byte 0 MagmaHideout_1F_MapScript1_239886: @ 8239886 diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index b66ab17c43..036fa77247 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -1,6 +1,6 @@ MarineCave_End_MapScripts:: @ 823AFDF - map_script 5, MarineCave_End_MapScript1_23AFEA - map_script 3, MarineCave_End_MapScript1_23B008 + map_script MAP_SCRIPT_ON_RESUME, MarineCave_End_MapScript1_23AFEA + map_script MAP_SCRIPT_ON_TRANSITION, MarineCave_End_MapScript1_23B008 .byte 0 MarineCave_End_MapScript1_23AFEA: @ 823AFEA diff --git a/data/maps/MarineCave_Entrance/scripts.inc b/data/maps/MarineCave_Entrance/scripts.inc index 24b288050f..82ff756e1d 100644 --- a/data/maps/MarineCave_Entrance/scripts.inc +++ b/data/maps/MarineCave_Entrance/scripts.inc @@ -1,5 +1,5 @@ MarineCave_Entrance_MapScripts:: @ 823AFD0 - map_script 5, MarineCave_Entrance_MapScript1_23AFD6 + map_script MAP_SCRIPT_ON_RESUME, MarineCave_Entrance_MapScript1_23AFD6 .byte 0 MarineCave_Entrance_MapScript1_23AFD6: @ 823AFD6 diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 6c2ae69fc9..344ccfa416 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -1,5 +1,5 @@ MauvilleCity_MapScripts:: @ 81DF385 - map_script 3, MauvilleCity_MapScript1_1DF38B + map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_MapScript1_1DF38B .byte 0 MauvilleCity_MapScript1_1DF38B: @ 81DF38B diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index 4d555fe79b..e3c3f5369a 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -1,5 +1,5 @@ MauvilleCity_Gym_MapScripts:: @ 820DD6E - map_script 1, MauvilleCity_Gym_MapScript1_20DD74 + map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_Gym_MapScript1_20DD74 .byte 0 MauvilleCity_Gym_MapScript1_20DD74: @ 820DD74 diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc index 1eac0efc90..a866e6aa4f 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B - map_script 3, MauvilleCity_PokemonCenter_1F_MapScript1_210E66 - map_script 5, MauvilleCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_1F_MapScript1_210E66 + map_script MAP_SCRIPT_ON_RESUME, MauvilleCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 MauvilleCity_PokemonCenter_1F_MapScript1_210E66: @ 8210E66 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc index 196d49a261..a289886a33 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ MauvilleCity_PokemonCenter_2F_MapScripts:: @ 8211008 - map_script 2, MauvilleCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, MauvilleCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, MauvilleCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, MauvilleCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, MauvilleCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MauvilleCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 MauvilleCity_PokemonCenter_2F_EventScript_21101D:: @ 821101D diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index 466b1ee3ba..8522df0a57 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -1,5 +1,5 @@ MeteorFalls_1F_1R_MapScripts:: @ 822BD2A - map_script 1, MeteorFalls_1F_1R_MapScript1_22BD30 + map_script MAP_SCRIPT_ON_LOAD, MeteorFalls_1F_1R_MapScript1_22BD30 .byte 0 MeteorFalls_1F_1R_MapScript1_22BD30: @ 822BD30 diff --git a/data/maps/MirageTower_1F/scripts.inc b/data/maps/MirageTower_1F/scripts.inc index 94aed55d0f..9f6c35a844 100644 --- a/data/maps/MirageTower_1F/scripts.inc +++ b/data/maps/MirageTower_1F/scripts.inc @@ -1,5 +1,5 @@ MirageTower_1F_MapScripts:: @ 823AD01 - map_script 3, MirageTower_1F_MapScript1_23AD07 + map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_1F_MapScript1_23AD07 .byte 0 MirageTower_1F_MapScript1_23AD07: @ 823AD07 diff --git a/data/maps/MirageTower_2F/scripts.inc b/data/maps/MirageTower_2F/scripts.inc index 79f3cce2a1..d22a7c6fff 100644 --- a/data/maps/MirageTower_2F/scripts.inc +++ b/data/maps/MirageTower_2F/scripts.inc @@ -1,7 +1,7 @@ MirageTower_2F_MapScripts:: @ 823AD11 - map_script 2, MirageTower_2F_MapScript2_2A8327 - map_script 3, MirageTower_2F_MapScript1_2A8331 - map_script 5, MirageTower_2F_MapScript1_23AD21 + map_script MAP_SCRIPT_ON_FRAME_TABLE, MirageTower_2F_MapScript2_2A8327 + map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_2F_MapScript1_2A8331 + map_script MAP_SCRIPT_ON_RESUME, MirageTower_2F_MapScript1_23AD21 .byte 0 MirageTower_2F_MapScript1_23AD21: @ 823AD21 diff --git a/data/maps/MirageTower_3F/scripts.inc b/data/maps/MirageTower_3F/scripts.inc index 1ec82de55e..f29f542fc4 100644 --- a/data/maps/MirageTower_3F/scripts.inc +++ b/data/maps/MirageTower_3F/scripts.inc @@ -1,7 +1,7 @@ MirageTower_3F_MapScripts:: @ 823AD2C - map_script 2, MirageTower_3F_MapScript2_2A8327 - map_script 3, MirageTower_3F_MapScript1_2A8331 - map_script 5, MirageTower_3F_MapScript1_23AD3C + map_script MAP_SCRIPT_ON_FRAME_TABLE, MirageTower_3F_MapScript2_2A8327 + map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_3F_MapScript1_2A8331 + map_script MAP_SCRIPT_ON_RESUME, MirageTower_3F_MapScript1_23AD3C .byte 0 MirageTower_3F_MapScript1_23AD3C: @ 823AD3C diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index 3e2bd4cf9c..b01e9cae8d 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -1,5 +1,5 @@ MossdeepCity_MapScripts:: @ 81E4A96 - map_script 3, MossdeepCity_MapScript1_1E4A9C + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_MapScript1_1E4A9C .byte 0 MossdeepCity_MapScript1_1E4A9C: @ 81E4A9C diff --git a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc index ed10a83099..4b40cd74ec 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc @@ -1,7 +1,7 @@ MossdeepCity_GameCorner_1F_MapScripts:: @ 8224B27 - map_script 2, MossdeepCity_GameCorner_1F_MapScript2_224B41 - map_script 4, MossdeepCity_GameCorner_1F_MapScript2_224B37 - map_script 1, MossdeepCity_GameCorner_1F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B41 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B37 + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_GameCorner_1F_MapScript1_276BBE .byte 0 MossdeepCity_GameCorner_1F_MapScript2_224B37: @ 8224B37 diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index 6e5b461cd6..7638f6119a 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -1,5 +1,5 @@ MossdeepCity_Gym_MapScripts:: @ 8220800 - map_script 1, MossdeepCity_Gym_MapScript1_220806 + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_Gym_MapScript1_220806 .byte 0 MossdeepCity_Gym_MapScript1_220806: @ 8220806 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc index 28573a3c1e..9dbead25e7 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ MossdeepCity_PokemonCenter_1F_MapScripts:: @ 822223F - map_script 3, MossdeepCity_PokemonCenter_1F_MapScript1_22224A - map_script 5, MossdeepCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_1F_MapScript1_22224A + map_script MAP_SCRIPT_ON_RESUME, MossdeepCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 MossdeepCity_PokemonCenter_1F_MapScript1_22224A: @ 822224A diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc index e8fbb6e026..922c9a064e 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ MossdeepCity_PokemonCenter_2F_MapScripts:: @ 8222334 - map_script 2, MossdeepCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, MossdeepCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, MossdeepCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, MossdeepCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 MossdeepCity_PokemonCenter_2F_EventScript_222349:: @ 8222349 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 662774d64f..43bd56d3ae 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -1,6 +1,6 @@ MossdeepCity_SpaceCenter_1F_MapScripts:: @ 8222F41 - map_script 1, MossdeepCity_SpaceCenter_1F_MapScript1_222FC2 - map_script 3, MossdeepCity_SpaceCenter_1F_MapScript1_222F4C + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_SpaceCenter_1F_MapScript1_222FC2 + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_1F_MapScript1_222F4C .byte 0 MossdeepCity_SpaceCenter_1F_MapScript1_222F4C: @ 8222F4C diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index bfc33a10f5..7ce0efef38 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -1,6 +1,6 @@ MossdeepCity_SpaceCenter_2F_MapScripts:: @ 8223D58 - map_script 3, MossdeepCity_SpaceCenter_2F_MapScript1_223D63 - map_script 2, MossdeepCity_SpaceCenter_2F_MapScript2_223DB5 + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_2F_MapScript1_223D63 + map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_SpaceCenter_2F_MapScript2_223DB5 .byte 0 MossdeepCity_SpaceCenter_2F_MapScript1_223D63: @ 8223D63 diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index d669302922..e59c217d36 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -1,7 +1,7 @@ MossdeepCity_StevensHouse_MapScripts:: @ 8222784 - map_script 1, MossdeepCity_StevensHouse_MapScript1_222794 - map_script 3, MossdeepCity_StevensHouse_MapScript1_2227A8 - map_script 2, MossdeepCity_StevensHouse_MapScript2_2227C0 + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_StevensHouse_MapScript1_222794 + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_StevensHouse_MapScript1_2227A8 + map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_StevensHouse_MapScript2_2227C0 .byte 0 MossdeepCity_StevensHouse_MapScript1_222794: @ 8222794 diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 7282ca944d..38b223ab0b 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -1,6 +1,6 @@ MtChimney_MapScripts:: @ 822EDC1 - map_script 5, MtChimney_MapScript1_22EDD2 - map_script 3, MtChimney_MapScript1_22EDCC + map_script MAP_SCRIPT_ON_RESUME, MtChimney_MapScript1_22EDD2 + map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_MapScript1_22EDCC .byte 0 MtChimney_MapScript1_22EDCC: @ 822EDCC diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index 6c389e2ad3..9e85729b74 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -1,6 +1,6 @@ MtChimney_CableCarStation_MapScripts:: @ 822ABFA - map_script 3, MtChimney_CableCarStation_MapScript1_22AC05 - map_script 2, MtChimney_CableCarStation_MapScript2_22AC1D + map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_CableCarStation_MapScript1_22AC05 + map_script MAP_SCRIPT_ON_FRAME_TABLE, MtChimney_CableCarStation_MapScript2_22AC1D .byte 0 MtChimney_CableCarStation_MapScript1_22AC05: @ 822AC05 diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc index cdf2cb98ba..150c08df4e 100644 --- a/data/maps/MtPyre_2F/scripts.inc +++ b/data/maps/MtPyre_2F/scripts.inc @@ -1,7 +1,7 @@ MtPyre_2F_MapScripts:: @ 82310FB - map_script 2, MtPyre_2F_MapScript2_2A8327 - map_script 3, MtPyre_2F_MapScript1_2A8331 - map_script 5, MtPyre_2F_MapScript1_23110B + map_script MAP_SCRIPT_ON_FRAME_TABLE, MtPyre_2F_MapScript2_2A8327 + map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_2F_MapScript1_2A8331 + map_script MAP_SCRIPT_ON_RESUME, MtPyre_2F_MapScript1_23110B .byte 0 MtPyre_2F_MapScript1_23110B: @ 823110B diff --git a/data/maps/MtPyre_Exterior/scripts.inc b/data/maps/MtPyre_Exterior/scripts.inc index fe51946dcb..e24f8ea682 100644 --- a/data/maps/MtPyre_Exterior/scripts.inc +++ b/data/maps/MtPyre_Exterior/scripts.inc @@ -1,5 +1,5 @@ MtPyre_Exterior_MapScripts:: @ 8231FCC - map_script 3, MtPyre_Exterior_MapScript1_231FD2 + map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Exterior_MapScript1_231FD2 .byte 0 MtPyre_Exterior_MapScript1_231FD2: @ 8231FD2 diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 6b9805fbf4..b7f6d73fc1 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -1,5 +1,5 @@ MtPyre_Summit_MapScripts:: @ 8231FF7 - map_script 3, MtPyre_Summit_MapScript1_231FFD + map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Summit_MapScript1_231FFD .byte 0 MtPyre_Summit_MapScript1_231FFD: @ 8231FFD diff --git a/data/maps/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc index 83185bc4d3..8a617236c5 100644 --- a/data/maps/NavelRock_Bottom/scripts.inc +++ b/data/maps/NavelRock_Bottom/scripts.inc @@ -1,6 +1,6 @@ NavelRock_Bottom_MapScripts:: @ 8269255 - map_script 3, NavelRock_Bottom_MapScript1_269260 - map_script 5, NavelRock_Bottom_MapScript1_269284 + map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Bottom_MapScript1_269260 + map_script MAP_SCRIPT_ON_RESUME, NavelRock_Bottom_MapScript1_269284 .byte 0 NavelRock_Bottom_MapScript1_269260: @ 8269260 diff --git a/data/maps/NavelRock_Exterior/scripts.inc b/data/maps/NavelRock_Exterior/scripts.inc index 21034a4e06..33bbb63915 100644 --- a/data/maps/NavelRock_Exterior/scripts.inc +++ b/data/maps/NavelRock_Exterior/scripts.inc @@ -1,5 +1,5 @@ NavelRock_Exterior_MapScripts:: @ 82690B2 - map_script 3, NavelRock_Exterior_MapScript1_2690B8 + map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Exterior_MapScript1_2690B8 .byte 0 NavelRock_Exterior_MapScript1_2690B8: @ 82690B8 diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc index 795bcf0e5f..af011e0589 100644 --- a/data/maps/NavelRock_Top/scripts.inc +++ b/data/maps/NavelRock_Top/scripts.inc @@ -1,6 +1,6 @@ NavelRock_Top_MapScripts:: @ 8269113 - map_script 3, NavelRock_Top_MapScript1_26911E - map_script 5, NavelRock_Top_MapScript1_269151 + map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Top_MapScript1_26911E + map_script MAP_SCRIPT_ON_RESUME, NavelRock_Top_MapScript1_269151 .byte 0 NavelRock_Top_MapScript1_26911E: @ 826911E diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index 9d0452b6b6..d45661fc11 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -1,6 +1,6 @@ NewMauville_Entrance_MapScripts:: @ 82372AD - map_script 1, NewMauville_Entrance_MapScript1_2372B8 - map_script 3, NewMauville_Entrance_MapScript1_2372FB + map_script MAP_SCRIPT_ON_LOAD, NewMauville_Entrance_MapScript1_2372B8 + map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Entrance_MapScript1_2372FB .byte 0 NewMauville_Entrance_MapScript1_2372B8: @ 82372B8 diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc index 38bacbde3b..0245018204 100644 --- a/data/maps/NewMauville_Inside/scripts.inc +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -1,7 +1,7 @@ NewMauville_Inside_MapScripts:: @ 82373D7 - map_script 5, NewMauville_Inside_MapScript1_2373E7 - map_script 3, NewMauville_Inside_MapScript1_23741B - map_script 1, NewMauville_Inside_MapScript1_23744D + map_script MAP_SCRIPT_ON_RESUME, NewMauville_Inside_MapScript1_2373E7 + map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Inside_MapScript1_23741B + map_script MAP_SCRIPT_ON_LOAD, NewMauville_Inside_MapScript1_23744D .byte 0 NewMauville_Inside_MapScript1_2373E7: @ 82373E7 diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index a635b2f5cb..6f550a8b03 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -1,5 +1,5 @@ OldaleTown_MapScripts:: @ 81E8EA2 - map_script 3, OldaleTown_MapScript1_1E8EA8 + map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_MapScript1_1E8EA8 .byte 0 OldaleTown_MapScript1_1E8EA8: @ 81E8EA8 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc index 19f7d8f670..49452da71c 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ OldaleTown_PokemonCenter_1F_MapScripts:: @ 81FC006 - map_script 3, OldaleTown_PokemonCenter_1F_MapScript1_1FC011 - map_script 5, OldaleTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_1F_MapScript1_1FC011 + map_script MAP_SCRIPT_ON_RESUME, OldaleTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 OldaleTown_PokemonCenter_1F_MapScript1_1FC011: @ 81FC011 diff --git a/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc index 788157bebf..b6795876b8 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ OldaleTown_PokemonCenter_2F_MapScripts:: @ 81FC218 - map_script 2, OldaleTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, OldaleTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, OldaleTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, OldaleTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, OldaleTown_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, OldaleTown_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, OldaleTown_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_2F_MapScript1_276ACF .byte 0 OldaleTown_PokemonCenter_2F_EventScript_1FC22D:: @ 81FC22D diff --git a/data/maps/PacifidlogTown/scripts.inc b/data/maps/PacifidlogTown/scripts.inc index 6125ed3865..0ae0a53a81 100644 --- a/data/maps/PacifidlogTown/scripts.inc +++ b/data/maps/PacifidlogTown/scripts.inc @@ -1,6 +1,6 @@ PacifidlogTown_MapScripts:: @ 81EBAB1 - map_script 3, PacifidlogTown_MapScript1_1EBABC - map_script 5, PacifidlogTown_MapScript1_1EBAC0 + map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_MapScript1_1EBABC + map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_MapScript1_1EBAC0 .byte 0 PacifidlogTown_MapScript1_1EBABC: @ 81EBABC diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc index ddad843fbe..89fec7f6bf 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 82034A7 - map_script 3, PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2 - map_script 5, PacifidlogTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2 + map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2: @ 82034B2 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc index 0199c22153..cb28d577ee 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ PacifidlogTown_PokemonCenter_2F_MapScripts:: @ 8203635 - map_script 2, PacifidlogTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, PacifidlogTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, PacifidlogTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, PacifidlogTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, PacifidlogTown_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PacifidlogTown_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, PacifidlogTown_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_2F_MapScript1_276ACF .byte 0 PacifidlogTown_PokemonCenter_2F_EventScript_20364A:: @ 820364A diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index 0253a799fc..83ec1aa23c 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -1,6 +1,6 @@ PetalburgCity_MapScripts:: - map_script 3, PetalburgCity_MapScript1_1DC2D7 - map_script 2, PetalburgCity_MapScript2_1DC31C + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_MapScript1_1DC2D7 + map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_MapScript2_1DC31C .byte 0 PetalburgCity_MapScript1_1DC2D7: @ 81DC2D7 diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 474fe0df56..09f20ecf40 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -1,8 +1,8 @@ PetalburgCity_Gym_MapScripts:: @ 8204889 - map_script 1, PetalburgCity_Gym_MapScript1_20489E - map_script 3, PetalburgCity_Gym_MapScript1_20492D - map_script 4, PetalburgCity_Gym_MapScript2_20498B - map_script 2, PetalburgCity_Gym_MapScript2_20499A + map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_MapScript1_20489E + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_Gym_MapScript1_20492D + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_Gym_MapScript2_20498B + map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_Gym_MapScript2_20499A .byte 0 PetalburgCity_Gym_MapScript1_20489E: @ 820489E diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc index 1bbeb8fadb..382847bc7d 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ PetalburgCity_PokemonCenter_1F_MapScripts:: @ 82079E8 - map_script 3, PetalburgCity_PokemonCenter_1F_MapScript1_2079F3 - map_script 5, PetalburgCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_1F_MapScript1_2079F3 + map_script MAP_SCRIPT_ON_RESUME, PetalburgCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 PetalburgCity_PokemonCenter_1F_MapScript1_2079F3: @ 82079F3 diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc index 38d01972af..7b5f5af558 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ PetalburgCity_PokemonCenter_2F_MapScripts:: @ 8207D41 - map_script 2, PetalburgCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, PetalburgCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, PetalburgCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, PetalburgCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 PetalburgCity_PokemonCenter_2F_EventScript_207D56:: @ 8207D56 diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc index ac41aaa28f..1a47543749 100644 --- a/data/maps/PetalburgCity_WallysHouse/scripts.inc +++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc @@ -1,6 +1,6 @@ PetalburgCity_WallysHouse_MapScripts:: @ 8204229 - map_script 2, PetalburgCity_WallysHouse_MapScript2_204247 - map_script 4, PetalburgCity_WallysHouse_MapScript2_204234 + map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_WallysHouse_MapScript2_204247 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_WallysHouse_MapScript2_204234 .byte 0 PetalburgCity_WallysHouse_MapScript2_204234: @ 8204234 diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index ca9d94127c..8ee9ea05e7 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -1,6 +1,6 @@ Route101_MapScripts:: @ 81EBCBA - map_script 3, Route101_MapScript1_1EBCC5 - map_script 2, Route101_MapScript2_1EBCCB + map_script MAP_SCRIPT_ON_TRANSITION, Route101_MapScript1_1EBCC5 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route101_MapScript2_1EBCCB .byte 0 Route101_MapScript1_1EBCC5: @ 81EBCC5 diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 798e32715a..f863e6dc76 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -1,6 +1,6 @@ Route103_MapScripts:: @ 81EC38E - map_script 3, Route103_MapScript1_1EC399 - map_script 1, Route103_MapScript1_1EC3A4 + map_script MAP_SCRIPT_ON_TRANSITION, Route103_MapScript1_1EC399 + map_script MAP_SCRIPT_ON_LOAD, Route103_MapScript1_1EC3A4 .byte 0 Route103_MapScript1_1EC399: @ 81EC399 diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 7d2e06876e..159fff9abc 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -1,6 +1,6 @@ Route104_MapScripts:: @ 81ECC32 - map_script 2, Route104_MapScript2_1ECC3D - map_script 3, Route104_MapScript1_1ECC4E + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route104_MapScript2_1ECC3D + map_script MAP_SCRIPT_ON_TRANSITION, Route104_MapScript1_1ECC4E .byte 0 Route104_MapScript2_1ECC3D: @ 81ECC3D diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc index 17ed47206a..ef3e92e569 100644 --- a/data/maps/Route104_MrBrineysHouse/scripts.inc +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -1,5 +1,5 @@ Route104_MrBrineysHouse_MapScripts:: @ 8229D2E - map_script 3, Route104_MrBrineysHouse_MapScript1_229D34 + map_script MAP_SCRIPT_ON_TRANSITION, Route104_MrBrineysHouse_MapScript1_229D34 .byte 0 Route104_MrBrineysHouse_MapScript1_229D34: @ 8229D34 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc index a1f0706510..26dfe7f8a4 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -1,5 +1,5 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 822A34C - map_script 3, Route104_PrettyPetalFlowerShop_MapScript1_22A352 + map_script MAP_SCRIPT_ON_TRANSITION, Route104_PrettyPetalFlowerShop_MapScript1_22A352 .byte 0 Route104_PrettyPetalFlowerShop_MapScript1_22A352: @ 822A352 diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index b4213af5bc..6ad11bc523 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -1,7 +1,7 @@ Route105_MapScripts:: @ 81EE1DB - map_script 1, Route105_MapScript1_1EE1EB - map_script 3, Route105_MapScript1_1EE21E - map_script 2, Route105_MapScript2_1EE240 + map_script MAP_SCRIPT_ON_LOAD, Route105_MapScript1_1EE1EB + map_script MAP_SCRIPT_ON_TRANSITION, Route105_MapScript1_1EE21E + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route105_MapScript2_1EE240 .byte 0 Route105_MapScript1_1EE1EB: @ 81EE1EB diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index 89e31d639b..ed27e32ff6 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -1,5 +1,5 @@ Route109_SeashoreHouse_MapScripts:: @ 82693F4 - map_script 3, Route109_SeashoreHouse_MapScript1_2693FA + map_script MAP_SCRIPT_ON_TRANSITION, Route109_SeashoreHouse_MapScript1_2693FA .byte 0 Route109_SeashoreHouse_MapScript1_2693FA: @ 82693FA diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 578a19a21a..1a45bee608 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -1,7 +1,7 @@ Route110_MapScripts:: @ 81EF269 - map_script 5, Route110_MapScript1_1EF279 - map_script 3, Route110_MapScript1_1EF27D - map_script 2, Route110_MapScript2_1EF297 + map_script MAP_SCRIPT_ON_RESUME, Route110_MapScript1_1EF279 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_MapScript1_1EF27D + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_MapScript2_1EF297 .byte 0 Route110_MapScript1_1EF279: @ 81EF279 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc index a993364e6a..1d353dcdd1 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc @@ -1,5 +1,5 @@ Route110_SeasideCyclingRoadSouthEntrance_MapScripts:: @ 826EBA1 - map_script 3, Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7 .byte 0 Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7: @ 826EBA7 diff --git a/data/maps/Route110_TrickHouseCorridor/scripts.inc b/data/maps/Route110_TrickHouseCorridor/scripts.inc index cf520c81f7..f15c8c7069 100644 --- a/data/maps/Route110_TrickHouseCorridor/scripts.inc +++ b/data/maps/Route110_TrickHouseCorridor/scripts.inc @@ -1,5 +1,5 @@ Route110_TrickHouseCorridor_MapScripts:: @ 826B903 - map_script 3, Route110_TrickHouseCorridor_MapScript1_26B909 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseCorridor_MapScript1_26B909 .byte 0 Route110_TrickHouseCorridor_MapScript1_26B909: @ 826B909 diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 770c397682..749e6fbb2b 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -1,8 +1,8 @@ Route110_TrickHouseEnd_MapScripts:: @ 826ACAF - map_script 5, Route110_TrickHouseEnd_MapScript1_26ACC4 - map_script 3, Route110_TrickHouseEnd_MapScript1_26ACD0 - map_script 2, Route110_TrickHouseEnd_MapScript2_26ACF5 - map_script 4, Route110_TrickHouseEnd_MapScript2_26ACDE + map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHouseEnd_MapScript1_26ACC4 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEnd_MapScript1_26ACD0 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEnd_MapScript2_26ACF5 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEnd_MapScript2_26ACDE .byte 0 Route110_TrickHouseEnd_MapScript1_26ACC4: @ 826ACC4 diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 7dc918f2d4..b97c257814 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -1,7 +1,7 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8269A50 - map_script 3, Route110_TrickHouseEntrance_MapScript1_269A60 - map_script 2, Route110_TrickHouseEntrance_MapScript2_269CEE - map_script 4, Route110_TrickHouseEntrance_MapScript2_269BD3 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEntrance_MapScript1_269A60 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEntrance_MapScript2_269CEE + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEntrance_MapScript2_269BD3 .byte 0 Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60 diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc index b34a9d5552..3ec5ac82ce 100644 --- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle1_MapScripts:: @ 826B90F - map_script 1, Route110_TrickHousePuzzle1_MapScript1_26B915 + map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle1_MapScript1_26B915 .byte 0 Route110_TrickHousePuzzle1_MapScript1_26B915: @ 826B915 diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc index 560d100601..0e84817340 100644 --- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -1,6 +1,6 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 826BB73 - map_script 5, Route110_TrickHousePuzzle2_MapScript1_26BB7E - map_script 3, Route110_TrickHousePuzzle2_MapScript1_26BBAB + map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle2_MapScript1_26BB7E + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle2_MapScript1_26BBAB .byte 0 Route110_TrickHousePuzzle2_MapScript1_26BB7E: @ 826BB7E diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc index b26c5473d3..3968adce27 100644 --- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc @@ -1,6 +1,6 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 826BED8 - map_script 5, Route110_TrickHousePuzzle3_MapScript1_26BEE3 - map_script 3, Route110_TrickHousePuzzle3_MapScript1_26BEFF + map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle3_MapScript1_26BEE3 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle3_MapScript1_26BEFF .byte 0 Route110_TrickHousePuzzle3_MapScript1_26BEE3: @ 826BEE3 diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index 48ce6be8c2..7f400760a8 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle5_MapScripts:: @ 826CAF0 - map_script 3, Route110_TrickHousePuzzle5_MapScript1_26CAF6 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle5_MapScript1_26CAF6 .byte 0 Route110_TrickHousePuzzle5_MapScript1_26CAF6: @ 826CAF6 diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc index 2cb784b505..d5725bbd8a 100644 --- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc @@ -1,6 +1,6 @@ Route110_TrickHousePuzzle6_MapScripts:: @ 826DDA7 - map_script 3, Route110_TrickHousePuzzle6_MapScript1_26DDB2 - map_script 4, Route110_TrickHousePuzzle6_MapScript2_26DDB6 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle6_MapScript1_26DDB2 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHousePuzzle6_MapScript2_26DDB6 .byte 0 Route110_TrickHousePuzzle6_MapScript1_26DDB2: @ 826DDB2 diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index 3babdbd453..55fdec0fb0 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -1,8 +1,8 @@ Route110_TrickHousePuzzle7_MapScripts:: @ 826E091 - map_script 5, Route110_TrickHousePuzzle7_MapScript1_26E0A6 - map_script 3, Route110_TrickHousePuzzle7_MapScript1_26E198 - map_script 1, Route110_TrickHousePuzzle7_MapScript1_26E1B4 - map_script 2, Route110_TrickHousePuzzle7_MapScript2_26E1C0 + map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle7_MapScript1_26E0A6 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle7_MapScript1_26E198 + map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle7_MapScript1_26E1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHousePuzzle7_MapScript2_26E1C0 .byte 0 Route110_TrickHousePuzzle7_MapScript1_26E0A6: @ 826E0A6 diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index c33dc6f115..7543690148 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -1,8 +1,8 @@ Route111_MapScripts:: @ 81F0CA7 - map_script 1, Route111_MapScript1_1F0CBC - map_script 3, Route111_MapScript1_1F0D87 - map_script 4, Route111_MapScript2_1F0E46 - map_script 2, Route111_MapScript2_1F0E56 + map_script MAP_SCRIPT_ON_LOAD, Route111_MapScript1_1F0CBC + map_script MAP_SCRIPT_ON_TRANSITION, Route111_MapScript1_1F0D87 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route111_MapScript2_1F0E46 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route111_MapScript2_1F0E56 .byte 0 Route111_MapScript1_1F0CBC: @ 81F0CBC diff --git a/data/maps/Route111_OldLadysRestStop/scripts.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc index 23dca6f0b3..9427e8692d 100644 --- a/data/maps/Route111_OldLadysRestStop/scripts.inc +++ b/data/maps/Route111_OldLadysRestStop/scripts.inc @@ -1,5 +1,5 @@ Route111_OldLadysRestStop_MapScripts:: @ 822A916 - map_script 3, Route111_OldLadysRestStop_MapScript1_22A91C + map_script MAP_SCRIPT_ON_TRANSITION, Route111_OldLadysRestStop_MapScript1_22A91C .byte 0 Route111_OldLadysRestStop_MapScript1_22A91C: @ 822A91C diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 7f479d9f25..8c624fb214 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -1,5 +1,5 @@ Route112_MapScripts:: @ 81F1DA8 - map_script 3, Route112_MapScript1_1F1DAE + map_script MAP_SCRIPT_ON_TRANSITION, Route112_MapScript1_1F1DAE .byte 0 Route112_MapScript1_1F1DAE: @ 81F1DAE diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index a430a497e5..1f2f83589e 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -1,6 +1,6 @@ Route112_CableCarStation_MapScripts:: @ 822AABE - map_script 3, Route112_CableCarStation_MapScript1_22AAC9 - map_script 2, Route112_CableCarStation_MapScript2_22AAE9 + map_script MAP_SCRIPT_ON_TRANSITION, Route112_CableCarStation_MapScript1_22AAC9 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route112_CableCarStation_MapScript2_22AAE9 .byte 0 Route112_CableCarStation_MapScript1_22AAC9: @ 822AAC9 diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index ac27784da4..6efd05d6ec 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -1,6 +1,6 @@ Route113_MapScripts:: @ 81F2153 - map_script 5, Route113_MapScript1_1F215E - map_script 3, Route113_MapScript1_1F2161 + map_script MAP_SCRIPT_ON_RESUME, Route113_MapScript1_1F215E + map_script MAP_SCRIPT_ON_TRANSITION, Route113_MapScript1_1F2161 .byte 0 Route113_MapScript1_1F215E: @ 81F215E diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc index b5b082d4d1..cbe1c210e1 100644 --- a/data/maps/Route113_GlassWorkshop/scripts.inc +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -1,5 +1,5 @@ Route113_GlassWorkshop_MapScripts:: @ 826ED03 - map_script 3, Route113_GlassWorkshop_MapScript1_26ED09 + map_script MAP_SCRIPT_ON_TRANSITION, Route113_GlassWorkshop_MapScript1_26ED09 .byte 0 Route113_GlassWorkshop_MapScript1_26ED09: @ 826ED09 diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index 3c07facf3d..d4327a2f45 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -1,7 +1,7 @@ Route114_MapScripts:: @ 81F252F - map_script 3, Route114_MapScript1_1F253F - map_script 1, Route114_MapScript1_1F2561 - map_script 2, Route114_MapScript2_1F2578 + map_script MAP_SCRIPT_ON_TRANSITION, Route114_MapScript1_1F253F + map_script MAP_SCRIPT_ON_LOAD, Route114_MapScript1_1F2561 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route114_MapScript2_1F2578 .byte 0 Route114_MapScript1_1F253F: @ 81F253F diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc index 0d942e4469..c6b63d8da3 100644 --- a/data/maps/Route114_FossilManiacsHouse/scripts.inc +++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc @@ -1,5 +1,5 @@ Route114_FossilManiacsHouse_MapScripts:: @ 822AD30 - map_script 3, Route114_FossilManiacsHouse_MapScript1_22AD36 + map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsHouse_MapScript1_22AD36 .byte 0 Route114_FossilManiacsHouse_MapScript1_22AD36: @ 822AD36 diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index c36abfe3b5..1a84082abd 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -1,6 +1,6 @@ Route114_FossilManiacsTunnel_MapScripts:: @ 822AF28 - map_script 3, Route114_FossilManiacsTunnel_MapScript1_22AF33 - map_script 1, Route114_FossilManiacsTunnel_MapScript1_22AF49 + map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsTunnel_MapScript1_22AF33 + map_script MAP_SCRIPT_ON_LOAD, Route114_FossilManiacsTunnel_MapScript1_22AF49 .byte 0 Route114_FossilManiacsTunnel_MapScript1_22AF33: @ 822AF33 diff --git a/data/maps/Route114_LanettesHouse/scripts.inc b/data/maps/Route114_LanettesHouse/scripts.inc index b54365523f..1cf7ffb470 100644 --- a/data/maps/Route114_LanettesHouse/scripts.inc +++ b/data/maps/Route114_LanettesHouse/scripts.inc @@ -1,5 +1,5 @@ Route114_LanettesHouse_MapScripts:: @ 822B2C8 - map_script 3, Route114_LanettesHouse_MapScript1_22B2CE + map_script MAP_SCRIPT_ON_TRANSITION, Route114_LanettesHouse_MapScript1_22B2CE .byte 0 Route114_LanettesHouse_MapScript1_22B2CE: @ 822B2CE diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 560c360af3..9cb3ea2e01 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -1,7 +1,7 @@ Route115_MapScripts:: @ 81F2920 - map_script 1, Route115_MapScript1_1F2930 - map_script 3, Route115_MapScript1_1F2947 - map_script 2, Route115_MapScript2_1F2969 + map_script MAP_SCRIPT_ON_LOAD, Route115_MapScript1_1F2930 + map_script MAP_SCRIPT_ON_TRANSITION, Route115_MapScript1_1F2947 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route115_MapScript2_1F2969 .byte 0 Route115_MapScript1_1F2930: @ 81F2930 diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 1addad5ecb..fc8b49b305 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -1,7 +1,7 @@ Route116_MapScripts:: @ 81F2C0C - map_script 3, Route116_MapScript1_1F2C1C - map_script 1, Route116_MapScript1_1F2C4F - map_script 2, Route116_MapScript2_1F2C66 + map_script MAP_SCRIPT_ON_TRANSITION, Route116_MapScript1_1F2C1C + map_script MAP_SCRIPT_ON_LOAD, Route116_MapScript1_1F2C4F + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route116_MapScript2_1F2C66 .byte 0 Route116_MapScript1_1F2C1C: @ 81F2C1C diff --git a/data/maps/Route116_TunnelersRestHouse/scripts.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc index 89ccdce8df..bdd22aadd9 100644 --- a/data/maps/Route116_TunnelersRestHouse/scripts.inc +++ b/data/maps/Route116_TunnelersRestHouse/scripts.inc @@ -1,5 +1,5 @@ Route116_TunnelersRestHouse_MapScripts:: @ 822B850 - map_script 3, Route116_TunnelersRestHouse_MapScript1_22B856 + map_script MAP_SCRIPT_ON_TRANSITION, Route116_TunnelersRestHouse_MapScript1_22B856 .byte 0 Route116_TunnelersRestHouse_MapScript1_22B856: @ 822B856 diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index 4a51c17d8e..08571690fe 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -1,5 +1,5 @@ Route117_MapScripts:: @ 81F397D - map_script 3, Route117_MapScript1_1F3983 + map_script MAP_SCRIPT_ON_TRANSITION, Route117_MapScript1_1F3983 .byte 0 Route117_MapScript1_1F3983: @ 81F3983 diff --git a/data/maps/Route117_PokemonDayCare/scripts.inc b/data/maps/Route117_PokemonDayCare/scripts.inc index b2e9ddfaaf..ea9894ffca 100644 --- a/data/maps/Route117_PokemonDayCare/scripts.inc +++ b/data/maps/Route117_PokemonDayCare/scripts.inc @@ -1,5 +1,5 @@ Route117_PokemonDayCare_MapScripts:: @ 822BBB1 - map_script 3, Route117_PokemonDayCare_MapScript1_22BBB7 + map_script MAP_SCRIPT_ON_TRANSITION, Route117_PokemonDayCare_MapScript1_22BBB7 .byte 0 Route117_PokemonDayCare_MapScript1_22BBB7: @ 822BBB7 diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 4e5279510e..5ba60d5cdf 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -1,7 +1,7 @@ Route118_MapScripts:: @ 81F3DBC - map_script 3, Route118_MapScript1_1F3DCC - map_script 1, Route118_MapScript1_1F3DF3 - map_script 2, Route118_MapScript2_1F3E0A + map_script MAP_SCRIPT_ON_TRANSITION, Route118_MapScript1_1F3DCC + map_script MAP_SCRIPT_ON_LOAD, Route118_MapScript1_1F3DF3 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route118_MapScript2_1F3E0A .byte 0 Route118_MapScript1_1F3DCC: @ 81F3DCC diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 8356df0635..91208f052f 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -1,6 +1,6 @@ Route119_MapScripts:: @ 81F4424 - map_script 5, Route119_MapScript1_1F442F - map_script 3, Route119_MapScript1_1F444D + map_script MAP_SCRIPT_ON_RESUME, Route119_MapScript1_1F442F + map_script MAP_SCRIPT_ON_TRANSITION, Route119_MapScript1_1F444D .byte 0 Route119_MapScript1_1F442F: @ 81F442F diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index 8d57356fdf..09ed3c4f5c 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -1,5 +1,5 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 826FA86 - map_script 3, Route119_WeatherInstitute_1F_MapScript1_26FA8C + map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_1F_MapScript1_26FA8C .byte 0 Route119_WeatherInstitute_1F_MapScript1_26FA8C: @ 826FA8C diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 21d34eed1a..7d557fdef5 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -1,5 +1,5 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 826FF1E - map_script 3, Route119_WeatherInstitute_2F_MapScript1_26FF24 + map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_2F_MapScript1_26FF24 .byte 0 Route119_WeatherInstitute_2F_MapScript1_26FF24: @ 826FF24 diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 5a29c1bb72..40c9ee09ad 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -1,7 +1,7 @@ Route120_MapScripts:: @ 81F53EC - map_script 5, Route120_MapScript1_1F53FC - map_script 3, Route120_MapScript1_1F54CD - map_script 1, Route120_MapScript1_1F5474 + map_script MAP_SCRIPT_ON_RESUME, Route120_MapScript1_1F53FC + map_script MAP_SCRIPT_ON_TRANSITION, Route120_MapScript1_1F54CD + map_script MAP_SCRIPT_ON_LOAD, Route120_MapScript1_1F5474 .byte 0 Route120_MapScript1_1F53FC: @ 81F53FC diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index f5e2fb088a..e7339f0080 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -1,5 +1,5 @@ Route121_SafariZoneEntrance_MapScripts:: @ 822BBBB - map_script 2, Route121_SafariZoneEntrance_MapScript2_22BBC1 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route121_SafariZoneEntrance_MapScript2_22BBC1 .byte 0 Route121_SafariZoneEntrance_MapScript2_22BBC1: @ 822BBC1 diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index 132a068e36..8e1692114b 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -1,5 +1,5 @@ Route123_MapScripts:: @ 81F6147 - map_script 3, Route123_MapScript1_1F614D + map_script MAP_SCRIPT_ON_TRANSITION, Route123_MapScript1_1F614D .byte 0 Route123_MapScript1_1F614D: @ 81F614D diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc index 3500578efa..6d4afa30a7 100644 --- a/data/maps/Route123_BerryMastersHouse/scripts.inc +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -1,5 +1,5 @@ Route123_BerryMastersHouse_MapScripts:: @ 826F83B - map_script 3, Route123_BerryMastersHouse_MapScript1_26F841 + map_script MAP_SCRIPT_ON_TRANSITION, Route123_BerryMastersHouse_MapScript1_26F841 .byte 0 Route123_BerryMastersHouse_MapScript1_26F841: @ 826F841 diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 9968d3a040..34e3157928 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -1,5 +1,5 @@ Route124_MapScripts:: @ 81F656C - map_script 3, Route124_MapScript1_1F6572 + map_script MAP_SCRIPT_ON_TRANSITION, Route124_MapScript1_1F6572 .byte 0 Route124_MapScript1_1F6572: @ 81F6572 diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc index 934c6757d3..250a5ba513 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc @@ -1,5 +1,5 @@ Route124_DivingTreasureHuntersHouse_MapScripts:: @ 8270A28 - map_script 3, Route124_DivingTreasureHuntersHouse_MapScript1_270A2E + map_script MAP_SCRIPT_ON_TRANSITION, Route124_DivingTreasureHuntersHouse_MapScript1_270A2E .byte 0 Route124_DivingTreasureHuntersHouse_MapScript1_270A2E: @ 8270A2E diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index c979577d85..4812b96919 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -1,7 +1,7 @@ Route125_MapScripts:: @ 81F6748 - map_script 3, Route125_MapScript1_1F6758 - map_script 1, Route125_MapScript1_1F6783 - map_script 2, Route125_MapScript2_1F679A + map_script MAP_SCRIPT_ON_TRANSITION, Route125_MapScript1_1F6758 + map_script MAP_SCRIPT_ON_LOAD, Route125_MapScript1_1F6783 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route125_MapScript2_1F679A .byte 0 Route125_MapScript1_1F6758: @ 81F6758 diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index 29846af227..71bc77b28f 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -1,5 +1,5 @@ Route126_MapScripts:: @ 81F68C6 - map_script 3, Route126_MapScript1_1F68CC + map_script MAP_SCRIPT_ON_TRANSITION, Route126_MapScript1_1F68CC .byte 0 Route126_MapScript1_1F68CC: @ 81F68CC diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 76ade14f3f..7d5eee844c 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -1,7 +1,7 @@ Route127_MapScripts:: @ 81F69D9 - map_script 3, Route127_MapScript1_1F69E9 - map_script 1, Route127_MapScript1_1F6A14 - map_script 2, Route127_MapScript2_1F6A2B + map_script MAP_SCRIPT_ON_TRANSITION, Route127_MapScript1_1F69E9 + map_script MAP_SCRIPT_ON_LOAD, Route127_MapScript1_1F6A14 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route127_MapScript2_1F6A2B .byte 0 Route127_MapScript1_1F69E9: @ 81F69E9 diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 3ec3d2fe7e..b12443756d 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -1,6 +1,6 @@ Route128_MapScripts:: @ 81F6B38 - map_script 3, Route128_MapScript1_1F6B43 - map_script 2, Route128_MapScript2_1F6B4D + map_script MAP_SCRIPT_ON_TRANSITION, Route128_MapScript1_1F6B43 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route128_MapScript2_1F6B4D .byte 0 Route128_MapScript1_1F6B43: @ 81F6B43 diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index c1bd91f0a2..8aec4bc289 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -1,7 +1,7 @@ Route129_MapScripts:: @ 81F7284 - map_script 3, Route129_MapScript1_1F72AB - map_script 1, Route129_MapScript1_1F7294 - map_script 2, Route129_MapScript2_1F72E2 + map_script MAP_SCRIPT_ON_TRANSITION, Route129_MapScript1_1F72AB + map_script MAP_SCRIPT_ON_LOAD, Route129_MapScript1_1F7294 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route129_MapScript2_1F72E2 .byte 0 Route129_MapScript1_1F7294: @ 81F7294 diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 797cc302c6..18dce324d9 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -1,5 +1,5 @@ Route130_MapScripts:: @ 81F735F - map_script 3, Route130_MapScript1_1F7365 + map_script MAP_SCRIPT_ON_TRANSITION, Route130_MapScript1_1F7365 .byte 0 Route130_MapScript1_1F7365: @ 81F7365 diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index 9cbd6eb6d3..7f50b2273a 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -1,5 +1,5 @@ Route131_MapScripts:: @ 81F7404 - map_script 3, Route131_MapScript1_1F740A + map_script MAP_SCRIPT_ON_TRANSITION, Route131_MapScript1_1F740A .byte 0 Route131_MapScript1_1F740A: @ 81F740A diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc index f6f4feee3a..a941e19b50 100644 --- a/data/maps/Route134/scripts.inc +++ b/data/maps/Route134/scripts.inc @@ -1,5 +1,5 @@ Route134_MapScripts:: @ 81F7644 - map_script 5, Route134_MapScript1_1F764A + map_script MAP_SCRIPT_ON_RESUME, Route134_MapScript1_1F764A .byte 0 Route134_MapScript1_1F764A: @ 81F764A diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index f475f02e3b..a3bd8f5970 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -1,6 +1,6 @@ RustboroCity_MapScripts:: @ 81E06BD - map_script 3, RustboroCity_MapScript1_1E06C8 - map_script 2, RustboroCity_MapScript2_1E070B + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_MapScript1_1E06C8 + map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_MapScript2_1E070B .byte 0 RustboroCity_MapScript1_1E06C8: @ 81E06C8 diff --git a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc index a7a84335b9..4f1971c80b 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc @@ -1,5 +1,5 @@ RustboroCity_DevonCorp_1F_MapScripts:: @ 8211245 - map_script 3, RustboroCity_DevonCorp_1F_MapScript1_21124B + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_1F_MapScript1_21124B .byte 0 RustboroCity_DevonCorp_1F_MapScript1_21124B: @ 821124B diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index 1631d923d4..622ea9cf77 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -1,5 +1,5 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 8211857 - map_script 3, RustboroCity_DevonCorp_2F_MapScript1_21185D + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_2F_MapScript1_21185D .byte 0 RustboroCity_DevonCorp_2F_MapScript1_21185D: @ 821185D diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index 7c45570588..d53119e69c 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -1,7 +1,7 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 821242D - map_script 3, RustboroCity_DevonCorp_3F_MapScript1_21243D - map_script 4, RustboroCity_DevonCorp_3F_MapScript2_212455 - map_script 2, RustboroCity_DevonCorp_3F_MapScript2_212464 + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_3F_MapScript1_21243D + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_DevonCorp_3F_MapScript2_212455 + map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_DevonCorp_3F_MapScript2_212464 .byte 0 RustboroCity_DevonCorp_3F_MapScript1_21243D: @ 821243D diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc index f76603dbde..e7bea0f0df 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ RustboroCity_PokemonCenter_1F_MapScripts:: @ 8214D62 - map_script 3, RustboroCity_PokemonCenter_1F_MapScript1_214D6D - map_script 5, RustboroCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_1F_MapScript1_214D6D + map_script MAP_SCRIPT_ON_RESUME, RustboroCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 RustboroCity_PokemonCenter_1F_MapScript1_214D6D: @ 8214D6D diff --git a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc index a1bdeba5bf..fac3cb0590 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ RustboroCity_PokemonCenter_2F_MapScripts:: @ 8214EDE - map_script 2, RustboroCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, RustboroCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, RustboroCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, RustboroCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, RustboroCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 RustboroCity_PokemonCenter_2F_EventScript_214EF3:: @ 8214EF3 diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 325e4186b9..de0d07ec9f 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -1,6 +1,6 @@ RusturfTunnel_MapScripts:: @ 822CE27 - map_script 3, RusturfTunnel_MapScript1_22CE44 - map_script 2, RusturfTunnel_MapScript2_22CE32 + map_script MAP_SCRIPT_ON_TRANSITION, RusturfTunnel_MapScript1_22CE44 + map_script MAP_SCRIPT_ON_FRAME_TABLE, RusturfTunnel_MapScript2_22CE32 .byte 0 RusturfTunnel_MapScript2_22CE32: @ 822CE32 diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 20d0c72d48..ededf1e5f7 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -1,5 +1,5 @@ SSTidalCorridor_MapScripts:: @ 823BFCF - map_script 2, SSTidalCorridor_MapScript2_23BFD5 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SSTidalCorridor_MapScript2_23BFD5 .byte 0 SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5 diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc index ab6f70f865..8ba86b3c83 100644 --- a/data/maps/SafariZone_South/scripts.inc +++ b/data/maps/SafariZone_South/scripts.inc @@ -1,6 +1,6 @@ SafariZone_South_MapScripts:: @ 823D279 - map_script 3, SafariZone_South_MapScript1_23D2B1 - map_script 2, SafariZone_South_MapScript2_23D284 + map_script MAP_SCRIPT_ON_TRANSITION, SafariZone_South_MapScript1_23D2B1 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SafariZone_South_MapScript2_23D284 .byte 0 SafariZone_South_MapScript2_23D284: @ 823D284 diff --git a/data/maps/ScorchedSlab/scripts.inc b/data/maps/ScorchedSlab/scripts.inc index f83724ec57..62a5467807 100644 --- a/data/maps/ScorchedSlab/scripts.inc +++ b/data/maps/ScorchedSlab/scripts.inc @@ -1,5 +1,5 @@ ScorchedSlab_MapScripts:: @ 8239291 - map_script 3, ScorchedSlab_MapScript1_239297 + map_script MAP_SCRIPT_ON_TRANSITION, ScorchedSlab_MapScript1_239297 .byte 0 ScorchedSlab_MapScript1_239297: @ 8239297 diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc index 13b65c7227..045c0e0652 100644 --- a/data/maps/SeafloorCavern_Entrance/scripts.inc +++ b/data/maps/SeafloorCavern_Entrance/scripts.inc @@ -1,5 +1,5 @@ SeafloorCavern_Entrance_MapScripts:: @ 823446E - map_script 5, SeafloorCavern_Entrance_MapScript1_234474 + map_script MAP_SCRIPT_ON_RESUME, SeafloorCavern_Entrance_MapScript1_234474 .byte 0 SeafloorCavern_Entrance_MapScript1_234474: @ 8234474 diff --git a/data/maps/SealedChamber_OuterRoom/scripts.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc index 4b461a684b..71e6426fe2 100644 --- a/data/maps/SealedChamber_OuterRoom/scripts.inc +++ b/data/maps/SealedChamber_OuterRoom/scripts.inc @@ -1,7 +1,7 @@ SealedChamber_OuterRoom_MapScripts:: @ 8239106 - map_script 5, SealedChamber_OuterRoom_MapScript1_239116 - map_script 3, SealedChamber_OuterRoom_MapScript1_239127 - map_script 1, SealedChamber_OuterRoom_MapScript1_23912B + map_script MAP_SCRIPT_ON_RESUME, SealedChamber_OuterRoom_MapScript1_239116 + map_script MAP_SCRIPT_ON_TRANSITION, SealedChamber_OuterRoom_MapScript1_239127 + map_script MAP_SCRIPT_ON_LOAD, SealedChamber_OuterRoom_MapScript1_23912B .byte 0 SealedChamber_OuterRoom_MapScript1_239116: @ 8239116 diff --git a/data/maps/SecretBase_YellowCave4/scripts.inc b/data/maps/SecretBase_YellowCave4/scripts.inc index 32da393883..cb26f924e1 100644 --- a/data/maps/SecretBase_YellowCave4/scripts.inc +++ b/data/maps/SecretBase_YellowCave4/scripts.inc @@ -1,8 +1,8 @@ SecretBase_YellowCave4_MapScripts:: @ 823B483 - map_script 4, SecretBase_RedCave1_MapScript2_23B498 - map_script 3, SecretBase_RedCave1_MapScript1_23B4A2 - map_script 2, SecretBase_RedCave1_MapScript2_23B4AE - map_script 5, SecretBase_RedCave1_MapScript1_23B4B8 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_RedCave1_MapScript2_23B498 + map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_RedCave1_MapScript1_23B4A2 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_RedCave1_MapScript2_23B4AE + map_script MAP_SCRIPT_ON_RESUME, SecretBase_RedCave1_MapScript1_23B4B8 .byte 0 SecretBase_RedCave1_MapScript2_23B498: @ 823B498 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index fa2aca8e0d..218cabc677 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 8236DBA - map_script 3, ShoalCave_LowTideEntranceRoom_MapScript1_236DC0 + map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideEntranceRoom_MapScript1_236DC0 .byte 0 ShoalCave_LowTideEntranceRoom_MapScript1_236DC0: @ 8236DC0 diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc index 7a7c3e337a..f1a29b28a5 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc @@ -1,6 +1,6 @@ ShoalCave_LowTideInnerRoom_MapScripts:: @ 8236EF5 - map_script 1, ShoalCave_LowTideInnerRoom_MapScript1_236F16 - map_script 3, ShoalCave_LowTideInnerRoom_MapScript1_236F00 + map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideInnerRoom_MapScript1_236F16 + map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideInnerRoom_MapScript1_236F00 .byte 0 ShoalCave_LowTideInnerRoom_MapScript1_236F00: @ 8236F00 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc index d493469fab..8492afe5b5 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideLowerRoom_MapScripts:: @ 8237156 - map_script 1, ShoalCave_LowTideLowerRoom_MapScript1_23715C + map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideLowerRoom_MapScript1_23715C .byte 0 ShoalCave_LowTideLowerRoom_MapScript1_23715C: @ 823715C diff --git a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc index 6e3bb63fe4..74b653a5f9 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideStairsRoom_MapScripts:: @ 82370FA - map_script 1, ShoalCave_LowTideStairsRoom_MapScript1_237100 + map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideStairsRoom_MapScript1_237100 .byte 0 ShoalCave_LowTideStairsRoom_MapScript1_237100: @ 8237100 diff --git a/data/maps/SkyPillar_1F/scripts.inc b/data/maps/SkyPillar_1F/scripts.inc index a0b62df258..b1ec3b74a5 100644 --- a/data/maps/SkyPillar_1F/scripts.inc +++ b/data/maps/SkyPillar_1F/scripts.inc @@ -1,5 +1,5 @@ SkyPillar_1F_MapScripts:: @ 8239615 - map_script 3, SkyPillar_1F_MapScript1_23961B + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_1F_MapScript1_23961B .byte 0 SkyPillar_1F_MapScript1_23961B: @ 823961B diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc index a0a4aeaf33..8c1424fd93 100644 --- a/data/maps/SkyPillar_2F/scripts.inc +++ b/data/maps/SkyPillar_2F/scripts.inc @@ -1,7 +1,7 @@ SkyPillar_2F_MapScripts:: @ 823962B - map_script 2, SkyPillar_2F_MapScript2_2A8327 - map_script 3, SkyPillar_2F_MapScript1_23963B - map_script 5, SkyPillar_2F_MapScript1_239650 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_2F_MapScript2_2A8327 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_2F_MapScript1_23963B + map_script MAP_SCRIPT_ON_RESUME, SkyPillar_2F_MapScript1_239650 .byte 0 SkyPillar_2F_MapScript1_23963B: @ 823963B diff --git a/data/maps/SkyPillar_3F/scripts.inc b/data/maps/SkyPillar_3F/scripts.inc index d78ee62665..9bc7eda27d 100644 --- a/data/maps/SkyPillar_3F/scripts.inc +++ b/data/maps/SkyPillar_3F/scripts.inc @@ -1,5 +1,5 @@ SkyPillar_3F_MapScripts:: @ 823965B - map_script 3, SkyPillar_3F_MapScript1_239661 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_3F_MapScript1_239661 .byte 0 SkyPillar_3F_MapScript1_239661: @ 8239661 diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc index 3904e954f4..254d61a59f 100644 --- a/data/maps/SkyPillar_4F/scripts.inc +++ b/data/maps/SkyPillar_4F/scripts.inc @@ -1,7 +1,7 @@ SkyPillar_4F_MapScripts:: @ 8239671 - map_script 2, SkyPillar_4F_MapScript2_2A8327 - map_script 3, SkyPillar_4F_MapScript1_239681 - map_script 5, SkyPillar_4F_MapScript1_239696 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_4F_MapScript2_2A8327 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_4F_MapScript1_239681 + map_script MAP_SCRIPT_ON_RESUME, SkyPillar_4F_MapScript1_239696 .byte 0 SkyPillar_4F_MapScript1_239681: @ 8239681 diff --git a/data/maps/SkyPillar_5F/scripts.inc b/data/maps/SkyPillar_5F/scripts.inc index 20478e77e4..af5a5ffe12 100644 --- a/data/maps/SkyPillar_5F/scripts.inc +++ b/data/maps/SkyPillar_5F/scripts.inc @@ -1,5 +1,5 @@ SkyPillar_5F_MapScripts:: @ 82396A2 - map_script 3, SkyPillar_5F_MapScript1_2396A8 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_5F_MapScript1_2396A8 .byte 0 SkyPillar_5F_MapScript1_2396A8: @ 82396A8 diff --git a/data/maps/SkyPillar_Entrance/scripts.inc b/data/maps/SkyPillar_Entrance/scripts.inc index 09ee9eae24..40d57a4851 100644 --- a/data/maps/SkyPillar_Entrance/scripts.inc +++ b/data/maps/SkyPillar_Entrance/scripts.inc @@ -1,5 +1,5 @@ SkyPillar_Entrance_MapScripts:: @ 823929E - map_script 3, SkyPillar_Entrance_MapScript1_2392A4 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Entrance_MapScript1_2392A4 .byte 0 SkyPillar_Entrance_MapScript1_2392A4: @ 82392A4 diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index a6e7b05cc0..7b826d5765 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -1,7 +1,7 @@ SkyPillar_Outside_MapScripts:: @ 82392A8 - map_script 3, SkyPillar_Outside_MapScript1_2392B8 - map_script 1, SkyPillar_Outside_MapScript1_2392DD - map_script 2, SkyPillar_Outside_MapScript2_2392FA + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Outside_MapScript1_2392B8 + map_script MAP_SCRIPT_ON_LOAD, SkyPillar_Outside_MapScript1_2392DD + map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_Outside_MapScript2_2392FA .byte 0 SkyPillar_Outside_MapScript1_2392B8: @ 82392B8 diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index de4706f847..3d031293db 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -1,7 +1,7 @@ SkyPillar_Top_MapScripts:: @ 82396B8 - map_script 5, SkyPillar_Top_MapScript1_2396C8 - map_script 3, SkyPillar_Top_MapScript1_2396E6 - map_script 4, SkyPillar_Top_MapScript2_239713 + map_script MAP_SCRIPT_ON_RESUME, SkyPillar_Top_MapScript1_2396C8 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Top_MapScript1_2396E6 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SkyPillar_Top_MapScript2_239713 .byte 0 SkyPillar_Top_MapScript1_2396C8: @ 82396C8 diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index efce9cde82..640725f33e 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -1,6 +1,6 @@ SlateportCity_MapScripts:: @ 81DCC61 - map_script 3, SlateportCity_MapScript1_1DCC6C - map_script 2, SlateportCity_MapScript2_1DCD12 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_MapScript1_1DCC6C + map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_MapScript2_1DCD12 .byte 0 SlateportCity_MapScript1_1DCC6C: @ 81DCC6C diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc index 9df0e0a6a5..a5e2a493c4 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc @@ -1,7 +1,7 @@ SlateportCity_BattleTentBattleRoom_MapScripts:: @ 8209960 - map_script 3, SlateportCity_BattleTentBattleRoom_MapScript1_209970 - map_script 4, SlateportCity_BattleTentBattleRoom_MapScript2_20999A - map_script 2, SlateportCity_BattleTentBattleRoom_MapScript2_2099B4 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_BattleTentBattleRoom_MapScript1_209970 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentBattleRoom_MapScript2_20999A + map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentBattleRoom_MapScript2_2099B4 .byte 0 SlateportCity_BattleTentBattleRoom_MapScript1_209970: @ 8209970 diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index 400146b3bb..27f7fa3b99 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -1,6 +1,6 @@ SlateportCity_BattleTentCorridor_MapScripts:: @ 8208E26 - map_script 2, SlateportCity_BattleTentCorridor_MapScript2_208E5B - map_script 4, SlateportCity_BattleTentCorridor_MapScript2_208E31 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentCorridor_MapScript2_208E5B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentCorridor_MapScript2_208E31 .byte 0 SlateportCity_BattleTentCorridor_MapScript2_208E31: @ 8208E31 diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc index bf84162954..19416c91b3 100644 --- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -1,6 +1,6 @@ SlateportCity_BattleTentLobby_MapScripts:: @ 8208730 - map_script 2, SlateportCity_BattleTentLobby_MapScript2_20874F - map_script 4, SlateportCity_BattleTentLobby_MapScript2_20873B + map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentLobby_MapScript2_20874F + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentLobby_MapScript2_20873B .byte 0 SlateportCity_BattleTentLobby_MapScript2_20873B: @ 820873B diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 138ca9859c..d69842ece4 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -1,5 +1,5 @@ SlateportCity_Harbor_MapScripts:: @ 820C97D - map_script 3, SlateportCity_Harbor_MapScript1_20C983 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_Harbor_MapScript1_20C983 .byte 0 SlateportCity_Harbor_MapScript1_20C983: @ 820C983 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc index db8cc19d75..8c1f87e636 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ SlateportCity_PokemonCenter_1F_MapScripts:: @ 820DABF - map_script 3, SlateportCity_PokemonCenter_1F_MapScript1_20DACA - map_script 5, SlateportCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_1F_MapScript1_20DACA + map_script MAP_SCRIPT_ON_RESUME, SlateportCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 SlateportCity_PokemonCenter_1F_MapScript1_20DACA: @ 820DACA diff --git a/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc index 3138f20d65..1ddbcc0bed 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ SlateportCity_PokemonCenter_2F_MapScripts:: @ 820DC21 - map_script 2, SlateportCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, SlateportCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, SlateportCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, SlateportCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, SlateportCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 SlateportCity_PokemonCenter_2F_EventScript_20DC36:: @ 820DC36 diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index bfebcf0559..fb7dae6c9a 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -1,9 +1,9 @@ SootopolisCity_MapScripts:: @ 81E565C - map_script 1, SootopolisCity_MapScript1_1E5676 - map_script 3, SootopolisCity_MapScript1_1E56EF - map_script 5, SootopolisCity_MapScript1_1E590B - map_script 2, SootopolisCity_MapScript2_1E5914 - map_script 4, SootopolisCity_MapScript2_1E58DB + map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_MapScript1_1E5676 + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MapScript1_1E56EF + map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_MapScript1_1E590B + map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MapScript2_1E5914 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SootopolisCity_MapScript2_1E58DB .byte 0 SootopolisCity_MapScript1_1E5676: @ 81E5676 diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index d5bb3d790e..06bc91f218 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -1,8 +1,8 @@ SootopolisCity_Gym_1F_MapScripts:: @ 8224E4C - map_script 2, SootopolisCity_Gym_1F_MapScript2_224ECB - map_script 5, SootopolisCity_Gym_1F_MapScript1_224E67 - map_script 1, SootopolisCity_Gym_1F_MapScript1_224E6A - map_script 3, SootopolisCity_Gym_1F_MapScript1_224E61 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_Gym_1F_MapScript2_224ECB + map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_Gym_1F_MapScript1_224E67 + map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_Gym_1F_MapScript1_224E6A + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_Gym_1F_MapScript1_224E61 .byte 0 SootopolisCity_Gym_1F_MapScript1_224E61: @ 8224E61 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index a44615e9fd..76ec3a59ff 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -1,6 +1,6 @@ SootopolisCity_MysteryEventsHouse_1F_MapScripts:: @ 8227953 - map_script 3, SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E - map_script 2, SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E + map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D .byte 0 SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc index 0de8651d7f..33cb5db8e2 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc @@ -1,6 +1,6 @@ SootopolisCity_MysteryEventsHouse_B1F_MapScripts:: @ 8227E4F - map_script 3, SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A - map_script 2, SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A + map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E .byte 0 SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A: @ 8227E5A diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc index 2e7e804ce4..96f766f7b3 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ SootopolisCity_PokemonCenter_1F_MapScripts:: @ 82264F1 - map_script 3, SootopolisCity_PokemonCenter_1F_MapScript1_2264FC - map_script 5, SootopolisCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_1F_MapScript1_2264FC + map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 SootopolisCity_PokemonCenter_1F_MapScript1_2264FC: @ 82264FC diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc index 43d8a9d2ff..275fe30467 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ SootopolisCity_PokemonCenter_2F_MapScripts:: @ 822676D - map_script 2, SootopolisCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, SootopolisCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, SootopolisCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, SootopolisCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SootopolisCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 SootopolisCity_PokemonCenter_2F_EventScript_226782:: @ 8226782 diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc index 8eb00337f4..618ce864a8 100644 --- a/data/maps/SouthernIsland_Exterior/scripts.inc +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -1,5 +1,5 @@ SouthernIsland_Exterior_MapScripts:: @ 82429C8 - map_script 3, SouthernIsland_Exterior_MapScript1_2429CE + map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Exterior_MapScript1_2429CE .byte 0 SouthernIsland_Exterior_MapScript1_2429CE: @ 82429CE diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index c5cbe0f5e0..a24bc772f2 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -1,6 +1,6 @@ SouthernIsland_Interior_MapScripts:: @ 8242A45 - map_script 5, SouthernIsland_Interior_MapScript1_242A50 - map_script 3, SouthernIsland_Interior_MapScript1_242A6E + map_script MAP_SCRIPT_ON_RESUME, SouthernIsland_Interior_MapScript1_242A50 + map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Interior_MapScript1_242A6E .byte 0 SouthernIsland_Interior_MapScript1_242A50: @ 8242A50 diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index 9e88be494e..3f892315d1 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -1,6 +1,6 @@ TerraCave_End_MapScripts:: @ 823B0B0 - map_script 5, TerraCave_End_MapScript1_23B0BB - map_script 3, TerraCave_End_MapScript1_23B0D9 + map_script MAP_SCRIPT_ON_RESUME, TerraCave_End_MapScript1_23B0BB + map_script MAP_SCRIPT_ON_TRANSITION, TerraCave_End_MapScript1_23B0D9 .byte 0 TerraCave_End_MapScript1_23B0BB: @ 823B0BB diff --git a/data/maps/TerraCave_Entrance/scripts.inc b/data/maps/TerraCave_Entrance/scripts.inc index b9a17701bd..b9e3e59104 100644 --- a/data/maps/TerraCave_Entrance/scripts.inc +++ b/data/maps/TerraCave_Entrance/scripts.inc @@ -1,5 +1,5 @@ TerraCave_Entrance_MapScripts:: @ 823B0A6 - map_script 3, TerraCave_Entrance_MapScript1_23B0AC + map_script MAP_SCRIPT_ON_TRANSITION, TerraCave_Entrance_MapScript1_23B0AC .byte 0 TerraCave_Entrance_MapScript1_23B0AC: @ 823B0AC diff --git a/data/maps/TrainerHill_1F/scripts.inc b/data/maps/TrainerHill_1F/scripts.inc index 465a6d7812..e726f85660 100644 --- a/data/maps/TrainerHill_1F/scripts.inc +++ b/data/maps/TrainerHill_1F/scripts.inc @@ -1,6 +1,6 @@ TrainerHill_1F_MapScripts:: @ 8268F71 - map_script 5, TrainerHill_1F_MapScript1_2C8336 - map_script 4, TrainerHill_1F_MapScript2_2C8372 - map_script 2, TrainerHill_1F_MapScript2_2C8381 + map_script MAP_SCRIPT_ON_RESUME, TrainerHill_1F_MapScript1_2C8336 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TrainerHill_1F_MapScript2_2C8372 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_1F_MapScript2_2C8381 .byte 0 diff --git a/data/maps/TrainerHill_2F/scripts.inc b/data/maps/TrainerHill_2F/scripts.inc index ca8eeff72c..dd1f356de2 100644 --- a/data/maps/TrainerHill_2F/scripts.inc +++ b/data/maps/TrainerHill_2F/scripts.inc @@ -1,6 +1,6 @@ TrainerHill_2F_MapScripts:: @ 8268F81 - map_script 5, TrainerHill_2F_MapScript1_2C8336 - map_script 4, TrainerHill_2F_MapScript2_2C8372 - map_script 2, TrainerHill_2F_MapScript2_2C8381 + map_script MAP_SCRIPT_ON_RESUME, TrainerHill_2F_MapScript1_2C8336 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TrainerHill_2F_MapScript2_2C8372 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_2F_MapScript2_2C8381 .byte 0 diff --git a/data/maps/TrainerHill_3F/scripts.inc b/data/maps/TrainerHill_3F/scripts.inc index 921a8d808f..b4793f457a 100644 --- a/data/maps/TrainerHill_3F/scripts.inc +++ b/data/maps/TrainerHill_3F/scripts.inc @@ -1,5 +1,5 @@ TrainerHill_3F_MapScripts:: @ 8268F91 - map_script 5, TrainerHill_3F_MapScript1_2C8336 - map_script 2, TrainerHill_3F_MapScript2_2C8381 + map_script MAP_SCRIPT_ON_RESUME, TrainerHill_3F_MapScript1_2C8336 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_3F_MapScript2_2C8381 .byte 0 diff --git a/data/maps/TrainerHill_4F/scripts.inc b/data/maps/TrainerHill_4F/scripts.inc index 0f710152c8..66b8ed3bb1 100644 --- a/data/maps/TrainerHill_4F/scripts.inc +++ b/data/maps/TrainerHill_4F/scripts.inc @@ -1,5 +1,5 @@ TrainerHill_4F_MapScripts:: @ 8268F9C - map_script 5, TrainerHill_4F_MapScript1_2C8336 - map_script 2, TrainerHill_4F_MapScript2_2C8381 + map_script MAP_SCRIPT_ON_RESUME, TrainerHill_4F_MapScript1_2C8336 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_4F_MapScript2_2C8381 .byte 0 diff --git a/data/maps/TrainerHill_Elevator/scripts.inc b/data/maps/TrainerHill_Elevator/scripts.inc index c3a71d4929..ecc48a9e9b 100644 --- a/data/maps/TrainerHill_Elevator/scripts.inc +++ b/data/maps/TrainerHill_Elevator/scripts.inc @@ -1,5 +1,5 @@ TrainerHill_Elevator_MapScripts:: @ 826934F - map_script 2, TrainerHill_Elevator_MapScript2_269355 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Elevator_MapScript2_269355 .byte 0 TrainerHill_Elevator_MapScript2_269355: @ 8269355 diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index 57dbbe13d1..5339f49e3a 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -1,9 +1,9 @@ TrainerHill_Entrance_MapScripts:: @ 82680AC - map_script 5, TrainerHill_Entrance_MapScript1_2680D0 - map_script 7, TrainerHill_Entrance_MapScript1_26811B - map_script 3, TrainerHill_Entrance_MapScript1_2680C6 - map_script 1, TrainerHill_Entrance_MapScript1_268128 - map_script 2, TrainerHill_Entrance_MapScript2_26813E + map_script MAP_SCRIPT_ON_RESUME, TrainerHill_Entrance_MapScript1_2680D0 + map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, TrainerHill_Entrance_MapScript1_26811B + map_script MAP_SCRIPT_ON_TRANSITION, TrainerHill_Entrance_MapScript1_2680C6 + map_script MAP_SCRIPT_ON_LOAD, TrainerHill_Entrance_MapScript1_268128 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Entrance_MapScript2_26813E .byte 0 TrainerHill_Entrance_MapScript1_2680C6: @ 82680C6 diff --git a/data/maps/TrainerHill_Roof/scripts.inc b/data/maps/TrainerHill_Roof/scripts.inc index b959481f22..fc1ca200f1 100644 --- a/data/maps/TrainerHill_Roof/scripts.inc +++ b/data/maps/TrainerHill_Roof/scripts.inc @@ -1,6 +1,6 @@ TrainerHill_Roof_MapScripts:: @ 8268FA7 - map_script 5, TrainerHill_Roof_MapScript1_2C8336 - map_script 2, TrainerHill_Roof_MapScript2_2C8381 + map_script MAP_SCRIPT_ON_RESUME, TrainerHill_Roof_MapScript1_2C8336 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Roof_MapScript2_2C8381 .byte 0 TrainerHill_Roof_EventScript_268FB2:: @ 8268FB2 diff --git a/data/maps/Underwater3/scripts.inc b/data/maps/Underwater3/scripts.inc index 463f7a0ff7..99f0efcf02 100644 --- a/data/maps/Underwater3/scripts.inc +++ b/data/maps/Underwater3/scripts.inc @@ -1,5 +1,5 @@ Underwater3_MapScripts:: @ 81F7724 - map_script 5, Underwater3_MapScript1_1F772A + map_script MAP_SCRIPT_ON_RESUME, Underwater3_MapScript1_1F772A .byte 0 Underwater3_MapScript1_1F772A: @ 81F772A diff --git a/data/maps/Underwater5/scripts.inc b/data/maps/Underwater5/scripts.inc index 9d0cc373c3..ea37514eb6 100644 --- a/data/maps/Underwater5/scripts.inc +++ b/data/maps/Underwater5/scripts.inc @@ -1,5 +1,5 @@ Underwater5_MapScripts:: @ 81F7731 - map_script 5, Underwater5_MapScript1_1F7737 + map_script MAP_SCRIPT_ON_RESUME, Underwater5_MapScript1_1F7737 .byte 0 Underwater5_MapScript1_1F7737: @ 81F7737 diff --git a/data/maps/Underwater6/scripts.inc b/data/maps/Underwater6/scripts.inc index 047628c9c0..fee91dc757 100644 --- a/data/maps/Underwater6/scripts.inc +++ b/data/maps/Underwater6/scripts.inc @@ -1,5 +1,5 @@ Underwater6_MapScripts:: @ 81F773D - map_script 5, Underwater6_MapScript1_1F7743 + map_script MAP_SCRIPT_ON_RESUME, Underwater6_MapScript1_1F7743 .byte 0 Underwater6_MapScript1_1F7743: @ 81F7743 diff --git a/data/maps/Underwater7/scripts.inc b/data/maps/Underwater7/scripts.inc index dd757f98a4..a0eba386a0 100644 --- a/data/maps/Underwater7/scripts.inc +++ b/data/maps/Underwater7/scripts.inc @@ -1,5 +1,5 @@ Underwater7_MapScripts:: @ 81F7749 - map_script 5, Underwater7_MapScript1_1F774F + map_script MAP_SCRIPT_ON_RESUME, Underwater7_MapScript1_1F774F .byte 0 Underwater7_MapScript1_1F774F: @ 81F774F diff --git a/data/maps/Underwater_MarineCave/scripts.inc b/data/maps/Underwater_MarineCave/scripts.inc index d6a3aa0db2..9309d51f45 100644 --- a/data/maps/Underwater_MarineCave/scripts.inc +++ b/data/maps/Underwater_MarineCave/scripts.inc @@ -1,6 +1,6 @@ Underwater_MarineCave_MapScripts:: @ 823AFB8 - map_script 5, Underwater_MarineCave_MapScript1_23AFC7 - map_script 3, Underwater_MarineCave_MapScript1_23AFC3 + map_script MAP_SCRIPT_ON_RESUME, Underwater_MarineCave_MapScript1_23AFC7 + map_script MAP_SCRIPT_ON_TRANSITION, Underwater_MarineCave_MapScript1_23AFC3 .byte 0 Underwater_MarineCave_MapScript1_23AFC3: @ 823AFC3 diff --git a/data/maps/Underwater_Route134/scripts.inc b/data/maps/Underwater_Route134/scripts.inc index 786de17572..acffa23a28 100644 --- a/data/maps/Underwater_Route134/scripts.inc +++ b/data/maps/Underwater_Route134/scripts.inc @@ -1,5 +1,5 @@ Underwater_Route134_MapScripts:: @ 82390B5 - map_script 5, Underwater_Route134_MapScript1_2390BB + map_script MAP_SCRIPT_ON_RESUME, Underwater_Route134_MapScript1_2390BB .byte 0 Underwater_Route134_MapScript1_2390BB: @ 82390BB diff --git a/data/maps/Underwater_SeafloorCavern/scripts.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc index efd2e94386..9dc5b406ac 100644 --- a/data/maps/Underwater_SeafloorCavern/scripts.inc +++ b/data/maps/Underwater_SeafloorCavern/scripts.inc @@ -1,7 +1,7 @@ Underwater_SeafloorCavern_MapScripts:: @ 823433B - map_script 5, Underwater_SeafloorCavern_MapScript1_2343D3 - map_script 3, Underwater_SeafloorCavern_MapScript1_23434B - map_script 1, Underwater_SeafloorCavern_MapScript1_23435C + map_script MAP_SCRIPT_ON_RESUME, Underwater_SeafloorCavern_MapScript1_2343D3 + map_script MAP_SCRIPT_ON_TRANSITION, Underwater_SeafloorCavern_MapScript1_23434B + map_script MAP_SCRIPT_ON_LOAD, Underwater_SeafloorCavern_MapScript1_23435C .byte 0 Underwater_SeafloorCavern_MapScript1_23434B: @ 823434B diff --git a/data/maps/Underwater_SealedChamber/scripts.inc b/data/maps/Underwater_SealedChamber/scripts.inc index de6ed50d18..9ec884781a 100644 --- a/data/maps/Underwater_SealedChamber/scripts.inc +++ b/data/maps/Underwater_SealedChamber/scripts.inc @@ -1,5 +1,5 @@ Underwater_SealedChamber_MapScripts:: @ 82390C4 - map_script 6, Underwater_SealedChamber_MapScript1_2390CA + map_script MAP_SCRIPT_ON_DIVE_WARP, Underwater_SealedChamber_MapScript1_2390CA .byte 0 Underwater_SealedChamber_MapScript1_2390CA: @ 82390CA diff --git a/data/maps/Underwater_SootopolisCity/scripts.inc b/data/maps/Underwater_SootopolisCity/scripts.inc index cbeefcb1d6..d5040dba0a 100644 --- a/data/maps/Underwater_SootopolisCity/scripts.inc +++ b/data/maps/Underwater_SootopolisCity/scripts.inc @@ -1,5 +1,5 @@ Underwater_SootopolisCity_MapScripts:: @ 822D94C - map_script 5, Underwater_SootopolisCity_MapScript1_22D952 + map_script MAP_SCRIPT_ON_RESUME, Underwater_SootopolisCity_MapScript1_22D952 .byte 0 Underwater_SootopolisCity_MapScript1_22D952: @ 822D952 diff --git a/data/maps/UnionRoom/scripts.inc b/data/maps/UnionRoom/scripts.inc index f71c40e3d2..0871ae0335 100644 --- a/data/maps/UnionRoom/scripts.inc +++ b/data/maps/UnionRoom/scripts.inc @@ -1,6 +1,6 @@ UnionRoom_MapScripts:: @ 823D1A6 - map_script 5, UnionRoom_MapScript1_23D1B1 - map_script 3, UnionRoom_MapScript1_23D1E5 + map_script MAP_SCRIPT_ON_RESUME, UnionRoom_MapScript1_23D1B1 + map_script MAP_SCRIPT_ON_TRANSITION, UnionRoom_MapScript1_23D1E5 .byte 0 UnionRoom_MapScript1_23D1B1: @ 823D1B1 diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc index 74aa613c78..f940af2f93 100644 --- a/data/maps/VerdanturfTown/scripts.inc +++ b/data/maps/VerdanturfTown/scripts.inc @@ -1,5 +1,5 @@ VerdanturfTown_MapScripts:: @ 81EB566 - map_script 3, VerdanturfTown_MapScript1_1EB56C + map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_MapScript1_1EB56C .byte 0 VerdanturfTown_MapScript1_1EB56C: @ 81EB56C diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index c5f3186637..9d98e790c3 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -1,7 +1,7 @@ VerdanturfTown_BattleTentBattleRoom_MapScripts:: @ 82022FA - map_script 3, VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A - map_script 2, VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E - map_script 4, VerdanturfTown_BattleTentBattleRoom_MapScript2_202541 + map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A + map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_BattleTentBattleRoom_MapScript2_202541 .byte 0 VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A: @ 820230A diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc index e5d7e45e9d..907ef3fd62 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc @@ -1,5 +1,5 @@ VerdanturfTown_BattleTentCorridor_MapScripts:: @ 820208A - map_script 2, VerdanturfTown_BattleTentCorridor_MapScript2_202090 + map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentCorridor_MapScript2_202090 .byte 0 VerdanturfTown_BattleTentCorridor_MapScript2_202090: @ 8202090 diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index e699e6427d..f6bb194a3e 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -1,6 +1,6 @@ VerdanturfTown_BattleTentLobby_MapScripts:: @ 82016D0 - map_script 2, VerdanturfTown_BattleTentLobby_MapScript2_2016EF - map_script 4, VerdanturfTown_BattleTentLobby_MapScript2_2016DB + map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentLobby_MapScript2_2016EF + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_BattleTentLobby_MapScript2_2016DB .byte 0 VerdanturfTown_BattleTentLobby_MapScript2_2016DB: @ 82016DB diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc index da8676aec0..474448132a 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8202726 - map_script 3, VerdanturfTown_PokemonCenter_1F_MapScript1_202731 - map_script 5, VerdanturfTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_1F_MapScript1_202731 + map_script MAP_SCRIPT_ON_RESUME, VerdanturfTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 VerdanturfTown_PokemonCenter_1F_MapScript1_202731: @ 8202731 diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc index 9e93a628ee..b09335fb26 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ VerdanturfTown_PokemonCenter_2F_MapScripts:: @ 8202897 - map_script 2, VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, VerdanturfTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_2F_MapScript1_276ACF .byte 0 VerdanturfTown_PokemonCenter_2F_EventScript_2028AC:: @ 82028AC diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index fdb0947d8e..f5efbe38ad 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -1,5 +1,5 @@ VictoryRoad_1F_MapScripts:: @ 8235D7A - map_script 3, VictoryRoad_1F_MapScript1_235D80 + map_script MAP_SCRIPT_ON_TRANSITION, VictoryRoad_1F_MapScript1_235D80 .byte 0 VictoryRoad_1F_MapScript1_235D80: @ 8235D80 From a5cf2b8090fb6638857b91f4f2a58c5584ca9335 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 25 Feb 2019 02:09:02 -0500 Subject: [PATCH 20/25] Use map script constants in map script functions --- src/script.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/script.c b/src/script.c index dff99609bd..c95a1141fd 100644 --- a/src/script.c +++ b/src/script.c @@ -2,6 +2,7 @@ #include "script.h" #include "event_data.h" #include "util.h" +#include "constants/map_scripts.h" #define RAM_SCRIPT_MAGIC 51 @@ -293,32 +294,32 @@ u8 *MapHeaderCheckScriptTable(u8 tag) void RunOnLoadMapScript(void) { - MapHeaderRunScriptType(1); + MapHeaderRunScriptType(MAP_SCRIPT_ON_LOAD); } void RunOnTransitionMapScript(void) { - MapHeaderRunScriptType(3); + MapHeaderRunScriptType(MAP_SCRIPT_ON_TRANSITION); } void RunOnResumeMapScript(void) { - MapHeaderRunScriptType(5); + MapHeaderRunScriptType(MAP_SCRIPT_ON_RESUME); } void RunOnReturnToFieldMapScript(void) { - MapHeaderRunScriptType(7); + MapHeaderRunScriptType(MAP_SCRIPT_ON_RETURN_TO_FIELD); } void RunOnDiveWarpMapScript(void) { - MapHeaderRunScriptType(6); + MapHeaderRunScriptType(MAP_SCRIPT_ON_DIVE_WARP); } bool8 TryRunOnFrameMapScript(void) { - u8 *ptr = MapHeaderCheckScriptTable(2); + u8 *ptr = MapHeaderCheckScriptTable(MAP_SCRIPT_ON_FRAME_TABLE); if (!ptr) return FALSE; @@ -329,7 +330,7 @@ bool8 TryRunOnFrameMapScript(void) void TryRunOnWarpIntoMapScript(void) { - u8 *ptr = MapHeaderCheckScriptTable(4); + u8 *ptr = MapHeaderCheckScriptTable(MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE); if (ptr) ScriptContext2_RunNewScript(ptr); } From 7ea05431a58d63c2e0594d15e552979d20092cf6 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 25 Feb 2019 14:03:13 -0600 Subject: [PATCH 21/25] Decompile more easy_chat.c --- asm/easy_chat.s | 912 ---------------------------------- include/bard_music.h | 1 + include/constants/easy_chat.h | 2 + include/easy_chat.h | 4 +- include/strings.h | 1 + src/easy_chat.c | 414 ++++++++++++++- src/mail.c | 2 +- 7 files changed, 420 insertions(+), 916 deletions(-) diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 10536929e6..2051e67e15 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -5,918 +5,6 @@ .text - thumb_func_start sub_811E948 -sub_811E948: @ 811E948 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x14 - bl sub_811E8E4 - mov r8, r0 - cmp r0, 0x3 - beq _0811E9FA - ldr r3, =0xffffff00 - ldr r0, [sp, 0xC] - ands r0, r3 - movs r1, 0x3 - orrs r0, r1 - ldr r2, =0xffff00ff - ands r0, r2 - adds r1, 0xFD - orrs r0, r1 - ldr r1, =0xff00ffff - ands r0, r1 - movs r1, 0xB0 - lsls r1, 12 - orrs r0, r1 - ldr r1, =0x00ffffff - ands r0, r1 - movs r1, 0xE0 - lsls r1, 21 - orrs r0, r1 - str r0, [sp, 0xC] - ldr r0, [sp, 0x10] - ands r0, r3 - movs r1, 0x2 - orrs r0, r1 - ands r0, r2 - movs r1, 0xB0 - lsls r1, 4 - orrs r0, r1 - ldr r1, =0x0000ffff - ands r0, r1 - movs r1, 0xD0 - lsls r1, 14 - orrs r0, r1 - str r0, [sp, 0x10] - add r0, sp, 0xC - bl AddWindow - lsls r0, 16 - lsrs r7, r0, 16 - lsls r4, r7, 24 - lsrs r0, r4, 24 - movs r1, 0x11 - bl FillWindowPixelBuffer - movs r6, 0 - mov r0, r8 - lsls r1, r0, 4 - ldr r0, =gUnknown_08597E6C - adds r5, r1, r0 - ldr r1, =gUnknown_08597E60 - mov r10, r1 - mov r9, r4 -_0811E9C6: - ldr r2, [r5] - lsls r4, r7, 24 - cmp r2, 0 - beq _0811E9EC - mov r1, r8 - lsls r0, r1, 2 - adds r0, r6, r0 - add r0, r10 - ldrb r3, [r0] - movs r0, 0x1 - str r0, [sp] - movs r0, 0 - str r0, [sp, 0x4] - str r0, [sp, 0x8] - mov r1, r9 - lsrs r0, r1, 24 - movs r1, 0x1 - bl sub_811D028 -_0811E9EC: - adds r5, 0x4 - adds r6, 0x1 - cmp r6, 0x3 - ble _0811E9C6 - lsrs r0, r4, 24 - bl PutWindowTilemap -_0811E9FA: - add sp, 0x14 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E948 - - thumb_func_start sub_811EA28 -sub_811EA28: @ 811EA28 - push {lr} - lsls r0, 24 - lsrs r0, 24 - adds r1, r0, 0 - cmp r0, 0x14 - beq _0811EA4E - cmp r0, 0x14 - bgt _0811EA48 - cmp r0, 0x11 - blt _0811EA66 - ldr r0, =0x00000864 @ = FLAG_SYS_GAME_CLEAR - bl FlagGet - b _0811EA60 - .pool -_0811EA48: - cmp r1, 0x15 - beq _0811EA5C - b _0811EA66 -_0811EA4E: - ldr r0, =0x00000866 - bl FlagGet - b _0811EA60 - .pool -_0811EA5C: - bl sub_811F0F8 -_0811EA60: - lsls r0, 24 - lsrs r0, 24 - b _0811EA68 -_0811EA66: - movs r0, 0x1 -_0811EA68: - pop {r1} - bx r1 - thumb_func_end sub_811EA28 - - thumb_func_start EasyChat_GetNumWordsInGroup -EasyChat_GetNumWordsInGroup: @ 811EA6C - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - adds r4, r0, 0 - cmp r0, 0 - bne _0811EA84 - movs r0, 0 - bl GetNationalPokedexCount - lsls r0, 16 - lsrs r0, 16 - b _0811EA9A -_0811EA84: - bl sub_811EA28 - lsls r0, 24 - cmp r0, 0 - bne _0811EA92 - movs r0, 0 - b _0811EA9A -_0811EA92: - ldr r0, =gEasyChatGroups - lsls r1, r4, 3 - adds r1, r0 - ldrh r0, [r1, 0x6] -_0811EA9A: - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end EasyChat_GetNumWordsInGroup - - thumb_func_start sub_811EAA4 -sub_811EAA4: @ 811EAA4 - push {r4,r5,lr} - lsls r2, r0, 16 - lsrs r1, r2, 16 - ldr r0, =0x0000ffff - cmp r1, r0 - beq _0811EB04 - lsrs r3, r2, 25 - ldr r5, =0x000001ff - ands r5, r1 - cmp r3, 0x15 - bhi _0811EB08 - ldr r0, =gEasyChatGroups - lsls r2, r3, 3 - adds r1, r2, r0 - ldrh r4, [r1, 0x4] - cmp r3, 0x13 - bgt _0811EADC - cmp r3, 0x12 - bge _0811EAE0 - cmp r3, 0 - beq _0811EAE0 - b _0811EB00 - .pool -_0811EADC: - cmp r3, 0x15 - bne _0811EB00 -_0811EAE0: - adds r0, r2, r0 - ldr r2, [r0] - movs r1, 0 - cmp r1, r4 - bcs _0811EB08 -_0811EAEA: - lsls r0, r1, 1 - adds r0, r2 - ldrh r0, [r0] - cmp r5, r0 - beq _0811EB04 - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, r4 - bcc _0811EAEA - b _0811EB08 -_0811EB00: - cmp r5, r4 - bcs _0811EB08 -_0811EB04: - movs r0, 0 - b _0811EB0A -_0811EB08: - movs r0, 0x1 -_0811EB0A: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_811EAA4 - - thumb_func_start ECWord_CheckIfOutsideOfValidRange -ECWord_CheckIfOutsideOfValidRange: @ 811EB10 - push {lr} - lsls r0, 16 - lsrs r2, r0, 25 - lsls r0, 7 - lsrs r3, r0, 23 - cmp r2, 0x15 - bhi _0811EB5C - cmp r2, 0x13 - bgt _0811EB2C - cmp r2, 0x12 - bge _0811EB3C - cmp r2, 0 - beq _0811EB30 - b _0811EB48 -_0811EB2C: - cmp r2, 0x15 - bne _0811EB48 -_0811EB30: - ldr r0, =gUnknown_085F5490 - ldrh r0, [r0] - b _0811EB50 - .pool -_0811EB3C: - ldr r0, =gUnknown_085FA1D4 - ldrh r0, [r0] - b _0811EB50 - .pool -_0811EB48: - ldr r1, =gEasyChatGroups - lsls r0, r2, 3 - adds r0, r1 - ldrh r0, [r0, 0x4] -_0811EB50: - cmp r0, r3 - bls _0811EB5C - movs r0, 0 - b _0811EB5E - .pool -_0811EB5C: - movs r0, 0x1 -_0811EB5E: - pop {r1} - bx r1 - thumb_func_end ECWord_CheckIfOutsideOfValidRange - - thumb_func_start GetEasyChatWord -@ char *GetEasyChatWord(u8 groupId, u16 wordId) -GetEasyChatWord: @ 811EB64 - push {lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, 16 - lsrs r2, r1, 16 - cmp r0, 0x13 - bgt _0811EB7C - cmp r0, 0x12 - bge _0811EB90 - cmp r0, 0 - beq _0811EB80 - b _0811EBA0 -_0811EB7C: - cmp r0, 0x15 - bne _0811EBA0 -_0811EB80: - movs r0, 0xB - muls r0, r2 - ldr r1, =gSpeciesNames - adds r0, r1 - b _0811EBB2 - .pool -_0811EB90: - movs r0, 0xD - muls r0, r2 - ldr r1, =gMoveNames - adds r0, r1 - b _0811EBB2 - .pool -_0811EBA0: - ldr r1, =gEasyChatGroups - lsls r0, 3 - adds r0, r1 - ldr r1, [r0] - lsls r0, r2, 1 - adds r0, r2 - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] -_0811EBB2: - pop {r1} - bx r1 - .pool - thumb_func_end GetEasyChatWord - - thumb_func_start CopyEasyChatWord -@ char *CopyEasyChatWord(char *dest, u16 groupIdWordIdPair) -CopyEasyChatWord: @ 811EBBC - push {r4-r6,lr} - adds r5, r0, 0 - lsls r6, r1, 16 - lsrs r0, r6, 16 - adds r4, r0, 0 - bl sub_811EAA4 - lsls r0, 24 - cmp r0, 0 - beq _0811EBD8 - ldr r1, =gText_ThreeQuestionMarks - b _0811EBEA - .pool -_0811EBD8: - ldr r0, =0x0000ffff - cmp r4, r0 - beq _0811EBFC - ldr r1, =0x000001ff - ands r1, r4 - lsrs r0, r6, 25 - bl GetEasyChatWord - adds r1, r0, 0 -_0811EBEA: - adds r0, r5, 0 - bl StringCopy - b _0811EC02 - .pool -_0811EBFC: - movs r0, 0xFF - strb r0, [r5] - adds r0, r5, 0 -_0811EC02: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end CopyEasyChatWord - - thumb_func_start ConvertEasyChatWordsToString -ConvertEasyChatWordsToString: @ 811EC08 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x4 - adds r4, r0, 0 - adds r5, r1, 0 - lsls r2, 16 - lsls r3, 16 - lsrs r3, 16 - mov r9, r3 - ldr r0, =0xffff0000 - adds r2, r0 - lsrs r7, r2, 16 - movs r0, 0 - cmp r0, r9 - bcs _0811EC78 -_0811EC2A: - movs r6, 0 - adds r0, 0x1 - mov r8, r0 - cmp r6, r7 - bcs _0811EC5C - ldr r2, =0x0000ffff -_0811EC36: - ldrh r1, [r5] - adds r0, r4, 0 - str r2, [sp] - bl CopyEasyChatWord - adds r4, r0, 0 - ldrh r0, [r5] - ldr r2, [sp] - cmp r0, r2 - beq _0811EC50 - movs r0, 0 - strb r0, [r4] - adds r4, 0x1 -_0811EC50: - adds r5, 0x2 - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, r7 - bcc _0811EC36 -_0811EC5C: - ldrh r1, [r5] - adds r5, 0x2 - adds r0, r4, 0 - bl CopyEasyChatWord - adds r4, r0, 0 - movs r0, 0xFE - strb r0, [r4] - adds r4, 0x1 - mov r1, r8 - lsls r0, r1, 16 - lsrs r0, 16 - cmp r0, r9 - bcc _0811EC2A -_0811EC78: - subs r4, 0x1 - movs r0, 0xFF - strb r0, [r4] - adds r0, r4, 0 - add sp, 0x4 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end ConvertEasyChatWordsToString - - thumb_func_start sub_811EC98 -sub_811EC98: @ 811EC98 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - adds r4, r0, 0 - adds r5, r1, 0 - lsls r2, 16 - lsrs r2, 16 - mov r8, r2 - lsls r3, 16 - lsrs r3, 16 - str r3, [sp] - mov r7, r8 - movs r0, 0 - str r0, [sp, 0x4] - subs r0, r7, 0x1 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - movs r0, 0 - cmp r0, r3 - bcs _0811ED62 -_0811ECC8: - adds r3, r5, 0 - movs r2, 0 - movs r1, 0 - adds r0, 0x1 - mov r10, r0 - cmp r2, r7 - bcs _0811ECEE - ldr r6, =0x0000ffff -_0811ECD8: - lsls r0, r1, 1 - adds r0, r3 - ldrh r0, [r0] - cmp r0, r6 - beq _0811ECE4 - movs r2, 0x1 -_0811ECE4: - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, r7 - bcc _0811ECD8 -_0811ECEE: - cmp r2, 0 - bne _0811ECFC - lsls r0, r7, 1 - adds r5, r0 - b _0811ED56 - .pool -_0811ECFC: - movs r6, 0 - ldr r1, [sp, 0x4] - adds r1, 0x1 - mov r9, r1 - cmp r6, r8 - bcs _0811ED30 - ldr r2, =0x0000ffff -_0811ED0A: - ldrh r1, [r5] - adds r0, r4, 0 - str r2, [sp, 0x8] - bl CopyEasyChatWord - adds r4, r0, 0 - ldrh r0, [r5] - ldr r2, [sp, 0x8] - cmp r0, r2 - beq _0811ED24 - movs r0, 0 - strb r0, [r4] - adds r4, 0x1 -_0811ED24: - adds r5, 0x2 - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, r8 - bcc _0811ED0A -_0811ED30: - ldrh r1, [r5] - adds r5, 0x2 - adds r0, r4, 0 - bl CopyEasyChatWord - adds r4, r0, 0 - ldr r0, [sp, 0x4] - cmp r0, 0 - bne _0811ED4C - movs r0, 0xFE - b _0811ED4E - .pool -_0811ED4C: - movs r0, 0xFA -_0811ED4E: - strb r0, [r4] - adds r4, 0x1 - mov r1, r9 - str r1, [sp, 0x4] -_0811ED56: - mov r1, r10 - lsls r0, r1, 16 - lsrs r0, 16 - ldr r1, [sp] - cmp r0, r1 - bcc _0811ECC8 -_0811ED62: - subs r4, 0x1 - movs r0, 0xFF - strb r0, [r4] - adds r0, r4, 0 - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_811EC98 - - thumb_func_start sub_811ED7C -sub_811ED7C: @ 811ED7C - push {r4,r5,lr} - lsls r5, r0, 16 - lsrs r0, r5, 16 - adds r4, r0, 0 - ldr r0, =0x0000ffff - cmp r4, r0 - bne _0811ED94 - movs r0, 0 - b _0811EDBA - .pool -_0811ED94: - adds r0, r4, 0 - bl sub_811EAA4 - lsls r0, 24 - cmp r0, 0 - bne _0811EDB0 - ldr r1, =0x000001ff - ands r1, r4 - lsrs r0, r5, 25 - bl GetEasyChatWord - b _0811EDB2 - .pool -_0811EDB0: - ldr r0, =gText_ThreeQuestionMarks -_0811EDB2: - bl StringLength - lsls r0, 16 - lsrs r0, 16 -_0811EDBA: - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_811ED7C - - thumb_func_start sub_811EDC4 -sub_811EDC4: @ 811EDC4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - adds r6, r0, 0 - lsls r1, 24 - lsrs r1, 24 - lsls r2, 24 - lsrs r2, 24 - mov r8, r2 - lsls r3, 16 - lsrs r3, 16 - mov r10, r3 - movs r7, 0 - cmp r7, r8 - bcs _0811EE26 - subs r0, r1, 0x1 - lsls r0, 16 - mov r9, r0 -_0811EDEE: - mov r0, r9 - lsrs r4, r0, 16 - movs r5, 0 - cmp r5, r1 - bcs _0811EE14 -_0811EDF8: - ldrh r0, [r6] - adds r6, 0x2 - str r1, [sp] - bl sub_811ED7C - adds r0, r4, r0 - lsls r0, 16 - lsrs r4, r0, 16 - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, [sp] - cmp r5, r1 - bcc _0811EDF8 -_0811EE14: - cmp r4, r10 - bls _0811EE1C - movs r0, 0x1 - b _0811EE28 -_0811EE1C: - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, r8 - bcc _0811EDEE -_0811EE26: - movs r0, 0 -_0811EE28: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_811EDC4 - - thumb_func_start sub_811EE38 -sub_811EE38: @ 811EE38 - push {r4,lr} - lsls r0, 16 - lsrs r4, r0, 16 - bl Random - ldr r2, =gEasyChatGroups - lsls r1, r4, 3 - adds r1, r2 - lsls r0, 16 - lsrs r0, 16 - ldrh r1, [r1, 0x4] - bl __umodsi3 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r4, 0 - beq _0811EE66 - cmp r4, 0x15 - beq _0811EE66 - cmp r4, 0x12 - beq _0811EE66 - cmp r4, 0x13 - bne _0811EE74 -_0811EE66: - ldr r1, =gEasyChatGroups - lsls r0, r4, 3 - adds r0, r1 - ldr r1, [r0] - lsls r0, r2, 1 - adds r0, r1 - ldrh r2, [r0] -_0811EE74: - movs r0, 0x7F - ands r0, r4 - lsls r0, 9 - ldr r1, =0x000001ff - ands r2, r1 - orrs r0, r2 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_811EE38 - - thumb_func_start sub_811EE90 -sub_811EE90: @ 811EE90 - push {r4,lr} - lsls r0, 16 - lsrs r0, 16 - adds r4, r0, 0 - lsls r0, r4, 24 - lsrs r0, 24 - bl sub_811EA28 - lsls r0, 24 - cmp r0, 0 - bne _0811EEB0 - ldr r0, =0x0000ffff - b _0811EEC4 - .pool -_0811EEB0: - cmp r4, 0 - beq _0811EEBC - adds r0, r4, 0 - bl sub_811EE38 - b _0811EEC0 -_0811EEBC: - bl sub_811F108 -_0811EEC0: - lsls r0, 16 - lsrs r0, 16 -_0811EEC4: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811EE90 - - thumb_func_start sub_811EECC -sub_811EECC: @ 811EECC - push {r4,r5,lr} - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - cmp r0, 0x1 - beq _0811EF04 - cmp r0, 0x1 - bgt _0811EEE4 - cmp r0, 0 - beq _0811EEEE - b _0811EF58 - .pool -_0811EEE4: - cmp r0, 0x2 - beq _0811EF2C - cmp r0, 0x3 - beq _0811EF3C - b _0811EF58 -_0811EEEE: - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00002bb0 - adds r5, r0, r1 - movs r2, 0x2 - b _0811EF46 - .pool -_0811EF04: - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00002bbc - adds r5, r0, r1 - adds r0, r5, 0 - movs r1, 0x3 - movs r2, 0x2 - movs r3, 0x12 - bl sub_811EDC4 - lsls r0, 24 - cmp r0, 0 - beq _0811EF44 - movs r2, 0x2 - movs r3, 0x3 - b _0811EF48 - .pool -_0811EF2C: - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00002bc8 - b _0811EF42 - .pool -_0811EF3C: - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00002bd4 -_0811EF42: - adds r5, r0, r1 -_0811EF44: - movs r2, 0x3 -_0811EF46: - movs r3, 0x2 -_0811EF48: - ldr r4, =gStringVar4 - adds r0, r4, 0 - adds r1, r5, 0 - bl ConvertEasyChatWordsToString - adds r0, r4, 0 - bl ShowFieldAutoScrollMessage -_0811EF58: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811EECC - - thumb_func_start sub_811EF6C -sub_811EF6C: @ 811EF6C - push {lr} - bl Random - movs r1, 0x1 - ands r1, r0 - movs r0, 0xC - cmp r1, 0 - beq _0811EF7E - movs r0, 0xD -_0811EF7E: - bl sub_811EE90 - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - ldr r0, =gStringVar2 - bl CopyEasyChatWord - pop {r0} - bx r0 - .pool - thumb_func_end sub_811EF6C - - thumb_func_start sub_811EF98 -sub_811EF98: @ 811EF98 - lsls r0, 24 - lsrs r2, r0, 27 - movs r1, 0xE0 - lsls r1, 19 - ands r1, r0 - lsrs r1, 24 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r3, =0x00002e20 - adds r0, r3 - adds r0, r2 - ldrb r0, [r0] - asrs r0, r1 - movs r1, 0x1 - ands r0, r1 - bx lr - .pool - thumb_func_end sub_811EF98 - - thumb_func_start sub_811EFC0 -sub_811EFC0: @ 811EFC0 - push {lr} - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x20 - bhi _0811EFE4 - lsrs r3, r0, 27 - movs r2, 0x7 - ands r2, r1 - ldr r0, =gSaveBlock1Ptr - ldr r1, [r0] - ldr r0, =0x00002e20 - adds r1, r0 - adds r1, r3 - movs r0, 0x1 - lsls r0, r2 - ldrb r2, [r1] - orrs r0, r2 - strb r0, [r1] -_0811EFE4: - pop {r0} - bx r0 - .pool - thumb_func_end sub_811EFC0 - - thumb_func_start sub_811EFF0 -sub_811EFF0: @ 811EFF0 - push {r4,r5,lr} - movs r4, 0 - movs r5, 0 -_0811EFF6: - adds r0, r4, 0 - bl sub_811EF98 - lsls r0, 24 - cmp r0, 0 - beq _0811F008 - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 -_0811F008: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x20 - bls _0811EFF6 - adds r0, r5, 0 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_811EFF0 - thumb_func_start sub_811F01C sub_811F01C: @ 811F01C push {r4-r6,lr} diff --git a/include/bard_music.h b/include/bard_music.h index 9d3d0ad229..4882054057 100644 --- a/include/bard_music.h +++ b/include/bard_music.h @@ -39,6 +39,7 @@ struct BardSong // Exported ROM declarations extern const u16 gUnknown_085F5490; +extern const u16 gUnknown_085FA1D4; const struct BardSound *GetWordSounds(u16 word); void GetWordPhonemes(struct BardSong *song, u16 word); diff --git a/include/constants/easy_chat.h b/include/constants/easy_chat.h index 2c437c88e7..1c8866bc36 100644 --- a/include/constants/easy_chat.h +++ b/include/constants/easy_chat.h @@ -23,6 +23,7 @@ #define EC_GROUP_MOVE_2 0x13 #define EC_GROUP_TRENDY_SAYING 0x14 #define EC_GROUP_POKEMON_2 0x15 +#define EC_NUM_GROUPS 0x16 // TRAINER #define EC_WORD_I_CHOOSE_YOU (EC_GROUP_TRAINER << 9) | 0x0 @@ -1075,5 +1076,6 @@ #define EC_GROUP(word) ((word) >> 9) #define EC_INDEX(word) ((word) & 0x1FF) +#define EC_WORD(group, index) ((((group) & 0x7F) << 9) | ((index) & 0x1FF)) #endif // GUARD_CONSTANTS_EASY_CHAT_H diff --git a/include/easy_chat.h b/include/easy_chat.h index 23fd9ed839..c55fca81bf 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -8,11 +8,11 @@ void easy_chat_input_maybe(void); u8 * CopyEasyChatWord(u8 *dest, u16 word); bool32 sub_811F8D8(u16 word); void InitializeEasyChatWordArray(u16 *words, u16 length); -void ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 length1, u16 length2); +u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 columns, u16 rows); bool8 ECWord_CheckIfOutsideOfValidRange(u16 word); u16 sub_811EE38(u16 group); u16 sub_811F01C(void); -bool16 EasyChat_GetNumWordsInGroup(u8); +u16 EasyChat_GetNumWordsInGroup(u8); u16 sub_811EE90(u16); void sub_811A20C(u8 kind, u16 *words, MainCallback callback, u8 sizeParam); diff --git a/include/strings.h b/include/strings.h index a3e7439430..591c5ce338 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2430,5 +2430,6 @@ extern const u8 gText_CombineTwoWordsOrPhrases3[]; extern const u8 gText_OnlyOnePhrase[]; extern const u8 gText_YouCannotQuitHere[]; extern const u8 gText_SectionMustBeCompleted[]; +extern const u8 gText_ThreeQuestionMarks[]; #endif // GUARD_STRINGS_H diff --git a/src/easy_chat.c b/src/easy_chat.c index 1b1bd105b5..51b25c42a8 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -2,13 +2,16 @@ // Includes #include "global.h" #include "alloc.h" +#include "bard_music.h" #include "bg.h" +#include "data2.h" #include "decompress.h" #include "dewford_trend.h" #include "dynamic_placeholder_text_util.h" #include "easy_chat.h" #include "event_data.h" #include "event_object_movement.h" +#include "field_message_box.h" #include "field_weather.h" #include "gpu_regs.h" #include "graphics.h" @@ -18,12 +21,15 @@ #include "menu.h" #include "overworld.h" #include "palette.h" +#include "pokedex.h" +#include "random.h" #include "sound.h" #include "string_util.h" #include "strings.h" #include "task.h" #include "text_window.h" #include "window.h" +#include "constants/easy_chat.h" #include "constants/event_objects.h" #include "constants/flags.h" #include "constants/songs.h" @@ -115,6 +121,26 @@ struct Unk08597C30 u8 unk3; }; +struct EasyChatWordInfo +{ + const u8 *text; + int alphabeticalOrder; + int enabled; +}; + +typedef union +{ + const u16 *valueList; + const struct EasyChatWordInfo *words; +} EasyChatGroupWordData; + +struct EasyChatGroup +{ + EasyChatGroupWordData wordData; + u16 numWords; + u16 numEnabledWords; +}; + EWRAM_DATA struct EasyChatScreen *gEasyChatScreen = NULL; EWRAM_DATA struct Unk203A11C *gUnknown_0203A11C = 0; EWRAM_DATA void *gUnknown_0203A120 = 0; @@ -203,7 +229,7 @@ static void sub_811CF04(void); static void sub_811D60C(void); static void sub_811D424(u16 *); static void sub_811D230(void); -void sub_811E948(void); +static void sub_811E948(void); static void sub_811CFCC(void); static void sub_811D0BC(void); static void sub_811D2C8(void); @@ -293,6 +319,8 @@ static void sub_811E0EC(s8, s8); static void sub_811E1A4(s8, s8); static void sub_811E2DC(struct Sprite *); static void sub_811E34C(u8, u8); +bool8 sub_811F0F8(void); +u16 sub_811F108(void); u8 *CopyEasyChatWordPadded(u8 *, u16, u16); extern const struct { @@ -326,6 +354,8 @@ extern const struct SpriteTemplate gUnknown_08597E48; extern const struct SpriteTemplate gUnknown_08597E30; extern const u8 gUnknown_08597D08[]; extern const u8 gUnknown_08597E60[][4]; +extern const u8 *const gUnknown_08597E6C[][4]; +extern const struct EasyChatGroup gEasyChatGroups[]; void sub_811A20C(u8 kind, u16 *words, MainCallback callback, u8 sizeParam) { @@ -4373,3 +4403,385 @@ static int sub_811E920(int arg0) else return 0; } + +static void sub_811E948(void) +{ + int i; + u16 windowId; + struct WindowTemplate template; + int var0 = sub_811E8E4(); + if (var0 == 3) + return; + + template.bg = 3; + template.tilemapLeft = 1; + template.tilemapTop = 11; + template.width = 28; + template.height = 2; + template.paletteNum = 11; + template.baseBlock = 0x34; + windowId = AddWindow(&template); + FillWindowPixelBuffer(windowId, 0x11); + for (i = 0; i < 4; i++) + { + const u8 *str = gUnknown_08597E6C[var0][i]; + if (str) + { + int x = gUnknown_08597E60[var0][i]; + sub_811D028(windowId, 1, str, x, 1, 0, NULL); + } + } + + PutWindowTilemap(windowId); +} + +bool8 sub_811EA28(u8 groupId) +{ + switch (groupId) + { + case EC_GROUP_TRENDY_SAYING: + return FlagGet(FLAG_SYS_HIPSTER_MEET); + case EC_GROUP_EVENTS: + case EC_GROUP_MOVE_1: + case EC_GROUP_MOVE_2: + return FlagGet(FLAG_SYS_GAME_CLEAR); + case EC_GROUP_POKEMON_2: + return sub_811F0F8(); + default: + return TRUE; + } +} + +u16 EasyChat_GetNumWordsInGroup(u8 groupId) +{ + if (groupId == EC_GROUP_POKEMON) + return GetNationalPokedexCount(FLAG_GET_SEEN); + + if (sub_811EA28(groupId)) + return gEasyChatGroups[groupId].numEnabledWords; + + return 0; +} + +bool8 sub_811EAA4(u16 easyChatWord) +{ + u16 i; + u8 groupId; + u32 index; + u16 numWords; + const u16 *list; + if (easyChatWord == 0xFFFF) + return FALSE; + + groupId = EC_GROUP(easyChatWord); + index = EC_INDEX(easyChatWord); + if (groupId >= EC_NUM_GROUPS) + return TRUE; + + numWords = gEasyChatGroups[groupId].numWords; + switch (groupId) + { + case EC_GROUP_POKEMON: + case EC_GROUP_POKEMON_2: + case EC_GROUP_MOVE_1: + case EC_GROUP_MOVE_2: + list = gEasyChatGroups[groupId].wordData.valueList; + for (i = 0; i < numWords; i++) + { + if (index == list[i]) + return FALSE; + } + return TRUE; + default: + if (index >= numWords) + return TRUE; + else + return FALSE; + } +} + +bool8 ECWord_CheckIfOutsideOfValidRange(u16 easyChatWord) +{ + int numWordsInGroup; + u8 groupId = EC_GROUP(easyChatWord); + u32 index = EC_INDEX(easyChatWord); + if (groupId >= EC_NUM_GROUPS) + return TRUE; + + switch (groupId) + { + case EC_GROUP_POKEMON: + case EC_GROUP_POKEMON_2: + numWordsInGroup = gUnknown_085F5490; + break; + case EC_GROUP_MOVE_1: + case EC_GROUP_MOVE_2: + numWordsInGroup = gUnknown_085FA1D4; + break; + default: + numWordsInGroup = gEasyChatGroups[groupId].numWords; + break; + } + + if (numWordsInGroup <= index) + return TRUE; + else + return FALSE; +} + +const u8 *GetEasyChatWord(u8 groupId, u16 index) +{ + switch (groupId) + { + case EC_GROUP_POKEMON: + case EC_GROUP_POKEMON_2: + return gSpeciesNames[index]; + case EC_GROUP_MOVE_1: + case EC_GROUP_MOVE_2: + return gMoveNames[index]; + default: + return gEasyChatGroups[groupId].wordData.words[index].text; + } +} + +u8 *CopyEasyChatWord(u8 *dest, u16 easyChatWord) +{ + u8 *resultStr; + if (sub_811EAA4(easyChatWord)) + { + resultStr = StringCopy(dest, gText_ThreeQuestionMarks); + } + else if (easyChatWord != 0xFFFF) + { + u16 index = EC_INDEX(easyChatWord); + u8 groupId = EC_GROUP(easyChatWord); + resultStr = StringCopy(dest, GetEasyChatWord(groupId, index)); + } + else + { + *dest = EOS; + resultStr = dest; + } + + return resultStr; +} + +u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 columns, u16 rows) +{ + u16 i, j; + u16 numColumns = columns - 1; + + for (i = 0; i < rows; i++) + { + for (j = 0; j < numColumns; j++) + { + dest = CopyEasyChatWord(dest, *src); + if (*src != 0xFFFF) + { + *dest = CHAR_SPACE; + dest++; + } + + src++; + } + + dest = CopyEasyChatWord(dest, *(src++)); + *dest = CHAR_NEWLINE; + dest++; + } + + dest--; + *dest = EOS; + return dest; +} + +u8 *unref_sub_811EC98(u8 *dest, const u16 *src, u16 columns, u16 rows) +{ + u16 i, j, k; + u16 numColumns; + int var0, var1; + + numColumns = columns; + var1 = 0; + columns--; + for (i = 0; i < rows; i++) + { + const u16 *var2 = src; + var0 = 0; + for (j = 0; j < numColumns; j++) + { + if (var2[j] != 0xFFFF) + var0 = 1; + } + + if (!var0) + { + src += numColumns; + continue; + } + + for (k = 0; k < columns; k++) + { + dest = CopyEasyChatWord(dest, *src); + if (*src != 0xFFFF) + { + *dest = CHAR_SPACE; + dest++; + } + + src++; + } + + dest = CopyEasyChatWord(dest, *(src++)); + if (var1 == 0) + *dest = CHAR_NEWLINE; + else + *dest = CHAR_PROMPT_SCROLL; + + dest++; + var1++; + } + + dest--; + *dest = EOS; + return dest; +} + +static u16 GetEasyChatWordStringLength(u16 easyChatWord) +{ + if (easyChatWord == 0xFFFF) + return 0; + + if (sub_811EAA4(easyChatWord)) + { + return StringLength(gText_ThreeQuestionMarks); + } + else + { + u16 index = EC_INDEX(easyChatWord); + u8 groupId = EC_GROUP(easyChatWord); + return StringLength(GetEasyChatWord(groupId, index)); + } +} + +bool8 sub_811EDC4(const u16 *easyChatWords, u8 arg1, u8 arg2, u16 arg3) +{ + u8 i, j; + + for (i = 0; i < arg2; i++) + { + u16 totalLength = arg1 - 1; + for (j = 0; j < arg1; j++) + totalLength += GetEasyChatWordStringLength(*(easyChatWords++)); + + if (totalLength > arg3) + return TRUE; + } + + return FALSE; +} + +u16 sub_811EE38(u16 groupId) +{ + u16 index = Random() % gEasyChatGroups[groupId].numWords; + if (groupId == EC_GROUP_POKEMON + || groupId == EC_GROUP_POKEMON_2 + || groupId == EC_GROUP_MOVE_1 + || groupId == EC_GROUP_MOVE_2) + { + index = gEasyChatGroups[groupId].wordData.valueList[index]; + } + + return EC_WORD(groupId, index); +} + +u16 sub_811EE90(u16 groupId) +{ + if (!sub_811EA28(groupId)) + return 0xFFFF; + + if (groupId == EC_GROUP_POKEMON) + return sub_811F108(); + + return sub_811EE38(groupId); +} + +void sub_811EECC(void) +{ + u16 *easyChatWords; + int columns, rows; + switch (gSpecialVar_0x8004) + { + case 0: + easyChatWords = gSaveBlock1Ptr->unk2BB0; + columns = 2; + rows = 2; + break; + case 1: + easyChatWords = gSaveBlock1Ptr->unk2BBC; + if (sub_811EDC4(gSaveBlock1Ptr->unk2BBC, 3, 2, 18)) + { + columns = 2; + rows = 3; + } + else + { + columns = 3; + rows = 2; + } + break; + case 2: + easyChatWords = gSaveBlock1Ptr->unk2BC8; + columns = 3; + rows = 2; + break; + case 3: + easyChatWords = gSaveBlock1Ptr->unk2BD4; + columns = 3; + rows = 2; + break; + default: + return; + } + + ConvertEasyChatWordsToString(gStringVar4, easyChatWords, columns, rows); + ShowFieldAutoScrollMessage(gStringVar4); +} + +void sub_811EF6C(void) +{ + int groupId = Random() & 1 ? EC_GROUP_HOBBIES : EC_GROUP_LIFESTYLE; + u16 easyChatWord = sub_811EE90(groupId); + CopyEasyChatWord(gStringVar2, easyChatWord); +} + +u8 sub_811EF98(u8 additionalPhraseId) +{ + int byteOffset = additionalPhraseId / 8; + int shift = additionalPhraseId & 0x7; + return (gSaveBlock1Ptr->additionalPhrases[byteOffset] >> shift) & 1; +} + +void sub_811EFC0(u8 additionalPhraseId) +{ + if (additionalPhraseId < 33) + { + int byteOffset = additionalPhraseId / 8; + int shift = additionalPhraseId & 0x7; + gSaveBlock1Ptr->additionalPhrases[byteOffset] |= 1 << shift; + } +} + +u8 sub_811EFF0(void) +{ + u8 i; + u8 numAdditionalPhrasesUnlocked; + + for (i = 0, numAdditionalPhrasesUnlocked = 0; i < 33; i++) + { + if (sub_811EF98(i)) + numAdditionalPhrasesUnlocked++; + } + + return numAdditionalPhrasesUnlocked; +} diff --git a/src/mail.c b/src/mail.c index 45e96e85e5..aa4ba571f1 100644 --- a/src/mail.c +++ b/src/mail.c @@ -102,7 +102,7 @@ struct MailRead /*0x021d*/ u8 language; /*0x021e*/ bool8 playerIsSender; /*0x0220*/ u8 * (*parserSingle)(u8 *dest, u16 word); - /*0x0224*/ void (*parserMultiple)(u8 *dest, const u16 *src, u16 length1, u16 length2); + /*0x0224*/ u8 * (*parserMultiple)(u8 *dest, const u16 *src, u16 length1, u16 length2); /*0x0228*/ const struct MailLayout *layout; /*0x022c*/ u8 bg1TilemapBuffer[0x1000]; /*0x122c*/ u8 bg2TilemapBuffer[0x1000]; From 7742e28dad96fd908d87a3412d0127be10f65ed0 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 25 Feb 2019 22:20:00 +0100 Subject: [PATCH 22/25] Easy chat nonmatchings fix do {} while(0); --- src/easy_chat.c | 552 +++++++++--------------------------------------- 1 file changed, 97 insertions(+), 455 deletions(-) diff --git a/src/easy_chat.c b/src/easy_chat.c index 51b25c42a8..3fdc888234 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -790,47 +790,51 @@ bool32 sub_811AB44(void) return FALSE; } -#ifdef NONMATCHING static u16 sub_811AB68(void) { - if (gMain.newKeys & A_BUTTON) - { - sub_811BF78(); - gEasyChatScreen->state = 2; - gEasyChatScreen->unk_0a = 0; - gEasyChatScreen->unk_0b = 0; - gEasyChatScreen->unk_0c = 0; - return 9; - } - else if (gMain.newKeys & B_BUTTON) - { - return sub_811B150(); - } - else if (gMain.newKeys & START_BUTTON) - { - return sub_811B1B4(); - } - else if (gMain.newKeys & DPAD_UP) - { - gEasyChatScreen->mainCursorRow--; - } - else if (gMain.newKeys & DPAD_LEFT) - { - gEasyChatScreen->mainCursorColumn--; - } - else if (gMain.newKeys & DPAD_DOWN) - { - gEasyChatScreen->mainCursorRow++; - } - else if (gMain.newKeys & DPAD_RIGHT) - { - gEasyChatScreen->mainCursorColumn++; - } - else + do { + if (gMain.newKeys & A_BUTTON) + { + sub_811BF78(); + gEasyChatScreen->state = 2; + gEasyChatScreen->unk_0a = 0; + gEasyChatScreen->unk_0b = 0; + gEasyChatScreen->unk_0c = 0; + return 9; + } + else if (gMain.newKeys & B_BUTTON) + { + return sub_811B150(); + } + else if (gMain.newKeys & START_BUTTON) + { + return sub_811B1B4(); + } + else if (gMain.newKeys & DPAD_UP) + { + gEasyChatScreen->mainCursorRow--; + break; + } + else if (gMain.newKeys & DPAD_LEFT) + { + gEasyChatScreen->mainCursorColumn--; + break; + } + else if (gMain.newKeys & DPAD_DOWN) + { + gEasyChatScreen->mainCursorRow++; + break; + } + else if (gMain.newKeys & DPAD_RIGHT) + { + gEasyChatScreen->mainCursorColumn++; + break; + } + return 0; - } - + } while (0); + if (gEasyChatScreen->mainCursorRow < 0) gEasyChatScreen->mainCursorRow = gEasyChatScreenTemplates[gEasyChatScreen->templateId].numRows; @@ -857,238 +861,61 @@ static u16 sub_811AB68(void) return 2; } -#else -NAKED -static u16 sub_811AB68(void) -{ - asm_unified("\n\ - push {r4-r7,lr}\n\ - ldr r0, =gMain\n\ - ldrh r1, [r0, 0x2E]\n\ - movs r0, 0x1\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _0811ABB8\n\ - bl sub_811BF78\n\ - ldr r1, =gEasyChatScreen\n\ - ldr r3, [r1]\n\ - movs r2, 0\n\ - movs r0, 0x2\n\ - strb r0, [r3, 0x4]\n\ - ldr r0, [r1]\n\ - strb r2, [r0, 0xA]\n\ - ldr r0, [r1]\n\ - strb r2, [r0, 0xB]\n\ - ldr r0, [r1]\n\ - strb r2, [r0, 0xC]\n\ - movs r0, 0x9\n\ - b RETURN\n\ - .pool\n\ -_0811AB9C:\n\ - movs r0, 0x20\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _0811AC68_dpad_left\n\ - movs r0, 0x80\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _0811AC58_dpad_down\n\ - movs r0, 0x10\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _0811AC48_dpad_right\n\ - movs r0, 0\n\ - b RETURN\n\ -_0811ABB8:\n\ - movs r0, 0x2\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _0811AC78_b_button\n\ - movs r0, 0x8\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _0811AC7E_start_button\n\ - movs r0, 0x40\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _0811AB9C\n\ - ldr r2, =gEasyChatScreen\n\ - ldr r1, [r2]\n\ - ldrb r0, [r1, 0x6]\n\ - subs r0, 0x1\n\ -_0811ABD8:\n\ - strb r0, [r1, 0x6]\n\ -_0811ABDA:\n\ - adds r7, r2, 0\n\ - adds r4, r7, 0\n\ - ldr r2, [r4]\n\ - movs r0, 0x6\n\ - ldrsb r0, [r2, r0]\n\ - ldr r6, =gEasyChatScreenTemplates\n\ - cmp r0, 0\n\ - bge _0811ABF8\n\ - ldrb r0, [r2, 0x1]\n\ - lsls r1, r0, 1\n\ - adds r1, r0\n\ - lsls r1, 3\n\ - adds r1, r6\n\ - ldrb r0, [r1, 0x2]\n\ - strb r0, [r2, 0x6]\n\ -_0811ABF8:\n\ - ldr r3, [r4]\n\ - movs r2, 0x6\n\ - ldrsb r2, [r3, r2]\n\ - adds r5, r6, 0\n\ - ldrb r1, [r3, 0x1]\n\ - lsls r0, r1, 1\n\ - adds r0, r1\n\ - lsls r0, 3\n\ - adds r0, r5\n\ - ldrb r0, [r0, 0x2]\n\ - cmp r2, r0\n\ - ble _0811AC14\n\ - movs r0, 0\n\ - strb r0, [r3, 0x6]\n\ -_0811AC14:\n\ - ldr r3, [r4]\n\ - movs r2, 0x6\n\ - ldrsb r2, [r3, r2]\n\ - ldrb r1, [r3, 0x1]\n\ - lsls r0, r1, 1\n\ - adds r0, r1\n\ - lsls r0, 3\n\ - adds r1, r0, r5\n\ - ldrb r0, [r1, 0x2]\n\ - cmp r2, r0\n\ - bne _0811AC88\n\ - movs r0, 0x5\n\ - ldrsb r0, [r3, r0]\n\ - cmp r0, 0x2\n\ - ble _0811AC36\n\ - movs r0, 0x2\n\ - strb r0, [r3, 0x5]\n\ -_0811AC36:\n\ - ldr r1, [r4]\n\ - movs r0, 0x1\n\ - strb r0, [r1, 0x4]\n\ - movs r0, 0x3\n\ - b RETURN\n\ - .pool\n\ -_0811AC48_dpad_right:\n\ - ldr r2, =gEasyChatScreen\n\ - ldr r1, [r2]\n\ - ldrb r0, [r1, 0x5]\n\ - adds r0, 0x1\n\ - strb r0, [r1, 0x5]\n\ - b _0811ABDA\n\ - .pool\n\ -_0811AC58_dpad_down:\n\ - ldr r2, =gEasyChatScreen\n\ - ldr r1, [r2]\n\ - ldrb r0, [r1, 0x6]\n\ - adds r0, 0x1\n\ - b _0811ABD8\n\ - .pool\n\ -_0811AC68_dpad_left:\n\ - ldr r2, =gEasyChatScreen\n\ - ldr r1, [r2]\n\ - ldrb r0, [r1, 0x5]\n\ - subs r0, 0x1\n\ - strb r0, [r1, 0x5]\n\ - b _0811ABDA\n\ - .pool\n\ -_0811AC78_b_button:\n\ - bl sub_811B150\n\ - b _0811AC82\n\ -_0811AC7E_start_button:\n\ - bl sub_811B1B4\n\ -_0811AC82:\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - b RETURN\n\ -_0811AC88:\n\ - movs r0, 0x5\n\ - ldrsb r0, [r3, r0]\n\ - cmp r0, 0\n\ - bge _0811AC96\n\ - ldrb r0, [r1, 0x1]\n\ - subs r0, 0x1\n\ - strb r0, [r3, 0x5]\n\ -_0811AC96:\n\ - ldr r3, [r4]\n\ - movs r2, 0x5\n\ - ldrsb r2, [r3, r2]\n\ - ldrb r1, [r3, 0x1]\n\ - lsls r0, r1, 1\n\ - adds r0, r1\n\ - lsls r0, 3\n\ - adds r0, r6\n\ - ldrb r0, [r0, 0x1]\n\ - cmp r2, r0\n\ - blt _0811ACB0\n\ - movs r0, 0\n\ - strb r0, [r3, 0x5]\n\ -_0811ACB0:\n\ - bl sub_811AB44\n\ - cmp r0, 0\n\ - beq _0811ACCA\n\ - ldr r2, [r7]\n\ - ldr r0, [r2, 0x4]\n\ - ldr r1, =0x00ffff00\n\ - ands r0, r1\n\ - ldr r1, =0x00040100\n\ - cmp r0, r1\n\ - bne _0811ACCA\n\ - movs r0, 0\n\ - strb r0, [r2, 0x5]\n\ -_0811ACCA:\n\ - movs r0, 0x2\n\ -RETURN:\n\ - pop {r4-r7}\n\ - pop {r1}\n\ - bx r1\n\ - .pool"); -} -#endif // NONMATCHING -#ifdef NONMATCHING static u16 sub_811ACDC(void) { - int numFooterColumns; - - if (gMain.newKeys & A_BUTTON) + do { - switch (gEasyChatScreen->mainCursorColumn) + if (gMain.newKeys & A_BUTTON) { - case 0: - return sub_811B184(); - case 1: - return sub_811B150(); - case 2: - return sub_811B1B4(); - case 3: - return sub_811B264(); + switch (gEasyChatScreen->mainCursorColumn) + { + case 0: + return sub_811B184(); + case 1: + return sub_811B150(); + case 2: + return sub_811B1B4(); + case 3: + return sub_811B264(); + } + } + + if (gMain.newKeys & B_BUTTON) + { + return sub_811B150(); + } + else if (gMain.newKeys & START_BUTTON) + { + return sub_811B1B4(); + } + else if (gMain.newKeys & DPAD_UP) + { + gEasyChatScreen->mainCursorRow--; + break; + } + else if (gMain.newKeys & DPAD_LEFT) + { + gEasyChatScreen->mainCursorColumn--; + break; + } + else if (gMain.newKeys & DPAD_DOWN) + { + gEasyChatScreen->mainCursorRow = 0; + break; + } + else if (gMain.newKeys & DPAD_RIGHT) + { + gEasyChatScreen->mainCursorColumn++; + break; } - } - if (gMain.newKeys & B_BUTTON) - return sub_811B150(); - else if (gMain.newKeys & START_BUTTON) - return sub_811B1B4(); - else if (gMain.newKeys & DPAD_UP) - gEasyChatScreen->mainCursorRow--; - else if (gMain.newKeys & DPAD_LEFT) - gEasyChatScreen->mainCursorColumn--; - else if (gMain.newKeys & DPAD_DOWN) - gEasyChatScreen->mainCursorRow = 0; - else if (gMain.newKeys & DPAD_RIGHT) - gEasyChatScreen->mainCursorColumn++; - else return 0; + } while (0); if (gEasyChatScreen->mainCursorRow == gEasyChatScreenTemplates[gEasyChatScreen->templateId].numRows) { - numFooterColumns = sub_811BA3C() ? 4 : 3; + int numFooterColumns = sub_811BA3C() ? 4 : 3; if (gEasyChatScreen->mainCursorColumn < 0) gEasyChatScreen->mainCursorColumn = numFooterColumns - 1; @@ -1100,198 +927,13 @@ static u16 sub_811ACDC(void) if (gEasyChatScreen->mainCursorColumn >= gEasyChatScreenTemplates[gEasyChatScreen->templateId].numColumns) gEasyChatScreen->mainCursorColumn = gEasyChatScreenTemplates[gEasyChatScreen->templateId].numColumns - 1; - + if (sub_811AB44() && gEasyChatScreen->mainCursorColumn == 1 && gEasyChatScreen->mainCursorRow == 4) gEasyChatScreen->mainCursorColumn = 0; gEasyChatScreen->state = 0; return 2; } -#else -NAKED -static u16 sub_811ACDC(void) -{ - asm_unified("\n\ - push {r4-r6,lr}\n\ - ldr r2, =gMain\n\ - ldrh r1, [r2, 0x2E]\n\ - movs r0, 0x1\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _0811AD4A\n\ - ldr r0, =gEasyChatScreen\n\ - ldr r0, [r0]\n\ - ldrb r0, [r0, 0x5]\n\ - lsls r0, 24\n\ - asrs r0, 24\n\ - cmp r0, 0x1\n\ - beq _0811AD3E\n\ - b _0811AD24\n\ - .pool\n\ -_0811AD04:\n\ - movs r0, 0x20\n\ - ands r0, r2\n\ - lsls r0, 16\n\ - lsrs r3, r0, 16\n\ - cmp r3, 0\n\ - bne _0811ADE0\n\ - movs r0, 0x80\n\ - ands r0, r2\n\ - cmp r0, 0\n\ - bne _0811ADD0\n\ - movs r0, 0x10\n\ - ands r0, r2\n\ - cmp r0, 0\n\ - bne _0811ADC0\n\ - movs r0, 0\n\ - b _0811AE32\n\ -_0811AD24:\n\ - cmp r0, 0x1\n\ - bgt _0811AD2E\n\ - cmp r0, 0\n\ - beq _0811AD38\n\ - b _0811AD4A\n\ -_0811AD2E:\n\ - cmp r0, 0x2\n\ - beq _0811ADF6\n\ - cmp r0, 0x3\n\ - beq _0811AD44\n\ - b _0811AD4A\n\ -_0811AD38:\n\ - bl sub_811B184\n\ - b _0811ADFA\n\ -_0811AD3E:\n\ - bl sub_811B150\n\ - b _0811ADFA\n\ -_0811AD44:\n\ - bl sub_811B264\n\ - b _0811ADFA\n\ -_0811AD4A:\n\ - ldrh r2, [r2, 0x2E]\n\ - movs r0, 0x2\n\ - ands r0, r2\n\ - cmp r0, 0\n\ - bne _0811ADF0\n\ - movs r0, 0x8\n\ - ands r0, r2\n\ - cmp r0, 0\n\ - bne _0811ADF6\n\ - movs r0, 0x40\n\ - ands r0, r2\n\ - cmp r0, 0\n\ - beq _0811AD04\n\ - ldr r2, =gEasyChatScreen\n\ - ldr r1, [r2]\n\ - ldrb r0, [r1, 0x6]\n\ - subs r0, 0x1\n\ - strb r0, [r1, 0x6]\n\ -_0811AD6E:\n\ - adds r6, r2, 0\n\ -_0811AD70:\n\ - adds r5, r6, 0\n\ - ldr r4, [r5]\n\ - movs r3, 0x6\n\ - ldrsb r3, [r4, r3]\n\ - ldr r2, =gEasyChatScreenTemplates\n\ - ldrb r1, [r4, 0x1]\n\ - lsls r0, r1, 1\n\ - adds r0, r1\n\ - lsls r0, 3\n\ - adds r1, r0, r2\n\ - ldrb r0, [r1, 0x2]\n\ - cmp r3, r0\n\ - bne _0811AE00\n\ - bl sub_811BA3C\n\ - movs r2, 0x3\n\ - cmp r0, 0\n\ - beq _0811AD96\n\ - movs r2, 0x4\n\ -_0811AD96:\n\ - ldr r1, [r5]\n\ - movs r0, 0x5\n\ - ldrsb r0, [r1, r0]\n\ - cmp r0, 0\n\ - bge _0811ADA4\n\ - subs r0, r2, 0x1\n\ - strb r0, [r1, 0x5]\n\ -_0811ADA4:\n\ - ldr r1, [r5]\n\ - movs r0, 0x5\n\ - ldrsb r0, [r1, r0]\n\ - cmp r0, r2\n\ - blt _0811ADB2\n\ - movs r0, 0\n\ - strb r0, [r1, 0x5]\n\ -_0811ADB2:\n\ - movs r0, 0x3\n\ - b _0811AE32\n\ - .pool\n\ -_0811ADC0:\n\ - ldr r2, =gEasyChatScreen\n\ - ldr r1, [r2]\n\ - ldrb r0, [r1, 0x5]\n\ - adds r0, 0x1\n\ - strb r0, [r1, 0x5]\n\ - b _0811AD6E\n\ - .pool\n\ -_0811ADD0:\n\ - ldr r1, =gEasyChatScreen\n\ - ldr r0, [r1]\n\ - strb r3, [r0, 0x6]\n\ - adds r6, r1, 0\n\ - b _0811AD70\n\ - .pool\n\ -_0811ADE0:\n\ - ldr r2, =gEasyChatScreen\n\ - ldr r1, [r2]\n\ - ldrb r0, [r1, 0x5]\n\ - subs r0, 0x1\n\ - strb r0, [r1, 0x5]\n\ - b _0811AD6E\n\ - .pool\n\ -_0811ADF0:\n\ - bl sub_811B150\n\ - b _0811ADFA\n\ -_0811ADF6:\n\ - bl sub_811B1B4\n\ -_0811ADFA:\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - b _0811AE32\n\ -_0811AE00:\n\ - movs r0, 0x5\n\ - ldrsb r0, [r4, r0]\n\ - ldrb r1, [r1, 0x1]\n\ - cmp r0, r1\n\ - blt _0811AE0E\n\ - subs r0, r1, 0x1\n\ - strb r0, [r4, 0x5]\n\ -_0811AE0E:\n\ - bl sub_811AB44\n\ - cmp r0, 0\n\ - beq _0811AE28\n\ - ldr r2, [r6]\n\ - ldr r0, [r2, 0x4]\n\ - ldr r1, =0x00ffff00\n\ - ands r0, r1\n\ - ldr r1, =0x00040100\n\ - cmp r0, r1\n\ - bne _0811AE28\n\ - movs r0, 0\n\ - strb r0, [r2, 0x5]\n\ -_0811AE28:\n\ - ldr r0, =gEasyChatScreen\n\ - ldr r1, [r0]\n\ - movs r0, 0\n\ - strb r0, [r1, 0x4]\n\ - movs r0, 0x2\n\ -_0811AE32:\n\ - pop {r4-r6}\n\ - pop {r1}\n\ - bx r1\n\ - .pool"); -} -#endif // NONMATCHING static u16 sub_811AE44(void) { @@ -1617,7 +1259,7 @@ static int sub_811B2B0(void) var1 = sub_811F5B0(); if (var1 == 0) return 0; - + gEasyChatScreen->unk_0f = (var1 - 1) / 2; gEasyChatScreen->unk_0e = 0; gEasyChatScreen->unk_10 = 0; @@ -1984,7 +1626,7 @@ static u16 sub_811B794(u32 arg0) gEasyChatScreen->unk_0e += 4; if (gEasyChatScreen->unk_0e > gEasyChatScreen->unk_0f - 3) gEasyChatScreen->unk_0e = gEasyChatScreen->unk_0f + 0xFD; - + sub_811B9A0(); return 22; } @@ -2287,7 +1929,7 @@ static int sub_811BD64(void) if (gEasyChatScreen->kind == 17) return sub_811BCF4(); - + saveBlock1 = gSaveBlock1Ptr; for (i = 0; i < 9; i++) { @@ -2401,7 +2043,7 @@ int sub_811BF88(int easyChatWord) static bool8 sub_811BF8C(void) { if (!sub_811CE94()) - return 0; + return 0; else return 1; } @@ -2555,7 +2197,7 @@ static bool8 sub_811C30C(void) int trueStringWidth; u8 var2; u8 sp0[64]; - + ecWordBuffer = sub_811BA94(); var0 = sub_811BA68(); cursorColumn = sub_811BAB8(); @@ -2775,7 +2417,7 @@ static bool8 sub_811C6C0(void) if (!sub_811DAA4() && !sub_811E5B8()) { sub_811D6D4(); - gUnknown_0203A11C->unk0++; + gUnknown_0203A11C->unk0++; } break; case 2: @@ -3517,7 +3159,7 @@ static void sub_811D424(u16 *tilemap) x++; for (; x < right; x++) tilemap[y * 32 + x] = 0x1000; - + tilemap[y* 32 + x] = 0x1007; } } @@ -4456,10 +4098,10 @@ u16 EasyChat_GetNumWordsInGroup(u8 groupId) { if (groupId == EC_GROUP_POKEMON) return GetNationalPokedexCount(FLAG_GET_SEEN); - + if (sub_811EA28(groupId)) - return gEasyChatGroups[groupId].numEnabledWords; - + return gEasyChatGroups[groupId].numEnabledWords; + return 0; } @@ -4472,7 +4114,7 @@ bool8 sub_811EAA4(u16 easyChatWord) const u16 *list; if (easyChatWord == 0xFFFF) return FALSE; - + groupId = EC_GROUP(easyChatWord); index = EC_INDEX(easyChatWord); if (groupId >= EC_NUM_GROUPS) From b60611c38e904dac5c83f76fc2fbb880baaf0d33 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 26 Feb 2019 11:17:41 -0600 Subject: [PATCH 23/25] Finish decompiling easy_chat.c code --- asm/easy_chat.s | 1179 ------------------------------------------- include/easy_chat.h | 3 +- include/global.h | 3 +- ld_script.txt | 2 +- src/easy_chat.c | 464 ++++++++++++++++- 5 files changed, 447 insertions(+), 1204 deletions(-) delete mode 100644 asm/easy_chat.s diff --git a/asm/easy_chat.s b/asm/easy_chat.s deleted file mode 100644 index 2051e67e15..0000000000 --- a/asm/easy_chat.s +++ /dev/null @@ -1,1179 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_811F01C -sub_811F01C: @ 811F01C - push {r4-r6,lr} - bl sub_811EFF0 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x21 - bne _0811F048 - b _0811F082 -_0811F02C: - adds r0, r5, 0 - bl sub_811EFC0 - ldr r0, =0x000001ff - ands r4, r0 - movs r1, 0xA0 - lsls r1, 6 - adds r0, r1, 0 - orrs r4, r0 - adds r0, r4, 0 - b _0811F084 - .pool -_0811F048: - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x21 - subs r1, r4 - bl __modsi3 - lsls r0, 16 - lsrs r6, r0, 16 - movs r4, 0 -_0811F05E: - lsls r0, r4, 24 - lsrs r5, r0, 24 - adds r0, r5, 0 - bl sub_811EF98 - lsls r0, 24 - cmp r0, 0 - bne _0811F078 - cmp r6, 0 - beq _0811F02C - subs r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 -_0811F078: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x20 - bls _0811F05E -_0811F082: - ldr r0, =0x0000ffff -_0811F084: - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end sub_811F01C - - thumb_func_start sub_811F090 -sub_811F090: @ 811F090 - push {r4,r5,lr} - bl sub_811EFF0 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0 - bne _0811F0B4 - b _0811F0EA -_0811F0A0: - ldr r0, =0x000001ff - ands r4, r0 - movs r1, 0xA0 - lsls r1, 6 - adds r0, r1, 0 - orrs r4, r0 - adds r0, r4, 0 - b _0811F0EC - .pool -_0811F0B4: - bl Random - lsls r0, 16 - lsrs r0, 16 - adds r1, r5, 0 - bl __umodsi3 - lsls r0, 16 - lsrs r5, r0, 16 - movs r4, 0 -_0811F0C8: - lsls r0, r4, 24 - lsrs r0, 24 - bl sub_811EF98 - lsls r0, 24 - cmp r0, 0 - beq _0811F0E0 - cmp r5, 0 - beq _0811F0A0 - subs r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 -_0811F0E0: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x20 - bls _0811F0C8 -_0811F0EA: - ldr r0, =0x0000ffff -_0811F0EC: - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_811F090 - - thumb_func_start sub_811F0F8 -sub_811F0F8: @ 811F0F8 - push {lr} - bl IsNationalPokedexEnabled - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - thumb_func_end sub_811F0F8 - - thumb_func_start sub_811F108 -sub_811F108: @ 811F108 - push {r4-r7,lr} - movs r0, 0 - bl EasyChat_GetNumWordsInGroup - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0 - bne _0811F128 - b _0811F172 -_0811F11A: - ldrh r1, [r5] - ldr r0, =0x000001ff - ands r0, r1 - b _0811F174 - .pool -_0811F128: - bl Random - lsls r0, 16 - lsrs r0, 16 - adds r1, r4, 0 - bl __umodsi3 - lsls r0, 16 - lsrs r4, r0, 16 - ldr r0, =gEasyChatGroups - ldr r5, [r0] - ldrh r7, [r0, 0x4] - movs r6, 0 - cmp r6, r7 - bcs _0811F172 -_0811F146: - ldrh r0, [r5] - bl SpeciesToNationalPokedexNum - lsls r0, 16 - lsrs r0, 16 - movs r1, 0 - bl GetSetPokedexFlag - lsls r0, 24 - cmp r0, 0 - beq _0811F166 - cmp r4, 0 - beq _0811F11A - subs r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 -_0811F166: - adds r5, 0x2 - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, r7 - bcc _0811F146 -_0811F172: - ldr r0, =0x0000ffff -_0811F174: - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_811F108 - - thumb_func_start InitEasyChatPhrases -InitEasyChatPhrases: @ 811F184 - push {r4-r7,lr} - movs r2, 0 - ldr r5, =gSaveBlock1Ptr - ldr r4, =0x00002bb0 - ldr r3, =gUnknown_0859E62C -_0811F18E: - ldr r1, [r5] - lsls r0, r2, 1 - adds r1, r4 - adds r1, r0 - adds r0, r3 - ldrh r0, [r0] - strh r0, [r1] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x3 - bls _0811F18E - movs r2, 0 - ldr r5, =gSaveBlock1Ptr - ldr r4, =0x00002bbc - ldr r3, =gUnknown_0859E634 -_0811F1AE: - ldr r1, [r5] - lsls r0, r2, 1 - adds r1, r4 - adds r1, r0 - adds r0, r3 - ldrh r0, [r0] - strh r0, [r1] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x5 - bls _0811F1AE - movs r2, 0 - ldr r5, =gSaveBlock1Ptr - ldr r4, =0x00002bc8 - ldr r3, =gUnknown_0859E640 -_0811F1CE: - ldr r1, [r5] - lsls r0, r2, 1 - adds r1, r4 - adds r1, r0 - adds r0, r3 - ldrh r0, [r0] - strh r0, [r1] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x5 - bls _0811F1CE - movs r2, 0 - ldr r5, =gSaveBlock1Ptr - ldr r4, =0x00002bd4 - ldr r3, =gUnknown_0859E64C -_0811F1EE: - ldr r1, [r5] - lsls r0, r2, 1 - adds r1, r4 - adds r1, r0 - adds r0, r3 - ldrh r0, [r0] - strh r0, [r1] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x5 - bls _0811F1EE - movs r2, 0 - ldr r7, =gSaveBlock1Ptr - ldr r6, =0x00002be0 - ldr r0, =0x0000ffff - adds r5, r0, 0 -_0811F210: - movs r3, 0 - lsls r0, r2, 3 - adds r0, r2 - lsls r4, r0, 2 -_0811F218: - ldr r1, [r7] - lsls r0, r3, 1 - adds r0, r4 - adds r1, r6 - adds r1, r0 - ldrh r0, [r1] - orrs r0, r5 - strh r0, [r1] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x8 - bls _0811F218 - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0xF - bls _0811F210 - movs r2, 0 - ldr r4, =gSaveBlock1Ptr - ldr r3, =0x00002e20 - movs r1, 0 -_0811F244: - ldr r0, [r4] - adds r0, r3 - adds r0, r2 - strb r1, [r0] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x3F - bls _0811F244 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end InitEasyChatPhrases - - thumb_func_start sub_811F28C -sub_811F28C: @ 811F28C - push {r4,lr} - ldr r4, =gUnknown_0203A120 - ldr r0, =0x00003ba4 - bl Alloc - str r0, [r4] - cmp r0, 0 - beq _0811F2B0 - bl sub_811F2D4 - bl sub_811F46C - movs r0, 0x1 - b _0811F2B2 - .pool -_0811F2B0: - movs r0, 0 -_0811F2B2: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811F28C - - thumb_func_start sub_811F2B8 -sub_811F2B8: @ 811F2B8 - push {r4,lr} - ldr r4, =gUnknown_0203A120 - ldr r0, [r4] - cmp r0, 0 - beq _0811F2CA - bl Free - movs r0, 0 - str r0, [r4] -_0811F2CA: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811F2B8 - - thumb_func_start sub_811F2D4 -sub_811F2D4: @ 811F2D4 - push {r4,r5,lr} - ldr r4, =gUnknown_0203A120 - ldr r0, [r4] - movs r5, 0 - strh r5, [r0] - movs r0, 0 - bl GetNationalPokedexCount - lsls r0, 16 - cmp r0, 0 - beq _0811F2FC - ldr r0, [r4] - ldrh r1, [r0] - adds r2, r1, 0x1 - strh r2, [r0] - lsls r1, 16 - lsrs r1, 15 - adds r0, 0x2 - adds r0, r1 - strh r5, [r0] -_0811F2FC: - movs r3, 0x1 -_0811F2FE: - ldr r0, [r4] - ldrh r2, [r0] - adds r1, r2, 0x1 - strh r1, [r0] - lsls r2, 16 - lsrs r2, 15 - adds r0, 0x2 - adds r0, r2 - strh r3, [r0] - adds r3, 0x1 - cmp r3, 0x10 - ble _0811F2FE - ldr r0, =0x00000864 @ = FLAG_SYS_GAME_CLEAR - bl FlagGet - lsls r0, 24 - cmp r0, 0 - beq _0811F358 - ldr r0, =gUnknown_0203A120 - ldr r2, [r0] - ldrh r0, [r2] - adds r1, r0, 0x1 - strh r1, [r2] - lsls r0, 16 - lsrs r0, 15 - adds r3, r2, 0x2 - adds r0, r3, r0 - movs r1, 0x11 - strh r1, [r0] - ldrh r0, [r2] - adds r1, r0, 0x1 - strh r1, [r2] - lsls r0, 16 - lsrs r0, 15 - adds r0, r3, r0 - movs r1, 0x12 - strh r1, [r0] - ldrh r0, [r2] - adds r1, r0, 0x1 - strh r1, [r2] - lsls r0, 16 - lsrs r0, 15 - adds r3, r0 - movs r0, 0x13 - strh r0, [r3] -_0811F358: - ldr r0, =0x00000866 - bl FlagGet - lsls r0, 24 - cmp r0, 0 - beq _0811F37A - ldr r0, =gUnknown_0203A120 - ldr r0, [r0] - ldrh r1, [r0] - adds r2, r1, 0x1 - strh r2, [r0] - lsls r1, 16 - lsrs r1, 15 - adds r0, 0x2 - adds r0, r1 - movs r1, 0x14 - strh r1, [r0] -_0811F37A: - bl IsNationalPokedexEnabled - cmp r0, 0 - beq _0811F398 - ldr r0, =gUnknown_0203A120 - ldr r0, [r0] - ldrh r1, [r0] - adds r2, r1, 0x1 - strh r2, [r0] - lsls r1, 16 - lsrs r1, 15 - adds r0, 0x2 - adds r0, r1 - movs r1, 0x15 - strh r1, [r0] -_0811F398: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811F2D4 - - thumb_func_start sub_811F3AC -sub_811F3AC: @ 811F3AC - ldr r0, =gUnknown_0203A120 - ldr r0, [r0] - ldrb r0, [r0] - bx lr - .pool - thumb_func_end sub_811F3AC - - thumb_func_start sub_811F3B8 -sub_811F3B8: @ 811F3B8 - push {lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, =gUnknown_0203A120 - ldr r1, [r0] - ldrh r0, [r1] - cmp r2, r0 - bcs _0811F3D8 - lsls r0, r2, 1 - adds r1, 0x2 - adds r1, r0 - ldrb r0, [r1] - b _0811F3DA - .pool -_0811F3D8: - movs r0, 0x16 -_0811F3DA: - pop {r1} - bx r1 - thumb_func_end sub_811F3B8 - - thumb_func_start sub_811F3E0 -sub_811F3E0: @ 811F3E0 - push {r4,r5,lr} - adds r4, r0, 0 - lsls r1, 24 - lsls r2, 16 - lsrs r5, r2, 16 - ldr r0, =gEasyChatGroupNamePointers - lsrs r1, 22 - adds r1, r0 - ldr r1, [r1] - adds r0, r4, 0 - bl StringCopy - adds r1, r0, 0 - subs r4, r1, r4 - lsls r4, 16 - lsrs r0, r4, 16 - cmp r0, r5 - bcs _0811F414 - movs r2, 0 -_0811F406: - strb r2, [r1] - adds r1, 0x1 - adds r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - cmp r0, r5 - bcc _0811F406 -_0811F414: - movs r0, 0xFF - strb r0, [r1] - adds r0, r1, 0 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_811F3E0 - - thumb_func_start sub_811F424 -sub_811F424: @ 811F424 - lsls r0, 24 - ldr r1, =gEasyChatGroupNamePointers - lsrs r0, 22 - adds r0, r1 - ldr r0, [r0] - bx lr - .pool - thumb_func_end sub_811F424 - - thumb_func_start CopyEasyChatWordPadded -@ char *CopyEasyChatWordPadded(char *dest, u16 groupIdWordIdPair, u16 minLength) -CopyEasyChatWordPadded: @ 811F434 - push {r4,r5,lr} - adds r4, r0, 0 - lsls r1, 16 - lsrs r1, 16 - lsls r2, 16 - lsrs r5, r2, 16 - bl CopyEasyChatWord - adds r1, r0, 0 - subs r4, r1, r4 - lsls r4, 16 - lsrs r0, r4, 16 - cmp r0, r5 - bcs _0811F460 - movs r2, 0 -_0811F452: - strb r2, [r1] - adds r1, 0x1 - adds r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - cmp r0, r5 - bcc _0811F452 -_0811F460: - movs r0, 0xFF - strb r0, [r1] - adds r0, r1, 0 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end CopyEasyChatWordPadded - - thumb_func_start sub_811F46C -sub_811F46C: @ 811F46C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x10 - movs r3, 0 -_0811F47A: - ldr r2, =gEasyChatWordsByLetterPointers - lsls r1, r3, 3 - adds r0, r2, 0x4 - adds r0, r1, r0 - ldr r0, [r0] - str r0, [sp] - adds r1, r2 - ldr r7, [r1] - ldr r0, =gUnknown_0203A120 - ldr r1, [r0] - lsls r2, r3, 1 - adds r1, 0x2E - adds r1, r2 - movs r0, 0 - strh r0, [r1] - mov r10, r0 - movs r1, 0 - str r2, [sp, 0x4] - adds r0, r3, 0x1 - str r0, [sp, 0x8] - ldr r2, [sp] - cmp r1, r2 - bge _0811F530 -_0811F4A8: - ldrh r0, [r7] - ldr r2, =0x0000ffff - cmp r0, r2 - bne _0811F4FC - adds r7, 0x2 - ldrh r4, [r7] - adds r7, 0x2 - adds r0, r1, 0x1 - adds r1, r0, r4 - b _0811F4FE - .pool -_0811F4C8: - ldr r0, =gUnknown_0203A120 - ldr r2, [r0] - mov r0, r10 - lsls r1, r0, 1 - lsls r0, r3, 4 - adds r0, r3 - lsls r0, 3 - subs r0, r3 - lsls r0, 2 - adds r1, r0 - adds r0, r2, 0 - adds r0, 0x64 - adds r0, r1 - ldrh r1, [r5] - strh r1, [r0] - movs r0, 0x1 - add r10, r0 - adds r2, 0x2E - ldr r0, [sp, 0x4] - adds r2, r0 - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - b _0811F526 - .pool -_0811F4FC: - movs r4, 0x1 -_0811F4FE: - movs r6, 0 - adds r1, 0x1 - mov r9, r1 - lsls r2, r4, 1 - mov r8, r2 - cmp r6, r4 - bge _0811F526 - adds r5, r7, 0 -_0811F50E: - ldrh r0, [r5] - str r3, [sp, 0xC] - bl sub_811F860 - lsls r0, 24 - ldr r3, [sp, 0xC] - cmp r0, 0 - bne _0811F4C8 - adds r5, 0x2 - adds r6, 0x1 - cmp r6, r4 - blt _0811F50E -_0811F526: - add r7, r8 - mov r1, r9 - ldr r0, [sp] - cmp r1, r0 - blt _0811F4A8 -_0811F530: - ldr r3, [sp, 0x8] - cmp r3, 0x1A - ble _0811F47A - add sp, 0x10 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_811F46C - - thumb_func_start sub_811F548 -sub_811F548: @ 811F548 - push {lr} - lsls r1, 16 - lsrs r1, 16 - cmp r0, 0 - bne _0811F55A - adds r0, r1, 0 - bl sub_811F5C4 - b _0811F560 -_0811F55A: - adds r0, r1, 0 - bl sub_811F6B8 -_0811F560: - ldr r1, =gUnknown_0203A120 - ldr r1, [r1] - ldr r2, =0x00003ba0 - adds r1, r2 - strh r0, [r1] - pop {r0} - bx r0 - .pool - thumb_func_end sub_811F548 - - thumb_func_start sub_811F578 -sub_811F578: @ 811F578 - push {lr} - lsls r0, 16 - lsrs r2, r0, 16 - ldr r0, =gUnknown_0203A120 - ldr r1, [r0] - ldr r3, =0x00003ba0 - adds r0, r1, r3 - ldrh r0, [r0] - cmp r2, r0 - bcs _0811F5A4 - lsls r0, r2, 1 - ldr r2, =0x00003984 - adds r1, r2 - adds r1, r0 - ldrh r0, [r1] - b _0811F5A6 - .pool -_0811F5A4: - ldr r0, =0x0000ffff -_0811F5A6: - pop {r1} - bx r1 - .pool - thumb_func_end sub_811F578 - - thumb_func_start sub_811F5B0 -sub_811F5B0: @ 811F5B0 - ldr r0, =gUnknown_0203A120 - ldr r0, [r0] - ldr r1, =0x00003ba0 - adds r0, r1 - ldrh r0, [r0] - bx lr - .pool - thumb_func_end sub_811F5B0 - - thumb_func_start sub_811F5C4 -sub_811F5C4: @ 811F5C4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 16 - lsrs r2, r0, 16 - ldr r1, =gEasyChatGroups - lsls r0, r2, 3 - adds r0, r1 - ldrh r3, [r0, 0x4] - mov r8, r3 - cmp r2, 0 - beq _0811F5EC - cmp r2, 0x15 - beq _0811F5EC - cmp r2, 0x12 - beq _0811F5EC - cmp r2, 0x13 - bne _0811F64C -_0811F5EC: - lsls r0, r2, 3 - adds r0, r1 - ldr r1, [r0] - movs r7, 0 - movs r5, 0 - cmp r5, r8 - bcs _0811F698 - movs r0, 0x7F - ands r0, r2 - lsls r0, 9 - mov r9, r0 - adds r4, r1, 0 - lsls r6, r2, 24 -_0811F606: - ldrh r0, [r4] - lsrs r1, r6, 24 - bl sub_811F764 - lsls r0, 24 - cmp r0, 0 - beq _0811F630 - ldr r0, =gUnknown_0203A120 - ldr r2, [r0] - lsls r0, r5, 1 - ldr r1, =0x00003984 - adds r2, r1 - adds r2, r0 - ldrh r0, [r4] - ldr r3, =0x000001ff - adds r1, r3, 0 - ands r0, r1 - mov r1, r9 - orrs r0, r1 - strh r0, [r2] - adds r5, 0x1 -_0811F630: - adds r4, 0x2 - adds r7, 0x1 - cmp r7, r8 - bcc _0811F606 - b _0811F698 - .pool -_0811F64C: - ldr r1, [r0] - movs r7, 0 - movs r5, 0 - cmp r5, r8 - bcs _0811F698 - movs r0, 0x7F - ands r0, r2 - lsls r0, 9 - mov r10, r0 - adds r6, r1, 0 - lsls r2, 24 - mov r9, r2 -_0811F664: - ldrh r4, [r6, 0x4] - adds r0, r4, 0 - mov r2, r9 - lsrs r1, r2, 24 - bl sub_811F764 - lsls r0, 24 - cmp r0, 0 - beq _0811F690 - ldr r0, =gUnknown_0203A120 - ldr r1, [r0] - lsls r0, r5, 1 - ldr r3, =0x00003984 - adds r1, r3 - adds r1, r0 - ldr r2, =0x000001ff - adds r0, r2, 0 - ands r4, r0 - mov r3, r10 - orrs r4, r3 - strh r4, [r1] - adds r5, 0x1 -_0811F690: - adds r6, 0xC - adds r7, 0x1 - cmp r7, r8 - bcc _0811F664 -_0811F698: - lsls r0, r5, 16 - lsrs r0, 16 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_811F5C4 - - thumb_func_start sub_811F6B8 -sub_811F6B8: @ 811F6B8 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 16 - lsrs r1, r0, 16 - movs r4, 0 - movs r6, 0 - ldr r3, =gUnknown_0203A120 - ldr r0, [r3] - lsls r5, r1, 1 - adds r0, 0x2E - adds r0, r5 - ldrh r0, [r0] - cmp r6, r0 - bcs _0811F718 - mov r8, r3 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 3 - subs r0, r1 - lsls r7, r0, 2 - ldr r0, =0x00003984 - mov r12, r0 -_0811F6E6: - mov r0, r8 - ldr r3, [r0] - adds r1, r6, 0 - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - lsls r1, 1 - mov r0, r12 - adds r2, r3, r0 - adds r2, r1 - lsls r1, r4, 1 - adds r1, r7 - adds r0, r3, 0 - adds r0, 0x64 - adds r0, r1 - ldrh r0, [r0] - strh r0, [r2] - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - adds r3, 0x2E - adds r3, r5 - ldrh r3, [r3] - cmp r4, r3 - bcc _0811F6E6 -_0811F718: - adds r0, r6, 0 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_811F6B8 - - thumb_func_start sub_811F72C -sub_811F72C: @ 811F72C - push {r4,lr} - lsls r0, 24 - lsrs r3, r0, 24 - movs r2, 0 - ldr r0, =gUnknown_0203A120 - ldr r0, [r0] - ldrh r1, [r0] - cmp r2, r1 - bge _0811F75C - adds r4, r3, 0 - adds r3, r1, 0 - adds r1, r0, 0x2 -_0811F744: - ldrh r0, [r1] - cmp r0, r4 - bne _0811F754 - movs r0, 0x1 - b _0811F75E - .pool -_0811F754: - adds r1, 0x2 - adds r2, 0x1 - cmp r2, r3 - blt _0811F744 -_0811F75C: - movs r0, 0 -_0811F75E: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811F72C - - thumb_func_start sub_811F764 -sub_811F764: @ 811F764 - push {r4,lr} - lsls r0, 16 - lsrs r4, r0, 16 - lsls r1, 24 - lsrs r2, r1, 24 - cmp r2, 0x15 - bhi _0811F81A - lsls r0, r2, 2 - ldr r1, =_0811F780 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0811F780: - .4byte _0811F7D8 - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F808 - .4byte _0811F808 - .4byte _0811F80C - .4byte _0811F7EE -_0811F7D8: - adds r0, r4, 0 - bl SpeciesToNationalPokedexNum - lsls r0, 16 - lsrs r0, 16 - movs r1, 0 - bl GetSetPokedexFlag - lsls r0, 24 - lsrs r0, 24 - b _0811F82C -_0811F7EE: - adds r0, r4, 0 - bl sub_811F838 - cmp r0, 0 - beq _0811F808 - adds r0, r4, 0 - bl SpeciesToNationalPokedexNum - lsls r0, 16 - lsrs r0, 16 - movs r1, 0 - bl GetSetPokedexFlag -_0811F808: - movs r0, 0x1 - b _0811F82C -_0811F80C: - lsls r0, r4, 24 - lsrs r0, 24 - bl sub_811EF98 - lsls r0, 24 - lsrs r0, 24 - b _0811F82C -_0811F81A: - ldr r1, =gEasyChatGroups - lsls r0, r2, 3 - adds r0, r1 - ldr r1, [r0] - lsls r0, r4, 1 - adds r0, r4 - lsls r0, 2 - adds r0, r1 - ldrb r0, [r0, 0x8] -_0811F82C: - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_811F764 - - thumb_func_start sub_811F838 -sub_811F838: @ 811F838 - push {lr} - lsls r0, 16 - lsrs r3, r0, 16 - movs r2, 0 - ldr r1, =gUnknown_0859E658 -_0811F842: - ldrh r0, [r1] - cmp r0, r3 - bne _0811F850 - movs r0, 0x1 - b _0811F85A - .pool -_0811F850: - adds r1, 0x2 - adds r2, 0x1 - cmp r2, 0 - beq _0811F842 - movs r0, 0 -_0811F85A: - pop {r1} - bx r1 - thumb_func_end sub_811F838 - - thumb_func_start sub_811F860 -sub_811F860: @ 811F860 - push {r4,r5,lr} - lsls r0, 16 - lsrs r5, r0, 25 - lsls r0, 7 - lsrs r4, r0, 23 - adds r0, r5, 0 - bl sub_811F72C - lsls r0, 24 - cmp r0, 0 - beq _0811F884 - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_811F764 - lsls r0, 24 - lsrs r0, 24 - b _0811F886 -_0811F884: - movs r0, 0 -_0811F886: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_811F860 - - thumb_func_start InitializeEasyChatWordArray -InitializeEasyChatWordArray: @ 811F88C - push {lr} - adds r2, r0, 0 - lsls r1, 16 - ldr r0, =0xffff0000 - adds r1, r0 - lsrs r0, r1, 16 - ldr r1, =0x0000ffff - cmp r0, r1 - beq _0811F8AE - adds r3, r1, 0 -_0811F8A0: - strh r3, [r2] - adds r2, 0x2 - subs r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - cmp r0, r1 - bne _0811F8A0 -_0811F8AE: - pop {r0} - bx r0 - .pool - thumb_func_end InitializeEasyChatWordArray - -@void sub_811F8BC() { -@ s16* v; -@ s16* ptr; -@ v = GetSaveBlock1Field3564(); -@ for (ptr = v + 3; ptr >= v; ptr--) { -@ *ptr = -1; -@ } -@} - thumb_func_start sub_811F8BC -sub_811F8BC: @ 811F8BC - push {lr} - bl GetSaveBlock1Field3564 - ldr r1, =0x0000ffff - adds r2, r1, 0 - adds r1, r0, 0x6 -_0811F8C8: - strh r2, [r1] - subs r1, 0x2 - cmp r1, r0 - bge _0811F8C8 - pop {r0} - bx r0 - .pool - thumb_func_end sub_811F8BC - - thumb_func_start sub_811F8D8 -sub_811F8D8: @ 811F8D8 - push {r4,r5,lr} - asrs r4, r0, 9 - movs r1, 0x7F - ldr r5, =0x000001ff - ands r5, r0 - ands r4, r1 - adds r0, r4, 0 - bl sub_811EA28 - lsls r0, 24 - cmp r0, 0 - beq _0811F904 - adds r0, r5, 0 - adds r1, r4, 0 - bl sub_811F764 - lsls r0, 24 - lsrs r0, 24 - b _0811F906 - .pool -_0811F904: - movs r0, 0 -_0811F906: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_811F8D8 - - .align 2, 0 @ Don't pad with nop. diff --git a/include/easy_chat.h b/include/easy_chat.h index c55fca81bf..b3639af217 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -6,7 +6,7 @@ void InitEasyChatPhrases(void); void easy_chat_input_maybe(void); u8 * CopyEasyChatWord(u8 *dest, u16 word); -bool32 sub_811F8D8(u16 word); +bool32 sub_811F8D8(int word); void InitializeEasyChatWordArray(u16 *words, u16 length); u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 columns, u16 rows); bool8 ECWord_CheckIfOutsideOfValidRange(u16 word); @@ -15,5 +15,6 @@ u16 sub_811F01C(void); u16 EasyChat_GetNumWordsInGroup(u8); u16 sub_811EE90(u16); void sub_811A20C(u8 kind, u16 *words, MainCallback callback, u8 sizeParam); +void sub_811F8BC(void); #endif // GUARD_EASYCHAT_H diff --git a/include/global.h b/include/global.h index cc308c3c99..ee0ba68931 100644 --- a/include/global.h +++ b/include/global.h @@ -875,8 +875,7 @@ struct SaveBlock1 /*0x2BC8*/ u16 unk2BC8[6]; /*0x2BD4*/ u16 unk2BD4[6]; /*0x2BE0*/ struct MailStruct mail[MAIL_COUNT]; - /*0x2E20*/ u8 additionalPhrases[5]; // bitfield for 33 additional phrases in easy chat system - /*0x2E25*/ u8 unk2E25[3]; // possibly padding? + /*0x2E20*/ u8 additionalPhrases[8]; // bitfield for 33 additional phrases in easy chat system /*0x2E28*/ OldMan oldMan; /*0x2e64*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff /*0x2e90*/ struct ContestWinner contestWinners[13]; // 0 - 5 used in contest hall, 6 - 7 unused?, 8 - 12 museum diff --git a/ld_script.txt b/ld_script.txt index eaf75c3dec..1076068334 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -178,7 +178,6 @@ SECTIONS { src/battle_intro.o(.text); src/bike.o(.text); src/easy_chat.o(.text); - asm/easy_chat.o(.text); src/mon_markings.o(.text); src/mauville_old_man.o(.text); src/mail.o(.text); @@ -501,6 +500,7 @@ SECTIONS { src/battle_anim_utility_funcs.o(.rodata); src/battle_intro.o(.rodata); src/bike.o(.rodata); + src/easy_chat.o(.rodata); data/easy_chat.o(.rodata); src/mon_markings.o(.rodata); src/mauville_old_man.o(.rodata); diff --git a/src/easy_chat.c b/src/easy_chat.c index 3fdc888234..6a103dd7b0 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -141,9 +141,26 @@ struct EasyChatGroup u16 numEnabledWords; }; +struct Unk203A120 +{ + u16 unk0; + u16 unk2[EC_NUM_GROUPS]; + u16 unk2E[27]; + u16 unk64[27][270]; + u8 filler3958[0x2C]; + u16 unk3984[0x10E]; + u16 unk3BA0; +}; /*size = 0x3BA4*/ + +struct EasyChatWordsByLetter +{ + const u16 *words; + int numWords; +}; + EWRAM_DATA struct EasyChatScreen *gEasyChatScreen = NULL; EWRAM_DATA struct Unk203A11C *gUnknown_0203A11C = 0; -EWRAM_DATA void *gUnknown_0203A120 = 0; +EWRAM_DATA struct Unk203A120 *gUnknown_0203A120 = 0; static void sub_811A2C0(u8); static void sub_811A278(void); @@ -178,9 +195,9 @@ static bool8 sub_811BFA4(void); static void sub_811C13C(void); static void sub_811C158(u16); static bool8 sub_811C170(void); -bool8 sub_811F28C(void); -void sub_811F2B8(void); -u8 sub_811F3AC(void); +static bool8 sub_811F28C(void); +static void sub_811F2B8(void); +static u8 sub_811F3AC(void); int sub_811BA3C(void); int sub_811B184(void); int sub_811B264(void); @@ -202,13 +219,13 @@ static int sub_811BDB0(void); static int sub_811BD2C(void); int sub_811BCF4(void); static u16 sub_811B8E8(void); -int sub_811F3B8(u8); -void sub_811F548(int, u16); +static u8 sub_811F3B8(u8); +static void sub_811F548(int, u16); static int sub_811B908(void); -u16 sub_811F5B0(void); +static u16 sub_811F5B0(void); static void sub_811B488(u16); u16 sub_811B940(void); -u16 sub_811F578(u16); +static u16 sub_811F578(u16); int sub_811BF88(int); static u16 sub_811B8C8(void); static int sub_811B568(u32); @@ -310,7 +327,7 @@ static void sub_811DD84(void); static void sub_811D6F4(void); static void sub_811D758(void); static void sub_811D794(void); -const u8 *sub_811F424(u8); +static const u8 *GetEasyChatWordGroupName(u8); static void sub_811D864(u8, u8); static void sub_811D950(u8, u8); static void sub_811DADC(u8); @@ -319,9 +336,16 @@ static void sub_811E0EC(s8, s8); static void sub_811E1A4(s8, s8); static void sub_811E2DC(struct Sprite *); static void sub_811E34C(u8, u8); -bool8 sub_811F0F8(void); -u16 sub_811F108(void); -u8 *CopyEasyChatWordPadded(u8 *, u16, u16); +static bool8 sub_811F0F8(void); +static u16 sub_811F108(void); +static void sub_811F2D4(void); +static void sub_811F46C(void); +static u8 *CopyEasyChatWordPadded(u8 *, u16, u16); +static u8 sub_811F860(u16); +static u16 sub_811F5C4(u16); +static u16 sub_811F6B8(u16); +bool8 sub_811F764(u16, u8); +static int sub_811F838(u16); extern const struct { u16 word; @@ -356,6 +380,13 @@ extern const u8 gUnknown_08597D08[]; extern const u8 gUnknown_08597E60[][4]; extern const u8 *const gUnknown_08597E6C[][4]; extern const struct EasyChatGroup gEasyChatGroups[]; +extern const u16 gUnknown_0859E62C[]; +extern const u16 gUnknown_0859E634[]; +extern const u16 gUnknown_0859E640[]; +extern const u16 gUnknown_0859E64C[]; +extern const u8 *const gEasyChatGroupNamePointers[]; +extern const struct EasyChatWordsByLetter gEasyChatWordsByLetterPointers[]; +extern const u16 gUnknown_0859E658[1]; void sub_811A20C(u8 kind, u16 *words, MainCallback callback, u8 sizeParam) { @@ -1248,8 +1279,8 @@ static int sub_811B2B0(void) if (gEasyChatScreen->unk_09 == 0) { - u8 var0 = sub_811F3B8(sub_811B8E8()); - sub_811F548(0, var0); + u8 groupId = sub_811F3B8(sub_811B8E8()); + sub_811F548(0, groupId); } else { @@ -3265,14 +3296,14 @@ static void sub_811D6F4(void) { for (x = 0; x < 2; x++) { - u8 index = sub_811F3B8(i++); - if (index == 22) + u8 groupId = sub_811F3B8(i++); + if (groupId == EC_NUM_GROUPS) { sub_811DDAC(sub_811BBBC(), 0); return; } - sub_811D028(2, 1, sub_811F424(index), x * 84 + 10, y, 0xFF, NULL); + sub_811D028(2, 1, GetEasyChatWordGroupName(groupId), x * 84 + 10, y, 0xFF, NULL); } y += 16; @@ -4077,7 +4108,7 @@ static void sub_811E948(void) PutWindowTilemap(windowId); } -bool8 sub_811EA28(u8 groupId) +static bool8 sub_811EA28(u8 groupId) { switch (groupId) { @@ -4397,10 +4428,10 @@ void sub_811EF6C(void) CopyEasyChatWord(gStringVar2, easyChatWord); } -u8 sub_811EF98(u8 additionalPhraseId) +static bool8 sub_811EF98(u8 additionalPhraseId) { int byteOffset = additionalPhraseId / 8; - int shift = additionalPhraseId & 0x7; + int shift = additionalPhraseId % 8; return (gSaveBlock1Ptr->additionalPhrases[byteOffset] >> shift) & 1; } @@ -4409,7 +4440,7 @@ void sub_811EFC0(u8 additionalPhraseId) if (additionalPhraseId < 33) { int byteOffset = additionalPhraseId / 8; - int shift = additionalPhraseId & 0x7; + int shift = additionalPhraseId % 8; gSaveBlock1Ptr->additionalPhrases[byteOffset] |= 1 << shift; } } @@ -4427,3 +4458,394 @@ u8 sub_811EFF0(void) return numAdditionalPhrasesUnlocked; } + +u16 sub_811F01C(void) +{ + u16 i; + u16 additionalPhraseId; + u8 numAdditionalPhrasesUnlocked = sub_811EFF0(); + if (numAdditionalPhrasesUnlocked == 33) + return 0xFFFF; + + additionalPhraseId = Random() % (33 - numAdditionalPhrasesUnlocked); + for (i = 0; i < 33; i++) + { + if (!sub_811EF98(i)) + { + if (additionalPhraseId) + { + additionalPhraseId--; + } + else + { + sub_811EFC0(i); + return EC_WORD(EC_GROUP_TRENDY_SAYING, i); + } + } + } + + return 0xFFFF; +} + +u16 sub_811F090(void) +{ + u16 i; + u16 additionalPhraseId = sub_811EFF0(); + if (additionalPhraseId == 0) + return 0xFFFF; + + additionalPhraseId = Random() % additionalPhraseId; + for (i = 0; i < 33; i++) + { + if (sub_811EF98(i)) + { + if (additionalPhraseId) + additionalPhraseId--; + else + return EC_WORD(EC_GROUP_TRENDY_SAYING, i); + } + } + + return 0xFFFF; +} + +static bool8 sub_811F0F8(void) +{ + return IsNationalPokedexEnabled(); +} + +static u16 sub_811F108(void) +{ + u16 i; + u16 numWords; + const u16 *species; + u16 index = EasyChat_GetNumWordsInGroup(EC_GROUP_POKEMON); + if (index == 0) + return 0xFFFF; + + index = Random() % index; + species = gEasyChatGroups[EC_GROUP_POKEMON].wordData.valueList; + numWords = gEasyChatGroups[EC_GROUP_POKEMON].numWords; + for (i = 0; i < numWords; i++) + { + u16 dexNum = SpeciesToNationalPokedexNum(*species); + if (GetSetPokedexFlag(dexNum, FLAG_GET_SEEN)) + { + if (index) + index--; + else + return EC_WORD(EC_GROUP_POKEMON, *species); + } + + species++; + } + + return 0xFFFF; +} + +void InitEasyChatPhrases(void) +{ + u16 i, j; + + for (i = 0; i < 4; i++) + gSaveBlock1Ptr->unk2BB0[i] = gUnknown_0859E62C[i]; + + for (i = 0; i < 6; i++) + gSaveBlock1Ptr->unk2BBC[i] = gUnknown_0859E634[i]; + + for (i = 0; i < 6; i++) + gSaveBlock1Ptr->unk2BC8[i] = gUnknown_0859E640[i]; + + for (i = 0; i < 6; i++) + gSaveBlock1Ptr->unk2BD4[i] = gUnknown_0859E64C[i]; + + for (i = 0; i < MAIL_COUNT; i++) + { + for (j = 0; j < MAIL_WORDS_COUNT; j++) + gSaveBlock1Ptr->mail[i].words[j] = 0xFFFF; + } + + // BUG: This is supposed to clear 64 bits, but this loop is clearing 64 bytes. + // However, this bug has no resulting effect on gameplay because only the + // Mauville old man data is corrupted, which is initialized directly after + // this function is called when starting a new game. + for (i = 0; i < 64; i++) + gSaveBlock1Ptr->additionalPhrases[i] = 0; +} + +static bool8 sub_811F28C(void) +{ + gUnknown_0203A120 = Alloc(sizeof(*gUnknown_0203A120)); + if (!gUnknown_0203A120) + return FALSE; + + sub_811F2D4(); + sub_811F46C(); + return TRUE; +} + +static void sub_811F2B8(void) +{ + if (gUnknown_0203A120) + FREE_AND_SET_NULL(gUnknown_0203A120); +} + +static void sub_811F2D4(void) +{ + int i; + + gUnknown_0203A120->unk0 = 0; + if (GetNationalPokedexCount(FLAG_GET_SEEN)) + gUnknown_0203A120->unk2[gUnknown_0203A120->unk0++] = EC_GROUP_POKEMON; + + for (i = EC_GROUP_TRAINER; i <= EC_GROUP_ADJECTIVES; i++) + gUnknown_0203A120->unk2[gUnknown_0203A120->unk0++] = i; + + if (FlagGet(FLAG_SYS_GAME_CLEAR)) + { + gUnknown_0203A120->unk2[gUnknown_0203A120->unk0++] = EC_GROUP_EVENTS; + gUnknown_0203A120->unk2[gUnknown_0203A120->unk0++] = EC_GROUP_MOVE_1; + gUnknown_0203A120->unk2[gUnknown_0203A120->unk0++] = EC_GROUP_MOVE_2; + } + + if (FlagGet(FLAG_SYS_HIPSTER_MEET)) + gUnknown_0203A120->unk2[gUnknown_0203A120->unk0++] = EC_GROUP_TRENDY_SAYING; + + if (IsNationalPokedexEnabled()) + gUnknown_0203A120->unk2[gUnknown_0203A120->unk0++] = EC_GROUP_POKEMON_2; +} + +static u8 sub_811F3AC(void) +{ + return gUnknown_0203A120->unk0; +} + +static u8 sub_811F3B8(u8 index) +{ + if (index >= gUnknown_0203A120->unk0) + return EC_NUM_GROUPS; + else + return gUnknown_0203A120->unk2[index]; +} + +u8 *unref_sub_811F3E0(u8 *dest, u8 groupId, u16 totalChars) +{ + u16 i; + u8 *str = StringCopy(dest, gEasyChatGroupNamePointers[groupId]); + for (i = str - dest; i < totalChars; i++) + { + *str = CHAR_SPACE; + str++; + } + + *str = EOS; + return str; +} + +static const u8 *GetEasyChatWordGroupName(u8 groupId) +{ + return gEasyChatGroupNamePointers[groupId]; +} + +static u8 *CopyEasyChatWordPadded(u8 *dest, u16 easyChatWord, u16 totalChars) +{ + u16 i; + u8 *str = CopyEasyChatWord(dest, easyChatWord); + for (i = str - dest; i < totalChars; i++) + { + *str = CHAR_SPACE; + str++; + } + + *str = EOS; + return str; +} + +static void sub_811F46C(void) +{ + int i, j, k; + int numWords; + const u16 *words; + u16 numToProcess; + int index; + + for (i = 0; i < 27; i++) + { + numWords = gEasyChatWordsByLetterPointers[i].numWords; + words = gEasyChatWordsByLetterPointers[i].words; + gUnknown_0203A120->unk2E[i] = 0; + index = 0; + for (j = 0; j < numWords; j++) + { + if (*words == 0xFFFF) + { + words++; + numToProcess = *words; + words++; + j += 1 + numToProcess; + } + else + { + numToProcess = 1; + } + + for (k = 0; k < numToProcess; k++) + { + if (sub_811F860(words[k])) + { + gUnknown_0203A120->unk64[i][index++] = words[k]; + gUnknown_0203A120->unk2E[i]++; + break; + } + } + + words += numToProcess; + } + } +} + +static void sub_811F548(int arg0, u16 groupId) +{ + if (!arg0) + gUnknown_0203A120->unk3BA0 = sub_811F5C4(groupId); + else + gUnknown_0203A120->unk3BA0 = sub_811F6B8(groupId); +} + +static u16 sub_811F578(u16 arg0) +{ + if (arg0 >= gUnknown_0203A120->unk3BA0) + return 0xFFFF; + else + return gUnknown_0203A120->unk3984[arg0]; +} + +static u16 sub_811F5B0(void) +{ + return gUnknown_0203A120->unk3BA0; +} + +static u16 sub_811F5C4(u16 groupId) +{ + u32 i; + int totalWords; + const u16 *list; + const struct EasyChatWordInfo *wordInfo; + u16 numWords = gEasyChatGroups[groupId].numWords; + + if (groupId == EC_GROUP_POKEMON || groupId == EC_GROUP_POKEMON_2 + || groupId == EC_GROUP_MOVE_1 || groupId == EC_GROUP_MOVE_2) + { + list = gEasyChatGroups[groupId].wordData.valueList; + for (i = 0, totalWords = 0; i < numWords; i++) + { + if (sub_811F764(list[i], groupId)) + gUnknown_0203A120->unk3984[totalWords++] = EC_WORD(groupId, list[i]); + } + + return totalWords; + } + else + { + wordInfo = gEasyChatGroups[groupId].wordData.words; + for (i = 0, totalWords = 0; i < numWords; i++) + { + u16 alphabeticalOrder = wordInfo[i].alphabeticalOrder; + if (sub_811F764(alphabeticalOrder, groupId)) + gUnknown_0203A120->unk3984[totalWords++] = EC_WORD(groupId, alphabeticalOrder); + } + + return totalWords; + } +} + +static u16 sub_811F6B8(u16 alphabeticalGroup) +{ + u16 i; + u16 totalWords; + + for (i = 0, totalWords = 0; i < gUnknown_0203A120->unk2E[alphabeticalGroup]; i++) + gUnknown_0203A120->unk3984[totalWords++] = gUnknown_0203A120->unk64[alphabeticalGroup][i]; + + return totalWords; +} + +static bool8 sub_811F72C(u8 arg0) +{ + int i; + for (i = 0; i < gUnknown_0203A120->unk0; i++) + { + if (gUnknown_0203A120->unk2[i] == arg0) + return TRUE; + } + + return FALSE; +} + +bool8 sub_811F764(u16 wordIndex, u8 groupId) +{ + switch (groupId) + { + case EC_GROUP_POKEMON: + return GetSetPokedexFlag(SpeciesToNationalPokedexNum(wordIndex), FLAG_GET_SEEN); + case EC_GROUP_POKEMON_2: + if (sub_811F838(wordIndex)) + GetSetPokedexFlag(SpeciesToNationalPokedexNum(wordIndex), FLAG_GET_SEEN); + return TRUE; + case EC_GROUP_MOVE_1: + case EC_GROUP_MOVE_2: + return TRUE; + case EC_GROUP_TRENDY_SAYING: + return sub_811EF98(wordIndex); + default: + return gEasyChatGroups[groupId].wordData.words[wordIndex].enabled; + } +} + +static int sub_811F838(u16 species) +{ + u32 i; + for (i = 0; i < ARRAY_COUNT(gUnknown_0859E658); i++) + { + if (gUnknown_0859E658[i] == species) + return TRUE; + } + + return FALSE; +} + +static u8 sub_811F860(u16 easyChatWord) +{ + u8 groupId = EC_GROUP(easyChatWord); + u32 index = EC_INDEX(easyChatWord); + if (!sub_811F72C(groupId)) + return FALSE; + else + return sub_811F764(index, groupId); +} + +void InitializeEasyChatWordArray(u16 *words, u16 length) +{ + u16 i; + for (i = length - 1; i != 0xFFFF; i--) + *(words++) = 0xFFFF; +} + +void sub_811F8BC(void) +{ + int i; + u16 *words = GetSaveBlock1Field3564(); + for (i = 0; i < 4; i++) + words[i] = 0xFFFF; +} + +bool32 sub_811F8D8(int easyChatWord) +{ + int groupId = EC_GROUP(easyChatWord); + int mask = 0x7F; + int index = EC_INDEX(easyChatWord); + if (!sub_811EA28(groupId & mask)) + return FALSE; + else + return sub_811F764(index, groupId & mask); +} From 231355f84dccd11329d81d074fa36135cfad4f94 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 26 Feb 2019 11:24:12 -0600 Subject: [PATCH 24/25] Decompile easy_chat data --- data/easy_chat.s | 489 --- data/text/easy_chat/easy_chat_group_actions.s | 547 ---- .../easy_chat/easy_chat_group_adjectives.s | 253 -- data/text/easy_chat/easy_chat_group_battle.s | 442 --- .../easy_chat/easy_chat_group_conditions.s | 484 --- data/text/easy_chat/easy_chat_group_endings.s | 484 --- data/text/easy_chat/easy_chat_group_events.s | 204 -- .../text/easy_chat/easy_chat_group_feelings.s | 484 --- .../easy_chat/easy_chat_group_greetings.s | 295 -- data/text/easy_chat/easy_chat_group_hobbies.s | 379 --- .../easy_chat/easy_chat_group_lifestyle.s | 316 -- data/text/easy_chat/easy_chat_group_misc.s | 295 -- data/text/easy_chat/easy_chat_group_move_1.s | 156 - data/text/easy_chat/easy_chat_group_move_2.s | 202 -- .../easy_chat_group_name_pointers.inc | 24 - data/text/easy_chat/easy_chat_group_people.s | 526 ---- data/text/easy_chat/easy_chat_group_pokemon.s | 204 -- .../text/easy_chat/easy_chat_group_pokemon2.s | 253 -- data/text/easy_chat/easy_chat_group_speech.s | 421 --- data/text/easy_chat/easy_chat_group_status.s | 764 ----- data/text/easy_chat/easy_chat_group_time.s | 316 -- data/text/easy_chat/easy_chat_group_trainer.s | 190 -- .../easy_chat/easy_chat_group_trendy_saying.s | 232 -- data/text/easy_chat/easy_chat_group_voices.s | 442 --- data/text/easy_chat/easy_chat_groups.inc | 112 - .../easy_chat/easy_chat_words_by_letter.inc | 2656 ---------------- include/easy_chat.h | 118 + include/graphics.h | 5 + include/strings.h | 124 + ld_script.txt | 1 - src/data/easy_chat/easy_chat_group_actions.h | 471 +++ .../easy_chat/easy_chat_group_adjectives.h | 219 ++ src/data/easy_chat/easy_chat_group_battle.h | 381 +++ .../easy_chat/easy_chat_group_conditions.h | 417 +++ src/data/easy_chat/easy_chat_group_endings.h | 417 +++ src/data/easy_chat/easy_chat_group_events.h | 177 ++ src/data/easy_chat/easy_chat_group_feelings.h | 417 +++ .../easy_chat/easy_chat_group_greetings.h | 255 ++ src/data/easy_chat/easy_chat_group_hobbies.h | 327 ++ .../easy_chat/easy_chat_group_lifestyle.h | 273 ++ src/data/easy_chat/easy_chat_group_misc.h | 255 ++ src/data/easy_chat/easy_chat_group_move_1.h | 158 + src/data/easy_chat/easy_chat_group_move_2.h | 204 ++ src/data/easy_chat/easy_chat_group_people.h | 453 +++ src/data/easy_chat/easy_chat_group_pokemon.h | 206 ++ src/data/easy_chat/easy_chat_group_pokemon2.h | 255 ++ src/data/easy_chat/easy_chat_group_speech.h | 363 +++ src/data/easy_chat/easy_chat_group_status.h | 657 ++++ src/data/easy_chat/easy_chat_group_time.h | 273 ++ src/data/easy_chat/easy_chat_group_trainer.h | 165 + .../easy_chat/easy_chat_group_trendy_saying.h | 201 ++ src/data/easy_chat/easy_chat_group_voices.h | 381 +++ src/data/easy_chat/easy_chat_groups.h | 137 + .../easy_chat/easy_chat_words_by_letter.h | 2750 +++++++++++++++++ src/easy_chat.c | 1143 +++++-- 55 files changed, 10975 insertions(+), 11398 deletions(-) delete mode 100644 data/easy_chat.s delete mode 100644 data/text/easy_chat/easy_chat_group_actions.s delete mode 100644 data/text/easy_chat/easy_chat_group_adjectives.s delete mode 100644 data/text/easy_chat/easy_chat_group_battle.s delete mode 100644 data/text/easy_chat/easy_chat_group_conditions.s delete mode 100644 data/text/easy_chat/easy_chat_group_endings.s delete mode 100644 data/text/easy_chat/easy_chat_group_events.s delete mode 100644 data/text/easy_chat/easy_chat_group_feelings.s delete mode 100644 data/text/easy_chat/easy_chat_group_greetings.s delete mode 100644 data/text/easy_chat/easy_chat_group_hobbies.s delete mode 100644 data/text/easy_chat/easy_chat_group_lifestyle.s delete mode 100644 data/text/easy_chat/easy_chat_group_misc.s delete mode 100644 data/text/easy_chat/easy_chat_group_move_1.s delete mode 100644 data/text/easy_chat/easy_chat_group_move_2.s delete mode 100644 data/text/easy_chat/easy_chat_group_name_pointers.inc delete mode 100644 data/text/easy_chat/easy_chat_group_people.s delete mode 100644 data/text/easy_chat/easy_chat_group_pokemon.s delete mode 100644 data/text/easy_chat/easy_chat_group_pokemon2.s delete mode 100644 data/text/easy_chat/easy_chat_group_speech.s delete mode 100644 data/text/easy_chat/easy_chat_group_status.s delete mode 100644 data/text/easy_chat/easy_chat_group_time.s delete mode 100644 data/text/easy_chat/easy_chat_group_trainer.s delete mode 100644 data/text/easy_chat/easy_chat_group_trendy_saying.s delete mode 100644 data/text/easy_chat/easy_chat_group_voices.s delete mode 100644 data/text/easy_chat/easy_chat_groups.inc delete mode 100644 data/text/easy_chat/easy_chat_words_by_letter.inc create mode 100755 src/data/easy_chat/easy_chat_group_actions.h create mode 100755 src/data/easy_chat/easy_chat_group_adjectives.h create mode 100755 src/data/easy_chat/easy_chat_group_battle.h create mode 100755 src/data/easy_chat/easy_chat_group_conditions.h create mode 100755 src/data/easy_chat/easy_chat_group_endings.h create mode 100755 src/data/easy_chat/easy_chat_group_events.h create mode 100755 src/data/easy_chat/easy_chat_group_feelings.h create mode 100755 src/data/easy_chat/easy_chat_group_greetings.h create mode 100755 src/data/easy_chat/easy_chat_group_hobbies.h create mode 100755 src/data/easy_chat/easy_chat_group_lifestyle.h create mode 100755 src/data/easy_chat/easy_chat_group_misc.h create mode 100755 src/data/easy_chat/easy_chat_group_move_1.h create mode 100755 src/data/easy_chat/easy_chat_group_move_2.h create mode 100755 src/data/easy_chat/easy_chat_group_people.h create mode 100755 src/data/easy_chat/easy_chat_group_pokemon.h create mode 100755 src/data/easy_chat/easy_chat_group_pokemon2.h create mode 100755 src/data/easy_chat/easy_chat_group_speech.h create mode 100755 src/data/easy_chat/easy_chat_group_status.h create mode 100755 src/data/easy_chat/easy_chat_group_time.h create mode 100755 src/data/easy_chat/easy_chat_group_trainer.h create mode 100755 src/data/easy_chat/easy_chat_group_trendy_saying.h create mode 100755 src/data/easy_chat/easy_chat_group_voices.h create mode 100755 src/data/easy_chat/easy_chat_groups.h create mode 100755 src/data/easy_chat/easy_chat_words_by_letter.h diff --git a/data/easy_chat.s b/data/easy_chat.s deleted file mode 100644 index ef632c69f9..0000000000 --- a/data/easy_chat.s +++ /dev/null @@ -1,489 +0,0 @@ -#include "constants/easy_chat.h" -#include "constants/moves.h" -#include "constants/species.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_08597530:: @ 8597530 - .4byte 0x0000001a - .4byte sub_811A8CC - .4byte 0x00000019 - .4byte sub_811A8F0 - .4byte 0x0000001c - .4byte sub_811A914 - .4byte 0x0000001b - .4byte sub_811A938 - -gEasyChatScreenTemplates:: @ 8597550 - .byte 0x00, 0x02, 0x02, 0x00 - - .align 2 - .4byte gText_Profile - .4byte gText_CombineFourWordsOrPhrases - .4byte gText_AndMakeYourProfile - .4byte gText_YourProfile - .4byte gText_IsAsShownOkay - - .byte 0x01, 0x02, 0x03, 0x01 - - .align 2 - .4byte gText_AtTheBattlesStart - .4byte gText_CombineSixWordsOrPhrases - .4byte gText_AndMakeAMessage - .4byte gText_YourFeelingAtTheBattlesStart - .4byte gText_IsAsShownOkay - - .byte 0x02, 0x02, 0x03, 0x01 - - .align 2 - .4byte gText_UponWinningABattle - .4byte gText_CombineSixWordsOrPhrases - .4byte gText_AndMakeAMessage - .4byte gText_WhatYouSayIfYouWin - .4byte gText_IsAsShownOkay - - .byte 0x03, 0x02, 0x03, 0x01 - - .align 2 - .4byte gText_UponLosingABattle - .4byte gText_CombineSixWordsOrPhrases - .4byte gText_AndMakeAMessage - .4byte gText_WhatYouSayIfYouLose - .4byte gText_IsAsShownOkay - - .byte 0x04, 0x02, 0x05, 0x02 - - .align 2 - .4byte NULL - .4byte gText_CombineNineWordsOrPhrases - .4byte gText_AndMakeAMessage2 - .4byte gText_TheMailMessage - .4byte gText_IsAsShownOkay - - .byte 0x05, 0x02, 0x02, 0x05 - - .align 2 - .4byte gText_Interview - .4byte gText_CombineFourWordsOrPhrases - .4byte gText_LetsReplyToTheInterview - .4byte gText_TheAnswer - .4byte gText_IsAsShownOkay - - .byte 0x06, 0x02, 0x03, 0x01 - - .align 2 - .4byte gText_TheBardsSong - .4byte gText_ChangeJustOneWordOrPhrase - .4byte gText_AndImproveTheBardsSong - .4byte gText_TheBardsSong2 - .4byte gText_IsAsShownOkay - - .byte 0x07, 0x01, 0x01, 0x04 - - .align 2 - .4byte gText_Interview - .4byte gText_FindWordsThatDescribeYour - .4byte gText_FeelingsRightNow - .4byte gText_TheAnswer - .4byte gText_IsAsShownOkay - - .byte 0x09, 0x02, 0x01, 0x03 - - .align 2 - .4byte gText_WhatsHipAndHappening - .4byte gText_CombineTwoWordsOrPhrases - .4byte gText_AndMakeATrendySaying - .4byte gText_TheTrendySaying - .4byte gText_IsAsShownOkay - - .byte 0x10, 0x02, 0x05, 0x87 - - .align 2 - .4byte NULL - .4byte gText_AfterYouHaveReadTheQuiz - .4byte gText_QuestionPressTheAButton - .4byte NULL - .4byte NULL - - .byte 0x0f, 0x01, 0x01, 0x86 - - .align 2 - .4byte gText_TheQuizAnswerIs - .4byte gText_OutOfTheListedChoices - .4byte gText_SelectTheAnswerToTheQuiz - .4byte gText_TheAnswerColon - .4byte gText_IsAsShownOkay - - .byte 0x11, 0x02, 0x05, 0x88 - - .align 2 - .4byte NULL - .4byte gText_CombineNineWordsOrPhrases - .4byte gText_AndCreateAQuiz - .4byte gText_IsThisQuizOK - .4byte NULL - - .byte 0x12, 0x01, 0x01, 0x86 - - .align 2 - .4byte gText_TheQuizAnswerIs - .4byte gText_PickAWordOrPhraseAnd - .4byte gText_SetTheQuizAnswer - .4byte gText_IsThisQuizOK - .4byte NULL - - .byte 0x06, 0x02, 0x03, 0x01 - - .align 2 - .4byte gText_TheBardsSong - .4byte gText_ChangeJustOneWordOrPhrase - .4byte gText_AndImproveTheBardsSong - .4byte gText_TheBardsSong2 - .4byte gText_IsAsShownOkay - - .byte 0x13, 0x02, 0x03, 0x01 - - .align 2 - .4byte gText_ApprenticesPhrase - .4byte gText_FindWordsWhichFit - .4byte gText_TheTrainersImage - .4byte gText_ApprenticePhrase - .4byte gText_IsAsShownOkay - - .byte 0x0d, 0x02, 0x01, 0x03 - - .align 2 - .4byte gText_GoodSaying - .4byte gText_CombineTwoWordsOrPhrases2 - .4byte gText_ToTeachHerAGoodSaying - .4byte gText_TheAnswer - .4byte gText_IsAsShownOkay - - .byte 0x0a, 0x01, 0x01, 0x04 - - .align 2 - .4byte gText_Interview - .4byte gText_FindWordsThatDescribeYour - .4byte gText_FeelingsRightNow - .4byte gText_TheAnswer - .4byte gText_IsAsShownOkay - - .byte 0x0c, 0x01, 0x01, 0x04 - - .align 2 - .4byte gText_Interview - .4byte gText_FindWordsThatDescribeYour - .4byte gText_FeelingsRightNow - .4byte gText_TheAnswer - .4byte gText_IsAsShownOkay - - .byte 0x0b, 0x01, 0x01, 0x04 - - .align 2 - .4byte gText_Interview - .4byte gText_FindWordsThatDescribeYour - .4byte gText_FeelingsRightNow - .4byte gText_TheAnswer - .4byte gText_IsAsShownOkay - - .byte 0x0e, 0x01, 0x01, 0x04 - - .align 2 - .4byte gText_FansQuestion - .4byte gText_FindWordsWhichFit - .4byte gText_TheTrainersImage - .4byte gText_TheImage - .4byte gText_IsAsShownOkay - - .byte 0x14, 0x02, 0x02, 0x00 - - .align 2 - .4byte gText_Questionnaire - .4byte gText_CombineFourWordsOrPhrases - .4byte gText_AndFillOutTheQuestionnaire - .4byte gText_TheAnswer - .4byte gText_IsAsShownOkay - -gUnknown_08597748:: @ 8597748 - .byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00 - .byte 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x00 - .byte 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13 - .byte 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a - -gUnknown_08597764:: @ 8597764 - .2byte 0x0209, 0x140b, 0x1030, 0x102a - -gUnknown_0859776C:: @ 859776C - .2byte 0x1240, 0x0628 - .2byte 0x061f, 0x2204 - .2byte 0x1422, 0x0197 - .2byte 0x0415, 0x0198 - .2byte 0x2207, 0x0449 - - .align 2 -gUnknown_08597780:: @ 8597780 - .incbin "graphics/misc/interview_triangle_cursor.gbapal" - - .align 2 -gUnknown_085977A0:: @ 85977A0 - .incbin "graphics/misc/interview_triangle_cursor.4bpp" - - .align 2 -gUnknown_085977C0:: @ 85977C0 - .incbin "graphics/misc/interview_arrow.4bpp" - - .align 2 -gUnknown_085978C0:: @ 85978C0 - .incbin "graphics/misc/interview_buttons.4bpp" - - .align 2 -gUnknown_085979C0:: @ 85979C0 - .incbin "graphics/misc/interview_frame.gbapal" - - .align 2 -gUnknown_085979E0:: @ 85979E0 - .incbin "graphics/misc/interview_frame.4bpp.lz" - - .align 2 -gUnknown_08597B14:: @ 8597B14 - .incbin "graphics/misc/interview_frame_orange.gbapal" - - .align 2 -gUnknown_08597B34:: @ 8597B34 - .incbin "graphics/misc/interview_frame_green.gbapal" - - .align 2 -gUnknown_08597B54:: @ 8597B54 - .incbin "graphics/misc/interview_frame_2.4bpp.lz" - - .align 2 -gUnknown_08597C1C:: @ 8597C1C - .incbin "graphics/misc/8597C1C.gbapal" - - .align 2 -gUnknown_08597C24:: @ 8597C24 - .incbin "graphics/misc/8597C24.gbapal" - -gUnknown_08597C30:: @ 8597C30 - .byte 0x83, 0x18, 0x04, 0x00 - .byte 0x63, 0x18, 0x06, 0x00 - .byte 0x03, 0x18, 0x0a, 0x00 - .byte 0xa3, 0x18, 0x02, 0x00 - .byte 0xb0, 0x0c, 0x02, 0x00 - .byte 0x83, 0x18, 0x04, 0x00 - .byte 0x89, 0x0c, 0x02, 0x01 - .byte 0x65, 0x14, 0x0a, 0x03 - .byte 0x03, 0x18, 0x0a, 0x02 - - .align 2 -gUnknown_08597C54:: @ 8597C54 - .4byte 0x000001c0, 0x000011dd, 0x002021e2, 0x000031fb - - .align 2 -gUnknown_08597C64:: @ 8597C64 - window_template 0x01, 0x06, 0x00, 0x12, 0x02, 0x0a, 0x0010 - window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0f, 0x000a - window_template 0x02, 0x01, 0x00, 0x1c, 0x20, 0x03, 0x0000 - null_window_template - - .align 2 -gUnknown_08597C84:: @ 8597C84 - window_template 0x00, 0x16, 0x09, 0x05, 0x04, 0x0f, 0x006a - -gUnknown_08597C8C:: @ 8597C8C - .string "{CLEAR 17}$" - - .align 2 -gUnknown_08597C90:: @ 8597C90 - .4byte gUnknown_862B810 - .4byte gUnknown_862B832 - .4byte gUnknown_862B84B - .4byte gUnknown_862B86C - - .align 2 -gUnknown_08597CA0:: @ 8597CA0 - obj_tiles gUnknown_085977A0, 0x0020, 0x0000 - obj_tiles gUnknown_085977C0, 0x0100, 0x0002 - obj_tiles gUnknown_085978C0, 0x0100, 0x0003 - null_obj_tiles - - .align 2 -gUnknown_08597CC0:: @ 8597CC0 - obj_pal gUnknown_08597780, 0x0000 - obj_pal gEasyChatCursor_Pal, 0x0001 - obj_pal gEasyChatRightWindow_Pal, 0x0002 - obj_pal gUnknown_085979C0, 0x0003 - null_obj_pal - - .align 2 -gUnknown_08597CE8:: @ 8597CE8 - obj_tiles gUnknown_085979E0, 0x0800, 0x0005 - obj_tiles gEasyChatCursor_Gfx, 0x1000, 0x0001 - obj_tiles gEasyChatRightWindow_Gfx, 0x0800, 0x0006 - obj_tiles gEasyChatMode_Gfx, 0x1000, 0x0004 - -gUnknown_08597D08:: @ 8597D08 - .byte 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x00 - - .align 2 -gOamData_8597D10:: @ 8597D10 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0C00 - - .align 2 -gUnknown_08597D18:: @ 8597D18 - spr_template 0x0000, 0x0000, gOamData_8597D10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_811DF28 - - .align 2 -gUnknown_08597D30:: @ 8597D30 - .2byte 0x4000, 0xc000, 0x0400, 0x0000 - - .align 2 -gUnknown_08597D38:: @ 8597D38 - .2byte 0x0000, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_08597D40:: @ 8597D40 - .2byte 0x0020, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_08597D48:: @ 8597D48 - .2byte 0x0040, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_08597D50:: @ 8597D50 - .2byte 0x0060, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_08597D58:: @ 8597D58 - .4byte gUnknown_08597D38 - .4byte gUnknown_08597D40 - .4byte gUnknown_08597D48 - .4byte gUnknown_08597D50 - - .align 2 -gUnknown_08597D68:: @ 8597D68 - spr_template 0x0001, 0x0001, gUnknown_08597D30, gUnknown_08597D58, NULL, gDummySpriteAffineAnimTable, sub_811DF28 - - .align 2 -gUnknown_08597D80:: @ 8597D80 - .2byte 0x4000, 0xc000, 0x0400, 0x0000 - - .align 2 -gUnknown_08597D88:: @ 8597D88 - .2byte 0x0060, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_08597D90:: @ 8597D90 - .2byte 0x0040, 0x0004, 0x0020, 0x0004, 0xffff, 0x0000 - - .align 2 -gUnknown_08597D9C:: @ 8597D9C - .2byte 0x0040, 0x0004, 0x0000, 0x0004, 0xffff, 0x0000 - - .align 2 -gUnknown_08597DA8:: @ 8597DA8 - .2byte 0x0040, 0x0004, 0x0060, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_08597DB4:: @ 8597DB4 - .2byte 0x0040, 0x0004, 0xffff, 0x0000 - - .align 2 -gUnknown_08597DBC:: @ 8597DBC - .4byte gUnknown_08597D88 - .4byte gUnknown_08597D90 - .4byte gUnknown_08597D9C - .4byte gUnknown_08597DA8 - .4byte gUnknown_08597DB4 - - .align 2 -gUnknown_08597DD0:: @ 8597DD0 - spr_template 0x0004, 0x0002, gUnknown_08597D80, gUnknown_08597DBC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_08597DE8:: @ 8597DE8 - .2byte 0x0000, 0xc000, 0x0c00, 0x0000 - - .align 2 -gUnknown_08597DF0:: @ 8597DF0 - spr_template 0x0006, 0x0002, gUnknown_08597DE8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_08597E08:: @ 8597E08 - .2byte 0x4000, 0x4000, 0x0400, 0x0000 - - .align 2 -gUnknown_08597E10:: @ 8597E10 - .2byte 0x0000, 0x4000, 0x0400, 0x0000 - - .align 2 -gUnknown_08597E18:: @ 8597E18 - .2byte 0x0000, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_08597E20:: @ 8597E20 - .2byte 0x0004, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_08597E28:: @ 8597E28 - .4byte gUnknown_08597E18 - .4byte gUnknown_08597E20 - - .align 2 -gUnknown_08597E30:: @ 8597E30 - spr_template 0x0003, 0x0002, gUnknown_08597E08, gUnknown_08597E28, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_08597E48:: @ 8597E48 - spr_template 0x0002, 0x0002, gUnknown_08597E10, gUnknown_08597E28, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_08597E60:: @ 8597E60 - .byte 0x10, 0x6f, 0xc4, 0x00 - .byte 0x10, 0x4e, 0x82, 0xa0 - .byte 0x10, 0x50, 0x86, 0xaa - - .align 2 -gUnknown_08597E6C:: @ 8597E6C - .4byte gText_DelAll - .4byte gText_Cancel5 - .4byte gText_Ok2 - .4byte NULL - - .4byte gText_DelAll - .4byte gText_Cancel5 - .4byte gText_Ok2 - .4byte gText_Quiz - - .4byte gText_DelAll - .4byte gText_Cancel5 - .4byte gText_Ok2 - .4byte gText_Answer - -@ 8597E9C - .include "data/text/easy_chat/easy_chat_groups.inc" - -@ 859D0B4 - .include "data/text/easy_chat/easy_chat_words_by_letter.inc" - -@ 859E5D4 - .include "data/text/easy_chat/easy_chat_group_name_pointers.inc" - -gUnknown_0859E62C:: @ 859E62C - .2byte 0x0a29, 0x1020, 0x020e, 0x0a33 - -gUnknown_0859E634:: @ 859E634 - .2byte 0x100f, 0x0a02, 0x0e25, 0x0c03, 0x0803, 0x0c00 - -gUnknown_0859E640:: @ 859E640 - .2byte 0x0c3a, 0x0c3a, 0x0c01, 0x0a2a, 0x0607, 0x0c01 - -gUnknown_0859E64C:: @ 859E64C - .2byte 0x1039, 0x122e, 0x0c04, 0x0a3d, 0x0630, 0x0c04 - -gUnknown_0859E658:: @ 859E658 - .2byte 0x019a, 0x0000 diff --git a/data/text/easy_chat/easy_chat_group_actions.s b/data/text/easy_chat/easy_chat_group_actions.s deleted file mode 100644 index 432323e959..0000000000 --- a/data/text/easy_chat/easy_chat_group_actions.s +++ /dev/null @@ -1,547 +0,0 @@ -gEasyChatWord_Meets:: @ 859B058 - .string "MEETS$" - -gEasyChatWord_Concede:: @ 859B05E - .string "CONCEDE$" - -gEasyChatWord_Give:: @ 859B066 - .string "GIVE$" - -gEasyChatWord_Gives:: @ 859B06B - .string "GIVES$" - -gEasyChatWord_Played:: @ 859B071 - .string "PLAYED$" - -gEasyChatWord_Plays:: @ 859B078 - .string "PLAYS$" - -gEasyChatWord_Collect:: @ 859B07E - .string "COLLECT$" - -gEasyChatWord_Walking:: @ 859B086 - .string "WALKING$" - -gEasyChatWord_Walks:: @ 859B08E - .string "WALKS$" - -gEasyChatWord_Says:: @ 859B094 - .string "SAYS$" - -gEasyChatWord_Went:: @ 859B099 - .string "WENT$" - -gEasyChatWord_Said:: @ 859B09E - .string "SAID$" - -gEasyChatWord_WakeUp:: @ 859B0A3 - .string "WAKE UP$" - -gEasyChatWord_WakesUp:: @ 859B0AB - .string "WAKES UP$" - -gEasyChatWord_Angers:: @ 859B0B4 - .string "ANGERS$" - -gEasyChatWord_Teach:: @ 859B0BB - .string "TEACH$" - -gEasyChatWord_Teaches:: @ 859B0C1 - .string "TEACHES$" - -gEasyChatWord_Please:: @ 859B0C9 - .string "PLEASE$" - -gEasyChatWord_Learn:: @ 859B0D0 - .string "LEARN$" - -gEasyChatWord_Change:: @ 859B0D6 - .string "CHANGE$" - -gEasyChatWord_Story:: @ 859B0DD - .string "STORY$" - -gEasyChatWord_Trust:: @ 859B0E3 - .string "TRUST$" - -gEasyChatWord_Lavish:: @ 859B0E9 - .string "LAVISH$" - -gEasyChatWord_Listens:: @ 859B0F0 - .string "LISTENS$" - -gEasyChatWord_Hearing:: @ 859B0F8 - .string "HEARING$" - -gEasyChatWord_Trains:: @ 859B100 - .string "TRAINS$" - -gEasyChatWord_Choose:: @ 859B107 - .string "CHOOSE$" - -gEasyChatWord_Come:: @ 859B10E - .string "COME$" - -gEasyChatWord_Came:: @ 859B113 - .string "CAME$" - -gEasyChatWord_Search:: @ 859B118 - .string "SEARCH$" - -gEasyChatWord_Make:: @ 859B11F - .string "MAKE$" - -gEasyChatWord_Cause:: @ 859B124 - .string "CAUSE$" - -gEasyChatWord_Know:: @ 859B12A - .string "KNOW$" - -gEasyChatWord_Knows:: @ 859B12F - .string "KNOWS$" - -gEasyChatWord_Refuse:: @ 859B135 - .string "REFUSE$" - -gEasyChatWord_Stores:: @ 859B13C - .string "STORES$" - -gEasyChatWord_Brag:: @ 859B143 - .string "BRAG$" - -gEasyChatWord_Ignorant:: @ 859B148 - .string "IGNORANT$" - -gEasyChatWord_Thinks:: @ 859B151 - .string "THINKS$" - -gEasyChatWord_Believe:: @ 859B158 - .string "BELIEVE$" - -gEasyChatWord_Slide:: @ 859B160 - .string "SLIDE$" - -gEasyChatWord_Eats:: @ 859B166 - .string "EATS$" - -gEasyChatWord_Use:: @ 859B16B - .string "USE$" - -gEasyChatWord_Uses:: @ 859B16F - .string "USES$" - -gEasyChatWord_Using:: @ 859B174 - .string "USING$" - -gEasyChatWord_Couldnt:: @ 859B17A - .string "COULDN'T$" - -gEasyChatWord_Capable:: @ 859B183 - .string "CAPABLE$" - -gEasyChatWord_Disappear:: @ 859B18B - .string "DISAPPEAR$" - -gEasyChatWord_Appear:: @ 859B195 - .string "APPEAR$" - -gEasyChatWord_Throw:: @ 859B19C - .string "THROW$" - -gEasyChatWord_Worry:: @ 859B1A2 - .string "WORRY$" - -gEasyChatWord_Slept:: @ 859B1A8 - .string "SLEPT$" - -gEasyChatWord_Sleep:: @ 859B1AE - .string "SLEEP$" - -gEasyChatWord_Release:: @ 859B1B4 - .string "RELEASE$" - -gEasyChatWord_Drinks:: @ 859B1BC - .string "DRINKS$" - -gEasyChatWord_Runs:: @ 859B1C3 - .string "RUNS$" - -gEasyChatWord_Run:: @ 859B1C8 - .string "RUN$" - -gEasyChatWord_Works:: @ 859B1CC - .string "WORKS$" - -gEasyChatWord_Working:: @ 859B1D2 - .string "WORKING$" - -gEasyChatWord_Talking:: @ 859B1DA - .string "TALKING$" - -gEasyChatWord_Talk:: @ 859B1E2 - .string "TALK$" - -gEasyChatWord_Sink:: @ 859B1E7 - .string "SINK$" - -gEasyChatWord_Smack:: @ 859B1EC - .string "SMACK$" - -gEasyChatWord_Pretend:: @ 859B1F2 - .string "PRETEND$" - -gEasyChatWord_Praise:: @ 859B1FA - .string "PRAISE$" - -gEasyChatWord_Overdo:: @ 859B201 - .string "OVERDO$" - -gEasyChatWord_Show:: @ 859B208 - .string "SHOW$" - -gEasyChatWord_Looks:: @ 859B20D - .string "LOOKS$" - -gEasyChatWord_Sees:: @ 859B213 - .string "SEES$" - -gEasyChatWord_Seek:: @ 859B218 - .string "SEEK$" - -gEasyChatWord_Own:: @ 859B21D - .string "OWN$" - -gEasyChatWord_Take:: @ 859B221 - .string "TAKE$" - -gEasyChatWord_Allow:: @ 859B226 - .string "ALLOW$" - -gEasyChatWord_Forget:: @ 859B22C - .string "FORGET$" - -gEasyChatWord_Forgets:: @ 859B233 - .string "FORGETS$" - -gEasyChatWord_Appears:: @ 859B23B - .string "APPEARS$" - -gEasyChatWord_Faint:: @ 859B243 - .string "FAINT$" - -gEasyChatWord_Fainted:: @ 859B249 - .string "FAINTED$" - - .align 2 -gEasyChatGroup_Actions:: @ 859B254 - .4byte gEasyChatWord_Meets - .4byte 72 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Concede - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Give - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Gives - .4byte 75 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Played - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Plays - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Collect - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Walking - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Walks - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Says - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Went - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Said - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WakeUp - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WakesUp - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Angers - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Teach - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Teaches - .4byte 54 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Please - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Learn - .4byte 76 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Change - .4byte 77 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Story - .4byte 73 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Trust - .4byte 74 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lavish - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Listens - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hearing - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Trains - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Choose - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Come - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Came - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Search - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Make - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cause - .4byte 67 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Know - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Knows - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Refuse - .4byte 65 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Stores - .4byte 70 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Brag - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ignorant - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Thinks - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Believe - .4byte 64 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Slide - .4byte 63 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Eats - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Use - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Uses - .4byte 56 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Using - .4byte 55 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Couldnt - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Capable - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Disappear - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Appear - .4byte 69 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Throw - .4byte 68 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Worry - .4byte 66 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Slept - .4byte 61 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sleep - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Release - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Drinks - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Runs - .4byte 62 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Run - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Works - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Working - .4byte 71 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Talking - .4byte 60 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Talk - .4byte 59 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sink - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Smack - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pretend - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Praise - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Overdo - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Show - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Looks - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sees - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Seek - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Own - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Take - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Allow - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Forget - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Forgets - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Appears - .4byte 58 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Faint - .4byte 57 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fainted - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_adjectives.s b/data/text/easy_chat/easy_chat_group_adjectives.s deleted file mode 100644 index 08142d41c6..0000000000 --- a/data/text/easy_chat/easy_chat_group_adjectives.s +++ /dev/null @@ -1,253 +0,0 @@ -gEasyChatWord_Wandering:: @ 859C3B8 - .string "WANDERING$" - -gEasyChatWord_Rickety:: @ 859C3C2 - .string "RICKETY$" - -gEasyChatWord_RockSolid:: @ 859C3CA - .string "ROCK-SOLID$" - -gEasyChatWord_Hungry:: @ 859C3D5 - .string "HUNGRY$" - -gEasyChatWord_Tight:: @ 859C3DC - .string "TIGHT$" - -gEasyChatWord_Ticklish:: @ 859C3E2 - .string "TICKLISH$" - -gEasyChatWord_Twirling:: @ 859C3EB - .string "TWIRLING$" - -gEasyChatWord_Spiraling:: @ 859C3F4 - .string "SPIRALING$" - -gEasyChatWord_Thirsty:: @ 859C3FE - .string "THIRSTY$" - -gEasyChatWord_Lolling:: @ 859C406 - .string "LOLLING$" - -gEasyChatWord_Silky:: @ 859C40E - .string "SILKY$" - -gEasyChatWord_Sadly:: @ 859C414 - .string "SADLY$" - -gEasyChatWord_Hopeless:: @ 859C41A - .string "HOPELESS$" - -gEasyChatWord_Useless:: @ 859C423 - .string "USELESS$" - -gEasyChatWord_Drooling:: @ 859C42B - .string "DROOLING$" - -gEasyChatWord_Exciting:: @ 859C434 - .string "EXCITING$" - -gEasyChatWord_Thick:: @ 859C43D - .string "THICK$" - -gEasyChatWord_Smooth:: @ 859C443 - .string "SMOOTH$" - -gEasyChatWord_Slimy:: @ 859C44A - .string "SLIMY$" - -gEasyChatWord_Thin:: @ 859C450 - .string "THIN$" - -gEasyChatWord_Break:: @ 859C455 - .string "BREAK$" - -gEasyChatWord_Voracious:: @ 859C45B - .string "VORACIOUS$" - -gEasyChatWord_Scatter:: @ 859C465 - .string "SCATTER$" - -gEasyChatWord_Awesome:: @ 859C46D - .string "AWESOME$" - -gEasyChatWord_Wimpy:: @ 859C475 - .string "WIMPY$" - -gEasyChatWord_Wobbly:: @ 859C47B - .string "WOBBLY$" - -gEasyChatWord_Shaky:: @ 859C482 - .string "SHAKY$" - -gEasyChatWord_Ripped:: @ 859C488 - .string "RIPPED$" - -gEasyChatWord_Shredded:: @ 859C48F - .string "SHREDDED$" - -gEasyChatWord_Increasing:: @ 859C498 - .string "INCREASING$" - -gEasyChatWord_Yet:: @ 859C4A3 - .string "YET$" - -gEasyChatWord_Destroyed:: @ 859C4A7 - .string "DESTROYED$" - -gEasyChatWord_Fiery:: @ 859C4B1 - .string "FIERY$" - -gEasyChatWord_LoveyDovey:: @ 859C4B7 - .string "LOVEY-DOVEY$" - -gEasyChatWord_Happily:: @ 859C4C3 - .string "HAPPILY$" - -gEasyChatWord_Anticipation:: @ 859C4CB - .string "ANTICIPATION$" - - .align 2 -gEasyChatGroup_Adjectives:: @ 859C4D8 - .4byte gEasyChatWord_Wandering - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rickety - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_RockSolid - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hungry - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tight - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ticklish - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Twirling - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Spiraling - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Thirsty - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lolling - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Silky - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sadly - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hopeless - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Useless - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Drooling - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Exciting - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Thick - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Smooth - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Slimy - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Thin - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Break - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Voracious - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Scatter - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Awesome - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wimpy - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wobbly - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Shaky - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ripped - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Shredded - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Increasing - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Yet - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Destroyed - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fiery - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_LoveyDovey - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Happily - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Anticipation - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_battle.s b/data/text/easy_chat/easy_chat_group_battle.s deleted file mode 100644 index 1f1175980c..0000000000 --- a/data/text/easy_chat/easy_chat_group_battle.s +++ /dev/null @@ -1,442 +0,0 @@ -gEasyChatWord_MatchUp:: @ 8598B3C - .string "MATCH UP$" - -gEasyChatWord_Go:: @ 8598B45 - .string "GO$" - -gEasyChatWord_No1:: @ 8598B48 - .string "NO. 1$" - -gEasyChatWord_Decide:: @ 8598B4E - .string "DECIDE$" - -gEasyChatWord_LetMeWin:: @ 8598B55 - .string "LET ME WIN$" - -gEasyChatWord_Wins:: @ 8598B60 - .string "WINS$" - -gEasyChatWord_Win:: @ 8598B65 - .string "WIN$" - -gEasyChatWord_Won:: @ 8598B69 - .string "WON$" - -gEasyChatWord_IfIWin:: @ 8598B6D - .string "IF I WIN$" - -gEasyChatWord_WhenIWin:: @ 8598B76 - .string "WHEN I WIN$" - -gEasyChatWord_CantWin:: @ 8598B81 - .string "CAN'T WIN$" - -gEasyChatWord_CanWin:: @ 8598B8B - .string "CAN WIN$" - -gEasyChatWord_NoMatch:: @ 8598B93 - .string "NO MATCH$" - -gEasyChatWord_Spirit:: @ 8598B9C - .string "SPIRIT$" - -gEasyChatWord_Decided:: @ 8598BA3 - .string "DECIDED$" - -gEasyChatWord_TrumpCard:: @ 8598BAB - .string "TRUMP CARD$" - -gEasyChatWord_TakeThat:: @ 8598BB6 - .string "TAKE THAT$" - -gEasyChatWord_ComeOn:: @ 8598BC0 - .string "COME ON$" - -gEasyChatWord_Attack:: @ 8598BC8 - .string "ATTACK$" - -gEasyChatWord_Surrender:: @ 8598BCF - .string "SURRENDER$" - -gEasyChatWord_Gutsy:: @ 8598BD9 - .string "GUTSY$" - -gEasyChatWord_Talent:: @ 8598BDF - .string "TALENT$" - -gEasyChatWord_Strategy:: @ 8598BE6 - .string "STRATEGY$" - -gEasyChatWord_Smite:: @ 8598BEF - .string "SMITE$" - -gEasyChatWord_Match:: @ 8598BF5 - .string "MATCH$" - -gEasyChatWord_Victory:: @ 8598BFB - .string "VICTORY$" - -gEasyChatWord_Offensive:: @ 8598C03 - .string "OFFENSIVE$" - -gEasyChatWord_Sense:: @ 8598C0D - .string "SENSE$" - -gEasyChatWord_Versus:: @ 8598C13 - .string "VERSUS$" - -gEasyChatWord_Fights:: @ 8598C1A - .string "FIGHTS$" - -gEasyChatWord_Power:: @ 8598C21 - .string "POWER$" - -gEasyChatWord_Challenge:: @ 8598C27 - .string "CHALLENGE$" - -gEasyChatWord_Strong:: @ 8598C31 - .string "STRONG$" - -gEasyChatWord_TooStrong:: @ 8598C38 - .string "TOO STRONG$" - -gEasyChatWord_GoEasy:: @ 8598C43 - .string "GO EASY$" - -gEasyChatWord_Foe:: @ 8598C4B - .string "FOE$" - -gEasyChatWord_Genius:: @ 8598C4F - .string "GENIUS$" - -gEasyChatWord_Legend:: @ 8598C56 - .string "LEGEND$" - -gEasyChatWord_Escape:: @ 8598C5D - .string "ESCAPE$" - -gEasyChatWord_Aim:: @ 8598C64 - .string "AIM$" - -gEasyChatWord_Battle:: @ 8598C68 - .string "BATTLE$" - -gEasyChatWord_Fight:: @ 8598C6F - .string "FIGHT$" - -gEasyChatWord_Resuscitate:: @ 8598C75 - .string "RESUSCITATE$" - -gEasyChatWord_Points:: @ 8598C81 - .string "POINTS$" - -gEasyChatWord_Serious:: @ 8598C88 - .string "SERIOUS$" - -gEasyChatWord_GiveUp:: @ 8598C90 - .string "GIVE UP$" - -gEasyChatWord_Loss:: @ 8598C98 - .string "LOSS$" - -gEasyChatWord_IfILose:: @ 8598C9D - .string "IF I LOSE$" - -gEasyChatWord_Lost:: @ 8598CA7 - .string "LOST$" - -gEasyChatWord_Lose:: @ 8598CAC - .string "LOSE$" - -gEasyChatWord_Guard:: @ 8598CB1 - .string "GUARD$" - -gEasyChatWord_Partner:: @ 8598CB7 - .string "PARTNER$" - -gEasyChatWord_Reject:: @ 8598CBF - .string "REJECT$" - -gEasyChatWord_Accept:: @ 8598CC6 - .string "ACCEPT$" - -gEasyChatWord_Invincible:: @ 8598CCD - .string "INVINCIBLE$" - -gEasyChatWord_Received:: @ 8598CD8 - .string "RECEIVED$" - -gEasyChatWord_Easy:: @ 8598CE1 - .string "EASY$" - -gEasyChatWord_Weak:: @ 8598CE6 - .string "WEAK$" - -gEasyChatWord_TooWeak:: @ 8598CEB - .string "TOO WEAK$" - -gEasyChatWord_Pushover:: @ 8598CF4 - .string "PUSHOVER$" - -gEasyChatWord_Leader:: @ 8598CFD - .string "LEADER$" - -gEasyChatWord_Rule:: @ 8598D04 - .string "RULE$" - -gEasyChatWord_Move:: @ 8598D09 - .string "MOVE$" - - .align 2 -gEasyChatGroup_Battle:: @ 8598D10 - .4byte gEasyChatWord_MatchUp - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Go - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_No1 - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Decide - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_LetMeWin - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wins - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Win - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Won - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_IfIWin - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WhenIWin - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_CantWin - .4byte 56 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_CanWin - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_NoMatch - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Spirit - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Decided - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_TrumpCard - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_TakeThat - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ComeOn - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Attack - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Surrender - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Gutsy - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Talent - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Strategy - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Smite - .4byte 54 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Match - .4byte 60 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Victory - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Offensive - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sense - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Versus - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fights - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Power - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Challenge - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Strong - .4byte 62 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_TooStrong - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_GoEasy - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Foe - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Genius - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Legend - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Escape - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Aim - .4byte 59 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Battle - .4byte 55 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fight - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Resuscitate - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Points - .4byte 61 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Serious - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_GiveUp - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Loss - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_IfILose - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lost - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lose - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Guard - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Partner - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Reject - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Accept - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Invincible - .4byte 58 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Received - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Easy - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Weak - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_TooWeak - .4byte 57 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pushover - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Leader - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rule - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Move - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_conditions.s b/data/text/easy_chat/easy_chat_group_conditions.s deleted file mode 100644 index 2afbca0204..0000000000 --- a/data/text/easy_chat/easy_chat_group_conditions.s +++ /dev/null @@ -1,484 +0,0 @@ -gEasyChatWord_Hot:: @ 859AB2C - .string "HOT$" - -gEasyChatWord_Exists:: @ 859AB30 - .string "EXISTS$" - -gEasyChatWord_Excess:: @ 859AB37 - .string "EXCESS$" - -gEasyChatWord_Approved:: @ 859AB3E - .string "APPROVED$" - -gEasyChatWord_Has:: @ 859AB47 - .string "HAS$" - -gEasyChatWord_Good:: @ 859AB4B - .string "GOOD$" - -gEasyChatWord_Less:: @ 859AB50 - .string "LESS$" - -gEasyChatWord_Momentum:: @ 859AB55 - .string "MOMENTUM$" - -gEasyChatWord_Going:: @ 859AB5E - .string "GOING$" - -gEasyChatWord_Weird:: @ 859AB64 - .string "WEIRD$" - -gEasyChatWord_Busy:: @ 859AB6A - .string "BUSY$" - -gEasyChatWord_Together:: @ 859AB6F - .string "TOGETHER$" - -gEasyChatWord_Full:: @ 859AB78 - .string "FULL$" - -gEasyChatWord_Absent:: @ 859AB7D - .string "ABSENT$" - -gEasyChatWord_Being:: @ 859AB84 - .string "BEING$" - -gEasyChatWord_Need:: @ 859AB8A - .string "NEED$" - -gEasyChatWord_Tasty:: @ 859AB8F - .string "TASTY$" - -gEasyChatWord_Skilled:: @ 859AB95 - .string "SKILLED$" - -gEasyChatWord_Noisy:: @ 859AB9D - .string "NOISY$" - -gEasyChatWord_Big:: @ 859ABA3 - .string "BIG$" - -gEasyChatWord_Late:: @ 859ABA7 - .string "LATE$" - -gEasyChatWord_Close:: @ 859ABAC - .string "CLOSE$" - -gEasyChatWord_Docile:: @ 859ABB2 - .string "DOCILE$" - -gEasyChatWord_Amusing:: @ 859ABB9 - .string "AMUSING$" - -gEasyChatWord_Entertaining:: @ 859ABC1 - .string "ENTERTAINING$" - -gEasyChatWord_Perfection:: @ 859ABCE - .string "PERFECTION$" - -gEasyChatWord_Pretty:: @ 859ABD9 - .string "PRETTY$" - -gEasyChatWord_Healthy:: @ 859ABE0 - .string "HEALTHY$" - -gEasyChatWord_Excellent:: @ 859ABE8 - .string "EXCELLENT$" - -gEasyChatWord_UpsideDown:: @ 859ABF2 - .string "UPSIDE DOWN$" - -gEasyChatWord_Cold:: @ 859ABFE - .string "COLD$" - -gEasyChatWord_Refreshing:: @ 859AC03 - .string "REFRESHING$" - -gEasyChatWord_Unavoidable:: @ 859AC0E - .string "UNAVOIDABLE$" - -gEasyChatWord_Much:: @ 859AC1A - .string "MUCH$" - -gEasyChatWord_Overwhelming:: @ 859AC1F - .string "OVERWHELMING$" - -gEasyChatWord_Fabulous:: @ 859AC2C - .string "FABULOUS$" - -gEasyChatWord_Else:: @ 859AC35 - .string "ELSE$" - -gEasyChatWord_Expensive:: @ 859AC3A - .string "EXPENSIVE$" - -gEasyChatWord_Correct:: @ 859AC44 - .string "CORRECT$" - -gEasyChatWord_Impossible:: @ 859AC4C - .string "IMPOSSIBLE$" - -gEasyChatWord_Small:: @ 859AC57 - .string "SMALL$" - -gEasyChatWord_Different:: @ 859AC5D - .string "DIFFERENT$" - -gEasyChatWord_Tired:: @ 859AC67 - .string "TIRED$" - -gEasyChatWord_Skill:: @ 859AC6D - .string "SKILL$" - -gEasyChatWord_Top:: @ 859AC73 - .string "TOP$" - -gEasyChatWord_NonStop:: @ 859AC77 - .string "NON-STOP$" - -gEasyChatWord_Preposterous:: @ 859AC80 - .string "PREPOSTEROUS$" - -gEasyChatWord_None:: @ 859AC8D - .string "NONE$" - -gEasyChatWord_Nothing:: @ 859AC92 - .string "NOTHING$" - -gEasyChatWord_Natural:: @ 859AC9A - .string "NATURAL$" - -gEasyChatWord_Becomes:: @ 859ACA2 - .string "BECOMES$" - -gEasyChatWord_Lukewarm:: @ 859ACAA - .string "LUKEWARM$" - -gEasyChatWord_Fast:: @ 859ACB3 - .string "FAST$" - -gEasyChatWord_Low:: @ 859ACB8 - .string "LOW$" - -gEasyChatWord_Awful:: @ 859ACBC - .string "AWFUL$" - -gEasyChatWord_Alone:: @ 859ACC2 - .string "ALONE$" - -gEasyChatWord_Bored:: @ 859ACC8 - .string "BORED$" - -gEasyChatWord_Secret:: @ 859ACCE - .string "SECRET$" - -gEasyChatWord_Mystery:: @ 859ACD5 - .string "MYSTERY$" - -gEasyChatWord_Lacks:: @ 859ACDD - .string "LACKS$" - -gEasyChatWord_Best:: @ 859ACE3 - .string "BEST$" - -gEasyChatWord_Lousy:: @ 859ACE8 - .string "LOUSY$" - -gEasyChatWord_Mistake:: @ 859ACEE - .string "MISTAKE$" - -gEasyChatWord_Kind:: @ 859ACF6 - .string "KIND$" - -gEasyChatWord_Well:: @ 859ACFB - .string "WELL$" - -gEasyChatWord_Weakened:: @ 859AD00 - .string "WEAKENED$" - -gEasyChatWord_Simple:: @ 859AD09 - .string "SIMPLE$" - -gEasyChatWord_Seems:: @ 859AD10 - .string "SEEMS$" - -gEasyChatWord_Badly:: @ 859AD16 - .string "BADLY$" - - .align 2 -gEasyChatGroup_Conditions:: @ 859AD1C - .4byte gEasyChatWord_Hot - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Exists - .4byte 55 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Excess - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Approved - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Has - .4byte 54 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Good - .4byte 68 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Less - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Momentum - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Going - .4byte 60 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Weird - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Busy - .4byte 56 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Together - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Full - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Absent - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Being - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Need - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tasty - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Skilled - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Noisy - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Big - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Late - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Close - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Docile - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Amusing - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Entertaining - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Perfection - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pretty - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Healthy - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Excellent - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_UpsideDown - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cold - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Refreshing - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Unavoidable - .4byte 63 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Much - .4byte 59 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Overwhelming - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fabulous - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Else - .4byte 61 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Expensive - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Correct - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Impossible - .4byte 62 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Small - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Different - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tired - .4byte 58 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Skill - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Top - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_NonStop - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Preposterous - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_None - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Nothing - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Natural - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Becomes - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lukewarm - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fast - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Low - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Awful - .4byte 57 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Alone - .4byte 67 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Bored - .4byte 66 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Secret - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mystery - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lacks - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Best - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lousy - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mistake - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Kind - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Well - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Weakened - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Simple - .4byte 65 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Seems - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Badly - .4byte 64 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_endings.s b/data/text/easy_chat/easy_chat_group_endings.s deleted file mode 100644 index 4d79c9a69e..0000000000 --- a/data/text/easy_chat/easy_chat_group_endings.s +++ /dev/null @@ -1,484 +0,0 @@ -gEasyChatWord_Will:: @ 859A158 - .string "WILL$" - -gEasyChatWord_WillBeHere:: @ 859A15D - .string "WILL BE HERE$" - -gEasyChatWord_Or:: @ 859A16A - .string "OR$" - -gEasyChatWord_Times:: @ 859A16D - .string "TIMES$" - -gEasyChatWord_Wonder:: @ 859A173 - .string "WONDER$" - -gEasyChatWord_IsItQues:: @ 859A17A - .string "IS IT?$" - -gEasyChatWord_Be:: @ 859A181 - .string "BE$" - -gEasyChatWord_Gimme:: @ 859A184 - .string "GIMME$" - -gEasyChatWord_Could:: @ 859A18A - .string "COULD$" - -gEasyChatWord_LikelyTo:: @ 859A190 - .string "LIKELY TO$" - -gEasyChatWord_Would:: @ 859A19A - .string "WOULD$" - -gEasyChatWord_Is:: @ 859A1A0 - .string "IS$" - -gEasyChatWord_IsntItQues:: @ 859A1A3 - .string "ISN'T IT?$" - -gEasyChatWord_Lets:: @ 859A1AD - .string "LET'S$" - -gEasyChatWord_Other:: @ 859A1B3 - .string "OTHER$" - -gEasyChatWord_Are:: @ 859A1B9 - .string "ARE$" - -gEasyChatWord_Was:: @ 859A1BD - .string "WAS$" - -gEasyChatWord_Were:: @ 859A1C1 - .string "WERE$" - -gEasyChatWord_Those:: @ 859A1C6 - .string "THOSE$" - -gEasyChatWord_Isnt:: @ 859A1CC - .string "ISN'T$" - -gEasyChatWord_Wont:: @ 859A1D2 - .string "WON'T$" - -gEasyChatWord_Cant:: @ 859A1D8 - .string "CAN'T$" - -gEasyChatWord_Can:: @ 859A1DE - .string "CAN$" - -gEasyChatWord_Dont:: @ 859A1E2 - .string "DON'T$" - -gEasyChatWord_Do:: @ 859A1E8 - .string "DO$" - -gEasyChatWord_Does:: @ 859A1EB - .string "DOES$" - -gEasyChatWord_Whom:: @ 859A1F0 - .string "WHOM$" - -gEasyChatWord_Which:: @ 859A1F5 - .string "WHICH$" - -gEasyChatWord_Wasnt:: @ 859A1FB - .string "WASN'T$" - -gEasyChatWord_Werent:: @ 859A202 - .string "WEREN'T$" - -gEasyChatWord_Have:: @ 859A20A - .string "HAVE$" - -gEasyChatWord_Havent:: @ 859A20F - .string "HAVEN'T$" - -gEasyChatWord_A:: @ 859A217 - .string "A$" - -gEasyChatWord_An:: @ 859A219 - .string "AN$" - -gEasyChatWord_Not:: @ 859A21C - .string "NOT$" - -gEasyChatWord_There:: @ 859A220 - .string "THERE$" - -gEasyChatWord_OkQues:: @ 859A226 - .string "OK?$" - -gEasyChatWord_So:: @ 859A22A - .string "SO$" - -gEasyChatWord_Maybe:: @ 859A22D - .string "MAYBE$" - -gEasyChatWord_About:: @ 859A233 - .string "ABOUT$" - -gEasyChatWord_Over:: @ 859A239 - .string "OVER$" - -gEasyChatWord_It:: @ 859A23E - .string "IT$" - -gEasyChatWord_All:: @ 859A241 - .string "ALL$" - -gEasyChatWord_For:: @ 859A245 - .string "FOR$" - -gEasyChatWord_On:: @ 859A249 - .string "ON$" - -gEasyChatWord_Off:: @ 859A24C - .string "OFF$" - -gEasyChatWord_As:: @ 859A250 - .string "AS$" - -gEasyChatWord_To:: @ 859A253 - .string "TO$" - -gEasyChatWord_With:: @ 859A256 - .string "WITH$" - -gEasyChatWord_Better:: @ 859A25B - .string "BETTER$" - -gEasyChatWord_Ever:: @ 859A262 - .string "EVER$" - -gEasyChatWord_Since:: @ 859A267 - .string "SINCE$" - -gEasyChatWord_Of:: @ 859A26D - .string "OF$" - -gEasyChatWord_BelongsTo:: @ 859A270 - .string "BELONGS TO$" - -gEasyChatWord_At:: @ 859A27B - .string "AT$" - -gEasyChatWord_In:: @ 859A27E - .string "IN$" - -gEasyChatWord_Out:: @ 859A281 - .string "OUT$" - -gEasyChatWord_Too:: @ 859A285 - .string "TOO$" - -gEasyChatWord_Like:: @ 859A289 - .string "LIKE$" - -gEasyChatWord_Did:: @ 859A28E - .string "DID$" - -gEasyChatWord_Didnt:: @ 859A292 - .string "DIDN'T$" - -gEasyChatWord_Doesnt:: @ 859A299 - .string "DOESN'T$" - -gEasyChatWord_Without:: @ 859A2A1 - .string "WITHOUT$" - -gEasyChatWord_After:: @ 859A2A9 - .string "AFTER$" - -gEasyChatWord_Before:: @ 859A2AF - .string "BEFORE$" - -gEasyChatWord_While:: @ 859A2B6 - .string "WHILE$" - -gEasyChatWord_Than:: @ 859A2BC - .string "THAN$" - -gEasyChatWord_Once:: @ 859A2C1 - .string "ONCE$" - -gEasyChatWord_Anywhere:: @ 859A2C6 - .string "ANYWHERE$" - - .align 2 -gEasyChatGroup_Endings:: @ 859A2D0 - .4byte gEasyChatWord_Will - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WillBeHere - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Or - .4byte 63 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Times - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wonder - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_IsItQues - .4byte 68 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Be - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Gimme - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Could - .4byte 54 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_LikelyTo - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Would - .4byte 64 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Is - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_IsntItQues - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lets - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Other - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Are - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Was - .4byte 59 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Were - .4byte 60 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Those - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Isnt - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wont - .4byte 61 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cant - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Can - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Dont - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Do - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Does - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Whom - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Which - .4byte 55 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wasnt - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Werent - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Have - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Havent - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_A - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_An - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Not - .4byte 58 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_There - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_OkQues - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_So - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Maybe - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_About - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Over - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_It - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_All - .4byte 67 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_For - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_On - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Off - .4byte 56 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_As - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_To - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_With - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Better - .4byte 66 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ever - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Since - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Of - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_BelongsTo - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_At - .4byte 57 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_In - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Out - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Too - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Like - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Did - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Didnt - .4byte 65 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Doesnt - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Without - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_After - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Before - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_While - .4byte 62 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Than - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Once - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Anywhere - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_events.s b/data/text/easy_chat/easy_chat_group_events.s deleted file mode 100644 index f603908b7d..0000000000 --- a/data/text/easy_chat/easy_chat_group_events.s +++ /dev/null @@ -1,204 +0,0 @@ -gEasyChatWord_Appeal:: @ 859C688 - .string "APPEAL$" - -gEasyChatWord_Events:: @ 859C68F - .string "EVENTS$" - -gEasyChatWord_StayAtHome:: @ 859C696 - .string "STAY-AT-HOME$" - -gEasyChatWord_Berry:: @ 859C6A3 - .string "BERRY$" - -gEasyChatWord_Contest:: @ 859C6A9 - .string "CONTEST$" - -gEasyChatWord_Mc:: @ 859C6B1 - .string "MC$" - -gEasyChatWord_Judge:: @ 859C6B4 - .string "JUDGE$" - -gEasyChatWord_Super:: @ 859C6BA - .string "SUPER$" - -gEasyChatWord_Stage:: @ 859C6C0 - .string "STAGE$" - -gEasyChatWord_HallOfFame:: @ 859C6C6 - .string "HALL OF FAME$" - -gEasyChatWord_Evolution:: @ 859C6D3 - .string "EVOLUTION$" - -gEasyChatWord_Hyper:: @ 859C6DD - .string "HYPER$" - -gEasyChatWord_BattleTower:: @ 859C6E3 - .string "BATTLE TOWER$" - -gEasyChatWord_Leaders:: @ 859C6F0 - .string "LEADERS$" - -gEasyChatWord_BattleRoom:: @ 859C6F8 - .string "BATTLE ROOM$" - -gEasyChatWord_Hidden:: @ 859C704 - .string "HIDDEN$" - -gEasyChatWord_SecretBase:: @ 859C70B - .string "SECRET BASE$" - -gEasyChatWord_Blend:: @ 859C717 - .string "BLEND$" - -gEasyChatWord_POKEBLOCK:: @ 859C71D - .string "{POKEBLOCK}$" - -gEasyChatWord_Master:: @ 859C723 - .string "MASTER$" - -gEasyChatWord_Rank:: @ 859C72A - .string "RANK$" - -gEasyChatWord_Ribbon:: @ 859C72F - .string "RIBBON$" - -gEasyChatWord_Crush:: @ 859C736 - .string "CRUSH$" - -gEasyChatWord_Direct:: @ 859C73C - .string "DIRECT$" - -gEasyChatWord_Tower:: @ 859C743 - .string "TOWER$" - -gEasyChatWord_Union:: @ 859C749 - .string "UNION$" - -gEasyChatWord_Room:: @ 859C74F - .string "ROOM$" - -gEasyChatWord_Wireless:: @ 859C754 - .string "WIRELESS$" - -gEasyChatWord_Frontier:: @ 859C75D - .string "FRONTIER$" - - .align 2 -gEasyChatGroup_Events:: @ 859C768 - .4byte gEasyChatWord_Appeal - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Events - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_StayAtHome - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Berry - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Contest - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mc - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Judge - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Super - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Stage - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HallOfFame - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Evolution - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hyper - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_BattleTower - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Leaders - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_BattleRoom - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hidden - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SecretBase - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Blend - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_POKEBLOCK - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Master - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rank - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ribbon - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Crush - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Direct - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tower - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Union - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Room - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wireless - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Frontier - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_feelings.s b/data/text/easy_chat/easy_chat_group_feelings.s deleted file mode 100644 index 4cda319cca..0000000000 --- a/data/text/easy_chat/easy_chat_group_feelings.s +++ /dev/null @@ -1,484 +0,0 @@ -gEasyChatWord_Meet:: @ 859A60C - .string "MEET$" - -gEasyChatWord_Play:: @ 859A611 - .string "PLAY$" - -gEasyChatWord_Hurried:: @ 859A616 - .string "HURRIED$" - -gEasyChatWord_Goes:: @ 859A61E - .string "GOES$" - -gEasyChatWord_Giddy:: @ 859A623 - .string "GIDDY$" - -gEasyChatWord_Happy:: @ 859A629 - .string "HAPPY$" - -gEasyChatWord_Happiness:: @ 859A62F - .string "HAPPINESS$" - -gEasyChatWord_Excite:: @ 859A639 - .string "EXCITE$" - -gEasyChatWord_Important:: @ 859A640 - .string "IMPORTANT$" - -gEasyChatWord_Funny:: @ 859A64A - .string "FUNNY$" - -gEasyChatWord_Got:: @ 859A650 - .string "GOT$" - -gEasyChatWord_GoHome:: @ 859A654 - .string "GO HOME$" - -gEasyChatWord_Disappointed:: @ 859A65C - .string "DISAPPOINTED$" - -gEasyChatWord_Disappoints:: @ 859A669 - .string "DISAPPOINTS$" - -gEasyChatWord_Sad:: @ 859A675 - .string "SAD$" - -gEasyChatWord_Try:: @ 859A679 - .string "TRY$" - -gEasyChatWord_Tries:: @ 859A67D - .string "TRIES$" - -gEasyChatWord_Hears:: @ 859A683 - .string "HEARS$" - -gEasyChatWord_Think:: @ 859A689 - .string "THINK$" - -gEasyChatWord_Hear:: @ 859A68F - .string "HEAR$" - -gEasyChatWord_Wants:: @ 859A694 - .string "WANTS$" - -gEasyChatWord_Misheard:: @ 859A69A - .string "MISHEARD$" - -gEasyChatWord_Dislike:: @ 859A6A3 - .string "DISLIKE$" - -gEasyChatWord_Angry:: @ 859A6AB - .string "ANGRY$" - -gEasyChatWord_Anger:: @ 859A6B1 - .string "ANGER$" - -gEasyChatWord_Scary:: @ 859A6B7 - .string "SCARY$" - -gEasyChatWord_Lonesome:: @ 859A6BD - .string "LONESOME$" - -gEasyChatWord_Disappoint:: @ 859A6C6 - .string "DISAPPOINT$" - -gEasyChatWord_Joy:: @ 859A6D1 - .string "JOY$" - -gEasyChatWord_Gets:: @ 859A6D5 - .string "GETS$" - -gEasyChatWord_Never:: @ 859A6DA - .string "NEVER$" - -gEasyChatWord_Darn:: @ 859A6E0 - .string "DARN$" - -gEasyChatWord_Downcast:: @ 859A6E5 - .string "DOWNCAST$" - -gEasyChatWord_Incredible:: @ 859A6EE - .string "INCREDIBLE$" - -gEasyChatWord_Likes:: @ 859A6F9 - .string "LIKES$" - -gEasyChatWord_Dislikes:: @ 859A6FF - .string "DISLIKES$" - -gEasyChatWord_Boring:: @ 859A708 - .string "BORING$" - -gEasyChatWord_Care:: @ 859A70F - .string "CARE$" - -gEasyChatWord_Cares:: @ 859A714 - .string "CARES$" - -gEasyChatWord_AllRight:: @ 859A71A - .string "ALL RIGHT$" - -gEasyChatWord_Adore:: @ 859A724 - .string "ADORE$" - -gEasyChatWord_Disaster:: @ 859A72A - .string "DISASTER$" - -gEasyChatWord_Enjoy:: @ 859A733 - .string "ENJOY$" - -gEasyChatWord_Enjoys:: @ 859A739 - .string "ENJOYS$" - -gEasyChatWord_Eat:: @ 859A740 - .string "EAT$" - -gEasyChatWord_Lacking:: @ 859A744 - .string "LACKING$" - -gEasyChatWord_Bad:: @ 859A74C - .string "BAD$" - -gEasyChatWord_Hard:: @ 859A750 - .string "HARD$" - -gEasyChatWord_Terrible:: @ 859A755 - .string "TERRIBLE$" - -gEasyChatWord_Should:: @ 859A75E - .string "SHOULD$" - -gEasyChatWord_Nice:: @ 859A765 - .string "NICE$" - -gEasyChatWord_Drink:: @ 859A76A - .string "DRINK$" - -gEasyChatWord_Surprise:: @ 859A770 - .string "SURPRISE$" - -gEasyChatWord_Fear:: @ 859A779 - .string "FEAR$" - -gEasyChatWord_Want:: @ 859A77E - .string "WANT$" - -gEasyChatWord_Wait:: @ 859A783 - .string "WAIT$" - -gEasyChatWord_Satisfied:: @ 859A788 - .string "SATISFIED$" - -gEasyChatWord_See:: @ 859A792 - .string "SEE$" - -gEasyChatWord_Rare:: @ 859A796 - .string "RARE$" - -gEasyChatWord_Negative:: @ 859A79B - .string "NEGATIVE$" - -gEasyChatWord_Done:: @ 859A7A4 - .string "DONE$" - -gEasyChatWord_Danger:: @ 859A7A9 - .string "DANGER$" - -gEasyChatWord_Defeated:: @ 859A7B0 - .string "DEFEATED$" - -gEasyChatWord_Beat:: @ 859A7B9 - .string "BEAT$" - -gEasyChatWord_Great:: @ 859A7BE - .string "GREAT$" - -gEasyChatWord_Romantic:: @ 859A7C4 - .string "ROMANTIC$" - -gEasyChatWord_Question:: @ 859A7CD - .string "QUESTION$" - -gEasyChatWord_Understand:: @ 859A7D6 - .string "UNDERSTAND$" - -gEasyChatWord_Understands:: @ 859A7E1 - .string "UNDERSTANDS$" - - .align 2 -gEasyChatGroup_Feelings:: @ 859A7F0 - .4byte gEasyChatWord_Meet - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Play - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hurried - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Goes - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Giddy - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Happy - .4byte 63 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Happiness - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Excite - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Important - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Funny - .4byte 61 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Got - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_GoHome - .4byte 62 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Disappointed - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Disappoints - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sad - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Try - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tries - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hears - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Think - .4byte 60 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hear - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wants - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Misheard - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Dislike - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Angry - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Anger - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Scary - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lonesome - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Disappoint - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Joy - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Gets - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Never - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Darn - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Downcast - .4byte 64 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Incredible - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Likes - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Dislikes - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Boring - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Care - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cares - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_AllRight - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Adore - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Disaster - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Enjoy - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Enjoys - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Eat - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lacking - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Bad - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hard - .4byte 59 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Terrible - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Should - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Nice - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Drink - .4byte 66 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Surprise - .4byte 58 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fear - .4byte 65 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Want - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wait - .4byte 56 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Satisfied - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_See - .4byte 57 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rare - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Negative - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Done - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Danger - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Defeated - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Beat - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Great - .4byte 67 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Romantic - .4byte 68 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Question - .4byte 55 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Understand - .4byte 54 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Understands - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_greetings.s b/data/text/easy_chat/easy_chat_group_greetings.s deleted file mode 100644 index 98db7acea3..0000000000 --- a/data/text/easy_chat/easy_chat_group_greetings.s +++ /dev/null @@ -1,295 +0,0 @@ -gEasyChatWord_Thanks:: @ 8599004 - .string "THANKS$" - -gEasyChatWord_Yes:: @ 859900B - .string "YES$" - -gEasyChatWord_HereGoes:: @ 859900F - .string "HERE GOES$" - -gEasyChatWord_HereICome:: @ 8599019 - .string "HERE I COME$" - -gEasyChatWord_HereItIs:: @ 8599025 - .string "HERE IT IS$" - -gEasyChatWord_Yeah:: @ 8599030 - .string "YEAH$" - -gEasyChatWord_Welcome:: @ 8599035 - .string "WELCOME$" - -gEasyChatWord_Oi:: @ 859903D - .string "OI$" - -gEasyChatWord_HowDo:: @ 8599040 - .string "HOW DO$" - -gEasyChatWord_Congrats:: @ 8599047 - .string "CONGRATS$" - -gEasyChatWord_GiveMe:: @ 8599050 - .string "GIVE ME$" - -gEasyChatWord_Sorry:: @ 8599058 - .string "SORRY$" - -gEasyChatWord_Apologize:: @ 859905E - .string "APOLOGIZE$" - -gEasyChatWord_Forgive:: @ 8599068 - .string "FORGIVE$" - -gEasyChatWord_HeyThere:: @ 8599070 - .string "HEY, THERE$" - -gEasyChatWord_Hello:: @ 859907B - .string "HELLO$" - -gEasyChatWord_GoodBye:: @ 8599081 - .string "GOOD-BYE$" - -gEasyChatWord_ThankYou:: @ 859908A - .string "THANK YOU$" - -gEasyChatWord_IveArrived:: @ 8599094 - .string "I'VE ARRIVED$" - -gEasyChatWord_Pardon:: @ 85990A1 - .string "PARDON$" - -gEasyChatWord_Excuse:: @ 85990A8 - .string "EXCUSE$" - -gEasyChatWord_SeeYa:: @ 85990AF - .string "SEE YA$" - -gEasyChatWord_ExcuseMe:: @ 85990B6 - .string "EXCUSE ME$" - -gEasyChatWord_WellThen:: @ 85990C0 - .string "WELL, THEN$" - -gEasyChatWord_GoAhead:: @ 85990CB - .string "GO AHEAD$" - -gEasyChatWord_Appreciate:: @ 85990D4 - .string "APPRECIATE$" - -gEasyChatWord_HeyQues:: @ 85990DF - .string "HEY?$" - -gEasyChatWord_WhatsUpQues:: @ 85990E4 - .string "WHAT'S UP?$" - -gEasyChatWord_HuhQues:: @ 85990EF - .string "HUH?$" - -gEasyChatWord_No:: @ 85990F4 - .string "NO$" - -gEasyChatWord_Hi:: @ 85990F7 - .string "HI$" - -gEasyChatWord_YeahYeah:: @ 85990FA - .string "YEAH, YEAH$" - -gEasyChatWord_ByeBye:: @ 8599105 - .string "BYE-BYE$" - -gEasyChatWord_MeetYou:: @ 859910D - .string "MEET YOU$" - -gEasyChatWord_Hey:: @ 8599116 - .string "HEY$" - -gEasyChatWord_Smell:: @ 859911A - .string "SMELL$" - -gEasyChatWord_Listening:: @ 8599120 - .string "LISTENING$" - -gEasyChatWord_HooHah:: @ 859912A - .string "HOO-HAH$" - -gEasyChatWord_Yahoo:: @ 8599132 - .string "YAHOO$" - -gEasyChatWord_Yo:: @ 8599138 - .string "YO$" - -gEasyChatWord_ComeOver:: @ 859913B - .string "COME OVER$" - -gEasyChatWord_CountOn:: @ 8599145 - .string "COUNT ON$" - - .align 2 -gEasyChatGroup_Greetings:: @ 8599150 - .4byte gEasyChatWord_Thanks - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Yes - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HereGoes - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HereICome - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HereItIs - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Yeah - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Welcome - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Oi - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HowDo - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Congrats - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_GiveMe - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sorry - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Apologize - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Forgive - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HeyThere - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hello - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_GoodBye - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ThankYou - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_IveArrived - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pardon - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Excuse - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SeeYa - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ExcuseMe - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WellThen - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_GoAhead - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Appreciate - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HeyQues - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WhatsUpQues - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HuhQues - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_No - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hi - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_YeahYeah - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ByeBye - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_MeetYou - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hey - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Smell - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Listening - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HooHah - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Yahoo - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Yo - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ComeOver - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_CountOn - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_hobbies.s b/data/text/easy_chat/easy_chat_group_hobbies.s deleted file mode 100644 index f3fb02b0b9..0000000000 --- a/data/text/easy_chat/easy_chat_group_hobbies.s +++ /dev/null @@ -1,379 +0,0 @@ -gEasyChatWord_Idol:: @ 859B960 - .string "IDOL$" - -gEasyChatWord_Anime:: @ 859B965 - .string "ANIME$" - -gEasyChatWord_Song:: @ 859B96B - .string "SONG$" - -gEasyChatWord_Movie:: @ 859B970 - .string "MOVIE$" - -gEasyChatWord_Sweets:: @ 859B976 - .string "SWEETS$" - -gEasyChatWord_Chat:: @ 859B97D - .string "CHAT$" - -gEasyChatWord_ChildsPlay:: @ 859B982 - .string "CHILD'S PLAY$" - -gEasyChatWord_Toys:: @ 859B98F - .string "TOYS$" - -gEasyChatWord_Music:: @ 859B994 - .string "MUSIC$" - -gEasyChatWord_Cards:: @ 859B99A - .string "CARDS$" - -gEasyChatWord_Shopping:: @ 859B9A0 - .string "SHOPPING$" - -gEasyChatWord_Camera:: @ 859B9A9 - .string "CAMERA$" - -gEasyChatWord_Viewing:: @ 859B9B0 - .string "VIEWING$" - -gEasyChatWord_Spectator:: @ 859B9B8 - .string "SPECTATOR$" - -gEasyChatWord_Gourmet:: @ 859B9C2 - .string "GOURMET$" - -gEasyChatWord_Game:: @ 859B9CA - .string "GAME$" - -gEasyChatWord_Rpg:: @ 859B9CF - .string "RPG$" - -gEasyChatWord_Collection:: @ 859B9D3 - .string "COLLECTION$" - -gEasyChatWord_Complete:: @ 859B9DE - .string "COMPLETE$" - -gEasyChatWord_Magazine:: @ 859B9E7 - .string "MAGAZINE$" - -gEasyChatWord_Walk:: @ 859B9F0 - .string "WALK$" - -gEasyChatWord_Bike:: @ 859B9F5 - .string "BIKE$" - -gEasyChatWord_Hobby:: @ 859B9FA - .string "HOBBY$" - -gEasyChatWord_Sports:: @ 859BA00 - .string "SPORTS$" - -gEasyChatWord_Software:: @ 859BA07 - .string "SOFTWARE$" - -gEasyChatWord_Songs:: @ 859BA10 - .string "SONGS$" - -gEasyChatWord_Diet:: @ 859BA16 - .string "DIET$" - -gEasyChatWord_Treasure:: @ 859BA1B - .string "TREASURE$" - -gEasyChatWord_Travel:: @ 859BA24 - .string "TRAVEL$" - -gEasyChatWord_Dance:: @ 859BA2B - .string "DANCE$" - -gEasyChatWord_Channel:: @ 859BA31 - .string "CHANNEL$" - -gEasyChatWord_Making:: @ 859BA39 - .string "MAKING$" - -gEasyChatWord_Fishing:: @ 859BA40 - .string "FISHING$" - -gEasyChatWord_Date:: @ 859BA48 - .string "DATE$" - -gEasyChatWord_Design:: @ 859BA4D - .string "DESIGN$" - -gEasyChatWord_Locomotive:: @ 859BA54 - .string "LOCOMOTIVE$" - -gEasyChatWord_PlushDoll:: @ 859BA5F - .string "PLUSH DOLL$" - -gEasyChatWord_Pc:: @ 859BA6A - .string "PC$" - -gEasyChatWord_Flowers:: @ 859BA6D - .string "FLOWERS$" - -gEasyChatWord_Hero:: @ 859BA75 - .string "HERO$" - -gEasyChatWord_Nap:: @ 859BA7A - .string "NAP$" - -gEasyChatWord_Heroine:: @ 859BA7E - .string "HEROINE$" - -gEasyChatWord_Fashion:: @ 859BA86 - .string "FASHION$" - -gEasyChatWord_Adventure:: @ 859BA8E - .string "ADVENTURE$" - -gEasyChatWord_Board:: @ 859BA98 - .string "BOARD$" - -gEasyChatWord_Ball:: @ 859BA9E - .string "BALL$" - -gEasyChatWord_Book:: @ 859BAA3 - .string "BOOK$" - -gEasyChatWord_Festival:: @ 859BAA8 - .string "FESTIVAL$" - -gEasyChatWord_Comics:: @ 859BAB1 - .string "COMICS$" - -gEasyChatWord_Holiday:: @ 859BAB8 - .string "HOLIDAY$" - -gEasyChatWord_Plans:: @ 859BAC0 - .string "PLANS$" - -gEasyChatWord_Trendy:: @ 859BAC6 - .string "TRENDY$" - -gEasyChatWord_Vacation:: @ 859BACD - .string "VACATION$" - -gEasyChatWord_Look:: @ 859BAD6 - .string "LOOK$" - - .align 2 -gEasyChatGroup_Hobbies:: @ 859BADC - .4byte gEasyChatWord_Idol - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Anime - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Song - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Movie - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sweets - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Chat - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ChildsPlay - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Toys - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Music - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cards - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Shopping - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Camera - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Viewing - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Spectator - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Gourmet - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Game - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rpg - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Collection - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Complete - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Magazine - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Walk - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Bike - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hobby - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sports - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Software - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Songs - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Diet - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Treasure - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Travel - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Dance - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Channel - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Making - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fishing - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Date - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Design - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Locomotive - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_PlushDoll - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pc - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Flowers - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hero - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Nap - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Heroine - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fashion - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Adventure - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Board - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ball - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Book - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Festival - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Comics - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Holiday - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Plans - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Trendy - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Vacation - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Look - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_lifestyle.s b/data/text/easy_chat/easy_chat_group_lifestyle.s deleted file mode 100644 index 356095cd54..0000000000 --- a/data/text/easy_chat/easy_chat_group_lifestyle.s +++ /dev/null @@ -1,316 +0,0 @@ -gEasyChatWord_Chores:: @ 859B5FC - .string "CHORES$" - -gEasyChatWord_Home:: @ 859B603 - .string "HOME$" - -gEasyChatWord_Money:: @ 859B608 - .string "MONEY$" - -gEasyChatWord_Allowance:: @ 859B60E - .string "ALLOWANCE$" - -gEasyChatWord_Bath:: @ 859B618 - .string "BATH$" - -gEasyChatWord_Conversation:: @ 859B61D - .string "CONVERSATION$" - -gEasyChatWord_School:: @ 859B62A - .string "SCHOOL$" - -gEasyChatWord_Commemorate:: @ 859B631 - .string "COMMEMORATE$" - -gEasyChatWord_Habit:: @ 859B63D - .string "HABIT$" - -gEasyChatWord_Group:: @ 859B643 - .string "GROUP$" - -gEasyChatWord_Word:: @ 859B649 - .string "WORD$" - -gEasyChatWord_Store:: @ 859B64E - .string "STORE$" - -gEasyChatWord_Service:: @ 859B654 - .string "SERVICE$" - -gEasyChatWord_Work:: @ 859B65C - .string "WORK$" - -gEasyChatWord_System:: @ 859B661 - .string "SYSTEM$" - -gEasyChatWord_Train:: @ 859B668 - .string "TRAIN$" - -gEasyChatWord_Class:: @ 859B66E - .string "CLASS$" - -gEasyChatWord_Lessons:: @ 859B674 - .string "LESSONS$" - -gEasyChatWord_Information:: @ 859B67C - .string "INFORMATION$" - -gEasyChatWord_Living:: @ 859B688 - .string "LIVING$" - -gEasyChatWord_Teacher:: @ 859B68F - .string "TEACHER$" - -gEasyChatWord_Tournament:: @ 859B697 - .string "TOURNAMENT$" - -gEasyChatWord_Letter:: @ 859B6A2 - .string "LETTER$" - -gEasyChatWord_Event:: @ 859B6A9 - .string "EVENT$" - -gEasyChatWord_Digital:: @ 859B6AF - .string "DIGITAL$" - -gEasyChatWord_Test:: @ 859B6B7 - .string "TEST$" - -gEasyChatWord_DeptStore:: @ 859B6BC - .string "DEPT. STORE$" - -gEasyChatWord_Television:: @ 859B6C8 - .string "TELEVISION$" - -gEasyChatWord_Phone:: @ 859B6D3 - .string "PHONE$" - -gEasyChatWord_Item:: @ 859B6D9 - .string "ITEM$" - -gEasyChatWord_Name:: @ 859B6DE - .string "NAME$" - -gEasyChatWord_News:: @ 859B6E3 - .string "NEWS$" - -gEasyChatWord_Popular:: @ 859B6E8 - .string "POPULAR$" - -gEasyChatWord_Party:: @ 859B6F0 - .string "PARTY$" - -gEasyChatWord_Study:: @ 859B6F6 - .string "STUDY$" - -gEasyChatWord_Machine:: @ 859B6FC - .string "MACHINE$" - -gEasyChatWord_Mail:: @ 859B704 - .string "MAIL$" - -gEasyChatWord_Message:: @ 859B709 - .string "MESSAGE$" - -gEasyChatWord_Promise:: @ 859B711 - .string "PROMISE$" - -gEasyChatWord_Dream:: @ 859B719 - .string "DREAM$" - -gEasyChatWord_Kindergarten:: @ 859B71F - .string "KINDERGARTEN$" - -gEasyChatWord_Life:: @ 859B72C - .string "LIFE$" - -gEasyChatWord_Radio:: @ 859B731 - .string "RADIO$" - -gEasyChatWord_Rental:: @ 859B737 - .string "RENTAL$" - -gEasyChatWord_World:: @ 859B73E - .string "WORLD$" - - .align 2 -gEasyChatGroup_Lifestyle:: @ 859B744 - .4byte gEasyChatWord_Chores - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Home - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Money - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Allowance - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Bath - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Conversation - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_School - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Commemorate - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Habit - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Group - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Word - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Store - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Service - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Work - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_System - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Train - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Class - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lessons - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Information - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Living - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Teacher - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tournament - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Letter - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Event - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Digital - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Test - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_DeptStore - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Television - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Phone - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Item - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Name - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_News - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Popular - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Party - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Study - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Machine - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mail - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Message - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Promise - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Dream - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Kindergarten - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Life - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Radio - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rental - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_World - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_misc.s b/data/text/easy_chat/easy_chat_group_misc.s deleted file mode 100644 index 19ca730d54..0000000000 --- a/data/text/easy_chat/easy_chat_group_misc.s +++ /dev/null @@ -1,295 +0,0 @@ -gEasyChatWord_Highs:: @ 859C0B4 - .string "HIGHS$" - -gEasyChatWord_Lows:: @ 859C0BA - .string "LOWS$" - -gEasyChatWord_Um:: @ 859C0BF - .string "UM$" - -gEasyChatWord_Rear:: @ 859C0C2 - .string "REAR$" - -gEasyChatWord_Things:: @ 859C0C7 - .string "THINGS$" - -gEasyChatWord_Thing:: @ 859C0CE - .string "THING$" - -gEasyChatWord_Below:: @ 859C0D4 - .string "BELOW$" - -gEasyChatWord_Above:: @ 859C0DA - .string "ABOVE$" - -gEasyChatWord_Back:: @ 859C0E0 - .string "BACK$" - -gEasyChatWord_High:: @ 859C0E5 - .string "HIGH$" - -gEasyChatWord_Here:: @ 859C0EA - .string "HERE$" - -gEasyChatWord_Inside:: @ 859C0EF - .string "INSIDE$" - -gEasyChatWord_Outside:: @ 859C0F6 - .string "OUTSIDE$" - -gEasyChatWord_Beside:: @ 859C0FE - .string "BESIDE$" - -gEasyChatWord_ThisIsItExcl:: @ 859C105 - .string "THIS IS IT!$" - -gEasyChatWord_This:: @ 859C111 - .string "THIS$" - -gEasyChatWord_Every:: @ 859C116 - .string "EVERY$" - -gEasyChatWord_These:: @ 859C11C - .string "THESE$" - -gEasyChatWord_TheseWere:: @ 859C122 - .string "THESE WERE$" - -gEasyChatWord_Down:: @ 859C12D - .string "DOWN$" - -gEasyChatWord_That:: @ 859C132 - .string "THAT$" - -gEasyChatWord_ThoseAre:: @ 859C137 - .string "THOSE ARE$" - -gEasyChatWord_ThoseWere:: @ 859C141 - .string "THOSE WERE$" - -gEasyChatWord_ThatsItExcl:: @ 859C14C - .string "THAT'S IT!$" - -gEasyChatWord_Am:: @ 859C157 - .string "AM$" - -gEasyChatWord_ThatWas:: @ 859C15A - .string "THAT WAS$" - -gEasyChatWord_Front:: @ 859C163 - .string "FRONT$" - -gEasyChatWord_Up:: @ 859C169 - .string "UP$" - -gEasyChatWord_Choice:: @ 859C16C - .string "CHOICE$" - -gEasyChatWord_Far:: @ 859C173 - .string "FAR$" - -gEasyChatWord_Away:: @ 859C177 - .string "AWAY$" - -gEasyChatWord_Near:: @ 859C17C - .string "NEAR$" - -gEasyChatWord_Where:: @ 859C181 - .string "WHERE$" - -gEasyChatWord_When:: @ 859C187 - .string "WHEN$" - -gEasyChatWord_What:: @ 859C18C - .string "WHAT$" - -gEasyChatWord_Deep:: @ 859C191 - .string "DEEP$" - -gEasyChatWord_Shallow:: @ 859C196 - .string "SHALLOW$" - -gEasyChatWord_Why:: @ 859C19E - .string "WHY$" - -gEasyChatWord_Confused:: @ 859C1A2 - .string "CONFUSED$" - -gEasyChatWord_Opposite:: @ 859C1AB - .string "OPPOSITE$" - -gEasyChatWord_Left:: @ 859C1B4 - .string "LEFT$" - -gEasyChatWord_Right:: @ 859C1B9 - .string "RIGHT$" - - .align 2 -gEasyChatGroup_Misc:: @ 859C1C0 - .4byte gEasyChatWord_Highs - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lows - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Um - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rear - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Things - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Thing - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Below - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Above - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Back - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_High - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Here - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Inside - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Outside - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Beside - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ThisIsItExcl - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_This - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Every - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_These - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_TheseWere - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Down - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_That - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ThoseAre - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ThoseWere - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ThatsItExcl - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Am - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ThatWas - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Front - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Up - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Choice - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Far - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Away - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Near - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Where - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_When - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_What - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Deep - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Shallow - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Why - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Confused - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Opposite - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Left - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Right - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_move_1.s b/data/text/easy_chat/easy_chat_group_move_1.s deleted file mode 100644 index 595dfd1589..0000000000 --- a/data/text/easy_chat/easy_chat_group_move_1.s +++ /dev/null @@ -1,156 +0,0 @@ - .align 2 -gEasyChatGroup_Move1:: @ 859C8C4 - .2byte MOVE_ABSORB - .2byte MOVE_AEROBLAST - .2byte MOVE_AGILITY - .2byte MOVE_AIR_CUTTER - .2byte MOVE_ANCIENT_POWER - .2byte MOVE_AROMATHERAPY - .2byte MOVE_ASTONISH - .2byte MOVE_AURORA_BEAM - .2byte MOVE_BIDE - .2byte MOVE_BIND - .2byte MOVE_BITE - .2byte MOVE_BRICK_BREAK - .2byte MOVE_BUBBLE - .2byte MOVE_CHARGE - .2byte MOVE_CHARM - .2byte MOVE_CLAMP - .2byte MOVE_CONFUSE_RAY - .2byte MOVE_CONSTRICT - .2byte MOVE_COSMIC_POWER - .2byte MOVE_COUNTER - .2byte MOVE_CRABHAMMER - .2byte MOVE_CROSS_CHOP - .2byte MOVE_CRUNCH - .2byte MOVE_CUT - .2byte MOVE_DIG - .2byte MOVE_DISABLE - .2byte MOVE_DOUBLE_TEAM - .2byte MOVE_DOUBLE_EDGE - .2byte MOVE_DOUBLE_SLAP - .2byte MOVE_EARTHQUAKE - .2byte MOVE_ENCORE - .2byte MOVE_ENDEAVOR - .2byte MOVE_ENDURE - .2byte MOVE_EXTRASENSORY - .2byte MOVE_EXTREME_SPEED - .2byte MOVE_FACADE - .2byte MOVE_FAKE_TEARS - .2byte MOVE_FISSURE - .2byte MOVE_FLAIL - .2byte MOVE_FLAME_WHEEL - .2byte MOVE_FLAMETHROWER - .2byte MOVE_FLATTER - .2byte MOVE_FLY - .2byte MOVE_FOCUS_ENERGY - .2byte MOVE_FOCUS_PUNCH - .2byte MOVE_FOLLOW_ME - .2byte MOVE_GIGA_DRAIN - .2byte MOVE_GRASS_WHISTLE - .2byte MOVE_GROWTH - .2byte MOVE_GRUDGE - .2byte MOVE_GUST - .2byte MOVE_HAIL - .2byte MOVE_HARDEN - .2byte MOVE_HAZE - .2byte MOVE_HEADBUTT - .2byte MOVE_HEAL_BELL - .2byte MOVE_HYPNOSIS - .2byte MOVE_ICE_BALL - .2byte MOVE_ICY_WIND - .2byte MOVE_IRON_TAIL - .2byte MOVE_KARATE_CHOP - .2byte MOVE_KINESIS - .2byte MOVE_LEECH_LIFE - .2byte MOVE_LICK - .2byte MOVE_LOVELY_KISS - .2byte MOVE_LOW_KICK - .2byte MOVE_MEAN_LOOK - .2byte MOVE_MEMENTO - .2byte MOVE_METAL_SOUND - .2byte MOVE_METEOR_MASH - .2byte MOVE_MIND_READER - .2byte MOVE_MIRROR_MOVE - .2byte MOVE_MIST - .2byte MOVE_MORNING_SUN - .2byte MOVE_NATURE_POWER - .2byte MOVE_NIGHTMARE - .2byte MOVE_OCTAZOOKA - .2byte MOVE_ODOR_SLEUTH - .2byte MOVE_OUTRAGE - .2byte MOVE_OVERHEAT - .2byte MOVE_PAIN_SPLIT - .2byte MOVE_POWDER_SNOW - .2byte MOVE_PSYBEAM - .2byte MOVE_PSYCH_UP - .2byte MOVE_PSYCHIC - .2byte MOVE_PSYCHO_BOOST - .2byte MOVE_PSYWAVE - .2byte MOVE_PURSUIT - .2byte MOVE_RAGE - .2byte MOVE_RAIN_DANCE - .2byte MOVE_RAPID_SPIN - .2byte MOVE_RAZOR_WIND - .2byte MOVE_RECOVER - .2byte MOVE_RETURN - .2byte MOVE_REVERSAL - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_ROCK_SMASH - .2byte MOVE_ROCK_THROW - .2byte MOVE_ROCK_TOMB - .2byte MOVE_ROLLOUT - .2byte MOVE_SACRED_FIRE - .2byte MOVE_SAFEGUARD - .2byte MOVE_SAND_TOMB - .2byte MOVE_SAND_ATTACK - .2byte MOVE_SANDSTORM - .2byte MOVE_SCARY_FACE - .2byte MOVE_SCREECH - .2byte MOVE_SELF_DESTRUCT - .2byte MOVE_SHADOW_BALL - .2byte MOVE_SHADOW_PUNCH - .2byte MOVE_SHARPEN - .2byte MOVE_SHEER_COLD - .2byte MOVE_SIGNAL_BEAM - .2byte MOVE_SILVER_WIND - .2byte MOVE_SING - .2byte MOVE_SKETCH - .2byte MOVE_SKILL_SWAP - .2byte MOVE_SKY_ATTACK - .2byte MOVE_SKY_UPPERCUT - .2byte MOVE_SLASH - .2byte MOVE_SMELLING_SALT - .2byte MOVE_SMOG - .2byte MOVE_SMOKESCREEN - .2byte MOVE_SNORE - .2byte MOVE_SOLAR_BEAM - .2byte MOVE_SONIC_BOOM - .2byte MOVE_SPARK - .2byte MOVE_SPIDER_WEB - .2byte MOVE_SPITE - .2byte MOVE_SPORE - .2byte MOVE_STRENGTH - .2byte MOVE_STRING_SHOT - .2byte MOVE_STUN_SPORE - .2byte MOVE_SUBMISSION - .2byte MOVE_SUPER_FANG - .2byte MOVE_SWAGGER - .2byte MOVE_SWEET_SCENT - .2byte MOVE_SWIFT - .2byte MOVE_SYNTHESIS - .2byte MOVE_TAIL_WHIP - .2byte MOVE_THRASH - .2byte MOVE_THUNDER - .2byte MOVE_THUNDERBOLT - .2byte MOVE_THUNDER_PUNCH - .2byte MOVE_TICKLE - .2byte MOVE_TORMENT - .2byte MOVE_UPROAR - .2byte MOVE_VITAL_THROW - .2byte MOVE_WATER_SPOUT - .2byte MOVE_WEATHER_BALL - .2byte MOVE_WHIRLPOOL - .2byte MOVE_WILL_O_WISP - .2byte MOVE_WITHDRAW - .2byte MOVE_YAWN diff --git a/data/text/easy_chat/easy_chat_group_move_2.s b/data/text/easy_chat/easy_chat_group_move_2.s deleted file mode 100644 index e08a077679..0000000000 --- a/data/text/easy_chat/easy_chat_group_move_2.s +++ /dev/null @@ -1,202 +0,0 @@ - .align 2 -gEasyChatGroup_Move2:: @ 859C9F8 - .2byte MOVE_ACID - .2byte MOVE_ACID_ARMOR - .2byte MOVE_AERIAL_ACE - .2byte MOVE_AMNESIA - .2byte MOVE_ARM_THRUST - .2byte MOVE_ASSIST - .2byte MOVE_ATTRACT - .2byte MOVE_BARRAGE - .2byte MOVE_BARRIER - .2byte MOVE_BATON_PASS - .2byte MOVE_BEAT_UP - .2byte MOVE_BELLY_DRUM - .2byte MOVE_BLAST_BURN - .2byte MOVE_BLAZE_KICK - .2byte MOVE_BLIZZARD - .2byte MOVE_BLOCK - .2byte MOVE_BODY_SLAM - .2byte MOVE_BONE_CLUB - .2byte MOVE_BONE_RUSH - .2byte MOVE_BONEMERANG - .2byte MOVE_BOUNCE - .2byte MOVE_BUBBLE_BEAM - .2byte MOVE_BULK_UP - .2byte MOVE_BULLET_SEED - .2byte MOVE_CALM_MIND - .2byte MOVE_CAMOUFLAGE - .2byte MOVE_COMET_PUNCH - .2byte MOVE_CONFUSION - .2byte MOVE_CONVERSION - .2byte MOVE_CONVERSION_2 - .2byte MOVE_COTTON_SPORE - .2byte MOVE_COVET - .2byte MOVE_CRUSH_CLAW - .2byte MOVE_CURSE - .2byte MOVE_DEFENSE_CURL - .2byte MOVE_DESTINY_BOND - .2byte MOVE_DETECT - .2byte MOVE_DIVE - .2byte MOVE_DIZZY_PUNCH - .2byte MOVE_DOOM_DESIRE - .2byte MOVE_DOUBLE_KICK - .2byte MOVE_DRAGON_CLAW - .2byte MOVE_DRAGON_DANCE - .2byte MOVE_DRAGON_RAGE - .2byte MOVE_DRAGON_BREATH - .2byte MOVE_DREAM_EATER - .2byte MOVE_DRILL_PECK - .2byte MOVE_DYNAMIC_PUNCH - .2byte MOVE_EGG_BOMB - .2byte MOVE_EMBER - .2byte MOVE_ERUPTION - .2byte MOVE_EXPLOSION - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_FAKE_OUT - .2byte MOVE_FALSE_SWIPE - .2byte MOVE_FEATHER_DANCE - .2byte MOVE_FIRE_BLAST - .2byte MOVE_FIRE_PUNCH - .2byte MOVE_FIRE_SPIN - .2byte MOVE_FLASH - .2byte MOVE_FORESIGHT - .2byte MOVE_FRENZY_PLANT - .2byte MOVE_FRUSTRATION - .2byte MOVE_FURY_ATTACK - .2byte MOVE_FURY_CUTTER - .2byte MOVE_FURY_SWIPES - .2byte MOVE_FUTURE_SIGHT - .2byte MOVE_GLARE - .2byte MOVE_GROWL - .2byte MOVE_GUILLOTINE - .2byte MOVE_HEAT_WAVE - .2byte MOVE_HELPING_HAND - .2byte MOVE_HI_JUMP_KICK - .2byte MOVE_HIDDEN_POWER - .2byte MOVE_HORN_ATTACK - .2byte MOVE_HORN_DRILL - .2byte MOVE_HOWL - .2byte MOVE_HYDRO_CANNON - .2byte MOVE_HYDRO_PUMP - .2byte MOVE_HYPER_BEAM - .2byte MOVE_HYPER_FANG - .2byte MOVE_HYPER_VOICE - .2byte MOVE_ICE_BEAM - .2byte MOVE_ICE_PUNCH - .2byte MOVE_ICICLE_SPEAR - .2byte MOVE_IMPRISON - .2byte MOVE_INGRAIN - .2byte MOVE_IRON_DEFENSE - .2byte MOVE_JUMP_KICK - .2byte MOVE_KNOCK_OFF - .2byte MOVE_LEAF_BLADE - .2byte MOVE_LEECH_SEED - .2byte MOVE_LEER - .2byte MOVE_LIGHT_SCREEN - .2byte MOVE_LOCK_ON - .2byte MOVE_LUSTER_PURGE - .2byte MOVE_MACH_PUNCH - .2byte MOVE_MAGIC_COAT - .2byte MOVE_MAGICAL_LEAF - .2byte MOVE_MAGNITUDE - .2byte MOVE_MEDITATE - .2byte MOVE_MEGA_DRAIN - .2byte MOVE_MEGA_KICK - .2byte MOVE_MEGA_PUNCH - .2byte MOVE_MEGAHORN - .2byte MOVE_METAL_CLAW - .2byte MOVE_METRONOME - .2byte MOVE_MILK_DRINK - .2byte MOVE_MIMIC - .2byte MOVE_MINIMIZE - .2byte MOVE_MIRROR_COAT - .2byte MOVE_MIST_BALL - .2byte MOVE_MOONLIGHT - .2byte MOVE_MUD_SHOT - .2byte MOVE_MUD_SPORT - .2byte MOVE_MUD_SLAP - .2byte MOVE_MUDDY_WATER - .2byte MOVE_NEEDLE_ARM - .2byte MOVE_NIGHT_SHADE - .2byte MOVE_PAY_DAY - .2byte MOVE_PECK - .2byte MOVE_PERISH_SONG - .2byte MOVE_PETAL_DANCE - .2byte MOVE_PIN_MISSILE - .2byte MOVE_POISON_FANG - .2byte MOVE_POISON_GAS - .2byte MOVE_POISON_STING - .2byte MOVE_POISON_TAIL - .2byte MOVE_POISON_POWDER - .2byte MOVE_POUND - .2byte MOVE_PRESENT - .2byte MOVE_PROTECT - .2byte MOVE_QUICK_ATTACK - .2byte MOVE_RAZOR_LEAF - .2byte MOVE_RECYCLE - .2byte MOVE_REFLECT - .2byte MOVE_REFRESH - .2byte MOVE_REST - .2byte MOVE_REVENGE - .2byte MOVE_ROAR - .2byte MOVE_ROCK_BLAST - .2byte MOVE_ROLE_PLAY - .2byte MOVE_ROLLING_KICK - .2byte MOVE_SCRATCH - .2byte MOVE_SECRET_POWER - .2byte MOVE_SEISMIC_TOSS - .2byte MOVE_SHOCK_WAVE - .2byte MOVE_SKULL_BASH - .2byte MOVE_SLACK_OFF - .2byte MOVE_SLAM - .2byte MOVE_SLEEP_POWDER - .2byte MOVE_SLEEP_TALK - .2byte MOVE_SLUDGE - .2byte MOVE_SLUDGE_BOMB - .2byte MOVE_SNATCH - .2byte MOVE_SOFT_BOILED - .2byte MOVE_SPIKE_CANNON - .2byte MOVE_SPIKES - .2byte MOVE_SPIT_UP - .2byte MOVE_SPLASH - .2byte MOVE_STEEL_WING - .2byte MOVE_STOCKPILE - .2byte MOVE_STOMP - .2byte MOVE_STRUGGLE - .2byte MOVE_SUBSTITUTE - .2byte MOVE_SUNNY_DAY - .2byte MOVE_SUPERPOWER - .2byte MOVE_SUPERSONIC - .2byte MOVE_SURF - .2byte MOVE_SWALLOW - .2byte MOVE_SWEET_KISS - .2byte MOVE_SWORDS_DANCE - .2byte MOVE_TACKLE - .2byte MOVE_TAIL_GLOW - .2byte MOVE_TAKE_DOWN - .2byte MOVE_TAUNT - .2byte MOVE_TEETER_DANCE - .2byte MOVE_TELEPORT - .2byte MOVE_THIEF - .2byte MOVE_THUNDER_WAVE - .2byte MOVE_THUNDER_SHOCK - .2byte MOVE_TOXIC - .2byte MOVE_TRANSFORM - .2byte MOVE_TRI_ATTACK - .2byte MOVE_TRICK - .2byte MOVE_TRIPLE_KICK - .2byte MOVE_TWINEEDLE - .2byte MOVE_TWISTER - .2byte MOVE_VICE_GRIP - .2byte MOVE_VINE_WHIP - .2byte MOVE_VOLT_TACKLE - .2byte MOVE_WATER_GUN - .2byte MOVE_WATER_PULSE - .2byte MOVE_WATER_SPORT - .2byte MOVE_WATERFALL - .2byte MOVE_WHIRLWIND - .2byte MOVE_WING_ATTACK - .2byte MOVE_WISH - .2byte MOVE_WRAP - .2byte MOVE_ZAP_CANNON diff --git a/data/text/easy_chat/easy_chat_group_name_pointers.inc b/data/text/easy_chat/easy_chat_group_name_pointers.inc deleted file mode 100644 index 375614b86c..0000000000 --- a/data/text/easy_chat/easy_chat_group_name_pointers.inc +++ /dev/null @@ -1,24 +0,0 @@ - .align 2 -gEasyChatGroupNamePointers:: @ 859E5D4 - .4byte gEasyChatGroupName_Pokemon - .4byte gEasyChatGroupName_Trainer - .4byte gEasyChatGroupName_Status - .4byte gEasyChatGroupName_Battle - .4byte gEasyChatGroupName_Greetings - .4byte gEasyChatGroupName_People - .4byte gEasyChatGroupName_Voices - .4byte gEasyChatGroupName_Speech - .4byte gEasyChatGroupName_Endings - .4byte gEasyChatGroupName_Feelings - .4byte gEasyChatGroupName_Conditions - .4byte gEasyChatGroupName_Actions - .4byte gEasyChatGroupName_Lifestyle - .4byte gEasyChatGroupName_Hobbies - .4byte gEasyChatGroupName_Time - .4byte gEasyChatGroupName_Misc - .4byte gEasyChatGroupName_Adjectives - .4byte gEasyChatGroupName_Events - .4byte gEasyChatGroupName_Move1 - .4byte gEasyChatGroupName_Move2 - .4byte gEasyChatGroupName_TrendySaying - .4byte gEasyChatGroupName_Pokemon2 diff --git a/data/text/easy_chat/easy_chat_group_people.s b/data/text/easy_chat/easy_chat_group_people.s deleted file mode 100644 index fb74aba912..0000000000 --- a/data/text/easy_chat/easy_chat_group_people.s +++ /dev/null @@ -1,526 +0,0 @@ -gEasyChatWord_Opponent:: @ 8599348 - .string "OPPONENT$" - -gEasyChatWord_I:: @ 8599351 - .string "I$" - -gEasyChatWord_You:: @ 8599353 - .string "YOU$" - -gEasyChatWord_Yours:: @ 8599357 - .string "YOURS$" - -gEasyChatWord_Son:: @ 859935D - .string "SON$" - -gEasyChatWord_Your:: @ 8599361 - .string "YOUR$" - -gEasyChatWord_Youre:: @ 8599366 - .string "YOU'RE$" - -gEasyChatWord_Youve:: @ 859936D - .string "YOU'VE$" - -gEasyChatWord_Mother:: @ 8599374 - .string "MOTHER$" - -gEasyChatWord_Grandfather:: @ 859937B - .string "GRANDFATHER$" - -gEasyChatWord_Uncle:: @ 8599387 - .string "UNCLE$" - -gEasyChatWord_Father:: @ 859938D - .string "FATHER$" - -gEasyChatWord_Boy:: @ 8599394 - .string "BOY$" - -gEasyChatWord_Adult:: @ 8599398 - .string "ADULT$" - -gEasyChatWord_Brother:: @ 859939E - .string "BROTHER$" - -gEasyChatWord_Sister:: @ 85993A6 - .string "SISTER$" - -gEasyChatWord_Grandmother:: @ 85993AD - .string "GRANDMOTHER$" - -gEasyChatWord_Aunt:: @ 85993B9 - .string "AUNT$" - -gEasyChatWord_Parent:: @ 85993BE - .string "PARENT$" - -gEasyChatWord_Man:: @ 85993C5 - .string "MAN$" - -gEasyChatWord_Me:: @ 85993C9 - .string "ME$" - -gEasyChatWord_Girl:: @ 85993CC - .string "GIRL$" - -gEasyChatWord_Babe:: @ 85993D1 - .string "BABE$" - -gEasyChatWord_Family:: @ 85993D6 - .string "FAMILY$" - -gEasyChatWord_Her:: @ 85993DD - .string "HER$" - -gEasyChatWord_Him:: @ 85993E1 - .string "HIM$" - -gEasyChatWord_He:: @ 85993E5 - .string "HE$" - -gEasyChatWord_Place:: @ 85993E8 - .string "PLACE$" - -gEasyChatWord_Daughter:: @ 85993EE - .string "DAUGHTER$" - -gEasyChatWord_His:: @ 85993F7 - .string "HIS$" - -gEasyChatWord_Hes:: @ 85993FB - .string "HE'S$" - -gEasyChatWord_Arent:: @ 8599400 - .string "AREN'T$" - -gEasyChatWord_Siblings:: @ 8599407 - .string "SIBLINGS$" - -gEasyChatWord_Kid:: @ 8599410 - .string "KID$" - -gEasyChatWord_Children:: @ 8599414 - .string "CHILDREN$" - -gEasyChatWord_Mr:: @ 859941D - .string "MR.$" - -gEasyChatWord_Mrs:: @ 8599421 - .string "MRS.$" - -gEasyChatWord_Myself:: @ 8599426 - .string "MYSELF$" - -gEasyChatWord_IWas:: @ 859942D - .string "I WAS$" - -gEasyChatWord_ToMe:: @ 8599433 - .string "TO ME$" - -gEasyChatWord_My:: @ 8599439 - .string "MY$" - -gEasyChatWord_IAm:: @ 859943C - .string "I AM$" - -gEasyChatWord_Ive:: @ 8599441 - .string "I'VE$" - -gEasyChatWord_Who:: @ 8599446 - .string "WHO$" - -gEasyChatWord_Someone:: @ 859944A - .string "SOMEONE$" - -gEasyChatWord_WhoWas:: @ 8599452 - .string "WHO WAS$" - -gEasyChatWord_ToWhom:: @ 859945A - .string "TO WHOM$" - -gEasyChatWord_Whose:: @ 8599462 - .string "WHOSE$" - -gEasyChatWord_WhoIs:: @ 8599468 - .string "WHO IS$" - -gEasyChatWord_Its:: @ 859946F - .string "IT'S$" - -gEasyChatWord_Lady:: @ 8599474 - .string "LADY$" - -gEasyChatWord_Friend:: @ 8599479 - .string "FRIEND$" - -gEasyChatWord_Ally:: @ 8599480 - .string "ALLY$" - -gEasyChatWord_Person:: @ 8599485 - .string "PERSON$" - -gEasyChatWord_Dude:: @ 859948C - .string "DUDE$" - -gEasyChatWord_They:: @ 8599491 - .string "THEY$" - -gEasyChatWord_TheyWere:: @ 8599496 - .string "THEY WERE$" - -gEasyChatWord_ToThem:: @ 85994A0 - .string "TO THEM$" - -gEasyChatWord_Their:: @ 85994A8 - .string "THEIR$" - -gEasyChatWord_Theyre:: @ 85994AE - .string "THEY'RE$" - -gEasyChatWord_Theyve:: @ 85994B6 - .string "THEY'VE$" - -gEasyChatWord_We:: @ 85994BE - .string "WE$" - -gEasyChatWord_Been:: @ 85994C1 - .string "BEEN$" - -gEasyChatWord_ToUs:: @ 85994C6 - .string "TO US$" - -gEasyChatWord_Our:: @ 85994CC - .string "OUR$" - -gEasyChatWord_WeAre:: @ 85994D0 - .string "WE'RE$" - -gEasyChatWord_Rival:: @ 85994D6 - .string "RIVAL$" - -gEasyChatWord_Weve:: @ 85994DC - .string "WE'VE$" - -gEasyChatWord_Woman:: @ 85994E2 - .string "WOMAN$" - -gEasyChatWord_She:: @ 85994E8 - .string "SHE$" - -gEasyChatWord_SheWas:: @ 85994EC - .string "SHE WAS$" - -gEasyChatWord_ToHer:: @ 85994F4 - .string "TO HER$" - -gEasyChatWord_Hers:: @ 85994FB - .string "HERS$" - -gEasyChatWord_SheIs:: @ 8599500 - .string "SHE IS$" - -gEasyChatWord_Some:: @ 8599507 - .string "SOME$" - - .align 2 -gEasyChatGroup_People:: @ 859950C - .4byte gEasyChatWord_Opponent - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_I - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_You - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Yours - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Son - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Your - .4byte 62 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Youre - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Youve - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mother - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Grandfather - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Uncle - .4byte 54 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Father - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Boy - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Adult - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Brother - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sister - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Grandmother - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Aunt - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Parent - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Man - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Me - .4byte 72 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Girl - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Babe - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Family - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Her - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Him - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_He - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Place - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Daughter - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_His - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hes - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Arent - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Siblings - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Kid - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Children - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mr - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mrs - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Myself - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_IWas - .4byte 64 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ToMe - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_My - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_IAm - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ive - .4byte 66 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Who - .4byte 69 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Someone - .4byte 73 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WhoWas - .4byte 70 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ToWhom - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Whose - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WhoIs - .4byte 74 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Its - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lady - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Friend - .4byte 58 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ally - .4byte 55 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Person - .4byte 56 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Dude - .4byte 59 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_They - .4byte 60 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_TheyWere - .4byte 71 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ToThem - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Their - .4byte 57 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Theyre - .4byte 63 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Theyve - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_We - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Been - .4byte 61 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ToUs - .4byte 65 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Our - .4byte 67 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WeAre - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rival - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Weve - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Woman - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_She - .4byte 68 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SheWas - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ToHer - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hers - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SheIs - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Some - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_pokemon.s b/data/text/easy_chat/easy_chat_group_pokemon.s deleted file mode 100644 index 571c687367..0000000000 --- a/data/text/easy_chat/easy_chat_group_pokemon.s +++ /dev/null @@ -1,204 +0,0 @@ - .align 2 -gEasyChatGroup_Pokemon:: @ 8597E9C - .2byte SPECIES_ABRA - .2byte SPECIES_ABSOL - .2byte SPECIES_AGGRON - .2byte SPECIES_ALAKAZAM - .2byte SPECIES_ALTARIA - .2byte SPECIES_ANORITH - .2byte SPECIES_ARMALDO - .2byte SPECIES_ARON - .2byte SPECIES_AZUMARILL - .2byte SPECIES_AZURILL - .2byte SPECIES_BAGON - .2byte SPECIES_BALTOY - .2byte SPECIES_BANETTE - .2byte SPECIES_BARBOACH - .2byte SPECIES_BEAUTIFLY - .2byte SPECIES_BELDUM - .2byte SPECIES_BELLOSSOM - .2byte SPECIES_BLAZIKEN - .2byte SPECIES_BRELOOM - .2byte SPECIES_CACNEA - .2byte SPECIES_CACTURNE - .2byte SPECIES_CAMERUPT - .2byte SPECIES_CARVANHA - .2byte SPECIES_CASCOON - .2byte SPECIES_CASTFORM - .2byte SPECIES_CHIMECHO - .2byte SPECIES_CHINCHOU - .2byte SPECIES_CLAMPERL - .2byte SPECIES_CLAYDOL - .2byte SPECIES_COMBUSKEN - .2byte SPECIES_CORPHISH - .2byte SPECIES_CORSOLA - .2byte SPECIES_CRADILY - .2byte SPECIES_CRAWDAUNT - .2byte SPECIES_CROBAT - .2byte SPECIES_DELCATTY - .2byte SPECIES_DEOXYS - .2byte SPECIES_DODRIO - .2byte SPECIES_DODUO - .2byte SPECIES_DONPHAN - .2byte SPECIES_DUSCLOPS - .2byte SPECIES_DUSKULL - .2byte SPECIES_DUSTOX - .2byte SPECIES_ELECTRIKE - .2byte SPECIES_ELECTRODE - .2byte SPECIES_EXPLOUD - .2byte SPECIES_FEEBAS - .2byte SPECIES_FLYGON - .2byte SPECIES_GARDEVOIR - .2byte SPECIES_GEODUDE - .2byte SPECIES_GIRAFARIG - .2byte SPECIES_GLALIE - .2byte SPECIES_GLOOM - .2byte SPECIES_GOLBAT - .2byte SPECIES_GOLDEEN - .2byte SPECIES_GOLDUCK - .2byte SPECIES_GOLEM - .2byte SPECIES_GOREBYSS - .2byte SPECIES_GRAVELER - .2byte SPECIES_GRIMER - .2byte SPECIES_GROUDON - .2byte SPECIES_GROVYLE - .2byte SPECIES_GRUMPIG - .2byte SPECIES_GULPIN - .2byte SPECIES_GYARADOS - .2byte SPECIES_HARIYAMA - .2byte SPECIES_HERACROSS - .2byte SPECIES_HORSEA - .2byte SPECIES_HUNTAIL - .2byte SPECIES_IGGLYBUFF - .2byte SPECIES_ILLUMISE - .2byte SPECIES_JIGGLYPUFF - .2byte SPECIES_JIRACHI - .2byte SPECIES_KADABRA - .2byte SPECIES_KECLEON - .2byte SPECIES_KINGDRA - .2byte SPECIES_KIRLIA - .2byte SPECIES_KOFFING - .2byte SPECIES_KYOGRE - .2byte SPECIES_LAIRON - .2byte SPECIES_LANTURN - .2byte SPECIES_LATIAS - .2byte SPECIES_LATIOS - .2byte SPECIES_LILEEP - .2byte SPECIES_LINOONE - .2byte SPECIES_LOMBRE - .2byte SPECIES_LOTAD - .2byte SPECIES_LOUDRED - .2byte SPECIES_LUDICOLO - .2byte SPECIES_LUNATONE - .2byte SPECIES_LUVDISC - .2byte SPECIES_MACHAMP - .2byte SPECIES_MACHOKE - .2byte SPECIES_MACHOP - .2byte SPECIES_MAGCARGO - .2byte SPECIES_MAGIKARP - .2byte SPECIES_MAGNEMITE - .2byte SPECIES_MAGNETON - .2byte SPECIES_MAKUHITA - .2byte SPECIES_MANECTRIC - .2byte SPECIES_MARILL - .2byte SPECIES_MARSHTOMP - .2byte SPECIES_MASQUERAIN - .2byte SPECIES_MAWILE - .2byte SPECIES_MEDICHAM - .2byte SPECIES_MEDITITE - .2byte SPECIES_METAGROSS - .2byte SPECIES_METANG - .2byte SPECIES_MIGHTYENA - .2byte SPECIES_MILOTIC - .2byte SPECIES_MINUN - .2byte SPECIES_MUDKIP - .2byte SPECIES_MUK - .2byte SPECIES_NATU - .2byte SPECIES_NINCADA - .2byte SPECIES_NINETALES - .2byte SPECIES_NINJASK - .2byte SPECIES_NOSEPASS - .2byte SPECIES_NUMEL - .2byte SPECIES_NUZLEAF - .2byte SPECIES_ODDISH - .2byte SPECIES_PELIPPER - .2byte SPECIES_PHANPY - .2byte SPECIES_PICHU - .2byte SPECIES_PIKACHU - .2byte SPECIES_PINSIR - .2byte SPECIES_PLUSLE - .2byte SPECIES_POOCHYENA - .2byte SPECIES_PSYDUCK - .2byte SPECIES_RAICHU - .2byte SPECIES_RALTS - .2byte SPECIES_RAYQUAZA - .2byte SPECIES_REGICE - .2byte SPECIES_REGIROCK - .2byte SPECIES_REGISTEEL - .2byte SPECIES_RELICANTH - .2byte SPECIES_RHYDON - .2byte SPECIES_RHYHORN - .2byte SPECIES_ROSELIA - .2byte SPECIES_SABLEYE - .2byte SPECIES_SALAMENCE - .2byte SPECIES_SANDSHREW - .2byte SPECIES_SANDSLASH - .2byte SPECIES_SCEPTILE - .2byte SPECIES_SEADRA - .2byte SPECIES_SEAKING - .2byte SPECIES_SEALEO - .2byte SPECIES_SEEDOT - .2byte SPECIES_SEVIPER - .2byte SPECIES_SHARPEDO - .2byte SPECIES_SHEDINJA - .2byte SPECIES_SHELGON - .2byte SPECIES_SHIFTRY - .2byte SPECIES_SHROOMISH - .2byte SPECIES_SHUPPET - .2byte SPECIES_SILCOON - .2byte SPECIES_SKARMORY - .2byte SPECIES_SKITTY - .2byte SPECIES_SLAKING - .2byte SPECIES_SLAKOTH - .2byte SPECIES_SLUGMA - .2byte SPECIES_SNORUNT - .2byte SPECIES_SOLROCK - .2byte SPECIES_SPHEAL - .2byte SPECIES_SPINDA - .2byte SPECIES_SPOINK - .2byte SPECIES_STARMIE - .2byte SPECIES_STARYU - .2byte SPECIES_SURSKIT - .2byte SPECIES_SWABLU - .2byte SPECIES_SWALOT - .2byte SPECIES_SWAMPERT - .2byte SPECIES_SWELLOW - .2byte SPECIES_TAILLOW - .2byte SPECIES_TENTACOOL - .2byte SPECIES_TENTACRUEL - .2byte SPECIES_TORCHIC - .2byte SPECIES_TORKOAL - .2byte SPECIES_TRAPINCH - .2byte SPECIES_TREECKO - .2byte SPECIES_TROPIUS - .2byte SPECIES_VIBRAVA - .2byte SPECIES_VIGOROTH - .2byte SPECIES_VILEPLUME - .2byte SPECIES_VOLBEAT - .2byte SPECIES_VOLTORB - .2byte SPECIES_VULPIX - .2byte SPECIES_WAILMER - .2byte SPECIES_WAILORD - .2byte SPECIES_WALREIN - .2byte SPECIES_WEEZING - .2byte SPECIES_WHISCASH - .2byte SPECIES_WHISMUR - .2byte SPECIES_WIGGLYTUFF - .2byte SPECIES_WINGULL - .2byte SPECIES_WOBBUFFET - .2byte SPECIES_WURMPLE - .2byte SPECIES_WYNAUT - .2byte SPECIES_XATU - .2byte SPECIES_ZANGOOSE - .2byte SPECIES_ZIGZAGOON - .2byte SPECIES_ZUBAT diff --git a/data/text/easy_chat/easy_chat_group_pokemon2.s b/data/text/easy_chat/easy_chat_group_pokemon2.s deleted file mode 100644 index e2f58e4967..0000000000 --- a/data/text/easy_chat/easy_chat_group_pokemon2.s +++ /dev/null @@ -1,253 +0,0 @@ - .align 2 -gEasyChatGroup_Pokemon2:: @ 859CE0C - .2byte SPECIES_ABRA - .2byte SPECIES_AERODACTYL - .2byte SPECIES_AIPOM - .2byte SPECIES_ALAKAZAM - .2byte SPECIES_AMPHAROS - .2byte SPECIES_ARBOK - .2byte SPECIES_ARCANINE - .2byte SPECIES_ARIADOS - .2byte SPECIES_ARTICUNO - .2byte SPECIES_AZUMARILL - .2byte SPECIES_BAYLEEF - .2byte SPECIES_BEEDRILL - .2byte SPECIES_BELLOSSOM - .2byte SPECIES_BELLSPROUT - .2byte SPECIES_BLASTOISE - .2byte SPECIES_BLISSEY - .2byte SPECIES_BULBASAUR - .2byte SPECIES_BUTTERFREE - .2byte SPECIES_CATERPIE - .2byte SPECIES_CELEBI - .2byte SPECIES_CHANSEY - .2byte SPECIES_CHARIZARD - .2byte SPECIES_CHARMANDER - .2byte SPECIES_CHARMELEON - .2byte SPECIES_CHIKORITA - .2byte SPECIES_CHINCHOU - .2byte SPECIES_CLEFABLE - .2byte SPECIES_CLEFAIRY - .2byte SPECIES_CLEFFA - .2byte SPECIES_CLOYSTER - .2byte SPECIES_CORSOLA - .2byte SPECIES_CROBAT - .2byte SPECIES_CROCONAW - .2byte SPECIES_CUBONE - .2byte SPECIES_CYNDAQUIL - .2byte SPECIES_DELIBIRD - .2byte SPECIES_DEWGONG - .2byte SPECIES_DIGLETT - .2byte SPECIES_DITTO - .2byte SPECIES_DODRIO - .2byte SPECIES_DODUO - .2byte SPECIES_DONPHAN - .2byte SPECIES_DRAGONAIR - .2byte SPECIES_DRAGONITE - .2byte SPECIES_DRATINI - .2byte SPECIES_DROWZEE - .2byte SPECIES_DUGTRIO - .2byte SPECIES_DUNSPARCE - .2byte SPECIES_EEVEE - .2byte SPECIES_EKANS - .2byte SPECIES_ELECTABUZZ - .2byte SPECIES_ELECTRODE - .2byte SPECIES_ELEKID - .2byte SPECIES_ENTEI - .2byte SPECIES_ESPEON - .2byte SPECIES_EXEGGCUTE - .2byte SPECIES_EXEGGUTOR - .2byte SPECIES_FARFETCHD - .2byte SPECIES_FEAROW - .2byte SPECIES_FERALIGATR - .2byte SPECIES_FLAAFFY - .2byte SPECIES_FLAREON - .2byte SPECIES_FORRETRESS - .2byte SPECIES_FURRET - .2byte SPECIES_GASTLY - .2byte SPECIES_GENGAR - .2byte SPECIES_GEODUDE - .2byte SPECIES_GIRAFARIG - .2byte SPECIES_GLIGAR - .2byte SPECIES_GLOOM - .2byte SPECIES_GOLBAT - .2byte SPECIES_GOLDEEN - .2byte SPECIES_GOLDUCK - .2byte SPECIES_GOLEM - .2byte SPECIES_GRANBULL - .2byte SPECIES_GRAVELER - .2byte SPECIES_GRIMER - .2byte SPECIES_GROWLITHE - .2byte SPECIES_GYARADOS - .2byte SPECIES_HAUNTER - .2byte SPECIES_HERACROSS - .2byte SPECIES_HITMONCHAN - .2byte SPECIES_HITMONLEE - .2byte SPECIES_HITMONTOP - .2byte SPECIES_HO_OH - .2byte SPECIES_HOOTHOOT - .2byte SPECIES_HOPPIP - .2byte SPECIES_HORSEA - .2byte SPECIES_HOUNDOOM - .2byte SPECIES_HOUNDOUR - .2byte SPECIES_HYPNO - .2byte SPECIES_IGGLYBUFF - .2byte SPECIES_IVYSAUR - .2byte SPECIES_JIGGLYPUFF - .2byte SPECIES_JOLTEON - .2byte SPECIES_JUMPLUFF - .2byte SPECIES_JYNX - .2byte SPECIES_KABUTO - .2byte SPECIES_KABUTOPS - .2byte SPECIES_KADABRA - .2byte SPECIES_KAKUNA - .2byte SPECIES_KANGASKHAN - .2byte SPECIES_KINGDRA - .2byte SPECIES_KINGLER - .2byte SPECIES_KOFFING - .2byte SPECIES_KRABBY - .2byte SPECIES_LANTURN - .2byte SPECIES_LAPRAS - .2byte SPECIES_LARVITAR - .2byte SPECIES_LEDIAN - .2byte SPECIES_LEDYBA - .2byte SPECIES_LICKITUNG - .2byte SPECIES_LUGIA - .2byte SPECIES_MACHAMP - .2byte SPECIES_MACHOKE - .2byte SPECIES_MACHOP - .2byte SPECIES_MAGBY - .2byte SPECIES_MAGCARGO - .2byte SPECIES_MAGIKARP - .2byte SPECIES_MAGMAR - .2byte SPECIES_MAGNEMITE - .2byte SPECIES_MAGNETON - .2byte SPECIES_MANKEY - .2byte SPECIES_MANTINE - .2byte SPECIES_MAREEP - .2byte SPECIES_MARILL - .2byte SPECIES_MAROWAK - .2byte SPECIES_MEGANIUM - .2byte SPECIES_MEOWTH - .2byte SPECIES_METAPOD - .2byte SPECIES_MEW - .2byte SPECIES_MEWTWO - .2byte SPECIES_MILTANK - .2byte SPECIES_MISDREAVUS - .2byte SPECIES_MOLTRES - .2byte SPECIES_MR_MIME - .2byte SPECIES_MUK - .2byte SPECIES_MURKROW - .2byte SPECIES_NATU - .2byte SPECIES_NIDOKING - .2byte SPECIES_NIDOQUEEN - .2byte SPECIES_NIDORAN_F - .2byte SPECIES_NIDORAN_M - .2byte SPECIES_NIDORINA - .2byte SPECIES_NIDORINO - .2byte SPECIES_NINETALES - .2byte SPECIES_NOCTOWL - .2byte SPECIES_OCTILLERY - .2byte SPECIES_ODDISH - .2byte SPECIES_OMANYTE - .2byte SPECIES_OMASTAR - .2byte SPECIES_ONIX - .2byte SPECIES_PARAS - .2byte SPECIES_PARASECT - .2byte SPECIES_PERSIAN - .2byte SPECIES_PHANPY - .2byte SPECIES_PICHU - .2byte SPECIES_PIDGEOT - .2byte SPECIES_PIDGEOTTO - .2byte SPECIES_PIDGEY - .2byte SPECIES_PIKACHU - .2byte SPECIES_PILOSWINE - .2byte SPECIES_PINECO - .2byte SPECIES_PINSIR - .2byte SPECIES_POLITOED - .2byte SPECIES_POLIWAG - .2byte SPECIES_POLIWHIRL - .2byte SPECIES_POLIWRATH - .2byte SPECIES_PONYTA - .2byte SPECIES_PORYGON - .2byte SPECIES_PORYGON2 - .2byte SPECIES_PRIMEAPE - .2byte SPECIES_PSYDUCK - .2byte SPECIES_PUPITAR - .2byte SPECIES_QUAGSIRE - .2byte SPECIES_QUILAVA - .2byte SPECIES_QWILFISH - .2byte SPECIES_RAICHU - .2byte SPECIES_RAIKOU - .2byte SPECIES_RAPIDASH - .2byte SPECIES_RATICATE - .2byte SPECIES_RATTATA - .2byte SPECIES_REMORAID - .2byte SPECIES_RHYDON - .2byte SPECIES_RHYHORN - .2byte SPECIES_SANDSHREW - .2byte SPECIES_SANDSLASH - .2byte SPECIES_SCIZOR - .2byte SPECIES_SCYTHER - .2byte SPECIES_SEADRA - .2byte SPECIES_SEAKING - .2byte SPECIES_SEEL - .2byte SPECIES_SENTRET - .2byte SPECIES_SHELLDER - .2byte SPECIES_SHUCKLE - .2byte SPECIES_SKARMORY - .2byte SPECIES_SKIPLOOM - .2byte SPECIES_SLOWBRO - .2byte SPECIES_SLOWKING - .2byte SPECIES_SLOWPOKE - .2byte SPECIES_SLUGMA - .2byte SPECIES_SMEARGLE - .2byte SPECIES_SMOOCHUM - .2byte SPECIES_SNEASEL - .2byte SPECIES_SNORLAX - .2byte SPECIES_SNUBBULL - .2byte SPECIES_SPEAROW - .2byte SPECIES_SPINARAK - .2byte SPECIES_SQUIRTLE - .2byte SPECIES_STANTLER - .2byte SPECIES_STARMIE - .2byte SPECIES_STARYU - .2byte SPECIES_STEELIX - .2byte SPECIES_SUDOWOODO - .2byte SPECIES_SUICUNE - .2byte SPECIES_SUNFLORA - .2byte SPECIES_SUNKERN - .2byte SPECIES_SWINUB - .2byte SPECIES_TANGELA - .2byte SPECIES_TAUROS - .2byte SPECIES_TEDDIURSA - .2byte SPECIES_TENTACOOL - .2byte SPECIES_TENTACRUEL - .2byte SPECIES_TOGEPI - .2byte SPECIES_TOGETIC - .2byte SPECIES_TOTODILE - .2byte SPECIES_TYPHLOSION - .2byte SPECIES_TYRANITAR - .2byte SPECIES_TYROGUE - .2byte SPECIES_UMBREON - .2byte SPECIES_UNOWN - .2byte SPECIES_URSARING - .2byte SPECIES_VAPOREON - .2byte SPECIES_VENOMOTH - .2byte SPECIES_VENONAT - .2byte SPECIES_VENUSAUR - .2byte SPECIES_VICTREEBEL - .2byte SPECIES_VILEPLUME - .2byte SPECIES_VOLTORB - .2byte SPECIES_VULPIX - .2byte SPECIES_WARTORTLE - .2byte SPECIES_WEEDLE - .2byte SPECIES_WEEPINBELL - .2byte SPECIES_WEEZING - .2byte SPECIES_WIGGLYTUFF - .2byte SPECIES_WOBBUFFET - .2byte SPECIES_WOOPER - .2byte SPECIES_XATU - .2byte SPECIES_YANMA - .2byte SPECIES_ZAPDOS - .2byte SPECIES_ZUBAT diff --git a/data/text/easy_chat/easy_chat_group_speech.s b/data/text/easy_chat/easy_chat_group_speech.s deleted file mode 100644 index 4cfea7eca9..0000000000 --- a/data/text/easy_chat/easy_chat_group_speech.s +++ /dev/null @@ -1,421 +0,0 @@ -gEasyChatWord_Listen:: @ 8599CE8 - .string "LISTEN$" - -gEasyChatWord_NotVery:: @ 8599CEF - .string "NOT VERY$" - -gEasyChatWord_Mean:: @ 8599CF8 - .string "MEAN$" - -gEasyChatWord_Lie:: @ 8599CFD - .string "LIE$" - -gEasyChatWord_Lay:: @ 8599D01 - .string "LAY$" - -gEasyChatWord_Recommend:: @ 8599D05 - .string "RECOMMEND$" - -gEasyChatWord_Nitwit:: @ 8599D0F - .string "NITWIT$" - -gEasyChatWord_Quite:: @ 8599D16 - .string "QUITE$" - -gEasyChatWord_From:: @ 8599D1C - .string "FROM$" - -gEasyChatWord_Feeling:: @ 8599D21 - .string "FEELING$" - -gEasyChatWord_But:: @ 8599D29 - .string "BUT$" - -gEasyChatWord_However:: @ 8599D2D - .string "HOWEVER$" - -gEasyChatWord_Case:: @ 8599D35 - .string "CASE$" - -gEasyChatWord_The:: @ 8599D3A - .string "THE$" - -gEasyChatWord_Miss:: @ 8599D3E - .string "MISS$" - -gEasyChatWord_How:: @ 8599D43 - .string "HOW$" - -gEasyChatWord_Hit:: @ 8599D47 - .string "HIT$" - -gEasyChatWord_Enough:: @ 8599D4B - .string "ENOUGH$" - -gEasyChatWord_ALot:: @ 8599D52 - .string "A LOT$" - -gEasyChatWord_ALittle:: @ 8599D58 - .string "A LITTLE$" - -gEasyChatWord_Absolutely:: @ 8599D61 - .string "ABSOLUTELY$" - -gEasyChatWord_And:: @ 8599D6C - .string "AND$" - -gEasyChatWord_Only:: @ 8599D70 - .string "ONLY$" - -gEasyChatWord_Around:: @ 8599D75 - .string "AROUND$" - -gEasyChatWord_Probably:: @ 8599D7C - .string "PROBABLY$" - -gEasyChatWord_If:: @ 8599D85 - .string "IF$" - -gEasyChatWord_Very:: @ 8599D88 - .string "VERY$" - -gEasyChatWord_ATinyBit:: @ 8599D8D - .string "A TINY BIT$" - -gEasyChatWord_Wild:: @ 8599D98 - .string "WILD$" - -gEasyChatWord_Thats:: @ 8599D9D - .string "THAT'S$" - -gEasyChatWord_Just:: @ 8599DA4 - .string "JUST$" - -gEasyChatWord_EvenSo:: @ 8599DA9 - .string "EVEN SO,$" - -gEasyChatWord_MustBe:: @ 8599DB2 - .string "MUST BE$" - -gEasyChatWord_Naturally:: @ 8599DBA - .string "NATURALLY$" - -gEasyChatWord_ForNow:: @ 8599DC4 - .string "FOR NOW,$" - -gEasyChatWord_Understood:: @ 8599DCD - .string "UNDERSTOOD$" - -gEasyChatWord_Joking:: @ 8599DD8 - .string "JOKING$" - -gEasyChatWord_Ready:: @ 8599DDF - .string "READY$" - -gEasyChatWord_Something:: @ 8599DE5 - .string "SOMETHING$" - -gEasyChatWord_Somehow:: @ 8599DEF - .string "SOMEHOW$" - -gEasyChatWord_Although:: @ 8599DF7 - .string "ALTHOUGH$" - -gEasyChatWord_Also:: @ 8599E00 - .string "ALSO$" - -gEasyChatWord_Perfect:: @ 8599E05 - .string "PERFECT$" - -gEasyChatWord_AsMuchAs:: @ 8599E0D - .string "AS MUCH AS$" - -gEasyChatWord_Really:: @ 8599E18 - .string "REALLY$" - -gEasyChatWord_Truly:: @ 8599E1F - .string "TRULY$" - -gEasyChatWord_Seriously:: @ 8599E25 - .string "SERIOUSLY$" - -gEasyChatWord_Totally:: @ 8599E2F - .string "TOTALLY$" - -gEasyChatWord_Until:: @ 8599E37 - .string "UNTIL$" - -gEasyChatWord_AsIf:: @ 8599E3D - .string "AS IF$" - -gEasyChatWord_Mood:: @ 8599E43 - .string "MOOD$" - -gEasyChatWord_Rather:: @ 8599E48 - .string "RATHER$" - -gEasyChatWord_Awfully:: @ 8599E4F - .string "AWFULLY$" - -gEasyChatWord_Mode:: @ 8599E57 - .string "MODE$" - -gEasyChatWord_More:: @ 8599E5C - .string "MORE$" - -gEasyChatWord_TooLate:: @ 8599E61 - .string "TOO LATE$" - -gEasyChatWord_Finally:: @ 8599E6A - .string "FINALLY$" - -gEasyChatWord_Any:: @ 8599E72 - .string "ANY$" - -gEasyChatWord_Instead:: @ 8599E76 - .string "INSTEAD$" - -gEasyChatWord_Fantastic:: @ 8599E7E - .string "FANTASTIC$" - - .align 2 -gEasyChatGroup_Speech:: @ 8599E88 - .4byte gEasyChatWord_Listen - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_NotVery - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mean - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lie - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lay - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Recommend - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Nitwit - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Quite - .4byte 57 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_From - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Feeling - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_But - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_However - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Case - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_The - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Miss - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_How - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hit - .4byte 59 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Enough - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ALot - .4byte 56 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ALittle - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Absolutely - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_And - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Only - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Around - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Probably - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_If - .4byte 58 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Very - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ATinyBit - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wild - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Thats - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Just - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_EvenSo - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_MustBe - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Naturally - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ForNow - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Understood - .4byte 54 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Joking - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ready - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Something - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Somehow - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Although - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Also - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Perfect - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_AsMuchAs - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Really - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Truly - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Seriously - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Totally - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Until - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_AsIf - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mood - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rather - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Awfully - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mode - .4byte 55 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_More - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_TooLate - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Finally - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Any - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Instead - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fantastic - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_status.s b/data/text/easy_chat/easy_chat_group_status.s deleted file mode 100644 index db945423f7..0000000000 --- a/data/text/easy_chat/easy_chat_group_status.s +++ /dev/null @@ -1,764 +0,0 @@ -gEasyChatWord_Dark:: @ 8598234 - .string "DARK$" - -gEasyChatWord_Stench:: @ 8598239 - .string "STENCH$" - -gEasyChatWord_ThickFat:: @ 8598240 - .string "THICK FAT$" - -gEasyChatWord_RainDish:: @ 859824A - .string "RAIN DISH$" - -gEasyChatWord_Drizzle:: @ 8598254 - .string "DRIZZLE$" - -gEasyChatWord_ArenaTrap:: @ 859825C - .string "ARENA TRAP$" - -gEasyChatWord_Intimidate:: @ 8598267 - .string "INTIMIDATE$" - -gEasyChatWord_RockHead:: @ 8598272 - .string "ROCK HEAD$" - -gEasyChatWord_Color:: @ 859827C - .string "COLOR$" - -gEasyChatWord_AltColor:: @ 8598282 - .string "ALT. COLOR$" - -gEasyChatWord_Rock:: @ 859828D - .string "ROCK$" - -gEasyChatWord_Beautiful:: @ 8598292 - .string "BEAUTIFUL$" - -gEasyChatWord_Beauty:: @ 859829C - .string "BEAUTY$" - -gEasyChatWord_AirLock:: @ 85982A3 - .string "AIR LOCK$" - -gEasyChatWord_Psychic:: @ 85982AC - .string "PSYCHIC$" - -gEasyChatWord_HyperCutter:: @ 85982B4 - .string "HYPER CUTTER$" - -gEasyChatWord_Fighting:: @ 85982C1 - .string "FIGHTING$" - -gEasyChatWord_ShadowTag:: @ 85982CA - .string "SHADOW TAG$" - -gEasyChatWord_Smart:: @ 85982D5 - .string "SMART$" - -gEasyChatWord_Smartness:: @ 85982DB - .string "SMARTNESS$" - -gEasyChatWord_SpeedBoost:: @ 85982E5 - .string "SPEED BOOST$" - -gEasyChatWord_Cool:: @ 85982F1 - .string "COOL$" - -gEasyChatWord_Coolness:: @ 85982F6 - .string "COOLNESS$" - -gEasyChatWord_BattleArmor:: @ 85982FF - .string "BATTLE ARMOR$" - -gEasyChatWord_Cute:: @ 859830C - .string "CUTE$" - -gEasyChatWord_Cuteness:: @ 8598311 - .string "CUTENESS$" - -gEasyChatWord_Sturdy:: @ 859831A - .string "STURDY$" - -gEasyChatWord_SuctionCups:: @ 8598321 - .string "SUCTION CUPS$" - -gEasyChatWord_Grass:: @ 859832E - .string "GRASS$" - -gEasyChatWord_ClearBody:: @ 8598334 - .string "CLEAR BODY$" - -gEasyChatWord_Torrent:: @ 859833F - .string "TORRENT$" - -gEasyChatWord_Ghost:: @ 8598347 - .string "GHOST$" - -gEasyChatWord_Ice:: @ 859834D - .string "ICE$" - -gEasyChatWord_Guts:: @ 8598351 - .string "GUTS$" - -gEasyChatWord_RoughSkin:: @ 8598356 - .string "ROUGH SKIN$" - -gEasyChatWord_ShellArmor:: @ 8598361 - .string "SHELL ARMOR$" - -gEasyChatWord_NaturalCure:: @ 859836D - .string "NATURAL CURE$" - -gEasyChatWord_Damp:: @ 859837A - .string "DAMP$" - -gEasyChatWord_Ground:: @ 859837F - .string "GROUND$" - -gEasyChatWord_Limber:: @ 8598386 - .string "LIMBER$" - -gEasyChatWord_MagnetPull:: @ 859838D - .string "MAGNET PULL$" - -gEasyChatWord_WhiteSmoke:: @ 8598399 - .string "WHITE SMOKE$" - -gEasyChatWord_Synchronize:: @ 85983A5 - .string "SYNCHRONIZE$" - -gEasyChatWord_Overgrow:: @ 85983B1 - .string "OVERGROW$" - -gEasyChatWord_SwiftSwim:: @ 85983BA - .string "SWIFT SWIM$" - -gEasyChatWord_SandStream:: @ 85983C5 - .string "SAND STREAM$" - -gEasyChatWord_SandVeil:: @ 85983D1 - .string "SAND VEIL$" - -gEasyChatWord_KeenEye:: @ 85983DB - .string "KEEN EYE$" - -gEasyChatWord_InnerFocus:: @ 85983E4 - .string "INNER FOCUS$" - -gEasyChatWord_Static:: @ 85983F0 - .string "STATIC$" - -gEasyChatWord_Type:: @ 85983F7 - .string "TYPE$" - -gEasyChatWord_Tough:: @ 85983FC - .string "TOUGH$" - -gEasyChatWord_Toughness:: @ 8598402 - .string "TOUGHNESS$" - -gEasyChatWord_ShedSkin:: @ 859840C - .string "SHED SKIN$" - -gEasyChatWord_HugePower:: @ 8598416 - .string "HUGE POWER$" - -gEasyChatWord_VoltAbsorb:: @ 8598421 - .string "VOLT ABSORB$" - -gEasyChatWord_WaterAbsorb:: @ 859842D - .string "WATER ABSORB$" - -gEasyChatWord_Electric:: @ 859843A - .string "ELECTRIC$" - -gEasyChatWord_Forecast:: @ 8598443 - .string "FORECAST$" - -gEasyChatWord_SereneGrace:: @ 859844C - .string "SERENE GRACE$" - -gEasyChatWord_Poison:: @ 8598459 - .string "POISON$" - -gEasyChatWord_PoisonPoint:: @ 8598460 - .string "POISON POINT$" - -gEasyChatWord_Dragon:: @ 859846D - .string "DRAGON$" - -gEasyChatWord_Trace:: @ 8598474 - .string "TRACE$" - -gEasyChatWord_Oblivious:: @ 859847A - .string "OBLIVIOUS$" - -gEasyChatWord_Truant:: @ 8598484 - .string "TRUANT$" - -gEasyChatWord_RunAway:: @ 859848B - .string "RUN AWAY$" - -gEasyChatWord_StickyHold:: @ 8598494 - .string "STICKY HOLD$" - -gEasyChatWord_CloudNine:: @ 85984A0 - .string "CLOUD NINE$" - -gEasyChatWord_Normal:: @ 85984AB - .string "NORMAL$" - -gEasyChatWord_Steel:: @ 85984B2 - .string "STEEL$" - -gEasyChatWord_Illuminate:: @ 85984B8 - .string "ILLUMINATE$" - -gEasyChatWord_EarlyBird:: @ 85984C3 - .string "EARLY BIRD$" - -gEasyChatWord_Hustle:: @ 85984CE - .string "HUSTLE$" - -gEasyChatWord_Shine:: @ 85984D5 - .string "SHINE$" - -gEasyChatWord_Flying:: @ 85984DB - .string "FLYING$" - -gEasyChatWord_Drought:: @ 85984E2 - .string "DROUGHT$" - -gEasyChatWord_Lightningrod:: @ 85984EA - .string "LIGHTNINGROD$" - -gEasyChatWord_Compoundeyes:: @ 85984F7 - .string "COMPOUNDEYES$" - -gEasyChatWord_MarvelScale:: @ 8598504 - .string "MARVEL SCALE$" - -gEasyChatWord_WonderGuard:: @ 8598511 - .string "WONDER GUARD$" - -gEasyChatWord_Insomnia:: @ 859851E - .string "INSOMNIA$" - -gEasyChatWord_Levitate:: @ 8598527 - .string "LEVITATE$" - -gEasyChatWord_Plus:: @ 8598530 - .string "PLUS$" - -gEasyChatWord_Pressure:: @ 8598535 - .string "PRESSURE$" - -gEasyChatWord_LiquidOoze:: @ 859853E - .string "LIQUID OOZE$" - -gEasyChatWord_ColorChange:: @ 859854A - .string "COLOR CHANGE$" - -gEasyChatWord_Soundproof:: @ 8598557 - .string "SOUNDPROOF$" - -gEasyChatWord_EffectSpore:: @ 8598562 - .string "EFFECT SPORE$" - -gEasyChatWord_Pkrs:: @ 859856F - .string "{PK}RS$" - -gEasyChatWord_Fire:: @ 8598573 - .string "FIRE$" - -gEasyChatWord_FlameBody:: @ 8598578 - .string "FLAME BODY$" - -gEasyChatWord_Minus:: @ 8598583 - .string "MINUS$" - -gEasyChatWord_OwnTempo:: @ 8598589 - .string "OWN TEMPO$" - -gEasyChatWord_MagmaArmor:: @ 8598593 - .string "MAGMA ARMOR$" - -gEasyChatWord_Water:: @ 859859F - .string "WATER$" - -gEasyChatWord_WaterVeil:: @ 85985A5 - .string "WATER VEIL$" - -gEasyChatWord_Bug:: @ 85985B0 - .string "BUG$" - -gEasyChatWord_Swarm:: @ 85985B4 - .string "SWARM$" - -gEasyChatWord_CuteCharm:: @ 85985BA - .string "CUTE CHARM$" - -gEasyChatWord_Immunity:: @ 85985C5 - .string "IMMUNITY$" - -gEasyChatWord_Blaze:: @ 85985CE - .string "BLAZE$" - -gEasyChatWord_Pickup:: @ 85985D4 - .string "PICKUP$" - -gEasyChatWord_Pattern:: @ 85985DB - .string "PATTERN$" - -gEasyChatWord_FlashFire:: @ 85985E3 - .string "FLASH FIRE$" - -gEasyChatWord_VitalSpirit:: @ 85985EE - .string "VITAL SPIRIT$" - -gEasyChatWord_Chlorophyll:: @ 85985FB - .string "CHLOROPHYLL$" - -gEasyChatWord_PurePower:: @ 8598607 - .string "PURE POWER$" - -gEasyChatWord_ShieldDust:: @ 8598612 - .string "SHIELD DUST$" - - .align 2 -gEasyChatGroup_Status:: @ 8598620 - .4byte gEasyChatWord_Dark - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Stench - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ThickFat - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_RainDish - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Drizzle - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ArenaTrap - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Intimidate - .4byte 101 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_RockHead - .4byte 97 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Color - .4byte 106 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_AltColor - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rock - .4byte 68 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Beautiful - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Beauty - .4byte 86 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_AirLock - .4byte 78 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Psychic - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HyperCutter - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fighting - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ShadowTag - .4byte 99 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Smart - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Smartness - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SpeedBoost - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cool - .4byte 62 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Coolness - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_BattleArmor - .4byte 76 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cute - .4byte 72 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cuteness - .4byte 88 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sturdy - .4byte 57 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SuctionCups - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Grass - .4byte 90 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ClearBody - .4byte 91 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Torrent - .4byte 104 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ghost - .4byte 75 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ice - .4byte 58 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Guts - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_RoughSkin - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ShellArmor - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_NaturalCure - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Damp - .4byte 54 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ground - .4byte 73 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Limber - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_MagnetPull - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WhiteSmoke - .4byte 71 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Synchronize - .4byte 100 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Overgrow - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SwiftSwim - .4byte 81 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SandStream - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SandVeil - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_KeenEye - .4byte 82 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_InnerFocus - .4byte 77 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Static - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Type - .4byte 85 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tough - .4byte 94 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Toughness - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ShedSkin - .4byte 79 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HugePower - .4byte 92 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_VoltAbsorb - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WaterAbsorb - .4byte 69 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Electric - .4byte 64 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Forecast - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SereneGrace - .4byte 93 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Poison - .4byte 103 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_PoisonPoint - .4byte 102 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Dragon - .4byte 89 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Trace - .4byte 83 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Oblivious - .4byte 60 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Truant - .4byte 61 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_RunAway - .4byte 84 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_StickyHold - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_CloudNine - .4byte 107 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Normal - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Steel - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Illuminate - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_EarlyBird - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hustle - .4byte 66 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Shine - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Flying - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Drought - .4byte 59 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lightningrod - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Compoundeyes - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_MarvelScale - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WonderGuard - .4byte 108 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Insomnia - .4byte 74 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Levitate - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Plus - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pressure - .4byte 87 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_LiquidOoze - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ColorChange - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Soundproof - .4byte 70 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_EffectSpore - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pkrs - .4byte 67 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fire - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_FlameBody - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Minus - .4byte 98 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_OwnTempo - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_MagmaArmor - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Water - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WaterVeil - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Bug - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Swarm - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_CuteCharm - .4byte 63 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Immunity - .4byte 65 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Blaze - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pickup - .4byte 105 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pattern - .4byte 55 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_FlashFire - .4byte 95 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_VitalSpirit - .4byte 56 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Chlorophyll - .4byte 96 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_PurePower - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ShieldDust - .4byte 80 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_time.s b/data/text/easy_chat/easy_chat_group_time.s deleted file mode 100644 index 1604eaf501..0000000000 --- a/data/text/easy_chat/easy_chat_group_time.s +++ /dev/null @@ -1,316 +0,0 @@ -gEasyChatWord_Fall:: @ 859BD64 - .string "FALL$" - -gEasyChatWord_Morning:: @ 859BD69 - .string "MORNING$" - -gEasyChatWord_Tomorrow:: @ 859BD71 - .string "TOMORROW$" - -gEasyChatWord_Last:: @ 859BD7A - .string "LAST$" - -gEasyChatWord_Day:: @ 859BD7F - .string "DAY$" - -gEasyChatWord_Sometime:: @ 859BD83 - .string "SOMETIME$" - -gEasyChatWord_Always:: @ 859BD8C - .string "ALWAYS$" - -gEasyChatWord_Current:: @ 859BD93 - .string "CURRENT$" - -gEasyChatWord_Forever:: @ 859BD9B - .string "FOREVER$" - -gEasyChatWord_Days:: @ 859BDA3 - .string "DAYS$" - -gEasyChatWord_End:: @ 859BDA8 - .string "END$" - -gEasyChatWord_Tuesday:: @ 859BDAC - .string "TUESDAY$" - -gEasyChatWord_Yesterday:: @ 859BDB4 - .string "YESTERDAY$" - -gEasyChatWord_Today:: @ 859BDBE - .string "TODAY$" - -gEasyChatWord_Friday:: @ 859BDC4 - .string "FRIDAY$" - -gEasyChatWord_Monday:: @ 859BDCB - .string "MONDAY$" - -gEasyChatWord_Later:: @ 859BDD2 - .string "LATER$" - -gEasyChatWord_Earlier:: @ 859BDD8 - .string "EARLIER$" - -gEasyChatWord_Another:: @ 859BDE0 - .string "ANOTHER$" - -gEasyChatWord_Time:: @ 859BDE8 - .string "TIME$" - -gEasyChatWord_Finish:: @ 859BDED - .string "FINISH$" - -gEasyChatWord_Wednesday:: @ 859BDF4 - .string "WEDNESDAY$" - -gEasyChatWord_Soon:: @ 859BDFE - .string "SOON$" - -gEasyChatWord_Start:: @ 859BE03 - .string "START$" - -gEasyChatWord_Month:: @ 859BE09 - .string "MONTH$" - -gEasyChatWord_Stop:: @ 859BE0F - .string "STOP$" - -gEasyChatWord_Now:: @ 859BE14 - .string "NOW$" - -gEasyChatWord_Final:: @ 859BE18 - .string "FINAL$" - -gEasyChatWord_Next:: @ 859BE1E - .string "NEXT$" - -gEasyChatWord_Age:: @ 859BE23 - .string "AGE$" - -gEasyChatWord_Saturday:: @ 859BE27 - .string "SATURDAY$" - -gEasyChatWord_Summer:: @ 859BE30 - .string "SUMMER$" - -gEasyChatWord_Sunday:: @ 859BE37 - .string "SUNDAY$" - -gEasyChatWord_Beginning:: @ 859BE3E - .string "BEGINNING$" - -gEasyChatWord_Spring:: @ 859BE48 - .string "SPRING$" - -gEasyChatWord_Daytime:: @ 859BE4F - .string "DAYTIME$" - -gEasyChatWord_Winter:: @ 859BE57 - .string "WINTER$" - -gEasyChatWord_Daily:: @ 859BE5E - .string "DAILY$" - -gEasyChatWord_Olden:: @ 859BE64 - .string "OLDEN$" - -gEasyChatWord_Almost:: @ 859BE6A - .string "ALMOST$" - -gEasyChatWord_Nearly:: @ 859BE71 - .string "NEARLY$" - -gEasyChatWord_Thursday:: @ 859BE78 - .string "THURSDAY$" - -gEasyChatWord_Nighttime:: @ 859BE81 - .string "NIGHTTIME$" - -gEasyChatWord_Night:: @ 859BE8B - .string "NIGHT$" - -gEasyChatWord_Week:: @ 859BE91 - .string "WEEK$" - - .align 2 -gEasyChatGroup_Time:: @ 859BE98 - .4byte gEasyChatWord_Fall - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Morning - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tomorrow - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Last - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Day - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sometime - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Always - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Current - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Forever - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Days - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_End - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tuesday - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Yesterday - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Today - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Friday - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Monday - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Later - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Earlier - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Another - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Time - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Finish - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wednesday - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Soon - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Start - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Month - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Stop - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Now - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Final - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Next - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Age - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Saturday - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Summer - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sunday - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Beginning - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Spring - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Daytime - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Winter - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Daily - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Olden - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Almost - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Nearly - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Thursday - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Nighttime - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Night - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Week - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_trainer.s b/data/text/easy_chat/easy_chat_group_trainer.s deleted file mode 100644 index 23a3b0b6a4..0000000000 --- a/data/text/easy_chat/easy_chat_group_trainer.s +++ /dev/null @@ -1,190 +0,0 @@ -gEasyChatWord_IChooseYou:: @ 8598030 - .string "I CHOOSE YOU$" - -gEasyChatWord_Gotcha:: @ 859803D - .string "GOTCHA$" - -gEasyChatWord_Trade:: @ 8598044 - .string "TRADE$" - -gEasyChatWord_Sapphire:: @ 859804A - .string "SAPPHIRE$" - -gEasyChatWord_Evolve:: @ 8598053 - .string "EVOLVE$" - -gEasyChatWord_Encyclopedia:: @ 859805A - .string "ENCYCLOPEDIA$" - -gEasyChatWord_Nature:: @ 8598067 - .string "NATURE$" - -gEasyChatWord_Center:: @ 859806E - .string "CENTER$" - -gEasyChatWord_Egg:: @ 8598075 - .string "EGG$" - -gEasyChatWord_Link:: @ 8598079 - .string "LINK$" - -gEasyChatWord_SpAbility:: @ 859807E - .string "SP. ABILITY$" - -gEasyChatWord_Trainer:: @ 859808A - .string "TRAINER$" - -gEasyChatWord_Version:: @ 8598092 - .string "VERSION$" - -gEasyChatWord_Pokenav:: @ 859809A - .string "POKéNAV$" - -gEasyChatWord_Pokemon:: @ 85980A2 - .string "POKéMON$" - -gEasyChatWord_Get:: @ 85980AA - .string "GET$" - -gEasyChatWord_Pokedex:: @ 85980AE - .string "POKéDEX$" - -gEasyChatWord_Ruby:: @ 85980B6 - .string "RUBY$" - -gEasyChatWord_Level:: @ 85980BB - .string "LEVEL$" - -gEasyChatWord_Red:: @ 85980C1 - .string "RED$" - -gEasyChatWord_Green:: @ 85980C5 - .string "GREEN$" - -gEasyChatWord_Bag:: @ 85980CB - .string "BAG$" - -gEasyChatWord_Flame:: @ 85980CF - .string "FLAME$" - -gEasyChatWord_Gold:: @ 85980D5 - .string "GOLD$" - -gEasyChatWord_Leaf:: @ 85980DA - .string "LEAF$" - -gEasyChatWord_Silver:: @ 85980DF - .string "SILVER$" - -gEasyChatWord_Emerald:: @ 85980E6 - .string "EMERALD$" - - .align 2 -gEasyChatGroup_Trainer:: @ 85980F0 - .4byte gEasyChatWord_IChooseYou - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Gotcha - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Trade - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sapphire - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Evolve - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Encyclopedia - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Nature - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Center - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Egg - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Link - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SpAbility - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Trainer - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Version - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pokenav - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pokemon - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Get - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pokedex - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ruby - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Level - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Red - .4byte 19 @ alphabetical order - .4byte FALSE @ enabled - - .4byte gEasyChatWord_Green - .4byte 17 @ alphabetical order - .4byte FALSE @ enabled - - .4byte gEasyChatWord_Bag - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Flame - .4byte 25 @ alphabetical order - .4byte FALSE @ enabled - - .4byte gEasyChatWord_Gold - .4byte 10 @ alphabetical order - .4byte FALSE @ enabled - - .4byte gEasyChatWord_Leaf - .4byte 2 @ alphabetical order - .4byte FALSE @ enabled - - .4byte gEasyChatWord_Silver - .4byte 11 @ alphabetical order - .4byte FALSE @ enabled - - .4byte gEasyChatWord_Emerald - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_trendy_saying.s b/data/text/easy_chat/easy_chat_group_trendy_saying.s deleted file mode 100644 index 3e9f7291e3..0000000000 --- a/data/text/easy_chat/easy_chat_group_trendy_saying.s +++ /dev/null @@ -1,232 +0,0 @@ -gEasyChatWord_KthxBye:: @ 859CB88 - .string "KTHX, BYE.$" - -gEasyChatWord_YesSirExcl:: @ 859CB93 - .string "YES, SIR!$" - -gEasyChatWord_AvantGarde:: @ 859CB9D - .string "AVANT GARDE$" - -gEasyChatWord_Couple:: @ 859CBA9 - .string "COUPLE$" - -gEasyChatWord_MuchObliged:: @ 859CBB0 - .string "MUCH OBLIGED$" - -gEasyChatWord_YeehawExcl:: @ 859CBBD - .string "YEEHAW!$" - -gEasyChatWord_Mega:: @ 859CBC5 - .string "MEGA$" - -gEasyChatWord_1HitKOExcl:: @ 859CBCA - .string "1-HIT KO!$" - -gEasyChatWord_Destiny:: @ 859CBD4 - .string "DESTINY$" - -gEasyChatWord_Cancel:: @ 859CBDC - .string "CANCEL$" - -gEasyChatWord_New:: @ 859CBE3 - .string "NEW$" - -gEasyChatWord_Flatten:: @ 859CBE7 - .string "FLATTEN$" - -gEasyChatWord_Kidding:: @ 859CBEF - .string "KIDDING$" - -gEasyChatWord_Loser:: @ 859CBF7 - .string "LOSER$" - -gEasyChatWord_Losing:: @ 859CBFD - .string "LOSING$" - -gEasyChatWord_Happening:: @ 859CC04 - .string "HAPPENING$" - -gEasyChatWord_HipAnd:: @ 859CC0E - .string "HIP AND$" - -gEasyChatWord_Shake:: @ 859CC16 - .string "SHAKE$" - -gEasyChatWord_Shady:: @ 859CC1C - .string "SHADY$" - -gEasyChatWord_Upbeat:: @ 859CC22 - .string "UPBEAT$" - -gEasyChatWord_Modern:: @ 859CC29 - .string "MODERN$" - -gEasyChatWord_SmellYa:: @ 859CC30 - .string "SMELL YA$" - -gEasyChatWord_Bang:: @ 859CC39 - .string "BANG$" - -gEasyChatWord_Knockout:: @ 859CC3E - .string "KNOCKOUT$" - -gEasyChatWord_Hassle:: @ 859CC47 - .string "HASSLE$" - -gEasyChatWord_Winner:: @ 859CC4E - .string "WINNER$" - -gEasyChatWord_Fever:: @ 859CC55 - .string "FEVER$" - -gEasyChatWord_Wannabe:: @ 859CC5B - .string "WANNABE$" - -gEasyChatWord_Baby:: @ 859CC63 - .string "BABY$" - -gEasyChatWord_Heart:: @ 859CC68 - .string "HEART$" - -gEasyChatWord_Old:: @ 859CC6E - .string "OLD$" - -gEasyChatWord_Young:: @ 859CC72 - .string "YOUNG$" - -gEasyChatWord_Ugly:: @ 859CC78 - .string "UGLY$" - - .align 2 -gEasyChatGroup_TrendySaying:: @ 859CC80 - .4byte gEasyChatWord_KthxBye - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_YesSirExcl - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_AvantGarde - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Couple - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_MuchObliged - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_YeehawExcl - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mega - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_1HitKOExcl - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Destiny - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cancel - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_New - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Flatten - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Kidding - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Loser - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Losing - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Happening - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HipAnd - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Shake - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Shady - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Upbeat - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Modern - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SmellYa - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Bang - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Knockout - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hassle - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Winner - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fever - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wannabe - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Baby - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Heart - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Old - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Young - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ugly - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_voices.s b/data/text/easy_chat/easy_chat_group_voices.s deleted file mode 100644 index 548576fd32..0000000000 --- a/data/text/easy_chat/easy_chat_group_voices.s +++ /dev/null @@ -1,442 +0,0 @@ -gEasyChatWord_Excl:: @ 8599890 - .string "!$" - -gEasyChatWord_ExclExcl:: @ 8599892 - .string "!!$" - -gEasyChatWord_QuesExcl:: @ 8599895 - .string "?!$" - -gEasyChatWord_Ques:: @ 8599898 - .string "?$" - -gEasyChatWord_Ellipsis:: @ 859989A - .string "…$" - -gEasyChatWord_EllipsisExcl:: @ 859989C - .string "…!$" - -gEasyChatWord_EllipsisEllipsisEllipsis:: @ 859989F - .string "………$" - -gEasyChatWord_Dash:: @ 85998A3 - .string "-$" - -gEasyChatWord_DashDashDash:: @ 85998A5 - .string "- - -$" - -gEasyChatWord_UhOh:: @ 85998AB - .string "UH-OH$" - -gEasyChatWord_Waaah:: @ 85998B1 - .string "WAAAH$" - -gEasyChatWord_Ahaha:: @ 85998B7 - .string "AHAHA$" - -gEasyChatWord_OhQues:: @ 85998BD - .string "OH?$" - -gEasyChatWord_Nope:: @ 85998C1 - .string "NOPE$" - -gEasyChatWord_Urgh:: @ 85998C6 - .string "URGH$" - -gEasyChatWord_Hmm:: @ 85998CB - .string "HMM$" - -gEasyChatWord_Whoah:: @ 85998CF - .string "WHOAH$" - -gEasyChatWord_WroooaarExcl:: @ 85998D5 - .string "WROOOAAR!$" - -gEasyChatWord_Wow:: @ 85998DF - .string "WOW$" - -gEasyChatWord_Giggle:: @ 85998E3 - .string "GIGGLE$" - -gEasyChatWord_Sigh:: @ 85998EA - .string "SIGH$" - -gEasyChatWord_Unbelievable:: @ 85998EF - .string "UNBELIEVABLE$" - -gEasyChatWord_Cries:: @ 85998FC - .string "CRIES$" - -gEasyChatWord_Agree:: @ 8599902 - .string "AGREE$" - -gEasyChatWord_EhQues:: @ 8599908 - .string "EH?$" - -gEasyChatWord_Cry:: @ 859990C - .string "CRY$" - -gEasyChatWord_Ehehe:: @ 8599910 - .string "EHEHE$" - -gEasyChatWord_OiOiOi:: @ 8599916 - .string "OI, OI, OI$" - -gEasyChatWord_OhYeah:: @ 8599921 - .string "OH, YEAH$" - -gEasyChatWord_Oh:: @ 859992A - .string "OH$" - -gEasyChatWord_Oops:: @ 859992D - .string "OOPS$" - -gEasyChatWord_Shocked:: @ 8599932 - .string "SHOCKED$" - -gEasyChatWord_Eek:: @ 859993A - .string "EEK$" - -gEasyChatWord_Graaah:: @ 859993E - .string "GRAAAH$" - -gEasyChatWord_Gwahahaha:: @ 8599945 - .string "GWAHAHAHA$" - -gEasyChatWord_Way:: @ 859994F - .string "WAY$" - -gEasyChatWord_Tch:: @ 8599953 - .string "TCH$" - -gEasyChatWord_Hehe:: @ 8599957 - .string "HEHE$" - -gEasyChatWord_Hah:: @ 859995C - .string "HAH$" - -gEasyChatWord_Yup:: @ 8599960 - .string "YUP$" - -gEasyChatWord_Hahaha:: @ 8599964 - .string "HAHAHA$" - -gEasyChatWord_Aiyeeh:: @ 859996B - .string "AIYEEH$" - -gEasyChatWord_Hiyah:: @ 8599972 - .string "HIYAH$" - -gEasyChatWord_Fufufu:: @ 8599978 - .string "FUFUFU$" - -gEasyChatWord_Lol:: @ 859997F - .string "LOL$" - -gEasyChatWord_Snort:: @ 8599983 - .string "SNORT$" - -gEasyChatWord_Humph:: @ 8599989 - .string "HUMPH$" - -gEasyChatWord_Hehehe:: @ 859998F - .string "HEHEHE$" - -gEasyChatWord_Heh:: @ 8599996 - .string "HEH$" - -gEasyChatWord_Hohoho:: @ 859999A - .string "HOHOHO$" - -gEasyChatWord_UhHuh:: @ 85999A1 - .string "UH-HUH$" - -gEasyChatWord_OhDear:: @ 85999A8 - .string "OH, DEAR$" - -gEasyChatWord_Arrgh:: @ 85999B1 - .string "ARRGH$" - -gEasyChatWord_Mufufu:: @ 85999B7 - .string "MUFUFU$" - -gEasyChatWord_Mmm:: @ 85999BE - .string "MMM$" - -gEasyChatWord_OhKay:: @ 85999C2 - .string "OH-KAY$" - -gEasyChatWord_Okay:: @ 85999C9 - .string "OKAY$" - -gEasyChatWord_Lalala:: @ 85999CE - .string "LALALA$" - -gEasyChatWord_Yay:: @ 85999D5 - .string "YAY$" - -gEasyChatWord_Aww:: @ 85999D9 - .string "AWW$" - -gEasyChatWord_Wowee:: @ 85999DD - .string "WOWEE$" - -gEasyChatWord_Gwah:: @ 85999E3 - .string "GWAH$" - -gEasyChatWord_Wahahaha:: @ 85999E8 - .string "WAHAHAHA$" - - .align 2 -gEasyChatGroup_Voices:: @ 85999F4 - .4byte gEasyChatWord_Excl - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ExclExcl - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_QuesExcl - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ques - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ellipsis - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_EllipsisExcl - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_EllipsisEllipsisEllipsis - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Dash - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_DashDashDash - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_UhOh - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Waaah - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ahaha - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_OhQues - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Nope - .4byte 59 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Urgh - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hmm - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Whoah - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WroooaarExcl - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wow - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Giggle - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sigh - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Unbelievable - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cries - .4byte 61 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Agree - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_EhQues - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cry - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ehehe - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_OiOiOi - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_OhYeah - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Oh - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Oops - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Shocked - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Eek - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Graaah - .4byte 57 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Gwahahaha - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Way - .4byte 54 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tch - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hehe - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hah - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Yup - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hahaha - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Aiyeeh - .4byte 55 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hiyah - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fufufu - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lol - .4byte 56 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Snort - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Humph - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hehehe - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Heh - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hohoho - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_UhHuh - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_OhDear - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Arrgh - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mufufu - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mmm - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_OhKay - .4byte 62 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Okay - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lalala - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Yay - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Aww - .4byte 60 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wowee - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Gwah - .4byte 58 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wahahaha - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_groups.inc b/data/text/easy_chat/easy_chat_groups.inc deleted file mode 100644 index 94636c7fe5..0000000000 --- a/data/text/easy_chat/easy_chat_groups.inc +++ /dev/null @@ -1,112 +0,0 @@ - .include "data/text/easy_chat/easy_chat_group_pokemon.s" - .include "data/text/easy_chat/easy_chat_group_trainer.s" - .include "data/text/easy_chat/easy_chat_group_status.s" - .include "data/text/easy_chat/easy_chat_group_battle.s" - .include "data/text/easy_chat/easy_chat_group_greetings.s" - .include "data/text/easy_chat/easy_chat_group_people.s" - .include "data/text/easy_chat/easy_chat_group_voices.s" - .include "data/text/easy_chat/easy_chat_group_speech.s" - .include "data/text/easy_chat/easy_chat_group_endings.s" - .include "data/text/easy_chat/easy_chat_group_feelings.s" - .include "data/text/easy_chat/easy_chat_group_conditions.s" - .include "data/text/easy_chat/easy_chat_group_actions.s" - .include "data/text/easy_chat/easy_chat_group_lifestyle.s" - .include "data/text/easy_chat/easy_chat_group_hobbies.s" - .include "data/text/easy_chat/easy_chat_group_time.s" - .include "data/text/easy_chat/easy_chat_group_misc.s" - .include "data/text/easy_chat/easy_chat_group_adjectives.s" - .include "data/text/easy_chat/easy_chat_group_events.s" - .include "data/text/easy_chat/easy_chat_group_move_1.s" - .include "data/text/easy_chat/easy_chat_group_move_2.s" - .include "data/text/easy_chat/easy_chat_group_trendy_saying.s" - .include "data/text/easy_chat/easy_chat_group_pokemon2.s" - - .align 2 -gEasyChatGroups:: @ 859D004 - .4byte gEasyChatGroup_Pokemon - .2byte 202 @ total number of entries - .2byte 202 @ number of enabled entries - - .4byte gEasyChatGroup_Trainer - .2byte 27 @ total number of entries - .2byte 21 @ number of enabled entries - - .4byte gEasyChatGroup_Status - .2byte 109 @ total number of entries - .2byte 109 @ number of enabled entries - - .4byte gEasyChatGroup_Battle - .2byte 63 @ total number of entries - .2byte 63 @ number of enabled entries - - .4byte gEasyChatGroup_Greetings - .2byte 42 @ total number of entries - .2byte 42 @ number of enabled entries - - .4byte gEasyChatGroup_People - .2byte 75 @ total number of entries - .2byte 75 @ number of enabled entries - - .4byte gEasyChatGroup_Voices - .2byte 63 @ total number of entries - .2byte 63 @ number of enabled entries - - .4byte gEasyChatGroup_Speech - .2byte 60 @ total number of entries - .2byte 60 @ number of enabled entries - - .4byte gEasyChatGroup_Endings - .2byte 69 @ total number of entries - .2byte 69 @ number of enabled entries - - .4byte gEasyChatGroup_Feelings - .2byte 69 @ total number of entries - .2byte 69 @ number of enabled entries - - .4byte gEasyChatGroup_Conditions - .2byte 69 @ total number of entries - .2byte 69 @ number of enabled entries - - .4byte gEasyChatGroup_Actions - .2byte 78 @ total number of entries - .2byte 78 @ number of enabled entries - - .4byte gEasyChatGroup_Lifestyle - .2byte 45 @ total number of entries - .2byte 45 @ number of enabled entries - - .4byte gEasyChatGroup_Hobbies - .2byte 54 @ total number of entries - .2byte 54 @ number of enabled entries - - .4byte gEasyChatGroup_Time - .2byte 45 @ total number of entries - .2byte 45 @ number of enabled entries - - .4byte gEasyChatGroup_Misc - .2byte 42 @ total number of entries - .2byte 42 @ number of enabled entries - - .4byte gEasyChatGroup_Adjectives - .2byte 36 @ total number of entries - .2byte 36 @ number of enabled entries - - .4byte gEasyChatGroup_Events - .2byte 29 @ total number of entries - .2byte 29 @ number of enabled entries - - .4byte gEasyChatGroup_Move1 - .2byte 154 @ total number of entries - .2byte 154 @ number of enabled entries - - .4byte gEasyChatGroup_Move2 - .2byte 200 @ total number of entries - .2byte 200 @ number of enabled entries - - .4byte gEasyChatGroup_TrendySaying - .2byte 33 @ total number of entries - .2byte 33 @ number of enabled entries - - .4byte gEasyChatGroup_Pokemon2 - .2byte 251 @ total number of entries - .2byte 251 @ number of enabled entries diff --git a/data/text/easy_chat/easy_chat_words_by_letter.inc b/data/text/easy_chat/easy_chat_words_by_letter.inc deleted file mode 100644 index bce4be347a..0000000000 --- a/data/text/easy_chat/easy_chat_words_by_letter.inc +++ /dev/null @@ -1,2656 +0,0 @@ -gEasyChatWordsByLetter_Others:: @ 859D0B4 - .2byte EC_WORD_EXCL - .2byte EC_WORD_EXCL_EXCL - .2byte EC_WORD_DASH - .2byte EC_WORD_DASH_DASH_DASH - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_ELLIPSIS_EXCL - .2byte EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS - .2byte EC_WORD_1_HIT_KO_EXCL - .2byte EC_WORD_QUES - .2byte EC_WORD_QUES_EXCL - -gEasyChatWordsByLetter_A:: @ 859D0C8 - .2byte EC_WORD_A - .2byte EC_WORD_A_LITTLE - .2byte EC_WORD_A_LOT - .2byte EC_WORD_A_TINY_BIT - .2byte EC_WORD_ABOUT - .2byte EC_WORD_ABOVE - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(ABRA) - .2byte EC_POKEMON2(ABRA) - .2byte EC_WORD_ABSENT - .2byte EC_POKEMON(ABSOL) - .2byte EC_WORD_ABSOLUTELY - .2byte EC_MOVE(ABSORB) - .2byte EC_WORD_ACCEPT - .2byte EC_MOVE2(ACID) - .2byte EC_MOVE2(ACID_ARMOR) - .2byte EC_WORD_ADORE - .2byte EC_WORD_ADULT - .2byte EC_WORD_ADVENTURE - .2byte EC_MOVE2(AERIAL_ACE) - .2byte EC_MOVE(AEROBLAST) - .2byte EC_POKEMON2(AERODACTYL) - .2byte EC_WORD_AFTER - .2byte EC_WORD_AGE - .2byte EC_POKEMON(AGGRON) - .2byte EC_MOVE(AGILITY) - .2byte EC_WORD_AGREE - .2byte EC_WORD_AHAHA - .2byte EC_WORD_AIM - .2byte EC_POKEMON2(AIPOM) - .2byte EC_MOVE(AIR_CUTTER) - .2byte EC_WORD_AIR_LOCK - .2byte EC_WORD_AIYEEH - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(ALAKAZAM) - .2byte EC_POKEMON2(ALAKAZAM) - .2byte EC_WORD_ALL - .2byte EC_WORD_ALL_RIGHT - .2byte EC_WORD_ALLOW - .2byte EC_WORD_ALLOWANCE - .2byte EC_WORD_ALLY - .2byte EC_WORD_ALMOST - .2byte EC_WORD_ALONE - .2byte EC_WORD_ALSO - .2byte EC_WORD_ALT_COLOR - .2byte EC_POKEMON(ALTARIA) - .2byte EC_WORD_ALTHOUGH - .2byte EC_WORD_ALWAYS - .2byte EC_WORD_AM - .2byte EC_MOVE2(AMNESIA) - .2byte EC_POKEMON2(AMPHAROS) - .2byte EC_WORD_AMUSING - .2byte EC_WORD_AN - .2byte EC_MOVE(ANCIENT_POWER) - .2byte EC_WORD_AND - .2byte EC_WORD_ANGER - .2byte EC_WORD_ANGERS - .2byte EC_WORD_ANGRY - .2byte EC_WORD_ANIME - .2byte EC_POKEMON(ANORITH) - .2byte EC_WORD_ANOTHER - .2byte EC_WORD_ANTICIPATION - .2byte EC_WORD_ANY - .2byte EC_WORD_ANYWHERE - .2byte EC_WORD_APOLOGIZE - .2byte EC_WORD_APPEAL - .2byte EC_WORD_APPEAR - .2byte EC_WORD_APPEARS - .2byte EC_WORD_APPRECIATE - .2byte EC_WORD_APPROVED - .2byte EC_POKEMON2(ARBOK) - .2byte EC_POKEMON2(ARCANINE) - .2byte EC_WORD_ARE - .2byte EC_WORD_AREN_T - .2byte EC_WORD_ARENA_TRAP - .2byte EC_POKEMON2(ARIADOS) - .2byte EC_MOVE2(ARM_THRUST) - .2byte EC_POKEMON(ARMALDO) - .2byte EC_MOVE(AROMATHERAPY) - .2byte EC_POKEMON(ARON) - .2byte EC_WORD_AROUND - .2byte EC_WORD_ARRGH - .2byte EC_POKEMON2(ARTICUNO) - .2byte EC_WORD_AS - .2byte EC_WORD_AS_IF - .2byte EC_WORD_AS_MUCH_AS - .2byte EC_MOVE2(ASSIST) - .2byte EC_MOVE(ASTONISH) - .2byte EC_WORD_AT - .2byte EC_WORD_ATTACK - .2byte EC_MOVE2(ATTRACT) - .2byte EC_WORD_AUNT - .2byte EC_MOVE(AURORA_BEAM) - .2byte EC_WORD_AVANT_GARDE - .2byte EC_WORD_AWAY - .2byte EC_WORD_AWESOME - .2byte EC_WORD_AWFUL - .2byte EC_WORD_AWFULLY - .2byte EC_WORD_AWW - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(AZUMARILL) - .2byte EC_POKEMON2(AZUMARILL) - .2byte EC_POKEMON(AZURILL) - -gEasyChatWordsByLetter_B:: @ 859D19C - .2byte EC_WORD_BABE - .2byte EC_WORD_BABY - .2byte EC_WORD_BACK - .2byte EC_WORD_BAD - .2byte EC_WORD_BADLY - .2byte EC_WORD_BAG - .2byte EC_POKEMON(BAGON) - .2byte EC_WORD_BALL - .2byte EC_POKEMON(BALTOY) - .2byte EC_POKEMON(BANETTE) - .2byte EC_WORD_BANG - .2byte EC_POKEMON(BARBOACH) - .2byte EC_MOVE2(BARRAGE) - .2byte EC_MOVE2(BARRIER) - .2byte EC_WORD_BATH - .2byte EC_MOVE2(BATON_PASS) - .2byte EC_WORD_BATTLE - .2byte EC_WORD_BATTLE_ARMOR - .2byte EC_WORD_BATTLE_ROOM - .2byte EC_WORD_BATTLE_TOWER - .2byte EC_POKEMON2(BAYLEEF) - .2byte EC_WORD_BE - .2byte EC_WORD_BEAT - .2byte EC_MOVE2(BEAT_UP) - .2byte EC_POKEMON(BEAUTIFLY) - .2byte EC_WORD_BEAUTIFUL - .2byte EC_WORD_BEAUTY - .2byte EC_WORD_BECOMES - .2byte EC_POKEMON2(BEEDRILL) - .2byte EC_WORD_BEEN - .2byte EC_WORD_BEFORE - .2byte EC_WORD_BEGINNING - .2byte EC_WORD_BEING - .2byte EC_POKEMON(BELDUM) - .2byte EC_WORD_BELIEVE - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(BELLOSSOM) - .2byte EC_POKEMON2(BELLOSSOM) - .2byte EC_POKEMON2(BELLSPROUT) - .2byte EC_MOVE2(BELLY_DRUM) - .2byte EC_WORD_BELONGS_TO - .2byte EC_WORD_BELOW - .2byte EC_WORD_BERRY - .2byte EC_WORD_BESIDE - .2byte EC_WORD_BEST - .2byte EC_WORD_BETTER - .2byte EC_MOVE(BIDE) - .2byte EC_WORD_BIG - .2byte EC_WORD_BIKE - .2byte EC_MOVE(BIND) - .2byte EC_MOVE(BITE) - .2byte EC_MOVE2(BLAST_BURN) - .2byte EC_POKEMON2(BLASTOISE) - .2byte EC_WORD_BLAZE - .2byte EC_MOVE2(BLAZE_KICK) - .2byte EC_POKEMON(BLAZIKEN) - .2byte EC_WORD_BLEND - .2byte EC_POKEMON2(BLISSEY) - .2byte EC_MOVE2(BLIZZARD) - .2byte EC_MOVE2(BLOCK) - .2byte EC_WORD_BOARD - .2byte EC_MOVE2(BODY_SLAM) - .2byte EC_MOVE2(BONE_CLUB) - .2byte EC_MOVE2(BONE_RUSH) - .2byte EC_MOVE2(BONEMERANG) - .2byte EC_WORD_BOOK - .2byte EC_WORD_BORED - .2byte EC_WORD_BORING - .2byte EC_MOVE2(BOUNCE) - .2byte EC_WORD_BOY - .2byte EC_WORD_BRAG - .2byte EC_WORD_BREAK - .2byte EC_POKEMON(BRELOOM) - .2byte EC_MOVE(BRICK_BREAK) - .2byte EC_WORD_BROTHER - .2byte EC_MOVE(BUBBLE) - .2byte EC_MOVE2(BUBBLE_BEAM) - .2byte EC_WORD_BUG - .2byte EC_POKEMON2(BULBASAUR) - .2byte EC_MOVE2(BULK_UP) - .2byte EC_MOVE2(BULLET_SEED) - .2byte EC_WORD_BUSY - .2byte EC_WORD_BUT - .2byte EC_POKEMON2(BUTTERFREE) - .2byte EC_WORD_BYE_BYE - -gEasyChatWordsByLetter_C:: @ 859D248 - .2byte EC_POKEMON(CACNEA) - .2byte EC_POKEMON(CACTURNE) - .2byte EC_MOVE2(CALM_MIND) - .2byte EC_WORD_CAME - .2byte EC_WORD_CAMERA - .2byte EC_POKEMON(CAMERUPT) - .2byte EC_MOVE2(CAMOUFLAGE) - .2byte EC_WORD_CAN - .2byte EC_WORD_CAN_WIN - .2byte EC_WORD_CAN_T - .2byte EC_WORD_CAN_T_WIN - .2byte EC_WORD_CANCEL - .2byte EC_WORD_CAPABLE - .2byte EC_WORD_CARDS - .2byte EC_WORD_CARE - .2byte EC_WORD_CARES - .2byte EC_POKEMON(CARVANHA) - .2byte EC_POKEMON(CASCOON) - .2byte EC_WORD_CASE - .2byte EC_POKEMON(CASTFORM) - .2byte EC_POKEMON2(CATERPIE) - .2byte EC_WORD_CAUSE - .2byte EC_POKEMON2(CELEBI) - .2byte EC_WORD_CENTER - .2byte EC_WORD_CHALLENGE - .2byte EC_WORD_CHANGE - .2byte EC_WORD_CHANNEL - .2byte EC_POKEMON2(CHANSEY) - .2byte EC_MOVE(CHARGE) - .2byte EC_POKEMON2(CHARIZARD) - .2byte EC_MOVE(CHARM) - .2byte EC_POKEMON2(CHARMANDER) - .2byte EC_POKEMON2(CHARMELEON) - .2byte EC_WORD_CHAT - .2byte EC_POKEMON2(CHIKORITA) - .2byte EC_WORD_CHILD_S_PLAY - .2byte EC_WORD_CHILDREN - .2byte EC_POKEMON(CHIMECHO) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(CHINCHOU) - .2byte EC_POKEMON2(CHINCHOU) - .2byte EC_WORD_CHLOROPHYLL - .2byte EC_WORD_CHOICE - .2byte EC_WORD_CHOOSE - .2byte EC_WORD_CHORES - .2byte EC_MOVE(CLAMP) - .2byte EC_POKEMON(CLAMPERL) - .2byte EC_WORD_CLASS - .2byte EC_POKEMON(CLAYDOL) - .2byte EC_WORD_CLEAR_BODY - .2byte EC_POKEMON2(CLEFABLE) - .2byte EC_POKEMON2(CLEFAIRY) - .2byte EC_POKEMON2(CLEFFA) - .2byte EC_WORD_CLOSE - .2byte EC_WORD_CLOUD_NINE - .2byte EC_POKEMON2(CLOYSTER) - .2byte EC_WORD_COLD - .2byte EC_WORD_COLLECT - .2byte EC_WORD_COLLECTION - .2byte EC_WORD_COLOR - .2byte EC_WORD_COLOR_CHANGE - .2byte EC_POKEMON(COMBUSKEN) - .2byte EC_WORD_COME - .2byte EC_WORD_COME_ON - .2byte EC_WORD_COME_OVER - .2byte EC_MOVE2(COMET_PUNCH) - .2byte EC_WORD_COMICS - .2byte EC_WORD_COMMEMORATE - .2byte EC_WORD_COMPLETE - .2byte EC_WORD_COMPOUNDEYES - .2byte EC_WORD_CONCEDE - .2byte EC_MOVE(CONFUSE_RAY) - .2byte EC_WORD_CONFUSED - .2byte EC_MOVE2(CONFUSION) - .2byte EC_WORD_CONGRATS - .2byte EC_MOVE(CONSTRICT) - .2byte EC_WORD_CONTEST - .2byte EC_WORD_CONVERSATION - .2byte EC_MOVE2(CONVERSION) - .2byte EC_MOVE2(CONVERSION_2) - .2byte EC_WORD_COOL - .2byte EC_WORD_COOLNESS - .2byte EC_POKEMON(CORPHISH) - .2byte EC_WORD_CORRECT - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(CORSOLA) - .2byte EC_POKEMON2(CORSOLA) - .2byte EC_MOVE(COSMIC_POWER) - .2byte EC_MOVE2(COTTON_SPORE) - .2byte EC_WORD_COULD - .2byte EC_WORD_COULDN_T - .2byte EC_WORD_COUNT_ON - .2byte EC_MOVE(COUNTER) - .2byte EC_WORD_COUPLE - .2byte EC_MOVE2(COVET) - .2byte EC_MOVE(CRABHAMMER) - .2byte EC_POKEMON(CRADILY) - .2byte EC_POKEMON(CRAWDAUNT) - .2byte EC_WORD_CRIES - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(CROBAT) - .2byte EC_POKEMON2(CROBAT) - .2byte EC_POKEMON2(CROCONAW) - .2byte EC_MOVE(CROSS_CHOP) - .2byte EC_MOVE(CRUNCH) - .2byte EC_WORD_CRUSH - .2byte EC_MOVE2(CRUSH_CLAW) - .2byte EC_WORD_CRY - .2byte EC_POKEMON2(CUBONE) - .2byte EC_WORD_CURRENT - .2byte EC_MOVE2(CURSE) - .2byte EC_MOVE(CUT) - .2byte EC_WORD_CUTE - .2byte EC_WORD_CUTE_CHARM - .2byte EC_WORD_CUTENESS - .2byte EC_POKEMON2(CYNDAQUIL) - -gEasyChatWordsByLetter_D:: @ 859D336 - .2byte EC_WORD_DAILY - .2byte EC_WORD_DAMP - .2byte EC_WORD_DANCE - .2byte EC_WORD_DANGER - .2byte EC_WORD_DARK - .2byte EC_WORD_DARN - .2byte EC_WORD_DATE - .2byte EC_WORD_DAUGHTER - .2byte EC_WORD_DAY - .2byte EC_WORD_DAYS - .2byte EC_WORD_DAYTIME - .2byte EC_WORD_DECIDE - .2byte EC_WORD_DECIDED - .2byte EC_WORD_DEEP - .2byte EC_WORD_DEFEATED - .2byte EC_MOVE2(DEFENSE_CURL) - .2byte EC_POKEMON(DELCATTY) - .2byte EC_POKEMON2(DELIBIRD) - .2byte EC_POKEMON(DEOXYS) - .2byte EC_WORD_DEPT_STORE - .2byte EC_WORD_DESIGN - .2byte EC_WORD_DESTINY - .2byte EC_MOVE2(DESTINY_BOND) - .2byte EC_WORD_DESTROYED - .2byte EC_MOVE2(DETECT) - .2byte EC_POKEMON2(DEWGONG) - .2byte EC_WORD_DID - .2byte EC_WORD_DIDN_T - .2byte EC_WORD_DIET - .2byte EC_WORD_DIFFERENT - .2byte EC_MOVE(DIG) - .2byte EC_WORD_DIGITAL - .2byte EC_POKEMON2(DIGLETT) - .2byte EC_WORD_DIRECT - .2byte EC_MOVE(DISABLE) - .2byte EC_WORD_DISAPPEAR - .2byte EC_WORD_DISAPPOINT - .2byte EC_WORD_DISAPPOINTED - .2byte EC_WORD_DISAPPOINTS - .2byte EC_WORD_DISASTER - .2byte EC_WORD_DISLIKE - .2byte EC_WORD_DISLIKES - .2byte EC_POKEMON2(DITTO) - .2byte EC_MOVE2(DIVE) - .2byte EC_MOVE2(DIZZY_PUNCH) - .2byte EC_WORD_DO - .2byte EC_WORD_DOCILE - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(DODRIO) - .2byte EC_POKEMON2(DODRIO) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(DODUO) - .2byte EC_POKEMON2(DODUO) - .2byte EC_WORD_DOES - .2byte EC_WORD_DOESN_T - .2byte EC_WORD_DON_T - .2byte EC_WORD_DONE - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(DONPHAN) - .2byte EC_POKEMON2(DONPHAN) - .2byte EC_MOVE2(DOOM_DESIRE) - .2byte EC_MOVE2(DOUBLE_KICK) - .2byte EC_MOVE(DOUBLE_TEAM) - .2byte EC_MOVE(DOUBLE_EDGE) - .2byte EC_MOVE(DOUBLE_SLAP) - .2byte EC_WORD_DOWN - .2byte EC_WORD_DOWNCAST - .2byte EC_WORD_DRAGON - .2byte EC_MOVE2(DRAGON_CLAW) - .2byte EC_MOVE2(DRAGON_DANCE) - .2byte EC_MOVE2(DRAGON_RAGE) - .2byte EC_POKEMON2(DRAGONAIR) - .2byte EC_MOVE2(DRAGON_BREATH) - .2byte EC_POKEMON2(DRAGONITE) - .2byte EC_POKEMON2(DRATINI) - .2byte EC_WORD_DREAM - .2byte EC_MOVE2(DREAM_EATER) - .2byte EC_MOVE2(DRILL_PECK) - .2byte EC_WORD_DRINK - .2byte EC_WORD_DRINKS - .2byte EC_WORD_DRIZZLE - .2byte EC_WORD_DROOLING - .2byte EC_WORD_DROUGHT - .2byte EC_POKEMON2(DROWZEE) - .2byte EC_WORD_DUDE - .2byte EC_POKEMON2(DUGTRIO) - .2byte EC_POKEMON2(DUNSPARCE) - .2byte EC_POKEMON(DUSCLOPS) - .2byte EC_POKEMON(DUSKULL) - .2byte EC_POKEMON(DUSTOX) - .2byte EC_MOVE2(DYNAMIC_PUNCH) - -gEasyChatWordsByLetter_E:: @ 859D3F2 - .2byte EC_WORD_EARLIER - .2byte EC_WORD_EARLY_BIRD - .2byte EC_MOVE(EARTHQUAKE) - .2byte EC_WORD_EASY - .2byte EC_WORD_EAT - .2byte EC_WORD_EATS - .2byte EC_WORD_EEK - .2byte EC_POKEMON2(EEVEE) - .2byte EC_WORD_EFFECT_SPORE - .2byte EC_WORD_EGG - .2byte EC_MOVE2(EGG_BOMB) - .2byte EC_WORD_EH_QUES - .2byte EC_WORD_EHEHE - .2byte EC_POKEMON2(EKANS) - .2byte EC_POKEMON2(ELECTABUZZ) - .2byte EC_WORD_ELECTRIC - .2byte EC_POKEMON(ELECTRIKE) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(ELECTRODE) - .2byte EC_POKEMON2(ELECTRODE) - .2byte EC_POKEMON2(ELEKID) - .2byte EC_WORD_ELSE - .2byte EC_MOVE2(EMBER) - .2byte EC_WORD_EMERALD - .2byte EC_MOVE(ENCORE) - .2byte EC_WORD_ENCYCLOPEDIA - .2byte EC_WORD_END - .2byte EC_MOVE(ENDEAVOR) - .2byte EC_MOVE(ENDURE) - .2byte EC_WORD_ENJOY - .2byte EC_WORD_ENJOYS - .2byte EC_WORD_ENOUGH - .2byte EC_POKEMON2(ENTEI) - .2byte EC_WORD_ENTERTAINING - .2byte EC_MOVE2(ERUPTION) - .2byte EC_WORD_ESCAPE - .2byte EC_POKEMON2(ESPEON) - .2byte EC_WORD_EVEN_SO - .2byte EC_WORD_EVENT - .2byte EC_WORD_EVENTS - .2byte EC_WORD_EVER - .2byte EC_WORD_EVERY - .2byte EC_WORD_EVOLUTION - .2byte EC_WORD_EVOLVE - .2byte EC_WORD_EXCELLENT - .2byte EC_WORD_EXCESS - .2byte EC_WORD_EXCITE - .2byte EC_WORD_EXCITING - .2byte EC_WORD_EXCUSE - .2byte EC_WORD_EXCUSE_ME - .2byte EC_POKEMON2(EXEGGCUTE) - .2byte EC_POKEMON2(EXEGGUTOR) - .2byte EC_WORD_EXISTS - .2byte EC_WORD_EXPENSIVE - .2byte EC_MOVE2(EXPLOSION) - .2byte EC_POKEMON(EXPLOUD) - .2byte EC_MOVE(EXTRASENSORY) - .2byte EC_MOVE(EXTREME_SPEED) - -gEasyChatWordsByLetter_F:: @ 859D468 - .2byte EC_WORD_FABULOUS - .2byte EC_MOVE(FACADE) - .2byte EC_WORD_FAINT - .2byte EC_MOVE2(FAINT_ATTACK) - .2byte EC_WORD_FAINTED - .2byte EC_MOVE2(FAKE_OUT) - .2byte EC_MOVE(FAKE_TEARS) - .2byte EC_WORD_FALL - .2byte EC_MOVE2(FALSE_SWIPE) - .2byte EC_WORD_FAMILY - .2byte EC_WORD_FANTASTIC - .2byte EC_WORD_FAR - .2byte EC_POKEMON2(FARFETCHD) - .2byte EC_WORD_FASHION - .2byte EC_WORD_FAST - .2byte EC_WORD_FATHER - .2byte EC_WORD_FEAR - .2byte EC_POKEMON2(FEAROW) - .2byte EC_MOVE2(FEATHER_DANCE) - .2byte EC_POKEMON(FEEBAS) - .2byte EC_WORD_FEELING - .2byte EC_POKEMON2(FERALIGATR) - .2byte EC_WORD_FESTIVAL - .2byte EC_WORD_FEVER - .2byte EC_WORD_FIERY - .2byte EC_WORD_FIGHT - .2byte EC_WORD_FIGHTING - .2byte EC_WORD_FIGHTS - .2byte EC_WORD_FINAL - .2byte EC_WORD_FINALLY - .2byte EC_WORD_FINISH - .2byte EC_WORD_FIRE - .2byte EC_MOVE2(FIRE_BLAST) - .2byte EC_MOVE2(FIRE_PUNCH) - .2byte EC_MOVE2(FIRE_SPIN) - .2byte EC_WORD_FISHING - .2byte EC_MOVE(FISSURE) - .2byte EC_POKEMON2(FLAAFFY) - .2byte EC_MOVE(FLAIL) - .2byte EC_WORD_FLAME - .2byte EC_WORD_FLAME_BODY - .2byte EC_MOVE(FLAME_WHEEL) - .2byte EC_MOVE(FLAMETHROWER) - .2byte EC_POKEMON2(FLAREON) - .2byte EC_MOVE2(FLASH) - .2byte EC_WORD_FLASH_FIRE - .2byte EC_WORD_FLATTEN - .2byte EC_MOVE(FLATTER) - .2byte EC_WORD_FLOWERS - .2byte EC_MOVE(FLY) - .2byte EC_POKEMON(FLYGON) - .2byte EC_WORD_FLYING - .2byte EC_MOVE(FOCUS_ENERGY) - .2byte EC_MOVE(FOCUS_PUNCH) - .2byte EC_WORD_FOE - .2byte EC_MOVE(FOLLOW_ME) - .2byte EC_WORD_FOR - .2byte EC_WORD_FOR_NOW - .2byte EC_WORD_FORECAST - .2byte EC_MOVE2(FORESIGHT) - .2byte EC_WORD_FOREVER - .2byte EC_WORD_FORGET - .2byte EC_WORD_FORGETS - .2byte EC_WORD_FORGIVE - .2byte EC_POKEMON2(FORRETRESS) - .2byte EC_MOVE2(FRENZY_PLANT) - .2byte EC_WORD_FRIDAY - .2byte EC_WORD_FRIEND - .2byte EC_WORD_FROM - .2byte EC_WORD_FRONT - .2byte EC_WORD_FRONTIER - .2byte EC_MOVE2(FRUSTRATION) - .2byte EC_WORD_FUFUFU - .2byte EC_WORD_FULL - .2byte EC_WORD_FUNNY - .2byte EC_POKEMON2(FURRET) - .2byte EC_MOVE2(FURY_ATTACK) - .2byte EC_MOVE2(FURY_CUTTER) - .2byte EC_MOVE2(FURY_SWIPES) - .2byte EC_MOVE2(FUTURE_SIGHT) - -gEasyChatWordsByLetter_G:: @ 859D508 - .2byte EC_WORD_GAME - .2byte EC_POKEMON(GARDEVOIR) - .2byte EC_POKEMON2(GASTLY) - .2byte EC_POKEMON2(GENGAR) - .2byte EC_WORD_GENIUS - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GEODUDE) - .2byte EC_POKEMON2(GEODUDE) - .2byte EC_WORD_GET - .2byte EC_WORD_GETS - .2byte EC_WORD_GHOST - .2byte EC_WORD_GIDDY - .2byte EC_MOVE(GIGA_DRAIN) - .2byte EC_WORD_GIGGLE - .2byte EC_WORD_GIMME - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GIRAFARIG) - .2byte EC_POKEMON2(GIRAFARIG) - .2byte EC_WORD_GIRL - .2byte EC_WORD_GIVE - .2byte EC_WORD_GIVE_ME - .2byte EC_WORD_GIVE_UP - .2byte EC_WORD_GIVES - .2byte EC_POKEMON(GLALIE) - .2byte EC_MOVE2(GLARE) - .2byte EC_POKEMON2(GLIGAR) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GLOOM) - .2byte EC_POKEMON2(GLOOM) - .2byte EC_WORD_GO - .2byte EC_WORD_GO_AHEAD - .2byte EC_WORD_GO_EASY - .2byte EC_WORD_GO_HOME - .2byte EC_WORD_GOES - .2byte EC_WORD_GOING - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GOLBAT) - .2byte EC_POKEMON2(GOLBAT) - .2byte EC_WORD_GOLD - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GOLDEEN) - .2byte EC_POKEMON2(GOLDEEN) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GOLDUCK) - .2byte EC_POKEMON2(GOLDUCK) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GOLEM) - .2byte EC_POKEMON2(GOLEM) - .2byte EC_WORD_GOOD - .2byte EC_WORD_GOOD_BYE - .2byte EC_POKEMON(GOREBYSS) - .2byte EC_WORD_GOT - .2byte EC_WORD_GOTCHA - .2byte EC_WORD_GOURMET - .2byte EC_WORD_GRAAAH - .2byte EC_POKEMON2(GRANBULL) - .2byte EC_WORD_GRANDFATHER - .2byte EC_WORD_GRANDMOTHER - .2byte EC_WORD_GRASS - .2byte EC_MOVE(GRASS_WHISTLE) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GRAVELER) - .2byte EC_POKEMON2(GRAVELER) - .2byte EC_WORD_GREAT - .2byte EC_WORD_GREEN - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GRIMER) - .2byte EC_POKEMON2(GRIMER) - .2byte EC_POKEMON(GROUDON) - .2byte EC_WORD_GROUND - .2byte EC_WORD_GROUP - .2byte EC_POKEMON(GROVYLE) - .2byte EC_MOVE2(GROWL) - .2byte EC_POKEMON2(GROWLITHE) - .2byte EC_MOVE(GROWTH) - .2byte EC_MOVE(GRUDGE) - .2byte EC_POKEMON(GRUMPIG) - .2byte EC_WORD_GUARD - .2byte EC_MOVE2(GUILLOTINE) - .2byte EC_POKEMON(GULPIN) - .2byte EC_MOVE(GUST) - .2byte EC_WORD_GUTS - .2byte EC_WORD_GUTSY - .2byte EC_WORD_GWAH - .2byte EC_WORD_GWAHAHAHA - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GYARADOS) - .2byte EC_POKEMON2(GYARADOS) - -gEasyChatWordsByLetter_H:: @ 859D5CC - .2byte EC_WORD_HABIT - .2byte EC_WORD_HAH - .2byte EC_WORD_HAHAHA - .2byte EC_MOVE(HAIL) - .2byte EC_WORD_HALL_OF_FAME - .2byte EC_WORD_HAPPENING - .2byte EC_WORD_HAPPILY - .2byte EC_WORD_HAPPINESS - .2byte EC_WORD_HAPPY - .2byte EC_WORD_HARD - .2byte EC_MOVE(HARDEN) - .2byte EC_POKEMON(HARIYAMA) - .2byte EC_WORD_HAS - .2byte EC_WORD_HASSLE - .2byte EC_POKEMON2(HAUNTER) - .2byte EC_WORD_HAVE - .2byte EC_WORD_HAVEN_T - .2byte EC_MOVE(HAZE) - .2byte EC_WORD_HE - .2byte EC_WORD_HE_S - .2byte EC_MOVE(HEADBUTT) - .2byte EC_MOVE(HEAL_BELL) - .2byte EC_WORD_HEALTHY - .2byte EC_WORD_HEAR - .2byte EC_WORD_HEARING - .2byte EC_WORD_HEARS - .2byte EC_WORD_HEART - .2byte EC_MOVE2(HEAT_WAVE) - .2byte EC_WORD_HEH - .2byte EC_WORD_HEHE - .2byte EC_WORD_HEHEHE - .2byte EC_WORD_HELLO - .2byte EC_MOVE2(HELPING_HAND) - .2byte EC_WORD_HER - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(HERACROSS) - .2byte EC_POKEMON2(HERACROSS) - .2byte EC_WORD_HERE - .2byte EC_WORD_HERE_GOES - .2byte EC_WORD_HERE_I_COME - .2byte EC_WORD_HERE_IT_IS - .2byte EC_WORD_HERO - .2byte EC_WORD_HEROINE - .2byte EC_WORD_HERS - .2byte EC_WORD_HEY - .2byte EC_WORD_HEY_THERE - .2byte EC_WORD_HEY_QUES - .2byte EC_WORD_HI - .2byte EC_MOVE2(HI_JUMP_KICK) - .2byte EC_WORD_HIDDEN - .2byte EC_MOVE2(HIDDEN_POWER) - .2byte EC_WORD_HIGH - .2byte EC_WORD_HIGHS - .2byte EC_WORD_HIM - .2byte EC_WORD_HIP_AND - .2byte EC_WORD_HIS - .2byte EC_WORD_HIT - .2byte EC_POKEMON2(HITMONCHAN) - .2byte EC_POKEMON2(HITMONLEE) - .2byte EC_POKEMON2(HITMONTOP) - .2byte EC_WORD_HIYAH - .2byte EC_WORD_HMM - .2byte EC_POKEMON2(HO_OH) - .2byte EC_WORD_HOBBY - .2byte EC_WORD_HOHOHO - .2byte EC_WORD_HOLIDAY - .2byte EC_WORD_HOME - .2byte EC_WORD_HOO_HAH - .2byte EC_POKEMON2(HOOTHOOT) - .2byte EC_WORD_HOPELESS - .2byte EC_POKEMON2(HOPPIP) - .2byte EC_MOVE2(HORN_ATTACK) - .2byte EC_MOVE2(HORN_DRILL) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(HORSEA) - .2byte EC_POKEMON2(HORSEA) - .2byte EC_WORD_HOT - .2byte EC_POKEMON2(HOUNDOOM) - .2byte EC_POKEMON2(HOUNDOUR) - .2byte EC_WORD_HOW - .2byte EC_WORD_HOW_DO - .2byte EC_WORD_HOWEVER - .2byte EC_MOVE2(HOWL) - .2byte EC_WORD_HUGE_POWER - .2byte EC_WORD_HUH_QUES - .2byte EC_WORD_HUMPH - .2byte EC_WORD_HUNGRY - .2byte EC_POKEMON(HUNTAIL) - .2byte EC_WORD_HURRIED - .2byte EC_WORD_HUSTLE - .2byte EC_MOVE2(HYDRO_CANNON) - .2byte EC_MOVE2(HYDRO_PUMP) - .2byte EC_WORD_HYPER - .2byte EC_MOVE2(HYPER_BEAM) - .2byte EC_WORD_HYPER_CUTTER - .2byte EC_MOVE2(HYPER_FANG) - .2byte EC_MOVE2(HYPER_VOICE) - .2byte EC_POKEMON2(HYPNO) - .2byte EC_MOVE(HYPNOSIS) - -gEasyChatWordsByLetter_I:: @ 859D696 - .2byte EC_WORD_I - .2byte EC_WORD_I_AM - .2byte EC_WORD_I_CHOOSE_YOU - .2byte EC_WORD_I_WAS - .2byte EC_WORD_I_VE - .2byte EC_WORD_I_VE_ARRIVED - .2byte EC_WORD_ICE - .2byte EC_MOVE(ICE_BALL) - .2byte EC_MOVE2(ICE_BEAM) - .2byte EC_MOVE2(ICE_PUNCH) - .2byte EC_MOVE2(ICICLE_SPEAR) - .2byte EC_MOVE(ICY_WIND) - .2byte EC_WORD_IDOL - .2byte EC_WORD_IF - .2byte EC_WORD_IF_I_LOSE - .2byte EC_WORD_IF_I_WIN - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(IGGLYBUFF) - .2byte EC_POKEMON2(IGGLYBUFF) - .2byte EC_WORD_IGNORANT - .2byte EC_WORD_ILLUMINATE - .2byte EC_POKEMON(ILLUMISE) - .2byte EC_WORD_IMMUNITY - .2byte EC_WORD_IMPORTANT - .2byte EC_WORD_IMPOSSIBLE - .2byte EC_MOVE2(IMPRISON) - .2byte EC_WORD_IN - .2byte EC_WORD_INCREASING - .2byte EC_WORD_INCREDIBLE - .2byte EC_WORD_INFORMATION - .2byte EC_MOVE2(INGRAIN) - .2byte EC_WORD_INNER_FOCUS - .2byte EC_WORD_INSIDE - .2byte EC_WORD_INSOMNIA - .2byte EC_WORD_INSTEAD - .2byte EC_WORD_INTIMIDATE - .2byte EC_WORD_INVINCIBLE - .2byte EC_MOVE2(IRON_DEFENSE) - .2byte EC_MOVE(IRON_TAIL) - .2byte EC_WORD_IS - .2byte EC_WORD_IS_IT_QUES - .2byte EC_WORD_ISN_T - .2byte EC_WORD_ISN_T_IT_QUES - .2byte EC_WORD_IT - .2byte EC_WORD_IT_S - .2byte EC_WORD_ITEM - .2byte EC_POKEMON2(IVYSAUR) - -gEasyChatWordsByLetter_J:: @ 859D6F6 - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(JIGGLYPUFF) - .2byte EC_POKEMON2(JIGGLYPUFF) - .2byte EC_POKEMON(JIRACHI) - .2byte EC_WORD_JOKING - .2byte EC_POKEMON2(JOLTEON) - .2byte EC_WORD_JOY - .2byte EC_WORD_JUDGE - .2byte EC_MOVE2(JUMP_KICK) - .2byte EC_POKEMON2(JUMPLUFF) - .2byte EC_WORD_JUST - .2byte EC_POKEMON2(JYNX) - -gEasyChatWordsByLetter_K:: @ 859D710 - .2byte EC_POKEMON2(KABUTO) - .2byte EC_POKEMON2(KABUTOPS) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(KADABRA) - .2byte EC_POKEMON2(KADABRA) - .2byte EC_POKEMON2(KAKUNA) - .2byte EC_POKEMON2(KANGASKHAN) - .2byte EC_MOVE(KARATE_CHOP) - .2byte EC_POKEMON(KECLEON) - .2byte EC_WORD_KEEN_EYE - .2byte EC_WORD_KID - .2byte EC_WORD_KIDDING - .2byte EC_WORD_KIND - .2byte EC_WORD_KINDERGARTEN - .2byte EC_MOVE(KINESIS) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(KINGDRA) - .2byte EC_POKEMON2(KINGDRA) - .2byte EC_POKEMON2(KINGLER) - .2byte EC_POKEMON(KIRLIA) - .2byte EC_MOVE2(KNOCK_OFF) - .2byte EC_WORD_KNOCKOUT - .2byte EC_WORD_KNOW - .2byte EC_WORD_KNOWS - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(KOFFING) - .2byte EC_POKEMON2(KOFFING) - .2byte EC_POKEMON2(KRABBY) - .2byte EC_WORD_KTHX_BYE - .2byte EC_POKEMON(KYOGRE) - -gEasyChatWordsByLetter_L:: @ 859D752 - .2byte EC_WORD_LACKING - .2byte EC_WORD_LACKS - .2byte EC_WORD_LADY - .2byte EC_POKEMON(LAIRON) - .2byte EC_WORD_LALALA - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(LANTURN) - .2byte EC_POKEMON2(LANTURN) - .2byte EC_POKEMON2(LAPRAS) - .2byte EC_POKEMON2(LARVITAR) - .2byte EC_WORD_LAST - .2byte EC_WORD_LATE - .2byte EC_WORD_LATER - .2byte EC_POKEMON(LATIAS) - .2byte EC_POKEMON(LATIOS) - .2byte EC_WORD_LAVISH - .2byte EC_WORD_LAY - .2byte EC_WORD_LEADER - .2byte EC_WORD_LEADERS - .2byte EC_WORD_LEAF - .2byte EC_MOVE2(LEAF_BLADE) - .2byte EC_WORD_LEARN - .2byte EC_POKEMON2(LEDIAN) - .2byte EC_POKEMON2(LEDYBA) - .2byte EC_MOVE(LEECH_LIFE) - .2byte EC_MOVE2(LEECH_SEED) - .2byte EC_MOVE2(LEER) - .2byte EC_WORD_LEFT - .2byte EC_WORD_LEGEND - .2byte EC_WORD_LESS - .2byte EC_WORD_LESSONS - .2byte EC_WORD_LET_ME_WIN - .2byte EC_WORD_LET_S - .2byte EC_WORD_LETTER - .2byte EC_WORD_LEVEL - .2byte EC_WORD_LEVITATE - .2byte EC_MOVE(LICK) - .2byte EC_POKEMON2(LICKITUNG) - .2byte EC_WORD_LIE - .2byte EC_WORD_LIFE - .2byte EC_MOVE2(LIGHT_SCREEN) - .2byte EC_WORD_LIGHTNINGROD - .2byte EC_WORD_LIKE - .2byte EC_WORD_LIKELY_TO - .2byte EC_WORD_LIKES - .2byte EC_POKEMON(LILEEP) - .2byte EC_WORD_LIMBER - .2byte EC_WORD_LINK - .2byte EC_POKEMON(LINOONE) - .2byte EC_WORD_LIQUID_OOZE - .2byte EC_WORD_LISTEN - .2byte EC_WORD_LISTENING - .2byte EC_WORD_LISTENS - .2byte EC_WORD_LIVING - .2byte EC_MOVE2(LOCK_ON) - .2byte EC_WORD_LOCOMOTIVE - .2byte EC_WORD_LOL - .2byte EC_WORD_LOLLING - .2byte EC_POKEMON(LOMBRE) - .2byte EC_WORD_LONESOME - .2byte EC_WORD_LOOK - .2byte EC_WORD_LOOKS - .2byte EC_WORD_LOSE - .2byte EC_WORD_LOSER - .2byte EC_WORD_LOSING - .2byte EC_WORD_LOSS - .2byte EC_WORD_LOST - .2byte EC_POKEMON(LOTAD) - .2byte EC_POKEMON(LOUDRED) - .2byte EC_WORD_LOUSY - .2byte EC_MOVE(LOVELY_KISS) - .2byte EC_WORD_LOVEY_DOVEY - .2byte EC_WORD_LOW - .2byte EC_MOVE(LOW_KICK) - .2byte EC_WORD_LOWS - .2byte EC_POKEMON(LUDICOLO) - .2byte EC_POKEMON2(LUGIA) - .2byte EC_WORD_LUKEWARM - .2byte EC_POKEMON(LUNATONE) - .2byte EC_MOVE2(LUSTER_PURGE) - .2byte EC_POKEMON(LUVDISC) - -gEasyChatWordsByLetter_M:: @ 859D7F6 - .2byte EC_MOVE2(MACH_PUNCH) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(MACHAMP) - .2byte EC_POKEMON2(MACHAMP) - .2byte EC_WORD_MACHINE - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(MACHOKE) - .2byte EC_POKEMON2(MACHOKE) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(MACHOP) - .2byte EC_POKEMON2(MACHOP) - .2byte EC_WORD_MAGAZINE - .2byte EC_POKEMON2(MAGBY) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(MAGCARGO) - .2byte EC_POKEMON2(MAGCARGO) - .2byte EC_MOVE2(MAGIC_COAT) - .2byte EC_MOVE2(MAGICAL_LEAF) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(MAGIKARP) - .2byte EC_POKEMON2(MAGIKARP) - .2byte EC_WORD_MAGMA_ARMOR - .2byte EC_POKEMON2(MAGMAR) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(MAGNEMITE) - .2byte EC_POKEMON2(MAGNEMITE) - .2byte EC_WORD_MAGNET_PULL - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(MAGNETON) - .2byte EC_POKEMON2(MAGNETON) - .2byte EC_MOVE2(MAGNITUDE) - .2byte EC_WORD_MAIL - .2byte EC_WORD_MAKE - .2byte EC_WORD_MAKING - .2byte EC_POKEMON(MAKUHITA) - .2byte EC_WORD_MAN - .2byte EC_POKEMON(MANECTRIC) - .2byte EC_POKEMON2(MANKEY) - .2byte EC_POKEMON2(MANTINE) - .2byte EC_POKEMON2(MAREEP) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(MARILL) - .2byte EC_POKEMON2(MARILL) - .2byte EC_POKEMON2(MAROWAK) - .2byte EC_POKEMON(MARSHTOMP) - .2byte EC_WORD_MARVEL_SCALE - .2byte EC_POKEMON(MASQUERAIN) - .2byte EC_WORD_MASTER - .2byte EC_WORD_MATCH - .2byte EC_WORD_MATCH_UP - .2byte EC_POKEMON(MAWILE) - .2byte EC_WORD_MAYBE - .2byte EC_WORD_MC - .2byte EC_WORD_ME - .2byte EC_WORD_MEAN - .2byte EC_MOVE(MEAN_LOOK) - .2byte EC_POKEMON(MEDICHAM) - .2byte EC_MOVE2(MEDITATE) - .2byte EC_POKEMON(MEDITITE) - .2byte EC_WORD_MEET - .2byte EC_WORD_MEET_YOU - .2byte EC_WORD_MEETS - .2byte EC_WORD_MEGA - .2byte EC_MOVE2(MEGA_DRAIN) - .2byte EC_MOVE2(MEGA_KICK) - .2byte EC_MOVE2(MEGA_PUNCH) - .2byte EC_MOVE2(MEGAHORN) - .2byte EC_POKEMON2(MEGANIUM) - .2byte EC_MOVE(MEMENTO) - .2byte EC_POKEMON2(MEOWTH) - .2byte EC_WORD_MESSAGE - .2byte EC_POKEMON(METAGROSS) - .2byte EC_MOVE2(METAL_CLAW) - .2byte EC_MOVE(METAL_SOUND) - .2byte EC_POKEMON(METANG) - .2byte EC_POKEMON2(METAPOD) - .2byte EC_MOVE(METEOR_MASH) - .2byte EC_MOVE2(METRONOME) - .2byte EC_POKEMON2(MEW) - .2byte EC_POKEMON2(MEWTWO) - .2byte EC_POKEMON(MIGHTYENA) - .2byte EC_MOVE2(MILK_DRINK) - .2byte EC_POKEMON(MILOTIC) - .2byte EC_POKEMON2(MILTANK) - .2byte EC_MOVE2(MIMIC) - .2byte EC_MOVE(MIND_READER) - .2byte EC_MOVE2(MINIMIZE) - .2byte EC_POKEMON(MINUN) - .2byte EC_WORD_MINUS - .2byte EC_MOVE2(MIRROR_COAT) - .2byte EC_MOVE(MIRROR_MOVE) - .2byte EC_POKEMON2(MISDREAVUS) - .2byte EC_WORD_MISHEARD - .2byte EC_WORD_MISS - .2byte EC_MOVE(MIST) - .2byte EC_MOVE2(MIST_BALL) - .2byte EC_WORD_MISTAKE - .2byte EC_WORD_MMM - .2byte EC_WORD_MODE - .2byte EC_WORD_MODERN - .2byte EC_POKEMON2(MOLTRES) - .2byte EC_WORD_MOMENTUM - .2byte EC_WORD_MONDAY - .2byte EC_WORD_MONEY - .2byte EC_WORD_MONTH - .2byte EC_WORD_MOOD - .2byte EC_MOVE2(MOONLIGHT) - .2byte EC_WORD_MORE - .2byte EC_WORD_MORNING - .2byte EC_MOVE(MORNING_SUN) - .2byte EC_WORD_MOTHER - .2byte EC_WORD_MOVE - .2byte EC_WORD_MOVIE - .2byte EC_WORD_MR - .2byte EC_POKEMON2(MR_MIME) - .2byte EC_WORD_MRS - .2byte EC_WORD_MUCH - .2byte EC_WORD_MUCH_OBLIGED - .2byte EC_MOVE2(MUD_SHOT) - .2byte EC_MOVE2(MUD_SPORT) - .2byte EC_MOVE2(MUD_SLAP) - .2byte EC_MOVE2(MUDDY_WATER) - .2byte EC_POKEMON(MUDKIP) - .2byte EC_WORD_MUFUFU - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(MUK) - .2byte EC_POKEMON2(MUK) - .2byte EC_POKEMON2(MURKROW) - .2byte EC_WORD_MUSIC - .2byte EC_WORD_MUST_BE - .2byte EC_WORD_MY - .2byte EC_WORD_MYSELF - .2byte EC_WORD_MYSTERY - -gEasyChatWordsByLetter_N:: @ 859D912 - .2byte EC_WORD_NAME - .2byte EC_WORD_NAP - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(NATU) - .2byte EC_POKEMON2(NATU) - .2byte EC_WORD_NATURAL - .2byte EC_WORD_NATURAL_CURE - .2byte EC_WORD_NATURALLY - .2byte EC_WORD_NATURE - .2byte EC_MOVE(NATURE_POWER) - .2byte EC_WORD_NEAR - .2byte EC_WORD_NEARLY - .2byte EC_WORD_NEED - .2byte EC_MOVE2(NEEDLE_ARM) - .2byte EC_WORD_NEGATIVE - .2byte EC_WORD_NEVER - .2byte EC_WORD_NEW - .2byte EC_WORD_NEWS - .2byte EC_WORD_NEXT - .2byte EC_WORD_NICE - .2byte EC_POKEMON2(NIDOKING) - .2byte EC_POKEMON2(NIDOQUEEN) - .2byte EC_POKEMON2(NIDORAN_F) - .2byte EC_POKEMON2(NIDORAN_M) - .2byte EC_POKEMON2(NIDORINA) - .2byte EC_POKEMON2(NIDORINO) - .2byte EC_WORD_NIGHT - .2byte EC_MOVE2(NIGHT_SHADE) - .2byte EC_MOVE(NIGHTMARE) - .2byte EC_WORD_NIGHTTIME - .2byte EC_POKEMON(NINCADA) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(NINETALES) - .2byte EC_POKEMON2(NINETALES) - .2byte EC_POKEMON(NINJASK) - .2byte EC_WORD_NITWIT - .2byte EC_WORD_NO - .2byte EC_WORD_NO_MATCH - .2byte EC_WORD_NO_1 - .2byte EC_POKEMON2(NOCTOWL) - .2byte EC_WORD_NOISY - .2byte EC_WORD_NON_STOP - .2byte EC_WORD_NONE - .2byte EC_WORD_NOPE - .2byte EC_WORD_NORMAL - .2byte EC_POKEMON(NOSEPASS) - .2byte EC_WORD_NOT - .2byte EC_WORD_NOT_VERY - .2byte EC_WORD_NOTHING - .2byte EC_WORD_NOW - .2byte EC_POKEMON(NUMEL) - .2byte EC_POKEMON(NUZLEAF) - -gEasyChatWordsByLetter_O:: @ 859D97E - .2byte EC_WORD_OBLIVIOUS - .2byte EC_MOVE(OCTAZOOKA) - .2byte EC_POKEMON2(OCTILLERY) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(ODDISH) - .2byte EC_POKEMON2(ODDISH) - .2byte EC_MOVE(ODOR_SLEUTH) - .2byte EC_WORD_OF - .2byte EC_WORD_OFF - .2byte EC_WORD_OFFENSIVE - .2byte EC_WORD_OH - .2byte EC_WORD_OH_DEAR - .2byte EC_WORD_OH_YEAH - .2byte EC_WORD_OH_KAY - .2byte EC_WORD_OH_QUES - .2byte EC_WORD_OI - .2byte EC_WORD_OI_OI_OI - .2byte EC_WORD_OK_QUES - .2byte EC_WORD_OKAY - .2byte EC_WORD_OLD - .2byte EC_WORD_OLDEN - .2byte EC_POKEMON2(OMANYTE) - .2byte EC_POKEMON2(OMASTAR) - .2byte EC_WORD_ON - .2byte EC_WORD_ONCE - .2byte EC_POKEMON2(ONIX) - .2byte EC_WORD_ONLY - .2byte EC_WORD_OOPS - .2byte EC_WORD_OPPONENT - .2byte EC_WORD_OPPOSITE - .2byte EC_WORD_OR - .2byte EC_WORD_OTHER - .2byte EC_WORD_OUR - .2byte EC_WORD_OUT - .2byte EC_MOVE(OUTRAGE) - .2byte EC_WORD_OUTSIDE - .2byte EC_WORD_OVER - .2byte EC_WORD_OVERDO - .2byte EC_WORD_OVERGROW - .2byte EC_MOVE(OVERHEAT) - .2byte EC_WORD_OVERWHELMING - .2byte EC_WORD_OWN - .2byte EC_WORD_OWN_TEMPO - -gEasyChatWordsByLetter_P:: @ 859D9D6 - .2byte EC_MOVE(PAIN_SPLIT) - .2byte EC_POKEMON2(PARAS) - .2byte EC_POKEMON2(PARASECT) - .2byte EC_WORD_PARDON - .2byte EC_WORD_PARENT - .2byte EC_WORD_PARTNER - .2byte EC_WORD_PARTY - .2byte EC_WORD_PATTERN - .2byte EC_MOVE2(PAY_DAY) - .2byte EC_WORD_PC - .2byte EC_MOVE2(PECK) - .2byte EC_POKEMON(PELIPPER) - .2byte EC_WORD_PERFECT - .2byte EC_WORD_PERFECTION - .2byte EC_MOVE2(PERISH_SONG) - .2byte EC_POKEMON2(PERSIAN) - .2byte EC_WORD_PERSON - .2byte EC_MOVE2(PETAL_DANCE) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(PHANPY) - .2byte EC_POKEMON2(PHANPY) - .2byte EC_WORD_PHONE - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(PICHU) - .2byte EC_POKEMON2(PICHU) - .2byte EC_WORD_PICKUP - .2byte EC_POKEMON2(PIDGEOT) - .2byte EC_POKEMON2(PIDGEOTTO) - .2byte EC_POKEMON2(PIDGEY) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(PIKACHU) - .2byte EC_POKEMON2(PIKACHU) - .2byte EC_POKEMON2(PILOSWINE) - .2byte EC_MOVE2(PIN_MISSILE) - .2byte EC_POKEMON2(PINECO) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(PINSIR) - .2byte EC_POKEMON2(PINSIR) - .2byte EC_WORD_PKRS - .2byte EC_WORD_PLACE - .2byte EC_WORD_PLANS - .2byte EC_WORD_PLAY - .2byte EC_WORD_PLAYED - .2byte EC_WORD_PLAYS - .2byte EC_WORD_PLEASE - .2byte EC_WORD_PLUS - .2byte EC_WORD_PLUSH_DOLL - .2byte EC_POKEMON(PLUSLE) - .2byte EC_WORD_POINTS - .2byte EC_WORD_POISON - .2byte EC_MOVE2(POISON_FANG) - .2byte EC_MOVE2(POISON_GAS) - .2byte EC_WORD_POISON_POINT - .2byte EC_MOVE2(POISON_STING) - .2byte EC_MOVE2(POISON_TAIL) - .2byte EC_MOVE2(POISON_POWDER) - .2byte EC_WORD_POKEBLOCK - .2byte EC_WORD_POKEDEX - .2byte EC_WORD_POKEMON - .2byte EC_WORD_POKENAV - .2byte EC_POKEMON2(POLITOED) - .2byte EC_POKEMON2(POLIWAG) - .2byte EC_POKEMON2(POLIWHIRL) - .2byte EC_POKEMON2(POLIWRATH) - .2byte EC_POKEMON2(PONYTA) - .2byte EC_POKEMON(POOCHYENA) - .2byte EC_WORD_POPULAR - .2byte EC_POKEMON2(PORYGON) - .2byte EC_POKEMON2(PORYGON2) - .2byte EC_MOVE2(POUND) - .2byte EC_MOVE(POWDER_SNOW) - .2byte EC_WORD_POWER - .2byte EC_WORD_PRAISE - .2byte EC_WORD_PREPOSTEROUS - .2byte EC_MOVE2(PRESENT) - .2byte EC_WORD_PRESSURE - .2byte EC_WORD_PRETEND - .2byte EC_WORD_PRETTY - .2byte EC_POKEMON2(PRIMEAPE) - .2byte EC_WORD_PROBABLY - .2byte EC_WORD_PROMISE - .2byte EC_MOVE2(PROTECT) - .2byte EC_MOVE(PSYBEAM) - .2byte EC_MOVE(PSYCH_UP) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_WORD_PSYCHIC - .2byte EC_MOVE(PSYCHIC) - .2byte EC_MOVE(PSYCHO_BOOST) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(PSYDUCK) - .2byte EC_POKEMON2(PSYDUCK) - .2byte EC_MOVE(PSYWAVE) - .2byte EC_POKEMON2(PUPITAR) - .2byte EC_WORD_PURE_POWER - .2byte EC_MOVE(PURSUIT) - .2byte EC_WORD_PUSHOVER - -gEasyChatWordsByLetter_Q:: @ 859DAA2 - .2byte EC_POKEMON2(QUAGSIRE) - .2byte EC_WORD_QUESTION - .2byte EC_MOVE2(QUICK_ATTACK) - .2byte EC_POKEMON2(QUILAVA) - .2byte EC_WORD_QUITE - .2byte EC_POKEMON2(QWILFISH) - -gEasyChatWordsByLetter_R:: @ 859DAAE - .2byte EC_WORD_RADIO - .2byte EC_MOVE(RAGE) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(RAICHU) - .2byte EC_POKEMON2(RAICHU) - .2byte EC_POKEMON2(RAIKOU) - .2byte EC_MOVE(RAIN_DANCE) - .2byte EC_WORD_RAIN_DISH - .2byte EC_POKEMON(RALTS) - .2byte EC_WORD_RANK - .2byte EC_MOVE(RAPID_SPIN) - .2byte EC_POKEMON2(RAPIDASH) - .2byte EC_WORD_RARE - .2byte EC_WORD_RATHER - .2byte EC_POKEMON2(RATICATE) - .2byte EC_POKEMON2(RATTATA) - .2byte EC_POKEMON(RAYQUAZA) - .2byte EC_MOVE2(RAZOR_LEAF) - .2byte EC_MOVE(RAZOR_WIND) - .2byte EC_WORD_READY - .2byte EC_WORD_REALLY - .2byte EC_WORD_REAR - .2byte EC_WORD_RECEIVED - .2byte EC_WORD_RECOMMEND - .2byte EC_MOVE(RECOVER) - .2byte EC_MOVE2(RECYCLE) - .2byte EC_WORD_RED - .2byte EC_MOVE2(REFLECT) - .2byte EC_MOVE2(REFRESH) - .2byte EC_WORD_REFRESHING - .2byte EC_WORD_REFUSE - .2byte EC_POKEMON(REGICE) - .2byte EC_POKEMON(REGIROCK) - .2byte EC_POKEMON(REGISTEEL) - .2byte EC_WORD_REJECT - .2byte EC_WORD_RELEASE - .2byte EC_POKEMON(RELICANTH) - .2byte EC_POKEMON2(REMORAID) - .2byte EC_WORD_RENTAL - .2byte EC_MOVE2(REST) - .2byte EC_WORD_RESUSCITATE - .2byte EC_MOVE(RETURN) - .2byte EC_MOVE2(REVENGE) - .2byte EC_MOVE(REVERSAL) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(RHYDON) - .2byte EC_POKEMON2(RHYDON) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(RHYHORN) - .2byte EC_POKEMON2(RHYHORN) - .2byte EC_WORD_RIBBON - .2byte EC_WORD_RICKETY - .2byte EC_WORD_RIGHT - .2byte EC_WORD_RIPPED - .2byte EC_WORD_RIVAL - .2byte EC_MOVE2(ROAR) - .2byte EC_WORD_ROCK - .2byte EC_MOVE2(ROCK_BLAST) - .2byte EC_WORD_ROCK_HEAD - .2byte EC_MOVE(ROCK_SLIDE) - .2byte EC_MOVE(ROCK_SMASH) - .2byte EC_MOVE(ROCK_THROW) - .2byte EC_MOVE(ROCK_TOMB) - .2byte EC_WORD_ROCK_SOLID - .2byte EC_MOVE2(ROLE_PLAY) - .2byte EC_MOVE2(ROLLING_KICK) - .2byte EC_MOVE(ROLLOUT) - .2byte EC_WORD_ROMANTIC - .2byte EC_WORD_ROOM - .2byte EC_POKEMON(ROSELIA) - .2byte EC_WORD_ROUGH_SKIN - .2byte EC_WORD_RPG - .2byte EC_WORD_RUBY - .2byte EC_WORD_RULE - .2byte EC_WORD_RUN - .2byte EC_WORD_RUN_AWAY - .2byte EC_WORD_RUNS - -gEasyChatWordsByLetter_S:: @ 859DB4E - .2byte EC_POKEMON(SABLEYE) - .2byte EC_MOVE(SACRED_FIRE) - .2byte EC_WORD_SAD - .2byte EC_WORD_SADLY - .2byte EC_MOVE(SAFEGUARD) - .2byte EC_WORD_SAID - .2byte EC_POKEMON(SALAMENCE) - .2byte EC_WORD_SAND_STREAM - .2byte EC_MOVE(SAND_TOMB) - .2byte EC_WORD_SAND_VEIL - .2byte EC_MOVE(SAND_ATTACK) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(SANDSHREW) - .2byte EC_POKEMON2(SANDSHREW) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(SANDSLASH) - .2byte EC_POKEMON2(SANDSLASH) - .2byte EC_MOVE(SANDSTORM) - .2byte EC_WORD_SAPPHIRE - .2byte EC_WORD_SATISFIED - .2byte EC_WORD_SATURDAY - .2byte EC_WORD_SAYS - .2byte EC_WORD_SCARY - .2byte EC_MOVE(SCARY_FACE) - .2byte EC_WORD_SCATTER - .2byte EC_POKEMON(SCEPTILE) - .2byte EC_WORD_SCHOOL - .2byte EC_POKEMON2(SCIZOR) - .2byte EC_MOVE2(SCRATCH) - .2byte EC_MOVE(SCREECH) - .2byte EC_POKEMON2(SCYTHER) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(SEADRA) - .2byte EC_POKEMON2(SEADRA) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(SEAKING) - .2byte EC_POKEMON2(SEAKING) - .2byte EC_POKEMON(SEALEO) - .2byte EC_WORD_SEARCH - .2byte EC_WORD_SECRET - .2byte EC_WORD_SECRET_BASE - .2byte EC_MOVE2(SECRET_POWER) - .2byte EC_WORD_SEE - .2byte EC_WORD_SEE_YA - .2byte EC_POKEMON(SEEDOT) - .2byte EC_WORD_SEEK - .2byte EC_POKEMON2(SEEL) - .2byte EC_WORD_SEEMS - .2byte EC_WORD_SEES - .2byte EC_MOVE2(SEISMIC_TOSS) - .2byte EC_MOVE(SELF_DESTRUCT) - .2byte EC_WORD_SENSE - .2byte EC_POKEMON2(SENTRET) - .2byte EC_WORD_SERENE_GRACE - .2byte EC_WORD_SERIOUS - .2byte EC_WORD_SERIOUSLY - .2byte EC_WORD_SERVICE - .2byte EC_POKEMON(SEVIPER) - .2byte EC_MOVE(SHADOW_BALL) - .2byte EC_MOVE(SHADOW_PUNCH) - .2byte EC_WORD_SHADOW_TAG - .2byte EC_WORD_SHADY - .2byte EC_WORD_SHAKE - .2byte EC_WORD_SHAKY - .2byte EC_WORD_SHALLOW - .2byte EC_POKEMON(SHARPEDO) - .2byte EC_MOVE(SHARPEN) - .2byte EC_WORD_SHE - .2byte EC_WORD_SHE_IS - .2byte EC_WORD_SHE_WAS - .2byte EC_WORD_SHED_SKIN - .2byte EC_POKEMON(SHEDINJA) - .2byte EC_MOVE(SHEER_COLD) - .2byte EC_POKEMON(SHELGON) - .2byte EC_WORD_SHELL_ARMOR - .2byte EC_POKEMON2(SHELLDER) - .2byte EC_WORD_SHIELD_DUST - .2byte EC_POKEMON(SHIFTRY) - .2byte EC_WORD_SHINE - .2byte EC_MOVE2(SHOCK_WAVE) - .2byte EC_WORD_SHOCKED - .2byte EC_WORD_SHOPPING - .2byte EC_WORD_SHOULD - .2byte EC_WORD_SHOW - .2byte EC_WORD_SHREDDED - .2byte EC_POKEMON(SHROOMISH) - .2byte EC_POKEMON2(SHUCKLE) - .2byte EC_POKEMON(SHUPPET) - .2byte EC_WORD_SIBLINGS - .2byte EC_WORD_SIGH - .2byte EC_MOVE(SIGNAL_BEAM) - .2byte EC_POKEMON(SILCOON) - .2byte EC_WORD_SILKY - .2byte EC_WORD_SILVER - .2byte EC_MOVE(SILVER_WIND) - .2byte EC_WORD_SIMPLE - .2byte EC_WORD_SINCE - .2byte EC_MOVE(SING) - .2byte EC_WORD_SINK - .2byte EC_WORD_SISTER - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(SKARMORY) - .2byte EC_POKEMON2(SKARMORY) - .2byte EC_MOVE(SKETCH) - .2byte EC_WORD_SKILL - .2byte EC_MOVE(SKILL_SWAP) - .2byte EC_WORD_SKILLED - .2byte EC_POKEMON2(SKIPLOOM) - .2byte EC_POKEMON(SKITTY) - .2byte EC_MOVE2(SKULL_BASH) - .2byte EC_MOVE(SKY_ATTACK) - .2byte EC_MOVE(SKY_UPPERCUT) - .2byte EC_MOVE2(SLACK_OFF) - .2byte EC_POKEMON(SLAKING) - .2byte EC_POKEMON(SLAKOTH) - .2byte EC_MOVE2(SLAM) - .2byte EC_MOVE(SLASH) - .2byte EC_WORD_SLEEP - .2byte EC_MOVE2(SLEEP_POWDER) - .2byte EC_MOVE2(SLEEP_TALK) - .2byte EC_WORD_SLEPT - .2byte EC_WORD_SLIDE - .2byte EC_WORD_SLIMY - .2byte EC_POKEMON2(SLOWBRO) - .2byte EC_POKEMON2(SLOWKING) - .2byte EC_POKEMON2(SLOWPOKE) - .2byte EC_MOVE2(SLUDGE) - .2byte EC_MOVE2(SLUDGE_BOMB) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(SLUGMA) - .2byte EC_POKEMON2(SLUGMA) - .2byte EC_WORD_SMACK - .2byte EC_WORD_SMALL - .2byte EC_WORD_SMART - .2byte EC_WORD_SMARTNESS - .2byte EC_POKEMON2(SMEARGLE) - .2byte EC_WORD_SMELL - .2byte EC_WORD_SMELL_YA - .2byte EC_MOVE(SMELLING_SALT) - .2byte EC_WORD_SMITE - .2byte EC_MOVE(SMOG) - .2byte EC_MOVE(SMOKESCREEN) - .2byte EC_POKEMON2(SMOOCHUM) - .2byte EC_WORD_SMOOTH - .2byte EC_MOVE2(SNATCH) - .2byte EC_POKEMON2(SNEASEL) - .2byte EC_MOVE(SNORE) - .2byte EC_POKEMON2(SNORLAX) - .2byte EC_WORD_SNORT - .2byte EC_POKEMON(SNORUNT) - .2byte EC_POKEMON2(SNUBBULL) - .2byte EC_WORD_SO - .2byte EC_MOVE2(SOFT_BOILED) - .2byte EC_WORD_SOFTWARE - .2byte EC_MOVE(SOLAR_BEAM) - .2byte EC_POKEMON(SOLROCK) - .2byte EC_WORD_SOME - .2byte EC_WORD_SOMEHOW - .2byte EC_WORD_SOMEONE - .2byte EC_WORD_SOMETHING - .2byte EC_WORD_SOMETIME - .2byte EC_WORD_SON - .2byte EC_WORD_SONG - .2byte EC_WORD_SONGS - .2byte EC_MOVE(SONIC_BOOM) - .2byte EC_WORD_SOON - .2byte EC_WORD_SORRY - .2byte EC_WORD_SOUNDPROOF - .2byte EC_WORD_SP_ABILITY - .2byte EC_MOVE(SPARK) - .2byte EC_POKEMON2(SPEAROW) - .2byte EC_WORD_SPECTATOR - .2byte EC_WORD_SPEED_BOOST - .2byte EC_POKEMON(SPHEAL) - .2byte EC_MOVE(SPIDER_WEB) - .2byte EC_MOVE2(SPIKE_CANNON) - .2byte EC_MOVE2(SPIKES) - .2byte EC_POKEMON2(SPINARAK) - .2byte EC_POKEMON(SPINDA) - .2byte EC_WORD_SPIRALING - .2byte EC_WORD_SPIRIT - .2byte EC_MOVE2(SPIT_UP) - .2byte EC_MOVE(SPITE) - .2byte EC_MOVE2(SPLASH) - .2byte EC_POKEMON(SPOINK) - .2byte EC_MOVE(SPORE) - .2byte EC_WORD_SPORTS - .2byte EC_WORD_SPRING - .2byte EC_POKEMON2(SQUIRTLE) - .2byte EC_WORD_STAGE - .2byte EC_POKEMON2(STANTLER) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(STARMIE) - .2byte EC_POKEMON2(STARMIE) - .2byte EC_WORD_START - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(STARYU) - .2byte EC_POKEMON2(STARYU) - .2byte EC_WORD_STATIC - .2byte EC_WORD_STAY_AT_HOME - .2byte EC_WORD_STEEL - .2byte EC_MOVE2(STEEL_WING) - .2byte EC_POKEMON2(STEELIX) - .2byte EC_WORD_STENCH - .2byte EC_WORD_STICKY_HOLD - .2byte EC_MOVE2(STOCKPILE) - .2byte EC_MOVE2(STOMP) - .2byte EC_WORD_STOP - .2byte EC_WORD_STORE - .2byte EC_WORD_STORES - .2byte EC_WORD_STORY - .2byte EC_WORD_STRATEGY - .2byte EC_MOVE(STRENGTH) - .2byte EC_MOVE(STRING_SHOT) - .2byte EC_WORD_STRONG - .2byte EC_MOVE2(STRUGGLE) - .2byte EC_WORD_STUDY - .2byte EC_MOVE(STUN_SPORE) - .2byte EC_WORD_STURDY - .2byte EC_MOVE(SUBMISSION) - .2byte EC_MOVE2(SUBSTITUTE) - .2byte EC_WORD_SUCTION_CUPS - .2byte EC_POKEMON2(SUDOWOODO) - .2byte EC_POKEMON2(SUICUNE) - .2byte EC_WORD_SUMMER - .2byte EC_WORD_SUNDAY - .2byte EC_POKEMON2(SUNFLORA) - .2byte EC_POKEMON2(SUNKERN) - .2byte EC_MOVE2(SUNNY_DAY) - .2byte EC_WORD_SUPER - .2byte EC_MOVE(SUPER_FANG) - .2byte EC_MOVE2(SUPERPOWER) - .2byte EC_MOVE2(SUPERSONIC) - .2byte EC_MOVE2(SURF) - .2byte EC_WORD_SURPRISE - .2byte EC_WORD_SURRENDER - .2byte EC_POKEMON(SURSKIT) - .2byte EC_POKEMON(SWABLU) - .2byte EC_MOVE(SWAGGER) - .2byte EC_MOVE2(SWALLOW) - .2byte EC_POKEMON(SWALOT) - .2byte EC_POKEMON(SWAMPERT) - .2byte EC_WORD_SWARM - .2byte EC_MOVE2(SWEET_KISS) - .2byte EC_MOVE(SWEET_SCENT) - .2byte EC_WORD_SWEETS - .2byte EC_POKEMON(SWELLOW) - .2byte EC_MOVE(SWIFT) - .2byte EC_WORD_SWIFT_SWIM - .2byte EC_POKEMON2(SWINUB) - .2byte EC_MOVE2(SWORDS_DANCE) - .2byte EC_WORD_SYNCHRONIZE - .2byte EC_MOVE(SYNTHESIS) - .2byte EC_WORD_SYSTEM - -gEasyChatWordsByLetter_T:: @ 859DD5A - .2byte EC_MOVE2(TACKLE) - .2byte EC_MOVE2(TAIL_GLOW) - .2byte EC_MOVE(TAIL_WHIP) - .2byte EC_POKEMON(TAILLOW) - .2byte EC_WORD_TAKE - .2byte EC_MOVE2(TAKE_DOWN) - .2byte EC_WORD_TAKE_THAT - .2byte EC_WORD_TALENT - .2byte EC_WORD_TALK - .2byte EC_WORD_TALKING - .2byte EC_POKEMON2(TANGELA) - .2byte EC_WORD_TASTY - .2byte EC_MOVE2(TAUNT) - .2byte EC_POKEMON2(TAUROS) - .2byte EC_WORD_TCH - .2byte EC_WORD_TEACH - .2byte EC_WORD_TEACHER - .2byte EC_WORD_TEACHES - .2byte EC_POKEMON2(TEDDIURSA) - .2byte EC_MOVE2(TEETER_DANCE) - .2byte EC_MOVE2(TELEPORT) - .2byte EC_WORD_TELEVISION - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(TENTACOOL) - .2byte EC_POKEMON2(TENTACOOL) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(TENTACRUEL) - .2byte EC_POKEMON2(TENTACRUEL) - .2byte EC_WORD_TERRIBLE - .2byte EC_WORD_TEST - .2byte EC_WORD_THAN - .2byte EC_WORD_THANK_YOU - .2byte EC_WORD_THANKS - .2byte EC_WORD_THAT - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_THAT_S - .2byte EC_WORD_THAT_S_IT_EXCL - .2byte EC_WORD_THE - .2byte EC_WORD_THEIR - .2byte EC_WORD_THERE - .2byte EC_WORD_THESE - .2byte EC_WORD_THESE_WERE - .2byte EC_WORD_THEY - .2byte EC_WORD_THEY_WERE - .2byte EC_WORD_THEY_RE - .2byte EC_WORD_THEY_VE - .2byte EC_WORD_THICK - .2byte EC_WORD_THICK_FAT - .2byte EC_MOVE2(THIEF) - .2byte EC_WORD_THIN - .2byte EC_WORD_THING - .2byte EC_WORD_THINGS - .2byte EC_WORD_THINK - .2byte EC_WORD_THINKS - .2byte EC_WORD_THIRSTY - .2byte EC_WORD_THIS - .2byte EC_WORD_THIS_IS_IT_EXCL - .2byte EC_WORD_THOSE - .2byte EC_WORD_THOSE_ARE - .2byte EC_WORD_THOSE_WERE - .2byte EC_MOVE(THRASH) - .2byte EC_WORD_THROW - .2byte EC_MOVE(THUNDER) - .2byte EC_MOVE2(THUNDER_WAVE) - .2byte EC_MOVE(THUNDERBOLT) - .2byte EC_MOVE(THUNDER_PUNCH) - .2byte EC_MOVE2(THUNDER_SHOCK) - .2byte EC_WORD_THURSDAY - .2byte EC_MOVE(TICKLE) - .2byte EC_WORD_TICKLISH - .2byte EC_WORD_TIGHT - .2byte EC_WORD_TIME - .2byte EC_WORD_TIMES - .2byte EC_WORD_TIRED - .2byte EC_WORD_TO - .2byte EC_WORD_TO_HER - .2byte EC_WORD_TO_ME - .2byte EC_WORD_TO_THEM - .2byte EC_WORD_TO_US - .2byte EC_WORD_TO_WHOM - .2byte EC_WORD_TODAY - .2byte EC_POKEMON2(TOGEPI) - .2byte EC_WORD_TOGETHER - .2byte EC_POKEMON2(TOGETIC) - .2byte EC_WORD_TOMORROW - .2byte EC_WORD_TOO - .2byte EC_WORD_TOO_LATE - .2byte EC_WORD_TOO_STRONG - .2byte EC_WORD_TOO_WEAK - .2byte EC_WORD_TOP - .2byte EC_POKEMON(TORCHIC) - .2byte EC_POKEMON(TORKOAL) - .2byte EC_MOVE(TORMENT) - .2byte EC_WORD_TORRENT - .2byte EC_WORD_TOTALLY - .2byte EC_POKEMON2(TOTODILE) - .2byte EC_WORD_TOUGH - .2byte EC_WORD_TOUGHNESS - .2byte EC_WORD_TOURNAMENT - .2byte EC_WORD_TOWER - .2byte EC_MOVE2(TOXIC) - .2byte EC_WORD_TOYS - .2byte EC_WORD_TRACE - .2byte EC_WORD_TRADE - .2byte EC_WORD_TRAIN - .2byte EC_WORD_TRAINER - .2byte EC_WORD_TRAINS - .2byte EC_MOVE2(TRANSFORM) - .2byte EC_POKEMON(TRAPINCH) - .2byte EC_WORD_TRAVEL - .2byte EC_WORD_TREASURE - .2byte EC_POKEMON(TREECKO) - .2byte EC_WORD_TRENDY - .2byte EC_MOVE2(TRI_ATTACK) - .2byte EC_MOVE2(TRICK) - .2byte EC_WORD_TRIES - .2byte EC_MOVE2(TRIPLE_KICK) - .2byte EC_POKEMON(TROPIUS) - .2byte EC_WORD_TRUANT - .2byte EC_WORD_TRULY - .2byte EC_WORD_TRUMP_CARD - .2byte EC_WORD_TRUST - .2byte EC_WORD_TRY - .2byte EC_WORD_TUESDAY - .2byte EC_MOVE2(TWINEEDLE) - .2byte EC_WORD_TWIRLING - .2byte EC_MOVE2(TWISTER) - .2byte EC_WORD_TYPE - .2byte EC_POKEMON2(TYPHLOSION) - .2byte EC_POKEMON2(TYRANITAR) - .2byte EC_POKEMON2(TYROGUE) - -gEasyChatWordsByLetter_U:: @ 859DE64 - .2byte EC_WORD_UGLY - .2byte EC_WORD_UH_HUH - .2byte EC_WORD_UH_OH - .2byte EC_WORD_UM - .2byte EC_POKEMON2(UMBREON) - .2byte EC_WORD_UNAVOIDABLE - .2byte EC_WORD_UNBELIEVABLE - .2byte EC_WORD_UNCLE - .2byte EC_WORD_UNDERSTAND - .2byte EC_WORD_UNDERSTANDS - .2byte EC_WORD_UNDERSTOOD - .2byte EC_WORD_UNION - .2byte EC_POKEMON2(UNOWN) - .2byte EC_WORD_UNTIL - .2byte EC_WORD_UP - .2byte EC_WORD_UPBEAT - .2byte EC_MOVE(UPROAR) - .2byte EC_WORD_UPSIDE_DOWN - .2byte EC_WORD_URGH - .2byte EC_POKEMON2(URSARING) - .2byte EC_WORD_USE - .2byte EC_WORD_USELESS - .2byte EC_WORD_USES - .2byte EC_WORD_USING - -gEasyChatWordsByLetter_V:: @ 859DE94 - .2byte EC_WORD_VACATION - .2byte EC_POKEMON2(VAPOREON) - .2byte EC_POKEMON2(VENOMOTH) - .2byte EC_POKEMON2(VENONAT) - .2byte EC_POKEMON2(VENUSAUR) - .2byte EC_WORD_VERSION - .2byte EC_WORD_VERSUS - .2byte EC_WORD_VERY - .2byte EC_POKEMON(VIBRAVA) - .2byte EC_MOVE2(VICE_GRIP) - .2byte EC_WORD_VICTORY - .2byte EC_POKEMON2(VICTREEBEL) - .2byte EC_WORD_VIEWING - .2byte EC_POKEMON(VIGOROTH) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(VILEPLUME) - .2byte EC_POKEMON2(VILEPLUME) - .2byte EC_MOVE2(VINE_WHIP) - .2byte EC_WORD_VITAL_SPIRIT - .2byte EC_MOVE(VITAL_THROW) - .2byte EC_POKEMON(VOLBEAT) - .2byte EC_WORD_VOLT_ABSORB - .2byte EC_MOVE2(VOLT_TACKLE) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(VOLTORB) - .2byte EC_POKEMON2(VOLTORB) - .2byte EC_WORD_VORACIOUS - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(VULPIX) - .2byte EC_POKEMON2(VULPIX) - -gEasyChatWordsByLetter_W:: @ 859DED6 - .2byte EC_WORD_WAAAH - .2byte EC_WORD_WAHAHAHA - .2byte EC_POKEMON(WAILMER) - .2byte EC_POKEMON(WAILORD) - .2byte EC_WORD_WAIT - .2byte EC_WORD_WAKE_UP - .2byte EC_WORD_WAKES_UP - .2byte EC_WORD_WALK - .2byte EC_WORD_WALKING - .2byte EC_WORD_WALKS - .2byte EC_POKEMON(WALREIN) - .2byte EC_WORD_WANDERING - .2byte EC_WORD_WANNABE - .2byte EC_WORD_WANT - .2byte EC_WORD_WANTS - .2byte EC_POKEMON2(WARTORTLE) - .2byte EC_WORD_WAS - .2byte EC_WORD_WASN_T - .2byte EC_WORD_WATER - .2byte EC_WORD_WATER_ABSORB - .2byte EC_MOVE2(WATER_GUN) - .2byte EC_MOVE2(WATER_PULSE) - .2byte EC_MOVE2(WATER_SPORT) - .2byte EC_MOVE(WATER_SPOUT) - .2byte EC_WORD_WATER_VEIL - .2byte EC_MOVE2(WATERFALL) - .2byte EC_WORD_WAY - .2byte EC_WORD_WE - .2byte EC_WORD_WE_RE - .2byte EC_WORD_WE_VE - .2byte EC_WORD_WEAK - .2byte EC_WORD_WEAKENED - .2byte EC_MOVE(WEATHER_BALL) - .2byte EC_WORD_WEDNESDAY - .2byte EC_POKEMON2(WEEDLE) - .2byte EC_WORD_WEEK - .2byte EC_POKEMON2(WEEPINBELL) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(WEEZING) - .2byte EC_POKEMON2(WEEZING) - .2byte EC_WORD_WEIRD - .2byte EC_WORD_WELCOME - .2byte EC_WORD_WELL - .2byte EC_WORD_WELL_THEN - .2byte EC_WORD_WENT - .2byte EC_WORD_WERE - .2byte EC_WORD_WEREN_T - .2byte EC_WORD_WHAT - .2byte EC_WORD_WHAT_S_UP_QUES - .2byte EC_WORD_WHEN - .2byte EC_WORD_WHEN_I_WIN - .2byte EC_WORD_WHERE - .2byte EC_WORD_WHICH - .2byte EC_WORD_WHILE - .2byte EC_MOVE(WHIRLPOOL) - .2byte EC_MOVE2(WHIRLWIND) - .2byte EC_POKEMON(WHISCASH) - .2byte EC_POKEMON(WHISMUR) - .2byte EC_WORD_WHITE_SMOKE - .2byte EC_WORD_WHO - .2byte EC_WORD_WHO_IS - .2byte EC_WORD_WHO_WAS - .2byte EC_WORD_WHOAH - .2byte EC_WORD_WHOM - .2byte EC_WORD_WHOSE - .2byte EC_WORD_WHY - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(WIGGLYTUFF) - .2byte EC_POKEMON2(WIGGLYTUFF) - .2byte EC_WORD_WILD - .2byte EC_WORD_WILL - .2byte EC_WORD_WILL_BE_HERE - .2byte EC_MOVE(WILL_O_WISP) - .2byte EC_WORD_WIMPY - .2byte EC_WORD_WIN - .2byte EC_MOVE2(WING_ATTACK) - .2byte EC_POKEMON(WINGULL) - .2byte EC_WORD_WINNER - .2byte EC_WORD_WINS - .2byte EC_WORD_WINTER - .2byte EC_WORD_WIRELESS - .2byte EC_MOVE2(WISH) - .2byte EC_WORD_WITH - .2byte EC_MOVE(WITHDRAW) - .2byte EC_WORD_WITHOUT - .2byte EC_WORD_WOBBLY - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(WOBBUFFET) - .2byte EC_POKEMON2(WOBBUFFET) - .2byte EC_WORD_WOMAN - .2byte EC_WORD_WON - .2byte EC_WORD_WON_T - .2byte EC_WORD_WONDER - .2byte EC_WORD_WONDER_GUARD - .2byte EC_POKEMON2(WOOPER) - .2byte EC_WORD_WORD - .2byte EC_WORD_WORK - .2byte EC_WORD_WORKING - .2byte EC_WORD_WORKS - .2byte EC_WORD_WORLD - .2byte EC_WORD_WORRY - .2byte EC_WORD_WOULD - .2byte EC_WORD_WOW - .2byte EC_WORD_WOWEE - .2byte EC_MOVE2(WRAP) - .2byte EC_WORD_WROOOAAR_EXCL - .2byte EC_POKEMON(WURMPLE) - .2byte EC_POKEMON(WYNAUT) - -gEasyChatWordsByLetter_X:: @ 859DFB4 - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(XATU) - .2byte EC_POKEMON2(XATU) - -gEasyChatWordsByLetter_Y:: @ 859DFBC - .2byte EC_WORD_YAHOO - .2byte EC_POKEMON2(YANMA) - .2byte EC_MOVE(YAWN) - .2byte EC_WORD_YAY - .2byte EC_WORD_YEAH - .2byte EC_WORD_YEAH_YEAH - .2byte EC_WORD_YEEHAW_EXCL - .2byte EC_WORD_YES - .2byte EC_WORD_YES_SIR_EXCL - .2byte EC_WORD_YESTERDAY - .2byte EC_WORD_YET - .2byte EC_WORD_YO - .2byte EC_WORD_YOU - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_YOU_VE - .2byte EC_WORD_YOUNG - .2byte EC_WORD_YOUR - .2byte EC_WORD_YOURS - .2byte EC_WORD_YUP - -gEasyChatWordsByLetter_Z:: @ 859DFE2 - .2byte EC_POKEMON(ZANGOOSE) - .2byte EC_MOVE2(ZAP_CANNON) - .2byte EC_POKEMON2(ZAPDOS) - .2byte EC_POKEMON(ZIGZAGOON) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(ZUBAT) - .2byte EC_POKEMON2(ZUBAT) - -gEasyChatWordsByLetter_UnusedJapaneseHi:: @ 859DFF2 - .2byte EC_POKEMON2(CLEFFA) - .2byte EC_WORD_AIYEEH - .2byte EC_POKEMON2(WEEDLE) - .2byte EC_WORD_HERO - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(PIKACHU) - .2byte EC_POKEMON(PIKACHU) - .2byte EC_MOVE2(LIGHT_SCREEN) - .2byte EC_WORD_SHINE - .2byte EC_WORD_LOW - .2byte EC_POKEMON2(CLEFABLE) - .2byte EC_WORD_FLYING - .2byte EC_POKEMON2(PIDGEOT) - .2byte EC_POKEMON2(PIDGEOTTO) - .2byte EC_WORD_LEFT - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(PICHU) - .2byte EC_POKEMON(PICHU) - .2byte EC_MOVE2(SCRATCH) - .2byte EC_WORD_SURPRISE - .2byte EC_MOVE2(HYPER_FANG) - .2byte EC_POKEMON2(CLEFAIRY) - .2byte EC_WORD_DROUGHT - .2byte EC_WORD_HIDDEN - .2byte EC_WORD_PERSON - .2byte EC_WORD_AWFUL - .2byte EC_POKEMON2(CHARMANDER) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(STARYU) - .2byte EC_POKEMON(STARYU) - .2byte EC_WORD_ALONE - .2byte EC_POKEMON2(CYNDAQUIL) - .2byte EC_MOVE2(EMBER) - .2byte EC_POKEMON(VIBRAVA) - .2byte EC_WORD_BORED - .2byte EC_POKEMON2(SUNKERN) - .2byte EC_WORD_SECRET - .2byte EC_WORD_SECRET_BASE - .2byte EC_MOVE2(SECRET_POWER) - .2byte EC_POKEMON2(TEDDIURSA) - .2byte EC_WORD_HIYAH - .2byte EC_MOVE2(DIZZY_PUNCH) - .2byte EC_WORD_LIGHTNINGROD - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(VOLTORB) - .2byte EC_POKEMON(VOLTORB) - .2byte EC_WORD_DAYTIME - .2byte EC_MOVE2(BULK_UP) - .2byte EC_WORD_NAP - .2byte EC_WORD_HEROINE - .2byte EC_POKEMON(FEEBAS) - -gEasyChatWordsByLetter_UnusedJapaneseFu:: @ 859E060 - .2byte EC_WORD_FIGHT - .2byte EC_POKEMON2(MOLTRES) - .2byte EC_WORD_FASHION - .2byte EC_WORD_FEAR - .2byte EC_WORD_FEVER - .2byte EC_MOVE2(IMPRISON) - .2byte EC_POKEMON2(FLAREON) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(ALAKAZAM) - .2byte EC_POKEMON(ALAKAZAM) - .2byte EC_POKEMON2(MAGMAR) - .2byte EC_POKEMON(GRUMPIG) - .2byte EC_MOVE2(FEATHER_DANCE) - .2byte EC_POKEMON2(FORRETRESS) - .2byte EC_MOVE2(WHIRLWIND) - .2byte EC_WORD_COMPOUNDEYES - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(WIGGLYTUFF) - .2byte EC_POKEMON(WIGGLYTUFF) - .2byte EC_MOVE2(BEAT_UP) - .2byte EC_WORD_MYSTERY - .2byte EC_POKEMON2(IVYSAUR) - .2byte EC_POKEMON2(BULBASAUR) - .2byte EC_WORD_MARVEL_SCALE - .2byte EC_WORD_WONDER_GUARD - .2byte EC_POKEMON2(VENUSAUR) - .2byte EC_WORD_LACKS - .2byte EC_WORD_RESUSCITATE - .2byte EC_WORD_SMACK - .2byte EC_WORD_FUFUFU - .2byte EC_POKEMON2(AERODACTYL) - .2byte EC_WORD_WIMPY - .2byte EC_POKEMON2(MAGBY) - .2byte EC_WORD_LOL - .2byte EC_MOVE2(BLIZZARD) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(IGGLYBUFF) - .2byte EC_POKEMON(IGGLYBUFF) - .2byte EC_WORD_SNORT - .2byte EC_MOVE2(STOMP) - .2byte EC_WORD_INSOMNIA - .2byte EC_WORD_WINTER - .2byte EC_WORD_LEVITATE - .2byte EC_POKEMON(FLYGON) - .2byte EC_WORD_PLUS - .2byte EC_MOVE2(BLAST_BURN) - .2byte EC_POKEMON(PLUSLE) - .2byte EC_POKEMON2(UMBREON) - .2byte EC_MOVE2(FLASH) - .2byte EC_WORD_WOBBLY - .2byte EC_MOVE2(TEETER_DANCE) - .2byte EC_WORD_PRETEND - .2byte EC_POKEMON2(ARTICUNO) - .2byte EC_WORD_WANNABE - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(JIGGLYPUFF) - .2byte EC_POKEMON(JIGGLYPUFF) - .2byte EC_POKEMON2(SNUBBULL) - .2byte EC_WORD_SHAKY - .2byte EC_MOVE2(CRUSH_CLAW) - .2byte EC_MOVE2(BLAZE_KICK) - .2byte EC_MOVE2(PRESENT) - .2byte EC_WORD_PRESSURE - .2byte EC_WORD_BLEND - .2byte EC_WORD_FRONTIER - .2byte EC_WORD_HUMPH - .2byte EC_MOVE2(ERUPTION) - -gEasyChatWordsByLetter_UnusedJapaneseHe:: @ 859E0EE - .2byte EC_WORD_HEY - .2byte EC_POKEMON(CORPHISH) - .2byte EC_WORD_BABY - .2byte EC_POKEMON2(BAYLEEF) - .2byte EC_WORD_BEST - .2byte EC_WORD_LOUSY - .2byte EC_WORD_HEHEHE - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(GRIMER) - .2byte EC_POKEMON(GRIMER) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(MUK) - .2byte EC_POKEMON(MUK) - .2byte EC_WORD_LIQUID_OOZE - .2byte EC_MOVE2(SLUDGE) - .2byte EC_MOVE2(SLUDGE_BOMB) - .2byte EC_MOVE2(GLARE) - .2byte EC_WORD_HEH - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(HERACROSS) - .2byte EC_POKEMON(HERACROSS) - .2byte EC_POKEMON(PELIPPER) - .2byte EC_POKEMON2(HOUNDOOM) - .2byte EC_POKEMON2(PERSIAN) - .2byte EC_WORD_RIPPED - .2byte EC_POKEMON2(LICKITUNG) - .2byte EC_WORD_STUDY - .2byte EC_WORD_COLOR_CHANGE - .2byte EC_MOVE2(TRANSFORM) - -gEasyChatWordsByLetter_UnusedJapaneseHo:: @ 859E12E - .2byte EC_MOVE2(POISON_TAIL) - .2byte EC_WORD_POINTS - .2byte EC_POKEMON2(HO_OH) - .2byte EC_WORD_SOUNDPROOF - .2byte EC_WORD_ADVENTURE - .2byte EC_WORD_EFFECT_SPORE - .2byte EC_MOVE2(ROAR) - .2byte EC_POKEMON(WAILORD) - .2byte EC_POKEMON(WAILMER) - .2byte EC_WORD_DUDE - .2byte EC_WORD_BOARD - .2byte EC_POKEMON2(HOOTHOOT) - .2byte EC_POKEMON(SALAMENCE) - .2byte EC_WORD_BALL - .2byte EC_MOVE2(BONE_RUSH) - .2byte EC_WORD_THEY - .2byte EC_WORD_THEY_WERE - .2byte EC_WORD_TO_THEM - .2byte EC_WORD_THEIR - .2byte EC_WORD_THEY_RE - .2byte EC_WORD_THEY_VE - .2byte EC_WORD_POKENAV - .2byte EC_WORD_POKEMON - .2byte EC_WORD_GET - .2byte EC_WORD_POKEDEX - .2byte EC_WORD_PKRS - .2byte EC_MOVE2(CAMOUFLAGE) - .2byte EC_WORD_WANT - .2byte EC_MOVE2(COVET) - .2byte EC_POKEMON(AGGRON) - .2byte EC_MOVE2(TAIL_GLOW) - .2byte EC_POKEMON(POOCHYENA) - .2byte EC_POKEMON2(PIDGEY) - .2byte EC_WORD_AS_MUCH_AS - .2byte EC_POKEMON2(PONYTA) - .2byte EC_MOVE2(BONE_CLUB) - .2byte EC_MOVE2(BONEMERANG) - .2byte EC_WORD_FIRE - .2byte EC_MOVE2(FIRE_SPIN) - .2byte EC_WORD_FLAME_BODY - .2byte EC_MOVE2(FIRE_PUNCH) - .2byte EC_POKEMON2(SKIPLOOM) - .2byte EC_WORD_HOHOHO - .2byte EC_WORD_PRAISE - .2byte EC_WORD_UH_HUH - .2byte EC_POKEMON2(PORYGON) - .2byte EC_POKEMON2(PORYGON2) - .2byte EC_MOVE2(VOLT_TACKLE) - .2byte EC_WORD_POKEBLOCK - .2byte EC_MOVE2(PERISH_SONG) - .2byte EC_WORD_SHREDDED - .2byte EC_POKEMON(CASTFORM) - .2byte EC_WORD_BOOK - .2byte EC_WORD_SERIOUS - .2byte EC_WORD_REALLY - -gEasyChatWordsByLetter_UnusedJapaneseMa:: @ 859E19C - .2byte EC_WORD_OH_DEAR - .2byte EC_WORD_IN - .2byte EC_WORD_GIVE_UP - .2byte EC_WORD_MINUS - .2byte EC_POKEMON(MINUN) - .2byte EC_WORD_DAILY - .2byte EC_WORD_OWN_TEMPO - .2byte EC_MOVE2(WRAP) - .2byte EC_MOVE2(SPIKES) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(MAGCARGO) - .2byte EC_POKEMON(MAGCARGO) - .2byte EC_MOVE2(MAGNITUDE) - .2byte EC_POKEMON(MAKUHITA) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(SLUGMA) - .2byte EC_POKEMON(SLUGMA) - .2byte EC_WORD_MAGMA_ARMOR - .2byte EC_POKEMON2(QUILAVA) - .2byte EC_WORD_OVERDO - .2byte EC_WORD_LOSS - .2byte EC_WORD_IF_I_LOSE - .2byte EC_WORD_LOST - .2byte EC_WORD_LOSE - .2byte EC_WORD_TRULY - .2byte EC_WORD_SERIOUSLY - .2byte EC_MOVE2(MAGICAL_LEAF) - .2byte EC_MOVE2(MAGIC_COAT) - .2byte EC_WORD_MACHINE - .2byte EC_WORD_OUT - .2byte EC_WORD_MASTER - .2byte EC_WORD_INCREASING - .2byte EC_WORD_TOO - .2byte EC_WORD_LIKE - .2byte EC_POKEMON2(BELLSPROUT) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(WEEZING) - .2byte EC_POKEMON(WEEZING) - .2byte EC_WORD_SMELL - .2byte EC_WORD_YET - .2byte EC_WORD_MISTAKE - .2byte EC_POKEMON(LINOONE) - .2byte EC_WORD_TOTALLY - .2byte EC_MOVE2(MUD_SHOT) - .2byte EC_MOVE2(MACH_PUNCH) - .2byte EC_WORD_FESTIVAL - .2byte EC_WORD_UNTIL - .2byte EC_WORD_WAIT - .2byte EC_WORD_GUARD - .2byte EC_MOVE2(PROTECT) - .2byte EC_POKEMON(CASCOON) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(MARILL) - .2byte EC_POKEMON(MARILL) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(AZUMARILL) - .2byte EC_POKEMON(AZUMARILL) - .2byte EC_MOVE2(DEFENSE_CURL) - .2byte EC_WORD_AS_IF - .2byte EC_POKEMON(SWALOT) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(ELECTRODE) - .2byte EC_POKEMON(ELECTRODE) - .2byte EC_MOVE2(ROLLING_KICK) - .2byte EC_WORD_COMICS - .2byte EC_POKEMON2(MANKEY) - .2byte EC_WORD_SATISFIED - .2byte EC_POKEMON2(MANTINE) - -gEasyChatWordsByLetter_UnusedJapaneseMi:: @ 859E230 - .2byte EC_WORD_PARTNER - .2byte EC_MOVE2(SUBSTITUTE) - .2byte EC_WORD_RIGHT - .2byte EC_MOVE2(DETECT) - .2byte EC_MOVE2(PIN_MISSILE) - .2byte EC_WORD_WATER - .2byte EC_MOVE2(WATER_SPORT) - .2byte EC_POKEMON(MUDKIP) - .2byte EC_MOVE2(WATER_GUN) - .2byte EC_MOVE2(MIST_BALL) - .2byte EC_MOVE2(WATER_PULSE) - .2byte EC_WORD_WATER_VEIL - .2byte EC_WORD_SHOW - .2byte EC_WORD_SEE - .2byte EC_WORD_DID - .2byte EC_MOVE2(FURY_ATTACK) - .2byte EC_MOVE2(FURY_SWIPES) - .2byte EC_MOVE2(DESTINY_BOND) - .2byte EC_WORD_LOOKS - .2byte EC_WORD_REJECT - .2byte EC_WORD_ACCEPT - .2byte EC_POKEMON2(DRATINI) - .2byte EC_MOVE2(FALSE_SWIPE) - .2byte EC_MOVE2(FORESIGHT) - .2byte EC_POKEMON2(MEW) - .2byte EC_POKEMON2(MEWTWO) - .2byte EC_MOVE2(MIRROR_COAT) - .2byte EC_MOVE2(FUTURE_SIGHT) - .2byte EC_WORD_SEES - .2byte EC_MOVE2(MILK_DRINK) - .2byte EC_POKEMON2(MILTANK) - .2byte EC_POKEMON(MILOTIC) - .2byte EC_WORD_WE - .2byte EC_WORD_BEEN - .2byte EC_WORD_TO_US - .2byte EC_WORD_OUR - .2byte EC_WORD_WE_RE - -gEasyChatWordsByLetter_UnusedJapaneseMu:: @ 859E27A - .2byte EC_WORD_MOOD - .2byte EC_POKEMON2(MISDREAVUS) - .2byte EC_WORD_OLDEN - .2byte EC_WORD_ARRGH - .2byte EC_WORD_BUG - .2byte EC_WORD_SWARM - .2byte EC_WORD_RATHER - .2byte EC_POKEMON2(SMOOCHUM) - .2byte EC_WORD_INVINCIBLE - .2byte EC_WORD_HEART - .2byte EC_WORD_MUFUFU - .2byte EC_WORD_MMM - -gEasyChatWordsByLetter_UnusedJapaneseMe:: @ 859E292 - .2byte EC_MOVE2(CALM_MIND) - .2byte EC_WORD_MAIL - .2byte EC_MOVE2(MEGA_DRAIN) - .2byte EC_MOVE2(MEGA_KICK) - .2byte EC_MOVE2(MEGA_PUNCH) - .2byte EC_POKEMON2(MEGANIUM) - .2byte EC_MOVE2(MEGAHORN) - .2byte EC_WORD_SEEK - .2byte EC_MOVE2(HIDDEN_POWER) - .2byte EC_WORD_RARE - .2byte EC_POKEMON(METAGROSS) - .2byte EC_POKEMON2(DITTO) - .2byte EC_MOVE2(METAL_CLAW) - .2byte EC_POKEMON(METANG) - .2byte EC_WORD_DESTROYED - .2byte EC_WORD_MESSAGE - .2byte EC_WORD_AWFULLY - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(TENTACOOL) - .2byte EC_POKEMON(TENTACOOL) - .2byte EC_WORD_FIERY - .2byte EC_POKEMON2(MAREEP) - .2byte EC_MOVE2(ATTRACT) - .2byte EC_WORD_CUTE_CHARM - .2byte EC_WORD_IMMUNITY - -gEasyChatWordsByLetter_UnusedJapaneseMo:: @ 859E2C6 - .2byte EC_WORD_ALMOST - .2byte EC_WORD_BLAZE - .2byte EC_WORD_NEARLY - .2byte EC_WORD_MODE - .2byte EC_WORD_OLD - .2byte EC_WORD_THURSDAY - .2byte EC_POKEMON2(FLAAFFY) - .2byte EC_WORD_LISTENING - .2byte EC_WORD_OWN - .2byte EC_WORD_MORE - .2byte EC_WORD_DIDN_T - .2byte EC_WORD_PICKUP - .2byte EC_MOVE2(MIMIC) - .2byte EC_WORD_TOO_LATE - .2byte EC_WORD_PATTERN - .2byte EC_WORD_FLASH_FIRE - .2byte EC_WORD_RECEIVED - .2byte EC_POKEMON2(VENOMOTH) - .2byte EC_WORD_DOESN_T - .2byte EC_POKEMON2(TANGELA) - -gEasyChatWordsByLetter_UnusedJapaneseYa:: @ 859E2EE - .2byte EC_WORD_HOO_HAH - .2byte EC_WORD_PROMISE - .2byte EC_WORD_KIND - .2byte EC_POKEMON(BALTOY) - .2byte EC_WORD_HOLIDAY - .2byte EC_WORD_NEGATIVE - .2byte EC_MOVE2(FRUSTRATION) - .2byte EC_WORD_DONE - .2byte EC_WORD_FINALLY - .2byte EC_WORD_ANY - .2byte EC_WORD_YAHOO - .2byte EC_POKEMON2(SLOWKING) - .2byte EC_POKEMON2(SLOWBRO) - .2byte EC_MOVE2(LEECH_SEED) - .2byte EC_POKEMON2(SLOWPOKE) - .2byte EC_WORD_DANGER - .2byte EC_POKEMON2(MURKROW) - .2byte EC_POKEMON(SABLEYE) - .2byte EC_WORD_DEFEATED - .2byte EC_WORD_BEAT - .2byte EC_WORD_VITAL_SPIRIT - .2byte EC_POKEMON(VIGOROTH) - .2byte EC_WORD_YOUNG - .2byte EC_POKEMON2(YANMA) - -gEasyChatWordsByLetter_UnusedJapaneseYu:: @ 859E31E - .2byte EC_POKEMON(SNORUNT) - .2byte EC_WORD_TAKE - .2byte EC_WORD_UNION - .2byte EC_MOVE2(METRONOME) - .2byte EC_WORD_DREAM - .2byte EC_MOVE2(DREAM_EATER) - .2byte EC_WORD_ALLOW - .2byte EC_WORD_FORGET - .2byte EC_POKEMON(CRADILY) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(KADABRA) - .2byte EC_POKEMON(KADABRA) - -gEasyChatWordsByLetter_UnusedJapaneseYo:: @ 859E338 - .2byte EC_WORD_WITHOUT - .2byte EC_WORD_YO - .2byte EC_MOVE2(ACID) - .2byte EC_WORD_COME_OVER - .2byte EC_WORD_KINDERGARTEN - .2byte EC_WORD_CHLOROPHYLL - .2byte EC_WORD_AFTER - .2byte EC_POKEMON2(LARVITAR) - .2byte EC_WORD_OH_KAY - .2byte EC_WORD_BEFORE - .2byte EC_WORD_GREAT - .2byte EC_MOVE2(MEDITATE) - .2byte EC_WORD_PURE_POWER - .2byte EC_WORD_WELL - .2byte EC_MOVE2(SNATCH) - .2byte EC_WORD_OKAY - .2byte EC_WORD_PLANS - .2byte EC_WORD_NIGHTTIME - .2byte EC_WORD_WHILE - .2byte EC_POKEMON(DUSKULL) - .2byte EC_WORD_EASY - .2byte EC_WORD_INSTEAD - .2byte EC_WORD_NIGHT - .2byte EC_POKEMON2(NOCTOWL) - .2byte EC_WORD_COUNT_ON - .2byte EC_WORD_WEAK - .2byte EC_WORD_TOO_WEAK - .2byte EC_WORD_WEAKENED - -gEasyChatWordsByLetter_UnusedJapaneseRa:: @ 859E370 - .2byte EC_POKEMON2(RAIKOU) - .2byte EC_WORD_WEEK - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(RAICHU) - .2byte EC_POKEMON(RAICHU) - .2byte EC_WORD_RIVAL - .2byte EC_WORD_LIFE - .2byte EC_POKEMON(MANECTRIC) - .2byte EC_WORD_SIMPLE - .2byte EC_WORD_PUSHOVER - .2byte EC_POKEMON(SWAMPERT) - .2byte EC_POKEMON(ELECTRIKE) - .2byte EC_WORD_SEEMS - .2byte EC_WORD_RADIO - .2byte EC_MOVE2(LUSTER_PURGE) - .2byte EC_POKEMON2(CHANSEY) - .2byte EC_POKEMON2(RATICATE) - .2byte EC_POKEMON(LATIAS) - .2byte EC_POKEMON(LATIOS) - .2byte EC_POKEMON(LUVDISC) - .2byte EC_POKEMON2(LAPRAS) - .2byte EC_WORD_LOVEY_DOVEY - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(VILEPLUME) - .2byte EC_POKEMON(VILEPLUME) - .2byte EC_WORD_LALALA - .2byte EC_POKEMON(RALTS) - .2byte EC_WORD_FORGETS - .2byte EC_WORD_APPEARS - .2byte EC_WORD_RANK - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(LANTURN) - .2byte EC_POKEMON(LANTURN) - -gEasyChatWordsByLetter_UnusedJapaneseRi:: @ 859E3B8 - .2byte EC_WORD_LEADER - .2byte EC_MOVE2(LEAF_BLADE) - .2byte EC_POKEMON2(CHARMELEON) - .2byte EC_POKEMON2(CHARIZARD) - .2byte EC_MOVE2(RECYCLE) - .2byte EC_MOVE2(REFLECT) - .2byte EC_MOVE2(REFRESH) - .2byte EC_MOVE2(REVENGE) - .2byte EC_WORD_RIBBON - .2byte EC_WORD_TRENDY - .2byte EC_MOVE2(DRAGON_RAGE) - .2byte EC_MOVE2(DRAGON_BREATH) - .2byte EC_MOVE2(DRAGON_DANCE) - .2byte EC_WORD_VACATION - .2byte EC_POKEMON(LILEEP) - .2byte EC_POKEMON2(URSARING) - .2byte EC_WORD_SHIELD_DUST - -gEasyChatWordsByLetter_UnusedJapaneseRu:: @ 859E3DA - .2byte EC_POKEMON2(JYNX) - .2byte EC_WORD_ROOM - .2byte EC_WORD_RULE - .2byte EC_POKEMON2(LUGIA) - .2byte EC_WORD_LOOK - .2byte EC_POKEMON(LUNATONE) - .2byte EC_WORD_RUBY - .2byte EC_WORD_THAN - .2byte EC_POKEMON(AZURILL) - .2byte EC_POKEMON(LUDICOLO) - .2byte EC_WORD_HAPPILY - -gEasyChatWordsByLetter_UnusedJapaneseRe:: @ 859E3F0 - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(MAGNETON) - .2byte EC_POKEMON(MAGNETON) - .2byte EC_MOVE2(ICE_PUNCH) - .2byte EC_MOVE2(ICE_BEAM) - .2byte EC_POKEMON(REGICE) - .2byte EC_POKEMON(REGISTEEL) - .2byte EC_POKEMON(REGIROCK) - .2byte EC_POKEMON(RAYQUAZA) - .2byte EC_WORD_UGLY - .2byte EC_POKEMON2(LEDIAN) - .2byte EC_POKEMON2(LEDYBA) - .2byte EC_WORD_FANTASTIC - .2byte EC_WORD_LEVEL - .2byte EC_MOVE2(FURY_CUTTER) - .2byte EC_MOVE2(COMET_PUNCH) - .2byte EC_WORD_RENTAL - -gEasyChatWordsByLetter_UnusedJapaneseRo:: @ 859E414 - .2byte EC_MOVE2(SKULL_BASH) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(VULPIX) - .2byte EC_POKEMON(VULPIX) - .2byte EC_POKEMON(ROSELIA) - .2byte EC_MOVE2(LOCK_ON) - .2byte EC_MOVE2(ROCK_BLAST) - .2byte EC_WORD_ROMANTIC - .2byte EC_WORD_QUESTION - -gEasyChatWordsByLetter_UnusedJapaneseWa:: @ 859E428 - .2byte EC_WORD_YAY - .2byte EC_WORD_WORLD - .2byte EC_WORD_AWW - .2byte EC_WORD_WIRELESS - .2byte EC_WORD_WOWEE - .2byte EC_POKEMON(COMBUSKEN) - .2byte EC_WORD_UNDERSTAND - .2byte EC_WORD_UNDERSTANDS - .2byte EC_WORD_FAINT - .2byte EC_WORD_ANTICIPATION - .2byte EC_WORD_ONCE - .2byte EC_WORD_MOVE - .2byte EC_WORD_WE_VE - .2byte EC_WORD_FAINTED - .2byte EC_WORD_WOMAN - .2byte EC_WORD_SHE - .2byte EC_WORD_SHE_WAS - .2byte EC_WORD_TO_HER - .2byte EC_WORD_HERS - .2byte EC_WORD_SHE_IS - .2byte EC_WORD_SOME - .2byte EC_POKEMON2(JUMPLUFF) - .2byte EC_MOVE2(COTTON_SPORE) - .2byte EC_WORD_GWAH - .2byte EC_POKEMON2(TOTODILE) - .2byte EC_WORD_WAHAHAHA - .2byte EC_WORD_ANYWHERE - .2byte EC_MOVE2(STRUGGLE) - .2byte EC_WORD_BADLY - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(MACHOP) - .2byte EC_POKEMON(MACHOP) - - .align 2 -gEasyChatWordsByLetterPointers:: @ 859E46C - .4byte gEasyChatWordsByLetter_Others - .4byte 10 @ number of entries - - .4byte gEasyChatWordsByLetter_A - .4byte 106 @ number of entries - - .4byte gEasyChatWordsByLetter_B - .4byte 86 @ number of entries - - .4byte gEasyChatWordsByLetter_C - .4byte 119 @ number of entries - - .4byte gEasyChatWordsByLetter_D - .4byte 94 @ number of entries - - .4byte gEasyChatWordsByLetter_E - .4byte 59 @ number of entries - - .4byte gEasyChatWordsByLetter_F - .4byte 80 @ number of entries - - .4byte gEasyChatWordsByLetter_G - .4byte 98 @ number of entries - - .4byte gEasyChatWordsByLetter_H - .4byte 101 @ number of entries - - .4byte gEasyChatWordsByLetter_I - .4byte 48 @ number of entries - - .4byte gEasyChatWordsByLetter_J - .4byte 13 @ number of entries - - .4byte gEasyChatWordsByLetter_K - .4byte 33 @ number of entries - - .4byte gEasyChatWordsByLetter_L - .4byte 82 @ number of entries - - .4byte gEasyChatWordsByLetter_M - .4byte 142 @ number of entries - - .4byte gEasyChatWordsByLetter_N - .4byte 54 @ number of entries - - .4byte gEasyChatWordsByLetter_O - .4byte 44 @ number of entries - - .4byte gEasyChatWordsByLetter_P - .4byte 102 @ number of entries - - .4byte gEasyChatWordsByLetter_Q - .4byte 6 @ number of entries - - .4byte gEasyChatWordsByLetter_R - .4byte 80 @ number of entries - - .4byte gEasyChatWordsByLetter_S - .4byte 262 @ number of entries - - .4byte gEasyChatWordsByLetter_T - .4byte 133 @ number of entries - - .4byte gEasyChatWordsByLetter_U - .4byte 24 @ number of entries - - .4byte gEasyChatWordsByLetter_V - .4byte 33 @ number of entries - - .4byte gEasyChatWordsByLetter_W - .4byte 111 @ number of entries - - .4byte gEasyChatWordsByLetter_X - .4byte 4 @ number of entries - - .4byte gEasyChatWordsByLetter_Y - .4byte 19 @ number of entries - - .4byte gEasyChatWordsByLetter_Z - .4byte 8 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseHi - .4byte 55 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseFu - .4byte 71 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseHe - .4byte 32 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseHo - .4byte 55 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseMa - .4byte 74 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseMi - .4byte 37 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseMu - .4byte 12 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseMe - .4byte 26 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseMo - .4byte 20 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseYa - .4byte 24 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseYu - .4byte 13 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseYo - .4byte 28 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseRa - .4byte 36 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseRi - .4byte 17 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseRu - .4byte 11 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseRe - .4byte 18 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseRo - .4byte 10 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseWa - .4byte 33 @ number of entries diff --git a/include/easy_chat.h b/include/easy_chat.h index b3639af217..b7685e48cb 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -2,6 +2,124 @@ #define GUARD_EASYCHAT_H #include "main.h" +#include "constants/easy_chat.h" + +struct EasyChatScreenTemplate +{ + u8 unk_00; + u8 numColumns; + u8 numRows; + u8 unk_03_0:7; + u8 unk_03_7:1; + const u8 *titleText; + const u8 *instructionsText1; + const u8 *instructionsText2; + const u8 *confirmText1; + const u8 *confirmText2; +}; + +struct EasyChatScreen +{ + /*0x00*/ u8 kind; + /*0x01*/ u8 templateId; + /*0x02*/ u8 numColumns; + /*0x03*/ u8 numRows; + /*0x04*/ u8 state; + /*0x05*/ s8 mainCursorColumn; + /*0x06*/ s8 mainCursorRow; + /*0x07*/ u8 unk_07; + /*0x08*/ u8 unk_08; + /*0x09*/ u8 unk_09; + /*0x0A*/ s8 unk_0a; + /*0x0B*/ s8 unk_0b; + /*0x0C*/ u8 unk_0c; + /*0x0D*/ u8 unk_0d; + /*0x0E*/ u8 unk_0e; + /*0x0F*/ u8 unk_0f; + /*0x10*/ s8 unk_10; + /*0x11*/ s8 unk_11; + /*0x12*/ u8 sizeParam; + /*0x13*/ u8 unk_13; + /*0x14*/ u8 unk_14[0x20]; + /*0x34*/ const u8 *titleText; + /*0x38*/ u16 *words; + /*0x3C*/ u16 ecWordBuffer[9]; +}; + +struct Unk203A11C +{ + u16 unk0; + u16 windowId; + u16 unk4; + u8 unk6; + u8 unk7; + s8 unk8; + u8 unk9; + u8 unkA; + u8 unkB[0xC1]; + u8 unkCC[0x202]; + u16 unk2CE; + int unk2D0; + int unk2D4; + struct Sprite *unk2D8; + struct Sprite *unk2DC; + struct Sprite *unk2E0; + struct Sprite *unk2E4; + struct Sprite *unk2E8; + struct Sprite *unk2EC; + struct Sprite *unk2F0; + struct Sprite *unk2F4; + struct Sprite *unk2F8; + struct Sprite *unk2FC; + u16 unk300[BG_SCREEN_SIZE / 2]; + u16 unkB00[BG_SCREEN_SIZE / 2]; +}; + +struct Unk08597C30 +{ + u8 unk0_0:5; + u8 unk0_5:3; + u8 unk1; + u8 unk2; + u8 unk3; +}; + +struct EasyChatWordInfo +{ + const u8 *text; + int alphabeticalOrder; + int enabled; +}; + +typedef union +{ + const u16 *valueList; + const struct EasyChatWordInfo *words; +} EasyChatGroupWordData; + +struct EasyChatGroup +{ + EasyChatGroupWordData wordData; + u16 numWords; + u16 numEnabledWords; +}; + +struct Unk203A120 +{ + u16 unk0; + u16 unk2[EC_NUM_GROUPS]; + u16 unk2E[27]; + u16 unk64[27][270]; + u8 filler3958[0x2C]; + u16 unk3984[0x10E]; + u16 unk3BA0; +}; /*size = 0x3BA4*/ + +struct EasyChatWordsByLetter +{ + const u16 *words; + int numWords; +}; void InitEasyChatPhrases(void); void easy_chat_input_maybe(void); diff --git a/include/graphics.h b/include/graphics.h index 6e6d2b4fc0..c651268ca5 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4893,6 +4893,11 @@ extern const u16 gFrontierPassMapCursor_Pal[]; // Easy Chat Screen extern const u32 gEasyChatWindow_Gfx[]; extern const u32 gEasyChatWindow_Tilemap[]; +extern const u32 gEasyChatMode_Gfx[]; extern const u16 gEasyChatMode_Pal[]; +extern const u32 gEasyChatCursor_Gfx[]; +extern const u16 gEasyChatCursor_Pal[]; +extern const u32 gEasyChatRightWindow_Gfx[]; +extern const u16 gEasyChatRightWindow_Pal[]; #endif //GUARD_GRAPHICS_H diff --git a/include/strings.h b/include/strings.h index 591c5ce338..3899b63aa5 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2431,5 +2431,129 @@ extern const u8 gText_OnlyOnePhrase[]; extern const u8 gText_YouCannotQuitHere[]; extern const u8 gText_SectionMustBeCompleted[]; extern const u8 gText_ThreeQuestionMarks[]; +extern const u8 gText_Profile[]; +extern const u8 gText_CombineFourWordsOrPhrases[]; +extern const u8 gText_AndMakeYourProfile[]; +extern const u8 gText_YourProfile[]; +extern const u8 gText_IsAsShownOkay[]; +extern const u8 gText_AtTheBattlesStart[]; +extern const u8 gText_CombineSixWordsOrPhrases[]; +extern const u8 gText_AndMakeAMessage[]; +extern const u8 gText_YourFeelingAtTheBattlesStart[]; +extern const u8 gText_UponWinningABattle[]; +extern const u8 gText_WhatYouSayIfYouWin[]; +extern const u8 gText_UponLosingABattle[]; +extern const u8 gText_WhatYouSayIfYouLose[]; +extern const u8 gText_CombineNineWordsOrPhrases[]; +extern const u8 gText_AndMakeAMessage2[]; +extern const u8 gText_TheMailMessage[]; +extern const u8 gText_Interview[]; +extern const u8 gText_LetsReplyToTheInterview[]; +extern const u8 gText_TheAnswer[]; +extern const u8 gText_TheBardsSong[]; +extern const u8 gText_ChangeJustOneWordOrPhrase[]; +extern const u8 gText_AndImproveTheBardsSong[]; +extern const u8 gText_TheBardsSong2[]; +extern const u8 gText_FindWordsThatDescribeYour[]; +extern const u8 gText_FeelingsRightNow[]; +extern const u8 gText_WhatsHipAndHappening[]; +extern const u8 gText_CombineTwoWordsOrPhrases[]; +extern const u8 gText_AndMakeATrendySaying[]; +extern const u8 gText_TheTrendySaying[]; +extern const u8 gText_AfterYouHaveReadTheQuiz[]; +extern const u8 gText_QuestionPressTheAButton[]; +extern const u8 gText_TheQuizAnswerIs[]; +extern const u8 gText_OutOfTheListedChoices[]; +extern const u8 gText_SelectTheAnswerToTheQuiz[]; +extern const u8 gText_TheAnswerColon[]; +extern const u8 gText_AndCreateAQuiz[]; +extern const u8 gText_IsThisQuizOK[]; +extern const u8 gText_PickAWordOrPhraseAnd[]; +extern const u8 gText_SetTheQuizAnswer[]; +extern const u8 gText_ApprenticesPhrase[]; +extern const u8 gText_FindWordsWhichFit[]; +extern const u8 gText_TheTrainersImage[]; +extern const u8 gText_ApprenticePhrase[]; +extern const u8 gText_GoodSaying[]; +extern const u8 gText_CombineTwoWordsOrPhrases2[]; +extern const u8 gText_ToTeachHerAGoodSaying[]; +extern const u8 gText_FansQuestion[]; +extern const u8 gText_TheImage[]; +extern const u8 gText_Questionnaire[]; +extern const u8 gText_AndFillOutTheQuestionnaire[]; +extern const u8 gText_DelAll[]; +extern const u8 gText_Cancel5[]; +extern const u8 gText_Ok2[]; +extern const u8 gText_Quiz[]; +extern const u8 gText_Answer[]; +extern const u8 gEasyChatGroupName_Pokemon[]; +extern const u8 gEasyChatGroupName_Trainer[]; +extern const u8 gEasyChatGroupName_Status[]; +extern const u8 gEasyChatGroupName_Battle[]; +extern const u8 gEasyChatGroupName_Greetings[]; +extern const u8 gEasyChatGroupName_People[]; +extern const u8 gEasyChatGroupName_Voices[]; +extern const u8 gEasyChatGroupName_Speech[]; +extern const u8 gEasyChatGroupName_Endings[]; +extern const u8 gEasyChatGroupName_Feelings[]; +extern const u8 gEasyChatGroupName_Conditions[]; +extern const u8 gEasyChatGroupName_Actions[]; +extern const u8 gEasyChatGroupName_Lifestyle[]; +extern const u8 gEasyChatGroupName_Hobbies[]; +extern const u8 gEasyChatGroupName_Time[]; +extern const u8 gEasyChatGroupName_Misc[]; +extern const u8 gEasyChatGroupName_Adjectives[]; +extern const u8 gEasyChatGroupName_Events[]; +extern const u8 gEasyChatGroupName_Move1[]; +extern const u8 gEasyChatGroupName_Move2[]; +extern const u8 gEasyChatGroupName_TrendySaying[]; +extern const u8 gEasyChatGroupName_Pokemon2[]; + +extern const u8 gUnknown_862B810[]; +extern const u8 gUnknown_862B832[]; +extern const u8 gUnknown_862B84B[]; +extern const u8 gUnknown_862B86C[]; +extern const u8 gUnknown_0862B88D[]; +extern const u8 gUnknown_0862B8AE[]; +extern const u8 gUnknown_0862B8CF[]; +extern const u8 gUnknown_0862B8F0[]; +extern const u8 gUnknown_0862B911[]; +extern const u8 gUnknown_0862B932[]; +extern const u8 gUnknown_0862B953[]; +extern const u8 gUnknown_0862B974[]; +extern const u8 gUnknown_0862B995[]; +extern const u8 gUnknown_0862B9AE[]; +extern const u8 gUnknown_0862B9C7[]; +extern const u8 gUnknown_0862B9E0[]; +extern const u8 gUnknown_0862B9F9[]; +extern const u8 gUnknown_0862B9FF[]; +extern const u8 gUnknown_0862BA05[]; +extern const u8 gUnknown_0862BA0B[]; +extern const u8 gUnknown_0862BA11[]; +extern const u8 gUnknown_0862BA17[]; +extern const u8 gUnknown_0862BA1D[]; +extern const u8 gUnknown_0862BA23[]; +extern const u8 gUnknown_0862BA29[]; +extern const u8 gUnknown_0862BA2F[]; +extern const u8 gUnknown_0862BA35[]; +extern const u8 gUnknown_0862BA3B[]; +extern const u8 gUnknown_0862BA41[]; +extern const u8 gUnknown_0862BA47[]; +extern const u8 gUnknown_0862BA4D[]; +extern const u8 gUnknown_0862BA53[]; +extern const u8 gUnknown_0862BA59[]; +extern const u8 gUnknown_0862BA5F[]; +extern const u8 gUnknown_0862BA65[]; +extern const u8 gUnknown_0862BA6B[]; +extern const u8 gUnknown_0862BA79[]; +extern const u8 gUnknown_0862BA84[]; +extern const u8 gUnknown_0862BA8F[]; +extern const u8 gUnknown_0862BA9A[]; +extern const u8 gUnknown_0862BAA3[]; +extern const u8 gUnknown_0862BAAE[]; +extern const u8 gUnknown_0862BAB9[]; +extern const u8 gUnknown_0862BAC4[]; +extern const u8 gUnknown_0862BACF[]; +extern const u8 gUnknown_0862BADA[]; #endif // GUARD_STRINGS_H diff --git a/ld_script.txt b/ld_script.txt index 1076068334..acfd535f89 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -501,7 +501,6 @@ SECTIONS { src/battle_intro.o(.rodata); src/bike.o(.rodata); src/easy_chat.o(.rodata); - data/easy_chat.o(.rodata); src/mon_markings.o(.rodata); src/mauville_old_man.o(.rodata); src/mail.o(.rodata); diff --git a/src/data/easy_chat/easy_chat_group_actions.h b/src/data/easy_chat/easy_chat_group_actions.h new file mode 100755 index 0000000000..06a8e73030 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_actions.h @@ -0,0 +1,471 @@ +const u8 gEasyChatWord_Meets[] = _("MEETS"); +const u8 gEasyChatWord_Concede[] = _("CONCEDE"); +const u8 gEasyChatWord_Give[] = _("GIVE"); +const u8 gEasyChatWord_Gives[] = _("GIVES"); +const u8 gEasyChatWord_Played[] = _("PLAYED"); +const u8 gEasyChatWord_Plays[] = _("PLAYS"); +const u8 gEasyChatWord_Collect[] = _("COLLECT"); +const u8 gEasyChatWord_Walking[] = _("WALKING"); +const u8 gEasyChatWord_Walks[] = _("WALKS"); +const u8 gEasyChatWord_Says[] = _("SAYS"); +const u8 gEasyChatWord_Went[] = _("WENT"); +const u8 gEasyChatWord_Said[] = _("SAID"); +const u8 gEasyChatWord_WakeUp[] = _("WAKE UP"); +const u8 gEasyChatWord_WakesUp[] = _("WAKES UP"); +const u8 gEasyChatWord_Angers[] = _("ANGERS"); +const u8 gEasyChatWord_Teach[] = _("TEACH"); +const u8 gEasyChatWord_Teaches[] = _("TEACHES"); +const u8 gEasyChatWord_Please[] = _("PLEASE"); +const u8 gEasyChatWord_Learn[] = _("LEARN"); +const u8 gEasyChatWord_Change[] = _("CHANGE"); +const u8 gEasyChatWord_Story[] = _("STORY"); +const u8 gEasyChatWord_Trust[] = _("TRUST"); +const u8 gEasyChatWord_Lavish[] = _("LAVISH"); +const u8 gEasyChatWord_Listens[] = _("LISTENS"); +const u8 gEasyChatWord_Hearing[] = _("HEARING"); +const u8 gEasyChatWord_Trains[] = _("TRAINS"); +const u8 gEasyChatWord_Choose[] = _("CHOOSE"); +const u8 gEasyChatWord_Come[] = _("COME"); +const u8 gEasyChatWord_Came[] = _("CAME"); +const u8 gEasyChatWord_Search[] = _("SEARCH"); +const u8 gEasyChatWord_Make[] = _("MAKE"); +const u8 gEasyChatWord_Cause[] = _("CAUSE"); +const u8 gEasyChatWord_Know[] = _("KNOW"); +const u8 gEasyChatWord_Knows[] = _("KNOWS"); +const u8 gEasyChatWord_Refuse[] = _("REFUSE"); +const u8 gEasyChatWord_Stores[] = _("STORES"); +const u8 gEasyChatWord_Brag[] = _("BRAG"); +const u8 gEasyChatWord_Ignorant[] = _("IGNORANT"); +const u8 gEasyChatWord_Thinks[] = _("THINKS"); +const u8 gEasyChatWord_Believe[] = _("BELIEVE"); +const u8 gEasyChatWord_Slide[] = _("SLIDE"); +const u8 gEasyChatWord_Eats[] = _("EATS"); +const u8 gEasyChatWord_Use[] = _("USE"); +const u8 gEasyChatWord_Uses[] = _("USES"); +const u8 gEasyChatWord_Using[] = _("USING"); +const u8 gEasyChatWord_Couldnt[] = _("COULDN'T"); +const u8 gEasyChatWord_Capable[] = _("CAPABLE"); +const u8 gEasyChatWord_Disappear[] = _("DISAPPEAR"); +const u8 gEasyChatWord_Appear[] = _("APPEAR"); +const u8 gEasyChatWord_Throw[] = _("THROW"); +const u8 gEasyChatWord_Worry[] = _("WORRY"); +const u8 gEasyChatWord_Slept[] = _("SLEPT"); +const u8 gEasyChatWord_Sleep[] = _("SLEEP"); +const u8 gEasyChatWord_Release[] = _("RELEASE"); +const u8 gEasyChatWord_Drinks[] = _("DRINKS"); +const u8 gEasyChatWord_Runs[] = _("RUNS"); +const u8 gEasyChatWord_Run[] = _("RUN"); +const u8 gEasyChatWord_Works[] = _("WORKS"); +const u8 gEasyChatWord_Working[] = _("WORKING"); +const u8 gEasyChatWord_Talking[] = _("TALKING"); +const u8 gEasyChatWord_Talk[] = _("TALK"); +const u8 gEasyChatWord_Sink[] = _("SINK"); +const u8 gEasyChatWord_Smack[] = _("SMACK"); +const u8 gEasyChatWord_Pretend[] = _("PRETEND"); +const u8 gEasyChatWord_Praise[] = _("PRAISE"); +const u8 gEasyChatWord_Overdo[] = _("OVERDO"); +const u8 gEasyChatWord_Show[] = _("SHOW"); +const u8 gEasyChatWord_Looks[] = _("LOOKS"); +const u8 gEasyChatWord_Sees[] = _("SEES"); +const u8 gEasyChatWord_Seek[] = _("SEEK"); +const u8 gEasyChatWord_Own[] = _("OWN"); +const u8 gEasyChatWord_Take[] = _("TAKE"); +const u8 gEasyChatWord_Allow[] = _("ALLOW"); +const u8 gEasyChatWord_Forget[] = _("FORGET"); +const u8 gEasyChatWord_Forgets[] = _("FORGETS"); +const u8 gEasyChatWord_Appears[] = _("APPEARS"); +const u8 gEasyChatWord_Faint[] = _("FAINT"); +const u8 gEasyChatWord_Fainted[] = _("FAINTED"); + +const struct EasyChatWordInfo gEasyChatGroup_Actions[] = { + { + .text = gEasyChatWord_Meets, + .alphabeticalOrder = 72, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Concede, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Give, + .alphabeticalOrder = 48, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Gives, + .alphabeticalOrder = 75, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Played, + .alphabeticalOrder = 39, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Plays, + .alphabeticalOrder = 36, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Collect, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Walking, + .alphabeticalOrder = 46, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Walks, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Says, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Went, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Said, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_WakeUp, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_WakesUp, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Angers, + .alphabeticalOrder = 45, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Teach, + .alphabeticalOrder = 47, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Teaches, + .alphabeticalOrder = 54, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Please, + .alphabeticalOrder = 41, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Learn, + .alphabeticalOrder = 76, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Change, + .alphabeticalOrder = 77, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Story, + .alphabeticalOrder = 73, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Trust, + .alphabeticalOrder = 74, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lavish, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Listens, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hearing, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Trains, + .alphabeticalOrder = 37, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Choose, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Come, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Came, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Search, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Make, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Cause, + .alphabeticalOrder = 67, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Know, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Knows, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Refuse, + .alphabeticalOrder = 65, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Stores, + .alphabeticalOrder = 70, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Brag, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ignorant, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Thinks, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Believe, + .alphabeticalOrder = 64, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Slide, + .alphabeticalOrder = 63, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Eats, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Use, + .alphabeticalOrder = 53, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Uses, + .alphabeticalOrder = 56, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Using, + .alphabeticalOrder = 55, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Couldnt, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Capable, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Disappear, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Appear, + .alphabeticalOrder = 69, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Throw, + .alphabeticalOrder = 68, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Worry, + .alphabeticalOrder = 66, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Slept, + .alphabeticalOrder = 61, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sleep, + .alphabeticalOrder = 52, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Release, + .alphabeticalOrder = 51, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Drinks, + .alphabeticalOrder = 40, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Runs, + .alphabeticalOrder = 62, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Run, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Works, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Working, + .alphabeticalOrder = 71, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Talking, + .alphabeticalOrder = 60, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Talk, + .alphabeticalOrder = 59, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sink, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Smack, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Pretend, + .alphabeticalOrder = 38, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Praise, + .alphabeticalOrder = 49, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Overdo, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Show, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Looks, + .alphabeticalOrder = 42, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sees, + .alphabeticalOrder = 43, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Seek, + .alphabeticalOrder = 44, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Own, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Take, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Allow, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Forget, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Forgets, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Appears, + .alphabeticalOrder = 58, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Faint, + .alphabeticalOrder = 57, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Fainted, + .alphabeticalOrder = 50, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_adjectives.h b/src/data/easy_chat/easy_chat_group_adjectives.h new file mode 100755 index 0000000000..1c74741180 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_adjectives.h @@ -0,0 +1,219 @@ +const u8 gEasyChatWord_Wandering[] = _("WANDERING"); +const u8 gEasyChatWord_Rickety[] = _("RICKETY"); +const u8 gEasyChatWord_RockSolid[] = _("ROCK-SOLID"); +const u8 gEasyChatWord_Hungry[] = _("HUNGRY"); +const u8 gEasyChatWord_Tight[] = _("TIGHT"); +const u8 gEasyChatWord_Ticklish[] = _("TICKLISH"); +const u8 gEasyChatWord_Twirling[] = _("TWIRLING"); +const u8 gEasyChatWord_Spiraling[] = _("SPIRALING"); +const u8 gEasyChatWord_Thirsty[] = _("THIRSTY"); +const u8 gEasyChatWord_Lolling[] = _("LOLLING"); +const u8 gEasyChatWord_Silky[] = _("SILKY"); +const u8 gEasyChatWord_Sadly[] = _("SADLY"); +const u8 gEasyChatWord_Hopeless[] = _("HOPELESS"); +const u8 gEasyChatWord_Useless[] = _("USELESS"); +const u8 gEasyChatWord_Drooling[] = _("DROOLING"); +const u8 gEasyChatWord_Exciting[] = _("EXCITING"); +const u8 gEasyChatWord_Thick[] = _("THICK"); +const u8 gEasyChatWord_Smooth[] = _("SMOOTH"); +const u8 gEasyChatWord_Slimy[] = _("SLIMY"); +const u8 gEasyChatWord_Thin[] = _("THIN"); +const u8 gEasyChatWord_Break[] = _("BREAK"); +const u8 gEasyChatWord_Voracious[] = _("VORACIOUS"); +const u8 gEasyChatWord_Scatter[] = _("SCATTER"); +const u8 gEasyChatWord_Awesome[] = _("AWESOME"); +const u8 gEasyChatWord_Wimpy[] = _("WIMPY"); +const u8 gEasyChatWord_Wobbly[] = _("WOBBLY"); +const u8 gEasyChatWord_Shaky[] = _("SHAKY"); +const u8 gEasyChatWord_Ripped[] = _("RIPPED"); +const u8 gEasyChatWord_Shredded[] = _("SHREDDED"); +const u8 gEasyChatWord_Increasing[] = _("INCREASING"); +const u8 gEasyChatWord_Yet[] = _("YET"); +const u8 gEasyChatWord_Destroyed[] = _("DESTROYED"); +const u8 gEasyChatWord_Fiery[] = _("FIERY"); +const u8 gEasyChatWord_LoveyDovey[] = _("LOVEY-DOVEY"); +const u8 gEasyChatWord_Happily[] = _("HAPPILY"); +const u8 gEasyChatWord_Anticipation[] = _("ANTICIPATION"); + +const struct EasyChatWordInfo gEasyChatGroup_Adjectives[] = { + { + .text = gEasyChatWord_Wandering, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Rickety, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_RockSolid, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hungry, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Tight, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ticklish, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Twirling, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Spiraling, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Thirsty, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lolling, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Silky, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sadly, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hopeless, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Useless, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Drooling, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Exciting, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Thick, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Smooth, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Slimy, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Thin, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Break, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Voracious, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Scatter, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Awesome, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wimpy, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wobbly, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Shaky, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ripped, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Shredded, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Increasing, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Yet, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Destroyed, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Fiery, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_LoveyDovey, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Happily, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Anticipation, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_battle.h b/src/data/easy_chat/easy_chat_group_battle.h new file mode 100755 index 0000000000..0f97f50c93 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_battle.h @@ -0,0 +1,381 @@ +const u8 gEasyChatWord_MatchUp[] = _("MATCH UP"); +const u8 gEasyChatWord_Go[] = _("GO"); +const u8 gEasyChatWord_No1[] = _("NO. 1"); +const u8 gEasyChatWord_Decide[] = _("DECIDE"); +const u8 gEasyChatWord_LetMeWin[] = _("LET ME WIN"); +const u8 gEasyChatWord_Wins[] = _("WINS"); +const u8 gEasyChatWord_Win[] = _("WIN"); +const u8 gEasyChatWord_Won[] = _("WON"); +const u8 gEasyChatWord_IfIWin[] = _("IF I WIN"); +const u8 gEasyChatWord_WhenIWin[] = _("WHEN I WIN"); +const u8 gEasyChatWord_CantWin[] = _("CAN'T WIN"); +const u8 gEasyChatWord_CanWin[] = _("CAN WIN"); +const u8 gEasyChatWord_NoMatch[] = _("NO MATCH"); +const u8 gEasyChatWord_Spirit[] = _("SPIRIT"); +const u8 gEasyChatWord_Decided[] = _("DECIDED"); +const u8 gEasyChatWord_TrumpCard[] = _("TRUMP CARD"); +const u8 gEasyChatWord_TakeThat[] = _("TAKE THAT"); +const u8 gEasyChatWord_ComeOn[] = _("COME ON"); +const u8 gEasyChatWord_Attack[] = _("ATTACK"); +const u8 gEasyChatWord_Surrender[] = _("SURRENDER"); +const u8 gEasyChatWord_Gutsy[] = _("GUTSY"); +const u8 gEasyChatWord_Talent[] = _("TALENT"); +const u8 gEasyChatWord_Strategy[] = _("STRATEGY"); +const u8 gEasyChatWord_Smite[] = _("SMITE"); +const u8 gEasyChatWord_Match[] = _("MATCH"); +const u8 gEasyChatWord_Victory[] = _("VICTORY"); +const u8 gEasyChatWord_Offensive[] = _("OFFENSIVE"); +const u8 gEasyChatWord_Sense[] = _("SENSE"); +const u8 gEasyChatWord_Versus[] = _("VERSUS"); +const u8 gEasyChatWord_Fights[] = _("FIGHTS"); +const u8 gEasyChatWord_Power[] = _("POWER"); +const u8 gEasyChatWord_Challenge[] = _("CHALLENGE"); +const u8 gEasyChatWord_Strong[] = _("STRONG"); +const u8 gEasyChatWord_TooStrong[] = _("TOO STRONG"); +const u8 gEasyChatWord_GoEasy[] = _("GO EASY"); +const u8 gEasyChatWord_Foe[] = _("FOE"); +const u8 gEasyChatWord_Genius[] = _("GENIUS"); +const u8 gEasyChatWord_Legend[] = _("LEGEND"); +const u8 gEasyChatWord_Escape[] = _("ESCAPE"); +const u8 gEasyChatWord_Aim[] = _("AIM"); +const u8 gEasyChatWord_Battle[] = _("BATTLE"); +const u8 gEasyChatWord_Fight[] = _("FIGHT"); +const u8 gEasyChatWord_Resuscitate[] = _("RESUSCITATE"); +const u8 gEasyChatWord_Points[] = _("POINTS"); +const u8 gEasyChatWord_Serious[] = _("SERIOUS"); +const u8 gEasyChatWord_GiveUp[] = _("GIVE UP"); +const u8 gEasyChatWord_Loss[] = _("LOSS"); +const u8 gEasyChatWord_IfILose[] = _("IF I LOSE"); +const u8 gEasyChatWord_Lost[] = _("LOST"); +const u8 gEasyChatWord_Lose[] = _("LOSE"); +const u8 gEasyChatWord_Guard[] = _("GUARD"); +const u8 gEasyChatWord_Partner[] = _("PARTNER"); +const u8 gEasyChatWord_Reject[] = _("REJECT"); +const u8 gEasyChatWord_Accept[] = _("ACCEPT"); +const u8 gEasyChatWord_Invincible[] = _("INVINCIBLE"); +const u8 gEasyChatWord_Received[] = _("RECEIVED"); +const u8 gEasyChatWord_Easy[] = _("EASY"); +const u8 gEasyChatWord_Weak[] = _("WEAK"); +const u8 gEasyChatWord_TooWeak[] = _("TOO WEAK"); +const u8 gEasyChatWord_Pushover[] = _("PUSHOVER"); +const u8 gEasyChatWord_Leader[] = _("LEADER"); +const u8 gEasyChatWord_Rule[] = _("RULE"); +const u8 gEasyChatWord_Move[] = _("MOVE"); + +const struct EasyChatWordInfo gEasyChatGroup_Battle[] = { + { + .text = gEasyChatWord_MatchUp, + .alphabeticalOrder = 53, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Go, + .alphabeticalOrder = 39, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_No1, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Decide, + .alphabeticalOrder = 40, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_LetMeWin, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wins, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Win, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Won, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_IfIWin, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_WhenIWin, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_CantWin, + .alphabeticalOrder = 56, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_CanWin, + .alphabeticalOrder = 38, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_NoMatch, + .alphabeticalOrder = 41, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Spirit, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Decided, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_TrumpCard, + .alphabeticalOrder = 36, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_TakeThat, + .alphabeticalOrder = 45, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ComeOn, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Attack, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Surrender, + .alphabeticalOrder = 50, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Gutsy, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Talent, + .alphabeticalOrder = 47, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Strategy, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Smite, + .alphabeticalOrder = 54, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Match, + .alphabeticalOrder = 60, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Victory, + .alphabeticalOrder = 37, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Offensive, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sense, + .alphabeticalOrder = 49, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Versus, + .alphabeticalOrder = 46, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Fights, + .alphabeticalOrder = 48, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Power, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Challenge, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Strong, + .alphabeticalOrder = 62, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_TooStrong, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_GoEasy, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Foe, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Genius, + .alphabeticalOrder = 51, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Legend, + .alphabeticalOrder = 43, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Escape, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Aim, + .alphabeticalOrder = 59, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Battle, + .alphabeticalOrder = 55, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Fight, + .alphabeticalOrder = 52, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Resuscitate, + .alphabeticalOrder = 42, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Points, + .alphabeticalOrder = 61, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Serious, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_GiveUp, + .alphabeticalOrder = 44, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Loss, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_IfILose, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lost, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lose, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Guard, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Partner, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Reject, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Accept, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Invincible, + .alphabeticalOrder = 58, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Received, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Easy, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Weak, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_TooWeak, + .alphabeticalOrder = 57, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Pushover, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Leader, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Rule, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Move, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_conditions.h b/src/data/easy_chat/easy_chat_group_conditions.h new file mode 100755 index 0000000000..a8d8ee8740 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_conditions.h @@ -0,0 +1,417 @@ +const u8 gEasyChatWord_Hot[] = _("HOT"); +const u8 gEasyChatWord_Exists[] = _("EXISTS"); +const u8 gEasyChatWord_Excess[] = _("EXCESS"); +const u8 gEasyChatWord_Approved[] = _("APPROVED"); +const u8 gEasyChatWord_Has[] = _("HAS"); +const u8 gEasyChatWord_Good[] = _("GOOD"); +const u8 gEasyChatWord_Less[] = _("LESS"); +const u8 gEasyChatWord_Momentum[] = _("MOMENTUM"); +const u8 gEasyChatWord_Going[] = _("GOING"); +const u8 gEasyChatWord_Weird[] = _("WEIRD"); +const u8 gEasyChatWord_Busy[] = _("BUSY"); +const u8 gEasyChatWord_Together[] = _("TOGETHER"); +const u8 gEasyChatWord_Full[] = _("FULL"); +const u8 gEasyChatWord_Absent[] = _("ABSENT"); +const u8 gEasyChatWord_Being[] = _("BEING"); +const u8 gEasyChatWord_Need[] = _("NEED"); +const u8 gEasyChatWord_Tasty[] = _("TASTY"); +const u8 gEasyChatWord_Skilled[] = _("SKILLED"); +const u8 gEasyChatWord_Noisy[] = _("NOISY"); +const u8 gEasyChatWord_Big[] = _("BIG"); +const u8 gEasyChatWord_Late[] = _("LATE"); +const u8 gEasyChatWord_Close[] = _("CLOSE"); +const u8 gEasyChatWord_Docile[] = _("DOCILE"); +const u8 gEasyChatWord_Amusing[] = _("AMUSING"); +const u8 gEasyChatWord_Entertaining[] = _("ENTERTAINING"); +const u8 gEasyChatWord_Perfection[] = _("PERFECTION"); +const u8 gEasyChatWord_Pretty[] = _("PRETTY"); +const u8 gEasyChatWord_Healthy[] = _("HEALTHY"); +const u8 gEasyChatWord_Excellent[] = _("EXCELLENT"); +const u8 gEasyChatWord_UpsideDown[] = _("UPSIDE DOWN"); +const u8 gEasyChatWord_Cold[] = _("COLD"); +const u8 gEasyChatWord_Refreshing[] = _("REFRESHING"); +const u8 gEasyChatWord_Unavoidable[] = _("UNAVOIDABLE"); +const u8 gEasyChatWord_Much[] = _("MUCH"); +const u8 gEasyChatWord_Overwhelming[] = _("OVERWHELMING"); +const u8 gEasyChatWord_Fabulous[] = _("FABULOUS"); +const u8 gEasyChatWord_Else[] = _("ELSE"); +const u8 gEasyChatWord_Expensive[] = _("EXPENSIVE"); +const u8 gEasyChatWord_Correct[] = _("CORRECT"); +const u8 gEasyChatWord_Impossible[] = _("IMPOSSIBLE"); +const u8 gEasyChatWord_Small[] = _("SMALL"); +const u8 gEasyChatWord_Different[] = _("DIFFERENT"); +const u8 gEasyChatWord_Tired[] = _("TIRED"); +const u8 gEasyChatWord_Skill[] = _("SKILL"); +const u8 gEasyChatWord_Top[] = _("TOP"); +const u8 gEasyChatWord_NonStop[] = _("NON-STOP"); +const u8 gEasyChatWord_Preposterous[] = _("PREPOSTEROUS"); +const u8 gEasyChatWord_None[] = _("NONE"); +const u8 gEasyChatWord_Nothing[] = _("NOTHING"); +const u8 gEasyChatWord_Natural[] = _("NATURAL"); +const u8 gEasyChatWord_Becomes[] = _("BECOMES"); +const u8 gEasyChatWord_Lukewarm[] = _("LUKEWARM"); +const u8 gEasyChatWord_Fast[] = _("FAST"); +const u8 gEasyChatWord_Low[] = _("LOW"); +const u8 gEasyChatWord_Awful[] = _("AWFUL"); +const u8 gEasyChatWord_Alone[] = _("ALONE"); +const u8 gEasyChatWord_Bored[] = _("BORED"); +const u8 gEasyChatWord_Secret[] = _("SECRET"); +const u8 gEasyChatWord_Mystery[] = _("MYSTERY"); +const u8 gEasyChatWord_Lacks[] = _("LACKS"); +const u8 gEasyChatWord_Best[] = _("BEST"); +const u8 gEasyChatWord_Lousy[] = _("LOUSY"); +const u8 gEasyChatWord_Mistake[] = _("MISTAKE"); +const u8 gEasyChatWord_Kind[] = _("KIND"); +const u8 gEasyChatWord_Well[] = _("WELL"); +const u8 gEasyChatWord_Weakened[] = _("WEAKENED"); +const u8 gEasyChatWord_Simple[] = _("SIMPLE"); +const u8 gEasyChatWord_Seems[] = _("SEEMS"); +const u8 gEasyChatWord_Badly[] = _("BADLY"); + +const struct EasyChatWordInfo gEasyChatGroup_Conditions[] = { + { + .text = gEasyChatWord_Hot, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Exists, + .alphabeticalOrder = 55, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Excess, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Approved, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Has, + .alphabeticalOrder = 54, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Good, + .alphabeticalOrder = 68, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Less, + .alphabeticalOrder = 50, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Momentum, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Going, + .alphabeticalOrder = 60, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Weird, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Busy, + .alphabeticalOrder = 56, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Together, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Full, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Absent, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Being, + .alphabeticalOrder = 38, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Need, + .alphabeticalOrder = 41, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Tasty, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Skilled, + .alphabeticalOrder = 36, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Noisy, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Big, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Late, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Close, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Docile, + .alphabeticalOrder = 37, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Amusing, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Entertaining, + .alphabeticalOrder = 52, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Perfection, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Pretty, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Healthy, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Excellent, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_UpsideDown, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Cold, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Refreshing, + .alphabeticalOrder = 39, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Unavoidable, + .alphabeticalOrder = 63, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Much, + .alphabeticalOrder = 59, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Overwhelming, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Fabulous, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Else, + .alphabeticalOrder = 61, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Expensive, + .alphabeticalOrder = 53, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Correct, + .alphabeticalOrder = 51, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Impossible, + .alphabeticalOrder = 62, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Small, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Different, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Tired, + .alphabeticalOrder = 58, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Skill, + .alphabeticalOrder = 49, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Top, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_NonStop, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Preposterous, + .alphabeticalOrder = 45, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_None, + .alphabeticalOrder = 47, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Nothing, + .alphabeticalOrder = 48, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Natural, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Becomes, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lukewarm, + .alphabeticalOrder = 46, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Fast, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Low, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Awful, + .alphabeticalOrder = 57, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Alone, + .alphabeticalOrder = 67, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Bored, + .alphabeticalOrder = 66, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Secret, + .alphabeticalOrder = 43, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Mystery, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lacks, + .alphabeticalOrder = 40, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Best, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lousy, + .alphabeticalOrder = 42, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Mistake, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Kind, + .alphabeticalOrder = 44, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Well, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Weakened, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Simple, + .alphabeticalOrder = 65, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Seems, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Badly, + .alphabeticalOrder = 64, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_endings.h b/src/data/easy_chat/easy_chat_group_endings.h new file mode 100755 index 0000000000..afaea48cb1 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_endings.h @@ -0,0 +1,417 @@ +const u8 gEasyChatWord_Will[] = _("WILL"); +const u8 gEasyChatWord_WillBeHere[] = _("WILL BE HERE"); +const u8 gEasyChatWord_Or[] = _("OR"); +const u8 gEasyChatWord_Times[] = _("TIMES"); +const u8 gEasyChatWord_Wonder[] = _("WONDER"); +const u8 gEasyChatWord_IsItQues[] = _("IS IT?"); +const u8 gEasyChatWord_Be[] = _("BE"); +const u8 gEasyChatWord_Gimme[] = _("GIMME"); +const u8 gEasyChatWord_Could[] = _("COULD"); +const u8 gEasyChatWord_LikelyTo[] = _("LIKELY TO"); +const u8 gEasyChatWord_Would[] = _("WOULD"); +const u8 gEasyChatWord_Is[] = _("IS"); +const u8 gEasyChatWord_IsntItQues[] = _("ISN'T IT?"); +const u8 gEasyChatWord_Lets[] = _("LET'S"); +const u8 gEasyChatWord_Other[] = _("OTHER"); +const u8 gEasyChatWord_Are[] = _("ARE"); +const u8 gEasyChatWord_Was[] = _("WAS"); +const u8 gEasyChatWord_Were[] = _("WERE"); +const u8 gEasyChatWord_Those[] = _("THOSE"); +const u8 gEasyChatWord_Isnt[] = _("ISN'T"); +const u8 gEasyChatWord_Wont[] = _("WON'T"); +const u8 gEasyChatWord_Cant[] = _("CAN'T"); +const u8 gEasyChatWord_Can[] = _("CAN"); +const u8 gEasyChatWord_Dont[] = _("DON'T"); +const u8 gEasyChatWord_Do[] = _("DO"); +const u8 gEasyChatWord_Does[] = _("DOES"); +const u8 gEasyChatWord_Whom[] = _("WHOM"); +const u8 gEasyChatWord_Which[] = _("WHICH"); +const u8 gEasyChatWord_Wasnt[] = _("WASN'T"); +const u8 gEasyChatWord_Werent[] = _("WEREN'T"); +const u8 gEasyChatWord_Have[] = _("HAVE"); +const u8 gEasyChatWord_Havent[] = _("HAVEN'T"); +const u8 gEasyChatWord_A[] = _("A"); +const u8 gEasyChatWord_An[] = _("AN"); +const u8 gEasyChatWord_Not[] = _("NOT"); +const u8 gEasyChatWord_There[] = _("THERE"); +const u8 gEasyChatWord_OkQues[] = _("OK?"); +const u8 gEasyChatWord_So[] = _("SO"); +const u8 gEasyChatWord_Maybe[] = _("MAYBE"); +const u8 gEasyChatWord_About[] = _("ABOUT"); +const u8 gEasyChatWord_Over[] = _("OVER"); +const u8 gEasyChatWord_It[] = _("IT"); +const u8 gEasyChatWord_All[] = _("ALL"); +const u8 gEasyChatWord_For[] = _("FOR"); +const u8 gEasyChatWord_On[] = _("ON"); +const u8 gEasyChatWord_Off[] = _("OFF"); +const u8 gEasyChatWord_As[] = _("AS"); +const u8 gEasyChatWord_To[] = _("TO"); +const u8 gEasyChatWord_With[] = _("WITH"); +const u8 gEasyChatWord_Better[] = _("BETTER"); +const u8 gEasyChatWord_Ever[] = _("EVER"); +const u8 gEasyChatWord_Since[] = _("SINCE"); +const u8 gEasyChatWord_Of[] = _("OF"); +const u8 gEasyChatWord_BelongsTo[] = _("BELONGS TO"); +const u8 gEasyChatWord_At[] = _("AT"); +const u8 gEasyChatWord_In[] = _("IN"); +const u8 gEasyChatWord_Out[] = _("OUT"); +const u8 gEasyChatWord_Too[] = _("TOO"); +const u8 gEasyChatWord_Like[] = _("LIKE"); +const u8 gEasyChatWord_Did[] = _("DID"); +const u8 gEasyChatWord_Didnt[] = _("DIDN'T"); +const u8 gEasyChatWord_Doesnt[] = _("DOESN'T"); +const u8 gEasyChatWord_Without[] = _("WITHOUT"); +const u8 gEasyChatWord_After[] = _("AFTER"); +const u8 gEasyChatWord_Before[] = _("BEFORE"); +const u8 gEasyChatWord_While[] = _("WHILE"); +const u8 gEasyChatWord_Than[] = _("THAN"); +const u8 gEasyChatWord_Once[] = _("ONCE"); +const u8 gEasyChatWord_Anywhere[] = _("ANYWHERE"); + +const struct EasyChatWordInfo gEasyChatGroup_Endings[] = { + { + .text = gEasyChatWord_Will, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_WillBeHere, + .alphabeticalOrder = 39, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Or, + .alphabeticalOrder = 63, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Times, + .alphabeticalOrder = 42, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wonder, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_IsItQues, + .alphabeticalOrder = 68, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Be, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Gimme, + .alphabeticalOrder = 46, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Could, + .alphabeticalOrder = 54, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_LikelyTo, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Would, + .alphabeticalOrder = 64, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Is, + .alphabeticalOrder = 53, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_IsntItQues, + .alphabeticalOrder = 49, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lets, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Other, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Are, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Was, + .alphabeticalOrder = 59, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Were, + .alphabeticalOrder = 60, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Those, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Isnt, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wont, + .alphabeticalOrder = 61, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Cant, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Can, + .alphabeticalOrder = 50, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Dont, + .alphabeticalOrder = 43, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Do, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Does, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Whom, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Which, + .alphabeticalOrder = 55, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wasnt, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Werent, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Have, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Havent, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_A, + .alphabeticalOrder = 41, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_An, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Not, + .alphabeticalOrder = 58, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_There, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_OkQues, + .alphabeticalOrder = 38, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_So, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Maybe, + .alphabeticalOrder = 52, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_About, + .alphabeticalOrder = 45, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Over, + .alphabeticalOrder = 36, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_It, + .alphabeticalOrder = 44, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_All, + .alphabeticalOrder = 67, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_For, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_On, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Off, + .alphabeticalOrder = 56, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_As, + .alphabeticalOrder = 40, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_To, + .alphabeticalOrder = 51, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_With, + .alphabeticalOrder = 37, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Better, + .alphabeticalOrder = 66, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ever, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Since, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Of, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_BelongsTo, + .alphabeticalOrder = 47, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_At, + .alphabeticalOrder = 57, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_In, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Out, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Too, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Like, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Did, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Didnt, + .alphabeticalOrder = 65, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Doesnt, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Without, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_After, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Before, + .alphabeticalOrder = 48, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_While, + .alphabeticalOrder = 62, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Than, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Once, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Anywhere, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_events.h b/src/data/easy_chat/easy_chat_group_events.h new file mode 100755 index 0000000000..8d9cf7e24c --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_events.h @@ -0,0 +1,177 @@ +const u8 gEasyChatWord_Appeal[] = _("APPEAL"); +const u8 gEasyChatWord_Events[] = _("EVENTS"); +const u8 gEasyChatWord_StayAtHome[] = _("STAY-AT-HOME"); +const u8 gEasyChatWord_Berry[] = _("BERRY"); +const u8 gEasyChatWord_Contest[] = _("CONTEST"); +const u8 gEasyChatWord_Mc[] = _("MC"); +const u8 gEasyChatWord_Judge[] = _("JUDGE"); +const u8 gEasyChatWord_Super[] = _("SUPER"); +const u8 gEasyChatWord_Stage[] = _("STAGE"); +const u8 gEasyChatWord_HallOfFame[] = _("HALL OF FAME"); +const u8 gEasyChatWord_Evolution[] = _("EVOLUTION"); +const u8 gEasyChatWord_Hyper[] = _("HYPER"); +const u8 gEasyChatWord_BattleTower[] = _("BATTLE TOWER"); +const u8 gEasyChatWord_Leaders[] = _("LEADERS"); +const u8 gEasyChatWord_BattleRoom[] = _("BATTLE ROOM"); +const u8 gEasyChatWord_Hidden[] = _("HIDDEN"); +const u8 gEasyChatWord_SecretBase[] = _("SECRET BASE"); +const u8 gEasyChatWord_Blend[] = _("BLEND"); +const u8 gEasyChatWord_POKEBLOCK[] = _("{POKEBLOCK}"); +const u8 gEasyChatWord_Master[] = _("MASTER"); +const u8 gEasyChatWord_Rank[] = _("RANK"); +const u8 gEasyChatWord_Ribbon[] = _("RIBBON"); +const u8 gEasyChatWord_Crush[] = _("CRUSH"); +const u8 gEasyChatWord_Direct[] = _("DIRECT"); +const u8 gEasyChatWord_Tower[] = _("TOWER"); +const u8 gEasyChatWord_Union[] = _("UNION"); +const u8 gEasyChatWord_Room[] = _("ROOM"); +const u8 gEasyChatWord_Wireless[] = _("WIRELESS"); +const u8 gEasyChatWord_Frontier[] = _("FRONTIER"); + +const struct EasyChatWordInfo gEasyChatGroup_Events[] = { + { + .text = gEasyChatWord_Appeal, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Events, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_StayAtHome, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Berry, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Contest, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Mc, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Judge, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Super, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Stage, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_HallOfFame, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Evolution, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hyper, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_BattleTower, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Leaders, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_BattleRoom, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hidden, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_SecretBase, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Blend, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_POKEBLOCK, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Master, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Rank, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ribbon, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Crush, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Direct, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Tower, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Union, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Room, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wireless, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Frontier, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_feelings.h b/src/data/easy_chat/easy_chat_group_feelings.h new file mode 100755 index 0000000000..2dda718081 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_feelings.h @@ -0,0 +1,417 @@ +const u8 gEasyChatWord_Meet[] = _("MEET"); +const u8 gEasyChatWord_Play[] = _("PLAY"); +const u8 gEasyChatWord_Hurried[] = _("HURRIED"); +const u8 gEasyChatWord_Goes[] = _("GOES"); +const u8 gEasyChatWord_Giddy[] = _("GIDDY"); +const u8 gEasyChatWord_Happy[] = _("HAPPY"); +const u8 gEasyChatWord_Happiness[] = _("HAPPINESS"); +const u8 gEasyChatWord_Excite[] = _("EXCITE"); +const u8 gEasyChatWord_Important[] = _("IMPORTANT"); +const u8 gEasyChatWord_Funny[] = _("FUNNY"); +const u8 gEasyChatWord_Got[] = _("GOT"); +const u8 gEasyChatWord_GoHome[] = _("GO HOME"); +const u8 gEasyChatWord_Disappointed[] = _("DISAPPOINTED"); +const u8 gEasyChatWord_Disappoints[] = _("DISAPPOINTS"); +const u8 gEasyChatWord_Sad[] = _("SAD"); +const u8 gEasyChatWord_Try[] = _("TRY"); +const u8 gEasyChatWord_Tries[] = _("TRIES"); +const u8 gEasyChatWord_Hears[] = _("HEARS"); +const u8 gEasyChatWord_Think[] = _("THINK"); +const u8 gEasyChatWord_Hear[] = _("HEAR"); +const u8 gEasyChatWord_Wants[] = _("WANTS"); +const u8 gEasyChatWord_Misheard[] = _("MISHEARD"); +const u8 gEasyChatWord_Dislike[] = _("DISLIKE"); +const u8 gEasyChatWord_Angry[] = _("ANGRY"); +const u8 gEasyChatWord_Anger[] = _("ANGER"); +const u8 gEasyChatWord_Scary[] = _("SCARY"); +const u8 gEasyChatWord_Lonesome[] = _("LONESOME"); +const u8 gEasyChatWord_Disappoint[] = _("DISAPPOINT"); +const u8 gEasyChatWord_Joy[] = _("JOY"); +const u8 gEasyChatWord_Gets[] = _("GETS"); +const u8 gEasyChatWord_Never[] = _("NEVER"); +const u8 gEasyChatWord_Darn[] = _("DARN"); +const u8 gEasyChatWord_Downcast[] = _("DOWNCAST"); +const u8 gEasyChatWord_Incredible[] = _("INCREDIBLE"); +const u8 gEasyChatWord_Likes[] = _("LIKES"); +const u8 gEasyChatWord_Dislikes[] = _("DISLIKES"); +const u8 gEasyChatWord_Boring[] = _("BORING"); +const u8 gEasyChatWord_Care[] = _("CARE"); +const u8 gEasyChatWord_Cares[] = _("CARES"); +const u8 gEasyChatWord_AllRight[] = _("ALL RIGHT"); +const u8 gEasyChatWord_Adore[] = _("ADORE"); +const u8 gEasyChatWord_Disaster[] = _("DISASTER"); +const u8 gEasyChatWord_Enjoy[] = _("ENJOY"); +const u8 gEasyChatWord_Enjoys[] = _("ENJOYS"); +const u8 gEasyChatWord_Eat[] = _("EAT"); +const u8 gEasyChatWord_Lacking[] = _("LACKING"); +const u8 gEasyChatWord_Bad[] = _("BAD"); +const u8 gEasyChatWord_Hard[] = _("HARD"); +const u8 gEasyChatWord_Terrible[] = _("TERRIBLE"); +const u8 gEasyChatWord_Should[] = _("SHOULD"); +const u8 gEasyChatWord_Nice[] = _("NICE"); +const u8 gEasyChatWord_Drink[] = _("DRINK"); +const u8 gEasyChatWord_Surprise[] = _("SURPRISE"); +const u8 gEasyChatWord_Fear[] = _("FEAR"); +const u8 gEasyChatWord_Want[] = _("WANT"); +const u8 gEasyChatWord_Wait[] = _("WAIT"); +const u8 gEasyChatWord_Satisfied[] = _("SATISFIED"); +const u8 gEasyChatWord_See[] = _("SEE"); +const u8 gEasyChatWord_Rare[] = _("RARE"); +const u8 gEasyChatWord_Negative[] = _("NEGATIVE"); +const u8 gEasyChatWord_Done[] = _("DONE"); +const u8 gEasyChatWord_Danger[] = _("DANGER"); +const u8 gEasyChatWord_Defeated[] = _("DEFEATED"); +const u8 gEasyChatWord_Beat[] = _("BEAT"); +const u8 gEasyChatWord_Great[] = _("GREAT"); +const u8 gEasyChatWord_Romantic[] = _("ROMANTIC"); +const u8 gEasyChatWord_Question[] = _("QUESTION"); +const u8 gEasyChatWord_Understand[] = _("UNDERSTAND"); +const u8 gEasyChatWord_Understands[] = _("UNDERSTANDS"); + +const struct EasyChatWordInfo gEasyChatGroup_Feelings[] = { + { + .text = gEasyChatWord_Meet, + .alphabeticalOrder = 40, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Play, + .alphabeticalOrder = 39, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hurried, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Goes, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Giddy, + .alphabeticalOrder = 46, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Happy, + .alphabeticalOrder = 63, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Happiness, + .alphabeticalOrder = 36, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Excite, + .alphabeticalOrder = 37, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Important, + .alphabeticalOrder = 38, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Funny, + .alphabeticalOrder = 61, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Got, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_GoHome, + .alphabeticalOrder = 62, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Disappointed, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Disappoints, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sad, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Try, + .alphabeticalOrder = 41, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Tries, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hears, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Think, + .alphabeticalOrder = 60, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hear, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wants, + .alphabeticalOrder = 51, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Misheard, + .alphabeticalOrder = 44, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Dislike, + .alphabeticalOrder = 42, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Angry, + .alphabeticalOrder = 43, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Anger, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Scary, + .alphabeticalOrder = 53, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lonesome, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Disappoint, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Joy, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Gets, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Never, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Darn, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Downcast, + .alphabeticalOrder = 64, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Incredible, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Likes, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Dislikes, + .alphabeticalOrder = 47, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Boring, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Care, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Cares, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_AllRight, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Adore, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Disaster, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Enjoy, + .alphabeticalOrder = 45, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Enjoys, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Eat, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lacking, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Bad, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hard, + .alphabeticalOrder = 59, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Terrible, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Should, + .alphabeticalOrder = 50, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Nice, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Drink, + .alphabeticalOrder = 66, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Surprise, + .alphabeticalOrder = 58, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Fear, + .alphabeticalOrder = 65, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Want, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wait, + .alphabeticalOrder = 56, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Satisfied, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_See, + .alphabeticalOrder = 57, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Rare, + .alphabeticalOrder = 49, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Negative, + .alphabeticalOrder = 52, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Done, + .alphabeticalOrder = 48, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Danger, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Defeated, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Beat, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Great, + .alphabeticalOrder = 67, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Romantic, + .alphabeticalOrder = 68, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Question, + .alphabeticalOrder = 55, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Understand, + .alphabeticalOrder = 54, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Understands, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_greetings.h b/src/data/easy_chat/easy_chat_group_greetings.h new file mode 100755 index 0000000000..4df08bf7dc --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_greetings.h @@ -0,0 +1,255 @@ +const u8 gEasyChatWord_Thanks[] = _("THANKS"); +const u8 gEasyChatWord_Yes[] = _("YES"); +const u8 gEasyChatWord_HereGoes[] = _("HERE GOES"); +const u8 gEasyChatWord_HereICome[] = _("HERE I COME"); +const u8 gEasyChatWord_HereItIs[] = _("HERE IT IS"); +const u8 gEasyChatWord_Yeah[] = _("YEAH"); +const u8 gEasyChatWord_Welcome[] = _("WELCOME"); +const u8 gEasyChatWord_Oi[] = _("OI"); +const u8 gEasyChatWord_HowDo[] = _("HOW DO"); +const u8 gEasyChatWord_Congrats[] = _("CONGRATS"); +const u8 gEasyChatWord_GiveMe[] = _("GIVE ME"); +const u8 gEasyChatWord_Sorry[] = _("SORRY"); +const u8 gEasyChatWord_Apologize[] = _("APOLOGIZE"); +const u8 gEasyChatWord_Forgive[] = _("FORGIVE"); +const u8 gEasyChatWord_HeyThere[] = _("HEY, THERE"); +const u8 gEasyChatWord_Hello[] = _("HELLO"); +const u8 gEasyChatWord_GoodBye[] = _("GOOD-BYE"); +const u8 gEasyChatWord_ThankYou[] = _("THANK YOU"); +const u8 gEasyChatWord_IveArrived[] = _("I'VE ARRIVED"); +const u8 gEasyChatWord_Pardon[] = _("PARDON"); +const u8 gEasyChatWord_Excuse[] = _("EXCUSE"); +const u8 gEasyChatWord_SeeYa[] = _("SEE YA"); +const u8 gEasyChatWord_ExcuseMe[] = _("EXCUSE ME"); +const u8 gEasyChatWord_WellThen[] = _("WELL, THEN"); +const u8 gEasyChatWord_GoAhead[] = _("GO AHEAD"); +const u8 gEasyChatWord_Appreciate[] = _("APPRECIATE"); +const u8 gEasyChatWord_HeyQues[] = _("HEY?"); +const u8 gEasyChatWord_WhatsUpQues[] = _("WHAT'S UP?"); +const u8 gEasyChatWord_HuhQues[] = _("HUH?"); +const u8 gEasyChatWord_No[] = _("NO"); +const u8 gEasyChatWord_Hi[] = _("HI"); +const u8 gEasyChatWord_YeahYeah[] = _("YEAH, YEAH"); +const u8 gEasyChatWord_ByeBye[] = _("BYE-BYE"); +const u8 gEasyChatWord_MeetYou[] = _("MEET YOU"); +const u8 gEasyChatWord_Hey[] = _("HEY"); +const u8 gEasyChatWord_Smell[] = _("SMELL"); +const u8 gEasyChatWord_Listening[] = _("LISTENING"); +const u8 gEasyChatWord_HooHah[] = _("HOO-HAH"); +const u8 gEasyChatWord_Yahoo[] = _("YAHOO"); +const u8 gEasyChatWord_Yo[] = _("YO"); +const u8 gEasyChatWord_ComeOver[] = _("COME OVER"); +const u8 gEasyChatWord_CountOn[] = _("COUNT ON"); + +const struct EasyChatWordInfo gEasyChatGroup_Greetings[] = { + { + .text = gEasyChatWord_Thanks, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Yes, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_HereGoes, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_HereICome, + .alphabeticalOrder = 40, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_HereItIs, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Yeah, + .alphabeticalOrder = 41, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Welcome, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Oi, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_HowDo, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Congrats, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_GiveMe, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sorry, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Apologize, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Forgive, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_HeyThere, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hello, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_GoodBye, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ThankYou, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_IveArrived, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Pardon, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Excuse, + .alphabeticalOrder = 37, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_SeeYa, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ExcuseMe, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_WellThen, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_GoAhead, + .alphabeticalOrder = 36, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Appreciate, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_HeyQues, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_WhatsUpQues, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_HuhQues, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_No, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hi, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_YeahYeah, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ByeBye, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_MeetYou, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hey, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Smell, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Listening, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_HooHah, + .alphabeticalOrder = 38, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Yahoo, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Yo, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ComeOver, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_CountOn, + .alphabeticalOrder = 39, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_hobbies.h b/src/data/easy_chat/easy_chat_group_hobbies.h new file mode 100755 index 0000000000..fcd73d0174 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_hobbies.h @@ -0,0 +1,327 @@ +const u8 gEasyChatWord_Idol[] = _("IDOL"); +const u8 gEasyChatWord_Anime[] = _("ANIME"); +const u8 gEasyChatWord_Song[] = _("SONG"); +const u8 gEasyChatWord_Movie[] = _("MOVIE"); +const u8 gEasyChatWord_Sweets[] = _("SWEETS"); +const u8 gEasyChatWord_Chat[] = _("CHAT"); +const u8 gEasyChatWord_ChildsPlay[] = _("CHILD'S PLAY"); +const u8 gEasyChatWord_Toys[] = _("TOYS"); +const u8 gEasyChatWord_Music[] = _("MUSIC"); +const u8 gEasyChatWord_Cards[] = _("CARDS"); +const u8 gEasyChatWord_Shopping[] = _("SHOPPING"); +const u8 gEasyChatWord_Camera[] = _("CAMERA"); +const u8 gEasyChatWord_Viewing[] = _("VIEWING"); +const u8 gEasyChatWord_Spectator[] = _("SPECTATOR"); +const u8 gEasyChatWord_Gourmet[] = _("GOURMET"); +const u8 gEasyChatWord_Game[] = _("GAME"); +const u8 gEasyChatWord_Rpg[] = _("RPG"); +const u8 gEasyChatWord_Collection[] = _("COLLECTION"); +const u8 gEasyChatWord_Complete[] = _("COMPLETE"); +const u8 gEasyChatWord_Magazine[] = _("MAGAZINE"); +const u8 gEasyChatWord_Walk[] = _("WALK"); +const u8 gEasyChatWord_Bike[] = _("BIKE"); +const u8 gEasyChatWord_Hobby[] = _("HOBBY"); +const u8 gEasyChatWord_Sports[] = _("SPORTS"); +const u8 gEasyChatWord_Software[] = _("SOFTWARE"); +const u8 gEasyChatWord_Songs[] = _("SONGS"); +const u8 gEasyChatWord_Diet[] = _("DIET"); +const u8 gEasyChatWord_Treasure[] = _("TREASURE"); +const u8 gEasyChatWord_Travel[] = _("TRAVEL"); +const u8 gEasyChatWord_Dance[] = _("DANCE"); +const u8 gEasyChatWord_Channel[] = _("CHANNEL"); +const u8 gEasyChatWord_Making[] = _("MAKING"); +const u8 gEasyChatWord_Fishing[] = _("FISHING"); +const u8 gEasyChatWord_Date[] = _("DATE"); +const u8 gEasyChatWord_Design[] = _("DESIGN"); +const u8 gEasyChatWord_Locomotive[] = _("LOCOMOTIVE"); +const u8 gEasyChatWord_PlushDoll[] = _("PLUSH DOLL"); +const u8 gEasyChatWord_Pc[] = _("PC"); +const u8 gEasyChatWord_Flowers[] = _("FLOWERS"); +const u8 gEasyChatWord_Hero[] = _("HERO"); +const u8 gEasyChatWord_Nap[] = _("NAP"); +const u8 gEasyChatWord_Heroine[] = _("HEROINE"); +const u8 gEasyChatWord_Fashion[] = _("FASHION"); +const u8 gEasyChatWord_Adventure[] = _("ADVENTURE"); +const u8 gEasyChatWord_Board[] = _("BOARD"); +const u8 gEasyChatWord_Ball[] = _("BALL"); +const u8 gEasyChatWord_Book[] = _("BOOK"); +const u8 gEasyChatWord_Festival[] = _("FESTIVAL"); +const u8 gEasyChatWord_Comics[] = _("COMICS"); +const u8 gEasyChatWord_Holiday[] = _("HOLIDAY"); +const u8 gEasyChatWord_Plans[] = _("PLANS"); +const u8 gEasyChatWord_Trendy[] = _("TRENDY"); +const u8 gEasyChatWord_Vacation[] = _("VACATION"); +const u8 gEasyChatWord_Look[] = _("LOOK"); + +const struct EasyChatWordInfo gEasyChatGroup_Hobbies[] = { + { + .text = gEasyChatWord_Idol, + .alphabeticalOrder = 43, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Anime, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Song, + .alphabeticalOrder = 45, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Movie, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sweets, + .alphabeticalOrder = 44, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Chat, + .alphabeticalOrder = 46, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ChildsPlay, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Toys, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Music, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Cards, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Shopping, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Camera, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Viewing, + .alphabeticalOrder = 48, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Spectator, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Gourmet, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Game, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Rpg, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Collection, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Complete, + .alphabeticalOrder = 42, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Magazine, + .alphabeticalOrder = 47, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Walk, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Bike, + .alphabeticalOrder = 38, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hobby, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sports, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Software, + .alphabeticalOrder = 39, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Songs, + .alphabeticalOrder = 41, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Diet, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Treasure, + .alphabeticalOrder = 49, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Travel, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Dance, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Channel, + .alphabeticalOrder = 53, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Making, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Fishing, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Date, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Design, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Locomotive, + .alphabeticalOrder = 40, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_PlushDoll, + .alphabeticalOrder = 37, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Pc, + .alphabeticalOrder = 50, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Flowers, + .alphabeticalOrder = 36, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hero, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Nap, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Heroine, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Fashion, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Adventure, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Board, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ball, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Book, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Festival, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Comics, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Holiday, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Plans, + .alphabeticalOrder = 51, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Trendy, + .alphabeticalOrder = 52, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Vacation, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Look, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_lifestyle.h b/src/data/easy_chat/easy_chat_group_lifestyle.h new file mode 100755 index 0000000000..9ed60025d2 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_lifestyle.h @@ -0,0 +1,273 @@ +const u8 gEasyChatWord_Chores[] = _("CHORES"); +const u8 gEasyChatWord_Home[] = _("HOME"); +const u8 gEasyChatWord_Money[] = _("MONEY"); +const u8 gEasyChatWord_Allowance[] = _("ALLOWANCE"); +const u8 gEasyChatWord_Bath[] = _("BATH"); +const u8 gEasyChatWord_Conversation[] = _("CONVERSATION"); +const u8 gEasyChatWord_School[] = _("SCHOOL"); +const u8 gEasyChatWord_Commemorate[] = _("COMMEMORATE"); +const u8 gEasyChatWord_Habit[] = _("HABIT"); +const u8 gEasyChatWord_Group[] = _("GROUP"); +const u8 gEasyChatWord_Word[] = _("WORD"); +const u8 gEasyChatWord_Store[] = _("STORE"); +const u8 gEasyChatWord_Service[] = _("SERVICE"); +const u8 gEasyChatWord_Work[] = _("WORK"); +const u8 gEasyChatWord_System[] = _("SYSTEM"); +const u8 gEasyChatWord_Train[] = _("TRAIN"); +const u8 gEasyChatWord_Class[] = _("CLASS"); +const u8 gEasyChatWord_Lessons[] = _("LESSONS"); +const u8 gEasyChatWord_Information[] = _("INFORMATION"); +const u8 gEasyChatWord_Living[] = _("LIVING"); +const u8 gEasyChatWord_Teacher[] = _("TEACHER"); +const u8 gEasyChatWord_Tournament[] = _("TOURNAMENT"); +const u8 gEasyChatWord_Letter[] = _("LETTER"); +const u8 gEasyChatWord_Event[] = _("EVENT"); +const u8 gEasyChatWord_Digital[] = _("DIGITAL"); +const u8 gEasyChatWord_Test[] = _("TEST"); +const u8 gEasyChatWord_DeptStore[] = _("DEPT. STORE"); +const u8 gEasyChatWord_Television[] = _("TELEVISION"); +const u8 gEasyChatWord_Phone[] = _("PHONE"); +const u8 gEasyChatWord_Item[] = _("ITEM"); +const u8 gEasyChatWord_Name[] = _("NAME"); +const u8 gEasyChatWord_News[] = _("NEWS"); +const u8 gEasyChatWord_Popular[] = _("POPULAR"); +const u8 gEasyChatWord_Party[] = _("PARTY"); +const u8 gEasyChatWord_Study[] = _("STUDY"); +const u8 gEasyChatWord_Machine[] = _("MACHINE"); +const u8 gEasyChatWord_Mail[] = _("MAIL"); +const u8 gEasyChatWord_Message[] = _("MESSAGE"); +const u8 gEasyChatWord_Promise[] = _("PROMISE"); +const u8 gEasyChatWord_Dream[] = _("DREAM"); +const u8 gEasyChatWord_Kindergarten[] = _("KINDERGARTEN"); +const u8 gEasyChatWord_Life[] = _("LIFE"); +const u8 gEasyChatWord_Radio[] = _("RADIO"); +const u8 gEasyChatWord_Rental[] = _("RENTAL"); +const u8 gEasyChatWord_World[] = _("WORLD"); + +const struct EasyChatWordInfo gEasyChatGroup_Lifestyle[] = { + { + .text = gEasyChatWord_Chores, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Home, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Money, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Allowance, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Bath, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Conversation, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_School, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Commemorate, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Habit, + .alphabeticalOrder = 39, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Group, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Word, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Store, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Service, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Work, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_System, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Train, + .alphabeticalOrder = 40, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Class, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lessons, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Information, + .alphabeticalOrder = 41, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Living, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Teacher, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Tournament, + .alphabeticalOrder = 36, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Letter, + .alphabeticalOrder = 37, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Event, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Digital, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Test, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_DeptStore, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Television, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Phone, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Item, + .alphabeticalOrder = 38, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Name, + .alphabeticalOrder = 42, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_News, + .alphabeticalOrder = 43, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Popular, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Party, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Study, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Machine, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Mail, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Message, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Promise, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Dream, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Kindergarten, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Life, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Radio, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Rental, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_World, + .alphabeticalOrder = 44, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_misc.h b/src/data/easy_chat/easy_chat_group_misc.h new file mode 100755 index 0000000000..fbc9a70698 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_misc.h @@ -0,0 +1,255 @@ +const u8 gEasyChatWord_Highs[] = _("HIGHS"); +const u8 gEasyChatWord_Lows[] = _("LOWS"); +const u8 gEasyChatWord_Um[] = _("UM"); +const u8 gEasyChatWord_Rear[] = _("REAR"); +const u8 gEasyChatWord_Things[] = _("THINGS"); +const u8 gEasyChatWord_Thing[] = _("THING"); +const u8 gEasyChatWord_Below[] = _("BELOW"); +const u8 gEasyChatWord_Above[] = _("ABOVE"); +const u8 gEasyChatWord_Back[] = _("BACK"); +const u8 gEasyChatWord_High[] = _("HIGH"); +const u8 gEasyChatWord_Here[] = _("HERE"); +const u8 gEasyChatWord_Inside[] = _("INSIDE"); +const u8 gEasyChatWord_Outside[] = _("OUTSIDE"); +const u8 gEasyChatWord_Beside[] = _("BESIDE"); +const u8 gEasyChatWord_ThisIsItExcl[] = _("THIS IS IT!"); +const u8 gEasyChatWord_This[] = _("THIS"); +const u8 gEasyChatWord_Every[] = _("EVERY"); +const u8 gEasyChatWord_These[] = _("THESE"); +const u8 gEasyChatWord_TheseWere[] = _("THESE WERE"); +const u8 gEasyChatWord_Down[] = _("DOWN"); +const u8 gEasyChatWord_That[] = _("THAT"); +const u8 gEasyChatWord_ThoseAre[] = _("THOSE ARE"); +const u8 gEasyChatWord_ThoseWere[] = _("THOSE WERE"); +const u8 gEasyChatWord_ThatsItExcl[] = _("THAT'S IT!"); +const u8 gEasyChatWord_Am[] = _("AM"); +const u8 gEasyChatWord_ThatWas[] = _("THAT WAS"); +const u8 gEasyChatWord_Front[] = _("FRONT"); +const u8 gEasyChatWord_Up[] = _("UP"); +const u8 gEasyChatWord_Choice[] = _("CHOICE"); +const u8 gEasyChatWord_Far[] = _("FAR"); +const u8 gEasyChatWord_Away[] = _("AWAY"); +const u8 gEasyChatWord_Near[] = _("NEAR"); +const u8 gEasyChatWord_Where[] = _("WHERE"); +const u8 gEasyChatWord_When[] = _("WHEN"); +const u8 gEasyChatWord_What[] = _("WHAT"); +const u8 gEasyChatWord_Deep[] = _("DEEP"); +const u8 gEasyChatWord_Shallow[] = _("SHALLOW"); +const u8 gEasyChatWord_Why[] = _("WHY"); +const u8 gEasyChatWord_Confused[] = _("CONFUSED"); +const u8 gEasyChatWord_Opposite[] = _("OPPOSITE"); +const u8 gEasyChatWord_Left[] = _("LEFT"); +const u8 gEasyChatWord_Right[] = _("RIGHT"); + +const struct EasyChatWordInfo gEasyChatGroup_Misc[] = { + { + .text = gEasyChatWord_Highs, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lows, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Um, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Rear, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Things, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Thing, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Below, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Above, + .alphabeticalOrder = 38, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Back, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_High, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Here, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Inside, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Outside, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Beside, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ThisIsItExcl, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_This, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Every, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_These, + .alphabeticalOrder = 40, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_TheseWere, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Down, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_That, + .alphabeticalOrder = 39, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ThoseAre, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ThoseWere, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ThatsItExcl, + .alphabeticalOrder = 41, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Am, + .alphabeticalOrder = 36, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ThatWas, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Front, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Up, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Choice, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Far, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Away, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Near, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Where, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_When, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_What, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Deep, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Shallow, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Why, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Confused, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Opposite, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Left, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Right, + .alphabeticalOrder = 37, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_move_1.h b/src/data/easy_chat/easy_chat_group_move_1.h new file mode 100755 index 0000000000..3b0e8acca3 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_move_1.h @@ -0,0 +1,158 @@ +#include "constants/moves.h" + +const u16 gEasyChatGroup_Move1[] = { + MOVE_ABSORB, + MOVE_AEROBLAST, + MOVE_AGILITY, + MOVE_AIR_CUTTER, + MOVE_ANCIENT_POWER, + MOVE_AROMATHERAPY, + MOVE_ASTONISH, + MOVE_AURORA_BEAM, + MOVE_BIDE, + MOVE_BIND, + MOVE_BITE, + MOVE_BRICK_BREAK, + MOVE_BUBBLE, + MOVE_CHARGE, + MOVE_CHARM, + MOVE_CLAMP, + MOVE_CONFUSE_RAY, + MOVE_CONSTRICT, + MOVE_COSMIC_POWER, + MOVE_COUNTER, + MOVE_CRABHAMMER, + MOVE_CROSS_CHOP, + MOVE_CRUNCH, + MOVE_CUT, + MOVE_DIG, + MOVE_DISABLE, + MOVE_DOUBLE_TEAM, + MOVE_DOUBLE_EDGE, + MOVE_DOUBLE_SLAP, + MOVE_EARTHQUAKE, + MOVE_ENCORE, + MOVE_ENDEAVOR, + MOVE_ENDURE, + MOVE_EXTRASENSORY, + MOVE_EXTREME_SPEED, + MOVE_FACADE, + MOVE_FAKE_TEARS, + MOVE_FISSURE, + MOVE_FLAIL, + MOVE_FLAME_WHEEL, + MOVE_FLAMETHROWER, + MOVE_FLATTER, + MOVE_FLY, + MOVE_FOCUS_ENERGY, + MOVE_FOCUS_PUNCH, + MOVE_FOLLOW_ME, + MOVE_GIGA_DRAIN, + MOVE_GRASS_WHISTLE, + MOVE_GROWTH, + MOVE_GRUDGE, + MOVE_GUST, + MOVE_HAIL, + MOVE_HARDEN, + MOVE_HAZE, + MOVE_HEADBUTT, + MOVE_HEAL_BELL, + MOVE_HYPNOSIS, + MOVE_ICE_BALL, + MOVE_ICY_WIND, + MOVE_IRON_TAIL, + MOVE_KARATE_CHOP, + MOVE_KINESIS, + MOVE_LEECH_LIFE, + MOVE_LICK, + MOVE_LOVELY_KISS, + MOVE_LOW_KICK, + MOVE_MEAN_LOOK, + MOVE_MEMENTO, + MOVE_METAL_SOUND, + MOVE_METEOR_MASH, + MOVE_MIND_READER, + MOVE_MIRROR_MOVE, + MOVE_MIST, + MOVE_MORNING_SUN, + MOVE_NATURE_POWER, + MOVE_NIGHTMARE, + MOVE_OCTAZOOKA, + MOVE_ODOR_SLEUTH, + MOVE_OUTRAGE, + MOVE_OVERHEAT, + MOVE_PAIN_SPLIT, + MOVE_POWDER_SNOW, + MOVE_PSYBEAM, + MOVE_PSYCH_UP, + MOVE_PSYCHIC, + MOVE_PSYCHO_BOOST, + MOVE_PSYWAVE, + MOVE_PURSUIT, + MOVE_RAGE, + MOVE_RAIN_DANCE, + MOVE_RAPID_SPIN, + MOVE_RAZOR_WIND, + MOVE_RECOVER, + MOVE_RETURN, + MOVE_REVERSAL, + MOVE_ROCK_SLIDE, + MOVE_ROCK_SMASH, + MOVE_ROCK_THROW, + MOVE_ROCK_TOMB, + MOVE_ROLLOUT, + MOVE_SACRED_FIRE, + MOVE_SAFEGUARD, + MOVE_SAND_TOMB, + MOVE_SAND_ATTACK, + MOVE_SANDSTORM, + MOVE_SCARY_FACE, + MOVE_SCREECH, + MOVE_SELF_DESTRUCT, + MOVE_SHADOW_BALL, + MOVE_SHADOW_PUNCH, + MOVE_SHARPEN, + MOVE_SHEER_COLD, + MOVE_SIGNAL_BEAM, + MOVE_SILVER_WIND, + MOVE_SING, + MOVE_SKETCH, + MOVE_SKILL_SWAP, + MOVE_SKY_ATTACK, + MOVE_SKY_UPPERCUT, + MOVE_SLASH, + MOVE_SMELLING_SALT, + MOVE_SMOG, + MOVE_SMOKESCREEN, + MOVE_SNORE, + MOVE_SOLAR_BEAM, + MOVE_SONIC_BOOM, + MOVE_SPARK, + MOVE_SPIDER_WEB, + MOVE_SPITE, + MOVE_SPORE, + MOVE_STRENGTH, + MOVE_STRING_SHOT, + MOVE_STUN_SPORE, + MOVE_SUBMISSION, + MOVE_SUPER_FANG, + MOVE_SWAGGER, + MOVE_SWEET_SCENT, + MOVE_SWIFT, + MOVE_SYNTHESIS, + MOVE_TAIL_WHIP, + MOVE_THRASH, + MOVE_THUNDER, + MOVE_THUNDERBOLT, + MOVE_THUNDER_PUNCH, + MOVE_TICKLE, + MOVE_TORMENT, + MOVE_UPROAR, + MOVE_VITAL_THROW, + MOVE_WATER_SPOUT, + MOVE_WEATHER_BALL, + MOVE_WHIRLPOOL, + MOVE_WILL_O_WISP, + MOVE_WITHDRAW, + MOVE_YAWN, +}; diff --git a/src/data/easy_chat/easy_chat_group_move_2.h b/src/data/easy_chat/easy_chat_group_move_2.h new file mode 100755 index 0000000000..e0a0cd3795 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_move_2.h @@ -0,0 +1,204 @@ +#include "constants/moves.h" + +const u16 gEasyChatGroup_Move2[] = { + MOVE_ACID, + MOVE_ACID_ARMOR, + MOVE_AERIAL_ACE, + MOVE_AMNESIA, + MOVE_ARM_THRUST, + MOVE_ASSIST, + MOVE_ATTRACT, + MOVE_BARRAGE, + MOVE_BARRIER, + MOVE_BATON_PASS, + MOVE_BEAT_UP, + MOVE_BELLY_DRUM, + MOVE_BLAST_BURN, + MOVE_BLAZE_KICK, + MOVE_BLIZZARD, + MOVE_BLOCK, + MOVE_BODY_SLAM, + MOVE_BONE_CLUB, + MOVE_BONE_RUSH, + MOVE_BONEMERANG, + MOVE_BOUNCE, + MOVE_BUBBLE_BEAM, + MOVE_BULK_UP, + MOVE_BULLET_SEED, + MOVE_CALM_MIND, + MOVE_CAMOUFLAGE, + MOVE_COMET_PUNCH, + MOVE_CONFUSION, + MOVE_CONVERSION, + MOVE_CONVERSION_2, + MOVE_COTTON_SPORE, + MOVE_COVET, + MOVE_CRUSH_CLAW, + MOVE_CURSE, + MOVE_DEFENSE_CURL, + MOVE_DESTINY_BOND, + MOVE_DETECT, + MOVE_DIVE, + MOVE_DIZZY_PUNCH, + MOVE_DOOM_DESIRE, + MOVE_DOUBLE_KICK, + MOVE_DRAGON_CLAW, + MOVE_DRAGON_DANCE, + MOVE_DRAGON_RAGE, + MOVE_DRAGON_BREATH, + MOVE_DREAM_EATER, + MOVE_DRILL_PECK, + MOVE_DYNAMIC_PUNCH, + MOVE_EGG_BOMB, + MOVE_EMBER, + MOVE_ERUPTION, + MOVE_EXPLOSION, + MOVE_FAINT_ATTACK, + MOVE_FAKE_OUT, + MOVE_FALSE_SWIPE, + MOVE_FEATHER_DANCE, + MOVE_FIRE_BLAST, + MOVE_FIRE_PUNCH, + MOVE_FIRE_SPIN, + MOVE_FLASH, + MOVE_FORESIGHT, + MOVE_FRENZY_PLANT, + MOVE_FRUSTRATION, + MOVE_FURY_ATTACK, + MOVE_FURY_CUTTER, + MOVE_FURY_SWIPES, + MOVE_FUTURE_SIGHT, + MOVE_GLARE, + MOVE_GROWL, + MOVE_GUILLOTINE, + MOVE_HEAT_WAVE, + MOVE_HELPING_HAND, + MOVE_HI_JUMP_KICK, + MOVE_HIDDEN_POWER, + MOVE_HORN_ATTACK, + MOVE_HORN_DRILL, + MOVE_HOWL, + MOVE_HYDRO_CANNON, + MOVE_HYDRO_PUMP, + MOVE_HYPER_BEAM, + MOVE_HYPER_FANG, + MOVE_HYPER_VOICE, + MOVE_ICE_BEAM, + MOVE_ICE_PUNCH, + MOVE_ICICLE_SPEAR, + MOVE_IMPRISON, + MOVE_INGRAIN, + MOVE_IRON_DEFENSE, + MOVE_JUMP_KICK, + MOVE_KNOCK_OFF, + MOVE_LEAF_BLADE, + MOVE_LEECH_SEED, + MOVE_LEER, + MOVE_LIGHT_SCREEN, + MOVE_LOCK_ON, + MOVE_LUSTER_PURGE, + MOVE_MACH_PUNCH, + MOVE_MAGIC_COAT, + MOVE_MAGICAL_LEAF, + MOVE_MAGNITUDE, + MOVE_MEDITATE, + MOVE_MEGA_DRAIN, + MOVE_MEGA_KICK, + MOVE_MEGA_PUNCH, + MOVE_MEGAHORN, + MOVE_METAL_CLAW, + MOVE_METRONOME, + MOVE_MILK_DRINK, + MOVE_MIMIC, + MOVE_MINIMIZE, + MOVE_MIRROR_COAT, + MOVE_MIST_BALL, + MOVE_MOONLIGHT, + MOVE_MUD_SHOT, + MOVE_MUD_SPORT, + MOVE_MUD_SLAP, + MOVE_MUDDY_WATER, + MOVE_NEEDLE_ARM, + MOVE_NIGHT_SHADE, + MOVE_PAY_DAY, + MOVE_PECK, + MOVE_PERISH_SONG, + MOVE_PETAL_DANCE, + MOVE_PIN_MISSILE, + MOVE_POISON_FANG, + MOVE_POISON_GAS, + MOVE_POISON_STING, + MOVE_POISON_TAIL, + MOVE_POISON_POWDER, + MOVE_POUND, + MOVE_PRESENT, + MOVE_PROTECT, + MOVE_QUICK_ATTACK, + MOVE_RAZOR_LEAF, + MOVE_RECYCLE, + MOVE_REFLECT, + MOVE_REFRESH, + MOVE_REST, + MOVE_REVENGE, + MOVE_ROAR, + MOVE_ROCK_BLAST, + MOVE_ROLE_PLAY, + MOVE_ROLLING_KICK, + MOVE_SCRATCH, + MOVE_SECRET_POWER, + MOVE_SEISMIC_TOSS, + MOVE_SHOCK_WAVE, + MOVE_SKULL_BASH, + MOVE_SLACK_OFF, + MOVE_SLAM, + MOVE_SLEEP_POWDER, + MOVE_SLEEP_TALK, + MOVE_SLUDGE, + MOVE_SLUDGE_BOMB, + MOVE_SNATCH, + MOVE_SOFT_BOILED, + MOVE_SPIKE_CANNON, + MOVE_SPIKES, + MOVE_SPIT_UP, + MOVE_SPLASH, + MOVE_STEEL_WING, + MOVE_STOCKPILE, + MOVE_STOMP, + MOVE_STRUGGLE, + MOVE_SUBSTITUTE, + MOVE_SUNNY_DAY, + MOVE_SUPERPOWER, + MOVE_SUPERSONIC, + MOVE_SURF, + MOVE_SWALLOW, + MOVE_SWEET_KISS, + MOVE_SWORDS_DANCE, + MOVE_TACKLE, + MOVE_TAIL_GLOW, + MOVE_TAKE_DOWN, + MOVE_TAUNT, + MOVE_TEETER_DANCE, + MOVE_TELEPORT, + MOVE_THIEF, + MOVE_THUNDER_WAVE, + MOVE_THUNDER_SHOCK, + MOVE_TOXIC, + MOVE_TRANSFORM, + MOVE_TRI_ATTACK, + MOVE_TRICK, + MOVE_TRIPLE_KICK, + MOVE_TWINEEDLE, + MOVE_TWISTER, + MOVE_VICE_GRIP, + MOVE_VINE_WHIP, + MOVE_VOLT_TACKLE, + MOVE_WATER_GUN, + MOVE_WATER_PULSE, + MOVE_WATER_SPORT, + MOVE_WATERFALL, + MOVE_WHIRLWIND, + MOVE_WING_ATTACK, + MOVE_WISH, + MOVE_WRAP, + MOVE_ZAP_CANNON, +}; diff --git a/src/data/easy_chat/easy_chat_group_people.h b/src/data/easy_chat/easy_chat_group_people.h new file mode 100755 index 0000000000..17d2d53393 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_people.h @@ -0,0 +1,453 @@ +const u8 gEasyChatWord_Opponent[] = _("OPPONENT"); +const u8 gEasyChatWord_I[] = _("I"); +const u8 gEasyChatWord_You[] = _("YOU"); +const u8 gEasyChatWord_Yours[] = _("YOURS"); +const u8 gEasyChatWord_Son[] = _("SON"); +const u8 gEasyChatWord_Your[] = _("YOUR"); +const u8 gEasyChatWord_Youre[] = _("YOU'RE"); +const u8 gEasyChatWord_Youve[] = _("YOU'VE"); +const u8 gEasyChatWord_Mother[] = _("MOTHER"); +const u8 gEasyChatWord_Grandfather[] = _("GRANDFATHER"); +const u8 gEasyChatWord_Uncle[] = _("UNCLE"); +const u8 gEasyChatWord_Father[] = _("FATHER"); +const u8 gEasyChatWord_Boy[] = _("BOY"); +const u8 gEasyChatWord_Adult[] = _("ADULT"); +const u8 gEasyChatWord_Brother[] = _("BROTHER"); +const u8 gEasyChatWord_Sister[] = _("SISTER"); +const u8 gEasyChatWord_Grandmother[] = _("GRANDMOTHER"); +const u8 gEasyChatWord_Aunt[] = _("AUNT"); +const u8 gEasyChatWord_Parent[] = _("PARENT"); +const u8 gEasyChatWord_Man[] = _("MAN"); +const u8 gEasyChatWord_Me[] = _("ME"); +const u8 gEasyChatWord_Girl[] = _("GIRL"); +const u8 gEasyChatWord_Babe[] = _("BABE"); +const u8 gEasyChatWord_Family[] = _("FAMILY"); +const u8 gEasyChatWord_Her[] = _("HER"); +const u8 gEasyChatWord_Him[] = _("HIM"); +const u8 gEasyChatWord_He[] = _("HE"); +const u8 gEasyChatWord_Place[] = _("PLACE"); +const u8 gEasyChatWord_Daughter[] = _("DAUGHTER"); +const u8 gEasyChatWord_His[] = _("HIS"); +const u8 gEasyChatWord_Hes[] = _("HE'S"); +const u8 gEasyChatWord_Arent[] = _("AREN'T"); +const u8 gEasyChatWord_Siblings[] = _("SIBLINGS"); +const u8 gEasyChatWord_Kid[] = _("KID"); +const u8 gEasyChatWord_Children[] = _("CHILDREN"); +const u8 gEasyChatWord_Mr[] = _("MR."); +const u8 gEasyChatWord_Mrs[] = _("MRS."); +const u8 gEasyChatWord_Myself[] = _("MYSELF"); +const u8 gEasyChatWord_IWas[] = _("I WAS"); +const u8 gEasyChatWord_ToMe[] = _("TO ME"); +const u8 gEasyChatWord_My[] = _("MY"); +const u8 gEasyChatWord_IAm[] = _("I AM"); +const u8 gEasyChatWord_Ive[] = _("I'VE"); +const u8 gEasyChatWord_Who[] = _("WHO"); +const u8 gEasyChatWord_Someone[] = _("SOMEONE"); +const u8 gEasyChatWord_WhoWas[] = _("WHO WAS"); +const u8 gEasyChatWord_ToWhom[] = _("TO WHOM"); +const u8 gEasyChatWord_Whose[] = _("WHOSE"); +const u8 gEasyChatWord_WhoIs[] = _("WHO IS"); +const u8 gEasyChatWord_Its[] = _("IT'S"); +const u8 gEasyChatWord_Lady[] = _("LADY"); +const u8 gEasyChatWord_Friend[] = _("FRIEND"); +const u8 gEasyChatWord_Ally[] = _("ALLY"); +const u8 gEasyChatWord_Person[] = _("PERSON"); +const u8 gEasyChatWord_Dude[] = _("DUDE"); +const u8 gEasyChatWord_They[] = _("THEY"); +const u8 gEasyChatWord_TheyWere[] = _("THEY WERE"); +const u8 gEasyChatWord_ToThem[] = _("TO THEM"); +const u8 gEasyChatWord_Their[] = _("THEIR"); +const u8 gEasyChatWord_Theyre[] = _("THEY'RE"); +const u8 gEasyChatWord_Theyve[] = _("THEY'VE"); +const u8 gEasyChatWord_We[] = _("WE"); +const u8 gEasyChatWord_Been[] = _("BEEN"); +const u8 gEasyChatWord_ToUs[] = _("TO US"); +const u8 gEasyChatWord_Our[] = _("OUR"); +const u8 gEasyChatWord_WeAre[] = _("WE'RE"); +const u8 gEasyChatWord_Rival[] = _("RIVAL"); +const u8 gEasyChatWord_Weve[] = _("WE'VE"); +const u8 gEasyChatWord_Woman[] = _("WOMAN"); +const u8 gEasyChatWord_She[] = _("SHE"); +const u8 gEasyChatWord_SheWas[] = _("SHE WAS"); +const u8 gEasyChatWord_ToHer[] = _("TO HER"); +const u8 gEasyChatWord_Hers[] = _("HERS"); +const u8 gEasyChatWord_SheIs[] = _("SHE IS"); +const u8 gEasyChatWord_Some[] = _("SOME"); + +const struct EasyChatWordInfo gEasyChatGroup_People[] = { + { + .text = gEasyChatWord_Opponent, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_I, + .alphabeticalOrder = 52, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_You, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Yours, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Son, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Your, + .alphabeticalOrder = 62, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Youre, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Youve, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Mother, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Grandfather, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Uncle, + .alphabeticalOrder = 54, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Father, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Boy, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Adult, + .alphabeticalOrder = 51, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Brother, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sister, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Grandmother, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Aunt, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Parent, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Man, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Me, + .alphabeticalOrder = 72, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Girl, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Babe, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Family, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Her, + .alphabeticalOrder = 41, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Him, + .alphabeticalOrder = 38, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_He, + .alphabeticalOrder = 42, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Place, + .alphabeticalOrder = 49, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Daughter, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_His, + .alphabeticalOrder = 50, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hes, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Arent, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Siblings, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Kid, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Children, + .alphabeticalOrder = 36, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Mr, + .alphabeticalOrder = 40, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Mrs, + .alphabeticalOrder = 37, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Myself, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_IWas, + .alphabeticalOrder = 64, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ToMe, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_My, + .alphabeticalOrder = 53, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_IAm, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ive, + .alphabeticalOrder = 66, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Who, + .alphabeticalOrder = 69, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Someone, + .alphabeticalOrder = 73, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_WhoWas, + .alphabeticalOrder = 70, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ToWhom, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Whose, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_WhoIs, + .alphabeticalOrder = 74, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Its, + .alphabeticalOrder = 44, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lady, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Friend, + .alphabeticalOrder = 58, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ally, + .alphabeticalOrder = 55, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Person, + .alphabeticalOrder = 56, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Dude, + .alphabeticalOrder = 59, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_They, + .alphabeticalOrder = 60, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_TheyWere, + .alphabeticalOrder = 71, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ToThem, + .alphabeticalOrder = 39, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Their, + .alphabeticalOrder = 57, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Theyre, + .alphabeticalOrder = 63, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Theyve, + .alphabeticalOrder = 46, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_We, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Been, + .alphabeticalOrder = 61, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ToUs, + .alphabeticalOrder = 65, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Our, + .alphabeticalOrder = 67, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_WeAre, + .alphabeticalOrder = 43, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Rival, + .alphabeticalOrder = 48, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Weve, + .alphabeticalOrder = 45, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Woman, + .alphabeticalOrder = 47, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_She, + .alphabeticalOrder = 68, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_SheWas, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ToHer, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hers, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_SheIs, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Some, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_pokemon.h b/src/data/easy_chat/easy_chat_group_pokemon.h new file mode 100755 index 0000000000..9993a51446 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_pokemon.h @@ -0,0 +1,206 @@ +#include "constants/species.h" + +const u16 gEasyChatGroup_Pokemon[] = { + SPECIES_ABRA, + SPECIES_ABSOL, + SPECIES_AGGRON, + SPECIES_ALAKAZAM, + SPECIES_ALTARIA, + SPECIES_ANORITH, + SPECIES_ARMALDO, + SPECIES_ARON, + SPECIES_AZUMARILL, + SPECIES_AZURILL, + SPECIES_BAGON, + SPECIES_BALTOY, + SPECIES_BANETTE, + SPECIES_BARBOACH, + SPECIES_BEAUTIFLY, + SPECIES_BELDUM, + SPECIES_BELLOSSOM, + SPECIES_BLAZIKEN, + SPECIES_BRELOOM, + SPECIES_CACNEA, + SPECIES_CACTURNE, + SPECIES_CAMERUPT, + SPECIES_CARVANHA, + SPECIES_CASCOON, + SPECIES_CASTFORM, + SPECIES_CHIMECHO, + SPECIES_CHINCHOU, + SPECIES_CLAMPERL, + SPECIES_CLAYDOL, + SPECIES_COMBUSKEN, + SPECIES_CORPHISH, + SPECIES_CORSOLA, + SPECIES_CRADILY, + SPECIES_CRAWDAUNT, + SPECIES_CROBAT, + SPECIES_DELCATTY, + SPECIES_DEOXYS, + SPECIES_DODRIO, + SPECIES_DODUO, + SPECIES_DONPHAN, + SPECIES_DUSCLOPS, + SPECIES_DUSKULL, + SPECIES_DUSTOX, + SPECIES_ELECTRIKE, + SPECIES_ELECTRODE, + SPECIES_EXPLOUD, + SPECIES_FEEBAS, + SPECIES_FLYGON, + SPECIES_GARDEVOIR, + SPECIES_GEODUDE, + SPECIES_GIRAFARIG, + SPECIES_GLALIE, + SPECIES_GLOOM, + SPECIES_GOLBAT, + SPECIES_GOLDEEN, + SPECIES_GOLDUCK, + SPECIES_GOLEM, + SPECIES_GOREBYSS, + SPECIES_GRAVELER, + SPECIES_GRIMER, + SPECIES_GROUDON, + SPECIES_GROVYLE, + SPECIES_GRUMPIG, + SPECIES_GULPIN, + SPECIES_GYARADOS, + SPECIES_HARIYAMA, + SPECIES_HERACROSS, + SPECIES_HORSEA, + SPECIES_HUNTAIL, + SPECIES_IGGLYBUFF, + SPECIES_ILLUMISE, + SPECIES_JIGGLYPUFF, + SPECIES_JIRACHI, + SPECIES_KADABRA, + SPECIES_KECLEON, + SPECIES_KINGDRA, + SPECIES_KIRLIA, + SPECIES_KOFFING, + SPECIES_KYOGRE, + SPECIES_LAIRON, + SPECIES_LANTURN, + SPECIES_LATIAS, + SPECIES_LATIOS, + SPECIES_LILEEP, + SPECIES_LINOONE, + SPECIES_LOMBRE, + SPECIES_LOTAD, + SPECIES_LOUDRED, + SPECIES_LUDICOLO, + SPECIES_LUNATONE, + SPECIES_LUVDISC, + SPECIES_MACHAMP, + SPECIES_MACHOKE, + SPECIES_MACHOP, + SPECIES_MAGCARGO, + SPECIES_MAGIKARP, + SPECIES_MAGNEMITE, + SPECIES_MAGNETON, + SPECIES_MAKUHITA, + SPECIES_MANECTRIC, + SPECIES_MARILL, + SPECIES_MARSHTOMP, + SPECIES_MASQUERAIN, + SPECIES_MAWILE, + SPECIES_MEDICHAM, + SPECIES_MEDITITE, + SPECIES_METAGROSS, + SPECIES_METANG, + SPECIES_MIGHTYENA, + SPECIES_MILOTIC, + SPECIES_MINUN, + SPECIES_MUDKIP, + SPECIES_MUK, + SPECIES_NATU, + SPECIES_NINCADA, + SPECIES_NINETALES, + SPECIES_NINJASK, + SPECIES_NOSEPASS, + SPECIES_NUMEL, + SPECIES_NUZLEAF, + SPECIES_ODDISH, + SPECIES_PELIPPER, + SPECIES_PHANPY, + SPECIES_PICHU, + SPECIES_PIKACHU, + SPECIES_PINSIR, + SPECIES_PLUSLE, + SPECIES_POOCHYENA, + SPECIES_PSYDUCK, + SPECIES_RAICHU, + SPECIES_RALTS, + SPECIES_RAYQUAZA, + SPECIES_REGICE, + SPECIES_REGIROCK, + SPECIES_REGISTEEL, + SPECIES_RELICANTH, + SPECIES_RHYDON, + SPECIES_RHYHORN, + SPECIES_ROSELIA, + SPECIES_SABLEYE, + SPECIES_SALAMENCE, + SPECIES_SANDSHREW, + SPECIES_SANDSLASH, + SPECIES_SCEPTILE, + SPECIES_SEADRA, + SPECIES_SEAKING, + SPECIES_SEALEO, + SPECIES_SEEDOT, + SPECIES_SEVIPER, + SPECIES_SHARPEDO, + SPECIES_SHEDINJA, + SPECIES_SHELGON, + SPECIES_SHIFTRY, + SPECIES_SHROOMISH, + SPECIES_SHUPPET, + SPECIES_SILCOON, + SPECIES_SKARMORY, + SPECIES_SKITTY, + SPECIES_SLAKING, + SPECIES_SLAKOTH, + SPECIES_SLUGMA, + SPECIES_SNORUNT, + SPECIES_SOLROCK, + SPECIES_SPHEAL, + SPECIES_SPINDA, + SPECIES_SPOINK, + SPECIES_STARMIE, + SPECIES_STARYU, + SPECIES_SURSKIT, + SPECIES_SWABLU, + SPECIES_SWALOT, + SPECIES_SWAMPERT, + SPECIES_SWELLOW, + SPECIES_TAILLOW, + SPECIES_TENTACOOL, + SPECIES_TENTACRUEL, + SPECIES_TORCHIC, + SPECIES_TORKOAL, + SPECIES_TRAPINCH, + SPECIES_TREECKO, + SPECIES_TROPIUS, + SPECIES_VIBRAVA, + SPECIES_VIGOROTH, + SPECIES_VILEPLUME, + SPECIES_VOLBEAT, + SPECIES_VOLTORB, + SPECIES_VULPIX, + SPECIES_WAILMER, + SPECIES_WAILORD, + SPECIES_WALREIN, + SPECIES_WEEZING, + SPECIES_WHISCASH, + SPECIES_WHISMUR, + SPECIES_WIGGLYTUFF, + SPECIES_WINGULL, + SPECIES_WOBBUFFET, + SPECIES_WURMPLE, + SPECIES_WYNAUT, + SPECIES_XATU, + SPECIES_ZANGOOSE, + SPECIES_ZIGZAGOON, + SPECIES_ZUBAT, +}; diff --git a/src/data/easy_chat/easy_chat_group_pokemon2.h b/src/data/easy_chat/easy_chat_group_pokemon2.h new file mode 100755 index 0000000000..35b0a03cbb --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_pokemon2.h @@ -0,0 +1,255 @@ +#include "constants/species.h" + +const u16 gEasyChatGroup_Pokemon2[] = { + SPECIES_ABRA, + SPECIES_AERODACTYL, + SPECIES_AIPOM, + SPECIES_ALAKAZAM, + SPECIES_AMPHAROS, + SPECIES_ARBOK, + SPECIES_ARCANINE, + SPECIES_ARIADOS, + SPECIES_ARTICUNO, + SPECIES_AZUMARILL, + SPECIES_BAYLEEF, + SPECIES_BEEDRILL, + SPECIES_BELLOSSOM, + SPECIES_BELLSPROUT, + SPECIES_BLASTOISE, + SPECIES_BLISSEY, + SPECIES_BULBASAUR, + SPECIES_BUTTERFREE, + SPECIES_CATERPIE, + SPECIES_CELEBI, + SPECIES_CHANSEY, + SPECIES_CHARIZARD, + SPECIES_CHARMANDER, + SPECIES_CHARMELEON, + SPECIES_CHIKORITA, + SPECIES_CHINCHOU, + SPECIES_CLEFABLE, + SPECIES_CLEFAIRY, + SPECIES_CLEFFA, + SPECIES_CLOYSTER, + SPECIES_CORSOLA, + SPECIES_CROBAT, + SPECIES_CROCONAW, + SPECIES_CUBONE, + SPECIES_CYNDAQUIL, + SPECIES_DELIBIRD, + SPECIES_DEWGONG, + SPECIES_DIGLETT, + SPECIES_DITTO, + SPECIES_DODRIO, + SPECIES_DODUO, + SPECIES_DONPHAN, + SPECIES_DRAGONAIR, + SPECIES_DRAGONITE, + SPECIES_DRATINI, + SPECIES_DROWZEE, + SPECIES_DUGTRIO, + SPECIES_DUNSPARCE, + SPECIES_EEVEE, + SPECIES_EKANS, + SPECIES_ELECTABUZZ, + SPECIES_ELECTRODE, + SPECIES_ELEKID, + SPECIES_ENTEI, + SPECIES_ESPEON, + SPECIES_EXEGGCUTE, + SPECIES_EXEGGUTOR, + SPECIES_FARFETCHD, + SPECIES_FEAROW, + SPECIES_FERALIGATR, + SPECIES_FLAAFFY, + SPECIES_FLAREON, + SPECIES_FORRETRESS, + SPECIES_FURRET, + SPECIES_GASTLY, + SPECIES_GENGAR, + SPECIES_GEODUDE, + SPECIES_GIRAFARIG, + SPECIES_GLIGAR, + SPECIES_GLOOM, + SPECIES_GOLBAT, + SPECIES_GOLDEEN, + SPECIES_GOLDUCK, + SPECIES_GOLEM, + SPECIES_GRANBULL, + SPECIES_GRAVELER, + SPECIES_GRIMER, + SPECIES_GROWLITHE, + SPECIES_GYARADOS, + SPECIES_HAUNTER, + SPECIES_HERACROSS, + SPECIES_HITMONCHAN, + SPECIES_HITMONLEE, + SPECIES_HITMONTOP, + SPECIES_HO_OH, + SPECIES_HOOTHOOT, + SPECIES_HOPPIP, + SPECIES_HORSEA, + SPECIES_HOUNDOOM, + SPECIES_HOUNDOUR, + SPECIES_HYPNO, + SPECIES_IGGLYBUFF, + SPECIES_IVYSAUR, + SPECIES_JIGGLYPUFF, + SPECIES_JOLTEON, + SPECIES_JUMPLUFF, + SPECIES_JYNX, + SPECIES_KABUTO, + SPECIES_KABUTOPS, + SPECIES_KADABRA, + SPECIES_KAKUNA, + SPECIES_KANGASKHAN, + SPECIES_KINGDRA, + SPECIES_KINGLER, + SPECIES_KOFFING, + SPECIES_KRABBY, + SPECIES_LANTURN, + SPECIES_LAPRAS, + SPECIES_LARVITAR, + SPECIES_LEDIAN, + SPECIES_LEDYBA, + SPECIES_LICKITUNG, + SPECIES_LUGIA, + SPECIES_MACHAMP, + SPECIES_MACHOKE, + SPECIES_MACHOP, + SPECIES_MAGBY, + SPECIES_MAGCARGO, + SPECIES_MAGIKARP, + SPECIES_MAGMAR, + SPECIES_MAGNEMITE, + SPECIES_MAGNETON, + SPECIES_MANKEY, + SPECIES_MANTINE, + SPECIES_MAREEP, + SPECIES_MARILL, + SPECIES_MAROWAK, + SPECIES_MEGANIUM, + SPECIES_MEOWTH, + SPECIES_METAPOD, + SPECIES_MEW, + SPECIES_MEWTWO, + SPECIES_MILTANK, + SPECIES_MISDREAVUS, + SPECIES_MOLTRES, + SPECIES_MR_MIME, + SPECIES_MUK, + SPECIES_MURKROW, + SPECIES_NATU, + SPECIES_NIDOKING, + SPECIES_NIDOQUEEN, + SPECIES_NIDORAN_F, + SPECIES_NIDORAN_M, + SPECIES_NIDORINA, + SPECIES_NIDORINO, + SPECIES_NINETALES, + SPECIES_NOCTOWL, + SPECIES_OCTILLERY, + SPECIES_ODDISH, + SPECIES_OMANYTE, + SPECIES_OMASTAR, + SPECIES_ONIX, + SPECIES_PARAS, + SPECIES_PARASECT, + SPECIES_PERSIAN, + SPECIES_PHANPY, + SPECIES_PICHU, + SPECIES_PIDGEOT, + SPECIES_PIDGEOTTO, + SPECIES_PIDGEY, + SPECIES_PIKACHU, + SPECIES_PILOSWINE, + SPECIES_PINECO, + SPECIES_PINSIR, + SPECIES_POLITOED, + SPECIES_POLIWAG, + SPECIES_POLIWHIRL, + SPECIES_POLIWRATH, + SPECIES_PONYTA, + SPECIES_PORYGON, + SPECIES_PORYGON2, + SPECIES_PRIMEAPE, + SPECIES_PSYDUCK, + SPECIES_PUPITAR, + SPECIES_QUAGSIRE, + SPECIES_QUILAVA, + SPECIES_QWILFISH, + SPECIES_RAICHU, + SPECIES_RAIKOU, + SPECIES_RAPIDASH, + SPECIES_RATICATE, + SPECIES_RATTATA, + SPECIES_REMORAID, + SPECIES_RHYDON, + SPECIES_RHYHORN, + SPECIES_SANDSHREW, + SPECIES_SANDSLASH, + SPECIES_SCIZOR, + SPECIES_SCYTHER, + SPECIES_SEADRA, + SPECIES_SEAKING, + SPECIES_SEEL, + SPECIES_SENTRET, + SPECIES_SHELLDER, + SPECIES_SHUCKLE, + SPECIES_SKARMORY, + SPECIES_SKIPLOOM, + SPECIES_SLOWBRO, + SPECIES_SLOWKING, + SPECIES_SLOWPOKE, + SPECIES_SLUGMA, + SPECIES_SMEARGLE, + SPECIES_SMOOCHUM, + SPECIES_SNEASEL, + SPECIES_SNORLAX, + SPECIES_SNUBBULL, + SPECIES_SPEAROW, + SPECIES_SPINARAK, + SPECIES_SQUIRTLE, + SPECIES_STANTLER, + SPECIES_STARMIE, + SPECIES_STARYU, + SPECIES_STEELIX, + SPECIES_SUDOWOODO, + SPECIES_SUICUNE, + SPECIES_SUNFLORA, + SPECIES_SUNKERN, + SPECIES_SWINUB, + SPECIES_TANGELA, + SPECIES_TAUROS, + SPECIES_TEDDIURSA, + SPECIES_TENTACOOL, + SPECIES_TENTACRUEL, + SPECIES_TOGEPI, + SPECIES_TOGETIC, + SPECIES_TOTODILE, + SPECIES_TYPHLOSION, + SPECIES_TYRANITAR, + SPECIES_TYROGUE, + SPECIES_UMBREON, + SPECIES_UNOWN, + SPECIES_URSARING, + SPECIES_VAPOREON, + SPECIES_VENOMOTH, + SPECIES_VENONAT, + SPECIES_VENUSAUR, + SPECIES_VICTREEBEL, + SPECIES_VILEPLUME, + SPECIES_VOLTORB, + SPECIES_VULPIX, + SPECIES_WARTORTLE, + SPECIES_WEEDLE, + SPECIES_WEEPINBELL, + SPECIES_WEEZING, + SPECIES_WIGGLYTUFF, + SPECIES_WOBBUFFET, + SPECIES_WOOPER, + SPECIES_XATU, + SPECIES_YANMA, + SPECIES_ZAPDOS, + SPECIES_ZUBAT, +}; diff --git a/src/data/easy_chat/easy_chat_group_speech.h b/src/data/easy_chat/easy_chat_group_speech.h new file mode 100755 index 0000000000..013b454c0b --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_speech.h @@ -0,0 +1,363 @@ +const u8 gEasyChatWord_Listen[] = _("LISTEN"); +const u8 gEasyChatWord_NotVery[] = _("NOT VERY"); +const u8 gEasyChatWord_Mean[] = _("MEAN"); +const u8 gEasyChatWord_Lie[] = _("LIE"); +const u8 gEasyChatWord_Lay[] = _("LAY"); +const u8 gEasyChatWord_Recommend[] = _("RECOMMEND"); +const u8 gEasyChatWord_Nitwit[] = _("NITWIT"); +const u8 gEasyChatWord_Quite[] = _("QUITE"); +const u8 gEasyChatWord_From[] = _("FROM"); +const u8 gEasyChatWord_Feeling[] = _("FEELING"); +const u8 gEasyChatWord_But[] = _("BUT"); +const u8 gEasyChatWord_However[] = _("HOWEVER"); +const u8 gEasyChatWord_Case[] = _("CASE"); +const u8 gEasyChatWord_The[] = _("THE"); +const u8 gEasyChatWord_Miss[] = _("MISS"); +const u8 gEasyChatWord_How[] = _("HOW"); +const u8 gEasyChatWord_Hit[] = _("HIT"); +const u8 gEasyChatWord_Enough[] = _("ENOUGH"); +const u8 gEasyChatWord_ALot[] = _("A LOT"); +const u8 gEasyChatWord_ALittle[] = _("A LITTLE"); +const u8 gEasyChatWord_Absolutely[] = _("ABSOLUTELY"); +const u8 gEasyChatWord_And[] = _("AND"); +const u8 gEasyChatWord_Only[] = _("ONLY"); +const u8 gEasyChatWord_Around[] = _("AROUND"); +const u8 gEasyChatWord_Probably[] = _("PROBABLY"); +const u8 gEasyChatWord_If[] = _("IF"); +const u8 gEasyChatWord_Very[] = _("VERY"); +const u8 gEasyChatWord_ATinyBit[] = _("A TINY BIT"); +const u8 gEasyChatWord_Wild[] = _("WILD"); +const u8 gEasyChatWord_Thats[] = _("THAT'S"); +const u8 gEasyChatWord_Just[] = _("JUST"); +const u8 gEasyChatWord_EvenSo[] = _("EVEN SO,"); +const u8 gEasyChatWord_MustBe[] = _("MUST BE"); +const u8 gEasyChatWord_Naturally[] = _("NATURALLY"); +const u8 gEasyChatWord_ForNow[] = _("FOR NOW,"); +const u8 gEasyChatWord_Understood[] = _("UNDERSTOOD"); +const u8 gEasyChatWord_Joking[] = _("JOKING"); +const u8 gEasyChatWord_Ready[] = _("READY"); +const u8 gEasyChatWord_Something[] = _("SOMETHING"); +const u8 gEasyChatWord_Somehow[] = _("SOMEHOW"); +const u8 gEasyChatWord_Although[] = _("ALTHOUGH"); +const u8 gEasyChatWord_Also[] = _("ALSO"); +const u8 gEasyChatWord_Perfect[] = _("PERFECT"); +const u8 gEasyChatWord_AsMuchAs[] = _("AS MUCH AS"); +const u8 gEasyChatWord_Really[] = _("REALLY"); +const u8 gEasyChatWord_Truly[] = _("TRULY"); +const u8 gEasyChatWord_Seriously[] = _("SERIOUSLY"); +const u8 gEasyChatWord_Totally[] = _("TOTALLY"); +const u8 gEasyChatWord_Until[] = _("UNTIL"); +const u8 gEasyChatWord_AsIf[] = _("AS IF"); +const u8 gEasyChatWord_Mood[] = _("MOOD"); +const u8 gEasyChatWord_Rather[] = _("RATHER"); +const u8 gEasyChatWord_Awfully[] = _("AWFULLY"); +const u8 gEasyChatWord_Mode[] = _("MODE"); +const u8 gEasyChatWord_More[] = _("MORE"); +const u8 gEasyChatWord_TooLate[] = _("TOO LATE"); +const u8 gEasyChatWord_Finally[] = _("FINALLY"); +const u8 gEasyChatWord_Any[] = _("ANY"); +const u8 gEasyChatWord_Instead[] = _("INSTEAD"); +const u8 gEasyChatWord_Fantastic[] = _("FANTASTIC"); + +const struct EasyChatWordInfo gEasyChatGroup_Speech[] = { + { + .text = gEasyChatWord_Listen, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_NotVery, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Mean, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lie, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lay, + .alphabeticalOrder = 41, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Recommend, + .alphabeticalOrder = 40, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Nitwit, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Quite, + .alphabeticalOrder = 57, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_From, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Feeling, + .alphabeticalOrder = 49, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_But, + .alphabeticalOrder = 43, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_However, + .alphabeticalOrder = 52, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Case, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_The, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Miss, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_How, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hit, + .alphabeticalOrder = 59, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Enough, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ALot, + .alphabeticalOrder = 56, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ALittle, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Absolutely, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_And, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Only, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Around, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Probably, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_If, + .alphabeticalOrder = 58, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Very, + .alphabeticalOrder = 36, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ATinyBit, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wild, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Thats, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Just, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_EvenSo, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_MustBe, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Naturally, + .alphabeticalOrder = 53, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ForNow, + .alphabeticalOrder = 50, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Understood, + .alphabeticalOrder = 54, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Joking, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ready, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Something, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Somehow, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Although, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Also, + .alphabeticalOrder = 42, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Perfect, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_AsMuchAs, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Really, + .alphabeticalOrder = 51, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Truly, + .alphabeticalOrder = 37, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Seriously, + .alphabeticalOrder = 44, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Totally, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Until, + .alphabeticalOrder = 46, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_AsIf, + .alphabeticalOrder = 39, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Mood, + .alphabeticalOrder = 38, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Rather, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Awfully, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Mode, + .alphabeticalOrder = 55, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_More, + .alphabeticalOrder = 47, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_TooLate, + .alphabeticalOrder = 45, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Finally, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Any, + .alphabeticalOrder = 48, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Instead, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Fantastic, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_status.h b/src/data/easy_chat/easy_chat_group_status.h new file mode 100755 index 0000000000..d4958c3ad7 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_status.h @@ -0,0 +1,657 @@ +const u8 gEasyChatWord_Dark[] = _("DARK"); +const u8 gEasyChatWord_Stench[] = _("STENCH"); +const u8 gEasyChatWord_ThickFat[] = _("THICK FAT"); +const u8 gEasyChatWord_RainDish[] = _("RAIN DISH"); +const u8 gEasyChatWord_Drizzle[] = _("DRIZZLE"); +const u8 gEasyChatWord_ArenaTrap[] = _("ARENA TRAP"); +const u8 gEasyChatWord_Intimidate[] = _("INTIMIDATE"); +const u8 gEasyChatWord_RockHead[] = _("ROCK HEAD"); +const u8 gEasyChatWord_Color[] = _("COLOR"); +const u8 gEasyChatWord_AltColor[] = _("ALT. COLOR"); +const u8 gEasyChatWord_Rock[] = _("ROCK"); +const u8 gEasyChatWord_Beautiful[] = _("BEAUTIFUL"); +const u8 gEasyChatWord_Beauty[] = _("BEAUTY"); +const u8 gEasyChatWord_AirLock[] = _("AIR LOCK"); +const u8 gEasyChatWord_Psychic[] = _("PSYCHIC"); +const u8 gEasyChatWord_HyperCutter[] = _("HYPER CUTTER"); +const u8 gEasyChatWord_Fighting[] = _("FIGHTING"); +const u8 gEasyChatWord_ShadowTag[] = _("SHADOW TAG"); +const u8 gEasyChatWord_Smart[] = _("SMART"); +const u8 gEasyChatWord_Smartness[] = _("SMARTNESS"); +const u8 gEasyChatWord_SpeedBoost[] = _("SPEED BOOST"); +const u8 gEasyChatWord_Cool[] = _("COOL"); +const u8 gEasyChatWord_Coolness[] = _("COOLNESS"); +const u8 gEasyChatWord_BattleArmor[] = _("BATTLE ARMOR"); +const u8 gEasyChatWord_Cute[] = _("CUTE"); +const u8 gEasyChatWord_Cuteness[] = _("CUTENESS"); +const u8 gEasyChatWord_Sturdy[] = _("STURDY"); +const u8 gEasyChatWord_SuctionCups[] = _("SUCTION CUPS"); +const u8 gEasyChatWord_Grass[] = _("GRASS"); +const u8 gEasyChatWord_ClearBody[] = _("CLEAR BODY"); +const u8 gEasyChatWord_Torrent[] = _("TORRENT"); +const u8 gEasyChatWord_Ghost[] = _("GHOST"); +const u8 gEasyChatWord_Ice[] = _("ICE"); +const u8 gEasyChatWord_Guts[] = _("GUTS"); +const u8 gEasyChatWord_RoughSkin[] = _("ROUGH SKIN"); +const u8 gEasyChatWord_ShellArmor[] = _("SHELL ARMOR"); +const u8 gEasyChatWord_NaturalCure[] = _("NATURAL CURE"); +const u8 gEasyChatWord_Damp[] = _("DAMP"); +const u8 gEasyChatWord_Ground[] = _("GROUND"); +const u8 gEasyChatWord_Limber[] = _("LIMBER"); +const u8 gEasyChatWord_MagnetPull[] = _("MAGNET PULL"); +const u8 gEasyChatWord_WhiteSmoke[] = _("WHITE SMOKE"); +const u8 gEasyChatWord_Synchronize[] = _("SYNCHRONIZE"); +const u8 gEasyChatWord_Overgrow[] = _("OVERGROW"); +const u8 gEasyChatWord_SwiftSwim[] = _("SWIFT SWIM"); +const u8 gEasyChatWord_SandStream[] = _("SAND STREAM"); +const u8 gEasyChatWord_SandVeil[] = _("SAND VEIL"); +const u8 gEasyChatWord_KeenEye[] = _("KEEN EYE"); +const u8 gEasyChatWord_InnerFocus[] = _("INNER FOCUS"); +const u8 gEasyChatWord_Static[] = _("STATIC"); +const u8 gEasyChatWord_Type[] = _("TYPE"); +const u8 gEasyChatWord_Tough[] = _("TOUGH"); +const u8 gEasyChatWord_Toughness[] = _("TOUGHNESS"); +const u8 gEasyChatWord_ShedSkin[] = _("SHED SKIN"); +const u8 gEasyChatWord_HugePower[] = _("HUGE POWER"); +const u8 gEasyChatWord_VoltAbsorb[] = _("VOLT ABSORB"); +const u8 gEasyChatWord_WaterAbsorb[] = _("WATER ABSORB"); +const u8 gEasyChatWord_Electric[] = _("ELECTRIC"); +const u8 gEasyChatWord_Forecast[] = _("FORECAST"); +const u8 gEasyChatWord_SereneGrace[] = _("SERENE GRACE"); +const u8 gEasyChatWord_Poison[] = _("POISON"); +const u8 gEasyChatWord_PoisonPoint[] = _("POISON POINT"); +const u8 gEasyChatWord_Dragon[] = _("DRAGON"); +const u8 gEasyChatWord_Trace[] = _("TRACE"); +const u8 gEasyChatWord_Oblivious[] = _("OBLIVIOUS"); +const u8 gEasyChatWord_Truant[] = _("TRUANT"); +const u8 gEasyChatWord_RunAway[] = _("RUN AWAY"); +const u8 gEasyChatWord_StickyHold[] = _("STICKY HOLD"); +const u8 gEasyChatWord_CloudNine[] = _("CLOUD NINE"); +const u8 gEasyChatWord_Normal[] = _("NORMAL"); +const u8 gEasyChatWord_Steel[] = _("STEEL"); +const u8 gEasyChatWord_Illuminate[] = _("ILLUMINATE"); +const u8 gEasyChatWord_EarlyBird[] = _("EARLY BIRD"); +const u8 gEasyChatWord_Hustle[] = _("HUSTLE"); +const u8 gEasyChatWord_Shine[] = _("SHINE"); +const u8 gEasyChatWord_Flying[] = _("FLYING"); +const u8 gEasyChatWord_Drought[] = _("DROUGHT"); +const u8 gEasyChatWord_Lightningrod[] = _("LIGHTNINGROD"); +const u8 gEasyChatWord_Compoundeyes[] = _("COMPOUNDEYES"); +const u8 gEasyChatWord_MarvelScale[] = _("MARVEL SCALE"); +const u8 gEasyChatWord_WonderGuard[] = _("WONDER GUARD"); +const u8 gEasyChatWord_Insomnia[] = _("INSOMNIA"); +const u8 gEasyChatWord_Levitate[] = _("LEVITATE"); +const u8 gEasyChatWord_Plus[] = _("PLUS"); +const u8 gEasyChatWord_Pressure[] = _("PRESSURE"); +const u8 gEasyChatWord_LiquidOoze[] = _("LIQUID OOZE"); +const u8 gEasyChatWord_ColorChange[] = _("COLOR CHANGE"); +const u8 gEasyChatWord_Soundproof[] = _("SOUNDPROOF"); +const u8 gEasyChatWord_EffectSpore[] = _("EFFECT SPORE"); +const u8 gEasyChatWord_Pkrs[] = _("{PK}RS"); +const u8 gEasyChatWord_Fire[] = _("FIRE"); +const u8 gEasyChatWord_FlameBody[] = _("FLAME BODY"); +const u8 gEasyChatWord_Minus[] = _("MINUS"); +const u8 gEasyChatWord_OwnTempo[] = _("OWN TEMPO"); +const u8 gEasyChatWord_MagmaArmor[] = _("MAGMA ARMOR"); +const u8 gEasyChatWord_Water[] = _("WATER"); +const u8 gEasyChatWord_WaterVeil[] = _("WATER VEIL"); +const u8 gEasyChatWord_Bug[] = _("BUG"); +const u8 gEasyChatWord_Swarm[] = _("SWARM"); +const u8 gEasyChatWord_CuteCharm[] = _("CUTE CHARM"); +const u8 gEasyChatWord_Immunity[] = _("IMMUNITY"); +const u8 gEasyChatWord_Blaze[] = _("BLAZE"); +const u8 gEasyChatWord_Pickup[] = _("PICKUP"); +const u8 gEasyChatWord_Pattern[] = _("PATTERN"); +const u8 gEasyChatWord_FlashFire[] = _("FLASH FIRE"); +const u8 gEasyChatWord_VitalSpirit[] = _("VITAL SPIRIT"); +const u8 gEasyChatWord_Chlorophyll[] = _("CHLOROPHYLL"); +const u8 gEasyChatWord_PurePower[] = _("PURE POWER"); +const u8 gEasyChatWord_ShieldDust[] = _("SHIELD DUST"); + +const struct EasyChatWordInfo gEasyChatGroup_Status[] = { + { + .text = gEasyChatWord_Dark, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Stench, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ThickFat, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_RainDish, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Drizzle, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ArenaTrap, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Intimidate, + .alphabeticalOrder = 101, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_RockHead, + .alphabeticalOrder = 97, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Color, + .alphabeticalOrder = 106, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_AltColor, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Rock, + .alphabeticalOrder = 68, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Beautiful, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Beauty, + .alphabeticalOrder = 86, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_AirLock, + .alphabeticalOrder = 78, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Psychic, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_HyperCutter, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Fighting, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ShadowTag, + .alphabeticalOrder = 99, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Smart, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Smartness, + .alphabeticalOrder = 37, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_SpeedBoost, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Cool, + .alphabeticalOrder = 62, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Coolness, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_BattleArmor, + .alphabeticalOrder = 76, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Cute, + .alphabeticalOrder = 72, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Cuteness, + .alphabeticalOrder = 88, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sturdy, + .alphabeticalOrder = 57, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_SuctionCups, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Grass, + .alphabeticalOrder = 90, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ClearBody, + .alphabeticalOrder = 91, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Torrent, + .alphabeticalOrder = 104, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ghost, + .alphabeticalOrder = 75, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ice, + .alphabeticalOrder = 58, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Guts, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_RoughSkin, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ShellArmor, + .alphabeticalOrder = 38, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_NaturalCure, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Damp, + .alphabeticalOrder = 54, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ground, + .alphabeticalOrder = 73, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Limber, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_MagnetPull, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_WhiteSmoke, + .alphabeticalOrder = 71, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Synchronize, + .alphabeticalOrder = 100, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Overgrow, + .alphabeticalOrder = 48, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_SwiftSwim, + .alphabeticalOrder = 81, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_SandStream, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_SandVeil, + .alphabeticalOrder = 47, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_KeenEye, + .alphabeticalOrder = 82, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_InnerFocus, + .alphabeticalOrder = 77, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Static, + .alphabeticalOrder = 39, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Type, + .alphabeticalOrder = 85, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Tough, + .alphabeticalOrder = 94, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Toughness, + .alphabeticalOrder = 40, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ShedSkin, + .alphabeticalOrder = 79, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_HugePower, + .alphabeticalOrder = 92, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_VoltAbsorb, + .alphabeticalOrder = 36, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_WaterAbsorb, + .alphabeticalOrder = 69, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Electric, + .alphabeticalOrder = 64, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Forecast, + .alphabeticalOrder = 43, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_SereneGrace, + .alphabeticalOrder = 93, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Poison, + .alphabeticalOrder = 103, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_PoisonPoint, + .alphabeticalOrder = 102, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Dragon, + .alphabeticalOrder = 89, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Trace, + .alphabeticalOrder = 83, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Oblivious, + .alphabeticalOrder = 60, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Truant, + .alphabeticalOrder = 61, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_RunAway, + .alphabeticalOrder = 84, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_StickyHold, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_CloudNine, + .alphabeticalOrder = 107, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Normal, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Steel, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Illuminate, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_EarlyBird, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hustle, + .alphabeticalOrder = 66, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Shine, + .alphabeticalOrder = 45, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Flying, + .alphabeticalOrder = 46, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Drought, + .alphabeticalOrder = 59, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lightningrod, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Compoundeyes, + .alphabeticalOrder = 53, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_MarvelScale, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_WonderGuard, + .alphabeticalOrder = 108, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Insomnia, + .alphabeticalOrder = 74, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Levitate, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Plus, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Pressure, + .alphabeticalOrder = 87, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_LiquidOoze, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ColorChange, + .alphabeticalOrder = 49, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Soundproof, + .alphabeticalOrder = 70, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_EffectSpore, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Pkrs, + .alphabeticalOrder = 67, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Fire, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_FlameBody, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Minus, + .alphabeticalOrder = 98, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_OwnTempo, + .alphabeticalOrder = 44, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_MagmaArmor, + .alphabeticalOrder = 42, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Water, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_WaterVeil, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Bug, + .alphabeticalOrder = 51, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Swarm, + .alphabeticalOrder = 52, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_CuteCharm, + .alphabeticalOrder = 63, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Immunity, + .alphabeticalOrder = 65, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Blaze, + .alphabeticalOrder = 50, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Pickup, + .alphabeticalOrder = 105, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Pattern, + .alphabeticalOrder = 55, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_FlashFire, + .alphabeticalOrder = 95, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_VitalSpirit, + .alphabeticalOrder = 56, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Chlorophyll, + .alphabeticalOrder = 96, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_PurePower, + .alphabeticalOrder = 41, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ShieldDust, + .alphabeticalOrder = 80, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_time.h b/src/data/easy_chat/easy_chat_group_time.h new file mode 100755 index 0000000000..691dde70c0 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_time.h @@ -0,0 +1,273 @@ +const u8 gEasyChatWord_Fall[] = _("FALL"); +const u8 gEasyChatWord_Morning[] = _("MORNING"); +const u8 gEasyChatWord_Tomorrow[] = _("TOMORROW"); +const u8 gEasyChatWord_Last[] = _("LAST"); +const u8 gEasyChatWord_Day[] = _("DAY"); +const u8 gEasyChatWord_Sometime[] = _("SOMETIME"); +const u8 gEasyChatWord_Always[] = _("ALWAYS"); +const u8 gEasyChatWord_Current[] = _("CURRENT"); +const u8 gEasyChatWord_Forever[] = _("FOREVER"); +const u8 gEasyChatWord_Days[] = _("DAYS"); +const u8 gEasyChatWord_End[] = _("END"); +const u8 gEasyChatWord_Tuesday[] = _("TUESDAY"); +const u8 gEasyChatWord_Yesterday[] = _("YESTERDAY"); +const u8 gEasyChatWord_Today[] = _("TODAY"); +const u8 gEasyChatWord_Friday[] = _("FRIDAY"); +const u8 gEasyChatWord_Monday[] = _("MONDAY"); +const u8 gEasyChatWord_Later[] = _("LATER"); +const u8 gEasyChatWord_Earlier[] = _("EARLIER"); +const u8 gEasyChatWord_Another[] = _("ANOTHER"); +const u8 gEasyChatWord_Time[] = _("TIME"); +const u8 gEasyChatWord_Finish[] = _("FINISH"); +const u8 gEasyChatWord_Wednesday[] = _("WEDNESDAY"); +const u8 gEasyChatWord_Soon[] = _("SOON"); +const u8 gEasyChatWord_Start[] = _("START"); +const u8 gEasyChatWord_Month[] = _("MONTH"); +const u8 gEasyChatWord_Stop[] = _("STOP"); +const u8 gEasyChatWord_Now[] = _("NOW"); +const u8 gEasyChatWord_Final[] = _("FINAL"); +const u8 gEasyChatWord_Next[] = _("NEXT"); +const u8 gEasyChatWord_Age[] = _("AGE"); +const u8 gEasyChatWord_Saturday[] = _("SATURDAY"); +const u8 gEasyChatWord_Summer[] = _("SUMMER"); +const u8 gEasyChatWord_Sunday[] = _("SUNDAY"); +const u8 gEasyChatWord_Beginning[] = _("BEGINNING"); +const u8 gEasyChatWord_Spring[] = _("SPRING"); +const u8 gEasyChatWord_Daytime[] = _("DAYTIME"); +const u8 gEasyChatWord_Winter[] = _("WINTER"); +const u8 gEasyChatWord_Daily[] = _("DAILY"); +const u8 gEasyChatWord_Olden[] = _("OLDEN"); +const u8 gEasyChatWord_Almost[] = _("ALMOST"); +const u8 gEasyChatWord_Nearly[] = _("NEARLY"); +const u8 gEasyChatWord_Thursday[] = _("THURSDAY"); +const u8 gEasyChatWord_Nighttime[] = _("NIGHTTIME"); +const u8 gEasyChatWord_Night[] = _("NIGHT"); +const u8 gEasyChatWord_Week[] = _("WEEK"); + +const struct EasyChatWordInfo gEasyChatGroup_Time[] = { + { + .text = gEasyChatWord_Fall, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Morning, + .alphabeticalOrder = 39, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Tomorrow, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Last, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Day, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sometime, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Always, + .alphabeticalOrder = 37, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Current, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Forever, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Days, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_End, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Tuesday, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Yesterday, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Today, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Friday, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Monday, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Later, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Earlier, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Another, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Time, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Finish, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wednesday, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Soon, + .alphabeticalOrder = 40, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Start, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Month, + .alphabeticalOrder = 43, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Stop, + .alphabeticalOrder = 42, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Now, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Final, + .alphabeticalOrder = 38, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Next, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Age, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Saturday, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Summer, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sunday, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Beginning, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Spring, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Daytime, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Winter, + .alphabeticalOrder = 41, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Daily, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Olden, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Almost, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Nearly, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Thursday, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Nighttime, + .alphabeticalOrder = 44, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Night, + .alphabeticalOrder = 36, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Week, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_trainer.h b/src/data/easy_chat/easy_chat_group_trainer.h new file mode 100755 index 0000000000..a4e1ddfd6b --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_trainer.h @@ -0,0 +1,165 @@ +const u8 gEasyChatWord_IChooseYou[] = _("I CHOOSE YOU"); +const u8 gEasyChatWord_Gotcha[] = _("GOTCHA"); +const u8 gEasyChatWord_Trade[] = _("TRADE"); +const u8 gEasyChatWord_Sapphire[] = _("SAPPHIRE"); +const u8 gEasyChatWord_Evolve[] = _("EVOLVE"); +const u8 gEasyChatWord_Encyclopedia[] = _("ENCYCLOPEDIA"); +const u8 gEasyChatWord_Nature[] = _("NATURE"); +const u8 gEasyChatWord_Center[] = _("CENTER"); +const u8 gEasyChatWord_Egg[] = _("EGG"); +const u8 gEasyChatWord_Link[] = _("LINK"); +const u8 gEasyChatWord_SpAbility[] = _("SP. ABILITY"); +const u8 gEasyChatWord_Trainer[] = _("TRAINER"); +const u8 gEasyChatWord_Version[] = _("VERSION"); +const u8 gEasyChatWord_Pokenav[] = _("POKéNAV"); +const u8 gEasyChatWord_Pokemon[] = _("POKéMON"); +const u8 gEasyChatWord_Get[] = _("GET"); +const u8 gEasyChatWord_Pokedex[] = _("POKéDEX"); +const u8 gEasyChatWord_Ruby[] = _("RUBY"); +const u8 gEasyChatWord_Level[] = _("LEVEL"); +const u8 gEasyChatWord_Red[] = _("RED"); +const u8 gEasyChatWord_Green[] = _("GREEN"); +const u8 gEasyChatWord_Bag[] = _("BAG"); +const u8 gEasyChatWord_Flame[] = _("FLAME"); +const u8 gEasyChatWord_Gold[] = _("GOLD"); +const u8 gEasyChatWord_Leaf[] = _("LEAF"); +const u8 gEasyChatWord_Silver[] = _("SILVER"); +const u8 gEasyChatWord_Emerald[] = _("EMERALD"); + +const struct EasyChatWordInfo gEasyChatGroup_Trainer[] = { + { + .text = gEasyChatWord_IChooseYou, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Gotcha, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Trade, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sapphire, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Evolve, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Encyclopedia, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Nature, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Center, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Egg, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Link, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_SpAbility, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Trainer, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Version, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Pokenav, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Pokemon, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Get, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Pokedex, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ruby, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Level, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Red, + .alphabeticalOrder = 19, + .enabled = FALSE, + }, + { + .text = gEasyChatWord_Green, + .alphabeticalOrder = 17, + .enabled = FALSE, + }, + { + .text = gEasyChatWord_Bag, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Flame, + .alphabeticalOrder = 25, + .enabled = FALSE, + }, + { + .text = gEasyChatWord_Gold, + .alphabeticalOrder = 10, + .enabled = FALSE, + }, + { + .text = gEasyChatWord_Leaf, + .alphabeticalOrder = 2, + .enabled = FALSE, + }, + { + .text = gEasyChatWord_Silver, + .alphabeticalOrder = 11, + .enabled = FALSE, + }, + { + .text = gEasyChatWord_Emerald, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_trendy_saying.h b/src/data/easy_chat/easy_chat_group_trendy_saying.h new file mode 100755 index 0000000000..46ce1201ae --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_trendy_saying.h @@ -0,0 +1,201 @@ +const u8 gEasyChatWord_KthxBye[] = _("KTHX, BYE."); +const u8 gEasyChatWord_YesSirExcl[] = _("YES, SIR!"); +const u8 gEasyChatWord_AvantGarde[] = _("AVANT GARDE"); +const u8 gEasyChatWord_Couple[] = _("COUPLE"); +const u8 gEasyChatWord_MuchObliged[] = _("MUCH OBLIGED"); +const u8 gEasyChatWord_YeehawExcl[] = _("YEEHAW!"); +const u8 gEasyChatWord_Mega[] = _("MEGA"); +const u8 gEasyChatWord_1HitKOExcl[] = _("1-HIT KO!"); +const u8 gEasyChatWord_Destiny[] = _("DESTINY"); +const u8 gEasyChatWord_Cancel[] = _("CANCEL"); +const u8 gEasyChatWord_New[] = _("NEW"); +const u8 gEasyChatWord_Flatten[] = _("FLATTEN"); +const u8 gEasyChatWord_Kidding[] = _("KIDDING"); +const u8 gEasyChatWord_Loser[] = _("LOSER"); +const u8 gEasyChatWord_Losing[] = _("LOSING"); +const u8 gEasyChatWord_Happening[] = _("HAPPENING"); +const u8 gEasyChatWord_HipAnd[] = _("HIP AND"); +const u8 gEasyChatWord_Shake[] = _("SHAKE"); +const u8 gEasyChatWord_Shady[] = _("SHADY"); +const u8 gEasyChatWord_Upbeat[] = _("UPBEAT"); +const u8 gEasyChatWord_Modern[] = _("MODERN"); +const u8 gEasyChatWord_SmellYa[] = _("SMELL YA"); +const u8 gEasyChatWord_Bang[] = _("BANG"); +const u8 gEasyChatWord_Knockout[] = _("KNOCKOUT"); +const u8 gEasyChatWord_Hassle[] = _("HASSLE"); +const u8 gEasyChatWord_Winner[] = _("WINNER"); +const u8 gEasyChatWord_Fever[] = _("FEVER"); +const u8 gEasyChatWord_Wannabe[] = _("WANNABE"); +const u8 gEasyChatWord_Baby[] = _("BABY"); +const u8 gEasyChatWord_Heart[] = _("HEART"); +const u8 gEasyChatWord_Old[] = _("OLD"); +const u8 gEasyChatWord_Young[] = _("YOUNG"); +const u8 gEasyChatWord_Ugly[] = _("UGLY"); + +const struct EasyChatWordInfo gEasyChatGroup_TrendySaying[] = { + { + .text = gEasyChatWord_KthxBye, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_YesSirExcl, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_AvantGarde, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Couple, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_MuchObliged, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_YeehawExcl, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Mega, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_1HitKOExcl, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Destiny, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Cancel, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_New, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Flatten, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Kidding, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Loser, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Losing, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Happening, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_HipAnd, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Shake, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Shady, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Upbeat, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Modern, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_SmellYa, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Bang, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Knockout, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hassle, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Winner, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Fever, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wannabe, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Baby, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Heart, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Old, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Young, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ugly, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_voices.h b/src/data/easy_chat/easy_chat_group_voices.h new file mode 100755 index 0000000000..6dad874ec3 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_voices.h @@ -0,0 +1,381 @@ +const u8 gEasyChatWord_Excl[] = _("!"); +const u8 gEasyChatWord_ExclExcl[] = _("!!"); +const u8 gEasyChatWord_QuesExcl[] = _("?!"); +const u8 gEasyChatWord_Ques[] = _("?"); +const u8 gEasyChatWord_Ellipsis[] = _("…"); +const u8 gEasyChatWord_EllipsisExcl[] = _("…!"); +const u8 gEasyChatWord_EllipsisEllipsisEllipsis[] = _("………"); +const u8 gEasyChatWord_Dash[] = _("-"); +const u8 gEasyChatWord_DashDashDash[] = _("- - -"); +const u8 gEasyChatWord_UhOh[] = _("UH-OH"); +const u8 gEasyChatWord_Waaah[] = _("WAAAH"); +const u8 gEasyChatWord_Ahaha[] = _("AHAHA"); +const u8 gEasyChatWord_OhQues[] = _("OH?"); +const u8 gEasyChatWord_Nope[] = _("NOPE"); +const u8 gEasyChatWord_Urgh[] = _("URGH"); +const u8 gEasyChatWord_Hmm[] = _("HMM"); +const u8 gEasyChatWord_Whoah[] = _("WHOAH"); +const u8 gEasyChatWord_WroooaarExcl[] = _("WROOOAAR!"); +const u8 gEasyChatWord_Wow[] = _("WOW"); +const u8 gEasyChatWord_Giggle[] = _("GIGGLE"); +const u8 gEasyChatWord_Sigh[] = _("SIGH"); +const u8 gEasyChatWord_Unbelievable[] = _("UNBELIEVABLE"); +const u8 gEasyChatWord_Cries[] = _("CRIES"); +const u8 gEasyChatWord_Agree[] = _("AGREE"); +const u8 gEasyChatWord_EhQues[] = _("EH?"); +const u8 gEasyChatWord_Cry[] = _("CRY"); +const u8 gEasyChatWord_Ehehe[] = _("EHEHE"); +const u8 gEasyChatWord_OiOiOi[] = _("OI, OI, OI"); +const u8 gEasyChatWord_OhYeah[] = _("OH, YEAH"); +const u8 gEasyChatWord_Oh[] = _("OH"); +const u8 gEasyChatWord_Oops[] = _("OOPS"); +const u8 gEasyChatWord_Shocked[] = _("SHOCKED"); +const u8 gEasyChatWord_Eek[] = _("EEK"); +const u8 gEasyChatWord_Graaah[] = _("GRAAAH"); +const u8 gEasyChatWord_Gwahahaha[] = _("GWAHAHAHA"); +const u8 gEasyChatWord_Way[] = _("WAY"); +const u8 gEasyChatWord_Tch[] = _("TCH"); +const u8 gEasyChatWord_Hehe[] = _("HEHE"); +const u8 gEasyChatWord_Hah[] = _("HAH"); +const u8 gEasyChatWord_Yup[] = _("YUP"); +const u8 gEasyChatWord_Hahaha[] = _("HAHAHA"); +const u8 gEasyChatWord_Aiyeeh[] = _("AIYEEH"); +const u8 gEasyChatWord_Hiyah[] = _("HIYAH"); +const u8 gEasyChatWord_Fufufu[] = _("FUFUFU"); +const u8 gEasyChatWord_Lol[] = _("LOL"); +const u8 gEasyChatWord_Snort[] = _("SNORT"); +const u8 gEasyChatWord_Humph[] = _("HUMPH"); +const u8 gEasyChatWord_Hehehe[] = _("HEHEHE"); +const u8 gEasyChatWord_Heh[] = _("HEH"); +const u8 gEasyChatWord_Hohoho[] = _("HOHOHO"); +const u8 gEasyChatWord_UhHuh[] = _("UH-HUH"); +const u8 gEasyChatWord_OhDear[] = _("OH, DEAR"); +const u8 gEasyChatWord_Arrgh[] = _("ARRGH"); +const u8 gEasyChatWord_Mufufu[] = _("MUFUFU"); +const u8 gEasyChatWord_Mmm[] = _("MMM"); +const u8 gEasyChatWord_OhKay[] = _("OH-KAY"); +const u8 gEasyChatWord_Okay[] = _("OKAY"); +const u8 gEasyChatWord_Lalala[] = _("LALALA"); +const u8 gEasyChatWord_Yay[] = _("YAY"); +const u8 gEasyChatWord_Aww[] = _("AWW"); +const u8 gEasyChatWord_Wowee[] = _("WOWEE"); +const u8 gEasyChatWord_Gwah[] = _("GWAH"); +const u8 gEasyChatWord_Wahahaha[] = _("WAHAHAHA"); + +const struct EasyChatWordInfo gEasyChatGroup_Voices[] = { + { + .text = gEasyChatWord_Excl, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ExclExcl, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_QuesExcl, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ques, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ellipsis, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_EllipsisExcl, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_EllipsisEllipsisEllipsis, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Dash, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_DashDashDash, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_UhOh, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Waaah, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ahaha, + .alphabeticalOrder = 41, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_OhQues, + .alphabeticalOrder = 52, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Nope, + .alphabeticalOrder = 59, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Urgh, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hmm, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Whoah, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_WroooaarExcl, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wow, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Giggle, + .alphabeticalOrder = 43, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sigh, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Unbelievable, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Cries, + .alphabeticalOrder = 61, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Agree, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_EhQues, + .alphabeticalOrder = 38, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Cry, + .alphabeticalOrder = 40, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ehehe, + .alphabeticalOrder = 48, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_OiOiOi, + .alphabeticalOrder = 37, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_OhYeah, + .alphabeticalOrder = 47, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Oh, + .alphabeticalOrder = 42, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Oops, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Shocked, + .alphabeticalOrder = 49, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Eek, + .alphabeticalOrder = 46, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Graaah, + .alphabeticalOrder = 57, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Gwahahaha, + .alphabeticalOrder = 44, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Way, + .alphabeticalOrder = 54, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Tch, + .alphabeticalOrder = 53, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hehe, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hah, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Yup, + .alphabeticalOrder = 51, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hahaha, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Aiyeeh, + .alphabeticalOrder = 55, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hiyah, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Fufufu, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lol, + .alphabeticalOrder = 56, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Snort, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Humph, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hehehe, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Heh, + .alphabeticalOrder = 45, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hohoho, + .alphabeticalOrder = 36, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_UhHuh, + .alphabeticalOrder = 50, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_OhDear, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Arrgh, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Mufufu, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Mmm, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_OhKay, + .alphabeticalOrder = 62, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Okay, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lalala, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Yay, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Aww, + .alphabeticalOrder = 60, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wowee, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Gwah, + .alphabeticalOrder = 58, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wahahaha, + .alphabeticalOrder = 39, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_groups.h b/src/data/easy_chat/easy_chat_groups.h new file mode 100755 index 0000000000..df114d9803 --- /dev/null +++ b/src/data/easy_chat/easy_chat_groups.h @@ -0,0 +1,137 @@ +#include "easy_chat.h" + +#include "easy_chat_group_pokemon.h" +#include "easy_chat_group_trainer.h" +#include "easy_chat_group_status.h" +#include "easy_chat_group_battle.h" +#include "easy_chat_group_greetings.h" +#include "easy_chat_group_people.h" +#include "easy_chat_group_voices.h" +#include "easy_chat_group_speech.h" +#include "easy_chat_group_endings.h" +#include "easy_chat_group_feelings.h" +#include "easy_chat_group_conditions.h" +#include "easy_chat_group_actions.h" +#include "easy_chat_group_lifestyle.h" +#include "easy_chat_group_hobbies.h" +#include "easy_chat_group_time.h" +#include "easy_chat_group_misc.h" +#include "easy_chat_group_adjectives.h" +#include "easy_chat_group_events.h" +#include "easy_chat_group_move_1.h" +#include "easy_chat_group_move_2.h" +#include "easy_chat_group_trendy_saying.h" +#include "easy_chat_group_pokemon2.h" + +const struct EasyChatGroup gEasyChatGroups[] = { + { + .wordData = {.valueList = gEasyChatGroup_Pokemon}, + .numWords = 202, + .numEnabledWords = 202, + }, + { + .wordData = {.words = gEasyChatGroup_Trainer}, + .numWords = 27, + .numEnabledWords = 21, + }, + { + .wordData = {.words = gEasyChatGroup_Status}, + .numWords = 109, + .numEnabledWords = 109, + }, + { + .wordData = {.words = gEasyChatGroup_Battle}, + .numWords = 63, + .numEnabledWords = 63, + }, + { + .wordData = {.words = gEasyChatGroup_Greetings}, + .numWords = 42, + .numEnabledWords = 42, + }, + { + .wordData = {.words = gEasyChatGroup_People}, + .numWords = 75, + .numEnabledWords = 75, + }, + { + .wordData = {.words = gEasyChatGroup_Voices}, + .numWords = 63, + .numEnabledWords = 63, + }, + { + .wordData = {.words = gEasyChatGroup_Speech}, + .numWords = 60, + .numEnabledWords = 60, + }, + { + .wordData = {.words = gEasyChatGroup_Endings}, + .numWords = 69, + .numEnabledWords = 69, + }, + { + .wordData = {.words = gEasyChatGroup_Feelings}, + .numWords = 69, + .numEnabledWords = 69, + }, + { + .wordData = {.words = gEasyChatGroup_Conditions}, + .numWords = 69, + .numEnabledWords = 69, + }, + { + .wordData = {.words = gEasyChatGroup_Actions}, + .numWords = 78, + .numEnabledWords = 78, + }, + { + .wordData = {.words = gEasyChatGroup_Lifestyle}, + .numWords = 45, + .numEnabledWords = 45, + }, + { + .wordData = {.words = gEasyChatGroup_Hobbies}, + .numWords = 54, + .numEnabledWords = 54, + }, + { + .wordData = {.words = gEasyChatGroup_Time}, + .numWords = 45, + .numEnabledWords = 45, + }, + { + .wordData = {.words = gEasyChatGroup_Misc}, + .numWords = 42, + .numEnabledWords = 42, + }, + { + .wordData = {.words = gEasyChatGroup_Adjectives}, + .numWords = 36, + .numEnabledWords = 36, + }, + { + .wordData = {.words = gEasyChatGroup_Events}, + .numWords = 29, + .numEnabledWords = 29, + }, + { + .wordData = {.valueList = gEasyChatGroup_Move1}, + .numWords = 154, + .numEnabledWords = 154, + }, + { + .wordData = {.valueList = gEasyChatGroup_Move2}, + .numWords = 200, + .numEnabledWords = 200, + }, + { + .wordData = {.words = gEasyChatGroup_TrendySaying}, + .numWords = 33, + .numEnabledWords = 33, + }, + { + .wordData = {.valueList = gEasyChatGroup_Pokemon2}, + .numWords = 251, + .numEnabledWords = 251, + }, +}; diff --git a/src/data/easy_chat/easy_chat_words_by_letter.h b/src/data/easy_chat/easy_chat_words_by_letter.h new file mode 100755 index 0000000000..927b9db2f0 --- /dev/null +++ b/src/data/easy_chat/easy_chat_words_by_letter.h @@ -0,0 +1,2750 @@ +#include "easy_chat.h" +#include "constants/easy_chat.h" + +const u16 gEasyChatWordsByLetter_Others[] = { + EC_WORD_EXCL, + EC_WORD_EXCL_EXCL, + EC_WORD_DASH, + EC_WORD_DASH_DASH_DASH, + EC_WORD_ELLIPSIS, + EC_WORD_ELLIPSIS_EXCL, + EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, + EC_WORD_1_HIT_KO_EXCL, + EC_WORD_QUES, + EC_WORD_QUES_EXCL, +}; + +const u16 gEasyChatWordsByLetter_A[] = { + EC_WORD_A, + EC_WORD_A_LITTLE, + EC_WORD_A_LOT, + EC_WORD_A_TINY_BIT, + EC_WORD_ABOUT, + EC_WORD_ABOVE, + -1, 2, // Doubled pokemon species name + EC_POKEMON(ABRA), + EC_POKEMON2(ABRA), + EC_WORD_ABSENT, + EC_POKEMON(ABSOL), + EC_WORD_ABSOLUTELY, + EC_MOVE(ABSORB), + EC_WORD_ACCEPT, + EC_MOVE2(ACID), + EC_MOVE2(ACID_ARMOR), + EC_WORD_ADORE, + EC_WORD_ADULT, + EC_WORD_ADVENTURE, + EC_MOVE2(AERIAL_ACE), + EC_MOVE(AEROBLAST), + EC_POKEMON2(AERODACTYL), + EC_WORD_AFTER, + EC_WORD_AGE, + EC_POKEMON(AGGRON), + EC_MOVE(AGILITY), + EC_WORD_AGREE, + EC_WORD_AHAHA, + EC_WORD_AIM, + EC_POKEMON2(AIPOM), + EC_MOVE(AIR_CUTTER), + EC_WORD_AIR_LOCK, + EC_WORD_AIYEEH, + -1, 2, // Doubled pokemon species name + EC_POKEMON(ALAKAZAM), + EC_POKEMON2(ALAKAZAM), + EC_WORD_ALL, + EC_WORD_ALL_RIGHT, + EC_WORD_ALLOW, + EC_WORD_ALLOWANCE, + EC_WORD_ALLY, + EC_WORD_ALMOST, + EC_WORD_ALONE, + EC_WORD_ALSO, + EC_WORD_ALT_COLOR, + EC_POKEMON(ALTARIA), + EC_WORD_ALTHOUGH, + EC_WORD_ALWAYS, + EC_WORD_AM, + EC_MOVE2(AMNESIA), + EC_POKEMON2(AMPHAROS), + EC_WORD_AMUSING, + EC_WORD_AN, + EC_MOVE(ANCIENT_POWER), + EC_WORD_AND, + EC_WORD_ANGER, + EC_WORD_ANGERS, + EC_WORD_ANGRY, + EC_WORD_ANIME, + EC_POKEMON(ANORITH), + EC_WORD_ANOTHER, + EC_WORD_ANTICIPATION, + EC_WORD_ANY, + EC_WORD_ANYWHERE, + EC_WORD_APOLOGIZE, + EC_WORD_APPEAL, + EC_WORD_APPEAR, + EC_WORD_APPEARS, + EC_WORD_APPRECIATE, + EC_WORD_APPROVED, + EC_POKEMON2(ARBOK), + EC_POKEMON2(ARCANINE), + EC_WORD_ARE, + EC_WORD_AREN_T, + EC_WORD_ARENA_TRAP, + EC_POKEMON2(ARIADOS), + EC_MOVE2(ARM_THRUST), + EC_POKEMON(ARMALDO), + EC_MOVE(AROMATHERAPY), + EC_POKEMON(ARON), + EC_WORD_AROUND, + EC_WORD_ARRGH, + EC_POKEMON2(ARTICUNO), + EC_WORD_AS, + EC_WORD_AS_IF, + EC_WORD_AS_MUCH_AS, + EC_MOVE2(ASSIST), + EC_MOVE(ASTONISH), + EC_WORD_AT, + EC_WORD_ATTACK, + EC_MOVE2(ATTRACT), + EC_WORD_AUNT, + EC_MOVE(AURORA_BEAM), + EC_WORD_AVANT_GARDE, + EC_WORD_AWAY, + EC_WORD_AWESOME, + EC_WORD_AWFUL, + EC_WORD_AWFULLY, + EC_WORD_AWW, + -1, 2, // Doubled pokemon species name + EC_POKEMON(AZUMARILL), + EC_POKEMON2(AZUMARILL), + EC_POKEMON(AZURILL), +}; + +const u16 gEasyChatWordsByLetter_B[] = { + EC_WORD_BABE, + EC_WORD_BABY, + EC_WORD_BACK, + EC_WORD_BAD, + EC_WORD_BADLY, + EC_WORD_BAG, + EC_POKEMON(BAGON), + EC_WORD_BALL, + EC_POKEMON(BALTOY), + EC_POKEMON(BANETTE), + EC_WORD_BANG, + EC_POKEMON(BARBOACH), + EC_MOVE2(BARRAGE), + EC_MOVE2(BARRIER), + EC_WORD_BATH, + EC_MOVE2(BATON_PASS), + EC_WORD_BATTLE, + EC_WORD_BATTLE_ARMOR, + EC_WORD_BATTLE_ROOM, + EC_WORD_BATTLE_TOWER, + EC_POKEMON2(BAYLEEF), + EC_WORD_BE, + EC_WORD_BEAT, + EC_MOVE2(BEAT_UP), + EC_POKEMON(BEAUTIFLY), + EC_WORD_BEAUTIFUL, + EC_WORD_BEAUTY, + EC_WORD_BECOMES, + EC_POKEMON2(BEEDRILL), + EC_WORD_BEEN, + EC_WORD_BEFORE, + EC_WORD_BEGINNING, + EC_WORD_BEING, + EC_POKEMON(BELDUM), + EC_WORD_BELIEVE, + -1, 2, // Doubled pokemon species name + EC_POKEMON(BELLOSSOM), + EC_POKEMON2(BELLOSSOM), + EC_POKEMON2(BELLSPROUT), + EC_MOVE2(BELLY_DRUM), + EC_WORD_BELONGS_TO, + EC_WORD_BELOW, + EC_WORD_BERRY, + EC_WORD_BESIDE, + EC_WORD_BEST, + EC_WORD_BETTER, + EC_MOVE(BIDE), + EC_WORD_BIG, + EC_WORD_BIKE, + EC_MOVE(BIND), + EC_MOVE(BITE), + EC_MOVE2(BLAST_BURN), + EC_POKEMON2(BLASTOISE), + EC_WORD_BLAZE, + EC_MOVE2(BLAZE_KICK), + EC_POKEMON(BLAZIKEN), + EC_WORD_BLEND, + EC_POKEMON2(BLISSEY), + EC_MOVE2(BLIZZARD), + EC_MOVE2(BLOCK), + EC_WORD_BOARD, + EC_MOVE2(BODY_SLAM), + EC_MOVE2(BONE_CLUB), + EC_MOVE2(BONE_RUSH), + EC_MOVE2(BONEMERANG), + EC_WORD_BOOK, + EC_WORD_BORED, + EC_WORD_BORING, + EC_MOVE2(BOUNCE), + EC_WORD_BOY, + EC_WORD_BRAG, + EC_WORD_BREAK, + EC_POKEMON(BRELOOM), + EC_MOVE(BRICK_BREAK), + EC_WORD_BROTHER, + EC_MOVE(BUBBLE), + EC_MOVE2(BUBBLE_BEAM), + EC_WORD_BUG, + EC_POKEMON2(BULBASAUR), + EC_MOVE2(BULK_UP), + EC_MOVE2(BULLET_SEED), + EC_WORD_BUSY, + EC_WORD_BUT, + EC_POKEMON2(BUTTERFREE), + EC_WORD_BYE_BYE, +}; + +const u16 gEasyChatWordsByLetter_C[] = { + EC_POKEMON(CACNEA), + EC_POKEMON(CACTURNE), + EC_MOVE2(CALM_MIND), + EC_WORD_CAME, + EC_WORD_CAMERA, + EC_POKEMON(CAMERUPT), + EC_MOVE2(CAMOUFLAGE), + EC_WORD_CAN, + EC_WORD_CAN_WIN, + EC_WORD_CAN_T, + EC_WORD_CAN_T_WIN, + EC_WORD_CANCEL, + EC_WORD_CAPABLE, + EC_WORD_CARDS, + EC_WORD_CARE, + EC_WORD_CARES, + EC_POKEMON(CARVANHA), + EC_POKEMON(CASCOON), + EC_WORD_CASE, + EC_POKEMON(CASTFORM), + EC_POKEMON2(CATERPIE), + EC_WORD_CAUSE, + EC_POKEMON2(CELEBI), + EC_WORD_CENTER, + EC_WORD_CHALLENGE, + EC_WORD_CHANGE, + EC_WORD_CHANNEL, + EC_POKEMON2(CHANSEY), + EC_MOVE(CHARGE), + EC_POKEMON2(CHARIZARD), + EC_MOVE(CHARM), + EC_POKEMON2(CHARMANDER), + EC_POKEMON2(CHARMELEON), + EC_WORD_CHAT, + EC_POKEMON2(CHIKORITA), + EC_WORD_CHILD_S_PLAY, + EC_WORD_CHILDREN, + EC_POKEMON(CHIMECHO), + -1, 2, // Doubled pokemon species name + EC_POKEMON(CHINCHOU), + EC_POKEMON2(CHINCHOU), + EC_WORD_CHLOROPHYLL, + EC_WORD_CHOICE, + EC_WORD_CHOOSE, + EC_WORD_CHORES, + EC_MOVE(CLAMP), + EC_POKEMON(CLAMPERL), + EC_WORD_CLASS, + EC_POKEMON(CLAYDOL), + EC_WORD_CLEAR_BODY, + EC_POKEMON2(CLEFABLE), + EC_POKEMON2(CLEFAIRY), + EC_POKEMON2(CLEFFA), + EC_WORD_CLOSE, + EC_WORD_CLOUD_NINE, + EC_POKEMON2(CLOYSTER), + EC_WORD_COLD, + EC_WORD_COLLECT, + EC_WORD_COLLECTION, + EC_WORD_COLOR, + EC_WORD_COLOR_CHANGE, + EC_POKEMON(COMBUSKEN), + EC_WORD_COME, + EC_WORD_COME_ON, + EC_WORD_COME_OVER, + EC_MOVE2(COMET_PUNCH), + EC_WORD_COMICS, + EC_WORD_COMMEMORATE, + EC_WORD_COMPLETE, + EC_WORD_COMPOUNDEYES, + EC_WORD_CONCEDE, + EC_MOVE(CONFUSE_RAY), + EC_WORD_CONFUSED, + EC_MOVE2(CONFUSION), + EC_WORD_CONGRATS, + EC_MOVE(CONSTRICT), + EC_WORD_CONTEST, + EC_WORD_CONVERSATION, + EC_MOVE2(CONVERSION), + EC_MOVE2(CONVERSION_2), + EC_WORD_COOL, + EC_WORD_COOLNESS, + EC_POKEMON(CORPHISH), + EC_WORD_CORRECT, + -1, 2, // Doubled pokemon species name + EC_POKEMON(CORSOLA), + EC_POKEMON2(CORSOLA), + EC_MOVE(COSMIC_POWER), + EC_MOVE2(COTTON_SPORE), + EC_WORD_COULD, + EC_WORD_COULDN_T, + EC_WORD_COUNT_ON, + EC_MOVE(COUNTER), + EC_WORD_COUPLE, + EC_MOVE2(COVET), + EC_MOVE(CRABHAMMER), + EC_POKEMON(CRADILY), + EC_POKEMON(CRAWDAUNT), + EC_WORD_CRIES, + -1, 2, // Doubled pokemon species name + EC_POKEMON(CROBAT), + EC_POKEMON2(CROBAT), + EC_POKEMON2(CROCONAW), + EC_MOVE(CROSS_CHOP), + EC_MOVE(CRUNCH), + EC_WORD_CRUSH, + EC_MOVE2(CRUSH_CLAW), + EC_WORD_CRY, + EC_POKEMON2(CUBONE), + EC_WORD_CURRENT, + EC_MOVE2(CURSE), + EC_MOVE(CUT), + EC_WORD_CUTE, + EC_WORD_CUTE_CHARM, + EC_WORD_CUTENESS, + EC_POKEMON2(CYNDAQUIL), +}; + +const u16 gEasyChatWordsByLetter_D[] = { + EC_WORD_DAILY, + EC_WORD_DAMP, + EC_WORD_DANCE, + EC_WORD_DANGER, + EC_WORD_DARK, + EC_WORD_DARN, + EC_WORD_DATE, + EC_WORD_DAUGHTER, + EC_WORD_DAY, + EC_WORD_DAYS, + EC_WORD_DAYTIME, + EC_WORD_DECIDE, + EC_WORD_DECIDED, + EC_WORD_DEEP, + EC_WORD_DEFEATED, + EC_MOVE2(DEFENSE_CURL), + EC_POKEMON(DELCATTY), + EC_POKEMON2(DELIBIRD), + EC_POKEMON(DEOXYS), + EC_WORD_DEPT_STORE, + EC_WORD_DESIGN, + EC_WORD_DESTINY, + EC_MOVE2(DESTINY_BOND), + EC_WORD_DESTROYED, + EC_MOVE2(DETECT), + EC_POKEMON2(DEWGONG), + EC_WORD_DID, + EC_WORD_DIDN_T, + EC_WORD_DIET, + EC_WORD_DIFFERENT, + EC_MOVE(DIG), + EC_WORD_DIGITAL, + EC_POKEMON2(DIGLETT), + EC_WORD_DIRECT, + EC_MOVE(DISABLE), + EC_WORD_DISAPPEAR, + EC_WORD_DISAPPOINT, + EC_WORD_DISAPPOINTED, + EC_WORD_DISAPPOINTS, + EC_WORD_DISASTER, + EC_WORD_DISLIKE, + EC_WORD_DISLIKES, + EC_POKEMON2(DITTO), + EC_MOVE2(DIVE), + EC_MOVE2(DIZZY_PUNCH), + EC_WORD_DO, + EC_WORD_DOCILE, + -1, 2, // Doubled pokemon species name + EC_POKEMON(DODRIO), + EC_POKEMON2(DODRIO), + -1, 2, // Doubled pokemon species name + EC_POKEMON(DODUO), + EC_POKEMON2(DODUO), + EC_WORD_DOES, + EC_WORD_DOESN_T, + EC_WORD_DON_T, + EC_WORD_DONE, + -1, 2, // Doubled pokemon species name + EC_POKEMON(DONPHAN), + EC_POKEMON2(DONPHAN), + EC_MOVE2(DOOM_DESIRE), + EC_MOVE2(DOUBLE_KICK), + EC_MOVE(DOUBLE_TEAM), + EC_MOVE(DOUBLE_EDGE), + EC_MOVE(DOUBLE_SLAP), + EC_WORD_DOWN, + EC_WORD_DOWNCAST, + EC_WORD_DRAGON, + EC_MOVE2(DRAGON_CLAW), + EC_MOVE2(DRAGON_DANCE), + EC_MOVE2(DRAGON_RAGE), + EC_POKEMON2(DRAGONAIR), + EC_MOVE2(DRAGON_BREATH), + EC_POKEMON2(DRAGONITE), + EC_POKEMON2(DRATINI), + EC_WORD_DREAM, + EC_MOVE2(DREAM_EATER), + EC_MOVE2(DRILL_PECK), + EC_WORD_DRINK, + EC_WORD_DRINKS, + EC_WORD_DRIZZLE, + EC_WORD_DROOLING, + EC_WORD_DROUGHT, + EC_POKEMON2(DROWZEE), + EC_WORD_DUDE, + EC_POKEMON2(DUGTRIO), + EC_POKEMON2(DUNSPARCE), + EC_POKEMON(DUSCLOPS), + EC_POKEMON(DUSKULL), + EC_POKEMON(DUSTOX), + EC_MOVE2(DYNAMIC_PUNCH), +}; + +const u16 gEasyChatWordsByLetter_E[] = { + EC_WORD_EARLIER, + EC_WORD_EARLY_BIRD, + EC_MOVE(EARTHQUAKE), + EC_WORD_EASY, + EC_WORD_EAT, + EC_WORD_EATS, + EC_WORD_EEK, + EC_POKEMON2(EEVEE), + EC_WORD_EFFECT_SPORE, + EC_WORD_EGG, + EC_MOVE2(EGG_BOMB), + EC_WORD_EH_QUES, + EC_WORD_EHEHE, + EC_POKEMON2(EKANS), + EC_POKEMON2(ELECTABUZZ), + EC_WORD_ELECTRIC, + EC_POKEMON(ELECTRIKE), + -1, 2, // Doubled pokemon species name + EC_POKEMON(ELECTRODE), + EC_POKEMON2(ELECTRODE), + EC_POKEMON2(ELEKID), + EC_WORD_ELSE, + EC_MOVE2(EMBER), + EC_WORD_EMERALD, + EC_MOVE(ENCORE), + EC_WORD_ENCYCLOPEDIA, + EC_WORD_END, + EC_MOVE(ENDEAVOR), + EC_MOVE(ENDURE), + EC_WORD_ENJOY, + EC_WORD_ENJOYS, + EC_WORD_ENOUGH, + EC_POKEMON2(ENTEI), + EC_WORD_ENTERTAINING, + EC_MOVE2(ERUPTION), + EC_WORD_ESCAPE, + EC_POKEMON2(ESPEON), + EC_WORD_EVEN_SO, + EC_WORD_EVENT, + EC_WORD_EVENTS, + EC_WORD_EVER, + EC_WORD_EVERY, + EC_WORD_EVOLUTION, + EC_WORD_EVOLVE, + EC_WORD_EXCELLENT, + EC_WORD_EXCESS, + EC_WORD_EXCITE, + EC_WORD_EXCITING, + EC_WORD_EXCUSE, + EC_WORD_EXCUSE_ME, + EC_POKEMON2(EXEGGCUTE), + EC_POKEMON2(EXEGGUTOR), + EC_WORD_EXISTS, + EC_WORD_EXPENSIVE, + EC_MOVE2(EXPLOSION), + EC_POKEMON(EXPLOUD), + EC_MOVE(EXTRASENSORY), + EC_MOVE(EXTREME_SPEED), +}; + +const u16 gEasyChatWordsByLetter_F[] = { + EC_WORD_FABULOUS, + EC_MOVE(FACADE), + EC_WORD_FAINT, + EC_MOVE2(FAINT_ATTACK), + EC_WORD_FAINTED, + EC_MOVE2(FAKE_OUT), + EC_MOVE(FAKE_TEARS), + EC_WORD_FALL, + EC_MOVE2(FALSE_SWIPE), + EC_WORD_FAMILY, + EC_WORD_FANTASTIC, + EC_WORD_FAR, + EC_POKEMON2(FARFETCHD), + EC_WORD_FASHION, + EC_WORD_FAST, + EC_WORD_FATHER, + EC_WORD_FEAR, + EC_POKEMON2(FEAROW), + EC_MOVE2(FEATHER_DANCE), + EC_POKEMON(FEEBAS), + EC_WORD_FEELING, + EC_POKEMON2(FERALIGATR), + EC_WORD_FESTIVAL, + EC_WORD_FEVER, + EC_WORD_FIERY, + EC_WORD_FIGHT, + EC_WORD_FIGHTING, + EC_WORD_FIGHTS, + EC_WORD_FINAL, + EC_WORD_FINALLY, + EC_WORD_FINISH, + EC_WORD_FIRE, + EC_MOVE2(FIRE_BLAST), + EC_MOVE2(FIRE_PUNCH), + EC_MOVE2(FIRE_SPIN), + EC_WORD_FISHING, + EC_MOVE(FISSURE), + EC_POKEMON2(FLAAFFY), + EC_MOVE(FLAIL), + EC_WORD_FLAME, + EC_WORD_FLAME_BODY, + EC_MOVE(FLAME_WHEEL), + EC_MOVE(FLAMETHROWER), + EC_POKEMON2(FLAREON), + EC_MOVE2(FLASH), + EC_WORD_FLASH_FIRE, + EC_WORD_FLATTEN, + EC_MOVE(FLATTER), + EC_WORD_FLOWERS, + EC_MOVE(FLY), + EC_POKEMON(FLYGON), + EC_WORD_FLYING, + EC_MOVE(FOCUS_ENERGY), + EC_MOVE(FOCUS_PUNCH), + EC_WORD_FOE, + EC_MOVE(FOLLOW_ME), + EC_WORD_FOR, + EC_WORD_FOR_NOW, + EC_WORD_FORECAST, + EC_MOVE2(FORESIGHT), + EC_WORD_FOREVER, + EC_WORD_FORGET, + EC_WORD_FORGETS, + EC_WORD_FORGIVE, + EC_POKEMON2(FORRETRESS), + EC_MOVE2(FRENZY_PLANT), + EC_WORD_FRIDAY, + EC_WORD_FRIEND, + EC_WORD_FROM, + EC_WORD_FRONT, + EC_WORD_FRONTIER, + EC_MOVE2(FRUSTRATION), + EC_WORD_FUFUFU, + EC_WORD_FULL, + EC_WORD_FUNNY, + EC_POKEMON2(FURRET), + EC_MOVE2(FURY_ATTACK), + EC_MOVE2(FURY_CUTTER), + EC_MOVE2(FURY_SWIPES), + EC_MOVE2(FUTURE_SIGHT), +}; + +const u16 gEasyChatWordsByLetter_G[] = { + EC_WORD_GAME, + EC_POKEMON(GARDEVOIR), + EC_POKEMON2(GASTLY), + EC_POKEMON2(GENGAR), + EC_WORD_GENIUS, + -1, 2, // Doubled pokemon species name + EC_POKEMON(GEODUDE), + EC_POKEMON2(GEODUDE), + EC_WORD_GET, + EC_WORD_GETS, + EC_WORD_GHOST, + EC_WORD_GIDDY, + EC_MOVE(GIGA_DRAIN), + EC_WORD_GIGGLE, + EC_WORD_GIMME, + -1, 2, // Doubled pokemon species name + EC_POKEMON(GIRAFARIG), + EC_POKEMON2(GIRAFARIG), + EC_WORD_GIRL, + EC_WORD_GIVE, + EC_WORD_GIVE_ME, + EC_WORD_GIVE_UP, + EC_WORD_GIVES, + EC_POKEMON(GLALIE), + EC_MOVE2(GLARE), + EC_POKEMON2(GLIGAR), + -1, 2, // Doubled pokemon species name + EC_POKEMON(GLOOM), + EC_POKEMON2(GLOOM), + EC_WORD_GO, + EC_WORD_GO_AHEAD, + EC_WORD_GO_EASY, + EC_WORD_GO_HOME, + EC_WORD_GOES, + EC_WORD_GOING, + -1, 2, // Doubled pokemon species name + EC_POKEMON(GOLBAT), + EC_POKEMON2(GOLBAT), + EC_WORD_GOLD, + -1, 2, // Doubled pokemon species name + EC_POKEMON(GOLDEEN), + EC_POKEMON2(GOLDEEN), + -1, 2, // Doubled pokemon species name + EC_POKEMON(GOLDUCK), + EC_POKEMON2(GOLDUCK), + -1, 2, // Doubled pokemon species name + EC_POKEMON(GOLEM), + EC_POKEMON2(GOLEM), + EC_WORD_GOOD, + EC_WORD_GOOD_BYE, + EC_POKEMON(GOREBYSS), + EC_WORD_GOT, + EC_WORD_GOTCHA, + EC_WORD_GOURMET, + EC_WORD_GRAAAH, + EC_POKEMON2(GRANBULL), + EC_WORD_GRANDFATHER, + EC_WORD_GRANDMOTHER, + EC_WORD_GRASS, + EC_MOVE(GRASS_WHISTLE), + -1, 2, // Doubled pokemon species name + EC_POKEMON(GRAVELER), + EC_POKEMON2(GRAVELER), + EC_WORD_GREAT, + EC_WORD_GREEN, + -1, 2, // Doubled pokemon species name + EC_POKEMON(GRIMER), + EC_POKEMON2(GRIMER), + EC_POKEMON(GROUDON), + EC_WORD_GROUND, + EC_WORD_GROUP, + EC_POKEMON(GROVYLE), + EC_MOVE2(GROWL), + EC_POKEMON2(GROWLITHE), + EC_MOVE(GROWTH), + EC_MOVE(GRUDGE), + EC_POKEMON(GRUMPIG), + EC_WORD_GUARD, + EC_MOVE2(GUILLOTINE), + EC_POKEMON(GULPIN), + EC_MOVE(GUST), + EC_WORD_GUTS, + EC_WORD_GUTSY, + EC_WORD_GWAH, + EC_WORD_GWAHAHAHA, + -1, 2, // Doubled pokemon species name + EC_POKEMON(GYARADOS), + EC_POKEMON2(GYARADOS), +}; + +const u16 gEasyChatWordsByLetter_H[] = { + EC_WORD_HABIT, + EC_WORD_HAH, + EC_WORD_HAHAHA, + EC_MOVE(HAIL), + EC_WORD_HALL_OF_FAME, + EC_WORD_HAPPENING, + EC_WORD_HAPPILY, + EC_WORD_HAPPINESS, + EC_WORD_HAPPY, + EC_WORD_HARD, + EC_MOVE(HARDEN), + EC_POKEMON(HARIYAMA), + EC_WORD_HAS, + EC_WORD_HASSLE, + EC_POKEMON2(HAUNTER), + EC_WORD_HAVE, + EC_WORD_HAVEN_T, + EC_MOVE(HAZE), + EC_WORD_HE, + EC_WORD_HE_S, + EC_MOVE(HEADBUTT), + EC_MOVE(HEAL_BELL), + EC_WORD_HEALTHY, + EC_WORD_HEAR, + EC_WORD_HEARING, + EC_WORD_HEARS, + EC_WORD_HEART, + EC_MOVE2(HEAT_WAVE), + EC_WORD_HEH, + EC_WORD_HEHE, + EC_WORD_HEHEHE, + EC_WORD_HELLO, + EC_MOVE2(HELPING_HAND), + EC_WORD_HER, + -1, 2, // Doubled pokemon species name + EC_POKEMON(HERACROSS), + EC_POKEMON2(HERACROSS), + EC_WORD_HERE, + EC_WORD_HERE_GOES, + EC_WORD_HERE_I_COME, + EC_WORD_HERE_IT_IS, + EC_WORD_HERO, + EC_WORD_HEROINE, + EC_WORD_HERS, + EC_WORD_HEY, + EC_WORD_HEY_THERE, + EC_WORD_HEY_QUES, + EC_WORD_HI, + EC_MOVE2(HI_JUMP_KICK), + EC_WORD_HIDDEN, + EC_MOVE2(HIDDEN_POWER), + EC_WORD_HIGH, + EC_WORD_HIGHS, + EC_WORD_HIM, + EC_WORD_HIP_AND, + EC_WORD_HIS, + EC_WORD_HIT, + EC_POKEMON2(HITMONCHAN), + EC_POKEMON2(HITMONLEE), + EC_POKEMON2(HITMONTOP), + EC_WORD_HIYAH, + EC_WORD_HMM, + EC_POKEMON2(HO_OH), + EC_WORD_HOBBY, + EC_WORD_HOHOHO, + EC_WORD_HOLIDAY, + EC_WORD_HOME, + EC_WORD_HOO_HAH, + EC_POKEMON2(HOOTHOOT), + EC_WORD_HOPELESS, + EC_POKEMON2(HOPPIP), + EC_MOVE2(HORN_ATTACK), + EC_MOVE2(HORN_DRILL), + -1, 2, // Doubled pokemon species name + EC_POKEMON(HORSEA), + EC_POKEMON2(HORSEA), + EC_WORD_HOT, + EC_POKEMON2(HOUNDOOM), + EC_POKEMON2(HOUNDOUR), + EC_WORD_HOW, + EC_WORD_HOW_DO, + EC_WORD_HOWEVER, + EC_MOVE2(HOWL), + EC_WORD_HUGE_POWER, + EC_WORD_HUH_QUES, + EC_WORD_HUMPH, + EC_WORD_HUNGRY, + EC_POKEMON(HUNTAIL), + EC_WORD_HURRIED, + EC_WORD_HUSTLE, + EC_MOVE2(HYDRO_CANNON), + EC_MOVE2(HYDRO_PUMP), + EC_WORD_HYPER, + EC_MOVE2(HYPER_BEAM), + EC_WORD_HYPER_CUTTER, + EC_MOVE2(HYPER_FANG), + EC_MOVE2(HYPER_VOICE), + EC_POKEMON2(HYPNO), + EC_MOVE(HYPNOSIS), +}; + +const u16 gEasyChatWordsByLetter_I[] = { + EC_WORD_I, + EC_WORD_I_AM, + EC_WORD_I_CHOOSE_YOU, + EC_WORD_I_WAS, + EC_WORD_I_VE, + EC_WORD_I_VE_ARRIVED, + EC_WORD_ICE, + EC_MOVE(ICE_BALL), + EC_MOVE2(ICE_BEAM), + EC_MOVE2(ICE_PUNCH), + EC_MOVE2(ICICLE_SPEAR), + EC_MOVE(ICY_WIND), + EC_WORD_IDOL, + EC_WORD_IF, + EC_WORD_IF_I_LOSE, + EC_WORD_IF_I_WIN, + -1, 2, // Doubled pokemon species name + EC_POKEMON(IGGLYBUFF), + EC_POKEMON2(IGGLYBUFF), + EC_WORD_IGNORANT, + EC_WORD_ILLUMINATE, + EC_POKEMON(ILLUMISE), + EC_WORD_IMMUNITY, + EC_WORD_IMPORTANT, + EC_WORD_IMPOSSIBLE, + EC_MOVE2(IMPRISON), + EC_WORD_IN, + EC_WORD_INCREASING, + EC_WORD_INCREDIBLE, + EC_WORD_INFORMATION, + EC_MOVE2(INGRAIN), + EC_WORD_INNER_FOCUS, + EC_WORD_INSIDE, + EC_WORD_INSOMNIA, + EC_WORD_INSTEAD, + EC_WORD_INTIMIDATE, + EC_WORD_INVINCIBLE, + EC_MOVE2(IRON_DEFENSE), + EC_MOVE(IRON_TAIL), + EC_WORD_IS, + EC_WORD_IS_IT_QUES, + EC_WORD_ISN_T, + EC_WORD_ISN_T_IT_QUES, + EC_WORD_IT, + EC_WORD_IT_S, + EC_WORD_ITEM, + EC_POKEMON2(IVYSAUR), +}; + +const u16 gEasyChatWordsByLetter_J[] = { + -1, 2, // Doubled pokemon species name + EC_POKEMON(JIGGLYPUFF), + EC_POKEMON2(JIGGLYPUFF), + EC_POKEMON(JIRACHI), + EC_WORD_JOKING, + EC_POKEMON2(JOLTEON), + EC_WORD_JOY, + EC_WORD_JUDGE, + EC_MOVE2(JUMP_KICK), + EC_POKEMON2(JUMPLUFF), + EC_WORD_JUST, + EC_POKEMON2(JYNX), +}; + +const u16 gEasyChatWordsByLetter_K[] = { + EC_POKEMON2(KABUTO), + EC_POKEMON2(KABUTOPS), + -1, 2, // Doubled pokemon species name + EC_POKEMON(KADABRA), + EC_POKEMON2(KADABRA), + EC_POKEMON2(KAKUNA), + EC_POKEMON2(KANGASKHAN), + EC_MOVE(KARATE_CHOP), + EC_POKEMON(KECLEON), + EC_WORD_KEEN_EYE, + EC_WORD_KID, + EC_WORD_KIDDING, + EC_WORD_KIND, + EC_WORD_KINDERGARTEN, + EC_MOVE(KINESIS), + -1, 2, // Doubled pokemon species name + EC_POKEMON(KINGDRA), + EC_POKEMON2(KINGDRA), + EC_POKEMON2(KINGLER), + EC_POKEMON(KIRLIA), + EC_MOVE2(KNOCK_OFF), + EC_WORD_KNOCKOUT, + EC_WORD_KNOW, + EC_WORD_KNOWS, + -1, 2, // Doubled pokemon species name + EC_POKEMON(KOFFING), + EC_POKEMON2(KOFFING), + EC_POKEMON2(KRABBY), + EC_WORD_KTHX_BYE, + EC_POKEMON(KYOGRE), +}; + +const u16 gEasyChatWordsByLetter_L[] = { + EC_WORD_LACKING, + EC_WORD_LACKS, + EC_WORD_LADY, + EC_POKEMON(LAIRON), + EC_WORD_LALALA, + -1, 2, // Doubled pokemon species name + EC_POKEMON(LANTURN), + EC_POKEMON2(LANTURN), + EC_POKEMON2(LAPRAS), + EC_POKEMON2(LARVITAR), + EC_WORD_LAST, + EC_WORD_LATE, + EC_WORD_LATER, + EC_POKEMON(LATIAS), + EC_POKEMON(LATIOS), + EC_WORD_LAVISH, + EC_WORD_LAY, + EC_WORD_LEADER, + EC_WORD_LEADERS, + EC_WORD_LEAF, + EC_MOVE2(LEAF_BLADE), + EC_WORD_LEARN, + EC_POKEMON2(LEDIAN), + EC_POKEMON2(LEDYBA), + EC_MOVE(LEECH_LIFE), + EC_MOVE2(LEECH_SEED), + EC_MOVE2(LEER), + EC_WORD_LEFT, + EC_WORD_LEGEND, + EC_WORD_LESS, + EC_WORD_LESSONS, + EC_WORD_LET_ME_WIN, + EC_WORD_LET_S, + EC_WORD_LETTER, + EC_WORD_LEVEL, + EC_WORD_LEVITATE, + EC_MOVE(LICK), + EC_POKEMON2(LICKITUNG), + EC_WORD_LIE, + EC_WORD_LIFE, + EC_MOVE2(LIGHT_SCREEN), + EC_WORD_LIGHTNINGROD, + EC_WORD_LIKE, + EC_WORD_LIKELY_TO, + EC_WORD_LIKES, + EC_POKEMON(LILEEP), + EC_WORD_LIMBER, + EC_WORD_LINK, + EC_POKEMON(LINOONE), + EC_WORD_LIQUID_OOZE, + EC_WORD_LISTEN, + EC_WORD_LISTENING, + EC_WORD_LISTENS, + EC_WORD_LIVING, + EC_MOVE2(LOCK_ON), + EC_WORD_LOCOMOTIVE, + EC_WORD_LOL, + EC_WORD_LOLLING, + EC_POKEMON(LOMBRE), + EC_WORD_LONESOME, + EC_WORD_LOOK, + EC_WORD_LOOKS, + EC_WORD_LOSE, + EC_WORD_LOSER, + EC_WORD_LOSING, + EC_WORD_LOSS, + EC_WORD_LOST, + EC_POKEMON(LOTAD), + EC_POKEMON(LOUDRED), + EC_WORD_LOUSY, + EC_MOVE(LOVELY_KISS), + EC_WORD_LOVEY_DOVEY, + EC_WORD_LOW, + EC_MOVE(LOW_KICK), + EC_WORD_LOWS, + EC_POKEMON(LUDICOLO), + EC_POKEMON2(LUGIA), + EC_WORD_LUKEWARM, + EC_POKEMON(LUNATONE), + EC_MOVE2(LUSTER_PURGE), + EC_POKEMON(LUVDISC), +}; + +const u16 gEasyChatWordsByLetter_M[] = { + EC_MOVE2(MACH_PUNCH), + -1, 2, // Doubled pokemon species name + EC_POKEMON(MACHAMP), + EC_POKEMON2(MACHAMP), + EC_WORD_MACHINE, + -1, 2, // Doubled pokemon species name + EC_POKEMON(MACHOKE), + EC_POKEMON2(MACHOKE), + -1, 2, // Doubled pokemon species name + EC_POKEMON(MACHOP), + EC_POKEMON2(MACHOP), + EC_WORD_MAGAZINE, + EC_POKEMON2(MAGBY), + -1, 2, // Doubled pokemon species name + EC_POKEMON(MAGCARGO), + EC_POKEMON2(MAGCARGO), + EC_MOVE2(MAGIC_COAT), + EC_MOVE2(MAGICAL_LEAF), + -1, 2, // Doubled pokemon species name + EC_POKEMON(MAGIKARP), + EC_POKEMON2(MAGIKARP), + EC_WORD_MAGMA_ARMOR, + EC_POKEMON2(MAGMAR), + -1, 2, // Doubled pokemon species name + EC_POKEMON(MAGNEMITE), + EC_POKEMON2(MAGNEMITE), + EC_WORD_MAGNET_PULL, + -1, 2, // Doubled pokemon species name + EC_POKEMON(MAGNETON), + EC_POKEMON2(MAGNETON), + EC_MOVE2(MAGNITUDE), + EC_WORD_MAIL, + EC_WORD_MAKE, + EC_WORD_MAKING, + EC_POKEMON(MAKUHITA), + EC_WORD_MAN, + EC_POKEMON(MANECTRIC), + EC_POKEMON2(MANKEY), + EC_POKEMON2(MANTINE), + EC_POKEMON2(MAREEP), + -1, 2, // Doubled pokemon species name + EC_POKEMON(MARILL), + EC_POKEMON2(MARILL), + EC_POKEMON2(MAROWAK), + EC_POKEMON(MARSHTOMP), + EC_WORD_MARVEL_SCALE, + EC_POKEMON(MASQUERAIN), + EC_WORD_MASTER, + EC_WORD_MATCH, + EC_WORD_MATCH_UP, + EC_POKEMON(MAWILE), + EC_WORD_MAYBE, + EC_WORD_MC, + EC_WORD_ME, + EC_WORD_MEAN, + EC_MOVE(MEAN_LOOK), + EC_POKEMON(MEDICHAM), + EC_MOVE2(MEDITATE), + EC_POKEMON(MEDITITE), + EC_WORD_MEET, + EC_WORD_MEET_YOU, + EC_WORD_MEETS, + EC_WORD_MEGA, + EC_MOVE2(MEGA_DRAIN), + EC_MOVE2(MEGA_KICK), + EC_MOVE2(MEGA_PUNCH), + EC_MOVE2(MEGAHORN), + EC_POKEMON2(MEGANIUM), + EC_MOVE(MEMENTO), + EC_POKEMON2(MEOWTH), + EC_WORD_MESSAGE, + EC_POKEMON(METAGROSS), + EC_MOVE2(METAL_CLAW), + EC_MOVE(METAL_SOUND), + EC_POKEMON(METANG), + EC_POKEMON2(METAPOD), + EC_MOVE(METEOR_MASH), + EC_MOVE2(METRONOME), + EC_POKEMON2(MEW), + EC_POKEMON2(MEWTWO), + EC_POKEMON(MIGHTYENA), + EC_MOVE2(MILK_DRINK), + EC_POKEMON(MILOTIC), + EC_POKEMON2(MILTANK), + EC_MOVE2(MIMIC), + EC_MOVE(MIND_READER), + EC_MOVE2(MINIMIZE), + EC_POKEMON(MINUN), + EC_WORD_MINUS, + EC_MOVE2(MIRROR_COAT), + EC_MOVE(MIRROR_MOVE), + EC_POKEMON2(MISDREAVUS), + EC_WORD_MISHEARD, + EC_WORD_MISS, + EC_MOVE(MIST), + EC_MOVE2(MIST_BALL), + EC_WORD_MISTAKE, + EC_WORD_MMM, + EC_WORD_MODE, + EC_WORD_MODERN, + EC_POKEMON2(MOLTRES), + EC_WORD_MOMENTUM, + EC_WORD_MONDAY, + EC_WORD_MONEY, + EC_WORD_MONTH, + EC_WORD_MOOD, + EC_MOVE2(MOONLIGHT), + EC_WORD_MORE, + EC_WORD_MORNING, + EC_MOVE(MORNING_SUN), + EC_WORD_MOTHER, + EC_WORD_MOVE, + EC_WORD_MOVIE, + EC_WORD_MR, + EC_POKEMON2(MR_MIME), + EC_WORD_MRS, + EC_WORD_MUCH, + EC_WORD_MUCH_OBLIGED, + EC_MOVE2(MUD_SHOT), + EC_MOVE2(MUD_SPORT), + EC_MOVE2(MUD_SLAP), + EC_MOVE2(MUDDY_WATER), + EC_POKEMON(MUDKIP), + EC_WORD_MUFUFU, + -1, 2, // Doubled pokemon species name + EC_POKEMON(MUK), + EC_POKEMON2(MUK), + EC_POKEMON2(MURKROW), + EC_WORD_MUSIC, + EC_WORD_MUST_BE, + EC_WORD_MY, + EC_WORD_MYSELF, + EC_WORD_MYSTERY, +}; + +const u16 gEasyChatWordsByLetter_N[] = { + EC_WORD_NAME, + EC_WORD_NAP, + -1, 2, // Doubled pokemon species name + EC_POKEMON(NATU), + EC_POKEMON2(NATU), + EC_WORD_NATURAL, + EC_WORD_NATURAL_CURE, + EC_WORD_NATURALLY, + EC_WORD_NATURE, + EC_MOVE(NATURE_POWER), + EC_WORD_NEAR, + EC_WORD_NEARLY, + EC_WORD_NEED, + EC_MOVE2(NEEDLE_ARM), + EC_WORD_NEGATIVE, + EC_WORD_NEVER, + EC_WORD_NEW, + EC_WORD_NEWS, + EC_WORD_NEXT, + EC_WORD_NICE, + EC_POKEMON2(NIDOKING), + EC_POKEMON2(NIDOQUEEN), + EC_POKEMON2(NIDORAN_F), + EC_POKEMON2(NIDORAN_M), + EC_POKEMON2(NIDORINA), + EC_POKEMON2(NIDORINO), + EC_WORD_NIGHT, + EC_MOVE2(NIGHT_SHADE), + EC_MOVE(NIGHTMARE), + EC_WORD_NIGHTTIME, + EC_POKEMON(NINCADA), + -1, 2, // Doubled pokemon species name + EC_POKEMON(NINETALES), + EC_POKEMON2(NINETALES), + EC_POKEMON(NINJASK), + EC_WORD_NITWIT, + EC_WORD_NO, + EC_WORD_NO_MATCH, + EC_WORD_NO_1, + EC_POKEMON2(NOCTOWL), + EC_WORD_NOISY, + EC_WORD_NON_STOP, + EC_WORD_NONE, + EC_WORD_NOPE, + EC_WORD_NORMAL, + EC_POKEMON(NOSEPASS), + EC_WORD_NOT, + EC_WORD_NOT_VERY, + EC_WORD_NOTHING, + EC_WORD_NOW, + EC_POKEMON(NUMEL), + EC_POKEMON(NUZLEAF), +}; + +const u16 gEasyChatWordsByLetter_O[] = { + EC_WORD_OBLIVIOUS, + EC_MOVE(OCTAZOOKA), + EC_POKEMON2(OCTILLERY), + -1, 2, // Doubled pokemon species name + EC_POKEMON(ODDISH), + EC_POKEMON2(ODDISH), + EC_MOVE(ODOR_SLEUTH), + EC_WORD_OF, + EC_WORD_OFF, + EC_WORD_OFFENSIVE, + EC_WORD_OH, + EC_WORD_OH_DEAR, + EC_WORD_OH_YEAH, + EC_WORD_OH_KAY, + EC_WORD_OH_QUES, + EC_WORD_OI, + EC_WORD_OI_OI_OI, + EC_WORD_OK_QUES, + EC_WORD_OKAY, + EC_WORD_OLD, + EC_WORD_OLDEN, + EC_POKEMON2(OMANYTE), + EC_POKEMON2(OMASTAR), + EC_WORD_ON, + EC_WORD_ONCE, + EC_POKEMON2(ONIX), + EC_WORD_ONLY, + EC_WORD_OOPS, + EC_WORD_OPPONENT, + EC_WORD_OPPOSITE, + EC_WORD_OR, + EC_WORD_OTHER, + EC_WORD_OUR, + EC_WORD_OUT, + EC_MOVE(OUTRAGE), + EC_WORD_OUTSIDE, + EC_WORD_OVER, + EC_WORD_OVERDO, + EC_WORD_OVERGROW, + EC_MOVE(OVERHEAT), + EC_WORD_OVERWHELMING, + EC_WORD_OWN, + EC_WORD_OWN_TEMPO, +}; + +const u16 gEasyChatWordsByLetter_P[] = { + EC_MOVE(PAIN_SPLIT), + EC_POKEMON2(PARAS), + EC_POKEMON2(PARASECT), + EC_WORD_PARDON, + EC_WORD_PARENT, + EC_WORD_PARTNER, + EC_WORD_PARTY, + EC_WORD_PATTERN, + EC_MOVE2(PAY_DAY), + EC_WORD_PC, + EC_MOVE2(PECK), + EC_POKEMON(PELIPPER), + EC_WORD_PERFECT, + EC_WORD_PERFECTION, + EC_MOVE2(PERISH_SONG), + EC_POKEMON2(PERSIAN), + EC_WORD_PERSON, + EC_MOVE2(PETAL_DANCE), + -1, 2, // Doubled pokemon species name + EC_POKEMON(PHANPY), + EC_POKEMON2(PHANPY), + EC_WORD_PHONE, + -1, 2, // Doubled pokemon species name + EC_POKEMON(PICHU), + EC_POKEMON2(PICHU), + EC_WORD_PICKUP, + EC_POKEMON2(PIDGEOT), + EC_POKEMON2(PIDGEOTTO), + EC_POKEMON2(PIDGEY), + -1, 2, // Doubled pokemon species name + EC_POKEMON(PIKACHU), + EC_POKEMON2(PIKACHU), + EC_POKEMON2(PILOSWINE), + EC_MOVE2(PIN_MISSILE), + EC_POKEMON2(PINECO), + -1, 2, // Doubled pokemon species name + EC_POKEMON(PINSIR), + EC_POKEMON2(PINSIR), + EC_WORD_PKRS, + EC_WORD_PLACE, + EC_WORD_PLANS, + EC_WORD_PLAY, + EC_WORD_PLAYED, + EC_WORD_PLAYS, + EC_WORD_PLEASE, + EC_WORD_PLUS, + EC_WORD_PLUSH_DOLL, + EC_POKEMON(PLUSLE), + EC_WORD_POINTS, + EC_WORD_POISON, + EC_MOVE2(POISON_FANG), + EC_MOVE2(POISON_GAS), + EC_WORD_POISON_POINT, + EC_MOVE2(POISON_STING), + EC_MOVE2(POISON_TAIL), + EC_MOVE2(POISON_POWDER), + EC_WORD_POKEBLOCK, + EC_WORD_POKEDEX, + EC_WORD_POKEMON, + EC_WORD_POKENAV, + EC_POKEMON2(POLITOED), + EC_POKEMON2(POLIWAG), + EC_POKEMON2(POLIWHIRL), + EC_POKEMON2(POLIWRATH), + EC_POKEMON2(PONYTA), + EC_POKEMON(POOCHYENA), + EC_WORD_POPULAR, + EC_POKEMON2(PORYGON), + EC_POKEMON2(PORYGON2), + EC_MOVE2(POUND), + EC_MOVE(POWDER_SNOW), + EC_WORD_POWER, + EC_WORD_PRAISE, + EC_WORD_PREPOSTEROUS, + EC_MOVE2(PRESENT), + EC_WORD_PRESSURE, + EC_WORD_PRETEND, + EC_WORD_PRETTY, + EC_POKEMON2(PRIMEAPE), + EC_WORD_PROBABLY, + EC_WORD_PROMISE, + EC_MOVE2(PROTECT), + EC_MOVE(PSYBEAM), + EC_MOVE(PSYCH_UP), + -1, 2, // Doubled pokemon species name + EC_WORD_PSYCHIC, + EC_MOVE(PSYCHIC), + EC_MOVE(PSYCHO_BOOST), + -1, 2, // Doubled pokemon species name + EC_POKEMON(PSYDUCK), + EC_POKEMON2(PSYDUCK), + EC_MOVE(PSYWAVE), + EC_POKEMON2(PUPITAR), + EC_WORD_PURE_POWER, + EC_MOVE(PURSUIT), + EC_WORD_PUSHOVER, +}; + +const u16 gEasyChatWordsByLetter_Q[] = { + EC_POKEMON2(QUAGSIRE), + EC_WORD_QUESTION, + EC_MOVE2(QUICK_ATTACK), + EC_POKEMON2(QUILAVA), + EC_WORD_QUITE, + EC_POKEMON2(QWILFISH), +}; + +const u16 gEasyChatWordsByLetter_R[] = { + EC_WORD_RADIO, + EC_MOVE(RAGE), + -1, 2, // Doubled pokemon species name + EC_POKEMON(RAICHU), + EC_POKEMON2(RAICHU), + EC_POKEMON2(RAIKOU), + EC_MOVE(RAIN_DANCE), + EC_WORD_RAIN_DISH, + EC_POKEMON(RALTS), + EC_WORD_RANK, + EC_MOVE(RAPID_SPIN), + EC_POKEMON2(RAPIDASH), + EC_WORD_RARE, + EC_WORD_RATHER, + EC_POKEMON2(RATICATE), + EC_POKEMON2(RATTATA), + EC_POKEMON(RAYQUAZA), + EC_MOVE2(RAZOR_LEAF), + EC_MOVE(RAZOR_WIND), + EC_WORD_READY, + EC_WORD_REALLY, + EC_WORD_REAR, + EC_WORD_RECEIVED, + EC_WORD_RECOMMEND, + EC_MOVE(RECOVER), + EC_MOVE2(RECYCLE), + EC_WORD_RED, + EC_MOVE2(REFLECT), + EC_MOVE2(REFRESH), + EC_WORD_REFRESHING, + EC_WORD_REFUSE, + EC_POKEMON(REGICE), + EC_POKEMON(REGIROCK), + EC_POKEMON(REGISTEEL), + EC_WORD_REJECT, + EC_WORD_RELEASE, + EC_POKEMON(RELICANTH), + EC_POKEMON2(REMORAID), + EC_WORD_RENTAL, + EC_MOVE2(REST), + EC_WORD_RESUSCITATE, + EC_MOVE(RETURN), + EC_MOVE2(REVENGE), + EC_MOVE(REVERSAL), + -1, 2, // Doubled pokemon species name + EC_POKEMON(RHYDON), + EC_POKEMON2(RHYDON), + -1, 2, // Doubled pokemon species name + EC_POKEMON(RHYHORN), + EC_POKEMON2(RHYHORN), + EC_WORD_RIBBON, + EC_WORD_RICKETY, + EC_WORD_RIGHT, + EC_WORD_RIPPED, + EC_WORD_RIVAL, + EC_MOVE2(ROAR), + EC_WORD_ROCK, + EC_MOVE2(ROCK_BLAST), + EC_WORD_ROCK_HEAD, + EC_MOVE(ROCK_SLIDE), + EC_MOVE(ROCK_SMASH), + EC_MOVE(ROCK_THROW), + EC_MOVE(ROCK_TOMB), + EC_WORD_ROCK_SOLID, + EC_MOVE2(ROLE_PLAY), + EC_MOVE2(ROLLING_KICK), + EC_MOVE(ROLLOUT), + EC_WORD_ROMANTIC, + EC_WORD_ROOM, + EC_POKEMON(ROSELIA), + EC_WORD_ROUGH_SKIN, + EC_WORD_RPG, + EC_WORD_RUBY, + EC_WORD_RULE, + EC_WORD_RUN, + EC_WORD_RUN_AWAY, + EC_WORD_RUNS, +}; + +const u16 gEasyChatWordsByLetter_S[] = { + EC_POKEMON(SABLEYE), + EC_MOVE(SACRED_FIRE), + EC_WORD_SAD, + EC_WORD_SADLY, + EC_MOVE(SAFEGUARD), + EC_WORD_SAID, + EC_POKEMON(SALAMENCE), + EC_WORD_SAND_STREAM, + EC_MOVE(SAND_TOMB), + EC_WORD_SAND_VEIL, + EC_MOVE(SAND_ATTACK), + -1, 2, // Doubled pokemon species name + EC_POKEMON(SANDSHREW), + EC_POKEMON2(SANDSHREW), + -1, 2, // Doubled pokemon species name + EC_POKEMON(SANDSLASH), + EC_POKEMON2(SANDSLASH), + EC_MOVE(SANDSTORM), + EC_WORD_SAPPHIRE, + EC_WORD_SATISFIED, + EC_WORD_SATURDAY, + EC_WORD_SAYS, + EC_WORD_SCARY, + EC_MOVE(SCARY_FACE), + EC_WORD_SCATTER, + EC_POKEMON(SCEPTILE), + EC_WORD_SCHOOL, + EC_POKEMON2(SCIZOR), + EC_MOVE2(SCRATCH), + EC_MOVE(SCREECH), + EC_POKEMON2(SCYTHER), + -1, 2, // Doubled pokemon species name + EC_POKEMON(SEADRA), + EC_POKEMON2(SEADRA), + -1, 2, // Doubled pokemon species name + EC_POKEMON(SEAKING), + EC_POKEMON2(SEAKING), + EC_POKEMON(SEALEO), + EC_WORD_SEARCH, + EC_WORD_SECRET, + EC_WORD_SECRET_BASE, + EC_MOVE2(SECRET_POWER), + EC_WORD_SEE, + EC_WORD_SEE_YA, + EC_POKEMON(SEEDOT), + EC_WORD_SEEK, + EC_POKEMON2(SEEL), + EC_WORD_SEEMS, + EC_WORD_SEES, + EC_MOVE2(SEISMIC_TOSS), + EC_MOVE(SELF_DESTRUCT), + EC_WORD_SENSE, + EC_POKEMON2(SENTRET), + EC_WORD_SERENE_GRACE, + EC_WORD_SERIOUS, + EC_WORD_SERIOUSLY, + EC_WORD_SERVICE, + EC_POKEMON(SEVIPER), + EC_MOVE(SHADOW_BALL), + EC_MOVE(SHADOW_PUNCH), + EC_WORD_SHADOW_TAG, + EC_WORD_SHADY, + EC_WORD_SHAKE, + EC_WORD_SHAKY, + EC_WORD_SHALLOW, + EC_POKEMON(SHARPEDO), + EC_MOVE(SHARPEN), + EC_WORD_SHE, + EC_WORD_SHE_IS, + EC_WORD_SHE_WAS, + EC_WORD_SHED_SKIN, + EC_POKEMON(SHEDINJA), + EC_MOVE(SHEER_COLD), + EC_POKEMON(SHELGON), + EC_WORD_SHELL_ARMOR, + EC_POKEMON2(SHELLDER), + EC_WORD_SHIELD_DUST, + EC_POKEMON(SHIFTRY), + EC_WORD_SHINE, + EC_MOVE2(SHOCK_WAVE), + EC_WORD_SHOCKED, + EC_WORD_SHOPPING, + EC_WORD_SHOULD, + EC_WORD_SHOW, + EC_WORD_SHREDDED, + EC_POKEMON(SHROOMISH), + EC_POKEMON2(SHUCKLE), + EC_POKEMON(SHUPPET), + EC_WORD_SIBLINGS, + EC_WORD_SIGH, + EC_MOVE(SIGNAL_BEAM), + EC_POKEMON(SILCOON), + EC_WORD_SILKY, + EC_WORD_SILVER, + EC_MOVE(SILVER_WIND), + EC_WORD_SIMPLE, + EC_WORD_SINCE, + EC_MOVE(SING), + EC_WORD_SINK, + EC_WORD_SISTER, + -1, 2, // Doubled pokemon species name + EC_POKEMON(SKARMORY), + EC_POKEMON2(SKARMORY), + EC_MOVE(SKETCH), + EC_WORD_SKILL, + EC_MOVE(SKILL_SWAP), + EC_WORD_SKILLED, + EC_POKEMON2(SKIPLOOM), + EC_POKEMON(SKITTY), + EC_MOVE2(SKULL_BASH), + EC_MOVE(SKY_ATTACK), + EC_MOVE(SKY_UPPERCUT), + EC_MOVE2(SLACK_OFF), + EC_POKEMON(SLAKING), + EC_POKEMON(SLAKOTH), + EC_MOVE2(SLAM), + EC_MOVE(SLASH), + EC_WORD_SLEEP, + EC_MOVE2(SLEEP_POWDER), + EC_MOVE2(SLEEP_TALK), + EC_WORD_SLEPT, + EC_WORD_SLIDE, + EC_WORD_SLIMY, + EC_POKEMON2(SLOWBRO), + EC_POKEMON2(SLOWKING), + EC_POKEMON2(SLOWPOKE), + EC_MOVE2(SLUDGE), + EC_MOVE2(SLUDGE_BOMB), + -1, 2, // Doubled pokemon species name + EC_POKEMON(SLUGMA), + EC_POKEMON2(SLUGMA), + EC_WORD_SMACK, + EC_WORD_SMALL, + EC_WORD_SMART, + EC_WORD_SMARTNESS, + EC_POKEMON2(SMEARGLE), + EC_WORD_SMELL, + EC_WORD_SMELL_YA, + EC_MOVE(SMELLING_SALT), + EC_WORD_SMITE, + EC_MOVE(SMOG), + EC_MOVE(SMOKESCREEN), + EC_POKEMON2(SMOOCHUM), + EC_WORD_SMOOTH, + EC_MOVE2(SNATCH), + EC_POKEMON2(SNEASEL), + EC_MOVE(SNORE), + EC_POKEMON2(SNORLAX), + EC_WORD_SNORT, + EC_POKEMON(SNORUNT), + EC_POKEMON2(SNUBBULL), + EC_WORD_SO, + EC_MOVE2(SOFT_BOILED), + EC_WORD_SOFTWARE, + EC_MOVE(SOLAR_BEAM), + EC_POKEMON(SOLROCK), + EC_WORD_SOME, + EC_WORD_SOMEHOW, + EC_WORD_SOMEONE, + EC_WORD_SOMETHING, + EC_WORD_SOMETIME, + EC_WORD_SON, + EC_WORD_SONG, + EC_WORD_SONGS, + EC_MOVE(SONIC_BOOM), + EC_WORD_SOON, + EC_WORD_SORRY, + EC_WORD_SOUNDPROOF, + EC_WORD_SP_ABILITY, + EC_MOVE(SPARK), + EC_POKEMON2(SPEAROW), + EC_WORD_SPECTATOR, + EC_WORD_SPEED_BOOST, + EC_POKEMON(SPHEAL), + EC_MOVE(SPIDER_WEB), + EC_MOVE2(SPIKE_CANNON), + EC_MOVE2(SPIKES), + EC_POKEMON2(SPINARAK), + EC_POKEMON(SPINDA), + EC_WORD_SPIRALING, + EC_WORD_SPIRIT, + EC_MOVE2(SPIT_UP), + EC_MOVE(SPITE), + EC_MOVE2(SPLASH), + EC_POKEMON(SPOINK), + EC_MOVE(SPORE), + EC_WORD_SPORTS, + EC_WORD_SPRING, + EC_POKEMON2(SQUIRTLE), + EC_WORD_STAGE, + EC_POKEMON2(STANTLER), + -1, 2, // Doubled pokemon species name + EC_POKEMON(STARMIE), + EC_POKEMON2(STARMIE), + EC_WORD_START, + -1, 2, // Doubled pokemon species name + EC_POKEMON(STARYU), + EC_POKEMON2(STARYU), + EC_WORD_STATIC, + EC_WORD_STAY_AT_HOME, + EC_WORD_STEEL, + EC_MOVE2(STEEL_WING), + EC_POKEMON2(STEELIX), + EC_WORD_STENCH, + EC_WORD_STICKY_HOLD, + EC_MOVE2(STOCKPILE), + EC_MOVE2(STOMP), + EC_WORD_STOP, + EC_WORD_STORE, + EC_WORD_STORES, + EC_WORD_STORY, + EC_WORD_STRATEGY, + EC_MOVE(STRENGTH), + EC_MOVE(STRING_SHOT), + EC_WORD_STRONG, + EC_MOVE2(STRUGGLE), + EC_WORD_STUDY, + EC_MOVE(STUN_SPORE), + EC_WORD_STURDY, + EC_MOVE(SUBMISSION), + EC_MOVE2(SUBSTITUTE), + EC_WORD_SUCTION_CUPS, + EC_POKEMON2(SUDOWOODO), + EC_POKEMON2(SUICUNE), + EC_WORD_SUMMER, + EC_WORD_SUNDAY, + EC_POKEMON2(SUNFLORA), + EC_POKEMON2(SUNKERN), + EC_MOVE2(SUNNY_DAY), + EC_WORD_SUPER, + EC_MOVE(SUPER_FANG), + EC_MOVE2(SUPERPOWER), + EC_MOVE2(SUPERSONIC), + EC_MOVE2(SURF), + EC_WORD_SURPRISE, + EC_WORD_SURRENDER, + EC_POKEMON(SURSKIT), + EC_POKEMON(SWABLU), + EC_MOVE(SWAGGER), + EC_MOVE2(SWALLOW), + EC_POKEMON(SWALOT), + EC_POKEMON(SWAMPERT), + EC_WORD_SWARM, + EC_MOVE2(SWEET_KISS), + EC_MOVE(SWEET_SCENT), + EC_WORD_SWEETS, + EC_POKEMON(SWELLOW), + EC_MOVE(SWIFT), + EC_WORD_SWIFT_SWIM, + EC_POKEMON2(SWINUB), + EC_MOVE2(SWORDS_DANCE), + EC_WORD_SYNCHRONIZE, + EC_MOVE(SYNTHESIS), + EC_WORD_SYSTEM, +}; + +const u16 gEasyChatWordsByLetter_T[] = { + EC_MOVE2(TACKLE), + EC_MOVE2(TAIL_GLOW), + EC_MOVE(TAIL_WHIP), + EC_POKEMON(TAILLOW), + EC_WORD_TAKE, + EC_MOVE2(TAKE_DOWN), + EC_WORD_TAKE_THAT, + EC_WORD_TALENT, + EC_WORD_TALK, + EC_WORD_TALKING, + EC_POKEMON2(TANGELA), + EC_WORD_TASTY, + EC_MOVE2(TAUNT), + EC_POKEMON2(TAUROS), + EC_WORD_TCH, + EC_WORD_TEACH, + EC_WORD_TEACHER, + EC_WORD_TEACHES, + EC_POKEMON2(TEDDIURSA), + EC_MOVE2(TEETER_DANCE), + EC_MOVE2(TELEPORT), + EC_WORD_TELEVISION, + -1, 2, // Doubled pokemon species name + EC_POKEMON(TENTACOOL), + EC_POKEMON2(TENTACOOL), + -1, 2, // Doubled pokemon species name + EC_POKEMON(TENTACRUEL), + EC_POKEMON2(TENTACRUEL), + EC_WORD_TERRIBLE, + EC_WORD_TEST, + EC_WORD_THAN, + EC_WORD_THANK_YOU, + EC_WORD_THANKS, + EC_WORD_THAT, + EC_WORD_THAT_WAS, + EC_WORD_THAT_S, + EC_WORD_THAT_S_IT_EXCL, + EC_WORD_THE, + EC_WORD_THEIR, + EC_WORD_THERE, + EC_WORD_THESE, + EC_WORD_THESE_WERE, + EC_WORD_THEY, + EC_WORD_THEY_WERE, + EC_WORD_THEY_RE, + EC_WORD_THEY_VE, + EC_WORD_THICK, + EC_WORD_THICK_FAT, + EC_MOVE2(THIEF), + EC_WORD_THIN, + EC_WORD_THING, + EC_WORD_THINGS, + EC_WORD_THINK, + EC_WORD_THINKS, + EC_WORD_THIRSTY, + EC_WORD_THIS, + EC_WORD_THIS_IS_IT_EXCL, + EC_WORD_THOSE, + EC_WORD_THOSE_ARE, + EC_WORD_THOSE_WERE, + EC_MOVE(THRASH), + EC_WORD_THROW, + EC_MOVE(THUNDER), + EC_MOVE2(THUNDER_WAVE), + EC_MOVE(THUNDERBOLT), + EC_MOVE(THUNDER_PUNCH), + EC_MOVE2(THUNDER_SHOCK), + EC_WORD_THURSDAY, + EC_MOVE(TICKLE), + EC_WORD_TICKLISH, + EC_WORD_TIGHT, + EC_WORD_TIME, + EC_WORD_TIMES, + EC_WORD_TIRED, + EC_WORD_TO, + EC_WORD_TO_HER, + EC_WORD_TO_ME, + EC_WORD_TO_THEM, + EC_WORD_TO_US, + EC_WORD_TO_WHOM, + EC_WORD_TODAY, + EC_POKEMON2(TOGEPI), + EC_WORD_TOGETHER, + EC_POKEMON2(TOGETIC), + EC_WORD_TOMORROW, + EC_WORD_TOO, + EC_WORD_TOO_LATE, + EC_WORD_TOO_STRONG, + EC_WORD_TOO_WEAK, + EC_WORD_TOP, + EC_POKEMON(TORCHIC), + EC_POKEMON(TORKOAL), + EC_MOVE(TORMENT), + EC_WORD_TORRENT, + EC_WORD_TOTALLY, + EC_POKEMON2(TOTODILE), + EC_WORD_TOUGH, + EC_WORD_TOUGHNESS, + EC_WORD_TOURNAMENT, + EC_WORD_TOWER, + EC_MOVE2(TOXIC), + EC_WORD_TOYS, + EC_WORD_TRACE, + EC_WORD_TRADE, + EC_WORD_TRAIN, + EC_WORD_TRAINER, + EC_WORD_TRAINS, + EC_MOVE2(TRANSFORM), + EC_POKEMON(TRAPINCH), + EC_WORD_TRAVEL, + EC_WORD_TREASURE, + EC_POKEMON(TREECKO), + EC_WORD_TRENDY, + EC_MOVE2(TRI_ATTACK), + EC_MOVE2(TRICK), + EC_WORD_TRIES, + EC_MOVE2(TRIPLE_KICK), + EC_POKEMON(TROPIUS), + EC_WORD_TRUANT, + EC_WORD_TRULY, + EC_WORD_TRUMP_CARD, + EC_WORD_TRUST, + EC_WORD_TRY, + EC_WORD_TUESDAY, + EC_MOVE2(TWINEEDLE), + EC_WORD_TWIRLING, + EC_MOVE2(TWISTER), + EC_WORD_TYPE, + EC_POKEMON2(TYPHLOSION), + EC_POKEMON2(TYRANITAR), + EC_POKEMON2(TYROGUE), +}; + +const u16 gEasyChatWordsByLetter_U[] = { + EC_WORD_UGLY, + EC_WORD_UH_HUH, + EC_WORD_UH_OH, + EC_WORD_UM, + EC_POKEMON2(UMBREON), + EC_WORD_UNAVOIDABLE, + EC_WORD_UNBELIEVABLE, + EC_WORD_UNCLE, + EC_WORD_UNDERSTAND, + EC_WORD_UNDERSTANDS, + EC_WORD_UNDERSTOOD, + EC_WORD_UNION, + EC_POKEMON2(UNOWN), + EC_WORD_UNTIL, + EC_WORD_UP, + EC_WORD_UPBEAT, + EC_MOVE(UPROAR), + EC_WORD_UPSIDE_DOWN, + EC_WORD_URGH, + EC_POKEMON2(URSARING), + EC_WORD_USE, + EC_WORD_USELESS, + EC_WORD_USES, + EC_WORD_USING, +}; + +const u16 gEasyChatWordsByLetter_V[] = { + EC_WORD_VACATION, + EC_POKEMON2(VAPOREON), + EC_POKEMON2(VENOMOTH), + EC_POKEMON2(VENONAT), + EC_POKEMON2(VENUSAUR), + EC_WORD_VERSION, + EC_WORD_VERSUS, + EC_WORD_VERY, + EC_POKEMON(VIBRAVA), + EC_MOVE2(VICE_GRIP), + EC_WORD_VICTORY, + EC_POKEMON2(VICTREEBEL), + EC_WORD_VIEWING, + EC_POKEMON(VIGOROTH), + -1, 2, // Doubled pokemon species name + EC_POKEMON(VILEPLUME), + EC_POKEMON2(VILEPLUME), + EC_MOVE2(VINE_WHIP), + EC_WORD_VITAL_SPIRIT, + EC_MOVE(VITAL_THROW), + EC_POKEMON(VOLBEAT), + EC_WORD_VOLT_ABSORB, + EC_MOVE2(VOLT_TACKLE), + -1, 2, // Doubled pokemon species name + EC_POKEMON(VOLTORB), + EC_POKEMON2(VOLTORB), + EC_WORD_VORACIOUS, + -1, 2, // Doubled pokemon species name + EC_POKEMON(VULPIX), + EC_POKEMON2(VULPIX), +}; + +const u16 gEasyChatWordsByLetter_W[] = { + EC_WORD_WAAAH, + EC_WORD_WAHAHAHA, + EC_POKEMON(WAILMER), + EC_POKEMON(WAILORD), + EC_WORD_WAIT, + EC_WORD_WAKE_UP, + EC_WORD_WAKES_UP, + EC_WORD_WALK, + EC_WORD_WALKING, + EC_WORD_WALKS, + EC_POKEMON(WALREIN), + EC_WORD_WANDERING, + EC_WORD_WANNABE, + EC_WORD_WANT, + EC_WORD_WANTS, + EC_POKEMON2(WARTORTLE), + EC_WORD_WAS, + EC_WORD_WASN_T, + EC_WORD_WATER, + EC_WORD_WATER_ABSORB, + EC_MOVE2(WATER_GUN), + EC_MOVE2(WATER_PULSE), + EC_MOVE2(WATER_SPORT), + EC_MOVE(WATER_SPOUT), + EC_WORD_WATER_VEIL, + EC_MOVE2(WATERFALL), + EC_WORD_WAY, + EC_WORD_WE, + EC_WORD_WE_RE, + EC_WORD_WE_VE, + EC_WORD_WEAK, + EC_WORD_WEAKENED, + EC_MOVE(WEATHER_BALL), + EC_WORD_WEDNESDAY, + EC_POKEMON2(WEEDLE), + EC_WORD_WEEK, + EC_POKEMON2(WEEPINBELL), + -1, 2, // Doubled pokemon species name + EC_POKEMON(WEEZING), + EC_POKEMON2(WEEZING), + EC_WORD_WEIRD, + EC_WORD_WELCOME, + EC_WORD_WELL, + EC_WORD_WELL_THEN, + EC_WORD_WENT, + EC_WORD_WERE, + EC_WORD_WEREN_T, + EC_WORD_WHAT, + EC_WORD_WHAT_S_UP_QUES, + EC_WORD_WHEN, + EC_WORD_WHEN_I_WIN, + EC_WORD_WHERE, + EC_WORD_WHICH, + EC_WORD_WHILE, + EC_MOVE(WHIRLPOOL), + EC_MOVE2(WHIRLWIND), + EC_POKEMON(WHISCASH), + EC_POKEMON(WHISMUR), + EC_WORD_WHITE_SMOKE, + EC_WORD_WHO, + EC_WORD_WHO_IS, + EC_WORD_WHO_WAS, + EC_WORD_WHOAH, + EC_WORD_WHOM, + EC_WORD_WHOSE, + EC_WORD_WHY, + -1, 2, // Doubled pokemon species name + EC_POKEMON(WIGGLYTUFF), + EC_POKEMON2(WIGGLYTUFF), + EC_WORD_WILD, + EC_WORD_WILL, + EC_WORD_WILL_BE_HERE, + EC_MOVE(WILL_O_WISP), + EC_WORD_WIMPY, + EC_WORD_WIN, + EC_MOVE2(WING_ATTACK), + EC_POKEMON(WINGULL), + EC_WORD_WINNER, + EC_WORD_WINS, + EC_WORD_WINTER, + EC_WORD_WIRELESS, + EC_MOVE2(WISH), + EC_WORD_WITH, + EC_MOVE(WITHDRAW), + EC_WORD_WITHOUT, + EC_WORD_WOBBLY, + -1, 2, // Doubled pokemon species name + EC_POKEMON(WOBBUFFET), + EC_POKEMON2(WOBBUFFET), + EC_WORD_WOMAN, + EC_WORD_WON, + EC_WORD_WON_T, + EC_WORD_WONDER, + EC_WORD_WONDER_GUARD, + EC_POKEMON2(WOOPER), + EC_WORD_WORD, + EC_WORD_WORK, + EC_WORD_WORKING, + EC_WORD_WORKS, + EC_WORD_WORLD, + EC_WORD_WORRY, + EC_WORD_WOULD, + EC_WORD_WOW, + EC_WORD_WOWEE, + EC_MOVE2(WRAP), + EC_WORD_WROOOAAR_EXCL, + EC_POKEMON(WURMPLE), + EC_POKEMON(WYNAUT), +}; + +const u16 gEasyChatWordsByLetter_X[] = { + -1, 2, // Doubled pokemon species name + EC_POKEMON(XATU), + EC_POKEMON2(XATU), +}; + +const u16 gEasyChatWordsByLetter_Y[] = { + EC_WORD_YAHOO, + EC_POKEMON2(YANMA), + EC_MOVE(YAWN), + EC_WORD_YAY, + EC_WORD_YEAH, + EC_WORD_YEAH_YEAH, + EC_WORD_YEEHAW_EXCL, + EC_WORD_YES, + EC_WORD_YES_SIR_EXCL, + EC_WORD_YESTERDAY, + EC_WORD_YET, + EC_WORD_YO, + EC_WORD_YOU, + EC_WORD_YOU_RE, + EC_WORD_YOU_VE, + EC_WORD_YOUNG, + EC_WORD_YOUR, + EC_WORD_YOURS, + EC_WORD_YUP, +}; + +const u16 gEasyChatWordsByLetter_Z[] = { + EC_POKEMON(ZANGOOSE), + EC_MOVE2(ZAP_CANNON), + EC_POKEMON2(ZAPDOS), + EC_POKEMON(ZIGZAGOON), + -1, 2, // Doubled pokemon species name + EC_POKEMON(ZUBAT), + EC_POKEMON2(ZUBAT), +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseHi[] = { + EC_POKEMON2(CLEFFA), + EC_WORD_AIYEEH, + EC_POKEMON2(WEEDLE), + EC_WORD_HERO, + -1, 2, // Doubled pokemon species name + EC_POKEMON2(PIKACHU), + EC_POKEMON(PIKACHU), + EC_MOVE2(LIGHT_SCREEN), + EC_WORD_SHINE, + EC_WORD_LOW, + EC_POKEMON2(CLEFABLE), + EC_WORD_FLYING, + EC_POKEMON2(PIDGEOT), + EC_POKEMON2(PIDGEOTTO), + EC_WORD_LEFT, + -1, 2, // Doubled pokemon species name + EC_POKEMON2(PICHU), + EC_POKEMON(PICHU), + EC_MOVE2(SCRATCH), + EC_WORD_SURPRISE, + EC_MOVE2(HYPER_FANG), + EC_POKEMON2(CLEFAIRY), + EC_WORD_DROUGHT, + EC_WORD_HIDDEN, + EC_WORD_PERSON, + EC_WORD_AWFUL, + EC_POKEMON2(CHARMANDER), + -1, 2, // Doubled pokemon species name + EC_POKEMON2(STARYU), + EC_POKEMON(STARYU), + EC_WORD_ALONE, + EC_POKEMON2(CYNDAQUIL), + EC_MOVE2(EMBER), + EC_POKEMON(VIBRAVA), + EC_WORD_BORED, + EC_POKEMON2(SUNKERN), + EC_WORD_SECRET, + EC_WORD_SECRET_BASE, + EC_MOVE2(SECRET_POWER), + EC_POKEMON2(TEDDIURSA), + EC_WORD_HIYAH, + EC_MOVE2(DIZZY_PUNCH), + EC_WORD_LIGHTNINGROD, + -1, 2, // Doubled pokemon species name + EC_POKEMON2(VOLTORB), + EC_POKEMON(VOLTORB), + EC_WORD_DAYTIME, + EC_MOVE2(BULK_UP), + EC_WORD_NAP, + EC_WORD_HEROINE, + EC_POKEMON(FEEBAS), +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseFu[] = { + EC_WORD_FIGHT, + EC_POKEMON2(MOLTRES), + EC_WORD_FASHION, + EC_WORD_FEAR, + EC_WORD_FEVER, + EC_MOVE2(IMPRISON), + EC_POKEMON2(FLAREON), + -1, 2, // Doubled pokemon species name + EC_POKEMON2(ALAKAZAM), + EC_POKEMON(ALAKAZAM), + EC_POKEMON2(MAGMAR), + EC_POKEMON(GRUMPIG), + EC_MOVE2(FEATHER_DANCE), + EC_POKEMON2(FORRETRESS), + EC_MOVE2(WHIRLWIND), + EC_WORD_COMPOUNDEYES, + -1, 2, // Doubled pokemon species name + EC_POKEMON2(WIGGLYTUFF), + EC_POKEMON(WIGGLYTUFF), + EC_MOVE2(BEAT_UP), + EC_WORD_MYSTERY, + EC_POKEMON2(IVYSAUR), + EC_POKEMON2(BULBASAUR), + EC_WORD_MARVEL_SCALE, + EC_WORD_WONDER_GUARD, + EC_POKEMON2(VENUSAUR), + EC_WORD_LACKS, + EC_WORD_RESUSCITATE, + EC_WORD_SMACK, + EC_WORD_FUFUFU, + EC_POKEMON2(AERODACTYL), + EC_WORD_WIMPY, + EC_POKEMON2(MAGBY), + EC_WORD_LOL, + EC_MOVE2(BLIZZARD), + -1, 2, // Doubled pokemon species name + EC_POKEMON2(IGGLYBUFF), + EC_POKEMON(IGGLYBUFF), + EC_WORD_SNORT, + EC_MOVE2(STOMP), + EC_WORD_INSOMNIA, + EC_WORD_WINTER, + EC_WORD_LEVITATE, + EC_POKEMON(FLYGON), + EC_WORD_PLUS, + EC_MOVE2(BLAST_BURN), + EC_POKEMON(PLUSLE), + EC_POKEMON2(UMBREON), + EC_MOVE2(FLASH), + EC_WORD_WOBBLY, + EC_MOVE2(TEETER_DANCE), + EC_WORD_PRETEND, + EC_POKEMON2(ARTICUNO), + EC_WORD_WANNABE, + -1, 2, // Doubled pokemon species name + EC_POKEMON2(JIGGLYPUFF), + EC_POKEMON(JIGGLYPUFF), + EC_POKEMON2(SNUBBULL), + EC_WORD_SHAKY, + EC_MOVE2(CRUSH_CLAW), + EC_MOVE2(BLAZE_KICK), + EC_MOVE2(PRESENT), + EC_WORD_PRESSURE, + EC_WORD_BLEND, + EC_WORD_FRONTIER, + EC_WORD_HUMPH, + EC_MOVE2(ERUPTION), +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseHe[] = { + EC_WORD_HEY, + EC_POKEMON(CORPHISH), + EC_WORD_BABY, + EC_POKEMON2(BAYLEEF), + EC_WORD_BEST, + EC_WORD_LOUSY, + EC_WORD_HEHEHE, + -1, 2, // Doubled pokemon species name + EC_POKEMON2(GRIMER), + EC_POKEMON(GRIMER), + -1, 2, // Doubled pokemon species name + EC_POKEMON2(MUK), + EC_POKEMON(MUK), + EC_WORD_LIQUID_OOZE, + EC_MOVE2(SLUDGE), + EC_MOVE2(SLUDGE_BOMB), + EC_MOVE2(GLARE), + EC_WORD_HEH, + -1, 2, // Doubled pokemon species name + EC_POKEMON2(HERACROSS), + EC_POKEMON(HERACROSS), + EC_POKEMON(PELIPPER), + EC_POKEMON2(HOUNDOOM), + EC_POKEMON2(PERSIAN), + EC_WORD_RIPPED, + EC_POKEMON2(LICKITUNG), + EC_WORD_STUDY, + EC_WORD_COLOR_CHANGE, + EC_MOVE2(TRANSFORM), +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseHo[] = { + EC_MOVE2(POISON_TAIL), + EC_WORD_POINTS, + EC_POKEMON2(HO_OH), + EC_WORD_SOUNDPROOF, + EC_WORD_ADVENTURE, + EC_WORD_EFFECT_SPORE, + EC_MOVE2(ROAR), + EC_POKEMON(WAILORD), + EC_POKEMON(WAILMER), + EC_WORD_DUDE, + EC_WORD_BOARD, + EC_POKEMON2(HOOTHOOT), + EC_POKEMON(SALAMENCE), + EC_WORD_BALL, + EC_MOVE2(BONE_RUSH), + EC_WORD_THEY, + EC_WORD_THEY_WERE, + EC_WORD_TO_THEM, + EC_WORD_THEIR, + EC_WORD_THEY_RE, + EC_WORD_THEY_VE, + EC_WORD_POKENAV, + EC_WORD_POKEMON, + EC_WORD_GET, + EC_WORD_POKEDEX, + EC_WORD_PKRS, + EC_MOVE2(CAMOUFLAGE), + EC_WORD_WANT, + EC_MOVE2(COVET), + EC_POKEMON(AGGRON), + EC_MOVE2(TAIL_GLOW), + EC_POKEMON(POOCHYENA), + EC_POKEMON2(PIDGEY), + EC_WORD_AS_MUCH_AS, + EC_POKEMON2(PONYTA), + EC_MOVE2(BONE_CLUB), + EC_MOVE2(BONEMERANG), + EC_WORD_FIRE, + EC_MOVE2(FIRE_SPIN), + EC_WORD_FLAME_BODY, + EC_MOVE2(FIRE_PUNCH), + EC_POKEMON2(SKIPLOOM), + EC_WORD_HOHOHO, + EC_WORD_PRAISE, + EC_WORD_UH_HUH, + EC_POKEMON2(PORYGON), + EC_POKEMON2(PORYGON2), + EC_MOVE2(VOLT_TACKLE), + EC_WORD_POKEBLOCK, + EC_MOVE2(PERISH_SONG), + EC_WORD_SHREDDED, + EC_POKEMON(CASTFORM), + EC_WORD_BOOK, + EC_WORD_SERIOUS, + EC_WORD_REALLY, +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseMa[] = { + EC_WORD_OH_DEAR, + EC_WORD_IN, + EC_WORD_GIVE_UP, + EC_WORD_MINUS, + EC_POKEMON(MINUN), + EC_WORD_DAILY, + EC_WORD_OWN_TEMPO, + EC_MOVE2(WRAP), + EC_MOVE2(SPIKES), + -1, 2, // Doubled pokemon species name + EC_POKEMON2(MAGCARGO), + EC_POKEMON(MAGCARGO), + EC_MOVE2(MAGNITUDE), + EC_POKEMON(MAKUHITA), + -1, 2, // Doubled pokemon species name + EC_POKEMON2(SLUGMA), + EC_POKEMON(SLUGMA), + EC_WORD_MAGMA_ARMOR, + EC_POKEMON2(QUILAVA), + EC_WORD_OVERDO, + EC_WORD_LOSS, + EC_WORD_IF_I_LOSE, + EC_WORD_LOST, + EC_WORD_LOSE, + EC_WORD_TRULY, + EC_WORD_SERIOUSLY, + EC_MOVE2(MAGICAL_LEAF), + EC_MOVE2(MAGIC_COAT), + EC_WORD_MACHINE, + EC_WORD_OUT, + EC_WORD_MASTER, + EC_WORD_INCREASING, + EC_WORD_TOO, + EC_WORD_LIKE, + EC_POKEMON2(BELLSPROUT), + -1, 2, // Doubled pokemon species name + EC_POKEMON2(WEEZING), + EC_POKEMON(WEEZING), + EC_WORD_SMELL, + EC_WORD_YET, + EC_WORD_MISTAKE, + EC_POKEMON(LINOONE), + EC_WORD_TOTALLY, + EC_MOVE2(MUD_SHOT), + EC_MOVE2(MACH_PUNCH), + EC_WORD_FESTIVAL, + EC_WORD_UNTIL, + EC_WORD_WAIT, + EC_WORD_GUARD, + EC_MOVE2(PROTECT), + EC_POKEMON(CASCOON), + -1, 2, // Doubled pokemon species name + EC_POKEMON2(MARILL), + EC_POKEMON(MARILL), + -1, 2, // Doubled pokemon species name + EC_POKEMON2(AZUMARILL), + EC_POKEMON(AZUMARILL), + EC_MOVE2(DEFENSE_CURL), + EC_WORD_AS_IF, + EC_POKEMON(SWALOT), + -1, 2, // Doubled pokemon species name + EC_POKEMON2(ELECTRODE), + EC_POKEMON(ELECTRODE), + EC_MOVE2(ROLLING_KICK), + EC_WORD_COMICS, + EC_POKEMON2(MANKEY), + EC_WORD_SATISFIED, + EC_POKEMON2(MANTINE), +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseMi[] = { + EC_WORD_PARTNER, + EC_MOVE2(SUBSTITUTE), + EC_WORD_RIGHT, + EC_MOVE2(DETECT), + EC_MOVE2(PIN_MISSILE), + EC_WORD_WATER, + EC_MOVE2(WATER_SPORT), + EC_POKEMON(MUDKIP), + EC_MOVE2(WATER_GUN), + EC_MOVE2(MIST_BALL), + EC_MOVE2(WATER_PULSE), + EC_WORD_WATER_VEIL, + EC_WORD_SHOW, + EC_WORD_SEE, + EC_WORD_DID, + EC_MOVE2(FURY_ATTACK), + EC_MOVE2(FURY_SWIPES), + EC_MOVE2(DESTINY_BOND), + EC_WORD_LOOKS, + EC_WORD_REJECT, + EC_WORD_ACCEPT, + EC_POKEMON2(DRATINI), + EC_MOVE2(FALSE_SWIPE), + EC_MOVE2(FORESIGHT), + EC_POKEMON2(MEW), + EC_POKEMON2(MEWTWO), + EC_MOVE2(MIRROR_COAT), + EC_MOVE2(FUTURE_SIGHT), + EC_WORD_SEES, + EC_MOVE2(MILK_DRINK), + EC_POKEMON2(MILTANK), + EC_POKEMON(MILOTIC), + EC_WORD_WE, + EC_WORD_BEEN, + EC_WORD_TO_US, + EC_WORD_OUR, + EC_WORD_WE_RE, +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseMu[] = { + EC_WORD_MOOD, + EC_POKEMON2(MISDREAVUS), + EC_WORD_OLDEN, + EC_WORD_ARRGH, + EC_WORD_BUG, + EC_WORD_SWARM, + EC_WORD_RATHER, + EC_POKEMON2(SMOOCHUM), + EC_WORD_INVINCIBLE, + EC_WORD_HEART, + EC_WORD_MUFUFU, + EC_WORD_MMM, +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseMe[] = { + EC_MOVE2(CALM_MIND), + EC_WORD_MAIL, + EC_MOVE2(MEGA_DRAIN), + EC_MOVE2(MEGA_KICK), + EC_MOVE2(MEGA_PUNCH), + EC_POKEMON2(MEGANIUM), + EC_MOVE2(MEGAHORN), + EC_WORD_SEEK, + EC_MOVE2(HIDDEN_POWER), + EC_WORD_RARE, + EC_POKEMON(METAGROSS), + EC_POKEMON2(DITTO), + EC_MOVE2(METAL_CLAW), + EC_POKEMON(METANG), + EC_WORD_DESTROYED, + EC_WORD_MESSAGE, + EC_WORD_AWFULLY, + -1, 2, // Doubled pokemon species name + EC_POKEMON2(TENTACOOL), + EC_POKEMON(TENTACOOL), + EC_WORD_FIERY, + EC_POKEMON2(MAREEP), + EC_MOVE2(ATTRACT), + EC_WORD_CUTE_CHARM, + EC_WORD_IMMUNITY, +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseMo[] = { + EC_WORD_ALMOST, + EC_WORD_BLAZE, + EC_WORD_NEARLY, + EC_WORD_MODE, + EC_WORD_OLD, + EC_WORD_THURSDAY, + EC_POKEMON2(FLAAFFY), + EC_WORD_LISTENING, + EC_WORD_OWN, + EC_WORD_MORE, + EC_WORD_DIDN_T, + EC_WORD_PICKUP, + EC_MOVE2(MIMIC), + EC_WORD_TOO_LATE, + EC_WORD_PATTERN, + EC_WORD_FLASH_FIRE, + EC_WORD_RECEIVED, + EC_POKEMON2(VENOMOTH), + EC_WORD_DOESN_T, + EC_POKEMON2(TANGELA), +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseYa[] = { + EC_WORD_HOO_HAH, + EC_WORD_PROMISE, + EC_WORD_KIND, + EC_POKEMON(BALTOY), + EC_WORD_HOLIDAY, + EC_WORD_NEGATIVE, + EC_MOVE2(FRUSTRATION), + EC_WORD_DONE, + EC_WORD_FINALLY, + EC_WORD_ANY, + EC_WORD_YAHOO, + EC_POKEMON2(SLOWKING), + EC_POKEMON2(SLOWBRO), + EC_MOVE2(LEECH_SEED), + EC_POKEMON2(SLOWPOKE), + EC_WORD_DANGER, + EC_POKEMON2(MURKROW), + EC_POKEMON(SABLEYE), + EC_WORD_DEFEATED, + EC_WORD_BEAT, + EC_WORD_VITAL_SPIRIT, + EC_POKEMON(VIGOROTH), + EC_WORD_YOUNG, + EC_POKEMON2(YANMA), +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseYu[] = { + EC_POKEMON(SNORUNT), + EC_WORD_TAKE, + EC_WORD_UNION, + EC_MOVE2(METRONOME), + EC_WORD_DREAM, + EC_MOVE2(DREAM_EATER), + EC_WORD_ALLOW, + EC_WORD_FORGET, + EC_POKEMON(CRADILY), + -1, 2, // Doubled pokemon species name + EC_POKEMON2(KADABRA), + EC_POKEMON(KADABRA), +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseYo[] = { + EC_WORD_WITHOUT, + EC_WORD_YO, + EC_MOVE2(ACID), + EC_WORD_COME_OVER, + EC_WORD_KINDERGARTEN, + EC_WORD_CHLOROPHYLL, + EC_WORD_AFTER, + EC_POKEMON2(LARVITAR), + EC_WORD_OH_KAY, + EC_WORD_BEFORE, + EC_WORD_GREAT, + EC_MOVE2(MEDITATE), + EC_WORD_PURE_POWER, + EC_WORD_WELL, + EC_MOVE2(SNATCH), + EC_WORD_OKAY, + EC_WORD_PLANS, + EC_WORD_NIGHTTIME, + EC_WORD_WHILE, + EC_POKEMON(DUSKULL), + EC_WORD_EASY, + EC_WORD_INSTEAD, + EC_WORD_NIGHT, + EC_POKEMON2(NOCTOWL), + EC_WORD_COUNT_ON, + EC_WORD_WEAK, + EC_WORD_TOO_WEAK, + EC_WORD_WEAKENED, +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseRa[] = { + EC_POKEMON2(RAIKOU), + EC_WORD_WEEK, + -1, 2, // Doubled pokemon species name + EC_POKEMON2(RAICHU), + EC_POKEMON(RAICHU), + EC_WORD_RIVAL, + EC_WORD_LIFE, + EC_POKEMON(MANECTRIC), + EC_WORD_SIMPLE, + EC_WORD_PUSHOVER, + EC_POKEMON(SWAMPERT), + EC_POKEMON(ELECTRIKE), + EC_WORD_SEEMS, + EC_WORD_RADIO, + EC_MOVE2(LUSTER_PURGE), + EC_POKEMON2(CHANSEY), + EC_POKEMON2(RATICATE), + EC_POKEMON(LATIAS), + EC_POKEMON(LATIOS), + EC_POKEMON(LUVDISC), + EC_POKEMON2(LAPRAS), + EC_WORD_LOVEY_DOVEY, + -1, 2, // Doubled pokemon species name + EC_POKEMON2(VILEPLUME), + EC_POKEMON(VILEPLUME), + EC_WORD_LALALA, + EC_POKEMON(RALTS), + EC_WORD_FORGETS, + EC_WORD_APPEARS, + EC_WORD_RANK, + -1, 2, // Doubled pokemon species name + EC_POKEMON2(LANTURN), + EC_POKEMON(LANTURN), +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseRi[] = { + EC_WORD_LEADER, + EC_MOVE2(LEAF_BLADE), + EC_POKEMON2(CHARMELEON), + EC_POKEMON2(CHARIZARD), + EC_MOVE2(RECYCLE), + EC_MOVE2(REFLECT), + EC_MOVE2(REFRESH), + EC_MOVE2(REVENGE), + EC_WORD_RIBBON, + EC_WORD_TRENDY, + EC_MOVE2(DRAGON_RAGE), + EC_MOVE2(DRAGON_BREATH), + EC_MOVE2(DRAGON_DANCE), + EC_WORD_VACATION, + EC_POKEMON(LILEEP), + EC_POKEMON2(URSARING), + EC_WORD_SHIELD_DUST, +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseRu[] = { + EC_POKEMON2(JYNX), + EC_WORD_ROOM, + EC_WORD_RULE, + EC_POKEMON2(LUGIA), + EC_WORD_LOOK, + EC_POKEMON(LUNATONE), + EC_WORD_RUBY, + EC_WORD_THAN, + EC_POKEMON(AZURILL), + EC_POKEMON(LUDICOLO), + EC_WORD_HAPPILY, +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseRe[] = { + -1, 2, // Doubled pokemon species name + EC_POKEMON2(MAGNETON), + EC_POKEMON(MAGNETON), + EC_MOVE2(ICE_PUNCH), + EC_MOVE2(ICE_BEAM), + EC_POKEMON(REGICE), + EC_POKEMON(REGISTEEL), + EC_POKEMON(REGIROCK), + EC_POKEMON(RAYQUAZA), + EC_WORD_UGLY, + EC_POKEMON2(LEDIAN), + EC_POKEMON2(LEDYBA), + EC_WORD_FANTASTIC, + EC_WORD_LEVEL, + EC_MOVE2(FURY_CUTTER), + EC_MOVE2(COMET_PUNCH), + EC_WORD_RENTAL, +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseRo[] = { + EC_MOVE2(SKULL_BASH), + -1, 2, // Doubled pokemon species name + EC_POKEMON2(VULPIX), + EC_POKEMON(VULPIX), + EC_POKEMON(ROSELIA), + EC_MOVE2(LOCK_ON), + EC_MOVE2(ROCK_BLAST), + EC_WORD_ROMANTIC, + EC_WORD_QUESTION, +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseWa[] = { + EC_WORD_YAY, + EC_WORD_WORLD, + EC_WORD_AWW, + EC_WORD_WIRELESS, + EC_WORD_WOWEE, + EC_POKEMON(COMBUSKEN), + EC_WORD_UNDERSTAND, + EC_WORD_UNDERSTANDS, + EC_WORD_FAINT, + EC_WORD_ANTICIPATION, + EC_WORD_ONCE, + EC_WORD_MOVE, + EC_WORD_WE_VE, + EC_WORD_FAINTED, + EC_WORD_WOMAN, + EC_WORD_SHE, + EC_WORD_SHE_WAS, + EC_WORD_TO_HER, + EC_WORD_HERS, + EC_WORD_SHE_IS, + EC_WORD_SOME, + EC_POKEMON2(JUMPLUFF), + EC_MOVE2(COTTON_SPORE), + EC_WORD_GWAH, + EC_POKEMON2(TOTODILE), + EC_WORD_WAHAHAHA, + EC_WORD_ANYWHERE, + EC_MOVE2(STRUGGLE), + EC_WORD_BADLY, + -1, 2, // Doubled pokemon species name + EC_POKEMON2(MACHOP), + EC_POKEMON(MACHOP), +}; + +const struct EasyChatWordsByLetter gEasyChatWordsByLetterPointers[] = { + { + .words = gEasyChatWordsByLetter_Others, + .numWords = 10, + }, + { + .words = gEasyChatWordsByLetter_A, + .numWords = 106, + }, + { + .words = gEasyChatWordsByLetter_B, + .numWords = 86, + }, + { + .words = gEasyChatWordsByLetter_C, + .numWords = 119, + }, + { + .words = gEasyChatWordsByLetter_D, + .numWords = 94, + }, + { + .words = gEasyChatWordsByLetter_E, + .numWords = 59, + }, + { + .words = gEasyChatWordsByLetter_F, + .numWords = 80, + }, + { + .words = gEasyChatWordsByLetter_G, + .numWords = 98, + }, + { + .words = gEasyChatWordsByLetter_H, + .numWords = 101, + }, + { + .words = gEasyChatWordsByLetter_I, + .numWords = 48, + }, + { + .words = gEasyChatWordsByLetter_J, + .numWords = 13, + }, + { + .words = gEasyChatWordsByLetter_K, + .numWords = 33, + }, + { + .words = gEasyChatWordsByLetter_L, + .numWords = 82, + }, + { + .words = gEasyChatWordsByLetter_M, + .numWords = 142, + }, + { + .words = gEasyChatWordsByLetter_N, + .numWords = 54, + }, + { + .words = gEasyChatWordsByLetter_O, + .numWords = 44, + }, + { + .words = gEasyChatWordsByLetter_P, + .numWords = 102, + }, + { + .words = gEasyChatWordsByLetter_Q, + .numWords = 6, + }, + { + .words = gEasyChatWordsByLetter_R, + .numWords = 80, + }, + { + .words = gEasyChatWordsByLetter_S, + .numWords = 262, + }, + { + .words = gEasyChatWordsByLetter_T, + .numWords = 133, + }, + { + .words = gEasyChatWordsByLetter_U, + .numWords = 24, + }, + { + .words = gEasyChatWordsByLetter_V, + .numWords = 33, + }, + { + .words = gEasyChatWordsByLetter_W, + .numWords = 111, + }, + { + .words = gEasyChatWordsByLetter_X, + .numWords = 4, + }, + { + .words = gEasyChatWordsByLetter_Y, + .numWords = 19, + }, + { + .words = gEasyChatWordsByLetter_Z, + .numWords = 8, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseHi, + .numWords = 55, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseFu, + .numWords = 71, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseHe, + .numWords = 32, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseHo, + .numWords = 55, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseMa, + .numWords = 74, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseMi, + .numWords = 37, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseMu, + .numWords = 12, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseMe, + .numWords = 26, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseMo, + .numWords = 20, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseYa, + .numWords = 24, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseYu, + .numWords = 13, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseYo, + .numWords = 28, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseRa, + .numWords = 36, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseRi, + .numWords = 17, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseRu, + .numWords = 11, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseRe, + .numWords = 18, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseRo, + .numWords = 10, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseWa, + .numWords = 33, + }, +}; diff --git a/src/easy_chat.c b/src/easy_chat.c index 6a103dd7b0..3c436246db 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -1,5 +1,3 @@ - -// Includes #include "global.h" #include "alloc.h" #include "bard_music.h" @@ -33,6 +31,7 @@ #include "constants/event_objects.h" #include "constants/flags.h" #include "constants/songs.h" +#include "constants/species.h" #define EZCHAT_TASK_STATE 0 #define EZCHAT_TASK_KIND 1 @@ -41,123 +40,6 @@ #define EZCHAT_TASK_UNK06 6 #define EZCHAT_TASK_SIZE 7 -struct EasyChatScreenTemplate -{ - u8 unk_00; - u8 numColumns; - u8 numRows; - u8 unk_03_0:7; - u8 unk_03_7:1; - const u8 *titleText; - const u8 *instructionsText1; - const u8 *instructionsText2; - const u8 *confirmText1; - const u8 *confirmText2; -}; - -struct EasyChatScreen -{ - /*0x00*/ u8 kind; - /*0x01*/ u8 templateId; - /*0x02*/ u8 numColumns; - /*0x03*/ u8 numRows; - /*0x04*/ u8 state; - /*0x05*/ s8 mainCursorColumn; - /*0x06*/ s8 mainCursorRow; - /*0x07*/ u8 unk_07; - /*0x08*/ u8 unk_08; - /*0x09*/ u8 unk_09; - /*0x0A*/ s8 unk_0a; - /*0x0B*/ s8 unk_0b; - /*0x0C*/ u8 unk_0c; - /*0x0D*/ u8 unk_0d; - /*0x0E*/ u8 unk_0e; - /*0x0F*/ u8 unk_0f; - /*0x10*/ s8 unk_10; - /*0x11*/ s8 unk_11; - /*0x12*/ u8 sizeParam; - /*0x13*/ u8 unk_13; - /*0x14*/ u8 unk_14[0x20]; - /*0x34*/ const u8 *titleText; - /*0x38*/ u16 *words; - /*0x3C*/ u16 ecWordBuffer[9]; -}; - -struct Unk203A11C -{ - u16 unk0; - u16 windowId; - u16 unk4; - u8 unk6; - u8 unk7; - s8 unk8; - u8 unk9; - u8 unkA; - u8 unkB[0xC1]; - u8 unkCC[0x202]; - u16 unk2CE; - int unk2D0; - int unk2D4; - struct Sprite *unk2D8; - struct Sprite *unk2DC; - struct Sprite *unk2E0; - struct Sprite *unk2E4; - struct Sprite *unk2E8; - struct Sprite *unk2EC; - struct Sprite *unk2F0; - struct Sprite *unk2F4; - struct Sprite *unk2F8; - struct Sprite *unk2FC; - u16 unk300[BG_SCREEN_SIZE / 2]; - u16 unkB00[BG_SCREEN_SIZE / 2]; -}; - -struct Unk08597C30 -{ - u8 unk0_0:5; - u8 unk0_5:3; - u8 unk1; - u8 unk2; - u8 unk3; -}; - -struct EasyChatWordInfo -{ - const u8 *text; - int alphabeticalOrder; - int enabled; -}; - -typedef union -{ - const u16 *valueList; - const struct EasyChatWordInfo *words; -} EasyChatGroupWordData; - -struct EasyChatGroup -{ - EasyChatGroupWordData wordData; - u16 numWords; - u16 numEnabledWords; -}; - -struct Unk203A120 -{ - u16 unk0; - u16 unk2[EC_NUM_GROUPS]; - u16 unk2E[27]; - u16 unk64[27][270]; - u8 filler3958[0x2C]; - u16 unk3984[0x10E]; - u16 unk3BA0; -}; /*size = 0x3BA4*/ - -struct EasyChatWordsByLetter -{ - const u16 *words; - int numWords; -}; - EWRAM_DATA struct EasyChatScreen *gEasyChatScreen = NULL; EWRAM_DATA struct Unk203A11C *gUnknown_0203A11C = 0; EWRAM_DATA struct Unk203A120 *gUnknown_0203A120 = 0; @@ -169,7 +51,6 @@ static void sub_811A2FC(u8); static void sub_811A4D0(MainCallback); static bool32 sub_811A88C(u16); static void sub_811A8A4(u16); -void sub_811A8F0(void); static bool8 EasyChat_AllocateResources(u8, u16 *, u8); static void EasyChat_FreeResources(void); static u16 sub_811AAAC(void); @@ -185,11 +66,11 @@ static u16 sub_811B0BC(void); static u16 sub_811B0E8(void); static u16 sub_811B0F8(void); static u16 sub_811B150(void); -u16 sub_811B1B4(void); -u8 sub_811BA68(void); +static u16 sub_811B1B4(void); +static u8 sub_811BA68(void); static u8 sub_811BCC8(u8); static void sub_811BDF0(u8 *); -void sub_811BF78(void); +static void sub_811BF78(void); static bool8 sub_811BF8C(void); static bool8 sub_811BFA4(void); static void sub_811C13C(void); @@ -198,9 +79,9 @@ static bool8 sub_811C170(void); static bool8 sub_811F28C(void); static void sub_811F2B8(void); static u8 sub_811F3AC(void); -int sub_811BA3C(void); -int sub_811B184(void); -int sub_811B264(void); +static int sub_811BA3C(void); +static int sub_811B184(void); +static int sub_811B264(void); static int sub_811B32C(void); static int sub_811B2B0(void); static int sub_811B33C(void); @@ -217,16 +98,16 @@ static void sub_811B454(void); static int sub_811BD64(void); static int sub_811BDB0(void); static int sub_811BD2C(void); -int sub_811BCF4(void); +static int sub_811BCF4(void); static u16 sub_811B8E8(void); static u8 sub_811F3B8(u8); static void sub_811F548(int, u16); static int sub_811B908(void); static u16 sub_811F5B0(void); static void sub_811B488(u16); -u16 sub_811B940(void); +static u16 sub_811B940(void); static u16 sub_811F578(u16); -int sub_811BF88(int); +static int sub_811BF88(int); static u16 sub_811B8C8(void); static int sub_811B568(u32); static int sub_811B634(u32); @@ -253,6 +134,7 @@ static void sub_811D2C8(void); static void sub_811D684(void); static void sub_811DE90(void); static void sub_811DEC4(void); +static void sub_811DF28(struct Sprite *); static void sub_811DE5C(u8, u8, u8, u8); static void sub_811E5D4(void); static void sub_811E720(void); @@ -322,7 +204,7 @@ static void sub_811D7C8(void); static int sub_811DE48(void); static void sub_811D7EC(void); static void sub_811D830(void); -void sub_811D058(u8, u8, const u8 *, u8, u8, u8, u8, u8, u8); +static void sub_811D058(u8, u8, const u8 *, u8, u8, u8, u8, u8, u8); static void sub_811DD84(void); static void sub_811D6F4(void); static void sub_811D758(void); @@ -344,49 +226,856 @@ static u8 *CopyEasyChatWordPadded(u8 *, u16, u16); static u8 sub_811F860(u16); static u16 sub_811F5C4(u16); static u16 sub_811F6B8(u16); -bool8 sub_811F764(u16, u8); +static bool8 sub_811F764(u16, u8); static int sub_811F838(u16); +static void sub_811A8CC(void); +static void sub_811A8F0(void); +static void sub_811A914(void); +static void sub_811A938(void); -extern const struct { +struct Unk8597530 +{ u16 word; MainCallback callback; -} gUnknown_08597530[4]; +}; -extern const struct EasyChatScreenTemplate gEasyChatScreenTemplates[21]; -extern const u8 gUnknown_08597748[][7]; -extern const u16 gUnknown_08597764[]; -extern const u16 gUnknown_0859776C[][2]; -extern const struct BgTemplate gUnknown_08597C54[4]; -extern const struct WindowTemplate gUnknown_08597C64[]; -extern const u32 gUnknown_08597B54[]; -extern const struct Unk08597C30 gUnknown_08597C30[]; -extern const u16 gUnknown_08597B14[]; -extern const u16 gUnknown_08597B34[]; -extern const u16 gUnknown_08597C1C[]; -extern const u16 gUnknown_08597C24[]; -extern const struct WindowTemplate gUnknown_08597C84; -extern const u8 gUnknown_08597C8C[4]; -extern const u8 *const gUnknown_08597C90[4]; -extern const struct SpriteSheet gUnknown_08597CA0[]; -extern const struct SpritePalette gUnknown_08597CC0[]; -extern const struct CompressedSpriteSheet gUnknown_08597CE8[]; -extern const struct SpriteTemplate gUnknown_08597D18; -extern const struct SpriteTemplate gUnknown_08597D68; -extern const struct SpriteTemplate gUnknown_08597DF0; -extern const struct SpriteTemplate gUnknown_08597DD0; -extern const struct SpriteTemplate gUnknown_08597E48; -extern const struct SpriteTemplate gUnknown_08597E30; -extern const u8 gUnknown_08597D08[]; -extern const u8 gUnknown_08597E60[][4]; -extern const u8 *const gUnknown_08597E6C[][4]; -extern const struct EasyChatGroup gEasyChatGroups[]; -extern const u16 gUnknown_0859E62C[]; -extern const u16 gUnknown_0859E634[]; -extern const u16 gUnknown_0859E640[]; -extern const u16 gUnknown_0859E64C[]; -extern const u8 *const gEasyChatGroupNamePointers[]; -extern const struct EasyChatWordsByLetter gEasyChatWordsByLetterPointers[]; -extern const u16 gUnknown_0859E658[1]; +static const struct Unk8597530 sUnknown_08597530[] = { + { + .word = 26, + .callback = sub_811A8CC, + }, + { + .word = 25, + .callback = sub_811A8F0, + }, + { + .word = 28, + .callback = sub_811A914, + }, + { + .word = 27, + .callback = sub_811A938, + }, +}; +static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { + { + .unk_00 = 0, + .numColumns = 2, + .numRows = 2, + .unk_03_0 = 0, + .unk_03_7 = 0, + .titleText = gText_Profile, + .instructionsText1 = gText_CombineFourWordsOrPhrases, + .instructionsText2 = gText_AndMakeYourProfile, + .confirmText1 = gText_YourProfile, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 1, + .numColumns = 2, + .numRows = 3, + .unk_03_0 = 1, + .unk_03_7 = 0, + .titleText = gText_AtTheBattlesStart, + .instructionsText1 = gText_CombineSixWordsOrPhrases, + .instructionsText2 = gText_AndMakeAMessage, + .confirmText1 = gText_YourFeelingAtTheBattlesStart, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 2, + .numColumns = 2, + .numRows = 3, + .unk_03_0 = 1, + .unk_03_7 = 0, + .titleText = gText_UponWinningABattle, + .instructionsText1 = gText_CombineSixWordsOrPhrases, + .instructionsText2 = gText_AndMakeAMessage, + .confirmText1 = gText_WhatYouSayIfYouWin, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 3, + .numColumns = 2, + .numRows = 3, + .unk_03_0 = 1, + .unk_03_7 = 0, + .titleText = gText_UponLosingABattle, + .instructionsText1 = gText_CombineSixWordsOrPhrases, + .instructionsText2 = gText_AndMakeAMessage, + .confirmText1 = gText_WhatYouSayIfYouLose, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 4, + .numColumns = 2, + .numRows = 5, + .unk_03_0 = 2, + .unk_03_7 = 0, + .titleText = NULL, + .instructionsText1 = gText_CombineNineWordsOrPhrases, + .instructionsText2 = gText_AndMakeAMessage2, + .confirmText1 = gText_TheMailMessage, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 5, + .numColumns = 2, + .numRows = 2, + .unk_03_0 = 5, + .unk_03_7 = 0, + .titleText = gText_Interview, + .instructionsText1 = gText_CombineFourWordsOrPhrases, + .instructionsText2 = gText_LetsReplyToTheInterview, + .confirmText1 = gText_TheAnswer, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 6, + .numColumns = 2, + .numRows = 3, + .unk_03_0 = 1, + .unk_03_7 = 0, + .titleText = gText_TheBardsSong, + .instructionsText1 = gText_ChangeJustOneWordOrPhrase, + .instructionsText2 = gText_AndImproveTheBardsSong, + .confirmText1 = gText_TheBardsSong2, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 7, + .numColumns = 1, + .numRows = 1, + .unk_03_0 = 4, + .unk_03_7 = 0, + .titleText = gText_Interview, + .instructionsText1 = gText_FindWordsThatDescribeYour, + .instructionsText2 = gText_FeelingsRightNow, + .confirmText1 = gText_TheAnswer, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 9, + .numColumns = 2, + .numRows = 1, + .unk_03_0 = 3, + .unk_03_7 = 0, + .titleText = gText_WhatsHipAndHappening, + .instructionsText1 = gText_CombineTwoWordsOrPhrases, + .instructionsText2 = gText_AndMakeATrendySaying, + .confirmText1 = gText_TheTrendySaying, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 16, + .numColumns = 2, + .numRows = 5, + .unk_03_0 = 7, + .unk_03_7 = 1, + .titleText = NULL, + .instructionsText1 = gText_AfterYouHaveReadTheQuiz, + .instructionsText2 = gText_QuestionPressTheAButton, + .confirmText1 = NULL, + .confirmText2 = NULL, + }, + { + .unk_00 = 15, + .numColumns = 1, + .numRows = 1, + .unk_03_0 = 6, + .unk_03_7 = 1, + .titleText = gText_TheQuizAnswerIs, + .instructionsText1 = gText_OutOfTheListedChoices, + .instructionsText2 = gText_SelectTheAnswerToTheQuiz, + .confirmText1 = gText_TheAnswerColon, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 17, + .numColumns = 2, + .numRows = 5, + .unk_03_0 = 8, + .unk_03_7 = 1, + .titleText = NULL, + .instructionsText1 = gText_CombineNineWordsOrPhrases, + .instructionsText2 = gText_AndCreateAQuiz, + .confirmText1 = gText_IsThisQuizOK, + .confirmText2 = NULL, + }, + { + .unk_00 = 18, + .numColumns = 1, + .numRows = 1, + .unk_03_0 = 6, + .unk_03_7 = 1, + .titleText = gText_TheQuizAnswerIs, + .instructionsText1 = gText_PickAWordOrPhraseAnd, + .instructionsText2 = gText_SetTheQuizAnswer, + .confirmText1 = gText_IsThisQuizOK, + .confirmText2 = NULL, + }, + { + .unk_00 = 6, + .numColumns = 2, + .numRows = 3, + .unk_03_0 = 1, + .unk_03_7 = 0, + .titleText = gText_TheBardsSong, + .instructionsText1 = gText_ChangeJustOneWordOrPhrase, + .instructionsText2 = gText_AndImproveTheBardsSong, + .confirmText1 = gText_TheBardsSong2, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 19, + .numColumns = 2, + .numRows = 3, + .unk_03_0 = 1, + .unk_03_7 = 0, + .titleText = gText_ApprenticesPhrase, + .instructionsText1 = gText_FindWordsWhichFit, + .instructionsText2 = gText_TheTrainersImage, + .confirmText1 = gText_ApprenticePhrase, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 13, + .numColumns = 2, + .numRows = 1, + .unk_03_0 = 3, + .unk_03_7 = 0, + .titleText = gText_GoodSaying, + .instructionsText1 = gText_CombineTwoWordsOrPhrases2, + .instructionsText2 = gText_ToTeachHerAGoodSaying, + .confirmText1 = gText_TheAnswer, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 10, + .numColumns = 1, + .numRows = 1, + .unk_03_0 = 4, + .unk_03_7 = 0, + .titleText = gText_Interview, + .instructionsText1 = gText_FindWordsThatDescribeYour, + .instructionsText2 = gText_FeelingsRightNow, + .confirmText1 = gText_TheAnswer, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 12, + .numColumns = 1, + .numRows = 1, + .unk_03_0 = 4, + .unk_03_7 = 0, + .titleText = gText_Interview, + .instructionsText1 = gText_FindWordsThatDescribeYour, + .instructionsText2 = gText_FeelingsRightNow, + .confirmText1 = gText_TheAnswer, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 11, + .numColumns = 1, + .numRows = 1, + .unk_03_0 = 4, + .unk_03_7 = 0, + .titleText = gText_Interview, + .instructionsText1 = gText_FindWordsThatDescribeYour, + .instructionsText2 = gText_FeelingsRightNow, + .confirmText1 = gText_TheAnswer, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 14, + .numColumns = 1, + .numRows = 1, + .unk_03_0 = 4, + .unk_03_7 = 0, + .titleText = gText_FansQuestion, + .instructionsText1 = gText_FindWordsWhichFit, + .instructionsText2 = gText_TheTrainersImage, + .confirmText1 = gText_TheImage, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 20, + .numColumns = 2, + .numRows = 2, + .unk_03_0 = 0, + .unk_03_7 = 0, + .titleText = gText_Questionnaire, + .instructionsText1 = gText_CombineFourWordsOrPhrases, + .instructionsText2 = gText_AndFillOutTheQuestionnaire, + .confirmText1 = gText_TheAnswer, + .confirmText2 = gText_IsAsShownOkay, + }, +}; + +static const u8 sUnknown_08597748[][7] = { + { 1, 2, 3, 4, 5, 6, 0}, + { 7, 8, 9, 10, 11, 12, 0}, + {13, 14, 15, 16, 17, 18, 19}, + {20, 21, 22, 23, 24, 25, 26}, +}; + +static const u16 sMysteryGiftPhrase[] = { + EC_WORD_LINK, + EC_WORD_TOGETHER, + EC_WORD_WITH, + EC_WORD_ALL, +}; + +static const u16 sBerryMasterWifePhrases[][2] = { + {EC_WORD_GREAT, EC_WORD_BATTLE}, + {EC_WORD_CHALLENGE, EC_WORD_CONTEST}, + {EC_WORD_OVERWHELMING, EC_POKEMON(LATIAS)}, + {EC_WORD_COOL, EC_POKEMON(LATIOS)}, + {EC_WORD_SUPER, EC_WORD_HUSTLE}, +}; + +static const u16 sUnknown_08597780[] = INCBIN_U16("graphics/misc/interview_triangle_cursor.gbapal"); +static const u32 sUnknown_085977A0[] = INCBIN_U32("graphics/misc/interview_triangle_cursor.4bpp"); +static const u32 sUnknown_085977C0[] = INCBIN_U32("graphics/misc/interview_arrow.4bpp"); +static const u32 sUnknown_085978C0[] = INCBIN_U32("graphics/misc/interview_buttons.4bpp"); +static const u16 sUnknown_085979C0[] = INCBIN_U16("graphics/misc/interview_frame.gbapal"); +static const u32 sUnknown_085979E0[] = INCBIN_U32("graphics/misc/interview_frame.4bpp.lz"); +static const u16 sUnknown_08597B14[] = INCBIN_U16("graphics/misc/interview_frame_orange.gbapal"); +static const u16 sUnknown_08597B34[] = INCBIN_U16("graphics/misc/interview_frame_green.gbapal"); +static const u32 sUnknown_08597B54[] = INCBIN_U32("graphics/misc/interview_frame_2.4bpp.lz"); +static const u16 sUnknown_08597C1C[] = INCBIN_U16("graphics/misc/8597C1C.gbapal"); +static const u16 sUnknown_08597C24[] = INCBIN_U16("graphics/misc/8597C24.gbapal"); + +static const struct Unk08597C30 gUnknown_08597C30[] = { + { + .unk0_0 = 3, + .unk0_5 = 4, + .unk1 = 24, + .unk2 = 4, + .unk3 = 0, + }, + { + .unk0_0 = 3, + .unk0_5 = 3, + .unk1 = 24, + .unk2 = 6, + .unk3 = 0, + }, + { + .unk0_0 = 3, + .unk0_5 = 0, + .unk1 = 24, + .unk2 = 10, + .unk3 = 0, + }, + { + .unk0_0 = 3, + .unk0_5 = 5, + .unk1 = 24, + .unk2 = 2, + .unk3 = 0, + }, + { + .unk0_0 = 16, + .unk0_5 = 5, + .unk1 = 12, + .unk2 = 2, + .unk3 = 0, + }, + { + .unk0_0 = 3, + .unk0_5 = 4, + .unk1 = 24, + .unk2 = 4, + .unk3 = 0, + }, + { + .unk0_0 = 9, + .unk0_5 = 4, + .unk1 = 12, + .unk2 = 2, + .unk3 = 1, + }, + { + .unk0_0 = 5, + .unk0_5 = 3, + .unk1 = 0x14, + .unk2 = 10, + .unk3 = 3, + }, + { + .unk0_0 = 3, + .unk0_5 = 0, + .unk1 = 24, + .unk2 = 10, + .unk3 = 2, + }, +}; + +static const struct BgTemplate sEasyChatBgTemplates[] = { + { + .bg = 0, + .charBaseIndex = 0, + .mapBaseIndex = 28, + .screenSize = 0, + .paletteMode = 0, + .priority = 0, + .baseTile = 0, + }, + { + .bg = 1, + .charBaseIndex = 3, + .mapBaseIndex = 29, + .screenSize = 0, + .paletteMode = 0, + .priority = 1, + .baseTile = 0, + }, + { + .bg = 2, + .charBaseIndex = 0, + .mapBaseIndex = 30, + .screenSize = 0, + .paletteMode = 0, + .priority = 2, + .baseTile = 0x80, + }, + { + .bg = 3, + .charBaseIndex = 2, + .mapBaseIndex = 31, + .screenSize = 0, + .paletteMode = 0, + .priority = 3, + .baseTile = 0, + }, +}; + +static const struct WindowTemplate sEasyChatWindowTemplates[] = { + { + .bg = 1, + .tilemapLeft = 6, + .tilemapTop = 0, + .width = 18, + .height = 2, + .paletteNum = 10, + .baseBlock = 0x10, + }, + { + .bg = 0, + .tilemapLeft = 3, + .tilemapTop = 15, + .width = 24, + .height = 4, + .paletteNum = 15, + .baseBlock = 0xA, + }, + { + .bg = 2, + .tilemapLeft = 1, + .tilemapTop = 0, + .width = 28, + .height = 32, + .paletteNum = 3, + .baseBlock = 0, + }, + DUMMY_WIN_TEMPLATE, +}; + +static const struct WindowTemplate sEasyChatYesNoWindowTemplate = { + .bg = 0, + .tilemapLeft = 22, + .tilemapTop = 9, + .width = 5, + .height = 4, + .paletteNum = 15, + .baseBlock = 0x6A, +}; + +static const u8 sText_Clear17[] = _("{CLEAR 17}"); + +static const u8 *const sUnknown_08597C90[] = { + gUnknown_862B810, + gUnknown_862B832, + gUnknown_862B84B, + gUnknown_862B86C, +}; + +static const struct SpriteSheet sUnknown_08597CA0[] = { + { + .data = sUnknown_085977A0, + .size = 0x0020, + .tag = 0 + }, + { + .data = sUnknown_085977C0, + .size = 0x0100, + .tag = 2 + }, + { + .data = sUnknown_085978C0, + .size = 0x0100, + .tag = 3 + }, + {0} +}; + +static const struct SpritePalette sUnknown_08597CC0[] = { + { + .data = sUnknown_08597780, + .tag = 0, + }, + { + .data = gEasyChatCursor_Pal, + .tag = 1, + }, + { + .data = gEasyChatRightWindow_Pal, + .tag = 2, + }, + { + .data = sUnknown_085979C0, + .tag = 3, + }, + {0} +}; + +static const struct CompressedSpriteSheet sUnknown_08597CE8[] = { + { + .data = sUnknown_085979E0, + .size = 0x0800, + .tag = 5, + }, + { + .data = gEasyChatCursor_Gfx, + .size = 0x1000, + .tag = 1, + }, + { + .data = gEasyChatRightWindow_Gfx, + .size = 0x0800, + .tag = 6, + }, + { + .data = gEasyChatMode_Gfx, + .size = 0x1000, + .tag = 4, + }, +}; + +static const u8 sUnknown_08597D08[] = {0, 12, 24, 56, 68, 80, 92}; + +static const struct OamData sOamData_8597D10 = { + .y = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = 0, + .bpp = ST_OAM_4BPP, + .shape = ST_OAM_SQUARE, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 0, + .priority = 3, + .paletteNum = 0, + .affineParam = 0, +}; + +static const struct SpriteTemplate sUnknown_08597D18 = { + .tileTag = 0, + .paletteTag = 0, + .oam = &sOamData_8597D10, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_811DF28, +}; + +static const struct OamData sUnknown_08597D30 = { + .y = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = 0, + .bpp = ST_OAM_4BPP, + .shape = ST_OAM_H_RECTANGLE, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 1, + .paletteNum = 0, + .affineParam = 0, +}; + +static const union AnimCmd sUnknown_08597D38[] = { + ANIMCMD_FRAME(0, 0), + ANIMCMD_END, +}; + +static const union AnimCmd sUnknown_08597D40[] = { + ANIMCMD_FRAME(32, 0), + ANIMCMD_END, +}; + +static const union AnimCmd sUnknown_08597D48[] = { + ANIMCMD_FRAME(64, 0), + ANIMCMD_END, +}; + +static const union AnimCmd sUnknown_08597D50[] = { + ANIMCMD_FRAME(96, 0), + ANIMCMD_END, +}; + +static const union AnimCmd *const sUnknown_08597D58[] = { + sUnknown_08597D38, + sUnknown_08597D40, + sUnknown_08597D48, + sUnknown_08597D50, +}; + +static const struct SpriteTemplate sUnknown_08597D68 = { + .tileTag = 1, + .paletteTag = 1, + .oam = &sUnknown_08597D30, + .anims = sUnknown_08597D58, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_811DF28, +}; + +static const struct OamData sUnknown_08597D80 = { + .y = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = 0, + .bpp = ST_OAM_4BPP, + .shape = ST_OAM_H_RECTANGLE, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 1, + .paletteNum = 0, + .affineParam = 0, +}; + +static const union AnimCmd sUnknown_08597D88[] = { + ANIMCMD_FRAME(96, 0), + ANIMCMD_END, +}; + +static const union AnimCmd sUnknown_08597D90[] = { + ANIMCMD_FRAME(64, 4), + ANIMCMD_FRAME(32, 4), + ANIMCMD_END, +}; + +static const union AnimCmd sUnknown_08597D9C[] = { + ANIMCMD_FRAME(64, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_END, +}; + +static const union AnimCmd sUnknown_08597DA8[] = { + ANIMCMD_FRAME(64, 4), + ANIMCMD_FRAME(96, 0), + ANIMCMD_END, +}; + +static const union AnimCmd sUnknown_08597DB4[] = { + ANIMCMD_FRAME(64, 4), + ANIMCMD_END, +}; + +static const union AnimCmd *const sUnknown_08597DBC[] = { + sUnknown_08597D88, + sUnknown_08597D90, + sUnknown_08597D9C, + sUnknown_08597DA8, + sUnknown_08597DB4, +}; + +static const struct SpriteTemplate sUnknown_08597DD0 = { + .tileTag = 4, + .paletteTag = 2, + .oam = &sUnknown_08597D80, + .anims = sUnknown_08597DBC, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, +}; + +static const struct OamData sUnknown_08597DE8 = { + .y = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = 0, + .bpp = ST_OAM_4BPP, + .shape = ST_OAM_SQUARE, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 3, + .paletteNum = 0, + .affineParam = 0, +}; + +static const struct SpriteTemplate sUnknown_08597DF0 = { + .tileTag = 6, + .paletteTag = 2, + .oam = &sUnknown_08597DE8, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, +}; + +static const struct OamData sUnknown_08597E08 = { + .y = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = 0, + .bpp = ST_OAM_4BPP, + .shape = ST_OAM_H_RECTANGLE, + .x = 0, + .matrixNum = 0, + .size = 1, + .tileNum = 0, + .priority = 1, + .paletteNum = 0, + .affineParam = 0, +}; + +static const struct OamData gUnknown_08597E10 = { + .y = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = 0, + .bpp = ST_OAM_4BPP, + .shape = ST_OAM_SQUARE, + .x = 0, + .matrixNum = 0, + .size = 1, + .tileNum = 0, + .priority = 1, + .paletteNum = 0, + .affineParam = 0, +}; + +static const union AnimCmd sUnknown_08597E18[] = { + ANIMCMD_FRAME(0, 0), + ANIMCMD_END, +}; + +static const union AnimCmd sUnknown_08597E20[] = { + ANIMCMD_FRAME(4, 0), + ANIMCMD_END, +}; + +static const union AnimCmd *const sUnknown_08597E28[] = { + sUnknown_08597E18, + sUnknown_08597E20, +}; + +static const struct SpriteTemplate sUnknown_08597E30 = { + .tileTag = 3, + .paletteTag = 2, + .oam = &sUnknown_08597E08, + .anims = sUnknown_08597E28, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, +}; + +static const struct SpriteTemplate sUnknown_08597E48 = { + .tileTag = 2, + .paletteTag = 2, + .oam = &gUnknown_08597E10, + .anims = sUnknown_08597E28, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, +}; + +static const u8 sUnknown_08597E60[][4] = { + {16, 111, 196, 0}, + {16, 78, 130, 160}, + {16, 80, 134, 170}, +}; + +static const u8 *const sFooterTextOptions[][4] = { + {gText_DelAll, gText_Cancel5, gText_Ok2, NULL}, + {gText_DelAll, gText_Cancel5, gText_Ok2, gText_Quiz}, + {gText_DelAll, gText_Cancel5, gText_Ok2, gText_Answer}, +}; + +#include "data/easy_chat/easy_chat_groups.h" +#include "data/easy_chat/easy_chat_words_by_letter.h" + +const u8 *const gEasyChatGroupNamePointers[] = { + [EC_GROUP_POKEMON] = gEasyChatGroupName_Pokemon, + [EC_GROUP_TRAINER] = gEasyChatGroupName_Trainer, + [EC_GROUP_STATUS] = gEasyChatGroupName_Status, + [EC_GROUP_BATTLE] = gEasyChatGroupName_Battle, + [EC_GROUP_GREETINGS] = gEasyChatGroupName_Greetings, + [EC_GROUP_PEOPLE] = gEasyChatGroupName_People, + [EC_GROUP_VOICES] = gEasyChatGroupName_Voices, + [EC_GROUP_SPEECH] = gEasyChatGroupName_Speech, + [EC_GROUP_ENDINGS] = gEasyChatGroupName_Endings, + [EC_GROUP_FEELINGS] = gEasyChatGroupName_Feelings, + [EC_GROUP_CONDITIONS] = gEasyChatGroupName_Conditions, + [EC_GROUP_ACTIONS] = gEasyChatGroupName_Actions, + [EC_GROUP_LIFESTYLE] = gEasyChatGroupName_Lifestyle, + [EC_GROUP_HOBBIES] = gEasyChatGroupName_Hobbies, + [EC_GROUP_TIME] = gEasyChatGroupName_Time, + [EC_GROUP_MISC] = gEasyChatGroupName_Misc, + [EC_GROUP_ADJECTIVES] = gEasyChatGroupName_Adjectives, + [EC_GROUP_EVENTS] = gEasyChatGroupName_Events, + [EC_GROUP_MOVE_1] = gEasyChatGroupName_Move1, + [EC_GROUP_MOVE_2] = gEasyChatGroupName_Move2, + [EC_GROUP_TRENDY_SAYING] = gEasyChatGroupName_TrendySaying, + [EC_GROUP_POKEMON_2] = gEasyChatGroupName_Pokemon2, +}; + +static const u16 sUnknown_0859E62C[] = { + EC_WORD_I_AM, + EC_WORD_A, + EC_WORD_POKEMON, + EC_WORD_FRIEND, +}; + +static const u16 sUnknown_0859E634[] = { + EC_WORD_ARE, + EC_WORD_YOU, + EC_WORD_READY, + EC_WORD_QUES, + EC_WORD_HERE_I_COME, + EC_WORD_EXCL, +}; + +static const u16 sUnknown_0859E640[] = { + EC_WORD_YAY, + EC_WORD_YAY, + EC_WORD_EXCL_EXCL, + EC_WORD_I_VE, + EC_WORD_WON, + EC_WORD_EXCL_EXCL, +}; + +static const u16 sUnknown_0859E64C[] = { + EC_WORD_TOO, + EC_WORD_BAD, + EC_WORD_ELLIPSIS, + EC_WORD_WE, + EC_WORD_LOST, + EC_WORD_ELLIPSIS, +}; + +static const u16 sUnknown_0859E658[] = { + SPECIES_DEOXYS, +}; void sub_811A20C(u8 kind, u16 *words, MainCallback callback, u8 sizeParam) { @@ -678,9 +1367,9 @@ static int sub_811A868(u16 word) { int i; - for (i = 0; i < ARRAY_COUNT(gUnknown_08597530); i ++) + for (i = 0; i < ARRAY_COUNT(sUnknown_08597530); i ++) { - if (word == gUnknown_08597530[i].word) + if (word == sUnknown_08597530[i].word) return i; } return -1; @@ -697,25 +1386,25 @@ static void sub_811A8A4(u16 word) i = sub_811A868(word); ResetTasks(); - sub_811A4D0(gUnknown_08597530[i].callback); + sub_811A4D0(sUnknown_08597530[i].callback); } -void sub_811A8CC(void) +static void sub_811A8CC(void) { sub_811A20C(0xF, &gSaveBlock1Ptr->lilycoveLady.quiz.unk_016, CB2_ReturnToFieldContinueScript, 3); } -void sub_811A8F0(void) +static void sub_811A8F0(void) { sub_811A20C(0x10, gSaveBlock1Ptr->lilycoveLady.quiz.unk_002, CB2_ReturnToFieldContinueScript, 3); } -void sub_811A914(void) +static void sub_811A914(void) { sub_811A20C(0x12, &gSaveBlock1Ptr->lilycoveLady.quiz.unk_014, CB2_ReturnToFieldContinueScript, 3); } -void sub_811A938(void) +static void sub_811A938(void) { sub_811A20C(0x11, gSaveBlock1Ptr->lilycoveLady.quiz.unk_002, CB2_ReturnToFieldContinueScript, 3); } @@ -1157,7 +1846,7 @@ static u16 sub_811B150(void) } } -int sub_811B184(void) +static int sub_811B184(void) { gEasyChatScreen->unk_08 = gEasyChatScreen->state; if (gEasyChatScreen->kind != 6) @@ -1173,7 +1862,7 @@ int sub_811B184(void) } } -u16 sub_811B1B4(void) +static u16 sub_811B1B4(void) { gEasyChatScreen->unk_08 = gEasyChatScreen->state; if (gEasyChatScreen->kind == 17) @@ -1250,7 +1939,7 @@ u16 sub_811B1B4(void) } } -int sub_811B264(void) +static int sub_811B264(void) { gEasyChatScreen->unk_08 = gEasyChatScreen->state; switch (gEasyChatScreen->kind) @@ -1681,10 +2370,10 @@ static int sub_811B908(void) { int var0 = (u8)gEasyChatScreen->unk_0a < 7 ? gEasyChatScreen->unk_0a : 0; int var1 = (u8)gEasyChatScreen->unk_0b < 4 ? gEasyChatScreen->unk_0b : 0; - return gUnknown_08597748[var1][var0]; + return sUnknown_08597748[var1][var0]; } -u16 sub_811B940(void) +static u16 sub_811B940(void) { return 2 * (gEasyChatScreen->unk_11 + gEasyChatScreen->unk_0e) + gEasyChatScreen->unk_10; } @@ -1736,7 +2425,7 @@ static u8 sub_811BA1C(void) return sub_811B940() >= sub_811F5B0() ? 1 : 0; } -int sub_811BA3C(void) +static int sub_811BA3C(void) { return gEasyChatScreenTemplates[gEasyChatScreen->templateId].unk_03_7; } @@ -1746,7 +2435,7 @@ u8 sub_811BA5C(void) return gEasyChatScreen->kind; } -u8 sub_811BA68(void) +static u8 sub_811BA68(void) { return gEasyChatScreenTemplates[gEasyChatScreen->templateId].unk_03_0; } @@ -1927,7 +2616,7 @@ static u8 sub_811BCC8(u8 entryType) return 0; } -int sub_811BCF4(void) +static int sub_811BCF4(void) { int i; @@ -2046,7 +2735,7 @@ static void sub_811BE9C(void) static int sub_811BF20(void) { - return sub_811BC7C(gUnknown_08597764, 4) == 0; + return sub_811BC7C(sMysteryGiftPhrase, ARRAY_COUNT(sMysteryGiftPhrase)) == 0; } static u16 sub_811BF40(void) @@ -2054,19 +2743,19 @@ static u16 sub_811BF40(void) int i; for (i = 0; i < 5; i++) { - if (!sub_811BC7C(gUnknown_0859776C[i], 2)) + if (!sub_811BC7C(sBerryMasterWifePhrases[i], ARRAY_COUNT(*sBerryMasterWifePhrases))) return i + 1; } return 0; } -void sub_811BF78(void) +static void sub_811BF78(void) { gEasyChatScreen->unk_13 = 0; } -int sub_811BF88(int easyChatWord) +static int sub_811BF88(int easyChatWord) { return 0; } @@ -2085,10 +2774,10 @@ static bool8 sub_811BFA4(void) { case 0: ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(0, gUnknown_08597C54, ARRAY_COUNT(gUnknown_08597C54)); + InitBgsFromTemplates(0, sEasyChatBgTemplates, ARRAY_COUNT(sEasyChatBgTemplates)); SetBgTilemapBuffer(3, gUnknown_0203A11C->unkB00); SetBgTilemapBuffer(1, gUnknown_0203A11C->unk300); - InitWindows(gUnknown_08597C64); + InitWindows(sEasyChatWindowTemplates); DeactivateAllTextPrinters(); sub_811CF64(); sub_811CF04(); @@ -2104,7 +2793,7 @@ static bool8 sub_811BFA4(void) CopyBgTilemapBufferToVram(3); break; case 2: - DecompressAndLoadBgGfxUsingHeap(1, gUnknown_08597B54, 0, 0, 0); + DecompressAndLoadBgGfxUsingHeap(1, sUnknown_08597B54, 0, 0, 0); CopyBgTilemapBufferToVram(1); break; case 3: @@ -2984,12 +3673,12 @@ static void sub_811CF64(void) { ResetPaletteFade(); LoadPalette(gEasyChatMode_Pal, 0, 32); - LoadPalette(gUnknown_08597B14, 1 * 16, 32); - LoadPalette(gUnknown_08597B34, 4 * 16, 32); - LoadPalette(gUnknown_08597C1C, 10 * 16, 8); - LoadPalette(gUnknown_08597C24, 11 * 16, 12); - LoadPalette(gUnknown_08597C24, 15 * 16, 12); - LoadPalette(gUnknown_08597C24, 3 * 16, 12); + LoadPalette(sUnknown_08597B14, 1 * 16, 32); + LoadPalette(sUnknown_08597B34, 4 * 16, 32); + LoadPalette(sUnknown_08597C1C, 10 * 16, 8); + LoadPalette(sUnknown_08597C24, 11 * 16, 12); + LoadPalette(sUnknown_08597C24, 15 * 16, 12); + LoadPalette(sUnknown_08597C24, 3 * 16, 12); } static void sub_811CFCC(void) @@ -3011,7 +3700,7 @@ void sub_811D028(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, vo AddTextPrinterParameterized(windowId, fontId, str, x, y, speed, callback); } -void sub_811D058(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 speed, u8 red, u8 green, u8 blue) +static void sub_811D058(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 speed, u8 red, u8 green, u8 blue) { u8 color[3]; color[0] = red; @@ -3082,7 +3771,7 @@ static void sub_811D104(u8 arg0) static void sub_811D214(u8 initialCursorPos) { - CreateYesNoMenu(&gUnknown_08597C84, 1, 14, initialCursorPos); + CreateYesNoMenu(&sEasyChatYesNoWindowTemplate, 1, 14, initialCursorPos); } static void sub_811D230(void) @@ -3123,7 +3812,7 @@ static void sub_811D2C8(void) FillWindowPixelBuffer(gUnknown_0203A11C->windowId, 0x11); for (i = 0; i < numRows; i++) { - memcpy(spC, gUnknown_08597C8C, sizeof(gUnknown_08597C8C)); + memcpy(spC, sText_Clear17, sizeof(sText_Clear17)); if (var1) spC[2] = 6; @@ -3314,8 +4003,8 @@ static void sub_811D758(void) { u32 i; - for (i = 0; i < 4; i++) - sub_811D028(2, 1, gUnknown_08597C90[i], 10, 97 + i * 16, 0xFF, NULL); + for (i = 0; i < ARRAY_COUNT(sUnknown_08597C90); i++) + sub_811D028(2, 1, sUnknown_08597C90[i], 10, 97 + i * 16, 0xFF, NULL); } static void sub_811D794(void) @@ -3647,10 +4336,10 @@ static void sub_811DE90(void) { u32 i; - LoadSpriteSheets(gUnknown_08597CA0); - LoadSpritePalettes(gUnknown_08597CC0); - for (i = 0; i < 4; i++) - LoadCompressedSpriteSheet(&gUnknown_08597CE8[i]); + LoadSpriteSheets(sUnknown_08597CA0); + LoadSpritePalettes(sUnknown_08597CC0); + for (i = 0; i < ARRAY_COUNT(sUnknown_08597CE8); i++) + LoadCompressedSpriteSheet(&sUnknown_08597CE8[i]); } static void sub_811DEC4(void) @@ -3658,12 +4347,12 @@ static void sub_811DEC4(void) u8 var0 = sub_811BA68(); int x = gUnknown_08597C30[var0].unk0_0 * 8 + 13; int y = gUnknown_08597C30[var0].unk0_5 * 8 + 8; - u8 spriteId = CreateSprite(&gUnknown_08597D18, x, y, 2); + u8 spriteId = CreateSprite(&sUnknown_08597D18, x, y, 2); gUnknown_0203A11C->unk2D8 = &gSprites[spriteId]; gSprites[spriteId].data[1] = 1; } -void sub_811DF28(struct Sprite *sprite) +static void sub_811DF28(struct Sprite *sprite) { if (sprite->data[1]) { @@ -3698,11 +4387,11 @@ static void sub_811DFB0(void) static void sub_811DFC8(void) { - u8 spriteId = CreateSprite(&gUnknown_08597D68, 0, 0, 3); + u8 spriteId = CreateSprite(&sUnknown_08597D68, 0, 0, 3); gUnknown_0203A11C->unk2DC = &gSprites[spriteId]; gUnknown_0203A11C->unk2DC->pos2.x = 32; - spriteId = CreateSprite(&gUnknown_08597D68, 0, 0, 3); + spriteId = CreateSprite(&sUnknown_08597D68, 0, 0, 3); gUnknown_0203A11C->unk2E0 = &gSprites[spriteId]; gUnknown_0203A11C->unk2E0->pos2.x = -32; @@ -3773,7 +4462,7 @@ static void sub_811E1A4(s8 arg0, s8 arg1) } else { - x += gUnknown_08597D08[(u8)arg0 < 7 ? arg0 : 0]; + x += sUnknown_08597D08[arg0 < ARRAY_COUNT(sUnknown_08597D08) ? arg0 : 0]; anim = 3; } @@ -3799,7 +4488,7 @@ static void sub_811E1A4(s8 arg0, s8 arg1) static void sub_811E288(void) { - u8 spriteId = CreateSprite(&gUnknown_08597D18, 0, 0, 4); + u8 spriteId = CreateSprite(&sUnknown_08597D18, 0, 0, 4); gUnknown_0203A11C->unk2E4 = &gSprites[spriteId]; gUnknown_0203A11C->unk2E4->callback = sub_811E2DC; gUnknown_0203A11C->unk2E4->oam.priority = 2; @@ -3849,11 +4538,11 @@ static void sub_811E380(void) static void sub_811E3AC(void) { - u8 spriteId = CreateSprite(&gUnknown_08597DF0, 208, 128, 6); + u8 spriteId = CreateSprite(&sUnknown_08597DF0, 208, 128, 6); gUnknown_0203A11C->unk2E8 = &gSprites[spriteId]; gUnknown_0203A11C->unk2E8->pos2.x = -64; - spriteId = CreateSprite(&gUnknown_08597DD0, 208, 80, 5); + spriteId = CreateSprite(&sUnknown_08597DD0, 208, 80, 5); gUnknown_0203A11C->unk2EC = &gSprites[spriteId]; gUnknown_0203A11C->unk9 = 0; } @@ -3940,11 +4629,11 @@ static bool8 sub_811E5B8(void) static void sub_811E5D4(void) { - u8 spriteId = CreateSprite(&gUnknown_08597E48, 96, 80, 0); + u8 spriteId = CreateSprite(&sUnknown_08597E48, 96, 80, 0); if (spriteId != MAX_SPRITES) gUnknown_0203A11C->unk2F0 = &gSprites[spriteId]; - spriteId = CreateSprite(&gUnknown_08597E48, 96, 156, 0); + spriteId = CreateSprite(&sUnknown_08597E48, 96, 156, 0); if (spriteId != MAX_SPRITES) { gUnknown_0203A11C->unk2F4 = &gSprites[spriteId]; @@ -3982,11 +4671,11 @@ static void sub_811E6E0(int arg0) static void sub_811E720(void) { - u8 spriteId = CreateSprite(&gUnknown_08597E30, 220, 84, 1); + u8 spriteId = CreateSprite(&sUnknown_08597E30, 220, 84, 1); if (spriteId != MAX_SPRITES) gUnknown_0203A11C->unk2F8 = &gSprites[spriteId]; - spriteId = CreateSprite(&gUnknown_08597E30, 220, 156, 1); + spriteId = CreateSprite(&sUnknown_08597E30, 220, 156, 1); if (spriteId != MAX_SPRITES) { gUnknown_0203A11C->unk2FC = &gSprites[spriteId]; @@ -4072,7 +4761,7 @@ static int sub_811E920(int arg0) { int var0 = sub_811E8E4(); if (var0 < 3) - return gUnknown_08597E60[var0][arg0] + 4; + return sUnknown_08597E60[var0][arg0] + 4; else return 0; } @@ -4097,10 +4786,10 @@ static void sub_811E948(void) FillWindowPixelBuffer(windowId, 0x11); for (i = 0; i < 4; i++) { - const u8 *str = gUnknown_08597E6C[var0][i]; + const u8 *str = sFooterTextOptions[var0][i]; if (str) { - int x = gUnknown_08597E60[var0][i]; + int x = sUnknown_08597E60[var0][i]; sub_811D028(windowId, 1, str, x, 1, 0, NULL); } } @@ -4548,16 +5237,16 @@ void InitEasyChatPhrases(void) u16 i, j; for (i = 0; i < 4; i++) - gSaveBlock1Ptr->unk2BB0[i] = gUnknown_0859E62C[i]; + gSaveBlock1Ptr->unk2BB0[i] = sUnknown_0859E62C[i]; for (i = 0; i < 6; i++) - gSaveBlock1Ptr->unk2BBC[i] = gUnknown_0859E634[i]; + gSaveBlock1Ptr->unk2BBC[i] = sUnknown_0859E634[i]; for (i = 0; i < 6; i++) - gSaveBlock1Ptr->unk2BC8[i] = gUnknown_0859E640[i]; + gSaveBlock1Ptr->unk2BC8[i] = sUnknown_0859E640[i]; for (i = 0; i < 6; i++) - gSaveBlock1Ptr->unk2BD4[i] = gUnknown_0859E64C[i]; + gSaveBlock1Ptr->unk2BD4[i] = sUnknown_0859E64C[i]; for (i = 0; i < MAIL_COUNT; i++) { @@ -4782,7 +5471,7 @@ static bool8 sub_811F72C(u8 arg0) return FALSE; } -bool8 sub_811F764(u16 wordIndex, u8 groupId) +static bool8 sub_811F764(u16 wordIndex, u8 groupId) { switch (groupId) { @@ -4805,9 +5494,9 @@ bool8 sub_811F764(u16 wordIndex, u8 groupId) static int sub_811F838(u16 species) { u32 i; - for (i = 0; i < ARRAY_COUNT(gUnknown_0859E658); i++) + for (i = 0; i < ARRAY_COUNT(sUnknown_0859E658); i++) { - if (gUnknown_0859E658[i] == species) + if (sUnknown_0859E658[i] == species) return TRUE; } From 4b9e93850c50a2fbd380c061e129c76d33f6e452 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 27 Feb 2019 12:45:31 -0600 Subject: [PATCH 25/25] Document easy chat screen types --- data/event_scripts.s | 50 +- .../scripts.inc | 12 +- data/maps/DewfordTown/scripts.inc | 4 +- .../scripts.inc | 8 +- .../Route123_BerryMastersHouse/scripts.inc | 4 +- data/scripts/apprentice.inc | 4 +- data/scripts/gabby_and_ty.inc | 4 +- data/scripts/mauville_man.inc | 4 +- data/scripts/mystery_event_club.inc | 8 +- data/specials.inc | 2 +- .../scroll_indicator.png} | Bin .../start_select_buttons.png} | Bin .../triangle_cursor.png} | Bin include/constants/easy_chat.h | 27 + include/easy_chat.h | 28 +- include/global.h | 8 +- src/battle_tower.c | 8 +- src/easy_chat.c | 1694 +++++++++-------- src/lilycove_lady.c | 6 +- src/party_menu.c | 13 +- src/trainer_card.c | 2 +- src/tv.c | 4 +- 22 files changed, 963 insertions(+), 927 deletions(-) rename graphics/{misc/interview_arrow.png => easy_chat/scroll_indicator.png} (100%) rename graphics/{misc/interview_buttons.png => easy_chat/start_select_buttons.png} (100%) rename graphics/{misc/interview_triangle_cursor.png => easy_chat/triangle_cursor.png} (100%) diff --git a/data/event_scripts.s b/data/event_scripts.s index 55bbb76185..1453175b50 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,6 +1,7 @@ #include "constants/global.h" #include "constants/battle_frontier.h" #include "constants/battle_setup.h" +#include "constants/easy_chat.h" #include "constants/event_objects.h" #include "constants/event_object_movement_constants.h" #include "constants/field_effects.h" @@ -1683,18 +1684,9 @@ Common_EventScript_ShowPokemonCenterSign:: @ 8271E73 msgbox gText_PokemonCenterSign, MSGBOX_SIGN end -BattleFrontier_BattleTowerLobby_EventScript_271E7C:: @ 8271E7C -DewfordTown_EventScript_271E7C:: @ 8271E7C -LilycoveCity_ContestLobby_EventScript_271E7C:: @ 8271E7C -LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C:: @ 8271E7C -MauvilleCity_PokemonCenter_1F_EventScript_271E7C:: @ 8271E7C -PetalburgCity_PokemonCenter_1F_EventScript_271E7C:: @ 8271E7C -Route111_EventScript_271E7C:: @ 8271E7C -Route123_BerryMastersHouse_EventScript_271E7C:: @ 8271E7C -SlateportCity_OceanicMuseum_1F_EventScript_271E7C:: @ 8271E7C -SlateportCity_PokemonFanClub_EventScript_271E7C:: @ 8271E7C +Common_ShowEasyChatScreen:: @ 8271E7C fadescreen 1 - special easy_chat_input_maybe + special ShowEasyChatScreen fadescreen 0 return @@ -2941,8 +2933,8 @@ EventScript_Questionnaire:: @ 827381B msgbox gUnknown_0827339F, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq EventScript_2738FD - setvar VAR_0x8004, 20 - call MauvilleCity_PokemonCenter_1F_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE + call Common_ShowEasyChatScreen lock faceplayer specialvar VAR_0x8008, sub_813B490 @@ -3769,10 +3761,10 @@ SlateportCity_PokemonFanClub_EventScript_28C7F0:: @ 828C7F0 SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827 msgbox SlateportCity_PokemonFanClub_Text_28073B, MSGBOX_DEFAULT - setvar VAR_0x8004, 5 + setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW copyvar VAR_0x8005, VAR_0x8009 - setvar VAR_0x8006, 1 - call SlateportCity_PokemonFanClub_EventScript_271E7C + setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_FEMALE + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 @@ -3824,10 +3816,10 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C8C8:: @ 828C8C8 SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7 msgbox SlateportCity_OceanicMuseum_1F_Text_2812F2, MSGBOX_DEFAULT - setvar VAR_0x8004, 5 + setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW copyvar VAR_0x8005, VAR_0x8009 - setvar VAR_0x8006, 0 - call SlateportCity_OceanicMuseum_1F_EventScript_271E7C + setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_MALE + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 @@ -3896,17 +3888,17 @@ SlateportCity_PokemonFanClub_EventScript_28C9DF:: @ 828C9DF end SlateportCity_PokemonFanClub_EventScript_28C9ED:: @ 828C9ED - setvar VAR_0x8004, 7 + setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_CLUB copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 0 - call SlateportCity_PokemonFanClub_EventScript_271E7C + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 msgbox SlateportCity_PokemonFanClub_Text_2804AC, MSGBOX_DEFAULT setvar VAR_0x8006, 1 - call SlateportCity_PokemonFanClub_EventScript_271E7C + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 @@ -3945,10 +3937,10 @@ LilycoveCity_ContestLobby_EventScript_28CA59:: @ 828CA59 LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B msgbox LilycoveCity_ContestLobby_Text_27EFE7, MSGBOX_DEFAULT - setvar VAR_0x8004, 11 + setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 0 - call LilycoveCity_ContestLobby_EventScript_271E7C + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 @@ -3966,10 +3958,10 @@ LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA setvar VAR_0x8004, 24 special SetContestCategoryStringVarForInterview msgbox LilycoveCity_ContestLobby_Text_27F03E, MSGBOX_DEFAULT - setvar VAR_0x8004, 11 + setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 1 - call LilycoveCity_ContestLobby_EventScript_271E7C + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 @@ -4034,9 +4026,9 @@ BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8 compare VAR_RESULT, 1 call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC41 msgbox BattleFrontier_BattleTowerLobby_Text_27F97A, MSGBOX_DEFAULT - setvar VAR_0x8004, 12 + setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW copyvar VAR_0x8005, VAR_0x8009 - call BattleFrontier_BattleTowerLobby_EventScript_271E7C + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 @@ -4506,7 +4498,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A861C:: @ 82A861C special sub_818E3BC compare VAR_0x8004, 0 goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A864C - compare VAR_0x8004, 15 + compare VAR_0x8004, EASY_CHAT_TYPE_QUIZ_ANSWER goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8656 LilycoveCity_PokemonCenter_1F_EventScript_2A8635:: @ 82A8635 diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 8d407ac1de..6d53a33e16 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -572,8 +572,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EEE7:: @ 823EEE7 BattleFrontier_BattleTowerLobby_EventScript_23EF32:: @ 823EF32 msgbox BattleFrontier_BattleTowerLobby_Text_23F969, MSGBOX_DEFAULT - setvar VAR_0x8004, 1 - call BattleFrontier_BattleTowerLobby_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_START + call Common_ShowEasyChatScreen lock faceplayer goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A @@ -581,8 +581,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF32:: @ 823EF32 BattleFrontier_BattleTowerLobby_EventScript_23EF4C:: @ 823EF4C msgbox BattleFrontier_BattleTowerLobby_Text_23F9AA, MSGBOX_DEFAULT - setvar VAR_0x8004, 2 - call BattleFrontier_BattleTowerLobby_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_WON + call Common_ShowEasyChatScreen lock faceplayer goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A @@ -590,8 +590,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF4C:: @ 823EF4C BattleFrontier_BattleTowerLobby_EventScript_23EF66:: @ 823EF66 msgbox BattleFrontier_BattleTowerLobby_Text_23F9D4, MSGBOX_DEFAULT - setvar VAR_0x8004, 3 - call BattleFrontier_BattleTowerLobby_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_LOST + call Common_ShowEasyChatScreen lock faceplayer goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index d1f382e36b..ed8acea17c 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -608,8 +608,8 @@ DewfordTown_EventScript_1E9948:: @ 81E9948 DewfordTown_EventScript_1E9952:: @ 81E9952 msgbox DewfordTown_Text_1EA242, MSGBOX_DEFAULT - setvar VAR_0x8004, 9 - call DewfordTown_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_TRENDY_PHRASE + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index f65d901bb5..f83be42b9c 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -512,9 +512,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90 setvar VAR_0x8004, 8 special BufferStreakTrainerText msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, MSGBOX_DEFAULT - setvar VAR_0x8004, 14 + setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_QUESTION copyvar VAR_0x8005, VAR_0x800A - call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 @@ -542,9 +542,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15 setvar VAR_0x8004, 8 special BufferStreakTrainerText msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, MSGBOX_DEFAULT - setvar VAR_0x8004, 14 + setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_QUESTION copyvar VAR_0x8005, VAR_0x800A - call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc index 6d4afa30a7..31158782da 100644 --- a/data/maps/Route123_BerryMastersHouse/scripts.inc +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -41,8 +41,8 @@ Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0 dotimebasedevents goto_if_set FLAG_DAILY_BERRY_MASTERS_WIFE, Route123_BerryMastersHouse_EventScript_26FA6F msgbox Route123_BerryMastersHouse_Text_2A74E6, MSGBOX_DEFAULT - setvar VAR_0x8004, 13 - call Route123_BerryMastersHouse_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_GOOD_SAYING + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc index ac4bd19790..d6713cde4f 100644 --- a/data/scripts/apprentice.inc +++ b/data/scripts/apprentice.inc @@ -269,8 +269,8 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6DD4: apprentice_msg TRUE, 11 setvar VAR_0x8004, 25 special CallApprenticeFunction - setvar VAR_0x8004, 19 - call BattleFrontier_BattleTowerLobby_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_APPRENTICE + call Common_ShowEasyChatScreen lock faceplayer setvar VAR_0x8004, 21 diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index ee0e533bc1..31000539c5 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -313,8 +313,8 @@ Route111_EventScript_28D0A7:: @ 828D0A7 compare VAR_RESULT, 0 goto_if_eq Route111_EventScript_28D0E1 msgbox Route111_Text_28B433, MSGBOX_DEFAULT - setvar VAR_0x8004, 10 - call Route111_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_GABBY_AND_TY + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 2791e5d9fb..0ab47ea80a 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -43,8 +43,8 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E0F4:: @ 828E0F4 end MauvilleCity_PokemonCenter_1F_EventScript_28E113:: @ 828E113 - setvar VAR_0x8004, 6 - call MauvilleCity_PokemonCenter_1F_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_BARD_SONG + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index ea805edc4b..cc189a96b4 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -24,8 +24,8 @@ PetalburgCity_PokemonCenter_1F_EventScript_291591:: @ 8291591 PetalburgCity_PokemonCenter_1F_EventScript_29159F:: @ 829159F msgbox PetalburgCity_PokemonCenter_1F_Text_291969, MSGBOX_DEFAULT closemessage - setvar VAR_0x8004, 0 - call PetalburgCity_PokemonCenter_1F_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 @@ -76,8 +76,8 @@ PetalburgCity_PokemonCenter_1F_EventScript_291642:: @ 8291642 PetalburgCity_PokemonCenter_1F_EventScript_291650:: @ 8291650 msgbox PetalburgCity_PokemonCenter_1F_Text_291A6B, MSGBOX_DEFAULT closemessage - setvar VAR_0x8004, 0 - call PetalburgCity_PokemonCenter_1F_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 diff --git a/data/specials.inc b/data/specials.inc index 965bef117f..e7f5e60723 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -106,7 +106,7 @@ gSpecials:: @ 81DBA64 def_special sub_80B3000 def_special SaveGame def_special DoWateringBerryTreeAnim - def_special easy_chat_input_maybe + def_special ShowEasyChatScreen def_special sub_811EECC def_special ScrSpecial_GetCurrentMauvilleMan def_special ScrSpecial_HasBardSongBeenChanged diff --git a/graphics/misc/interview_arrow.png b/graphics/easy_chat/scroll_indicator.png similarity index 100% rename from graphics/misc/interview_arrow.png rename to graphics/easy_chat/scroll_indicator.png diff --git a/graphics/misc/interview_buttons.png b/graphics/easy_chat/start_select_buttons.png similarity index 100% rename from graphics/misc/interview_buttons.png rename to graphics/easy_chat/start_select_buttons.png diff --git a/graphics/misc/interview_triangle_cursor.png b/graphics/easy_chat/triangle_cursor.png similarity index 100% rename from graphics/misc/interview_triangle_cursor.png rename to graphics/easy_chat/triangle_cursor.png diff --git a/include/constants/easy_chat.h b/include/constants/easy_chat.h index 1c8866bc36..50f5994f4e 100644 --- a/include/constants/easy_chat.h +++ b/include/constants/easy_chat.h @@ -1,6 +1,33 @@ #ifndef GUARD_CONSTANTS_EASY_CHAT_H #define GUARD_CONSTANTS_EASY_CHAT_H +#define EASY_CHAT_TYPE_PROFILE 0 +#define EASY_CHAT_TYPE_BATTLE_START 1 +#define EASY_CHAT_TYPE_BATTLE_WON 2 +#define EASY_CHAT_TYPE_BATTLE_LOST 3 +#define EASY_CHAT_TYPE_MAIL 4 +#define EASY_CHAT_TYPE_INTERVIEW 5 +#define EASY_CHAT_TYPE_BARD_SONG 6 +#define EASY_CHAT_TYPE_FAN_CLUB 7 +#define EASY_CHAT_TYPE_UNK_8 8 +#define EASY_CHAT_TYPE_TRENDY_PHRASE 9 +#define EASY_CHAT_TYPE_GABBY_AND_TY 10 +#define EASY_CHAT_TYPE_CONTEST_INTERVIEW 11 +#define EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW 12 +#define EASY_CHAT_TYPE_GOOD_SAYING 13 +#define EASY_CHAT_TYPE_FAN_QUESTION 14 +#define EASY_CHAT_TYPE_QUIZ_ANSWER 15 +#define EASY_CHAT_TYPE_QUIZ_QUESTION 16 +#define EASY_CHAT_TYPE_QUIZ_SET_QUESTION 17 +#define EASY_CHAT_TYPE_QUIZ_SET_ANSWER 18 +#define EASY_CHAT_TYPE_APPRENTICE 19 +#define EASY_CHAT_TYPE_QUESTIONNAIRE 20 + +#define EASY_CHAT_PERSON_REPORTER_MALE 0 +#define EASY_CHAT_PERSON_REPORTER_FEMALE 1 +#define EASY_CHAT_PERSON_BOY 2 +#define EASY_CHAT_PERSON_DISPLAY_NONE 3 + #define EC_GROUP_POKEMON 0x0 #define EC_GROUP_TRAINER 0x1 #define EC_GROUP_STATUS 0x2 diff --git a/include/easy_chat.h b/include/easy_chat.h index b7685e48cb..2efdc4e5d6 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -6,11 +6,11 @@ struct EasyChatScreenTemplate { - u8 unk_00; + u8 type; u8 numColumns; u8 numRows; - u8 unk_03_0:7; - u8 unk_03_7:1; + u8 frameId:7; + u8 fourFooterOptions:1; const u8 *titleText; const u8 *instructionsText1; const u8 *instructionsText2; @@ -20,7 +20,7 @@ struct EasyChatScreenTemplate struct EasyChatScreen { - /*0x00*/ u8 kind; + /*0x00*/ u8 type; /*0x01*/ u8 templateId; /*0x02*/ u8 numColumns; /*0x03*/ u8 numRows; @@ -28,7 +28,7 @@ struct EasyChatScreen /*0x05*/ s8 mainCursorColumn; /*0x06*/ s8 mainCursorRow; /*0x07*/ u8 unk_07; - /*0x08*/ u8 unk_08; + /*0x08*/ u8 stateBackup; /*0x09*/ u8 unk_09; /*0x0A*/ s8 unk_0a; /*0x0B*/ s8 unk_0b; @@ -38,7 +38,7 @@ struct EasyChatScreen /*0x0F*/ u8 unk_0f; /*0x10*/ s8 unk_10; /*0x11*/ s8 unk_11; - /*0x12*/ u8 sizeParam; + /*0x12*/ u8 displayedPersonType; /*0x13*/ u8 unk_13; /*0x14*/ u8 unk_14[0x20]; /*0x34*/ const u8 *titleText; @@ -75,13 +75,13 @@ struct Unk203A11C u16 unkB00[BG_SCREEN_SIZE / 2]; }; -struct Unk08597C30 +struct EasyChatPhraseFrameDimensions { - u8 unk0_0:5; - u8 unk0_5:3; - u8 unk1; - u8 unk2; - u8 unk3; + u8 left:5; + u8 top:3; + u8 width; + u8 height; + u8 footerId; }; struct EasyChatWordInfo @@ -122,7 +122,7 @@ struct EasyChatWordsByLetter }; void InitEasyChatPhrases(void); -void easy_chat_input_maybe(void); +void ShowEasyChatScreen(void); u8 * CopyEasyChatWord(u8 *dest, u16 word); bool32 sub_811F8D8(int word); void InitializeEasyChatWordArray(u16 *words, u16 length); @@ -132,7 +132,7 @@ u16 sub_811EE38(u16 group); u16 sub_811F01C(void); u16 EasyChat_GetNumWordsInGroup(u8); u16 sub_811EE90(u16); -void sub_811A20C(u8 kind, u16 *words, MainCallback callback, u8 sizeParam); +void DoEasyChatScreen(u8 type, u16 *words, MainCallback callback, u8 displayedPersonType); void sub_811F8BC(void); #endif // GUARD_EASYCHAT_H diff --git a/include/global.h b/include/global.h index ee0ba68931..cc026f36a1 100644 --- a/include/global.h +++ b/include/global.h @@ -870,10 +870,10 @@ struct SaveBlock1 /*0x2BA1*/ u8 outbreakPokemonProbability; /*0x2BA2*/ u16 outbreakDaysLeft; /*0x2BA4*/ struct GabbyAndTyData gabbyAndTyData; - /*0x2BB0*/ u16 unk2BB0[6]; - /*0x2BBC*/ u16 unk2BBC[6]; - /*0x2BC8*/ u16 unk2BC8[6]; - /*0x2BD4*/ u16 unk2BD4[6]; + /*0x2BB0*/ u16 easyChatProfile[6]; + /*0x2BBC*/ u16 easyChatBattleStart[6]; + /*0x2BC8*/ u16 easyChatBattleWon[6]; + /*0x2BD4*/ u16 easyChatBattleLost[6]; /*0x2BE0*/ struct MailStruct mail[MAIL_COUNT]; /*0x2E20*/ u8 additionalPhrases[8]; // bitfield for 33 additional phrases in easy chat system /*0x2E28*/ OldMan oldMan; diff --git a/src/battle_tower.c b/src/battle_tower.c index fbb77789e0..06aaef48d5 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -2401,9 +2401,9 @@ static void sub_8163EE4(void) for (i = 0; i < 6; i++) { - playerRecord->greeting[i] = gSaveBlock1Ptr->unk2BBC[i]; - playerRecord->speechWon[i] = gSaveBlock1Ptr->unk2BC8[i]; - playerRecord->speechLost[i] = gSaveBlock1Ptr->unk2BD4[i]; + playerRecord->greeting[i] = gSaveBlock1Ptr->easyChatBattleStart[i]; + playerRecord->speechWon[i] = gSaveBlock1Ptr->easyChatBattleWon[i]; + playerRecord->speechLost[i] = gSaveBlock1Ptr->easyChatBattleLost[i]; } for (i = 0; i < 4; i++) @@ -3059,7 +3059,7 @@ static void FillEReaderTrainerWithPlayerData(void) j = 7; for (i = 0; i < 6; i++) { - ereaderTrainer->greeting[i] = gSaveBlock1Ptr->unk2BBC[i]; + ereaderTrainer->greeting[i] = gSaveBlock1Ptr->easyChatBattleStart[i]; ereaderTrainer->farewellPlayerLost[i] = j; ereaderTrainer->farewellPlayerWon[i] = j + 6; j++; diff --git a/src/easy_chat.c b/src/easy_chat.c index 3c436246db..aa681eebaf 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -34,18 +34,18 @@ #include "constants/species.h" #define EZCHAT_TASK_STATE 0 -#define EZCHAT_TASK_KIND 1 +#define EZCHAT_TASK_TYPE 1 #define EZCHAT_TASK_WORDS 2 #define EZCHAT_TASK_MAINCALLBACK 4 #define EZCHAT_TASK_UNK06 6 #define EZCHAT_TASK_SIZE 7 -EWRAM_DATA struct EasyChatScreen *gEasyChatScreen = NULL; -EWRAM_DATA struct Unk203A11C *gUnknown_0203A11C = 0; -EWRAM_DATA struct Unk203A120 *gUnknown_0203A120 = 0; +static EWRAM_DATA struct EasyChatScreen *sEasyChatScreen = NULL; +static EWRAM_DATA struct Unk203A11C *sUnknown_0203A11C = NULL; +static EWRAM_DATA struct Unk203A120 *sUnknown_0203A120 = NULL; static void sub_811A2C0(u8); -static void sub_811A278(void); +static void MainCallback_EasyChatScreen(void); static bool8 sub_811A428(u8); static void sub_811A2FC(u8); static void sub_811A4D0(MainCallback); @@ -67,8 +67,8 @@ static u16 sub_811B0E8(void); static u16 sub_811B0F8(void); static u16 sub_811B150(void); static u16 sub_811B1B4(void); -static u8 sub_811BA68(void); -static u8 sub_811BCC8(u8); +static u8 GetEasyChatScreenFrameId(void); +static u8 GetEachChatScreenTemplateId(u8); static void sub_811BDF0(u8 *); static void sub_811BF78(void); static bool8 sub_811BF8C(void); @@ -79,7 +79,7 @@ static bool8 sub_811C170(void); static bool8 sub_811F28C(void); static void sub_811F2B8(void); static u8 sub_811F3AC(void); -static int sub_811BA3C(void); +static int FooterHasFourOptions(void); static int sub_811B184(void); static int sub_811B264(void); static int sub_811B32C(void); @@ -169,7 +169,7 @@ static bool8 sub_811CDD4(void); static bool8 sub_811CE14(void); static bool8 sub_811CE54(void); static void sub_811DF60(u8, u8); -static int sub_811E920(int); +static int GetFooterOptionXOffset(int); static void sub_811DF90(void); static void sub_811D104(u8); static void sub_811D214(u8); @@ -228,10 +228,10 @@ static u16 sub_811F5C4(u16); static u16 sub_811F6B8(u16); static bool8 sub_811F764(u16, u8); static int sub_811F838(u16); -static void sub_811A8CC(void); -static void sub_811A8F0(void); -static void sub_811A914(void); -static void sub_811A938(void); +static void DoQuizAnswerEasyChatScreen(void); +static void DoQuizQuestionEasyChatScreen(void); +static void DoQuizSetAnswerEasyChatScreen(void); +static void DoQuizSetQuestionEasyChatScreen(void); struct Unk8597530 { @@ -242,28 +242,29 @@ struct Unk8597530 static const struct Unk8597530 sUnknown_08597530[] = { { .word = 26, - .callback = sub_811A8CC, + .callback = DoQuizAnswerEasyChatScreen, }, { .word = 25, - .callback = sub_811A8F0, + .callback = DoQuizQuestionEasyChatScreen, }, { .word = 28, - .callback = sub_811A914, + .callback = DoQuizSetAnswerEasyChatScreen, }, { .word = 27, - .callback = sub_811A938, + .callback = DoQuizSetQuestionEasyChatScreen, }, }; -static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { + +static const struct EasyChatScreenTemplate sEasyChatScreenTemplates[] = { { - .unk_00 = 0, + .type = EASY_CHAT_TYPE_PROFILE, .numColumns = 2, .numRows = 2, - .unk_03_0 = 0, - .unk_03_7 = 0, + .frameId = 0, + .fourFooterOptions = FALSE, .titleText = gText_Profile, .instructionsText1 = gText_CombineFourWordsOrPhrases, .instructionsText2 = gText_AndMakeYourProfile, @@ -271,11 +272,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 1, + .type = EASY_CHAT_TYPE_BATTLE_START, .numColumns = 2, .numRows = 3, - .unk_03_0 = 1, - .unk_03_7 = 0, + .frameId = 1, + .fourFooterOptions = FALSE, .titleText = gText_AtTheBattlesStart, .instructionsText1 = gText_CombineSixWordsOrPhrases, .instructionsText2 = gText_AndMakeAMessage, @@ -283,11 +284,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 2, + .type = EASY_CHAT_TYPE_BATTLE_WON, .numColumns = 2, .numRows = 3, - .unk_03_0 = 1, - .unk_03_7 = 0, + .frameId = 1, + .fourFooterOptions = FALSE, .titleText = gText_UponWinningABattle, .instructionsText1 = gText_CombineSixWordsOrPhrases, .instructionsText2 = gText_AndMakeAMessage, @@ -295,11 +296,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 3, + .type = EASY_CHAT_TYPE_BATTLE_LOST, .numColumns = 2, .numRows = 3, - .unk_03_0 = 1, - .unk_03_7 = 0, + .frameId = 1, + .fourFooterOptions = FALSE, .titleText = gText_UponLosingABattle, .instructionsText1 = gText_CombineSixWordsOrPhrases, .instructionsText2 = gText_AndMakeAMessage, @@ -307,11 +308,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 4, + .type = EASY_CHAT_TYPE_MAIL, .numColumns = 2, .numRows = 5, - .unk_03_0 = 2, - .unk_03_7 = 0, + .frameId = 2, + .fourFooterOptions = FALSE, .titleText = NULL, .instructionsText1 = gText_CombineNineWordsOrPhrases, .instructionsText2 = gText_AndMakeAMessage2, @@ -319,11 +320,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 5, + .type = EASY_CHAT_TYPE_INTERVIEW, .numColumns = 2, .numRows = 2, - .unk_03_0 = 5, - .unk_03_7 = 0, + .frameId = 5, + .fourFooterOptions = FALSE, .titleText = gText_Interview, .instructionsText1 = gText_CombineFourWordsOrPhrases, .instructionsText2 = gText_LetsReplyToTheInterview, @@ -331,11 +332,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 6, + .type = EASY_CHAT_TYPE_BARD_SONG, .numColumns = 2, .numRows = 3, - .unk_03_0 = 1, - .unk_03_7 = 0, + .frameId = 1, + .fourFooterOptions = FALSE, .titleText = gText_TheBardsSong, .instructionsText1 = gText_ChangeJustOneWordOrPhrase, .instructionsText2 = gText_AndImproveTheBardsSong, @@ -343,11 +344,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 7, + .type = EASY_CHAT_TYPE_FAN_CLUB, .numColumns = 1, .numRows = 1, - .unk_03_0 = 4, - .unk_03_7 = 0, + .frameId = 4, + .fourFooterOptions = FALSE, .titleText = gText_Interview, .instructionsText1 = gText_FindWordsThatDescribeYour, .instructionsText2 = gText_FeelingsRightNow, @@ -355,11 +356,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 9, + .type = EASY_CHAT_TYPE_TRENDY_PHRASE, .numColumns = 2, .numRows = 1, - .unk_03_0 = 3, - .unk_03_7 = 0, + .frameId = 3, + .fourFooterOptions = FALSE, .titleText = gText_WhatsHipAndHappening, .instructionsText1 = gText_CombineTwoWordsOrPhrases, .instructionsText2 = gText_AndMakeATrendySaying, @@ -367,11 +368,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 16, + .type = EASY_CHAT_TYPE_QUIZ_QUESTION, .numColumns = 2, .numRows = 5, - .unk_03_0 = 7, - .unk_03_7 = 1, + .frameId = 7, + .fourFooterOptions = TRUE, .titleText = NULL, .instructionsText1 = gText_AfterYouHaveReadTheQuiz, .instructionsText2 = gText_QuestionPressTheAButton, @@ -379,11 +380,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = NULL, }, { - .unk_00 = 15, + .type = EASY_CHAT_TYPE_QUIZ_ANSWER, .numColumns = 1, .numRows = 1, - .unk_03_0 = 6, - .unk_03_7 = 1, + .frameId = 6, + .fourFooterOptions = TRUE, .titleText = gText_TheQuizAnswerIs, .instructionsText1 = gText_OutOfTheListedChoices, .instructionsText2 = gText_SelectTheAnswerToTheQuiz, @@ -391,11 +392,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 17, + .type = EASY_CHAT_TYPE_QUIZ_SET_QUESTION, .numColumns = 2, .numRows = 5, - .unk_03_0 = 8, - .unk_03_7 = 1, + .frameId = 8, + .fourFooterOptions = TRUE, .titleText = NULL, .instructionsText1 = gText_CombineNineWordsOrPhrases, .instructionsText2 = gText_AndCreateAQuiz, @@ -403,11 +404,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = NULL, }, { - .unk_00 = 18, + .type = EASY_CHAT_TYPE_QUIZ_SET_ANSWER, .numColumns = 1, .numRows = 1, - .unk_03_0 = 6, - .unk_03_7 = 1, + .frameId = 6, + .fourFooterOptions = TRUE, .titleText = gText_TheQuizAnswerIs, .instructionsText1 = gText_PickAWordOrPhraseAnd, .instructionsText2 = gText_SetTheQuizAnswer, @@ -415,11 +416,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = NULL, }, { - .unk_00 = 6, + .type = EASY_CHAT_TYPE_BARD_SONG, .numColumns = 2, .numRows = 3, - .unk_03_0 = 1, - .unk_03_7 = 0, + .frameId = 1, + .fourFooterOptions = FALSE, .titleText = gText_TheBardsSong, .instructionsText1 = gText_ChangeJustOneWordOrPhrase, .instructionsText2 = gText_AndImproveTheBardsSong, @@ -427,11 +428,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 19, + .type = EASY_CHAT_TYPE_APPRENTICE, .numColumns = 2, .numRows = 3, - .unk_03_0 = 1, - .unk_03_7 = 0, + .frameId = 1, + .fourFooterOptions = FALSE, .titleText = gText_ApprenticesPhrase, .instructionsText1 = gText_FindWordsWhichFit, .instructionsText2 = gText_TheTrainersImage, @@ -439,11 +440,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 13, + .type = EASY_CHAT_TYPE_GOOD_SAYING, .numColumns = 2, .numRows = 1, - .unk_03_0 = 3, - .unk_03_7 = 0, + .frameId = 3, + .fourFooterOptions = FALSE, .titleText = gText_GoodSaying, .instructionsText1 = gText_CombineTwoWordsOrPhrases2, .instructionsText2 = gText_ToTeachHerAGoodSaying, @@ -451,11 +452,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 10, + .type = EASY_CHAT_TYPE_GABBY_AND_TY, .numColumns = 1, .numRows = 1, - .unk_03_0 = 4, - .unk_03_7 = 0, + .frameId = 4, + .fourFooterOptions = FALSE, .titleText = gText_Interview, .instructionsText1 = gText_FindWordsThatDescribeYour, .instructionsText2 = gText_FeelingsRightNow, @@ -463,11 +464,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 12, + .type = EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW, .numColumns = 1, .numRows = 1, - .unk_03_0 = 4, - .unk_03_7 = 0, + .frameId = 4, + .fourFooterOptions = FALSE, .titleText = gText_Interview, .instructionsText1 = gText_FindWordsThatDescribeYour, .instructionsText2 = gText_FeelingsRightNow, @@ -475,11 +476,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 11, + .type = EASY_CHAT_TYPE_CONTEST_INTERVIEW, .numColumns = 1, .numRows = 1, - .unk_03_0 = 4, - .unk_03_7 = 0, + .frameId = 4, + .fourFooterOptions = FALSE, .titleText = gText_Interview, .instructionsText1 = gText_FindWordsThatDescribeYour, .instructionsText2 = gText_FeelingsRightNow, @@ -487,11 +488,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 14, + .type = EASY_CHAT_TYPE_FAN_QUESTION, .numColumns = 1, .numRows = 1, - .unk_03_0 = 4, - .unk_03_7 = 0, + .frameId = 4, + .fourFooterOptions = FALSE, .titleText = gText_FansQuestion, .instructionsText1 = gText_FindWordsWhichFit, .instructionsText2 = gText_TheTrainersImage, @@ -499,11 +500,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 20, + .type = EASY_CHAT_TYPE_QUESTIONNAIRE, .numColumns = 2, .numRows = 2, - .unk_03_0 = 0, - .unk_03_7 = 0, + .frameId = 0, + .fourFooterOptions = FALSE, .titleText = gText_Questionnaire, .instructionsText1 = gText_CombineFourWordsOrPhrases, .instructionsText2 = gText_AndFillOutTheQuestionnaire, @@ -534,10 +535,10 @@ static const u16 sBerryMasterWifePhrases[][2] = { {EC_WORD_SUPER, EC_WORD_HUSTLE}, }; -static const u16 sUnknown_08597780[] = INCBIN_U16("graphics/misc/interview_triangle_cursor.gbapal"); -static const u32 sUnknown_085977A0[] = INCBIN_U32("graphics/misc/interview_triangle_cursor.4bpp"); -static const u32 sUnknown_085977C0[] = INCBIN_U32("graphics/misc/interview_arrow.4bpp"); -static const u32 sUnknown_085978C0[] = INCBIN_U32("graphics/misc/interview_buttons.4bpp"); +static const u16 sEasyChatTriangleCursorPalette[] = INCBIN_U16("graphics/easy_chat/triangle_cursor.gbapal"); +static const u32 sEasyChatTriangleCursorGfx[] = INCBIN_U32("graphics/easy_chat/triangle_cursor.4bpp"); +static const u32 sEasyChatScrollIndicatorGfx[] = INCBIN_U32("graphics/easy_chat/scroll_indicator.4bpp"); +static const u32 sEasyChatStartSelectButtonsGfx[] = INCBIN_U32("graphics/easy_chat/start_select_buttons.4bpp"); static const u16 sUnknown_085979C0[] = INCBIN_U16("graphics/misc/interview_frame.gbapal"); static const u32 sUnknown_085979E0[] = INCBIN_U32("graphics/misc/interview_frame.4bpp.lz"); static const u16 sUnknown_08597B14[] = INCBIN_U16("graphics/misc/interview_frame_orange.gbapal"); @@ -546,69 +547,69 @@ static const u32 sUnknown_08597B54[] = INCBIN_U32("graphics/misc/interview_frame static const u16 sUnknown_08597C1C[] = INCBIN_U16("graphics/misc/8597C1C.gbapal"); static const u16 sUnknown_08597C24[] = INCBIN_U16("graphics/misc/8597C24.gbapal"); -static const struct Unk08597C30 gUnknown_08597C30[] = { +static const struct EasyChatPhraseFrameDimensions sPhraseFrameDimensions[] = { { - .unk0_0 = 3, - .unk0_5 = 4, - .unk1 = 24, - .unk2 = 4, - .unk3 = 0, + .left = 3, + .top = 4, + .width = 24, + .height = 4, + .footerId = 0, }, { - .unk0_0 = 3, - .unk0_5 = 3, - .unk1 = 24, - .unk2 = 6, - .unk3 = 0, + .left = 3, + .top = 3, + .width = 24, + .height = 6, + .footerId = 0, }, { - .unk0_0 = 3, - .unk0_5 = 0, - .unk1 = 24, - .unk2 = 10, - .unk3 = 0, + .left = 3, + .top = 0, + .width = 24, + .height = 10, + .footerId = 0, }, { - .unk0_0 = 3, - .unk0_5 = 5, - .unk1 = 24, - .unk2 = 2, - .unk3 = 0, + .left = 3, + .top = 5, + .width = 24, + .height = 2, + .footerId = 0, }, { - .unk0_0 = 16, - .unk0_5 = 5, - .unk1 = 12, - .unk2 = 2, - .unk3 = 0, + .left = 16, + .top = 5, + .width = 12, + .height = 2, + .footerId = 0, }, { - .unk0_0 = 3, - .unk0_5 = 4, - .unk1 = 24, - .unk2 = 4, - .unk3 = 0, + .left = 3, + .top = 4, + .width = 24, + .height = 4, + .footerId = 0, }, { - .unk0_0 = 9, - .unk0_5 = 4, - .unk1 = 12, - .unk2 = 2, - .unk3 = 1, + .left = 9, + .top = 4, + .width = 12, + .height = 2, + .footerId = 1, }, { - .unk0_0 = 5, - .unk0_5 = 3, - .unk1 = 0x14, - .unk2 = 10, - .unk3 = 3, + .left = 5, + .top = 3, + .width = 0x14, + .height = 10, + .footerId = 3, }, { - .unk0_0 = 3, - .unk0_5 = 0, - .unk1 = 24, - .unk2 = 10, - .unk3 = 2, + .left = 3, + .top = 0, + .width = 24, + .height = 10, + .footerId = 2, }, }; @@ -701,28 +702,28 @@ static const u8 *const sUnknown_08597C90[] = { gUnknown_862B86C, }; -static const struct SpriteSheet sUnknown_08597CA0[] = { +static const struct SpriteSheet sEasyChatSpriteSheets[] = { { - .data = sUnknown_085977A0, + .data = sEasyChatTriangleCursorGfx, .size = 0x0020, .tag = 0 }, { - .data = sUnknown_085977C0, + .data = sEasyChatScrollIndicatorGfx, .size = 0x0100, .tag = 2 }, { - .data = sUnknown_085978C0, + .data = sEasyChatStartSelectButtonsGfx, .size = 0x0100, .tag = 3 }, {0} }; -static const struct SpritePalette sUnknown_08597CC0[] = { +static const struct SpritePalette sEasyChatSpritePalettes[] = { { - .data = sUnknown_08597780, + .data = sEasyChatTriangleCursorPalette, .tag = 0, }, { @@ -999,7 +1000,7 @@ static const struct SpriteTemplate sUnknown_08597E48 = { .callback = SpriteCallbackDummy, }; -static const u8 sUnknown_08597E60[][4] = { +static const u8 sFooterOptionXOffsets[][4] = { {16, 111, 196, 0}, {16, 78, 130, 160}, {16, 80, 134, 170}, @@ -1039,14 +1040,14 @@ const u8 *const gEasyChatGroupNamePointers[] = { [EC_GROUP_POKEMON_2] = gEasyChatGroupName_Pokemon2, }; -static const u16 sUnknown_0859E62C[] = { +static const u16 sDefaultProfileWords[] = { EC_WORD_I_AM, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_FRIEND, }; -static const u16 sUnknown_0859E634[] = { +static const u16 sDefaultBattleStartWords[] = { EC_WORD_ARE, EC_WORD_YOU, EC_WORD_READY, @@ -1077,20 +1078,20 @@ static const u16 sUnknown_0859E658[] = { SPECIES_DEOXYS, }; -void sub_811A20C(u8 kind, u16 *words, MainCallback callback, u8 sizeParam) +void DoEasyChatScreen(u8 type, u16 *words, MainCallback callback, u8 displayedPersonType) { u8 taskId; ResetTasks(); taskId = CreateTask(sub_811A2C0, 0); - gTasks[taskId].data[EZCHAT_TASK_KIND] = kind; - gTasks[taskId].data[EZCHAT_TASK_SIZE] = sizeParam; + gTasks[taskId].data[EZCHAT_TASK_TYPE] = type; + gTasks[taskId].data[EZCHAT_TASK_SIZE] = displayedPersonType; SetWordTaskArg(taskId, EZCHAT_TASK_WORDS, (u32)words); SetWordTaskArg(taskId, EZCHAT_TASK_MAINCALLBACK, (u32)callback); - SetMainCallback2(sub_811A278); + SetMainCallback2(MainCallback_EasyChatScreen); } -static void sub_811A278(void) +static void MainCallback_EasyChatScreen(void) { RunTasks(); AnimateSprites(); @@ -1098,7 +1099,7 @@ static void sub_811A278(void) UpdatePaletteFade(); } -static void sub_811A290(void) +static void VBlankCallback_EasyChatScreen(void) { TransferPlttBuffer(); LoadOam(); @@ -1136,22 +1137,22 @@ static void sub_811A2FC(u8 taskId) switch (data[EZCHAT_TASK_STATE]) { case 0: - SetVBlankCallback(sub_811A290); + SetVBlankCallback(VBlankCallback_EasyChatScreen); BlendPalettes(0xFFFFFFFF, 16, 0); - BeginNormalPaletteFade(-1, -1, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, 0); data[EZCHAT_TASK_STATE] = 5; break; case 1: v0 = sub_811AAAC(); if (sub_811A88C(v0)) { - BeginNormalPaletteFade(-1, -2, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, 0); data[EZCHAT_TASK_STATE] = 3; data[EZCHAT_TASK_UNK06] = v0; } else if (v0 == 0x18) { - BeginNormalPaletteFade(-1, -1, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, 0); data[EZCHAT_TASK_STATE] = 4; } else if (v0 != 0) @@ -1163,27 +1164,19 @@ static void sub_811A2FC(u8 taskId) break; case 2: if (!sub_811C170()) - { data[EZCHAT_TASK_STATE] = 1; - } break; case 3: if (!gPaletteFade.active) - { sub_811A8A4(data[EZCHAT_TASK_UNK06]); - } break; case 4: if (!gPaletteFade.active) - { sub_811A4D0((MainCallback)GetWordTaskArg(taskId, EZCHAT_TASK_MAINCALLBACK)); - } break; case 5: if (!gPaletteFade.active) - { data[EZCHAT_TASK_STATE] = 1; - } break; } } @@ -1208,7 +1201,7 @@ static bool8 sub_811A428(u8 taskId) } break; case 2: - if (!EasyChat_AllocateResources(data[EZCHAT_TASK_KIND], (u16 *)GetWordTaskArg(taskId, EZCHAT_TASK_WORDS), data[EZCHAT_TASK_SIZE])) + if (!EasyChat_AllocateResources(data[EZCHAT_TASK_TYPE], (u16 *)GetWordTaskArg(taskId, EZCHAT_TASK_WORDS), data[EZCHAT_TASK_SIZE])) { sub_811A4D0((MainCallback)GetWordTaskArg(taskId, EZCHAT_TASK_MAINCALLBACK)); } @@ -1241,98 +1234,98 @@ static void sub_811A4D0(MainCallback callback) SetMainCallback2(callback); } -void easy_chat_input_maybe(void) +void ShowEasyChatScreen(void) { int i; u16 *words; struct MauvilleManBard *bard; - u8 sizeParam = 3; + u8 displayedPersonType = EASY_CHAT_PERSON_DISPLAY_NONE; switch (gSpecialVar_0x8004) { - case 0: - words = gSaveBlock1Ptr->unk2BB0; + case EASY_CHAT_TYPE_PROFILE: + words = gSaveBlock1Ptr->easyChatProfile; break; - case 1: - words = gSaveBlock1Ptr->unk2BBC; + case EASY_CHAT_TYPE_BATTLE_START: + words = gSaveBlock1Ptr->easyChatBattleStart; break; - case 2: - words = gSaveBlock1Ptr->unk2BC8; + case EASY_CHAT_TYPE_BATTLE_WON: + words = gSaveBlock1Ptr->easyChatBattleWon; break; - case 3: - words = gSaveBlock1Ptr->unk2BD4; + case EASY_CHAT_TYPE_BATTLE_LOST: + words = gSaveBlock1Ptr->easyChatBattleLost; break; - case 4: + case EASY_CHAT_TYPE_MAIL: words = gSaveBlock1Ptr->mail[gSpecialVar_0x8005].words; break; - case 6: + case EASY_CHAT_TYPE_BARD_SONG: bard = &gSaveBlock1Ptr->oldMan.bard; for (i = 0; i < 6; i ++) - { bard->temporaryLyrics[i] = bard->songLyrics[i]; - } + words = bard->temporaryLyrics; break; - case 5: + case EASY_CHAT_TYPE_INTERVIEW: words = gSaveBlock1Ptr->tvShows[gSpecialVar_0x8005].bravoTrainer.words; - sizeParam = gSpecialVar_0x8006; + displayedPersonType = gSpecialVar_0x8006; break; - case 7: + case EASY_CHAT_TYPE_FAN_CLUB: words = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8005].fanclubOpinions.words[gSpecialVar_0x8006]; - sizeParam = 1; + displayedPersonType = EASY_CHAT_PERSON_REPORTER_FEMALE; break; - case 8: + case EASY_CHAT_TYPE_UNK_8: words = gSaveBlock1Ptr->tvShows[gSpecialVar_0x8005].unkShow04.words; - sizeParam = 0; + displayedPersonType = EASY_CHAT_PERSON_REPORTER_MALE; break; - case 9: + case EASY_CHAT_TYPE_TRENDY_PHRASE: words = (u16 *)gStringVar3; words[0] = gSaveBlock1Ptr->easyChatPairs[0].words[0]; words[1] = gSaveBlock1Ptr->easyChatPairs[0].words[1]; break; - case 10: + case EASY_CHAT_TYPE_GABBY_AND_TY: words = gSaveBlock1Ptr->gabbyAndTyData.quote; *words = -1; - sizeParam = 1; + displayedPersonType = EASY_CHAT_PERSON_REPORTER_FEMALE; break; - case 11: + case EASY_CHAT_TYPE_CONTEST_INTERVIEW: words = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8005].bravoTrainer.words[gSpecialVar_0x8006]; - sizeParam = 0; + displayedPersonType = EASY_CHAT_PERSON_REPORTER_MALE; break; - case 12: + case EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW: words = gSaveBlock1Ptr->tvShows[gSpecialVar_0x8005].fanclubOpinions.words18; - sizeParam = 1; + displayedPersonType = EASY_CHAT_PERSON_REPORTER_FEMALE; break; - case 13: + case EASY_CHAT_TYPE_GOOD_SAYING: words = (u16 *)gStringVar3; InitializeEasyChatWordArray(words, 2); break; - case 14: + case EASY_CHAT_TYPE_FAN_QUESTION: words = gSaveBlock1Ptr->tvShows[gSpecialVar_0x8005].fanClubSpecial.words; words[0] = -1; - sizeParam = 2; + displayedPersonType = EASY_CHAT_PERSON_BOY; break; - case 15: + case EASY_CHAT_TYPE_QUIZ_ANSWER: words = &gSaveBlock1Ptr->lilycoveLady.quiz.unk_016; break; - case 16: + case EASY_CHAT_TYPE_QUIZ_QUESTION: return; - case 17: + case EASY_CHAT_TYPE_QUIZ_SET_QUESTION: words = gSaveBlock1Ptr->lilycoveLady.quiz.unk_002; break; - case 18: + case EASY_CHAT_TYPE_QUIZ_SET_ANSWER: words = &gSaveBlock1Ptr->lilycoveLady.quiz.unk_014; break; - case 19: + case EASY_CHAT_TYPE_APPRENTICE: words = gSaveBlock2Ptr->apprentices[0].easyChatWords; break; - case 20: + case EASY_CHAT_TYPE_QUESTIONNAIRE: words = GetSaveBlock1Field3564(); break; default: return; } + CleanupOverworldWindowsAndTilemaps(); - sub_811A20C(gSpecialVar_0x8004, words, CB2_ReturnToFieldContinueScript, sizeParam); + DoEasyChatScreen(gSpecialVar_0x8004, words, CB2_ReturnToFieldContinueScript, displayedPersonType); } static void sub_811A7E4(void) @@ -1351,7 +1344,7 @@ static void sub_811A7E4(void) lilycoveLady = &gSaveBlock1Ptr->lilycoveLady; lilycoveLady->quiz.unk_016 = -1; CleanupOverworldWindowsAndTilemaps(); - sub_811A8F0(); + DoQuizQuestionEasyChatScreen(); } return; } @@ -1389,88 +1382,100 @@ static void sub_811A8A4(u16 word) sub_811A4D0(sUnknown_08597530[i].callback); } -static void sub_811A8CC(void) +static void DoQuizAnswerEasyChatScreen(void) { - sub_811A20C(0xF, &gSaveBlock1Ptr->lilycoveLady.quiz.unk_016, CB2_ReturnToFieldContinueScript, 3); + DoEasyChatScreen( + EASY_CHAT_TYPE_QUIZ_ANSWER, + &gSaveBlock1Ptr->lilycoveLady.quiz.unk_016, + CB2_ReturnToFieldContinueScript, + EASY_CHAT_PERSON_DISPLAY_NONE); } -static void sub_811A8F0(void) +static void DoQuizQuestionEasyChatScreen(void) { - sub_811A20C(0x10, gSaveBlock1Ptr->lilycoveLady.quiz.unk_002, CB2_ReturnToFieldContinueScript, 3); + DoEasyChatScreen(EASY_CHAT_TYPE_QUIZ_QUESTION, + gSaveBlock1Ptr->lilycoveLady.quiz.unk_002, + CB2_ReturnToFieldContinueScript, + EASY_CHAT_PERSON_DISPLAY_NONE); } -static void sub_811A914(void) +static void DoQuizSetAnswerEasyChatScreen(void) { - sub_811A20C(0x12, &gSaveBlock1Ptr->lilycoveLady.quiz.unk_014, CB2_ReturnToFieldContinueScript, 3); + DoEasyChatScreen(EASY_CHAT_TYPE_QUIZ_SET_ANSWER, + &gSaveBlock1Ptr->lilycoveLady.quiz.unk_014, + CB2_ReturnToFieldContinueScript, + EASY_CHAT_PERSON_DISPLAY_NONE); } -static void sub_811A938(void) +static void DoQuizSetQuestionEasyChatScreen(void) { - sub_811A20C(0x11, gSaveBlock1Ptr->lilycoveLady.quiz.unk_002, CB2_ReturnToFieldContinueScript, 3); + DoEasyChatScreen(EASY_CHAT_TYPE_QUIZ_SET_QUESTION, + gSaveBlock1Ptr->lilycoveLady.quiz.unk_002, + CB2_ReturnToFieldContinueScript, + EASY_CHAT_PERSON_DISPLAY_NONE); } -static bool8 EasyChat_AllocateResources(u8 kind, u16 *words, u8 sizeParam) +static bool8 EasyChat_AllocateResources(u8 type, u16 *words, u8 displayedPersonType) { u8 templateId; int i; - gEasyChatScreen = malloc(sizeof(*gEasyChatScreen)); - if (gEasyChatScreen == NULL) - { + sEasyChatScreen = malloc(sizeof(*sEasyChatScreen)); + if (sEasyChatScreen == NULL) return FALSE; - } - gEasyChatScreen->kind = kind; - gEasyChatScreen->words = words; - gEasyChatScreen->mainCursorColumn = 0; - gEasyChatScreen->mainCursorRow = 0; - gEasyChatScreen->unk_09 = 0; - gEasyChatScreen->sizeParam = sizeParam; - gEasyChatScreen->unk_13 = 0; - templateId = sub_811BCC8(kind); - if (kind == 0x10) + + sEasyChatScreen->type = type; + sEasyChatScreen->words = words; + sEasyChatScreen->mainCursorColumn = 0; + sEasyChatScreen->mainCursorRow = 0; + sEasyChatScreen->unk_09 = 0; + sEasyChatScreen->displayedPersonType = displayedPersonType; + sEasyChatScreen->unk_13 = 0; + templateId = GetEachChatScreenTemplateId(type); + if (type == EASY_CHAT_TYPE_QUIZ_QUESTION) { - sub_811BDF0(gEasyChatScreen->unk_14); - gEasyChatScreen->titleText = gEasyChatScreen->unk_14; - gEasyChatScreen->state = 7; + sub_811BDF0(sEasyChatScreen->unk_14); + sEasyChatScreen->titleText = sEasyChatScreen->unk_14; + sEasyChatScreen->state = 7; } else { - gEasyChatScreen->state = 0; - gEasyChatScreen->titleText = gEasyChatScreenTemplates[templateId].titleText; - } - gEasyChatScreen->numColumns = gEasyChatScreenTemplates[templateId].numColumns; - gEasyChatScreen->numRows = gEasyChatScreenTemplates[templateId].numRows; - gEasyChatScreen->unk_07 = gEasyChatScreen->numColumns * gEasyChatScreen->numRows; - gEasyChatScreen->templateId = templateId; - if (gEasyChatScreen->unk_07 > 9) - { - gEasyChatScreen->unk_07 = 9; + sEasyChatScreen->state = 0; + sEasyChatScreen->titleText = sEasyChatScreenTemplates[templateId].titleText; } + + sEasyChatScreen->numColumns = sEasyChatScreenTemplates[templateId].numColumns; + sEasyChatScreen->numRows = sEasyChatScreenTemplates[templateId].numRows; + sEasyChatScreen->unk_07 = sEasyChatScreen->numColumns * sEasyChatScreen->numRows; + sEasyChatScreen->templateId = templateId; + if (sEasyChatScreen->unk_07 > 9) + sEasyChatScreen->unk_07 = 9; + if (words != NULL) { - CpuCopy16(words, gEasyChatScreen->ecWordBuffer, gEasyChatScreen->unk_07 * sizeof(u16)); + CpuCopy16(words, sEasyChatScreen->ecWordBuffer, sEasyChatScreen->unk_07 * sizeof(u16)); } else { - for (i = 0; i < gEasyChatScreen->unk_07; i ++) - { - gEasyChatScreen->ecWordBuffer[i] = -1; - } - gEasyChatScreen->words = gEasyChatScreen->ecWordBuffer; + for (i = 0; i < sEasyChatScreen->unk_07; i ++) + sEasyChatScreen->ecWordBuffer[i] = -1; + + sEasyChatScreen->words = sEasyChatScreen->ecWordBuffer; } - gEasyChatScreen->unk_0d = (sub_811F3AC() - 1) / 2 + 1; + + sEasyChatScreen->unk_0d = (sub_811F3AC() - 1) / 2 + 1; return TRUE; } static void EasyChat_FreeResources(void) { - if (gEasyChatScreen != NULL) - FREE_AND_SET_NULL(gEasyChatScreen); + if (sEasyChatScreen != NULL) + FREE_AND_SET_NULL(sEasyChatScreen); } static u16 sub_811AAAC(void) { - switch (gEasyChatScreen->state) + switch (sEasyChatScreen->state) { case 0: return sub_811AB68(); @@ -1500,7 +1505,7 @@ static u16 sub_811AAAC(void) bool32 sub_811AB44(void) { - switch (sub_811BA68()) + switch (GetEasyChatScreenFrameId()) { case 2: case 7: @@ -1517,10 +1522,10 @@ static u16 sub_811AB68(void) if (gMain.newKeys & A_BUTTON) { sub_811BF78(); - gEasyChatScreen->state = 2; - gEasyChatScreen->unk_0a = 0; - gEasyChatScreen->unk_0b = 0; - gEasyChatScreen->unk_0c = 0; + sEasyChatScreen->state = 2; + sEasyChatScreen->unk_0a = 0; + sEasyChatScreen->unk_0b = 0; + sEasyChatScreen->unk_0c = 0; return 9; } else if (gMain.newKeys & B_BUTTON) @@ -1533,51 +1538,51 @@ static u16 sub_811AB68(void) } else if (gMain.newKeys & DPAD_UP) { - gEasyChatScreen->mainCursorRow--; + sEasyChatScreen->mainCursorRow--; break; } else if (gMain.newKeys & DPAD_LEFT) { - gEasyChatScreen->mainCursorColumn--; + sEasyChatScreen->mainCursorColumn--; break; } else if (gMain.newKeys & DPAD_DOWN) { - gEasyChatScreen->mainCursorRow++; + sEasyChatScreen->mainCursorRow++; break; } else if (gMain.newKeys & DPAD_RIGHT) { - gEasyChatScreen->mainCursorColumn++; + sEasyChatScreen->mainCursorColumn++; break; } return 0; } while (0); - if (gEasyChatScreen->mainCursorRow < 0) - gEasyChatScreen->mainCursorRow = gEasyChatScreenTemplates[gEasyChatScreen->templateId].numRows; + if (sEasyChatScreen->mainCursorRow < 0) + sEasyChatScreen->mainCursorRow = sEasyChatScreenTemplates[sEasyChatScreen->templateId].numRows; - if (gEasyChatScreen->mainCursorRow > gEasyChatScreenTemplates[gEasyChatScreen->templateId].numRows) - gEasyChatScreen->mainCursorRow = 0; + if (sEasyChatScreen->mainCursorRow > sEasyChatScreenTemplates[sEasyChatScreen->templateId].numRows) + sEasyChatScreen->mainCursorRow = 0; - if (gEasyChatScreen->mainCursorRow == gEasyChatScreenTemplates[gEasyChatScreen->templateId].numRows) + if (sEasyChatScreen->mainCursorRow == sEasyChatScreenTemplates[sEasyChatScreen->templateId].numRows) { - if (gEasyChatScreen->mainCursorColumn > 2) - gEasyChatScreen->mainCursorColumn = 2; + if (sEasyChatScreen->mainCursorColumn > 2) + sEasyChatScreen->mainCursorColumn = 2; - gEasyChatScreen->state = 1; + sEasyChatScreen->state = 1; return 3; } - if (gEasyChatScreen->mainCursorColumn < 0) - gEasyChatScreen->mainCursorColumn = gEasyChatScreenTemplates[gEasyChatScreen->templateId].numColumns - 1; + if (sEasyChatScreen->mainCursorColumn < 0) + sEasyChatScreen->mainCursorColumn = sEasyChatScreenTemplates[sEasyChatScreen->templateId].numColumns - 1; - if (gEasyChatScreen->mainCursorColumn >= gEasyChatScreenTemplates[gEasyChatScreen->templateId].numColumns) - gEasyChatScreen->mainCursorColumn = 0; + if (sEasyChatScreen->mainCursorColumn >= sEasyChatScreenTemplates[sEasyChatScreen->templateId].numColumns) + sEasyChatScreen->mainCursorColumn = 0; - if (sub_811AB44() && gEasyChatScreen->mainCursorColumn == 1 && gEasyChatScreen->mainCursorRow == 4) - gEasyChatScreen->mainCursorColumn = 0; + if (sub_811AB44() && sEasyChatScreen->mainCursorColumn == 1 && sEasyChatScreen->mainCursorRow == 4) + sEasyChatScreen->mainCursorColumn = 0; return 2; } @@ -1588,7 +1593,7 @@ static u16 sub_811ACDC(void) { if (gMain.newKeys & A_BUTTON) { - switch (gEasyChatScreen->mainCursorColumn) + switch (sEasyChatScreen->mainCursorColumn) { case 0: return sub_811B184(); @@ -1611,47 +1616,47 @@ static u16 sub_811ACDC(void) } else if (gMain.newKeys & DPAD_UP) { - gEasyChatScreen->mainCursorRow--; + sEasyChatScreen->mainCursorRow--; break; } else if (gMain.newKeys & DPAD_LEFT) { - gEasyChatScreen->mainCursorColumn--; + sEasyChatScreen->mainCursorColumn--; break; } else if (gMain.newKeys & DPAD_DOWN) { - gEasyChatScreen->mainCursorRow = 0; + sEasyChatScreen->mainCursorRow = 0; break; } else if (gMain.newKeys & DPAD_RIGHT) { - gEasyChatScreen->mainCursorColumn++; + sEasyChatScreen->mainCursorColumn++; break; } return 0; } while (0); - if (gEasyChatScreen->mainCursorRow == gEasyChatScreenTemplates[gEasyChatScreen->templateId].numRows) + if (sEasyChatScreen->mainCursorRow == sEasyChatScreenTemplates[sEasyChatScreen->templateId].numRows) { - int numFooterColumns = sub_811BA3C() ? 4 : 3; - if (gEasyChatScreen->mainCursorColumn < 0) - gEasyChatScreen->mainCursorColumn = numFooterColumns - 1; + int numFooterColumns = FooterHasFourOptions() ? 4 : 3; + if (sEasyChatScreen->mainCursorColumn < 0) + sEasyChatScreen->mainCursorColumn = numFooterColumns - 1; - if (gEasyChatScreen->mainCursorColumn >= numFooterColumns) - gEasyChatScreen->mainCursorColumn = 0; + if (sEasyChatScreen->mainCursorColumn >= numFooterColumns) + sEasyChatScreen->mainCursorColumn = 0; return 3; } - if (gEasyChatScreen->mainCursorColumn >= gEasyChatScreenTemplates[gEasyChatScreen->templateId].numColumns) - gEasyChatScreen->mainCursorColumn = gEasyChatScreenTemplates[gEasyChatScreen->templateId].numColumns - 1; + if (sEasyChatScreen->mainCursorColumn >= sEasyChatScreenTemplates[sEasyChatScreen->templateId].numColumns) + sEasyChatScreen->mainCursorColumn = sEasyChatScreenTemplates[sEasyChatScreen->templateId].numColumns - 1; - if (sub_811AB44() && gEasyChatScreen->mainCursorColumn == 1 && gEasyChatScreen->mainCursorRow == 4) - gEasyChatScreen->mainCursorColumn = 0; + if (sub_811AB44() && sEasyChatScreen->mainCursorColumn == 1 && sEasyChatScreen->mainCursorRow == 4) + sEasyChatScreen->mainCursorColumn = 0; - gEasyChatScreen->state = 0; + sEasyChatScreen->state = 0; return 2; } @@ -1662,10 +1667,10 @@ static u16 sub_811AE44(void) if (gMain.newKeys & A_BUTTON) { - if (gEasyChatScreen->unk_0a != -1) + if (sEasyChatScreen->unk_0a != -1) return sub_811B2B0(); - switch (gEasyChatScreen->unk_0b) + switch (sEasyChatScreen->unk_0b) { case 0: return sub_811B33C(); @@ -1698,7 +1703,7 @@ static u16 sub_811AF00(void) { if (gMain.newKeys & B_BUTTON) { - gEasyChatScreen->state = 2; + sEasyChatScreen->state = 2; return 14; } @@ -1734,11 +1739,11 @@ static u16 sub_811AF8C(void) { case MENU_B_PRESSED: // B Button case 1: // No - gEasyChatScreen->state = sub_811B2A4(); + sEasyChatScreen->state = sub_811B2A4(); return 7; case 0: // Yes gSpecialVar_Result = 0; - var0 = gEasyChatScreen->kind - 17; + var0 = sEasyChatScreen->type - EASY_CHAT_TYPE_QUIZ_SET_QUESTION; if (var0 < 2) sub_811B3E4(); @@ -1754,7 +1759,7 @@ static u16 sub_811AFEC(void) { case MENU_B_PRESSED: // B Button case 1: // No - gEasyChatScreen->state = sub_811B2A4(); + sEasyChatScreen->state = sub_811B2A4(); return 7; case 0: // Yes sub_811BE9C(); @@ -1772,11 +1777,11 @@ static u16 sub_811B040(void) { case MENU_B_PRESSED: // B Button case 1: // No - gEasyChatScreen->state = 1; + sEasyChatScreen->state = 1; return 7; case 0: // Yes sub_811B418(); - gEasyChatScreen->state = 1; + sEasyChatScreen->state = 1; return 8; default: return 0; @@ -1798,7 +1803,7 @@ static u16 sub_811B0BC(void) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - gEasyChatScreen->state = sub_811B2A4(); + sEasyChatScreen->state = sub_811B2A4(); return 7; } @@ -1807,7 +1812,7 @@ static u16 sub_811B0BC(void) static u16 sub_811B0E8(void) { - gEasyChatScreen->state = 10; + sEasyChatScreen->state = 10; return 6; } @@ -1818,8 +1823,8 @@ static u16 sub_811B0F8(void) case MENU_B_PRESSED: // B Button case 1: // No sub_811B454(); - gEasyChatScreen->unk_08 = 0; - gEasyChatScreen->state = 8; + sEasyChatScreen->stateBackup = 0; + sEasyChatScreen->state = 8; return 31; case 0: // Yes gSpecialVar_Result = sub_811B4EC(); @@ -1832,124 +1837,127 @@ static u16 sub_811B0F8(void) static u16 sub_811B150(void) { - if (gEasyChatScreen->kind == 19 || gEasyChatScreen->kind == 11) + if (sEasyChatScreen->type == EASY_CHAT_TYPE_APPRENTICE + || sEasyChatScreen->type == EASY_CHAT_TYPE_CONTEST_INTERVIEW) { - gEasyChatScreen->unk_08 = gEasyChatScreen->state; - gEasyChatScreen->state = 8; + sEasyChatScreen->stateBackup = sEasyChatScreen->state; + sEasyChatScreen->state = 8; return 34; } else { - gEasyChatScreen->unk_08 = gEasyChatScreen->state; - gEasyChatScreen->state = 4; + sEasyChatScreen->stateBackup = sEasyChatScreen->state; + sEasyChatScreen->state = 4; return 5; } } static int sub_811B184(void) { - gEasyChatScreen->unk_08 = gEasyChatScreen->state; - if (gEasyChatScreen->kind != 6) + sEasyChatScreen->stateBackup = sEasyChatScreen->state; + if (sEasyChatScreen->type != EASY_CHAT_TYPE_BARD_SONG) { - gEasyChatScreen->state = 5; + sEasyChatScreen->state = 5; return 4; } else { - gEasyChatScreen->unk_08 = gEasyChatScreen->state; - gEasyChatScreen->state = 8; + sEasyChatScreen->stateBackup = sEasyChatScreen->state; + sEasyChatScreen->state = 8; return 32; } } static u16 sub_811B1B4(void) { - gEasyChatScreen->unk_08 = gEasyChatScreen->state; - if (gEasyChatScreen->kind == 17) + sEasyChatScreen->stateBackup = sEasyChatScreen->state; + if (sEasyChatScreen->type == EASY_CHAT_TYPE_QUIZ_SET_QUESTION) { if (sub_811BD64()) { - gEasyChatScreen->state = 8; + sEasyChatScreen->state = 8; return 29; } if (sub_811BDB0()) { - gEasyChatScreen->state = 8; + sEasyChatScreen->state = 8; return 30; } - gEasyChatScreen->state = 6; + sEasyChatScreen->state = 6; return 6; } - else if (gEasyChatScreen->kind == 18) + else if (sEasyChatScreen->type == EASY_CHAT_TYPE_QUIZ_SET_ANSWER) { if (sub_811BDB0()) { - gEasyChatScreen->state = 8; + sEasyChatScreen->state = 8; return 30; } if (sub_811BD64()) { - gEasyChatScreen->state = 8; + sEasyChatScreen->state = 8; return 29; } - gEasyChatScreen->state = 6; + sEasyChatScreen->state = 6; return 6; } - else if (gEasyChatScreen->kind == 9 || gEasyChatScreen->kind == 13) + else if (sEasyChatScreen->type == EASY_CHAT_TYPE_TRENDY_PHRASE + || sEasyChatScreen->type == EASY_CHAT_TYPE_GOOD_SAYING) { if (!sub_811BD2C()) { - gEasyChatScreen->state = 8; + sEasyChatScreen->state = 8; return 33; } - gEasyChatScreen->state = 6; + sEasyChatScreen->state = 6; return 6; } - else if (gEasyChatScreen->kind == 19 || gEasyChatScreen->kind == 11) + else if (sEasyChatScreen->type == EASY_CHAT_TYPE_APPRENTICE + || sEasyChatScreen->type == EASY_CHAT_TYPE_CONTEST_INTERVIEW) { if (sub_811BCF4()) { - gEasyChatScreen->state = 8; + sEasyChatScreen->state = 8; return 34; } - gEasyChatScreen->state = 6; + sEasyChatScreen->state = 6; return 6; } - else if (gEasyChatScreen->kind == 20) + else if (sEasyChatScreen->type == EASY_CHAT_TYPE_QUESTIONNAIRE) { - gEasyChatScreen->state = 6; + sEasyChatScreen->state = 6; return 6; } else { if (sub_811BCF4() == 1 || !sub_811B4EC()) { - gEasyChatScreen->state = 4; + sEasyChatScreen->state = 4; return 5; } - gEasyChatScreen->state = 6; + sEasyChatScreen->state = 6; return 6; } } static int sub_811B264(void) { - gEasyChatScreen->unk_08 = gEasyChatScreen->state; - switch (gEasyChatScreen->kind) + sEasyChatScreen->stateBackup = sEasyChatScreen->state; + switch (sEasyChatScreen->type) { - case 15: + case EASY_CHAT_TYPE_QUIZ_ANSWER: return 25; - case 17: + case EASY_CHAT_TYPE_QUIZ_SET_QUESTION: sub_811B3E4(); return 28; - case 18: + case EASY_CHAT_TYPE_QUIZ_SET_ANSWER: sub_811B3E4(); return 27; default: @@ -1959,14 +1967,14 @@ static int sub_811B264(void) static u8 sub_811B2A4(void) { - return gEasyChatScreen->unk_08; + return sEasyChatScreen->stateBackup; } static int sub_811B2B0(void) { u16 var1; - if (gEasyChatScreen->unk_09 == 0) + if (sEasyChatScreen->unk_09 == 0) { u8 groupId = sub_811F3B8(sub_811B8E8()); sub_811F548(0, groupId); @@ -1980,36 +1988,36 @@ static int sub_811B2B0(void) if (var1 == 0) return 0; - gEasyChatScreen->unk_0f = (var1 - 1) / 2; - gEasyChatScreen->unk_0e = 0; - gEasyChatScreen->unk_10 = 0; - gEasyChatScreen->unk_11 = 0; - gEasyChatScreen->state = 3; + sEasyChatScreen->unk_0f = (var1 - 1) / 2; + sEasyChatScreen->unk_0e = 0; + sEasyChatScreen->unk_10 = 0; + sEasyChatScreen->unk_11 = 0; + sEasyChatScreen->state = 3; return 11; } static int sub_811B32C(void) { - gEasyChatScreen->state = 0; + sEasyChatScreen->state = 0; return 10; } static int sub_811B33C(void) { - gEasyChatScreen->unk_0a = 0; - gEasyChatScreen->unk_0b = 0; - gEasyChatScreen->unk_0c = 0; - if (!gEasyChatScreen->unk_09) - gEasyChatScreen->unk_09 = 1; + sEasyChatScreen->unk_0a = 0; + sEasyChatScreen->unk_0b = 0; + sEasyChatScreen->unk_0c = 0; + if (!sEasyChatScreen->unk_09) + sEasyChatScreen->unk_09 = 1; else - gEasyChatScreen->unk_09 = 0; + sEasyChatScreen->unk_09 = 0; return 23; } static int sub_811B368(void) { - if (gEasyChatScreen->kind == 6) + if (sEasyChatScreen->type == EASY_CHAT_TYPE_BARD_SONG) { PlaySE(SE_HAZURE); return 0; @@ -2032,14 +2040,14 @@ static int sub_811B394(void) else { sub_811B488(easyChatWord); - if (gEasyChatScreen->kind != 6) + if (sEasyChatScreen->type != EASY_CHAT_TYPE_BARD_SONG) { - gEasyChatScreen->state = 0; + sEasyChatScreen->state = 0; return 12; } else { - gEasyChatScreen->state = 9; + sEasyChatScreen->state = 9; return 13; } } @@ -2048,36 +2056,36 @@ static int sub_811B394(void) static void sub_811B3E4(void) { int i; - for (i = 0; i < gEasyChatScreen->unk_07; i++) - gEasyChatScreen->words[i] = gEasyChatScreen->ecWordBuffer[i]; + for (i = 0; i < sEasyChatScreen->unk_07; i++) + sEasyChatScreen->words[i] = sEasyChatScreen->ecWordBuffer[i]; } static void sub_811B418(void) { int i; - for (i = 0; i < gEasyChatScreen->unk_07; i++) - gEasyChatScreen->ecWordBuffer[i] = 0xFFFF; + for (i = 0; i < sEasyChatScreen->unk_07; i++) + sEasyChatScreen->ecWordBuffer[i] = 0xFFFF; } static void sub_811B454(void) { int i; - for (i = 0; i < gEasyChatScreen->unk_07; i++) - gEasyChatScreen->ecWordBuffer[i] = gEasyChatScreen->words[i]; + for (i = 0; i < sEasyChatScreen->unk_07; i++) + sEasyChatScreen->ecWordBuffer[i] = sEasyChatScreen->words[i]; } static void sub_811B488(u16 easyChatWord) { u16 index = sub_811B8C8(); - gEasyChatScreen->ecWordBuffer[index] = easyChatWord; + sEasyChatScreen->ecWordBuffer[index] = easyChatWord; } static u8 sub_811B4AC(void) { u16 i; - for (i = 0; i < gEasyChatScreen->unk_07; i++) + for (i = 0; i < sEasyChatScreen->unk_07; i++) { - if (gEasyChatScreen->ecWordBuffer[i] != gEasyChatScreen->words[i]) + if (sEasyChatScreen->ecWordBuffer[i] != sEasyChatScreen->words[i]) return 1; } @@ -2086,7 +2094,7 @@ static u8 sub_811B4AC(void) static int sub_811B4EC(void) { - u8 var0 = gEasyChatScreen->kind - 17; + u8 var0 = sEasyChatScreen->type - EASY_CHAT_TYPE_QUIZ_SET_QUESTION; if (var0 < 2) { if (sub_811BD64()) @@ -2105,9 +2113,9 @@ static int sub_811B4EC(void) static u16 sub_811B528(int arg0) { - if (gEasyChatScreen->unk_0a != -1) + if (sEasyChatScreen->unk_0a != -1) { - if (gEasyChatScreen->unk_09 == 0) + if (sEasyChatScreen->unk_09 == 0) return sub_811B568(arg0); else return sub_811B634(arg0); @@ -2123,32 +2131,32 @@ static int sub_811B568(u32 arg0) switch (arg0) { case 2: - if (gEasyChatScreen->unk_0b != -gEasyChatScreen->unk_0c) + if (sEasyChatScreen->unk_0b != -sEasyChatScreen->unk_0c) { - if (gEasyChatScreen->unk_0b) + if (sEasyChatScreen->unk_0b) { - gEasyChatScreen->unk_0b--; + sEasyChatScreen->unk_0b--; return 15; } else { - gEasyChatScreen->unk_0c--; + sEasyChatScreen->unk_0c--; return 17; } } break; case 3: - if (gEasyChatScreen->unk_0b + gEasyChatScreen->unk_0c < gEasyChatScreen->unk_0d - 1) + if (sEasyChatScreen->unk_0b + sEasyChatScreen->unk_0c < sEasyChatScreen->unk_0d - 1) { int var0; - if (gEasyChatScreen->unk_0b < 3) + if (sEasyChatScreen->unk_0b < 3) { - gEasyChatScreen->unk_0b++; + sEasyChatScreen->unk_0b++; var0 = 15; } else { - gEasyChatScreen->unk_0c++; + sEasyChatScreen->unk_0c++; var0 = 16; } @@ -2157,16 +2165,16 @@ static int sub_811B568(u32 arg0) } break; case 1: - if (gEasyChatScreen->unk_0a) - gEasyChatScreen->unk_0a--; + if (sEasyChatScreen->unk_0a) + sEasyChatScreen->unk_0a--; else sub_811B744(); return 15; case 0: - if (gEasyChatScreen->unk_0a < 1) + if (sEasyChatScreen->unk_0a < 1) { - gEasyChatScreen->unk_0a++; + sEasyChatScreen->unk_0a++; if (sub_811B9C8()) sub_811B744(); } @@ -2185,30 +2193,30 @@ static int sub_811B634(u32 arg0) switch (arg0) { case 2: - if (gEasyChatScreen->unk_0b > 0) - gEasyChatScreen->unk_0b--; + if (sEasyChatScreen->unk_0b > 0) + sEasyChatScreen->unk_0b--; else - gEasyChatScreen->unk_0b = 3; + sEasyChatScreen->unk_0b = 3; sub_811B978(); return 15; case 3: - if (gEasyChatScreen->unk_0b < 3) - gEasyChatScreen->unk_0b++; + if (sEasyChatScreen->unk_0b < 3) + sEasyChatScreen->unk_0b++; else - gEasyChatScreen->unk_0b = 0; + sEasyChatScreen->unk_0b = 0; sub_811B978(); return 15; case 0: - gEasyChatScreen->unk_0a++; + sEasyChatScreen->unk_0a++; if (sub_811B9C8()) sub_811B744(); return 15; case 1: - gEasyChatScreen->unk_0a--; - if (gEasyChatScreen->unk_0a < 0) + sEasyChatScreen->unk_0a--; + if (sEasyChatScreen->unk_0a < 0) sub_811B744(); return 15; @@ -2222,26 +2230,26 @@ static int sub_811B6C4(u32 arg0) switch (arg0) { case 2: - if (gEasyChatScreen->unk_0b) - gEasyChatScreen->unk_0b--; + if (sEasyChatScreen->unk_0b) + sEasyChatScreen->unk_0b--; else - gEasyChatScreen->unk_0b = 2; + sEasyChatScreen->unk_0b = 2; return 15; case 3: - if (gEasyChatScreen->unk_0b < 2) - gEasyChatScreen->unk_0b++; + if (sEasyChatScreen->unk_0b < 2) + sEasyChatScreen->unk_0b++; else - gEasyChatScreen->unk_0b = 0; + sEasyChatScreen->unk_0b = 0; return 15; case 1: - gEasyChatScreen->unk_0b++; + sEasyChatScreen->unk_0b++; sub_811B768(); return 15; case 0: - gEasyChatScreen->unk_0a = 0; - gEasyChatScreen->unk_0b++; + sEasyChatScreen->unk_0a = 0; + sEasyChatScreen->unk_0b++; return 15; } @@ -2250,21 +2258,21 @@ static int sub_811B6C4(u32 arg0) static void sub_811B744(void) { - gEasyChatScreen->unk_0a = 0xFF; - if (gEasyChatScreen->unk_0b) - gEasyChatScreen->unk_0b--; + sEasyChatScreen->unk_0a = 0xFF; + if (sEasyChatScreen->unk_0b) + sEasyChatScreen->unk_0b--; } static void sub_811B768(void) { - if (gEasyChatScreen->unk_09 == 0) + if (sEasyChatScreen->unk_09 == 0) { - gEasyChatScreen->unk_0a = 1; + sEasyChatScreen->unk_0a = 1; sub_811B978(); } else { - gEasyChatScreen->unk_0a = sub_811B960(gEasyChatScreen->unk_0b); + sEasyChatScreen->unk_0a = sub_811B960(sEasyChatScreen->unk_0b); } } @@ -2274,16 +2282,16 @@ static u16 sub_811B794(u32 arg0) switch (arg0) { case 2: - if (gEasyChatScreen->unk_11 + gEasyChatScreen->unk_0e > 0) + if (sEasyChatScreen->unk_11 + sEasyChatScreen->unk_0e > 0) { - if (gEasyChatScreen->unk_11 > 0) + if (sEasyChatScreen->unk_11 > 0) { - gEasyChatScreen->unk_11--; + sEasyChatScreen->unk_11--; result = 18; } else { - gEasyChatScreen->unk_0e--; + sEasyChatScreen->unk_0e--; result = 19; } @@ -2292,16 +2300,16 @@ static u16 sub_811B794(u32 arg0) } break; case 3: - if (gEasyChatScreen->unk_11 + gEasyChatScreen->unk_0e < gEasyChatScreen->unk_0f) + if (sEasyChatScreen->unk_11 + sEasyChatScreen->unk_0e < sEasyChatScreen->unk_0f) { - if (gEasyChatScreen->unk_11 < 3) + if (sEasyChatScreen->unk_11 < 3) { - gEasyChatScreen->unk_11++; + sEasyChatScreen->unk_11++; result = 18; } else { - gEasyChatScreen->unk_0e++; + sEasyChatScreen->unk_0e++; result = 20; } @@ -2310,42 +2318,42 @@ static u16 sub_811B794(u32 arg0) } break; case 1: - if (gEasyChatScreen->unk_10 > 0) - gEasyChatScreen->unk_10--; + if (sEasyChatScreen->unk_10 > 0) + sEasyChatScreen->unk_10--; else - gEasyChatScreen->unk_10 = 1; + sEasyChatScreen->unk_10 = 1; sub_811B9A0(); return 18; case 0: - if (gEasyChatScreen->unk_10 < 1) + if (sEasyChatScreen->unk_10 < 1) { - gEasyChatScreen->unk_10++; + sEasyChatScreen->unk_10++; if (sub_811BA1C()) - gEasyChatScreen->unk_10 = 0; + sEasyChatScreen->unk_10 = 0; } else { - gEasyChatScreen->unk_10 = 0; + sEasyChatScreen->unk_10 = 0; } return 18; case 4: - if (gEasyChatScreen->unk_0e) + if (sEasyChatScreen->unk_0e) { - if (gEasyChatScreen->unk_0e > 3) - gEasyChatScreen->unk_0e -= 4; + if (sEasyChatScreen->unk_0e > 3) + sEasyChatScreen->unk_0e -= 4; else - gEasyChatScreen->unk_0e = 0; + sEasyChatScreen->unk_0e = 0; return 21; } break; case 5: - if (gEasyChatScreen->unk_0e <= gEasyChatScreen->unk_0f - 4) + if (sEasyChatScreen->unk_0e <= sEasyChatScreen->unk_0f - 4) { - gEasyChatScreen->unk_0e += 4; - if (gEasyChatScreen->unk_0e > gEasyChatScreen->unk_0f - 3) - gEasyChatScreen->unk_0e = gEasyChatScreen->unk_0f + 0xFD; + sEasyChatScreen->unk_0e += 4; + if (sEasyChatScreen->unk_0e > sEasyChatScreen->unk_0f - 3) + sEasyChatScreen->unk_0e = sEasyChatScreen->unk_0f + 0xFD; sub_811B9A0(); return 22; @@ -2358,24 +2366,24 @@ static u16 sub_811B794(u32 arg0) static u16 sub_811B8C8(void) { - return (gEasyChatScreen->mainCursorRow * gEasyChatScreen->numColumns) + gEasyChatScreen->mainCursorColumn; + return (sEasyChatScreen->mainCursorRow * sEasyChatScreen->numColumns) + sEasyChatScreen->mainCursorColumn; } static u16 sub_811B8E8(void) { - return 2 * (gEasyChatScreen->unk_0b + gEasyChatScreen->unk_0c) + gEasyChatScreen->unk_0a; + return 2 * (sEasyChatScreen->unk_0b + sEasyChatScreen->unk_0c) + sEasyChatScreen->unk_0a; } static int sub_811B908(void) { - int var0 = (u8)gEasyChatScreen->unk_0a < 7 ? gEasyChatScreen->unk_0a : 0; - int var1 = (u8)gEasyChatScreen->unk_0b < 4 ? gEasyChatScreen->unk_0b : 0; + int var0 = (u8)sEasyChatScreen->unk_0a < 7 ? sEasyChatScreen->unk_0a : 0; + int var1 = (u8)sEasyChatScreen->unk_0b < 4 ? sEasyChatScreen->unk_0b : 0; return sUnknown_08597748[var1][var0]; } static u16 sub_811B940(void) { - return 2 * (gEasyChatScreen->unk_11 + gEasyChatScreen->unk_0e) + gEasyChatScreen->unk_10; + return 2 * (sEasyChatScreen->unk_11 + sEasyChatScreen->unk_0e) + sEasyChatScreen->unk_10; } static u8 sub_811B960(u8 arg0) @@ -2394,8 +2402,8 @@ static void sub_811B978(void) { while (sub_811B9C8()) { - if (gEasyChatScreen->unk_0a) - gEasyChatScreen->unk_0a--; + if (sEasyChatScreen->unk_0a) + sEasyChatScreen->unk_0a--; else break; } @@ -2405,8 +2413,8 @@ static void sub_811B9A0(void) { while (sub_811BA1C()) { - if (gEasyChatScreen->unk_10) - gEasyChatScreen->unk_10--; + if (sEasyChatScreen->unk_10) + sEasyChatScreen->unk_10--; else break; } @@ -2414,10 +2422,10 @@ static void sub_811B9A0(void) static u8 sub_811B9C8(void) { - if (gEasyChatScreen->unk_09 == 0) + if (sEasyChatScreen->unk_09 == 0) return sub_811B8E8() >= sub_811F3AC() ? 1 : 0; else - return gEasyChatScreen->unk_0a > sub_811B960(gEasyChatScreen->unk_0b) ? 1 : 0; + return sEasyChatScreen->unk_0a > sub_811B960(sEasyChatScreen->unk_0b) ? 1 : 0; } static u8 sub_811BA1C(void) @@ -2425,73 +2433,73 @@ static u8 sub_811BA1C(void) return sub_811B940() >= sub_811F5B0() ? 1 : 0; } -static int sub_811BA3C(void) +static int FooterHasFourOptions(void) { - return gEasyChatScreenTemplates[gEasyChatScreen->templateId].unk_03_7; + return sEasyChatScreenTemplates[sEasyChatScreen->templateId].fourFooterOptions; } -u8 sub_811BA5C(void) +static u8 GetEasyChatScreenType(void) { - return gEasyChatScreen->kind; + return sEasyChatScreen->type; } -static u8 sub_811BA68(void) +static u8 GetEasyChatScreenFrameId(void) { - return gEasyChatScreenTemplates[gEasyChatScreen->templateId].unk_03_0; + return sEasyChatScreenTemplates[sEasyChatScreen->templateId].frameId; } -const u8 *sub_811BA88(void) +const u8 *GetTitleText(void) { - return gEasyChatScreen->titleText; + return sEasyChatScreen->titleText; } -u16 *sub_811BA94(void) +static u16 *GetEasyChatWordBuffer(void) { - return gEasyChatScreen->ecWordBuffer; + return sEasyChatScreen->ecWordBuffer; } -u8 sub_811BAA0(void) +static u8 GetNumRows(void) { - return gEasyChatScreen->numRows; + return sEasyChatScreen->numRows; } -u8 sub_811BAAC(void) +static u8 GetNumColumns(void) { - return gEasyChatScreen->numColumns; + return sEasyChatScreen->numColumns; } -u8 sub_811BAB8(void) +static u8 GetMainCursorColumn(void) { - return gEasyChatScreen->mainCursorColumn; + return sEasyChatScreen->mainCursorColumn; } -u8 sub_811BAC4(void) +static u8 GetMainCursorRow(void) { - return gEasyChatScreen->mainCursorRow; + return sEasyChatScreen->mainCursorRow; } static void GetEasyChatInstructionsText(const u8 **str1, const u8 **str2) { - *str1 = gEasyChatScreenTemplates[gEasyChatScreen->templateId].instructionsText1; - *str2 = gEasyChatScreenTemplates[gEasyChatScreen->templateId].instructionsText2; + *str1 = sEasyChatScreenTemplates[sEasyChatScreen->templateId].instructionsText1; + *str2 = sEasyChatScreenTemplates[sEasyChatScreen->templateId].instructionsText2; } static void GetEasyChatConfirmText(const u8 **str1, const u8 **str2) { - *str1 = gEasyChatScreenTemplates[gEasyChatScreen->templateId].confirmText1; - *str2 = gEasyChatScreenTemplates[gEasyChatScreen->templateId].confirmText2; + *str1 = sEasyChatScreenTemplates[sEasyChatScreen->templateId].confirmText1; + *str2 = sEasyChatScreenTemplates[sEasyChatScreen->templateId].confirmText2; } static void sub_811BB40(const u8 **str1, const u8 **str2) { - switch (gEasyChatScreen->kind) + switch (sEasyChatScreen->type) { - case 4: + case EASY_CHAT_TYPE_MAIL: *str1 = gText_StopGivingPkmnMail; *str2 = NULL; break; - case 15: - case 16: + case EASY_CHAT_TYPE_QUIZ_ANSWER: + case EASY_CHAT_TYPE_QUIZ_QUESTION: *str1 = gText_LikeToQuitQuiz; *str2 = gText_ChallengeQuestionMark; break; @@ -2511,34 +2519,34 @@ static void GetEasyChatConfirmDeletionText(const u8 **str1, const u8 **str2) void sub_811BB9C(u8 *arg0, u8 *arg1) { - *arg0 = gEasyChatScreen->unk_0a; - *arg1 = gEasyChatScreen->unk_0b; + *arg0 = sEasyChatScreen->unk_0a; + *arg1 = sEasyChatScreen->unk_0b; } u8 sub_811BBB0(void) { - return gEasyChatScreen->unk_09; + return sEasyChatScreen->unk_09; } u8 sub_811BBBC(void) { - return gEasyChatScreen->unk_0c; + return sEasyChatScreen->unk_0c; } void sub_811BBC8(u8 *arg0, u8 *arg1) { - *arg0 = gEasyChatScreen->unk_10; - *arg1 = gEasyChatScreen->unk_11; + *arg0 = sEasyChatScreen->unk_10; + *arg1 = sEasyChatScreen->unk_11; } u8 sub_811BBDC(void) { - return gEasyChatScreen->unk_0e; + return sEasyChatScreen->unk_0e; } u8 sub_811BBE8(void) { - return gEasyChatScreen->unk_0f; + return sEasyChatScreen->unk_0f; } static u8 unref_sub_811BBF4(void) @@ -2548,14 +2556,14 @@ static u8 unref_sub_811BBF4(void) int sub_811BBF8(void) { - switch (gEasyChatScreen->state) + switch (sEasyChatScreen->state) { case 2: - if (gEasyChatScreen->unk_09 == 0 && gEasyChatScreen->unk_0c) + if (sEasyChatScreen->unk_09 == 0 && sEasyChatScreen->unk_0c) return 1; break; case 3: - if (gEasyChatScreen->unk_0e) + if (sEasyChatScreen->unk_0e) return 1; break; } @@ -2565,14 +2573,14 @@ int sub_811BBF8(void) int sub_811BC2C(void) { - switch (gEasyChatScreen->state) + switch (sEasyChatScreen->state) { case 2: - if (gEasyChatScreen->unk_09 == 0 && gEasyChatScreen->unk_0c + 4 <= gEasyChatScreen->unk_0d - 1) + if (sEasyChatScreen->unk_09 == 0 && sEasyChatScreen->unk_0c + 4 <= sEasyChatScreen->unk_0d - 1) return 1; break; case 3: - if (gEasyChatScreen->unk_0e + 4 <= gEasyChatScreen->unk_0f) + if (sEasyChatScreen->unk_0e + 4 <= sEasyChatScreen->unk_0f) return 1; break; } @@ -2580,9 +2588,9 @@ int sub_811BC2C(void) return 0; } -static int sub_811BC70(void) +static int FooterHasFourOptions_(void) { - return sub_811BA3C(); + return FooterHasFourOptions(); } u8 sub_811BC7C(const u16 *arg0, u8 arg1) @@ -2591,25 +2599,25 @@ u8 sub_811BC7C(const u16 *arg0, u8 arg1) for (i = 0; i < arg1; i++) { - if (arg0[i] != gEasyChatScreen->ecWordBuffer[i]) + if (arg0[i] != sEasyChatScreen->ecWordBuffer[i]) return 1; } return 0; } -u8 sub_811BCBC(void) +static u8 GetDisplayedPersonType(void) { - return gEasyChatScreen->sizeParam; + return sEasyChatScreen->displayedPersonType; } -static u8 sub_811BCC8(u8 entryType) +static u8 GetEachChatScreenTemplateId(u8 type) { u32 i; - for (i = 0; i < ARRAY_COUNT(gEasyChatScreenTemplates); i++) + for (i = 0; i < ARRAY_COUNT(sEasyChatScreenTemplates); i++) { - if (gEasyChatScreenTemplates[i].unk_00 == entryType) + if (sEasyChatScreenTemplates[i].type == type) return i; } @@ -2620,9 +2628,9 @@ static int sub_811BCF4(void) { int i; - for (i = 0; i < gEasyChatScreen->unk_07; i++) + for (i = 0; i < sEasyChatScreen->unk_07; i++) { - if (gEasyChatScreen->ecWordBuffer[i] != 0xFFFF) + if (sEasyChatScreen->ecWordBuffer[i] != 0xFFFF) return 0; } @@ -2633,9 +2641,9 @@ static int sub_811BD2C(void) { int i; - for (i = 0; i < gEasyChatScreen->unk_07; i++) + for (i = 0; i < sEasyChatScreen->unk_07; i++) { - if (gEasyChatScreen->ecWordBuffer[i] == 0xFFFF) + if (sEasyChatScreen->ecWordBuffer[i] == 0xFFFF) return 0; } @@ -2647,7 +2655,7 @@ static int sub_811BD64(void) int i; struct SaveBlock1 *saveBlock1; - if (gEasyChatScreen->kind == 17) + if (sEasyChatScreen->type == EASY_CHAT_TYPE_QUIZ_SET_QUESTION) return sub_811BCF4(); saveBlock1 = gSaveBlock1Ptr; @@ -2663,7 +2671,7 @@ static int sub_811BD64(void) static int sub_811BDB0(void) { struct LilycoveLadyQuiz *quiz; - if (gEasyChatScreen->kind == 18) + if (sEasyChatScreen->type == EASY_CHAT_TYPE_QUIZ_SET_ANSWER) return sub_811BCF4(); quiz = &gSaveBlock1Ptr->lilycoveLady.quiz; @@ -2694,10 +2702,10 @@ static void sub_811BE54(void) u16 *ecWord; u8 *str; - ecWord = gEasyChatScreen->ecWordBuffer; + ecWord = sEasyChatScreen->ecWordBuffer; str = gStringVar2; i = 0; - while (i < gEasyChatScreen->unk_07) + while (i < sEasyChatScreen->unk_07) { str = CopyEasyChatWordPadded(str, *ecWord, 0); *str = 0; @@ -2712,22 +2720,22 @@ static void sub_811BE54(void) static void sub_811BE9C(void) { - switch (gEasyChatScreen->kind) + switch (sEasyChatScreen->type) { - case 0: + case EASY_CHAT_TYPE_PROFILE: FlagSet(FLAG_SYS_CHAT_USED); break; - case 20: + case EASY_CHAT_TYPE_QUESTIONNAIRE: if (sub_811BF20()) gSpecialVar_0x8004 = 2; else gSpecialVar_0x8004 = 0; break; - case 9: + case EASY_CHAT_TYPE_TRENDY_PHRASE: sub_811BE54(); - gSpecialVar_0x8004 = sub_81226D8(gEasyChatScreen->ecWordBuffer); + gSpecialVar_0x8004 = sub_81226D8(sEasyChatScreen->ecWordBuffer); break; - case 13: + case EASY_CHAT_TYPE_GOOD_SAYING: gSpecialVar_0x8004 = sub_811BF40(); break; } @@ -2752,7 +2760,7 @@ static u16 sub_811BF40(void) static void sub_811BF78(void) { - gEasyChatScreen->unk_13 = 0; + sEasyChatScreen->unk_13 = 0; } static int sub_811BF88(int easyChatWord) @@ -2770,13 +2778,13 @@ static bool8 sub_811BF8C(void) static bool8 sub_811BFA4(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, sEasyChatBgTemplates, ARRAY_COUNT(sEasyChatBgTemplates)); - SetBgTilemapBuffer(3, gUnknown_0203A11C->unkB00); - SetBgTilemapBuffer(1, gUnknown_0203A11C->unk300); + SetBgTilemapBuffer(3, sUnknown_0203A11C->unkB00); + SetBgTilemapBuffer(1, sUnknown_0203A11C->unk300); InitWindows(sEasyChatWindowTemplates); DeactivateAllTextPrinters(); sub_811CF64(); @@ -2787,7 +2795,7 @@ static bool8 sub_811BFA4(void) DecompressAndLoadBgGfxUsingHeap(3, gEasyChatWindow_Gfx, 0, 0, 0); CopyToBgTilemapBuffer(3, gEasyChatWindow_Tilemap, 0, 0); sub_811D60C(); - sub_811D424(gUnknown_0203A11C->unk300); + sub_811D424(sUnknown_0203A11C->unk300); sub_811D230(); sub_811E948(); CopyBgTilemapBufferToVram(3); @@ -2804,7 +2812,7 @@ static bool8 sub_811BFA4(void) break; case 4: sub_811DE90(); - if (sub_811BA5C() != 16) + if (GetEasyChatScreenType() != EASY_CHAT_TYPE_QUIZ_QUESTION) sub_811DEC4(); break; case 5: @@ -2830,26 +2838,26 @@ static bool8 sub_811BFA4(void) return FALSE; } - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; return TRUE; } static void sub_811C13C(void) { - if (gUnknown_0203A11C) - FREE_AND_SET_NULL(gUnknown_0203A11C); + if (sUnknown_0203A11C) + FREE_AND_SET_NULL(sUnknown_0203A11C); } static void sub_811C158(u16 arg0) { - gUnknown_0203A11C->unk4 = arg0; - gUnknown_0203A11C->unk0 = 0; + sUnknown_0203A11C->unk4 = arg0; + sUnknown_0203A11C->unk0 = 0; sub_811C170(); } static bool8 sub_811C170(void) { - switch (gUnknown_0203A11C->unk4) + switch (sUnknown_0203A11C->unk4) { case 0: return FALSE; case 1: return sub_811C2D4(); @@ -2892,11 +2900,11 @@ static bool8 sub_811C170(void) static bool8 sub_811C2D4(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811D2C8(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: return IsDma3ManagerBusyWithBgCopy(); @@ -2910,21 +2918,21 @@ static bool8 sub_811C30C(void) u8 i; u16 *ecWordBuffer; u16 *ecWord; - u8 var0; + u8 frameId; u8 cursorColumn, cursorRow, numColumns; s16 var1; int stringWidth; int trueStringWidth; u8 var2; - u8 sp0[64]; + u8 str[64]; - ecWordBuffer = sub_811BA94(); - var0 = sub_811BA68(); - cursorColumn = sub_811BAB8(); - cursorRow = sub_811BAC4(); - numColumns = sub_811BAAC(); + ecWordBuffer = GetEasyChatWordBuffer(); + frameId = GetEasyChatScreenFrameId(); + cursorColumn = GetMainCursorColumn(); + cursorRow = GetMainCursorRow(); + numColumns = GetNumColumns(); ecWord = &ecWordBuffer[cursorRow * numColumns]; - var1 = 8 * gUnknown_08597C30[var0].unk0_0 + 13; + var1 = 8 * sPhraseFrameDimensions[frameId].left + 13; for (i = 0; i < cursorColumn; i++) { if (*ecWord == 0xFFFF) @@ -2933,8 +2941,8 @@ static bool8 sub_811C30C(void) } else { - CopyEasyChatWord(sp0, *ecWord); - stringWidth = GetStringWidth(1, sp0, 0); + CopyEasyChatWord(str, *ecWord); + stringWidth = GetStringWidth(1, str, 0); } trueStringWidth = stringWidth + 17; @@ -2942,27 +2950,27 @@ static bool8 sub_811C30C(void) ecWord++; } - var2 = 8 * (gUnknown_08597C30[var0].unk0_5 + cursorRow * 2); + var2 = 8 * (sPhraseFrameDimensions[frameId].top + cursorRow * 2); sub_811DF60(var1, var2 + 8); return FALSE; } static bool8 sub_811C3E4(void) { - u8 var0 = sub_811E920(sub_811BAB8()); - sub_811DF60(var0, 96); + u8 xOffset = GetFooterOptionXOffset(GetMainCursorColumn()); + sub_811DF60(xOffset, 96); return FALSE; } static bool8 sub_811C404(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811DF90(); sub_811D104(2); sub_811D214(1); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: return IsDma3ManagerBusyWithBgCopy(); @@ -2973,13 +2981,13 @@ static bool8 sub_811C404(void) static bool8 sub_811C448(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811DF90(); sub_811D104(3); sub_811D214(0); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: return IsDma3ManagerBusyWithBgCopy(); @@ -2990,13 +2998,13 @@ static bool8 sub_811C448(void) static bool8 sub_811C48C(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811DF90(); sub_811D104(1); sub_811D214(1); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: return IsDma3ManagerBusyWithBgCopy(); @@ -3007,14 +3015,14 @@ static bool8 sub_811C48C(void) static bool8 sub_811C4D0(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811DFB0(); sub_811D104(0); sub_811D2C8(); ShowBg(0); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: return IsDma3ManagerBusyWithBgCopy(); @@ -3025,13 +3033,13 @@ static bool8 sub_811C4D0(void) static bool8 sub_811C518(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811DFB0(); sub_811D104(0); sub_811D2C8(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; // Fall through case 1: return IsDma3ManagerBusyWithBgCopy(); @@ -3042,31 +3050,31 @@ static bool8 sub_811C518(void) static bool8 sub_811C554(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811DF90(); HideBg(0); sub_811DE5C(0, 0, 0, 0); sub_811D6D4(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: if (!IsDma3ManagerBusyWithBgCopy()) { sub_811D9CC(0); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 2: if (!IsDma3ManagerBusyWithBgCopy() && !sub_811DAA4()) - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 3: if (!IsDma3ManagerBusyWithBgCopy()) { sub_811E3AC(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 4: @@ -3075,7 +3083,7 @@ static bool8 sub_811C554(void) sub_811DFC8(); sub_811E6E0(0); sub_811E64C(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; return FALSE; } break; @@ -3088,31 +3096,31 @@ static bool8 sub_811C554(void) static bool8 sub_811C620(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811E050(); sub_811E4AC(); sub_811E6B0(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: if (sub_811E4D0() == TRUE) break; sub_811D9CC(1); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; // Fall through case 2: if (!sub_811DAA4()) - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 3: if (!IsDma3ManagerBusyWithBgCopy()) { sub_811DFB0(); ShowBg(0); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 4: @@ -3124,20 +3132,20 @@ static bool8 sub_811C620(void) static bool8 sub_811C6C0(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811E050(); sub_811E6B0(); sub_811E55C(); sub_811D9CC(5); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: if (!sub_811DAA4() && !sub_811E5B8()) { sub_811D6D4(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 2: @@ -3145,7 +3153,7 @@ static bool8 sub_811C6C0(void) { sub_811D9CC(6); sub_811E578(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 3: @@ -3153,7 +3161,7 @@ static bool8 sub_811C6C0(void) { sub_811E64C(); sub_811DFC8(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; return FALSE; } break; @@ -3172,11 +3180,11 @@ static bool8 sub_811C780(void) static bool8 sub_811C78C(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811DDAC(1, 4); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; // Fall through case 1: if (!sub_811DE10()) @@ -3193,17 +3201,17 @@ static bool8 sub_811C78C(void) static bool8 sub_811C7D4(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811DDAC(-1, 4); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; // Fall through case 1: if (!sub_811DE10()) { sub_811E64C(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; return FALSE; } break; @@ -3216,33 +3224,33 @@ static bool8 sub_811C7D4(void) static bool8 sub_811C830(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811E050(); sub_811E4AC(); sub_811E6B0(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: if (!sub_811E4D0()) { sub_811D9B4(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 2: if (!IsDma3ManagerBusyWithBgCopy()) { sub_811D9CC(2); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 3: if (!sub_811DAA4()) { sub_811D698(2); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 4: @@ -3252,7 +3260,7 @@ static bool8 sub_811C830(void) sub_811E6E0(1); sub_811E64C(); sub_811E794(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; return FALSE; } break; @@ -3265,38 +3273,38 @@ static bool8 sub_811C830(void) static bool8 sub_811C8F0(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811D2C8(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: sub_811E380(); sub_811E6B0(); sub_811E7F8(); sub_811D9B4(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 2: if (!IsDma3ManagerBusyWithBgCopy()) { sub_811D9CC(3); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 3: if (!sub_811DAA4()) { ShowBg(0); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 4: if (!IsDma3ManagerBusyWithBgCopy()) { sub_811DFB0(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; return FALSE; } break; @@ -3309,45 +3317,45 @@ static bool8 sub_811C8F0(void) static bool8 sub_811C99C(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811D2C8(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: sub_811E380(); sub_811E6B0(); sub_811E7F8(); sub_811D9B4(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 2: if (!IsDma3ManagerBusyWithBgCopy()) { sub_811D9CC(3); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 3: if (!sub_811DAA4()) { sub_811D104(3); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 4: if (!IsDma3ManagerBusyWithBgCopy()) { ShowBg(0); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 5: if (!IsDma3ManagerBusyWithBgCopy()) { sub_811DFB0(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; return FALSE; } break; @@ -3360,34 +3368,34 @@ static bool8 sub_811C99C(void) static bool8 sub_811CA5C(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811E380(); sub_811E6B0(); sub_811E7F8(); sub_811D9B4(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: if (!IsDma3ManagerBusyWithBgCopy()) { sub_811D9CC(4); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 2: if (!sub_811DAA4()) { sub_811D6D4(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 3: if (!IsDma3ManagerBusyWithBgCopy()) { sub_811E3AC(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 4: @@ -3396,7 +3404,7 @@ static bool8 sub_811CA5C(void) sub_811DFC8(); sub_811E6E0(0); sub_811E64C(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; return FALSE; } break; @@ -3413,17 +3421,17 @@ static bool8 sub_811CB18(void) static bool8 sub_811CB24(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811D7A4(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: if (!IsDma3ManagerBusyWithBgCopy()) { sub_811DDAC(1, 4); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 2: @@ -3432,7 +3440,7 @@ static bool8 sub_811CB24(void) sub_811E30C(); sub_811E64C(); sub_811E794(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; return FALSE; } break; @@ -3445,17 +3453,17 @@ static bool8 sub_811CB24(void) static bool8 sub_811CB98(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811D7C8(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: if (!IsDma3ManagerBusyWithBgCopy()) { sub_811DDAC(-1, 4); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 2: @@ -3463,7 +3471,7 @@ static bool8 sub_811CB98(void) { sub_811E64C(); sub_811E794(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; return FALSE; } break; @@ -3476,18 +3484,18 @@ static bool8 sub_811CB98(void) static bool8 sub_811CC08(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811D7EC(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: if (!IsDma3ManagerBusyWithBgCopy()) { s16 var0 = sub_811BBDC() - sub_811DE48(); sub_811DDAC(var0, 8); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 2: @@ -3496,7 +3504,7 @@ static bool8 sub_811CC08(void) sub_811E30C(); sub_811E64C(); sub_811E794(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; return FALSE; } break; @@ -3509,18 +3517,18 @@ static bool8 sub_811CC08(void) static bool8 sub_811CC90(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811D830(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: if (!IsDma3ManagerBusyWithBgCopy()) { s16 var0 = sub_811BBDC() - sub_811DE48(); sub_811DDAC(var0, 8); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 2: @@ -3528,7 +3536,7 @@ static bool8 sub_811CC90(void) { sub_811E64C(); sub_811E794(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; return FALSE; } break; @@ -3541,12 +3549,12 @@ static bool8 sub_811CC90(void) static bool8 sub_811CD14(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811DF90(); sub_811D104(4); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: return IsDma3ManagerBusyWithBgCopy(); @@ -3557,12 +3565,12 @@ static bool8 sub_811CD14(void) static bool8 sub_811CD54(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811DF90(); sub_811D104(5); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: return IsDma3ManagerBusyWithBgCopy(); @@ -3573,12 +3581,12 @@ static bool8 sub_811CD54(void) static bool8 sub_811CD94(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811DF90(); sub_811D104(6); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: return IsDma3ManagerBusyWithBgCopy(); @@ -3589,12 +3597,12 @@ static bool8 sub_811CD94(void) static bool8 sub_811CDD4(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811DF90(); sub_811D104(7); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: return IsDma3ManagerBusyWithBgCopy(); @@ -3605,12 +3613,12 @@ static bool8 sub_811CDD4(void) static bool8 sub_811CE14(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811DF90(); sub_811D104(8); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: return IsDma3ManagerBusyWithBgCopy(); @@ -3621,12 +3629,12 @@ static bool8 sub_811CE14(void) static bool8 sub_811CE54(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811DF90(); sub_811D104(9); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: return IsDma3ManagerBusyWithBgCopy(); @@ -3637,22 +3645,22 @@ static bool8 sub_811CE54(void) static bool8 sub_811CE94(void) { - gUnknown_0203A11C = Alloc(sizeof(*gUnknown_0203A11C)); - if (!gUnknown_0203A11C) + sUnknown_0203A11C = Alloc(sizeof(*sUnknown_0203A11C)); + if (!sUnknown_0203A11C) return FALSE; - gUnknown_0203A11C->unk0 = 0; - gUnknown_0203A11C->unk2D8 = NULL; - gUnknown_0203A11C->unk2DC = NULL; - gUnknown_0203A11C->unk2E0 = NULL; - gUnknown_0203A11C->unk2E4 = NULL; - gUnknown_0203A11C->unk2E8 = NULL; - gUnknown_0203A11C->unk2EC = NULL; - gUnknown_0203A11C->unk2F0 = NULL; - gUnknown_0203A11C->unk2F4 = NULL; - gUnknown_0203A11C->unk2F8 = NULL; - gUnknown_0203A11C->unk2FC = NULL; - gUnknown_0203A11C->unkA = sub_811BC70(); + sUnknown_0203A11C->unk0 = 0; + sUnknown_0203A11C->unk2D8 = NULL; + sUnknown_0203A11C->unk2DC = NULL; + sUnknown_0203A11C->unk2E0 = NULL; + sUnknown_0203A11C->unk2E4 = NULL; + sUnknown_0203A11C->unk2E8 = NULL; + sUnknown_0203A11C->unk2EC = NULL; + sUnknown_0203A11C->unk2F0 = NULL; + sUnknown_0203A11C->unk2F4 = NULL; + sUnknown_0203A11C->unk2F8 = NULL; + sUnknown_0203A11C->unk2FC = NULL; + sUnknown_0203A11C->unkA = FooterHasFourOptions_(); return TRUE; } @@ -3684,7 +3692,7 @@ static void sub_811CF64(void) static void sub_811CFCC(void) { int xOffset; - const u8 *titleText = sub_811BA88(); + const u8 *titleText = GetTitleText(); if (!titleText) return; @@ -3776,19 +3784,19 @@ static void sub_811D214(u8 initialCursorPos) static void sub_811D230(void) { - u8 var0; + u8 frameId; struct WindowTemplate template; - var0 = sub_811BA68(); + frameId = GetEasyChatScreenFrameId(); template.bg = 3; - template.tilemapLeft = gUnknown_08597C30[var0].unk0_0; - template.tilemapTop = gUnknown_08597C30[var0].unk0_5; - template.width = gUnknown_08597C30[var0].unk1; - template.height = gUnknown_08597C30[var0].unk2; + template.tilemapLeft = sPhraseFrameDimensions[frameId].left; + template.tilemapTop = sPhraseFrameDimensions[frameId].top; + template.width = sPhraseFrameDimensions[frameId].width; + template.height = sPhraseFrameDimensions[frameId].height; template.paletteNum = 11; template.baseBlock = 0x6C; - gUnknown_0203A11C->windowId = AddWindow(&template); - PutWindowTilemap(gUnknown_0203A11C->windowId); + sUnknown_0203A11C->windowId = AddWindow(&template); + PutWindowTilemap(sUnknown_0203A11C->windowId); } static void sub_811D2C8(void) @@ -3797,27 +3805,27 @@ static void sub_811D2C8(void) u16 *ecWord; u8 numColumns, numRows; u8 *str; - int var0; + int frameId; int var1; int i, j, k; - ecWord = sub_811BA94(); - numColumns = sub_811BAAC(); - numRows = sub_811BAA0(); - var0 = sub_811BA68(); + ecWord = GetEasyChatWordBuffer(); + numColumns = GetNumColumns(); + numRows = GetNumRows(); + frameId = GetEasyChatScreenFrameId(); var1 = 0; - if (var0 == 7) + if (frameId == 7) var1 = 1; - FillWindowPixelBuffer(gUnknown_0203A11C->windowId, 0x11); + FillWindowPixelBuffer(sUnknown_0203A11C->windowId, 0x11); for (i = 0; i < numRows; i++) { memcpy(spC, sText_Clear17, sizeof(sText_Clear17)); if (var1) spC[2] = 6; - str = gUnknown_0203A11C->unkB; - gUnknown_0203A11C->unkB[0] = EOS; + str = sUnknown_0203A11C->unkB; + sUnknown_0203A11C->unkB[0] = EOS; str = StringAppend(str, spC); for (j = 0; j < numColumns; j++) { @@ -3846,7 +3854,7 @@ static void sub_811D2C8(void) spC[2] = 3; str = StringAppend(str, spC); - if (var0 == 2 || var0 == 7 || var0 == 8) + if (frameId == 2 || frameId == 7 || frameId == 8) { if (j == 0 && i == 4) break; @@ -3854,27 +3862,27 @@ static void sub_811D2C8(void) } *str = EOS; - sub_811D028(gUnknown_0203A11C->windowId, 1, gUnknown_0203A11C->unkB, 0, i * 16 + 1, 0xFF, 0); + sub_811D028(sUnknown_0203A11C->windowId, 1, sUnknown_0203A11C->unkB, 0, i * 16 + 1, 0xFF, 0); } - CopyWindowToVram(gUnknown_0203A11C->windowId, 3); + CopyWindowToVram(sUnknown_0203A11C->windowId, 3); } static void sub_811D424(u16 *tilemap) { - u8 var0; + u8 frameId; int right, bottom; int x, y; - var0 = sub_811BA68(); + frameId = GetEasyChatScreenFrameId(); CpuFastFill(0, tilemap, BG_SCREEN_SIZE); - if (var0 == 2 || var0 == 8) + if (frameId == 2 || frameId == 8) { - right = gUnknown_08597C30[var0].unk0_0 + gUnknown_08597C30[var0].unk1; - bottom = gUnknown_08597C30[var0].unk0_5 + gUnknown_08597C30[var0].unk2; - for (y = gUnknown_08597C30[var0].unk0_5; y < bottom; y++) + right = sPhraseFrameDimensions[frameId].left + sPhraseFrameDimensions[frameId].width; + bottom = sPhraseFrameDimensions[frameId].top + sPhraseFrameDimensions[frameId].height; + for (y = sPhraseFrameDimensions[frameId].top; y < bottom; y++) { - x = gUnknown_08597C30[var0].unk0_0 - 1; + x = sPhraseFrameDimensions[frameId].left - 1; tilemap[y * 32 + x] = 0x1005; x++; for (; x < right; x++) @@ -3885,10 +3893,10 @@ static void sub_811D424(u16 *tilemap) } else { - y = gUnknown_08597C30[var0].unk0_5 - 1; - x = gUnknown_08597C30[var0].unk0_0 - 1; - right = gUnknown_08597C30[var0].unk0_0 + gUnknown_08597C30[var0].unk1; - bottom = gUnknown_08597C30[var0].unk0_5 + gUnknown_08597C30[var0].unk2; + y = sPhraseFrameDimensions[frameId].top - 1; + x = sPhraseFrameDimensions[frameId].left - 1; + right = sPhraseFrameDimensions[frameId].left + sPhraseFrameDimensions[frameId].width; + bottom = sPhraseFrameDimensions[frameId].top + sPhraseFrameDimensions[frameId].height; tilemap[y * 32 + x] = 0x1001; x++; for (; x < right; x++) @@ -3898,7 +3906,7 @@ static void sub_811D424(u16 *tilemap) y++; for (; y < bottom; y++) { - x = gUnknown_08597C30[var0].unk0_0 - 1; + x = sPhraseFrameDimensions[frameId].left - 1; tilemap[y * 32 + x] = 0x1005; x++; for (; x < right; x++) @@ -3907,7 +3915,7 @@ static void sub_811D424(u16 *tilemap) tilemap[y* 32 + x] = 0x1007; } - x = gUnknown_08597C30[var0].unk0_0 - 1; + x = sPhraseFrameDimensions[frameId].left - 1; tilemap[y * 32 + x] = 0x1009; x++; for (; x < right; x++) @@ -3919,12 +3927,12 @@ static void sub_811D424(u16 *tilemap) static void sub_811D60C(void) { - u8 var0; + u8 frameId; u16 *tilemap; tilemap = GetBgTilemapBuffer(3); - var0 = sub_811BA68(); - switch (gUnknown_08597C30[var0].unk3) + frameId = GetEasyChatScreenFrameId(); + switch (sPhraseFrameDimensions[frameId].footerId) { case 2: tilemap += 0x2A0; @@ -4072,11 +4080,11 @@ static void sub_811D864(u8 arg0, u8 arg1) easyChatWord = sub_811F578(var0++); if (easyChatWord != 0xFFFF) { - CopyEasyChatWordPadded(gUnknown_0203A11C->unkCC, easyChatWord, 0); + CopyEasyChatWordPadded(sUnknown_0203A11C->unkCC, easyChatWord, 0); if (!sub_811BF88(easyChatWord)) - sub_811D028(2, 1, gUnknown_0203A11C->unkCC, (j * 13 + 3) * 8, y, 0xFF, NULL); + sub_811D028(2, 1, sUnknown_0203A11C->unkCC, (j * 13 + 3) * 8, y, 0xFF, NULL); else - sub_811D058(2, 1, gUnknown_0203A11C->unkCC, (j * 13 + 3) * 8, y, 0xFF, 1, 5, 3); + sub_811D058(2, 1, sUnknown_0203A11C->unkCC, (j * 13 + 3) * 8, y, 0xFF, 1, 5, 3); } } @@ -4122,48 +4130,48 @@ static void sub_811D9CC(int arg0) switch (arg0) { case 0: - gUnknown_0203A11C->unk6 = 0; - gUnknown_0203A11C->unk7 = 10; + sUnknown_0203A11C->unk6 = 0; + sUnknown_0203A11C->unk7 = 10; break; case 1: - gUnknown_0203A11C->unk6 = 9; - gUnknown_0203A11C->unk7 = 0; + sUnknown_0203A11C->unk6 = 9; + sUnknown_0203A11C->unk7 = 0; break; case 2: - gUnknown_0203A11C->unk6 = 11; - gUnknown_0203A11C->unk7 = 17; + sUnknown_0203A11C->unk6 = 11; + sUnknown_0203A11C->unk7 = 17; break; case 3: - gUnknown_0203A11C->unk6 = 17; - gUnknown_0203A11C->unk7 = 0; + sUnknown_0203A11C->unk6 = 17; + sUnknown_0203A11C->unk7 = 0; break; case 4: - gUnknown_0203A11C->unk6 = 17; - gUnknown_0203A11C->unk7 = 10; + sUnknown_0203A11C->unk6 = 17; + sUnknown_0203A11C->unk7 = 10; break; case 5: - gUnknown_0203A11C->unk6 = 18; - gUnknown_0203A11C->unk7 = 22; + sUnknown_0203A11C->unk6 = 18; + sUnknown_0203A11C->unk7 = 22; break; case 6: - gUnknown_0203A11C->unk6 = 22; - gUnknown_0203A11C->unk7 = 18; + sUnknown_0203A11C->unk6 = 22; + sUnknown_0203A11C->unk7 = 18; break; } - gUnknown_0203A11C->unk8 = gUnknown_0203A11C->unk6 < gUnknown_0203A11C->unk7 ? 1 : -1; + sUnknown_0203A11C->unk8 = sUnknown_0203A11C->unk6 < sUnknown_0203A11C->unk7 ? 1 : -1; } static bool8 sub_811DAA4(void) { u8 var0, var1; - if (gUnknown_0203A11C->unk6 == gUnknown_0203A11C->unk7) + if (sUnknown_0203A11C->unk6 == sUnknown_0203A11C->unk7) return FALSE; - gUnknown_0203A11C->unk6 += gUnknown_0203A11C->unk8; - sub_811DADC(gUnknown_0203A11C->unk6); - var0 = gUnknown_0203A11C->unk6; - var1 = gUnknown_0203A11C->unk7; + sUnknown_0203A11C->unk6 += sUnknown_0203A11C->unk8; + sub_811DADC(sUnknown_0203A11C->unk6); + var0 = sUnknown_0203A11C->unk6; + var1 = sUnknown_0203A11C->unk7; return (var0 ^ var1) > 0; } @@ -4244,7 +4252,7 @@ static void sub_811DC28(int left, int top, int width, int height) int bottom; int x, y; - tilemap = gUnknown_0203A11C->unk300; + tilemap = sUnknown_0203A11C->unk300; right = left + width - 1; bottom = top + height - 1; x = left; @@ -4278,7 +4286,7 @@ static void sub_811DC28(int left, int top, int width, int height) static void sub_811DD84(void) { ChangeBgY(2, 0x800, 0); - gUnknown_0203A11C->unk2CE = 0; + sUnknown_0203A11C->unk2CE = 0; } static void sub_811DDAC(s16 arg0, u8 arg1) @@ -4287,15 +4295,15 @@ static void sub_811DDAC(s16 arg0, u8 arg1) s16 var0; bgY = GetBgY(2); - gUnknown_0203A11C->unk2CE += arg0; + sUnknown_0203A11C->unk2CE += arg0; var0 = arg0 * 16; bgY += var0 << 8; if (arg1) { - gUnknown_0203A11C->unk2D0 = bgY; - gUnknown_0203A11C->unk2D4 = arg1 * 256; + sUnknown_0203A11C->unk2D0 = bgY; + sUnknown_0203A11C->unk2D4 = arg1 * 256; if (var0 < 0) - gUnknown_0203A11C->unk2D4 = -gUnknown_0203A11C->unk2D4; + sUnknown_0203A11C->unk2D4 = -sUnknown_0203A11C->unk2D4; } else { @@ -4308,20 +4316,20 @@ static bool8 sub_811DE10(void) int bgY; bgY = GetBgY(2); - if (bgY == gUnknown_0203A11C->unk2D0) + if (bgY == sUnknown_0203A11C->unk2D0) { return FALSE; } else { - ChangeBgY(2, gUnknown_0203A11C->unk2D4, 1); + ChangeBgY(2, sUnknown_0203A11C->unk2D4, 1); return TRUE; } } static int sub_811DE48(void) { - return gUnknown_0203A11C->unk2CE; + return sUnknown_0203A11C->unk2CE; } static void sub_811DE5C(u8 left, u8 top, u8 width, u8 height) @@ -4336,19 +4344,19 @@ static void sub_811DE90(void) { u32 i; - LoadSpriteSheets(sUnknown_08597CA0); - LoadSpritePalettes(sUnknown_08597CC0); + LoadSpriteSheets(sEasyChatSpriteSheets); + LoadSpritePalettes(sEasyChatSpritePalettes); for (i = 0; i < ARRAY_COUNT(sUnknown_08597CE8); i++) LoadCompressedSpriteSheet(&sUnknown_08597CE8[i]); } static void sub_811DEC4(void) { - u8 var0 = sub_811BA68(); - int x = gUnknown_08597C30[var0].unk0_0 * 8 + 13; - int y = gUnknown_08597C30[var0].unk0_5 * 8 + 8; + u8 frameId = GetEasyChatScreenFrameId(); + int x = sPhraseFrameDimensions[frameId].left * 8 + 13; + int y = sPhraseFrameDimensions[frameId].top * 8 + 8; u8 spriteId = CreateSprite(&sUnknown_08597D18, x, y, 2); - gUnknown_0203A11C->unk2D8 = &gSprites[spriteId]; + sUnknown_0203A11C->unk2D8 = &gSprites[spriteId]; gSprites[spriteId].data[1] = 1; } @@ -4367,44 +4375,44 @@ static void sub_811DF28(struct Sprite *sprite) static void sub_811DF60(u8 x, u8 y) { - gUnknown_0203A11C->unk2D8->pos1.x = x; - gUnknown_0203A11C->unk2D8->pos1.y = y; - gUnknown_0203A11C->unk2D8->pos2.x = 0; - gUnknown_0203A11C->unk2D8->data[0] = 0; + sUnknown_0203A11C->unk2D8->pos1.x = x; + sUnknown_0203A11C->unk2D8->pos1.y = y; + sUnknown_0203A11C->unk2D8->pos2.x = 0; + sUnknown_0203A11C->unk2D8->data[0] = 0; } static void sub_811DF90(void) { - gUnknown_0203A11C->unk2D8->data[0] = 0; - gUnknown_0203A11C->unk2D8->data[1] = 0; - gUnknown_0203A11C->unk2D8->pos2.x = 0; + sUnknown_0203A11C->unk2D8->data[0] = 0; + sUnknown_0203A11C->unk2D8->data[1] = 0; + sUnknown_0203A11C->unk2D8->pos2.x = 0; } static void sub_811DFB0(void) { - gUnknown_0203A11C->unk2D8->data[1] = 1; + sUnknown_0203A11C->unk2D8->data[1] = 1; } static void sub_811DFC8(void) { u8 spriteId = CreateSprite(&sUnknown_08597D68, 0, 0, 3); - gUnknown_0203A11C->unk2DC = &gSprites[spriteId]; - gUnknown_0203A11C->unk2DC->pos2.x = 32; + sUnknown_0203A11C->unk2DC = &gSprites[spriteId]; + sUnknown_0203A11C->unk2DC->pos2.x = 32; spriteId = CreateSprite(&sUnknown_08597D68, 0, 0, 3); - gUnknown_0203A11C->unk2E0 = &gSprites[spriteId]; - gUnknown_0203A11C->unk2E0->pos2.x = -32; + sUnknown_0203A11C->unk2E0 = &gSprites[spriteId]; + sUnknown_0203A11C->unk2E0->pos2.x = -32; - gUnknown_0203A11C->unk2DC->hFlip = 1; + sUnknown_0203A11C->unk2DC->hFlip = 1; sub_811E088(); } static void sub_811E050(void) { - DestroySprite(gUnknown_0203A11C->unk2DC); - gUnknown_0203A11C->unk2DC = NULL; - DestroySprite(gUnknown_0203A11C->unk2E0); - gUnknown_0203A11C->unk2E0 = NULL; + DestroySprite(sUnknown_0203A11C->unk2DC); + sUnknown_0203A11C->unk2DC = NULL; + DestroySprite(sUnknown_0203A11C->unk2E0); + sUnknown_0203A11C->unk2E0 = NULL; } static void sub_811E088(void) @@ -4412,7 +4420,7 @@ static void sub_811E088(void) u8 var0; u8 var1; - if (gUnknown_0203A11C->unk2DC && gUnknown_0203A11C->unk2E0) + if (sUnknown_0203A11C->unk2DC && sUnknown_0203A11C->unk2E0) { sub_811BB9C(&var0, &var1); if (!sub_811BBB0()) @@ -4426,23 +4434,23 @@ static void sub_811E0EC(s8 arg0, s8 arg1) { if (arg0 != -1) { - StartSpriteAnim(gUnknown_0203A11C->unk2DC, 0); - gUnknown_0203A11C->unk2DC->pos1.x = arg0 * 84 + 58; - gUnknown_0203A11C->unk2DC->pos1.y = arg1 * 16 + 96; + StartSpriteAnim(sUnknown_0203A11C->unk2DC, 0); + sUnknown_0203A11C->unk2DC->pos1.x = arg0 * 84 + 58; + sUnknown_0203A11C->unk2DC->pos1.y = arg1 * 16 + 96; - StartSpriteAnim(gUnknown_0203A11C->unk2E0, 0); - gUnknown_0203A11C->unk2E0->pos1.x = arg0 * 84 + 58; - gUnknown_0203A11C->unk2E0->pos1.y = arg1 * 16 + 96; + StartSpriteAnim(sUnknown_0203A11C->unk2E0, 0); + sUnknown_0203A11C->unk2E0->pos1.x = arg0 * 84 + 58; + sUnknown_0203A11C->unk2E0->pos1.y = arg1 * 16 + 96; } else { - StartSpriteAnim(gUnknown_0203A11C->unk2DC, 1); - gUnknown_0203A11C->unk2DC->pos1.x = 216; - gUnknown_0203A11C->unk2DC->pos1.y = arg1 * 16 + 112; + StartSpriteAnim(sUnknown_0203A11C->unk2DC, 1); + sUnknown_0203A11C->unk2DC->pos1.x = 216; + sUnknown_0203A11C->unk2DC->pos1.y = arg1 * 16 + 112; - StartSpriteAnim(gUnknown_0203A11C->unk2E0, 1); - gUnknown_0203A11C->unk2E0->pos1.x = 216; - gUnknown_0203A11C->unk2E0->pos1.y = arg1 * 16 + 112; + StartSpriteAnim(sUnknown_0203A11C->unk2E0, 1); + sUnknown_0203A11C->unk2E0->pos1.x = 216; + sUnknown_0203A11C->unk2E0->pos1.y = arg1 * 16 + 112; } } @@ -4466,32 +4474,32 @@ static void sub_811E1A4(s8 arg0, s8 arg1) anim = 3; } - StartSpriteAnim(gUnknown_0203A11C->unk2DC, anim); - gUnknown_0203A11C->unk2DC->pos1.x = x; - gUnknown_0203A11C->unk2DC->pos1.y = y; + StartSpriteAnim(sUnknown_0203A11C->unk2DC, anim); + sUnknown_0203A11C->unk2DC->pos1.x = x; + sUnknown_0203A11C->unk2DC->pos1.y = y; - StartSpriteAnim(gUnknown_0203A11C->unk2E0, anim); - gUnknown_0203A11C->unk2E0->pos1.x = x; - gUnknown_0203A11C->unk2E0->pos1.y = y; + StartSpriteAnim(sUnknown_0203A11C->unk2E0, anim); + sUnknown_0203A11C->unk2E0->pos1.x = x; + sUnknown_0203A11C->unk2E0->pos1.y = y; } else { - StartSpriteAnim(gUnknown_0203A11C->unk2DC, 1); - gUnknown_0203A11C->unk2DC->pos1.x = 216; - gUnknown_0203A11C->unk2DC->pos1.y = arg1 * 16 + 112; + StartSpriteAnim(sUnknown_0203A11C->unk2DC, 1); + sUnknown_0203A11C->unk2DC->pos1.x = 216; + sUnknown_0203A11C->unk2DC->pos1.y = arg1 * 16 + 112; - StartSpriteAnim(gUnknown_0203A11C->unk2E0, 1); - gUnknown_0203A11C->unk2E0->pos1.x = 216; - gUnknown_0203A11C->unk2E0->pos1.y = arg1 * 16 + 112; + StartSpriteAnim(sUnknown_0203A11C->unk2E0, 1); + sUnknown_0203A11C->unk2E0->pos1.x = 216; + sUnknown_0203A11C->unk2E0->pos1.y = arg1 * 16 + 112; } } static void sub_811E288(void) { u8 spriteId = CreateSprite(&sUnknown_08597D18, 0, 0, 4); - gUnknown_0203A11C->unk2E4 = &gSprites[spriteId]; - gUnknown_0203A11C->unk2E4->callback = sub_811E2DC; - gUnknown_0203A11C->unk2E4->oam.priority = 2; + sUnknown_0203A11C->unk2E4 = &gSprites[spriteId]; + sUnknown_0203A11C->unk2E4->callback = sub_811E2DC; + sUnknown_0203A11C->unk2E4->oam.priority = 2; sub_811E30C(); } @@ -4518,58 +4526,58 @@ static void sub_811E30C(void) static void sub_811E34C(u8 x, u8 y) { - if (gUnknown_0203A11C->unk2E4) + if (sUnknown_0203A11C->unk2E4) { - gUnknown_0203A11C->unk2E4->pos1.x = x; - gUnknown_0203A11C->unk2E4->pos1.y = y; - gUnknown_0203A11C->unk2E4->pos2.x = 0; - gUnknown_0203A11C->unk2E4->data[0] = 0; + sUnknown_0203A11C->unk2E4->pos1.x = x; + sUnknown_0203A11C->unk2E4->pos1.y = y; + sUnknown_0203A11C->unk2E4->pos2.x = 0; + sUnknown_0203A11C->unk2E4->data[0] = 0; } } static void sub_811E380(void) { - if (gUnknown_0203A11C->unk2E4) + if (sUnknown_0203A11C->unk2E4) { - DestroySprite(gUnknown_0203A11C->unk2E4); - gUnknown_0203A11C->unk2E4 = NULL; + DestroySprite(sUnknown_0203A11C->unk2E4); + sUnknown_0203A11C->unk2E4 = NULL; } } static void sub_811E3AC(void) { u8 spriteId = CreateSprite(&sUnknown_08597DF0, 208, 128, 6); - gUnknown_0203A11C->unk2E8 = &gSprites[spriteId]; - gUnknown_0203A11C->unk2E8->pos2.x = -64; + sUnknown_0203A11C->unk2E8 = &gSprites[spriteId]; + sUnknown_0203A11C->unk2E8->pos2.x = -64; spriteId = CreateSprite(&sUnknown_08597DD0, 208, 80, 5); - gUnknown_0203A11C->unk2EC = &gSprites[spriteId]; - gUnknown_0203A11C->unk9 = 0; + sUnknown_0203A11C->unk2EC = &gSprites[spriteId]; + sUnknown_0203A11C->unk9 = 0; } static bool8 sub_811E418(void) { - switch (gUnknown_0203A11C->unk9) + switch (sUnknown_0203A11C->unk9) { default: return FALSE; case 0: - gUnknown_0203A11C->unk2E8->pos2.x += 8; - if (gUnknown_0203A11C->unk2E8->pos2.x >= 0) + sUnknown_0203A11C->unk2E8->pos2.x += 8; + if (sUnknown_0203A11C->unk2E8->pos2.x >= 0) { - gUnknown_0203A11C->unk2E8->pos2.x = 0; + sUnknown_0203A11C->unk2E8->pos2.x = 0; if (!sub_811BBB0()) - StartSpriteAnim(gUnknown_0203A11C->unk2EC, 1); + StartSpriteAnim(sUnknown_0203A11C->unk2EC, 1); else - StartSpriteAnim(gUnknown_0203A11C->unk2EC, 2); + StartSpriteAnim(sUnknown_0203A11C->unk2EC, 2); - gUnknown_0203A11C->unk9++; + sUnknown_0203A11C->unk9++; } break; case 1: - if (gUnknown_0203A11C->unk2EC->animEnded) + if (sUnknown_0203A11C->unk2EC->animEnded) { - gUnknown_0203A11C->unk9 = 2; + sUnknown_0203A11C->unk9 = 2; return FALSE; } } @@ -4579,29 +4587,29 @@ static bool8 sub_811E418(void) static void sub_811E4AC(void) { - gUnknown_0203A11C->unk9 = 0; - StartSpriteAnim(gUnknown_0203A11C->unk2EC, 3); + sUnknown_0203A11C->unk9 = 0; + StartSpriteAnim(sUnknown_0203A11C->unk2EC, 3); } static bool8 sub_811E4D0(void) { - switch (gUnknown_0203A11C->unk9) + switch (sUnknown_0203A11C->unk9) { default: return FALSE; case 0: - if (gUnknown_0203A11C->unk2EC->animEnded) - gUnknown_0203A11C->unk9 = 1; + if (sUnknown_0203A11C->unk2EC->animEnded) + sUnknown_0203A11C->unk9 = 1; break; case 1: - gUnknown_0203A11C->unk2E8->pos2.x -= 8; - if (gUnknown_0203A11C->unk2E8->pos2.x <= -64) + sUnknown_0203A11C->unk2E8->pos2.x -= 8; + if (sUnknown_0203A11C->unk2E8->pos2.x <= -64) { - DestroySprite(gUnknown_0203A11C->unk2EC); - DestroySprite(gUnknown_0203A11C->unk2E8); - gUnknown_0203A11C->unk2EC = NULL; - gUnknown_0203A11C->unk2E8 = NULL; - gUnknown_0203A11C->unk9++; + DestroySprite(sUnknown_0203A11C->unk2EC); + DestroySprite(sUnknown_0203A11C->unk2E8); + sUnknown_0203A11C->unk2EC = NULL; + sUnknown_0203A11C->unk2E8 = NULL; + sUnknown_0203A11C->unk9++; return FALSE; } } @@ -4611,33 +4619,33 @@ static bool8 sub_811E4D0(void) static void sub_811E55C(void) { - StartSpriteAnim(gUnknown_0203A11C->unk2EC, 4); + StartSpriteAnim(sUnknown_0203A11C->unk2EC, 4); } static void sub_811E578(void) { if (!sub_811BBB0()) - StartSpriteAnim(gUnknown_0203A11C->unk2EC, 1); + StartSpriteAnim(sUnknown_0203A11C->unk2EC, 1); else - StartSpriteAnim(gUnknown_0203A11C->unk2EC, 2); + StartSpriteAnim(sUnknown_0203A11C->unk2EC, 2); } static bool8 sub_811E5B8(void) { - return !gUnknown_0203A11C->unk2EC->animEnded; + return !sUnknown_0203A11C->unk2EC->animEnded; } static void sub_811E5D4(void) { u8 spriteId = CreateSprite(&sUnknown_08597E48, 96, 80, 0); if (spriteId != MAX_SPRITES) - gUnknown_0203A11C->unk2F0 = &gSprites[spriteId]; + sUnknown_0203A11C->unk2F0 = &gSprites[spriteId]; spriteId = CreateSprite(&sUnknown_08597E48, 96, 156, 0); if (spriteId != MAX_SPRITES) { - gUnknown_0203A11C->unk2F4 = &gSprites[spriteId]; - gUnknown_0203A11C->unk2F4->vFlip = 1; + sUnknown_0203A11C->unk2F4 = &gSprites[spriteId]; + sUnknown_0203A11C->unk2F4->vFlip = 1; } sub_811E6B0(); @@ -4645,27 +4653,27 @@ static void sub_811E5D4(void) static void sub_811E64C(void) { - gUnknown_0203A11C->unk2F0->invisible = !sub_811BBF8(); - gUnknown_0203A11C->unk2F4->invisible = !sub_811BC2C(); + sUnknown_0203A11C->unk2F0->invisible = !sub_811BBF8(); + sUnknown_0203A11C->unk2F4->invisible = !sub_811BC2C(); } static void sub_811E6B0(void) { - gUnknown_0203A11C->unk2F0->invisible = 1; - gUnknown_0203A11C->unk2F4->invisible = 1; + sUnknown_0203A11C->unk2F0->invisible = 1; + sUnknown_0203A11C->unk2F4->invisible = 1; } static void sub_811E6E0(int arg0) { if (!arg0) { - gUnknown_0203A11C->unk2F0->pos1.x = 96; - gUnknown_0203A11C->unk2F4->pos1.x = 96; + sUnknown_0203A11C->unk2F0->pos1.x = 96; + sUnknown_0203A11C->unk2F4->pos1.x = 96; } else { - gUnknown_0203A11C->unk2F0->pos1.x = 120; - gUnknown_0203A11C->unk2F4->pos1.x = 120; + sUnknown_0203A11C->unk2F0->pos1.x = 120; + sUnknown_0203A11C->unk2F4->pos1.x = 120; } } @@ -4673,13 +4681,13 @@ static void sub_811E720(void) { u8 spriteId = CreateSprite(&sUnknown_08597E30, 220, 84, 1); if (spriteId != MAX_SPRITES) - gUnknown_0203A11C->unk2F8 = &gSprites[spriteId]; + sUnknown_0203A11C->unk2F8 = &gSprites[spriteId]; spriteId = CreateSprite(&sUnknown_08597E30, 220, 156, 1); if (spriteId != MAX_SPRITES) { - gUnknown_0203A11C->unk2FC = &gSprites[spriteId]; - StartSpriteAnim(gUnknown_0203A11C->unk2FC, 1); + sUnknown_0203A11C->unk2FC = &gSprites[spriteId]; + StartSpriteAnim(sUnknown_0203A11C->unk2FC, 1); } sub_811E7F8(); @@ -4687,14 +4695,14 @@ static void sub_811E720(void) static void sub_811E794(void) { - gUnknown_0203A11C->unk2F8->invisible = !sub_811BBF8(); - gUnknown_0203A11C->unk2FC->invisible = !sub_811BC2C(); + sUnknown_0203A11C->unk2F8->invisible = !sub_811BBF8(); + sUnknown_0203A11C->unk2FC->invisible = !sub_811BC2C(); } static void sub_811E7F8(void) { - gUnknown_0203A11C->unk2F8->invisible = 1; - gUnknown_0203A11C->unk2FC->invisible = 1; + sUnknown_0203A11C->unk2F8->invisible = 1; + sUnknown_0203A11C->unk2FC->invisible = 1; } static void sub_811E828(void) @@ -4702,22 +4710,22 @@ static void sub_811E828(void) int graphicsId; u8 spriteId; - switch (sub_811BCBC()) + switch (GetDisplayedPersonType()) { - case 0: + case EASY_CHAT_PERSON_REPORTER_MALE: graphicsId = EVENT_OBJ_GFX_REPORTER_M; break; - case 1: + case EASY_CHAT_PERSON_REPORTER_FEMALE: graphicsId = EVENT_OBJ_GFX_REPORTER_F; break; - case 2: + case EASY_CHAT_PERSON_BOY: graphicsId = EVENT_OBJ_GFX_BOY_1; break; default: return; } - if (sub_811BA68() != 4) + if (GetEasyChatScreenFrameId() != 4) return; spriteId = AddPseudoEventObject(graphicsId, SpriteCallbackDummy, 76, 40, 0); @@ -4741,10 +4749,10 @@ static void sub_811E828(void) } } -int sub_811E8E4(void) +int GetFooterIndex(void) { - u8 var0 = sub_811BA68(); - switch (gUnknown_08597C30[var0].unk3) + u8 frameId = GetEasyChatScreenFrameId(); + switch (sPhraseFrameDimensions[frameId].footerId) { case 1: return 1; @@ -4757,11 +4765,11 @@ int sub_811E8E4(void) } } -static int sub_811E920(int arg0) +static int GetFooterOptionXOffset(int option) { - int var0 = sub_811E8E4(); - if (var0 < 3) - return sUnknown_08597E60[var0][arg0] + 4; + int footerIndex = GetFooterIndex(); + if (footerIndex < 3) + return sFooterOptionXOffsets[footerIndex][option] + 4; else return 0; } @@ -4771,8 +4779,8 @@ static void sub_811E948(void) int i; u16 windowId; struct WindowTemplate template; - int var0 = sub_811E8E4(); - if (var0 == 3) + int footerId = GetFooterIndex(); + if (footerId == 3) return; template.bg = 3; @@ -4786,10 +4794,10 @@ static void sub_811E948(void) FillWindowPixelBuffer(windowId, 0x11); for (i = 0; i < 4; i++) { - const u8 *str = sFooterTextOptions[var0][i]; + const u8 *str = sFooterTextOptions[footerId][i]; if (str) { - int x = sUnknown_08597E60[var0][i]; + int x = sFooterOptionXOffsets[footerId][i]; sub_811D028(windowId, 1, str, x, 1, 0, NULL); } } @@ -5075,13 +5083,13 @@ void sub_811EECC(void) switch (gSpecialVar_0x8004) { case 0: - easyChatWords = gSaveBlock1Ptr->unk2BB0; + easyChatWords = gSaveBlock1Ptr->easyChatProfile; columns = 2; rows = 2; break; case 1: - easyChatWords = gSaveBlock1Ptr->unk2BBC; - if (sub_811EDC4(gSaveBlock1Ptr->unk2BBC, 3, 2, 18)) + easyChatWords = gSaveBlock1Ptr->easyChatBattleStart; + if (sub_811EDC4(gSaveBlock1Ptr->easyChatBattleStart, 3, 2, 18)) { columns = 2; rows = 3; @@ -5093,12 +5101,12 @@ void sub_811EECC(void) } break; case 2: - easyChatWords = gSaveBlock1Ptr->unk2BC8; + easyChatWords = gSaveBlock1Ptr->easyChatBattleWon; columns = 3; rows = 2; break; case 3: - easyChatWords = gSaveBlock1Ptr->unk2BD4; + easyChatWords = gSaveBlock1Ptr->easyChatBattleLost; columns = 3; rows = 2; break; @@ -5237,16 +5245,16 @@ void InitEasyChatPhrases(void) u16 i, j; for (i = 0; i < 4; i++) - gSaveBlock1Ptr->unk2BB0[i] = sUnknown_0859E62C[i]; + gSaveBlock1Ptr->easyChatProfile[i] = sDefaultProfileWords[i]; for (i = 0; i < 6; i++) - gSaveBlock1Ptr->unk2BBC[i] = sUnknown_0859E634[i]; + gSaveBlock1Ptr->easyChatBattleStart[i] = sDefaultBattleStartWords[i]; for (i = 0; i < 6; i++) - gSaveBlock1Ptr->unk2BC8[i] = sUnknown_0859E640[i]; + gSaveBlock1Ptr->easyChatBattleWon[i] = sUnknown_0859E640[i]; for (i = 0; i < 6; i++) - gSaveBlock1Ptr->unk2BD4[i] = sUnknown_0859E64C[i]; + gSaveBlock1Ptr->easyChatBattleLost[i] = sUnknown_0859E64C[i]; for (i = 0; i < MAIL_COUNT; i++) { @@ -5264,8 +5272,8 @@ void InitEasyChatPhrases(void) static bool8 sub_811F28C(void) { - gUnknown_0203A120 = Alloc(sizeof(*gUnknown_0203A120)); - if (!gUnknown_0203A120) + sUnknown_0203A120 = Alloc(sizeof(*sUnknown_0203A120)); + if (!sUnknown_0203A120) return FALSE; sub_811F2D4(); @@ -5275,46 +5283,46 @@ static bool8 sub_811F28C(void) static void sub_811F2B8(void) { - if (gUnknown_0203A120) - FREE_AND_SET_NULL(gUnknown_0203A120); + if (sUnknown_0203A120) + FREE_AND_SET_NULL(sUnknown_0203A120); } static void sub_811F2D4(void) { int i; - gUnknown_0203A120->unk0 = 0; + sUnknown_0203A120->unk0 = 0; if (GetNationalPokedexCount(FLAG_GET_SEEN)) - gUnknown_0203A120->unk2[gUnknown_0203A120->unk0++] = EC_GROUP_POKEMON; + sUnknown_0203A120->unk2[sUnknown_0203A120->unk0++] = EC_GROUP_POKEMON; for (i = EC_GROUP_TRAINER; i <= EC_GROUP_ADJECTIVES; i++) - gUnknown_0203A120->unk2[gUnknown_0203A120->unk0++] = i; + sUnknown_0203A120->unk2[sUnknown_0203A120->unk0++] = i; if (FlagGet(FLAG_SYS_GAME_CLEAR)) { - gUnknown_0203A120->unk2[gUnknown_0203A120->unk0++] = EC_GROUP_EVENTS; - gUnknown_0203A120->unk2[gUnknown_0203A120->unk0++] = EC_GROUP_MOVE_1; - gUnknown_0203A120->unk2[gUnknown_0203A120->unk0++] = EC_GROUP_MOVE_2; + sUnknown_0203A120->unk2[sUnknown_0203A120->unk0++] = EC_GROUP_EVENTS; + sUnknown_0203A120->unk2[sUnknown_0203A120->unk0++] = EC_GROUP_MOVE_1; + sUnknown_0203A120->unk2[sUnknown_0203A120->unk0++] = EC_GROUP_MOVE_2; } if (FlagGet(FLAG_SYS_HIPSTER_MEET)) - gUnknown_0203A120->unk2[gUnknown_0203A120->unk0++] = EC_GROUP_TRENDY_SAYING; + sUnknown_0203A120->unk2[sUnknown_0203A120->unk0++] = EC_GROUP_TRENDY_SAYING; if (IsNationalPokedexEnabled()) - gUnknown_0203A120->unk2[gUnknown_0203A120->unk0++] = EC_GROUP_POKEMON_2; + sUnknown_0203A120->unk2[sUnknown_0203A120->unk0++] = EC_GROUP_POKEMON_2; } static u8 sub_811F3AC(void) { - return gUnknown_0203A120->unk0; + return sUnknown_0203A120->unk0; } static u8 sub_811F3B8(u8 index) { - if (index >= gUnknown_0203A120->unk0) + if (index >= sUnknown_0203A120->unk0) return EC_NUM_GROUPS; else - return gUnknown_0203A120->unk2[index]; + return sUnknown_0203A120->unk2[index]; } u8 *unref_sub_811F3E0(u8 *dest, u8 groupId, u16 totalChars) @@ -5362,7 +5370,7 @@ static void sub_811F46C(void) { numWords = gEasyChatWordsByLetterPointers[i].numWords; words = gEasyChatWordsByLetterPointers[i].words; - gUnknown_0203A120->unk2E[i] = 0; + sUnknown_0203A120->unk2E[i] = 0; index = 0; for (j = 0; j < numWords; j++) { @@ -5382,8 +5390,8 @@ static void sub_811F46C(void) { if (sub_811F860(words[k])) { - gUnknown_0203A120->unk64[i][index++] = words[k]; - gUnknown_0203A120->unk2E[i]++; + sUnknown_0203A120->unk64[i][index++] = words[k]; + sUnknown_0203A120->unk2E[i]++; break; } } @@ -5396,22 +5404,22 @@ static void sub_811F46C(void) static void sub_811F548(int arg0, u16 groupId) { if (!arg0) - gUnknown_0203A120->unk3BA0 = sub_811F5C4(groupId); + sUnknown_0203A120->unk3BA0 = sub_811F5C4(groupId); else - gUnknown_0203A120->unk3BA0 = sub_811F6B8(groupId); + sUnknown_0203A120->unk3BA0 = sub_811F6B8(groupId); } static u16 sub_811F578(u16 arg0) { - if (arg0 >= gUnknown_0203A120->unk3BA0) + if (arg0 >= sUnknown_0203A120->unk3BA0) return 0xFFFF; else - return gUnknown_0203A120->unk3984[arg0]; + return sUnknown_0203A120->unk3984[arg0]; } static u16 sub_811F5B0(void) { - return gUnknown_0203A120->unk3BA0; + return sUnknown_0203A120->unk3BA0; } static u16 sub_811F5C4(u16 groupId) @@ -5429,7 +5437,7 @@ static u16 sub_811F5C4(u16 groupId) for (i = 0, totalWords = 0; i < numWords; i++) { if (sub_811F764(list[i], groupId)) - gUnknown_0203A120->unk3984[totalWords++] = EC_WORD(groupId, list[i]); + sUnknown_0203A120->unk3984[totalWords++] = EC_WORD(groupId, list[i]); } return totalWords; @@ -5441,7 +5449,7 @@ static u16 sub_811F5C4(u16 groupId) { u16 alphabeticalOrder = wordInfo[i].alphabeticalOrder; if (sub_811F764(alphabeticalOrder, groupId)) - gUnknown_0203A120->unk3984[totalWords++] = EC_WORD(groupId, alphabeticalOrder); + sUnknown_0203A120->unk3984[totalWords++] = EC_WORD(groupId, alphabeticalOrder); } return totalWords; @@ -5453,8 +5461,8 @@ static u16 sub_811F6B8(u16 alphabeticalGroup) u16 i; u16 totalWords; - for (i = 0, totalWords = 0; i < gUnknown_0203A120->unk2E[alphabeticalGroup]; i++) - gUnknown_0203A120->unk3984[totalWords++] = gUnknown_0203A120->unk64[alphabeticalGroup][i]; + for (i = 0, totalWords = 0; i < sUnknown_0203A120->unk2E[alphabeticalGroup]; i++) + sUnknown_0203A120->unk3984[totalWords++] = sUnknown_0203A120->unk64[alphabeticalGroup][i]; return totalWords; } @@ -5462,9 +5470,9 @@ static u16 sub_811F6B8(u16 alphabeticalGroup) static bool8 sub_811F72C(u8 arg0) { int i; - for (i = 0; i < gUnknown_0203A120->unk0; i++) + for (i = 0; i < sUnknown_0203A120->unk0; i++) { - if (gUnknown_0203A120->unk2[i] == arg0) + if (sUnknown_0203A120->unk2[i] == arg0) return TRUE; } diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index 3d4f8a90d2..dc38d88485 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -695,7 +695,7 @@ u8 sub_818E2D8(void) void sub_818E2FC(void) { - easy_chat_input_maybe(); + ShowEasyChatScreen(); } bool8 sub_818E308(void) @@ -763,8 +763,8 @@ void sub_818E430(void) void sub_818E47C(void) { - gSpecialVar_0x8004 = 0x11; - easy_chat_input_maybe(); + gSpecialVar_0x8004 = EASY_CHAT_TYPE_QUIZ_SET_QUESTION; + ShowEasyChatScreen(); } void sub_818E490(void) diff --git a/src/party_menu.c b/src/party_menu.c index 645390affd..4103c212ca 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -63,6 +63,7 @@ #include "window.h" #include "constants/battle.h" #include "constants/battle_frontier.h" +#include "constants/easy_chat.h" #include "constants/field_effects.h" #include "constants/flags.h" #include "constants/items.h" @@ -4211,7 +4212,11 @@ static void sub_81B452C(void) { u8 mail = GetMonData(&gPlayerParty[gUnknown_0203CEC8.unk9], MON_DATA_MAIL); - sub_811A20C(4, gSaveBlock1Ptr->mail[mail].words, sub_81B4578, 3); + DoEasyChatScreen( + EASY_CHAT_TYPE_MAIL, + gSaveBlock1Ptr->mail[mail].words, + sub_81B4578, + EASY_CHAT_PERSON_DISPLAY_NONE); } static void sub_81B4578(void) @@ -6385,7 +6390,11 @@ static void sub_81B814C(void) sub_81B1DB8(&gPlayerParty[gUnknown_0203CEC8.unk9], gUnknown_0203CEC8.unkC); mail = GetMonData(&gPlayerParty[gUnknown_0203CEC8.unk9], MON_DATA_MAIL); - sub_811A20C(4, gSaveBlock1Ptr->mail[mail].words, sub_81B81A8, 3); + DoEasyChatScreen( + EASY_CHAT_TYPE_MAIL, + gSaveBlock1Ptr->mail[mail].words, + sub_81B81A8, + EASY_CHAT_PERSON_DISPLAY_NONE); } static void sub_81B81A8(void) diff --git a/src/trainer_card.c b/src/trainer_card.c index 49a62284f9..4019ef0bd9 100755 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -695,7 +695,7 @@ static void SetPlayerCardData(struct TrainerCard *trainerCard, u8 cardType) trainerCard->money = GetMoney(&gSaveBlock1Ptr->money); for (i = 0; i < 4; i++) - trainerCard->var_28[i] = gSaveBlock1Ptr->unk2BB0[i]; + trainerCard->var_28[i] = gSaveBlock1Ptr->easyChatProfile[i]; StringCopy(trainerCard->playerName, gSaveBlock2Ptr->playerName); diff --git a/src/tv.c b/src/tv.c index 2487210837..f282b09f0d 100644 --- a/src/tv.c +++ b/src/tv.c @@ -2448,8 +2448,8 @@ void sub_80EE72C(void) show->trainerFanClub.kind = TVSHOW_TRAINER_FAN_CLUB; show->trainerFanClub.active = FALSE; StringCopy(show->trainerFanClub.playerName, gSaveBlock2Ptr->playerName); - show->trainerFanClub.words[0] = gSaveBlock1Ptr->unk2BB0[0]; - show->trainerFanClub.words[1] = gSaveBlock1Ptr->unk2BB0[1]; + show->trainerFanClub.words[0] = gSaveBlock1Ptr->easyChatProfile[0]; + show->trainerFanClub.words[1] = gSaveBlock1Ptr->easyChatProfile[1]; tv_store_id_3x(show); show->trainerFanClub.language = gGameLanguage; }