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 branch 'master' into mac_build_and_libc

Browse Source
This commit is contained in:
scnorton 2018-01-16 17:09:36 -05:00
commit d8bb1d15e7
644 changed files with 31475 additions and 13724 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -15,6 +15,7 @@
*.latfont
*.hwjpnfont
*.fwjpnfont
sound/**/*.bin
tools/agbcc
*.map
*.ld

10
Makefile
View File

@ -33,6 +33,8 @@ OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy
LIBGCC := tools/agbcc/lib/libgcc.a
LIBC := tools/agbcc/lib/libc.a
LIBC := tools/agbcc/lib/libc.a
SHA1 := sha1sum -c
GFX := tools/gbagfx/gbagfx
@ -48,7 +50,7 @@ RAMSCRGEN := tools/ramscrgen/ramscrgen
# Secondary expansion is required for dependency variables in object rules.
.SECONDEXPANSION:
.PRECIOUS: %.1bpp %.4bpp %.8bpp %.gbapal %.lz %.rl
.PRECIOUS: %.1bpp %.4bpp %.8bpp %.gbapal %.lz %.rl %.pcm %.bin sound/direct_sound_samples/cry_%.bin
.PHONY: rom clean compare tidy
@ -76,6 +78,8 @@ compare: $(ROM)
@$(SHA1) rom.sha1
clean: tidy
rm -f sound/direct_sound_samples/*.bin
rm -f $(SONG_OBJS)
find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} +
tidy:
@ -96,6 +100,10 @@ include graphics_file_rules.mk
%.gbapal: %.png ; $(GFX) $< $@
%.lz: % ; $(GFX) $< $@
%.rl: % ; $(GFX) $< $@
sound/direct_sound_samples/cry_%.bin: sound/direct_sound_samples/cry_%.aif ; $(AIF) $< $@ --compress
%.bin: %.aif ; $(AIF) $< $@
sound/songs/%.s: sound/songs/%.mid
cd $(@D) && ../../$(MID) $(<F)
$(C_BUILDDIR)/libc.o: CC1 := tools/agbcc/bin/old_agbcc
$(C_BUILDDIR)/libc.o: CFLAGS := -O2

2
asm/battle_anim_80FE840.s
View File

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

2
asm/battle_frontier_2.s
View File

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

9826
asm/battle_transition.s
View File

File diff suppressed because it is too large Load Diff

2
asm/contest.s
View File

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

6
asm/field_effect.s
View File

@ -498,8 +498,8 @@ _080B5E68:
bx r1
thumb_func_end FieldEffectActiveListContains
thumb_func_start sub_80B5E6C
sub_80B5E6C: @ 80B5E6C
thumb_func_start CreateTrainerSprite
CreateTrainerSprite: @ 80B5E6C
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@ -566,7 +566,7 @@ sub_80B5E6C: @ 80B5E6C
pop {r1}
bx r1
.pool
thumb_func_end sub_80B5E6C
thumb_func_end CreateTrainerSprite
thumb_func_start sub_80B5F0C
sub_80B5F0C: @ 80B5F0C

6
asm/link.s
View File

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

125
asm/macros/music_voice.inc Normal file
View File

@ -0,0 +1,125 @@
.macro voice_directsound base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release
.byte 0
_voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release
.endm
.macro voice_directsound_no_resample base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release
.byte 8
_voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release
.endm
.macro voice_directsound_alt base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release
.byte 16
_voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release
.endm
.macro _voice_directsound base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release
.byte \base_midi_key
.byte 0
.if \pan != 0
.byte (0x80 | \pan)
.else
.byte 0
.endif
.4byte \sample_data_pointer
.byte \attack
.byte \decay
.byte \sustain
.byte \release
.endm
.macro voice_square_1 sweep, duty_cycle, attack, decay, sustain, release
_voice_square_1 1, \sweep, \duty_cycle, \attack, \decay, \sustain, \release
.endm
.macro voice_square_1_alt sweep, duty_cycle, attack, decay, sustain, release
_voice_square_1 9, \sweep, \duty_cycle, \attack, \decay, \sustain, \release
.endm
.macro _voice_square_1 type, sweep, duty_cycle, attack, decay, sustain, release
.byte \type, 60, 0
.byte \sweep
.byte (\duty_cycle & 0x3)
.byte 0, 0, 0
.byte (\attack & 0x7)
.byte (\decay & 0x7)
.byte (\sustain & 0xF)
.byte (\release & 0x7)
.endm
.macro voice_square_2 duty_cycle, attack, decay, sustain, release
_voice_square_2 2, \duty_cycle, \attack, \decay, \sustain, \release
.endm
.macro voice_square_2_alt duty_cycle, attack, decay, sustain, release
_voice_square_2 10, \duty_cycle, \attack, \decay, \sustain, \release
.endm
.macro _voice_square_2 type, duty_cycle, attack, decay, sustain, release
.byte \type, 60, 0, 0
.byte (\duty_cycle & 0x3)
.byte 0, 0, 0
.byte (\attack & 0x7)
.byte (\decay & 0x7)
.byte (\sustain & 0xF)
.byte (\release & 0x7)
.endm
.macro voice_programmable_wave wave_samples_pointer, attack, decay, sustain, release
_voice_programmable_wave 3, \wave_samples_pointer, \attack, \decay, \sustain, \release
.endm
.macro voice_programmable_wave_alt wave_samples_pointer, attack, decay, sustain, release
_voice_programmable_wave 11, \wave_samples_pointer, \attack, \decay, \sustain, \release
.endm
.macro _voice_programmable_wave type, wave_samples_pointer, attack, decay, sustain, release
.byte \type, 60, 0, 0
.4byte \wave_samples_pointer
.byte (\attack & 0x7)
.byte (\decay & 0x7)
.byte (\sustain & 0xF)
.byte (\release & 0x7)
.endm
.macro voice_noise period, attack, decay, sustain, release
_voice_noise 4, \period, \attack, \decay, \sustain, \release
.endm
.macro voice_noise_alt period, attack, decay, sustain, release
_voice_noise 12, \period, \attack, \decay, \sustain, \release
.endm
.macro _voice_noise type, period, attack, decay, sustain, release
.byte \type, 60, 0, 0
.byte (\period & 0x1)
.byte 0, 0, 0
.byte (\attack & 0x7)
.byte (\decay & 0x7)
.byte (\sustain & 0xF)
.byte (\release & 0x7)
.endm
.macro voice_keysplit voice_group_pointer, keysplit_table_pointer
.byte 0x40, 0, 0, 0
.4byte \voice_group_pointer
.4byte \keysplit_table_pointer
.endm
.macro voice_keysplit_all voice_group_pointer
.byte 0x80, 0, 0, 0
.4byte \voice_group_pointer
.4byte 0
.endm
.macro cry sample
.byte 0x20, 60, 0, 0
.4byte \sample
.byte 0xff, 0, 0xff, 0
.endm
.macro cry2 sample
.byte 0x30, 60, 0, 0
.4byte \sample
.byte 0xff, 0, 0xff, 0
.endm

4
asm/main_menu.s
View File

@ -3948,7 +3948,7 @@ AddBirchSpeechObjects: @ 803192C
movs r1, 0x78
movs r2, 0x3C
movs r3, 0
bl sub_80B5E6C
bl CreateTrainerSprite
lsls r0, 24
lsrs r0, 24
lsls r2, r0, 4
@ -3981,7 +3981,7 @@ AddBirchSpeechObjects: @ 803192C
movs r1, 0x78
movs r2, 0x3C
movs r3, 0
bl sub_80B5E6C
bl CreateTrainerSprite
lsls r0, 24
lsrs r0, 24
lsls r2, r0, 4

8
asm/mauville_old_man.s
View File

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

18
asm/overworld.s
View File

@ -3055,9 +3055,9 @@ _08085E18:
.pool
thumb_func_end c1_overworld
thumb_func_start c2_overworld_basic
@ void c2_overworld_basic()
c2_overworld_basic: @ 8085E24
thumb_func_start OverworldBasic
@ void OverworldBasic()
OverworldBasic: @ 8085E24
push {lr}
bl ScriptContext2_RunScript
bl RunTasks
@ -3070,15 +3070,15 @@ c2_overworld_basic: @ 8085E24
bl do_scheduled_bg_tilemap_copies_to_vram
pop {r0}
bx r0
thumb_func_end c2_overworld_basic
thumb_func_end OverworldBasic
thumb_func_start sub_8085E50
sub_8085E50: @ 8085E50
thumb_func_start CB2_OverworldBasic
CB2_OverworldBasic: @ 8085E50
push {lr}
bl c2_overworld_basic
bl OverworldBasic
pop {r0}
bx r0
thumb_func_end sub_8085E50
thumb_func_end CB2_OverworldBasic
thumb_func_start c2_overworld
c2_overworld: @ 8085E5C
@ -3092,7 +3092,7 @@ c2_overworld: @ 8085E5C
movs r0, 0
bl SetVBlankCallback
_08085E70:
bl c2_overworld_basic
bl OverworldBasic
cmp r4, 0
beq _08085E7C
bl SetFieldVBlankCallback

12
asm/pokedex.s
View File

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

2
asm/pokedex_cry_screen.s
View File

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

12
asm/roulette.s
View File

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

2
asm/title_screen.s
View File

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

308
asm/unk_transition.s
View File

@ -24,8 +24,8 @@ _081DABD2:
bx r1
thumb_func_end sub_81DABBC
thumb_func_start sub_81DABDC
sub_81DABDC: @ 81DABDC
thumb_func_start Phase2Task_34
Phase2Task_34: @ 81DABDC
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
@ -50,7 +50,7 @@ _081DABEE:
pop {r0}
bx r0
.pool
thumb_func_end sub_81DABDC
thumb_func_end Phase2Task_34
thumb_func_start sub_81DAC14
sub_81DAC14: @ 81DAC14
@ -119,7 +119,7 @@ sub_81DAC80: @ 81DAC80
bne _081DACA4
adds r0, r2, 0
bl sub_81DAA20
ldr r0, =sub_81DABDC
ldr r0, =Phase2Task_34
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
@ -131,8 +131,8 @@ _081DACA4:
.pool
thumb_func_end sub_81DAC80
thumb_func_start sub_81DACB4
sub_81DACB4: @ 81DACB4
thumb_func_start Phase2Task_35
Phase2Task_35: @ 81DACB4
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
@ -157,7 +157,7 @@ _081DACC6:
pop {r0}
bx r0
.pool
thumb_func_end sub_81DACB4
thumb_func_end Phase2Task_35
thumb_func_start sub_81DACEC
sub_81DACEC: @ 81DACEC
@ -226,7 +226,7 @@ sub_81DAD58: @ 81DAD58
bne _081DAD7C
adds r0, r2, 0
bl sub_81DAA20
ldr r0, =sub_81DACB4
ldr r0, =Phase2Task_35
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
@ -238,8 +238,8 @@ _081DAD7C:
.pool
thumb_func_end sub_81DAD58
thumb_func_start sub_81DAD8C
sub_81DAD8C: @ 81DAD8C
thumb_func_start Phase2Task_36
Phase2Task_36: @ 81DAD8C
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
@ -264,7 +264,7 @@ _081DAD9E:
pop {r0}
bx r0
.pool
thumb_func_end sub_81DAD8C
thumb_func_end Phase2Task_36
thumb_func_start sub_81DADC4
sub_81DADC4: @ 81DADC4
@ -342,7 +342,7 @@ sub_81DAE44: @ 81DAE44
bne _081DAE68
adds r0, r2, 0
bl sub_81DAA20
ldr r0, =sub_81DAD8C
ldr r0, =Phase2Task_36
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
@ -354,8 +354,8 @@ _081DAE68:
.pool
thumb_func_end sub_81DAE44
thumb_func_start sub_81DAE78
sub_81DAE78: @ 81DAE78
thumb_func_start Phase2Task_37
Phase2Task_37: @ 81DAE78
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
@ -380,7 +380,7 @@ _081DAE8A:
pop {r0}
bx r0
.pool
thumb_func_end sub_81DAE78
thumb_func_end Phase2Task_37
thumb_func_start sub_81DAEB0
sub_81DAEB0: @ 81DAEB0
@ -460,7 +460,7 @@ sub_81DAF34: @ 81DAF34
bne _081DAF58
adds r0, r2, 0
bl sub_81DAA20
ldr r0, =sub_81DAE78
ldr r0, =Phase2Task_37
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
@ -472,8 +472,8 @@ _081DAF58:
.pool
thumb_func_end sub_81DAF34
thumb_func_start sub_81DAF68
sub_81DAF68: @ 81DAF68
thumb_func_start Phase2Task_38
Phase2Task_38: @ 81DAF68
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
@ -498,7 +498,7 @@ _081DAF7A:
pop {r0}
bx r0
.pool
thumb_func_end sub_81DAF68
thumb_func_end Phase2Task_38
thumb_func_start sub_81DAFA0
sub_81DAFA0: @ 81DAFA0
@ -585,7 +585,7 @@ sub_81DB02C: @ 81DB02C
bne _081DB050
adds r0, r2, 0
bl sub_81DAA20
ldr r0, =sub_81DAF68
ldr r0, =Phase2Task_38
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
@ -597,8 +597,8 @@ _081DB050:
.pool
thumb_func_end sub_81DB02C
thumb_func_start sub_81DB060
sub_81DB060: @ 81DB060
thumb_func_start Phase2Task_39
Phase2Task_39: @ 81DB060
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
@ -623,7 +623,7 @@ _081DB072:
pop {r0}
bx r0
.pool
thumb_func_end sub_81DB060
thumb_func_end Phase2Task_39
thumb_func_start sub_81DB098
sub_81DB098: @ 81DB098
@ -710,7 +710,7 @@ sub_81DB124: @ 81DB124
bne _081DB148
adds r0, r2, 0
bl sub_81DAA20
ldr r0, =sub_81DB060
ldr r0, =Phase2Task_39
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
@ -722,4 +722,264 @@ _081DB148:
.pool
thumb_func_end sub_81DB124
thumb_func_start Phase2Task_40
Phase2Task_40: @ 81DB158
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_0862B7E8
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r4, r1, r2
_081DB16A:
movs r1, 0x8
ldrsh r0, [r4, r1]
lsls r0, 2
adds r0, r5
ldr r1, [r0]
adds r0, r4, 0
bl _call_via_r1
lsls r0, 24
cmp r0, 0
bne _081DB16A
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end Phase2Task_40
thumb_func_start sub_81DB190
sub_81DB190: @ 81DB190
push {r4,lr}
sub sp, 0x10
adds r4, r0, 0
movs r0, 0xA
ldrsh r1, [r4, r0]
cmp r1, 0
bne _081DB1BE
movs r0, 0x80
str r0, [sp]
str r1, [sp, 0x4]
subs r0, 0x84
str r0, [sp, 0x8]
str r1, [sp, 0xC]
movs r0, 0x78
movs r1, 0x2D
movs r2, 0xC
movs r3, 0x4
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x10]
b _081DB212
_081DB1BE:
cmp r1, 0x10
bne _081DB1E6
movs r0, 0x80
str r0, [sp]
movs r0, 0
str r0, [sp, 0x4]
subs r0, 0x4
str r0, [sp, 0x8]
movs r0, 0x1
str r0, [sp, 0xC]
movs r0, 0x59
movs r1, 0x61
movs r2, 0xFC
movs r3, 0x4
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x12]
b _081DB212
_081DB1E6:
cmp r1, 0x20
bne _081DB212
movs r0, 0x80
str r0, [sp]
movs r0, 0
str r0, [sp, 0x4]
subs r0, 0x4
str r0, [sp, 0x8]
movs r0, 0x2
str r0, [sp, 0xC]
movs r0, 0x97
movs r1, 0x61
movs r2, 0x84
movs r3, 0x4
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x14]
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
_081DB212:
ldrh r0, [r4, 0xA]
adds r0, 0x1
strh r0, [r4, 0xA]
movs r0, 0
add sp, 0x10
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81DB190
thumb_func_start sub_81DB224
sub_81DB224: @ 81DB224
push {lr}
adds r2, r0, 0
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _081DB248
adds r0, r2, 0
bl sub_81DAA20
ldr r0, =Phase2Task_40
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
bl DestroyTask
_081DB248:
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end sub_81DB224
thumb_func_start Phase2Task_41
Phase2Task_41: @ 81DB258
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_0862B7FC
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r4, r1, r2
_081DB26A:
movs r1, 0x8
ldrsh r0, [r4, r1]
lsls r0, 2
adds r0, r5
ldr r1, [r0]
adds r0, r4, 0
bl _call_via_r1
lsls r0, 24
cmp r0, 0
bne _081DB26A
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end Phase2Task_41
thumb_func_start sub_81DB290
sub_81DB290: @ 81DB290
push {r4,lr}
sub sp, 0x10
adds r4, r0, 0
movs r0, 0xA
ldrsh r1, [r4, r0]
cmp r1, 0
bne _081DB2C2
movs r2, 0x8E
lsls r2, 1
movs r0, 0x83
str r0, [sp]
movs r0, 0x23
str r0, [sp, 0x4]
subs r0, 0x26
str r0, [sp, 0x8]
str r1, [sp, 0xC]
movs r0, 0x78
movs r1, 0x50
movs r3, 0x8
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x10]
b _081DB316
_081DB2C2:
cmp r1, 0x10
bne _081DB2EA
movs r0, 0x83
str r0, [sp]
movs r0, 0x23
str r0, [sp, 0x4]
subs r0, 0x26
str r0, [sp, 0x8]
movs r0, 0x1
str r0, [sp, 0xC]
movs r0, 0x78
movs r1, 0x50
movs r2, 0x2C
movs r3, 0x8
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x12]
b _081DB316
_081DB2EA:
cmp r1, 0x20
bne _081DB316
movs r0, 0x83
str r0, [sp]
movs r0, 0x23
str r0, [sp, 0x4]
subs r0, 0x26
str r0, [sp, 0x8]
movs r0, 0x2
str r0, [sp, 0xC]
movs r0, 0x79
movs r1, 0x50
movs r2, 0xA4
movs r3, 0x8
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x14]
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
_081DB316:
ldrh r0, [r4, 0xA]
adds r0, 0x1
strh r0, [r4, 0xA]
movs r0, 0
add sp, 0x10
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81DB290
thumb_func_start sub_81DB328
sub_81DB328: @ 81DB328
push {lr}
adds r2, r0, 0
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _081DB34C
adds r0, r2, 0
bl sub_81DAA20
ldr r0, =Phase2Task_41
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
bl DestroyTask
_081DB34C:
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end sub_81DB328
.align 2, 0 @ Don't pad with nop.

268
asm/unk_transition_2.s
View File

@ -1,268 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_81DB158
sub_81DB158: @ 81DB158
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_0862B7E8
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r4, r1, r2
_081DB16A:
movs r1, 0x8
ldrsh r0, [r4, r1]
lsls r0, 2
adds r0, r5
ldr r1, [r0]
adds r0, r4, 0
bl _call_via_r1
lsls r0, 24
cmp r0, 0
bne _081DB16A
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81DB158
thumb_func_start sub_81DB190
sub_81DB190: @ 81DB190
push {r4,lr}
sub sp, 0x10
adds r4, r0, 0
movs r0, 0xA
ldrsh r1, [r4, r0]
cmp r1, 0
bne _081DB1BE
movs r0, 0x80
str r0, [sp]
str r1, [sp, 0x4]
subs r0, 0x84
str r0, [sp, 0x8]
str r1, [sp, 0xC]
movs r0, 0x78
movs r1, 0x2D
movs r2, 0xC
movs r3, 0x4
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x10]
b _081DB212
_081DB1BE:
cmp r1, 0x10
bne _081DB1E6
movs r0, 0x80
str r0, [sp]
movs r0, 0
str r0, [sp, 0x4]
subs r0, 0x4
str r0, [sp, 0x8]
movs r0, 0x1
str r0, [sp, 0xC]
movs r0, 0x59
movs r1, 0x61
movs r2, 0xFC
movs r3, 0x4
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x12]
b _081DB212
_081DB1E6:
cmp r1, 0x20
bne _081DB212
movs r0, 0x80
str r0, [sp]
movs r0, 0
str r0, [sp, 0x4]
subs r0, 0x4
str r0, [sp, 0x8]
movs r0, 0x2
str r0, [sp, 0xC]
movs r0, 0x97
movs r1, 0x61
movs r2, 0x84
movs r3, 0x4
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x14]
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
_081DB212:
ldrh r0, [r4, 0xA]
adds r0, 0x1
strh r0, [r4, 0xA]
movs r0, 0
add sp, 0x10
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81DB190
thumb_func_start sub_81DB224
sub_81DB224: @ 81DB224
push {lr}
adds r2, r0, 0
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _081DB248
adds r0, r2, 0
bl sub_81DAA20
ldr r0, =sub_81DB158
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
bl DestroyTask
_081DB248:
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end sub_81DB224
thumb_func_start sub_81DB258
sub_81DB258: @ 81DB258
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_0862B7FC
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r4, r1, r2
_081DB26A:
movs r1, 0x8
ldrsh r0, [r4, r1]
lsls r0, 2
adds r0, r5
ldr r1, [r0]
adds r0, r4, 0
bl _call_via_r1
lsls r0, 24
cmp r0, 0
bne _081DB26A
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81DB258
thumb_func_start sub_81DB290
sub_81DB290: @ 81DB290
push {r4,lr}
sub sp, 0x10
adds r4, r0, 0
movs r0, 0xA
ldrsh r1, [r4, r0]
cmp r1, 0
bne _081DB2C2
movs r2, 0x8E
lsls r2, 1
movs r0, 0x83
str r0, [sp]
movs r0, 0x23
str r0, [sp, 0x4]
subs r0, 0x26
str r0, [sp, 0x8]
str r1, [sp, 0xC]
movs r0, 0x78
movs r1, 0x50
movs r3, 0x8
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x10]
b _081DB316
_081DB2C2:
cmp r1, 0x10
bne _081DB2EA
movs r0, 0x83
str r0, [sp]
movs r0, 0x23
str r0, [sp, 0x4]
subs r0, 0x26
str r0, [sp, 0x8]
movs r0, 0x1
str r0, [sp, 0xC]
movs r0, 0x78
movs r1, 0x50
movs r2, 0x2C
movs r3, 0x8
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x12]
b _081DB316
_081DB2EA:
cmp r1, 0x20
bne _081DB316
movs r0, 0x83
str r0, [sp]
movs r0, 0x23
str r0, [sp, 0x4]
subs r0, 0x26
str r0, [sp, 0x8]
movs r0, 0x2
str r0, [sp, 0xC]
movs r0, 0x79
movs r1, 0x50
movs r2, 0xA4
movs r3, 0x8
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x14]
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
_081DB316:
ldrh r0, [r4, 0xA]
adds r0, 0x1
strh r0, [r4, 0xA]
movs r0, 0
add sp, 0x10
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81DB290
thumb_func_start sub_81DB328
sub_81DB328: @ 81DB328
push {lr}
adds r2, r0, 0
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _081DB34C
adds r0, r2, 0
bl sub_81DAA20
ldr r0, =sub_81DB258
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
bl DestroyTask
_081DB34C:
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end sub_81DB328
.align 2, 0 @ Don't pad with nop.

4
charmap.txt
View File

@ -73,6 +73,7 @@ RIGHT_ARROW = 7C
'?' = AC
'.' = AD
'-' = AE
'·' = AF
'…' = B0
'“' = B1
'”' = B2
@ -317,8 +318,7 @@ TALL_PLUS = FC 0C FB
'？' = AC
'。' = AD
'ー' = AE
'·' = AF
'‥' = B0
'⋯' = B0
STRING = FD

8
common_syms/m4a_2.txt
View File

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

1211
data/battle_anims.s
View File

File diff suppressed because it is too large Load Diff

784
data/battle_transition.s
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

2
data/field_effect_scripts.s
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

175
data/field_map_obj.s
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

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"
.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

41
data/shop.s
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

11
data/sound_data.s
View File

@ -1,14 +1,13 @@
.section .rodata
.include "asm/macros/m4a.inc"
.include "asm/macros/music_voice.inc"
.include "sound/voice_groups.inc"
@ keysplit tables, programmable wave data
.incbin "baserom.gba", 0x6b4698, 0x328
.include "sound/keysplit_tables.inc"
.include "sound/programmable_wave_data.inc"
.include "sound/music_player_table.inc"
.include "sound/song_table.inc"
.include "sound/direct_sound_data.inc"
@ direct sound data
.incbin "baserom.gba", 0x6b5d04, 0x246338
.align 2

47
data/strings.s
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$"

32
include/battle_transition.h
View File

@ -1,12 +1,27 @@
#ifndef GUARD_BATTLE_TRANSITION_H
#define GUARD_BATTLE_TRANSITION_H
void sub_8149DFC(u8 a1);
void BattleTransition_StartOnField(u8 transitionID);
void BattleTransition_Start(u8 transitionID);
void TestBattleTransition(u8 transitionId);
void BattleTransition_StartOnField(u8 transitionId);
void BattleTransition_Start(u8 transitionId);
bool8 IsBattleTransitionDone(void);
bool8 FldEff_Pokeball(void);
void TransitionPhase1_Task_RunFuncs(u8 taskId);
void sub_8149F58(u16 **a0, u16 **a1);
// credits for the names go to Dyskinesia and Tetrable
extern const struct SpritePalette gFieldEffectObjectPaletteInfo10;
enum // TRANSITION_MUGSHOT
{
MUGSHOT_SYDNEY,
MUGSHOT_PHOEBE,
MUGSHOT_GLACIA,
MUGSHOT_DRAKE,
MUGSHOT_CHAMPION,
MUGSHOTS_COUNT
};
// credits for the names go to Dyskinesia, Tetrable and Farore
// names are naturally subject to change
#define B_TRANSITION_BLUR 0
@ -35,10 +50,10 @@ bool8 IsBattleTransitionDone(void);
#define B_TRANSITION_KYOGRE 22
#define B_TRANSITION_GROUDON 23
#define B_TRANSITION_RAYQUAZA 24
#define B_TRANSITION_25 25
#define B_TRANSITION_26 26
#define B_TRANSITION_27 27
#define B_TRANSITION_28 28
#define B_TRANSITION_SHRED_SPLIT 25
#define B_TRANSITION_BLACKHOLE1 26
#define B_TRANSITION_BLACKHOLE2 27
#define B_TRANSITION_RECTANGULAR_SPIRAL 28
#define B_TRANSITION_29 29
#define B_TRANSITION_30 30
#define B_TRANSITION_31 31
@ -52,5 +67,6 @@ bool8 IsBattleTransitionDone(void);
#define B_TRANSITION_39 39
#define B_TRANSITION_40 40
#define B_TRANSITION_41 41
#define B_TRANSITION_COUNT 42
#endif // GUARD_BATTLE_TRANSITION_H

2
include/bg.h
View File

@ -70,7 +70,7 @@ void CopyToBgTilemapBuffer(u8 bg, const void *src, u16 mode, u16 destOffset);
void CopyBgTilemapBufferToVram(u8 bg);
void CopyToBgTilemapBufferRect(u8 bg, void* src, u8 destX, u8 destY, u8 width, u8 height);
void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette);
void CopyRectToBgTilemapBufferRect(u8 bg, void* src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2);
void CopyRectToBgTilemapBufferRect(u8 bg, const void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2);
void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height);
void FillBgTilemapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette);
void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 width, u8 height, u8 paletteSlot, s16 tileNumDelta);

17
include/config.h
View File

@ -1,6 +1,23 @@
#ifndef GUARD_CONFIG_H
#define GUARD_CONFIG_H
// In the Generation 3 games, Asserts were used in various debug builds.
// Ruby/Sapphire and Emerald do not have these asserts while Fire Red
// still has them in the ROM. This is because the developers forgot
// to define NDEBUG before release, however this has been changed as
// Ruby's actual debug build does not use the AGBPrint features.
#define NDEBUG
// To enable print debugging, comment out "#define NDEBUG". This allows
// the various AGBPrint functions to be used. (See include/gba/isagbprint.h).
// Some emulators support a debug console window: uncomment NoCashGBAPrint()
// and NoCashGBAPrintf() in libisagbprn.c to use no$gba's own proprietary
// printing system. Use NoCashGBAPrint() and NoCashGBAPrintf() like you
// would normally use AGBPrint() and AGBPrintf().
// NOTE: Don't try to enable assert right now as many pointers
// still exist in defines and WILL likely result in a broken ROM.
#define ENGLISH
#ifdef ENGLISH

1
include/field_camera.h
View File

@ -24,6 +24,7 @@ extern u16 gUnknown_03005DE8;
void DrawWholeMapView(void);
void CurrentMapDrawMetatileAt(int x, int y);
void sub_8089C08(s16 *a0, s16 *a1);
void DrawDoorMetatileAt(int x, int y, u16 *arr);
#endif //GUARD_FIELD_CAMERA_H

1
include/field_effect.h
View File

@ -75,6 +75,7 @@ u32 FieldEffectStart(u8);
bool8 FieldEffectActiveListContains(u8 id);
void sub_80B69DC(void);
void FieldEffectStop(struct Sprite *sprite, u8 id);
u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buffer);
void sub_80B7FC8(void);
void FieldEffectActiveListRemove(u8 id);

1
include/gba/gba.h
View File

@ -7,5 +7,6 @@
#include "gba/multiboot.h"
#include "gba/syscall.h"
#include "gba/macro.h"
#include "gba/isagbprint.h"
#endif // GUARD_GBA_GBA_H

55
include/gba/io_reg.h
View File

@ -501,12 +501,12 @@
// I/O register fields
// DISPCNT
#define DISPCNT_MODE_0 0x0000
#define DISPCNT_MODE_1 0x0001
#define DISPCNT_MODE_2 0x0002
#define DISPCNT_MODE_3 0x0003
#define DISPCNT_MODE_4 0x0004
#define DISPCNT_MODE_5 0x0005
#define DISPCNT_MODE_0 0x0000 // BG0: text, BG1: text, BG2: text, BG3: text
#define DISPCNT_MODE_1 0x0001 // BG0: text, BG1: text, BG2: affine, BG3: off
#define DISPCNT_MODE_2 0x0002 // BG0: off, BG1: off, BG2: affine, BG3: affine
#define DISPCNT_MODE_3 0x0003 // Bitmap mode, 240x160, BGR555 color
#define DISPCNT_MODE_4 0x0004 // Bitmap mode, 240x160, 256 color palette
#define DISPCNT_MODE_5 0x0005 // Bitmap mode, 160x128, BGR555 color
#define DISPCNT_OBJ_1D_MAP 0x0040
#define DISPCNT_FORCED_BLANK 0x0080
#define DISPCNT_BG0_ON 0x0100
@ -527,7 +527,46 @@
#define DISPSTAT_HBLANK_INTR 0x0010 // H-Blank interrupt enabled
#define DISPSTAT_VCOUNT_INTR 0x0020 // V-Count interrupt enabled
// BGCNT
#define BGCNT_PRIORITY(n) (n) // Values 0 - 3. Lower priority BGs will be drawn on top of higher priority BGs.
#define BGCNT_CHARBASE(n) ((n) << 2) // Values 0 - 3. Base block for tile pixel data.
#define BGCNT_MOSAIC 0x0040
#define BGCNT_16COLOR 0x0000 // 4 bits per pixel
#define BGCNT_256COLOR 0x0080 // 8 bits per pixel
#define BGCNT_SCREENBASE(n) ((n) << 8) // Values 0 - 31. Base block for tile map.
#define BGCNT_WRAP 0x2000 // Only affects affine BGs. Text BGs wrap by default.
#define BGCNT_TXT256x256 0x0000 // Internal screen size size of text mode BG in pixels.
#define BGCNT_TXT512x256 0x4000
#define BGCNT_TXT256x512 0x8000
#define BGCNT_TXT512x512 0xC000
#define BGCNT_AFF128x128 0x0000 // Internal screen size size of affine mode BG in pixels.
#define BGCNT_AFF256x256 0x4000
#define BGCNT_AFF512x512 0x8000
#define BGCNT_AFF1024x1024 0xC000
// BLDCNT
// Bits 0-5 select layers for the 1st target
#define BLDCNT_TGT1_BG0 (1 << 0)
#define BLDCNT_TGT1_BG1 (1 << 1)
#define BLDCNT_TGT1_BG2 (1 << 2)
#define BLDCNT_TGT1_BG3 (1 << 3)
#define BLDCNT_TGT1_OBJ (1 << 4)
#define BLDCNT_TGT1_BD (1 << 5)
// Bits 6-7 select the special effect
#define BLDCNT_EFFECT_NONE (0 << 6) // no special effect
#define BLDCNT_EFFECT_BLEND (1 << 6) // 1st+2nd targets mixed (controlled by BLDALPHA)
#define BLDCNT_EFFECT_LIGHTEN (2 << 6) // 1st target becomes whiter (controlled by BLDY)
#define BLDCNT_EFFECT_DARKEN (3 << 6) // 1st target becomes blacker (controlled by BLDY)
// Bits 8-13 select layers for the 2nd target
#define BLDCNT_TGT2_BG0 (1 << 8)
#define BLDCNT_TGT2_BG1 (1 << 9)
#define BLDCNT_TGT2_BG2 (1 << 10)
#define BLDCNT_TGT2_BG3 (1 << 11)
#define BLDCNT_TGT2_OBJ (1 << 12)
#define BLDCNT_TGT2_BD (1 << 13)
// BLDALPHA
#define BLDALPHA_BLEND(target1, target2) (((target2) << 8) | (target1))
// SOUNDCNT_H
#define SOUND_CGB_MIX_QUARTER 0x0000
@ -627,8 +666,8 @@
#define KEY_INTR_ENABLE 0x0400
#define KEY_OR_INTR 0x0000
#define KEY_AND_INTR 0x8000
#define DPAD_ANY ((DPAD_RIGHT | DPAD_LEFT | DPAD_UP | DPAD_DOWN))
#define DPAD_ANY ((DPAD_RIGHT | DPAD_LEFT | DPAD_UP | DPAD_DOWN))
#define JOY_EXCL_DPAD 0x030F
// interrupt flags
#define INTR_FLAG_VBLANK (1 << 0)

50
include/gba/isagbprint.h Executable file
View File

@ -0,0 +1,50 @@
#ifndef GUARD_GBA_ISAGBPRINT_H
#define GUARD_GBA_ISAGBPRINT_H
#ifdef NDEBUG
#define AGBPrintInit()
#define AGBPutc(cChr)
#define AGBPrint(pBuf)
#define AGBPrintf(pBuf, ...)
#define AGBPrintFlush1Block()
#define AGBPrintFlush()
#define AGBAssert(pFile, nLine, pExpression, nStopProgram)
#else
void AGBPrintInit(void);
void AGBPutc(const char cChr);
void AGBPrint(const char *pBuf);
void AGBPrintf(const char *pBuf, ...);
void AGBPrintFlush1Block(void);
void AGBPrintFlush(void);
void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopProgram);
#endif
#undef AGB_ASSERT
#ifdef NDEBUG
#define AGB_ASSERT(exp)
#else
#define AGB_ASSERT(exp) (exp) ? ((void*)0) : AGBAssert(__FILE__, __LINE__, #exp, 1);
#endif
#undef AGB_WARNING
#ifdef NDEBUG
#define AGB_WARNING(exp)
#else
#define AGB_WARNING(exp) (exp) ? ((void*)0) : AGBAssert(__FILE__, __LINE__, #exp, 0);
#endif
// for matching purposes
#ifdef NDEBUG
#define AGB_ASSERT_EX(exp, file, line)
#else
#define AGB_ASSERT_EX(exp, file, line) (exp) ? ((void*)0) : AGBAssert(file, line, #exp, 1);
#endif
#ifdef NDEBUG
#define AGB_WARNING_EX(exp, file, line)
#else
#define AGB_WARNING_EX(exp, file, line) (exp) ? ((void*)0) : AGBAssert(file, line, #exp, 0);
#endif
#endif // GUARD_GBA_ISAGBPRINT_H

2
include/global.h
View File

@ -1,8 +1,8 @@
#ifndef GUARD_GLOBAL_H
#define GUARD_GLOBAL_H
#include "config.h" // we need to define config before gba headers as print stuff needs the functions nulled before defines.
#include "gba/gba.h"
#include "config.h"
// Prevent cross-jump optimization.
#define BLOCK_CROSS_JUMP asm("");

2
include/overworld.h
View File

@ -74,4 +74,6 @@ void mapldr_default(void);
void IncrementGameStat(u8);
u32 GetGameStat(u8);
void CB2_OverworldBasic(void);
#endif //GUARD_ROM4_H

13
include/unk_transition.h Normal file
View File

@ -0,0 +1,13 @@
#ifndef GUARD_UNK_TRANSITION_H
#define GUARD_UNK_TRANSITION_H
void Phase2Task_34(u8 taskId);
void Phase2Task_35(u8 taskId);
void Phase2Task_36(u8 taskId);
void Phase2Task_37(u8 taskId);
void Phase2Task_38(u8 taskId);
void Phase2Task_39(u8 taskId);
void Phase2Task_40(u8 taskId);
void Phase2Task_41(u8 taskId);
#endif // GUARD_UNK_TRANSITION_H

44
ld_script.txt
View File

@ -31,7 +31,8 @@ SECTIONS {
/* COMMON starts at 0x30022A8 */
<COMMON>
tools/agbcc/lib/libc.a:sbrkr.o(COMMON);
end = .;
. = 0x8000;
}
@ -196,7 +197,7 @@ SECTIONS {
src/coins.o(.text);
src/landmark.o(.text);
asm/fldeff_strength.o(.text);
asm/battle_transition.o(.text);
src/battle_transition.o(.text);
src/battle_controller_link_partner.o(.text);
src/battle_message.o(.text);
asm/cable_car.o(.text);
@ -274,7 +275,6 @@ SECTIONS {
asm/trainer_rematch.o(.text);
asm/unk_sprite_file.o(.text);
asm/unk_transition.o(.text);
asm/unk_transition_2.o(.text);
src/international_string_util.o(.text);
asm/international_string_util.o(.text);
} =0
@ -329,6 +329,38 @@ SECTIONS {
tools/agbcc/lib/libc.a:memset.o(.text);
tools/agbcc/lib/libc.a:strcmp.o(.text);
tools/agbcc/lib/libc.a:strcpy.o(.text);
tools/agbcc/lib/libc.a:vfprintf.o(.text);
tools/agbcc/lib/libc.a:vsprintf.o(.text);
tools/agbcc/lib/libc.a:fvwrite.o(.text);
tools/agbcc/lib/libc.a:locale.o(.text);
tools/agbcc/lib/libc.a:findfp.o(.text);
tools/agbcc/lib/libc.a:fflush.o(.text);
tools/agbcc/lib/libc.a:wsetup.o(.text);
tools/agbcc/lib/libc.a:mbtowc_r.o(.text);
tools/agbcc/lib/libc.a:s_isinf.o(.text);
tools/agbcc/lib/libc.a:s_isnan.o(.text);
tools/agbcc/lib/libc.a:memchr.o(.text);
tools/agbcc/lib/libc.a:strlen.o(.text);
tools/agbcc/lib/libc.a:dtoa.o(.text);
tools/agbcc/lib/libc.a:memmove.o(.text);
tools/agbcc/lib/libc.a:stdio.o(.text);
tools/agbcc/lib/libc.a:mprec.o(.text);
tools/agbcc/lib/libc.a:mallocr.o(.text);
tools/agbcc/lib/libc.a:fwalk.o(.text);
tools/agbcc/lib/libc.a:freer.o(.text);
tools/agbcc/lib/libc.a:makebuf.o(.text);
tools/agbcc/lib/libc.a:readr.o(.text);
tools/agbcc/lib/libc.a:writer.o(.text);
tools/agbcc/lib/libc.a:lseekr.o(.text);
tools/agbcc/lib/libc.a:closer.o(.text);
tools/agbcc/lib/libc.a:callocr.o(.text);
tools/agbcc/lib/libc.a:sbrkr.o(.text);
tools/agbcc/lib/libc.a:mlock.o(.text);
tools/agbcc/lib/libc.a:fstatr.o(.text);
tools/agbcc/lib/libc.a:libcfunc.o(.text);
tools/agbcc/lib/libc.a:syscalls.o(.text);
tools/agbcc/lib/libc.a:errno.o(.text);
src/libisagbprn.o(.text);
} =0
.rodata :
@ -449,7 +481,7 @@ SECTIONS {
data/roulette.o(.rodata);
data/pokedex_cry_screen.o(.rodata);
src/landmark.o(.rodata);
data/battle_transition.o(.rodata);
src/battle_transition.o(.rodata);
src/battle_controller_link_partner.o(.rodata);
src/battle_message.o(.rodata);
data/cable_car.o(.rodata);
@ -1062,6 +1094,10 @@ SECTIONS {
data/librfu_rodata.o(.rodata);
tools/agbcc/lib/libgcc.a:_divdi3.o(.rodata);
tools/agbcc/lib/libgcc.a:_udivdi3.o(.rodata);
tools/agbcc/lib/libc.a(.rodata);
tools/agbcc/lib/libc.a(.data);
tools/agbcc/lib/libc.a:syscalls.o(.rodata);
src/libisagbprn.o(.rodata);
} =0
other_data :

2175
sound/direct_sound_data.inc Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
sound/direct_sound_samples/86B5D04.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86B63A8.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86B6BA0.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86B776C.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86B86A4.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86B9318.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86BA7E8.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86BBE98.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86BD1DC.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86BDC80.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86BEF94.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86C2590.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86C2A68.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86C4344.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86C566C.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86C5B0C.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86C6200.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86C6A90.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86C7308.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86C8348.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86C875C.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86C958C.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86CA520.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86CADD4.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86CB6B8.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86CC5E4.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86CCAFC.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86CD0C4.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86CDFDC.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86CF950.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86D1A2C.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86D925C.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86D9C14.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86DAA94.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86DB908.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86DD11C.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86DE6C0.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86DFCA4.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86E0D98.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86E1CF8.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86E3358.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86E48B4.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86E5440.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86E89E4.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86EAD00.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86EE3CC.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86EF71C.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86F0C2C.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86F204C.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86F30E8.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86F4144.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86FB0D8.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86FF65C.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/86FFDC0.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/8701A10.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/8703214.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/8706DCC.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/8709004.aif Normal file
View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More