DIEGO SEND HELP

This commit is contained in:
golem galvanize 2018-01-20 17:26:30 -05:00
parent 646aa19e87
commit 59e1aacd26
50 changed files with 2734 additions and 100 deletions

View File

@ -244,7 +244,7 @@ _080D38F8:
lsrs r4, r0, 16
movs r7, 0x1
movs r5, 0
ldr r3, =gUnknown_0857C60A
ldr r3, =gUnknown_0857C608 + 2
adds r0, r2, r3
ldrb r0, [r0]
adds r6, 0x1

View File

@ -518,7 +518,7 @@ _080D4C0A:
lsls r1, r4, 4
subs r1, r4
lsls r1, 6
ldr r2, =gUnknown_0857DD04
ldr r2, =gMapPopUp_Outline_Table
adds r1, r2
movs r2, 0x80
lsls r2, 3
@ -541,7 +541,7 @@ _080D4C0A:
.pool
_080D4C6C:
lsls r0, r4, 5
ldr r1, =gUnknown_0857F384
ldr r1, =gMapPopUp_Palette_Table
adds r0, r1
movs r1, 0xE0
movs r2, 0x20
@ -550,7 +550,7 @@ _080D4C7A:
lsls r1, r4, 4
subs r1, r4
lsls r1, 6
ldr r0, =gUnknown_0857C684
ldr r0, =gMapPopUp_Table
adds r1, r0
movs r0, 0x50
str r0, [sp]

2114
data/contest_opponents.inc Normal file

File diff suppressed because it is too large Load Diff

View File

@ -7,6 +7,7 @@
.include "asm/macros.inc"
.include "asm/macros/event.inc"
.include "constants/constants.inc"
.section script_data, "aw", %progbits

View File

@ -4,7 +4,7 @@
.section .rodata
gUnknown_085CDC38:: @ 85CDC38
.incbin "baserom.gba", 0x5cdc38, 0x6
.2byte 12, 28, 44
gUnknown_085CDC3E:: @ 85CDC3E
.byte 0x00, 0x01, 0x02, 0x03
@ -22,8 +22,11 @@ gUnknown_085CDC54:: @ 85CDC54
.4byte sub_815550C
gUnknown_085CDC60:: @ 85CDC60
.incbin "baserom.gba", 0x5cdc60, 0xa
.byte 0, 0, 1, 2, 3, 0, 0, 1, 1
.byte 0
gUnknown_085CDC6A:: @ 85CDC6A
.incbin "baserom.gba", 0x5cdc6a, 0x96
.2byte 3, 7
@the following might be unref, not sure
.byte 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0x00, 0x00

View File

@ -39,7 +39,8 @@ gUnknown_0850E654:: @ 850E654
.4byte DoTracksGroundEffect_BikeTireTracks
gUnknown_0850E660:: @ 850E660
.incbin "baserom.gba", 0x50e660, 0x4
.byte 13, 0
.byte 24, 0
gUnknown_0850E664:: @ 850E664
.byte 0x01, 0x02, 0x07, 0x08, 0x01, 0x02, 0x06, 0x05, 0x05, 0x08, 0x03, 0x04, 0x06, 0x07, 0x03, 0x04

View File

@ -115,11 +115,12 @@ gUnknown_08497540:: @ 8497540
.4byte sub_808C6FC
gUnknown_08497550:: @ 8497550
.incbin "baserom.gba", 0x497550, 0x4
.byte 3, 4, 2, 1
gUnknown_08497554:: @ 8497554
.incbin "baserom.gba", 0x497554, 0x8
.byte 16, 16, 17, 18, 19
.align 2
gUnknown_0849755C:: @ 849755C
.4byte fish0
.4byte fish1
@ -139,19 +140,21 @@ gUnknown_0849755C:: @ 849755C
.4byte fishF
gUnknown_0849759C:: @ 849759C
.incbin "baserom.gba", 0x49759c, 0x6
.2byte 1, 1, 1
gUnknown_084975A2:: @ 84975A2
.incbin "baserom.gba", 0x4975a2, 0x6
.2byte 1, 3, 6
gUnknown_084975A8:: @ 84975A8
.incbin "baserom.gba", 0x4975a8, 0x2
.string "·$"
gUnknown_084975AA:: @ 84975AA
.incbin "baserom.gba", 0x4975aa, 0x6
.2byte 36, 33, 30
gUnknown_084975B0:: @ 84975B0
.incbin "baserom.gba", 0x4975b0, 0xc
.2byte 0, 0
.2byte 0x28, 10
.2byte 0x46, 30
gUnknown_084975BC:: @ 84975BC
.byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00

View File

@ -6,10 +6,10 @@
.align 2, 0
gTruckCamera_HorizontalTable:: @ 858E898
.incbin "baserom.gba", 0x58e898, 0x13
.byte 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, -1, -1, -1, 0
gUnknown_0858E8AB:: @ 858E8AB
.incbin "baserom.gba", 0x58e8ab, 0x2
.byte 0x18, 0xFE
gUnknown_0858E8AD:: @ 858E8AD
.incbin "baserom.gba", 0x58e8ad, 0x3
.byte 0x17, 0xFE

View File

@ -5,19 +5,95 @@
.align 2, 0
gUnknown_08510348:: @ 8510348
.incbin "baserom.gba", 0x510348, 0x20
.4byte nullsub_34
.4byte sub_809E3B4
.4byte sub_809DEF0
.4byte sub_809DCB4
.4byte sub_809E224
.4byte EndTruckSequence
.4byte sub_80EA3E4
.4byte sub_809E4CC
gUnknown_08510368:: @ 8510368
.incbin "baserom.gba", 0x510368, 0x20
.byte 0
.byte 0
.2byte 0x259
.byte 0
.byte 1
.2byte 0x261
.byte 0
.byte 0xFF
.2byte 0x259
.byte 0
.byte 0
.2byte 0x261
.byte 0
.byte 0
.2byte 0x252
.byte 1
.byte 0
.2byte 0x253
.byte 0xFF
.byte 0
.2byte 0x252
.byte 0
.byte 0
.2byte 0x253
gUnknown_08510388:: @ 8510388
.incbin "baserom.gba", 0x510388, 0x20
.byte 0
.byte 0
.2byte 0x25A
.byte 0
.byte 1
.2byte 0x262
.byte 0
.byte 0xFF
.2byte 0x25A
.byte 0
.byte 0
.2byte 0x262
.byte 0
.byte 0
.2byte 0x254
.byte 1
.byte 0
.2byte 0x255
.byte 0xFF
.byte 0
.2byte 0x254
.byte 0
.byte 0
.2byte 0x255
gUnknown_085103A8:: @ 85103A8
.incbin "baserom.gba", 0x5103a8, 0x20
.byte 0
.byte 0
.2byte 0x258
.byte 0
.byte 1
.2byte 0x260
.byte 0
.byte 0xFF
.2byte 0x258
.byte 0
.byte 0
.2byte 0x260
.byte 0
.byte 0
.2byte 0x250
.byte 1
.byte 0
.2byte 0x251
.byte 0xFF
.byte 0
.2byte 0x250
.byte 0
.byte 0
.2byte 0x251
gUnknown_085103C8:: @ 85103C8
.incbin "baserom.gba", 0x5103c8, 0x34
.2byte 0, 0, 0, 0, 0, 0, 0x4001, 0x4002, 0x4003, 0x4004, 0, 0, 0x4005, 0x4006, 0x4007, 0, 0, 0x4008, 0x4009, 0x400a, 0, 0, 0, 0, 0, 0
gUnknown_085103FC:: @ 85103FC
.incbin "baserom.gba", 0x5103fc, 0x8
.2byte 0xE8, 0xeb, 0xea, 0xe9

