ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Diego/master'

Browse Source
This commit is contained in:
Diegoisawesome 2018-01-14 21:41:29 -06:00
commit 11cb3275cc
35 changed files with 2405 additions and 2565 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/battle_anim_80FE840.s
View File

@ -36243,7 +36243,7 @@ _08110C10:
mov r0, sp mov r0, sp
movs r2, 0 movs r2, 0
bl sub_80A6D60 bl sub_80A6D60
ldr r0, =gUnknown_08D8DAB8 ldr r0, =gBattleAnimSpritePalette_261
mov r1, sp mov r1, sp
ldrb r1, [r1, 0x8] ldrb r1, [r1, 0x8]
lsls r1, 4 lsls r1, 4

2
asm/battle_frontier_2.s
View File

@ -20736,7 +20736,7 @@ _081A54D4:
bl HandleBattleWindow bl HandleBattleWindow
movs r0, 0 movs r0, 0
bl CopyBgTilemapBufferToVram bl CopyBgTilemapBufferToVram
ldr r0, =gMPlay_BGM ldr r0, =gMPlayInfo_BGM
ldr r1, =0x0000ffff ldr r1, =0x0000ffff
movs r2, 0x80 movs r2, 0x80
lsls r2, 1 lsls r2, 1

2
asm/contest.s
View File

@ -8891,7 +8891,7 @@ _080DC226:
ble _080DC284 ble _080DC284
movs r0, 0x60 movs r0, 0x60
bl PlaySE bl PlaySE
ldr r4, =gMPlay_SE1 ldr r4, =gMPlayInfo_SE1
adds r0, r4, 0 adds r0, r4, 0
bl m4aMPlayImmInit bl m4aMPlayImmInit
ldr r1, =0x0000ffff ldr r1, =0x0000ffff

6
asm/link.s
View File

@ -3342,11 +3342,11 @@ c2_800ACD4: @ 800AF30
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl SetGpuReg bl SetGpuReg
ldr r0, =gMPlay_SE1 ldr r0, =gMPlayInfo_SE1
bl m4aMPlayStop bl m4aMPlayStop
ldr r0, =gMPlay_SE2 ldr r0, =gMPlayInfo_SE2
bl m4aMPlayStop bl m4aMPlayStop
ldr r0, =gMPlay_SE3 ldr r0, =gMPlayInfo_SE3
bl m4aMPlayStop bl m4aMPlayStop
ldr r0, =0x02000000 ldr r0, =0x02000000
movs r1, 0xE0 movs r1, 0xE0

8
asm/mauville_old_man.s
View File

@ -965,7 +965,7 @@ _08120850:
lsls r1, 1 lsls r1, 1
adds r0, r1 adds r0, r1
strh r0, [r6, 0x6] strh r0, [r6, 0x6]
ldr r4, =gMPlay_SE2 ldr r4, =gMPlayInfo_SE2
ldr r5, =0x0000ffff ldr r5, =0x0000ffff
ldrh r2, [r6, 0x6] ldrh r2, [r6, 0x6]
adds r0, r4, 0 adds r0, r4, 0
@ -1008,7 +1008,7 @@ _081208BC:
subs r0, 0x40 subs r0, 0x40
_081208C0: _081208C0:
strh r0, [r6, 0x8] strh r0, [r6, 0x8]
ldr r4, =gMPlay_SE2 ldr r4, =gMPlayInfo_SE2
ldr r5, =0x0000ffff ldr r5, =0x0000ffff
ldrh r2, [r6, 0x6] ldrh r2, [r6, 0x6]
adds r0, r4, 0 adds r0, r4, 0
@ -1059,7 +1059,7 @@ _08120922:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08120938 bne _08120938
ldr r0, =gMPlay_SE2 ldr r0, =gMPlayInfo_SE2
bl m4aMPlayStop bl m4aMPlayStop
movs r0, 0x4 movs r0, 0x4
_08120936: _08120936:
@ -1228,7 +1228,7 @@ _08120A7E:
bne _08120AB0 bne _08120AB0
movs r0, 0x6 movs r0, 0x6
bl FadeInBGM bl FadeInBGM
ldr r0, =gMPlay_SE2 ldr r0, =gMPlayInfo_SE2
movs r1, 0x2 movs r1, 0x2
bl m4aMPlayFadeOutTemporarily bl m4aMPlayFadeOutTemporarily
bl EnableBothScriptContexts bl EnableBothScriptContexts

12
asm/pokedex.s
View File

@ -497,7 +497,7 @@ _080BB71C:
adds r1, r2 adds r1, r2
ldrb r1, [r1] ldrb r1, [r1]
bl sub_80BC8D4 bl sub_80BC8D4
ldr r0, =gMPlay_BGM ldr r0, =gMPlayInfo_BGM
ldr r1, =0x0000ffff ldr r1, =0x0000ffff
movs r2, 0x80 movs r2, 0x80
bl m4aMPlayVolumeControl bl m4aMPlayVolumeControl
@ -1246,7 +1246,7 @@ _080BBE18:
bl DestroyTask bl DestroyTask
ldr r0, =sub_8086194 ldr r0, =sub_8086194
bl SetMainCallback2 bl SetMainCallback2
ldr r0, =gMPlay_BGM ldr r0, =gMPlayInfo_BGM
ldr r1, =0x0000ffff ldr r1, =0x0000ffff
movs r2, 0x80 movs r2, 0x80
lsls r2, 1 lsls r2, 1
@ -7228,7 +7228,7 @@ _080BF2A8:
beq _080BF2B6 beq _080BF2B6
b _080BF5B2 b _080BF5B2
_080BF2B6: _080BF2B6:
ldr r0, =gMPlay_BGM ldr r0, =gMPlayInfo_BGM
bl m4aMPlayStop bl m4aMPlayStop
ldr r5, =gUnknown_02039B4C ldr r5, =gUnknown_02039B4C
ldr r0, [r5] ldr r0, [r5]
@ -7592,7 +7592,7 @@ _080BF636:
movs r2, 0 movs r2, 0
movs r3, 0x10 movs r3, 0x10
bl BeginNormalPaletteFade bl BeginNormalPaletteFade
ldr r0, =gMPlay_BGM ldr r0, =gMPlayInfo_BGM
bl m4aMPlayContinue bl m4aMPlayContinue
ldr r0, =gUnknown_02039B4C ldr r0, =gUnknown_02039B4C
ldr r0, [r0] ldr r0, [r0]
@ -7634,7 +7634,7 @@ _080BF6B0:
movs r2, 0 movs r2, 0
movs r3, 0x10 movs r3, 0x10
bl BeginNormalPaletteFade bl BeginNormalPaletteFade
ldr r0, =gMPlay_BGM ldr r0, =gMPlayInfo_BGM
bl m4aMPlayContinue bl m4aMPlayContinue
ldr r0, =gUnknown_02039B4C ldr r0, =gUnknown_02039B4C
ldr r0, [r0] ldr r0, [r0]
@ -7689,7 +7689,7 @@ _080BF73C:
movs r2, 0 movs r2, 0
movs r3, 0x10 movs r3, 0x10
bl BeginNormalPaletteFade bl BeginNormalPaletteFade
ldr r0, =gMPlay_BGM ldr r0, =gMPlayInfo_BGM
bl m4aMPlayContinue bl m4aMPlayContinue
ldr r0, =gUnknown_02039B4C ldr r0, =gUnknown_02039B4C
ldr r0, [r0] ldr r0, [r0]

2
asm/pokedex_cry_screen.s
View File

@ -239,7 +239,7 @@ sub_8145534: @ 8145534
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
adds r5, r4, 0 adds r5, r4, 0
ldr r0, =gMPlay_BGM ldr r0, =gMPlayInfo_BGM
ldr r0, [r0, 0x4] ldr r0, [r0, 0x4]
cmp r0, 0 cmp r0, 0
bge _08145582 bge _08145582

12
asm/roulette.s
View File

@ -6841,14 +6841,14 @@ _08143BEA:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08143C74 beq _08143C74
ldr r0, _08143C84 @ =gMPlay_SE1 ldr r0, _08143C84 @ =gMPlayInfo_SE1
ldr r4, _08143C88 @ =0x0000FFFF ldr r4, _08143C88 @ =0x0000FFFF
ldrh r2, [r7, 0x24] ldrh r2, [r7, 0x24]
lsls r2, 24 lsls r2, 24
asrs r2, 24 asrs r2, 24
adds r1, r4, 0 adds r1, r4, 0
bl m4aMPlayPanpotControl bl m4aMPlayPanpotControl
ldr r0, _08143C8C @ =gMPlay_SE2 ldr r0, _08143C8C @ =gMPlayInfo_SE2
ldrh r2, [r7, 0x24] ldrh r2, [r7, 0x24]
lsls r2, 24 lsls r2, 24
asrs r2, 24 asrs r2, 24
@ -6864,11 +6864,11 @@ _08143C74:
_08143C80: _08143C80:
.4byte 0x00000000 .4byte 0x00000000
_08143C84: _08143C84:
.4byte gMPlay_SE1 .4byte gMPlayInfo_SE1
_08143C88: _08143C88:
.4byte 0x0000FFFF .4byte 0x0000FFFF
_08143C8C: _08143C8C:
.4byte gMPlay_SE2 .4byte gMPlayInfo_SE2
thumb_func_end sub_8143B84 thumb_func_end sub_8143B84
thumb_func_start sub_8143C90 thumb_func_start sub_8143C90
@ -9385,14 +9385,14 @@ sub_81450D8: @ 81450D8
adds r4, r0 adds r4, r0
asrs r4, 1 asrs r4, 1
negs r4, r4 negs r4, r4
ldr r0, =gMPlay_SE1 ldr r0, =gMPlayInfo_SE1
ldr r5, =0x0000ffff ldr r5, =0x0000ffff
lsls r4, 24 lsls r4, 24
asrs r4, 24 asrs r4, 24
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
bl m4aMPlayPanpotControl bl m4aMPlayPanpotControl
ldr r0, =gMPlay_SE2 ldr r0, =gMPlayInfo_SE2
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
bl m4aMPlayPanpotControl bl m4aMPlayPanpotControl

2
asm/title_screen.s
View File

@ -1169,7 +1169,7 @@ _080AAE30:
_080AAE72: _080AAE72:
ldrb r0, [r3, 0x8] ldrb r0, [r3, 0x8]
bl title_screen_update_rayquaza_ring_palette bl title_screen_update_rayquaza_ring_palette
ldr r0, =gMPlay_BGM ldr r0, =gMPlayInfo_BGM
ldr r1, =0x0000ffff ldr r1, =0x0000ffff
ldrh r0, [r0, 0x4] ldrh r0, [r0, 0x4]
cmp r0, 0 cmp r0, 0

8
common_syms/m4a_2.txt
View File

@ -1,12 +1,12 @@
gSoundInfo gSoundInfo
gPokemonCrySongs gPokemonCrySongs
gPokemonCryMusicPlayers gPokemonCryMusicPlayers
gMPlay_BGM gMPlayInfo_BGM
gMPlayJumpTable gMPlayJumpTable
gCgbChans gCgbChans
gMPlay_SE1 gMPlayInfo_SE1
gMPlay_SE2 gMPlayInfo_SE2
gPokemonCryTracks gPokemonCryTracks
gPokemonCrySong gPokemonCrySong
gMPlayMemAccArea gMPlayMemAccArea
gMPlay_SE3 gMPlayInfo_SE3

1211
data/battle_anims.s
View File

File diff suppressed because it is too large Load Diff

175
data/field_map_obj.s
View File

