diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-03-11 13:32:30 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-03-11 13:32:30 -0400 |
| commit | 3aeb294572174d1f927286d507d15cda04e58601 (patch) | |
| tree | 05df00aa454eb4d3f15df49145b6266a37428006 /data | |
| parent | d2b0f36b7daa93d0708f19db347ad2befe2a4f07 (diff) | |
Port pokemon_storage_2 from emerald
Diffstat (limited to 'data')
| -rw-r--r-- | data/pokemon_storage_system.s | 52 | ||||
| -rw-r--r-- | data/scripts/pc.inc | 2 | ||||
| -rw-r--r-- | data/specials.inc | 2 |
3 files changed, 2 insertions, 54 deletions
diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index 0ac3268b6..a30550a80 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -6,58 +6,6 @@ .section .rodata .align 2 -gUnknown_83CDA20:: @ 83CDA20 - .4byte gUnknown_841856C, gUnknown_84185AD - .4byte gUnknown_841857D, gUnknown_84185E2 - .4byte gUnknown_841858D, gUnknown_8418611 - .4byte gUnknown_841859A, gUnknown_8418642 - .4byte gUnknown_84185A5, gUnknown_8418681 - -gUnknown_83CDA48:: @ 83CDA48 - .byte 0, 1, 1, 17, 10, 15 - .2byte 0x0001 - -gUnknown_83CDA50:: - obj_image_anim_frame 0x0000, 5 - obj_image_anim_end - -gUnknown_83CDA58:: - obj_image_anim_frame 0x0004, 5 - obj_image_anim_end - -gUnknown_83CDA60:: - obj_image_anim_frame 0x0006, 5 - obj_image_anim_end - -gUnknown_83CDA68:: - obj_image_anim_frame 0x000a, 5 - obj_image_anim_end - -gUnknown_83CDA70:: @ 83CDA70 - .4byte gUnknown_83CDA50 - .4byte gUnknown_83CDA58 - .4byte gUnknown_83CDA60 - .4byte gUnknown_83CDA68 - -gUnknown_83CDA80:: - obj_rot_scal_anim_frame 224, 224, 0, 0 - obj_rot_scal_anim_end - -gUnknown_83CDA90:: - .4byte gUnknown_83CDA80 - -gUnknown_83CDA94:: @ 83CDA94 - .string "/30$" - -gUnknown_83CDA98:: @ 83CDA98 gbapal - .incbin "graphics/interface/pss_unk_83CDA98.gbapal" - -gUnknown_83CDAB8:: @ 83CDAB8 4bpp - .incbin "graphics/interface/pss_unk_83CDAB8.4bpp" - -gUnknown_83CE2B8:: @ 83CE2B8 4bpp - .incbin "graphics/interface/pss_unk_83CE2B8.4bpp" - gUnknown_83CE438:: @ 83CE438 4bpp.lz .incbin "graphics/interface/pss_unk_83CE438.4bpp.lz" diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc index 0c71b9c76..a3190ea26 100644 --- a/data/scripts/pc.inc +++ b/data/scripts/pc.inc @@ -48,7 +48,7 @@ EventScript_AccessPokemonStorage:: @ 81A6A05 call_if_unset FLAG_SYS_NOT_SOMEONES_PC, EventScript_AccessSomeonesPC call_if_set FLAG_SYS_NOT_SOMEONES_PC, EventScript_AccessBillsPC msgbox Text_OpenedPkmnStorage - special ShowPokemonStorageSystem + special ShowPokemonStorageSystemPC waitstate setvar VAR_0x8004, HELPCONTEXT_PC special Script_SetHelpContext diff --git a/data/specials.inc b/data/specials.inc index 0d7670f63..dbe9deebc 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -68,7 +68,7 @@ gSpecials:: @ 815FD60 def_special ShouldTryRematchBattle def_special IsTrainerReadyForRematch def_special StartRematchBattle - def_special ShowPokemonStorageSystem + def_special ShowPokemonStorageSystemPC def_special HasEnoughMonsForDoubleBattle def_special NullFieldSpecial @ Hoenn TV specials def_special NullFieldSpecial |