From 6a90a57318aa20fb83797bbf99eafcda062b34f8 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 1 Nov 2019 13:51:30 -0400
Subject: [PATCH] Disassemble bike data

---
 baserom.ips         | Bin 497113 -> 492807 bytes
 data/bike.s         |  23 ++++++++++++++++++++---
 data/easy_chat.s    |   9 ---------
 include/easy_chat.h |  27 ---------------------------
 ld_script.txt       |   1 -
 5 files changed, 20 insertions(+), 40 deletions(-)
 delete mode 100644 data/easy_chat.s

diff --git a/baserom.ips b/baserom.ips
index f46d702155c28918d922913aca1601f50a23a8f7..9fbf21b9596c1270d643e4d7a50e8215b765096c 100644
GIT binary patch
delta 55
zcmcb)TCTlIuAzmog{g&k3(Hz*z6Ttf6Sjs4I2HT-ueVH}{&6Owbo&Y&79eH?Vz%uo
Ibl43u0aV@;xBvhE

delta 4387
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
RiKJ4KivIAUrP{TJ{}-n0ZA$<E

diff --git a/data/bike.s b/data/bike.s
index a01fc03ab..0245f0206 100644
--- a/data/bike.s
+++ b/data/bike.s
@@ -7,10 +7,27 @@
 	.align 2
 
 gUnknown_83E7CFC:: @ 83E7CFC
-	.incbin "baserom.gba", 0x3E7CFC, 0x14
+	.4byte sub_80BD27C
+	.4byte sub_80BD28C
+	.4byte sub_80BD2C8
+	.4byte sub_80BD358
+	.4byte sub_80BD380
 
 gUnknown_83E7D10:: @ 83E7D10
-	.incbin "baserom.gba", 0x3E7D10, 0xC
+	.4byte sub_80BD100
+	.4byte sub_80BD1C8
+	.4byte sub_80BD1E8
 
 gUnknown_83E7D1C:: @ 83E7D1C
-	.incbin "baserom.gba", 0x3E7D1C, 0x7
+	.2byte 0x0001, 0x0002, 0x0004
+
+gUnknown_83E7D22::
+	.byte 4
+
+	.align 2
+gUnknown_83E7D24::
+	.4byte 1, 2, 15, 15, gUnknown_83E7D22, gUnknown_83E7D22, 1
+	.4byte 2, 2, 15, 15, gUnknown_83E7D22, gUnknown_83E7D22, 2
+	.4byte 3, 2, 15, 15, gUnknown_83E7D22, gUnknown_83E7D22, 3
+	.4byte 4, 2, 15, 15, gUnknown_83E7D22, gUnknown_83E7D22, 4
+
diff --git a/data/easy_chat.s b/data/easy_chat.s
deleted file mode 100644
index 6138f7e36..000000000
--- a/data/easy_chat.s
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "constants/maps.h"
-#include "constants/species.h"
-#include "constants/moves.h"
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-	.align 2
-	.incbin "baserom.gba", 0x3E7D24, 0x70
diff --git a/include/easy_chat.h b/include/easy_chat.h
index f1031bd7b..b64916123 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -3,33 +3,6 @@
 
 #include "global.h"
 
-// Taken from Pokeruby, check if it's correct
-enum
-{
-    EC_GROUP_POKEMON,
-    EC_GROUP_TRAINER,
-    EC_GROUP_STATUS,
-    EC_GROUP_BATTLE,
-    EC_GROUP_GREETINGS,
-    EC_GROUP_PEOPLE,
-    EC_GROUP_VOICES,
-    EC_GROUP_SPEECH,
-    EC_GROUP_ENDINGS,
-    EC_GROUP_FEELINGS,
-    EC_GROUP_CONDITIONS,
-    EC_GROUP_ACTIONS,
-    EC_GROUP_LIFESTYLE,
-    EC_GROUP_HOBBIES,
-    EC_GROUP_TIME,
-    EC_GROUP_MISC,
-    EC_GROUP_ADJECTIVES,
-    EC_GROUP_EVENTS,
-    EC_GROUP_MOVE_1,
-    EC_GROUP_MOVE_2,
-    EC_GROUP_TRENDY_SAYING,
-    EC_GROUP_POKEMON_2,
-};
-
 struct EasyChatWordInfo
 {
     const u8 *text;
diff --git a/ld_script.txt b/ld_script.txt
index 2ce219c38..fe033340e 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -460,7 +460,6 @@ SECTIONS {
         src/battle_anim_utility_funcs.o(.rodata);
         src/battle_intro.o(.rodata);
         data/bike.o(.rodata);
-        data/easy_chat.o(.rodata);
         src/easy_chat.o(.rodata);
         data/data_835B488.o(.rodata);
         src/mail.o(.rodata);