@ -5,16 +5,12 @@
.section .rodata .section .rodata
gUnknown_084975C4:: @ 84975C4 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 .byte 0x01, 0x01, 0x06, 0x07, 0x08, 0x09, 0x06, 0x07, 0x08, 0x09, 0x0b, 0x0b, 0x00, 0x00, 0x00, 0x00
gUnknown_084975D4:: @ 84975D4 gUnknown_084975D4:: @ 84975D4
@ replacing .incbin "baserom.gba", 0x004975d4, 0x18 spr_template 0x0000, 0xFFFF, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject
.2byte 0, 65535
.4byte gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject
gUnknown_084975EC:: @ 84975EC gUnknown_084975EC:: @ 84975EC
@ replacing .incbin "baserom.gba", 0x004975ec, 0xc
.4byte CameraObject_0 .4byte CameraObject_0
.4byte CameraObject_1 .4byte CameraObject_1
.4byte CameraObject_2 .4byte CameraObject_2
@ -23,7 +19,6 @@ gUnknown_084975EC:: @ 84975EC
.include "data/graphics/field_objects/field_object_graphics.inc" .include "data/graphics/field_objects/field_object_graphics.inc"
gUnknown_08505438:: @ 8505438 gUnknown_08505438:: @ 8505438
@ replacing .incbin "baserom.gba", 0x00505438, 0x144
.4byte FieldObjectCB_NoMovement1 .4byte FieldObjectCB_NoMovement1
.4byte FieldObjectCB_LookRandomDirections .4byte FieldObjectCB_LookRandomDirections
.4byte FieldObjectCB_GoRandomDirections .4byte FieldObjectCB_GoRandomDirections
@ -107,13 +102,11 @@ gUnknown_08505438:: @ 8505438
.4byte FieldObjectCB_WalkInPlace4 .4byte FieldObjectCB_WalkInPlace4
gUnknown_0850557C:: @ 850557C 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 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 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 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
gUnknown_085055CD:: @ 85055CD 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 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 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 .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" .include "data/graphics/field_objects/field_object_anims.inc"
gUnknown_085094AC:: @ 85094AC gUnknown_085094AC:: @ 85094AC
@ replacing .incbin "baserom.gba", 0x005094ac, 0x40
.4byte gFieldObjectImageAnimTable_QuintyPlump .4byte gFieldObjectImageAnimTable_QuintyPlump
.byte 1, 3, 0, 2 .byte 1, 3, 0, 2
.4byte gFieldObjectImageAnimTable_Standard .4byte gFieldObjectImageAnimTable_Standard
@ -157,7 +149,6 @@ gUnknown_085094AC:: @ 85094AC
.include "data/graphics/field_objects/field_object_graphics_info.inc" .include "data/graphics/field_objects/field_object_graphics_info.inc"
gUnknown_0850BBC8:: @ 850BBC8 gUnknown_0850BBC8:: @ 850BBC8
@ replacing .incbin "baserom.gba", 0x0050bbc8, 0x138
.align 2, 0 .align 2, 0
.4byte gFieldObjectPalette0 .4byte gFieldObjectPalette0
.2byte 4355 .2byte 4355
@ -269,19 +260,15 @@ gUnknown_0850BBC8:: @ 850BBC8
.align 2, 0 .align 2, 0
Unknown_0850BCE8:: @ 0850BCE8 Unknown_0850BCE8:: @ 0850BCE8
@ replacing .incbin "baserom.gba", 0x0050bce8, 0x8
.2byte 0x1101, 0x1101, 0x1101, 0x1101 .2byte 0x1101, 0x1101, 0x1101, 0x1101
Unknown_0850BCF0:: @ 0850BCF0 Unknown_0850BCF0:: @ 0850BCF0
@ replacing .incbin "baserom.gba", 0x0050bcf0, 0x8
.2byte 0x1111, 0x1111, 0x1111, 0x1111 .2byte 0x1111, 0x1111, 0x1111, 0x1111
Unknown_0850BCF8:: @ 0850BCF8 Unknown_0850BCF8:: @ 0850BCF8
@ replacing .incbin "baserom.gba", 0x0050bcf8, 0x8
.2byte 0x1115, 0x1115, 0x1115, 0x1115 .2byte 0x1115, 0x1115, 0x1115, 0x1115
gUnknown_0850BD00:: @ 850BD00 gUnknown_0850BD00:: @ 850BD00
@ replacing .incbin "baserom.gba", 0x0050bd00, 0x78
.2byte 4352, 0 .2byte 4352, 0
.4byte Unknown_0850BCE8 .4byte Unknown_0850BCE8
.2byte 4368, 0 .2byte 4368, 0
@ -292,51 +279,39 @@ gUnknown_0850BD00:: @ 850BD00
.4byte NULL .4byte NULL
Unknown_0850BD20:: @ 0850BD20 Unknown_0850BD20:: @ 0850BD20
@ replacing .incbin "baserom.gba", 0x0050bd20, 0x8
.2byte 0x110c, 0x110c, 0x110c, 0x110c .2byte 0x110c, 0x110c, 0x110c, 0x110c
Unknown_0850BD28:: @ 0x0850bd28 Unknown_0850BD28:: @ 0x0850bd28
@ replacing .incbin "baserom.gba", 0x0050bd28, 0x8
.2byte 0x110d, 0x110d, 0x110d, 0x110d .2byte 0x110d, 0x110d, 0x110d, 0x110d
Unknown_0850BD30:: @ 0x0850bd30 Unknown_0850BD30:: @ 0x0850bd30
@ replacing .incbin "baserom.gba", 0x0050bd30, 0x8
.2byte 0x110e, 0x110e, 0x110e, 0x110e .2byte 0x110e, 0x110e, 0x110e, 0x110e
Unknown_0850BD38:: @ 0x0850bd38 Unknown_0850BD38:: @ 0x0850bd38
@ replacing .incbin "baserom.gba", 0x0050bd38, 0x8
.2byte 0x1112, 0x1112, 0x1112, 0x1112 .2byte 0x1112, 0x1112, 0x1112, 0x1112
Unknown_0850BD40:: @ 0x0850bd40 Unknown_0850BD40:: @ 0x0850bd40
@ replacing .incbin "baserom.gba", 0x0050bd40, 0x8
.2byte 0x1113, 0x1113, 0x1113, 0x1113 .2byte 0x1113, 0x1113, 0x1113, 0x1113
Unknown_0850BD48:: @ 0x0850bd48 Unknown_0850BD48:: @ 0x0850bd48
@ replacing .incbin "baserom.gba", 0x0050bd48, 0x8
.2byte 0x1114, 0x1114, 0x1114, 0x1114 .2byte 0x1114, 0x1114, 0x1114, 0x1114
Unknown_0850BD50:: @ 0x0850bd50 Unknown_0850BD50:: @ 0x0850bd50
@ replacing .incbin "baserom.gba", 0x0050bd50, 0x8
.2byte 0x111b, 0x111b, 0x111b, 0x111b .2byte 0x111b, 0x111b, 0x111b, 0x111b
Unknown_0850BD58:: @ 0x0850bd58 Unknown_0850BD58:: @ 0x0850bd58
@ replacing .incbin "baserom.gba", 0x0050bd58, 0x8
.2byte 0x1117, 0x1117, 0x1117, 0x1117 .2byte 0x1117, 0x1117, 0x1117, 0x1117
Unknown_0850BD60:: @ 0x0850bd60 Unknown_0850BD60:: @ 0x0850bd60
@ replacing .incbin "baserom.gba", 0x0050bd60, 0x8
.2byte 0x1119, 0x1119, 0x1119, 0x1119 .2byte 0x1119, 0x1119, 0x1119, 0x1119
Unknown_0850BD68:: @ 0x0850bd68 Unknown_0850BD68:: @ 0x0850bd68
@ replacing .incbin "baserom.gba", 0x0050bd68, 0x8
.2byte 0x1109, 0x1109, 0x1109, 0x1109 .2byte 0x1109, 0x1109, 0x1109, 0x1109
Unknown_0850BD70:: @ 0x0850bd70 Unknown_0850BD70:: @ 0x0850bd70
@ replacing .incbin "baserom.gba", 0x0050bd70, 0x8
.2byte 0x111d, 0x111d, 0x111d, 0x111d .2byte 0x111d, 0x111d, 0x111d, 0x111d
gUnknown_0850BD78:: @ 850BD78 gUnknown_0850BD78:: @ 850BD78
@ replacing .incbin "baserom.gba", 0x0050bd78, 0xc0
.2byte 4352, 0 .2byte 4352, 0
.4byte Unknown_0850BCE8 .4byte Unknown_0850BCE8
.2byte 4368, 0 .2byte 4368, 0
@ -367,7 +342,6 @@ gUnknown_0850BD78:: @ 850BD78
.4byte NULL .4byte NULL
gUnknown_0850BDE8:: @ 850BDE8 gUnknown_0850BDE8:: @ 850BDE8
@ replacing .incbin "baserom.gba", 0x0050bde8, 0x50
.2byte 0x1100, 0x1101, 0x1103, 0x1104, 0x1105, 0x1106, 0x1107, 0x1108, 0x1109, 0x110a .2byte 0x1100, 0x1101, 0x1103, 0x1104, 0x1105, 0x1106, 0x1107, 0x1108, 0x1109, 0x110a
gUnknown_0850BDFC:: gUnknown_0850BDFC::
.2byte 0x1100, 0x1101, 0x1103, 0x1104, 0x1105, 0x1106, 0x1107, 0x1108, 0x1109, 0x110a .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 .2byte 0x1100, 0x1101, 0x1103, 0x1104, 0x1105, 0x1106, 0x1107, 0x1108, 0x1109, 0x110a
gUnknown_0850BE38:: @ 850BE38 gUnknown_0850BE38:: @ 850BE38
@ replacing .incbin "baserom.gba", 0x0050be38, 0x10
.4byte gUnknown_0850BDE8 .4byte gUnknown_0850BDE8
.4byte gUnknown_0850BDFC .4byte gUnknown_0850BDFC
.4byte gUnknown_0850BE10 .4byte gUnknown_0850BE10
@ -389,22 +362,18 @@ gUnknown_0850BE38:: @ 850BE38
@ 850C9C0 @ 850C9C0
.include "data/graphics/field_objects/field_effect_objects.inc" .include "data/graphics/field_objects/field_effect_objects.inc"
@ replacing .incbin "baserom.gba", 0x0050d6d4, 0x8
.align 2, 0 .align 2, 0
.4byte gFieldObjectPalette2 .4byte gFieldObjectPalette2
.2byte 4113 .2byte 4113
.align 2, 0 .align 2, 0
gUnknown_0850D6DC:: @ 850D6DC gUnknown_0850D6DC:: @ 850D6DC
@ replacing .incbin "baserom.gba", 0x0050d6dc, 0x10
.2byte 0x0020, 0x0040, 0x0060, 0x0080, 0x0020, 0x0040, 0x0080, 0x00c0 .2byte 0x0020, 0x0040, 0x0060, 0x0080, 0x0020, 0x0040, 0x0080, 0x00c0
gUnknown_0850D6EC:: @ 850D6EC gUnknown_0850D6EC:: @ 850D6EC
@ replacing .incbin "baserom.gba", 0x0050d6ec, 0x8
.2byte 0x0020, 0x0030, 0x0040, 0x0050 .2byte 0x0020, 0x0030, 0x0040, 0x0050
gUnknown_0850D6F4:: @ 850D6F4 gUnknown_0850D6F4:: @ 850D6F4
@ replacing .incbin "baserom.gba", 0x0050d6f4, 0x1c
.4byte sub_808F44C .4byte sub_808F44C
.4byte sub_808F460 .4byte sub_808F460
.4byte sub_808F48C .4byte sub_808F48C
@ -414,11 +383,9 @@ gUnknown_0850D6F4:: @ 850D6F4
.4byte sub_808F564 .4byte sub_808F564
gUnknown_0850D710:: @ 850D710 gUnknown_0850D710:: @ 850D710
@ replacing .incbin "baserom.gba", 0x0050d710, 0x4
.byte 0x01, 0x02, 0x03, 0x04 .byte 0x01, 0x02, 0x03, 0x04
gUnknown_0850D714:: @ 850D714 gUnknown_0850D714:: @ 850D714
@ replacing .incbin "baserom.gba", 0x0050d714, 0x2c
.4byte GetRegularRunningPastFacingDirection .4byte GetRegularRunningPastFacingDirection
.4byte GetNorthSouthRunningPastFacingDirection .4byte GetNorthSouthRunningPastFacingDirection
.4byte GetEastWestRunningPastFacingDirection .4byte GetEastWestRunningPastFacingDirection
@ -432,7 +399,6 @@ gUnknown_0850D714:: @ 850D714
.4byte GetNonNorthRunningPastFacingDirection .4byte GetNonNorthRunningPastFacingDirection
gUnknown_0850D740:: @ 850D740 gUnknown_0850D740:: @ 850D740
@ replacing .incbin "baserom.gba", 0x0050d740, 0x14
.4byte sub_808F988 .4byte sub_808F988
.4byte sub_808F99C .4byte sub_808F99C
.4byte sub_808F9C8 .4byte sub_808F9C8
@ -440,7 +406,6 @@ gUnknown_0850D740:: @ 850D740
.4byte sub_808FA3C .4byte sub_808FA3C
gUnknown_0850D754:: @ 850D754 gUnknown_0850D754:: @ 850D754
@ replacing .incbin "baserom.gba", 0x0050d754, 0x1c
.4byte sub_808FAC8 .4byte sub_808FAC8
.4byte sub_808FADC .4byte sub_808FADC
.4byte sub_808FB08 .4byte sub_808FB08
@ -450,11 +415,9 @@ gUnknown_0850D754:: @ 850D754
.4byte sub_808FBE0 .4byte sub_808FBE0
gUnknown_0850D770:: @ 850D770 gUnknown_0850D770:: @ 850D770
@ replacing .incbin "baserom.gba", 0x0050d770, 0x4
.byte 0x01, 0x02, 0x00, 0x00 .byte 0x01, 0x02, 0x00, 0x00
gUnknown_0850D774:: @ 850D774 gUnknown_0850D774:: @ 850D774
@ replacing .incbin "baserom.gba", 0x0050d774, 0x1c
.4byte sub_808FC4C .4byte sub_808FC4C
.4byte sub_808FC60 .4byte sub_808FC60
.4byte sub_808FC8C .4byte sub_808FC8C
@ -464,17 +427,14 @@ gUnknown_0850D774:: @ 850D774
.4byte sub_808FD64 .4byte sub_808FD64
gUnknown_0850D790:: @ 850D790 gUnknown_0850D790:: @ 850D790
@ replacing .incbin "baserom.gba", 0x0050d790, 0x4
.byte 0x03, 0x04, 0x00, 0x00 .byte 0x03, 0x04, 0x00, 0x00
gUnknown_0850D794:: @ 850D794 gUnknown_0850D794:: @ 850D794
@ replacing .incbin "baserom.gba", 0x0050d794, 0xc
.4byte sub_808FDD0 .4byte sub_808FDD0
.4byte sub_808FDFC .4byte sub_808FDFC
.4byte sub_808FE1C .4byte sub_808FE1C
gUnknown_0850D7A0:: @ 850D7A0 gUnknown_0850D7A0:: @ 850D7A0
@ replacing .incbin "baserom.gba", 0x0050d7a0, 0x14
.4byte do_berry_tree_growth_sparkle_1 .4byte do_berry_tree_growth_sparkle_1
.4byte sub_808FF48 .4byte sub_808FF48
.4byte do_berry_tree_growth_sparkle_2 .4byte do_berry_tree_growth_sparkle_2
@ -482,7 +442,6 @@ gUnknown_0850D7A0:: @ 850D7A0
.4byte sub_8090004 .4byte sub_8090004
gUnknown_0850D7B4:: @ 850D7B4 gUnknown_0850D7B4:: @ 850D7B4
@ replacing .incbin "baserom.gba", 0x0050d7b4, 0x14
.4byte sub_8090094 .4byte sub_8090094
.4byte sub_80900A8 .4byte sub_80900A8
.4byte sub_80900D4 .4byte sub_80900D4
@ -490,7 +449,6 @@ gUnknown_0850D7B4:: @ 850D7B4
.4byte sub_8090148 .4byte sub_8090148
gUnknown_0850D7C8:: @ 850D7C8 gUnknown_0850D7C8:: @ 850D7C8
@ replacing .incbin "baserom.gba", 0x0050d7c8, 0x14
.4byte sub_80901D4 .4byte sub_80901D4
.4byte sub_80901E8 .4byte sub_80901E8
.4byte sub_8090214 .4byte sub_8090214
@ -498,7 +456,6 @@ gUnknown_0850D7C8:: @ 850D7C8
.4byte sub_8090288 .4byte sub_8090288
gUnknown_0850D7DC:: @ 850D7DC gUnknown_0850D7DC:: @ 850D7DC
@ replacing .incbin "baserom.gba", 0x0050d7dc, 0x14
.4byte sub_8090314 .4byte sub_8090314
.4byte sub_8090328 .4byte sub_8090328
.4byte sub_8090354 .4byte sub_8090354
@ -506,11 +463,9 @@ gUnknown_0850D7DC:: @ 850D7DC
.4byte sub_80903C8 .4byte sub_80903C8
gUnknown_0850D7F0:: @ 850D7F0 gUnknown_0850D7F0:: @ 850D7F0
@ replacing .incbin "baserom.gba", 0x0050d7f0, 0x4
.byte 0x02, 0x03, 0x00, 0x00 .byte 0x02, 0x03, 0x00, 0x00
gUnknown_0850D7F4:: @ 850D7F4 gUnknown_0850D7F4:: @ 850D7F4
@ replacing .incbin "baserom.gba", 0x0050d7f4, 0x14
.4byte sub_8090454 .4byte sub_8090454
.4byte sub_8090468 .4byte sub_8090468
.4byte sub_8090494 .4byte sub_8090494
@ -518,11 +473,9 @@ gUnknown_0850D7F4:: @ 850D7F4
.4byte sub_8090508 .4byte sub_8090508
gUnknown_0850D808:: @ 850D808 gUnknown_0850D808:: @ 850D808
@ replacing .incbin "baserom.gba", 0x0050d808, 0x4
.byte 0x02, 0x04, 0x00, 0x00 .byte 0x02, 0x04, 0x00, 0x00
gUnknown_0850D80C:: @ 850D80C gUnknown_0850D80C:: @ 850D80C
@ replacing .incbin "baserom.gba", 0x0050d80c, 0x14
.4byte sub_8090594 .4byte sub_8090594
.4byte sub_80905A8 .4byte sub_80905A8
.4byte sub_80905D4 .4byte sub_80905D4
@ -530,11 +483,9 @@ gUnknown_0850D80C:: @ 850D80C
.4byte sub_8090648 .4byte sub_8090648
gUnknown_0850D820:: @ 850D820 gUnknown_0850D820:: @ 850D820
@ replacing .incbin "baserom.gba", 0x0050d820, 0x4
.byte 0x01, 0x03, 0x00, 0x00 .byte 0x01, 0x03, 0x00, 0x00
gUnknown_0850D824:: @ 850D824 gUnknown_0850D824:: @ 850D824
@ replacing .incbin "baserom.gba", 0x0050d824, 0x14
.4byte sub_80906D4 .4byte sub_80906D4
.4byte sub_80906E8 .4byte sub_80906E8
.4byte sub_8090714 .4byte sub_8090714
@ -542,11 +493,9 @@ gUnknown_0850D824:: @ 850D824
.4byte sub_8090788 .4byte sub_8090788
gUnknown_0850D838:: @ 850D838 gUnknown_0850D838:: @ 850D838
@ replacing .incbin "baserom.gba", 0x0050d838, 0x4
.byte 0x01, 0x04, 0x00, 0x00 .byte 0x01, 0x04, 0x00, 0x00
gUnknown_0850D83C:: @ 850D83C gUnknown_0850D83C:: @ 850D83C
@ replacing .incbin "baserom.gba", 0x0050d83c, 0x14
.4byte sub_8090814 .4byte sub_8090814
.4byte sub_8090828 .4byte sub_8090828
.4byte sub_8090854 .4byte sub_8090854
@ -554,11 +503,9 @@ gUnknown_0850D83C:: @ 850D83C
.4byte sub_80908C8 .4byte sub_80908C8
gUnknown_0850D850:: @ 850D850 gUnknown_0850D850:: @ 850D850
@ replacing .incbin "baserom.gba", 0x0050d850, 0x4
.byte 0x02, 0x01, 0x03, 0x01 .byte 0x02, 0x01, 0x03, 0x01
gUnknown_0850D854:: @ 850D854 gUnknown_0850D854:: @ 850D854
@ replacing .incbin "baserom.gba", 0x0050d854, 0x14
.4byte sub_8090954 .4byte sub_8090954
.4byte sub_8090968 .4byte sub_8090968
.4byte sub_8090994 .4byte sub_8090994
@ -566,11 +513,9 @@ gUnknown_0850D854:: @ 850D854
.4byte sub_8090A08 .4byte sub_8090A08
gUnknown_0850D868:: @ 850D868 gUnknown_0850D868:: @ 850D868
@ replacing .incbin "baserom.gba", 0x0050d868, 0x4
.byte 0x01, 0x02, 0x04, 0x01 .byte 0x01, 0x02, 0x04, 0x01
gUnknown_0850D86C:: @ 850D86C gUnknown_0850D86C:: @ 850D86C
@ replacing .incbin "baserom.gba", 0x0050d86c, 0x14
.4byte sub_8090A94 .4byte sub_8090A94
.4byte sub_8090AA8 .4byte sub_8090AA8
.4byte sub_8090AD4 .4byte sub_8090AD4
@ -578,11 +523,9 @@ gUnknown_0850D86C:: @ 850D86C
.4byte sub_8090B48 .4byte sub_8090B48
gUnknown_0850D880:: @ 850D880 gUnknown_0850D880:: @ 850D880
@ replacing .incbin "baserom.gba", 0x0050d880, 0x4
.byte 0x02, 0x03, 0x04, 0x02 .byte 0x02, 0x03, 0x04, 0x02
gUnknown_0850D884:: @ 850D884 gUnknown_0850D884:: @ 850D884
@ replacing .incbin "baserom.gba", 0x0050d884, 0x14
.4byte sub_8090BD4 .4byte sub_8090BD4
.4byte sub_8090BE8 .4byte sub_8090BE8
.4byte sub_8090C14 .4byte sub_8090C14
@ -590,282 +533,227 @@ gUnknown_0850D884:: @ 850D884
.4byte sub_8090C88 .4byte sub_8090C88
gUnknown_0850D898:: @ 850D898 gUnknown_0850D898:: @ 850D898
@ replacing .incbin "baserom.gba", 0x0050d898, 0x4
.byte 0x03, 0x04, 0x01, 0x01 .byte 0x03, 0x04, 0x01, 0x01
gUnknown_0850D89C:: @ 850D89C gUnknown_0850D89C:: @ 850D89C
@ replacing .incbin "baserom.gba", 0x0050d89c, 0x10
.4byte sub_8090D14 .4byte sub_8090D14
.4byte sub_8090D40 .4byte sub_8090D40
.4byte sub_8090D64 .4byte sub_8090D64
.4byte sub_8090D90 .4byte sub_8090D90
gUnknown_0850D8AC:: @ 850D8AC gUnknown_0850D8AC:: @ 850D8AC
@ replacing .incbin "baserom.gba", 0x0050d8ac, 0x8
.byte 0x01, 0x04, 0x03, 0x01, 0x02, 0x00, 0x00, 0x00 .byte 0x01, 0x04, 0x03, 0x01, 0x02, 0x00, 0x00, 0x00
gUnknown_0850D8B4:: @ 850D8B4 gUnknown_0850D8B4:: @ 850D8B4
@ replacing .incbin "baserom.gba", 0x0050d8b4, 0x10
.4byte sub_8090E18 .4byte sub_8090E18
.4byte sub_8090E44 .4byte sub_8090E44
.4byte sub_8090E68 .4byte sub_8090E68
.4byte sub_8090E94 .4byte sub_8090E94
gUnknown_0850D8C4:: @ 850D8C4 gUnknown_0850D8C4:: @ 850D8C4
@ replacing .incbin "baserom.gba", 0x0050d8c4, 0x8
.byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00 .byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00
gUnknown_0850D8CC:: @ 850D8CC gUnknown_0850D8CC:: @ 850D8CC
@ replacing .incbin "baserom.gba", 0x0050d8cc, 0x10
.4byte sub_8090F1C .4byte sub_8090F1C
.4byte sub_8090F30 .4byte sub_8090F30
.4byte sub_8090F68 .4byte sub_8090F68
.4byte sub_8091020 .4byte sub_8091020
gUnknown_0850D8DC:: @ 850D8DC gUnknown_0850D8DC:: @ 850D8DC
@ replacing .incbin "baserom.gba", 0x0050d8dc, 0xc
.4byte sub_8091048 .4byte sub_8091048
.4byte sub_809117C .4byte sub_809117C
.4byte sub_8091110 .4byte sub_8091110
gUnknown_0850D8E8:: @ 850D8E8 gUnknown_0850D8E8:: @ 850D8E8
@ replacing .incbin "baserom.gba", 0x0050d8e8, 0x4
.byte 0x02, 0x04, 0x03, 0x01 .byte 0x02, 0x04, 0x03, 0x01
gUnknown_0850D8EC:: @ 850D8EC gUnknown_0850D8EC:: @ 850D8EC
@ replacing .incbin "baserom.gba", 0x0050d8ec, 0xc
.4byte sub_8091048 .4byte sub_8091048
.4byte sub_8091208 .4byte sub_8091208
.4byte sub_8091110 .4byte sub_8091110
gUnknown_0850D8F8:: @ 850D8F8 gUnknown_0850D8F8:: @ 850D8F8
@ replacing .incbin "baserom.gba", 0x0050d8f8, 0x4
.byte 0x04, 0x03, 0x01, 0x02 .byte 0x04, 0x03, 0x01, 0x02
gUnknown_0850D8FC:: @ 850D8FC gUnknown_0850D8FC:: @ 850D8FC
@ replacing .incbin "baserom.gba", 0x0050d8fc, 0xc
.4byte sub_8091048 .4byte sub_8091048
.4byte sub_8091294 .4byte sub_8091294
.4byte sub_8091110 .4byte sub_8091110
gUnknown_0850D908:: @ 850D908 gUnknown_0850D908:: @ 850D908
@ replacing .incbin "baserom.gba", 0x0050d908, 0x4
.byte 0x01, 0x02, 0x04, 0x03 .byte 0x01, 0x02, 0x04, 0x03
gUnknown_0850D90C:: @ 850D90C gUnknown_0850D90C:: @ 850D90C
@ replacing .incbin "baserom.gba", 0x0050d90c, 0xc
.4byte sub_8091048 .4byte sub_8091048
.4byte sub_8091320 .4byte sub_8091320
.4byte sub_8091110 .4byte sub_8091110
gUnknown_0850D918:: @ 850D918 gUnknown_0850D918:: @ 850D918
@ replacing .incbin "baserom.gba", 0x0050d918, 0x4
.byte 0x03, 0x01, 0x02, 0x04 .byte 0x03, 0x01, 0x02, 0x04
gUnknown_0850D91C:: @ 850D91C gUnknown_0850D91C:: @ 850D91C
@ replacing .incbin "baserom.gba", 0x0050d91c, 0xc
.4byte sub_8091048 .4byte sub_8091048
.4byte sub_80913AC .4byte sub_80913AC
.4byte sub_8091110 .4byte sub_8091110
gUnknown_0850D928:: @ 850D928 gUnknown_0850D928:: @ 850D928
@ replacing .incbin "baserom.gba", 0x0050d928, 0x4
.byte 0x02, 0x03, 0x04, 0x01 .byte 0x02, 0x03, 0x04, 0x01
gUnknown_0850D92C:: @ 850D92C gUnknown_0850D92C:: @ 850D92C
@ replacing .incbin "baserom.gba", 0x0050d92c, 0xc
.4byte sub_8091048 .4byte sub_8091048
.4byte sub_8091438 .4byte sub_8091438
.4byte sub_8091110 .4byte sub_8091110
gUnknown_0850D938:: @ 850D938 gUnknown_0850D938:: @ 850D938
@ replacing .incbin "baserom.gba", 0x0050d938, 0x4
.byte 0x03, 0x04, 0x01, 0x02 .byte 0x03, 0x04, 0x01, 0x02
gUnknown_0850D93C:: @ 850D93C gUnknown_0850D93C:: @ 850D93C
@ replacing .incbin "baserom.gba", 0x0050d93c, 0xc
.4byte sub_8091048 .4byte sub_8091048
.4byte sub_80914C4 .4byte sub_80914C4
.4byte sub_8091110 .4byte sub_8091110
gUnknown_0850D948:: @ 850D948 gUnknown_0850D948:: @ 850D948
@ replacing .incbin "baserom.gba", 0x0050d948, 0xc
.4byte sub_8091048 .4byte sub_8091048
.4byte sub_8091550 .4byte sub_8091550
.4byte sub_8091110 .4byte sub_8091110
gUnknown_0850D954:: @ 850D954 gUnknown_0850D954:: @ 850D954
@ replacing .incbin "baserom.gba", 0x0050d954, 0x4
.byte 0x04, 0x01, 0x02, 0x03 .byte 0x04, 0x01, 0x02, 0x03
gUnknown_0850D958:: @ 850D958 gUnknown_0850D958:: @ 850D958
@ replacing .incbin "baserom.gba", 0x0050d958, 0xc
.4byte sub_8091048 .4byte sub_8091048
.4byte sub_80915DC .4byte sub_80915DC
.4byte sub_8091110 .4byte sub_8091110
gUnknown_0850D964:: @ 850D964 gUnknown_0850D964:: @ 850D964
@ replacing .incbin "baserom.gba", 0x0050d964, 0x4
.byte 0x03, 0x02, 0x01, 0x04 .byte 0x03, 0x02, 0x01, 0x04
gUnknown_0850D968:: @ 850D968 gUnknown_0850D968:: @ 850D968
@ replacing .incbin "baserom.gba", 0x0050d968, 0xc
.4byte sub_8091048 .4byte sub_8091048
.4byte sub_8091668 .4byte sub_8091668
.4byte sub_8091110 .4byte sub_8091110
gUnknown_0850D974:: @ 850D974 gUnknown_0850D974:: @ 850D974
@ replacing .incbin "baserom.gba", 0x0050d974, 0x4
.byte 0x02, 0x01, 0x04, 0x03 .byte 0x02, 0x01, 0x04, 0x03
gUnknown_0850D978:: @ 850D978 gUnknown_0850D978:: @ 850D978
@ replacing .incbin "baserom.gba", 0x0050d978, 0xc
.4byte sub_8091048 .4byte sub_8091048
.4byte sub_80916F4 .4byte sub_80916F4
.4byte sub_8091110 .4byte sub_8091110
gUnknown_0850D984:: @ 850D984 gUnknown_0850D984:: @ 850D984
@ replacing .incbin "baserom.gba", 0x0050d984, 0x4
.byte 0x04, 0x03, 0x02, 0x01 .byte 0x04, 0x03, 0x02, 0x01
gUnknown_0850D988:: @ 850D988 gUnknown_0850D988:: @ 850D988
@ replacing .incbin "baserom.gba", 0x0050d988, 0xc
.4byte sub_8091048 .4byte sub_8091048
.4byte sub_8091780 .4byte sub_8091780
.4byte sub_8091110 .4byte sub_8091110
gUnknown_0850D994:: @ 850D994 gUnknown_0850D994:: @ 850D994
@ replacing .incbin "baserom.gba", 0x0050d994, 0x4
.byte 0x01, 0x04, 0x03, 0x02 .byte 0x01, 0x04, 0x03, 0x02
gUnknown_0850D998:: @ 850D998 gUnknown_0850D998:: @ 850D998
@ replacing .incbin "baserom.gba", 0x0050d998, 0xc
.4byte sub_8091048 .4byte sub_8091048
.4byte sub_809180C .4byte sub_809180C
.4byte sub_8091110 .4byte sub_8091110
gUnknown_0850D9A4:: @ 850D9A4 gUnknown_0850D9A4:: @ 850D9A4
@ replacing .incbin "baserom.gba", 0x0050d9a4, 0x4
.byte 0x04, 0x02, 0x01, 0x03 .byte 0x04, 0x02, 0x01, 0x03
gUnknown_0850D9A8:: @ 850D9A8 gUnknown_0850D9A8:: @ 850D9A8
@ replacing .incbin "baserom.gba", 0x0050d9a8, 0xc
.4byte sub_8091048 .4byte sub_8091048
.4byte sub_8091898 .4byte sub_8091898
.4byte sub_8091110 .4byte sub_8091110
gUnknown_0850D9B4:: @ 850D9B4 gUnknown_0850D9B4:: @ 850D9B4
@ replacing .incbin "baserom.gba", 0x0050d9b4, 0x4
.byte 0x02, 0x01, 0x03, 0x04 .byte 0x02, 0x01, 0x03, 0x04
gUnknown_0850D9B8:: @ 850D9B8 gUnknown_0850D9B8:: @ 850D9B8
@ replacing .incbin "baserom.gba", 0x0050d9b8, 0xc
.4byte sub_8091048 .4byte sub_8091048
.4byte sub_8091924 .4byte sub_8091924
.4byte sub_8091110 .4byte sub_8091110
gUnknown_0850D9C4:: @ 850D9C4 gUnknown_0850D9C4:: @ 850D9C4
@ replacing .incbin "baserom.gba", 0x0050d9c4, 0x4
.byte 0x03, 0x04, 0x02, 0x01 .byte 0x03, 0x04, 0x02, 0x01
gUnknown_0850D9C8:: @ 850D9C8 gUnknown_0850D9C8:: @ 850D9C8
@ replacing .incbin "baserom.gba", 0x0050d9c8, 0xc
.4byte sub_8091048 .4byte sub_8091048
.4byte sub_80919B0 .4byte sub_80919B0
.4byte sub_8091110 .4byte sub_8091110
gUnknown_0850D9D4:: @ 850D9D4 gUnknown_0850D9D4:: @ 850D9D4
@ replacing .incbin "baserom.gba", 0x0050d9d4, 0x4
.byte 0x01, 0x03, 0x04, 0x02 .byte 0x01, 0x03, 0x04, 0x02
gUnknown_0850D9D8:: @ 850D9D8 gUnknown_0850D9D8:: @ 850D9D8
@ replacing .incbin "baserom.gba", 0x0050d9d8, 0xc
.4byte sub_8091048 .4byte sub_8091048
.4byte sub_8091A3C .4byte sub_8091A3C
.4byte sub_8091110 .4byte sub_8091110
gUnknown_0850D9E4:: @ 850D9E4 gUnknown_0850D9E4:: @ 850D9E4
@ replacing .incbin "baserom.gba", 0x0050d9e4, 0x4
.byte 0x02, 0x03, 0x01, 0x04 .byte 0x02, 0x03, 0x01, 0x04
gUnknown_0850D9E8:: @ 850D9E8 gUnknown_0850D9E8:: @ 850D9E8
@ replacing .incbin "baserom.gba", 0x0050d9e8, 0xc
.4byte sub_8091048 .4byte sub_8091048
.4byte sub_8091AC8 .4byte sub_8091AC8
.4byte sub_8091110 .4byte sub_8091110
gUnknown_0850D9F4:: @ 850D9F4 gUnknown_0850D9F4:: @ 850D9F4
@ replacing .incbin "baserom.gba", 0x0050d9f4, 0x4
.byte 0x01, 0x04, 0x02, 0x03 .byte 0x01, 0x04, 0x02, 0x03
gUnknown_0850D9F8:: @ 850D9F8 gUnknown_0850D9F8:: @ 850D9F8
@ replacing .incbin "baserom.gba", 0x0050d9f8, 0xc
.4byte sub_8091048 .4byte sub_8091048
.4byte sub_8091B54 .4byte sub_8091B54
.4byte sub_8091110 .4byte sub_8091110
gUnknown_0850DA04:: @ 850DA04 gUnknown_0850DA04:: @ 850DA04
@ replacing .incbin "baserom.gba", 0x0050da04, 0x4
.byte 0x03, 0x01, 0x04, 0x02 .byte 0x03, 0x01, 0x04, 0x02
gUnknown_0850DA08:: @ 850DA08 gUnknown_0850DA08:: @ 850DA08
@ replacing .incbin "baserom.gba", 0x0050da08, 0xc
.4byte sub_8091048 .4byte sub_8091048
.4byte sub_8091BE0 .4byte sub_8091BE0
.4byte sub_8091110 .4byte sub_8091110
gUnknown_0850DA14:: @ 850DA14 gUnknown_0850DA14:: @ 850DA14
@ replacing .incbin "baserom.gba", 0x0050da14, 0x4
.byte 0x04, 0x02, 0x03, 0x01 .byte 0x04, 0x02, 0x03, 0x01
gUnknown_0850DA18:: @ 850DA18 gUnknown_0850DA18:: @ 850DA18
@ replacing .incbin "baserom.gba", 0x0050da18, 0xc
.4byte sub_8091048 .4byte sub_8091048
.4byte sub_8091C6C .4byte sub_8091C6C
.4byte sub_8091110 .4byte sub_8091110
gUnknown_0850DA24:: @ 850DA24 gUnknown_0850DA24:: @ 850DA24
@ replacing .incbin "baserom.gba", 0x0050da24, 0x4
.byte 0x02, 0x04, 0x01, 0x03 .byte 0x02, 0x04, 0x01, 0x03
gUnknown_0850DA28:: @ 850DA28 gUnknown_0850DA28:: @ 850DA28
@ replacing .incbin "baserom.gba", 0x0050da28, 0xc
.4byte sub_8091048 .4byte sub_8091048
.4byte sub_8091CF8 .4byte sub_8091CF8
.4byte sub_8091110 .4byte sub_8091110
gUnknown_0850DA34:: @ 850DA34 gUnknown_0850DA34:: @ 850DA34
@ replacing .incbin "baserom.gba", 0x0050da34, 0x4
.byte 0x01, 0x03, 0x02, 0x04 .byte 0x01, 0x03, 0x02, 0x04
gUnknown_0850DA38:: @ 850DA38 gUnknown_0850DA38:: @ 850DA38
@ replacing .incbin "baserom.gba", 0x0050da38, 0xc
.4byte sub_8091048 .4byte sub_8091048
.4byte sub_8091D84 .4byte sub_8091D84
.4byte sub_8091110 .4byte sub_8091110
gUnknown_0850DA44:: @ 850DA44 gUnknown_0850DA44:: @ 850DA44
@ replacing .incbin "baserom.gba", 0x0050da44, 0x4
.byte 0x03, 0x02, 0x04, 0x01 .byte 0x03, 0x02, 0x04, 0x01
gUnknown_0850DA48:: @ 850DA48 gUnknown_0850DA48:: @ 850DA48
@ replacing .incbin "baserom.gba", 0x0050da48, 0xc
.4byte sub_8091048 .4byte sub_8091048
.4byte sub_8091E10 .4byte sub_8091E10
.4byte sub_8091110 .4byte sub_8091110
gUnknown_0850DA54:: @ 850DA54 gUnknown_0850DA54:: @ 850DA54
@ replacing .incbin "baserom.gba", 0x0050da54, 0x4
.byte 0x04, 0x01, 0x03, 0x02 .byte 0x04, 0x01, 0x03, 0x02
gUnknown_0850DA58:: @ 850DA58 gUnknown_0850DA58:: @ 850DA58
@ replacing .incbin "baserom.gba", 0x0050da58, 0xc
.4byte mss_npc_reset_oampriv3_1_unk2_unk3 .4byte mss_npc_reset_oampriv3_1_unk2_unk3
.4byte sub_8091EC0 .4byte sub_8091EC0
.4byte sub_8091F20 .4byte sub_8091F20
gUnknown_0850DA64:: @ 850DA64 gUnknown_0850DA64:: @ 850DA64
@ replacing .incbin "baserom.gba", 0x0050da64, 0x2c
.4byte sub_8091F48 .4byte sub_8091F48
.4byte sub_8091F4C .4byte sub_8091F4C
.4byte sub_8091F94 .4byte sub_8091F94
@ -879,248 +767,191 @@ gUnknown_0850DA64:: @ 850DA64
.4byte sub_8091F48 .4byte sub_8091F48
gUnknown_0850DA90:: @ 850DA90 gUnknown_0850DA90:: @ 850DA90
@ replacing .incbin "baserom.gba", 0x0050da90, 0xc
.4byte mss_npc_reset_oampriv3_1_unk2_unk3 .4byte mss_npc_reset_oampriv3_1_unk2_unk3
.4byte mss_08062EA4 .4byte mss_08062EA4
.4byte sub_8091F20 .4byte sub_8091F20
gUnknown_0850DA9C:: @ 850DA9C gUnknown_0850DA9C:: @ 850DA9C
@ replacing .incbin "baserom.gba", 0x0050da9c, 0x4
.4byte sub_80926AC .4byte sub_80926AC
gUnknown_0850DAA0:: @ 850DAA0 gUnknown_0850DAA0:: @ 850DAA0
@ replacing .incbin "baserom.gba", 0x0050daa0, 0x8
.4byte sub_8092718 .4byte sub_8092718
.4byte sub_80926B8 .4byte sub_80926B8
gUnknown_0850DAA8:: @ 850DAA8 gUnknown_0850DAA8:: @ 850DAA8
@ replacing .incbin "baserom.gba", 0x0050daa8, 0x8
.4byte sub_8092788 .4byte sub_8092788
.4byte sub_80926B8 .4byte sub_80926B8
gUnknown_0850DAB0:: @ 850DAB0 gUnknown_0850DAB0:: @ 850DAB0
@ replacing .incbin "baserom.gba", 0x0050dab0, 0x8
.4byte sub_80927F8 .4byte sub_80927F8
.4byte sub_80926B8 .4byte sub_80926B8
gUnknown_0850DAB8:: @ 850DAB8 gUnknown_0850DAB8:: @ 850DAB8
@ replacing .incbin "baserom.gba", 0x0050dab8, 0x8
.4byte sub_8092868 .4byte sub_8092868
.4byte sub_80926B8 .4byte sub_80926B8
gUnknown_0850DAC0:: @ 850DAC0 gUnknown_0850DAC0:: @ 850DAC0
@ replacing .incbin "baserom.gba", 0x0050dac0, 0xc
.4byte sub_80928D8 .4byte sub_80928D8
.4byte sub_809290C .4byte sub_809290C
.4byte sub_809292C .4byte sub_809292C
gUnknown_0850DACC:: @ 850DACC gUnknown_0850DACC:: @ 850DACC
@ replacing .incbin "baserom.gba", 0x0050dacc, 0x9
.byte 0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x01, 0x01 .byte 0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x01, 0x01
gUnknown_0850DAD5:: @ 850DAD5 gUnknown_0850DAD5:: @ 850DAD5
@ replacing .incbin "baserom.gba", 0x0050dad5, 0x9
.byte 0x04, 0x04, 0x05, 0x06, 0x07, 0x04, 0x04, 0x05, 0x05 .byte 0x04, 0x04, 0x05, 0x06, 0x07, 0x04, 0x04, 0x05, 0x05
gUnknown_0850DADE:: @ 850DADE gUnknown_0850DADE:: @ 850DADE
@ replacing .incbin "baserom.gba", 0x0050dade, 0x9
.byte 0x08, 0x08, 0x09, 0x0a, 0x0b, 0x08, 0x08, 0x09, 0x09 .byte 0x08, 0x08, 0x09, 0x0a, 0x0b, 0x08, 0x08, 0x09, 0x09
gUnknown_0850DAE7:: @ 850DAE7 gUnknown_0850DAE7:: @ 850DAE7
@ replacing .incbin "baserom.gba", 0x0050dae7, 0x9
.byte 0x0c, 0x0c, 0x0d, 0x0e, 0x0f, 0x0c, 0x0c, 0x0d, 0x0d .byte 0x0c, 0x0c, 0x0d, 0x0e, 0x0f, 0x0c, 0x0c, 0x0d, 0x0d
gUnknown_0850DAF0:: @ 850DAF0 gUnknown_0850DAF0:: @ 850DAF0
@ replacing .incbin "baserom.gba", 0x0050daf0, 0x9
.byte 0x10, 0x10, 0x11, 0x12, 0x13, 0x10, 0x10, 0x11, 0x11 .byte 0x10, 0x10, 0x11, 0x12, 0x13, 0x10, 0x10, 0x11, 0x11
gUnknown_0850DAF9:: @ 850DAF9 gUnknown_0850DAF9:: @ 850DAF9
@ replacing .incbin "baserom.gba", 0x0050daf9, 0x9
.byte 0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15 .byte 0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15
gUnknown_0850DB02:: @ 850DB02 gUnknown_0850DB02:: @ 850DB02
@ replacing .incbin "baserom.gba", 0x0050db02, 0x9
.byte 0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15 .byte 0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15
gUnknown_0850DB0B:: @ 850DB0B gUnknown_0850DB0B:: @ 850DB0B
@ replacing .incbin "baserom.gba", 0x0050db0b, 0x9
.byte 0x18, 0x18, 0x19, 0x1a, 0x1b, 0x18, 0x18, 0x19, 0x19 .byte 0x18, 0x18, 0x19, 0x1a, 0x1b, 0x18, 0x18, 0x19, 0x19
gUnknown_0850DB14:: @ 850DB14 gUnknown_0850DB14:: @ 850DB14
@ replacing .incbin "baserom.gba", 0x0050db14, 0x9
.byte 0x1c, 0x1c, 0x1d, 0x1e, 0x1f, 0x1c, 0x1c, 0x1d, 0x1d .byte 0x1c, 0x1c, 0x1d, 0x1e, 0x1f, 0x1c, 0x1c, 0x1d, 0x1d
gUnknown_0850DB1D:: @ 850DB1D gUnknown_0850DB1D:: @ 850DB1D
@ replacing .incbin "baserom.gba", 0x0050db1d, 0x9
.byte 0x20, 0x20, 0x21, 0x22, 0x23, 0x20, 0x20, 0x21, 0x21 .byte 0x20, 0x20, 0x21, 0x22, 0x23, 0x20, 0x20, 0x21, 0x21
gUnknown_0850DB26:: @ 850DB26 gUnknown_0850DB26:: @ 850DB26
@ replacing .incbin "baserom.gba", 0x0050db26, 0x9
.byte 0x24, 0x24, 0x25, 0x26, 0x27, 0x24, 0x24, 0x25, 0x25 .byte 0x24, 0x24, 0x25, 0x26, 0x27, 0x24, 0x24, 0x25, 0x25
gUnknown_0850DB2F:: @ 850DB2F gUnknown_0850DB2F:: @ 850DB2F
@ replacing .incbin "baserom.gba", 0x0050db2f, 0x9
.byte 0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x01, 0x01 .byte 0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x01, 0x01
gUnknown_0850DB38:: @ 850DB38 gUnknown_0850DB38:: @ 850DB38
@ replacing .incbin "baserom.gba", 0x0050db38, 0x9
.byte 0x04, 0x04, 0x05, 0x06, 0x07, 0x04, 0x04, 0x05, 0x05 .byte 0x04, 0x04, 0x05, 0x06, 0x07, 0x04, 0x04, 0x05, 0x05
gUnknown_0850DB41:: @ 850DB41 gUnknown_0850DB41:: @ 850DB41
@ replacing .incbin "baserom.gba", 0x0050db41, 0x9
.byte 0x08, 0x08, 0x09, 0x0a, 0x0b, 0x08, 0x08, 0x09, 0x09 .byte 0x08, 0x08, 0x09, 0x0a, 0x0b, 0x08, 0x08, 0x09, 0x09
gUnknown_0850DB4A:: @ 850DB4A gUnknown_0850DB4A:: @ 850DB4A
@ replacing .incbin "baserom.gba", 0x0050db4a, 0x9
.byte 0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15 .byte 0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15
gUnknown_0850DB53:: @ 850DB53 gUnknown_0850DB53:: @ 850DB53
@ replacing .incbin "baserom.gba", 0x0050db53, 0x9
.byte 0x08, 0x08, 0x07, 0x09, 0x0a, 0x08, 0x08, 0x07, 0x07 .byte 0x08, 0x08, 0x07, 0x09, 0x0a, 0x08, 0x08, 0x07, 0x07
.align 2, 0 .align 2, 0
gUnknown_0850DB5C:: @ 850DB5C gUnknown_0850DB5C:: @ 850DB5C
@ replacing .incbin "baserom.gba", 0x0050db5c, 0x10
.4byte MetatileBehavior_IsSouthBlocked .4byte MetatileBehavior_IsSouthBlocked
.4byte MetatileBehavior_IsNorthBlocked .4byte MetatileBehavior_IsNorthBlocked
.4byte MetatileBehavior_IsWestBlocked .4byte MetatileBehavior_IsWestBlocked
.4byte MetatileBehavior_IsEastBlocked .4byte MetatileBehavior_IsEastBlocked
gUnknown_0850DB6C:: @ 850DB6C gUnknown_0850DB6C:: @ 850DB6C
@ replacing .incbin "baserom.gba", 0x0050db6c, 0x10
.4byte MetatileBehavior_IsNorthBlocked .4byte MetatileBehavior_IsNorthBlocked
.4byte MetatileBehavior_IsSouthBlocked .4byte MetatileBehavior_IsSouthBlocked
.4byte MetatileBehavior_IsEastBlocked .4byte MetatileBehavior_IsEastBlocked
.4byte MetatileBehavior_IsWestBlocked .4byte MetatileBehavior_IsWestBlocked
gUnknown_0850DB7C:: @ 850DB7C 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 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0xffff, 0xffff, 0x0000, 0x0001, 0x0000, 0xffff, 0x0001, 0x0001, 0x0001, 0xffff, 0xffff
.2byte 0x0001, 0xffff .2byte 0x0001, 0xffff
gUnknown_0850DBA0:: @ 850DBA0 gUnknown_0850DBA0:: @ 850DBA0
@ replacing .incbin "baserom.gba", 0x0050dba0, 0x5
.byte 0x00, 0x00, 0x01, 0x02, 0x03 .byte 0x00, 0x00, 0x01, 0x02, 0x03
gUnknown_0850DBA5:: @ 850DBA5 gUnknown_0850DBA5:: @ 850DBA5
@ replacing .incbin "baserom.gba", 0x0050dba5, 0x5
.byte 0x04, 0x04, 0x05, 0x06, 0x07 .byte 0x04, 0x04, 0x05, 0x06, 0x07
gUnknown_0850DBAA:: @ 850DBAA gUnknown_0850DBAA:: @ 850DBAA
@ replacing .incbin "baserom.gba", 0x0050dbaa, 0x5
.byte 0x08, 0x08, 0x09, 0x0a, 0x0b .byte 0x08, 0x08, 0x09, 0x0a, 0x0b
gUnknown_0850DBAF:: @ 850DBAF gUnknown_0850DBAF:: @ 850DBAF
@ replacing .incbin "baserom.gba", 0x0050dbaf, 0x5
.byte 0x15, 0x15, 0x16, 0x17, 0x18 .byte 0x15, 0x15, 0x16, 0x17, 0x18
gUnknown_0850DBB4:: @ 850DBB4 gUnknown_0850DBB4:: @ 850DBB4
@ replacing .incbin "baserom.gba", 0x0050dbb4, 0x5
.byte 0x29, 0x29, 0x2a, 0x2b, 0x2c .byte 0x29, 0x29, 0x2a, 0x2b, 0x2c
gUnknown_0850DBB9:: @ 850DBB9 gUnknown_0850DBB9:: @ 850DBB9
@ replacing .incbin "baserom.gba", 0x0050dbb9, 0x5
.byte 0x2d, 0x2d, 0x2e, 0x2f, 0x30 .byte 0x2d, 0x2d, 0x2e, 0x2f, 0x30
gUnknown_0850DBBE:: @ 850DBBE gUnknown_0850DBBE:: @ 850DBBE
@ replacing .incbin "baserom.gba", 0x0050dbbe, 0x5
.byte 0x31, 0x31, 0x32, 0x33, 0x34 .byte 0x31, 0x31, 0x32, 0x33, 0x34
gUnknown_0850DBC3:: @ 850DBC3 gUnknown_0850DBC3:: @ 850DBC3
@ replacing .incbin "baserom.gba", 0x0050dbc3, 0x5
.byte 0x35, 0x35, 0x36, 0x37, 0x38 .byte 0x35, 0x35, 0x36, 0x37, 0x38
gUnknown_0850DBC8:: @ 850DBC8 gUnknown_0850DBC8:: @ 850DBC8
@ replacing .incbin "baserom.gba", 0x0050dbc8, 0x5
.byte 0x0c, 0x0c, 0x0d, 0x0e, 0x0f .byte 0x0c, 0x0c, 0x0d, 0x0e, 0x0f
gUnknown_0850DBCD:: @ 850DBCD gUnknown_0850DBCD:: @ 850DBCD
@ replacing .incbin "baserom.gba", 0x0050dbcd, 0x5
.byte 0x46, 0x46, 0x47, 0x48, 0x49 .byte 0x46, 0x46, 0x47, 0x48, 0x49
gUnknown_0850DBD2:: @ 850DBD2 gUnknown_0850DBD2:: @ 850DBD2
@ replacing .incbin "baserom.gba", 0x0050dbd2, 0x5
.byte 0x4b, 0x4b, 0x4a, 0x4d, 0x4c .byte 0x4b, 0x4b, 0x4a, 0x4d, 0x4c
gUnknown_0850DBD7:: @ 850DBD7 gUnknown_0850DBD7:: @ 850DBD7
@ replacing .incbin "baserom.gba", 0x0050dbd7, 0x5
.byte 0x42, 0x42, 0x43, 0x44, 0x45 .byte 0x42, 0x42, 0x43, 0x44, 0x45
gUnknown_0850DBDC:: @ 850DBDC gUnknown_0850DBDC:: @ 850DBDC
@ replacing .incbin "baserom.gba", 0x0050dbdc, 0x5
.byte 0x3a, 0x3a, 0x3b, 0x3c, 0x3d .byte 0x3a, 0x3a, 0x3b, 0x3c, 0x3d
gUnknown_0850DBE1:: @ 850DBE1 gUnknown_0850DBE1:: @ 850DBE1
@ replacing .incbin "baserom.gba", 0x0050dbe1, 0x5
.byte 0x19, 0x19, 0x1a, 0x1b, 0x1c .byte 0x19, 0x19, 0x1a, 0x1b, 0x1c
gUnknown_0850DBE6:: @ 850DBE6 gUnknown_0850DBE6:: @ 850DBE6
@ replacing .incbin "baserom.gba", 0x0050dbe6, 0x5
.byte 0x1d, 0x1d, 0x1e, 0x1f, 0x20 .byte 0x1d, 0x1d, 0x1e, 0x1f, 0x20
gUnknown_0850DBEB:: @ 850DBEB gUnknown_0850DBEB:: @ 850DBEB
@ replacing .incbin "baserom.gba", 0x0050dbeb, 0x5
.byte 0x21, 0x21, 0x22, 0x23, 0x24 .byte 0x21, 0x21, 0x22, 0x23, 0x24
gUnknown_0850DBF0:: @ 850DBF0 gUnknown_0850DBF0:: @ 850DBF0
@ replacing .incbin "baserom.gba", 0x0050dbf0, 0x5
.byte 0x25, 0x25, 0x26, 0x27, 0x28 .byte 0x25, 0x25, 0x26, 0x27, 0x28
gUnknown_0850DBF5:: @ 850DBF5 gUnknown_0850DBF5:: @ 850DBF5
@ replacing .incbin "baserom.gba", 0x0050dbf5, 0x5
.byte 0x64, 0x64, 0x65, 0x66, 0x67 .byte 0x64, 0x64, 0x65, 0x66, 0x67
gUnknown_0850DBFA:: @ 850DBFA gUnknown_0850DBFA:: @ 850DBFA
@ replacing .incbin "baserom.gba", 0x0050dbfa, 0x5
.byte 0x68, 0x68, 0x69, 0x6a, 0x6b .byte 0x68, 0x68, 0x69, 0x6a, 0x6b
gUnknown_0850DBFF:: @ 850DBFF gUnknown_0850DBFF:: @ 850DBFF
@ replacing .incbin "baserom.gba", 0x0050dbff, 0x5
.byte 0x6c, 0x6c, 0x6d, 0x6e, 0x6f .byte 0x6c, 0x6c, 0x6d, 0x6e, 0x6f
gUnknown_0850DC04:: @ 850DC04 gUnknown_0850DC04:: @ 850DC04
@ replacing .incbin "baserom.gba", 0x0050dc04, 0x5
.byte 0x70, 0x70, 0x71, 0x72, 0x73 .byte 0x70, 0x70, 0x71, 0x72, 0x73
gUnknown_0850DC09:: @ 850DC09 gUnknown_0850DC09:: @ 850DC09
@ replacing .incbin "baserom.gba", 0x0050dc09, 0x5
.byte 0x74, 0x74, 0x75, 0x76, 0x77 .byte 0x74, 0x74, 0x75, 0x76, 0x77
gUnknown_0850DC0E:: @ 850DC0E gUnknown_0850DC0E:: @ 850DC0E
@ replacing .incbin "baserom.gba", 0x0050dc0e, 0x5
.byte 0x78, 0x78, 0x79, 0x7a, 0x7b .byte 0x78, 0x78, 0x79, 0x7a, 0x7b
gUnknown_0850DC13:: @ 850DC13 gUnknown_0850DC13:: @ 850DC13
@ replacing .incbin "baserom.gba", 0x0050dc13, 0x5
.byte 0x7c, 0x7c, 0x7d, 0x7e, 0x7f .byte 0x7c, 0x7c, 0x7d, 0x7e, 0x7f
gUnknown_0850DC18:: @ 850DC18 gUnknown_0850DC18:: @ 850DC18
@ replacing .incbin "baserom.gba", 0x0050dc18, 0x5
.byte 0x80, 0x80, 0x81, 0x82, 0x83 .byte 0x80, 0x80, 0x81, 0x82, 0x83
gUnknown_0850DC1D:: @ 850DC1D gUnknown_0850DC1D:: @ 850DC1D
@ replacing .incbin "baserom.gba", 0x0050dc1d, 0x5
.byte 0x84, 0x84, 0x85, 0x86, 0x87 .byte 0x84, 0x84, 0x85, 0x86, 0x87
gUnknown_0850DC22:: @ 850DC22 gUnknown_0850DC22:: @ 850DC22
@ replacing .incbin "baserom.gba", 0x0050dc22, 0x5
.byte 0x88, 0x88, 0x89, 0x8a, 0x8b .byte 0x88, 0x88, 0x89, 0x8a, 0x8b
gUnknown_0850DC27:: @ 850DC27 gUnknown_0850DC27:: @ 850DC27
@ replacing .incbin "baserom.gba", 0x0050dc27, 0x8
.byte 0x02, 0x01, 0x04, 0x03, 0x08, 0x07, 0x06, 0x05 .byte 0x02, 0x01, 0x04, 0x03, 0x08, 0x07, 0x06, 0x05
gUnknown_0850DC2F:: @ 850DC2F 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 .byte 0x02, 0x01, 0x04, 0x03, 0x01, 0x02, 0x03, 0x04, 0x03, 0x04, 0x02, 0x01, 0x04, 0x03, 0x01, 0x02
gUnknown_0850DC3F:: @ 850DC3F 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 .byte 0x02, 0x01, 0x04, 0x03, 0x01, 0x02, 0x03, 0x04, 0x04, 0x03, 0x01, 0x02, 0x03, 0x04, 0x02, 0x01, 0x00
.align 2, 0 .align 2, 0
gUnknown_0850DC50:: @ 850DC50 gUnknown_0850DC50:: @ 850DC50
@ replacing .incbin "baserom.gba", 0x0050dc50, 0x278
.4byte gUnknown_0850DEC8 .4byte gUnknown_0850DEC8
.4byte gUnknown_0850DED0 .4byte gUnknown_0850DED0
.4byte gUnknown_0850DED8 .4byte gUnknown_0850DED8
@ -1297,7 +1128,6 @@ gUnknown_0850DEE0::
.4byte sub_80964BC .4byte sub_80964BC
gUnknown_0850DEE8:: @ 850DEE8 gUnknown_0850DEE8:: @ 850DEE8
@ replacing .incbin "baserom.gba", 0x0050dee8, 0xd4
.4byte get_go_image_anim_num .4byte get_go_image_anim_num
.4byte get_go_fast_image_anim_num .4byte get_go_fast_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 .4byte sub_80964BC
gUnknown_0850DFBC:: @ 850DFBC gUnknown_0850DFBC:: @ 850DFBC
@ replacing .incbin "baserom.gba", 0x0050dfbc, 0x6
.byte 0x00, 0x00, 0x01, 0x00, 0x01, 0x00 .byte 0x00, 0x00, 0x01, 0x00, 0x01, 0x00
gUnknown_0850DFC2:: @ 850DFC2 gUnknown_0850DFC2:: @ 850DFC2
@ replacing .incbin "baserom.gba", 0x0050dfc2, 0x6
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00
gUnknown_0850DFC8:: @ 850DFC8 gUnknown_0850DFC8:: @ 850DFC8
@ replacing .incbin "baserom.gba", 0x0050dfc8, 0x614
.4byte sub_8094230 .4byte sub_8094230
.4byte sub_8094230_2 .4byte sub_8094230_2
.4byte sub_80964BC .4byte sub_80964BC