View File

@ -5,16 +5,28 @@
.align 2, 0
gUnknown_0857C608:: @ 857C608
.incbin "baserom.gba", 0x57c608, 0x2
.byte 0xfe, 0xfe, 0x01, 0x00, 0xff, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x01, 0xfe, 0x03, 0x00, 0x02, 0xfe, 0x03, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x02, 0xff, 0x03, 0x00, 0xfe, 0x00, 0x04, 0x00, 0x02, 0x00
.byte 0x06, 0x00, 0xfe, 0x01, 0x07, 0x00, 0x02, 0x01, 0x09, 0x00, 0xfe, 0x02, 0x07, 0x00, 0xff, 0x02, 0x07, 0x00, 0x00, 0x02, 0x08, 0x00, 0x01, 0x02, 0x09, 0x00, 0x02, 0x02, 0x09,
gUnknown_0857C648:: @ 857C648
.2byte 0
.2byte 0
.2byte 0x1401
.2byte 0
gUnknown_0857C60A:: @ 857C60A
.byte 0x01, 0x00, 0xff, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x01, 0xfe, 0x03, 0x00, 0x02, 0xfe, 0x03, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x02, 0xff, 0x03, 0x00, 0xfe, 0x00, 0x04, 0x00, 0x02, 0x00
.byte 0x06, 0x00, 0xfe, 0x01, 0x07, 0x00, 0x02, 0x01, 0x09, 0x00, 0xfe, 0x02, 0x07, 0x00, 0xff, 0x02, 0x07, 0x00, 0x00, 0x02, 0x08, 0x00, 0x01, 0x02, 0x09, 0x00, 0x02, 0x02, 0x09, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x01, 0x14, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0xfe, 0xff, 0x00, 0x00, 0x50, 0xc6, 0x57, 0x08, 0x58, 0x6e, 0x4f, 0x08, 0x20, 0x00, 0x00, 0x00
gUnknown_0857C650:: @ 857C650
obj_image_anim_frame 0, 0x1E
obj_image_anim_jump 0
gUnknown_0857C658:: @ 857C658
.4byte gUnknown_0857C650
gUnknown_0857C65C:: @ 857C65C
obj_frame_tiles gFieldEffectObjectPic_ShadowExtraLarge + 0x520, 32
.align 2
gFieldEffectObjectPaletteInfo6:: @ 857C664
obj_pal gFieldEffectObjectPalette6, 0x1000
gUnknown_0857C66C:: @ 857C66C
.incbin "baserom.gba", 0x57c66c, 0x18
spr_template -1, 0x1000, gUnknown_0857C648, gUnknown_0857C658, gUnknown_0857C65C, gDummySpriteAffineAnimTable, objc_8097BA8

View File

@ -5386,7 +5386,8 @@ gFieldEffectObjectPic_ShadowLarge:: @ 84F68B8
gFieldEffectObjectPic_ShadowExtraLarge:: @ 84F6938
.incbin "graphics/map_objects/pics/effects/shadow_extra_large.4bpp"
.incbin "baserom.gba", 0x4f6d38, 0x160
gUnknown_084F6D38:: @ 84F6D38
.incbin "graphics/map_objects/pics/effects/unknown_4F6D38/0.4bpp"
.align 2
gFieldEffectObjectPalette6:: @ 84F6E98
@ -5500,7 +5501,17 @@ gFieldEffectObjectPic_BikeHopTallGrass_2:: @ 84F7938
gFieldEffectObjectPic_BikeHopTallGrass_3:: @ 84F7978
.incbin "graphics/map_objects/pics/effects/bike_hop_tall_grass/3.4bpp"
.incbin "baserom.gba", 0x4f79b8, 0x200
gUnusedGrass_0:: @4F79B8
.incbin "graphics/map_objects/pics/effects/unused_grass/0.4bpp"
gUnusedGrass_1:: @4F7A38
.incbin "graphics/map_objects/pics/effects/unused_grass/1.4bpp"
gUnusedGrass_2:: @4F7AB8
.incbin "graphics/map_objects/pics/effects/unused_grass/2.4bpp"
gUnusedGrass_3:: @4F7B38
.incbin "graphics/map_objects/pics/effects/unused_grass/3.4bpp"
.align 2
gFieldEffectObjectPic_Unknown16_0:: @ 84F7BB8
@ -5522,7 +5533,8 @@ gFieldEffectObjectPic_Unknown16_3:: @ 84F7D38
gFieldEffectObjectPic_Unknown16_4:: @ 84F7DB8
.incbin "graphics/map_objects/pics/effects/unknown_16/4.4bpp"
.incbin "baserom.gba", 0x4f7e38, 0x80
gUnknown_084F7E38:: @ 84F7E38
.incbin "graphics/map_objects/pics/effects/unknown_4F7E38/0.4bpp"
.align 2
gFieldEffectObjectPic_Unknown16_5:: @ 84F7EB8

View File

