diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_anim_scripts.s | 2 | ||||
| -rw-r--r-- | data/battle_anims.s | 132 | ||||
| -rw-r--r-- | data/battle_interface.s | 180 | ||||
| -rw-r--r-- | data/clear_save_data_screen.s | 17 | ||||
| -rw-r--r-- | data/cute_sketch.s | 2 | ||||
| -rw-r--r-- | data/decoration.s | 86 | ||||
| -rw-r--r-- | data/event_scripts.s | 3 | ||||
| -rw-r--r-- | data/graphics.s | 119 | ||||
| -rw-r--r-- | data/graphics/decorations/decoration_graphics.inc | 252 | ||||
| -rw-r--r-- | data/mail.s | 26 | ||||
| -rw-r--r-- | data/pokemon_summary_screen.s | 5 | ||||
| -rw-r--r-- | data/rom_8525F58.s | 57 | ||||
| -rw-r--r-- | data/specials.inc | 537 | ||||
| -rw-r--r-- | data/strings.s | 28 | ||||
| -rw-r--r-- | data/walda_phrase.s | 7 |
15 files changed, 986 insertions, 467 deletions
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index b657ae179..e97943840 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -6,7 +6,7 @@ gUnknown_082C8D64:: @ 82C8D64 .incbin "baserom.gba", 0x2c8d64, 0x8 -gUnknown_082C8D6C:: @ 82C8D6C +gBattleAnims_Moves:: @ 82C8D6C .incbin "baserom.gba", 0x2c8d6c, 0x590 gUnknown_082C92FC:: @ 82C92FC diff --git a/data/battle_anims.s b/data/battle_anims.s index 13e1bdc2f..082a86fa1 100644 --- a/data/battle_anims.s +++ b/data/battle_anims.s @@ -294,7 +294,7 @@ gUnknown_08524B3C:: @ 8524B3C .byte 0x00, 0x87, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00 .align 2 -gUnknown_08524B44:: @ 8524B44 +gBattleAnimPicTable:: @ 8524B44 obj_tiles 0x08c02538, 0x0200, 0x2710 obj_tiles 0x08c1c6e0, 0x0300, 0x2711 obj_tiles 0x08c20784, 0x0200, 0x2712 @@ -353,9 +353,6 @@ gUnknown_08524B44:: @ 8524B44 obj_tiles 0x08c0a8bc, 0x0200, 0x2747 obj_tiles 0x08c0a3ec, 0x1000, 0x2748 obj_tiles 0x08c0a980, 0x0180, 0x2749 - - .align 2 -gUnknown_08524D14:: @ 8524D14 obj_tiles 0x08c0aa2c, 0x0c00, 0x274a obj_tiles 0x08c0aebc, 0x0100, 0x274b obj_tiles 0x08c0af38, 0x0040, 0x274c @@ -434,9 +431,6 @@ gUnknown_08524D14:: @ 8524D14 obj_tiles 0x08c14b78, 0x0100, 0x2795 obj_tiles 0x08c14c1c, 0x0200, 0x2796 obj_tiles 0x08c1a3a0, 0x0200, 0x2797 - - .align 2 -gUnknown_08524F84:: @ 8524F84 obj_tiles 0x08c1a540, 0x0020, 0x2798 obj_tiles 0x08c1a58c, 0x0a00, 0x2799 obj_tiles 0x08c1ab40, 0x0800, 0x279a @@ -534,9 +528,6 @@ gUnknown_08524F84:: @ 8524F84 obj_tiles 0x08c258b8, 0x0800, 0x27f6 obj_tiles 0x08c28394, 0x0380, 0x27f7 obj_tiles 0x08c27e34, 0x0800, 0x27f8 - - .align 2 -gUnknown_0852528C:: @ 852528C obj_tiles 0x08c28564, 0x00c0, 0x27f9 obj_tiles 0x08c28610, 0x0800, 0x27fa obj_tiles 0x08c28880, 0x0060, 0x27fb @@ -573,9 +564,6 @@ gUnknown_0852528C:: @ 852528C obj_tiles 0x08d93b9c, 0x0080, 0x281a obj_tiles 0x08c2407c, 0x0800, 0x281b obj_tiles 0x08d8ea54, 0x0020, 0x281c - - .align 2 -gUnknown_085253AC:: @ 85253AC obj_tiles 0x08d8ef2c, 0x0080, 0x281d obj_tiles 0x08dba378, 0x0400, 0x281e obj_tiles 0x08dba4b8, 0x0080, 0x281f @@ -597,6 +585,8 @@ gUnknown_085253AC:: @ 85253AC obj_tiles 0x08c0a3ec, 0x1000, 0x282f obj_tiles 0x08c1bee4, 0x0100, 0x2830 + .align 2 +gBattleAnimPaletteTable:: @ 852544C obj_pal 0x08c028cc, 0x2710 obj_pal 0x08c1c794, 0x2711 obj_pal 0x08c20868, 0x2712 @@ -655,9 +645,6 @@ gUnknown_085253AC:: @ 85253AC obj_pal 0x08c09fd8, 0x2747 obj_pal 0x08c0a894, 0x2748 obj_pal 0x08c0aa08, 0x2749 - - .align 2 -gUnknown_0852561C:: @ 852561C obj_pal 0x08c0ae94, 0x274a obj_pal 0x08c0af1c, 0x274b obj_pal 0x08c0af60, 0x274c @@ -736,9 +723,6 @@ gUnknown_0852561C:: @ 852561C obj_pal 0x08c14bf4, 0x2795 obj_pal 0x08c14bf4, 0x2796 obj_pal 0x08c1a478, 0x2797 - - .align 2 -gUnknown_0852588C:: @ 852588C obj_pal 0x08c1a564, 0x2798 obj_pal 0x08c1a478, 0x2799 obj_pal 0x08c1a478, 0x279a @@ -836,9 +820,6 @@ gUnknown_0852588C:: @ 852588C obj_pal 0x08c25890, 0x27f6 obj_pal 0x08c2836c, 0x27f7 obj_pal 0x08c2836c, 0x27f8 - - .align 2 -gUnknown_08525B94:: @ 8525B94 obj_pal 0x08c285e8, 0x27f9 obj_pal 0x08c287d0, 0x27fa obj_pal 0x08c288d0, 0x27fb @@ -875,9 +856,6 @@ gUnknown_08525B94:: @ 8525B94 obj_pal 0x08d93bdc, 0x281a obj_pal 0x08d93bf4, 0x281b obj_pal 0x08d93c0c, 0x281c - - .align 2 -gUnknown_08525CB4:: @ 8525CB4 obj_pal 0x08d8ef80, 0x281d obj_pal 0x08dba35c, 0x281e obj_pal 0x08dba4a0, 0x281f @@ -900,7 +878,7 @@ gUnknown_08525CB4:: @ 8525CB4 obj_pal 0x08c1bf5c, 0x2830 .align 2 -gUnknown_08525D54:: @ 8525D54 +gBattleAnimBackgroundTable:: @ 8525D54 .4byte 0x08c1c844, 0x08c1ce3c, 0x08c1ce5c .4byte 0x08c1c844, 0x08c1ce3c, 0x08c1ce5c .4byte 0x08d90074, 0x08d90d3c, 0x08d90d58 @@ -928,105 +906,3 @@ gUnknown_08525D54:: @ 8525D54 .4byte 0x08c25bec, 0x08d91074, 0x08c26958 .4byte 0x08c25bec, 0x08d91074, 0x08c26e54 .4byte 0x08c25bec, 0x08d91074, 0x08c27324 - - .align 2 -gUnknown_08525E98:: @ 8525E98 - .4byte ma00_load_graphics - .4byte ma01_080728D0 - .4byte ma02_instanciate_template - .4byte sub_80A3ECC - .4byte ma04_wait_countdown - .4byte sub_80A3F88 - .4byte nullsub_6 - .4byte nullsub_7 - .4byte sub_80A3FC4 - .4byte ma09_play_sound - .4byte sub_80A41D8 - .4byte ma0B_0807324C - .4byte ma0C_set_BLDCNT_to_x3F40_and_BLDALPHA_to_argument - .4byte ma0D_reset_BLDCNT_and_BLDALPHA - .4byte ma0E_call - .4byte sub_80A4D00 - .4byte ma10_080736AC - .4byte ma11_if_else - .4byte ma12_cond_if - .4byte ma13_goto - .4byte ma14_load_background - .4byte ma15_load_battle_screen_elements - .4byte ma16_wait_for_battle_screen_elements_s2 - .4byte sub_80A5124 - .4byte ma18_load_background_probably - .4byte ma19_08073BC8 - .4byte ma1A_8073C00 - .4byte ma1B_8073C2C - .4byte ma1C_8073ED0 - .4byte ma1D_08073FB4 - .4byte ma1E_set_BLDCNT - .4byte sub_80A57F8 - .4byte ma20_wait_for_something - .4byte ma21_08074164 - .4byte sub_80A4A18 - .4byte ma23_8073484 - .4byte sub_80A5944 - .4byte sub_80A4E5C - .4byte sub_80A5508 - .4byte sub_80A559C - .4byte sub_80A5984 - .4byte sub_80A59DC - .4byte sub_80A5A0C - .4byte ma2B_make_side_invisible - .4byte ma2C_make_side_visible - .4byte sub_80A5AFC - .4byte sub_80A5BAC - .4byte ma2F_stop_music - - .align 2 -gUnknown_08525F58:: @ 8525F58 - .byte 0x48, 0x50, 0x00, 0x00, 0xb0, 0x28, 0x00, 0x00 - .byte 0x30, 0x28, 0x00, 0x00, 0x70, 0x50, 0x00, 0x00 - .byte 0x20, 0x50, 0x00, 0x00, 0xc8, 0x28, 0x00, 0x00 - .byte 0x5a, 0x58, 0x00, 0x00, 0x98, 0x20, 0x00, 0x00 - - .align 2 -gCastformFrontSpriteCoords:: @ 8525F78 - .byte 0x44, 0x11, 0x00, 0x00, 0x66, 0x09, 0x00, 0x00 - .byte 0x46, 0x09, 0x00, 0x00, 0x86, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08525F88:: @ 8525F88 - .byte 0x0d, 0x0e, 0x0d, 0x0d - - .align 2 -gUnknown_08525F8C:: @ 8525F8C - .byte 0x00, 0x00, 0x00, 0x00 - - .align 2 -gUnknown_08525F90:: @ 8525F90 - spr_template 0xd755, 0xd755, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - spr_template 0xd756, 0xd756, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_08525FC0:: @ 8525FC0 - obj_tiles gMiscBlank_Gfx, 0x0800, 0xd755 - obj_tiles gMiscBlank_Gfx, 0x0800, 0xd756 - - .align 2 -@ the mother of all baserom includes - .incbin "baserom.gba", 0x525fd0, 0x18f60 - - .align 2 -gUnknown_0853EF30:: @ 853EF30 - .byte 0xf0, 0xf0, 0x0c, 0x80, 0xf0, 0x30, 0x0d, 0x84, 0x30, 0xf0, 0x0e, 0x86, 0x30, 0x30, 0x08, 0x88 - - .align 2 -gUnknown_0853EF40:: @ 853EF40 - .4byte 0x00000004, gUnknown_0853EF30 - - .align 2 -gUnknown_0853EF48:: @ 853EF48 - spr_template 0x271a, 0x271a, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_0853EF60:: @ 853EF60 - spr_template 0x2798, 0x2798, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9E44 - diff --git a/data/battle_interface.s b/data/battle_interface.s deleted file mode 100644 index 766f34752..000000000 --- a/data/battle_interface.s +++ /dev/null @@ -1,180 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -gUnknown_0832C138:: @ 832C138 - .byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x04, 0x00, 0x00 - - .align 2 -gUnknown_0832C140:: @ 832C140 - spr_template 0xd6ff, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_0832C158:: @ 832C158 - spr_template 0xd700, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_0832C170:: @ 832C170 - spr_template 0xd701, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_0832C188:: @ 832C188 - spr_template 0xd702, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_0832C1A0:: @ 832C1A0 - spr_template 0xd70b, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_0832C1B8:: @ 832C1B8 - .byte 0x00, 0x40, 0x00, 0x40, 0x00, 0x04, 0x00, 0x00 - - .align 2 -gUnknown_0832C1C0:: @ 832C1C0 - spr_template 0xd704, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4 - - .align 2 -gUnknown_0832C1D8:: @ 832C1D8 - spr_template 0xd705, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4 - - .align 2 -gUnknown_0832C1F0:: @ 832C1F0 - spr_template 0xd706, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4 - - .align 2 -gUnknown_0832C208:: @ 832C208 - spr_template 0xd707, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4 - - .align 2 -gUnknown_0832C220:: @ 832C220 - .byte 0xf0, 0x00, 0x0d, 0x40, 0x30, 0x00, 0x08, 0x42 - .byte 0xf0, 0x20, 0x05, 0x43, 0x10, 0x20, 0x45, 0x43 - .byte 0x30, 0x20, 0x85, 0x43 - - .align 2 -gUnknown_0832C234:: @ 832C234 - .byte 0xf0, 0x00, 0x0d, 0x44, 0x30, 0x00, 0x08, 0x46 - .byte 0xf0, 0x20, 0x05, 0x47, 0x10, 0x20, 0x45, 0x47 - .byte 0x30, 0x20, 0x85, 0x47 - - .align 2 -gUnknown_0832C248:: @ 832C248 - .byte 0xf0, 0x00, 0x0d, 0x40, 0x30, 0x00, 0x08, 0x42 - - .align 2 -gUnknown_0832C250:: @ 832C250 - .byte 0xf0, 0x00, 0x0d, 0x40, 0x30, 0x00, 0x08, 0x42 - - .align 2 -gUnknown_0832C258:: @ 832C258 - .byte 0xf0, 0x00, 0x05, 0x40, 0x10, 0x00, 0x45, 0x40 - - .align 2 -gUnknown_0832C260:: @ 832C260 - .byte 0xf0, 0x00, 0x05, 0x40, 0x10, 0x00, 0x45, 0x40 - .byte 0xe0, 0x00, 0x80, 0x40 - - .align 2 -gUnknown_0832C26C:: @ 832C26C - .4byte 0x00000005, gUnknown_0832C220 - .4byte 0x00000002, gUnknown_0832C248 - .4byte 0x00000005, gUnknown_0832C234 - .4byte 0x00000002, gUnknown_0832C250 - - .align 2 -gUnknown_0832C28C:: @ 832C28C - .4byte 0x00000002, gUnknown_0832C258 - .4byte 0x00000003, gUnknown_0832C260 - - .align 2 -gUnknown_0832C29C:: @ 832C29C - .byte 0xa0, 0x00, 0x05, 0x40, 0xc0, 0x00, 0x45, 0x40 - .byte 0xe0, 0x00, 0x85, 0x40, 0x00, 0x00, 0xc5, 0x40 - - .align 2 -gUnknown_0832C2AC:: @ 832C2AC - .byte 0xa0, 0x00, 0x05, 0x40, 0xc0, 0x00, 0x45, 0x40 - .byte 0xe0, 0x00, 0x85, 0x40, 0x00, 0x00, 0x85, 0x40 - .byte 0x20, 0x00, 0x85, 0x40, 0x40, 0x00, 0xc5, 0x40 - - .align 2 -gUnknown_0832C2C4:: @ 832C2C4 - .4byte 0x00000004, gUnknown_0832C29C - - .align 2 -gUnknown_0832C2CC:: @ 832C2CC - .4byte 0x00000006, gUnknown_0832C2AC - - .align 2 -gUnknown_0832C2D4:: @ 832C2D4 - .2byte 0x0000, 0x0000, 0x3333, 0x3333, 0x4444, 0x4444, 0x2222, 0x2222 - .2byte 0x7777, 0x7777, 0x7777, 0x7777, 0x7777, 0x7777, 0x7777, 0x7777 - - .2byte 0x0000, 0x0000, 0x3333, 0x3333, 0x4444, 0x4444, 0x2222, 0x2222 - .2byte 0x7777, 0x7777, 0x7777, 0x7717, 0x1777, 0x7177, 0x7777, 0x7771 - - .2byte 0x0000, 0x0000, 0x3333, 0x3333, 0x4444, 0x4444, 0x2222, 0x2222 - .2byte 0x7777, 0x7777, 0x7777, 0x7111, 0x7777, 0x7171, 0x7777, 0x7111 - - .align 2 -gUnknown_0832C334:: @ 832C334 - obj_tiles gBattleInterface_BallStatusBarGfx, 0x0200, 0xd70c - - .align 2 -gUnknown_0832C33C:: @ 832C33C - obj_pal gBattleInterface_BallStatusBarPal, 0xd710 - - .align 2 -gUnknown_0832C344:: @ 832C344 - obj_pal gBattleInterface_BallDisplayPal, 0xd712 - - .align 2 -gUnknown_0832C34C:: @ 832C34C - obj_tiles gBattleInterface_BallDisplayGfx, 0x0080, 0xd714 - - .align 2 -gUnknown_0832C354:: @ 832C354 - .byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x04, 0x00, 0x00 - - .align 2 -gUnknown_0832C35C:: @ 832C35C - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00 - - .align 2 -gUnknown_0832C364:: @ 832C364 - spr_template 0xd70c, 0xd710, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8074078 - - .align 2 -gUnknown_0832C37C:: @ 832C37C - spr_template 0xd70c, 0xd710, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8074078 - - .align 2 -gUnknown_0832C394:: @ 832C394 - spr_template 0xd714, 0xd712, gUnknown_0832C35C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80740C4 - - .align 2 -gUnknown_0832C3AC:: @ 832C3AC - spr_template 0xd714, 0xd712, gUnknown_0832C35C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80740C4 - - .align 2 -gUnknown_0832C3C4:: @ 832C3C4 - .byte 0xfc, 0x01, 0x01, 0xfc, 0x02, 0x02, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .align 2 -gUnknown_0832C3D8:: @ 832C3D8 - .byte 0xfc, 0x01, 0x01, 0xfc, 0x02, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .align 2 -gUnknown_0832C3EC:: @ 832C3EC - .byte 0x98, 0x61, 0xf7, 0x0e, 0x94, 0x46, 0xd1, 0x72 - .byte 0xdc, 0x29, 0x00, 0x00 - - .align 2 -gUnknown_0832C3F8:: @ 832C3F8 - .byte 0x00, 0x00, 0x00, 0x08, 0x02, 0x00, 0x00, 0x00 diff --git a/data/clear_save_data_screen.s b/data/clear_save_data_screen.s deleted file mode 100644 index 3abf9bf6d..000000000 --- a/data/clear_save_data_screen.s +++ /dev/null @@ -1,17 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_085F06C0:: @ 85F06C0 - .4byte 0x000001f0, 0x000011e3 - - .align 2 -gUnknown_085F06C8:: @ 85F06C8 - window_template 0x00, 0x03, 0x0f, 0x1a, 0x04, 0x0f, 0x000b - window_template_terminator - - .align 2 -gUnknown_085F06D8:: @ 85F06D8 - window_template 0x00, 0x03, 0x02, 0x05, 0x04, 0x0f, 0x0073 diff --git a/data/cute_sketch.s b/data/cute_sketch.s index ebdf1e39d..8a8ee1481 100644 --- a/data/cute_sketch.s +++ b/data/cute_sketch.s @@ -5,4 +5,4 @@ .align 2, 0 gUnknown_085A1F94:: @ 85A1F94 - .incbin "baserom.gba", 0x5a1f94, 0x3c74 + .incbin "baserom.gba", 0x5a1f94, 0x2580 diff --git a/data/decoration.s b/data/decoration.s deleted file mode 100644 index de4478f8d..000000000 --- a/data/decoration.s +++ /dev/null @@ -1,86 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -gDecorations:: @ 85A5C08 - .incbin "baserom.gba", 0x5a5c08, 0x1c - -gUnknown_085A5C24:: @ 85A5C24 - .incbin "baserom.gba", 0x5a5c24, 0xf04 - -gUnknown_085A6B28:: @ 85A6B28 - .incbin "baserom.gba", 0x5a6b28, 0x20 - -gUnknown_085A6B48:: @ 85A6B48 - .incbin "baserom.gba", 0x5a6b48, 0x20 - -gUnknown_085A6B68:: @ 85A6B68 - .incbin "baserom.gba", 0x5a6b68, 0x10 - -gUnknown_085A6B78:: @ 85A6B78 - .incbin "baserom.gba", 0x5a6b78, 0x18 - -gUnknown_085A6B90:: @ 85A6B90 - .incbin "baserom.gba", 0x5a6b90, 0x20 - -gUnknown_085A6BB0:: @ 85A6BB0 - .incbin "baserom.gba", 0x5a6bb0, 0x20 - -gUnknown_085A6BD0:: @ 85A6BD0 - .incbin "baserom.gba", 0x5a6bd0, 0x18 - -gUnknown_085A6BE8:: @ 85A6BE8 - .incbin "baserom.gba", 0x5a6be8, 0x5c8 - -gUnknown_085A71B0:: @ 85A71B0 - .incbin "baserom.gba", 0x5a71b0, 0xa0 - -gUnknown_085A7250:: @ 85A7250 - .incbin "baserom.gba", 0x5a7250, 0x3c - -gUnknown_085A728C:: @ 85A728C - .incbin "baserom.gba", 0x5a728c, 0x18 - -gUnknown_085A72A4:: @ 85A72A4 - .incbin "baserom.gba", 0x5a72a4, 0x18 - -gUnknown_085A72BC:: @ 85A72BC - .incbin "baserom.gba", 0x5a72bc, 0x8 - -gUnknown_085A72C4:: @ 85A72C4 - .incbin "baserom.gba", 0x5a72c4, 0x8 - -gUnknown_085A72CC:: @ 85A72CC - .incbin "baserom.gba", 0x5a72cc, 0x8 - -gUnknown_085A72D4:: @ 85A72D4 - .incbin "baserom.gba", 0x5a72d4, 0x10 - -gUnknown_085A72E4:: @ 85A72E4 - .incbin "baserom.gba", 0x5a72e4, 0x8 - -gUnknown_085A72EC:: @ 85A72EC - .incbin "baserom.gba", 0x5a72ec, 0x8 - -gUnknown_085A72F4:: @ 85A72F4 - .incbin "baserom.gba", 0x5a72f4, 0x54 - -gUnknown_085A7348:: @ 85A7348 - .incbin "baserom.gba", 0x5a7348, 0x8 - -gUnknown_085A7350:: @ 85A7350 - .incbin "baserom.gba", 0x5a7350, 0x88 - -gUnknown_085A73D8:: @ 85A73D8 - .incbin "baserom.gba", 0x5a73d8, 0x8 - -gUnknown_085A73E0:: @ 85A73E0 - .incbin "baserom.gba", 0x5a73e0, 0x24 - -gUnknown_085A7404:: @ 85A7404 - .incbin "baserom.gba", 0x5a7404, 0x18 - -gUnknown_085A741C:: @ 85A741C - .incbin "baserom.gba", 0x5a741c, 0x8 diff --git a/data/event_scripts.s b/data/event_scripts.s index 05cd014dd..2383907ee 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -14,8 +14,7 @@ gScriptCmdTableEnd:: @ 81DBA08 gSpecialVars:: @ 81DBA0C .incbin "baserom.gba", 0x1dba0c, 0x58 -gSpecials:: @ 81DBA64 - .incbin "baserom.gba", 0x1dba64, 0x83c + .include "data/specials.inc" gStdScripts:: @ 81DC2A0 .incbin "baserom.gba", 0x1dc2a0, 0x2c diff --git a/data/graphics.s b/data/graphics.s index e1b76565a..e89177a1d 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -39,7 +39,7 @@ gBattleInterface_BallDisplayPal:: @ 8C11BBC .incbin "graphics/battle_interface/ball_display.gbapal" .align 2 -gUnknown_08C11BDC:: @ 8C11BDC +gHealthboxElementsGfxTable:: @ 8C11BDC .incbin "baserom.gba", 0xc11bdc, 0x840 .align 2 @@ -881,7 +881,10 @@ gUnknown_08DAAFEC:: @ 8DAAFEC .include "data/graphics/items/item_graphics.inc" @ 8DB7AA0 - .incbin "baserom.gba", 0xdb7aa0, 0x2a78 + .include "data/graphics/decorations/decoration_graphics.inc" + +@ 8DBA14C + .incbin "baserom.gba", 0xdba14c, 0x3cc gUnknown_08DBA518:: @ 8DBA518 .incbin "baserom.gba", 0xdba518, 0x80 @@ -910,8 +913,116 @@ gCableCarCord_Gfx:: @ 8DBC2C0 gUnknown_08DBC2E8:: @ 8DBC2E8 .incbin "baserom.gba", 0xdbc2e8, 0x72c -gUnknown_08DBCA14:: @ 8DBCA14 - .incbin "baserom.gba", 0xdbca14, 0x3d00 +gUnknown_08DBCA14:: @ 0x08DBCA14 + .incbin "baserom.gba", 0xdbca14, 0x1e04 + +gUnknown_08DBE818:: @ 0x08DBE818 + .incbin "baserom.gba", 0xdbe818, 0x20 + +gUnknown_08DBE838:: @ 0x08DBE838 + .incbin "baserom.gba", 0xdbe838, 0x20 + +gUnknown_08DBE858:: @ 0x08DBE858 + .incbin "baserom.gba", 0xdbe858, 0x20 + +gUnknown_08DBE878:: @ 0x08DBE878 + .incbin "baserom.gba", 0xdbe878, 0x20 + +gUnknown_08DBE898:: @ 0x08DBE898 + .incbin "baserom.gba", 0xdbe898, 0x20 + +gUnknown_08DBE8B8:: @ 0x08DBE8B8 + .incbin "baserom.gba", 0xdbe8b8, 0x20 + +gUnknown_08DBE8D8:: @ 0x08DBE8D8 + .incbin "baserom.gba", 0xdbe8d8, 0x20 + +gUnknown_08DBE8F8:: @ 0x08DBE8F8 + .incbin "baserom.gba", 0xdbe8f8, 0x20 + +gUnknown_08DBE918:: @ 0x08DBE918 + .incbin "baserom.gba", 0xdbe918, 0x20 + +gUnknown_08DBE938:: @ 0x08DBE938 + .incbin "baserom.gba", 0xdbe938, 0x20 + +gUnknown_08DBE958:: @ 0x08DBE958 + .incbin "baserom.gba", 0xdbe958, 0x20 + +gUnknown_08DBE978:: @ 0x08DBE978 + .incbin "baserom.gba", 0xdbe978, 0x20 + +gUnknown_08DBE998:: @ 0x08DBE998 + .incbin "baserom.gba", 0xdbe998, 0x1a0 + +gUnknown_08DBEB38:: @ 0x08DBEB38 + .incbin "baserom.gba", 0xdbeb38, 0x13c + +gUnknown_08DBEC74:: @ 0x08DBEC74 + .incbin "baserom.gba", 0xdbec74, 0x210 + +gUnknown_08DBEE84:: @ 0x08DBEE84 + .incbin "baserom.gba", 0xdbee84, 0xd8 + +gUnknown_08DBEF5C:: @ 0x08DBEF5C + .incbin "baserom.gba", 0xdbef5c, 0x1f8 + +gUnknown_08DBF154:: @ 0x08DBF154 + .incbin "baserom.gba", 0xdbf154, 0x180 + +gUnknown_08DBF2D4:: @ 0x08DBF2D4 + .incbin "baserom.gba", 0xdbf2d4, 0xa8 + +gUnknown_08DBF37C:: @ 0x08DBF37C + .incbin "baserom.gba", 0xdbf37c, 0x190 + +gUnknown_08DBF50C:: @ 0x08DBF50C + .incbin "baserom.gba", 0xdbf50c, 0x140 + +gUnknown_08DBF64C:: @ 0x08DBF64C + .incbin "baserom.gba", 0xdbf64c, 0x168 + +gUnknown_08DBF7B4:: @ 0x08DBF7B4 + .incbin "baserom.gba", 0xdbf7b4, 0x150 + +gUnknown_08DBF904:: @ 0x08DBF904 + .incbin "baserom.gba", 0xdbf904, 0x2a0 + +gUnknown_08DBFBA4:: @ 0x08DBFBA4 + .incbin "baserom.gba", 0xdbfba4, 0xd8 + +gUnknown_08DBFC7C:: @ 0x08DBFC7C + .incbin "baserom.gba", 0xdbfc7c, 0xe0 + +gUnknown_08DBFD5C:: @ 0x08DBFD5C + .incbin "baserom.gba", 0xdbfd5c, 0x10c + +gUnknown_08DBFE68:: @ 0x08DBFE68 + .incbin "baserom.gba", 0xdbfe68, 0xdc + +gUnknown_08DBFF44:: @ 0x08DBFF44 + .incbin "baserom.gba", 0xdbff44, 0xf0 + +gUnknown_08DC0034:: @ 0x08DC0034 + .incbin "baserom.gba", 0xdc0034, 0xe0 + +gUnknown_08DC0114:: @ 0x08DC0114 + .incbin "baserom.gba", 0xdc0114, 0xe0 + +gUnknown_08DC01F4:: @ 0x08DC01F4 + .incbin "baserom.gba", 0xdc01f4, 0x10c + +gUnknown_08DC0300:: @ 0x08DC0300 + .incbin "baserom.gba", 0xdc0300, 0xf0 + +gUnknown_08DC03F0:: @ 0x08DC03F0 + .incbin "baserom.gba", 0xdc03f0, 0xf8 + +gUnknown_08DC04E8:: @ 0x08DC04E8 + .incbin "baserom.gba", 0xdc04e8, 0x118 + +gUnknown_08DC0600:: @ 0x08DC0600 + .incbin "baserom.gba", 0xdc0600, 0x114 gUnknown_08DC0714:: @ 8DC0714 .incbin "baserom.gba", 0xdc0714, 0x40 diff --git a/data/graphics/decorations/decoration_graphics.inc b/data/graphics/decorations/decoration_graphics.inc new file mode 100644 index 000000000..c7ea9be70 --- /dev/null +++ b/data/graphics/decorations/decoration_graphics.inc @@ -0,0 +1,252 @@ +gUnknown_08DB7AA0:: + .incbin "graphics/decorations/decor_heavy_desk.4bpp.lz" + +gUnknown_08DB7B34:: + .incbin "graphics/decorations/decor_heavy_desk.gbapal.lz" + +gUnknown_08DB7B5C:: + .incbin "graphics/decorations/decor_ragged_desk.4bpp.lz" + +gUnknown_08DB7BEC:: + .incbin "graphics/decorations/decor_ragged_desk.gbapal.lz" + +gUnknown_08DB7C08:: + .incbin "graphics/decorations/decor_comfort_desk.4bpp.lz" + +gUnknown_08DB7CE8:: + .incbin "graphics/decorations/decor_comfort_desk.gbapal.lz" + +gUnknown_08DB7D08:: + .incbin "graphics/decorations/decor_pretty_desk.4bpp.lz" + +gUnknown_08DB7DCC:: + .incbin "graphics/decorations/decor_pretty_desk.gbapal.lz" + +gUnknown_08DB7DF4:: + .incbin "graphics/decorations/decor_brick_desk.4bpp.lz" + +gUnknown_08DB7EA0:: + .incbin "graphics/decorations/decor_brick_desk.gbapal.lz" + +gUnknown_08DB7EC4:: + .incbin "graphics/decorations/decor_camp_desk.4bpp.lz" + +gUnknown_08DB7F60:: + .incbin "graphics/decorations/decor_camp_desk.gbapal.lz" + +gUnknown_08DB7F7C:: + .incbin "graphics/decorations/decor_hard_desk.4bpp.lz" + +gUnknown_08DB8070:: + .incbin "graphics/decorations/decor_hard_desk.gbapal.lz" + +gUnknown_08DB808C:: + .incbin "graphics/decorations/decor_red_plant.4bpp.lz" + +gUnknown_08DB8138:: + .incbin "graphics/decorations/decor_red_plant.gbapal.lz" + +gUnknown_08DB8160:: + .incbin "graphics/decorations/decor_tropical_plant.4bpp.lz" + +gUnknown_08DB8218:: + .incbin "graphics/decorations/decor_tropical_plant.gbapal.lz" + +gUnknown_08DB823C:: + .incbin "graphics/decorations/decor_pretty_flowers.4bpp.lz" + +gUnknown_08DB8300:: + .incbin "graphics/decorations/decor_pretty_flowers.gbapal.lz" + +gUnknown_08DB8328:: + .incbin "graphics/decorations/decor_colorful_plant.4bpp.lz" + +gUnknown_08DB8430:: + .incbin "graphics/decorations/decor_colorful_plant.gbapal.lz" + +gUnknown_08DB8458:: + .incbin "graphics/decorations/decor_big_plant.4bpp.lz" + +gUnknown_08DB8528:: + .incbin "graphics/decorations/decor_big_plant.gbapal.lz" + +gUnknown_08DB854C:: + .incbin "graphics/decorations/decor_gorgeous_plant.4bpp.lz" + +gUnknown_08DB862C:: + .incbin "graphics/decorations/decor_gorgeous_plant.gbapal.lz" + +gUnknown_08DB8654:: + .incbin "graphics/decorations/decor_red_brick.4bpp.lz" + +gUnknown_08DB86C4:: + .incbin "graphics/decorations/decor_red_brick.gbapal.lz" + +gUnknown_08DB86E0:: + .incbin "graphics/decorations/decor_yellow_brick.4bpp.lz" + +gUnknown_08DB8750:: + .incbin "graphics/decorations/decor_yellow_brick.gbapal.lz" + +gUnknown_08DB876C:: + .incbin "graphics/decorations/decor_blue_brick.4bpp.lz" + +gUnknown_08DB87DC:: + .incbin "graphics/decorations/decor_blue_brick.gbapal.lz" + +gUnknown_08DB87F8:: + .incbin "graphics/decorations/decor_red_tent.4bpp.lz" + +gUnknown_08DB88D8:: + .incbin "graphics/decorations/decor_red_tent.gbapal.lz" + +gUnknown_08DB8900:: + .incbin "graphics/decorations/decor_blue_tent.4bpp.lz" + +gUnknown_08DB89E0:: + .incbin "graphics/decorations/decor_blue_tent.gbapal.lz" + +gUnknown_08DB8A08:: + .incbin "graphics/decorations/decor_solid_board.4bpp.lz" + +gUnknown_08DB8A68:: + .incbin "graphics/decorations/decor_solid_board.gbapal.lz" + +gUnknown_08DB8A84:: + .incbin "graphics/decorations/decor_slide.4bpp.lz" + +gUnknown_08DB8B40:: + .incbin "graphics/decorations/decor_slide.gbapal.lz" + +gUnknown_08DB8B68:: + .incbin "graphics/decorations/decor_tire.4bpp.lz" + +gUnknown_08DB8C40:: + .incbin "graphics/decorations/decor_tire.gbapal.lz" + +gUnknown_08DB8C5C:: + .incbin "graphics/decorations/decor_stand.4bpp.lz" + +gUnknown_08DB8CF4:: + .incbin "graphics/decorations/decor_stand.gbapal.lz" + +gUnknown_08DB8D18:: + .incbin "graphics/decorations/decor_breakable_door.4bpp.lz" + +gUnknown_08DB8DB0:: + .incbin "graphics/decorations/decor_breakable_door.gbapal.lz" + +gUnknown_08DB8DD4:: + .incbin "graphics/decorations/decor_sand_ornament.4bpp.lz" + +gUnknown_08DB8E80:: + .incbin "graphics/decorations/decor_sand_ornament.gbapal.lz" + +gUnknown_08DB8EA0:: + .incbin "graphics/decorations/decor_glass_ornament.4bpp.lz" + +gUnknown_08DB8F58:: + .incbin "graphics/decorations/decor_glass_ornament.gbapal.lz" + +gUnknown_08DB8F7C:: + .incbin "graphics/decorations/decor_surf_mat.4bpp.lz" + +gUnknown_08DB9038:: + .incbin "graphics/decorations/decor_surf_mat.gbapal.lz" + +gUnknown_08DB9058:: + .incbin "graphics/decorations/decor_thunder_mat.4bpp.lz" + +gUnknown_08DB9130:: + .incbin "graphics/decorations/decor_thunder_mat.gbapal.lz" + +gUnknown_08DB9154:: + .incbin "graphics/decorations/decor_fire_blast_mat.4bpp.lz" + +gUnknown_08DB9218:: + .incbin "graphics/decorations/decor_fire_blast_mat.gbapal.lz" + +gUnknown_08DB9234:: + .incbin "graphics/decorations/decor_powder_snow_mat.4bpp.lz" + +gUnknown_08DB92FC:: + .incbin "graphics/decorations/decor_powder_snow_mat.gbapal.lz" + +gUnknown_08DB931C:: + .incbin "graphics/decorations/decor_attract_mat.4bpp.lz" + +gUnknown_08DB93E8:: + .incbin "graphics/decorations/decor_attract_mat.gbapal.lz" + +gUnknown_08DB940C:: + .incbin "graphics/decorations/decor_fissure_mat.4bpp.lz" + +gUnknown_08DB94CC:: + .incbin "graphics/decorations/decor_fissure_mat.gbapal.lz" + +gUnknown_08DB94E8:: + .incbin "graphics/decorations/decor_spikes_mat.4bpp.lz" + +gUnknown_08DB95AC:: + .incbin "graphics/decorations/decor_spikes_mat.gbapal.lz" + +gUnknown_08DB95D0:: + .incbin "graphics/decorations/decor_snorlax_doll.4bpp.lz" + +gUnknown_08DB96C4:: + .incbin "graphics/decorations/decor_snorlax_doll.gbapal.lz" + +gUnknown_08DB96EC:: + .incbin "graphics/decorations/decor_rhydon_doll.4bpp.lz" + +gUnknown_08DB97F4:: + .incbin "graphics/decorations/decor_rhydon_doll.gbapal.lz" + +gUnknown_08DB981C:: + .incbin "graphics/decorations/decor_lapras_doll.4bpp.lz" + +gUnknown_08DB9908:: + .incbin "graphics/decorations/decor_lapras_doll.gbapal.lz" + +gUnknown_08DB9930:: + .incbin "graphics/decorations/decor_venusaur_doll.4bpp.lz" + +gUnknown_08DB9A54:: + .incbin "graphics/decorations/decor_venusaur_doll.gbapal.lz" + +gUnknown_08DB9A7C:: + .incbin "graphics/decorations/decor_charizard_doll.4bpp.lz" + +gUnknown_08DB9B7C:: + .incbin "graphics/decorations/decor_charizard_doll.gbapal.lz" + +gUnknown_08DB9BA4:: + .incbin "graphics/decorations/decor_blastoise_doll.4bpp.lz" + +gUnknown_08DB9CB0:: + .incbin "graphics/decorations/decor_blastoise_doll.gbapal.lz" + +gUnknown_08DB9CD8:: + .incbin "graphics/decorations/decor_wailmer_doll.4bpp.lz" + +gUnknown_08DB9DAC:: + .incbin "graphics/decorations/decor_wailmer_doll.gbapal.lz" + +gUnknown_08DB9DD4:: + .incbin "graphics/decorations/decor_regice_doll.4bpp.lz" + +gUnknown_08DB9EE4:: + .incbin "graphics/decorations/decor_regice_doll.gbapal.lz" + +gUnknown_08DB9F08:: + .incbin "graphics/decorations/decor_regirock_doll.4bpp.lz" + +gUnknown_08DB9FFC:: + .incbin "graphics/decorations/decor_regirock_doll.gbapal.lz" + +gUnknown_08DBA020:: + .incbin "graphics/decorations/decor_registeel_doll.4bpp.lz" + +gUnknown_08DBA12C:: + .incbin "graphics/decorations/decor_registeel_doll.gbapal.lz" + diff --git a/data/mail.s b/data/mail.s deleted file mode 100644 index 5dc8270bc..000000000 --- a/data/mail.s +++ /dev/null @@ -1,26 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -gUnknown_0859F290:: @ 859F290 - .incbin "baserom.gba", 0x59f290, 0xc - -gUnknown_0859F29C:: @ 859F29C - .incbin "baserom.gba", 0x59f29c, 0x10 - -gUnknown_0859F2AC:: @ 859F2AC - .incbin "baserom.gba", 0x59f2ac, 0x4 - -gUnknown_0859F2B0:: @ 859F2B0 - .incbin "baserom.gba", 0x59f2b0, 0x8 - -gUnknown_0859F2B8:: @ 859F2B8 - .incbin "baserom.gba", 0x59f2b8, 0xfc - -gUnknown_0859F3B4:: @ 859F3B4 - .incbin "baserom.gba", 0x59f3b4, 0xa4 - -gUnknown_0859F458:: @ 859F458 - .incbin "baserom.gba", 0x59f458, 0xbc diff --git a/data/pokemon_summary_screen.s b/data/pokemon_summary_screen.s index ac28d47c5..fc1c79096 100644 --- a/data/pokemon_summary_screen.s +++ b/data/pokemon_summary_screen.s @@ -40,7 +40,10 @@ gUnknown_0861CD14:: @ 861CD14 .incbin "baserom.gba", 0x61cd14, 0x18 gUnknown_0861CD2C:: @ 861CD2C - .incbin "baserom.gba", 0x61cd2c, 0xa7 + .incbin "baserom.gba", 0x61cd2c, 0x27 + +gUnknown_0861CD53:: @ 861CD53 + .incbin "baserom.gba", 0x61cd53, 0x80 gUnknown_0861CDD3:: @ 861CDD3 .incbin "baserom.gba", 0x61cdd3, 0x81 diff --git a/data/rom_8525F58.s b/data/rom_8525F58.s new file mode 100644 index 000000000..1cee7112a --- /dev/null +++ b/data/rom_8525F58.s @@ -0,0 +1,57 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 + + +gUnknown_08525F58:: @ 8525F58 + .byte 0x48, 0x50, 0x00, 0x00, 0xb0, 0x28, 0x00, 0x00 + .byte 0x30, 0x28, 0x00, 0x00, 0x70, 0x50, 0x00, 0x00 + .byte 0x20, 0x50, 0x00, 0x00, 0xc8, 0x28, 0x00, 0x00 + .byte 0x5a, 0x58, 0x00, 0x00, 0x98, 0x20, 0x00, 0x00 + + .align 2 +gCastformFrontSpriteCoords:: @ 8525F78 + .byte 0x44, 0x11, 0x00, 0x00, 0x66, 0x09, 0x00, 0x00 + .byte 0x46, 0x09, 0x00, 0x00, 0x86, 0x08, 0x00, 0x00 + + .align 2 +gUnknown_08525F88:: @ 8525F88 + .byte 0x0d, 0x0e, 0x0d, 0x0d + + .align 2 +gUnknown_08525F8C:: @ 8525F8C + .byte 0x00, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_08525F90:: @ 8525F90 + spr_template 0xd755, 0xd755, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0xd756, 0xd756, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gUnknown_08525FC0:: @ 8525FC0 + obj_tiles gMiscBlank_Gfx, 0x0800, 0xd755 + obj_tiles gMiscBlank_Gfx, 0x0800, 0xd756 + + .align 2 +@ the mother of all baserom includes + .incbin "baserom.gba", 0x525fd0, 0x18f60 + + .align 2 +gUnknown_0853EF30:: @ 853EF30 + .byte 0xf0, 0xf0, 0x0c, 0x80, 0xf0, 0x30, 0x0d, 0x84, 0x30, 0xf0, 0x0e, 0x86, 0x30, 0x30, 0x08, 0x88 + + .align 2 +gUnknown_0853EF40:: @ 853EF40 + .4byte 0x00000004, gUnknown_0853EF30 + + .align 2 +gUnknown_0853EF48:: @ 853EF48 + spr_template 0x271a, 0x271a, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gUnknown_0853EF60:: @ 853EF60 + spr_template 0x2798, 0x2798, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9E44 + diff --git a/data/specials.inc b/data/specials.inc new file mode 100644 index 000000000..49f6b91a0 --- /dev/null +++ b/data/specials.inc @@ -0,0 +1,537 @@ +.macro def_special ptr +.set SPECIAL_\ptr, __special__ +.set __special__, __special__ + 1 + .4byte \ptr + .endm + +.set __special__, 0 + .align 2 +gSpecials:: @ 81DBA64 + def_special sp000_heal_pokemon + def_special sub_809D2BC + def_special sub_80AF948 + def_special sub_80AF9F8 + def_special sub_80B36EC + def_special sub_80B371C + def_special sub_80E8E18 + def_special sub_80E8BC8 + def_special sub_80E9068 + def_special sub_80E9A90 + def_special sub_80E9AC0 + def_special sub_80E9744 + def_special sub_80E9BDC + def_special sub_80E9C2C + def_special sub_80E9C74 + def_special sub_80E9C88 + def_special sub_80EA2E4 + def_special sub_80EA354 + def_special sub_80E933C + def_special sub_8127E18 + def_special sub_81297AC + def_special sub_80E8C98 + def_special sub_80E95D4 + def_special sub_8129708 + def_special sub_80E91F8 + def_special sub_80EA30C + def_special sub_80FA57C + def_special sub_80E6BE8 + def_special sub_80B2DA4 + def_special sub_80B2E4C + def_special sub_80B2E74 + def_special sub_80B2EA8 + def_special sub_80097E8 + def_special sub_80B3968 + def_special sub_80B3924 + def_special nullsub_37 + def_special sub_80B3254 + def_special sub_80B2FD8 + def_special sub_8138240 + def_special SpawnLinkPartnerFieldObject + def_special copy_player_party_to_sav1 + def_special copy_player_party_from_sav1 + def_special sub_80F9438 + def_special sp02A_crash_sound + def_special FieldObjectInteractionGetBerryTreeData + def_special FieldObjectInteractionGetBerryName + def_special FieldObjectInteractionGetBerryCountString + def_special Bag_ChooseBerry + def_special FieldObjectInteractionPlantBerryTree + def_special FieldObjectInteractionPickBerryTree + def_special FieldObjectInteractionRemoveBerryTree + def_special FieldObjectInteractionWaterBerryTree + def_special PlayerHasBerries + def_special IsEnigmaBerryValid + def_special sub_80B170C + def_special sub_80B1A14 + def_special special_trainer_unable_to_battle + def_special check_trainer_flag + def_special sub_80B45AC + def_special SetUpTrainerEncounterMusic + def_special sub_80B226C + def_special sub_80B22A0 + def_special sub_80B19EC + def_special sub_80C7578 + def_special sub_80F92F8 + def_special TurnOffTVScreen + def_special DoTVShow + def_special DoPokeNews + def_special special_0x44 + def_special special_0x45 + def_special InterviewBefore + def_special InterviewAfter + def_special sub_80EF8F8 + def_special SetContestCategoryStringVarForInterview + def_special special_0x4a + def_special TV_IsScriptShowKindAlreadyInQueue + def_special CheckForBigMovieOrEmergencyNewsOnTV + def_special GetMomOrDadStringForTVMessage + def_special ResetTVShowState + def_special sub_80F831C + def_special sub_80F84B0 + def_special sub_80F8814 + def_special sub_80F834C + def_special sub_80F8390 + def_special sub_80F8850 + def_special sub_80F82B4 + def_special sub_80F87D8 + def_special sub_80F7F30 + def_special sub_80F8970 + def_special sub_80F8AFC + def_special sub_80F82FC + def_special sub_80F7F7C + def_special sub_80F7FFC + def_special sub_80F8D24 + def_special sub_80F8C7C + def_special sub_80B3000 + def_special sub_809FF80 + def_special sub_80FAFF8 + def_special easy_chat_input_maybe + def_special sub_811EECC + def_special sub_81201DC + def_special sub_81201F4 + def_special sub_8120210 + def_special sub_8120358 + def_special sub_8120374 + def_special sub_812038C + def_special sub_8120340 + def_special sub_8120B5C + def_special sub_81203FC + def_special sub_81203C4 + def_special sub_81213B0 + def_special sub_812139C + def_special sub_8121388 + def_special sub_81213D8 + def_special sub_8121450 + def_special sub_8121424 + def_special sub_8133EC0 + def_special sub_8133CD8 + def_special sub_8133CF4 + def_special sub_8133D2C + def_special sub_8133D8C + def_special sub_8133E38 + def_special GetSeedotSizeRecordInfo + def_special CompareSeedotSize + def_special GetLotadSizeRecordInfo + def_special CompareLotadSize + def_special TV_PutNameRaterShowOnTheAirIfNicnkameChanged + def_special TV_CopyNicknameToStringVar1AndEnsureTerminated + def_special TV_CheckMonOTIDEqualsPlayerID + def_special sub_8122998 + def_special sub_81229C8 + def_special sub_811EF6C + def_special sub_8122A30 + def_special sub_80D6EDC + def_special CalculatePlayerPartyCount + def_special sub_80C7008 + def_special sub_80C70AC + def_special sub_80F88E8 + def_special sub_80F88DC + def_special sub_80F8864 + def_special sub_80F8940 + def_special ShowContestWinner + def_special sub_8138540 + def_special sub_81384F0 + def_special sub_8138AC0 + def_special DrawWholeMapView + def_special sub_8138AD0 + def_special sub_8138750 + def_special sub_81388E4 + def_special sub_8138AA4 + def_special sub_8138AF0 + def_special sub_8138B10 + def_special sub_8138B48 + def_special sub_8138BC8 + def_special sub_8138B8C + def_special sub_814FC9C + def_special sub_8085784 + def_special Special_StartWallClock + def_special Special_ViewWallClock + def_special sub_80B1138 + def_special sub_80B086C + def_special ChangePokemonNickname + def_special sub_81B94B0 + def_special sub_8136EF4 + def_special sub_807FA80 + def_special sub_8142BC8 + def_special sub_813BD60 + def_special sub_813BCA8 + def_special sub_813BDB4 + def_special sub_813BA30 + def_special sub_813BCE8 + def_special sub_813BF60 + def_special sub_813BA60 + def_special sub_813BF7C + def_special rock_smash_wild_pokemon_encounter + def_special GabbyAndTyGetBattleNum + def_special GabbyAndTyAfterInterview + def_special GabbyAndTyBeforeInterview + def_special DoTVShowInSearchOfTrainers + def_special IsTVShowInSearchOfTrainersAiring + def_special GabbyAndTyGetLastQuote + def_special GabbyAndTyGetLastBattleTrivia + def_special GabbyAndTySetScriptVarsToFieldObjectLocalIds + def_special sub_8138B80 + def_special sp0B5_daycare + def_special sp0B6_daycare + def_special sub_8070728 + def_special sp0B8_daycare + def_special sp0B9_daycare_relationship_comment + def_special sub_8070C58 + def_special daycare_send_selected_pokemon + def_special sub_8071330 + def_special sub_80712C0 + def_special sub_806FF30 + def_special sub_806FED8 + def_special sub_806FDC4 + def_special ScriptHatchMon + def_special EggHatch + def_special sub_8071614 + def_special sub_813C4BC + def_special IsEnoughForCostInVar0x8005 + def_special SubtractMoneyFromVar0x8005 + def_special sub_80F972C + def_special sp0C8_whiteout_maybe + def_special sub_80FBE90 + def_special sub_80FBED0 + def_special sub_8137F90 + def_special sub_8137FB0 + def_special EnterSafariMode + def_special ExitSafariMode + def_special GetPokeblockFeederInFront + def_special sub_8135908 + def_special sub_813793C + def_special sub_8137988 + def_special sub_8137A0C + def_special sub_8137A4C + def_special sub_8137C10 + def_special sp0D9_ComputerRelated + def_special sub_8138E20 + def_special sub_8139994 + def_special sub_8138EC0 + def_special sub_8138FAC + def_special sub_81B951C + def_special sub_81B968C + def_special sub_81B9770 + def_special sub_81B9718 + def_special sub_81B96D0 + def_special sub_8160638 + def_special sub_8137EFC + def_special sub_8137D0C + def_special sp0E3_walkrun_bitfield_interpretation + def_special sub_8137E6C + def_special sub_8137F44 + def_special sub_8138C04 + def_special sub_81A1780 + def_special sub_8161F74 + def_special sub_818E9AC + def_special sub_8195960 + def_special sub_8165360 + def_special sub_8163AC4 + def_special sub_81A5238 + def_special sub_81A5E74 + def_special sub_81A703C + def_special sub_81A8E7C + def_special StopMapMusic + def_special sub_81B99B4 + def_special sub_81B9B80 + def_special sub_81B9D08 + def_special sub_80F9490 + def_special sub_81652B4 + def_special sub_8139228 + def_special sub_80F94E8 + def_special sub_816AE58 + def_special sub_816AE98 + def_special sub_8138C94 + def_special sub_807E73C + def_special sub_807EA10 + def_special sub_807F0E4 + def_special sub_807E9D4 + def_special sub_8138BDC + def_special RetrieveLotteryNumber + def_special PickLotteryCornerTicket + def_special ShowBerryBlenderRecordWindow + def_special sub_8138FEC + def_special sub_8138FD4 + def_special sp109_CreatePCMenu + def_special sub_8137C28 + def_special sub_8137CB4 + def_special sub_8139004 + def_special sub_8139030 + def_special sub_813905C + def_special sub_8139088 + def_special sub_81390B4 + def_special sub_80FB7A4 + def_special DoSoftReset + def_special sub_8137734 + def_special sub_8139A78 + def_special nullsub_55 + def_special SpawnScriptFieldObject + def_special RemoveScriptFieldObject + def_special sub_81391D0 + def_special sub_8139200 + def_special CheckRelicanthWailord + def_special ShouldDoBrailleStrengthEffectOld + def_special sub_80B0534 + def_special sub_80B058C + def_special sub_81379F8 + def_special sub_8139238 + def_special sub_8139248 + def_special player_get_direction_lower_nybble + def_special sub_81392AC + def_special sub_81392D4 + def_special sub_81392F8 + def_special sub_8139320 + def_special sub_8139348 + def_special sub_8139370 + def_special sub_81393C8 + def_special sub_8098574 + def_special sub_809859C + def_special InitRoamer + def_special sub_81393FC + def_special sub_81390E0 + def_special sub_80AFC60 + def_special sub_813946C + def_special sub_81394D8 + def_special sub_80E980C + def_special sub_8139530 + def_special DoSealedChamberShakingEffect1 + def_special sub_8139B60 + def_special sub_80FAC78 + def_special sub_8139540 + def_special sub_809E1C8 + def_special sub_8139560 + def_special sub_80B0A18 + def_special sub_80B0934 + def_special sub_80B0A74 + def_special sub_80B16D8 + def_special DoSealedChamberShakingEffect2 + def_special sub_8139634 + def_special sub_80AC81C + def_special sp13E_warp_to_last_warp + def_special sp13F_fall_to_last_warp + def_special sub_80F8D28 + def_special sub_80F8EB8 + def_special sub_8162794 + def_special sub_80B08EC + def_special sub_8139648 + def_special sub_8139668 + def_special sub_80F8FA0 + def_special sub_81396E0 + def_special sub_81B98DC + def_special nullsub_54 + def_special sub_80E9B70 + def_special copy_bags_and_unk_data_from_save_blocks + def_special sub_80B05B4 + def_special sub_8139754 + def_special sub_813970C + def_special sub_80C08E4 + def_special sub_8139770 + def_special sub_81397C4 + def_special sub_81653CC + def_special sub_80F9370 + def_special sub_80F8FE8 + def_special sub_81AFDD0 + def_special sub_80EDCE8 + def_special sub_80EE2CC + def_special sub_80EE72C + def_special sub_80EE7C0 + def_special nullsub_55 + def_special PutFanClubSpecialOnTheAir + def_special sub_80EED10 + def_special sub_80EED34 + def_special sub_80EB1AC + def_special sub_80EBE7C + def_special sub_80EB300 + def_special sub_80EB438 + def_special sub_80EB368 + def_special sub_80EB3D0 + def_special sub_80EB290 + def_special sub_80EB2C8 + def_special sub_80EB56C + def_special sub_80EB9E0 + def_special sub_80EBB28 + def_special sub_80EB498 + def_special sub_818D9C0 + def_special sub_818DAEC + def_special sub_818DBE8 + def_special sub_818DC2C + def_special sub_818DC60 + def_special sub_818DCC8 + def_special sub_818DD14 + def_special sub_818DD54 + def_special sub_818DD78 + def_special sub_818DE44 + def_special sub_818DE5C + def_special sub_818DEA0 + def_special sub_818DEDC + def_special sub_818E038 + def_special sub_818E06C + def_special sub_818E2D8 + def_special sub_811A858 + def_special sub_818E2FC + def_special sub_818E308 + def_special sub_818E358 + def_special sub_818E37C + def_special sub_818E298 + def_special sub_818E39C + def_special sub_818E3BC + def_special sub_818E3E0 + def_special sub_818E430 + def_special sub_818E47C + def_special sub_818E490 + def_special sub_813986C + def_special sub_818E4A4 + def_special sub_818E510 + def_special sub_818E538 + def_special sub_818E274 + def_special sub_818E3EC + def_special sub_818E8E0 + def_special sub_818E8B4 + def_special sub_818E914 + def_special sub_818E92C + def_special sub_818E940 + def_special sub_818E960 + def_special sub_818E990 + def_special PutLilycoveContestLadyShowOnTheAir + def_special sub_813B880 + def_special sub_81A085C + def_special CheckIfMultipleTrainersWantBattle + def_special AddMapNamePopUpWindowTask + def_special AddMapNamePopUpWindowTask + def_special sub_81BE994 + def_special sub_81BE79C + def_special sub_81BE7F4 + def_special sub_81398C0 + def_special sub_80093CC + def_special BerryBlenderLinkBecomeLeader + def_special BerryBlenderLinkJoinGroup + def_special UnionRoomSpecial + def_special sub_801A42C + def_special sub_8016934 + def_special sp182_move_string + def_special sub_801DC20 + def_special sub_81B8958 + def_special sub_8018090 + def_special sub_813990C + def_special sub_801B27C + def_special HasAtLeastOneBerry + def_special sub_802C920 + def_special sub_802E3C4 + def_special sub_8027A5C + def_special sub_8027AAC + def_special sub_8139980 + def_special sub_81399F4 + def_special sub_8139D98 + def_special sub_80F905C + def_special sub_800B518 + def_special sub_80F90DC + def_special sub_80F910C + def_special sub_80F9160 + def_special sub_81A4AA0 + def_special sub_81A4AE8 + def_special sub_8139F20 + def_special sub_80F9134 + def_special sub_80F9154 + def_special sub_80B3028 + def_special sub_813A128 + def_special sub_813A630 + def_special sub_813A080 + def_special sub_81C6A94 + def_special sub_81C4F24 + def_special sub_81B95E0 + def_special sub_81B9620 + def_special sub_813A76C + def_special sub_813A7B8 + def_special sub_813A958 + def_special sub_813A8FC + def_special sub_813A988 + def_special sub_813A9D0 + def_special sub_813A9A4 + def_special sub_813AA04 + def_special sub_813AA18 + def_special sub_813AA44 + def_special sub_80248B0 + def_special sub_8024918 + def_special sub_80246D4 + def_special sub_802477C + def_special sub_802488C + def_special sub_813A820 + def_special sub_813A854 + def_special sub_813B7D8 + def_special sub_81C72A4 + def_special sp106_CreateStartMenu + def_special sub_80C2E40 + def_special sub_813AC7C + def_special sub_813ADB8 + def_special sub_813ADD4 + def_special sub_81B892C + def_special sub_813AEB4 + def_special sub_813AF48 + def_special sub_813AFC8 + def_special sub_813B1D0 + def_special DoScriptedWildBattle + def_special sub_81BEB54 + def_special sub_81BEB68 + def_special sub_81BEB7C + def_special ChangeBoxPokemonNickname + def_special get_unknown_box_id + def_special sub_813B21C + def_special sub_81D1C20 + def_special sub_8175280 + def_special sub_813B2E4 + def_special sub_813B374 + def_special sub_813B490 + def_special sub_80A08CC + def_special sub_813B484 + def_special sub_81AFDA0 + def_special sub_813B4E0 + def_special ShouldDoBrailleRegicePuzzle + def_special EnableNationalPokedex + def_special sub_80E2548 + def_special sub_80E2878 + def_special TurnOnTVScreen + def_special sub_81D4A90 + def_special sub_813B514 + def_special sub_813B568 + def_special sub_813B534 + def_special sp194_trainer_tower + def_special sub_813B7D8 + def_special sub_813B80C + def_special sub_81D4BEC + def_special sub_80224D0 + def_special TryBufferWaldaPhrase + def_special DoWaldaNamingScreen + def_special TryGetWallpaperWithWaldaPhrase + def_special sub_8139ED0 + def_special sub_813B968 + def_special sub_80F8B94 + def_special sub_813C904 + def_special sub_80B4808 + def_special sub_813B9A0 + def_special sub_81B9918 + def_special sub_80722E0 + def_special sub_80B45D0 + def_special sub_813C5A0 + def_special sub_8139C10 + def_special sub_80B3BC4 + diff --git a/data/strings.s b/data/strings.s index 90ccad90f..2b88c6d03 100644 --- a/data/strings.s +++ b/data/strings.s @@ -1517,52 +1517,52 @@ gUnknown_085EA79D:: @ 85EA79D gUnknown_085EA7A9:: @ 85EA7A9 .string "{STR_VAR_3}{STR_VAR_1}/{STR_VAR_2}$" -gUnknown_085EA7B1:: @ 85EA7B1 +gText_Decorate:: @ 85EA7B1 .string "DECORATE$" -gUnknown_085EA7BA:: @ 85EA7BA +gText_PutAway:: @ 85EA7BA .string "PUT AWAY$" -gUnknown_085EA7C3:: @ 85EA7C3 +gText_Toss2:: @ 85EA7C3 .string "TOSS$" gText_Color161Shadow161:: @ 85EA7C8 .string "{COLOR 161}{SHADOW 161}$" -gUnknown_085EA7CF:: @ 85EA7CF +gText_PutOutSelectedDecorItem:: @ 85EA7CF .string "Put out the selected decoration item.$" -gUnknown_085EA7F5:: @ 85EA7F5 +gText_StoreChosenDecorInPC:: @ 85EA7F5 .string "Store the chosen decoration in the PC.$" -gUnknown_085EA81C:: @ 85EA81C +gText_ThrowAwayUnwantedDecors:: @ 85EA81C .string "Throw away unwanted decorations.$" gText_NoDecorations:: @ 85EA83D .string "There are no decorations.{PAUSE_UNTIL_PRESS}$" -gUnknown_085EA859:: @ 85EA859 +gText_Desk:: @ 85EA859 .string "DESK$" -gUnknown_085EA85E:: @ 85EA85E +gText_Chair:: @ 85EA85E .string "CHAIR$" -gUnknown_085EA864:: @ 85EA864 +gText_Plant:: @ 85EA864 .string "PLANT$" -gUnknown_085EA86A:: @ 85EA86A +gText_Ornament:: @ 85EA86A .string "ORNAMENT$" -gUnknown_085EA873:: @ 85EA873 +gText_Mat:: @ 85EA873 .string "MAT$" -gUnknown_085EA877:: @ 85EA877 +gText_Poster:: @ 85EA877 .string "POSTER$" -gUnknown_085EA87E:: @ 85EA87E +gText_Doll:: @ 85EA87E .string "DOLL$" -gUnknown_085EA883:: @ 85EA883 +gText_Cushion:: @ 85EA883 .string "CUSHION$" gText_Gold:: @ 85EA88B diff --git a/data/walda_phrase.s b/data/walda_phrase.s deleted file mode 100644 index c168353b4..000000000 --- a/data/walda_phrase.s +++ /dev/null @@ -1,7 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_0862AD14:: @ 862AD14 - .incbin "baserom.gba", 0x62ad14, 0x20 |