3235
data/field_screen.s
View File

File diff suppressed because it is too large Load Diff

14
data/graphics.s
View File

@ -2329,11 +2329,11 @@ gSubstituteDollTilemap:: @ 8C2D120
.incbin "graphics/battle_anims/sprites/substitute.bin.lz" .incbin "graphics/battle_anims/sprites/substitute.bin.lz"
.align 2 .align 2
gUnknown_08C2D348:: @ 8C2D348 gBattleAnimSpriteSheet_241:: @ 8C2D348
.incbin "graphics/battle_anims/sprites/241.4bpp.lz" .incbin "graphics/battle_anims/sprites/241.4bpp.lz"
.align 2 .align 2
gUnknown_08C2D40C:: @ 8C2D40C gBattleAnimSpritePalette_241:: @ 8C2D40C
.incbin "graphics/battle_anims/sprites/241.gbapal.lz" .incbin "graphics/battle_anims/sprites/241.gbapal.lz"
.align 2 .align 2
@ -2345,19 +2345,19 @@ gContestConfetti_Pal:: @ 8C2D548
.incbin "graphics/misc/confetti.gbapal.lz" .incbin "graphics/misc/confetti.gbapal.lz"
.align 2 .align 2
gUnknown_08C2D570:: @ 8C2D570 gBattleAnimSpriteSheet_242:: @ 8C2D570
.incbin "graphics/battle_anims/sprites/242.4bpp.lz" .incbin "graphics/battle_anims/sprites/242.4bpp.lz"
.align 2 .align 2
gUnknown_08C2D6AC:: @ 8C2D6AC gBattleAnimSpritePalette_242:: @ 8C2D6AC
.incbin "graphics/battle_anims/sprites/242.gbapal.lz" .incbin "graphics/battle_anims/sprites/242.gbapal.lz"
.align 2 .align 2
gUnknown_08C2D6D0:: @ 8C2D6D0 gBattleAnimSpriteSheet_243:: @ 8C2D6D0
.incbin "graphics/battle_anims/sprites/243.4bpp.lz" .incbin "graphics/battle_anims/sprites/243.4bpp.lz"
.align 2 .align 2
gUnknown_08C2D6F8:: @ 8C2D6F8 gBattleAnimSpritePalette_243:: @ 8C2D6F8
.incbin "graphics/battle_anims/sprites/243.gbapal.lz" .incbin "graphics/battle_anims/sprites/243.gbapal.lz"
.align 2 .align 2
@ -3081,7 +3081,7 @@ gUnknown_08D8D58C:: @ 8D8D58C
.incbin "graphics/battle_anims/backgrounds/sandstorm_brew.4bpp.lz" .incbin "graphics/battle_anims/backgrounds/sandstorm_brew.4bpp.lz"
.align 2 .align 2
gUnknown_08D8DAB8:: @ 8E68580 gBattleAnimSpritePalette_261:: @ 8E68580
.incbin "graphics/battle_anims/sprites/261.gbapal.lz" .incbin "graphics/battle_anims/sprites/261.gbapal.lz"
.align 2 .align 2

