From 05724d3db1208ffdb867aba5aa9441d538ba9e26 Mon Sep 17 00:00:00 2001 From: Evan Date: Sat, 16 Nov 2019 19:45:55 -0700 Subject: remove compile errors --- data/strings.s | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'data') diff --git a/data/strings.s b/data/strings.s index 101946475..14a4472e3 100644 --- a/data/strings.s +++ b/data/strings.s @@ -2907,25 +2907,25 @@ gUnknown_8419D89:: @ 8419D89 gUnknown_8419DCC:: @ 8419DCC .string "OPTION$" -gUnknown_8419DD3:: @ 0x8419DD3 +gText_TextSpeed:: @ 0x8419DD3 .string "TEXT SPEED$" -gUnknown_8419DDE:: @ 0x8419DDE +gText_BattleScene:: @ 0x8419DDE .string "BATTLE SCENE$" -gUnknown_8419DEB:: @ 0x8419DEB +gText_BattleStyle:: @ 0x8419DEB .string "BATTLE STYLE$" -gUnknown_8419DF8:: @ 0x8419DF8 +gText_Sound:: @ 0x8419DF8 .string "SOUND$" -gUnknown_8419DFE:: @ 0x8419DFE +gText_ButtonMode:: @ 0x8419DFE .string "BUTTON MODE$" -gUnknown_8419E0A:: @ 0x8419E0A +gText_Frame:: @ 0x8419E0A .string "FRAME$" -gUnknown_8419E10:: @ 0x8419E10 +gText_OptionMenuCancel:: @ 0x8419E10 .string "CANCEL$" gUnknown_8419E17:: @ 0x8419E17 -- cgit v1.2.3 From cb5dc21a4e8fecbffcb46e34782d9db3b21ccb13 Mon Sep 17 00:00:00 2001 From: Evan Date: Mon, 18 Nov 2019 21:03:51 -0700 Subject: matching rom --- data/option_menu.s | 33 +++++++++++++++++---------------- data/strings.s | 30 +++++++++++++++--------------- 2 files changed, 32 insertions(+), 31 deletions(-) (limited to 'data') diff --git a/data/option_menu.s b/data/option_menu.s index 098e76f31..f8a590d6d 100644 --- a/data/option_menu.s +++ b/data/option_menu.s @@ -1,43 +1,44 @@ #include "constants/maps.h" #include "constants/species.h" - .include "asm/macros.inc" - .include "constants/constants.inc" + .include "asm/macros.inc" + .include "constants/constants.inc" - .section .rodata - .align 2 + .section .rodata + .align 2 gUnknown_83CC2B8:: @ 83CC2B8 - .incbin "baserom.gba", 0x3CC2B8, 0x20 + .incbin "baserom.gba", 0x3CC2B8, 0x20 gUnknown_83CC2D8:: @ 83CC2D8 - .incbin "baserom.gba", 0x3CC2D8, 0xC + .incbin "baserom.gba", 0x3CC2D8, 0xC gUnknown_83CC2E4:: @ 83CC2E4 - .incbin "baserom.gba", 0x3CC2E4, 0x20 + .incbin "baserom.gba", 0x3CC2E4, 0x20 gUnknown_83CC304:: @ 83CC304 - .incbin "baserom.gba", 0x3CC304, 0x10 + .incbin "baserom.gba", 0x3CC304, 0x10 gUnknown_83CC314:: @ 83CC314 - .incbin "baserom.gba", 0x3CC314, 0x1C + .incbin "baserom.gba", 0x3CC314, 0x1C gUnknown_83CC330:: @ 83CC330 - .incbin "baserom.gba", 0x3CC330, 0xC + .incbin "baserom.gba", 0x3CC330, 0xC gUnknown_83CC33C:: @ 83CC33C - .incbin "baserom.gba", 0x3CC33C, 0x8 + .incbin "baserom.gba", 0x3CC33C, 0x8 gUnknown_83CC344:: @ 83CC344 - .incbin "baserom.gba", 0x3CC344, 0x8 + .incbin "baserom.gba", 0x3CC344, 0x8 gUnknown_83CC34C:: @ 83CC34C - .incbin "baserom.gba", 0x3CC34C, 0x8 + .incbin "baserom.gba", 0x3CC34C, 0x8 gUnknown_83CC354:: @ 83CC354 - .incbin "baserom.gba", 0x3CC354, 0xC + .incbin "baserom.gba", 0x3CC354, 0xC gUnknown_83CC360:: @ 83CC360 - .incbin "baserom.gba", 0x3CC360, 0x3 + .incbin "baserom.gba", 0x3CC360, 0x3 gUnknown_83CC363:: @ 83CC363 - .incbin "baserom.gba", 0x3CC363, 0x3 + .incbin "baserom.gba", 0x3CC363, 0x3 + diff --git a/data/strings.s b/data/strings.s index 14a4472e3..a75671090 100644 --- a/data/strings.s +++ b/data/strings.s @@ -2904,7 +2904,7 @@ gUnknown_8419D89:: @ 8419D89 .string "Waiting for the other TRAINER to\n" .string "finish reading your TRAINER CARD.$" -gUnknown_8419DCC:: @ 8419DCC +gText_MenuOptionOption:: @ 8419DCC .string "OPTION$" gText_TextSpeed:: @ 0x8419DD3 @@ -2928,49 +2928,49 @@ gText_Frame:: @ 0x8419E0A gText_OptionMenuCancel:: @ 0x8419E10 .string "CANCEL$" -gUnknown_8419E17:: @ 0x8419E17 +gText_TextSpeedSlow:: @ 0x8419E17 .string "SLOW$" -gUnknown_8419E1C:: @ 0x8419E1C +gText_TextSpeedMid:: @ 0x8419E1C .string "MID$" -gUnknown_8419E20:: @ 0x8419E20 +gText_TextSpeedFast:: @ 0x8419E20 .string "FAST$" -gUnknown_8419E25:: @ 0x8419E25 +gText_BattleSceneOn:: @ 0x8419E25 .string "ON$" -gUnknown_8419E28:: @ 0x8419E28 +gText_BattleSceneOff:: @ 0x8419E28 .string "OFF$" -gUnknown_8419E2C:: @ 0x8419E2C +gText_BattleStyleShift:: @ 0x8419E2C .string "SHIFT$" -gUnknown_8419E32:: @ 0x8419E32 +gText_BattleStyleSet:: @ 0x8419E32 .string "SET$" -gUnknown_8419E36:: @ 0x8419E36 +gText_SoundMono:: @ 0x8419E36 .string "MONO$" -gUnknown_8419E3B:: @ 0x8419E3B +gText_SoundStereo:: @ 0x8419E3B .string "STEREO$" gUnknown_8419E42:: @ 0x8419E42 .string "タイプ$" -gUnknown_8419E46:: @ 0x8419E46 +gText_ButtonTypeNormal:: @ 0x8419E46 .string "HELP$" -gUnknown_8419E4B:: @ 0x8419E4B +gText_ButtonTypeLR:: @ 0x8419E4B .string "LゅA$" -gUnknown_8419E4F:: @ 0x8419E4F +gText_ButtonTypeLEqualsA:: @ 0x8419E4F .string "LR$" -gUnknown_8419E52:: @ 8419E52 +gText_FrameType:: @ 8419E52 .string "TYPE$" -gUnknown_8419E57:: @ 8419E57 +gText_PickSwitchCancel:: @ 8419E57 .string "{DPAD_UPDOWN}PICK {DPAD_LEFTRIGHT}SWITCH {A_BUTTON}{B_BUTTON}CANCEL$" gUnknown_8419E72:: @ 0x8419E72 -- cgit v1.2.3 From 5bb5d38d225d4ea426b6bf90778a10cb42cb84d4 Mon Sep 17 00:00:00 2001 From: Evan Date: Mon, 18 Nov 2019 21:41:45 -0700 Subject: match baserom --- data/option_menu.s | 44 -------------------------------------------- 1 file changed, 44 deletions(-) delete mode 100644 data/option_menu.s (limited to 'data') diff --git a/data/option_menu.s b/data/option_menu.s deleted file mode 100644 index f8a590d6d..000000000 --- a/data/option_menu.s +++ /dev/null @@ -1,44 +0,0 @@ -#include "constants/maps.h" -#include "constants/species.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnknown_83CC2B8:: @ 83CC2B8 - .incbin "baserom.gba", 0x3CC2B8, 0x20 - -gUnknown_83CC2D8:: @ 83CC2D8 - .incbin "baserom.gba", 0x3CC2D8, 0xC - -gUnknown_83CC2E4:: @ 83CC2E4 - .incbin "baserom.gba", 0x3CC2E4, 0x20 - -gUnknown_83CC304:: @ 83CC304 - .incbin "baserom.gba", 0x3CC304, 0x10 - -gUnknown_83CC314:: @ 83CC314 - .incbin "baserom.gba", 0x3CC314, 0x1C - -gUnknown_83CC330:: @ 83CC330 - .incbin "baserom.gba", 0x3CC330, 0xC - -gUnknown_83CC33C:: @ 83CC33C - .incbin "baserom.gba", 0x3CC33C, 0x8 - -gUnknown_83CC344:: @ 83CC344 - .incbin "baserom.gba", 0x3CC344, 0x8 - -gUnknown_83CC34C:: @ 83CC34C - .incbin "baserom.gba", 0x3CC34C, 0x8 - -gUnknown_83CC354:: @ 83CC354 - .incbin "baserom.gba", 0x3CC354, 0xC - -gUnknown_83CC360:: @ 83CC360 - .incbin "baserom.gba", 0x3CC360, 0x3 - -gUnknown_83CC363:: @ 83CC363 - .incbin "baserom.gba", 0x3CC363, 0x3 - -- cgit v1.2.3 From 2cc4db0c786e20c1ef9823d0d0a027f39dfef9f3 Mon Sep 17 00:00:00 2001 From: Evan Date: Sun, 24 Nov 2019 16:23:06 -0700 Subject: remove .s files --- data/shop.s | 92 ---------------------------------------------------------- data/strings.s | 24 +++++++-------- 2 files changed, 12 insertions(+), 104 deletions(-) delete mode 100644 data/shop.s (limited to 'data') diff --git a/data/shop.s b/data/shop.s deleted file mode 100644 index a675cfae2..000000000 --- a/data/shop.s +++ /dev/null @@ -1,92 +0,0 @@ -#include "constants/maps.h" -#include "constants/species.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnknown_83DF09C:: @ 83DF09C - .4byte gUnknown_8416738, sub_809AC5C - .4byte gUnknown_841673C, sub_809AC98 - .4byte gUnknown_8416741, sub_809ACF8 - -gUnknown_83DF0B4:: @ 83DF0B4 - .4byte sub_809BEA4 - .4byte sub_809BF98 - -gUnknown_83DF0BC:: @ 83DF0BC - .byte 0, 2, 1, 12, 6, 15 - .2byte 0x0008 - @ { - @ .bg = 0, - @ .tilemapLeft = 2, - @ .tilemapTop = 1, - @ .width = 12, - @ .height = 6, - @ .paletteNum = 15, - @ .baseBlock = 0x0008 - @ } - -gUnknown_83DF0C4:: @ 83DF0C4 - .4byte 0x000001f8 - @ { - @ .bg = 0, - @ .charBaseIndex = 2, - @ .mapBaseIndex = 31, - @ .screenSize = 0, - @ .paletteMode = 0, - @ .priority = 0, - @ .baseTile = 0x0000 - @ } - .4byte 0x000011e1 - @ { - @ .bg = 1, - @ .charBaseIndex = 0, - @ .mapBaseIndex = 30, - @ .screenSize = 0, - @ .paletteMode = 0, - @ .priority = 1, - @ .baseTile = 0x0000 - @ } - .4byte 0x000021d2 - @ { - @ .bg = 2, - @ .charBaseIndex = 0, - @ .mapBaseIndex = 29, - @ .screenSize = 0, - @ .paletteMode = 0, - @ .priority = 2, - @ .baseTile = 0x0000 - @ } - .4byte 0x000031c3 - @ { - @ .bg = 3, - @ .charBaseIndex = 0, - @ .mapBaseIndex = 28, - @ .screenSize = 0, - @ .paletteMode = 0, - @ .priority = 3, - @ .baseTile = 0x0000 - @ } - -gUnknown_83DF0D4:: @ 83DF0D4 - .2byte 0x0308, 0x030a, 0x02d0 - -gUnknown_83DF0DA:: @ 83DF0DA - .2byte 0x0309, 0x030b, 0x02d1 - -gUnknown_83DF0E0:: @ 83DF0E0 - .2byte 0x0310, 0x0312, 0x02d8 - -gUnknown_83DF0E6:: @ 83DF0E6 - .2byte 0x0311, 0x0313, 0x02d9 - -gUnknown_83DF0EC:: @ 83DF0EC - .2byte 0x02e3, 0x0316, 0x0314 - -gUnknown_83DF0F2:: @ 83DF0F2 - .2byte 0x02e4, 0x0317, 0x0315 - -gUnknown_83DF0F8:: @ 83DF0F8 - .2byte 0x02eb, 0x031e, 0x031c diff --git a/data/strings.s b/data/strings.s index a1892e209..bba9336dc 100644 --- a/data/strings.s +++ b/data/strings.s @@ -475,7 +475,7 @@ gUnknown_8416210:: @ 8416210 gText_ThreeHyphens:: @ 8416213 .string "---$" -gUnknown_8416217:: @ 8416217 +gText_SevenHyphens:: @ 8416217 .string "-------$" gUnknown_841621F:: @ 841621F @@ -720,26 +720,26 @@ gText_TheBerryPouchWillBePutAway:: @ 8416716 .string "The BERRY POUCH will be\n" .string "put away.$" -gUnknown_8416738:: @ 0x8416738 +gText_ShopBuy:: @ 0x8416738 .string "BUY$" -gUnknown_841673C:: @ 0x841673C +gText_ShopSell:: @ 0x841673C .string "SELL$" -gUnknown_8416741:: @ 0x8416741 +gText_ShopQuit:: @ 0x8416741 .string "SEE YA!$" -gUnknown_8416749:: @ 8416749 +gText_InBagVar1:: @ 8416749 .string "IN BAG:{SMALL} {STR_VAR_1}$" -gUnknown_8416757:: @ 8416757 +gText_QuitShopping:: @ 8416757 .string "Quit shopping.$" -gUnknown_8416766:: @ 8416766 +gText_Var1CertainlyHowMany:: @ 8416766 .string "{STR_VAR_1}? Certainly.\n" .string "How many would you like?$" -gUnknown_841678E:: @ 841678E +gText_Var1AndYouWantedVar2:: @ 841678E .string "{STR_VAR_1}, and you want {STR_VAR_2}.\n" .string "That will be ¥{STR_VAR_3}. Okay?$" @@ -751,7 +751,7 @@ gUnknown_84167D0:: @ 0x84167D0 .string "{STR_VAR_1} ですね!\n" .string "{STR_VAR_2}¥ だけど かいますか?$" -gUnknown_84167E7:: @ 84167E7 +gText_HereYouGoThankYou:: @ 84167E7 .string "Here you are!\n" .string "Thank you!$" @@ -763,10 +763,10 @@ gUnknown_8416822:: @ 0x8416822 .string "どうも ありがとう!\n" .string "じたくの パソコンに おくって おくね!$" -gUnknown_8416842:: @ 8416842 +gText_YouDontHaveMoney:: @ 8416842 .string "You don't have enough money.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416861:: @ 8416861 +gText_NoMoreRoomForThis:: @ 8416861 .string "You have no more room for this\n" .string "item.{PAUSE_UNTIL_PRESS}$" @@ -774,7 +774,7 @@ gUnknown_8416888:: @ 0x8416888 .string "{STR_VAR_1}を\n" .string "いれる ばしょが いっぱいです{PAUSE_UNTIL_PRESS}$" -gUnknown_841689E:: @ 841689E +gText_CanIHelpWithAnythingElse:: @ 841689E .string "Is there anything else I can do?$" gUnknown_84168BF:: @ 0x84168BF -- cgit v1.2.3 From d1142b4290e8688a0d42bfc1b95b9d90b1721459 Mon Sep 17 00:00:00 2001 From: Evan Date: Tue, 26 Nov 2019 11:47:12 -0700 Subject: extract graphics data --- data/graphics.s | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index 5eacc0cb2..ec4fc10dd 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -14008,17 +14008,17 @@ gBerryPouchSpritePalette:: @ 8E85C1C gBerryPouchBg1Tilemap:: @ 8E85C44 .incbin "graphics/berry_pouch/unk_8E85C44.bin.lz" -gUnknown_8E85DC8:: @ 8E85DC8 - .incbin "baserom.gba", 0xE85DC8, 0x134 +gBuyMenuFrame_Gfx:: @ 8E85DC8 + .incbin "graphics/shop_menu/shop_menu.4bpp.lz" -gUnknown_8E85EFC:: @ 8E85EFC - .incbin "baserom.gba", 0xE85EFC, 0x13C +gBuyMenuFrame_Tilemap:: @ 8E85EFC + .incbin "graphics/shop_menu/shop_tilemap.bin" -gUnknown_8E86038:: @ 8E86038 - .incbin "baserom.gba", 0xE86038, 0x138 +gBuyMenuFrame_TmHmTilemap:: @ 8E86038 + .incbin "graphics/shop_menu/shop_tmHmTilemap.bin" -gUnknown_8E86170:: @ 8E86170 - .incbin "baserom.gba", 0xE86170, 0x38 +gBuyMenuFrame_Pal:: @ 8E86170 + .incbin "graphics/shop_menu/shop_menu.gbapal.lz" gUnknown_8E861A8:: @ 8E861A8 .incbin "baserom.gba", 0xE861A8, 0x98 -- cgit v1.2.3