@ -6,8 +6,18 @@
@ 8614410
.include "data/graphics/items/item_icon_table.inc"
@ 8614FE0
.incbin "baserom.gba", 0x614fe0, 0x14
gUnknown_08614FE0:: @ 8614FE0
.2byte 0
.2byte 0x8000
.2byte 0x2400
.2byte 0
gUnknown_08614FE8:: @ 8614FE8
obj_image_anim_frame 0, 0
obj_image_anim_end
gUnknown_08614FF0:: @ 8614FF0
.4byte gUnknown_08614FE8
gUnknown_08614FF4:: @ 8614FF4
.incbin "baserom.gba", 0x614ff4, 0x18
spr_template 0, 0, gUnknown_08614FE0, gUnknown_08614FF0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy

View File

@ -100,13 +100,28 @@ gUnknown_08614094:: @ 8614094
.4byte 0x6F
gUnknown_086140A4:: @ 86140A4
.incbin "baserom.gba", 0x6140a4, 0xc0
.incbin "graphics/interface/select_button.4bpp"
gUnknown_08614164:: @ 8614164
.incbin "baserom.gba", 0x614164, 0x10
.byte 0, 1, 3, 0, 1, 4, 0, 3, 6, 2, 1, 3, 0, 14, 10, 0
gUnknown_08614174:: @ 8614174
.incbin "baserom.gba", 0x614174, 0x38
window_template 0, 14, 2, 15, 16, 1, 0x27
window_template 0, 0, 13, 14, 6, 1, 0x117
window_template 0, 4, 1, 8, 2, 1, 0x1A1
window_template 0, 1, 13, 5, 6, 12, 0x16B
window_template 0, 7, 13, 4, 6, 12, 0x189
window_template 1, 2, 15, 27, 4, 15, 0x1B1
null_window_template
gUnknown_086141AC:: @ 86141AC
.incbin "baserom.gba", 0x6141ac, 0x50
window_template 1, 22, 17, 7, 2, 15, 0x21D
window_template 1, 22, 15, 7, 4, 15, 0x21D
window_template 1, 15, 15, 14, 4, 15, 0x21D
window_template 1, 15, 13, 14, 6, 15, 0x21D
window_template 1, 2, 15, 27, 4, 15, 0x1B1
window_template 1, 24, 15, 5, 4, 15, 0x21D
window_template 1, 21, 9, 5, 4, 15, 0x21D
window_template 1, 24, 17, 5, 2, 15, 0x21D
window_template 1, 18, 11, 10, 2, 15, 0x245
window_template 1, 1, 1, 10, 2, 15, 0x231

View File

@ -1,7 +1,10 @@
.section .rodata
gUnknown_089A3220:: @ 89A3220
.incbin "baserom.gba", 0x9a3220, 0x20
.byte 2, 14, 0, 10, 9, 5, 7, 2
.byte 0, 15, 1, 3, 3, 0, 31, 0
.byte 3, 22, 18, 14, 13, 9, 11, 3
.byte 15, 15, 1, 3, 3, 0, 0x7f, 0
.asciz "RFU_V1026"

View File

@ -4,14 +4,29 @@
.section .rodata
.align 2, 0
gUnknown_0857C684:: @ 857C684
.incbin "baserom.gba", 0x57c684, 0x1680
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"
gUnknown_0857DD04:: @ 857DD04
.incbin "baserom.gba", 0x57dd04, 0x1680
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"
gUnknown_0857F384:: @ 857F384
.incbin "baserom.gba", 0x57f384, 0xc0
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 "baserom.gba", 0x57f444, 0x20
.incbin "graphics/interface/map_popup/857F444.gbapal"

View File