47
data/strings.s
View File

@ -4169,48 +4169,61 @@ gJPText_MysteryGift:: @ 85EDFBF
gJPText_DecideStop:: @ 85EDFC9 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) .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 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 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 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 .string "‘ゲームボーイアドバンスとつうしん’\n"
.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 .string "を　せんたく　してください$"
.byte 0x05, 0x0c, 0x13, 0x08, 0x41, 0x0b, 0x02, 0xff
gUnknown_085EE035:: @ 85EE035
.string "カードeリーダー{UNK_CTRL_F9 0x04}の　‘つうしん’を\n"
.string "えらんで　Aボタンを　おしてください$"
gUnknown_085EE05C:: @ 85EE05C gUnknown_085EE05C:: @ 85EE05C
.byte 0x0e, 0x12, 0x40, 0x08, 0x37, 0x00, 0x1f, 0x11, 0x37, 0x50, 0x13, 0x02, 0x1f, 0x0d, 0xff .string "せつぞくが　まちがっています$"
gUnknown_085EE06B:: @ 85EE06B 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 .string "カードの　よみこみを\n"
.byte 0xfe, 0x12, 0x03, 0x0c, 0x2e, 0x00, 0x44, 0x07, 0x1f, 0x0e, 0x2e, 0xff .string "ちゅうし　しました$"
gUnknown_085EE080:: @ 85EE080
.string "カードeリーダー{UNK_CTRL_F9 0x04}と\n"
.string "つうしん　できません$"
gUnknown_085EE097:: @ 85EE097 gUnknown_085EE097:: @ 85EE097
.byte 0x12, 0x03, 0x0c, 0x2e, 0x00, 0x11, 0x35, 0x03, 0x00, 0x44, 0x0d, 0xff .string "つうしん　ちゅう　です$"
gUnknown_085EE0A3:: @ 85EE0A3 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 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 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 gUnknown_085EE0FA:: @ 85EE0FA
.byte 0x12, 0x03, 0x0c, 0x2e, 0x00, 0x0c, 0x35, 0x03, 0x28, 0x36, 0x03, 0xab, 0xff .string "つうしん　しゅうりょう！$"
gUnknown_085EE107:: @ 85EE107 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 gUnknown_085EE120:: @ 85EE120
.byte 0x0c, 0x46, 0x27, 0x08, 0x00, 0x05, 0x1f, 0x11, 0x08, 0x41, 0x0b, 0x02, 0xff .string "しばらく　おまちください$"
gUnknown_085EE12D:: @ 85EE12D 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 gUnknown_085EE14B:: @ 85EE14B
.string "RED$" .string "RED$"

