From c3c8fb40cfab23b5db845ce4b2bd3e626a5506dc Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 3 Oct 2019 01:16:22 -0400 Subject: Move trade data, some trade.c clean up documentation --- data/event_scripts.s | 1 + 1 file changed, 1 insertion(+) (limited to 'data/event_scripts.s') diff --git a/data/event_scripts.s b/data/event_scripts.s index d22613f40..9a9e98565 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -27,6 +27,7 @@ #include "constants/secret_bases.h" #include "constants/songs.h" #include "constants/species.h" +#include "constants/trade.h" #include "constants/trainer_hill.h" #include "constants/trainers.h" #include "constants/vars.h" -- cgit v1.2.3 From d914c1d659f2d7076079487e5c5df8ee617ec144 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 6 Oct 2019 13:55:30 -0400 Subject: Document common movements --- data/event_scripts.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/event_scripts.s') diff --git a/data/event_scripts.s b/data/event_scripts.s index 670450b54..ca51379c2 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1296,7 +1296,7 @@ RusturfTunnel_EventScript_272216:: @ 8272216 EventScript_27222B:: @ 827222B delay 30 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 showobjectat 255, MAP_PETALBURG_CITY delay 30 -- cgit v1.2.3 From f179ab95c07ef7ec7a97864e88bbb35f9efae881 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 6 Oct 2019 17:30:17 -0400 Subject: Document move tutors --- data/event_scripts.s | 1 + 1 file changed, 1 insertion(+) (limited to 'data/event_scripts.s') diff --git a/data/event_scripts.s b/data/event_scripts.s index ca51379c2..730788a66 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -22,6 +22,7 @@ #include "constants/maps.h" #include "constants/metatile_labels.h" #include "constants/moves.h" +#include "constants/party_menu.h" #include "constants/pokemon.h" #include "constants/script_menu.h" #include "constants/secret_bases.h" -- cgit v1.2.3 From c4deb4db96ac8463c2ef1dd92ca5c7d6d13c4dae Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 6 Oct 2019 20:04:30 -0400 Subject: Document field_poison --- data/event_scripts.s | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'data/event_scripts.s') diff --git a/data/event_scripts.s b/data/event_scripts.s index 730788a66..2ffce2386 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,5 +1,7 @@ #include "constants/global.h" #include "constants/battle.h" +#include "constants/battle_pike.h" +#include "constants/battle_pyramid.h" #include "constants/battle_frontier.h" #include "constants/battle_setup.h" #include "constants/berry.h" @@ -10,6 +12,7 @@ #include "constants/event_objects.h" #include "constants/event_object_movement_constants.h" #include "constants/field_effects.h" +#include "constants/field_poison.h" #include "constants/field_specials.h" #include "constants/flags.h" #include "constants/game_stat.h" @@ -901,7 +904,7 @@ EventScript_PickItemUp:: @ 8271C3A waitfanfare waitmessage bufferitemnameplural 1, VAR_0x8004, VAR_0x8005 - setvar VAR_0x8004, 12 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN special CallBattlePyramidFunction compare VAR_RESULT, 1 goto_if_eq EventScript_271C86 -- cgit v1.2.3 From 0df304d629b10b2c65a4cf358b80fd5cf2a7befa Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 7 Oct 2019 02:00:16 -0400 Subject: Document roulette.inc --- data/event_scripts.s | 1 + 1 file changed, 1 insertion(+) (limited to 'data/event_scripts.s') diff --git a/data/event_scripts.s b/data/event_scripts.s index 670450b54..a6a5fe651 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -29,6 +29,7 @@ #include "constants/species.h" #include "constants/trainer_hill.h" #include "constants/trainers.h" +#include "constants/tv.h" #include "constants/vars.h" #include "constants/weather.h" .include "asm/macros.inc" -- cgit v1.2.3 From 7ba11b7a1b4e8639cdd65ab147a24b430f6424c5 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 7 Oct 2019 00:14:10 -0400 Subject: Use VAR_FACING constants --- data/event_scripts.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/event_scripts.s') diff --git a/data/event_scripts.s b/data/event_scripts.s index 670450b54..19e42c9e9 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1314,9 +1314,9 @@ BirthIsland_Harbor_EventScript_272250:: @ 8272250 FarawayIsland_Entrance_EventScript_272250:: @ 8272250 NavelRock_Harbor_EventScript_272250:: @ 8272250 SouthernIsland_Exterior_EventScript_272250:: @ 8272250 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if_eq BattleFrontier_OutsideWest_EventScript_242A21 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if_eq BattleFrontier_OutsideWest_EventScript_242A2C delay 30 hideobjectat 255, MAP_PETALBURG_CITY -- cgit v1.2.3 From 1b7607bd91a9bdf9ee5e2ccbf895727bc53f9254 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 11 Oct 2019 04:14:09 -0400 Subject: Document cable_club.inc --- data/event_scripts.s | 61 ++++++---------------------------------------------- 1 file changed, 7 insertions(+), 54 deletions(-) (limited to 'data/event_scripts.s') diff --git a/data/event_scripts.s b/data/event_scripts.s index 19e42c9e9..b080f07a6 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -3,6 +3,7 @@ #include "constants/battle_frontier.h" #include "constants/battle_setup.h" #include "constants/berry.h" +#include "constants/cable_club.h" #include "constants/contest.h" #include "constants/daycare.h" #include "constants/decorations.h" @@ -1569,64 +1570,16 @@ EventScript_CableClub_SetVarResult0:: @ 8273755 setvar VAR_RESULT, 0 return -BattleFrontier_PokemonCenter_2F_EventScript_27375B:: @ 827375B -DewfordTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B -EverGrandeCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B -EverGrandeCity_PokemonLeague_2F_EventScript_27375B:: @ 827375B -FallarborTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B -FortreeCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B -LavaridgeTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B -LilycoveCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B -MauvilleCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B -MossdeepCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B -OldaleTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B -PacifidlogTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B -PetalburgCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B -RustboroCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B -SlateportCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B -SootopolisCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B -VerdanturfTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B - call OldaleTown_PokemonCenter_2F_EventScript_27751B +Common_EventScript_UnionRoomAttendant:: @ 827375B + call CableClub_EventScript_UnionRoomAttendant end -BattleFrontier_PokemonCenter_2F_EventScript_273761:: @ 8273761 -DewfordTown_PokemonCenter_2F_EventScript_273761:: @ 8273761 -EverGrandeCity_PokemonCenter_2F_EventScript_273761:: @ 8273761 -EverGrandeCity_PokemonLeague_2F_EventScript_273761:: @ 8273761 -FallarborTown_PokemonCenter_2F_EventScript_273761:: @ 8273761 -FortreeCity_PokemonCenter_2F_EventScript_273761:: @ 8273761 -LavaridgeTown_PokemonCenter_2F_EventScript_273761:: @ 8273761 -LilycoveCity_PokemonCenter_2F_EventScript_273761:: @ 8273761 -MauvilleCity_PokemonCenter_2F_EventScript_273761:: @ 8273761 -MossdeepCity_PokemonCenter_2F_EventScript_273761:: @ 8273761 -OldaleTown_PokemonCenter_2F_EventScript_273761:: @ 8273761 -PacifidlogTown_PokemonCenter_2F_EventScript_273761:: @ 8273761 -PetalburgCity_PokemonCenter_2F_EventScript_273761:: @ 8273761 -RustboroCity_PokemonCenter_2F_EventScript_273761:: @ 8273761 -SlateportCity_PokemonCenter_2F_EventScript_273761:: @ 8273761 -SootopolisCity_PokemonCenter_2F_EventScript_273761:: @ 8273761 -VerdanturfTown_PokemonCenter_2F_EventScript_273761:: @ 8273761 - call OldaleTown_PokemonCenter_2F_EventScript_277672 +Common_EventScript_WirelessClubAttendant:: @ 8273761 + call CableClub_EventScript_WirelessClubAttendant end -BattleFrontier_PokemonCenter_2F_EventScript_273767:: @ 8273767 -DewfordTown_PokemonCenter_2F_EventScript_273767:: @ 8273767 -EverGrandeCity_PokemonCenter_2F_EventScript_273767:: @ 8273767 -EverGrandeCity_PokemonLeague_2F_EventScript_273767:: @ 8273767 -FallarborTown_PokemonCenter_2F_EventScript_273767:: @ 8273767 -FortreeCity_PokemonCenter_2F_EventScript_273767:: @ 8273767 -LavaridgeTown_PokemonCenter_2F_EventScript_273767:: @ 8273767 -LilycoveCity_PokemonCenter_2F_EventScript_273767:: @ 8273767 -MauvilleCity_PokemonCenter_2F_EventScript_273767:: @ 8273767 -MossdeepCity_PokemonCenter_2F_EventScript_273767:: @ 8273767 -OldaleTown_PokemonCenter_2F_EventScript_273767:: @ 8273767 -PacifidlogTown_PokemonCenter_2F_EventScript_273767:: @ 8273767 -PetalburgCity_PokemonCenter_2F_EventScript_273767:: @ 8273767 -RustboroCity_PokemonCenter_2F_EventScript_273767:: @ 8273767 -SlateportCity_PokemonCenter_2F_EventScript_273767:: @ 8273767 -SootopolisCity_PokemonCenter_2F_EventScript_273767:: @ 8273767 -VerdanturfTown_PokemonCenter_2F_EventScript_273767:: @ 8273767 - call OldaleTown_PokemonCenter_2F_EventScript_2776A4 +Common_EventScript_DirectCornerAttendant:: @ 8273767 + call CableClub_EventScript_DirectCornerAttendant end Common_EventScript_RemoveStaticPokemon:: @ 827376D -- cgit v1.2.3 From 1c99f5b7c9d280955389e0ecd97613e68062d5b3 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 11 Oct 2019 10:22:21 -0400 Subject: Split text from cable_club.inc --- data/event_scripts.s | 1 + 1 file changed, 1 insertion(+) (limited to 'data/event_scripts.s') diff --git a/data/event_scripts.s b/data/event_scripts.s index b080f07a6..1a5e8c07b 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1684,6 +1684,7 @@ EventScript_GotoTrainerScript:: @ 82742F6 .include "data/scripts/berry_tree.inc" .include "data/scripts/secret_base.inc" .include "data/scripts/cable_club.inc" + .include "data/text/cable_club.inc" .include "data/scripts/contest_hall.inc" .include "data/text/contest_strings.inc" .include "data/text/contest_link.inc" -- cgit v1.2.3 From 348bb002a8016d9c4bb6f6968dbc359b4d346aa9 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 11 Oct 2019 17:25:07 -0400 Subject: Document Gym scripts first half --- data/event_scripts.s | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'data/event_scripts.s') diff --git a/data/event_scripts.s b/data/event_scripts.s index 4f97d4c71..a8ab73968 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1025,10 +1025,7 @@ Common_ShowEasyChatScreen:: @ 8271E7C fadescreen 0 return -DewfordTown_Gym_EventScript_271E84:: @ 8271E84 -LavaridgeTown_Gym_1F_EventScript_271E84:: @ 8271E84 -MauvilleCity_Gym_EventScript_271E84:: @ 8271E84 -RustboroCity_Gym_EventScript_271E84:: @ 8271E84 +Common_EventScript_ReadyPetalburgGymForBattle:: @ 8271E84 clearflag FLAG_HIDE_PETALBURG_GYM_GREETER setflag FLAG_PETALBURG_MART_EXPANDED_ITEMS return -- cgit v1.2.3