diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/event_scripts.s | 2 | ||||
| -rw-r--r-- | data/field_effect_scripts.s | 4 | ||||
| -rw-r--r-- | data/map_name_popup.s | 69 | ||||
| -rw-r--r-- | data/mon_markings.s | 157 | ||||
| -rw-r--r-- | data/party_menu.s | 4 | ||||
| -rw-r--r-- | data/rotating_gate.s | 285 | ||||
| -rw-r--r-- | data/scripts/maps/DewfordTown_Hall.inc | 6 | ||||
| -rw-r--r-- | data/scripts/maps/FortreeCity_Gym.inc | 2 | ||||
| -rw-r--r-- | data/scripts/maps/Route110_TrickHousePuzzle6.inc | 2 | ||||
| -rw-r--r-- | data/specials.inc | 8 |
10 files changed, 14 insertions, 525 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 1343a4fa9..25b0c7b52 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1890,7 +1890,7 @@ DewfordTown_EventScript_271E8B:: @ 8271E8B DewfordTown_Hall_EventScript_271E8B:: @ 8271E8B dodailyevents setvar VAR_0x8004, 0 - special sub_8122998 + special BufferTrendyPhraseString return DewfordTown_EventScript_271E95:: @ 8271E95 diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 1a877daa9..c06497093 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -223,7 +223,7 @@ gFieldEffectScript_SandDisguisePlaceholder:: @ 82DBC09 field_eff_end gFieldEffectScript_UseRockSmash:: @ 82DBC0F - field_eff_callnative oei_rocksmash + field_eff_callnative FldEff_UseRockSmash field_eff_end gFieldEffectScript_Unknown40:: @ 82DBC15 @@ -231,7 +231,7 @@ gFieldEffectScript_Unknown40:: @ 82DBC15 field_eff_end gFieldEffectScript_Unknown38:: @ 82DBC1B - field_eff_callnative sub_8135780 + field_eff_callnative FldEff_UseDig field_eff_end gFieldEffectScript_Unknown39:: @ 82DBC21 diff --git a/data/map_name_popup.s b/data/map_name_popup.s deleted file mode 100644 index 7dc1da808..000000000 --- a/data/map_name_popup.s +++ /dev/null @@ -1,69 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -gMapPopUp_Table:: @ 857C684 - .incbin "graphics/interface/map_popup/wood.4bpp" - .incbin "graphics/interface/map_popup/marble.4bpp" - .incbin "graphics/interface/map_popup/stone.4bpp" - .incbin "graphics/interface/map_popup/brick.4bpp" - .incbin "graphics/interface/map_popup/underwater.4bpp" - .incbin "graphics/interface/map_popup/stone2.4bpp" - -gMapPopUp_Outline_Table:: @ 857DD04 - .incbin "graphics/interface/map_popup/wood_outline.4bpp" - .incbin "graphics/interface/map_popup/marble_outline.4bpp" - .incbin "graphics/interface/map_popup/stone_outline.4bpp" - .incbin "graphics/interface/map_popup/brick_outline.4bpp" - .incbin "graphics/interface/map_popup/underwater_outline.4bpp" - .incbin "graphics/interface/map_popup/stone2_outline.4bpp" - -gMapPopUp_Palette_Table:: @ 857F384 - .incbin "graphics/interface/map_popup/wood.gbapal" - .incbin "graphics/interface/map_popup/marble.gbapal" - .incbin "graphics/interface/map_popup/stone.gbapal" - .incbin "graphics/interface/map_popup/brick.gbapal" - .incbin "graphics/interface/map_popup/underwater.gbapal" - .incbin "graphics/interface/map_popup/stone2.gbapal" - -gUnknown_0857F444:: @ 857F444 - .incbin "graphics/interface/map_popup/857F444.gbapal" - -gUnknown_0857F464:: @ 857F464 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x01, 0x01, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x05, 0x02, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x05, 0x02, 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 0x02, 0x05, 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x01, 0x02, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x05, 0x02, 0x05, 0x05, 0x05, 0x02, 0x02, 0x02, 0x01 - -gUnknown_0857F4CC:: @ 857F4CC - .string "PYRAMID FLOOR 1$" - -gUnknown_0857F4DC:: @ 857F4DC - .string "PYRAMID FLOOR 2$" - -gUnknown_0857F4EC:: @ 857F4EC - .string "PYRAMID FLOOR 3$" - -gUnknown_0857F4FC:: @ 857F4FC - .string "PYRAMID FLOOR 4$" - -gUnknown_0857F50C:: @ 857F50C - .string "PYRAMID FLOOR 5$" - -gUnknown_0857F51C:: @ 857F51C - .string "PYRAMID FLOOR 6$" - -gUnknown_0857F52C:: @ 857F52C - .string "PYRAMID FLOOR 7$" - -gUnknown_0857F53C:: @ 857F53C - .string "PYRAMID$" - -gUnknown_0857F544:: @ 857F544 - .4byte gUnknown_0857F4CC - .4byte gUnknown_0857F4DC - .4byte gUnknown_0857F4EC - .4byte gUnknown_0857F4FC - .4byte gUnknown_0857F50C - .4byte gUnknown_0857F51C - .4byte gUnknown_0857F52C - .4byte gUnknown_0857F53C diff --git a/data/mon_markings.s b/data/mon_markings.s deleted file mode 100644 index 7d30c0012..000000000 --- a/data/mon_markings.s +++ /dev/null @@ -1,157 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -gUnknown_0859E65C:: @ 859E65C - .incbin "graphics/misc/mon_markings.gbapal" - -gUnknown_0859E67C:: @ 859E67C - .incbin "graphics/misc/mon_markings.4bpp" - -gUnknown_0859EE7C:: @ 859EE7C - .2byte 0, 0xC000, 0, 0 - -gUnknown_0859EE84:: @ 859EE84 - .2byte 0, 0, 0, 0 - -gUnknown_0859EE8C:: @ 859EE8C - .2byte 0, 5, -1, 0 - -gUnknown_0859EE94:: @ 859EE94 - .2byte 1, 5, -1, 0 - -gUnknown_0859EE9C:: @ 859EE9C - .2byte 2, 5, -1, 0 - -gUnknown_0859EEA4:: @ 859EEA4 - .2byte 3, 5, -1, 0 - -gUnknown_0859EEAC:: @ 859EEAC - .2byte 4, 5, -1, 0 - -gUnknown_0859EEB4:: @ 859EEB4 - .2byte 5, 5, -1, 0 - -gUnknown_0859EEBC:: @ 859EEBC - .2byte 6, 5, -1, 0 - -gUnknown_0859EEC4:: @ 859EEC4 - .2byte 7, 5, -1, 0 - -gUnknown_0859EECC:: @ 859EECC - .2byte 8, 5, -1, 0 - -gUnknown_0859EED4:: @ 859EED4 - .2byte 9, 5, -1, 0 - -gUnknown_0859EEDC:: @ 859EEDC - .4byte gUnknown_0859EE8C - .4byte gUnknown_0859EE94 - .4byte gUnknown_0859EE9C - .4byte gUnknown_0859EEA4 - .4byte gUnknown_0859EEAC - .4byte gUnknown_0859EEB4 - .4byte gUnknown_0859EEBC - .4byte gUnknown_0859EEC4 - .4byte gUnknown_0859EECC - .4byte gUnknown_0859EED4 - -gUnknown_0859EF04:: @ 859EF04 - .2byte 0, 5, -1, 0 - -gUnknown_0859EF0C:: @ 859EF0C - .2byte 64, 5, -1, 0 - -gUnknown_0859EF14:: @ 859EF14 - .4byte gUnknown_0859EF04 - .4byte gUnknown_0859EF0C - -gUnknown_0859EF1C:: @ 859EF1C - .2byte 0x4000 - .2byte 0x4000 - .2byte 0 - .2byte 0 - -gUnknown_0859EF24:: @ 859EF24 - obj_image_anim_frame 0, 5 - obj_image_anim_end - -gUnknown_0859EF2C:: @ 859EF2C - obj_image_anim_frame 4, 5 - obj_image_anim_end - -gUnknown_0859EF34:: @ 859EF34 - obj_image_anim_frame 8, 5 - obj_image_anim_end - -gUnknown_0859EF3C:: @ 859EF3C - obj_image_anim_frame 12, 5 - obj_image_anim_end - -gUnknown_0859EF44:: @ 859EF44 - obj_image_anim_frame 16, 5 - obj_image_anim_end - -gUnknown_0859EF4C:: @ 859EF4C - obj_image_anim_frame 20, 5 - obj_image_anim_end - -gUnknown_0859EF54:: @ 859EF54 - obj_image_anim_frame 24, 5 - obj_image_anim_end - -gUnknown_0859EF5C:: @ 859EF5C - obj_image_anim_frame 28, 5 - obj_image_anim_end - -gUnknown_0859EF64:: @ 859EF64 - obj_image_anim_frame 32, 5 - obj_image_anim_end - -gUnknown_0859EF6C:: @ 859EF6C - obj_image_anim_frame 36, 5 - obj_image_anim_end - -gUnknown_0859EF74:: @ 859EF74 - obj_image_anim_frame 40, 5 - obj_image_anim_end - -gUnknown_0859EF7C:: @ 859EF7C - obj_image_anim_frame 44, 5 - obj_image_anim_end - -gUnknown_0859EF84:: @ 859EF84 - obj_image_anim_frame 48, 5 - obj_image_anim_end - -gUnknown_0859EF8C:: @ 859EF8C - obj_image_anim_frame 52, 5 - obj_image_anim_end - -gUnknown_0859EF94:: @ 859EF94 - obj_image_anim_frame 56, 5 - obj_image_anim_end - -gUnknown_0859EF9C:: @ 859EF9C - obj_image_anim_frame 60, 5 - obj_image_anim_end - -gUnknown_0859EFA4:: @ 859EFA4 - .4byte gUnknown_0859EF24 - .4byte gUnknown_0859EF2C - .4byte gUnknown_0859EF34 - .4byte gUnknown_0859EF3C - .4byte gUnknown_0859EF44 - .4byte gUnknown_0859EF4C - .4byte gUnknown_0859EF54 - .4byte gUnknown_0859EF5C - .4byte gUnknown_0859EF64 - .4byte gUnknown_0859EF6C - .4byte gUnknown_0859EF74 - .4byte gUnknown_0859EF7C - .4byte gUnknown_0859EF84 - .4byte gUnknown_0859EF8C - .4byte gUnknown_0859EF94 - .4byte gUnknown_0859EF9C diff --git a/data/party_menu.s b/data/party_menu.s index b60a1f927..ebd596870 100644 --- a/data/party_menu.s +++ b/data/party_menu.s @@ -433,14 +433,14 @@ gUnknown_08615D7E:: @ 8615D7E gUnknown_08615D9C:: @ 8615D9C .4byte sub_80D3718, 0x00000007 .4byte SetUpFieldMove_Flash, 0x0000000d - .4byte sub_8135654, 0x0000000d + .4byte SetUpFieldMove_RockSmash, 0x0000000d .4byte SetUpFieldMove_Strength, 0x0000000d .4byte sub_81B5820, 0x00000008 .4byte sub_81B5884, 0x0000000d .4byte sub_81B5974, 0x0000000d .4byte hm_prepare_waterfall, 0x0000000d .4byte SetUpFieldMove_Teleport, 0x0000000d - .4byte sub_813572C, 0x0000000d + .4byte SetUpFieldMove_Dig, 0x0000000d .4byte sub_80FA004, 0x0000000d .4byte SetUpFieldMove_SoftBoiled, 0x00000010 .4byte SetUpFieldMove_SoftBoiled, 0x00000010 diff --git a/data/rotating_gate.s b/data/rotating_gate.s deleted file mode 100644 index 595cc9917..000000000 --- a/data/rotating_gate.s +++ /dev/null @@ -1,285 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_0858E8B0:: @ 858E8B0 - .2byte 0x0006, 0x0007 - .byte 0x05, 0x01 - - .align 2 - .2byte 0x0009, 0x000f - .byte 0x05, 0x02 - - .align 2 - .2byte 0x0003, 0x0013 - .byte 0x05, 0x01 - - .align 2 - .2byte 0x0002, 0x0006 - .byte 0x04, 0x01 - - .align 2 - .2byte 0x0009, 0x000c - .byte 0x04, 0x00 - - .align 2 - .2byte 0x0006, 0x0017 - .byte 0x04, 0x00 - - .align 2 - .2byte 0x000c, 0x0016 - .byte 0x04, 0x00 - - .align 2 - .2byte 0x0006, 0x0003 - .byte 0x03, 0x02 - - .align 2 -gUnknown_0858E8F0:: @ 858E8F0 - .2byte 0x000e, 0x0005 - .byte 0x04, 0x01 - - .align 2 - .2byte 0x000a, 0x0006 - .byte 0x01, 0x02 - - .align 2 - .2byte 0x0006, 0x0006 - .byte 0x03, 0x01 - - .align 2 - .2byte 0x000e, 0x0008 - .byte 0x04, 0x01 - - .align 2 - .2byte 0x0003, 0x000a - .byte 0x02, 0x03 - - .align 2 - .2byte 0x0009, 0x000e - .byte 0x00, 0x01 - - .align 2 - .2byte 0x0003, 0x000f - .byte 0x06, 0x00 - - .align 2 - .2byte 0x0002, 0x0011 - .byte 0x01, 0x02 - - .align 2 - .2byte 0x000c, 0x0012 - .byte 0x06, 0x03 - - .align 2 - .2byte 0x0005, 0x0012 - .byte 0x03, 0x01 - - .align 2 - .2byte 0x000a, 0x0013 - .byte 0x02, 0x02 - - .align 2 -gUnknown_0858E948:: @ 858E948 - .incbin "graphics/misc/rotating_gate_1.4bpp" - - .align 2 -gUnknown_0858EB48:: @ 858EB48 - .incbin "graphics/misc/rotating_gate_2.4bpp" - - .align 2 -gUnknown_0858F348:: @ 858F348 - .incbin "graphics/misc/rotating_gate_3.4bpp" - - .align 2 -gUnknown_0858FB48:: @ 858FB48 - .incbin "graphics/misc/rotating_gate_4.4bpp" - - .align 2 -gUnknown_08590348:: @ 8590348 - .incbin "graphics/misc/rotating_gate_5.4bpp" - - .align 2 -gUnknown_08590548:: @ 8590548 - .incbin "graphics/misc/rotating_gate_6.4bpp" - - .align 2 -gUnknown_08590D48:: @ 8590D48 - .incbin "graphics/misc/rotating_gate_7.4bpp" - - .align 2 -gUnknown_08591548:: @ 8591548 - .incbin "graphics/misc/rotating_gate_8.4bpp" - - .align 2 -gOamData_8591D48:: @ 8591D48 - .2byte 0x0100, 0xc000, 0x2800 - - .align 2 -gOamData_8591D50:: @ 8591D50 - .2byte 0x0100, 0x8000, 0x2800 - - .align 2 -gUnknown_08591D58:: @ 8591D58 - obj_tiles gUnknown_0858E948, 0x0200, 0x1300 - obj_tiles gUnknown_0858EB48, 0x0800, 0x1301 - obj_tiles gUnknown_0858F348, 0x0800, 0x1302 - obj_tiles gUnknown_0858FB48, 0x0800, 0x1303 - obj_tiles gUnknown_08590348, 0x0200, 0x1304 - obj_tiles gUnknown_08590548, 0x0800, 0x1305 - obj_tiles gUnknown_08590D48, 0x0800, 0x1306 - obj_tiles gUnknown_08591548, 0x0800, 0x1307 - null_obj_tiles - - .align 2 -gSpriteAnim_8591DA0:: @ 8591DA0 - .2byte 0x0000, 0x0000, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_8591DA8:: @ 8591DA8 - .2byte 0x0000, 0x0000, 0xffff, 0x0000 - - .align 2 -gSpriteAnimTable_8591DB0:: @ 8591DB0 - .4byte gSpriteAnim_8591DA0 - - .align 2 -gSpriteAnimTable_8591DB4:: @ 8591DB4 - .4byte gSpriteAnim_8591DA8 - - .align 2 -gSpriteAffineAnim_8591DB8:: @ 8591DB8 - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnim_8591DC8:: @ 8591DC8 - .2byte 0x0100, 0x0100, 0x00c0, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnim_8591DD8:: @ 8591DD8 - .2byte 0x0100, 0x0100, 0x0080, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnim_8591DE8:: @ 8591DE8 - .2byte 0x0100, 0x0100, 0x0040, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnim_8591DF8:: @ 8591DF8 - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x10fc, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnim_8591E10:: @ 8591E10 - .2byte 0x0100, 0x0100, 0x00c0, 0x0000, 0x0000, 0x0000, 0x10fc, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnim_8591E28:: @ 8591E28 - .2byte 0x0100, 0x0100, 0x0080, 0x0000, 0x0000, 0x0000, 0x10fc, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnim_8591E40:: @ 8591E40 - .2byte 0x0100, 0x0100, 0x0040, 0x0000, 0x0000, 0x0000, 0x10fc, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnim_8591E58:: @ 8591E58 - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x1004, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnim_8591E70:: @ 8591E70 - .2byte 0x0100, 0x0100, 0x0040, 0x0000, 0x0000, 0x0000, 0x1004, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnim_8591E88:: @ 8591E88 - .2byte 0x0100, 0x0100, 0x0080, 0x0000, 0x0000, 0x0000, 0x1004, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnim_8591EA0:: @ 8591EA0 - .2byte 0x0100, 0x0100, 0x00c0, 0x0000, 0x0000, 0x0000, 0x1004, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnim_8591EB8:: @ 8591EB8 - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x08f8, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnim_8591ED0:: @ 8591ED0 - .2byte 0x0100, 0x0100, 0x00c0, 0x0000, 0x0000, 0x0000, 0x08f8, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnim_8591EE8:: @ 8591EE8 - .2byte 0x0100, 0x0100, 0x0080, 0x0000, 0x0000, 0x0000, 0x08f8, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnim_8591F00:: @ 8591F00 - .2byte 0x0100, 0x0100, 0x0040, 0x0000, 0x0000, 0x0000, 0x08f8, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnim_8591F18:: @ 8591F18 - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0808, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnim_8591F30:: @ 8591F30 - .2byte 0x0100, 0x0100, 0x0040, 0x0000, 0x0000, 0x0000, 0x0808, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnim_8591F48:: @ 8591F48 - .2byte 0x0100, 0x0100, 0x0080, 0x0000, 0x0000, 0x0000, 0x0808, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnim_8591F60:: @ 8591F60 - .2byte 0x0100, 0x0100, 0x00c0, 0x0000, 0x0000, 0x0000, 0x0808, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnimTable_8591F78:: @ 8591F78 - .4byte gSpriteAffineAnim_8591DB8 - .4byte gSpriteAffineAnim_8591DC8 - .4byte gSpriteAffineAnim_8591DD8 - .4byte gSpriteAffineAnim_8591DE8 - .4byte gSpriteAffineAnim_8591E58 - .4byte gSpriteAffineAnim_8591EA0 - .4byte gSpriteAffineAnim_8591E88 - .4byte gSpriteAffineAnim_8591E70 - .4byte gSpriteAffineAnim_8591DF8 - .4byte gSpriteAffineAnim_8591E10 - .4byte gSpriteAffineAnim_8591E28 - .4byte gSpriteAffineAnim_8591E40 - .4byte gSpriteAffineAnim_8591F18 - .4byte gSpriteAffineAnim_8591F60 - .4byte gSpriteAffineAnim_8591F48 - .4byte gSpriteAffineAnim_8591F30 - .4byte gSpriteAffineAnim_8591EB8 - .4byte gSpriteAffineAnim_8591ED0 - .4byte gSpriteAffineAnim_8591EE8 - .4byte gSpriteAffineAnim_8591F00 - - .align 2 -gUnknown_08591FC8:: @ 8591FC8 - spr_template 0x1300, 0xffff, gOamData_8591D48, gSpriteAnimTable_8591DB0, NULL, gSpriteAffineAnimTable_8591F78, sub_80FBAE4 - - .align 2 -gUnknown_08591FE0:: @ 8591FE0 - spr_template 0x1300, 0xffff, gOamData_8591D50, gSpriteAnimTable_8591DB4, NULL, gSpriteAffineAnimTable_8591F78, sub_80FBAE4 - -gUnknown_08591FF8:: @ 8591FF8 - .byte 0xff, 0xff, 0xff, 0xff, 0x27, 0x26, 0x12, 0x13, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff - -gUnknown_08592008:: @ 8592008 - .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x16, 0x22, 0x23, 0xff, 0xff, 0xff, 0xff - -gUnknown_08592018:: @ 8592018 - .byte 0xff, 0x11, 0xff, 0xff, 0xff, 0x10, 0xff, 0xff, 0xff, 0x24, 0xff, 0xff, 0xff, 0x25, 0xff, 0xff - -gUnknown_08592028:: @ 8592028 - .byte 0xff, 0xff, 0x21, 0xff, 0xff, 0xff, 0x20, 0xff, 0xff, 0xff, 0x14, 0xff, 0xff, 0xff, 0x15, 0xff - -gUnknown_08592038:: @ 8592038 - .byte 0x00, 0xff, 0x00, 0x00, 0x01, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xfe, 0xff, 0x00, 0x00 - -gUnknown_08592058:: @ 8592058 - .byte 0xff, 0xff, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x01, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00 - -gUnknown_08592078:: @ 8592078 - .byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00 - .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00 - diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 3f9518722..4d4c3732d 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -5,7 +5,7 @@ DewfordTown_Hall_EventScript_1FD4D0:: @ 81FD4D0 lock faceplayer call DewfordTown_Hall_EventScript_271E8B - special sub_81229C8 + special TrendyPhraseIsOld compare VAR_RESULT, 1 goto_eq DewfordTown_Hall_EventScript_1FD4EF msgbox DewfordTown_Hall_Text_1FD818, 4 @@ -87,7 +87,7 @@ DewfordTown_Hall_EventScript_1FD590:: @ 81FD590 DewfordTown_Hall_EventScript_1FD5A0:: @ 81FD5A0 lockall call DewfordTown_Hall_EventScript_271E8B - special sub_8122A30 + special GetDewfordHallPaintingNameIndex switch VAR_RESULT case 0, DewfordTown_Hall_EventScript_1FD607 case 4, DewfordTown_Hall_EventScript_1FD607 @@ -133,7 +133,7 @@ DewfordTown_Hall_EventScript_1FD63B:: @ 81FD63B DewfordTown_Hall_EventScript_1FD647:: @ 81FD647 call DewfordTown_Hall_EventScript_271E8B - special sub_8122A30 + special GetDewfordHallPaintingNameIndex switch VAR_RESULT case 0, DewfordTown_Hall_EventScript_1FD6AD case 1, DewfordTown_Hall_EventScript_1FD6AD diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 01ce60717..b8b800286 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -4,7 +4,7 @@ FortreeCity_Gym_MapScripts:: @ 82165AB .byte 0 FortreeCity_Gym_MapScript1_2165B6: @ 82165B6 - special sub_80FBE90 + special RotatingGate_InitPuzzle end FortreeCity_Gym_MapScript2_2165BA: @ 82165BA diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/scripts/maps/Route110_TrickHousePuzzle6.inc index 6b13cf8cb..0a0e025af 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle6.inc @@ -4,7 +4,7 @@ Route110_TrickHousePuzzle6_MapScripts:: @ 826DDA7 .byte 0 Route110_TrickHousePuzzle6_MapScript1_26DDB2: @ 826DDB2 - special sub_80FBE90 + special RotatingGate_InitPuzzle end Route110_TrickHousePuzzle6_MapScript2_26DDB6: @ 826DDB6 diff --git a/data/specials.inc b/data/specials.inc index ab1a441ff..2290c9d21 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -137,10 +137,10 @@ gSpecials:: @ 81DBA64 def_special TV_PutNameRaterShowOnTheAirIfNicnkameChanged def_special TV_CopyNicknameToStringVar1AndEnsureTerminated def_special TV_CheckMonOTIDEqualsPlayerID - def_special sub_8122998 - def_special sub_81229C8 + def_special BufferTrendyPhraseString + def_special TrendyPhraseIsOld def_special sub_811EF6C - def_special sub_8122A30 + def_special GetDewfordHallPaintingNameIndex def_special sub_80D6EDC def_special CalculatePlayerPartyCount def_special CountPartyNonEggMons @@ -212,7 +212,7 @@ gSpecials:: @ 81DBA64 def_special SubtractMoneyFromVar0x8005 def_special sub_80F972C def_special sp0C8_whiteout_maybe - def_special sub_80FBE90 + def_special RotatingGate_InitPuzzle def_special RotatingGate_InitPuzzleAndGraphics def_special SetSSTidalFlag def_special ResetSSTidalFlag |