8
sound/music_player_table.inc
View File

@ -1,6 +1,6 @@
.align 2 .align 2
gMPlayTable:: @ 86B49C0 gMPlayTable:: @ 86B49C0
music_player gMPlay_BGM, 0x3001340, 10, 0 music_player gMPlayInfo_BGM, gMPlayTrack_BGM, 10, 0
music_player gMPlay_SE1, 0x3001660, 3, 1 music_player gMPlayInfo_SE1, gMPlayTrack_SE1, 3, 1
music_player gMPlay_SE2, 0x3001750, 9, 1 music_player gMPlayInfo_SE2, gMPlayTrack_SE2, 9, 1
music_player gMPlay_SE3, 0x3001A20, 1, 0 music_player gMPlayInfo_SE3, gMPlayTrack_SE3, 1, 0

8
src/battle_2.c
View File

@ -92,8 +92,8 @@ extern struct UnknownPokemonStruct2 gUnknown_02022FF8[3]; // what is it used for
extern struct UnknownPokemonStruct2* gUnknown_02023058; // what is it used for? extern struct UnknownPokemonStruct2* gUnknown_02023058; // what is it used for?
extern u8 gUnknown_02039B28[]; // possibly a struct? extern u8 gUnknown_02039B28[]; // possibly a struct?
extern struct UnknownStruct6 gUnknown_02038C28; // todo: identify & document extern struct UnknownStruct6 gUnknown_02038C28; // todo: identify & document
extern struct MusicPlayerInfo gMPlay_SE1; extern struct MusicPlayerInfo gMPlayInfo_SE1;
extern struct MusicPlayerInfo gMPlay_SE2; extern struct MusicPlayerInfo gMPlayInfo_SE2;
extern u8 gDecompressionBuffer[]; extern u8 gDecompressionBuffer[];
extern u16 gUnknown_020243FC; extern u16 gUnknown_020243FC;
extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT]; extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
@ -1610,8 +1610,8 @@ void CB2_QuitRecordedBattle(void)
UpdatePaletteFade(); UpdatePaletteFade();
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
m4aMPlayStop(&gMPlay_SE1); m4aMPlayStop(&gMPlayInfo_SE1);
m4aMPlayStop(&gMPlay_SE2); m4aMPlayStop(&gMPlayInfo_SE2);
FreeRestoreBattleData(); FreeRestoreBattleData();
FreeAllWindowBuffers(); FreeAllWindowBuffers();
SetMainCallback2(gMain.savedCallback); SetMainCallback2(gMain.savedCallback);