@ -28,13 +28,31 @@ gUnknown_0859F010:: @ 859F010
.4byte gUnknown_082944D5
gUnknown_0859F030:: @ 859F030
.incbin "baserom.gba", 0x59f030, 0x18
.4byte 0, 12, 13, 18, 19, 21
gUnknown_0859F048:: @ 859F048
.incbin "baserom.gba", 0x59f048, 0x230
.4byte 0x00000132, MauvilleCity_PokemonCenter_1F_Text_28E930, MauvilleCity_PokemonCenter_1F_Text_28E947, MauvilleCity_PokemonCenter_1F_Text_28E956, 0x00000102, MauvilleCity_PokemonCenter_1F_Text_28E9D7, MauvilleCity_PokemonCenter_1F_Text_28E9EF, MauvilleCity_PokemonCenter_1F_Text_28E9FE
.4byte 0x00000103, MauvilleCity_PokemonCenter_1F_Text_28EA7D, MauvilleCity_PokemonCenter_1F_Text_28EA98, MauvilleCity_PokemonCenter_1F_Text_28EAA8, 0x00000104, MauvilleCity_PokemonCenter_1F_Text_28EB19, MauvilleCity_PokemonCenter_1F_Text_28EB31, MauvilleCity_PokemonCenter_1F_Text_28EB3E
.4byte 0x00000106, MauvilleCity_PokemonCenter_1F_Text_28EBB5, MauvilleCity_PokemonCenter_1F_Text_28EBCD, MauvilleCity_PokemonCenter_1F_Text_28EBDD, 0x00000109, MauvilleCity_PokemonCenter_1F_Text_28EC60, MauvilleCity_PokemonCenter_1F_Text_28EC79, MauvilleCity_PokemonCenter_1F_Text_28EC81
.4byte 0x0000010b, MauvilleCity_PokemonCenter_1F_Text_28ED04, MauvilleCity_PokemonCenter_1F_Text_28ED21, MauvilleCity_PokemonCenter_1F_Text_28ED30, 0x0000010c, MauvilleCity_PokemonCenter_1F_Text_28EDA1, MauvilleCity_PokemonCenter_1F_Text_28EDB5, MauvilleCity_PokemonCenter_1F_Text_28EDCF
.4byte 0x0000010d, MauvilleCity_PokemonCenter_1F_Text_28EE45, MauvilleCity_PokemonCenter_1F_Text_28EE5D, MauvilleCity_PokemonCenter_1F_Text_28EE6A, 0x0000010e, MauvilleCity_PokemonCenter_1F_Text_28EEDD, MauvilleCity_PokemonCenter_1F_Text_28EEF1, MauvilleCity_PokemonCenter_1F_Text_28EF01
.4byte 0x0000010f, MauvilleCity_PokemonCenter_1F_Text_28EF73, MauvilleCity_PokemonCenter_1F_Text_28EF95, MauvilleCity_PokemonCenter_1F_Text_28EFAA, 0x00000110, MauvilleCity_PokemonCenter_1F_Text_28F045, MauvilleCity_PokemonCenter_1F_Text_28F05A, MauvilleCity_PokemonCenter_1F_Text_28F071
.4byte 0x00000111, MauvilleCity_PokemonCenter_1F_Text_28F0F3, MauvilleCity_PokemonCenter_1F_Text_28F10D, MauvilleCity_PokemonCenter_1F_Text_28F125, 0x00000112, MauvilleCity_PokemonCenter_1F_Text_28F1BE, MauvilleCity_PokemonCenter_1F_Text_28F1D5, MauvilleCity_PokemonCenter_1F_Text_28F1DE
.4byte 0x00000113, MauvilleCity_PokemonCenter_1F_Text_28F24F, MauvilleCity_PokemonCenter_1F_Text_28F269, MauvilleCity_PokemonCenter_1F_Text_28F277, 0x00000114, MauvilleCity_PokemonCenter_1F_Text_28F2FC, MauvilleCity_PokemonCenter_1F_Text_28F314, MauvilleCity_PokemonCenter_1F_Text_28F32A
.4byte 0x0000011a, MauvilleCity_PokemonCenter_1F_Text_28F3AD, MauvilleCity_PokemonCenter_1F_Text_28F3C6, MauvilleCity_PokemonCenter_1F_Text_28F3D2, 0x0000011b, MauvilleCity_PokemonCenter_1F_Text_28F44B, MauvilleCity_PokemonCenter_1F_Text_28F461, MauvilleCity_PokemonCenter_1F_Text_28F47C
.4byte 0x0000011c, MauvilleCity_PokemonCenter_1F_Text_28F50C, MauvilleCity_PokemonCenter_1F_Text_28F51B, MauvilleCity_PokemonCenter_1F_Text_28F538, 0x0000021d, MauvilleCity_PokemonCenter_1F_Text_28F5BE, MauvilleCity_PokemonCenter_1F_Text_28F5D1, MauvilleCity_PokemonCenter_1F_Text_28F5F2
.4byte 0x0000011e, MauvilleCity_PokemonCenter_1F_Text_28F678, MauvilleCity_PokemonCenter_1F_Text_28F694, MauvilleCity_PokemonCenter_1F_Text_28F6B4, 0x00000121, MauvilleCity_PokemonCenter_1F_Text_28F751, MauvilleCity_PokemonCenter_1F_Text_28F76A, MauvilleCity_PokemonCenter_1F_Text_28F776
.4byte 0x00000124, MauvilleCity_PokemonCenter_1F_Text_28F7F6, MauvilleCity_PokemonCenter_1F_Text_28F811, MauvilleCity_PokemonCenter_1F_Text_28F822, 0x00000125, MauvilleCity_PokemonCenter_1F_Text_28F89C, MauvilleCity_PokemonCenter_1F_Text_28F8AF, MauvilleCity_PokemonCenter_1F_Text_28F8BC
.4byte 0x00000126, MauvilleCity_PokemonCenter_1F_Text_28F92F, MauvilleCity_PokemonCenter_1F_Text_28F941, MauvilleCity_PokemonCenter_1F_Text_28F949, 0x00000127, MauvilleCity_PokemonCenter_1F_Text_28F9D1, MauvilleCity_PokemonCenter_1F_Text_28F9EA, MauvilleCity_PokemonCenter_1F_Text_28F9FD
.4byte 0x00000128, MauvilleCity_PokemonCenter_1F_Text_28FA81, MauvilleCity_PokemonCenter_1F_Text_28FA99, MauvilleCity_PokemonCenter_1F_Text_28FAA7, 0x00000129, MauvilleCity_PokemonCenter_1F_Text_28FB1D, MauvilleCity_PokemonCenter_1F_Text_28FB35, MauvilleCity_PokemonCenter_1F_Text_28FB47
.4byte 0x0000012a, MauvilleCity_PokemonCenter_1F_Text_28FBC4, MauvilleCity_PokemonCenter_1F_Text_28FBD9, MauvilleCity_PokemonCenter_1F_Text_28FBEA, 0x0000012b, MauvilleCity_PokemonCenter_1F_Text_28FC6B, MauvilleCity_PokemonCenter_1F_Text_28FC85, MauvilleCity_PokemonCenter_1F_Text_28FC98
.4byte 0x0000012c, MauvilleCity_PokemonCenter_1F_Text_28FD1D, MauvilleCity_PokemonCenter_1F_Text_28FD35, MauvilleCity_PokemonCenter_1F_Text_28FD40, 0x0000012d, MauvilleCity_PokemonCenter_1F_Text_28FDA2, MauvilleCity_PokemonCenter_1F_Text_28FDBD, MauvilleCity_PokemonCenter_1F_Text_28FDCE
.4byte 0x0000012e, MauvilleCity_PokemonCenter_1F_Text_28FE57, MauvilleCity_PokemonCenter_1F_Text_28FE72, MauvilleCity_PokemonCenter_1F_Text_28FE88, 0x0000012f, MauvilleCity_PokemonCenter_1F_Text_28FF0C, MauvilleCity_PokemonCenter_1F_Text_28FF27, MauvilleCity_PokemonCenter_1F_Text_28FF44
.4byte 0x00000130, MauvilleCity_PokemonCenter_1F_Text_28FFDD, MauvilleCity_PokemonCenter_1F_Text_28FFFA, MauvilleCity_PokemonCenter_1F_Text_29000D
gUnknown_0859F278:: @ 859F278
.incbin "baserom.gba", 0x59f278, 0x10
.4byte 0x00000131, MauvilleCity_PokemonCenter_1F_Text_290097, MauvilleCity_PokemonCenter_1F_Text_2900B5, MauvilleCity_PokemonCenter_1F_Text_2900CB
gUnknown_0859F288:: @ 859F288
.4byte 0x00000024, 0x00000008

View File

@ -4,11 +4,34 @@
.section .rodata
.align 2, 0
gUnknown_0859F4E8:: @ 859F4E8
.2byte 0x00
.2byte 0x4000
.2byte 0x00
.2byte 0x00
gUnknown_0859F4F0:: @ 859F4F0
obj_image_anim_frame 0x00, 0x00
obj_image_anim_end
gUnknown_0859F4F8:: @ 859F4F8
obj_image_anim_frame 0x04, 0x00
obj_image_anim_end
gUnknown_0859F500:: @ 859F500
obj_image_anim_frame 0x00, 0x40
obj_image_anim_end
gUnknown_0859F508:: @ 859F508
.4byte gUnknown_0859F4F0
.4byte gUnknown_0859F4F8
.4byte gUnknown_0859F500
gUnknown_0859F514:: @ 859F514
.incbin "baserom.gba", 0x59f514, 0x8
.4byte gBagSwapLineGfx, 0x6D0100
gUnknown_0859F51C:: @ 859F51C
.incbin "baserom.gba", 0x59f51c, 0x8
.4byte gBagSwapLinePal, 0x6D
gUnknown_0859F524:: @ 859F524
.incbin "baserom.gba", 0x59f524, 0x18
spr_template 0x6D, 0x6D, gUnknown_0859F4E8, gUnknown_0859F508, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy

View File

@ -4,10 +4,41 @@
.section .rodata
gUnknown_086141FC:: @ 86141FC
.incbin "baserom.gba", 0x6141fc, 0x48
.byte 0, 2, 8, 0
.byte 1, 2, -8, -1
.byte 18, 2, 8, 0
.byte 19, 2, -8, -1
gUnknown_0861420C:: @ 861420C
.2byte 0
.2byte 0x4000
.2byte 0
.2byte 0
gUnknown_08614214:: @ 8614214
obj_image_anim_frame 0, 30
obj_image_anim_end
gUnknown_0861421C:: @ 861421C
obj_image_anim_frame 0, 0x5e
obj_image_anim_end
gUnknown_08614224:: @ 8614224
obj_image_anim_frame 4, 30
obj_image_anim_end
gUnknown_0861422C:: @ 861422C
obj_image_anim_frame 4, 0x9e
obj_image_anim_end
gUnknown_08614234:: @ 8614234
.4byte gUnknown_08614214
.4byte gUnknown_0861421C
.4byte gUnknown_08614224
.4byte gUnknown_0861422C
gUnknown_08614244:: @ 8614244
.incbin "baserom.gba", 0x614244, 0x18
spr_template 0, 0, gUnknown_0861420C, gUnknown_08614234, NULL, gDummySpriteAffineAnimTable, sub_81AF264
gUnknown_0861425C:: @ 861425C
.4byte 0x00000000
@ -34,19 +65,29 @@ gUnknown_08614278:: @ 8614278
.4byte 0x00700000
gUnknown_0861427C:: @ 861427C
.incbin "baserom.gba", 0x61427C, 0x14
.2byte 0
.2byte 0x4000
.2byte 0
.2byte 0
gUnknown_08614284:: @ 8614284
obj_image_anim_frame 0, 30
obj_image_anim_end
gUnknown_0861428C:: @ 861428C
.4byte gUnknown_08614284
gUnknown_08614290:: @ 8614290
.incbin "baserom.gba", 0x614290, 0x18
spr_template 0, 0, gUnknown_0861427C, gUnknown_0861428C, NULL, gDummySpriteAffineAnimTable, ObjectCB_RedArrowCursor
gUnknown_086142A8:: @ 86142A8
.incbin "baserom.gba", 0x6142a8, 0x20
.incbin "graphics/interface/red_arrow.gbapal"
gUnknown_086142C8:: @ 86142C8
.incbin "baserom.gba", 0x6142c8, 0x70
.incbin "graphics/interface/red_arrow_other.4bpp.lz"
gUnknown_08614338:: @ 8614338
.incbin "baserom.gba", 0x614338, 0x40
.incbin "graphics/interface/selector_outline.4bpp.lz"
gUnknown_08614378:: @ 8614378
.incbin "baserom.gba", 0x614378, 0x44
.incbin "graphics/interface/red_arrow.4bpp.lz"

View File

@ -5,25 +5,153 @@
.align 2, 0
gUnknown_0859E65C:: @ 859E65C
.incbin "baserom.gba", 0x59e65c, 0x20
.incbin "graphics/misc/mon_markings.gbapal"
gUnknown_0859E67C:: @ 859E67C
.incbin "baserom.gba", 0x59e67c, 0x800
.incbin "graphics/misc/mon_markings.4bpp"
gUnknown_0859EE7C:: @ 859EE7C
.incbin "baserom.gba", 0x59ee7c, 0x8
.2byte 0, 0xC000, 0, 0
gUnknown_0859EE84:: @ 859EE84
.incbin "baserom.gba", 0x59ee84, 0x58
.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
.incbin "baserom.gba", 0x59eedc, 0x38
.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
.incbin "baserom.gba", 0x59ef14, 0x8
.4byte gUnknown_0859EF04
.4byte gUnknown_0859EF0C
gUnknown_0859EF1C:: @ 859EF1C
.incbin "baserom.gba", 0x59ef1c, 0x88
.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
.incbin "baserom.gba", 0x59efa4, 0x40
.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

View File

@ -4,7 +4,9 @@
.section .rodata
gUnknown_085EFD64:: @ 85EFD64
.incbin "baserom.gba", 0x5efd64, 0x4
.4byte 0x1F8
gUnknown_085EFD68:: @ 85EFD68
.incbin "baserom.gba", 0x5efd68, 0x18
window_template 0, 4, 15, 22, 4, 14, 20
window_template 0, 7, 6, 16, 4, 14, 0x6C
null_window_template

View File

@ -1,6 +1,16 @@
#include "constants/flags.h"
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/vars.h"
.include "asm/macros.inc"
.include "asm/macros/event.inc"
.include "constants/constants.inc"
.include "data/specials.inc"
.section .rodata
gText_MysteryGiftBerry:: @ 8674AE4
@ -34,8 +44,22 @@ gText_MysteryGiftNewTrainer:: @ 8674C31
gText_MysteryGiftCantBeUsed:: @ 8674C86
.string "This data cant be used in\nthis version.$"
gUnknown_08674CAF:: @ 8674CAF
.incbin "baserom.gba", 0x00674caf, 0x2e
.align 2
gUnknown_08674CB0:: @ 8674CB0
setvaddress gUnknown_08674CB0
setorcopyvar 0x800D, 1
specialvar 0x8008, sub_813986C
setorcopyvar 0x800D, 0
specialvar 0x8009, sub_813986C
subvar 0x8008, 32777
buffernumberstring 0, 0x8008
lock
faceplayer
vmessage gText_MysteryGiftStampCard
waitmessage
waitbuttonpress
release
end
gText_MysteryGiftStampCard::
.string "Thank you for using the STAMP CARD\nSystem.\pYou have {STR_VAR_1} more to collect to\nfill your STAMP CARD.$"

View File

