From 99e697223f86356ef178e4af90f3a3b4b7132591 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 5 Nov 2017 00:25:09 +0100 Subject: get rid of two baseroms --- data/mauville_old_man.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/mauville_old_man.s') diff --git a/data/mauville_old_man.s b/data/mauville_old_man.s index 539cace62..13e26f513 100644 --- a/data/mauville_old_man.s +++ b/data/mauville_old_man.s @@ -5,8 +5,8 @@ .align 2, 0 gUnknown_0859EFE4:: @ 859EFE4 - .incbin "baserom.gba", 0x59efe4, 0xc - + .2byte 0x2811, 0x1029, 0x1018, 0xE0D, 0x1A1A, 0x1A1D + gUnknown_0859EFF0:: @ 859EFF0 .incbin "baserom.gba", 0x59eff0, 0x20 -- cgit v1.2.3 From ffeeb2029965c30e24fdf75864b711cdd48e0a26 Mon Sep 17 00:00:00 2001 From: itskobold Date: Tue, 7 Nov 2017 20:47:43 +0000 Subject: mauville_old_man.s progress --- data/mauville_old_man.s | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) (limited to 'data/mauville_old_man.s') diff --git a/data/mauville_old_man.s b/data/mauville_old_man.s index 539cace62..70146bfe4 100644 --- a/data/mauville_old_man.s +++ b/data/mauville_old_man.s @@ -5,13 +5,30 @@ .align 2, 0 gUnknown_0859EFE4:: @ 859EFE4 - .incbin "baserom.gba", 0x59efe4, 0xc +@ replacing .incbin "baserom.gba", 0x0059efe4, 0xc +.2byte 0x2811, 0x1029, 0x1018, 0x0e0d, 0x1a1a, 0x1a1d gUnknown_0859EFF0:: @ 859EFF0 - .incbin "baserom.gba", 0x59eff0, 0x20 +@ replacing .incbin "baserom.gba", 0x0059eff0, 0x20 +.4byte 0x8294295 +.4byte 0x82942a1 +.4byte 0x82942ae +.4byte 0x82942bb +.4byte 0x82942c6 +.4byte 0x82942d5 +.4byte 0x82942e3 +.4byte 0x82942f0 gUnknown_0859F010:: @ 859F010 - .incbin "baserom.gba", 0x59f010, 0x20 +@ replacing .incbin "baserom.gba", 0x0059f010, 0x20 +.4byte 0x8294313 +.4byte 0x8294359 +.4byte 0x8294398 +.4byte 0x82943da +.4byte 0x829441c +.4byte 0x8294460 +.4byte 0x82944a0 +.4byte 0x82944d5 gUnknown_0859F030:: @ 859F030 .incbin "baserom.gba", 0x59f030, 0x18 @@ -23,4 +40,6 @@ gUnknown_0859F278:: @ 859F278 .incbin "baserom.gba", 0x59f278, 0x10 gUnknown_0859F288:: @ 859F288 - .incbin "baserom.gba", 0x59f288, 0x8 +@ replacing .incbin "baserom.gba", 0x0059f288, 0x8 +.4byte 0x00000024, 0x00000008 + -- cgit v1.2.3 From c967ba1d5f82c69e75f8a697fee60ceae6ef3218 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 12 Nov 2017 18:41:04 +0100 Subject: dump couple of baseroms review changes --- data/mauville_old_man.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/mauville_old_man.s') diff --git a/data/mauville_old_man.s b/data/mauville_old_man.s index 13e26f513..c9e096f19 100644 --- a/data/mauville_old_man.s +++ b/data/mauville_old_man.s @@ -6,7 +6,7 @@ gUnknown_0859EFE4:: @ 859EFE4 .2byte 0x2811, 0x1029, 0x1018, 0xE0D, 0x1A1A, 0x1A1D - + gUnknown_0859EFF0:: @ 859EFF0 .incbin "baserom.gba", 0x59eff0, 0x20 -- cgit v1.2.3 From 38af0f78ea73dc1eec582aff9a5bc37cd06412e0 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 19 Dec 2017 20:52:52 +0100 Subject: hopefully fix kobold PR --- data/mauville_old_man.s | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'data/mauville_old_man.s') diff --git a/data/mauville_old_man.s b/data/mauville_old_man.s index 0baca9782..d7832b761 100644 --- a/data/mauville_old_man.s +++ b/data/mauville_old_man.s @@ -8,24 +8,24 @@ gUnknown_0859EFE4:: @ 859EFE4 .2byte 0x2811, 0x1029, 0x1018, 0xE0D, 0x1A1A, 0x1A1D gUnknown_0859EFF0:: @ 859EFF0 - .4byte 0x8294295 - .4byte 0x82942a1 - .4byte 0x82942ae - .4byte 0x82942bb - .4byte 0x82942c6 - .4byte 0x82942d5 - .4byte 0x82942e3 - .4byte 0x82942f0 + .4byte gText_SoPretty + .4byte gText_SoDarling + .4byte gText_SoRelaxed + .4byte gText_SoSunny + .4byte gText_SoDesirable + .4byte gText_SoExciting + .4byte gText_SoAmusing + .4byte gText_SoMagical gUnknown_0859F010:: @ 859F010 - .4byte 0x8294313 - .4byte 0x8294359 - .4byte 0x8294398 - .4byte 0x82943da - .4byte 0x829441c - .4byte 0x8294460 - .4byte 0x82944a0 - .4byte 0x82944d5 + .4byte gUnknown_08294313 + .4byte gUnknown_08294359 + .4byte gUnknown_08294398 + .4byte gUnknown_082943DA + .4byte gUnknown_0829441C + .4byte gUnknown_08294460 + .4byte gUnknown_082944A0 + .4byte gUnknown_082944D5 gUnknown_0859F030:: @ 859F030 .incbin "baserom.gba", 0x59f030, 0x18 -- cgit v1.2.3 From 59e1aacd26207f6bcbd1d0107886627c53950a7c Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Sat, 20 Jan 2018 17:26:30 -0500 Subject: DIEGO SEND HELP --- data/mauville_old_man.s | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'data/mauville_old_man.s') diff --git a/data/mauville_old_man.s b/data/mauville_old_man.s index d7832b761..c1b4dd1be 100644 --- a/data/mauville_old_man.s +++ b/data/mauville_old_man.s @@ -28,13 +28,31 @@ gUnknown_0859F010:: @ 859F010 .4byte gUnknown_082944D5 gUnknown_0859F030:: @ 859F030 - .incbin "baserom.gba", 0x59f030, 0x18 + .4byte 0, 12, 13, 18, 19, 21 gUnknown_0859F048:: @ 859F048 - .incbin "baserom.gba", 0x59f048, 0x230 + .4byte 0x00000132, MauvilleCity_PokemonCenter_1F_Text_28E930, MauvilleCity_PokemonCenter_1F_Text_28E947, MauvilleCity_PokemonCenter_1F_Text_28E956, 0x00000102, MauvilleCity_PokemonCenter_1F_Text_28E9D7, MauvilleCity_PokemonCenter_1F_Text_28E9EF, MauvilleCity_PokemonCenter_1F_Text_28E9FE + .4byte 0x00000103, MauvilleCity_PokemonCenter_1F_Text_28EA7D, MauvilleCity_PokemonCenter_1F_Text_28EA98, MauvilleCity_PokemonCenter_1F_Text_28EAA8, 0x00000104, MauvilleCity_PokemonCenter_1F_Text_28EB19, MauvilleCity_PokemonCenter_1F_Text_28EB31, MauvilleCity_PokemonCenter_1F_Text_28EB3E + .4byte 0x00000106, MauvilleCity_PokemonCenter_1F_Text_28EBB5, MauvilleCity_PokemonCenter_1F_Text_28EBCD, MauvilleCity_PokemonCenter_1F_Text_28EBDD, 0x00000109, MauvilleCity_PokemonCenter_1F_Text_28EC60, MauvilleCity_PokemonCenter_1F_Text_28EC79, MauvilleCity_PokemonCenter_1F_Text_28EC81 + .4byte 0x0000010b, MauvilleCity_PokemonCenter_1F_Text_28ED04, MauvilleCity_PokemonCenter_1F_Text_28ED21, MauvilleCity_PokemonCenter_1F_Text_28ED30, 0x0000010c, MauvilleCity_PokemonCenter_1F_Text_28EDA1, MauvilleCity_PokemonCenter_1F_Text_28EDB5, MauvilleCity_PokemonCenter_1F_Text_28EDCF + .4byte 0x0000010d, MauvilleCity_PokemonCenter_1F_Text_28EE45, MauvilleCity_PokemonCenter_1F_Text_28EE5D, MauvilleCity_PokemonCenter_1F_Text_28EE6A, 0x0000010e, MauvilleCity_PokemonCenter_1F_Text_28EEDD, MauvilleCity_PokemonCenter_1F_Text_28EEF1, MauvilleCity_PokemonCenter_1F_Text_28EF01 + .4byte 0x0000010f, MauvilleCity_PokemonCenter_1F_Text_28EF73, MauvilleCity_PokemonCenter_1F_Text_28EF95, MauvilleCity_PokemonCenter_1F_Text_28EFAA, 0x00000110, MauvilleCity_PokemonCenter_1F_Text_28F045, MauvilleCity_PokemonCenter_1F_Text_28F05A, MauvilleCity_PokemonCenter_1F_Text_28F071 + .4byte 0x00000111, MauvilleCity_PokemonCenter_1F_Text_28F0F3, MauvilleCity_PokemonCenter_1F_Text_28F10D, MauvilleCity_PokemonCenter_1F_Text_28F125, 0x00000112, MauvilleCity_PokemonCenter_1F_Text_28F1BE, MauvilleCity_PokemonCenter_1F_Text_28F1D5, MauvilleCity_PokemonCenter_1F_Text_28F1DE + .4byte 0x00000113, MauvilleCity_PokemonCenter_1F_Text_28F24F, MauvilleCity_PokemonCenter_1F_Text_28F269, MauvilleCity_PokemonCenter_1F_Text_28F277, 0x00000114, MauvilleCity_PokemonCenter_1F_Text_28F2FC, MauvilleCity_PokemonCenter_1F_Text_28F314, MauvilleCity_PokemonCenter_1F_Text_28F32A + .4byte 0x0000011a, MauvilleCity_PokemonCenter_1F_Text_28F3AD, MauvilleCity_PokemonCenter_1F_Text_28F3C6, MauvilleCity_PokemonCenter_1F_Text_28F3D2, 0x0000011b, MauvilleCity_PokemonCenter_1F_Text_28F44B, MauvilleCity_PokemonCenter_1F_Text_28F461, MauvilleCity_PokemonCenter_1F_Text_28F47C + .4byte 0x0000011c, MauvilleCity_PokemonCenter_1F_Text_28F50C, MauvilleCity_PokemonCenter_1F_Text_28F51B, MauvilleCity_PokemonCenter_1F_Text_28F538, 0x0000021d, MauvilleCity_PokemonCenter_1F_Text_28F5BE, MauvilleCity_PokemonCenter_1F_Text_28F5D1, MauvilleCity_PokemonCenter_1F_Text_28F5F2 + .4byte 0x0000011e, MauvilleCity_PokemonCenter_1F_Text_28F678, MauvilleCity_PokemonCenter_1F_Text_28F694, MauvilleCity_PokemonCenter_1F_Text_28F6B4, 0x00000121, MauvilleCity_PokemonCenter_1F_Text_28F751, MauvilleCity_PokemonCenter_1F_Text_28F76A, MauvilleCity_PokemonCenter_1F_Text_28F776 + .4byte 0x00000124, MauvilleCity_PokemonCenter_1F_Text_28F7F6, MauvilleCity_PokemonCenter_1F_Text_28F811, MauvilleCity_PokemonCenter_1F_Text_28F822, 0x00000125, MauvilleCity_PokemonCenter_1F_Text_28F89C, MauvilleCity_PokemonCenter_1F_Text_28F8AF, MauvilleCity_PokemonCenter_1F_Text_28F8BC + .4byte 0x00000126, MauvilleCity_PokemonCenter_1F_Text_28F92F, MauvilleCity_PokemonCenter_1F_Text_28F941, MauvilleCity_PokemonCenter_1F_Text_28F949, 0x00000127, MauvilleCity_PokemonCenter_1F_Text_28F9D1, MauvilleCity_PokemonCenter_1F_Text_28F9EA, MauvilleCity_PokemonCenter_1F_Text_28F9FD + .4byte 0x00000128, MauvilleCity_PokemonCenter_1F_Text_28FA81, MauvilleCity_PokemonCenter_1F_Text_28FA99, MauvilleCity_PokemonCenter_1F_Text_28FAA7, 0x00000129, MauvilleCity_PokemonCenter_1F_Text_28FB1D, MauvilleCity_PokemonCenter_1F_Text_28FB35, MauvilleCity_PokemonCenter_1F_Text_28FB47 + .4byte 0x0000012a, MauvilleCity_PokemonCenter_1F_Text_28FBC4, MauvilleCity_PokemonCenter_1F_Text_28FBD9, MauvilleCity_PokemonCenter_1F_Text_28FBEA, 0x0000012b, MauvilleCity_PokemonCenter_1F_Text_28FC6B, MauvilleCity_PokemonCenter_1F_Text_28FC85, MauvilleCity_PokemonCenter_1F_Text_28FC98 + .4byte 0x0000012c, MauvilleCity_PokemonCenter_1F_Text_28FD1D, MauvilleCity_PokemonCenter_1F_Text_28FD35, MauvilleCity_PokemonCenter_1F_Text_28FD40, 0x0000012d, MauvilleCity_PokemonCenter_1F_Text_28FDA2, MauvilleCity_PokemonCenter_1F_Text_28FDBD, MauvilleCity_PokemonCenter_1F_Text_28FDCE + .4byte 0x0000012e, MauvilleCity_PokemonCenter_1F_Text_28FE57, MauvilleCity_PokemonCenter_1F_Text_28FE72, MauvilleCity_PokemonCenter_1F_Text_28FE88, 0x0000012f, MauvilleCity_PokemonCenter_1F_Text_28FF0C, MauvilleCity_PokemonCenter_1F_Text_28FF27, MauvilleCity_PokemonCenter_1F_Text_28FF44 + .4byte 0x00000130, MauvilleCity_PokemonCenter_1F_Text_28FFDD, MauvilleCity_PokemonCenter_1F_Text_28FFFA, MauvilleCity_PokemonCenter_1F_Text_29000D + gUnknown_0859F278:: @ 859F278 - .incbin "baserom.gba", 0x59f278, 0x10 + .4byte 0x00000131, MauvilleCity_PokemonCenter_1F_Text_290097, MauvilleCity_PokemonCenter_1F_Text_2900B5, MauvilleCity_PokemonCenter_1F_Text_2900CB gUnknown_0859F288:: @ 859F288 .4byte 0x00000024, 0x00000008 -- cgit v1.2.3