22
src/battle_anim.c
View File

@ -37,9 +37,9 @@ extern u16 gBattle_BG2_X;
extern u16 gBattle_BG2_Y; extern u16 gBattle_BG2_Y;
extern u16 gBattlePartyID[BATTLE_BANKS_COUNT]; extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT]; extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
extern struct MusicPlayerInfo gMPlay_BGM; extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern struct MusicPlayerInfo gMPlay_SE1; extern struct MusicPlayerInfo gMPlayInfo_SE1;
extern struct MusicPlayerInfo gMPlay_SE2; extern struct MusicPlayerInfo gMPlayInfo_SE2;
extern u8 gDecompressionBuffer[]; extern u8 gDecompressionBuffer[];
extern const u16 gUnknown_082C8D64[]; extern const u16 gUnknown_082C8D64[];
@ -272,7 +272,7 @@ void LaunchBattleAnimation(const u8 *const animsTable[], u16 tableId, bool8 isMo
{ {
if (tableId == gUnknown_082C8D64[i]) if (tableId == gUnknown_082C8D64[i])
{ {
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 128); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 128);
break; break;
} }
} }
@ -514,8 +514,8 @@ static void ScriptCmd_end(void)
} }
else else
{ {
m4aMPlayStop(&gMPlay_SE1); m4aMPlayStop(&gMPlayInfo_SE1);
m4aMPlayStop(&gMPlay_SE2); m4aMPlayStop(&gMPlayInfo_SE2);
} }
} }
@ -534,7 +534,7 @@ static void ScriptCmd_end(void)
if (!continuousAnim) // may have been used for debug? if (!continuousAnim) // may have been used for debug?
{ {
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 256); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256);
if (!IsContest()) if (!IsContest())
{ {
sub_80A8278(); sub_80A8278();
@ -1650,8 +1650,8 @@ static void ScriptCmd_waitsound(void)
{ {
if (++sSoundAnimFramesToWait > 90) if (++sSoundAnimFramesToWait > 90)
{ {
m4aMPlayStop(&gMPlay_SE1); m4aMPlayStop(&gMPlayInfo_SE1);
m4aMPlayStop(&gMPlay_SE2); m4aMPlayStop(&gMPlayInfo_SE2);
sSoundAnimFramesToWait = 0; sSoundAnimFramesToWait = 0;
} }
else else
@ -1833,7 +1833,7 @@ static void ScriptCmd_doublebattle_2E(void)
static void ScriptCmd_stopsound(void) static void ScriptCmd_stopsound(void)
{ {
m4aMPlayStop(&gMPlay_SE1); m4aMPlayStop(&gMPlayInfo_SE1);
m4aMPlayStop(&gMPlay_SE2); m4aMPlayStop(&gMPlayInfo_SE2);
sBattleAnimScriptPtr++; sBattleAnimScriptPtr++;
} }

8
src/battle_controller_link_opponent.c
View File

@ -51,7 +51,7 @@ extern u8 gBankTarget;
extern u8 gAbsentBankFlags; extern u8 gAbsentBankFlags;
extern u8 gUnknown_020244B4[]; extern u8 gUnknown_020244B4[];
extern u32 gTransformedPersonalities[BATTLE_BANKS_COUNT]; extern u32 gTransformedPersonalities[BATTLE_BANKS_COUNT];
extern struct MusicPlayerInfo gMPlay_BGM; extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern struct UnusedControllerStruct gUnknown_02022D0C; extern struct UnusedControllerStruct gUnknown_02022D0C;
extern u16 gTrainerBattleOpponent_A; extern u16 gTrainerBattleOpponent_A;
extern u16 gTrainerBattleOpponent_B; extern u16 gTrainerBattleOpponent_B;
@ -353,11 +353,11 @@ static void sub_8064734(void)
if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK) if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK)
{ {
if (GetBankIdentity(gActiveBank) == IDENTITY_OPPONENT_MON1) if (GetBankIdentity(gActiveBank) == IDENTITY_OPPONENT_MON1)
m4aMPlayContinue(&gMPlay_BGM); m4aMPlayContinue(&gMPlayInfo_BGM);
} }
else else
{ {
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
} }
} }
@ -499,7 +499,7 @@ static void sub_8064DD0(void)
if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy
|| gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy_2) || gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy_2)
{ {
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
LinkOpponentBufferExecCompleted(); LinkOpponentBufferExecCompleted();
} }
} }

8
src/battle_controller_opponent.c
View File

@ -38,7 +38,7 @@ extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200]; extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200]; extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT]; extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
extern struct MusicPlayerInfo gMPlay_BGM; extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern u8 gUnknown_03005D7C[BATTLE_BANKS_COUNT]; extern u8 gUnknown_03005D7C[BATTLE_BANKS_COUNT];
extern void (*gBattleBankFunc[BATTLE_BANKS_COUNT])(void); extern void (*gBattleBankFunc[BATTLE_BANKS_COUNT])(void);
extern void *gUnknown_020244D8; extern void *gUnknown_020244D8;
@ -350,10 +350,10 @@ static void sub_805F560(void)
if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK) if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK)
{ {
if (GetBankIdentity(gActiveBank) == 1) if (GetBankIdentity(gActiveBank) == 1)
m4aMPlayContinue(&gMPlay_BGM); m4aMPlayContinue(&gMPlayInfo_BGM);
} }
else else
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
} }
gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20 = 1; gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20 = 1;
sp = TRUE; sp = TRUE;
@ -485,7 +485,7 @@ static void sub_805FC80(void)
{ {
if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy || gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy_2) if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy || gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy_2)
{ {
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
OpponentBufferExecCompleted(); OpponentBufferExecCompleted();
} }
} }

10
src/battle_controller_player.c
View File

