From 7bd0a83d359beafc69a1a63cb51b11e98186a292 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 Feb 2020 16:41:25 -0500 Subject: I'm so original with these commit names --- data/event_scripts.s | 9 +++++---- data/scripts/mystery_event_club.inc | 2 +- data/specials.inc | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index e28093686..31446116f 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -30,6 +30,7 @@ #include "constants/trade.h" #include "constants/quest_log.h" #include "constants/daycare.h" +#include "constants/easy_chat.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .set FALSE, 0 @@ -1170,9 +1171,9 @@ EventScript_ResetEliteFour:: @ 81A6551 .include "data/scripts/pc.inc" @ DoEasyChatScreen? -EventScript_1A6AC0:: @ 81A6AC0 +Common_ShowEasyChatScreen:: @ 81A6AC0 fadescreen FADE_TO_BLACK - special sub_80FEE44 + special ShowEasyChatScreen fadescreen FADE_FROM_BLACK return @@ -1332,8 +1333,8 @@ gUnknown_81A7702:: @ 81A7702 msgbox Text_FillOutQuestionnaire, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq EventScript_1A778A - setvar VAR_0x8004, 14 - call EventScript_1A6AC0 + setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE + call Common_ShowEasyChatScreen lock faceplayer specialvar VAR_0x8008, Special_GetMartClerkObjectId diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index d47a2d06c..bfc9fbbbd 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -101,7 +101,7 @@ EventScript_GaveSpecialProfile: @ 81BEF3F EventScript_GiveProfile: @ 81BEF5A setvar VAR_0x8004, 0 - call EventScript_1A6AC0 + call Common_ShowEasyChatScreen lock faceplayer compare VAR_0x8004, 0 diff --git a/data/specials.inc b/data/specials.inc index 39ce252a4..d31d4e4d0 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -103,7 +103,7 @@ gSpecials:: @ 815FD60 def_special sub_8081128 def_special Field_AskSaveTheGame def_special nullsub_56 - def_special sub_80FEE44 + def_special ShowEasyChatScreen def_special Special_BufferEasyChatMessage def_special nullsub_75 def_special nullsub_75 -- cgit v1.2.3 From e0d25c32898b1284297159a5d1c1c6422a040150 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 Feb 2020 20:09:14 -0500 Subject: Document wireless_communication_status_screen --- data/scripts/cable_club.inc | 2 +- data/specials.inc | 2 +- data/strings.s | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'data') diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index c75ebdcfd..c174eaf41 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -1149,7 +1149,7 @@ CableClub_EventScript_81BBFD8:: @ 81BBFD8 goto_if_eq CableClub_EventScript_AdapterNotConnected special HelpSystem_Disable fadescreen FADE_TO_BLACK - special sub_814F1D4 + special Special_WirelessCommunicationScreen waitstate msgbox CableClub_Text_ParticipantsStepUpToCounter special HelpSystem_Enable diff --git a/data/specials.inc b/data/specials.inc index d31d4e4d0..96064fec3 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -374,7 +374,7 @@ gSpecials:: @ 815FD60 def_special TryBecomeLinkLeader def_special TryJoinLinkGroup def_special UnionRoomSpecial - def_special sub_814F1D4 + def_special Special_WirelessCommunicationScreen def_special EnableNationalPokedex def_special sub_80699E0 def_special sub_80699BC diff --git a/data/strings.s b/data/strings.s index 5cff90fcd..6ad1cfb0c 100644 --- a/data/strings.s +++ b/data/strings.s @@ -4498,19 +4498,19 @@ gUnknown_841E243:: @ 841E243 gUnknown_841E244:: @ 841E244 .string "$" -gUnknown_841E245:: @ 841E245 +gText_WirelessCommunicationStatus:: @ 841E245 .string "Wireless Communication Status$" -gUnknown_841E263:: @ 841E263 +gText_PeopleTrading:: @ 841E263 .string "People trading:$" -gUnknown_841E273:: @ 841E273 +gText_PeopleBattling:: @ 841E273 .string "People battling:$" -gUnknown_841E284:: @ 841E284 +gText_PeopleInUnionRoom:: @ 841E284 .string "People in the UNION ROOM:$" -gUnknown_841E29E:: @ 841E29E +gText_PeopleCommunicating:: @ 841E29E .string "People communicating:$" gUnknown_841E2B4:: @ 841E2B4 -- cgit v1.2.3 From 4770fac9eb9696236fa998554a353f1f140a1ed4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 4 Feb 2020 14:16:45 -0500 Subject: More mevent documentation --- data/strings.s | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'data') diff --git a/data/strings.s b/data/strings.s index 6ad1cfb0c..f595170ff 100644 --- a/data/strings.s +++ b/data/strings.s @@ -4230,51 +4230,51 @@ gJPText_MysteryGift:: @ 841DE50 gJPText_DecideStop:: @ 841DE51 .string "$" -gUnknown_841DE52:: @ 841DE52 +gJPText_ReceiveMysteryGiftWithEReader:: @ 841DE52 .string "$" -gUnknown_841DE53:: @ 841DE53 +gJPText_SelectConnectFromEReaderMenu:: @ 841DE53 .string "$" -gUnknown_841DE54:: @ 841DE54 +gJPText_SelectConnectWithGBA:: @ 841DE54 .string "$" -gUnknown_841DE55:: @ 841DE55 +gJPText_SelectConnectAndPressA:: @ 841DE55 .string "カ-ドeリ-ダ-{PLUS}の ‘つうしん'を\n" .string "えらんで Aボタンを おしてください$" -gUnknown_841DE7C:: @ 841DE7C +gJPText_LinkIsIncorrect:: @ 841DE7C .string "$" -gUnknown_841DE7D:: @ 841DE7D +gJPText_CardReadingHasBeenHalted:: @ 841DE7D .string "$" -gUnknown_841DE7E:: @ 841DE7E +gJPText_UnableConnectWithEReader:: @ 841DE7E .string "カ-ドeリ-ダ-{PLUS}と\n" .string "つうしん できません$" -gUnknown_841DE95:: @ 841DE95 +gJPText_Connecting:: @ 841DE95 .string "$" -gUnknown_841DE96:: @ 841DE96 +gJPText_ConnectionErrorCheckLink:: @ 841DE96 .string "$" -gUnknown_841DE97:: @ 841DE97 +gJPText_ConnectionErrorTryAgain:: @ 841DE97 .string "$" -gUnknown_841DE98:: @ 841DE98 +gJPText_AllowEReaderToLoadCard:: @ 841DE98 .string "$" -gUnknown_841DE99:: @ 841DE99 +gJPText_ConnectionComplete:: @ 841DE99 .string "$" -gUnknown_841DE9A:: @ 841DE9A +gJPText_NewTrainerHasComeToSevii:: @ 841DE9A .string "$" -gUnknown_841DE9B:: @ 841DE9B +gJPText_PleaseWaitAMoment:: @ 841DE9B .string "$" -gUnknown_841DE9C:: @ 841DE9C +gJPText_WriteErrorUnableToSaveData:: @ 841DE9C .string "$" gText_CommErrorCheckConnections:: @ 841DE9D -- cgit v1.2.3 From 354d837d6f680b44b7824e95a1363b387717807a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 11 Feb 2020 10:49:36 -0500 Subject: document digit_obj_util --- data/berry_crush.s | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) (limited to 'data') diff --git a/data/berry_crush.s b/data/berry_crush.s index cc7ae23fd..417347801 100644 --- a/data/berry_crush.s +++ b/data/berry_crush.s @@ -339,22 +339,28 @@ gUnknown_846F458:: @ 846F458 gUnknown_846F470:: @ 846F470 spr_template 5, 5, gOamData_AffineDouble_ObjNormal_32x32, gUnknown_846F404, NULL, gUnknown_846F408, SpriteCallbackDummy -gUnknown_846F488:: @ 846F488 struct UnkStruct3? perhaps not - .byte 9, 2, 8 +gUnknown_846F488:: @ 846F488 DigitObjUtilTemplate + @ strConvMode, shape, size, priority + .byte 1 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 9 + .byte 2, 8 @ ndigits, width .align 2 - .2byte 0x9c, 0x00 - .4byte gUnknown_846F2F8 + 0x18 - .4byte gUnknown_846F320 + 0x10 - .byte 8, 2, 8 + .2byte 0x9c, 0x00 @ x, y + .4byte gUnknown_846F2F8 + 0x18 @ spriteSheet + .4byte gUnknown_846F320 + 0x10 @ spritePalette + @ strConvMode, shape, size, priority + .byte 0 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 8 + .byte 2, 8 @ ndigits, width .align 2 - .2byte 0xb4, 0x00 - .4byte gUnknown_846F2F8 + 0x18 - .4byte gUnknown_846F320 + 0x10 - .byte 8, 2, 8 + .2byte 0xb4, 0x00 @ x, y + .4byte gUnknown_846F2F8 + 0x18 @ spriteSheet + .4byte gUnknown_846F320 + 0x10 @ spritePalette + @ strConvMode, shape, size, priority + .byte 0 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 8 + .byte 2, 8 @ ndigits, width .align 2 - .2byte 0xcc, 0x00 - .4byte gUnknown_846F2F8 + 0x18 - .4byte gUnknown_846F320 + 0x10 + .2byte 0xcc, 0x00 @ x, y + .4byte gUnknown_846F2F8 + 0x18 @ spriteSheet + .4byte gUnknown_846F320 + 0x10 @ spritePalette gUnknown_846F4B8:: @ 846F4B8 .4byte gUnknown_841D034 -- cgit v1.2.3 From 32dc21b634c74c2287b94289fdfe08499c626302 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 11 Feb 2020 16:56:09 -0500 Subject: Remove defunct macros and move trainer tower pointers and dummy header --- data/data_8479668.s | 42 ----------------------------------------- data/trainer_tower/trainers.inc | 40 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 42 deletions(-) (limited to 'data') diff --git a/data/data_8479668.s b/data/data_8479668.s index 393a5cc44..6d8a22898 100644 --- a/data/data_8479668.s +++ b/data/data_8479668.s @@ -174,52 +174,10 @@ gText_UnionRoomChatKeyboard_Emoji9:: gText_UnionRoomChatKeyboard_Emoji10:: .string "{EXTRA 210}{EXTRA 208}ょ: $" - // trainer_tower (again?) - @ 847ABAC .align 2 .include "data/trainer_tower/trainers.inc" - .align 2 -gUnknown_84827AC:: @ 84827AC - .byte 0x08, 0x01 - .align 2 - .4byte 0 - -gUnknown_84827B4:: @ 84827B4 - .4byte gUnknown_847F16C - .4byte gUnknown_847D26C - .4byte gUnknown_84808AC - .4byte gUnknown_847ABAC - .4byte gUnknown_847CAAC - .4byte gUnknown_847E9AC - .4byte gUnknown_847AF8C - .4byte gUnknown_847CE8C - .4byte gUnknown_847DA2C - .4byte gUnknown_847BF0C - .4byte gUnknown_847D64C - .4byte gUnknown_847DE0C - .4byte gUnknown_847B74C - .4byte gUnknown_847BB2C - .4byte gUnknown_848182C - .4byte gUnknown_847F92C - .4byte gUnknown_847C2EC - .4byte gUnknown_847C6CC - .4byte gUnknown_847E5CC - .4byte gUnknown_84804CC - .4byte gUnknown_84823CC - .4byte gUnknown_8481FEC - .4byte gUnknown_84800EC - .4byte gUnknown_847E1EC - .4byte gUnknown_847ED8C - .4byte gUnknown_848106C - .4byte gUnknown_8480C8C - .4byte gUnknown_847F92C - .4byte gUnknown_847F54C - .4byte gUnknown_847E1EC - .4byte gUnknown_847D64C - .4byte gUnknown_847C6CC - .include "data/text/move_descriptions.inc" .align 2, 0 diff --git a/data/trainer_tower/trainers.inc b/data/trainer_tower/trainers.inc index 5f9b0f49b..645a8a27e 100644 --- a/data/trainer_tower/trainers.inc +++ b/data/trainer_tower/trainers.inc @@ -5111,3 +5111,43 @@ gUnknown_84823CC:: .byte 255 @ friendship .byte 0x80, 0x6b, 0x01 + + .align 2 +gUnknown_84827AC:: @ 84827AC + .byte 0x08, 0x01 + .2byte 0 + .4byte 0 + +gUnknown_84827B4:: @ 84827B4 + .4byte gUnknown_847F16C + .4byte gUnknown_847D26C + .4byte gUnknown_84808AC + .4byte gUnknown_847ABAC + .4byte gUnknown_847CAAC + .4byte gUnknown_847E9AC + .4byte gUnknown_847AF8C + .4byte gUnknown_847CE8C + .4byte gUnknown_847DA2C + .4byte gUnknown_847BF0C + .4byte gUnknown_847D64C + .4byte gUnknown_847DE0C + .4byte gUnknown_847B74C + .4byte gUnknown_847BB2C + .4byte gUnknown_848182C + .4byte gUnknown_847F92C + .4byte gUnknown_847C2EC + .4byte gUnknown_847C6CC + .4byte gUnknown_847E5CC + .4byte gUnknown_84804CC + .4byte gUnknown_84823CC + .4byte gUnknown_8481FEC + .4byte gUnknown_84800EC + .4byte gUnknown_847E1EC + .4byte gUnknown_847ED8C + .4byte gUnknown_848106C + .4byte gUnknown_8480C8C + .4byte gUnknown_847F92C + .4byte gUnknown_847F54C + .4byte gUnknown_847E1EC + .4byte gUnknown_847D64C + .4byte gUnknown_847C6CC -- cgit v1.2.3 From b3167d579b903badfd0be67c02d30bdd71fd9ef6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 15 Feb 2020 14:49:27 -0500 Subject: use uroom size/count macros; travis reverts back to agbcc master --- data/event_scripts.s | 1 - 1 file changed, 1 deletion(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 31446116f..2681f52c9 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1170,7 +1170,6 @@ EventScript_ResetEliteFour:: @ 81A6551 .include "data/scripts/obtain_item.inc" .include "data/scripts/pc.inc" -@ DoEasyChatScreen? Common_ShowEasyChatScreen:: @ 81A6AC0 fadescreen FADE_TO_BLACK special ShowEasyChatScreen -- cgit v1.2.3