From 40a808351a5b76b0a536c5fac6c9479284468af8 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 2 Jul 2019 11:28:48 +0800 Subject: finished safari_zone --- data/map_event_scripts.inc | 8 ++++---- data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc | 8 ++++---- data/specials.inc | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'data') diff --git a/data/map_event_scripts.inc b/data/map_event_scripts.inc index f3205689d..3cf5c1ced 100644 --- a/data/map_event_scripts.inc +++ b/data/map_event_scripts.inc @@ -4178,16 +4178,16 @@ gUnknown_81BFB5F:: @ 81BFB5F gUnknown_81BFB65:: @ 81BFB65 .incbin "baserom.gba", 0x1BFB65, 0x22 -gUnknown_81BFB87:: @ 81BFB87 +EventScript_SafariWarpOut:: @ 81BFB87 .incbin "baserom.gba", 0x1BFB87, 0x23 -gUnknown_81BFBAA:: @ 81BFBAA +EventScript_SafariRetire:: @ 81BFBAA .incbin "baserom.gba", 0x1BFBAA, 0x1B -gUnknown_81BFBC5:: @ 81BFBC5 +EventScript_SafariTimesUp:: @ 81BFBC5 .incbin "baserom.gba", 0x1BFBC5, 0x12 -gUnknown_81BFBD7:: @ 81BFBD7 +EventScript_SafariOutOfBalls:: @ 81BFBD7 .incbin "baserom.gba", 0x1BFBD7, 0x2D5 gUnknown_81BFEAC:: @ 81BFEAC diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index a2ee86113..d9bcea13d 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -17,7 +17,7 @@ EventScript_16D2C8:: @ 816D2C8 closemessage applymovement 255, Movement_16D367 waitmovement 0 - special sub_80A0EEC + special ExitSafariMode setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0 releaseall end @@ -29,7 +29,7 @@ EventScript_16D2F2:: @ 816D2F2 closemessage applymovement 255, Movement_16D362 waitmovement 0 - special sub_80A0EEC + special ExitSafariMode setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0 releaseall end @@ -44,7 +44,7 @@ EventScript_16D312:: @ 816D312 closemessage applymovement 255, Movement_16D362 waitmovement 0 - special sub_80A0EEC + special ExitSafariMode setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0 releaseall end @@ -132,7 +132,7 @@ EventScript_16D3CA:: @ 816D3CA call_if 1, EventScript_16D441 compare_var_to_value VAR_0x4002, 2 call_if 1, EventScript_16D457 - special sub_80A0EC4 + special EnterSafariMode setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2 warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30 waitstate diff --git a/data/specials.inc b/data/specials.inc index e6cec1766..24d793093 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -214,8 +214,8 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 - def_special sub_80A0EC4 - def_special sub_80A0EEC + def_special EnterSafariMode + def_special ExitSafariMode def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 -- cgit v1.2.3 From d97925df0edcac9212ba827b31ff75c7968703f3 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Wed, 3 Jul 2019 01:34:39 +0800 Subject: finished field_poison --- data/map_event_scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/map_event_scripts.inc b/data/map_event_scripts.inc index 3cf5c1ced..899ed20e6 100644 --- a/data/map_event_scripts.inc +++ b/data/map_event_scripts.inc @@ -1065,7 +1065,7 @@ Text_1A5446:: @ 81A5446 .string "Want to give a nickname to the\n" .string "{STR_VAR_2} you received?$" -gUnknown_81A5476:: @ 81A5476 +gText_PkmnFainted3:: @ 81A5476 .string "{STR_VAR_1} fainted…\p" .string "$" -- cgit v1.2.3 From 503086bc7df2a832f49da321287e6b12b8e138fa Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Wed, 3 Jul 2019 12:40:04 +0800 Subject: finished menu_indicators --- data/menu_indicators.s | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 data/menu_indicators.s (limited to 'data') diff --git a/data/menu_indicators.s b/data/menu_indicators.s deleted file mode 100644 index dd8911c7d..000000000 --- a/data/menu_indicators.s +++ /dev/null @@ -1,46 +0,0 @@ - .section .rodata - .align 2 -gUnknown_846325C:: @ 846325C - .incbin "baserom.gba", 0x46325C, 0x48 - -gUnknown_84632A4:: @ 84632A4 - .incbin "baserom.gba", 0x4632A4, 0x18 - -gUnknown_84632BC:: @ 84632BC - .incbin "baserom.gba", 0x4632BC, 0x4 - -gUnknown_84632C0:: @ 84632C0 - .incbin "baserom.gba", 0x4632C0, 0x4 - -gUnknown_84632C4:: @ 84632C4 - .incbin "baserom.gba", 0x4632C4, 0x4 - -gUnknown_84632C8:: @ 84632C8 - .incbin "baserom.gba", 0x4632C8, 0x4 - -gUnknown_84632CC:: @ 84632CC - .incbin "baserom.gba", 0x4632CC, 0x4 - -gUnknown_84632D0:: @ 84632D0 - .incbin "baserom.gba", 0x4632D0, 0x4 - -gUnknown_84632D4:: @ 84632D4 - .incbin "baserom.gba", 0x4632D4, 0x4 - -gUnknown_84632D8:: @ 84632D8 - .incbin "baserom.gba", 0x4632D8, 0x18 - -gUnknown_84632F0:: @ 84632F0 - .incbin "baserom.gba", 0x4632F0, 0x18 - -gUnknown_8463308:: @ 8463308 - .incbin "baserom.gba", 0x463308, 0x20 - -gUnknown_8463328:: @ 8463328 - .incbin "baserom.gba", 0x463328, 0x70 - -gUnknown_8463398:: @ 8463398 - .incbin "baserom.gba", 0x463398, 0x40 - -gUnknown_84633D8:: @ 84633D8 - .incbin "baserom.gba", 0x4633D8, 0x44 -- cgit v1.2.3 From 60300866962c072aaf949c0addf75514b973bfec Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Fri, 5 Jul 2019 14:50:05 +0800 Subject: finished buy_menu_helpers --- data/buy_menu_helpers.s | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 data/buy_menu_helpers.s (limited to 'data') diff --git a/data/buy_menu_helpers.s b/data/buy_menu_helpers.s deleted file mode 100644 index a59b8e069..000000000 --- a/data/buy_menu_helpers.s +++ /dev/null @@ -1,14 +0,0 @@ - .section .rodata - .align 2 - -gUnknown_8464804:: @ 8464804 - .incbin "baserom.gba", 0x464804, 0x38 - -gUnknown_846483C:: @ 846483C - .incbin "baserom.gba", 0x46483C, 0x40 - -gUnknown_846487C:: @ 846487C - .incbin "baserom.gba", 0x46487C, 0x8 - -gUnknown_8464884:: @ 8464884 - .incbin "baserom.gba", 0x464884, 0xC -- cgit v1.2.3 From cc4d2f524cbac1610e6ff517d55d7de48ebcafc7 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sat, 6 Jul 2019 05:53:42 +0800 Subject: finished dynamic_placeholder_text_util --- data/unk_text_util.s | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 data/unk_text_util.s (limited to 'data') diff --git a/data/unk_text_util.s b/data/unk_text_util.s deleted file mode 100644 index 5e5ce1a5d..000000000 --- a/data/unk_text_util.s +++ /dev/null @@ -1,5 +0,0 @@ - .section .rodata - .align 2 - -gUnknown_8464300:: @ 8464300 - .incbin "baserom.gba", 0x464300, 0x4C -- cgit v1.2.3 From 050bb937533b98a6828f0b276bbe13608b7e2fb0 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sat, 6 Jul 2019 16:45:21 +0800 Subject: finished list_menu --- data/data_83FECCC.s | 3 +-- data/graphics.s | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'data') diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index bbd53eca8..d16de696f 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -759,8 +759,7 @@ gUnknown_84524C4:: @ 84524C4 gUnknown_8452C4C:: @ 8452C4C .incbin "baserom.gba", 0x452C4C, 0x48 -gUnknown_8452C94:: @ 8452C94 - .incbin "baserom.gba", 0x452C94, 0x60 + .section .rodata.8452CF4 gUnknown_8452CF4:: @ 8452CF4 .incbin "baserom.gba", 0x452CF4, 0x8 diff --git a/data/graphics.s b/data/graphics.s index b655cadc7..a8018aaf3 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -16029,14 +16029,14 @@ gFile_graphics_mail_retro_map_tilemap:: @ 8E95C88 .incbin "graphics/mail/retro/map.bin.lz" .align 2 -gUnknown_8E95D9C:: @ 8E95D9C - .incbin "baserom.gba", 0xE95D9C, 0x20 @UNKNOWN +gFireRedMenuElements1_Pal:: @ 8E95D9C + .incbin "graphics/interface/menu1.gbapal" -gUnknown_8E95DBC:: @ 8E95DBC - .incbin "baserom.gba", 0xE95DBC, 0x20 @UNKNOWN +gFireRedMenuElements2_Pal:: @ 8E95DBC + .incbin "graphics/interface/menu2.gbapal" -gUnknown_8E95DDC:: @ 8E95DDC - .incbin "baserom.gba", 0xE95DDC, 0x2000 @UNKNOWN +gFireRedMenuElements_Gfx:: @ 8E95DDC + .incbin "graphics/interface/menu.4bpp" gUnknown_8E97DDC:: @ 8E97DDC .incbin "baserom.gba", 0xE97DDC, 0x20 @UNKNOWN -- cgit v1.2.3 From 20a9d8f3ef6a0b5be2be245fdc7632b6613b4450 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sun, 7 Jul 2019 01:44:46 +0800 Subject: renamed some graphics --- data/graphics.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index a8018aaf3..83d14001d 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -16030,13 +16030,13 @@ gFile_graphics_mail_retro_map_tilemap:: @ 8E95C88 .align 2 gFireRedMenuElements1_Pal:: @ 8E95D9C - .incbin "graphics/interface/menu1.gbapal" + .incbin "graphics/interface/dex_caught_pokeball.gbapal" gFireRedMenuElements2_Pal:: @ 8E95DBC - .incbin "graphics/interface/menu2.gbapal" + .incbin "graphics/interface/pokemon_types.gbapal" gFireRedMenuElements_Gfx:: @ 8E95DDC - .incbin "graphics/interface/menu.4bpp" + .incbin "graphics/interface/dex_caught_pokeball_and_pokemon_types.4bpp" gUnknown_8E97DDC:: @ 8E97DDC .incbin "baserom.gba", 0xE97DDC, 0x20 @UNKNOWN -- cgit v1.2.3