@ -43,7 +43,7 @@ extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200]; extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
extern u8 gMultiUsePlayerCursor; extern u8 gMultiUsePlayerCursor;
extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT]; extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
extern struct MusicPlayerInfo gMPlay_BGM; extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern u16 gPartnerTrainerId; extern u16 gPartnerTrainerId;
extern struct SpriteTemplate gUnknown_0202499C; extern struct SpriteTemplate gUnknown_0202499C;
extern u8 gBattleMonForms[BATTLE_BANKS_COUNT]; extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
@ -1054,9 +1054,9 @@ static void sub_8058B40(void)
if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20) if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20)
{ {
if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK) if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK)
m4aMPlayContinue(&gMPlay_BGM); m4aMPlayContinue(&gMPlayInfo_BGM);
else else
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
} }
gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20 = 1; gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20 = 1;
r9 = TRUE; r9 = TRUE;
@ -1119,7 +1119,7 @@ static void sub_8058FC0(void)
if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive
&& !IsCryPlayingOrClearCrySongs()) && !IsCryPlayingOrClearCrySongs())
{ {
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
PlayerBufferExecCompleted(); PlayerBufferExecCompleted();
} }
@ -1148,7 +1148,7 @@ void c3_0802FDF4(u8 taskId)
{ {
if (!IsCryPlayingOrClearCrySongs()) if (!IsCryPlayingOrClearCrySongs())
{ {
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
DestroyTask(taskId); DestroyTask(taskId);
} }
} }

8
src/battle_controller_recorded_opponent.c
View File

@ -52,7 +52,7 @@ extern u8 gBankTarget;
extern u8 gAbsentBankFlags; extern u8 gAbsentBankFlags;
extern u8 gUnknown_020244B4[]; extern u8 gUnknown_020244B4[];
extern u32 gTransformedPersonalities[BATTLE_BANKS_COUNT]; extern u32 gTransformedPersonalities[BATTLE_BANKS_COUNT];
extern struct MusicPlayerInfo gMPlay_BGM; extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern struct UnusedControllerStruct gUnknown_02022D0C; extern struct UnusedControllerStruct gUnknown_02022D0C;
extern u16 gTrainerBattleOpponent_A; extern u16 gTrainerBattleOpponent_A;
extern u16 gTrainerBattleOpponent_B; extern u16 gTrainerBattleOpponent_B;
@ -331,11 +331,11 @@ static void sub_818686C(void)
if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK) if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK)
{ {
if (GetBankIdentity(gActiveBank) == IDENTITY_OPPONENT_MON1) if (GetBankIdentity(gActiveBank) == IDENTITY_OPPONENT_MON1)
m4aMPlayContinue(&gMPlay_BGM); m4aMPlayContinue(&gMPlayInfo_BGM);
} }
else else
{ {
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
} }
} }
gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20 = 1; gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20 = 1;
@ -484,7 +484,7 @@ static void sub_8186F14(void)
if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy
|| gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy_2) || gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy_2)
{ {
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
RecordedOpponentBufferExecCompleted(); RecordedOpponentBufferExecCompleted();
} }
} }

6
src/battle_controller_recorded_player.c
View File

@ -54,7 +54,7 @@ extern u8 gUnknown_020244B4[];
extern u32 gTransformedPersonalities[BATTLE_BANKS_COUNT]; extern u32 gTransformedPersonalities[BATTLE_BANKS_COUNT];
extern u8 gBattleCommunication[]; extern u8 gBattleCommunication[];
extern u8 gUnknown_0203C7B4; extern u8 gUnknown_0203C7B4;
extern struct MusicPlayerInfo gMPlay_BGM; extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern struct UnusedControllerStruct gUnknown_02022D0C; extern struct UnusedControllerStruct gUnknown_02022D0C;
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
@ -354,11 +354,11 @@ static void sub_8189D40(void)
if ((gBattleTypeFlags & BATTLE_TYPE_LINK) && (gBattleTypeFlags & BATTLE_TYPE_MULTI)) if ((gBattleTypeFlags & BATTLE_TYPE_LINK) && (gBattleTypeFlags & BATTLE_TYPE_MULTI))
{ {
if (GetBankIdentity(gActiveBank) == IDENTITY_PLAYER_MON1) if (GetBankIdentity(gActiveBank) == IDENTITY_PLAYER_MON1)
m4aMPlayContinue(&gMPlay_BGM); m4aMPlayContinue(&gMPlayInfo_BGM);
} }
else else
{ {
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
} }
} }

2
src/battle_controller_wally.c
View File

@ -42,7 +42,7 @@ extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200]; extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
extern u8 gMultiUsePlayerCursor; extern u8 gMultiUsePlayerCursor;
extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT]; extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
extern struct MusicPlayerInfo gMPlay_BGM; extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern u16 gPartnerTrainerId; extern u16 gPartnerTrainerId;
extern struct SpriteTemplate gUnknown_0202499C; extern struct SpriteTemplate gUnknown_0202499C;
extern u8 gBattleMonForms[BATTLE_BANKS_COUNT]; extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];

10
src/battle_gfx_sfx_util.c
View File

@ -34,9 +34,9 @@ extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT]; extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
extern u8 gBattleMonForms[BATTLE_BANKS_COUNT]; extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
extern u32 gTransformedPersonalities[BATTLE_BANKS_COUNT]; extern u32 gTransformedPersonalities[BATTLE_BANKS_COUNT];
extern struct MusicPlayerInfo gMPlay_SE1; extern struct MusicPlayerInfo gMPlayInfo_SE1;
extern struct MusicPlayerInfo gMPlay_SE2; extern struct MusicPlayerInfo gMPlayInfo_SE2;
extern struct MusicPlayerInfo gMPlay_BGM; extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern const struct BattleMove gBattleMoves[]; extern const struct BattleMove gBattleMoves[];
extern const u8 gUnknown_0831C604[]; extern const u8 gUnknown_0831C604[];
@ -527,8 +527,8 @@ bool8 mplay_80342A4(u8 bank)
if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_8 < 30) if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_8 < 30)
return TRUE; return TRUE;
m4aMPlayStop(&gMPlay_SE1); m4aMPlayStop(&gMPlayInfo_SE1);
m4aMPlayStop(&gMPlay_SE2); m4aMPlayStop(&gMPlayInfo_SE2);
} }
if (zero == 0) if (zero == 0)
{ {

6
src/battle_script_commands.c
View File

@ -112,7 +112,7 @@ extern u16 gBattle_BG1_Y;
extern u16 gBattle_BG2_X; extern u16 gBattle_BG2_X;
extern u16 gBattle_BG2_Y; extern u16 gBattle_BG2_Y;
extern u16 gBattle_BG3_X; extern u16 gBattle_BG3_X;
extern struct MusicPlayerInfo gMPlay_BGM; extern struct MusicPlayerInfo gMPlayInfo_BGM;
struct TrainerMoney struct TrainerMoney
{ {
@ -7103,10 +7103,10 @@ static void atk76_various(void)
} }
break; break;
case 21: case 21:
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x55); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x55);
break; break;
case 22: case 22:
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
break; break;
case 23: case 23:
gBattleStruct->field_2A2 |= gBitTable[gActiveBank]; gBattleStruct->field_2A2 |= gBitTable[gActiveBank];

14
src/berry_blender.c
View File

@ -127,8 +127,8 @@ struct BerryBlenderData
struct BlenderGameBlock gameBlock; struct BlenderGameBlock gameBlock;
}; };
extern struct MusicPlayerInfo gMPlay_SE2; extern struct MusicPlayerInfo gMPlayInfo_SE2;
extern struct MusicPlayerInfo gMPlay_BGM; extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern u16 gSpecialVar_ItemId; extern u16 gSpecialVar_ItemId;
extern u8 gInGameOpponentsNo; extern u8 gInGameOpponentsNo;
extern u8 gUnknown_020322D5; extern u8 gUnknown_020322D5;
@ -801,7 +801,7 @@ static const struct WindowTemplate sBlenderRecordWindowTemplate = {0, 6, 4, 0x12
static void Blender_ControlHitPitch(void) static void Blender_ControlHitPitch(void)
{ {
m4aMPlayPitchControl(&gMPlay_SE2, 0xFFFF, 2 * (sBerryBlenderData->field_4C - 128)); m4aMPlayPitchControl(&gMPlayInfo_SE2, 0xFFFF, 2 * (sBerryBlenderData->field_4C - 128));
} }
static void VBlankCB0_BerryBlender(void) static void VBlankCB0_BerryBlender(void)
@ -1938,9 +1938,9 @@ static void sub_80814F4(void)
if (gRecvCmds[i][2] == 0x2345 || gRecvCmds[2][i] == 0x4523 || gRecvCmds[2][i] == 0x5432) // could be a bug, 2 and i are reversed if (gRecvCmds[i][2] == 0x2345 || gRecvCmds[2][i] == 0x4523 || gRecvCmds[2][i] == 0x5432) // could be a bug, 2 and i are reversed
{ {
if (sBerryBlenderData->field_4C > 1500) if (sBerryBlenderData->field_4C > 1500)
m4aMPlayTempoControl(&gMPlay_BGM, ((sBerryBlenderData->field_4C - 750) / 20) + 256); m4aMPlayTempoControl(&gMPlayInfo_BGM, ((sBerryBlenderData->field_4C - 750) / 20) + 256);
else else
m4aMPlayTempoControl(&gMPlay_BGM, 0x100); m4aMPlayTempoControl(&gMPlayInfo_BGM, 0x100);
} }
} }
} }
@ -2335,7 +2335,7 @@ static void CB2_HandleBlenderEndGame(void)
switch (sBerryBlenderData->gameEndState) switch (sBerryBlenderData->gameEndState)
{ {
case 1: case 1:
m4aMPlayTempoControl(&gMPlay_BGM, 256); m4aMPlayTempoControl(&gMPlayInfo_BGM, 256);
for (i = 0; i < gSpecialVar_0x8004; i++) for (i = 0; i < gSpecialVar_0x8004; i++)
{ {
DestroyTask(sBerryBlenderData->field_120[i]); DestroyTask(sBerryBlenderData->field_120[i]);
@ -2355,7 +2355,7 @@ static void CB2_HandleBlenderEndGame(void)
sBerryBlenderData->gameEndState = 5; sBerryBlenderData->gameEndState = 5;
sBerryBlenderData->mainState = 0; sBerryBlenderData->mainState = 0;
m4aMPlayStop(&gMPlay_SE2); m4aMPlayStop(&gMPlayInfo_SE2);
} }
Blender_ControlHitPitch(); Blender_ControlHitPitch();
break; break;

6
src/hall_of_fame.c
View File

@ -54,7 +54,7 @@ static EWRAM_DATA struct HofGfx *sHofGfxPtr = NULL;
extern bool8 gHasHallOfFameRecords; extern bool8 gHasHallOfFameRecords;
extern u32 gUnknown_0203BCD4; extern u32 gUnknown_0203BCD4;
extern u8 gDecompressionBuffer[]; extern u8 gDecompressionBuffer[];
extern struct MusicPlayerInfo gMPlay_BGM; extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern MainCallback gGameContinueCallback; extern MainCallback gGameContinueCallback;
extern u32 gDamagedSaveSectors; extern u32 gDamagedSaveSectors;
extern u8 gReservedSpritePaletteCount; extern u8 gReservedSpritePaletteCount;
@ -1040,7 +1040,7 @@ static void Task_HofPC_HandleInput(u8 taskId)
if (IsCryPlayingOrClearCrySongs()) if (IsCryPlayingOrClearCrySongs())
{ {
StopCryAndClearCrySongs(); StopCryAndClearCrySongs();
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
} }
gTasks[taskId].func = Task_HofPC_HandlePaletteOnExit; gTasks[taskId].func = Task_HofPC_HandlePaletteOnExit;
} }
@ -1050,7 +1050,7 @@ static void Task_HofPC_HandleInput(u8 taskId)
if (IsCryPlayingOrClearCrySongs()) if (IsCryPlayingOrClearCrySongs())
{ {
StopCryAndClearCrySongs(); StopCryAndClearCrySongs();
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
} }
gTasks[taskId].func = Task_HofPC_HandlePaletteOnExit; gTasks[taskId].func = Task_HofPC_HandlePaletteOnExit;
} }

8
src/m4a_2.c
View File

@ -11,10 +11,10 @@ void *gMPlayJumpTable[36];
struct CgbChannel gCgbChans[4]; struct CgbChannel gCgbChans[4];
struct MusicPlayerTrack gPokemonCryTracks[MAX_POKEMON_CRIES * 2]; struct MusicPlayerTrack gPokemonCryTracks[MAX_POKEMON_CRIES * 2];
struct PokemonCrySong gPokemonCrySong; struct PokemonCrySong gPokemonCrySong;
struct MusicPlayerInfo gMPlay_BGM; struct MusicPlayerInfo gMPlayInfo_BGM;
struct MusicPlayerInfo gMPlay_SE1; struct MusicPlayerInfo gMPlayInfo_SE1;
struct MusicPlayerInfo gMPlay_SE2; struct MusicPlayerInfo gMPlayInfo_SE2;
struct MusicPlayerInfo gMPlay_SE3; struct MusicPlayerInfo gMPlayInfo_SE3;
u8 gMPlayMemAccArea[0x10]; u8 gMPlayMemAccArea[0x10];
u32 MidiKeyToFreq(struct WaveData *wav, u8 key, u8 fineAdjust) u32 MidiKeyToFreq(struct WaveData *wav, u8 key, u8 fineAdjust)

6
src/pokeball.c
View File

@ -21,7 +21,7 @@ extern u8 gBankTarget;
extern u16 gBattlePartyID[]; extern u16 gBattlePartyID[];
extern u8 gBankSpriteIds[]; extern u8 gBankSpriteIds[];
extern u8 gHealthBoxesIds[]; extern u8 gHealthBoxesIds[];
extern struct MusicPlayerInfo gMPlay_BGM; extern struct MusicPlayerInfo gMPlayInfo_BGM;
// this file's functions // this file's functions
static void Task_DoPokeballSendOutAnim(u8 taskId); static void Task_DoPokeballSendOutAnim(u8 taskId);
@ -773,11 +773,11 @@ static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite)
if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK) if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK)
{ {
if (IsBGMPlaying()) if (IsBGMPlaying())
m4aMPlayStop(&gMPlay_BGM); m4aMPlayStop(&gMPlayInfo_BGM);
} }
else else
{ {
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 128); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 128);
} }
} }

4
src/pokeblock_feed.c
View File