@ -300,10 +300,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "in hearing my epic tales of legendary\l"
.string "TRAINERS.$"
MauvilleCity_PokemonCenter_1F_Text_28E930:: @ 828E930
.string "The Save-Happy TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_28E947:: @ 828E947
.string "Saved the game$"
MauvilleCity_PokemonCenter_1F_Text_28E956:: @ 828E956
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER saved the game\n"
@ -311,10 +314,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "A more cautious TRAINER than\n"
.string "{STR_VAR_3} one will never find!$"
MauvilleCity_PokemonCenter_1F_Text_28E9D7:: @ 828E9D7
.string "The Trendsetter TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_28E9EF:: @ 828E9EF
.string "Started trends$"
MauvilleCity_PokemonCenter_1F_Text_28E9FE:: @ 828E9FE
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER started new trends\n"
@ -322,10 +328,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3} is setting trends for all\n"
.string "the HOENN region!$"
.string "The BERRY-Planting TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_28EA7D:: @ 828EA7D
.string "The BERRY-Planting TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_28EA98:: @ 828EA98
.string "Planted BERRIES$"
MauvilleCity_PokemonCenter_1F_Text_28EAA8:: @ 828EAA8
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER planted BERRIES\n"
@ -333,10 +342,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3} is a legendary lover of\n"
.string "BERRIES!$"
MauvilleCity_PokemonCenter_1F_Text_28EB19:: @ 828EB19
.string "The BIKE-Loving TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_28EB31:: @ 828EB31
.string "Traded BIKES$"
MauvilleCity_PokemonCenter_1F_Text_28EB3E:: @ 828EB3E
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER swapped BIKES\n"
@ -344,10 +356,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3} must love BIKES deeply\n"
.string "and passionately!$"
MauvilleCity_PokemonCenter_1F_Text_28EBB5:: @ 828EBB5
.string "The Interviewed TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_28EBCD:: @ 828EBCD
.string "Got interviewed$"
MauvilleCity_PokemonCenter_1F_Text_28EBDD:: @ 828EBDD
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER got interviewed\n"
@ -355,20 +370,26 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3} must be a TRAINER whos\n"
.string "attracting much attention!$"
MauvilleCity_PokemonCenter_1F_Text_28EC60:: @ 828EC60
.string "The Battle-Happy TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_28EC79:: @ 828EC79
.string "Battled$"
MauvilleCity_PokemonCenter_1F_Text_28EC81:: @ 828EC81
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER battled {STR_VAR_1} times!\p"
.string "{STR_VAR_3} must be a TRAINER who can\n"
.string "never refuse a chance to battle!$"
MauvilleCity_PokemonCenter_1F_Text_28ED04:: @ 828ED04
.string "The POKéMON-Catching TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_28ED21:: @ 828ED21
.string "Caught POKéMON$"
MauvilleCity_PokemonCenter_1F_Text_28ED30:: @ 828ED30
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER caught\n"
@ -376,10 +397,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3} is a legendary catcher of\n"
.string "wild POKéMON!$"
MauvilleCity_PokemonCenter_1F_Text_28EDA1:: @ 828EDA1
.string "The Fishing TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_28EDB5:: @ 828EDB5
.string "Caught POKéMON with a ROD$"
MauvilleCity_PokemonCenter_1F_Text_28EDCF:: @ 828EDCF
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER caught\n"
@ -387,10 +411,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3} is a legendary fishing\n"
.string "expert!$"
MauvilleCity_PokemonCenter_1F_Text_28EE45:: @ 828EE45
.string "The EGG-Warming TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_28EE5D:: @ 828EE5D
.string "Hatched EGGS$"
MauvilleCity_PokemonCenter_1F_Text_28EE6A:: @ 828EE6A
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER hatched {STR_VAR_1} POKéMON\n"
@ -398,10 +425,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3} is a legendary warmer\n"
.string "of EGGS!$"
MauvilleCity_PokemonCenter_1F_Text_28EEDD:: @ 828EEDD
.string "The Evolver TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_28EEF1:: @ 828EEF1
.string "Evolved POKéMON$"
MauvilleCity_PokemonCenter_1F_Text_28EF01:: @ 828EF01
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER made {STR_VAR_1} POKéMON\n"
@ -409,10 +439,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3} is the ultimate evolver\n"
.string "of POKéMON!$"
MauvilleCity_PokemonCenter_1F_Text_28EF73:: @ 828EF73
.string "The POKéMON CENTER-Loving TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_28EF95:: @ 828EF95
.string "Used POKéMON CENTERS$"
MauvilleCity_PokemonCenter_1F_Text_28EFAA:: @ 828EFAA
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER healed POKéMON\n"
@ -420,10 +453,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "There could be no greater lover of\n"
.string "POKéMON CENTERS than {STR_VAR_3}!$"
MauvilleCity_PokemonCenter_1F_Text_28F045:: @ 828F045
.string "The Homebody TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_28F05A:: @ 828F05A
.string "Rested POKéMON at home$"
MauvilleCity_PokemonCenter_1F_Text_28F071:: @ 828F071
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER healed POKéMON\n"
@ -431,10 +467,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "There could be no more of a homebody\n"
.string "than {STR_VAR_3}!$"
MauvilleCity_PokemonCenter_1F_Text_28F0F3:: @ 828F0F3
.string "The SAFARI-Loving TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_28F10D:: @ 828F10D
.string "Entered the SAFARI ZONE$"
MauvilleCity_PokemonCenter_1F_Text_28F125:: @ 828F125
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER went into the SAFARI ZONE\n"
@ -442,10 +481,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3} is a TRAINER whose wild side\n"
.string "must come out in the SAFARI ZONE!$"
MauvilleCity_PokemonCenter_1F_Text_28F1BE:: @ 828F1BE
.string "The CUT-Frenzy TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_28F1D5:: @ 828F1D5
.string "Used CUT$"
MauvilleCity_PokemonCenter_1F_Text_28F1DE:: @ 828F1DE
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER used CUT\n"
@ -453,10 +495,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3} is a TRAINER who just must\n"
.string "love to CUT!$"
MauvilleCity_PokemonCenter_1F_Text_28F24F:: @ 828F24F
.string "The ROCK-SMASHING TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_28F269:: @ 828F269
.string "Smashed rocks$"
MauvilleCity_PokemonCenter_1F_Text_28F277:: @ 828F277
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER used ROCK SMASH\n"
@ -464,10 +509,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3} must be a TRAINER who\n"
.string "cant leave a stone unsmashed!$"
MauvilleCity_PokemonCenter_1F_Text_28F2FC:: @ 828F2FC
.string "The Move-Loving TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_28F314:: @ 828F314
.string "Moved the SECRET BASE$"
MauvilleCity_PokemonCenter_1F_Text_28F32A:: @ 828F32A
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER moved the SECRET BASE\n"
@ -475,10 +523,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3} is a TRAINER who loves\n"
.string "to move houses often!$"
MauvilleCity_PokemonCenter_1F_Text_28F3AD:: @ 828F3AD
.string "The SPLASH-Happy TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_28F3C6:: @ 828F3C6
.string "Used SPLASH$"
MauvilleCity_PokemonCenter_1F_Text_28F3D2:: @ 828F3D2
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER used SPLASH\n"
@ -486,10 +537,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3} is a TRAINER who must love\n"
.string "SPLASHING around!$"
MauvilleCity_PokemonCenter_1F_Text_28F44B:: @ 828F44B
.string "The Tenacious TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_28F461:: @ 828F461
.string "Resorted to using STRUGGLE$"
MauvilleCity_PokemonCenter_1F_Text_28F47C:: @ 828F47C
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER had to rely on STRUGGLE\n"
@ -497,10 +551,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3} is a tenacious TRAINER\n"
.string "who never gives in to adversity!$"
MauvilleCity_PokemonCenter_1F_Text_28F50C:: @ 828F50C
.string "The SLOT Champ$"
MauvilleCity_PokemonCenter_1F_Text_28F51B:: @ 828F51B
.string "Won the jackpot on the SLOTS$"
MauvilleCity_PokemonCenter_1F_Text_28F538:: @ 828F538
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER won the jackpot on\n"
@ -508,10 +565,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3} is a TRAINER who was lucky\n"
.string "on the SLOTS!$"
MauvilleCity_PokemonCenter_1F_Text_28F5BE:: @ 828F5BE
.string "The ROULETTE Champ$"
MauvilleCity_PokemonCenter_1F_Text_28F5D1:: @ 828F5D1
.string "Had consecutive ROULETTE wins of$"
MauvilleCity_PokemonCenter_1F_Text_28F5F2:: @ 828F5F2
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER won in ROULETTE\n"
@ -519,10 +579,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3} was lucky when the ball\n"
.string "bounced in ROULETTE!$"
MauvilleCity_PokemonCenter_1F_Text_28F678:: @ 828F678
.string "The BATTLE TOWER Challenger$"
MauvilleCity_PokemonCenter_1F_Text_28F694:: @ 828F694
.string "Took the BATTLE TOWER challenge$"
MauvilleCity_PokemonCenter_1F_Text_28F6B4:: @ 828F6B4
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER took the BATTLE TOWER\n"
@ -530,10 +593,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3} is a TRAINER who aspires\n"
.string "for excellence in the BATTLE TOWER!$"
MauvilleCity_PokemonCenter_1F_Text_28F751:: @ 828F751
.string "The Blend-Loving TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_28F76A:: @ 828F76A
.string "Made {POKEBLOCK}S$"
MauvilleCity_PokemonCenter_1F_Text_28F776:: @ 828F776
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER made {POKEBLOCK}S\n"
@ -541,10 +607,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "There is none better at using a BERRY\n"
.string "BLENDER than {STR_VAR_3}!$"
MauvilleCity_PokemonCenter_1F_Text_28F7F6:: @ 828F7F6
.string "The CONTEST-Loving TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_28F811:: @ 828F811
.string "Entered CONTESTS$"
MauvilleCity_PokemonCenter_1F_Text_28F822:: @ 828F822
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER entered CONTESTS\n"
@ -552,10 +621,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3} must love showing off\n"
.string "POKéMON to others!$"
MauvilleCity_PokemonCenter_1F_Text_28F89C:: @ 828F89C
.string "The CONTEST Master$"
MauvilleCity_PokemonCenter_1F_Text_28F8AF:: @ 828F8AF
.string "Won CONTESTS$"
MauvilleCity_PokemonCenter_1F_Text_28F8BC:: @ 828F8BC
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER won CONTESTS\n"
@ -563,10 +635,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3} must be an incredible\n"
.string "CONTEST master!$"
MauvilleCity_PokemonCenter_1F_Text_28F92F:: @ 828F92F
.string "The Happy Shopper$"
MauvilleCity_PokemonCenter_1F_Text_28F941:: @ 828F941
.string "Shopped$"
MauvilleCity_PokemonCenter_1F_Text_28F949:: @ 828F949
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER bought items in shops\n"
@ -574,10 +649,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3} must be one of those\n"
.string "people who are born to shop.$"
MauvilleCity_PokemonCenter_1F_Text_28F9D1:: @ 828F9D1
.string "The Item-Finding TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_28F9EA:: @ 828F9EA
.string "Used an ITEMFINDER$"
MauvilleCity_PokemonCenter_1F_Text_28F9FD:: @ 828F9FD
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER used an ITEMFINDER\n"
@ -585,10 +663,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3} must enjoy scouring the\n"
.string "ground for hidden items!$"
MauvilleCity_PokemonCenter_1F_Text_28FA81:: @ 828FA81
.string "The Rain-Soaked TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_28FA99:: @ 828FA99
.string "Got rained on$"
MauvilleCity_PokemonCenter_1F_Text_28FAA7:: @ 828FAA7
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER got soaked by rain\n"
@ -596,10 +677,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3}s charisma must even\n"
.string "attract rain!$"
MauvilleCity_PokemonCenter_1F_Text_28FB1D:: @ 828FB1D
.string "The Avid POKéDEX Reader$"
MauvilleCity_PokemonCenter_1F_Text_28FB35:: @ 828FB35
.string "Checked a POKéDEX$"
MauvilleCity_PokemonCenter_1F_Text_28FB47:: @ 828FB47
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER checked a POKéDEX\n"
@ -607,10 +691,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3} must love inspecting\n"
.string "POKéMON in a POKéDEX!$"
MauvilleCity_PokemonCenter_1F_Text_28FBC4:: @ 828FBC4
.string "The RIBBON Collector$"
MauvilleCity_PokemonCenter_1F_Text_28FBD9:: @ 828FBD9
.string "Received RIBBONS$"
MauvilleCity_PokemonCenter_1F_Text_28FBEA:: @ 828FBEA
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER received RIBBONS\n"
@ -618,10 +705,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3} must be a TRAINER who\n"
.string "loves to collect RIBBONS!$"
MauvilleCity_PokemonCenter_1F_Text_28FC6B:: @ 828FC6B
.string "The Ledge-Jumping TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_28FC85:: @ 828FC85
.string "Jumped down ledges$"
MauvilleCity_PokemonCenter_1F_Text_28FC98:: @ 828FC98
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER jumped down ledges\n"
@ -629,20 +719,26 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "If theres a ledge to be jumped,\n"
.string "{STR_VAR_3} cant ignore it!$"
MauvilleCity_PokemonCenter_1F_Text_28FD1D:: @ 828FD1D
.string "The Legendary TV Viewer$"
MauvilleCity_PokemonCenter_1F_Text_28FD35:: @ 828FD35
.string "Watched TV$"
MauvilleCity_PokemonCenter_1F_Text_28FD40:: @ 828FD40
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER watched TV\n"
.string "{STR_VAR_1} times!\p"
.string "{STR_VAR_3} must love watching TV!$"
MauvilleCity_PokemonCenter_1F_Text_28FDA2:: @ 828FDA2
.string "The Time-Conscious TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_28FDBD:: @ 828FDBD
.string "Checked the time$"
MauvilleCity_PokemonCenter_1F_Text_28FDCE:: @ 828FDCE
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER checked the time\n"
@ -650,10 +746,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3} must be a punctual TRAINER\n"
.string "whos conscious of the time.$"
MauvilleCity_PokemonCenter_1F_Text_28FE57:: @ 828FE57
.string "The POKéMON LOTTERY Wizard$"
MauvilleCity_PokemonCenter_1F_Text_28FE72:: @ 828FE72
.string "Won POKéMON LOTTERIES$"
MauvilleCity_PokemonCenter_1F_Text_28FE88:: @ 828FE88
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER won POKéMON LOTTERIES\n"
@ -661,10 +760,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3} must have many friends\n"
.string "to trade POKéMON with!$"
MauvilleCity_PokemonCenter_1F_Text_28FF0C:: @ 828FF0C
.string "The DAY CARE-Using Trainer$"
MauvilleCity_PokemonCenter_1F_Text_28FF27:: @ 828FF27
.string "Left POKéMON at the DAY CARE$"
MauvilleCity_PokemonCenter_1F_Text_28FF44:: @ 828FF44
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER left POKéMON with the\n"
@ -672,10 +774,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3} must be a real go-getter\n"
.string "who raises POKéMON aggressively!$"
MauvilleCity_PokemonCenter_1F_Text_28FFDD:: @ 828FFDD
.string "The CABLE CAR-Loving TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_28FFFA:: @ 828FFFA
.string "Rode the CABLE CAR$"
MauvilleCity_PokemonCenter_1F_Text_29000D:: @ 829000D
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER rode the CABLE CAR\n"
@ -683,10 +788,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3} must be a busy TRAINER\n"
.string "whos up and down all the time!$"
MauvilleCity_PokemonCenter_1F_Text_290097:: @ 8290097
.string "The Hot Spring-Loving TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_2900B5:: @ 82900B5
.string "Bathed in hot springs$"
MauvilleCity_PokemonCenter_1F_Text_2900CB:: @ 82900CB
.string "This is a tale of a TRAINER\n"
.string "named {STR_VAR_3}.\p"
.string "This TRAINER bathed in hot springs\n"
@ -694,6 +802,7 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
.string "{STR_VAR_3} must be a TRAINER with\n"
.string "baby-smooth skin!$"
MauvilleCity_PokemonCenter_1F_EventScript_29014A:: @ 829014A
lock
faceplayer

