diff options
| -rw-r--r-- | asm/rom4.s | 16 | ||||
| -rw-r--r-- | data/data1.s | 74 |
2 files changed, 58 insertions, 32 deletions
diff --git a/asm/rom4.s b/asm/rom4.s index 7882103e8..5dfecb2a1 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -47900,7 +47900,7 @@ _080684AA: .align 2, 0 _080684CC: .4byte 0x0202e8cc _080684D0: .4byte 0x0202e8ce -_080684D4: .4byte gUnknown_0819FF7B +_080684D4: .4byte HiddenItemScript _080684D8: cmp r5, 0x2 bne _08068494 @@ -48029,7 +48029,7 @@ _080685CC: ldr r0, _080685E0 b _080686EE .align 2, 0 -_080685E0: .4byte gUnknown_081A085B +_080685E0: .4byte PictureBookShelfScript _080685E4: adds r0, r5, 0 bl sub_8057944 @@ -48040,7 +48040,7 @@ _080685E4: ldr r0, _080685F8 b _080686EE .align 2, 0 -_080685F8: .4byte gUnknown_081A0864 +_080685F8: .4byte BookshelfScript _080685FC: adds r0, r5, 0 bl sub_8057958 @@ -48051,7 +48051,7 @@ _080685FC: ldr r0, _08068610 b _080686EE .align 2, 0 -_08068610: .4byte gUnknown_081A086D +_08068610: .4byte PokemonCenterBookshelfScript _08068614: adds r0, r5, 0 bl sub_805796C @@ -48062,7 +48062,7 @@ _08068614: ldr r0, _08068628 b _080686EE .align 2, 0 -_08068628: .4byte gUnknown_081A0876 +_08068628: .4byte VaseScript _0806862C: adds r0, r5, 0 bl sub_8057980 @@ -48073,7 +48073,7 @@ _0806862C: ldr r0, _08068640 b _080686EE .align 2, 0 -_08068640: .4byte gUnknown_081A087F +_08068640: .4byte TrashCanScript _08068644: adds r0, r5, 0 bl sub_8057994 @@ -48084,7 +48084,7 @@ _08068644: ldr r0, _08068658 b _080686EE .align 2, 0 -_08068658: .4byte gUnknown_081A0888 +_08068658: .4byte ShopShelfScript _0806865C: adds r0, r5, 0 bl sub_80579A8 @@ -48095,7 +48095,7 @@ _0806865C: ldr r0, _08068670 b _080686EE .align 2, 0 -_08068670: .4byte gUnknown_081A0891 +_08068670: .4byte BlueprintScript _08068674: movs r4, 0x4 ldrsb r4, [r6, r4] diff --git a/data/data1.s b/data/data1.s index ebe89d31e..b89358d6a 100644 --- a/data/data1.s +++ b/data/data1.s @@ -3070,8 +3070,6 @@ Std_FindItem_Fail: @ 819FF65 setvar RESULT, 0 return - .global gUnknown_0819FF7B -gUnknown_0819FF7B: @ 819FF7B HiddenItemScript:: @ 819FF7B lockall checksound @@ -4220,33 +4218,35 @@ Route110_TrickHouseEntrance_Movement_1A0856:: @ 81A0856 .incbin "baserom.gba", 0x1a0858, 0x3 - .global gUnknown_081A085B -gUnknown_081A085B: @ 81A085B - .incbin "baserom.gba", 0x001a085b, 0x9 +PictureBookShelfScript:: @ 81A085B + msgbox PictureBookShelfText, 3 + end - .global gUnknown_081A0864 -gUnknown_081A0864: @ 81A0864 - .incbin "baserom.gba", 0x001a0864, 0x9 +BookshelfScript:: @ 81A0864 + msgbox BookshelfText, 3 + end - .global gUnknown_081A086D -gUnknown_081A086D: @ 81A086D - .incbin "baserom.gba", 0x001a086d, 0x9 +PokemonCenterBookshelfScript:: @ 81A086D + msgbox PokemonCenterBookshelfText, 3 + end - .global gUnknown_081A0876 -gUnknown_081A0876: @ 81A0876 - .incbin "baserom.gba", 0x001a0876, 0x9 +VaseScript:: @ 81A0876 + msgbox VaseText, 3 + end - .global gUnknown_081A087F -gUnknown_081A087F: @ 81A087F - .incbin "baserom.gba", 0x001a087f, 0x9 +TrashCanScript:: @ 81A087F + msgbox TrashCanText, 3 + end + +ShopShelfScript:: @ 81A0888 + msgbox ShopShelfText, 3 + end - .global gUnknown_081A0888 -gUnknown_081A0888: @ 81A0888 - .incbin "baserom.gba", 0x001a0888, 0x9 +BlueprintScript:: @ 81A0891 + msgbox BlueprintText, 3 + end - .global gUnknown_081A0891 -gUnknown_081A0891: @ 81A0891 - .incbin "baserom.gba", 0x001a0891, 0x170 + .incbin "baserom.gba", 0x001a089A, 0x167 .global gUnknown_081A0A01 gUnknown_081A0A01: @ 81A0A01 @@ -15492,7 +15492,33 @@ ShoalCave_LowTideEntranceRoom_Text_1C69F5:: @ 81C69F5 .string "You should make room and come back\n" .string "for a SHELL BELL.$" - .incbin "baserom.gba", 0x1c6a69, 0x14c +PictureBookShelfText: @ 81C6A69 + .string "There’s a set of POKéMON picture books.$" + +BookshelfText: @ 81C6A91 + .string "It’s filled with all sorts of books.$" + +PokemonCenterBookshelfText: @ 81C6AB6 + .string "POKéMON magazines!\n" + .string "POKéMON PAL...\p" + .string "POKéMON HANDBOOK...\n" + .string "ADORABLE POKéMON...$" + +VaseText: @ 81C6B00 + .string "This vase looks expensive...\n" + .string "Peered inside...\p" + .string "But, it was empty.$" + +TrashCanText: @ 81C6B41 + .string "It’s empty.$" + +ShopShelfText: @ 81C6B4D + .string "The shelves brim with all sorts of\n" + .string "POKéMON merchandise.$" + +BlueprintText: @ 81C6B85 + .string "A blueprint of some sort?\n" + .string "It’s too complicated!$" GraniteCave_B1F_MapScript2_1C6BB5:: @ 81C6BB5 MtPyre_2F_MapScript2_1C6BB5:: @ 81C6BB5 |