diff options
| -rw-r--r-- | baserom.ips | bin | 497113 -> 492807 bytes | |||
| -rw-r--r-- | data/bike.s | 23 | ||||
| -rw-r--r-- | data/easy_chat.s | 9 | ||||
| -rw-r--r-- | include/easy_chat.h | 27 | ||||
| -rw-r--r-- | ld_script.txt | 1 |
5 files changed, 20 insertions, 40 deletions
diff --git a/baserom.ips b/baserom.ips Binary files differindex f46d70215..9fbf21b95 100644 --- a/baserom.ips +++ b/baserom.ips 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); |