Merge branch 'master' of https://github.com/pret/pokeemerald into dump_slot_machine.s

This commit is contained in:
golem galvanize
2018-01-16 21:53:55 -05:00
59 changed files with 7185 additions and 13540 deletions
+605 -606
View File
File diff suppressed because it is too large Load Diff
-784
View File
@@ -1,784 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
sBigPokeball_Tileset:: @ 85B9330
.incbin "graphics/battle_transitions/big_pokeball.4bpp"
.align 2
sPokeballTrail_Tileset:: @ 85B98B0
.incbin "graphics/battle_transitions/pokeball_trail.4bpp"
.align 2
sSpriteImage_85B98F0:: @ 85B98F0
.incbin "graphics/battle_transitions/pokeball.4bpp"
.align 2
sUnknown_085B9AF0:: @ 85B9AF0
.incbin "graphics/battle_transitions/elite_four_bg.4bpp"
.align 2
sSpriteImage_85B9CD0:: @ 85B9CD0
.incbin "graphics/battle_transitions/unused_brendan.4bpp"
.align 2
sSpriteImage_85BA4D0:: @ 85BA4D0
.incbin "graphics/battle_transitions/unused_lass.4bpp"
.align 2
sShrinkingBoxTileset:: @ 85BACD0
.incbin "graphics/battle_transitions/shrinking_box.4bpp"
.align 2
sEvilTeam_Palette:: @ 85BAEB0
.incbin "graphics/battle_transitions/evil_team.gbapal"
.align 2
sTeamAqua_Tileset:: @ 85BAED0
.incbin "graphics/battle_transitions/team_aqua.4bpp.lz"
.align 2
sTeamAqua_Tilemap:: @ 85BB248
.incbin "graphics/battle_transitions/team_aqua.bin.lz"
.align 2
sTeamMagma_Tileset:: @ 85BB4A4
.incbin "graphics/battle_transitions/team_magma.4bpp.lz"
.align 2
sTeamMagma_Tilemap:: @ 85BB930
.incbin "graphics/battle_transitions/team_magma.bin.lz"
.align 2
gUnknown_085BBC14:: @ 85BBC14
.incbin "graphics/battle_transitions/85BBC14.4bpp"
.align 2
gUnknown_085BC2B4:: @ 85BC2B4
.incbin "graphics/battle_transitions/85BC2B4.gbapal"
.align 2
gUnknown_085BC2D4:: @ 85BC2D4
.incbin "graphics/battle_transitions/85BC2D4.gbapal"
.align 2
gUnknown_085BC2F4:: @ 85BC2F4
.incbin "graphics/battle_transitions/85BC2F4.gbapal"
.align 2
gUnknown_085BC314:: @ 85BC314
.incbin "graphics/battle_transitions/85BC314.bin"
.align 2
gUnknown_085BCB14:: @ 85BCB14
.incbin "graphics/battle_transitions/85BCB14.bin"
.align 2
gUnknown_085BD314:: @ 85BD314
.incbin "graphics/battle_transitions/85BD314.bin"
.align 2
gUnknown_085BDB14:: @ 85BDB14
.incbin "graphics/battle_transitions/85BDB14.gbapal"
.align 2
gUnknown_085BDB34:: @ 85BDB34
.incbin "graphics/battle_transitions/kyogre.4bpp.lz"
.align 2
gUnknown_085BE1E8:: @ 85BE1E8
.incbin "graphics/battle_transitions/kyogre.bin.lz"
.align 2
gUnknown_085BE51C:: @ 85BE51C
.incbin "graphics/battle_transitions/groudon.4bpp.lz"
.align 2
gUnknown_085BEA88:: @ 85BEA88
.incbin "graphics/battle_transitions/groudon.bin.lz"
.align 2
gUnknown_085BEDA0:: @ 85BEDA0
.incbin "graphics/battle_transitions/kyogre_pt1.gbapal"
.align 2
gUnknown_085BEEE0:: @ 85BEEE0
.incbin "graphics/battle_transitions/kyogre_pt2.gbapal"
.align 2
gUnknown_085BF0A0:: @ 85BF0A0
.incbin "graphics/battle_transitions/groudon_pt1.gbapal"
.align 2
gUnknown_085BF2A0:: @ 85BF2A0
.incbin "graphics/battle_transitions/groudon_pt2.gbapal"
.align 2
gUnknown_085BF4A0:: @ 85BF4A0
.incbin "graphics/battle_transitions/rayquaza.gbapal"
.align 2
gUnknown_085BF6A0:: @ 85BF6A0
.incbin "graphics/battle_transitions/rayquaza.4bpp"
.align 2
gUnknown_085C6BE0:: @ 85C6BE0
.incbin "graphics/battle_transitions/rayquaza.bin"
.align 2
gUnknown_085C7BE0:: @ 85C7BE0
.incbin "graphics/battle_transitions/frontier_brain.gbapal"
.align 2
gUnknown_085C7C00:: @ 85C7C00
.incbin "graphics/battle_transitions/frontier_brain.4bpp.lz"
.align 2
gUnknown_085C828C:: @ 85C828C
.incbin "graphics/battle_transitions/frontier_brain.bin.lz"
.align 2
gUnknown_085C8578:: @ 85C8578
.incbin "graphics/battle_transitions/frontier_squares_blanktiles.gbapal"
.align 2
gUnknown_085C8598:: @ 85C8598
.incbin "graphics/battle_transitions/frontier_square_1.4bpp.lz"
.align 2
gUnknown_085C86F4:: @ 85C86F4
.incbin "graphics/battle_transitions/frontier_square_2.4bpp.lz"
.align 2
gUnknown_085C87F4:: @ 85C87F4
.incbin "graphics/battle_transitions/frontier_square_3.4bpp.lz"
.align 2
gUnknown_085C88A4:: @ 85C88A4
.incbin "graphics/battle_transitions/frontier_square_4.4bpp.lz"
.align 2
gUnknown_085C8928:: @ 85C8928
.incbin "graphics/battle_transitions/frontier_squares.bin"
.align 2
sPhase1_Tasks:: @ 85C8948
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.align 2
sPhase2_Tasks:: @ 85C89F0
.4byte sub_814610C
.4byte sub_8146204
.4byte sub_8146384
.4byte sub_8146514
.4byte sub_8146F94
.4byte sub_8147204
.4byte sub_8147718
.4byte sub_81478EC
.4byte sub_81484D0
.4byte sub_8149578
.4byte sub_814995C
.4byte sub_8149A6C
.4byte sub_8147AE4
.4byte sub_8147B04
.4byte sub_8147B24
.4byte sub_8147B44
.4byte sub_8147B64
.4byte sub_814654C
.4byte sub_8146584
.4byte sub_81465BC
.4byte sub_81465F4
.4byte sub_814662C
.4byte sub_8146664
.4byte sub_8149140
.4byte sub_814927C
.4byte sub_8148760
.4byte sub_8148B54
.4byte sub_8148B8C
.4byte sub_8148E54
.4byte sub_814A3BC
.4byte sub_814A3F4
.4byte sub_814A6F0
.4byte sub_814A760
.4byte sub_814A728
.4byte sub_81DABDC
.4byte sub_81DACB4
.4byte sub_81DAD8C
.4byte sub_81DAE78
.4byte sub_81DAF68
.4byte sub_81DB060
.4byte sub_81DB158
.4byte sub_81DB258
.align 2
sMainTransitionPhases:: @ 85C8A98
.4byte sub_8145FE0
.4byte sub_8146030
.4byte sub_8146064
.4byte sub_814608C
.align 2
sPhase2_Transition_Blur_Funcs:: @ 85C8AA8
.4byte sub_8146144
.4byte sub_8146178
.4byte sub_81461D8
.align 2
sPhase2_Transition_Swirl_Funcs:: @ 85C8AB4
.4byte sub_814623C
.4byte sub_81462A8
.align 2
sPhase2_Transition_Shuffle_Funcs:: @ 85C8ABC
.4byte sub_81463BC
.4byte sub_8146420
.align 2
gUnknown_085C8AC4:: @ 85C8AC4
.4byte sub_814670C
.4byte sub_81468E4
.4byte sub_8146BF8
.4byte sub_8146C8C
.4byte sub_8146D20
.4byte sub_8146D90
.4byte sub_8146DF8
.align 2
gUnknown_085C8AE0:: @ 85C8AE0
.4byte sub_8146760
.4byte sub_814692C
.4byte sub_8146BF8
.4byte sub_8146C8C
.4byte sub_8146D20
.4byte sub_8146D90
.4byte sub_8146DF8
.align 2
gUnknown_085C8AFC:: @ 85C8AFC
.4byte sub_8146800
.4byte sub_8146854
.4byte sub_8146BF8
.4byte sub_8146C8C
.4byte sub_8146D20
.4byte sub_8146DF8
.align 2
gUnknown_085C8B14:: @ 85C8B14
.4byte sub_81467B4
.4byte sub_8146974
.4byte sub_8146BF8
.4byte sub_8146C8C
.4byte sub_8146D20
.4byte sub_8146DF8
.align 2
gUnknown_085C8B2C:: @ 85C8B2C
.4byte sub_81467B4
.4byte sub_81469CC
.4byte sub_8146BF8
.4byte sub_8146C8C
.4byte sub_8146D20
.4byte sub_8146DF8
.align 2
gUnknown_085C8B44:: @ 85C8B44
.4byte sub_81467B4
.4byte sub_8146A24
.4byte sub_8146BF8
.4byte sub_8146C8C
.4byte sub_8146D20
.4byte sub_8146DF8
.align 2
gUnknown_085C8B5C:: @ 85C8B5C
.4byte sub_8146DAC
.4byte sub_8146DD8
.4byte sub_8146A7C
.4byte sub_8146AC8
.4byte sub_8146B24
.4byte sub_8146D90
.4byte sub_8146B7C
.4byte sub_8146BA8
.align 2
sPhase2_Transition_PokeballsTrail_Funcs:: @ 85C8B7C
.4byte sub_8146FCC
.4byte sub_8147018
.4byte sub_81470A4
.align 1
sUnknown_085C8B88:: @ 85C8B88
.2byte 0xfff0, 0x0100
.align 1
sUnknown_085C8B8C:: @ 85C8B8C
.2byte 0x0000, 0x0020, 0x0040, 0x0012, 0x0030
.align 1
sUnknown_085C8B96:: @ 85C8B96
.2byte 0x0008, 0xfff8, 0x0000
.align 2
sPhase2_Transition_Clockwise_BlackFade_Funcs:: @ 85C8B9C
.4byte sub_814723C
.4byte sub_81472A4
.4byte sub_8147334
.4byte sub_8147428
.4byte sub_81474B0
.4byte sub_81475B0
.4byte sub_8147648
.align 2
sPhase2_Transition_Ripple_Funcs:: @ 85C8BB8
.4byte sub_8147750
.4byte sub_81477A8
.align 2
sPhase2_Transition_Wave_Funcs:: @ 85C8BC0
.4byte sub_8147924
.4byte sub_814797C
.4byte sub_8147A18
.align 2
sPhase2_Mugshot_Transition_Funcs:: @ 85C8BCC
.4byte sub_8147BBC
.4byte sub_8147C24
.4byte sub_8147CE4
.4byte sub_8147DD0
.4byte sub_8147E4C
.4byte sub_8147E88
.4byte sub_8147F40
.4byte sub_8148008
.4byte sub_8148040
.4byte sub_814808C
sMugshotsTrainerPicIDsTable:: @ 85C8BF4
.byte 0x24, 0x25, 0x26, 0x27, 0x36, 0x00
.align 1
sMugshotsOpponentRotationScales:: @ 85C8BFA
.2byte 0x0200, 0x0200, 0x0200, 0x0200, 0x01b0, 0x01b0, 0x01a0, 0x01a0, 0x0188, 0x0188
.align 1
sMugshotsOpponentCoords:: @ 85C8C0E
.2byte 0x0000, 0x0000, 0x0000, 0x0000, 0xfffc, 0x0004, 0x0000, 0x0005, 0xfff8, 0x0007, 0x0000
.align 2
sUnknown_085C8C24:: @ 85C8C24
.4byte sub_81483A8
.4byte sub_81483AC
.4byte sub_81483F8
.4byte sub_814842C
.4byte sub_81483A8
.4byte sub_8148458
.4byte sub_81483A8
.align 1
sUnknown_085C8C40:: @ 85C8C40
.2byte 0x000c, 0xfff4
.align 1
sUnknown_085C8C44:: @ 85C8C44
.2byte 0xffff, 0x0001
.align 2
gUnknown_085C8C48:: @ 85C8C48
.4byte sub_8148508
.4byte sub_8148590
.4byte sub_814865C
.align 2
gUnknown_085C8C54:: @ 85C8C54
.4byte sub_8148798
.4byte sub_8148864
.4byte sub_8148AD4
.4byte sub_8148B14
.align 1
gUnknown_085C8C64:: @ 85C8C64
.2byte 0x7727
.align 1
gUnknown_085C8C66:: @ 85C8C66
.2byte 0x0001, 0xffff, 0x0000
.align 2
gUnknown_085C8C6C:: @ 85C8C6C
.4byte sub_8148BC4
.4byte sub_8148CE8
.4byte sub_8148C28
.align 2
gUnknown_085C8C78:: @ 85C8C78
.4byte sub_8148BC4
.4byte sub_8148D6C
.align 1
gUnknown_085C8C80:: @ 85C8C80
.2byte 0xfffa, 0x0004
.align 2
gUnknown_085C8C84:: @ 85C8C84
.4byte sub_8148E8C
.4byte sub_8148F4C
.4byte sub_8149008
gUnknown_085C8C90:: @ 85C8C90
.2byte 0x0001, 0x001b, 0x0113, 0xffff
gUnknown_085C8C98:: @ 85C8C98
.2byte 0x0002, 0x01e6, 0xffff
gUnknown_085C8C9E:: @ 85C8C9E
.2byte 0x0003, 0x0106, 0xffff
gUnknown_085C8CA4:: @ 85C8CA4
.2byte 0x0004, 0x01fb, 0xfffe
gUnknown_085C8CAA:: @ 85C8CAA
.2byte 0x0001, 0x00d5, 0xffff
gUnknown_085C8CB0:: @ 85C8CB0
.2byte 0x0002, 0x0224, 0xfffe
gUnknown_085C8CB6:: @ 85C8CB6
.2byte 0x0003, 0x00c4, 0xffff
gUnknown_085C8CBC:: @ 85C8CBC
.2byte 0x0004, 0x023d, 0x0135, 0xffff
gUnknown_085C8CC4:: @ 85C8CC4
.2byte 0x0001, 0x01da, 0xffff
gUnknown_085C8CCA:: @ 85C8CCA
.2byte 0x0002, 0x0127, 0x0020, 0xffff
gUnknown_085C8CD2:: @ 85C8CD2
.2byte 0x0003, 0x003a, 0xffff
gUnknown_085C8CD8:: @ 85C8CD8
.2byte 0x0004, 0x01c7, 0xffff
gUnknown_085C8CDE:: @ 85C8CDE
.2byte 0x0001, 0x021c, 0xffff
gUnknown_085C8CE4:: @ 85C8CE4
.2byte 0x0002, 0x00e5, 0xffff
gUnknown_085C8CEA:: @ 85C8CEA
.2byte 0x0003, 0x00f4, 0x001c, 0xffff
gUnknown_085C8CF2:: @ 85C8CF2
.2byte 0x0004, 0x0205, 0xffff
.align 2
gUnknown_085C8CF8:: @ 85C8CF8
.4byte gUnknown_085C8C90
.4byte gUnknown_085C8CA4
.4byte gUnknown_085C8C98
.4byte gUnknown_085C8C9E
.4byte gUnknown_085C8CEA
.4byte gUnknown_085C8CE4
.4byte gUnknown_085C8CF2
.4byte gUnknown_085C8CDE
.align 2
gUnknown_085C8D18:: @ 85C8D18
.4byte gUnknown_085C8CBC
.4byte gUnknown_085C8CB0
.4byte gUnknown_085C8CB6
.4byte gUnknown_085C8CAA
.4byte gUnknown_085C8CCA
.4byte gUnknown_085C8CD8
.4byte gUnknown_085C8CC4
.4byte gUnknown_085C8CD2
.align 2
gUnknown_085C8D38:: @ 85C8D38
.4byte gUnknown_085C8CF8
.4byte gUnknown_085C8D18
.align 2
gUnknown_085C8D40:: @ 85C8D40
.4byte sub_8146DAC
.4byte sub_8146DD8
.4byte sub_8149178
.4byte sub_81491C8
.4byte sub_8149224
.4byte sub_8146D90
.4byte sub_8146B7C
.4byte sub_8146BA8
.align 2
gUnknown_085C8D60:: @ 85C8D60
.4byte sub_8146DAC
.4byte sub_8146DD8
.4byte sub_81492B4
.4byte sub_8149358
.4byte sub_8149388
.4byte sub_81493D8
.4byte sub_8149410
.4byte sub_814943C
.4byte sub_814946C
.4byte sub_8148CE8
.4byte sub_8148C28
.align 2
gUnknown_085C8D8C:: @ 85C8D8C
.4byte sub_81495B0
.4byte sub_8149628
.4byte sub_814969C
.4byte sub_81496D8
.4byte sub_8149740
.align 1
sUnknown_085C8DA0:: @ 85C8DA0
.2byte 0x0000, 0x0014, 0x000f, 0x0028, 0x000a, 0x0019, 0x0023, 0x0005
.align 2
sUnknown_085C8DB0:: @ 85C8DB0
.4byte sub_8149994
.4byte sub_81499E8
.4byte sub_8149A40
.align 2
sPhase2_Transition_Shards_Funcs:: @ 85C8DBC
.4byte sub_8149AA4
.4byte sub_8149B08
.4byte sub_8149B84
.4byte sub_8149C60
.4byte sub_8149CCC
.align 1
sUnknown_085C8DD0:: @ 85C8DD0
.2byte 0x0038, 0x0000, 0x0000, 0x00a0, 0x0000, 0x0068, 0x00a0, 0x00f0, 0x0058, 0x0001, 0x00f0, 0x0048, 0x0038, 0x0000, 0x0001, 0x0000
.2byte 0x0020, 0x0090, 0x00a0, 0x0000, 0x0090, 0x00a0, 0x00b8, 0x0000, 0x0001, 0x0038, 0x0000, 0x00a8, 0x00a0, 0x0000, 0x00a8, 0x00a0
.2byte 0x0030, 0x0000, 0x0001
.align 1
sUnknown_085C8E16:: @ 85C8E16
.2byte 0x0008, 0x0004, 0x0002, 0x0001, 0x0001, 0x0001, 0x0000
.align 2
sPhase1_TransitionAll_Funcs:: @ 85C8E24
.4byte sub_8149E34
.4byte sub_8149E90
.align 2
sSpriteImageTable_85C8E2C:: @ 85C8E2C
obj_frame_tiles sSpriteImage_85B98F0, 0x0200
.align 2
sSpriteAnim_85C8E34:: @ 85C8E34
obj_image_anim_frame 0, 1
obj_image_anim_end
.align 2
sSpriteAnimTable_85C8E3C:: @ 85C8E3C
.4byte sSpriteAnim_85C8E34
.align 2
sSpriteAffineAnim_85C8E40:: @ 85C8E40
obj_rot_scal_anim_frame 0, 0, -4, 1
obj_rot_scal_anim_jump 0
.align 2
sSpriteAffineAnim_85C8E50:: @ 85C8E50
obj_rot_scal_anim_frame 0, 0, 4, 1
obj_rot_scal_anim_jump 0
.align 2
sSpriteAffineAnimTable_85C8E60:: @ 85C8E60
.4byte sSpriteAffineAnim_85C8E40
.4byte sSpriteAffineAnim_85C8E50
.align 2
gUnknown_085C8E68:: @ 85C8E68
spr_template 0xffff, 0x1009, gFieldObjectBaseOam_32x32, sSpriteAnimTable_85C8E3C, sSpriteImageTable_85C8E2C, sSpriteAffineAnimTable_85C8E60, sub_814713C
.align 2
gOamData_85C8E80:: @ 85C8E80
.2byte 0x0000, 0xc000, 0x0000, 0x0000
.align 2
sSpriteImageTable_85C8E88:: @ 85C8E88
obj_frame_tiles sSpriteImage_85B9CD0, 0x0800
.align 2
sSpriteImageTable_85C8E90:: @ 85C8E90
obj_frame_tiles sSpriteImage_85BA4D0, 0x0800
.align 2
sSpriteAnim_85C8E98:: @ 85C8E98
obj_image_anim_frame 0, 1
obj_image_anim_end
.align 2
sSpriteAnimTable_85C8EA0:: @ 85C8EA0
.4byte sSpriteAnim_85C8E98
.align 2
sSpriteTemplate_85C8EA4:: @ 85C8EA4
spr_template 0xffff, 0x100a, gOamData_85C8E80, sSpriteAnimTable_85C8EA0, sSpriteImageTable_85C8E88, gDummySpriteAffineAnimTable, sub_8148380
.align 2
sSpriteTemplate_85C8EBC:: @ 85C8EBC
spr_template 0xffff, 0x100a, gOamData_85C8E80, sSpriteAnimTable_85C8EA0, sSpriteImageTable_85C8E90, gDummySpriteAffineAnimTable, sub_8148380
.align 2
gFieldEffectObjectPalette10:: @ 85C8ED4
.incbin "graphics/map_objects/palettes/field_effect_object_palette_10.gbapal"
.align 2
gFieldEffectObjectPaletteInfo10:: @ 85C8EF4
obj_pal gFieldEffectObjectPalette10, 0x1009
.align 2
sMugshotPal_Sidney:: @ 85C8EFC
.incbin "graphics/battle_transitions/sidney_bg.gbapal"
.align 2
sMugshotPal_Phoebe:: @ 85C8F1C
.incbin "graphics/battle_transitions/phoebe_bg.gbapal"
.align 2
sMugshotPal_Glacia:: @ 85C8F3C
.incbin "graphics/battle_transitions/glacia_bg.gbapal"
.align 2
sMugshotPal_Drake:: @ 85C8F5C
.incbin "graphics/battle_transitions/drake_bg.gbapal"
.align 2
sMugshotPal_Wallace:: @ 85C8F7C
.incbin "graphics/battle_transitions/wallace_bg.gbapal"
.align 2
sMugshotPal_Brendan:: @ 85C8F9C
.incbin "graphics/battle_transitions/brendan_bg.gbapal"
.align 2
sMugshotPal_May:: @ 85C8EFC
.incbin "graphics/battle_transitions/may_bg.gbapal"
.align 2
sOpponentMugshotsPals:: @ 85C8FDC
.4byte sMugshotPal_Sidney
.4byte sMugshotPal_Phoebe
.4byte sMugshotPal_Glacia
.4byte sMugshotPal_Drake
.4byte sMugshotPal_Wallace
.align 2
sPlayerMugshotsPals:: @ 85C8FF0
.4byte sMugshotPal_Brendan
.4byte sMugshotPal_May
.align 2
sUnusedTrainerPalette:: @ 85C8EF8
.incbin "graphics/battle_transitions/unused_trainer.gbapal"
.align 2
sSpritePalette_UnusedTrainer:: @ 85C8EFC
obj_pal sUnusedTrainerPalette, 0x100A
.align 2
sBigPokeball_Tilemap:: @ 85C9020
.incbin "graphics/battle_transitions/big_pokeball_map.bin"
.align 2
sMugshotsTilemap:: @ 85C94D0
.incbin "graphics/battle_transitions/elite_four_bg_map.bin"
.align 2
gUnknown_085C99D0:: @ 85C99D0
.4byte sub_814A324
.4byte sub_814A374
.4byte sub_8146BF8
.4byte sub_8146C8C
.4byte sub_8146D20
.4byte sub_8146DF8
.align 2
gUnknown_085C99E8:: @ 85C99E8
.4byte sub_814A42C
.4byte sub_814A4D4
.4byte sub_814A500
.4byte sub_814A550
.align 2
gUnknown_085C99F8:: @ 85C99F8
.4byte sub_814A798
.4byte sub_814A828
.4byte sub_814A898
.4byte sub_814ABA0
.align 2
gUnknown_085C9A08:: @ 85C9A08
.4byte sub_814A960
.4byte sub_814AA04
.4byte sub_814AA84
.4byte sub_814AAB8
.4byte sub_814ABA0
.align 2
gUnknown_085C9A1C:: @ 85C9A1C
.4byte sub_814AC38
.4byte sub_814AD48
.4byte sub_814ADB4
.4byte sub_814ADD8
.4byte sub_814AE40
gUnknown_085C9A30:: @ 85C9A30
.byte 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x1b, 0x14, 0x0d, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x07, 0x0e, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x13, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x0f
.byte 0x10, 0x11, 0x12
gUnknown_085C9A53:: @ 85C9A53
.byte 0x00, 0x10, 0x29, 0x16, 0x2c, 0x02, 0x2b, 0x15, 0x2e, 0x1b, 0x09, 0x30, 0x26, 0x05, 0x39, 0x3b, 0x0c, 0x3f, 0x23, 0x1c, 0x0a, 0x35, 0x07, 0x31, 0x27, 0x17, 0x37, 0x01, 0x3e, 0x11, 0x3d, 0x1e
.byte 0x06, 0x22, 0x0f, 0x33, 0x20, 0x3a, 0x0d, 0x2d, 0x25, 0x34, 0x0b, 0x18, 0x3c, 0x13, 0x38, 0x21, 0x1d, 0x32, 0x28, 0x36, 0x0e, 0x03, 0x2f, 0x14, 0x12, 0x19, 0x04, 0x24, 0x1a, 0x2a, 0x1f, 0x08
.byte 0x00
+1 -1
View File
@@ -256,7 +256,7 @@ gFieldEffectScript_Unknown44:: @ 82DBC45
gFieldEffectScript_Unknown45:: @ 82DBC4B
field_eff_loadpal gFieldEffectObjectPaletteInfo10
field_eff_callnative sub_81470D0
field_eff_callnative FldEff_Pokeball
field_eff_end
gFieldEffectScript_HeartIcon:: @ 82DBC56
+1 -174
View File
@@ -5,16 +5,12 @@
.section .rodata
gUnknown_084975C4:: @ 84975C4
@ replacing .incbin "baserom.gba", 0x004975c4, 0x10
.byte 0x01, 0x01, 0x06, 0x07, 0x08, 0x09, 0x06, 0x07, 0x08, 0x09, 0x0b, 0x0b, 0x00, 0x00, 0x00, 0x00
gUnknown_084975D4:: @ 84975D4
@ replacing .incbin "baserom.gba", 0x004975d4, 0x18
.2byte 0, 65535
.4byte gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject
spr_template 0x0000, 0xFFFF, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject
gUnknown_084975EC:: @ 84975EC
@ replacing .incbin "baserom.gba", 0x004975ec, 0xc
.4byte CameraObject_0
.4byte CameraObject_1
.4byte CameraObject_2
@@ -23,7 +19,6 @@ gUnknown_084975EC:: @ 84975EC
.include "data/graphics/field_objects/field_object_graphics.inc"
gUnknown_08505438:: @ 8505438
@ replacing .incbin "baserom.gba", 0x00505438, 0x144
.4byte FieldObjectCB_NoMovement1
.4byte FieldObjectCB_LookRandomDirections
.4byte FieldObjectCB_GoRandomDirections
@@ -107,13 +102,11 @@ gUnknown_08505438:: @ 8505438
.4byte FieldObjectCB_WalkInPlace4
gUnknown_0850557C:: @ 850557C
@ replacing .incbin "baserom.gba", 0x0050557c, 0x51
.byte 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
gUnknown_085055CD:: @ 85055CD
@ replacing .incbin "baserom.gba", 0x005055cd, 0x51
.byte 0x01, 0x01, 0x01, 0x02, 0x01, 0x03, 0x04, 0x02, 0x01, 0x03, 0x04, 0x01, 0x01, 0x01, 0x03, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x03, 0x04, 0x02, 0x04, 0x01
.byte 0x03, 0x02, 0x03, 0x01, 0x04, 0x03, 0x02, 0x04, 0x01, 0x04, 0x02, 0x03, 0x01, 0x02, 0x01, 0x03, 0x04, 0x02, 0x01, 0x03, 0x04, 0x02, 0x01, 0x03, 0x04, 0x01, 0x01, 0x02, 0x01, 0x03, 0x04, 0x01
.byte 0x01, 0x02, 0x03, 0x04, 0x01, 0x02, 0x03, 0x04, 0x01, 0x02, 0x03, 0x04, 0x01, 0x01, 0x02, 0x03, 0x04
@@ -132,7 +125,6 @@ gUnknown_085055CD:: @ 85055CD
.include "data/graphics/field_objects/field_object_anims.inc"
gUnknown_085094AC:: @ 85094AC
@ replacing .incbin "baserom.gba", 0x005094ac, 0x40
.4byte gFieldObjectImageAnimTable_QuintyPlump
.byte 1, 3, 0, 2
.4byte gFieldObjectImageAnimTable_Standard
@@ -157,7 +149,6 @@ gUnknown_085094AC:: @ 85094AC
.include "data/graphics/field_objects/field_object_graphics_info.inc"
gUnknown_0850BBC8:: @ 850BBC8
@ replacing .incbin "baserom.gba", 0x0050bbc8, 0x138
.align 2, 0
.4byte gFieldObjectPalette0
.2byte 4355
@@ -269,19 +260,15 @@ gUnknown_0850BBC8:: @ 850BBC8
.align 2, 0
Unknown_0850BCE8:: @ 0850BCE8
@ replacing .incbin "baserom.gba", 0x0050bce8, 0x8
.2byte 0x1101, 0x1101, 0x1101, 0x1101
Unknown_0850BCF0:: @ 0850BCF0
@ replacing .incbin "baserom.gba", 0x0050bcf0, 0x8
.2byte 0x1111, 0x1111, 0x1111, 0x1111
Unknown_0850BCF8:: @ 0850BCF8
@ replacing .incbin "baserom.gba", 0x0050bcf8, 0x8
.2byte 0x1115, 0x1115, 0x1115, 0x1115
gUnknown_0850BD00:: @ 850BD00
@ replacing .incbin "baserom.gba", 0x0050bd00, 0x78
.2byte 4352, 0
.4byte Unknown_0850BCE8
.2byte 4368, 0
@@ -292,51 +279,39 @@ gUnknown_0850BD00:: @ 850BD00
.4byte NULL
Unknown_0850BD20:: @ 0850BD20
@ replacing .incbin "baserom.gba", 0x0050bd20, 0x8
.2byte 0x110c, 0x110c, 0x110c, 0x110c
Unknown_0850BD28:: @ 0x0850bd28
@ replacing .incbin "baserom.gba", 0x0050bd28, 0x8
.2byte 0x110d, 0x110d, 0x110d, 0x110d
Unknown_0850BD30:: @ 0x0850bd30
@ replacing .incbin "baserom.gba", 0x0050bd30, 0x8
.2byte 0x110e, 0x110e, 0x110e, 0x110e
Unknown_0850BD38:: @ 0x0850bd38
@ replacing .incbin "baserom.gba", 0x0050bd38, 0x8
.2byte 0x1112, 0x1112, 0x1112, 0x1112
Unknown_0850BD40:: @ 0x0850bd40
@ replacing .incbin "baserom.gba", 0x0050bd40, 0x8
.2byte 0x1113, 0x1113, 0x1113, 0x1113
Unknown_0850BD48:: @ 0x0850bd48
@ replacing .incbin "baserom.gba", 0x0050bd48, 0x8
.2byte 0x1114, 0x1114, 0x1114, 0x1114
Unknown_0850BD50:: @ 0x0850bd50
@ replacing .incbin "baserom.gba", 0x0050bd50, 0x8
.2byte 0x111b, 0x111b, 0x111b, 0x111b
Unknown_0850BD58:: @ 0x0850bd58
@ replacing .incbin "baserom.gba", 0x0050bd58, 0x8
.2byte 0x1117, 0x1117, 0x1117, 0x1117
Unknown_0850BD60:: @ 0x0850bd60
@ replacing .incbin "baserom.gba", 0x0050bd60, 0x8
.2byte 0x1119, 0x1119, 0x1119, 0x1119
Unknown_0850BD68:: @ 0x0850bd68
@ replacing .incbin "baserom.gba", 0x0050bd68, 0x8
.2byte 0x1109, 0x1109, 0x1109, 0x1109
Unknown_0850BD70:: @ 0x0850bd70
@ replacing .incbin "baserom.gba", 0x0050bd70, 0x8
.2byte 0x111d, 0x111d, 0x111d, 0x111d
gUnknown_0850BD78:: @ 850BD78
@ replacing .incbin "baserom.gba", 0x0050bd78, 0xc0
.2byte 4352, 0
.4byte Unknown_0850BCE8
.2byte 4368, 0
@@ -367,7 +342,6 @@ gUnknown_0850BD78:: @ 850BD78
.4byte NULL
gUnknown_0850BDE8:: @ 850BDE8
@ replacing .incbin "baserom.gba", 0x0050bde8, 0x50
.2byte 0x1100, 0x1101, 0x1103, 0x1104, 0x1105, 0x1106, 0x1107, 0x1108, 0x1109, 0x110a
gUnknown_0850BDFC::
.2byte 0x1100, 0x1101, 0x1103, 0x1104, 0x1105, 0x1106, 0x1107, 0x1108, 0x1109, 0x110a
@@ -377,7 +351,6 @@ gUnknown_0850BE24::
.2byte 0x1100, 0x1101, 0x1103, 0x1104, 0x1105, 0x1106, 0x1107, 0x1108, 0x1109, 0x110a
gUnknown_0850BE38:: @ 850BE38
@ replacing .incbin "baserom.gba", 0x0050be38, 0x10
.4byte gUnknown_0850BDE8
.4byte gUnknown_0850BDFC
.4byte gUnknown_0850BE10
@@ -389,22 +362,18 @@ gUnknown_0850BE38:: @ 850BE38
@ 850C9C0
.include "data/graphics/field_objects/field_effect_objects.inc"
@ replacing .incbin "baserom.gba", 0x0050d6d4, 0x8
.align 2, 0
.4byte gFieldObjectPalette2
.2byte 4113
.align 2, 0
gUnknown_0850D6DC:: @ 850D6DC
@ replacing .incbin "baserom.gba", 0x0050d6dc, 0x10
.2byte 0x0020, 0x0040, 0x0060, 0x0080, 0x0020, 0x0040, 0x0080, 0x00c0
gUnknown_0850D6EC:: @ 850D6EC
@ replacing .incbin "baserom.gba", 0x0050d6ec, 0x8
.2byte 0x0020, 0x0030, 0x0040, 0x0050
gUnknown_0850D6F4:: @ 850D6F4
@ replacing .incbin "baserom.gba", 0x0050d6f4, 0x1c
.4byte sub_808F44C
.4byte sub_808F460
.4byte sub_808F48C
@@ -414,11 +383,9 @@ gUnknown_0850D6F4:: @ 850D6F4
.4byte sub_808F564
gUnknown_0850D710:: @ 850D710
@ replacing .incbin "baserom.gba", 0x0050d710, 0x4
.byte 0x01, 0x02, 0x03, 0x04
gUnknown_0850D714:: @ 850D714
@ replacing .incbin "baserom.gba", 0x0050d714, 0x2c
.4byte GetRegularRunningPastFacingDirection
.4byte GetNorthSouthRunningPastFacingDirection
.4byte GetEastWestRunningPastFacingDirection
@@ -432,7 +399,6 @@ gUnknown_0850D714:: @ 850D714
.4byte GetNonNorthRunningPastFacingDirection
gUnknown_0850D740:: @ 850D740
@ replacing .incbin "baserom.gba", 0x0050d740, 0x14
.4byte sub_808F988
.4byte sub_808F99C
.4byte sub_808F9C8
@@ -440,7 +406,6 @@ gUnknown_0850D740:: @ 850D740
.4byte sub_808FA3C
gUnknown_0850D754:: @ 850D754
@ replacing .incbin "baserom.gba", 0x0050d754, 0x1c
.4byte sub_808FAC8
.4byte sub_808FADC
.4byte sub_808FB08
@@ -450,11 +415,9 @@ gUnknown_0850D754:: @ 850D754
.4byte sub_808FBE0
gUnknown_0850D770:: @ 850D770
@ replacing .incbin "baserom.gba", 0x0050d770, 0x4
.byte 0x01, 0x02, 0x00, 0x00
gUnknown_0850D774:: @ 850D774
@ replacing .incbin "baserom.gba", 0x0050d774, 0x1c
.4byte sub_808FC4C
.4byte sub_808FC60
.4byte sub_808FC8C
@@ -464,17 +427,14 @@ gUnknown_0850D774:: @ 850D774
.4byte sub_808FD64
gUnknown_0850D790:: @ 850D790
@ replacing .incbin "baserom.gba", 0x0050d790, 0x4
.byte 0x03, 0x04, 0x00, 0x00
gUnknown_0850D794:: @ 850D794
@ replacing .incbin "baserom.gba", 0x0050d794, 0xc
.4byte sub_808FDD0
.4byte sub_808FDFC
.4byte sub_808FE1C
gUnknown_0850D7A0:: @ 850D7A0
@ replacing .incbin "baserom.gba", 0x0050d7a0, 0x14
.4byte do_berry_tree_growth_sparkle_1
.4byte sub_808FF48
.4byte do_berry_tree_growth_sparkle_2
@@ -482,7 +442,6 @@ gUnknown_0850D7A0:: @ 850D7A0
.4byte sub_8090004
gUnknown_0850D7B4:: @ 850D7B4
@ replacing .incbin "baserom.gba", 0x0050d7b4, 0x14
.4byte sub_8090094
.4byte sub_80900A8
.4byte sub_80900D4
@@ -490,7 +449,6 @@ gUnknown_0850D7B4:: @ 850D7B4
.4byte sub_8090148
gUnknown_0850D7C8:: @ 850D7C8
@ replacing .incbin "baserom.gba", 0x0050d7c8, 0x14
.4byte sub_80901D4
.4byte sub_80901E8
.4byte sub_8090214
@@ -498,7 +456,6 @@ gUnknown_0850D7C8:: @ 850D7C8
.4byte sub_8090288
gUnknown_0850D7DC:: @ 850D7DC
@ replacing .incbin "baserom.gba", 0x0050d7dc, 0x14
.4byte sub_8090314
.4byte sub_8090328
.4byte sub_8090354
@@ -506,11 +463,9 @@ gUnknown_0850D7DC:: @ 850D7DC
.4byte sub_80903C8
gUnknown_0850D7F0:: @ 850D7F0
@ replacing .incbin "baserom.gba", 0x0050d7f0, 0x4
.byte 0x02, 0x03, 0x00, 0x00
gUnknown_0850D7F4:: @ 850D7F4
@ replacing .incbin "baserom.gba", 0x0050d7f4, 0x14
.4byte sub_8090454
.4byte sub_8090468
.4byte sub_8090494
@@ -518,11 +473,9 @@ gUnknown_0850D7F4:: @ 850D7F4
.4byte sub_8090508
gUnknown_0850D808:: @ 850D808
@ replacing .incbin "baserom.gba", 0x0050d808, 0x4
.byte 0x02, 0x04, 0x00, 0x00
gUnknown_0850D80C:: @ 850D80C
@ replacing .incbin "baserom.gba", 0x0050d80c, 0x14
.4byte sub_8090594
.4byte sub_80905A8
.4byte sub_80905D4
@@ -530,11 +483,9 @@ gUnknown_0850D80C:: @ 850D80C
.4byte sub_8090648
gUnknown_0850D820:: @ 850D820
@ replacing .incbin "baserom.gba", 0x0050d820, 0x4
.byte 0x01, 0x03, 0x00, 0x00
gUnknown_0850D824:: @ 850D824
@ replacing .incbin "baserom.gba", 0x0050d824, 0x14
.4byte sub_80906D4
.4byte sub_80906E8
.4byte sub_8090714
@@ -542,11 +493,9 @@ gUnknown_0850D824:: @ 850D824
.4byte sub_8090788
gUnknown_0850D838:: @ 850D838
@ replacing .incbin "baserom.gba", 0x0050d838, 0x4
.byte 0x01, 0x04, 0x00, 0x00
gUnknown_0850D83C:: @ 850D83C
@ replacing .incbin "baserom.gba", 0x0050d83c, 0x14
.4byte sub_8090814
.4byte sub_8090828
.4byte sub_8090854
@@ -554,11 +503,9 @@ gUnknown_0850D83C:: @ 850D83C
.4byte sub_80908C8
gUnknown_0850D850:: @ 850D850
@ replacing .incbin "baserom.gba", 0x0050d850, 0x4
.byte 0x02, 0x01, 0x03, 0x01
gUnknown_0850D854:: @ 850D854
@ replacing .incbin "baserom.gba", 0x0050d854, 0x14
.4byte sub_8090954
.4byte sub_8090968
.4byte sub_8090994
@@ -566,11 +513,9 @@ gUnknown_0850D854:: @ 850D854
.4byte sub_8090A08
gUnknown_0850D868:: @ 850D868
@ replacing .incbin "baserom.gba", 0x0050d868, 0x4
.byte 0x01, 0x02, 0x04, 0x01
gUnknown_0850D86C:: @ 850D86C
@ replacing .incbin "baserom.gba", 0x0050d86c, 0x14
.4byte sub_8090A94
.4byte sub_8090AA8
.4byte sub_8090AD4
@@ -578,11 +523,9 @@ gUnknown_0850D86C:: @ 850D86C
.4byte sub_8090B48
gUnknown_0850D880:: @ 850D880
@ replacing .incbin "baserom.gba", 0x0050d880, 0x4
.byte 0x02, 0x03, 0x04, 0x02
gUnknown_0850D884:: @ 850D884
@ replacing .incbin "baserom.gba", 0x0050d884, 0x14
.4byte sub_8090BD4
.4byte sub_8090BE8
.4byte sub_8090C14
@@ -590,282 +533,227 @@ gUnknown_0850D884:: @ 850D884
.4byte sub_8090C88
gUnknown_0850D898:: @ 850D898
@ replacing .incbin "baserom.gba", 0x0050d898, 0x4
.byte 0x03, 0x04, 0x01, 0x01
gUnknown_0850D89C:: @ 850D89C
@ replacing .incbin "baserom.gba", 0x0050d89c, 0x10
.4byte sub_8090D14
.4byte sub_8090D40
.4byte sub_8090D64
.4byte sub_8090D90
gUnknown_0850D8AC:: @ 850D8AC
@ replacing .incbin "baserom.gba", 0x0050d8ac, 0x8
.byte 0x01, 0x04, 0x03, 0x01, 0x02, 0x00, 0x00, 0x00
gUnknown_0850D8B4:: @ 850D8B4
@ replacing .incbin "baserom.gba", 0x0050d8b4, 0x10
.4byte sub_8090E18
.4byte sub_8090E44
.4byte sub_8090E68
.4byte sub_8090E94
gUnknown_0850D8C4:: @ 850D8C4
@ replacing .incbin "baserom.gba", 0x0050d8c4, 0x8
.byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00
gUnknown_0850D8CC:: @ 850D8CC
@ replacing .incbin "baserom.gba", 0x0050d8cc, 0x10
.4byte sub_8090F1C
.4byte sub_8090F30
.4byte sub_8090F68
.4byte sub_8091020
gUnknown_0850D8DC:: @ 850D8DC
@ replacing .incbin "baserom.gba", 0x0050d8dc, 0xc
.4byte sub_8091048
.4byte sub_809117C
.4byte sub_8091110
gUnknown_0850D8E8:: @ 850D8E8
@ replacing .incbin "baserom.gba", 0x0050d8e8, 0x4
.byte 0x02, 0x04, 0x03, 0x01
gUnknown_0850D8EC:: @ 850D8EC
@ replacing .incbin "baserom.gba", 0x0050d8ec, 0xc
.4byte sub_8091048
.4byte sub_8091208
.4byte sub_8091110
gUnknown_0850D8F8:: @ 850D8F8
@ replacing .incbin "baserom.gba", 0x0050d8f8, 0x4
.byte 0x04, 0x03, 0x01, 0x02
gUnknown_0850D8FC:: @ 850D8FC
@ replacing .incbin "baserom.gba", 0x0050d8fc, 0xc
.4byte sub_8091048
.4byte sub_8091294
.4byte sub_8091110
gUnknown_0850D908:: @ 850D908
@ replacing .incbin "baserom.gba", 0x0050d908, 0x4
.byte 0x01, 0x02, 0x04, 0x03
gUnknown_0850D90C:: @ 850D90C
@ replacing .incbin "baserom.gba", 0x0050d90c, 0xc
.4byte sub_8091048
.4byte sub_8091320
.4byte sub_8091110
gUnknown_0850D918:: @ 850D918
@ replacing .incbin "baserom.gba", 0x0050d918, 0x4
.byte 0x03, 0x01, 0x02, 0x04
gUnknown_0850D91C:: @ 850D91C
@ replacing .incbin "baserom.gba", 0x0050d91c, 0xc
.4byte sub_8091048
.4byte sub_80913AC
.4byte sub_8091110
gUnknown_0850D928:: @ 850D928
@ replacing .incbin "baserom.gba", 0x0050d928, 0x4
.byte 0x02, 0x03, 0x04, 0x01
gUnknown_0850D92C:: @ 850D92C
@ replacing .incbin "baserom.gba", 0x0050d92c, 0xc
.4byte sub_8091048
.4byte sub_8091438
.4byte sub_8091110
gUnknown_0850D938:: @ 850D938
@ replacing .incbin "baserom.gba", 0x0050d938, 0x4
.byte 0x03, 0x04, 0x01, 0x02
gUnknown_0850D93C:: @ 850D93C
@ replacing .incbin "baserom.gba", 0x0050d93c, 0xc
.4byte sub_8091048
.4byte sub_80914C4
.4byte sub_8091110
gUnknown_0850D948:: @ 850D948
@ replacing .incbin "baserom.gba", 0x0050d948, 0xc
.4byte sub_8091048
.4byte sub_8091550
.4byte sub_8091110
gUnknown_0850D954:: @ 850D954
@ replacing .incbin "baserom.gba", 0x0050d954, 0x4
.byte 0x04, 0x01, 0x02, 0x03
gUnknown_0850D958:: @ 850D958
@ replacing .incbin "baserom.gba", 0x0050d958, 0xc
.4byte sub_8091048
.4byte sub_80915DC
.4byte sub_8091110
gUnknown_0850D964:: @ 850D964
@ replacing .incbin "baserom.gba", 0x0050d964, 0x4
.byte 0x03, 0x02, 0x01, 0x04
gUnknown_0850D968:: @ 850D968
@ replacing .incbin "baserom.gba", 0x0050d968, 0xc
.4byte sub_8091048
.4byte sub_8091668
.4byte sub_8091110
gUnknown_0850D974:: @ 850D974
@ replacing .incbin "baserom.gba", 0x0050d974, 0x4
.byte 0x02, 0x01, 0x04, 0x03
gUnknown_0850D978:: @ 850D978
@ replacing .incbin "baserom.gba", 0x0050d978, 0xc
.4byte sub_8091048
.4byte sub_80916F4
.4byte sub_8091110
gUnknown_0850D984:: @ 850D984
@ replacing .incbin "baserom.gba", 0x0050d984, 0x4
.byte 0x04, 0x03, 0x02, 0x01
gUnknown_0850D988:: @ 850D988
@ replacing .incbin "baserom.gba", 0x0050d988, 0xc
.4byte sub_8091048
.4byte sub_8091780
.4byte sub_8091110
gUnknown_0850D994:: @ 850D994
@ replacing .incbin "baserom.gba", 0x0050d994, 0x4
.byte 0x01, 0x04, 0x03, 0x02
gUnknown_0850D998:: @ 850D998
@ replacing .incbin "baserom.gba", 0x0050d998, 0xc
.4byte sub_8091048
.4byte sub_809180C
.4byte sub_8091110
gUnknown_0850D9A4:: @ 850D9A4
@ replacing .incbin "baserom.gba", 0x0050d9a4, 0x4
.byte 0x04, 0x02, 0x01, 0x03
gUnknown_0850D9A8:: @ 850D9A8
@ replacing .incbin "baserom.gba", 0x0050d9a8, 0xc
.4byte sub_8091048
.4byte sub_8091898
.4byte sub_8091110
gUnknown_0850D9B4:: @ 850D9B4
@ replacing .incbin "baserom.gba", 0x0050d9b4, 0x4
.byte 0x02, 0x01, 0x03, 0x04
gUnknown_0850D9B8:: @ 850D9B8
@ replacing .incbin "baserom.gba", 0x0050d9b8, 0xc
.4byte sub_8091048
.4byte sub_8091924
.4byte sub_8091110
gUnknown_0850D9C4:: @ 850D9C4
@ replacing .incbin "baserom.gba", 0x0050d9c4, 0x4
.byte 0x03, 0x04, 0x02, 0x01
gUnknown_0850D9C8:: @ 850D9C8
@ replacing .incbin "baserom.gba", 0x0050d9c8, 0xc
.4byte sub_8091048
.4byte sub_80919B0
.4byte sub_8091110
gUnknown_0850D9D4:: @ 850D9D4
@ replacing .incbin "baserom.gba", 0x0050d9d4, 0x4
.byte 0x01, 0x03, 0x04, 0x02
gUnknown_0850D9D8:: @ 850D9D8
@ replacing .incbin "baserom.gba", 0x0050d9d8, 0xc
.4byte sub_8091048
.4byte sub_8091A3C
.4byte sub_8091110
gUnknown_0850D9E4:: @ 850D9E4
@ replacing .incbin "baserom.gba", 0x0050d9e4, 0x4
.byte 0x02, 0x03, 0x01, 0x04
gUnknown_0850D9E8:: @ 850D9E8
@ replacing .incbin "baserom.gba", 0x0050d9e8, 0xc
.4byte sub_8091048
.4byte sub_8091AC8
.4byte sub_8091110
gUnknown_0850D9F4:: @ 850D9F4
@ replacing .incbin "baserom.gba", 0x0050d9f4, 0x4
.byte 0x01, 0x04, 0x02, 0x03
gUnknown_0850D9F8:: @ 850D9F8
@ replacing .incbin "baserom.gba", 0x0050d9f8, 0xc
.4byte sub_8091048
.4byte sub_8091B54
.4byte sub_8091110
gUnknown_0850DA04:: @ 850DA04
@ replacing .incbin "baserom.gba", 0x0050da04, 0x4
.byte 0x03, 0x01, 0x04, 0x02
gUnknown_0850DA08:: @ 850DA08
@ replacing .incbin "baserom.gba", 0x0050da08, 0xc
.4byte sub_8091048
.4byte sub_8091BE0
.4byte sub_8091110
gUnknown_0850DA14:: @ 850DA14
@ replacing .incbin "baserom.gba", 0x0050da14, 0x4
.byte 0x04, 0x02, 0x03, 0x01
gUnknown_0850DA18:: @ 850DA18
@ replacing .incbin "baserom.gba", 0x0050da18, 0xc
.4byte sub_8091048
.4byte sub_8091C6C
.4byte sub_8091110
gUnknown_0850DA24:: @ 850DA24
@ replacing .incbin "baserom.gba", 0x0050da24, 0x4
.byte 0x02, 0x04, 0x01, 0x03
gUnknown_0850DA28:: @ 850DA28
@ replacing .incbin "baserom.gba", 0x0050da28, 0xc
.4byte sub_8091048
.4byte sub_8091CF8
.4byte sub_8091110
gUnknown_0850DA34:: @ 850DA34
@ replacing .incbin "baserom.gba", 0x0050da34, 0x4
.byte 0x01, 0x03, 0x02, 0x04
gUnknown_0850DA38:: @ 850DA38
@ replacing .incbin "baserom.gba", 0x0050da38, 0xc
.4byte sub_8091048
.4byte sub_8091D84
.4byte sub_8091110
gUnknown_0850DA44:: @ 850DA44
@ replacing .incbin "baserom.gba", 0x0050da44, 0x4
.byte 0x03, 0x02, 0x04, 0x01
gUnknown_0850DA48:: @ 850DA48
@ replacing .incbin "baserom.gba", 0x0050da48, 0xc
.4byte sub_8091048
.4byte sub_8091E10
.4byte sub_8091110
gUnknown_0850DA54:: @ 850DA54
@ replacing .incbin "baserom.gba", 0x0050da54, 0x4
.byte 0x04, 0x01, 0x03, 0x02
gUnknown_0850DA58:: @ 850DA58
@ replacing .incbin "baserom.gba", 0x0050da58, 0xc
.4byte mss_npc_reset_oampriv3_1_unk2_unk3
.4byte sub_8091EC0
.4byte sub_8091F20
gUnknown_0850DA64:: @ 850DA64
@ replacing .incbin "baserom.gba", 0x0050da64, 0x2c
.4byte sub_8091F48
.4byte sub_8091F4C
.4byte sub_8091F94
@@ -879,248 +767,191 @@ gUnknown_0850DA64:: @ 850DA64
.4byte sub_8091F48
gUnknown_0850DA90:: @ 850DA90
@ replacing .incbin "baserom.gba", 0x0050da90, 0xc
.4byte mss_npc_reset_oampriv3_1_unk2_unk3
.4byte mss_08062EA4
.4byte sub_8091F20
gUnknown_0850DA9C:: @ 850DA9C
@ replacing .incbin "baserom.gba", 0x0050da9c, 0x4
.4byte sub_80926AC
gUnknown_0850DAA0:: @ 850DAA0
@ replacing .incbin "baserom.gba", 0x0050daa0, 0x8
.4byte sub_8092718
.4byte sub_80926B8
gUnknown_0850DAA8:: @ 850DAA8
@ replacing .incbin "baserom.gba", 0x0050daa8, 0x8
.4byte sub_8092788
.4byte sub_80926B8
gUnknown_0850DAB0:: @ 850DAB0
@ replacing .incbin "baserom.gba", 0x0050dab0, 0x8
.4byte sub_80927F8
.4byte sub_80926B8
gUnknown_0850DAB8:: @ 850DAB8
@ replacing .incbin "baserom.gba", 0x0050dab8, 0x8
.4byte sub_8092868
.4byte sub_80926B8
gUnknown_0850DAC0:: @ 850DAC0
@ replacing .incbin "baserom.gba", 0x0050dac0, 0xc
.4byte sub_80928D8
.4byte sub_809290C
.4byte sub_809292C
gUnknown_0850DACC:: @ 850DACC
@ replacing .incbin "baserom.gba", 0x0050dacc, 0x9
.byte 0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x01, 0x01
gUnknown_0850DAD5:: @ 850DAD5
@ replacing .incbin "baserom.gba", 0x0050dad5, 0x9
.byte 0x04, 0x04, 0x05, 0x06, 0x07, 0x04, 0x04, 0x05, 0x05
gUnknown_0850DADE:: @ 850DADE
@ replacing .incbin "baserom.gba", 0x0050dade, 0x9
.byte 0x08, 0x08, 0x09, 0x0a, 0x0b, 0x08, 0x08, 0x09, 0x09
gUnknown_0850DAE7:: @ 850DAE7
@ replacing .incbin "baserom.gba", 0x0050dae7, 0x9
.byte 0x0c, 0x0c, 0x0d, 0x0e, 0x0f, 0x0c, 0x0c, 0x0d, 0x0d
gUnknown_0850DAF0:: @ 850DAF0
@ replacing .incbin "baserom.gba", 0x0050daf0, 0x9
.byte 0x10, 0x10, 0x11, 0x12, 0x13, 0x10, 0x10, 0x11, 0x11
gUnknown_0850DAF9:: @ 850DAF9
@ replacing .incbin "baserom.gba", 0x0050daf9, 0x9
.byte 0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15
gUnknown_0850DB02:: @ 850DB02
@ replacing .incbin "baserom.gba", 0x0050db02, 0x9
.byte 0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15
gUnknown_0850DB0B:: @ 850DB0B
@ replacing .incbin "baserom.gba", 0x0050db0b, 0x9
.byte 0x18, 0x18, 0x19, 0x1a, 0x1b, 0x18, 0x18, 0x19, 0x19
gUnknown_0850DB14:: @ 850DB14
@ replacing .incbin "baserom.gba", 0x0050db14, 0x9
.byte 0x1c, 0x1c, 0x1d, 0x1e, 0x1f, 0x1c, 0x1c, 0x1d, 0x1d
gUnknown_0850DB1D:: @ 850DB1D
@ replacing .incbin "baserom.gba", 0x0050db1d, 0x9
.byte 0x20, 0x20, 0x21, 0x22, 0x23, 0x20, 0x20, 0x21, 0x21
gUnknown_0850DB26:: @ 850DB26
@ replacing .incbin "baserom.gba", 0x0050db26, 0x9
.byte 0x24, 0x24, 0x25, 0x26, 0x27, 0x24, 0x24, 0x25, 0x25
gUnknown_0850DB2F:: @ 850DB2F
@ replacing .incbin "baserom.gba", 0x0050db2f, 0x9
.byte 0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x01, 0x01
gUnknown_0850DB38:: @ 850DB38
@ replacing .incbin "baserom.gba", 0x0050db38, 0x9
.byte 0x04, 0x04, 0x05, 0x06, 0x07, 0x04, 0x04, 0x05, 0x05
gUnknown_0850DB41:: @ 850DB41
@ replacing .incbin "baserom.gba", 0x0050db41, 0x9
.byte 0x08, 0x08, 0x09, 0x0a, 0x0b, 0x08, 0x08, 0x09, 0x09
gUnknown_0850DB4A:: @ 850DB4A
@ replacing .incbin "baserom.gba", 0x0050db4a, 0x9
.byte 0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15
gUnknown_0850DB53:: @ 850DB53
@ replacing .incbin "baserom.gba", 0x0050db53, 0x9
.byte 0x08, 0x08, 0x07, 0x09, 0x0a, 0x08, 0x08, 0x07, 0x07
.align 2, 0
gUnknown_0850DB5C:: @ 850DB5C
@ replacing .incbin "baserom.gba", 0x0050db5c, 0x10
.4byte MetatileBehavior_IsSouthBlocked
.4byte MetatileBehavior_IsNorthBlocked
.4byte MetatileBehavior_IsWestBlocked
.4byte MetatileBehavior_IsEastBlocked
gUnknown_0850DB6C:: @ 850DB6C
@ replacing .incbin "baserom.gba", 0x0050db6c, 0x10
.4byte MetatileBehavior_IsNorthBlocked
.4byte MetatileBehavior_IsSouthBlocked
.4byte MetatileBehavior_IsEastBlocked
.4byte MetatileBehavior_IsWestBlocked
gUnknown_0850DB7C:: @ 850DB7C
@ replacing .incbin "baserom.gba", 0x0050db7c, 0x24
.2byte 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0xffff, 0xffff, 0x0000, 0x0001, 0x0000, 0xffff, 0x0001, 0x0001, 0x0001, 0xffff, 0xffff
.2byte 0x0001, 0xffff
gUnknown_0850DBA0:: @ 850DBA0
@ replacing .incbin "baserom.gba", 0x0050dba0, 0x5
.byte 0x00, 0x00, 0x01, 0x02, 0x03
gUnknown_0850DBA5:: @ 850DBA5
@ replacing .incbin "baserom.gba", 0x0050dba5, 0x5
.byte 0x04, 0x04, 0x05, 0x06, 0x07
gUnknown_0850DBAA:: @ 850DBAA
@ replacing .incbin "baserom.gba", 0x0050dbaa, 0x5
.byte 0x08, 0x08, 0x09, 0x0a, 0x0b
gUnknown_0850DBAF:: @ 850DBAF
@ replacing .incbin "baserom.gba", 0x0050dbaf, 0x5
.byte 0x15, 0x15, 0x16, 0x17, 0x18
gUnknown_0850DBB4:: @ 850DBB4
@ replacing .incbin "baserom.gba", 0x0050dbb4, 0x5
.byte 0x29, 0x29, 0x2a, 0x2b, 0x2c
gUnknown_0850DBB9:: @ 850DBB9
@ replacing .incbin "baserom.gba", 0x0050dbb9, 0x5
.byte 0x2d, 0x2d, 0x2e, 0x2f, 0x30
gUnknown_0850DBBE:: @ 850DBBE
@ replacing .incbin "baserom.gba", 0x0050dbbe, 0x5
.byte 0x31, 0x31, 0x32, 0x33, 0x34
gUnknown_0850DBC3:: @ 850DBC3
@ replacing .incbin "baserom.gba", 0x0050dbc3, 0x5
.byte 0x35, 0x35, 0x36, 0x37, 0x38
gUnknown_0850DBC8:: @ 850DBC8
@ replacing .incbin "baserom.gba", 0x0050dbc8, 0x5
.byte 0x0c, 0x0c, 0x0d, 0x0e, 0x0f
gUnknown_0850DBCD:: @ 850DBCD
@ replacing .incbin "baserom.gba", 0x0050dbcd, 0x5
.byte 0x46, 0x46, 0x47, 0x48, 0x49
gUnknown_0850DBD2:: @ 850DBD2
@ replacing .incbin "baserom.gba", 0x0050dbd2, 0x5
.byte 0x4b, 0x4b, 0x4a, 0x4d, 0x4c
gUnknown_0850DBD7:: @ 850DBD7
@ replacing .incbin "baserom.gba", 0x0050dbd7, 0x5
.byte 0x42, 0x42, 0x43, 0x44, 0x45
gUnknown_0850DBDC:: @ 850DBDC
@ replacing .incbin "baserom.gba", 0x0050dbdc, 0x5
.byte 0x3a, 0x3a, 0x3b, 0x3c, 0x3d
gUnknown_0850DBE1:: @ 850DBE1
@ replacing .incbin "baserom.gba", 0x0050dbe1, 0x5
.byte 0x19, 0x19, 0x1a, 0x1b, 0x1c
gUnknown_0850DBE6:: @ 850DBE6
@ replacing .incbin "baserom.gba", 0x0050dbe6, 0x5
.byte 0x1d, 0x1d, 0x1e, 0x1f, 0x20
gUnknown_0850DBEB:: @ 850DBEB
@ replacing .incbin "baserom.gba", 0x0050dbeb, 0x5
.byte 0x21, 0x21, 0x22, 0x23, 0x24
gUnknown_0850DBF0:: @ 850DBF0
@ replacing .incbin "baserom.gba", 0x0050dbf0, 0x5
.byte 0x25, 0x25, 0x26, 0x27, 0x28
gUnknown_0850DBF5:: @ 850DBF5
@ replacing .incbin "baserom.gba", 0x0050dbf5, 0x5
.byte 0x64, 0x64, 0x65, 0x66, 0x67
gUnknown_0850DBFA:: @ 850DBFA
@ replacing .incbin "baserom.gba", 0x0050dbfa, 0x5
.byte 0x68, 0x68, 0x69, 0x6a, 0x6b
gUnknown_0850DBFF:: @ 850DBFF
@ replacing .incbin "baserom.gba", 0x0050dbff, 0x5
.byte 0x6c, 0x6c, 0x6d, 0x6e, 0x6f
gUnknown_0850DC04:: @ 850DC04
@ replacing .incbin "baserom.gba", 0x0050dc04, 0x5
.byte 0x70, 0x70, 0x71, 0x72, 0x73
gUnknown_0850DC09:: @ 850DC09
@ replacing .incbin "baserom.gba", 0x0050dc09, 0x5
.byte 0x74, 0x74, 0x75, 0x76, 0x77
gUnknown_0850DC0E:: @ 850DC0E
@ replacing .incbin "baserom.gba", 0x0050dc0e, 0x5
.byte 0x78, 0x78, 0x79, 0x7a, 0x7b
gUnknown_0850DC13:: @ 850DC13
@ replacing .incbin "baserom.gba", 0x0050dc13, 0x5
.byte 0x7c, 0x7c, 0x7d, 0x7e, 0x7f
gUnknown_0850DC18:: @ 850DC18
@ replacing .incbin "baserom.gba", 0x0050dc18, 0x5
.byte 0x80, 0x80, 0x81, 0x82, 0x83
gUnknown_0850DC1D:: @ 850DC1D
@ replacing .incbin "baserom.gba", 0x0050dc1d, 0x5
.byte 0x84, 0x84, 0x85, 0x86, 0x87
gUnknown_0850DC22:: @ 850DC22
@ replacing .incbin "baserom.gba", 0x0050dc22, 0x5
.byte 0x88, 0x88, 0x89, 0x8a, 0x8b
gUnknown_0850DC27:: @ 850DC27
@ replacing .incbin "baserom.gba", 0x0050dc27, 0x8
.byte 0x02, 0x01, 0x04, 0x03, 0x08, 0x07, 0x06, 0x05
gUnknown_0850DC2F:: @ 850DC2F
@ replacing .incbin "baserom.gba", 0x0050dc2f, 0x10
.byte 0x02, 0x01, 0x04, 0x03, 0x01, 0x02, 0x03, 0x04, 0x03, 0x04, 0x02, 0x01, 0x04, 0x03, 0x01, 0x02
gUnknown_0850DC3F:: @ 850DC3F
@ replacing .incbin "baserom.gba", 0x0050dc3f, 0x11
.byte 0x02, 0x01, 0x04, 0x03, 0x01, 0x02, 0x03, 0x04, 0x04, 0x03, 0x01, 0x02, 0x03, 0x04, 0x02, 0x01, 0x00
.align 2, 0
gUnknown_0850DC50:: @ 850DC50
@ replacing .incbin "baserom.gba", 0x0050dc50, 0x278
.4byte gUnknown_0850DEC8
.4byte gUnknown_0850DED0
.4byte gUnknown_0850DED8
@@ -1297,7 +1128,6 @@ gUnknown_0850DEE0::
.4byte sub_80964BC
gUnknown_0850DEE8:: @ 850DEE8
@ replacing .incbin "baserom.gba", 0x0050dee8, 0xd4
.4byte get_go_image_anim_num
.4byte get_go_fast_image_anim_num
.4byte get_go_fast_image_anim_num
@@ -1370,15 +1200,12 @@ gUnknown_0850DFB0::
.4byte sub_80964BC
gUnknown_0850DFBC:: @ 850DFBC
@ replacing .incbin "baserom.gba", 0x0050dfbc, 0x6
.byte 0x00, 0x00, 0x01, 0x00, 0x01, 0x00
gUnknown_0850DFC2:: @ 850DFC2
@ replacing .incbin "baserom.gba", 0x0050dfc2, 0x6
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00
gUnknown_0850DFC8:: @ 850DFC8
@ replacing .incbin "baserom.gba", 0x0050dfc8, 0x614
.4byte sub_8094230
.4byte sub_8094230_2
.4byte sub_80964BC
+1612 -1623
View File
File diff suppressed because it is too large Load Diff
+7 -7
View File
@@ -2329,11 +2329,11 @@ gSubstituteDollTilemap:: @ 8C2D120
.incbin "graphics/battle_anims/sprites/substitute.bin.lz"
.align 2
gUnknown_08C2D348:: @ 8C2D348
gBattleAnimSpriteSheet_241:: @ 8C2D348
.incbin "graphics/battle_anims/sprites/241.4bpp.lz"
.align 2
gUnknown_08C2D40C:: @ 8C2D40C
gBattleAnimSpritePalette_241:: @ 8C2D40C
.incbin "graphics/battle_anims/sprites/241.gbapal.lz"
.align 2
@@ -2345,19 +2345,19 @@ gContestConfetti_Pal:: @ 8C2D548
.incbin "graphics/misc/confetti.gbapal.lz"
.align 2
gUnknown_08C2D570:: @ 8C2D570
gBattleAnimSpriteSheet_242:: @ 8C2D570
.incbin "graphics/battle_anims/sprites/242.4bpp.lz"
.align 2
gUnknown_08C2D6AC:: @ 8C2D6AC
gBattleAnimSpritePalette_242:: @ 8C2D6AC
.incbin "graphics/battle_anims/sprites/242.gbapal.lz"
.align 2
gUnknown_08C2D6D0:: @ 8C2D6D0
gBattleAnimSpriteSheet_243:: @ 8C2D6D0
.incbin "graphics/battle_anims/sprites/243.4bpp.lz"
.align 2
gUnknown_08C2D6F8:: @ 8C2D6F8
gBattleAnimSpritePalette_243:: @ 8C2D6F8
.incbin "graphics/battle_anims/sprites/243.gbapal.lz"
.align 2
@@ -3081,7 +3081,7 @@ gUnknown_08D8D58C:: @ 8D8D58C
.incbin "graphics/battle_anims/backgrounds/sandstorm_brew.4bpp.lz"
.align 2
gUnknown_08D8DAB8:: @ 8E68580
gBattleAnimSpritePalette_261:: @ 8E68580
.incbin "graphics/battle_anims/sprites/261.gbapal.lz"
.align 2
+27 -14
View File
@@ -24,43 +24,56 @@ gUnknown_08589A28:: @ 8589A28
.4byte HandleShopMenuQuit
gUnknown_08589A38:: @ 8589A38
.incbin "baserom.gba", 0x589a38, 0x10
window_template 0, 2, 1, 9, 6, 15, 8
window_template 0, 2, 1, 9, 4, 15, 8
gUnknown_08589A48:: @ 8589A48
.incbin "baserom.gba", 0x589a48, 0x18
.byte 0, 0, 0, 0
.4byte BuyMenuPrintItemDescriptionAndShowItemIcon
.4byte BuyMenuPrintPriceInList
.byte 0, 0, 0, 0, 1, 0, 8, 0, 33, 48, 0, 7
gUnknown_08589A60:: @ 8589A60
.incbin "baserom.gba", 0x589a60, 0x10
.4byte 0x1F8
.4byte 0x11E1
.4byte 0x21D2
.4byte 0x31C3
gUnknown_08589A70:: @ 8589A70
.incbin "baserom.gba", 0x589a70, 0x38
window_template 0, 1, 1, 10, 2, 15, 30
window_template 0, 14, 2, 15, 16, 15, 50
window_template 0, 0, 13, 14, 6, 15, 0x122
window_template 0, 1, 11, 12, 2, 15, 0x176
window_template 0, 18, 11, 10, 2, 15, 0x18E
window_template 0, 2, 15, 27, 4, 15, 0x1A2
window_template_terminator
gUnknown_08589AA8:: @ 8589AA8
.incbin "baserom.gba", 0x589aa8, 0x8
window_template 0, 21, 9, 5, 4, 15, 0x20E
gUnknown_08589AB0:: @ 8589AB0
.incbin "baserom.gba", 0x589ab0, 0x3
.byte 1, 2, 3
gUnknown_08589AB3:: @ 8589AB3
.incbin "baserom.gba", 0x589ab3, 0x7
.byte 0, 2, 3, 0, 3, 2, 0
gUnknown_08589ABA:: @ 8589ABA
.incbin "baserom.gba", 0x589aba, 0x6
.2byte 0x284, 0x282, 0x280
gUnknown_08589AC0:: @ 8589AC0
.incbin "baserom.gba", 0x589ac0, 0x6
.2byte 0x285, 0x283, 0x281
gUnknown_08589AC6:: @ 8589AC6
.incbin "baserom.gba", 0x589ac6, 0x6
.2byte 0x28C, 0x28A, 0x288
gUnknown_08589ACC:: @ 8589ACC
.incbin "baserom.gba", 0x589acc, 0x6
.2byte 0x28D, 0x28B, 0x289
gUnknown_08589AD2:: @ 8589AD2
.incbin "baserom.gba", 0x589ad2, 0x6
.2byte 0x2A0, 0x2A2, 0x2A4
gUnknown_08589AD8:: @ 8589AD8
.incbin "baserom.gba", 0x589ad8, 0x6
.2byte 0x2A1, 0x2A3, 0x2A5
gUnknown_08589ADE:: @ 8589ADE
.incbin "baserom.gba", 0x589ade, 0x6
.2byte 0x2A8, 0x2AA, 0x2AC
+30 -17
View File
@@ -4169,48 +4169,61 @@ gJPText_MysteryGift:: @ 85EDFBF
gJPText_DecideStop:: @ 85EDFC9
.string "{UNK_CTRL_F800} {UNK_CTRL_F801}$" @ "{UNK_CTRL_F800}kettei {UNK_CTRL_F801}yameru" ("{UNK_CTRL_F800}decide {UNK_CTRL_F801}stop" in Japanese)
@ A bunch of Japanese strings here, waiting for updated datadump to dump properly
gUnknown_085EDFD6:: @ 85EDFD6
.byte 0x56, 0xae, 0x95, 0xd9, 0x78, 0xae, 0x91, 0xae, 0xf9, 0x04, 0x00, 0x44, 0xfe, 0x1c, 0x0c, 0x38, 0x15, 0x23, 0x27, 0x02, 0x23, 0x19, 0x2d, 0x00, 0x26, 0x20, 0x0a, 0x20, 0x1f, 0x0d, 0xff
.string "e{UNK_CTRL_F9 0x04} \n"
.string " $"
gUnknown_085EDFF5:: @ 85EDFF5
.byte 0x56, 0xae, 0x95, 0xd9, 0x78, 0xae, 0x91, 0xae, 0xf9, 0x04, 0x19, 0x00, 0x72, 0x66, 0x85, 0xae, 0x06, 0x27, 0xfe, 0xb3, 0x12, 0x03, 0x0c, 0x2e, 0xb4, 0x2d, 0x00, 0x04, 0x27, 0x47, 0xff
.string "e{UNK_CTRL_F9 0x04} \n"
.string " $"
gUnknown_085EE014:: @ 85EE014
.byte 0xb3, 0x8a, 0xae, 0x71, 0x9a, 0xae, 0x52, 0x51, 0x95, 0x96, 0x7e, 0x5d, 0x14, 0x12, 0x03, 0x0c, 0x2e, 0xb4, 0xfe, 0x2d, 0x00, 0x0e, 0x2e, 0x10, 0x08, 0x00, 0x0c, 0x13, 0x08, 0x41, 0x0b, 0x02
.byte 0xff, 0x56, 0xae, 0x95, 0xd9, 0x78, 0xae, 0x91, 0xae, 0xf9, 0x04, 0x19, 0x00, 0xb3, 0x12, 0x03, 0x0c, 0x2e, 0xb4, 0x2d, 0xfe, 0x04, 0x27, 0x2e, 0x44, 0x00, 0xbb, 0x9a, 0x60, 0x7e, 0x2d, 0x00
.byte 0x05, 0x0c, 0x13, 0x08, 0x41, 0x0b, 0x02, 0xff
.string "\n"
.string "  $"
gUnknown_085EE035:: @ 85EE035
.string "e{UNK_CTRL_F9 0x04} \n"
.string " A $"
gUnknown_085EE05C:: @ 85EE05C
.byte 0x0e, 0x12, 0x40, 0x08, 0x37, 0x00, 0x1f, 0x11, 0x37, 0x50, 0x13, 0x02, 0x1f, 0x0d, 0xff
.string " $"
gUnknown_085EE06B:: @ 85EE06B
.byte 0x56, 0xae, 0x95, 0x19, 0x00, 0x26, 0x20, 0x0a, 0x20, 0x2d, 0xfe, 0x11, 0x35, 0x03, 0x0c, 0x00, 0x0c, 0x1f, 0x0c, 0x10, 0xff, 0x56, 0xae, 0x95, 0xd9, 0x78, 0xae, 0x91, 0xae, 0xf9, 0x04, 0x14
.byte 0xfe, 0x12, 0x03, 0x0c, 0x2e, 0x00, 0x44, 0x07, 0x1f, 0x0e, 0x2e, 0xff
.string " \n"
.string " $"
gUnknown_085EE080:: @ 85EE080
.string "e{UNK_CTRL_F9 0x04}\n"
.string " $"
gUnknown_085EE097:: @ 85EE097
.byte 0x12, 0x03, 0x0c, 0x2e, 0x00, 0x11, 0x35, 0x03, 0x00, 0x44, 0x0d, 0xff
.string "  $"
gUnknown_085EE0A3:: @ 85EE0A3
.byte 0x12, 0x03, 0x0c, 0x2e, 0x00, 0x54, 0x77, 0xae, 0x44, 0x0d, 0xfe, 0x0e, 0x12, 0x40, 0x08, 0x2d, 0x00, 0x10, 0x0c, 0x06, 0x22, 0x13, 0x00, 0x08, 0x41, 0x0b, 0x02, 0xff
.string " \n"
.string "  $"
gUnknown_085EE0BF:: @ 85EE0BF
.byte 0x12, 0x03, 0x0c, 0x2e, 0x00, 0x54, 0x77, 0xae, 0x44, 0x0d, 0xfe, 0x1a, 0x3d, 0x22, 0x06, 0x27, 0x00, 0x24, 0x28, 0x15, 0x05, 0x0c, 0x13, 0x00, 0x08, 0x41, 0x0b, 0x02, 0xff
.string " \n"
.string "  $"
gUnknown_085EE0DC:: @ 85EE0DC
.byte 0x56, 0xae, 0x95, 0xd9, 0x78, 0xae, 0x91, 0xae, 0xf9, 0x04, 0x00, 0x16, 0xfe, 0x56, 0xae, 0x95, 0x2d, 0x00, 0x26, 0x20, 0x0a, 0x1f, 0x0e, 0x13, 0x00, 0x08, 0x41, 0x0b, 0x02, 0xff
.string "e{UNK_CTRL_F9 0x04} \n"
.string "  $"
gUnknown_085EE0FA:: @ 85EE0FA
.byte 0x12, 0x03, 0x0c, 0x2e, 0x00, 0x0c, 0x35, 0x03, 0x28, 0x36, 0x03, 0xab, 0xff
.string " $"
gUnknown_085EE107:: @ 85EE107
.byte 0x01, 0x27, 0x10, 0x15, 0x00, 0x64, 0x7a, 0xae, 0x65, 0xae, 0x37, 0xfe, 0x6e, 0x53, 0x54, 0x7e, 0x16, 0x00, 0x24, 0x50, 0x13, 0x07, 0x10, 0xab, 0xff
.string " \n"
.string " $"
gUnknown_085EE120:: @ 85EE120
.byte 0x0c, 0x46, 0x27, 0x08, 0x00, 0x05, 0x1f, 0x11, 0x08, 0x41, 0x0b, 0x02, 0xff
.string " $"
gUnknown_085EE12D:: @ 85EE12D
.byte 0x06, 0x07, 0x0a, 0x20, 0x00, 0x54, 0x77, 0xae, 0x00, 0x44, 0x0d, 0xfe, 0x94, 0xae, 0x60, 0x37, 0x00, 0x1e, 0x40, 0x2e, 0x00, 0x44, 0x07, 0x1f, 0x0e, 0x2e, 0x44, 0x0c, 0x10, 0xff
.string "  \n"
.string "  $"
gUnknown_085EE14B:: @ 85EE14B
.string "RED$"