View File

@ -1,3 +1,5 @@
#ifndef GUARD_SPECIALS_H
#define GUARD_SPECIALS_H
.macro def_special ptr
.set SPECIAL_\ptr, __special__
.set __special__, __special__ + 1
@ -534,3 +536,4 @@ gSpecials:: @ 81DBA64
def_special sub_813C5A0
def_special sub_8139C10
def_special sub_80B3BC4
#endif

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
0 0 0
238 255 255
65 65 123
255 255 255
180 222 255
139 172 213
98 123 172
57 74 131
16 24 90
180 222 255
139 172 213
98 123 172
57 74 131
16 24 90
255 255 255

Binary file not shown.

After

Width:  |  Height:  |  Size: 412 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 461 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 509 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 494 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 201 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 201 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 407 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 407 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 304 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 485 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 338 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 391 B

BIN
graphics/interface/red_arrow.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 197 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 135 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 156 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 130 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 175 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 231 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 228 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 230 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 232 B

BIN
graphics/misc/mon_markings.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 489 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
255 255 255
0 0 0
65 65 65
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

View File

@ -18,6 +18,7 @@ SLOTMACHINEGFXDIR := graphics/slot_machine
PKNAVGFXDIR := graphics/pokenav
PKNAVOPTIONSGFXDIR := graphics/pokenav/options
PSSGFXDIR := graphics/pokemon_storage
MAPOBJGFXDIR := graphics/map_objects
types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark
contest_types := cool beauty cute smart tough
@ -629,6 +630,12 @@ $(PSSGFXDIR)/ludicolo.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/ludico
$(PSSGFXDIR)/whiscash.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/whiscash_bg.4bpp
@cat $^ >$@
$(MAPOBJGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 11
$(MENUGFXDIR)/selector_outline.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 8
$(PKNAVOPTIONSGFXDIR)/options.4bpp: $(PKNAVOPTIONSGFXDIR)/hoenn_map.4bpp \
$(PKNAVOPTIONSGFXDIR)/condition.4bpp \
$(PKNAVOPTIONSGFXDIR)/match_call.4bpp \

View File

@ -240,30 +240,6 @@ static const struct MailLayout sUnknown_0859F458[] = {
{ 0x05, 0x09, 0x60, 0x05, 0x1e, Unknown_0859F444 }
};
// What the heck are these meant to be? Call them u16 for now.
static const u16 Unknown_0859F4E8[] = {
0x00, 0x4000, 0x00, 0x00
};
static const u16 Unknown_0859F4F0[] = {
0x00, 0x00, -1, 0x00
};
static const u16 Unknown_0859F4F8[] = {
0x04, 0x00, -1, 0x00
};
static const u16 Unknown_0859F500[] = {
0x00, 0x40, -1, 0x00
};
static const u16 *const sUnknown_0859F508[] = {
Unknown_0859F4F0,
Unknown_0859F4F8,
Unknown_0859F500
};
// .text
void ReadMail(struct MailStruct *mail, void (*callback)(void), bool8 flag)