@ -50,7 +50,7 @@ struct PokeblockFeedStruct
}; };
extern u16 gSpecialVar_ItemId; extern u16 gSpecialVar_ItemId;
extern struct MusicPlayerInfo gMPlay_BGM; extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern struct SpriteTemplate gUnknown_0202499C; extern struct SpriteTemplate gUnknown_0202499C;
extern const u8 gBattleTerrainPalette_Frontier[]; extern const u8 gBattleTerrainPalette_Frontier[];
@ -802,7 +802,7 @@ static void Task_ReturnAfterPaletteFade(u8 taskId)
{ {
ResetSpriteData(); ResetSpriteData();
FreeAllSpritePalettes(); FreeAllSpritePalettes();
m4aMPlayVolumeControl(&gMPlay_BGM, -1, 0x100); m4aMPlayVolumeControl(&gMPlayInfo_BGM, -1, 0x100);
SetMainCallback2(gMain.savedCallback); SetMainCallback2(gMain.savedCallback);
DestroyTask(taskId); DestroyTask(taskId);
FreeAllWindowBuffers(); FreeAllWindowBuffers();

4
src/pokemon_summary_screen.c
View File

@ -41,7 +41,7 @@ struct ContestEffect
extern struct UnkSummaryStruct* gUnknown_0203CF1C; extern struct UnkSummaryStruct* gUnknown_0203CF1C;
extern struct BgTemplate gUnknown_0861CBB4; extern struct BgTemplate gUnknown_0861CBB4;
extern u8 gUnknown_0203CF20; extern u8 gUnknown_0203CF20;
extern struct MusicPlayerInfo gMPlay_BGM; extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern s8 gUnknown_0861CC1C[]; extern s8 gUnknown_0861CC1C[];
extern u8 gUnknown_08329D22[]; extern u8 gUnknown_08329D22[];
extern u8 gUnknown_0203CF21; extern u8 gUnknown_0203CF21;
@ -793,7 +793,7 @@ void sub_81C0484(u8 taskId)
ResetSpriteData(); ResetSpriteData();
FreeAllSpritePalettes(); FreeAllSpritePalettes();
StopCryAndClearCrySongs(); StopCryAndClearCrySongs();
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
if (gMonSpritesGfxPtr == 0) if (gMonSpritesGfxPtr == 0)
sub_806F47C(0); sub_806F47C(0);
sub_81C0434(); sub_81C0434();

76
src/sound.c
View File

@ -29,10 +29,10 @@ IWRAM_DATA static u16 sFanfareCounter;
bool8 gDisableMusic; bool8 gDisableMusic;
extern u32 gBattleTypeFlags; extern u32 gBattleTypeFlags;
extern struct MusicPlayerInfo gMPlay_BGM; extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern struct MusicPlayerInfo gMPlay_SE1; extern struct MusicPlayerInfo gMPlayInfo_SE1;
extern struct MusicPlayerInfo gMPlay_SE2; extern struct MusicPlayerInfo gMPlayInfo_SE2;
extern struct MusicPlayerInfo gMPlay_SE3; extern struct MusicPlayerInfo gMPlayInfo_SE3;
extern struct ToneData gCryTable[]; extern struct ToneData gCryTable[];
extern struct ToneData gCryTable2[]; extern struct ToneData gCryTable2[];
extern const struct Fanfare sFanfares[]; extern const struct Fanfare sFanfares[];
@ -171,7 +171,7 @@ bool8 IsNotWaitingForBGMStop(void)
void PlayFanfareByFanfareNum(u8 fanfareNum) void PlayFanfareByFanfareNum(u8 fanfareNum)
{ {
u16 songNum; u16 songNum;
m4aMPlayStop(&gMPlay_BGM); m4aMPlayStop(&gMPlayInfo_BGM);
songNum = sFanfares[fanfareNum].songNum; songNum = sFanfares[fanfareNum].songNum;
sFanfareCounter = sFanfares[fanfareNum].duration; sFanfareCounter = sFanfares[fanfareNum].duration;
m4aSongNumStart(songNum); m4aSongNumStart(songNum);
@ -187,7 +187,7 @@ bool8 WaitFanfare(bool8 stop)
else else
{ {
if (!stop) if (!stop)
m4aMPlayContinue(&gMPlay_BGM); m4aMPlayContinue(&gMPlayInfo_BGM);
else else
m4aSongNumStart(MUS_DUMMY); m4aSongNumStart(MUS_DUMMY);
@ -232,7 +232,7 @@ static void Task_Fanfare(u8 taskId)
} }
else else
{ {
m4aMPlayContinue(&gMPlay_BGM); m4aMPlayContinue(&gMPlayInfo_BGM);
DestroyTask(taskId); DestroyTask(taskId);
} }
} }
@ -250,46 +250,46 @@ void FadeInNewBGM(u16 songNum, u8 speed)
if (songNum == 0xFFFF) if (songNum == 0xFFFF)
songNum = 0; songNum = 0;
m4aSongNumStart(songNum); m4aSongNumStart(songNum);
m4aMPlayImmInit(&gMPlay_BGM); m4aMPlayImmInit(&gMPlayInfo_BGM);
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0);
m4aSongNumStop(songNum); m4aSongNumStop(songNum);
m4aMPlayFadeIn(&gMPlay_BGM, speed); m4aMPlayFadeIn(&gMPlayInfo_BGM, speed);
} }
void FadeOutBGMTemporarily(u8 speed) void FadeOutBGMTemporarily(u8 speed)
{ {
m4aMPlayFadeOutTemporarily(&gMPlay_BGM, speed); m4aMPlayFadeOutTemporarily(&gMPlayInfo_BGM, speed);
} }
bool8 IsBGMPausedOrStopped(void) bool8 IsBGMPausedOrStopped(void)
{ {
if (gMPlay_BGM.status & MUSICPLAYER_STATUS_PAUSE) if (gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_PAUSE)
return TRUE; return TRUE;
if (!(gMPlay_BGM.status & MUSICPLAYER_STATUS_TRACK)) if (!(gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_TRACK))
return TRUE; return TRUE;
return FALSE; return FALSE;
} }
void FadeInBGM(u8 speed) void FadeInBGM(u8 speed)
{ {
m4aMPlayFadeIn(&gMPlay_BGM, speed); m4aMPlayFadeIn(&gMPlayInfo_BGM, speed);
} }
void FadeOutBGM(u8 speed) void FadeOutBGM(u8 speed)
{ {
m4aMPlayFadeOut(&gMPlay_BGM, speed); m4aMPlayFadeOut(&gMPlayInfo_BGM, speed);
} }
bool8 IsBGMStopped(void) bool8 IsBGMStopped(void)
{ {
if (!(gMPlay_BGM.status & MUSICPLAYER_STATUS_TRACK)) if (!(gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_TRACK))
return TRUE; return TRUE;
return FALSE; return FALSE;
} }
void PlayCry1(u16 species, s8 pan) void PlayCry1(u16 species, s8 pan)
{ {
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 85); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 85);
PlayCryInternal(species, pan, CRY_VOLUME, 10, 0); PlayCryInternal(species, pan, CRY_VOLUME, 10, 0);
gPokemonCryBGMDuckingCounter = 2; gPokemonCryBGMDuckingCounter = 2;
RestoreBGMVolumeAfterPokemonCry(); RestoreBGMVolumeAfterPokemonCry();
@ -308,7 +308,7 @@ void PlayCry3(u16 species, s8 pan, u8 mode)
} }
else else
{ {
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 85); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 85);
PlayCryInternal(species, pan, CRY_VOLUME, 10, mode); PlayCryInternal(species, pan, CRY_VOLUME, 10, mode);
gPokemonCryBGMDuckingCounter = 2; gPokemonCryBGMDuckingCounter = 2;
RestoreBGMVolumeAfterPokemonCry(); RestoreBGMVolumeAfterPokemonCry();
@ -324,7 +324,7 @@ void PlayCry4(u16 species, s8 pan, u8 mode)
else else
{ {
if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI)) if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 85); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 85);
PlayCryInternal(species, pan, CRY_VOLUME, 10, mode); PlayCryInternal(species, pan, CRY_VOLUME, 10, mode);
} }
} }
@ -337,7 +337,7 @@ void PlayCry6(u16 species, s8 pan, u8 mode) // not present in R/S
} }
else else
{ {
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 85); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 85);
PlayCryInternal(species, pan, CRY_VOLUME, 10, mode); PlayCryInternal(species, pan, CRY_VOLUME, 10, mode);
gPokemonCryBGMDuckingCounter = 2; gPokemonCryBGMDuckingCounter = 2;
} }
@ -345,7 +345,7 @@ void PlayCry6(u16 species, s8 pan, u8 mode) // not present in R/S
void PlayCry5(u16 species, u8 mode) void PlayCry5(u16 species, u8 mode)
{ {
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 85); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 85);
PlayCryInternal(species, 0, CRY_VOLUME, 10, mode); PlayCryInternal(species, 0, CRY_VOLUME, 10, mode);
gPokemonCryBGMDuckingCounter = 2; gPokemonCryBGMDuckingCounter = 2;
RestoreBGMVolumeAfterPokemonCry(); RestoreBGMVolumeAfterPokemonCry();
@ -529,7 +529,7 @@ static void Task_DuckBGMForPokemonCry(u8 taskId)
if (!IsPokemonCryPlaying(gMPlay_PokemonCry)) if (!IsPokemonCryPlaying(gMPlay_PokemonCry))
{ {
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 256); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256);
DestroyTask(taskId); DestroyTask(taskId);
} }
} }
@ -557,55 +557,55 @@ void PlaySE(u16 songNum)
void PlaySE12WithPanning(u16 songNum, s8 pan) void PlaySE12WithPanning(u16 songNum, s8 pan)
{ {
m4aSongNumStart(songNum); m4aSongNumStart(songNum);
m4aMPlayImmInit(&gMPlay_SE1); m4aMPlayImmInit(&gMPlayInfo_SE1);
m4aMPlayImmInit(&gMPlay_SE2); m4aMPlayImmInit(&gMPlayInfo_SE2);
m4aMPlayPanpotControl(&gMPlay_SE1, 0xFFFF, pan); m4aMPlayPanpotControl(&gMPlayInfo_SE1, 0xFFFF, pan);
m4aMPlayPanpotControl(&gMPlay_SE2, 0xFFFF, pan); m4aMPlayPanpotControl(&gMPlayInfo_SE2, 0xFFFF, pan);
} }
void PlaySE1WithPanning(u16 songNum, s8 pan) void PlaySE1WithPanning(u16 songNum, s8 pan)
{ {
m4aSongNumStart(songNum); m4aSongNumStart(songNum);
m4aMPlayImmInit(&gMPlay_SE1); m4aMPlayImmInit(&gMPlayInfo_SE1);
m4aMPlayPanpotControl(&gMPlay_SE1, 0xFFFF, pan); m4aMPlayPanpotControl(&gMPlayInfo_SE1, 0xFFFF, pan);
} }
void PlaySE2WithPanning(u16 songNum, s8 pan) void PlaySE2WithPanning(u16 songNum, s8 pan)
{ {
m4aSongNumStart(songNum); m4aSongNumStart(songNum);
m4aMPlayImmInit(&gMPlay_SE2); m4aMPlayImmInit(&gMPlayInfo_SE2);
m4aMPlayPanpotControl(&gMPlay_SE2, 0xFFFF, pan); m4aMPlayPanpotControl(&gMPlayInfo_SE2, 0xFFFF, pan);
} }
void SE12PanpotControl(s8 pan) void SE12PanpotControl(s8 pan)
{ {
m4aMPlayPanpotControl(&gMPlay_SE1, 0xFFFF, pan); m4aMPlayPanpotControl(&gMPlayInfo_SE1, 0xFFFF, pan);
m4aMPlayPanpotControl(&gMPlay_SE2, 0xFFFF, pan); m4aMPlayPanpotControl(&gMPlayInfo_SE2, 0xFFFF, pan);
} }
bool8 IsSEPlaying(void) bool8 IsSEPlaying(void)
{ {
if ((gMPlay_SE1.status & MUSICPLAYER_STATUS_PAUSE) && (gMPlay_SE2.status & MUSICPLAYER_STATUS_PAUSE)) if ((gMPlayInfo_SE1.status & MUSICPLAYER_STATUS_PAUSE) && (gMPlayInfo_SE2.status & MUSICPLAYER_STATUS_PAUSE))
return FALSE; return FALSE;
if (!(gMPlay_SE1.status & MUSICPLAYER_STATUS_TRACK) && !(gMPlay_SE2.status & MUSICPLAYER_STATUS_TRACK)) if (!(gMPlayInfo_SE1.status & MUSICPLAYER_STATUS_TRACK) && !(gMPlayInfo_SE2.status & MUSICPLAYER_STATUS_TRACK))
return FALSE; return FALSE;
return TRUE; return TRUE;
} }
bool8 IsBGMPlaying(void) bool8 IsBGMPlaying(void)
{ {
if (gMPlay_BGM.status & MUSICPLAYER_STATUS_PAUSE) if (gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_PAUSE)
return FALSE; return FALSE;
if (!(gMPlay_BGM.status & MUSICPLAYER_STATUS_TRACK)) if (!(gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_TRACK))
return FALSE; return FALSE;
return TRUE; return TRUE;
} }
bool8 IsSpecialSEPlaying(void) bool8 IsSpecialSEPlaying(void)
{ {
if (gMPlay_SE3.status & MUSICPLAYER_STATUS_PAUSE) if (gMPlayInfo_SE3.status & MUSICPLAYER_STATUS_PAUSE)
return FALSE; return FALSE;
if (!(gMPlay_SE3.status & MUSICPLAYER_STATUS_TRACK)) if (!(gMPlayInfo_SE3.status & MUSICPLAYER_STATUS_TRACK))
return FALSE; return FALSE;
return TRUE; return TRUE;
} }

4
src/text.c
View File

@ -2418,12 +2418,12 @@ _08005ABA:\n\
strb r0, [r6, #0x9]\n\ strb r0, [r6, #0x9]\n\
b _08005A0A\n\ b _08005A0A\n\
_08005ABE:\n\ _08005ABE:\n\
ldr r0, =gMPlay_BGM\n\ ldr r0, =gMPlayInfo_BGM\n\
bl m4aMPlayStop\n\ bl m4aMPlayStop\n\
b _08005A0A\n\ b _08005A0A\n\
.pool\n\ .pool\n\
_08005ACC:\n\ _08005ACC:\n\
ldr r0, =gMPlay_BGM\n\ ldr r0, =gMPlayInfo_BGM\n\
bl m4aMPlayContinue\n\ bl m4aMPlayContinue\n\
b _08005A0A\n\ b _08005A0A\n\
.pool\n\ .pool\n\

14
sym_bss.txt
View File

@ -192,7 +192,19 @@ gUnknown_030012FC: @ 30012FC
.space 0x4 .space 0x4
gUnknown_03001300: @ 3001300 gUnknown_03001300: @ 3001300
.space 0x770 .space 0x40
gMPlayTrack_BGM: @ 3001340
.space 0x320
gMPlayTrack_SE1: @ 3001660
.space 0xF0
gMPlayTrack_SE2: @ 3001750
.space 0x2D0
gMPlayTrack_SE3: @ 3001A20
.space 0x50
.include "src/agb_flash.o" .include "src/agb_flash.o"
.include "src/siirtc.o" .include "src/siirtc.o"