dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dump_trainer_ai_scripts

Browse Source
This commit is contained in:
DizzyEggg
2017-12-30 12:20:16 +01:00
parent 5ae6461cc5 1496ea3a24
commit 9bad1921df
321 changed files with 23184 additions and 5907 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+2 -1
View File
@@ -84,9 +84,10 @@ tidy:
include graphics_file_rules.mk
%.s: ;
%.bin: ;
%.png: ;
%.pal: ;
%.aif: ;
%.1bpp: %.png ; $(GFX) $< $@
%.4bpp: %.png ; $(GFX) $< $@
%.8bpp: %.png ; $(GFX) $< $@
asm/battle_frontier_1.s
+1 -1
View File
@@ -14097,7 +14097,7 @@ sub_8196274: @ 8196274
_08196298:
movs r1, 0x4
ldrsh r0, [r4, r1]
ldr r1, =gUnknown_0860EF70
ldr r1, =gText_PokenavCallEllipsis
bl sub_81965D8
movs r0, 0x1
_081962A4:
asm/battle_frontier_2.s
+5 -5
View File
@@ -11329,7 +11329,7 @@ _081A03E6:
bls _081A03E6
movs r5, 0
ldr r7, =gSaveBlock2Ptr
ldr r6, =gUnknown_086109A4
ldr r6, =gUnknown_08610970+0x34
_081A0416:
ldr r0, [r7]
mov r12, r0
@@ -11490,7 +11490,7 @@ _081A0540:
mov r12, r1
adds r5, r3, 0
adds r5, 0xB0
ldr r0, =gUnknown_086109A4
ldr r0, =gUnknown_08610970+0x34
mov r8, r0
_081A0560:
adds r0, r3, 0
@@ -17495,7 +17495,7 @@ _081A38A8:
lsrs r3, r0, 24
movs r0, 0x58
muls r0, r3
ldr r1, =gUnknown_086109BA
ldr r1, =gUnknown_08610970+0x4A
_081A38C4:
adds r0, r1
bl ConvertBattleFrontierTrainerSpeechToString
@@ -17516,7 +17516,7 @@ _081A38D4:
lsrs r3, r0, 27
movs r0, 0x58
muls r0, r3
ldr r1, =gUnknown_086109BA
ldr r1, =gUnknown_08610970+0x4A
adds r0, r1
bl ConvertBattleFrontierTrainerSpeechToString
_081A38F8:
@@ -31102,7 +31102,7 @@ sub_81AA96C: @ 81AA96C
lsls r0, 24
lsrs r5, r0, 24
movs r3, 0
ldr r2, =gUnknown_08613655
ldr r2, =gUnknown_08613650+0x5
mov r12, r2
movs r7, 0x7
_081AA994:
asm/battle_transition.s
+45 -45
View File
@@ -148,7 +148,7 @@ Task_BattleTransitionMain: @ 8145FA8
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_085C8A98
ldr r5, =sMainTransitionPhases
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
@@ -180,7 +180,7 @@ sub_8145FE0: @ 8145FE0
ldr r1, =gPlttBufferUnfaded
ldr r2, =0x04000100
bl CpuSet
ldr r1, =gUnknown_085C8948
ldr r1, =sPhase1_Tasks
movs r2, 0xA
ldrsh r0, [r4, r2]
lsls r0, 2
@@ -210,7 +210,7 @@ _0814602A:
sub_8146030: @ 8146030
push {r4,lr}
adds r4, r0, 0
ldr r1, =gUnknown_085C8948
ldr r1, =sPhase1_Tasks
movs r2, 0xA
ldrsh r0, [r4, r2]
lsls r0, 2
@@ -239,7 +239,7 @@ _0814605C:
sub_8146064: @ 8146064
push {r4,lr}
adds r4, r0, 0
ldr r1, =gUnknown_085C89F0
ldr r1, =sPhase2_Tasks
movs r2, 0xA
ldrsh r0, [r4, r2]
lsls r0, 2
@@ -263,7 +263,7 @@ sub_814608C: @ 814608C
adds r4, r0, 0
movs r0, 0
strh r0, [r4, 0x26]
ldr r1, =gUnknown_085C89F0
ldr r1, =sPhase2_Tasks
movs r2, 0xA
ldrsh r0, [r4, r2]
lsls r0, 2
@@ -331,7 +331,7 @@ sub_814610C: @ 814610C
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_085C8AA8
ldr r5, =sPhase2_Transition_Blur_Funcs
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
@@ -458,7 +458,7 @@ sub_8146204: @ 8146204
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_085C8AB4
ldr r5, =sPhase2_Transition_Swirl_Funcs
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
@@ -629,7 +629,7 @@ sub_8146384: @ 8146384
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_085C8ABC
ldr r5, =sPhase2_Transition_Shuffle_Funcs
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
@@ -1069,10 +1069,10 @@ sub_814670C: @ 814670C
ldr r1, [sp, 0x4]
ldr r2, =0x01000400
bl CpuSet
ldr r0, =gUnknown_085BAED0
ldr r0, =sTeamAqua_Tileset
ldr r1, [sp, 0x8]
bl LZ77UnCompVram
ldr r0, =gUnknown_085BAEB0
ldr r0, =sEvilTeam_Palette
movs r1, 0xF0
movs r2, 0x20
bl LoadPalette
@@ -1105,10 +1105,10 @@ sub_8146760: @ 8146760
ldr r1, [sp, 0x4]
ldr r2, =0x01000400
bl CpuSet
ldr r0, =gUnknown_085BB4A4
ldr r0, =sTeamMagma_Tileset
ldr r1, [sp, 0x8]
bl LZ77UnCompVram
ldr r0, =gUnknown_085BAEB0
ldr r0, =sEvilTeam_Palette
movs r1, 0xF0
movs r2, 0x20
bl LoadPalette
@@ -1173,7 +1173,7 @@ sub_8146800: @ 8146800
ldr r2, =0x01000400
mov r0, sp
bl CpuSet
ldr r0, =gUnknown_085B9330
ldr r0, =sBigPokeball_Tileset
ldr r1, [sp, 0x8]
movs r2, 0xB0
lsls r2, 2
@@ -1204,7 +1204,7 @@ sub_8146854: @ 8146854
add r1, sp, 0xC
add r0, sp, 0x8
bl sub_8149F58
ldr r5, =gUnknown_085C9020
ldr r5, =sBigPokeball_Tilemap
movs r1, 0
ldr r0, [sp, 0x8]
mov r9, r0
@@ -1274,7 +1274,7 @@ sub_81468E4: @ 81468E4
add r1, sp, 0xC
add r0, sp, 0x8
bl sub_8149F58
ldr r0, =gUnknown_085BB248
ldr r0, =sTeamAqua_Tilemap
ldr r1, [sp, 0x8]
bl LZ77UnCompVram
ldr r0, =gUnknown_02038C28
@@ -1307,7 +1307,7 @@ sub_814692C: @ 814692C
add r1, sp, 0xC
add r0, sp, 0x8
bl sub_8149F58
ldr r0, =gUnknown_085BB930
ldr r0, =sTeamMagma_Tilemap
ldr r1, [sp, 0x8]
bl LZ77UnCompVram
ldr r0, =gUnknown_02038C28
@@ -2074,7 +2074,7 @@ sub_8146F94: @ 8146F94
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_085C8B7C
ldr r5, =sPhase2_Transition_PokeballsTrail_Funcs
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
@@ -2105,7 +2105,7 @@ sub_8146FCC: @ 8146FCC
add r0, sp, 0x4
add r1, sp, 0x8
bl sub_8149F58
ldr r0, =gUnknown_085B98B0
ldr r0, =sPokeballTrail_Tileset
ldr r1, [sp, 0x8]
movs r2, 0x20
bl CpuSet
@@ -2137,12 +2137,12 @@ sub_8147018: @ 8147018
push {r7}
sub sp, 0x10
adds r7, r0, 0
ldr r1, =gUnknown_085C8B88
ldr r1, =sUnknown_085C8B88
mov r0, sp
movs r2, 0x4
bl memcpy
add r4, sp, 0x4
ldr r1, =gUnknown_085C8B8C
ldr r1, =sUnknown_085C8B8C
adds r0, r4, 0
movs r2, 0xA
bl memcpy
@@ -2270,7 +2270,7 @@ sub_814713C: @ 814713C
push {r4-r6,lr}
sub sp, 0x4
adds r4, r0, 0
ldr r1, =gUnknown_085C8B96
ldr r1, =sUnknown_085C8B96
mov r0, sp
movs r2, 0x4
bl memcpy
@@ -2370,7 +2370,7 @@ sub_8147204: @ 8147204
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_085C8B9C
ldr r5, =sPhase2_Transition_Clockwise_BlackFade_Funcs
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
@@ -2997,7 +2997,7 @@ sub_8147718: @ 8147718
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_085C8BB8
ldr r5, =sPhase2_Transition_Ripple_Funcs
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
@@ -3214,7 +3214,7 @@ sub_81478EC: @ 81478EC
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_085C8BC0
ldr r5, =sPhase2_Transition_Wave_Funcs
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
@@ -3532,7 +3532,7 @@ sub_8147B84: @ 8147B84
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_085C8BCC
ldr r5, =sPhase2_Mugshot_Transition_Funcs
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
@@ -3608,15 +3608,15 @@ sub_8147C24: @ 8147C24
push {r7}
sub sp, 0x8
mov r8, r0
ldr r6, =gUnknown_085C94D0
ldr r6, =sMugshotsTilemap
add r1, sp, 0x4
mov r0, sp
bl sub_8149F58
ldr r0, =gUnknown_085B9AF0
ldr r0, =sUnknown_085B9AF0
ldr r1, [sp, 0x4]
movs r2, 0xF0
bl CpuSet
ldr r1, =gUnknown_085C8FDC
ldr r1, =sOpponentMugshotsPals
mov r2, r8
movs r3, 0x26
ldrsh r0, [r2, r3]
@@ -3626,7 +3626,7 @@ sub_8147C24: @ 8147C24
movs r1, 0xF0
movs r2, 0x20
bl LoadPalette
ldr r1, =gUnknown_085C8FF0
ldr r1, =sPlayerMugshotsPals
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
@@ -4318,13 +4318,13 @@ sub_8148218: @ 8148218
push {r5,r6}
sub sp, 0x4
adds r4, r0, 0
ldr r0, =gUnknown_085C8BF4
ldr r0, =sMugshotsTrainerPicIDsTable
movs r2, 0x26
ldrsh r1, [r4, r2]
mov r8, r1
add r0, r8
ldrb r0, [r0]
ldr r2, =gUnknown_085C8C0E
ldr r2, =sMugshotsOpponentCoords
lsls r1, 2
mov r8, r1
adds r1, r2
@@ -4439,7 +4439,7 @@ sub_8148218: @ 8148218
ldrb r0, [r5, 0x3]
lsls r0, 26
lsrs r0, 27
ldr r2, =gUnknown_085C8BFA
ldr r2, =sMugshotsOpponentRotationScales
mov r3, r8
adds r1, r3, r2
movs r4, 0
@@ -4473,7 +4473,7 @@ sub_8148218: @ 8148218
sub_8148380: @ 8148380
push {r4,r5,lr}
adds r4, r0, 0
ldr r5, =gUnknown_085C8C24
ldr r5, =sUnknown_085C8C24
_08148386:
movs r1, 0x2E
ldrsh r0, [r4, r1]
@@ -4502,12 +4502,12 @@ sub_81483AC: @ 81483AC
push {r4,r5,lr}
sub sp, 0x8
adds r5, r0, 0
ldr r1, =gUnknown_085C8C40
ldr r1, =sUnknown_085C8C40
mov r0, sp
movs r2, 0x4
bl memcpy
add r4, sp, 0x4
ldr r1, =gUnknown_085C8C44
ldr r1, =sUnknown_085C8C44
adds r0, r4, 0
movs r2, 0x4
bl memcpy
@@ -5855,7 +5855,7 @@ sub_8148E8C: @ 8148E8C
add r0, sp, 0x4
add r1, sp, 0x8
bl sub_8149F58
ldr r4, =gUnknown_085BACD0
ldr r4, =sShrinkingBoxTileset
ldr r1, [sp, 0x8]
adds r0, r4, 0
movs r2, 0x10
@@ -6401,7 +6401,7 @@ sub_81492B4: @ 81492B4
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
ldr r0, =gUnknown_085BF540
ldr r0, =gUnknown_085BF4A0+0xA0
movs r1, 0xF0
movs r2, 0x20
bl LoadPalette
@@ -6780,7 +6780,7 @@ sub_8149628: @ 8149628
push {r4-r6,lr}
sub sp, 0x10
adds r6, r0, 0
ldr r1, =gUnknown_085C8DA0
ldr r1, =sUnknown_085C8DA0
mov r0, sp
movs r2, 0x10
bl memcpy
@@ -7163,7 +7163,7 @@ sub_814995C: @ 814995C
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_085C8DB0
ldr r5, =sUnknown_085C8DB0
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
@@ -7194,7 +7194,7 @@ sub_8149994: @ 8149994
add r0, sp, 0x4
add r1, sp, 0x8
bl sub_8149F58
ldr r0, =gUnknown_085BACD0
ldr r0, =sShrinkingBoxTileset
ldr r1, [sp, 0x8]
movs r2, 0x10
bl CpuSet
@@ -7241,7 +7241,7 @@ sub_81499E8: @ 81499E8
movs r1, 0xC
ldrsh r0, [r4, r1]
lsls r0, 5
ldr r1, =gUnknown_085BACD0
ldr r1, =sShrinkingBoxTileset
adds r0, r1
ldr r1, [sp]
movs r2, 0x10
@@ -7294,7 +7294,7 @@ sub_8149A6C: @ 8149A6C
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_085C8DBC
ldr r5, =sPhase2_Transition_Shards_Funcs
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
@@ -7372,7 +7372,7 @@ sub_8149B08: @ 8149B08
ldr r0, =sTransitionStructPtr
ldr r0, [r0]
adds r0, 0x24
ldr r6, =gUnknown_085C8DD0
ldr r6, =sUnknown_085C8DD0
mov r2, r8
movs r3, 0xA
ldrsh r1, [r2, r3]
@@ -7571,7 +7571,7 @@ _08149CAC:
ldrh r0, [r2, 0x8]
adds r0, 0x1
strh r0, [r2, 0x8]
ldr r1, =gUnknown_085C8E16
ldr r1, =sUnknown_085C8E16
movs r3, 0xA
ldrsh r0, [r2, r3]
subs r0, 0x1
@@ -7738,7 +7738,7 @@ sub_8149DFC: @ 8149DFC
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_085C8E24
ldr r5, =sPhase1_TransitionAll_Funcs
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
asm/birch_pc.s
+234
View File
@@ -0,0 +1,234 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start ScriptGetPokedexInfo
ScriptGetPokedexInfo: @ 8137A4C
push {lr}
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0
bne _08137A70
movs r0, 0
bl sub_80C0844
ldr r1, =gSpecialVar_0x8005
strh r0, [r1]
movs r0, 0x1
bl sub_80C0844
b _08137A80
.pool
_08137A70:
movs r0, 0
bl pokedex_count
ldr r1, =gSpecialVar_0x8005
strh r0, [r1]
movs r0, 0x1
bl pokedex_count
_08137A80:
ldr r1, =gSpecialVar_0x8006
strh r0, [r1]
bl IsNationalPokedexEnabled
lsls r0, 16
lsrs r0, 16
pop {r1}
bx r1
.pool
thumb_func_end ScriptGetPokedexInfo
thumb_func_start GetPokedexRatingText
GetPokedexRatingText: @ 8137A98
push {lr}
lsls r0, 16
lsrs r0, 16
cmp r0, 0x9
bhi _08137AA4
b _08137BFC
_08137AA4:
cmp r0, 0x13
bhi _08137AB0
ldr r0, =gUnknown_082A5DAB
b _08137C06
.pool
_08137AB0:
cmp r0, 0x1D
bhi _08137ABC
ldr r0, =gUnknown_082A5DF1
b _08137C06
.pool
_08137ABC:
cmp r0, 0x27
bhi _08137AC8
ldr r0, =gUnknown_082A5E34
b _08137C06
.pool
_08137AC8:
cmp r0, 0x31
bhi _08137AD4
ldr r0, =gUnknown_082A5E83
b _08137C06
.pool
_08137AD4:
cmp r0, 0x3B
bhi _08137AE0
ldr r0, =gUnknown_082A5EB9
b _08137C06
.pool
_08137AE0:
cmp r0, 0x45
bhi _08137AEC
ldr r0, =gUnknown_082A5EF4
b _08137C06
.pool
_08137AEC:
cmp r0, 0x4F
bhi _08137AF8
ldr r0, =gUnknown_082A5F39
b _08137C06
.pool
_08137AF8:
cmp r0, 0x59
bhi _08137B04
ldr r0, =gUnknown_082A5F82
b _08137C06
.pool
_08137B04:
cmp r0, 0x63
bhi _08137B10
ldr r0, =gUnknown_082A5FB9
b _08137C06
.pool
_08137B10:
cmp r0, 0x6D
bhi _08137B1C
ldr r0, =gUnknown_082A6018
b _08137C06
.pool
_08137B1C:
cmp r0, 0x77
bhi _08137B28
ldr r0, =gUnknown_082A6061
b _08137C06
.pool
_08137B28:
cmp r0, 0x81
bhi _08137B34
ldr r0, =gUnknown_082A609C
b _08137C06
.pool
_08137B34:
cmp r0, 0x8B
bhi _08137B40
ldr r0, =gUnknown_082A60D5
b _08137C06
.pool
_08137B40:
cmp r0, 0x95
bhi _08137B4C
ldr r0, =gUnknown_082A6124
b _08137C06
.pool
_08137B4C:
cmp r0, 0x9F
bhi _08137B58
ldr r0, =gUnknown_082A616F
b _08137C06
.pool
_08137B58:
cmp r0, 0xA9
bhi _08137B64
ldr r0, =gUnknown_082A61D6
b _08137C06
.pool
_08137B64:
cmp r0, 0xB3
bhi _08137B70
ldr r0, =gUnknown_082A623A
b _08137C06
.pool
_08137B70:
cmp r0, 0xBD
bhi _08137B7C
ldr r0, =gUnknown_082A6287
b _08137C06
.pool
_08137B7C:
cmp r0, 0xC7
bls _08137BEA
cmp r0, 0xC8
bne _08137BB8
ldr r0, =0x00000199
bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
bl GetSetPokedexFlag
lsls r0, 24
cmp r0, 0
bne _08137BEA
movs r0, 0xCD
lsls r0, 1
bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
bl GetSetPokedexFlag
lsls r0, 24
cmp r0, 0
bne _08137BEA
b _08137C04
.pool
_08137BB8:
cmp r0, 0xC9
bne _08137BF8
ldr r0, =0x00000199
bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
bl GetSetPokedexFlag
lsls r0, 24
cmp r0, 0
beq _08137C04
movs r0, 0xCD
lsls r0, 1
bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
bl GetSetPokedexFlag
lsls r0, 24
cmp r0, 0
beq _08137C04
_08137BEA:
ldr r0, =gUnknown_082A62C9
b _08137C06
.pool
_08137BF8:
cmp r0, 0xCA
beq _08137C04
_08137BFC:
ldr r0, =gUnknown_082A5D6C
b _08137C06
.pool
_08137C04:
ldr r0, =gUnknown_082A6312
_08137C06:
pop {r1}
bx r1
.pool
thumb_func_end GetPokedexRatingText
thumb_func_start ShowPokedexRatingMessage
ShowPokedexRatingMessage: @ 8137C10
push {lr}
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
bl GetPokedexRatingText
bl ShowFieldMessage
pop {r0}
bx r0
.pool
thumb_func_end ShowPokedexRatingMessage
asm/contest.s
+7 -7
View File
@@ -6657,7 +6657,7 @@ sub_80DB0C4: @ 80DB0C4
lsls r1, 1
movs r2, 0x20
bl LoadCompressedPalette
ldr r0, =gUnknown_08587BE8
ldr r0, =gSpriteTemplate_8587BE8
movs r1, 0x70
movs r2, 0x24
movs r3, 0x1E
@@ -6692,7 +6692,7 @@ sub_80DB120: @ 80DB120
bl LoadCompressedObjectPic
ldr r0, =gUnknown_08587C10
bl LoadCompressedObjectPalette
ldr r0, =gUnknown_08587C18
ldr r0, =gSpriteTemplate_8587C18
movs r1, 0x60
movs r2, 0xA
movs r3, 0x1D
@@ -8946,7 +8946,7 @@ _080DC2C8:
ldrb r0, [r0]
adds r0, r5
ldrb r2, [r0]
ldr r0, =gUnknown_08587AD0
ldr r0, =gSpriteTemplate_8587AD0
movs r1, 0xB4
movs r3, 0x1
bl CreateSprite
@@ -9240,7 +9240,7 @@ _080DC506:
ldr r1, =gUnknown_08587AE8
adds r0, r1
bl LoadCompressedObjectPic
ldr r0, =gUnknown_08587B18
ldr r0, =gSpriteTemplate_8587B18
adds r0, r6, r0
ldr r2, =gUnknown_08587A70
ldr r1, =gUnknown_02039F26
@@ -9264,7 +9264,7 @@ _080DC506:
adds r0, r1
lsls r0, 2
add r0, r8
ldr r1, =gUnknown_08587B80
ldr r1, =gSubspriteTables_8587B80
bl SetSubspriteTables
ldr r0, [r7]
ldr r0, [r0, 0x14]
@@ -9298,7 +9298,7 @@ sub_80DC594: @ 80DC594
bl LoadCompressedObjectPic
ldr r0, =gUnknown_08587BB8
bl LoadSpritePalette
ldr r0, =gUnknown_08587BC8
ldr r0, =gSpriteTemplate_8587BC8
movs r1, 0x1E
movs r2, 0x2C
movs r3, 0x1
@@ -9877,7 +9877,7 @@ sub_80DC9EC: @ 80DC9EC
lsls r4, r2, 1
adds r4, r2
lsls r4, 3
ldr r0, =gUnknown_0858998C
ldr r0, =gSpriteTemplate_858998C
adds r4, r0
adds r0, r4, 0
movs r1, 0xB8
asm/contest_link_80F57C4.s
+3 -3
View File
@@ -2151,7 +2151,7 @@ sub_80F6AE8: @ 80F6AE8
movs r2, 0x80
movs r3, 0x1
bl RequestDma3Fill
ldr r0, =gUnknown_0858D8C8
ldr r0, =gSpriteTemplate_858D8C8
movs r1, 0x8
movs r2, 0x8
movs r3, 0
@@ -2454,7 +2454,7 @@ sub_80F6DC0: @ 80F6DC0
push {r4-r6,lr}
sub sp, 0x20
mov r1, sp
ldr r0, =gUnknown_0858D7F8
ldr r0, =gSpriteTemplate_858D7F8
ldm r0!, {r2-r4}
stm r1!, {r2-r4}
ldm r0!, {r2-r4}
@@ -3564,7 +3564,7 @@ sub_80F7670: @ 80F7670
ldrb r0, [r0, 0x7]
cmp r0, 0x27
bhi _080F7732
ldr r4, =gUnknown_0858D860
ldr r4, =gSpriteTemplate_858D860
bl Random
lsls r0, 16
lsrs r0, 16
asm/rom_81370FC.s → asm/field_specials.s
+195 -1575
View File
File diff suppressed because it is too large Load Diff
asm/fldeff_flash.s
+709
View File
@@ -0,0 +1,709 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start SetUpFieldMove_Flash
SetUpFieldMove_Flash: @ 81370FC
push {r4,lr}
bl ShouldDoBrailleFlyEffect
lsls r0, 24
cmp r0, 0
beq _08137134
ldr r4, =gSpecialVar_Result
bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
strh r0, [r4]
ldr r1, =gUnknown_03005DB0
ldr r0, =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r0, =sub_8179918
b _08137152
.pool
_08137134:
ldr r0, =gMapHeader
ldrb r0, [r0, 0x15]
cmp r0, 0x1
bne _08137170
ldr r0, =0x00000888
bl FlagGet
lsls r0, 24
cmp r0, 0
bne _08137170
ldr r1, =gUnknown_03005DB0
ldr r0, =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r0, =hm2_flash
_08137152:
str r0, [r1]
movs r0, 0x1
b _08137172
.pool
_08137170:
movs r0, 0
_08137172:
pop {r4}
pop {r1}
bx r1
thumb_func_end SetUpFieldMove_Flash
thumb_func_start hm2_flash
hm2_flash: @ 8137178
push {r4,lr}
bl oei_task_add
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl GetCursorSelectionMonId
ldr r1, =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r1
ldr r2, =sub_81371B4
lsrs r1, r2, 16
strh r1, [r0, 0x18]
strh r2, [r0, 0x1A]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end hm2_flash
thumb_func_start sub_81371B4
sub_81371B4: @ 81371B4
push {lr}
movs r0, 0xCF
bl PlaySE
ldr r0, =0x00000888
bl FlagSet
ldr r0, =EventScript_2926F8
bl ScriptContext1_SetupScript
pop {r0}
bx r0
.pool
thumb_func_end sub_81371B4
thumb_func_start sub_81371D4
sub_81371D4: @ 81371D4
push {lr}
bl RunTasks
bl AnimateSprites
bl BuildOamBuffer
bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_81371D4
thumb_func_start sub_81371EC
sub_81371EC: @ 81371EC
push {lr}
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_81371EC
thumb_func_start c2_change_map
c2_change_map: @ 8137200
push {r4,lr}
sub sp, 0x8
movs r0, 0
bl SetVBlankCallback
movs r0, 0
movs r1, 0
bl SetGpuReg
movs r0, 0xC
movs r1, 0
bl SetGpuReg
movs r0, 0xA
movs r1, 0
bl SetGpuReg
movs r0, 0x8
movs r1, 0
bl SetGpuReg
movs r0, 0x18
movs r1, 0
bl SetGpuReg
movs r0, 0x1A
movs r1, 0
bl SetGpuReg
movs r0, 0x14
movs r1, 0
bl SetGpuReg
movs r0, 0x16
movs r1, 0
bl SetGpuReg
movs r0, 0x10
movs r1, 0
bl SetGpuReg
movs r0, 0x12
movs r1, 0
bl SetGpuReg
mov r1, sp
movs r0, 0
strh r0, [r1]
ldr r1, =0x040000d4
mov r0, sp
str r0, [r1]
movs r0, 0xC0
lsls r0, 19
str r0, [r1, 0x4]
ldr r0, =0x8100c000
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
movs r4, 0
str r4, [sp, 0x4]
add r0, sp, 0x4
str r0, [r1]
movs r0, 0xE0
lsls r0, 19
str r0, [r1, 0x4]
ldr r0, =0x85000100
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
mov r0, sp
strh r4, [r0]
str r0, [r1]
ldr r0, =0x05000002
str r0, [r1, 0x4]
ldr r0, =0x810001ff
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
bl ResetPaletteFade
bl ResetTasks
bl ResetSpriteData
ldr r3, =0x04000208
ldrh r2, [r3]
strh r4, [r3]
ldr r4, =0x04000200
ldrh r0, [r4]
movs r1, 0x1
orrs r0, r1
strh r0, [r4]
strh r2, [r3]
ldr r0, =sub_81371EC
bl SetVBlankCallback
ldr r0, =sub_81371D4
bl SetMainCallback2
bl sub_8137304
lsls r0, 24
cmp r0, 0
bne _081372D2
ldr r0, =gMain
ldr r0, [r0, 0x8]
bl SetMainCallback2
_081372D2:
add sp, 0x8
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end c2_change_map
thumb_func_start sub_8137304
sub_8137304: @ 8137304
push {r4-r7,lr}
bl get_map_light_from_warp0
lsls r0, 24
lsrs r6, r0, 24
bl sav1_map_get_light_level
lsls r0, 24
lsrs r5, r0, 24
movs r3, 0
ldr r4, =gUnknown_085B27C8
ldrb r0, [r4]
cmp r0, 0
beq _08137358
adds r7, r4, 0
adds r0, r4, 0x4
mov r12, r0
_08137326:
lsls r2, r3, 3
adds r1, r2, r7
ldrb r0, [r1]
cmp r0, r6
bne _08137348
ldrb r0, [r1, 0x1]
cmp r0, r5
bne _08137348
mov r1, r12
adds r0, r2, r1
ldr r0, [r0]
bl _call_via_r0
movs r0, 0x1
b _0813735A
.pool
_08137348:
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
lsls r0, r3, 3
adds r0, r4
ldrb r0, [r0]
cmp r0, 0
bne _08137326
_08137358:
movs r0, 0
_0813735A:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_8137304
thumb_func_start sub_8137360
sub_8137360: @ 8137360
push {r4-r6,lr}
lsls r0, 24
lsls r1, 24
lsrs r5, r0, 24
lsrs r4, r1, 24
movs r3, 0
ldr r1, =gUnknown_085B27C8
ldrb r0, [r1]
cmp r0, 0
beq _081373A0
adds r6, r1, 0
_08137376:
lsls r0, r3, 3
adds r2, r0, r6
ldrb r0, [r2]
cmp r0, r5
bne _08137390
ldrb r0, [r2, 0x1]
cmp r0, r4
bne _08137390
ldrb r0, [r2, 0x2]
b _081373A2
.pool
_08137390:
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
lsls r0, r3, 3
adds r0, r1
ldrb r0, [r0]
cmp r0, 0
bne _08137376
_081373A0:
movs r0, 0
_081373A2:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_8137360
thumb_func_start fade_type_for_given_maplight_pair
fade_type_for_given_maplight_pair: @ 81373A8
push {r4-r6,lr}
lsls r0, 24
lsls r1, 24
lsrs r5, r0, 24
lsrs r4, r1, 24
movs r3, 0
ldr r1, =gUnknown_085B27C8
ldrb r0, [r1]
cmp r0, 0
beq _081373E8
adds r6, r1, 0
_081373BE:
lsls r0, r3, 3
adds r2, r0, r6
ldrb r0, [r2]
cmp r0, r5
bne _081373D8
ldrb r0, [r2, 0x1]
cmp r0, r4
bne _081373D8
ldrb r0, [r2, 0x3]
b _081373EA
.pool
_081373D8:
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
lsls r0, r3, 3
adds r0, r1
ldrb r0, [r0]
cmp r0, 0
bne _081373BE
_081373E8:
movs r0, 0
_081373EA:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end fade_type_for_given_maplight_pair
thumb_func_start sub_81373F0
sub_81373F0: @ 81373F0
push {lr}
ldr r0, =sub_8137404
movs r1, 0
bl CreateTask
pop {r0}
bx r0
.pool
thumb_func_end sub_81373F0
thumb_func_start sub_8137404
sub_8137404: @ 8137404
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r0, =sub_8137420
str r0, [r1]
bx lr
.pool
thumb_func_end sub_8137404
thumb_func_start sub_8137420
sub_8137420: @ 8137420
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0
movs r1, 0
bl SetGpuReg
ldr r0, =gCaveTransitionTiles
ldr r1, =0x0600c000
bl LZ77UnCompVram
ldr r0, =gCaveTransitionTilemap
ldr r1, =0x0600f800
bl LZ77UnCompVram
ldr r0, =gCaveTransitionPalette_White
movs r1, 0xE0
movs r2, 0x20
bl LoadPalette
ldr r0, =gUnknown_085B28A0
movs r1, 0xE0
movs r2, 0x10
bl LoadPalette
ldr r1, =0x00003e41
movs r0, 0x50
bl SetGpuReg
movs r0, 0x52
movs r1, 0
bl SetGpuReg
movs r0, 0x54
movs r1, 0
bl SetGpuReg
ldr r1, =0x00001f0c
movs r0, 0x8
bl SetGpuReg
movs r1, 0x8A
lsls r1, 5
movs r0, 0
bl SetGpuReg
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r1
ldr r1, =sub_81374C4
str r1, [r0]
movs r2, 0
movs r1, 0x10
strh r1, [r0, 0x8]
strh r2, [r0, 0xA]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_8137420
thumb_func_start sub_81374C4
sub_81374C4: @ 81374C4
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r5, r1, r2
ldrh r4, [r5, 0xA]
movs r0, 0x80
lsls r0, 5
adds r1, r4, r0
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
bl SetGpuReg
cmp r4, 0x10
bhi _081374F8
ldrh r0, [r5, 0xA]
adds r0, 0x1
strh r0, [r5, 0xA]
b _08137500
.pool
_081374F8:
movs r0, 0
strh r0, [r5, 0xC]
ldr r0, =sub_813750C
str r0, [r5]
_08137500:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81374C4
thumb_func_start sub_813750C
sub_813750C: @ 813750C
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r1, =0x00001010
movs r0, 0x52
bl SetGpuReg
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r4, r0, r1
ldrh r1, [r4, 0xC]
cmp r1, 0x7
bhi _08137554
adds r0, r1, 0x1
strh r0, [r4, 0xC]
lsls r1, 1
ldr r0, =gUnknown_085B28A0
adds r0, r1, r0
movs r2, 0x10
subs r2, r1
lsls r2, 16
lsrs r2, 16
movs r1, 0xE0
bl LoadPalette
b _08137566
.pool
_08137554:
ldr r0, =gCaveTransitionPalette_White
movs r1, 0
movs r2, 0x20
bl LoadPalette
ldr r0, =sub_8137574
str r0, [r4]
movs r0, 0x8
strh r0, [r4, 0xC]
_08137566:
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_813750C
thumb_func_start sub_8137574
sub_8137574: @ 8137574
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
ldrh r2, [r1, 0xC]
movs r3, 0xC
ldrsh r0, [r1, r3]
cmp r0, 0
beq _08137598
subs r0, r2, 0x1
strh r0, [r1, 0xC]
b _081375A0
.pool
_08137598:
ldr r0, =gMain
ldr r0, [r0, 0x8]
bl SetMainCallback2
_081375A0:
pop {r0}
bx r0
.pool
thumb_func_end sub_8137574
thumb_func_start sub_81375A8
sub_81375A8: @ 81375A8
push {lr}
ldr r0, =sub_81375BC
movs r1, 0
bl CreateTask
pop {r0}
bx r0
.pool
thumb_func_end sub_81375A8
thumb_func_start sub_81375BC
sub_81375BC: @ 81375BC
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r0, =sub_81375D8
str r0, [r1]
bx lr
.pool
thumb_func_end sub_81375BC
thumb_func_start sub_81375D8
sub_81375D8: @ 81375D8
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0
movs r1, 0
bl SetGpuReg
ldr r0, =gCaveTransitionTiles
ldr r1, =0x0600c000
bl LZ77UnCompVram
ldr r0, =gCaveTransitionTilemap
ldr r1, =0x0600f800
bl LZ77UnCompVram
movs r0, 0x50
movs r1, 0
bl SetGpuReg
movs r0, 0x52
movs r1, 0
bl SetGpuReg
movs r0, 0x54
movs r1, 0
bl SetGpuReg
ldr r1, =0x00001f0c
movs r0, 0x8
bl SetGpuReg
movs r1, 0x8A
lsls r1, 5
movs r0, 0
bl SetGpuReg
ldr r0, =gCaveTransitionPalette_White
movs r1, 0xE0
movs r2, 0x20
bl LoadPalette
ldr r0, =gCaveTransitionPalette_Black
movs r1, 0
movs r2, 0x20
bl LoadPalette
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r1
ldr r1, =sub_8137678
str r1, [r0]
movs r2, 0
movs r1, 0x10
strh r1, [r0, 0x8]
strh r2, [r0, 0xA]
strh r2, [r0, 0xC]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81375D8
thumb_func_start sub_8137678
sub_8137678: @ 8137678
push {r4,lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r4, r1, r2
ldrh r1, [r4, 0xC]
cmp r1, 0xF
bhi _081376B4
adds r2, r1, 0x1
adds r0, r2, 0x1
strh r0, [r4, 0xC]
movs r0, 0xF
subs r0, r1
lsls r0, 1
ldr r1, =gUnknown_085B2890
adds r0, r1
lsls r2, 17
lsrs r2, 16
movs r1, 0xE0
bl LoadPalette
b _081376C8
.pool
_081376B4:
ldr r1, =0x00001010
movs r0, 0x52
bl SetGpuReg
ldr r1, =0x00003e41
movs r0, 0x50
bl SetGpuReg
ldr r0, =sub_81376DC
str r0, [r4]
_081376C8:
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_8137678
thumb_func_start sub_81376DC
sub_81376DC: @ 81376DC
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r5, r1, r2
ldrh r0, [r5, 0xA]
movs r1, 0x10
subs r1, r0
lsls r1, 16
lsrs r4, r1, 16
movs r0, 0x80
lsls r0, 21
adds r1, r0
lsrs r1, 16
movs r0, 0x52
bl SetGpuReg
cmp r4, 0
beq _08137714
ldrh r0, [r5, 0xA]
adds r0, 0x1
strh r0, [r5, 0xA]
b _08137726
.pool
_08137714:
ldr r0, =gCaveTransitionPalette_Black
movs r1, 0
movs r2, 0x20
bl LoadPalette
ldr r0, =gMain
ldr r0, [r0, 0x8]
bl SetMainCallback2
_08137726:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81376DC
asm/hof_pc.s
+73
View File
@@ -0,0 +1,73 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start AccessHallOfFamePC
AccessHallOfFamePC: @ 8137C28
push {lr}
ldr r0, =CB2_DoHallOfFamePC
bl SetMainCallback2
bl ScriptContext2_Enable
pop {r0}
bx r0
.pool
thumb_func_end AccessHallOfFamePC
thumb_func_start ReturnFromHallOfFamePC
ReturnFromHallOfFamePC: @ 8137C3C
push {lr}
ldr r0, =c2_exit_to_overworld_2_switch
bl SetMainCallback2
ldr r1, =gFieldCallback
ldr r0, =ReshowPCMenuAfterHallOfFamePC
str r0, [r1]
pop {r0}
bx r0
.pool
thumb_func_end ReturnFromHallOfFamePC
thumb_func_start ReshowPCMenuAfterHallOfFamePC
ReshowPCMenuAfterHallOfFamePC: @ 8137C5C
push {lr}
sub sp, 0x4
bl ScriptContext2_Enable
bl Overworld_PlaySpecialMapMusic
bl sp109_CreatePCMenu
bl sub_80E2514
movs r0, 0x1
negs r0, r0
movs r1, 0
str r1, [sp]
movs r2, 0x10
movs r3, 0
bl BeginNormalPaletteFade
ldr r0, =Task_WaitForPaletteFade
movs r1, 0xA
bl CreateTask
add sp, 0x4
pop {r0}
bx r0
.pool
thumb_func_end ReshowPCMenuAfterHallOfFamePC
thumb_func_start Task_WaitForPaletteFade
Task_WaitForPaletteFade: @ 8137C94
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _08137CAC
adds r0, r2, 0
bl DestroyTask
_08137CAC:
pop {r0}
bx r0
.pool
thumb_func_end Task_WaitForPaletteFade
asm/landmark.s
-128
View File
@@ -1,128 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_8145CF4
sub_8145CF4: @ 8145CF4
push {r4-r6,lr}
lsls r0, 24
lsrs r0, 24
lsls r1, 24
lsrs r1, 24
lsls r2, 24
lsrs r5, r2, 24
bl sub_8145D48
adds r4, r0, 0
cmp r4, 0
bne _08145D10
_08145D0C:
movs r0, 0
b _08145D42
_08145D10:
ldr r6, =0x0000ffff
b _08145D26
.pool
_08145D18:
subs r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
_08145D1E:
adds r4, 0x4
ldr r0, [r4]
cmp r0, 0
beq _08145D0C
_08145D26:
ldr r1, [r4]
ldrh r0, [r1, 0x4]
cmp r0, r6
beq _08145D3A
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _08145D1E
_08145D3A:
cmp r5, 0
bne _08145D18
ldr r0, [r4]
ldr r0, [r0]
_08145D42:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_8145CF4
thumb_func_start sub_8145D48
sub_8145D48: @ 8145D48
push {r4-r6,lr}
lsls r0, 24
lsrs r3, r0, 24
lsls r1, 24
lsrs r6, r1, 24
movs r2, 0
ldr r0, =gUnknown_085B91B8
ldrb r1, [r0]
adds r4, r0, 0
cmp r1, 0xD5
beq _08145DB8
adds r1, r4, 0
_08145D60:
lsls r0, r2, 3
adds r0, r1
ldrb r0, [r0]
cmp r0, r3
bhi _08145DB8
cmp r0, r3
beq _08145D7E
adds r0, r2, 0x1
lsls r0, 16
lsrs r2, r0, 16
lsls r0, r2, 3
adds r0, r1
ldrb r0, [r0]
cmp r0, 0xD5
bne _08145D60
_08145D7E:
lsls r0, r2, 3
adds r0, r1
ldrb r0, [r0]
cmp r0, 0xD5
bne _08145D98
b _08145DB8
.pool
_08145D90:
adds r0, r4, 0x4
adds r0, r1, r0
ldr r0, [r0]
b _08145DBA
_08145D98:
cmp r0, r3
bne _08145DB8
ldr r5, =gUnknown_085B91B8
_08145D9E:
lsls r1, r2, 3
adds r0, r1, r5
ldrb r0, [r0, 0x1]
cmp r0, r6
beq _08145D90
adds r0, r2, 0x1
lsls r0, 16
lsrs r2, r0, 16
lsls r0, r2, 3
adds r0, r4
ldrb r0, [r0]
cmp r0, r3
beq _08145D9E
_08145DB8:
movs r0, 0
_08145DBA:
pop {r4-r6}
pop {r1}
bx r1
.pool
thumb_func_end sub_8145D48
.align 2, 0 @ Don't pad with nop.
asm/macros.inc
+4 -3
View File
@@ -65,7 +65,7 @@
.byte 3, 4, \slot, \slot, \slot
.endm
.macro sprite_oam x, y, priority, tile_num_offset, size
.macro subsprite x, y, priority, tile_num_offset, size
.byte \x
.byte \y
.2byte ((\priority) << 14) | ((\tile_num_offset) << 4) | SPRITE_SIZE_\size
@@ -114,7 +114,8 @@
.4byte 0 @ padding
.endm
.macro obj_rot_scal_anim_end
.macro obj_rot_scal_anim_end unknown=0
.2byte 0x7fff
.fill 6 @ padding
.2byte \unknown
.fill 4 @ padding
.endm
asm/overworld.s
+4 -4
View File
@@ -130,7 +130,7 @@ sub_8084788: @ 8084788
ldr r0, =0x0000088c
bl FlagClear
bl sub_8085B2C
bl wild_pokemon_reroll
bl ResetCyclingRoadChallengeData
bl UpdateLocationHistoryForRoamer
bl RoamerMoveToOtherLocationSet
pop {r0}
@@ -1377,7 +1377,7 @@ _080850C8:
bl CopyFieldObjectTemplatesToSav1
bl TrySetMapSaveWarpStatus
bl ClearTempFieldEventData
bl wild_pokemon_reroll
bl ResetCyclingRoadChallengeData
bl prev_quest_postbuffer_cursor_backup_reset
adds r0, r6, 0
adds r1, r5, 0
@@ -1465,7 +1465,7 @@ _080851A2:
bl sub_80EB218
bl TrySetMapSaveWarpStatus
bl ClearTempFieldEventData
bl wild_pokemon_reroll
bl ResetCyclingRoadChallengeData
bl prev_quest_postbuffer_cursor_backup_reset
ldr r0, =gSaveBlock1Ptr
ldr r1, [r0]
@@ -2668,7 +2668,7 @@ sub_8085B2C: @ 8085B2C
lsls r0, 6
cmp r1, r0
bne _08085B5C
bl sub_813793C
bl IsMirageIslandPresent
lsls r0, 24
cmp r0, 0
bne _08085B5C
asm/pokedex.s
+14 -14
View File
@@ -2028,7 +2028,7 @@ _080BC56E:
bl SetGpuReg
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_0855D298
ldr r1, =gBgTemplates_0855D298
movs r0, 0
movs r2, 0x4
bl InitBgsFromTemplates
@@ -2119,7 +2119,7 @@ _080BC682:
lsls r0, 31
lsrs r0, 31
bl sub_80BC844
ldr r0, =gUnknown_0855D2A8
ldr r0, =sWindowTemplates_0855D2A8
bl InitWindows
bl DeactivateAllTextPrinters
movs r0, 0
@@ -2141,9 +2141,9 @@ _080BC6CC:
ldr r1, =gReservedSpritePaletteCount
movs r0, 0x8
strb r0, [r1]
ldr r0, =gUnknown_0855D26C
ldr r0, =gSpriteSheets_0855D26C
bl LoadCompressedObjectPic
ldr r0, =gUnknown_0855D27C
ldr r0, =gSpritePalettes_0855D26C
bl LoadSpritePalettes
adds r0, r5, 0
bl sub_80BDB7C
@@ -2298,7 +2298,7 @@ _080BC858:
bl IsNationalPokedexEnabled
cmp r0, 0
bne _080BC870
ldr r0, =gUnknown_08DC16F6
ldr r0, =gUnknown_08DC16F4 + 2
_080BC862:
movs r1, 0x1
movs r2, 0xBE
@@ -2609,7 +2609,7 @@ _080BCACC:
movs r7, 0x1
mov r9, r7
_080BCADA:
ldr r1, =gUnknown_0855C6A4
ldr r1, =gPokedexOrder_Alphabetical
lsls r4, 16
asrs r0, r4, 15
adds r0, r1
@@ -2687,7 +2687,7 @@ _080BCB78:
ldr r7, =gUnknown_02039B4C
ldr r6, =0x0000060c
_080BCB82:
ldr r1, =gUnknown_0855C9DA
ldr r1, =gPokedexOrder_Weight
asrs r0, 15
adds r0, r1
ldrh r0, [r0]
@@ -2752,7 +2752,7 @@ _080BCC08:
ldr r0, =0x00000181
mov r9, r0
_080BCC16:
ldr r1, =gUnknown_0855C9DA
ldr r1, =gPokedexOrder_Weight
lsls r4, 16
asrs r0, r4, 15
adds r0, r1
@@ -2819,7 +2819,7 @@ _080BCCA0:
ldr r7, =gUnknown_02039B4C
ldr r6, =0x0000060c
_080BCCAA:
ldr r1, =gUnknown_0855CCDE
ldr r1, =gPokedexOrder_Height
asrs r0, 15
adds r0, r1
ldrh r0, [r0]
@@ -2884,7 +2884,7 @@ _080BCD30:
ldr r0, =0x00000181
mov r9, r0
_080BCD3E:
ldr r1, =gUnknown_0855CCDE
ldr r1, =gPokedexOrder_Height
lsls r4, 16
asrs r0, r4, 15
adds r0, r1
@@ -3517,7 +3517,7 @@ sub_80BD23C: @ 80BD23C
b _080BD266
.pool
_080BD264:
ldr r4, =gUnknown_0855D2FE
ldr r4, =sText_TenDashes
_080BD266:
str r5, [sp]
movs r0, 0
@@ -8751,7 +8751,7 @@ _080C00E8:
ands r1, r0
cmp r1, 0
beq _080C0114
ldr r0, =gUnknown_08DC16F6
ldr r0, =gUnknown_08DC16F4 + 2
movs r1, 0x31
movs r2, 0xE
bl LoadPalette
@@ -11172,9 +11172,9 @@ _080C13F0:
b _080C1516
.pool
_080C1414:
ldr r0, =gUnknown_0855D26C
ldr r0, =gSpriteSheets_0855D26C
bl LoadCompressedObjectPic
ldr r0, =gUnknown_0855D27C
ldr r0, =gSpritePalettes_0855D26C
bl LoadSpritePalettes
adds r0, r4, 0
bl sub_80C2594
asm/pokedex_area_screen.s
+1 -1
View File
@@ -1831,7 +1831,7 @@ _0813D924:
lsls r6, 16
adds r1, r6
asrs r1, 16
ldr r0, =gUnknown_085B40FC
ldr r0, =gSpriteTemplate_85B40FC
movs r2, 0x8C
movs r3, 0
bl CreateSprite
asm/pokedex_cry_screen.s
+2 -2
View File
@@ -675,9 +675,9 @@ _08145884:
b _081458F8
.pool
_081458B0:
ldr r0, =gUnknown_085B8C80
ldr r0, =gCryMeterNeedleSpriteSheets
bl LoadSpriteSheets
ldr r0, =gUnknown_085B8C90
ldr r0, =gCryMeterNeedleSpritePalettes
bl LoadSpritePalettes
ldr r0, =gUnknown_085B8C68
ldrb r1, [r4, 0x4]
asm/pokemon_icon.s
+9 -9
View File
@@ -28,15 +28,15 @@ sub_80D2CC4: @ 80D2CC4
lsls r0, 24
lsrs r0, 24
mov r9, r0
ldr r0, =gUnknown_0857C570
ldr r0, =sMonIconOamData
str r0, [sp, 0x18]
adds r0, r4, 0
adds r2, r5, 0
bl GetMonIconPtr
str r0, [sp, 0x1C]
ldr r0, =gUnknown_0857C5B4
ldr r0, =sMonIconAnims
str r0, [sp, 0x20]
ldr r0, =gUnknown_0857C5E8
ldr r0, =sMonIconAffineAnims
str r0, [sp, 0x24]
str r6, [sp, 0x28]
ldr r0, =gMonIconPaletteIndices
@@ -102,13 +102,13 @@ sub_80D2D78: @ 80D2D78
lsls r6, 24
lsrs r6, 24
mov r3, sp
ldr r2, =gUnknown_0857C570
ldr r2, =sMonIconOamData
str r2, [sp]
movs r2, 0
str r2, [sp, 0x4]
ldr r2, =gUnknown_0857C5B4
ldr r2, =sMonIconAnims
str r2, [sp, 0x8]
ldr r2, =gUnknown_0857C5E8
ldr r2, =sMonIconAffineAnims
str r2, [sp, 0xC]
str r1, [sp, 0x10]
ldr r2, =gMonIconPaletteIndices
@@ -601,7 +601,7 @@ _080D3126:
strb r7, [r5]
b _080D31A4
_080D312A:
ldr r2, =gUnknown_0857C5F0
ldr r2, =sSpriteImageSizes
ldrb r1, [r4, 0x3]
lsrs r1, 6
lsls r1, 1
@@ -689,7 +689,7 @@ sub_80D31B4: @ 80D31B4
mov r8, r0
movs r0, 0
str r0, [sp, 0x30]
ldr r2, =gUnknown_0857C5F0
ldr r2, =sSpriteImageSizes
mov r0, r9
ldr r6, [r0]
ldrb r1, [r6, 0x3]
@@ -776,7 +776,7 @@ sub_80D328C: @ 80D328C
sub sp, 0x8
movs r1, 0
str r1, [sp]
ldr r3, =gUnknown_0857C5F0
ldr r3, =sSpriteImageSizes
ldrb r2, [r0, 0x3]
lsrs r2, 6
lsls r2, 1
asm/pokemon_storage_system.s
+5 -5
View File
@@ -1106,7 +1106,7 @@ sub_80C7958: @ 80C7958
ldrh r0, [r3]
adds r0, 0x1
strh r0, [r1]
ldr r0, =gUnknown_08571710
ldr r0, =sSpriteAnimTable_8571710
str r0, [sp, 0xC]
movs r4, 0
_080C7A10:
@@ -9124,7 +9124,7 @@ _080CBF80:
adds r1, r3
ldr r0, [r1]
ldr r2, [r0]
ldr r0, =gUnknown_0857291C
ldr r0, =gSpriteAffineAnimTable_857291C
str r0, [r2, 0x10]
ldr r0, [r1]
ldr r0, [r0]
@@ -21048,8 +21048,8 @@ _080D220C:
bx r1
thumb_func_end sub_80D214C
thumb_func_start sub_80D2218
sub_80D2218: @ 80D2218
thumb_func_start CheckFreePokemonStorageSpace
CheckFreePokemonStorageSpace: @ 80D2218
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -21095,7 +21095,7 @@ _080D2262:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_80D2218
thumb_func_end CheckFreePokemonStorageSpace
thumb_func_start sub_80D2270
sub_80D2270: @ 80D2270
asm/pokenav.s
+1 -1
View File
@@ -11813,7 +11813,7 @@ _081CCE34:
mov r1, r8
lsrs r0, r1, 24
lsrs r1, r7, 24
bl sub_8145CF4
bl GetLandmarkName
adds r1, r0, 0
cmp r1, 0
bne _081CCE08
asm/post_battle_event_funcs.s
+165
View File
@@ -0,0 +1,165 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start GameClear
GameClear: @ 8137734
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x1C
bl HealPlayerParty
ldr r4, =0x00000864
adds r0, r4, 0
bl FlagGet
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x1
bne _08137760
ldr r0, =gHasHallOfFameRecords
strb r1, [r0]
b _0813776C
.pool
_08137760:
ldr r1, =gHasHallOfFameRecords
movs r0, 0
strb r0, [r1]
adds r0, r4, 0
bl FlagSet
_0813776C:
movs r0, 0x1
bl GetGameStat
cmp r0, 0
bne _0813778E
ldr r0, =gSaveBlock2Ptr
ldr r2, [r0]
ldrh r1, [r2, 0xE]
lsls r1, 16
ldrb r0, [r2, 0x10]
lsls r0, 8
orrs r1, r0
ldrb r0, [r2, 0x11]
orrs r1, r0
movs r0, 0x1
bl sav12_xor_set
_0813778E:
bl sub_8076D48
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
cmp r0, 0
bne _081377AC
movs r0, 0x1
bl sub_8084F6C
b _081377B2
.pool
_081377AC:
movs r0, 0x2
bl sub_8084F6C
_081377B2:
movs r7, 0
movs r6, 0
add r0, sp, 0x18
mov r8, r0
mov r5, sp
_081377BC:
movs r0, 0x64
adds r1, r6, 0
muls r1, r0
ldr r0, =gPlayerParty
adds r4, r1, r0
movs r0, 0
strb r6, [r5]
strb r0, [r5, 0x1]
adds r0, r4, 0
movs r1, 0x5
bl GetMonData
cmp r0, 0
beq _0813780A
adds r0, r4, 0
movs r1, 0x6
bl GetMonData
cmp r0, 0
bne _0813780A
adds r0, r4, 0
movs r1, 0x43
bl GetMonData
cmp r0, 0
bne _0813780A
movs r0, 0x1
mov r1, r8
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x43
add r2, sp, 0x18
bl SetMonData
adds r0, r4, 0
bl GetRibbonCount
strb r0, [r5, 0x1]
movs r7, 0x1
_0813780A:
adds r5, 0x4
adds r6, 0x1
cmp r6, 0x5
ble _081377BC
cmp r7, 0x1
bne _0813785A
movs r0, 0x2A
bl IncrementGameStat
ldr r0, =0x0000089b
bl FlagSet
mov r3, sp
add r2, sp, 0x4
movs r6, 0x4
_08137828:
ldrb r1, [r3, 0x1]
ldrb r0, [r2, 0x1]
cmp r0, r1
bls _08137838
ldr r1, [sp]
ldr r0, [r2]
str r0, [sp]
str r1, [r2]
_08137838:
adds r2, 0x4
subs r6, 0x1
cmp r6, 0
bge _08137828
mov r0, sp
ldrb r0, [r0, 0x1]
cmp r0, 0x4
bls _0813785A
mov r0, sp
ldrb r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x43
bl sub_80EE4DC
_0813785A:
ldr r0, =CB2_DoHallOfFameScreen
bl SetMainCallback2
movs r0, 0
add sp, 0x1C
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r1}
bx r1
.pool
thumb_func_end GameClear
thumb_func_start sp0C8_whiteout_maybe
sp0C8_whiteout_maybe: @ 813787C
push {lr}
ldr r0, =CB2_WhiteOut
bl SetMainCallback2
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end sp0C8_whiteout_maybe
asm/rayquaza_scene.s
+3 -3
View File
@@ -1172,8 +1172,8 @@ _081D7082:
.pool
thumb_func_end sub_81D706C
thumb_func_start task_add_00_WIN0V_open_close_above_and_more
task_add_00_WIN0V_open_close_above_and_more: @ 81D7134
thumb_func_start sub_81D7134
sub_81D7134: @ 81D7134
push {r4-r7,lr}
sub sp, 0x8
lsls r0, 24
@@ -1264,7 +1264,7 @@ _081D71EE:
pop {r0}
bx r0
.pool
thumb_func_end task_add_00_WIN0V_open_close_above_and_more
thumb_func_end sub_81D7134
thumb_func_start sub_81D7228
sub_81D7228: @ 81D7228
asm/roulette.s
+15 -15
View File
@@ -459,7 +459,7 @@ _08140662:
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
ldr r1, =gUnknown_08DBCA14
ldr r1, =gRouletteWheelTiles
str r4, [sp]
movs r0, 0x2
movs r2, 0
@@ -3619,7 +3619,7 @@ _08142174:
cmp r3, 0x3
bls _08142144
movs r6, 0
ldr r0, =gUnknown_085B62E8
ldr r0, =gUnknown_085B62E4+0x4
add r0, r12
ldr r7, [r0]
ldr r4, =gUnknown_0203AB88
@@ -4985,7 +4985,7 @@ _08142D24:
lsls r1, r5, 1
adds r1, r5
lsls r1, 3
ldr r0, =gUnknown_085B75B0
ldr r0, =gSpriteTemplate_85B75B0
adds r0, r1, r0
adds r1, 0x94
adds r2, r4, 0
@@ -5035,7 +5035,7 @@ _08142D86:
lsls r1, r6, 1
adds r1, r6
lsls r1, 3
ldr r0, =gUnknown_085B7508
ldr r0, =gSpriteTemplate_85B7508
adds r0, r1, r0
adds r1, 0x94
lsls r1, 16
@@ -5070,7 +5070,7 @@ _08142DCC:
lsls r2, r6, 1
adds r2, r6
lsls r2, 3
ldr r0, =gUnknown_085B7568
ldr r0, =gSpriteTemplate_85B7568
adds r0, r2, r0
adds r2, 0x5C
lsls r2, 16
@@ -5278,7 +5278,7 @@ sub_8142F7C: @ 8142F7C
movs r0, 0x4
mov r8, r0
_08142F8C:
ldr r0, =gUnknown_085B7928
ldr r0, =gSpriteTemplate_85B7928
movs r1, 0x74
movs r2, 0x14
movs r3, 0xA
@@ -5600,7 +5600,7 @@ _08143216:
lsls r0, r1, 1
adds r0, r1
lsls r0, 3
ldr r1, =gUnknown_085B7610
ldr r1, =gSpriteTemplate_85B7610
adds r0, r1
movs r1, 0x28
mov r2, sp
@@ -5749,7 +5749,7 @@ _08143322:
lsrs r5, r0, 24
cmp r5, 0x4
bls _08143322
ldr r0, =gUnknown_085B77E4
ldr r0, =gSpriteTemplate_85B77E4
movs r1, 0xD0
movs r2, 0x10
movs r3, 0x4
@@ -6459,7 +6459,7 @@ sub_814391C: @ 814391C
str r0, [sp, 0x4]
mov r0, sp
bl LoadSpriteSheet
ldr r0, =gUnknown_085B7950
ldr r0, =gSpriteTemplate_85B7950
movs r1, 0x74
movs r2, 0x50
movs r3, 0x51
@@ -6530,7 +6530,7 @@ _081439D0:
subs r3, r4
lsls r3, 24
lsrs r3, 24
ldr r0, =gUnknown_085B7928
ldr r0, =gSpriteTemplate_85B7928
movs r1, 0x74
movs r2, 0x50
bl CreateSprite
@@ -8128,7 +8128,7 @@ sub_81446DC: @ 81446DC
lsrs r0, 16
mov r9, r0
ldr r5, =gUnknown_0203AB88
ldr r0, =gUnknown_085B79F8
ldr r0, =gSpriteTemplate_85B79F8
movs r2, 0xC
negs r2, r2
movs r1, 0x24
@@ -8137,7 +8137,7 @@ sub_81446DC: @ 81446DC
ldr r1, [r5]
adds r1, 0x73
strb r0, [r1]
ldr r4, =gUnknown_085B7ABC
ldr r4, =gSpriteTemplate_85B7ABC
mov r3, r8
movs r0, 0x2E
ldrsh r2, [r3, r0]
@@ -8353,7 +8353,7 @@ sub_81448B8: @ 81448B8
lsls r0, 16
lsrs r0, 16
mov r9, r0
ldr r0, =gUnknown_085B7A10
ldr r0, =gSpriteTemplate_85B7A10
movs r1, 0x2E
ldrsh r2, [r7, r1]
lsls r2, 2
@@ -8709,12 +8709,12 @@ _08144BAC:
mov r5, r10
cmp r5, r8
bcs _08144C18
ldr r1, =gUnknown_085B6160
ldr r1, =gUnknown_085B6154+0xC
mov r10, r1
_08144BBC:
ldr r3, [r4]
lsls r0, r6, 3
ldr r1, =gUnknown_085B62E8
ldr r1, =gUnknown_085B62E4+0x4
adds r0, r1
ldr r1, [r3, 0x8]
ldr r2, [r0]
asm/time_events.s
+225
View File
@@ -0,0 +1,225 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start GetMirageRnd
GetMirageRnd: @ 8137890
push {r4,lr}
ldr r0, =0x00004024
bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
ldr r0, =0x00004025
bl VarGet
lsls r0, 16
lsrs r0, 16
lsls r4, 16
orrs r4, r0
adds r0, r4, 0
pop {r4}
pop {r1}
bx r1
.pool
thumb_func_end GetMirageRnd
thumb_func_start SetMirageRnd
SetMirageRnd: @ 81378BC
push {r4,lr}
adds r4, r0, 0
ldr r0, =0x00004024
lsrs r1, r4, 16
bl VarSet
ldr r0, =0x00004025
lsls r4, 16
lsrs r4, 16
adds r1, r4, 0
bl VarSet
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end SetMirageRnd
thumb_func_start InitMirageRnd
InitMirageRnd: @ 81378E4
push {r4,lr}
bl Random
adds r4, r0, 0
bl Random
lsls r4, 16
lsls r0, 16
lsrs r0, 16
orrs r4, r0
adds r0, r4, 0
bl SetMirageRnd
pop {r4}
pop {r0}
bx r0
thumb_func_end InitMirageRnd
thumb_func_start UpdateMirageRnd
UpdateMirageRnd: @ 8137904
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
bl GetMirageRnd
adds r1, r0, 0
cmp r4, 0
beq _08137928
ldr r3, =0x41c64e6d
ldr r2, =0x00003039
_08137918:
adds r0, r1, 0
muls r0, r3
adds r1, r0, r2
subs r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
cmp r4, 0
bne _08137918
_08137928:
adds r0, r1, 0
bl SetMirageRnd
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end UpdateMirageRnd
thumb_func_start IsMirageIslandPresent
IsMirageIslandPresent: @ 813793C
push {r4-r6,lr}
bl GetMirageRnd
lsrs r6, r0, 16
movs r5, 0
_08137946:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
bl GetMonData
cmp r0, 0
beq _08137978
adds r0, r4, 0
movs r1, 0
bl GetMonData
ldr r1, =0x0000ffff
ands r1, r0
cmp r1, r6
bne _08137978
movs r0, 0x1
b _08137980
.pool
_08137978:
adds r5, 0x1
cmp r5, 0x5
ble _08137946
movs r0, 0
_08137980:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end IsMirageIslandPresent
thumb_func_start UpdateShoalTideFlag
UpdateShoalTideFlag: @ 8137988
push {lr}
bl get_map_light_from_warp0
lsls r0, 24
lsrs r0, 24
bl is_light_level_1_2_3_5_or_6
lsls r0, 24
cmp r0, 0
beq _081379CE
bl RtcCalcLocalTime
ldr r1, =gUnknown_085B2B44
ldr r0, =gLocalTime
ldrb r0, [r0, 0x2]
lsls r0, 24
asrs r0, 24
adds r0, r1
ldrb r0, [r0]
cmp r0, 0
beq _081379C8
ldr r0, =0x0000089a
bl FlagSet
b _081379CE
.pool
_081379C8:
ldr r0, =0x0000089a
bl FlagClear
_081379CE:
pop {r0}
bx r0
.pool
thumb_func_end UpdateShoalTideFlag
thumb_func_start Task_WaitWeather
Task_WaitWeather: @ 81379D8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl sub_80AC3BC
lsls r0, 24
cmp r0, 0
beq _081379F2
bl EnableBothScriptContexts
adds r0, r4, 0
bl DestroyTask
_081379F2:
pop {r4}
pop {r0}
bx r0
thumb_func_end Task_WaitWeather
thumb_func_start WaitWeather
WaitWeather: @ 81379F8
push {lr}
ldr r0, =Task_WaitWeather
movs r1, 0x50
bl CreateTask
pop {r0}
bx r0
.pool
thumb_func_end WaitWeather
thumb_func_start InitBirchState
InitBirchState: @ 8137A0C
push {lr}
ldr r0, =0x00004049
bl GetVarPointer
movs r1, 0
strh r1, [r0]
pop {r0}
bx r0
.pool
thumb_func_end InitBirchState
thumb_func_start UpdateBirchState
UpdateBirchState: @ 8137A20
push {r4,r5,lr}
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
ldr r0, =0x00004049
bl GetVarPointer
adds r5, r0, 0
ldrh r0, [r5]
adds r4, r0
strh r4, [r5]
ldrh r0, [r5]
movs r1, 0x7
bl __umodsi3
strh r0, [r5]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end UpdateBirchState
asm/trainer_card.s
+2 -2
View File
@@ -3082,7 +3082,7 @@ _080C4214:
movs r1, 0x60
movs r2, 0
movs r3, 0
bl sub_80A2BAC
bl TintPalette_CustomTone
b _080C424A
_080C422A:
adds r0, r4, r5
@@ -3094,7 +3094,7 @@ _080C422A:
lsls r1, 1
str r1, [sp]
movs r1, 0x60
bl sub_80A2BAC
bl TintPalette_CustomTone
b _080C424A
_080C4242:
adds r0, r4, r5
constants/species_constants.inc
+1
View File
@@ -384,3 +384,4 @@
.set SPECIES_JIRACHI, 0x199
.set SPECIES_DEOXYS, 0x19a
.set SPECIES_CHIMECHO, 0x19b
.set SPECIES_EGG, 0x19c
data/battle_anim_80A9C70.s
+80 -1
View File
@@ -3,7 +3,86 @@
.section .rodata
.incbin "baserom.gba", 0x53ede4, 0x14c
.align 2
gUnknown_0853EDE4:: @ 853EDE4
.2byte 0x0000, 0x0003, 0x0004, 0x0003, 0x0008, 0x0003, 0x000c, 0x0003, 0xfffe, 0x0000
.align 2
gUnknown_0853EDF8:: @ 853EDF8
.4byte gUnknown_0853EDE4
.align 2
gUnknown_0853EDFC:: @ 853EDFC
spr_template 0x2714, 0x2714, gUnknown_0852490C, gUnknown_0853EDF8, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC
spr_template 0x2714, 0x2714, gUnknown_0852490C, gUnknown_0853EDF8, NULL, gDummySpriteAffineAnimTable, sub_80A8A6C
.align 2
gUnknown_0853EE2C:: @ 853EE2C
.2byte 0x0000, 0x0003, 0xfffe, 0x0000
.align 2
gUnknown_0853EE34:: @ 853EE34
.4byte gUnknown_0853EE2C
.align 2
gUnknown_0853EE38:: @ 853EE38
spr_template 0x282b, 0x282b, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8E30
spr_template 0x282b, 0x282b, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8EE4
.align 2
gUnknown_0853EE68:: @ 853EE68
.2byte 0x0000, 0x0003, 0x0010, 0x0003, 0x0020, 0x0003, 0x0030, 0x0003, 0x0040, 0x0003, 0xffff, 0x0000
.align 2
gUnknown_0853EE80:: @ 853EE80
.4byte gUnknown_0853EE68
.align 2
gUnknown_0853EE84:: @ 853EE84
spr_template 0x2757, 0x2757, gUnknown_08524914, gUnknown_0853EE80, NULL, gDummySpriteAffineAnimTable, sub_80A8B64
spr_template 0x2743, 0x2743, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC
.align 2
gUnknown_0853EEB4:: @ 853EEB4
.2byte 0x0000, 0x0005, 0xfffe, 0x0000
.align 2
gUnknown_0853EEBC:: @ 853EEBC
.2byte 0x0000, 0x0005, 0xfffe, 0x0000
.align 2
gUnknown_0853EEC4:: @ 853EEC4
.2byte 0x0000, 0x0005, 0xfffe, 0x0000
.align 2
gUnknown_0853EECC:: @ 853EECC
.4byte gUnknown_0853EEB4
.4byte gUnknown_0853EEBC
.4byte gUnknown_0853EEC4
.align 2
gUnknown_0853EED8:: @ 853EED8
spr_template 0x2797, 0x2797, gUnknown_08524914, gUnknown_0853EECC, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC
.align 2
gUnknown_0853EEF0:: @ 853EEF0
.2byte 0x0000, 0x000f, 0xfffe, 0x0000
.align 2
gUnknown_0853EEF8:: @ 853EEF8
.4byte gUnknown_0853EEF0
.align 2
gUnknown_0853EEFC:: @ 853EEFC
.2byte 0x0060, 0x0060, 0x0000, 0x0000, 0x0002, 0x0002, 0x0100, 0x0000, 0x7ffe, 0x0001, 0x0000, 0x0000
.align 2
gUnknown_0853EF14:: @ 853EF14
.4byte gUnknown_0853EEFC
.align 2
gUnknown_0853EF18:: @ 853EF18
spr_template 0x2714, 0x2714, gUnknown_085249CC, gUnknown_0853EEF8, NULL, gUnknown_0853EF14, sub_80A8A6C
.align 2
gUnknown_0853EF30:: @ 853EF30
data/battle_anim_815A0D4.s
+284 -21
View File
@@ -164,64 +164,327 @@ gUnknown_085CE284:: @ 85CE284
.align 2
gUnknown_085CE288:: @ 85CE288
spr_template 0x27f5, 0x27f5, gUnknown_08524934, gUnknown_085CE284, NULL, gDummySpriteAffineAnimTable, sub_815ACD0
.align 2
gUnknown_085CE2A0:: @ 85CE2A0
.incbin "baserom.gba", 0x5ce2a0, 0xb0
.2byte 0xfff4, 0x0008, 0x0400, 0x0000, 0x0014, 0xffec, 0x0400, 0x0000, 0xfff8, 0x000c, 0x0400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085CE2C0:: @ 85CE2C0
.2byte 0x0000, 0x0008, 0xffff, 0x0000
.align 2
gUnknown_085CE2C8:: @ 85CE2C8
.4byte gUnknown_085CE2C0
.align 2
gUnknown_085CE2CC:: @ 85CE2CC
.2byte 0x0000, 0x0000, 0x2805, 0x0000, 0x0000, 0x0000, 0x0a0a, 0x0000, 0x0000, 0x0000, 0x0a0f, 0x0000, 0x0000, 0x0000, 0x2814, 0x0000
.2byte 0x7ffe, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085CE2F4:: @ 85CE2F4
.4byte gUnknown_085CE2CC
.align 2
gUnknown_085CE2F8:: @ 85CE2F8
spr_template 0x27f6, 0x27f6, gUnknown_085249DC, gUnknown_085CE2C8, NULL, gUnknown_085CE2F4, sub_815B27C
.align 2
gUnknown_085CE310:: @ 85CE310
.2byte 0x0000, 0x0003, 0x0010, 0x0003, 0x0020, 0x0003, 0x0030, 0x0003, 0x0020, 0x0043, 0x0010, 0x0043, 0x0000, 0x0043, 0xfffd, 0x0001
.2byte 0xffff, 0x0000
.align 2
gUnknown_085CE334:: @ 85CE334
.4byte gUnknown_085CE310
.align 2
gUnknown_085CE338:: @ 85CE338
spr_template 0x27fa, 0x27fa, gUnknown_08524914, gUnknown_085CE334, NULL, gDummySpriteAffineAnimTable, sub_80A77C8
.align 2
gUnknown_085CE350:: @ 85CE350
.incbin "baserom.gba", 0x5ce350, 0x38
.2byte 0xfff4, 0x0014, 0x0800, 0x0000, 0x000c, 0xffec, 0x0800, 0x0000, 0x7ffd, 0x0002, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085CE370:: @ 85CE370
spr_template 0x27f2, 0x27f2, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B394
.align 2
gUnknown_085CE388:: @ 85CE388
.incbin "baserom.gba", 0x5ce388, 0x18
spr_template 0x27f9, 0x27f9, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B49C
.align 2
gUnknown_085CE3A0:: @ 85CE3A0
.incbin "baserom.gba", 0x5ce3a0, 0x18
spr_template 0x27f9, 0x27f9, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B570
.align 2
gUnknown_085CE3B8:: @ 85CE3B8
.incbin "baserom.gba", 0x5ce3b8, 0x28
.2byte 0x0008, 0xfff8, 0x0c00, 0x0000, 0xfff0, 0x0010, 0x0c00, 0x0000, 0x0008, 0xfff8, 0x0c00, 0x0000, 0x7ffd, 0x0001, 0x0000, 0x0000
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085CE3E0:: @ 85CE3E0
.incbin "baserom.gba", 0x5ce3e0, 0x50
.2byte 0x0000, 0x0006, 0x1400, 0x0000, 0x0000, 0x0000, 0x1400, 0x0000, 0x0000, 0xffee, 0x0600, 0x0000, 0xffee, 0xffee, 0x0300, 0x0000
.2byte 0x0000, 0x0000, 0x0f00, 0x0000, 0x0004, 0x0004, 0x0d00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085CE418:: @ 85CE418
spr_template 0x27fc, 0x27fc, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B70C
.align 2
gUnknown_085CE430:: @ 85CE430
.incbin "baserom.gba", 0x5ce430, 0x30
.2byte 0x0000, 0x0006, 0x1400, 0x0000, 0x0000, 0x0000, 0x1400, 0x0000, 0x0007, 0xffe2, 0x0600, 0x0000, 0x0000, 0x0000, 0x1400, 0x0000
.2byte 0xfffe, 0x0003, 0x1400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085CE460:: @ 85CE460
.incbin "baserom.gba", 0x5ce460, 0x2c
.byte 0xe8, 0x18, 0xfc, 0x00
.align 2
gUnknown_085CE464:: @ 85CE464
.2byte 0x0000, 0x0006, 0x0004, 0x0006, 0xfffe, 0x0000
.align 2
gUnknown_085CE470:: @ 85CE470
.2byte 0x0008, 0x0006, 0xffff, 0x0000
.align 2
gUnknown_085CE478:: @ 85CE478
.2byte 0x000c, 0x0006, 0xffff, 0x0000
.align 2
gUnknown_085CE480:: @ 85CE480
.4byte gUnknown_085CE464
.4byte gUnknown_085CE470
.4byte gUnknown_085CE478
.align 2
gUnknown_085CE48C:: @ 85CE48C
.incbin "baserom.gba", 0x5ce48c, 0x18
spr_template 0x2801, 0x2801, gUnknown_0852490C, gUnknown_085CE480, NULL, gDummySpriteAffineAnimTable, sub_815BE04
.align 2
gUnknown_085CE4A4:: @ 85CE4A4
.incbin "baserom.gba", 0x5ce4a4, 0x4
.byte 0x78, 0x50, 0x28, 0x00
.align 2
gUnknown_085CE4A8:: @ 85CE4A8
.incbin "baserom.gba", 0x5ce4a8, 0x8
.2byte 0x0000, 0x0000, 0x0032, 0x0000
.align 2
gUnknown_085CE4B0:: @ 85CE4B0
.incbin "baserom.gba", 0x5ce4b0, 0x140
.2byte 0x0000, 0xfff1, 0x0700, 0x0000, 0x0000, 0x000f, 0x0700, 0x0000, 0x7ffd, 0x0002, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085CE4D0:: @ 85CE4D0
spr_template 0x2767, 0x2767, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815C400
.align 2
gUnknown_085CE4E8:: @ 85CE4E8
.2byte 0x0000, 0x0008, 0x0001, 0x0008, 0x0002, 0x0008, 0x0003, 0x0008, 0x0003, 0x0088, 0x0002, 0x0088, 0x0000, 0x0088, 0x0001, 0x0088
.2byte 0xfffe, 0x0000
.align 2
gUnknown_085CE50C:: @ 85CE50C
.2byte 0x0000, 0x0048, 0x0001, 0x0048, 0x0002, 0x0048, 0x0003, 0x0048, 0x0003, 0x00c8, 0x0002, 0x00c8, 0x0000, 0x00c8, 0x0001, 0x00c8
.2byte 0xfffe, 0x0000
.align 2
gUnknown_085CE530:: @ 85CE530
.2byte 0x0000, 0x0008, 0xffff, 0x0000
.align 2
gUnknown_085CE538:: @ 85CE538
.4byte gUnknown_085CE4E8
.4byte gUnknown_085CE50C
.4byte gUnknown_085CE530
.align 2
gUnknown_085CE544:: @ 85CE544
spr_template 0x27fe, 0x27fe, gUnknown_08524904, gUnknown_085CE538, NULL, gDummySpriteAffineAnimTable, sub_815C6B0
.align 2
gUnknown_085CE55C:: @ 85CE55C
.byte 0x0c, 0x18, 0x10, 0x16, 0x13, 0x13, 0x15, 0x10, 0x17, 0x0c, 0x16, 0x07, 0x13, 0x04, 0x10, 0x01, 0x0b, 0x00, 0x06, 0x01, 0x04, 0x04, 0x01, 0x07, 0x00, 0x0c, 0x02, 0x11, 0x04, 0x13, 0x08, 0x16
.align 2
gUnknown_085CE57C:: @ 85CE57C
.2byte 0x0000, 0x0005, 0x0004, 0x0009, 0x0008, 0x0005, 0xffff, 0x0000
.align 2
gUnknown_085CE58C:: @ 85CE58C
.4byte gUnknown_085CE57C
.align 2
gUnknown_085CE590:: @ 85CE590
spr_template 0x27ff, 0x27ff, gUnknown_0852490C, gUnknown_085CE58C, NULL, gDummySpriteAffineAnimTable, sub_815C95C
spr_template 0x2800, 0x2800, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CB88
spr_template 0x27f3, 0x27f3, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815CC94
spr_template 0x27fc, 0x27fc, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CDB4
.align 2
gUnknown_085CE5F0:: @ 85CE5F0
.incbin "baserom.gba", 0x5ce5f0, 0x15c
.2byte 0x0010, 0x0000, 0x0400, 0x0000, 0x0000, 0xfffd, 0x1000, 0x0000, 0x0004, 0x0000, 0x0400, 0x0000, 0x0000, 0x0000, 0x1800, 0x0000
.2byte 0xfffb, 0x0003, 0x1000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085CE620:: @ 85CE620
.2byte 0x0080, 0x0080, 0x0000, 0x0000, 0xfff8, 0xfff8, 0x0800, 0x0000, 0x0008, 0x0008, 0x0800, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085CE640:: @ 85CE640
.2byte 0x00c0, 0x00c0, 0x0000, 0x0000, 0x0008, 0x0008, 0x0800, 0x0000, 0xfff8, 0xfff8, 0x0800, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085CE660:: @ 85CE660
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0008, 0x0008, 0x0800, 0x0000, 0xfff8, 0xfff8, 0x0800, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085CE680:: @ 85CE680
.4byte gUnknown_085CE620
.4byte gUnknown_085CE640
.4byte gUnknown_085CE660
.align 2
gUnknown_085CE68C:: @ 85CE68C
spr_template 0x2802, 0x2802, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085CE680, sub_815D7B4
.align 2
gUnknown_085CE6A4:: @ 85CE6A4
.2byte 0x0080, 0x0080, 0x0000, 0x0000, 0xfffc, 0xfffa, 0x1000, 0x0000, 0x0004, 0x0006, 0x1000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085CE6C4:: @ 85CE6C4
.2byte 0x00c0, 0x00c0, 0x0000, 0x0000, 0x0004, 0x0006, 0x1000, 0x0000, 0xfffc, 0xfffa, 0x1000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085CE6E4:: @ 85CE6E4
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0004, 0x0006, 0x1000, 0x0000, 0xfffc, 0xfffa, 0x1000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085CE704:: @ 85CE704
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0008, 0x000a, 0x1e00, 0x0000, 0xfff8, 0xfff6, 0x1000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085CE724:: @ 85CE724
.4byte gUnknown_085CE6A4
.4byte gUnknown_085CE6C4
.4byte gUnknown_085CE6E4
.4byte gUnknown_085CE704
.align 2
gUnknown_085CE734:: @ 85CE734
spr_template 0x2802, 0x2802, gUnknown_085249D4, gDummySpriteAnimTable, NULL, gUnknown_085CE724, sub_815D870
.align 2
gUnknown_085CE74C:: @ 85CE74C
.incbin "baserom.gba", 0x5ce74c, 0x20
.2byte 0xfff0, 0x0010, 0x0600, 0x0000, 0x0010, 0xfff0, 0x0c00, 0x0000, 0xfff0, 0x0010, 0x0600, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085CE76C:: @ 85CE76C
.incbin "baserom.gba", 0x5ce76c, 0x18
spr_template 0x2803, 0x2803, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815DEBC
.align 2
gUnknown_085CE784:: @ 85CE784
.incbin "baserom.gba", 0x5ce784, 0x68
.byte 0x3c, 0x07, 0xbc, 0x16, 0x5b, 0x22, 0xdb, 0x2d, 0x5a, 0x3d, 0xfa, 0x48, 0x79, 0x54, 0x19, 0x64, 0x19, 0x5c, 0x19, 0x50, 0x19, 0x40, 0x19, 0x34, 0x1a, 0x28, 0x1a, 0x18, 0x1a, 0x0c, 0x1b, 0x00
.byte 0x3b, 0x00, 0xbb, 0x00, 0x3b, 0x01, 0x9b, 0x01, 0x1c, 0x02, 0x7c, 0x02, 0xfc, 0x02, 0x7d, 0x03
.align 2
gUnknown_085CE7B4:: @ 85CE7B4
.2byte 0x0000, 0x0003, 0x0010, 0x0003, 0xfffe, 0x0000
.align 2
gUnknown_085CE7C0:: @ 85CE7C0
.2byte 0x0020, 0x0003, 0x0030, 0x0003, 0xfffe, 0x0000
.align 2
gUnknown_085CE7CC:: @ 85CE7CC
.4byte gUnknown_085CE7B4
.4byte gUnknown_085CE7C0
.align 2
gUnknown_085CE7D4:: @ 85CE7D4
spr_template 0x2745, 0x2745, gUnknown_08524914, gUnknown_085CE7CC, NULL, gDummySpriteAffineAnimTable, sub_815E01C
.align 2
gUnknown_085CE7EC:: @ 85CE7EC
.incbin "baserom.gba", 0x5ce7ec, 0x60
spr_template 0x2808, 0x2808, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E404
spr_template 0x280c, 0x280c, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E444
.align 2
gUnknown_085CE81C:: @ 85CE81C
.2byte 0x0000, 0x0000, 0x18fc, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085CE82C:: @ 85CE82C
.2byte 0x0100, 0x0100, 0x00c0, 0x0000, 0x0000, 0x0000, 0x1804, 0x0000
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085CE844:: @ 85CE844
.4byte gUnknown_085CE81C
.4byte gUnknown_085CE82C
.align 2
gUnknown_085CE84C:: @ 85CE84C
.incbin "baserom.gba", 0x5ce84c, 0x30
spr_template 0x280e, 0x280e, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085CE844, SpriteCallbackDummy
spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E6D8
.align 2
gUnknown_085CE87C:: @ 85CE87C
.incbin "baserom.gba", 0x5ce87c, 0x14c
.2byte 0x0000, 0xfff0, 0x0600, 0x0000, 0x0000, 0x0010, 0x0600, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085CE894:: @ 85CE894
spr_template 0x280f, 0x280f, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E954
spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815EA14
spr_template 0x2812, 0x2812, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815EE84
spr_template 0x27f9, 0x27f9, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815F18C
spr_template 0x27f9, 0x27f9, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81061C4
spr_template 0x280a, 0x280a, gUnknown_0852491C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815F48C
spr_template 0x27f0, 0x27f0, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815FE80
.align 2
gUnknown_085CE93C:: @ 85CE93C
.2byte 0x0000, 0x0004, 0x0040, 0x0004, 0xffff, 0x0000
.align 2
gUnknown_085CE948:: @ 85CE948
.4byte gUnknown_085CE93C
.align 2
gUnknown_085CE94C:: @ 85CE94C
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x08fc, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085CE964:: @ 85CE964
.2byte 0xff00, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0804, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085CE97C:: @ 85CE97C
.4byte gUnknown_085CE94C
.4byte gUnknown_085CE964
.align 2
gUnknown_085CE984:: @ 85CE984
spr_template 0x2825, 0x2825, gUnknown_0852497C, gUnknown_085CE948, NULL, gUnknown_085CE97C, sub_8160338
.align 2
gUnknown_085CE99C:: @ 85CE99C
.2byte 0x0000, 0x0000, 0x40fc, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085CE9AC:: @ 85CE9AC
.4byte gUnknown_085CE99C
.align 2
gUnknown_085CE9B0:: @ 85CE9B0
spr_template 0x2826, 0x2826, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_085CE9AC, sub_81603A8
.align 2
gUnknown_085CE9C8:: @ 85CE9C8
.incbin "baserom.gba", 0x5ce9c8, 0x1e8
.2byte 0x0000, 0x0010, 0x0400, 0x0000, 0xfffe, 0x0000, 0x0800, 0x0000, 0x0000, 0x0004, 0x0400, 0x0000, 0x0000, 0x0000, 0x1800, 0x0000
.2byte 0x0001, 0xfffb, 0x1000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000, 0x03e0, 0x001f, 0x001c, 0x001a, 0x0018, 0x0000, 0x0000, 0x0000
.2byte 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x6318, 0x0000, 0x7fff
data/battle_frontier_1.s
+500 -31
View File
File diff suppressed because it is too large Load Diff
data/battle_frontier_2.s
+1604 -117
View File
File diff suppressed because it is too large Load Diff
data/battle_records.s
+37
View File
@@ -0,0 +1,37 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_085B3484:: @ 85B3484
.incbin "graphics/unknown/unknown_5B3484.4bpp"
.align 2
gUnknown_085B3544:: @ 85B3544
.incbin "graphics/unknown/unknown_5B3484.gbapal"
.align 2
gUnknown_085B3564:: @ 85B3564
.incbin "graphics/unknown/unknown_5B3564.bin"
.align 2
gUnknown_085B3D64:: @ 85B3D64
.4byte 0x000001f0, 0x000031e7
.align 2
gUnknown_085B3D6C:: @ 85B3D6C
window_template 0x00, 0x02, 0x01, 0x1a, 0x12, 0x0f, 0x0014
window_template_terminator
.align 2
gUnknown_085B3D7C:: @ 85B3D7C
window_template 0x00, 0x02, 0x01, 0x1a, 0x11, 0x0f, 0x0001
gUnknown_085B3D84:: @ 85B3D84
.string "-------$"
gUnknown_085B3D8C:: @ 85B3D8C
.string "----$"
data/battle_tent.s
+35 -6
View File
@@ -3,20 +3,49 @@
.section .rodata
.align 2
gUnknown_086160B4:: @ 86160B4
.incbin "baserom.gba", 0x6160b4, 0x20
.4byte sub_81B99D4
.4byte sub_81B9A28
.4byte sub_81B9A44
.4byte sub_81B9A60
.4byte sub_81B9A90
.4byte sub_81B9ABC
.4byte sub_81B9B00
.4byte sub_81B9B28
.align 2
gUnknown_086160D4:: @ 86160D4
.incbin "baserom.gba", 0x6160d4, 0x4
.4byte 0x00000008
.align 2
gUnknown_086160D8:: @ 86160D8
.incbin "baserom.gba", 0x6160d8, 0x1c
.4byte sub_81B9BA0
.4byte sub_81B9BF4
.4byte sub_81B9C10
.4byte sub_81B9C2C
.4byte sub_81B9C70
.4byte sub_81B9C98
.4byte sub_81B9CF0
.align 2
gUnknown_086160F4:: @ 86160F4
.incbin "baserom.gba", 0x6160f4, 0x4
.4byte 0x00000015
.align 2
gUnknown_086160F8:: @ 86160F8
.incbin "baserom.gba", 0x6160f8, 0x28
.4byte sub_81B9D28
.4byte sub_81B9D7C
.4byte sub_81B9D98
.4byte sub_81B9DB4
.4byte sub_81B9DF8
.4byte sub_81B9E20
.4byte sub_81B9E78
.4byte sub_81B9E88
.4byte sub_81BA040
.4byte sub_81B9EC0
.align 2
gUnknown_08616120:: @ 8616120
.incbin "baserom.gba", 0x616120, 0x4
.4byte 0x00000017
data/battle_tower.s
+644 -20
View File
@@ -20,34 +20,634 @@
.include "data/battle_frontier/battle_frontier_mons.inc"
gUnknown_085DCEDC:: @ 85DCEDC
.incbin "baserom.gba", 0x5dcedc, 0x1e
.byte 0x0e, 0x11, 0x03, 0x15, 0x17, 0x07, 0x0a, 0x19, 0x1a, 0x1b, 0x1d, 0x1e, 0x20, 0x26, 0x29, 0x09, 0x2b, 0x2d, 0x2e, 0x30, 0x32, 0x34, 0x04, 0x35, 0x3a, 0x05, 0x42, 0x44, 0x43, 0x00
gUnknown_085DCEFA:: @ 85DCEFA
.incbin "baserom.gba", 0x5dcefa, 0x14
.byte 0x0d, 0x10, 0x12, 0x0c, 0x13, 0x14, 0x1f, 0x27, 0x2a, 0x16, 0x2f, 0x31, 0x33, 0x36, 0x37, 0x38, 0x1c, 0x02, 0x45, 0x47
gUnknown_085DCF0E:: @ 85DCF0E
.incbin "baserom.gba", 0x5dcf0e, 0x1e
.byte 0x37, 0x36, 0x21, 0x0f, 0x27, 0x33, 0x2c, 0x42, 0x42, 0x1f, 0x27, 0x25, 0x30, 0x26, 0x19, 0x15, 0x23, 0x32, 0x38, 0x33, 0x33, 0x21, 0x42, 0x05, 0x31, 0x27, 0x41, 0x1f, 0x24, 0x37
gUnknown_085DCF2C:: @ 85DCF2C
.incbin "baserom.gba", 0x5dcf2c, 0x14
.byte 0x14, 0x35, 0x22, 0x28, 0x14, 0x2d, 0x2f, 0x0e, 0x12, 0x16, 0x39, 0x34, 0x34, 0x0e, 0x22, 0x34, 0x20, 0x14, 0x20, 0x2f
gUnknown_085DCF40:: @ 85DCF40
.incbin "baserom.gba", 0x5dcf40, 0x5c0
.byte 0x00, 0x0b, 0x01, 0x01, 0x02, 0x06, 0x03, 0x0d, 0x04, 0x0e, 0x05, 0x0f, 0x06, 0x10, 0x07, 0x11, 0x08, 0x03, 0x09, 0x12, 0x0a, 0x0c, 0x0b, 0x13, 0x0c, 0x14, 0x0d, 0x15, 0x0e, 0x17, 0x0f, 0x07
.byte 0x10, 0x0a, 0x11, 0x19, 0x12, 0x1a, 0x13, 0x1b, 0x14, 0x1d, 0x15, 0x1e, 0x16, 0x1f, 0x17, 0x20, 0x18, 0x21, 0x19, 0x22, 0x1a, 0x23, 0x1b, 0x24, 0x1c, 0x25, 0x1d, 0x26, 0x1e, 0x27, 0x1f, 0x28
.byte 0x20, 0x29, 0x21, 0x2a, 0x22, 0x09, 0x23, 0x16, 0x24, 0x2b, 0x25, 0x2c, 0x26, 0x2d, 0x27, 0x2e, 0x28, 0x2f, 0x29, 0x30, 0x2a, 0x31, 0x2b, 0x32, 0x2c, 0x33, 0x2d, 0x34, 0x2e, 0x04, 0x2f, 0x35
.byte 0x30, 0x36, 0x31, 0x37, 0x32, 0x38, 0x33, 0x1c, 0x34, 0x39, 0x35, 0x3a, 0x38, 0x05, 0x39, 0x3b, 0x3a, 0x3c, 0x3b, 0x3d, 0x3c, 0x3e, 0x3d, 0x3f, 0x3e, 0x40, 0x3f, 0x41, 0x40, 0x42, 0x41, 0x02
.byte 0x42, 0x44, 0x43, 0x45, 0x44, 0x46, 0x45, 0x08, 0x46, 0x18, 0x47, 0x47, 0x48, 0x43, 0x49, 0x00, 0x4a, 0x48, 0x4b, 0x49, 0x4c, 0x4a, 0x00, 0x00
.align 2
gUnknown_085DCFD8:: @ 85DCFD8
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244383
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2443E7
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244413
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24444B
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2444D6
.align 2
gUnknown_085DCFEC:: @ 85DCFEC
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2444EF
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244549
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24459B
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2445C5
.align 2
gUnknown_085DD000:: @ 85DD000
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2445E8
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244618
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244643
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24468F
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2446B4
.align 2
gUnknown_085DD014:: @ 85DD014
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2446E5
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24474D
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24479E
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24480C
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2448A7
.align 2
gUnknown_085DD028:: @ 85DD028
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2448CD
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2448F5
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244939
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244989
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2449E6
.align 2
gUnknown_085DD03C:: @ 85DD03C
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244A23
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244AA9
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244AD6
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244B52
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93
.align 2
gUnknown_085DD050:: @ 85DD050
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244BD2
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244C18
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244C6E
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244CD6
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244D07
.align 2
gUnknown_085DD064:: @ 85DD064
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244D36
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244D82
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244DC6
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244DFE
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244E5B
.align 2
gUnknown_085DD078:: @ 85DD078
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244E7E
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244ECA
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244EF4
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244F4F
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244F98
.align 2
gUnknown_085DD08C:: @ 85DD08C
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244FD3
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245013
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24503D
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245087
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2450C0
.align 2
gUnknown_085DD0A0:: @ 85DD0A0
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2450E6
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245196
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2451BD
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24522F
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24529A
.align 2
gUnknown_085DD0B4:: @ 85DD0B4
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2452EF
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2453B4
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245406
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245464
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2454A3
.align 2
gUnknown_085DD0C8:: @ 85DD0C8
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2454D6
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245535
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24555F
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2455EC
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245656
.align 2
gUnknown_085DD0DC:: @ 85DD0DC
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24568A
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2456F5
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245740
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2457D9
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24581F
.align 2
gUnknown_085DD0F0:: @ 85DD0F0
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245851
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24589C
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2458CE
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245923
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24597F
.align 2
gUnknown_085DD104:: @ 85DD104
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2459BE
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2459F7
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245A5F
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245AB4
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E
.align 2
gUnknown_085DD118:: @ 85DD118
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245B79
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245B91
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245BBD
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245C05
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245C2D
.align 2
gUnknown_085DD12C:: @ 85DD12C
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245C66
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245CAC
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245CE6
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245D07
.align 2
gUnknown_085DD140:: @ 85DD140
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245D4B
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245D60
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245D8D
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245DC7
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245DF0
.align 2
gUnknown_085DD154:: @ 85DD154
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245E20
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245E41
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245E78
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245EBD
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245EEC
.align 2
gUnknown_085DD168:: @ 85DD168
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245F2B
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245F58
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245F87
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245FC6
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246002
.align 2
gUnknown_085DD17C:: @ 85DD17C
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246020
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246051
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246082
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2460D5
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24610D
.align 2
gUnknown_085DD190:: @ 85DD190
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24614A
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24617D
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2461C7
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2461F5
.align 2
gUnknown_085DD1A4:: @ 85DD1A4
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24622A
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246244
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24626E
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2462AA
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2462E4
.align 2
gUnknown_085DD1B8:: @ 85DD1B8
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24631F
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24633C
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24636B
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2463C5
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2463FF
.align 2
gUnknown_085DD1CC:: @ 85DD1CC
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246449
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246478
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2464EE
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246529
.align 2
gUnknown_085DD1E0:: @ 85DD1E0
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246571
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24658C
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2465B5
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246605
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24662A
.align 2
gUnknown_085DD1F4:: @ 85DD1F4
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246662
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246686
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2466B4
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2466E6
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24670A
.align 2
gUnknown_085DD208:: @ 85DD208
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246741
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246760
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246791
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2467C4
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2467E6
.align 2
gUnknown_085DD21C:: @ 85DD21C
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2467FF
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246831
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246864
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2468A7
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE
.align 2
gUnknown_085DD230:: @ 85DD230
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24694B
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24697C
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2469B4
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2469F1
.align 2
gUnknown_085DD244:: @ 85DD244
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246A22
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246A4E
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246A85
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246AF7
.align 2
gUnknown_085DD258:: @ 85DD258
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246B2B
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246B3F
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246B6B
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246BB2
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9
.align 2
gUnknown_085DD26C:: @ 85DD26C
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246C22
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246C35
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246C6C
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246CB3
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246CE9
.align 2
gUnknown_085DD280:: @ 85DD280
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246D2D
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246D6A
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246D9E
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246DD3
.align 2
gUnknown_085DD294:: @ 85DD294
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246E1A
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246E39
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246E64
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246EB6
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246EEE
.align 2
gUnknown_085DD2A8:: @ 85DD2A8
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246F21
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246F4C
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246F7B
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246FCC
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247013
.align 2
gUnknown_085DD2BC:: @ 85DD2BC
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24705B
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2470B2
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2470FD
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24712A
.align 2
gUnknown_085DD2D0:: @ 85DD2D0
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24716C
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24718D
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2471C7
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2471FB
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247238
.align 2
gUnknown_085DD2E4:: @ 85DD2E4
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247268
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247291
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2472C7
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247313
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247348
.align 2
gUnknown_085DD2F8:: @ 85DD2F8
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24737A
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24738F
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2473C6
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2473FB
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247438
.align 2
gUnknown_085DD30C:: @ 85DD30C
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247470
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247484
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2474AF
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2474EC
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24751D
.align 2
gUnknown_085DD320:: @ 85DD32
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24754A
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24758B
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2475BC
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2475D5
.align 2
gUnknown_085DD334:: @ 85DD334
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24760D
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247629
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247655
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24769B
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED
.align 2
gUnknown_085DD348:: @ 85DD348
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247724
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247749
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24777A
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2477CE
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247807
.align 2
gUnknown_085DD35C:: @ 85DD35C
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247838
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247854
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247889
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2478DD
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24790D
.align 2
gUnknown_085DD370:: @ 85DD370
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247942
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24795F
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247991
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2479CE
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247A18
.align 2
gUnknown_085DD384:: @ 85DD384
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247A51
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247AA1
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247AE3
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247B16
.align 2
gUnknown_085DD398:: @ 85DD398
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247B3E
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247B62
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247B9B
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247BE7
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247C23
.align 2
gUnknown_085DD3AC:: @ 85DD3AC
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247C4E
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247C8C
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247CB2
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247D07
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E
.align 2
gUnknown_085DD3C0:: @ 85DD3C0
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247D97
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247DC7
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247DFE
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247E3E
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247E7E
.align 2
gUnknown_085DD3D4:: @ 85DD3D4
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247EA1
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247EE9
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247F3F
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247F6D
.align 2
gUnknown_085DD3E8:: @ 85DD3E8
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247FA3
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247FB7
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247FE9
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248031
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E
.align 2
gUnknown_085DD3FC:: @ 85DD3FC
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24808D
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2480DC
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248128
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248151
.align 2
gUnknown_085DD410:: @ 85DD410
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24818E
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2481A9
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2481E1
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248221
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24824F
.align 2
gUnknown_085DD424:: @ 85DD424
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248297
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2482B1
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2482DC
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248321
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24833D
.align 2
gUnknown_085DD438:: @ 85DD438
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248369
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24838D
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2483C1
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248401
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248431
.align 2
gUnknown_085DD44C:: @ 85DD44C
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248467
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248477
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2484AC
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2484E7
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248517
.align 2
gUnknown_085DD460:: @ 85DD460
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248553
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24856A
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24857D
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2485E5
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248614
.align 2
gUnknown_085DD474:: @ 85DD474
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24864E
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248661
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248671
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2486C6
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2486FF
.align 2
gUnknown_085DD488:: @ 85DD488
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248725
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248751
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248781
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2487C9
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2487F7
.align 2
gUnknown_085DD49C:: @ 85DD49C
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248829
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24885B
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248892
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2488D8
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248908
.align 2
gUnknown_085DD4B0:: @ 85DD4B0
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24894B
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24895F
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24896F
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2489BD
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2489E7
.align 2
gUnknown_085DD4C4:: @ 85DD4C4
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248A10
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248A72
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248AC0
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248AEB
.align 2
gUnknown_085DD4D8:: @ 85DD4D8
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248B22
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248B39
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248B4C
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248BB4
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248BEE
.align 2
gUnknown_085DD4EC:: @ 85DD4EC
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248C2E
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248C5B
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248C90
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248CCF
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248D04
.align 2
gUnknown_085DD500:: @ 85DD500
.incbin "baserom.gba", 0x5dd500, 0x190
.4byte 0x00000047, gUnknown_085DD118
.4byte 0x0000002b, gUnknown_085DD12C
.4byte 0x00000000, gUnknown_085DD140
.4byte 0x00000014, gUnknown_085DD154
.4byte 0x0000002d, gUnknown_085DD168
.4byte 0x00000013, gUnknown_085DD17C
.4byte 0x0000002f, gUnknown_085DD190
.4byte 0x00000043, gUnknown_085DD1A4
.4byte 0x00000026, gUnknown_085DD1B8
.4byte 0x00000015, gUnknown_085DD1CC
.4byte 0x0000000a, gUnknown_085DD1E0
.4byte 0x00000010, gUnknown_085DD1F4
.4byte 0x0000000c, gUnknown_085DD208
.4byte 0x00000042, gUnknown_085DD21C
.4byte 0x00000031, gUnknown_085DD230
.4byte 0x00000030, gUnknown_085DD244
.4byte 0x00000036, gUnknown_085DD258
.4byte 0x0000002e, gUnknown_085DD26C
.4byte 0x00000011, gUnknown_085DD280
.4byte 0x00000019, gUnknown_085DD294
.4byte 0x00000020, gUnknown_085DD2A8
.4byte 0x00000029, gUnknown_085DD2BC
.4byte 0x00000009, gUnknown_085DD2D0
.4byte 0x00000016, gUnknown_085DD2E4
.4byte 0x00000034, gUnknown_085DD2F8
.4byte 0x00000004, gUnknown_085DD30C
.4byte 0x00000035, gUnknown_085DD320
.4byte 0x00000037, gUnknown_085DD334
.4byte 0x0000001d, gUnknown_085DD348
.4byte 0x0000003a, gUnknown_085DD35C
.4byte 0x00000005, gUnknown_085DD370
.4byte 0x00000044, gUnknown_085DD384
.4byte 0x00000045, gUnknown_085DD398
.4byte 0x0000000d, gUnknown_085DD3AC
.4byte 0x0000000e, gUnknown_085DD3C0
.4byte 0x00000003, gUnknown_085DD3D4
.4byte 0x00000012, gUnknown_085DD3E8
.4byte 0x00000017, gUnknown_085DD3FC
.4byte 0x0000001a, gUnknown_085DD410
.4byte 0x0000001b, gUnknown_085DD424
.4byte 0x0000001c, gUnknown_085DD438
.4byte 0x0000001e, gUnknown_085DD44C
.4byte 0x0000001f, gUnknown_085DD460
.4byte 0x00000027, gUnknown_085DD474
.4byte 0x00000002, gUnknown_085DD488
.4byte 0x0000002a, gUnknown_085DD49C
.4byte 0x00000038, gUnknown_085DD4B0
.4byte 0x00000032, gUnknown_085DD4C4
.4byte 0x00000033, gUnknown_085DD4D8
.4byte 0x00000007, gUnknown_085DD4EC
.align 2
gUnknown_085DD690:: @ 85DD690
.incbin "baserom.gba", 0x5dd690, 0x40
.4byte gUnknown_085DCFD8
.4byte gUnknown_085DCFEC
.4byte gUnknown_085DD000
.4byte gUnknown_085DD014
.4byte gUnknown_085DD028
.4byte gUnknown_085DD03C
.4byte gUnknown_085DD050
.4byte gUnknown_085DD064
.4byte gUnknown_085DD078
.4byte gUnknown_085DD08C
.4byte gUnknown_085DD0A0
.4byte gUnknown_085DD0B4
.4byte gUnknown_085DD0C8
.4byte gUnknown_085DD0DC
.4byte gUnknown_085DD0F0
.4byte gUnknown_085DD104
gUnknown_085DD6D0:: @ 85DD6D0
.incbin "baserom.gba", 0x5dd6d0, 0x5
.byte 0x8f, 0x01, 0x1f, 0x2a, 0x02
gUnknown_085DD6D5:: @ 85DD6D5
.incbin "baserom.gba", 0x5dd6d5, 0x7
.byte 0x00, 0xfc, 0xfc, 0x00, 0x06, 0x00, 0x00
.align 1
gUnknown_085DD6DC:: @ 85DD6DC
.incbin "baserom.gba", 0x5dd6dc, 0x30
.2byte 0x0071, 0x005e, 0x0073, 0x00e8, 0x00e3, 0x2b1f, 0xfc08, 0x0000, 0x0600, 0x00fc, 0x005c, 0x014c, 0x00b6, 0x00d3, 0x0180, 0x2c1f
.2byte 0x0003, 0x00fc, 0xfc00, 0x0006, 0x0057, 0x00b6, 0x004c, 0x0151
@ 85DD70C
.include "data/battle_frontier/slateport_battle_tent_trainer_mons.inc"
@@ -76,32 +676,56 @@ gUnknown_085DD6DC:: @ 85DD6DC
@ 85DF69C
.include "data/battle_frontier/fallarbor_battle_tent_mons.inc"
.align 2
gUnknown_085DF96C:: @ 85DF96C
.incbin "baserom.gba", 0x5df96c, 0x40
.4byte sub_8161F94
.4byte sub_8162054
.4byte sub_81620F4
.4byte sub_81623F0
.4byte sub_81621C0
.4byte sub_816502C
.4byte sub_8164040
.4byte sub_8163914
.4byte nullsub_61
.4byte nullsub_116
.4byte sub_81642A0
.4byte sub_8164828
.4byte sub_8164B74
.4byte sub_8164DCC
.4byte sub_8164DE4
.4byte sub_8164E04
.align 2
gUnknown_085DF9AC:: @ 85DF9AC
.incbin "baserom.gba", 0x5df9ac, 0x20
.4byte 0x00000001, 0x00000002, 0x00004000, 0x00008000, 0x00010000, 0x00020000, 0x00040000, 0x00080000
.align 2
gUnknown_085DF9CC:: @ 85DF9CC
.incbin "baserom.gba", 0x5df9cc, 0x20
.4byte 0xfffffffe, 0xfffffffd, 0xffffbfff, 0xffff7fff, 0xfffeffff, 0xfffdffff, 0xfffbffff, 0xfff7ffff
gUnknown_085DF9EC:: @ 85DF9EC
.incbin "baserom.gba", 0x5df9ec, 0xa
.byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x08, 0x09, 0x0a, 0x0b, 0x0c
gUnknown_085DF9F6:: @ 85DF9F6
.incbin "baserom.gba", 0x5df9f6, 0x4
.byte 0x03, 0x04, 0x02, 0x02
.align 1
gUnknown_085DF9FA:: @ 85DF9FA
.incbin "baserom.gba", 0x5df9fa, 0x20
.2byte 0x0000, 0x0063, 0x0050, 0x0077, 0x0064, 0x008b, 0x0078, 0x009f, 0x008c, 0x00b3, 0x00a0, 0x00c7, 0x00b4, 0x00db, 0x00c8, 0x012b
.align 1
gUnknown_085DFA1A:: @ 85DFA1A
.incbin "baserom.gba", 0x5dfa1a, 0x28
.2byte 0x0064, 0x0077, 0x0078, 0x008b, 0x008c, 0x009f, 0x00a0, 0x00b3, 0x00b4, 0x00c7, 0x00c8, 0x00db, 0x00dc, 0x00ef, 0x00c8, 0x012b
.2byte 0x00b3, 0x008d, 0x00c8, 0x00b7
gUnknown_085DFA42:: @ 85DFA42
.incbin "baserom.gba", 0x5dfa42, 0x4
.byte 0x03, 0x04, 0x02, 0x02
.align 1
gUnknown_085DFA46:: @ 85DFA46
.incbin "baserom.gba", 0x5dfa46, 0xc
.2byte 0x0c3a, 0x0c3a, 0x0c01, 0x0a2a, 0x0607, 0x0c01
.align 1
gUnknown_085DFA52:: @ 85DFA52
.incbin "baserom.gba", 0x5dfa52, 0xe
.2byte 0x1039, 0x122e, 0x0c04, 0x0a3d, 0x0630, 0x0c04, 0x0000
data/battle_transition.s
+784
View File
@@ -0,0 +1,784 @@
.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
data/contest.s
+180 -32
View File
@@ -10,55 +10,143 @@ gUnknown_08587A6C:: @ 8587A6C
gUnknown_08587A70:: @ 8587A70
.byte 0x24, 0x4c, 0x74, 0x9c
.align 2
gUnknown_08587A74:: @ 8587A74
.incbin "baserom.gba", 0x587a74, 0x5c
obj_tiles gUnknown_08C19450, 0x0020, 0x4e20
gUnknown_08587AD0:: @ 8587AD0
.incbin "baserom.gba", 0x587ad0, 0x18
.align 2
gOamData_8587A7C:: @ 8587A7C
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.align 2
gSpriteAffineAnim_8587A84:: @ 8587A84
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_8587A94:: @ 8587A94
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
obj_rot_scal_anim_frame 0xFFF6, 0xFFF6, -20, 20
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_8587AAC:: @ 8587AAC
obj_rot_scal_anim_frame 0x38, 0x38, 0, 0
obj_rot_scal_anim_frame 0xA, 0xA, 20, 20
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnimTable_8587AC4:: @ 8587AC4
.4byte gSpriteAffineAnim_8587A84
.4byte gSpriteAffineAnim_8587A94
.4byte gSpriteAffineAnim_8587AAC
.align 2
gSpriteTemplate_8587AD0:: @ 8587AD0
spr_template 0x4e20, 0xabe0, gOamData_8587A7C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8587AC4, SpriteCallbackDummy
.align 2
gUnknown_08587AE8:: @ 8587AE8
.incbin "baserom.gba", 0x587ae8, 0x20
obj_tiles gContestNextTurnGfx, 0x0100, 0x4e22
obj_tiles gContestNextTurnGfx, 0x0100, 0x4e23
obj_tiles gContestNextTurnGfx, 0x0100, 0x4e24
obj_tiles gContestNextTurnGfx, 0x0100, 0x4e25
.align 2
gUnknown_08587B08:: @ 8587B08
.incbin "baserom.gba", 0x587b08, 0x10
obj_pal gContestPal, 0x4e22
gUnknown_08587B18:: @ 8587B18
.incbin "baserom.gba", 0x587b18, 0x68
.align 2
gOamData_8587B10:: @ 8587B10
.2byte 0x4000
.2byte 0x4000
.2byte 0x0000
gUnknown_08587B80:: @ 8587B80
.incbin "baserom.gba", 0x587b80, 0x30
.align 2
gSpriteTemplate_8587B18:: @ 8587B18
spr_template 0x4e22, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 0x4e23, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 0x4e24, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 0x4e25, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gSubspriteTable_8587B78:: @ 8587B78
subsprite -28, -4, 0, 0, 32x8
subsprite 4, -4, 0, 4, 32x8
.align 2
gSubspriteTables_8587B80:: @ 8587B80
.4byte 2, gSubspriteTable_8587B78
.align 2
gUnknown_08587B88:: @ 8587B88
obj_tiles gUnknown_08C19168, 0x0180, 0xabe1
.align 2
gOamData_8587B90:: @ 8587B90
.2byte 0x0000
.2byte 0x4000
.2byte 0x0000
.align 2
gSpriteTemplate_8587B98:: @ 8587B98
spr_template 0xabe1, 0xabe0, gOamData_8587B90, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08587BB0:: @ 8587BB0
.incbin "baserom.gba", 0x587bb0, 0x8
obj_tiles gContestApplauseGfx, 0x0400, 0xabe2
.align 2
gUnknown_08587BB8:: @ 8587BB8
.incbin "baserom.gba", 0x587bb8, 0x10
obj_pal gContestPal, 0xabe2
gUnknown_08587BC8:: @ 8587BC8
.incbin "baserom.gba", 0x587bc8, 0x20
.align 2
gOamData_8587BC0:: @ 8587BC0
.2byte 0x4000
.2byte 0xC000
.2byte 0x0000
gUnknown_08587BE8:: @ 8587BE8
.incbin "baserom.gba", 0x587be8, 0x18
.align 2
gSpriteTemplate_8587BC8:: @ 8587BC8
spr_template 0xabe2, 0xabe2, gOamData_8587BC0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gOamData_8587BE0:: @ 8587BE0
.2byte 0x0000
.2byte 0xC000
.2byte 0x2C00
.align 2
gSpriteTemplate_8587BE8:: @ 8587BE8
spr_template 0x4e21, 0x4e21, gOamData_8587BE0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08587C00:: @ 8587C00
.incbin "baserom.gba", 0x587c00, 0x8
obj_tiles gContestJudgeGfx, 0x0800, 0x4e21
.align 2
gUnknown_08587C08:: @ 8587C08
.incbin "baserom.gba", 0x587c08, 0x8
obj_tiles gContestJudgeSymbolsGfx, 0x0380, 0xabe0
.align 2
gUnknown_08587C10:: @ 8587C10
.incbin "baserom.gba", 0x587c10, 0x8
obj_pal gContest3Pal, 0xabe0
gUnknown_08587C18:: @ 8587C18
.incbin "baserom.gba", 0x587c18, 0x18
.align 2
gSpriteTemplate_8587C18:: @ 8587C18
spr_template 0xabe0, 0xabe0, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08587C30:: @ 8587C30
.incbin "baserom.gba", 0x587c30, 0x20
.incbin "graphics/unknown/unknown_587C30.gbapal"
@ 8587C50
.include "data/text/contest_text_pointers.inc"
@ 8587D5C
.align 2
gUnknown_08587D5C:: @ 8587D5C
.4byte gText_0827D5C1
.4byte gText_0827D5DC
.4byte gText_0827D600
@@ -73,6 +161,7 @@ gUnknown_08587C30:: @ 8587C30
.4byte gText_0827D706
.4byte gText_0827D71D
.align 2
gUnknown_08587D90:: @ 8587D90
.4byte gText_0827D743
.4byte gText_0827D764
@@ -107,6 +196,7 @@ gUnknown_08587D90:: @ 8587D90
.4byte gText_0827DB1F
.4byte gText_0827DB4E
.align 2
gUnknown_08587E10:: @ 8587E10
.4byte gText_827DB75
.4byte gText_827DBB0
@@ -171,6 +261,7 @@ gUnknown_08587E10:: @ 8587E10
.4byte gText_0827E6C4
.4byte gText_0827E7BA
.align 2
gUnknown_08587F08:: @ 8587F08
.4byte gText_0827E85F
.4byte gText_0827E868
@@ -178,6 +269,7 @@ gUnknown_08587F08:: @ 8587F08
.4byte gText_0827E878
.4byte gText_0827E882
.align 2
gUnknown_08587F1C:: @ 8587F1C
.4byte gText_0827E894
.4byte gText_0827E89E
@@ -186,33 +278,89 @@ gUnknown_08587F1C:: @ 8587F1C
.4byte gText_0827E8BF
.4byte gText_0827E8CA
.align 2
gUnknown_08587F34:: @ 8587F34
.incbin "baserom.gba", 0x587f34, 0x10
.4byte 0x00000580, 0x000015e9, 0x000005c2, 0x000031a3
.align 2
gUnknown_08587F44:: @ 8587F44
.incbin "baserom.gba", 0x587f44, 0x60
window_template 0x00, 0x12, 0x00, 0x0c, 0x02, 0x0f, 0x0200
window_template 0x00, 0x12, 0x05, 0x0c, 0x02, 0x0f, 0x0218
window_template 0x00, 0x12, 0x0a, 0x0c, 0x02, 0x0f, 0x0230
window_template 0x00, 0x12, 0x0f, 0x0c, 0x02, 0x0f, 0x0248
window_template 0x00, 0x01, 0x0f, 0x11, 0x04, 0x0f, 0x0260
window_template 0x00, 0x01, 0x1f, 0x09, 0x02, 0x0f, 0x02a4
window_template 0x00, 0x01, 0x21, 0x09, 0x02, 0x0f, 0x02b6
window_template 0x00, 0x01, 0x23, 0x09, 0x02, 0x0f, 0x02c8
window_template 0x00, 0x01, 0x25, 0x09, 0x02, 0x0f, 0x02da
window_template 0x00, 0x10, 0x1f, 0x01, 0x02, 0x0f, 0x02ec
window_template 0x00, 0x0b, 0x23, 0x12, 0x04, 0x0f, 0x02ee
window_template_terminator
.align 2
gUnknown_08587FA4:: @ 8587FA4
.incbin "baserom.gba", 0x587fa4, 0x100
.align 2
gUnknown_085880A4:: @ 85880A4
.incbin "baserom.gba", 0x5880a4, 0x1740
.align 2
gUnknown_085897E4:: @ 85897E4
.incbin "baserom.gba", 0x005897e4, 0xc0
.incbin "baserom.gba", 0x5897e4, 0xc0
gUnknown_085898A4:: @ 85898A4
.incbin "baserom.gba", 0x5898a4, 0x60
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02
.byte 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02
.align 2
gUnknown_08589904:: @ 8589904
.incbin "baserom.gba", 0x589904, 0x20
obj_tiles gBlankGfxCompressed, 0x1000, 0x80e8
obj_tiles gBlankGfxCompressed, 0x1000, 0x80e9
obj_tiles gBlankGfxCompressed, 0x1000, 0x80ea
obj_tiles gBlankGfxCompressed, 0x1000, 0x80eb
gUnknown_08589924:: @ 8589924
.incbin "baserom.gba", 0x589924, 0x68
.align 2
gUnknown_08589924:: @ 8589924 Yup this is super dangerous but that's how it is here
obj_pal gHeap + 0x1A0A4, 0x80e8
obj_pal gHeap + 0x1A0C4, 0x80e9
obj_pal gHeap + 0x1A0E4, 0x80ea
obj_pal gHeap + 0x1A104, 0x80eb
gUnknown_0858998C:: @ 858998C
.incbin "baserom.gba", 0x58998c, 0x60
.align 2
gOamData_8589944:: @ 8589944
.2byte 0x0700
.2byte 0xC000
.2byte 0x0000
.align 2
gSpriteAffineAnim_858994C:: @ 858994C
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_858995C:: @ 858995C
obj_rot_scal_anim_frame 0x3, 0x3, 0, 15
obj_rot_scal_anim_frame 0xFFFD, 0xFFFD, 0, 15
obj_rot_scal_anim_frame 0x3, 0x3, 0, 15
obj_rot_scal_anim_frame 0xFFFD, 0xFFFD, 0, 15
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnimTable_8589984:: @ 8589984
.4byte gSpriteAffineAnim_858994C
.4byte gSpriteAffineAnim_858995C
.align 2
gSpriteTemplate_858998C:: @ 858998C
spr_template 0x80e8, 0x80e8, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy
spr_template 0x80e9, 0x80e9, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy
spr_template 0x80ea, 0x80ea, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy
spr_template 0x80eb, 0x80eb, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy
.align 2
gUnknown_085899EC:: @ 85899EC
.incbin "baserom.gba", 0x5899ec, 0x1c
.2byte 0x0001, 0xffff, 0x0000, 0x0001, 0xffff, 0x00ff, 0x0001, 0xffff, 0x00ff, 0x0001, 0xff00, 0x00ff, 0x0001, 0x0000
data/contest_link_80F57C4.s
+61 -19
View File
@@ -1,46 +1,88 @@
@ the third big chunk of data
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
.align 2
gUnknown_0858D6B0:: @ 858D6B0
.incbin "baserom.gba", 0x58d6b0, 0x20
.incbin "graphics/unknown/unknown_58D6B0.gbapal"
.align 2
gUnknown_0858D6D0:: @ 858D6D0
.incbin "baserom.gba", 0x58d6d0, 0x128
.incbin "graphics/unknown/unknown_58D6D0.4bpp"
gUnknown_0858D7F8:: @ 858D7F8
.incbin "baserom.gba", 0x58d7f8, 0x18
.align 2
gMiscBlank_Pal:: @ 858D7D0
.incbin "graphics/interface/blank.gbapal"
.align 2
gOamData_858D7F0:: @ 858D7F0
.2byte 0x4000
.2byte 0xC000
.2byte 0x2C00
.align 2
gSpriteTemplate_858D7F8:: @ 858D7F8
spr_template 0x0bc1, 0x0bc1, gOamData_858D7F0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0858D810:: @ 858D810
.incbin "baserom.gba", 0x58d810, 0x40
obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc1
obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc2
obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc3
obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc4
obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc5
obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc6
obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc7
obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc8
.align 2
gUnknown_0858D850:: @ 858D850
.incbin "baserom.gba", 0x58d850, 0x10
obj_pal gMiscBlank_Pal, 0x0bc1
gUnknown_0858D860:: @ 858D860
.incbin "baserom.gba", 0x58d860, 0x18
.align 2
gOamData_858D858:: @ 858D858
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.align 2
gSpriteTemplate_858D860:: @ 858D860
spr_template 0x0bc9, 0x0bc9, gOamData_858D858, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80F7768
.align 2
gUnknown_0858D878:: @ 858D878
.incbin "baserom.gba", 0x58d878, 0x8
obj_tiles gContestConfetti_Gfx, 0x0220, 0x0bc9
.align 2
gUnknown_0858D880:: @ 858D880
.incbin "baserom.gba", 0x58d880, 0x8
obj_pal gContestConfetti_Pal, 0x0bc9
.align 2
gUnknown_0858D888:: @ 858D888
.incbin "baserom.gba", 0x58d888, 0x10
.4byte 0x000001e0, 0x00003181, 0x000031c2, 0x000031a3
.align 2
gUnknown_0858D898:: @ 858D898
.incbin "baserom.gba", 0x58d898, 0x30
window_template 0x01, 0x07, 0x04, 0x0c, 0x02, 0x0f, 0x0302
window_template 0x01, 0x07, 0x07, 0x0c, 0x02, 0x0f, 0x031a
window_template 0x01, 0x07, 0x0a, 0x0c, 0x02, 0x0f, 0x0332
window_template 0x01, 0x07, 0x0d, 0x0c, 0x02, 0x0f, 0x034a
window_template_terminator
gUnknown_0858D8C8:: @ 858D8C8
.incbin "baserom.gba", 0x58d8c8, 0x18
.align 2
gUnknown_0858D8C0:: @ 858D8C0
.byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00
.align 2
gSpriteTemplate_858D8C8:: @ 858D8C8
spr_template 0x56ce, 0x0000, gUnknown_0858D8C0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0858D8E0:: @ 858D8E0
.incbin "baserom.gba", 0x58d8e0, 0x8
obj_tiles gMiscBlank_Gfx, 0x0200, 0x56ce
.align 2
gUnknown_0858D8E8:: @ 858D8E8
.incbin "baserom.gba", 0x58d8e8, 0x4
.byte 0x01, 0x0f, 0x0e, 0x00
data/contest_painting.s
+41 -17
View File
@@ -4,47 +4,68 @@
.include "constants/constants.inc"
.section .rodata
.align 2, 0
.align 2
gUnknown_085A989C:: @ 85A989C
.incbin "baserom.gba", 0x5a989c, 0x200
.incbin "graphics/picture_frame/bg.gbapal"
.align 2
gUnknown_085A9A9C:: @ 85A9A9C
.incbin "baserom.gba", 0x5a9a9c, 0x1084
.incbin "graphics/picture_frame/frame0.4bpp.rl"
.align 2
gUnknown_085AAB20:: @ 85AAB20
.incbin "baserom.gba", 0x5aab20, 0xc30
.incbin "graphics/picture_frame/frame1.4bpp.rl"
.align 2
gUnknown_085AB750:: @ 85AB750
.incbin "baserom.gba", 0x5ab750, 0xb38
.incbin "graphics/picture_frame/frame2.4bpp.rl"
.align 2
gUnknown_085AC288:: @ 85AC288
.incbin "baserom.gba", 0x5ac288, 0xfb8
.incbin "graphics/picture_frame/frame3.4bpp.rl"
.align 2
gUnknown_085AD240:: @ 85AD240
.incbin "baserom.gba", 0x5ad240, 0x1130
.incbin "graphics/picture_frame/frame4.4bpp.rl"
.align 2
gUnknown_085AE370:: @ 85AE370
.incbin "baserom.gba", 0x5ae370, 0x604
.incbin "graphics/picture_frame/frame5.4bpp.rl"
.align 2
gUnknown_085AE974:: @ 85AE974
.incbin "baserom.gba", 0x5ae974, 0x50c
.incbin "graphics/picture_frame/frame0_map.bin.rl"
.align 2
gUnknown_085AEE80:: @ 85AEE80
.incbin "baserom.gba", 0x5aee80, 0x50c
.incbin "graphics/picture_frame/frame1_map.bin.rl"
.align 2
gUnknown_085AF38C:: @ 85AF38C
.incbin "baserom.gba", 0x5af38c, 0x50c
.incbin "graphics/picture_frame/frame2_map.bin.rl"
.align 2
gUnknown_085AF898:: @ 85AF898
.incbin "baserom.gba", 0x5af898, 0x50c
.incbin "graphics/picture_frame/frame3_map.bin.rl"
.align 2
gUnknown_085AFDA4:: @ 85AFDA4
.incbin "baserom.gba", 0x5afda4, 0x50c
.incbin "graphics/picture_frame/frame4_map.bin.rl"
.align 2
gUnknown_085B02B0:: @ 85B02B0
.incbin "baserom.gba", 0x5b02b0, 0x524
.incbin "graphics/picture_frame/frame5_map.bin.rl"
.align 2
gUnknown_085B07C0:: @ 85B07C0
.4byte gContestCoolness
.4byte gContestBeauty
.4byte gContestCuteness
.4byte gContestSmartness
.4byte gContestToughness
.align 2
gContestRankTextPointers:: @ 85B07D4
.4byte gContestRankNormal
.4byte gContestRankSuper
@@ -52,12 +73,15 @@ gContestRankTextPointers:: @ 85B07D4
.4byte gContestRankMaster
.4byte gContestLink
.align 2
gUnknown_085B07E8:: @ 85B07E8
.incbin "baserom.gba", 0x5b07e8, 0x4
.4byte 0x000010a5
.align 2
gUnknown_085B07EC:: @ 85B07EC
.incbin "baserom.gba", 0x5b07ec, 0x8
window_template 0x01, 0x02, 0x0e, 0x1a, 0x04, 0x0f, 0x0001
.align 2
gContestPaintingDescriptionPointers:: @ 85B07F4
.4byte gContestPaintingCool1
.4byte gContestPaintingCool2
@@ -79,4 +103,4 @@ gUnknown_085B0830:: @ 85B0830
.4byte 0xc0003000, 0x00000000
gUnknown_085B0838:: @ 85B0838
.incbin "baserom.gba", 0x5b0838, 0x4
.2byte 0x0000, 0x0000
data/coord_event_weather.s
+14 -1
View File
@@ -5,4 +5,17 @@
.align 2, 0
gUnknown_085102E0:: @ 85102E0
.incbin "baserom.gba", 0x5102e0, 0x68
.4byte 0x00000001, sub_809D7BC
.4byte 0x00000002, sub_809D7C8
.4byte 0x00000003, sub_809D7D4
.4byte 0x00000004, sub_809D7E0
.4byte 0x00000005, sub_809D7EC
.4byte 0x00000006, sub_809D7F8
.4byte 0x00000007, sub_809D804
.4byte 0x00000008, sub_809D810
.4byte 0x00000009, sub_809D81C
.4byte 0x0000000a, sub_809D828
.4byte 0x0000000b, sub_809D834
.4byte 0x00000014, sub_809D840
.4byte 0x00000015, sub_809D84C
data/data4.s
-18
View File
@@ -1,18 +0,0 @@
@ the fourth big chunk of data
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_085B09E4:: @ 85B09E4
.incbin "baserom.gba", 0x5b09e4, 0x10
gUnknown_085B09F4:: @ 85B09F4
.incbin "baserom.gba", 0x5b09f4, 0x4
gUnknown_085B09F8:: @ 85B09F8
.incbin "baserom.gba", 0x5b09f8, 0x8
data/data4d.s
-745
View File
@@ -1,745 +0,0 @@
@ the fourth big chunk of data
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gUnknown_085B27C8:: @ 85B27C8
.incbin "baserom.gba", 0x5b27c8, 0x88
gUnknown_085B2850:: @ 85B2850
.incbin "baserom.gba", 0x5b2850, 0x20
gUnknown_085B2870:: @ 85B2870
.incbin "baserom.gba", 0x5b2870, 0x20
gUnknown_085B2890:: @ 85B2890
.incbin "baserom.gba", 0x5b2890, 0x10
gUnknown_085B28A0:: @ 85B28A0
.incbin "baserom.gba", 0x5b28a0, 0x10
gUnknown_085B28B0:: @ 85B28B0
.incbin "baserom.gba", 0x5b28b0, 0x1e0
gUnknown_085B2A90:: @ 85B2A90
.incbin "baserom.gba", 0x5b2a90, 0xb4
gUnknown_085B2B44:: @ 85B2B44
.incbin "baserom.gba", 0x5b2b44, 0x18
gUnknown_085B2B5C:: @ 85B2B5C
.incbin "baserom.gba", 0x5b2b5c, 0x4
gUnknown_085B2B60:: @ 85B2B60
.incbin "baserom.gba", 0x5b2b60, 0x8
gUnknown_085B2B68:: @ 85B2B68
.incbin "baserom.gba", 0x5b2b68, 0x10
gUnknown_085B2B78:: @ 85B2B78
.incbin "baserom.gba", 0x5b2b78, 0x6
gUnknown_085B2B7E:: @ 85B2B7E
.incbin "baserom.gba", 0x5b2b7e, 0xa
gUnknown_085B2B88:: @ 85B2B88
.incbin "baserom.gba", 0x5b2b88, 0xc
gUnknown_085B2B94:: @ 85B2B94
.incbin "baserom.gba", 0x5b2b94, 0xc
gUnknown_085B2BA0:: @ 85B2BA0
.incbin "baserom.gba", 0x5b2ba0, 0xc
gUnknown_085B2BAC:: @ 85B2BAC
.incbin "baserom.gba", 0x5b2bac, 0x8
gUnknown_085B2BB4:: @ 85B2BB4
.incbin "baserom.gba", 0x5b2bb4, 0x40
gUnknown_085B2BF4:: @ 85B2BF4
.incbin "baserom.gba", 0x5b2bf4, 0x12
gUnknown_085B2C06:: @ 85B2C06
.incbin "baserom.gba", 0x5b2c06, 0x12
gUnknown_085B2C18:: @ 85B2C18
.incbin "baserom.gba", 0x5b2c18, 0x9
gUnknown_085B2C21:: @ 85B2C21
.incbin "baserom.gba", 0x5b2c21, 0x9
gUnknown_085B2C2A:: @ 85B2C2A
.incbin "baserom.gba", 0x5b2c2a, 0x26
gUnknown_085B2C50:: @ 85B2C50
.incbin "baserom.gba", 0x5b2c50, 0x78
gUnknown_085B2CC8:: @ 85B2CC8
.incbin "baserom.gba", 0x5b2cc8, 0x14
gUnknown_085B2CDC:: @ 85B2CDC
.incbin "baserom.gba", 0x5b2cdc, 0x14
gUnknown_085B2CF0:: @ 85B2CF0
.incbin "baserom.gba", 0x5b2cf0, 0x340
gUnknown_085B3030:: @ 85B3030
.incbin "baserom.gba", 0x5b3030, 0x10
gUnknown_085B3040:: @ 85B3040
.incbin "baserom.gba", 0x5b3040, 0x64
gUnknown_085B30A4:: @ 85B30A4
.incbin "baserom.gba", 0x5b30a4, 0x30
gUnknown_085B30D4:: @ 85B30D4
.incbin "baserom.gba", 0x5b30d4, 0x30
gUnknown_085B3104:: @ 85B3104
.incbin "baserom.gba", 0x5b3104, 0x18
gUnknown_085B311C:: @ 85B311C
.incbin "baserom.gba", 0x5b311c, 0x8
gUnknown_085B3124:: @ 85B3124
.incbin "baserom.gba", 0x5b3124, 0x8
gUnknown_085B312C:: @ 85B312C
.incbin "baserom.gba", 0x5b312c, 0x16
gUnknown_085B3142:: @ 85B3142
.incbin "baserom.gba", 0x5b3142, 0xc
gUnknown_085B314E:: @ 85B314E
.incbin "baserom.gba", 0x5b314e, 0xe
gUnknown_085B315C:: @ 85B315C
.incbin "baserom.gba", 0x5b315c, 0x14
gUnknown_085B3170:: @ 85B3170
.incbin "baserom.gba", 0x5b3170, 0x2c
gUnknown_085B319C:: @ 85B319C
.incbin "baserom.gba", 0x5b319c, 0x18
gUnknown_085B31B4:: @ 85B31B4
.incbin "baserom.gba", 0x5b31b4, 0x1c
gUnknown_085B31D0:: @ 85B31D0
.incbin "baserom.gba", 0x5b31d0, 0x28
gUnknown_085B31F8:: @ 85B31F8
.incbin "baserom.gba", 0x5b31f8, 0x14
gUnknown_085B320C:: @ 85B320C
.incbin "baserom.gba", 0x5b320c, 0x14
gUnknown_085B3220:: @ 85B3220
.incbin "baserom.gba", 0x5b3220, 0x8
gUnknown_085B3228:: @ 85B3228
.incbin "baserom.gba", 0x5b3228, 0x2c
gUnknown_085B3254:: @ 85B3254
.incbin "baserom.gba", 0x5b3254, 0x2c
gUnknown_085B3280:: @ 85B3280
.incbin "baserom.gba", 0x5b3280, 0x160
gUnknown_085B33E0:: @ 85B33E0
.incbin "baserom.gba", 0x5b33e0, 0x16
gUnknown_085B33F6:: @ 85B33F6
.incbin "baserom.gba", 0x5b33f6, 0xa
gUnknown_085B3400:: @ 85B3400
.incbin "baserom.gba", 0x5b3400, 0x10
gUnknown_085B3410:: @ 85B3410
.incbin "baserom.gba", 0x5b3410, 0x10
gUnknown_085B3420:: @ 85B3420
.incbin "baserom.gba", 0x5b3420, 0x24
gUnknown_085B3444:: @ 85B3444
.incbin "baserom.gba", 0x5b3444, 0x2c
gUnknown_085B3470:: @ 85B3470
.incbin "baserom.gba", 0x5b3470, 0x4
gUnknown_085B3474:: @ 85B3474
.incbin "baserom.gba", 0x5b3474, 0x8
gUnknown_085B347C:: @ 85B347C
.incbin "baserom.gba", 0x5b347c, 0x8
gUnknown_085B3484:: @ 85B3484
.incbin "baserom.gba", 0x5b3484, 0xc0
gUnknown_085B3544:: @ 85B3544
.incbin "baserom.gba", 0x5b3544, 0x20
gUnknown_085B3564:: @ 85B3564
.incbin "baserom.gba", 0x5b3564, 0x800
gUnknown_085B3D64:: @ 85B3D64
.incbin "baserom.gba", 0x5b3d64, 0x8
gUnknown_085B3D6C:: @ 85B3D6C
.incbin "baserom.gba", 0x5b3d6c, 0x10
gUnknown_085B3D7C:: @ 85B3D7C
.incbin "baserom.gba", 0x5b3d7c, 0x8
gUnknown_085B3D84:: @ 85B3D84
.incbin "baserom.gba", 0x5b3d84, 0x8
gUnknown_085B3D8C:: @ 85B3D8C
.incbin "baserom.gba", 0x5b3d8c, 0x8
gUnknown_085B3D94:: @ 85B3D94
.incbin "baserom.gba", 0x5b3d94, 0x20
gUnknown_085B3DB4:: @ 85B3DB4
.incbin "baserom.gba", 0x5b3db4, 0x134
gUnknown_085B3EE8:: @ 85B3EE8
.incbin "baserom.gba", 0x5b3ee8, 0x2
gUnknown_085B3EEA:: @ 85B3EEA
.incbin "baserom.gba", 0x5b3eea, 0x6
gUnknown_085B3EF0:: @ 85B3EF0
.incbin "baserom.gba", 0x5b3ef0, 0xc
gUnknown_085B3EFC:: @ 85B3EFC
.incbin "baserom.gba", 0x5b3efc, 0x1c
gUnknown_085B3F18:: @ 85B3F18
.incbin "baserom.gba", 0x5b3f18, 0x100
gUnknown_085B4018:: @ 85B4018
.incbin "baserom.gba", 0x5b4018, 0x4
gUnknown_085B401C:: @ 85B401C
.incbin "baserom.gba", 0x5b401c, 0x8
gUnknown_085B4024:: @ 85B4024
.incbin "baserom.gba", 0x5b4024, 0x10
gUnknown_085B4034:: @ 85B4034
.incbin "baserom.gba", 0x5b4034, 0xb8
gUnknown_085B40EC:: @ 85B40EC
.incbin "baserom.gba", 0x5b40ec, 0x10
gUnknown_085B40FC:: @ 85B40FC
.incbin "baserom.gba", 0x5b40fc, 0x38
gUnknown_085B4134:: @ 85B4134
.incbin "baserom.gba", 0x5b4134, 0x6f8
gUnknown_085B482C:: @ 85B482C
.incbin "baserom.gba", 0x5b482c, 0x4e4
gUnknown_085B4D10:: @ 85B4D10
.incbin "baserom.gba", 0x5b4d10, 0x4d4
gUnknown_085B51E4:: @ 85B51E4
.incbin "baserom.gba", 0x5b51e4, 0x6a0
gUnknown_085B5884:: @ 85B5884
.incbin "baserom.gba", 0x5b5884, 0x40
gText_ShedinjaJapaneseName2:: @ 85B58C4
.incbin "baserom.gba", 0x5b58c4, 0x5
gUnknown_085B58C9:: @ 85B58C9
.incbin "baserom.gba", 0x5b58c9, 0x10
gUnknown_085B58D9:: @ 85B58D9
.incbin "baserom.gba", 0x5b58d9, 0x323
gUnknown_085B5BFC:: @ 85B5BFC
.incbin "baserom.gba", 0x5b5bfc, 0x200
gUnknown_085B5DFC:: @ 85B5DFC
.incbin "baserom.gba", 0x5b5dfc, 0x1a4
gUnknown_085B5FA0:: @ 85B5FA0
.incbin "baserom.gba", 0x5b5fa0, 0x1a0
gUnknown_085B6140:: @ 85B6140
.incbin "baserom.gba", 0x5b6140, 0xc
gUnknown_085B614C:: @ 85B614C
.incbin "baserom.gba", 0x5b614c, 0x8
gUnknown_085B6154:: @ 85B6154
.incbin "baserom.gba", 0x5b6154, 0xc
gUnknown_085B6160:: @ 85B6160
.incbin "baserom.gba", 0x5b6160, 0x184
gUnknown_085B62E4:: @ 85B62E4
.incbin "baserom.gba", 0x5b62e4, 0x4
gUnknown_085B62E8:: @ 85B62E8
.incbin "baserom.gba", 0x5b62e8, 0x5c
gUnknown_085B6344:: @ 85B6344
.incbin "baserom.gba", 0x5b6344, 0x4
gUnknown_085B6348:: @ 85B6348
.incbin "baserom.gba", 0x5b6348, 0x40
gUnknown_085B6388:: @ 85B6388
.incbin "baserom.gba", 0x5b6388, 0x68
gUnknown_085B63F0:: @ 85B63F0
.incbin "baserom.gba", 0x5b63f0, 0x18
gUnknown_085B6408:: @ 85B6408
.incbin "baserom.gba", 0x5b6408, 0x8
gUnknown_085B6410:: @ 85B6410
.incbin "baserom.gba", 0x5b6410, 0x8
gUnknown_085B6418:: @ 85B6418
.incbin "baserom.gba", 0x5b6418, 0x6
gUnknown_085B641E:: @ 85B641E
.incbin "baserom.gba", 0x5b641e, 0x4
gUnknown_085B6422:: @ 85B6422
.incbin "baserom.gba", 0x5b6422, 0xa
gUnknown_085B642C:: @ 85B642C
.incbin "baserom.gba", 0x5b642c, 0x10
gUnknown_085B643C:: @ 85B643C
.incbin "baserom.gba", 0x5b643c, 0xc
gUnknown_085B6448:: @ 85B6448
.incbin "baserom.gba", 0x5b6448, 0xf3c
gUnknown_085B7384:: @ 85B7384
.incbin "baserom.gba", 0x5b7384, 0x98
gUnknown_085B741C:: @ 85B741C
.incbin "baserom.gba", 0x5b741c, 0x6c
gUnknown_085B7488:: @ 85B7488
.incbin "baserom.gba", 0x5b7488, 0x8
gUnknown_085B7490:: @ 85B7490
.incbin "baserom.gba", 0x5b7490, 0x78
gUnknown_085B7508:: @ 85B7508
.incbin "baserom.gba", 0x5b7508, 0x60
gUnknown_085B7568:: @ 85B7568
.incbin "baserom.gba", 0x5b7568, 0x48
gUnknown_085B75B0:: @ 85B75B0
.incbin "baserom.gba", 0x5b75b0, 0x60
gUnknown_085B7610:: @ 85B7610
.incbin "baserom.gba", 0x5b7610, 0x140
gUnknown_085B7750:: @ 85B7750
.incbin "baserom.gba", 0x5b7750, 0x94
gUnknown_085B77E4:: @ 85B77E4
.incbin "baserom.gba", 0x5b77e4, 0x18
gUnknown_085B77FC:: @ 85B77FC
.incbin "baserom.gba", 0x5b77fc, 0x18
gUnknown_085B7814:: @ 85B7814
.incbin "baserom.gba", 0x5b7814, 0x18
gUnknown_085B782C:: @ 85B782C
.incbin "baserom.gba", 0x5b782c, 0x18
gUnknown_085B7844:: @ 85B7844
.incbin "baserom.gba", 0x5b7844, 0x20
gUnknown_085B7864:: @ 85B7864
.incbin "baserom.gba", 0x5b7864, 0xc4
gUnknown_085B7928:: @ 85B7928
.incbin "baserom.gba", 0x5b7928, 0x20
gUnknown_085B7948:: @ 85B7948
.incbin "baserom.gba", 0x5b7948, 0x8
gUnknown_085B7950:: @ 85B7950
.incbin "baserom.gba", 0x5b7950, 0x28
gUnknown_085B7978:: @ 85B7978
.incbin "baserom.gba", 0x5b7978, 0x80
gUnknown_085B79F8:: @ 85B79F8
.incbin "baserom.gba", 0x5b79f8, 0x18
gUnknown_085B7A10:: @ 85B7A10
.incbin "baserom.gba", 0x5b7a10, 0x30
gUnknown_085B7A40:: @ 85B7A40
.incbin "baserom.gba", 0x5b7a40, 0x7c
gUnknown_085B7ABC:: @ 85B7ABC
.incbin "baserom.gba", 0x5b7abc, 0x30
gUnknown_085B7AEC:: @ 85B7AEC
.incbin "baserom.gba", 0x5b7aec, 0x18
gUnknown_085B7B04:: @ 85B7B04
.incbin "baserom.gba", 0x5b7b04, 0x6
gUnknown_085B7B0A:: @ 85B7B0A
.incbin "baserom.gba", 0x5b7b0a, 0x8
gUnknown_085B7B12:: @ 85B7B12
.incbin "baserom.gba", 0x5b7b12, 0x8
gUnknown_085B7B1A:: @ 85B7B1A
.incbin "baserom.gba", 0x5b7b1a, 0x14
gUnknown_085B7B2E:: @ 85B7B2E
.incbin "baserom.gba", 0x5b7b2e, 0x18
gUnknown_085B7B46:: @ 85B7B46
.incbin "baserom.gba", 0x5b7b46, 0x2
gUnknown_085B7B48:: @ 85B7B48
.incbin "baserom.gba", 0x5b7b48, 0x8d0
gUnknown_085B8418:: @ 85B8418
.incbin "baserom.gba", 0x5b8418, 0x20
gUnknown_085B8438:: @ 85B8438
.incbin "baserom.gba", 0x5b8438, 0x338
gUnknown_085B8770:: @ 85B8770
.incbin "baserom.gba", 0x5b8770, 0x480
gUnknown_085B8BF0:: @ 85B8BF0
.incbin "baserom.gba", 0x5b8bf0, 0x20
gUnknown_085B8C10:: @ 85B8C10
.incbin "baserom.gba", 0x5b8c10, 0x20
gUnknown_085B8C30:: @ 85B8C30
.incbin "baserom.gba", 0x5b8c30, 0x2
gUnknown_085B8C32:: @ 85B8C32
.incbin "baserom.gba", 0x5b8c32, 0x36
gUnknown_085B8C68:: @ 85B8C68
.incbin "baserom.gba", 0x5b8c68, 0x18
gUnknown_085B8C80:: @ 85B8C80
.incbin "baserom.gba", 0x5b8c80, 0x10
gUnknown_085B8C90:: @ 85B8C90
.incbin "baserom.gba", 0x5b8c90, 0x528
gUnknown_085B91B8:: @ 85B91B8
.incbin "baserom.gba", 0x5b91b8, 0x178
gUnknown_085B9330:: @ 85B9330
.incbin "baserom.gba", 0x5b9330, 0x580
gUnknown_085B98B0:: @ 85B98B0
.incbin "baserom.gba", 0x5b98b0, 0x240
gUnknown_085B9AF0:: @ 85B9AF0
.incbin "baserom.gba", 0x5b9af0, 0x11e0
gUnknown_085BACD0:: @ 85BACD0
.incbin "baserom.gba", 0x5bacd0, 0x1e0
gUnknown_085BAEB0:: @ 85BAEB0
.incbin "baserom.gba", 0x5baeb0, 0x20
gUnknown_085BAED0:: @ 85BAED0
.incbin "baserom.gba", 0x5baed0, 0x378
gUnknown_085BB248:: @ 85BB248
.incbin "baserom.gba", 0x5bb248, 0x25c
gUnknown_085BB4A4:: @ 85BB4A4
.incbin "baserom.gba", 0x5bb4a4, 0x48c
gUnknown_085BB930:: @ 85BB930
.incbin "baserom.gba", 0x5bb930, 0x2e4
gUnknown_085BBC14:: @ 85BBC14
.incbin "baserom.gba", 0x5bbc14, 0x6a0
gUnknown_085BC2B4:: @ 85BC2B4
.incbin "baserom.gba", 0x5bc2b4, 0x20
gUnknown_085BC2D4:: @ 85BC2D4
.incbin "baserom.gba", 0x5bc2d4, 0x20
gUnknown_085BC2F4:: @ 85BC2F4
.incbin "baserom.gba", 0x5bc2f4, 0x20
gUnknown_085BC314:: @ 85BC314
.incbin "baserom.gba", 0x5bc314, 0x800
gUnknown_085BCB14:: @ 85BCB14
.incbin "baserom.gba", 0x5bcb14, 0x800
gUnknown_085BD314:: @ 85BD314
.incbin "baserom.gba", 0x5bd314, 0x820
gUnknown_085BDB34:: @ 85BDB34
.incbin "baserom.gba", 0x5bdb34, 0x6b4
gUnknown_085BE1E8:: @ 85BE1E8
.incbin "baserom.gba", 0x5be1e8, 0x334
gUnknown_085BE51C:: @ 85BE51C
.incbin "baserom.gba", 0x5be51c, 0x56c
gUnknown_085BEA88:: @ 85BEA88
.incbin "baserom.gba", 0x5bea88, 0x318
gUnknown_085BEDA0:: @ 85BEDA0
.incbin "baserom.gba", 0x5beda0, 0x140
gUnknown_085BEEE0:: @ 85BEEE0
.incbin "baserom.gba", 0x5beee0, 0x1c0
gUnknown_085BF0A0:: @ 85BF0A0
.incbin "baserom.gba", 0x5bf0a0, 0x200
gUnknown_085BF2A0:: @ 85BF2A0
.incbin "baserom.gba", 0x5bf2a0, 0x200
gUnknown_085BF4A0:: @ 85BF4A0
.incbin "baserom.gba", 0x5bf4a0, 0xa0
gUnknown_085BF540:: @ 85BF540
.incbin "baserom.gba", 0x5bf540, 0x160
gUnknown_085BF6A0:: @ 85BF6A0
.incbin "baserom.gba", 0x5bf6a0, 0x7540
gUnknown_085C6BE0:: @ 85C6BE0
.incbin "baserom.gba", 0x5c6be0, 0x1000
gUnknown_085C7BE0:: @ 85C7BE0
.incbin "baserom.gba", 0x5c7be0, 0x20
gUnknown_085C7C00:: @ 85C7C00
.incbin "baserom.gba", 0x5c7c00, 0x68c
gUnknown_085C828C:: @ 85C828C
.incbin "baserom.gba", 0x5c828c, 0x2ec
gUnknown_085C8578:: @ 85C8578
.incbin "baserom.gba", 0x5c8578, 0x20
gUnknown_085C8598:: @ 85C8598
.incbin "baserom.gba", 0x5c8598, 0x15c
gUnknown_085C86F4:: @ 85C86F4
.incbin "baserom.gba", 0x5c86f4, 0x100
gUnknown_085C87F4:: @ 85C87F4
.incbin "baserom.gba", 0x5c87f4, 0xb0
gUnknown_085C88A4:: @ 85C88A4
.incbin "baserom.gba", 0x5c88a4, 0x84
gUnknown_085C8928:: @ 85C8928
.incbin "baserom.gba", 0x5c8928, 0x20
gUnknown_085C8948:: @ 85C8948
.incbin "baserom.gba", 0x5c8948, 0xa8
gUnknown_085C89F0:: @ 85C89F0
.incbin "baserom.gba", 0x5c89f0, 0xa8
gUnknown_085C8A98:: @ 85C8A98
.incbin "baserom.gba", 0x5c8a98, 0x10
gUnknown_085C8AA8:: @ 85C8AA8
.incbin "baserom.gba", 0x5c8aa8, 0xc
gUnknown_085C8AB4:: @ 85C8AB4
.incbin "baserom.gba", 0x5c8ab4, 0x8
gUnknown_085C8ABC:: @ 85C8ABC
.incbin "baserom.gba", 0x5c8abc, 0x8
gUnknown_085C8AC4:: @ 85C8AC4
.incbin "baserom.gba", 0x5c8ac4, 0x1c
gUnknown_085C8AE0:: @ 85C8AE0
.incbin "baserom.gba", 0x5c8ae0, 0x1c
gUnknown_085C8AFC:: @ 85C8AFC
.incbin "baserom.gba", 0x5c8afc, 0x18
gUnknown_085C8B14:: @ 85C8B14
.incbin "baserom.gba", 0x5c8b14, 0x18
gUnknown_085C8B2C:: @ 85C8B2C
.incbin "baserom.gba", 0x5c8b2c, 0x18
gUnknown_085C8B44:: @ 85C8B44
.incbin "baserom.gba", 0x5c8b44, 0x18
gUnknown_085C8B5C:: @ 85C8B5C
.incbin "baserom.gba", 0x5c8b5c, 0x20
gUnknown_085C8B7C:: @ 85C8B7C
.incbin "baserom.gba", 0x5c8b7c, 0xc
gUnknown_085C8B88:: @ 85C8B88
.incbin "baserom.gba", 0x5c8b88, 0x4
gUnknown_085C8B8C:: @ 85C8B8C
.incbin "baserom.gba", 0x5c8b8c, 0xa
gUnknown_085C8B96:: @ 85C8B96
.incbin "baserom.gba", 0x5c8b96, 0x6
gUnknown_085C8B9C:: @ 85C8B9C
.incbin "baserom.gba", 0x5c8b9c, 0x1c
gUnknown_085C8BB8:: @ 85C8BB8
.incbin "baserom.gba", 0x5c8bb8, 0x8
gUnknown_085C8BC0:: @ 85C8BC0
.incbin "baserom.gba", 0x5c8bc0, 0xc
gUnknown_085C8BCC:: @ 85C8BCC
.incbin "baserom.gba", 0x5c8bcc, 0x28
gUnknown_085C8BF4:: @ 85C8BF4
.incbin "baserom.gba", 0x5c8bf4, 0x6
gUnknown_085C8BFA:: @ 85C8BFA
.incbin "baserom.gba", 0x5c8bfa, 0x14
gUnknown_085C8C0E:: @ 85C8C0E
.incbin "baserom.gba", 0x5c8c0e, 0x16
gUnknown_085C8C24:: @ 85C8C24
.incbin "baserom.gba", 0x5c8c24, 0x1c
gUnknown_085C8C40:: @ 85C8C40
.incbin "baserom.gba", 0x5c8c40, 0x4
gUnknown_085C8C44:: @ 85C8C44
.incbin "baserom.gba", 0x5c8c44, 0x4
gUnknown_085C8C48:: @ 85C8C48
.incbin "baserom.gba", 0x5c8c48, 0xc
gUnknown_085C8C54:: @ 85C8C54
.incbin "baserom.gba", 0x5c8c54, 0x10
gUnknown_085C8C64:: @ 85C8C64
.incbin "baserom.gba", 0x5c8c64, 0x2
gUnknown_085C8C66:: @ 85C8C66
.incbin "baserom.gba", 0x5c8c66, 0x6
gUnknown_085C8C6C:: @ 85C8C6C
.incbin "baserom.gba", 0x5c8c6c, 0xc
gUnknown_085C8C78:: @ 85C8C78
.incbin "baserom.gba", 0x5c8c78, 0x8
gUnknown_085C8C80:: @ 85C8C80
.incbin "baserom.gba", 0x5c8c80, 0x4
gUnknown_085C8C84:: @ 85C8C84
.incbin "baserom.gba", 0x5c8c84, 0xb4
gUnknown_085C8D38:: @ 85C8D38
.incbin "baserom.gba", 0x5c8d38, 0x8
gUnknown_085C8D40:: @ 85C8D40
.incbin "baserom.gba", 0x5c8d40, 0x20
gUnknown_085C8D60:: @ 85C8D60
.incbin "baserom.gba", 0x5c8d60, 0x2c
gUnknown_085C8D8C:: @ 85C8D8C
.incbin "baserom.gba", 0x5c8d8c, 0x14
gUnknown_085C8DA0:: @ 85C8DA0
.incbin "baserom.gba", 0x5c8da0, 0x10
gUnknown_085C8DB0:: @ 85C8DB0
.incbin "baserom.gba", 0x5c8db0, 0xc
gUnknown_085C8DBC:: @ 85C8DBC
.incbin "baserom.gba", 0x5c8dbc, 0x14
gUnknown_085C8DD0:: @ 85C8DD0
.incbin "baserom.gba", 0x5c8dd0, 0x46
gUnknown_085C8E16:: @ 85C8E16
.incbin "baserom.gba", 0x5c8e16, 0xe
gUnknown_085C8E24:: @ 85C8E24
.incbin "baserom.gba", 0x5c8e24, 0x44
gUnknown_085C8E68:: @ 85C8E68
.incbin "baserom.gba", 0x5c8e68, 0x6c
.align 2
gFieldEffectObjectPalette10:: @ 85C8ED4
.incbin "graphics/map_objects/palettes/field_effect_object_palette_10.gbapal"
.align 2
gFieldEffectObjectPaletteInfo10:: @ 85C8EF4
obj_pal gFieldEffectObjectPalette10, 0x1009
.incbin "baserom.gba", 0x5c8efc, 0xe0
gUnknown_085C8FDC:: @ 85C8FDC
.incbin "baserom.gba", 0x5c8fdc, 0x14
gUnknown_085C8FF0:: @ 85C8FF0
.incbin "baserom.gba", 0x5c8ff0, 0x30
gUnknown_085C9020:: @ 85C9020
.incbin "baserom.gba", 0x5c9020, 0x4b0
gUnknown_085C94D0:: @ 85C94D0
.incbin "baserom.gba", 0x5c94d0, 0x500
gUnknown_085C99D0:: @ 85C99D0
.incbin "baserom.gba", 0x5c99d0, 0x18
gUnknown_085C99E8:: @ 85C99E8
.incbin "baserom.gba", 0x5c99e8, 0x10
gUnknown_085C99F8:: @ 85C99F8
.incbin "baserom.gba", 0x5c99f8, 0x10
gUnknown_085C9A08:: @ 85C9A08
.incbin "baserom.gba", 0x5c9a08, 0x14
gUnknown_085C9A1C:: @ 85C9A1C
.incbin "baserom.gba", 0x5c9a1c, 0x14
gUnknown_085C9A30:: @ 85C9A30
.incbin "baserom.gba", 0x5c9a30, 0x23
gUnknown_085C9A53:: @ 85C9A53
.incbin "baserom.gba", 0x5c9a53, 0x41
data/event_scripts.s
+326 -10
View File
File diff suppressed because it is too large Load Diff
data/field_specials.s
+547
View File
@@ -0,0 +1,547 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_085B2B5C:: @ 85B2B5C
.byte 0x07, 0x09, 0x08, 0x0a
.align 2
gUnknown_085B2B60:: @ 85B2B60
.byte 0x00, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x00
gUnknown_085B2B68:: @ 85B2B68
.byte 0x07, 0x16, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, 0x0a, 0x10, 0x00, 0x00, 0x0f, 0x10, 0x00, 0x00
gUnknown_085B2B78:: @ 85B2B78
.byte 0x00, 0x01, 0x01, 0x01, 0x01, 0x00
.align 1
gUnknown_085B2B7E:: @ 85B2B7E
.2byte 0x0218, 0x0219, 0x021a, 0x021b, 0x021c
gUnknown_085B2B88:: @ 85B2B88
.byte 0x0c, 0x02, 0x04, 0x05, 0x01, 0x08, 0x07, 0x0b, 0x03, 0x0a, 0x09, 0x06
gUnknown_085B2B94:: @ 85B2B94
.byte 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x04, 0x04, 0x05
gUnknown_085B2BA0:: @ 85B2BA0
.byte 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x05, 0x05
.align 2
gUnknown_085B2BAC:: @ 85B2BAC
.byte 0x00, 0x15, 0x01, 0x08, 0x04, 0x0f, 0x08, 0x00
.align 2
gElevatorFloorsTable:: @ 85B2BB4
.4byte gText_B4F
.4byte gText_B3F
.4byte gText_B2F
.4byte gText_B1F
.4byte gText_1F
.4byte gText_2F
.4byte gText_3F
.4byte gText_4F
.4byte gText_5F
.4byte gText_6F
.4byte gText_7F
.4byte gText_8F
.4byte gText_9F
.4byte gText_10F
.4byte gText_11F
.4byte gText_Rooftop
.align 1
gUnknown_085B2BF4:: @ 85B2BF4
.2byte 0x0329, 0x032a, 0x032b, 0x0331, 0x0332, 0x0333, 0x0339, 0x033a, 0x033b
.align 1
gUnknown_085B2C06:: @ 85B2C06
.2byte 0x0329, 0x032b, 0x032a, 0x0331, 0x0333, 0x0332, 0x0339, 0x033b, 0x033a
gUnknown_085B2C18:: @ 85B2C18
.byte 0x08, 0x10, 0x18, 0x20, 0x26, 0x2e, 0x34, 0x38, 0x39
gUnknown_085B2C21:: @ 85B2C21
.byte 0x03, 0x06, 0x09, 0x0c, 0x0f, 0x12, 0x15, 0x18, 0x1b
.align 1
gUnknown_085B2C2A:: @ 85B2C2A
.2byte 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a
.2byte 0x1a35, 0x193c, 0xffff
.align 2
gUnknown_085B2C50:: @ 85B2C50
.4byte BattleFrontier_Lounge2_Text_260971
.4byte BattleFrontier_Lounge2_Text_260A1E
.4byte BattleFrontier_Lounge2_Text_260AE7
.4byte BattleFrontier_Lounge2_Text_2619AC
.4byte BattleFrontier_Lounge2_Text_261A91
.4byte BattleFrontier_Lounge2_Text_261B0C
.4byte BattleFrontier_Lounge2_Text_261B95
.4byte BattleFrontier_Lounge2_Text_261B95
.4byte BattleFrontier_Lounge2_Text_261B95
.4byte BattleFrontier_Lounge2_Text_261C1A
.4byte BattleFrontier_Lounge2_Text_261C1A
.4byte BattleFrontier_Lounge2_Text_261C1A
.4byte BattleFrontier_Lounge2_Text_260BC4
.4byte BattleFrontier_Lounge2_Text_260C6D
.4byte BattleFrontier_Lounge2_Text_260D3A
.4byte BattleFrontier_Lounge2_Text_260E1E
.4byte BattleFrontier_Lounge2_Text_260EC7
.4byte BattleFrontier_Lounge2_Text_260F74
.4byte BattleFrontier_Lounge2_Text_2614E6
.4byte BattleFrontier_Lounge2_Text_261591
.4byte BattleFrontier_Lounge2_Text_26166F
.4byte BattleFrontier_Lounge2_Text_261282
.4byte BattleFrontier_Lounge2_Text_261329
.4byte BattleFrontier_Lounge2_Text_261403
.4byte BattleFrontier_Lounge2_Text_261026
.4byte BattleFrontier_Lounge2_Text_2610CC
.4byte BattleFrontier_Lounge2_Text_261194
.4byte BattleFrontier_Lounge2_Text_26174D
.4byte BattleFrontier_Lounge2_Text_2617F9
.4byte BattleFrontier_Lounge2_Text_2618C4
gUnknown_085B2CC8:: @ 85B2CC8
.byte 0x15, 0x38, 0x15, 0x23, 0xff, 0xff, 0xff, 0xff, 0x02, 0x04, 0x07, 0x15, 0x07, 0x15, 0x0e, 0x1c, 0x0d, 0x70, 0x07, 0x38
.align 1
gUnknown_085B2CDC:: @ 85B2CDC
.2byte 0x0007, 0x000e, 0x0015, 0x001c, 0x0023, 0x0031, 0x003f, 0x004d, 0x005b, 0x0000
.align 2
gUnknown_085B2CF0:: @ 85B2CF0
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_BlueFlute
.4byte gText_YellowFlute
.4byte gText_RedFlute
.4byte gText_WhiteFlute
.4byte gText_BlackFlute
.4byte gText_PrettyChair
.4byte gText_PrettyDesk
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_0Pts
.4byte gText_10Pts
.4byte gText_20Pts
.4byte gText_30Pts
.4byte gText_40Pts
.4byte gText_50Pts
.4byte gText_60Pts
.4byte gText_70Pts
.4byte gText_80Pts
.4byte gText_90Pts
.4byte gText_100Pts
.4byte gText_QuestionMark
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_KissPoster16BP
.4byte gText_KissCushion32BP
.4byte gText_SmoochumDoll32BP
.4byte gText_TogepiDoll48BP
.4byte gText_MeowthDoll48BP
.4byte gText_ClefairyDoll48BP
.4byte gText_DittoDoll48BP
.4byte gText_CyndaquilDoll80BP
.4byte gText_ChikoritaDoll80BP
.4byte gText_TotodileDoll80BP
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_LaprasDoll128BP
.4byte gText_SnorlaxDoll128BP
.4byte gText_VenusaurDoll256BP
.4byte gText_CharizardDoll256BP
.4byte gText_BlastoiseDoll256BP
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_Protein1BP
.4byte gText_Calcium1BP
.4byte gText_Iron1BP
.4byte gText_Zinc1BP
.4byte gText_Carbos1BP
.4byte gText_HpUp1BP
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_Leftovers48BP
.4byte gText_WhiteHerb48BP
.4byte gText_QuickClaw48BP
.4byte gText_MentalHerb48BP
.4byte gText_BrightPowder64BP
.4byte gText_ChoiceBand64BP
.4byte gText_KingsRock64BP
.4byte gText_FocusBand64BP
.4byte gText_ScopeLens64BP
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_EnergyPowder50
.4byte gText_EnergyRoot80
.4byte gText_HealPowder50
.4byte gText_RevivalHerb300
.4byte gText_Protein1000
.4byte gText_Iron1000
.4byte gText_Carbos1000
.4byte gText_Calcium1000
.4byte gText_Zinc1000
.4byte gText_HPUp1000
.4byte gText_PPUp3000
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_BattleTower2
.4byte gText_BattleDome
.4byte gText_BattlePalace
.4byte gText_BattleArena
.4byte gText_BattleFactory
.4byte gText_BattlePike
.4byte gText_BattlePyramid
.4byte gText_RankingHall
.4byte gText_ExchangeService
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_Softboiled16BP
.4byte gText_SeismicToss24BP
.4byte gText_DreamEater24BP
.4byte gText_MegaPunch24BP
.4byte gText_MegaKick48BP
.4byte gText_BodySlam48BP
.4byte gText_RockSlide48BP
.4byte gText_Counter48BP
.4byte gText_ThunderWave48BP
.4byte gText_SwordsDance48BP
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_DefenseCurl16BP
.4byte gText_Snore24BP
.4byte gText_MudSlap24BP
.4byte gText_Swift24BP
.4byte gText_IcyWind24BP
.4byte gText_Endure48BP
.4byte gText_PsychUp48BP
.4byte gText_IcePunch48BP
.4byte gText_ThunderPunch48BP
.4byte gText_FirePunch48BP
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_SlateportCity
.4byte gText_BattleFrontier
.4byte gText_SouthernIsland
.4byte gText_NavelRock
.4byte gText_BirthIsland
.4byte gText_FarawayIsland
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_BattleTrainers
.4byte gText_BattleBasics
.4byte gText_PokemonNature
.4byte gText_PokemonMoves
.4byte gText_Underpowered
.4byte gText_WhenInDanger
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.align 2
gUnknown_085B3030:: @ 85B3030
.4byte 0x03000002, 0x00000000, 0x07d00000, 0x00000064
.align 2
gUnknown_085B3040:: @ 85B3040
.4byte BattleFrontier_Lounge5_Text_26468D
.4byte BattleFrontier_Lounge5_Text_2646E5
.4byte BattleFrontier_Lounge5_Text_264741
.4byte BattleFrontier_Lounge5_Text_2647A4
.4byte BattleFrontier_Lounge5_Text_2647FC
.4byte BattleFrontier_Lounge5_Text_264858
.4byte BattleFrontier_Lounge5_Text_2648BE
.4byte BattleFrontier_Lounge5_Text_264916
.4byte BattleFrontier_Lounge5_Text_264972
.4byte BattleFrontier_Lounge5_Text_2649D5
.4byte BattleFrontier_Lounge5_Text_264A3F
.4byte BattleFrontier_Lounge5_Text_264A9B
.4byte BattleFrontier_Lounge5_Text_264AF3
.4byte BattleFrontier_Lounge5_Text_264B5D
.4byte BattleFrontier_Lounge5_Text_2648BE
.4byte BattleFrontier_Lounge5_Text_264BC3
.4byte BattleFrontier_Lounge5_Text_264C36
.4byte BattleFrontier_Lounge5_Text_2648BE
.4byte BattleFrontier_Lounge5_Text_264C95
.4byte BattleFrontier_Lounge5_Text_264D01
.4byte BattleFrontier_Lounge5_Text_264D6B
.4byte BattleFrontier_Lounge5_Text_264DD7
.4byte BattleFrontier_Lounge5_Text_264E33
.4byte BattleFrontier_Lounge5_Text_264E8F
.4byte BattleFrontier_Lounge5_Text_2648BE
.align 2
gUnknown_085B30A4:: @ 85B30A4
.4byte BattleFrontier_Lounge3_Text_262261
.4byte BattleFrontier_Lounge3_Text_26230D
.4byte BattleFrontier_Lounge3_Text_2623B9
.4byte BattleFrontier_Lounge3_Text_262464
.4byte BattleFrontier_Lounge3_Text_26250E
.4byte BattleFrontier_Lounge3_Text_2625B8
.4byte BattleFrontier_Lounge3_Text_26266A
.4byte BattleFrontier_Lounge3_Text_26271C
.4byte BattleFrontier_Lounge3_Text_2627C9
.4byte BattleFrontier_Lounge3_Text_262876
.4byte BattleFrontier_Lounge3_Text_26291A
.4byte BattleFrontier_Lounge3_Text_2629BC
.align 2
gUnknown_085B30D4:: @ 85B30D4
.4byte BattleFrontier_Lounge3_Text_262C04
.4byte BattleFrontier_Lounge3_Text_262C90
.4byte BattleFrontier_Lounge3_Text_262D1C
.4byte BattleFrontier_Lounge3_Text_262DA7
.4byte BattleFrontier_Lounge3_Text_262E34
.4byte BattleFrontier_Lounge3_Text_262EC1
.4byte BattleFrontier_Lounge3_Text_262F56
.4byte BattleFrontier_Lounge3_Text_262FEB
.4byte BattleFrontier_Lounge3_Text_263078
.4byte BattleFrontier_Lounge3_Text_263105
.4byte BattleFrontier_Lounge3_Text_26318C
.4byte BattleFrontier_Lounge3_Text_263211
.align 1
gUnknown_085B3104:: @ 85B3104
.2byte 0x0000, 0x0001, 0x0002, 0x0100, 0x0101, 0x0400, 0x0401, 0x0200, 0x0201, 0x0300, 0x0500, 0x0600
.align 2
gUnknown_085B311C:: @ 85B311C
window_template 0x00, 0x01, 0x01, 0x06, 0x02, 0x0f, 0x0008
.align 2
gUnknown_085B3124:: @ 85B3124
window_template 0x00, 0x02, 0x09, 0x04, 0x04, 0x0f, 0x0014
.align 1
gUnknown_085B312C:: @ 85B312C
.2byte 0x004b, 0x0067, 0x0057, 0x004f, 0x0054, 0x0055, 0x0056, 0x0050, 0x0051, 0x0052, 0xffff
.align 1
gUnknown_085B3142:: @ 85B3142
.2byte 0x0071, 0x006f, 0x0072, 0x0073, 0x0074, 0xffff
.align 1
gUnknown_085B314E:: @ 85B314E
.2byte 0x0040, 0x0043, 0x0041, 0x0046, 0x0042, 0x003f, 0xffff
.align 1
gUnknown_085B315C:: @ 85B315C
.2byte 0x00c8, 0x00b4, 0x00b7, 0x00b9, 0x00b3, 0x00ba, 0x00bb, 0x00c4, 0x00c6, 0xffff
.align 2
gUnknown_085B3170:: @ 85B3170
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2601D0
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260201
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26022F
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26025B
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260287
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2602B5
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2602E0
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26030F
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26033E
.4byte gText_Exit
.align 2
gUnknown_085B319C:: @ 85B319C
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C
.4byte gText_Exit
.align 2
gUnknown_085B31B4:: @ 85B31B4
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260397
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2603BE
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2603E6
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26040E
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260436
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26045C
.4byte gText_Exit
.align 2
gUnknown_085B31D0:: @ 85B31D0
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26047A
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2604AC
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2604D8
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26050F
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260542
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260575
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2605A8
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2605E2
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260613
.4byte gText_Exit
.align 1
gUnknown_085B31F8:: @ 85B31F8
.2byte 0x0087, 0x0045, 0x008a, 0x0005, 0x0019, 0x0022, 0x009d, 0x0044, 0x0056, 0x000e
.align 1
gUnknown_085B320C:: @ 85B320C
.2byte 0x006f, 0x00ad, 0x00bd, 0x0081, 0x00c4, 0x00cb, 0x00f4, 0x0008, 0x0009, 0x0007
.align 2
gUnknown_085B3220:: @ 85B3220
window_template 0x00, 0x01, 0x07, 0x0c, 0x06, 0x0f, 0x001c
.align 2
gUnknown_085B3228:: @ 85B3228
.4byte BattleFrontier_Lounge7_Text_265E30
.4byte BattleFrontier_Lounge7_Text_265E5B
.4byte BattleFrontier_Lounge7_Text_265E8A
.4byte BattleFrontier_Lounge7_Text_265EC0
.4byte BattleFrontier_Lounge7_Text_265EED
.4byte BattleFrontier_Lounge7_Text_265F1C
.4byte BattleFrontier_Lounge7_Text_265F47
.4byte BattleFrontier_Lounge7_Text_265F77
.4byte BattleFrontier_Lounge7_Text_265FAA
.4byte BattleFrontier_Lounge7_Text_265FDD
.4byte gText_Exit
.align 2
gUnknown_085B3254:: @ 85B3254
.4byte BattleFrontier_Lounge7_Text_26600A
.4byte BattleFrontier_Lounge7_Text_26603E
.4byte BattleFrontier_Lounge7_Text_266070
.4byte BattleFrontier_Lounge7_Text_2660A6
.4byte BattleFrontier_Lounge7_Text_2660D0
.4byte BattleFrontier_Lounge7_Text_2660FF
.4byte BattleFrontier_Lounge7_Text_26612D
.4byte BattleFrontier_Lounge7_Text_26615F
.4byte BattleFrontier_Lounge7_Text_266185
.4byte BattleFrontier_Lounge7_Text_2661B5
.4byte gText_Exit
.align 2
gUnknown_085B3280:: @ 85B3280
.incbin "graphics/unknown/unknown_5B3280.gbapal"
gUnknown_085B33E0:: @ 85B33E0
.byte 0x0f, 0x0c, 0x0b, 0x0e, 0x0f, 0x08, 0x13, 0x0e, 0x0c, 0x0b, 0x12, 0x0b, 0x0f, 0x0e, 0x0b, 0x0e, 0x13, 0x0e, 0x0f, 0x0f, 0x0f, 0x0a
gUnknown_085B33F6:: @ 85B33F6
.byte 0x04, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x06, 0x03, 0x03
gUnknown_085B3400:: @ 85B3400
.byte 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c
gUnknown_085B3410:: @ 85B3410
.byte 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c
gUnknown_085B3420:: @ 85B3420
.byte 0x02, 0x04, 0x01, 0x04, 0x04, 0x01, 0x05, 0x00, 0x01, 0x06, 0x03, 0x01, 0x08, 0x06, 0x01, 0x09, 0x0d, 0x01, 0x0a, 0x07, 0x01, 0x0b, 0x07, 0x01, 0x0c, 0x04, 0x01, 0x0e, 0x05, 0x01, 0x0f, 0x04
.byte 0x01, 0x1a, 0x37, 0x01
.align 1
gUnknown_085B3444:: @ 85B3444
.2byte 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a
.2byte 0x1a35, 0x1918, 0x1919, 0x191a, 0x191b, 0xffff
gUnknown_085B3470:: @ 85B3470
.byte 0x02, 0x01, 0x02, 0x01
gUnknown_085B3474:: @ 85B3474
.byte 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
gUnknown_085B347C:: @ 85B347C
.byte 0x08, 0x0d, 0x0e, 0x0b, 0x0a, 0x0c, 0x0f, 0x09
data/fldeff_flash.s
+81
View File
@@ -0,0 +1,81 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_085B27C8:: @ 85B27C8
.byte 0x01, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x02, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x03, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x05, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x06, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x07, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x08, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x09, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x04, 0x01, 0x00, 0x01
.4byte sub_81373F0
.byte 0x04, 0x02, 0x00, 0x01
.4byte sub_81373F0
.byte 0x04, 0x03, 0x00, 0x01
.4byte sub_81373F0
.byte 0x04, 0x05, 0x00, 0x01
.4byte sub_81373F0
.byte 0x04, 0x06, 0x00, 0x01
.4byte sub_81373F0
.byte 0x04, 0x07, 0x00, 0x01
.4byte sub_81373F0
.byte 0x04, 0x08, 0x00, 0x01
.4byte sub_81373F0
.byte 0x04, 0x09, 0x00, 0x01
.4byte sub_81373F0
.byte 0x00, 0x00, 0x00, 0x00
.4byte NULL
.align 2
gCaveTransitionPalette_White:: @ 85B2850
.incbin "graphics/misc/cave_transition_white.gbapal"
.align 2
gCaveTransitionPalette_Black:: @ 85B2870
.incbin "graphics/misc/cave_transition_black.gbapal"
.align 2
gUnknown_085B2890:: @ 85B2890
.incbin "graphics/misc/85B2890.gbapal"
.align 2
gUnknown_085B28A0:: @ 85B28A0
.incbin "graphics/misc/85B28A0.gbapal"
.align 2
gCaveTransitionTilemap:: @ 85B28B0
.incbin "graphics/misc/cave_transition_map.bin.lz"
.align 2
gCaveTransitionTiles:: @ 85B2A90
.incbin "graphics/misc/cave_transition.4bpp.lz"
data/graphics.s
+290 -83
View File
@@ -20,7 +20,7 @@ gUnknown_08C01644:: @ 8C01644
gUnknown_08C01724:: @ 8C01724
.incbin "baserom.gba", 0xc01724, 0x18
.align 2
gInterfaceGfx_PokeBall::
.incbin "graphics/interface/ball/poke.4bpp.lz" @ 0xBC
@@ -120,29 +120,29 @@ gInterfacePal_PremierBall::
gOpenPokeballGfx:: @ 8C02300
.incbin "baserom.gba", 0xc02300, 0x7c
gUnknown_08C0237C:: @ 8C0237C
gBlankGfxCompressed:: @ 8C0237C
.incbin "baserom.gba", 0xc0237c, 0x7074
gUnknown_08C093F0:: @ 8C093F0
.incbin "baserom.gba", 0xc093f0, 0x87ac
.align 2
.align 2
gBattleInterface_BallStatusBarPal:: @ 8C11B9C
.incbin "graphics/battle_interface/ball_status_bar.gbapal"
.align 2
.align 2
gBattleInterface_BallDisplayPal:: @ 8C11BBC
.incbin "graphics/battle_interface/ball_display.gbapal"
.align 2
.align 2
gHealthboxElementsGfxTable:: @ 8C11BDC
.incbin "baserom.gba", 0xc11bdc, 0x840
.align 2
.align 2
gBattleInterface_BallDisplayGfx:: @ 8C1241C
.incbin "graphics/battle_interface/ball_display.4bpp"
.align 2
.align 2
gUnknown_08C1249C:: @ 8C1249C
.incbin "baserom.gba", 0xc1249c, 0x49f4
@@ -162,7 +162,19 @@ gUnknown_08C17AB0:: @ 8C17AB0
.incbin "baserom.gba", 0xc17ab0, 0xa5c
gUnknown_08C1850C:: @ 8C1850C
.incbin "baserom.gba", 0xc1850c, 0x107c
.incbin "baserom.gba", 0xc1850c, 0xc5c
gUnknown_08C19168:: @ 8C19168
.incbin "baserom.gba", 0xc19168, 0x11c
gContestJudgeSymbolsGfx:: @ 8C19284
.incbin "baserom.gba", 0xc19284, 0x1a4
gContest3Pal:: @ 8C19428
.incbin "baserom.gba", 0xc19428, 0x28
gUnknown_08C19450:: @ 8C19450
.incbin "baserom.gba", 0xc19450, 0x138
gUnknown_08C19588:: @ 8C19588
.incbin "baserom.gba", 0xc19588, 0x964
@@ -183,7 +195,10 @@ gUnknown_08C1A490:: @ 8C1A490
.incbin "baserom.gba", 0xc1a490, 0xD4
gUnknown_08C1A564:: @ 8C1A564
.incbin "baserom.gba", 0xc1a564, 0x2154
.incbin "baserom.gba", 0xc1a564, 0x1E80
gContestJudgeGfx:: @ 8C1C3E4
.incbin "baserom.gba", 0xc1c3e4, 0x2d4
gUnknown_08C1C6B8:: @ 8C1C6B8
.incbin "baserom.gba", 0xc1c6b8, 0x9f4
@@ -253,28 +268,28 @@ gSubstituteDollGfx:: @ 8C2CEE0
gSubstituteDollTilemap:: @ 8C2D120
.incbin "baserom.gba", 0xc2d120, 552
gUnknown_08C2D348:: @ 8C2D348
.incbin "baserom.gba", 0xC2D348, 196
gUnknown_08C2D40C:: @ 8C2D40C
.incbin "baserom.gba", 0xC2D40C, 28
gContestConfetti_Gfx:: @ 8C2D428
.incbin "baserom.gba", 0xC2D428, 288
gContestConfetti_Pal:: @ 8C2D548
.incbin "baserom.gba", 0xC2D548, 40
gUnknown_08C2D570:: @ 8C2D570
.incbin "baserom.gba", 0xC2D570, 316
gUnknown_08C2D6AC:: @ 8C2D6AC
.incbin "baserom.gba", 0xC2D6AC, 36
gUnknown_08C2D6D0:: @ 8C2D6D0
.incbin "baserom.gba", 0xC2D6D0, 40
gUnknown_08C2D6F8:: @ 8C2D6F8
.incbin "baserom.gba", 0xC2D6F8, 40
@@ -569,7 +584,10 @@ gUnknown_08D84970:: @ 8D84970
.incbin "baserom.gba", 0xd84970, 0x590
gUnknown_08D84F00:: @ 8D84F00
.incbin "baserom.gba", 0xd84f00, 0x458
.incbin "baserom.gba", 0xd84f00, 0x158
gUnknown_08D85058:: @ 8D85058
.incbin "baserom.gba", 0xd85058, 0x300
gUnknown_08D85358:: @ 8D85358
.incbin "baserom.gba", 0xd85358, 0xec
@@ -578,7 +596,10 @@ gUnknown_08D85444:: @ 8D85444
.incbin "baserom.gba", 0xd85444, 0x84
gUnknown_08D854C8:: @ 8D854C8
.incbin "baserom.gba", 0xd854c8, 0x120
.incbin "baserom.gba", 0xd854c8, 0x20
gUnknown_08D854E8:: @ 8D854E8
.incbin "baserom.gba", 0xd854E8, 0x100
gUnknown_08D855E8:: @ 8D855E8
.incbin "baserom.gba", 0xd855e8, 0x18
@@ -751,16 +772,25 @@ gUnknown_08D8D58C:: @ 8D8D58C
.incbin "baserom.gba", 0xd8d58c, 0x52c
gUnknown_08D8DAB8:: @ 8D8DAB8
.incbin "baserom.gba", 0xd8dab8, 0xefc
.incbin "baserom.gba", 0xd8dab8, 0xe84
gContestNextTurnGfx:: @ 8D8E93C
.incbin "baserom.gba", 0xd8e93c, 0x78
gUnknown_08D8E9B4:: @ 8D8E9B4
.incbin "baserom.gba", 0xd8e9b4, 0x80
gUnknown_08D8EA34:: @ 8D8EA34
.incbin "baserom.gba", 0xd8ea34, 0x1f0
.incbin "baserom.gba", 0xd8ea34, 0xb0
gContestApplauseGfx:: @ 8D8EAE4
.incbin "baserom.gba", 0xd8eaE4, 0x140
gUnknown_08D8EC24:: @ 8D8EC24
.incbin "baserom.gba", 0xd8ec24, 0xf78
.incbin "baserom.gba", 0xd8ec24, 0x80
gContestPal:: @ 8D8ECA4
.incbin "baserom.gba", 0xd8eca4, 0xef8
gUnknown_08D8FB9C:: @ 8D8FB9C
.incbin "baserom.gba", 0xd8fb9c, 0x24
@@ -821,10 +851,31 @@ gUnknown_08D96AB4:: @ 8D96AB4
.incbin "baserom.gba", 0xd96ab4, 0xec
gUnknown_08D96BA0:: @ 8D96BA0
.incbin "baserom.gba", 0xd96ba0, 0xfe4
.incbin "baserom.gba", 0xd96ba0, 0x138
gUnknown_08D96CD8:: @ 8D96CD8
.incbin "baserom.gba", 0xd96cd8, 0x294
gUnknown_08D96F6C:: @ 8D96F6C
.incbin "baserom.gba", 0xd96f6c, 0x24
gUnknown_08D96F90:: @ 8D96F90
.incbin "baserom.gba", 0xd96f90, 0x1F8
gUnknown_08D97188:: @ 8D97188
.incbin "baserom.gba", 0xd97188, 0x28
gUnknown_08D971B0:: @ 8D971B0
.incbin "baserom.gba", 0xd971b0, 0x9D4
gUnknown_08D97B84:: @ 8D97B84
.incbin "baserom.gba", 0xd97b84, 0x188
.incbin "baserom.gba", 0xd97b84, 0x68
gUnknown_08D97BEC:: @ 8D97BEC
.incbin "baserom.gba", 0xd97bec, 0x108
gUnknown_08D97CF4:: @ 8D97CF4
.incbin "baserom.gba", 0xd97cf4, 0x18
gUnknown_08D97D0C:: @ 8D97D0C
.incbin "baserom.gba", 0xd97d0c, 0x830
@@ -876,25 +927,25 @@ gMenuMoneyPal:: @ 8D9B0C8
gBuyMenuFrame_Tilemap:: @ 8D9B0F0
.incbin "baserom.gba", 0xd9b0f0, 0x140
gMenuMoneyGfx:: @ 8D9B230
.incbin "baserom.gba", 0xd9b230, 0x84
.incbin "baserom.gba", 0xd9b230, 0x84
gMenuPokeblock_Gfx:: @ 8D9B2B4
.incbin "baserom.gba", 0xd9b2b4, 0x1bc
gMenuPokeblock_Pal:: @ 8D9B470
.incbin "baserom.gba", 0xd9b470, 0x70
gMenuPokeblockDevice_Gfx:: @ 8D9B4E0
.incbin "baserom.gba", 0xd9b4e0, 0x2c0
gMenuPokeblockDevice_Pal:: @ 8D9B7A0
.incbin "baserom.gba", 0xd9b7a0, 0x28
gMenuPokeblock_Tilemap:: @ 8D9B7C8
.incbin "baserom.gba", 0xd9b7c8, 0x148
.align 2
gPokeblock_Gfx::
.incbin "graphics/pokeblock/pokeblock.4bpp.lz"
@@ -973,8 +1024,29 @@ gUnknown_08D9C13C:: @ 8D9C13C
@ 8D9C3A8
.include "data/graphics/berries/berry_graphics.inc"
@ 8DA1E78
.incbin "baserom.gba", 0xda1e78, 0x1548
gUnknown_08DA1E78:: @ 8DA1E78
.incbin "baserom.gba", 0xda1e78, 0xBE4
gUnknown_08DA2A5C:: @ 8DA2A5C
.incbin "baserom.gba", 0xDA2A5C, 0xCC
gUnknown_08DA2B28:: @ 8DA2B28
.incbin "baserom.gba", 0xDA2B28, 0x1F4
gUnknown_08DA2D1C:: @ 8DA2D1C
.incbin "baserom.gba", 0xDA2D1C, 0x534
gUnknown_08DA3250:: @ 8DA3250
.incbin "baserom.gba", 0xDA3250, 0x54
gUnknown_08DA32A4:: @ 8DA32A4
.incbin "baserom.gba", 0xDA32A4, 0xCC
gUnknown_08DA3370:: @ 8DA3370
.incbin "baserom.gba", 0xDA3370, 0x28
gUnknown_08DA3398:: @ 8DA3398
.incbin "baserom.gba", 0xDA3398, 0x28
gUnknown_08DA33C0:: @ 8DA33C0
.incbin "baserom.gba", 0xda33c0, 0x428
@@ -989,7 +1061,13 @@ gUnknown_08DA3988:: @ 8DA3988
.incbin "baserom.gba", 0xda3988, 0x100
gUnknown_08DA3A88:: @ 8DA3A88
.incbin "baserom.gba", 0xda3a88, 0x20c
.incbin "baserom.gba", 0xda3a88, 0x138
gUnknown_08DA3BC0:: @ 8DA3BC0
.incbin "baserom.gba", 0xDA3BC0, 0xBC
gUnknown_08DA3C7C:: @ 8DA3C7C
.incbin "baserom.gba", 0xDA3C7C, 0x18
gUnknown_08DA3C94:: @ 8DA3C94
.incbin "baserom.gba", 0xda3c94, 0x1114
@@ -1004,7 +1082,13 @@ gUnknown_08DA4F70:: @ 8DA4F70
.incbin "baserom.gba", 0xda4f70, 0x1148
gUnknown_08DA60B8:: @ 8DA60B8
.incbin "baserom.gba", 0xda60b8, 0x904
.incbin "baserom.gba", 0xda60b8, 0x388
gUnknown_08DA6440:: @ 8DA6440
.incbin "baserom.gba", 0xDA6440, 0x46C
gUnknown_08DA68AC:: @ 8DA68AC
.incbin "baserom.gba", 0xDA68AC, 0x110
gUnknown_08DA69BC:: @ 8DA69BC
.incbin "baserom.gba", 0xda69bc, 0xb6c
@@ -1043,7 +1127,37 @@ gUnknown_08DA8D6C:: @ 8DA8D6C
.incbin "baserom.gba", 0xda8d6c, 0x118
gUnknown_08DA8E84:: @ 8DA8E84
.incbin "baserom.gba", 0xda8e84, 0x1a30
.incbin "baserom.gba", 0xda8e84, 0x54
gUnknown_08DA8ED8:: @ 8DA8ED8
.incbin "baserom.gba", 0xDA8ED8, 0x798
gUnknown_08DA9670:: @ 8DA9670
.incbin "baserom.gba", 0xDA9670, 0x44
gUnknown_08DA96B4:: @ 8DA96B4
.incbin "baserom.gba", 0xDA96B4, 0x248
gUnknown_08DA98FC:: @ 8DA98FC
.incbin "baserom.gba", 0xDA98FC, 0xCA8
gUnknown_08DAA5A4:: @ 8DAA5A4
.incbin "baserom.gba", 0xDAA5A4, 0x1F0
gUnknown_08DAA794:: @ 8DAA794
.incbin "baserom.gba", 0xDAA794, 0x98
gUnknown_08DAA82C:: @ 8DAA82C
.incbin "baserom.gba", 0xDAA82C, 0x28
gUnknown_08DAA854:: @ 8DAA854
.incbin "baserom.gba", 0xDAA854, 0x28
gUnknown_08DAA87C:: @ 8DAA87C
.incbin "baserom.gba", 0xDAA87C, 0x28
gUnknown_08DAA8A4:: @ 8DAA8A4
.incbin "baserom.gba", 0xDAA8A4, 0x10
gUnknown_08DAA8B4:: @ 8DAA8B4
.incbin "baserom.gba", 0xdaa8b4, 0x270
@@ -1070,7 +1184,7 @@ gUnknown_08DAAFEC:: @ 8DAAFEC
.include "data/graphics/decorations/decoration_graphics.inc"
@ 8DBA14C
.incbin "baserom.gba", 0xdba14c, 0x3cc
.incbin "baserom.gba", 0xdba14c, 0x3cc
gUnknown_08DBA518:: @ 8DBA518
.incbin "baserom.gba", 0xdba518, 0x80
@@ -1099,8 +1213,29 @@ gCableCarCord_Gfx:: @ 8DBC2C0
gUnknown_08DBC2E8:: @ 8DBC2E8
.incbin "baserom.gba", 0xdbc2e8, 0x72c
gUnknown_08DBCA14:: @ 0x08DBCA14
.incbin "baserom.gba", 0xdbca14, 0x1e04
.align 2
gRouletteWheelTiles:: @ 0x08DBCA14
.incbin "graphics/roulette/wheel.8bpp.lz"
.align 2
gRouletteCenter_Gfx:: @ 0x08DBDABC
.incbin "graphics/roulette/center.4bpp.lz"
.align 2
gRouletteHeadersTiles:: @ 0x08DBDE38
.incbin "graphics/roulette/headers.4bpp.lz"
.align 2
gRouletteCreditTiles:: @ 0x08DBE45C
.incbin "graphics/roulette/credit.4bpp.lz"
.align 2
gRouletteNumbersTiles:: @ 0x08DBE5AC
.incbin "graphics/roulette/numbers.4bpp.lz"
.align 2
gRouletteMultiplierTiles:: @ 0x08DBE690
.incbin "graphics/roulette/multiplier.4bpp.lz"
gUnknown_08DBE818:: @ 0x08DBE818
.incbin "baserom.gba", 0xdbe818, 0x20
@@ -1217,10 +1352,25 @@ gUnknown_08DC0754:: @ 8DC0754
.incbin "baserom.gba", 0xdc0754, 0x440
gUnknown_08DC0B94:: @ 8DC0B94
.incbin "baserom.gba", 0xdc0b94, 0xb62
.incbin "baserom.gba", 0xdc0b94, 0x800
gUnknown_08DC16F6:: @ 8DC16F6
.incbin "baserom.gba", 0xdc16f6, 0x60
gUnknown_08DC1394:: @ 8DC1394
.incbin "baserom.gba", 0xdc1394, 0x2E0
gUnknown_08DC1674:: @ 8DC1674
.incbin "baserom.gba", 0xdc1674, 0x20
gUnknown_08DC1694:: @ 8DC1694
.incbin "baserom.gba", 0xdc1694, 0x20
gUnknown_08DC16B4:: @ 8DC16B4
.incbin "baserom.gba", 0xdc16b4, 0x20
gUnknown_08DC16D4:: @ 8DC16D4
.incbin "baserom.gba", 0xdc16d4, 0x20
gUnknown_08DC16F4:: @ 8DC16F4
.incbin "baserom.gba", 0xdc16f4, 0x62
gUnknown_08DC1756:: @ 8DC1756
.incbin "baserom.gba", 0xdc1756, 0x60
@@ -1232,7 +1382,10 @@ gUnknown_08DC1876:: @ 8DC1876
.incbin "baserom.gba", 0xdc1876, 0xbe
gUnknown_08DC1934:: @ 8DC1934
.incbin "baserom.gba", 0xdc1934, 0x10d4
.incbin "baserom.gba", 0xdc1934, 0xA18
gUnknown_08DC234C:: @ 8DC234C
.incbin "baserom.gba", 0xDC234C, 0x6BC
gUnknown_08DC2A08:: @ 8DC2A08
.incbin "baserom.gba", 0xdc2a08, 0x114
@@ -1365,7 +1518,43 @@ gUnknown_08DC7D84:: @ 8DC7D84
.incbin "baserom.gba", 0xdc7d84, 0x17c
gUnknown_08DC7F00:: @ 8DC7F00
.incbin "baserom.gba", 0xdc7f00, 0x11c0
.incbin "baserom.gba", 0xdc7f00, 0xA0
gUnknown_08DC7FA0:: @ 8DC7FA0
.incbin "baserom.gba", 0xdc7fa0, 0x13C
gUnknown_08DC80DC:: @ 8DC80DC
.incbin "baserom.gba", 0xdc80dc, 0x12C
gUnknown_08DC8208:: @ 8DC8208
.incbin "baserom.gba", 0xdc8208, 0x184
gUnknown_08DC838C:: @ 8DC838C
.incbin "baserom.gba", 0xdc838c, 0x120
gUnknown_08DC84AC:: @ 8DC84AC
.incbin "baserom.gba", 0xdc84ac, 0x1A0
gUnknown_08DC864C:: @ 8DC864C
.incbin "baserom.gba", 0xdc864c, 0x1AC
gUnknown_08DC87F8:: @ 8DC87F8
.incbin "baserom.gba", 0xdc87f8, 0x2AC
gUnknown_08DC8AA4:: @ 8DC8AA4
.incbin "baserom.gba", 0xdc8aa4, 0x170
gUnknown_08DC8C14:: @ 8DC8C14
.incbin "baserom.gba", 0xdc8c14, 0x13C
gUnknown_08DC8D50:: @ 8DC8D50
.incbin "baserom.gba", 0xdc8d50, 0x114
gUnknown_08DC8E64:: @ 8DC8E64
.incbin "baserom.gba", 0xdc8e64, 0x100
gUnknown_08DC8F64:: @ 8DC8F64
.incbin "baserom.gba", 0xdc8f64, 0x15C
gUnknown_08DC90C0:: @ 8DC90C0
.incbin "baserom.gba", 0xdc90c0, 0x20
@@ -1377,50 +1566,53 @@ gUnknown_08DC9130:: @ 8DC9130
.incbin "baserom.gba", 0xdc9130, 0xb8
gUnknown_08DC91E8:: @ 8DC91E8
.incbin "baserom.gba", 0xdc91e8, 0x420
.incbin "baserom.gba", 0xdc91e8, 0x20
gUnknown_08DC9208:: @ 8DC9208
.incbin "baserom.gba", 0xdc9208, 0x400
gUnknown_08DC9608:: @ 8DC9608
.incbin "baserom.gba", 0xdc9608, 0x20
gUnknown_08DC9628:: @ 8DC9628
.incbin "baserom.gba", 0xdc9628, 0x320
gBerryBlenderMiscPalette:: @ 8DCAB88
.incbin "graphics/berry_blender/misc.gbapal"
gBerryBlenderArrowPalette:: @ 8DC9948
.incbin "graphics/berry_blender/arrow.gbapal"
gUnknown_8DC9988:: @ 8DC9988
.incbin "baserom.gba", 0xdc9988, 0x200
.incbin "baserom.gba", 0xdc9988, 0x200
.align 2
gBerryBlenderMarubatsuTiles:: @ 8DC9B88
.incbin "graphics/berry_blender/marubatsu.4bpp"
.align 2
gBerryBlenderParticlesTiles:: @ 8E90818
.incbin "graphics/berry_blender/particles.4bpp"
.space 0x120
.align 2
gBerryBlenderCountdownNumbersTiles:: @ 8DC9F88
.incbin "graphics/berry_blender/countdown_numbers.4bpp"
.align 2
gBerryBlenderStartTiles:: @ 8DCA588
.incbin "graphics/berry_blender/start.4bpp"
.space 0x200
.space 0x200
.align 2
gBerryBlenderArrowTiles:: @ 8DCAB88
.incbin "graphics/berry_blender/arrow.4bpp"
gUnknown_08DCB388:: @ 8DCB388
.incbin "baserom.gba", 0xdcb388, 0xA28
gUnknown_08DCBDB0:: @ 8DCBDB0
.incbin "baserom.gba", 0xdcbdb0, 0x20
@@ -1443,10 +1635,19 @@ gUnknown_08DCC648:: @ 8DCC648
.incbin "baserom.gba", 0xdcc648, 0x2c0
gUnknown_08DCC908:: @ 8DCC908
.incbin "baserom.gba", 0xdcc908, 0x2b0
.incbin "baserom.gba", 0xdcc908, 0x290
gUnknown_08DCCB98:: @ 8DCCB98
.incbin "baserom.gba", 0xdccb98, 0x20
gUnknown_08DCCBB8:: @ 8DCCBB8
.incbin "baserom.gba", 0xdccbb8, 0x3a4
.incbin "baserom.gba", 0xdccbb8, 0x184
gUnknown_08DCCD3C:: @ 8DCCD3C
.incbin "baserom.gba", 0xdccd3c, 0x20
gUnknown_08DCCD5C:: @ 8DCCD5C
.incbin "baserom.gba", 0xdccd5c, 0x200
gUnknown_08DCCF5C:: @ 8DCCF5C
.incbin "baserom.gba", 0xdccf5c, 0x20
@@ -1473,22 +1674,28 @@ gUnknown_08DCEC70:: @ 8DCEC70
.incbin "baserom.gba", 0xdcec70, 0x13e0
gUnknown_08DD0050:: @ 8DD0050
.incbin "baserom.gba", 0xdd0050, 0x1a68
.incbin "baserom.gba", 0xdd0050, 0x1A08
gUnknown_08DD1A58:: @ 8DD1A58
.incbin "baserom.gba", 0xdd1a58, 0x60
gUnknown_08DD1AB8:: @ 8DD1AB8
.incbin "baserom.gba", 0xdd1ab8, 0x4c0
.incbin "baserom.gba", 0xdd1ab8, 0x4C0
gUnknown_08DD1F78:: @ 8DD1F78
.incbin "baserom.gba", 0xdd1f78, 0x98
.incbin "baserom.gba", 0xdd1f78, 0x98
gUnknown_08DD2010:: @ 8DD2010
.incbin "baserom.gba", 0xdd2010, 0x1a0
.incbin "baserom.gba", 0xdd2010, 0x1A0
gUnknown_08DD21B0:: @ 8DD21B0
.incbin "baserom.gba", 0xdd21b0, 0xdc
.incbin "baserom.gba", 0xdd21b0, 0xDC
gUnknown_08DD228C:: @ 8DD228C
.incbin "baserom.gba", 0xdd228c, 0x1e0
.incbin "baserom.gba", 0xdd228c, 0x180
gUnknown_08DD240C:: @ 8DD240C
.incbin "baserom.gba", 0xdd240c, 0x60
gUnknown_08DD246C:: @ 8DD246C
.incbin "baserom.gba", 0xdd246c, 0x674
@@ -1531,7 +1738,7 @@ gUnknown_08DD46E0:: @ 8DD46E0
gUnknown_08DD47A0:: @ 8DD47A0
.incbin "baserom.gba", 0xdd47a0, 0xc0
gUnknown_08DD4860:: @ 8DD4860
.incbin "baserom.gba", 0xdd4860, 0x20
@@ -1553,7 +1760,7 @@ gUnknown_08DD4BF0:: @ 8DD4BF0
gUnknown_08DD4C4C:: @ 8DD4C4C
.incbin "baserom.gba", 0xdd4c4c, 0xac
.align 2
.align 2
gUnknown_08DD4CF8:: @ 8DD4CF8
.incbin "graphics/interface/unk_change_case.4bpp.lz"
@@ -1587,61 +1794,61 @@ gUnknown_08DD7300:: @ 8DD7300
.incbin "baserom.gba", 0xdd7300, 0x60
gUnknown_08DD7360:: @ 8DD7360
.incbin "baserom.gba", 0xdd7360, 0x1420
.incbin "baserom.gba", 0xdd7360, 0x1420
gUnknown_08DD8780:: @ 8DD8780
.incbin "baserom.gba", 0xdd8780, 0x40
.incbin "baserom.gba", 0xdd8780, 0x40
gUnknown_08DD87C0:: @ 8DD87C0
.incbin "baserom.gba", 0xdd87c0, 0x720
.incbin "baserom.gba", 0xdd87c0, 0x720
gUnknown_08DD8EE0:: @ 8DD8EE0
.incbin "baserom.gba", 0xdd8ee0, 0x1a0
.incbin "baserom.gba", 0xdd8ee0, 0x1a0
gUnknown_08DD9080:: @ 8DD9080
.incbin "baserom.gba", 0xdd9080, 0x60
.incbin "baserom.gba", 0xdd9080, 0x60
gUnknown_08DD90E0:: @ 8DD90E0
.incbin "baserom.gba", 0xdd90e0, 0x638
.incbin "baserom.gba", 0xdd90e0, 0x638
gUnknown_08DD9718:: @ 8DD9718
.incbin "baserom.gba", 0xdd9718, 0x15c
.incbin "baserom.gba", 0xdd9718, 0x15c
gUnknown_08DD9874:: @ 8DD9874
.incbin "baserom.gba", 0xdd9874, 0x40
.incbin "baserom.gba", 0xdd9874, 0x40
gUnknown_08DD98B4:: @ 8DD98B4
.incbin "baserom.gba", 0xdd98b4, 0x5a4
.incbin "baserom.gba", 0xdd98b4, 0x5a4
gUnknown_08DD9E58:: @ 8DD9E58
.incbin "baserom.gba", 0xdd9e58, 0x194
.incbin "baserom.gba", 0xdd9e58, 0x194
gUnknown_08DD9FEC:: @ 8DD9FEC
.incbin "baserom.gba", 0xdd9fec, 0x40
.incbin "baserom.gba", 0xdd9fec, 0x40
gUnknown_08DDA02C:: @ 8DDA02C
.incbin "baserom.gba", 0xdda02c, 0x610
.incbin "baserom.gba", 0xdda02c, 0x610
gUnknown_08DDA63C:: @ 8DDA63C
.incbin "baserom.gba", 0xdda63c, 0x1c4
.incbin "baserom.gba", 0xdda63c, 0x1c4
gUnknown_08DDA800:: @ 8DDA800
.incbin "baserom.gba", 0xdda800, 0x40
.incbin "baserom.gba", 0xdda800, 0x40
gUnknown_08DDA840:: @ 8DDA840
.incbin "baserom.gba", 0xdda840, 0x600
.incbin "baserom.gba", 0xdda840, 0x600
gUnknown_08DDAE40:: @ 8DDAE40
.incbin "baserom.gba", 0xddae40, 0x1a0
.incbin "baserom.gba", 0xddae40, 0x1a0
gUnknown_08DDAFE0:: @ 8DDAFE0
.incbin "baserom.gba", 0xddafe0, 0x40
.incbin "baserom.gba", 0xddafe0, 0x40
gUnknown_08DDB020:: @ 8DDB020
.incbin "baserom.gba", 0xddb020, 0x2a4
.incbin "baserom.gba", 0xddb020, 0x2a4
gUnknown_08DDB2C4:: @ 8DDB2C4
.incbin "baserom.gba", 0xddb2c4, 0x120
.incbin "baserom.gba", 0xddb2c4, 0x120
gUnknown_08DDB3E4:: @ 8DDB3E4
.incbin "baserom.gba", 0xddb3e4, 0x80
data/graphics/field_objects/field_object_oam.inc
+170 -170
View File
@@ -40,26 +40,26 @@ gFieldObjectBaseOam_64x64:: @ 8509524
.align 2
gFieldObjectSpriteOamTable_16x16_0:: @ 850952C
sprite_oam -8, -8, 2, 0, 16x16
subsprite -8, -8, 2, 0, 16x16
.align 2
gFieldObjectSpriteOamTable_16x16_1:: @ 8509530
sprite_oam -8, -8, 1, 0, 16x16
subsprite -8, -8, 1, 0, 16x16
.align 2
gFieldObjectSpriteOamTable_16x16_2:: @ 8509534
sprite_oam -8, -8, 2, 0, 16x8
sprite_oam -8, 0, 3, 2, 16x8
subsprite -8, -8, 2, 0, 16x8
subsprite -8, 0, 3, 2, 16x8
.align 2
gFieldObjectSpriteOamTable_16x16_3:: @ 850953C
sprite_oam -8, -8, 2, 0, 16x16
sprite_oam -8, -8, 3, 0, 16x16
subsprite -8, -8, 2, 0, 16x16
subsprite -8, -8, 3, 0, 16x16
.align 2
gFieldObjectSpriteOamTable_16x16_4:: @ 8509544
sprite_oam -8, -8, 1, 0, 16x16
sprite_oam -8, -8, 3, 0, 16x16
subsprite -8, -8, 1, 0, 16x16
subsprite -8, -8, 3, 0, 16x16
.align 2
gFieldObjectSpriteOamTables_16x16:: @ 850954C
@@ -83,27 +83,27 @@ gFieldObjectSpriteOamTables_16x16:: @ 850954C
.align 2
gFieldObjectSpriteOamTable_16x32_0:: @ 850957C
sprite_oam -8, -16, 2, 0, 16x32
subsprite -8, -16, 2, 0, 16x32
.align 2
gFieldObjectSpriteOamTable_16x32_1:: @ 8509580
sprite_oam -8, -16, 1, 0, 16x32
subsprite -8, -16, 1, 0, 16x32
.align 2
gFieldObjectSpriteOamTable_16x32_2:: @ 8509584
sprite_oam -8, -16, 2, 0, 16x16
sprite_oam -8, 0, 2, 4, 16x8
sprite_oam -8, 8, 3, 6, 16x8
subsprite -8, -16, 2, 0, 16x16
subsprite -8, 0, 2, 4, 16x8
subsprite -8, 8, 3, 6, 16x8
.align 2
gFieldObjectSpriteOamTable_16x32_3:: @ 8509590
sprite_oam -8, -16, 2, 0, 16x16
sprite_oam -8, 0, 3, 4, 16x16
subsprite -8, -16, 2, 0, 16x16
subsprite -8, 0, 3, 4, 16x16
.align 2
gFieldObjectSpriteOamTable_16x32_4:: @ 8509598
sprite_oam -8, -16, 1, 0, 16x16
sprite_oam -8, 0, 3, 4, 16x16
subsprite -8, -16, 1, 0, 16x16
subsprite -8, 0, 3, 4, 16x16
.align 2
gFieldObjectSpriteOamTables_16x32:: @ 85095A0
@@ -127,27 +127,27 @@ gFieldObjectSpriteOamTables_16x32:: @ 85095A0
.align 2
gFieldObjectSpriteOamTable_32x32_0:: @ 85095D0
sprite_oam -16, -16, 2, 0, 32x32
subsprite -16, -16, 2, 0, 32x32
.align 2
gFieldObjectSpriteOamTable_32x32_1:: @ 85095D4
sprite_oam -16, -16, 1, 0, 32x32
subsprite -16, -16, 1, 0, 32x32
.align 2
gFieldObjectSpriteOamTable_32x32_2:: @ 85095D8
sprite_oam -16, -16, 2, 0, 32x16
sprite_oam -16, 0, 2, 8, 32x8
sprite_oam -16, 8, 3, 12, 32x8
subsprite -16, -16, 2, 0, 32x16
subsprite -16, 0, 2, 8, 32x8
subsprite -16, 8, 3, 12, 32x8
.align 2
gFieldObjectSpriteOamTable_32x32_3:: @ 85095E4
sprite_oam -16, -16, 2, 0, 32x16
sprite_oam -16, 0, 3, 8, 32x16
subsprite -16, -16, 2, 0, 32x16
subsprite -16, 0, 3, 8, 32x16
.align 2
gFieldObjectSpriteOamTable_32x32_4:: @ 85095EC
sprite_oam -16, -16, 1, 0, 32x16
sprite_oam -16, 0, 3, 8, 32x16
subsprite -16, -16, 1, 0, 32x16
subsprite -16, 0, 3, 8, 32x16
.align 2
gFieldObjectSpriteOamTables_32x32:: @ 85095F4
@@ -171,18 +171,18 @@ gFieldObjectSpriteOamTables_32x32:: @ 85095F4
.align 2
gFieldObjectSpriteOamTable_Truck_0:: @ 8509624
sprite_oam -24, -24, 2, 0, 32x8
sprite_oam 8, -24, 2, 4, 16x8
sprite_oam -24, -16, 2, 6, 32x8
sprite_oam 8, -16, 2, 10, 16x8
sprite_oam -24, -8, 2, 12, 32x8
sprite_oam 8, -8, 2, 16, 16x8
sprite_oam -24, 0, 2, 18, 32x8
sprite_oam 8, 0, 2, 22, 16x8
sprite_oam -24, 8, 2, 24, 32x8
sprite_oam 8, 8, 2, 28, 16x8
sprite_oam -24, 16, 2, 30, 32x8
sprite_oam 8, 16, 2, 34, 16x8
subsprite -24, -24, 2, 0, 32x8
subsprite 8, -24, 2, 4, 16x8
subsprite -24, -16, 2, 6, 32x8
subsprite 8, -16, 2, 10, 16x8
subsprite -24, -8, 2, 12, 32x8
subsprite 8, -8, 2, 16, 16x8
subsprite -24, 0, 2, 18, 32x8
subsprite 8, 0, 2, 22, 16x8
subsprite -24, 8, 2, 24, 32x8
subsprite 8, 8, 2, 28, 16x8
subsprite -24, 16, 2, 30, 32x8
subsprite 8, 16, 2, 34, 16x8
.align 2
gFieldObjectSpriteOamTables_Truck:: @ 8509654
@@ -206,19 +206,19 @@ gFieldObjectSpriteOamTables_Truck:: @ 8509654
.align 2
gFieldObjectSpriteOamTable_Unused_0:: @ 8509684
sprite_oam -32, -16, 2, 0, 64x32
subsprite -32, -16, 2, 0, 64x32
.align 2
gFieldObjectSpriteOamTable_Unused_1:: @ 8509688
sprite_oam -32, -16, 1, 0, 64x32
subsprite -32, -16, 1, 0, 64x32
.align 2
gFieldObjectSpriteOamTable_Unused_2:: @ 850968C
sprite_oam -32, -16, 2, 0, 64x32
subsprite -32, -16, 2, 0, 64x32
.align 2
gFieldObjectSpriteOamTable_Unused_3:: @ 8509690
sprite_oam -32, -16, 2, 0, 64x32
subsprite -32, -16, 2, 0, 64x32
.align 2
gFieldObjectSpriteOamTables_Unused:: @ 8509694
@@ -242,19 +242,19 @@ gFieldObjectSpriteOamTables_Unused:: @ 8509694
.align 2
gFieldObjectSpriteOamTable_64x64_0:: @ 85096C4
sprite_oam -32, -32, 2, 0, 64x64
subsprite -32, -32, 2, 0, 64x64
.align 2
gFieldObjectSpriteOamTable_64x64_1:: @ 85096C8
sprite_oam -32, -32, 1, 0, 64x64
subsprite -32, -32, 1, 0, 64x64
.align 2
gFieldObjectSpriteOamTable_64x64_2:: @ 85096CC
sprite_oam -32, -32, 2, 0, 64x64
subsprite -32, -32, 2, 0, 64x64
.align 2
gFieldObjectSpriteOamTable_64x64_3:: @ 85096D0
sprite_oam -32, -32, 2, 0, 64x64
subsprite -32, -32, 2, 0, 64x64
.align 2
gFieldObjectSpriteOamTables_64x64:: @ 85096D4
@@ -278,75 +278,75 @@ gFieldObjectSpriteOamTables_64x64:: @ 85096D4
.align 2
gFieldObjectSpriteOamTable_SSTidal_0:: @ 8509704
sprite_oam -48, -20, 2, 0, 32x8
sprite_oam -16, -20, 2, 4, 32x8
sprite_oam 16, -20, 2, 8, 32x8
sprite_oam -48, -12, 2, 12, 32x8
sprite_oam -16, -12, 2, 16, 32x8
sprite_oam 16, -12, 2, 20, 32x8
sprite_oam -48, -4, 2, 24, 32x8
sprite_oam -16, -4, 2, 28, 32x8
sprite_oam 16, -4, 2, 32, 32x8
sprite_oam -48, 4, 2, 36, 32x8
sprite_oam -16, 4, 2, 40, 32x8
sprite_oam 16, 4, 2, 44, 32x8
sprite_oam -48, 12, 2, 48, 32x8
sprite_oam -16, 12, 2, 52, 32x8
sprite_oam 16, 12, 2, 56, 32x8
subsprite -48, -20, 2, 0, 32x8
subsprite -16, -20, 2, 4, 32x8
subsprite 16, -20, 2, 8, 32x8
subsprite -48, -12, 2, 12, 32x8
subsprite -16, -12, 2, 16, 32x8
subsprite 16, -12, 2, 20, 32x8
subsprite -48, -4, 2, 24, 32x8
subsprite -16, -4, 2, 28, 32x8
subsprite 16, -4, 2, 32, 32x8
subsprite -48, 4, 2, 36, 32x8
subsprite -16, 4, 2, 40, 32x8
subsprite 16, 4, 2, 44, 32x8
subsprite -48, 12, 2, 48, 32x8
subsprite -16, 12, 2, 52, 32x8
subsprite 16, 12, 2, 56, 32x8
.align 2
gFieldObjectSpriteOamTable_SSTidal_1:: @ 8509740
sprite_oam -48, -20, 1, 0, 32x8
sprite_oam -16, -20, 1, 4, 32x8
sprite_oam 16, -20, 1, 8, 32x8
sprite_oam -48, -12, 1, 12, 32x8
sprite_oam -16, -12, 1, 16, 32x8
sprite_oam 16, -12, 1, 20, 32x8
sprite_oam -48, -4, 1, 24, 32x8
sprite_oam -16, -4, 1, 28, 32x8
sprite_oam 16, -4, 1, 32, 32x8
sprite_oam -48, 4, 1, 36, 32x8
sprite_oam -16, 4, 1, 40, 32x8
sprite_oam 16, 4, 1, 44, 32x8
sprite_oam -48, 12, 1, 48, 32x8
sprite_oam -16, 12, 1, 52, 32x8
sprite_oam 16, 12, 1, 56, 32x8
subsprite -48, -20, 1, 0, 32x8
subsprite -16, -20, 1, 4, 32x8
subsprite 16, -20, 1, 8, 32x8
subsprite -48, -12, 1, 12, 32x8
subsprite -16, -12, 1, 16, 32x8
subsprite 16, -12, 1, 20, 32x8
subsprite -48, -4, 1, 24, 32x8
subsprite -16, -4, 1, 28, 32x8
subsprite 16, -4, 1, 32, 32x8
subsprite -48, 4, 1, 36, 32x8
subsprite -16, 4, 1, 40, 32x8
subsprite 16, 4, 1, 44, 32x8
subsprite -48, 12, 1, 48, 32x8
subsprite -16, 12, 1, 52, 32x8
subsprite 16, 12, 1, 56, 32x8
.align 2
gFieldObjectSpriteOamTable_SSTidal_2:: @ 850977C
sprite_oam -48, -20, 2, 0, 32x8
sprite_oam -16, -20, 2, 4, 32x8
sprite_oam 16, -20, 2, 8, 32x8
sprite_oam -48, -12, 2, 12, 32x8
sprite_oam -16, -12, 2, 16, 32x8
sprite_oam 16, -12, 2, 20, 32x8
sprite_oam -48, -4, 2, 24, 32x8
sprite_oam -16, -4, 2, 28, 32x8
sprite_oam 16, -4, 2, 32, 32x8
sprite_oam -48, 4, 2, 36, 32x8
sprite_oam -16, 4, 2, 40, 32x8
sprite_oam 16, 4, 2, 44, 32x8
sprite_oam -48, 12, 2, 48, 32x8
sprite_oam -16, 12, 2, 52, 32x8
sprite_oam 16, 12, 2, 56, 32x8
subsprite -48, -20, 2, 0, 32x8
subsprite -16, -20, 2, 4, 32x8
subsprite 16, -20, 2, 8, 32x8
subsprite -48, -12, 2, 12, 32x8
subsprite -16, -12, 2, 16, 32x8
subsprite 16, -12, 2, 20, 32x8
subsprite -48, -4, 2, 24, 32x8
subsprite -16, -4, 2, 28, 32x8
subsprite 16, -4, 2, 32, 32x8
subsprite -48, 4, 2, 36, 32x8
subsprite -16, 4, 2, 40, 32x8
subsprite 16, 4, 2, 44, 32x8
subsprite -48, 12, 2, 48, 32x8
subsprite -16, 12, 2, 52, 32x8
subsprite 16, 12, 2, 56, 32x8
.align 2
gFieldObjectSpriteOamTable_SSTidal_3:: @ 85097B8
sprite_oam -48, -20, 1, 0, 32x8
sprite_oam -16, -20, 1, 4, 32x8
sprite_oam 16, -20, 1, 8, 32x8
sprite_oam -48, -12, 1, 12, 32x8
sprite_oam -16, -12, 1, 16, 32x8
sprite_oam 16, -12, 1, 20, 32x8
sprite_oam -48, -4, 2, 24, 32x8
sprite_oam -16, -4, 2, 28, 32x8
sprite_oam 16, -4, 2, 32, 32x8
sprite_oam -48, 4, 2, 36, 32x8
sprite_oam -16, 4, 2, 40, 32x8
sprite_oam 16, 4, 2, 44, 32x8
sprite_oam -48, 12, 2, 48, 32x8
sprite_oam -16, 12, 2, 52, 32x8
sprite_oam 16, 12, 2, 56, 32x8
subsprite -48, -20, 1, 0, 32x8
subsprite -16, -20, 1, 4, 32x8
subsprite 16, -20, 1, 8, 32x8
subsprite -48, -12, 1, 12, 32x8
subsprite -16, -12, 1, 16, 32x8
subsprite 16, -12, 1, 20, 32x8
subsprite -48, -4, 2, 24, 32x8
subsprite -16, -4, 2, 28, 32x8
subsprite 16, -4, 2, 32, 32x8
subsprite -48, 4, 2, 36, 32x8
subsprite -16, 4, 2, 40, 32x8
subsprite 16, 4, 2, 44, 32x8
subsprite -48, 12, 2, 48, 32x8
subsprite -16, 12, 2, 52, 32x8
subsprite 16, 12, 2, 56, 32x8
.align 2
gFieldObjectSpriteOamTables_SSTidal:: @ 85097F4
@@ -370,79 +370,79 @@ gFieldObjectSpriteOamTables_SSTidal:: @ 85097F4
.align 2
gFieldObjectSpriteOamTable_SubmarineShadow_0:: @ 8509824
sprite_oam -48, -20, 2, 0, 32x8
sprite_oam -16, -20, 2, 4, 32x8
sprite_oam 16, -20, 2, 8, 16x8
sprite_oam 32, -20, 2, 10, 8x8
sprite_oam -48, -12, 2, 11, 32x8
sprite_oam -16, -12, 2, 15, 32x8
sprite_oam 16, -12, 2, 19, 16x8
sprite_oam 32, -12, 2, 21, 8x8
sprite_oam -48, -4, 2, 22, 32x8
sprite_oam -16, -4, 2, 26, 32x8
sprite_oam 16, -4, 2, 30, 16x8
sprite_oam 32, -4, 2, 32, 8x8
sprite_oam -48, 4, 2, 33, 32x8
sprite_oam -16, 4, 2, 37, 32x8
sprite_oam 16, 4, 2, 41, 16x8
sprite_oam 32, 4, 2, 43, 8x8
subsprite -48, -20, 2, 0, 32x8
subsprite -16, -20, 2, 4, 32x8
subsprite 16, -20, 2, 8, 16x8
subsprite 32, -20, 2, 10, 8x8
subsprite -48, -12, 2, 11, 32x8
subsprite -16, -12, 2, 15, 32x8
subsprite 16, -12, 2, 19, 16x8
subsprite 32, -12, 2, 21, 8x8
subsprite -48, -4, 2, 22, 32x8
subsprite -16, -4, 2, 26, 32x8
subsprite 16, -4, 2, 30, 16x8
subsprite 32, -4, 2, 32, 8x8
subsprite -48, 4, 2, 33, 32x8
subsprite -16, 4, 2, 37, 32x8
subsprite 16, 4, 2, 41, 16x8
subsprite 32, 4, 2, 43, 8x8
.align 2
gFieldObjectSpriteOamTable_SubmarineShadow_1:: @ 8509864
sprite_oam -48, -20, 1, 0, 32x8
sprite_oam -16, -20, 1, 4, 32x8
sprite_oam 16, -20, 1, 8, 16x8
sprite_oam 32, -20, 1, 10, 8x8
sprite_oam -48, -12, 1, 11, 32x8
sprite_oam -16, -12, 1, 15, 32x8
sprite_oam 16, -12, 1, 19, 16x8
sprite_oam 32, -12, 1, 21, 8x8
sprite_oam -48, -4, 1, 22, 32x8
sprite_oam -16, -4, 1, 26, 32x8
sprite_oam 16, -4, 1, 30, 16x8
sprite_oam 32, -4, 1, 32, 8x8
sprite_oam -48, 4, 1, 33, 32x8
sprite_oam -16, 4, 1, 37, 32x8
sprite_oam 16, 4, 1, 41, 16x8
sprite_oam 32, 4, 1, 43, 8x8
subsprite -48, -20, 1, 0, 32x8
subsprite -16, -20, 1, 4, 32x8
subsprite 16, -20, 1, 8, 16x8
subsprite 32, -20, 1, 10, 8x8
subsprite -48, -12, 1, 11, 32x8
subsprite -16, -12, 1, 15, 32x8
subsprite 16, -12, 1, 19, 16x8
subsprite 32, -12, 1, 21, 8x8
subsprite -48, -4, 1, 22, 32x8
subsprite -16, -4, 1, 26, 32x8
subsprite 16, -4, 1, 30, 16x8
subsprite 32, -4, 1, 32, 8x8
subsprite -48, 4, 1, 33, 32x8
subsprite -16, 4, 1, 37, 32x8
subsprite 16, 4, 1, 41, 16x8
subsprite 32, 4, 1, 43, 8x8
.align 2
gFieldObjectSpriteOamTable_SubmarineShadow_2:: @ 85098A4
sprite_oam -48, -20, 2, 0, 32x8
sprite_oam -16, -20, 2, 4, 32x8
sprite_oam 16, -20, 2, 8, 16x8
sprite_oam 32, -20, 2, 10, 8x8
sprite_oam -48, -12, 2, 11, 32x8
sprite_oam -16, -12, 2, 15, 32x8
sprite_oam 16, -12, 2, 19, 16x8
sprite_oam 32, -12, 2, 21, 8x8
sprite_oam -48, -4, 2, 22, 32x8
sprite_oam -16, -4, 2, 26, 32x8
sprite_oam 16, -4, 2, 30, 16x8
sprite_oam 32, -4, 2, 32, 8x8
sprite_oam -48, 4, 2, 33, 32x8
sprite_oam -16, 4, 2, 37, 32x8
sprite_oam 16, 4, 2, 41, 16x8
sprite_oam 32, 4, 2, 43, 8x8
subsprite -48, -20, 2, 0, 32x8
subsprite -16, -20, 2, 4, 32x8
subsprite 16, -20, 2, 8, 16x8
subsprite 32, -20, 2, 10, 8x8
subsprite -48, -12, 2, 11, 32x8
subsprite -16, -12, 2, 15, 32x8
subsprite 16, -12, 2, 19, 16x8
subsprite 32, -12, 2, 21, 8x8
subsprite -48, -4, 2, 22, 32x8
subsprite -16, -4, 2, 26, 32x8
subsprite 16, -4, 2, 30, 16x8
subsprite 32, -4, 2, 32, 8x8
subsprite -48, 4, 2, 33, 32x8
subsprite -16, 4, 2, 37, 32x8
subsprite 16, 4, 2, 41, 16x8
subsprite 32, 4, 2, 43, 8x8
.align 2
gFieldObjectSpriteOamTable_SubmarineShadow_3:: @ 85098E4
sprite_oam -48, -20, 1, 0, 32x8
sprite_oam -16, -20, 1, 4, 32x8
sprite_oam 16, -20, 1, 8, 16x8
sprite_oam 32, -20, 1, 10, 8x8
sprite_oam -48, -12, 1, 11, 32x8
sprite_oam -16, -12, 1, 15, 32x8
sprite_oam 16, -12, 1, 19, 16x8
sprite_oam 32, -12, 1, 21, 8x8
sprite_oam -48, -4, 2, 22, 32x8
sprite_oam -16, -4, 2, 26, 32x8
sprite_oam 16, -4, 2, 30, 16x8
sprite_oam 32, -4, 2, 32, 8x8
sprite_oam -48, 4, 2, 33, 32x8
sprite_oam -16, 4, 2, 37, 32x8
sprite_oam 16, 4, 2, 41, 16x8
sprite_oam 32, 4, 2, 43, 8x8
subsprite -48, -20, 1, 0, 32x8
subsprite -16, -20, 1, 4, 32x8
subsprite 16, -20, 1, 8, 16x8
subsprite 32, -20, 1, 10, 8x8
subsprite -48, -12, 1, 11, 32x8
subsprite -16, -12, 1, 15, 32x8
subsprite 16, -12, 1, 19, 16x8
subsprite 32, -12, 1, 21, 8x8
subsprite -48, -4, 2, 22, 32x8
subsprite -16, -4, 2, 26, 32x8
subsprite 16, -4, 2, 30, 16x8
subsprite 32, -4, 2, 32, 8x8
subsprite -48, 4, 2, 33, 32x8
subsprite -16, 4, 2, 37, 32x8
subsprite 16, 4, 2, 41, 16x8
subsprite 32, 4, 2, 43, 8x8
.align 2
gFieldObjectSpriteOamTables_SubmarineShadow:: @ 8509924
data/graphics/pokemon/icon_palette_indices.inc
-442
View File
@@ -1,442 +0,0 @@
.align 2
gMonIconPaletteIndices:: @ 857C388
.byte 0 @ ??????????
.byte 1 @ Bulbasaur
.byte 1 @ Ivysaur
.byte 1 @ Venusaur
.byte 0 @ Charmander
.byte 0 @ Charmeleon
.byte 0 @ Charizard
.byte 0 @ Squirtle
.byte 2 @ Wartortle
.byte 2 @ Blastoise
.byte 1 @ Caterpie
.byte 1 @ Metapod
.byte 0 @ Butterfree
.byte 1 @ Weedle
.byte 2 @ Kakuna
.byte 2 @ Beedrill
.byte 0 @ Pidgey
.byte 0 @ Pidgeotto
.byte 0 @ Pidgeot
.byte 2 @ Rattata
.byte 1 @ Raticate
.byte 0 @ Spearow
.byte 0 @ Fearow
.byte 2 @ Ekans
.byte 2 @ Arbok
.byte 2 @ Pikachu
.byte 0 @ Raichu
.byte 2 @ Sandshrew
.byte 2 @ Sandslash
.byte 2 @ Nidoran♀
.byte 2 @ Nidorina
.byte 2 @ Nidoqueen
.byte 2 @ Nidoran♂
.byte 2 @ Nidorino
.byte 2 @ Nidoking
.byte 0 @ Clefairy
.byte 0 @ Clefable
.byte 2 @ Vulpix
.byte 1 @ Ninetales
.byte 0 @ Jigglypuff
.byte 0 @ Wigglytuff
.byte 2 @ Zubat
.byte 2 @ Golbat
.byte 1 @ Oddish
.byte 0 @ Gloom
.byte 0 @ Vileplume
.byte 0 @ Paras
.byte 0 @ Parasect
.byte 0 @ Venonat
.byte 2 @ Venomoth
.byte 2 @ Diglett
.byte 2 @ Dugtrio
.byte 1 @ Meowth
.byte 1 @ Persian
.byte 1 @ Psyduck
.byte 2 @ Golduck
.byte 1 @ Mankey
.byte 2 @ Primeape
.byte 0 @ Growlithe
.byte 0 @ Arcanine
.byte 0 @ Poliwag
.byte 0 @ Poliwhirl
.byte 0 @ Poliwrath
.byte 2 @ Abra
.byte 2 @ Kadabra
.byte 2 @ Alakazam
.byte 0 @ Machop
.byte 2 @ Machoke
.byte 0 @ Machamp
.byte 1 @ Bellsprout
.byte 1 @ Weepinbell
.byte 1 @ Victreebel
.byte 2 @ Tentacool
.byte 2 @ Tentacruel
.byte 1 @ Geodude
.byte 1 @ Graveler
.byte 1 @ Golem
.byte 0 @ Ponyta
.byte 0 @ Rapidash
.byte 0 @ Slowpoke
.byte 0 @ Slowbro
.byte 0 @ Magnemite
.byte 0 @ Magneton
.byte 1 @ Farfetch'd
.byte 2 @ Doduo
.byte 2 @ Dodrio
.byte 2 @ Seel
.byte 2 @ Dewgong
.byte 2 @ Grimer
.byte 2 @ Muk
.byte 2 @ Shellder
.byte 2 @ Cloyster
.byte 2 @ Gastly
.byte 2 @ Haunter
.byte 2 @ Gengar
.byte 2 @ Onix
.byte 2 @ Drowzee
.byte 1 @ Hypno
.byte 2 @ Krabby
.byte 2 @ Kingler
.byte 0 @ Voltorb
.byte 0 @ Electrode
.byte 0 @ Exeggcute
.byte 1 @ Exeggutor
.byte 1 @ Cubone
.byte 1 @ Marowak
.byte 2 @ Hitmonlee
.byte 2 @ Hitmonchan
.byte 1 @ Lickitung
.byte 2 @ Koffing
.byte 2 @ Weezing
.byte 1 @ Rhyhorn
.byte 1 @ Rhydon
.byte 0 @ Chansey
.byte 0 @ Tangela
.byte 1 @ Kangaskhan
.byte 0 @ Horsea
.byte 0 @ Seadra
.byte 0 @ Goldeen
.byte 0 @ Seaking
.byte 2 @ Staryu
.byte 2 @ Starmie
.byte 0 @ Mr. mime
.byte 1 @ Scyther
.byte 2 @ Jynx
.byte 1 @ Electabuzz
.byte 0 @ Magmar
.byte 2 @ Pinsir
.byte 2 @ Tauros
.byte 0 @ Magikarp
.byte 0 @ Gyarados
.byte 2 @ Lapras
.byte 2 @ Ditto
.byte 2 @ Eevee
.byte 0 @ Vaporeon
.byte 0 @ Jolteon
.byte 0 @ Flareon
.byte 0 @ Porygon
.byte 0 @ Omanyte
.byte 0 @ Omastar
.byte 2 @ Kabuto
.byte 2 @ Kabutops
.byte 0 @ Aerodactyl
.byte 1 @ Snorlax
.byte 0 @ Articuno
.byte 0 @ Zapdos
.byte 0 @ Moltres
.byte 0 @ Dratini
.byte 0 @ Dragonair
.byte 2 @ Dragonite
.byte 2 @ Mewtwo
.byte 0 @ Mew
.byte 1 @ Chikorita
.byte 1 @ Bayleef
.byte 1 @ Meganium
.byte 1 @ Cyndaquil
.byte 1 @ Quilava
.byte 1 @ Typhlosion
.byte 2 @ Totodile
.byte 2 @ Croconaw
.byte 2 @ Feraligatr
.byte 2 @ Sentret
.byte 2 @ Furret
.byte 2 @ Hoothoot
.byte 2 @ Noctowl
.byte 0 @ Ledyba
.byte 0 @ Ledian
.byte 1 @ Spinarak
.byte 0 @ Ariados
.byte 2 @ Crobat
.byte 2 @ Chinchou
.byte 0 @ Lanturn
.byte 0 @ Pichu
.byte 0 @ Cleffa
.byte 1 @ Igglybuff
.byte 2 @ Togepi
.byte 2 @ Togetic
.byte 0 @ Natu
.byte 0 @ Xatu
.byte 2 @ Mareep
.byte 0 @ Flaaffy
.byte 0 @ Ampharos
.byte 1 @ Bellossom
.byte 2 @ Marill
.byte 2 @ Azumarill
.byte 1 @ Sudowoodo
.byte 1 @ Politoed
.byte 1 @ Hoppip
.byte 1 @ Skiploom
.byte 2 @ Jumpluff
.byte 2 @ Aipom
.byte 1 @ Sunkern
.byte 1 @ Sunflora
.byte 1 @ Yanma
.byte 0 @ Wooper
.byte 0 @ Quagsire
.byte 2 @ Espeon
.byte 2 @ Umbreon
.byte 2 @ Murkrow
.byte 0 @ Slowking
.byte 0 @ Misdreavus
.byte 0 @ Unown A
.byte 0 @ Wobbuffet
.byte 1 @ Girafarig
.byte 0 @ Pineco
.byte 2 @ Forretress
.byte 2 @ Dunsparce
.byte 2 @ Gligar
.byte 0 @ Steelix
.byte 0 @ Snubbull
.byte 2 @ Granbull
.byte 0 @ Qwilfish
.byte 0 @ Scizor
.byte 1 @ Shuckle
.byte 2 @ Heracross
.byte 0 @ Sneasel
.byte 0 @ Teddiursa
.byte 2 @ Ursaring
.byte 0 @ Slugma
.byte 0 @ Magcargo
.byte 2 @ Swinub
.byte 2 @ Piloswine
.byte 0 @ Corsola
.byte 0 @ Remoraid
.byte 0 @ Octillery
.byte 0 @ Delibird
.byte 2 @ Mantine
.byte 0 @ Skarmory
.byte 0 @ Houndour
.byte 0 @ Houndoom
.byte 0 @ Kingdra
.byte 0 @ Phanpy
.byte 0 @ Donphan
.byte 0 @ Porygon2
.byte 2 @ Stantler
.byte 1 @ Smeargle
.byte 2 @ Tyrogue
.byte 2 @ Hitmontop
.byte 1 @ Smoochum
.byte 1 @ Elekid
.byte 1 @ Magby
.byte 1 @ Miltank
.byte 1 @ Blissey
.byte 0 @ Raikou
.byte 2 @ Entei
.byte 0 @ Suicune
.byte 1 @ Larvitar
.byte 0 @ Pupitar
.byte 1 @ Tyranitar
.byte 0 @ Lugia
.byte 1 @ Ho-Oh
.byte 1 @ Celebi
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 1 @ Treecko
.byte 0 @ Grovyle
.byte 1 @ Sceptile
.byte 0 @ Torchic
.byte 0 @ Combusken
.byte 0 @ Blaziken
.byte 0 @ Mudkip
.byte 0 @ Marshtomp
.byte 0 @ Swampert
.byte 2 @ Poochyena
.byte 2 @ Mightyena
.byte 2 @ Zigzagoon
.byte 2 @ Linoone
.byte 0 @ Wurmple
.byte 2 @ Silcoon
.byte 0 @ Beautifly
.byte 2 @ Cascoon
.byte 1 @ Dustox
.byte 1 @ Lotad
.byte 1 @ Lombre
.byte 1 @ Ludicolo
.byte 1 @ Seedot
.byte 1 @ Nuzleaf
.byte 0 @ Shiftry
.byte 1 @ Nincada
.byte 1 @ Ninjask
.byte 1 @ Shedinja
.byte 2 @ Taillow
.byte 2 @ Swellow
.byte 1 @ Shroomish
.byte 1 @ Breloom
.byte 1 @ Spinda
.byte 0 @ Wingull
.byte 0 @ Pelipper
.byte 2 @ Surskit
.byte 0 @ Masquerain
.byte 2 @ Wailmer
.byte 0 @ Wailord
.byte 0 @ Skitty
.byte 2 @ Delcatty
.byte 1 @ Kecleon
.byte 1 @ Baltoy
.byte 0 @ Claydol
.byte 0 @ Nosepass
.byte 1 @ Torkoal
.byte 2 @ Sableye
.byte 0 @ Barboach
.byte 0 @ Whiscash
.byte 0 @ Luvdisc
.byte 0 @ Corphish
.byte 0 @ Crawdaunt
.byte 2 @ Feebas
.byte 0 @ Milotic
.byte 0 @ Carvanha
.byte 0 @ Sharpedo
.byte 1 @ Trapinch
.byte 1 @ Vibrava
.byte 1 @ Flygon
.byte 2 @ Makuhita
.byte 1 @ Hariyama
.byte 1 @ Electrike
.byte 0 @ Manectric
.byte 1 @ Numel
.byte 0 @ Camerupt
.byte 2 @ Spheal
.byte 2 @ Sealeo
.byte 0 @ Walrein
.byte 1 @ Cacnea
.byte 1 @ Cacturne
.byte 2 @ Snorunt
.byte 0 @ Glalie
.byte 1 @ Lunatone
.byte 0 @ Solrock
.byte 2 @ Azurill
.byte 0 @ Spoink
.byte 2 @ Grumpig
.byte 0 @ Plusle
.byte 0 @ Minun
.byte 2 @ Mawile
.byte 0 @ Meditite
.byte 0 @ Medicham
.byte 0 @ Swablu
.byte 0 @ Altaria
.byte 0 @ Wynaut
.byte 0 @ Duskull
.byte 0 @ Dusclops
.byte 0 @ Roselia
.byte 2 @ Slakoth
.byte 2 @ Vigoroth
.byte 1 @ Slaking
.byte 1 @ Gulpin
.byte 2 @ Swalot
.byte 1 @ Tropius
.byte 0 @ Whismur
.byte 2 @ Loudred
.byte 2 @ Exploud
.byte 0 @ Clamperl
.byte 0 @ Huntail
.byte 0 @ Gorebyss
.byte 0 @ Absol
.byte 0 @ Shuppet
.byte 0 @ Banette
.byte 2 @ Seviper
.byte 0 @ Zangoose
.byte 1 @ Relicanth
.byte 2 @ Aron
.byte 2 @ Lairon
.byte 2 @ Aggron
.byte 0 @ Castform
.byte 0 @ Volbeat
.byte 2 @ Illumise
.byte 2 @ Lileep
.byte 0 @ Cradily
.byte 0 @ Anorith
.byte 0 @ Armaldo
.byte 1 @ Ralts
.byte 1 @ Kirlia
.byte 1 @ Gardevoir
.byte 2 @ Bagon
.byte 2 @ Shelgon
.byte 0 @ Salamence
.byte 0 @ Beldum
.byte 0 @ Metang
.byte 0 @ Metagross
.byte 2 @ Regirock
.byte 2 @ Regice
.byte 2 @ Registeel
.byte 2 @ Kyogre
.byte 0 @ Groudon
.byte 1 @ Rayquaza
.byte 0 @ Latias
.byte 2 @ Latios
.byte 0 @ Jirachi
.byte 0 @ Deoxys
.byte 0 @ Chimecho
.byte 1 @ Egg
.byte 0 @ Unown B
.byte 0 @ Unown C
.byte 0 @ Unown D
.byte 0 @ Unown E
.byte 0 @ Unown F
.byte 0 @ Unown G
.byte 0 @ Unown H
.byte 0 @ Unown I
.byte 0 @ Unown J
.byte 0 @ Unown K
.byte 0 @ Unown L
.byte 0 @ Unown M
.byte 0 @ Unown N
.byte 0 @ Unown O
.byte 0 @ Unown P
.byte 0 @ Unown Q
.byte 0 @ Unown R
.byte 0 @ Unown S
.byte 0 @ Unown T
.byte 0 @ Unown U
.byte 0 @ Unown V
.byte 0 @ Unown W
.byte 0 @ Unown X
.byte 0 @ Unown Y
.byte 0 @ Unown Z
.byte 0 @ Unown Exclamation Mark
.byte 0 @ Unown Question Mark
data/graphics/pokemon/icon_palette_table.inc
-11
View File
@@ -1,11 +0,0 @@
.align 2
gMonIconPaletteTable:: @ 857C540
obj_pal gMonIconPalettes + 0 * 32, 56000
obj_pal gMonIconPalettes + 1 * 32, 56001
obj_pal gMonIconPalettes + 2 * 32, 56002
@ These palettes are actually part of the title screen BG palette and are not
@ used for Pokémon icons.
obj_pal gMonIconPalettes + 3 * 32, 56003
obj_pal gMonIconPalettes + 4 * 32, 56004
obj_pal gMonIconPalettes + 5 * 32, 56005
data/graphics/pokemon/icon_table.inc
-442
View File
@@ -1,442 +0,0 @@
.align 2
gMonIconTable:: @ 857BCA8
.4byte gMonIcon_Bulbasaur
.4byte gMonIcon_Bulbasaur
.4byte gMonIcon_Ivysaur
.4byte gMonIcon_Venusaur
.4byte gMonIcon_Charmander
.4byte gMonIcon_Charmeleon
.4byte gMonIcon_Charizard
.4byte gMonIcon_Squirtle
.4byte gMonIcon_Wartortle
.4byte gMonIcon_Blastoise
.4byte gMonIcon_Caterpie
.4byte gMonIcon_Metapod
.4byte gMonIcon_Butterfree
.4byte gMonIcon_Weedle
.4byte gMonIcon_Kakuna
.4byte gMonIcon_Beedrill
.4byte gMonIcon_Pidgey
.4byte gMonIcon_Pidgeotto
.4byte gMonIcon_Pidgeot
.4byte gMonIcon_Rattata
.4byte gMonIcon_Raticate
.4byte gMonIcon_Spearow
.4byte gMonIcon_Fearow
.4byte gMonIcon_Ekans
.4byte gMonIcon_Arbok
.4byte gMonIcon_Pikachu
.4byte gMonIcon_Raichu
.4byte gMonIcon_Sandshrew
.4byte gMonIcon_Sandslash
.4byte gMonIcon_NidoranF
.4byte gMonIcon_Nidorina
.4byte gMonIcon_Nidoqueen
.4byte gMonIcon_NidoranM
.4byte gMonIcon_Nidorino
.4byte gMonIcon_Nidoking
.4byte gMonIcon_Clefairy
.4byte gMonIcon_Clefable
.4byte gMonIcon_Vulpix
.4byte gMonIcon_Ninetales
.4byte gMonIcon_Jigglypuff
.4byte gMonIcon_Wigglytuff
.4byte gMonIcon_Zubat
.4byte gMonIcon_Golbat
.4byte gMonIcon_Oddish
.4byte gMonIcon_Gloom
.4byte gMonIcon_Vileplume
.4byte gMonIcon_Paras
.4byte gMonIcon_Parasect
.4byte gMonIcon_Venonat
.4byte gMonIcon_Venomoth
.4byte gMonIcon_Diglett
.4byte gMonIcon_Dugtrio
.4byte gMonIcon_Meowth
.4byte gMonIcon_Persian
.4byte gMonIcon_Psyduck
.4byte gMonIcon_Golduck
.4byte gMonIcon_Mankey
.4byte gMonIcon_Primeape
.4byte gMonIcon_Growlithe
.4byte gMonIcon_Arcanine
.4byte gMonIcon_Poliwag
.4byte gMonIcon_Poliwhirl
.4byte gMonIcon_Poliwrath
.4byte gMonIcon_Abra
.4byte gMonIcon_Kadabra
.4byte gMonIcon_Alakazam
.4byte gMonIcon_Machop
.4byte gMonIcon_Machoke
.4byte gMonIcon_Machamp
.4byte gMonIcon_Bellsprout
.4byte gMonIcon_Weepinbell
.4byte gMonIcon_Victreebel
.4byte gMonIcon_Tentacool
.4byte gMonIcon_Tentacruel
.4byte gMonIcon_Geodude
.4byte gMonIcon_Graveler
.4byte gMonIcon_Golem
.4byte gMonIcon_Ponyta
.4byte gMonIcon_Rapidash
.4byte gMonIcon_Slowpoke
.4byte gMonIcon_Slowbro
.4byte gMonIcon_Magnemite
.4byte gMonIcon_Magneton
.4byte gMonIcon_Farfetchd
.4byte gMonIcon_Doduo
.4byte gMonIcon_Dodrio
.4byte gMonIcon_Seel
.4byte gMonIcon_Dewgong
.4byte gMonIcon_Grimer
.4byte gMonIcon_Muk
.4byte gMonIcon_Shellder
.4byte gMonIcon_Cloyster
.4byte gMonIcon_Gastly
.4byte gMonIcon_Haunter
.4byte gMonIcon_Gengar
.4byte gMonIcon_Onix
.4byte gMonIcon_Drowzee
.4byte gMonIcon_Hypno
.4byte gMonIcon_Krabby
.4byte gMonIcon_Kingler
.4byte gMonIcon_Voltorb
.4byte gMonIcon_Electrode
.4byte gMonIcon_Exeggcute
.4byte gMonIcon_Exeggutor
.4byte gMonIcon_Cubone
.4byte gMonIcon_Marowak
.4byte gMonIcon_Hitmonlee
.4byte gMonIcon_Hitmonchan
.4byte gMonIcon_Lickitung
.4byte gMonIcon_Koffing
.4byte gMonIcon_Weezing
.4byte gMonIcon_Rhyhorn
.4byte gMonIcon_Rhydon
.4byte gMonIcon_Chansey
.4byte gMonIcon_Tangela
.4byte gMonIcon_Kangaskhan
.4byte gMonIcon_Horsea
.4byte gMonIcon_Seadra
.4byte gMonIcon_Goldeen
.4byte gMonIcon_Seaking
.4byte gMonIcon_Staryu
.4byte gMonIcon_Starmie
.4byte gMonIcon_Mrmime
.4byte gMonIcon_Scyther
.4byte gMonIcon_Jynx
.4byte gMonIcon_Electabuzz
.4byte gMonIcon_Magmar
.4byte gMonIcon_Pinsir
.4byte gMonIcon_Tauros
.4byte gMonIcon_Magikarp
.4byte gMonIcon_Gyarados
.4byte gMonIcon_Lapras
.4byte gMonIcon_Ditto
.4byte gMonIcon_Eevee
.4byte gMonIcon_Vaporeon
.4byte gMonIcon_Jolteon
.4byte gMonIcon_Flareon
.4byte gMonIcon_Porygon
.4byte gMonIcon_Omanyte
.4byte gMonIcon_Omastar
.4byte gMonIcon_Kabuto
.4byte gMonIcon_Kabutops
.4byte gMonIcon_Aerodactyl
.4byte gMonIcon_Snorlax
.4byte gMonIcon_Articuno
.4byte gMonIcon_Zapdos
.4byte gMonIcon_Moltres
.4byte gMonIcon_Dratini
.4byte gMonIcon_Dragonair
.4byte gMonIcon_Dragonite
.4byte gMonIcon_Mewtwo
.4byte gMonIcon_Mew
.4byte gMonIcon_Chikorita
.4byte gMonIcon_Bayleef
.4byte gMonIcon_Meganium
.4byte gMonIcon_Cyndaquil
.4byte gMonIcon_Quilava
.4byte gMonIcon_Typhlosion
.4byte gMonIcon_Totodile
.4byte gMonIcon_Croconaw
.4byte gMonIcon_Feraligatr
.4byte gMonIcon_Sentret
.4byte gMonIcon_Furret
.4byte gMonIcon_Hoothoot
.4byte gMonIcon_Noctowl
.4byte gMonIcon_Ledyba
.4byte gMonIcon_Ledian
.4byte gMonIcon_Spinarak
.4byte gMonIcon_Ariados
.4byte gMonIcon_Crobat
.4byte gMonIcon_Chinchou
.4byte gMonIcon_Lanturn
.4byte gMonIcon_Pichu
.4byte gMonIcon_Cleffa
.4byte gMonIcon_Igglybuff
.4byte gMonIcon_Togepi
.4byte gMonIcon_Togetic
.4byte gMonIcon_Natu
.4byte gMonIcon_Xatu
.4byte gMonIcon_Mareep
.4byte gMonIcon_Flaaffy
.4byte gMonIcon_Ampharos
.4byte gMonIcon_Bellossom
.4byte gMonIcon_Marill
.4byte gMonIcon_Azumarill
.4byte gMonIcon_Sudowoodo
.4byte gMonIcon_Politoed
.4byte gMonIcon_Hoppip
.4byte gMonIcon_Skiploom
.4byte gMonIcon_Jumpluff
.4byte gMonIcon_Aipom
.4byte gMonIcon_Sunkern
.4byte gMonIcon_Sunflora
.4byte gMonIcon_Yanma
.4byte gMonIcon_Wooper
.4byte gMonIcon_Quagsire
.4byte gMonIcon_Espeon
.4byte gMonIcon_Umbreon
.4byte gMonIcon_Murkrow
.4byte gMonIcon_Slowking
.4byte gMonIcon_Misdreavus
.4byte gMonIcon_UnownA
.4byte gMonIcon_Wobbuffet
.4byte gMonIcon_Girafarig
.4byte gMonIcon_Pineco
.4byte gMonIcon_Forretress
.4byte gMonIcon_Dunsparce
.4byte gMonIcon_Gligar
.4byte gMonIcon_Steelix
.4byte gMonIcon_Snubbull
.4byte gMonIcon_Granbull
.4byte gMonIcon_Qwilfish
.4byte gMonIcon_Scizor
.4byte gMonIcon_Shuckle
.4byte gMonIcon_Heracross
.4byte gMonIcon_Sneasel
.4byte gMonIcon_Teddiursa
.4byte gMonIcon_Ursaring
.4byte gMonIcon_Slugma
.4byte gMonIcon_Magcargo
.4byte gMonIcon_Swinub
.4byte gMonIcon_Piloswine
.4byte gMonIcon_Corsola
.4byte gMonIcon_Remoraid
.4byte gMonIcon_Octillery
.4byte gMonIcon_Delibird
.4byte gMonIcon_Mantine
.4byte gMonIcon_Skarmory
.4byte gMonIcon_Houndour
.4byte gMonIcon_Houndoom
.4byte gMonIcon_Kingdra
.4byte gMonIcon_Phanpy
.4byte gMonIcon_Donphan
.4byte gMonIcon_Porygon2
.4byte gMonIcon_Stantler
.4byte gMonIcon_Smeargle
.4byte gMonIcon_Tyrogue
.4byte gMonIcon_Hitmontop
.4byte gMonIcon_Smoochum
.4byte gMonIcon_Elekid
.4byte gMonIcon_Magby
.4byte gMonIcon_Miltank
.4byte gMonIcon_Blissey
.4byte gMonIcon_Raikou
.4byte gMonIcon_Entei
.4byte gMonIcon_Suicune
.4byte gMonIcon_Larvitar
.4byte gMonIcon_Pupitar
.4byte gMonIcon_Tyranitar
.4byte gMonIcon_Lugia
.4byte gMonIcon_HoOh
.4byte gMonIcon_Celebi
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_Treecko
.4byte gMonIcon_Grovyle
.4byte gMonIcon_Sceptile
.4byte gMonIcon_Torchic
.4byte gMonIcon_Combusken
.4byte gMonIcon_Blaziken
.4byte gMonIcon_Mudkip
.4byte gMonIcon_Marshtomp
.4byte gMonIcon_Swampert
.4byte gMonIcon_Poochyena
.4byte gMonIcon_Mightyena
.4byte gMonIcon_Zigzagoon
.4byte gMonIcon_Linoone
.4byte gMonIcon_Wurmple
.4byte gMonIcon_Silcoon
.4byte gMonIcon_Beautifly
.4byte gMonIcon_Cascoon
.4byte gMonIcon_Dustox
.4byte gMonIcon_Lotad
.4byte gMonIcon_Lombre
.4byte gMonIcon_Ludicolo
.4byte gMonIcon_Seedot
.4byte gMonIcon_Nuzleaf
.4byte gMonIcon_Shiftry
.4byte gMonIcon_Nincada
.4byte gMonIcon_Ninjask
.4byte gMonIcon_Shedinja
.4byte gMonIcon_Taillow
.4byte gMonIcon_Swellow
.4byte gMonIcon_Shroomish
.4byte gMonIcon_Breloom
.4byte gMonIcon_Spinda
.4byte gMonIcon_Wingull
.4byte gMonIcon_Pelipper
.4byte gMonIcon_Surskit
.4byte gMonIcon_Masquerain
.4byte gMonIcon_Wailmer
.4byte gMonIcon_Wailord
.4byte gMonIcon_Skitty
.4byte gMonIcon_Delcatty
.4byte gMonIcon_Kecleon
.4byte gMonIcon_Baltoy
.4byte gMonIcon_Claydol
.4byte gMonIcon_Nosepass
.4byte gMonIcon_Torkoal
.4byte gMonIcon_Sableye
.4byte gMonIcon_Barboach
.4byte gMonIcon_Whiscash
.4byte gMonIcon_Luvdisc
.4byte gMonIcon_Corphish
.4byte gMonIcon_Crawdaunt
.4byte gMonIcon_Feebas
.4byte gMonIcon_Milotic
.4byte gMonIcon_Carvanha
.4byte gMonIcon_Sharpedo
.4byte gMonIcon_Trapinch
.4byte gMonIcon_Vibrava
.4byte gMonIcon_Flygon
.4byte gMonIcon_Makuhita
.4byte gMonIcon_Hariyama
.4byte gMonIcon_Electrike
.4byte gMonIcon_Manectric
.4byte gMonIcon_Numel
.4byte gMonIcon_Camerupt
.4byte gMonIcon_Spheal
.4byte gMonIcon_Sealeo
.4byte gMonIcon_Walrein
.4byte gMonIcon_Cacnea
.4byte gMonIcon_Cacturne
.4byte gMonIcon_Snorunt
.4byte gMonIcon_Glalie
.4byte gMonIcon_Lunatone
.4byte gMonIcon_Solrock
.4byte gMonIcon_Azurill
.4byte gMonIcon_Spoink
.4byte gMonIcon_Grumpig
.4byte gMonIcon_Plusle
.4byte gMonIcon_Minun
.4byte gMonIcon_Mawile
.4byte gMonIcon_Meditite
.4byte gMonIcon_Medicham
.4byte gMonIcon_Swablu
.4byte gMonIcon_Altaria
.4byte gMonIcon_Wynaut
.4byte gMonIcon_Duskull
.4byte gMonIcon_Dusclops
.4byte gMonIcon_Roselia
.4byte gMonIcon_Slakoth
.4byte gMonIcon_Vigoroth
.4byte gMonIcon_Slaking
.4byte gMonIcon_Gulpin
.4byte gMonIcon_Swalot
.4byte gMonIcon_Tropius
.4byte gMonIcon_Whismur
.4byte gMonIcon_Loudred
.4byte gMonIcon_Exploud
.4byte gMonIcon_Clamperl
.4byte gMonIcon_Huntail
.4byte gMonIcon_Gorebyss
.4byte gMonIcon_Absol
.4byte gMonIcon_Shuppet
.4byte gMonIcon_Banette
.4byte gMonIcon_Seviper
.4byte gMonIcon_Zangoose
.4byte gMonIcon_Relicanth
.4byte gMonIcon_Aron
.4byte gMonIcon_Lairon
.4byte gMonIcon_Aggron
.4byte gMonIcon_Castform
.4byte gMonIcon_Volbeat
.4byte gMonIcon_Illumise
.4byte gMonIcon_Lileep
.4byte gMonIcon_Cradily
.4byte gMonIcon_Anorith
.4byte gMonIcon_Armaldo
.4byte gMonIcon_Ralts
.4byte gMonIcon_Kirlia
.4byte gMonIcon_Gardevoir
.4byte gMonIcon_Bagon
.4byte gMonIcon_Shelgon
.4byte gMonIcon_Salamence
.4byte gMonIcon_Beldum
.4byte gMonIcon_Metang
.4byte gMonIcon_Metagross
.4byte gMonIcon_Regirock
.4byte gMonIcon_Regice
.4byte gMonIcon_Registeel
.4byte gMonIcon_Kyogre
.4byte gMonIcon_Groudon
.4byte gMonIcon_Rayquaza
.4byte gMonIcon_Latias
.4byte gMonIcon_Latios
.4byte gMonIcon_Jirachi
.4byte gMonIcon_Deoxys
.4byte gMonIcon_Chimecho
.4byte gMonIcon_Egg
.4byte gMonIcon_UnownB
.4byte gMonIcon_UnownC
.4byte gMonIcon_UnownD
.4byte gMonIcon_UnownE
.4byte gMonIcon_UnownF
.4byte gMonIcon_UnownG
.4byte gMonIcon_UnownH
.4byte gMonIcon_UnownI
.4byte gMonIcon_UnownJ
.4byte gMonIcon_UnownK
.4byte gMonIcon_UnownL
.4byte gMonIcon_UnownM
.4byte gMonIcon_UnownN
.4byte gMonIcon_UnownO
.4byte gMonIcon_UnownP
.4byte gMonIcon_UnownQ
.4byte gMonIcon_UnownR
.4byte gMonIcon_UnownS
.4byte gMonIcon_UnownT
.4byte gMonIcon_UnownU
.4byte gMonIcon_UnownV
.4byte gMonIcon_UnownW
.4byte gMonIcon_UnownX
.4byte gMonIcon_UnownY
.4byte gMonIcon_UnownZ
.4byte gMonIcon_UnownExclamationMark
.4byte gMonIcon_UnownQuestionMark
data/learn_move.s
+2
View File
@@ -2,6 +2,8 @@
.include "constants/constants.inc"
.section .rodata
gUnknown_085CEA18:: @ 85CEA18
.incbin "baserom.gba", 0x5ceA18, 0x198
gUnknown_085CEBB0:: @ 85CEBB0
.incbin "baserom.gba", 0x5cebb0, 0x8
data/party_menu.s
+56 -9
View File
@@ -166,10 +166,51 @@ gUnknown_08615AF1:: @ 8615AF1
.incbin "baserom.gba", 0x615af1, 0x3
gUnknown_08615AF4:: @ 8615AF4
.incbin "baserom.gba", 0x615af4, 0x6c
.4byte gUnknown_085E9E43
.4byte gUnknown_085EA010
.4byte gUnknown_085EA02A
.4byte gUnknown_085E9E55
.4byte gUnknown_085E9E64
.4byte gUnknown_085E9E79
.4byte gUnknown_085E9E8F
.4byte gUnknown_085E9EBC
.4byte gUnknown_085E9ED4
.4byte gUnknown_085E9EE9
.4byte gUnknown_085E9FDB
.4byte gUnknown_085EA046
.4byte gUnknown_085EA05B
.4byte gUnknown_085E9F01
.4byte gUnknown_085E9F58
.4byte gUnknown_085E9F6F
.4byte gUnknown_085E9F81
.4byte gUnknown_085E9F90
.4byte gUnknown_085E9FA7
.4byte gUnknown_085E9FC2
.4byte gText_EmptyString2
.4byte gUnknown_085E9EA6
.4byte gUnknown_085E9F16
.4byte gUnknown_085E9F2A
.4byte gUnknown_085E9F42
.4byte gUnknown_085E9FF9
.4byte gUnknown_085EA073
gUnknown_08615B60:: @ 8615B60
.incbin "baserom.gba", 0x615b60, 0xa8
.4byte gUnknown_085EA091
.4byte gUnknown_085EA099
.4byte gUnknown_085EA09E
.4byte gUnknown_085EA0A4
.4byte gUnknown_085EA0AB
.4byte gUnknown_085EA0E7
.4byte gUnknown_085EA0B1
.4byte gUnknown_085EA0B6
.4byte gUnknown_085EA0BF
.4byte gUnknown_085EA0C5
.4byte gUnknown_085EA0CF
.4byte gUnknown_085EA0D7
.4byte gUnknown_085EA0DC
gUnknown_08615B94:: @ 8615B94
.incbin "baserom.gba", 0x615b94, 0x74
gUnknown_08615C08:: @ 8615C08
.incbin "baserom.gba", 0x615c08, 0x130
@@ -187,22 +228,28 @@ gUnknown_08615D9C:: @ 8615D9C
.incbin "baserom.gba", 0x615d9c, 0x70
gUnknown_08615E0C:: @ 8615E0C
.incbin "baserom.gba", 0x615e0c, 0xa4
.incbin "baserom.gba", 0x615e0c, 0x24
gUnknown_08615E30:: @ 8615E30
.incbin "baserom.gba", 0x615e30, 0x40
gUnknown_08615E70:: @ 8615E70
.incbin "baserom.gba", 0x615e70, 0x40
gUnknown_08615EB0:: @ 8615EB0
.incbin "baserom.gba", 0x615eb0, 0x8
obj_tiles gUnknown_08615E30, 0x40, 55120
gUnknown_08615EB8:: @ 8615EB8
.incbin "baserom.gba", 0x615eb8, 0x8
obj_pal gUnknown_08615E70, 55120
gUnknown_08615EC0:: @ 8615EC0
.incbin "baserom.gba", 0x615ec0, 0x38
gUnknown_08615EF8:: @ 8615EF8
.incbin "baserom.gba", 0x615ef8, 0x8
obj_tiles gUnknown_08D96CD8, 0x400, 1200
gUnknown_08615F00:: @ 8615F00
.incbin "baserom.gba", 0x615f00, 0x8
obj_pal gUnknown_08D96F6C, 1200
gUnknown_08615F08:: @ 8615F08
.incbin "baserom.gba", 0x615f08, 0x68
@@ -214,10 +261,10 @@ gUnknown_08615F78:: @ 8615F78
.incbin "baserom.gba", 0x615f78, 0x80
gUnknown_08615FF8:: @ 8615FF8
.incbin "baserom.gba", 0x615ff8, 0x8
obj_tiles gUnknown_08D96F90, 0x400, 1202
gUnknown_08616000:: @ 8616000
.incbin "baserom.gba", 0x616000, 0x8
obj_pal gUnknown_08D97188, 1202
gUnknown_08616008:: @ 8616008
.incbin "baserom.gba", 0x616008, 0x18
data/pokedex.s
+144 -65
View File
@@ -1,62 +1,26 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
.section .rodata
.align 2, 0
gUnknown_0855C6A4:: @ 855C6A4
.incbin "baserom.gba", 0x55c6a4, 0x336
.macro unk_dex_struct texts, a2, a3, a4
.4byte \texts
.byte \a2, \a3, \a4
.byte 0 @padding
.endm
gUnknown_0855C9DA:: @ 855C9DA
.incbin "baserom.gba", 0x55c9da, 0x304
.macro unk_dex_struct_2 text, a2, a3, a4, a5, a6, a7
.4byte \text
.byte \a2, \a3, \a4, \a5, \a6, \a7
.2byte 0 @padding
.endm
gUnknown_0855CCDE:: @ 855CCDE
.incbin "baserom.gba", 0x55ccde, 0x4b6
gUnknown_0855D194:: @ 855D194
.incbin "baserom.gba", 0x55d194, 0x18
gUnknown_0855D1AC:: @ 855D1AC
.incbin "baserom.gba", 0x55d1ac, 0x18
gUnknown_0855D1C4:: @ 855D1C4
.incbin "baserom.gba", 0x55d1c4, 0x18
gUnknown_0855D1DC:: @ 855D1DC
.incbin "baserom.gba", 0x55d1dc, 0x18
gUnknown_0855D1F4:: @ 855D1F4
.incbin "baserom.gba", 0x55d1f4, 0x18
gUnknown_0855D20C:: @ 855D20C
.incbin "baserom.gba", 0x55d20c, 0x18
gUnknown_0855D224:: @ 855D224
.incbin "baserom.gba", 0x55d224, 0x18
gUnknown_0855D23C:: @ 855D23C
.incbin "baserom.gba", 0x55d23c, 0x18
gUnknown_0855D254:: @ 855D254
.incbin "baserom.gba", 0x55d254, 0x18
gUnknown_0855D26C:: @ 855D26C
.incbin "baserom.gba", 0x55d26c, 0x10
gUnknown_0855D27C:: @ 855D27C
.incbin "baserom.gba", 0x55d27c, 0x10
gUnknown_0855D28C:: @ 855D28C
.incbin "baserom.gba", 0x55d28c, 0x5
gUnknown_0855D291:: @ 855D291
.incbin "baserom.gba", 0x55d291, 0x7
gUnknown_0855D298:: @ 855D298
.incbin "baserom.gba", 0x55d298, 0x10
gUnknown_0855D2A8:: @ 855D2A8
.incbin "baserom.gba", 0x55d2a8, 0x10
.macro unk_dex_struct_3 text, a2, a3, a4
.4byte \text
.byte \a2, \a3, \a4
.byte 0 @padding
.endm
gUnknown_0855D2B8:: @ 855D2B8
.incbin "baserom.gba", 0x55d2b8, 0x6
@@ -64,8 +28,10 @@ gUnknown_0855D2B8:: @ 855D2B8
gUnknown_0855D2BE:: @ 855D2BE
.incbin "baserom.gba", 0x55d2be, 0x40
gUnknown_0855D2FE:: @ 855D2FE
.incbin "baserom.gba", 0x55d2fe, 0xe
sText_TenDashes:: @ 855D2FE
.string "----------$"
.align 2
gUnknown_0855D30C:: @ 855D30C
.string "$"
@@ -101,10 +67,18 @@ gUnknown_0856ED08:: @ 856ED08
.incbin "baserom.gba", 0x56ed08, 0x28
gUnknown_0856ED30:: @ 856ED30
.incbin "baserom.gba", 0x56ed30, 0x18
unk_dex_struct_3 gUnknown_085E87A5, 0, 0, 5
unk_dex_struct_3 gUnknown_085E87D6, 6, 0, 5
unk_dex_struct_3 gUnknown_085E87EF, 12, 0, 5
gUnknown_0856ED48:: @ 856ED48
.incbin "baserom.gba", 0x56ed48, 0x54
unk_dex_struct_2 gUnknown_085E8840, 0, 2, 5, 5, 2, 12
unk_dex_struct_2 gUnknown_085E887C, 0, 4, 5, 5, 4, 12
unk_dex_struct_2 gUnknown_085E88A6, 0, 6, 5, 5, 6, 6
unk_dex_struct_2 gUnknown_085E88A6, 0, 6, 5, 11, 6, 6
unk_dex_struct_2 gUnknown_085E881F, 0, 8, 5, 5, 8, 12
unk_dex_struct_2 gUnknown_085E8806, 0, 10, 5, 5, 10, 12
unk_dex_struct_2 gUnknown_085E88C8, 0, 12, 5, 0, 0, 0
gUnknown_0856ED9C:: @ 856ED9C
.incbin "baserom.gba", 0x56ed9c, 0x1c
@@ -119,19 +93,119 @@ gUnknown_0856EDF0:: @ 856EDF0
.incbin "baserom.gba", 0x56edf0, 0x1c
gUnknown_0856EE0C:: @ 856EE0C
.incbin "baserom.gba", 0x56ee0c, 0x18
.4byte gUnknown_085E89A4
.4byte gUnknown_085E88DF
.4byte gUnknown_085E89BB
.4byte gUnknown_085E88E9
.4byte NULL
.4byte NULL
gUnknown_0856EE24:: @ 856EE24
.incbin "baserom.gba", 0x56ee24, 0x38
.4byte gUnknown_085E89D4
.4byte gUnknown_085E88F6
.4byte gUnknown_085E8A02
.4byte gUnknown_085E8905
.4byte gUnknown_085E8A37
.4byte gUnknown_085E8911
.4byte gUnknown_085E8A73
.4byte gUnknown_085E891F
.4byte gUnknown_085E8AAF
.4byte gUnknown_085E892D
.4byte gUnknown_085E8AEA
.4byte gUnknown_085E893A
.4byte 0
.4byte 0
gUnknown_0856EE5C:: @ 856EE5C
.incbin "baserom.gba", 0x56ee5c, 0x58
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8B26
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8948
.4byte gUnknown_085E8B25
.4byte gUnknown_085E894C
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8950
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8954
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8958
.4byte gUnknown_085E8B25
.4byte gUnknown_085E895C
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8960
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8964
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8968
.4byte 0
.4byte 0
gUnknown_0856EEB4:: @ 856EEB4
.incbin "baserom.gba", 0x56eeb4, 0x60
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8B26
.4byte gUnknown_085E8B25
.4byte gUnknown_085E896B
.4byte gUnknown_085E8B25
.4byte gUnknown_085E896F
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8974
.4byte gUnknown_085E8B25
.4byte gUnknown_085E897B
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8981
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8987
.4byte gUnknown_085E8B25
.4byte gUnknown_085E898D
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8994
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8999
.4byte gUnknown_085E8B25
.4byte gUnknown_085E899F
.4byte 0
.4byte 0
@ read from type table for each type except ???, entry is 7 byte of length
gUnknown_0856EF14:: @ 856EF14
.incbin "baserom.gba", 0x56ef14, 0x98
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8B35
.4byte gUnknown_085E8B25
.4byte gTypeNames + 0
.4byte gUnknown_085E8B25
.4byte gTypeNames + 7
.4byte gUnknown_085E8B25
.4byte gTypeNames + 14
.4byte gUnknown_085E8B25
.4byte gTypeNames + 21
.4byte gUnknown_085E8B25
.4byte gTypeNames + 28
.4byte gUnknown_085E8B25
.4byte gTypeNames + 35
.4byte gUnknown_085E8B25
.4byte gTypeNames + 42
.4byte gUnknown_085E8B25
.4byte gTypeNames + 49
.4byte gUnknown_085E8B25
.4byte gTypeNames + 56
.4byte gUnknown_085E8B25
.4byte gTypeNames + 70
.4byte gUnknown_085E8B25
.4byte gTypeNames + 77
.4byte gUnknown_085E8B25
.4byte gTypeNames + 84
.4byte gUnknown_085E8B25
.4byte gTypeNames + 91
.4byte gUnknown_085E8B25
.4byte gTypeNames + 98
.4byte gUnknown_085E8B25
.4byte gTypeNames + 105
.4byte gUnknown_085E8B25
.4byte gTypeNames + 112
.4byte gUnknown_085E8B25
.4byte gTypeNames + 119
.4byte 0
.4byte 0
gUnknown_0856EFAC:: @ 856EFAC
.incbin "baserom.gba", 0x56efac, 0x2
@@ -143,7 +217,12 @@ gUnknown_0856EFB4:: @ 856EFB4
.incbin "baserom.gba", 0x56efb4, 0x14
gUnknown_0856EFC8:: @ 856EFC8
.incbin "baserom.gba", 0x56efc8, 0x30
unk_dex_struct gUnknown_0856EE5C, 6, 7, 10
unk_dex_struct gUnknown_0856EEB4, 8, 9, 11
unk_dex_struct gUnknown_0856EF14, 10,11, 18
unk_dex_struct gUnknown_0856EF14, 12, 13, 18
unk_dex_struct gUnknown_0856EE24, 4, 5, 6
unk_dex_struct gUnknown_0856EE0C, 2, 3, 2
gUnknown_0856EFF8:: @ 856EFF8
.incbin "baserom.gba", 0x56eff8, 0x10
data/pokedex_area_screen.s
+92
View File
@@ -0,0 +1,92 @@
#include "constants/flags.h"
#include "constants/region_map_sections.h"
#include "constants/species.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_085B3D94:: @ 85B3D94
.incbin "graphics/pokedex/area_glow.gbapal"
.align 2
gUnknown_085B3DB4:: @ 85B3DB4
.incbin "graphics/pokedex/area_glow.4bpp.lz"
.align 1
gUnknown_085B3EE8:: @ 85B3EE8
.2byte 0x0168
.align 1
gUnknown_085B3EEA:: @ 85B3EEA
.2byte MAPSEC_MARINE_CAVE, MAPSEC_UNDERWATER_MARINE_CAVE, MAPSEC_TERRA_CAVE
.align 1
gUnknown_085B3EF0:: @ 85B3EF0
.2byte SPECIES_FEEBAS, 0x0000, 0x0022
.2byte SPECIES_EGG, 0x0000, 0x0000
.align 1
gUnknown_085B3EFC:: @ 85B3EFC
.2byte MAPSEC_SKY_PILLAR, FLAG_LANDMARK_SKY_PILLAR
.2byte MAPSEC_SEAFLOOR_CAVERN, FLAG_LANDMARK_SEAFLOOR_CAVERN
.2byte MAPSEC_ALTERING_CAVE_2, FLAG_LANDMARK_ALTERING_CAVE
.2byte MAPSEC_MIRAGE_TOWER, FLAG_LANDMARK_MIRAGE_TOWER
.2byte MAPSEC_DESERT_UNDERPASS, FLAG_LANDMARK_DESERT_UNDERPASS
.2byte MAPSEC_ARTISAN_CAVE, FLAG_0x8DF
.2byte MAPSEC_NONE, 0x0000
gUnknown_085B3F18:: @ 85B3F18
.byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x11, 0x20, 0x02, 0x03, 0x27, 0x2d, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
.byte 0x12, 0x21, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x2a, 0x2e, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x13, 0x22, 0x02, 0x03, 0x27, 0x2d, 0x06, 0x07, 0x2a, 0x2e, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
.byte 0x14, 0x01, 0x23, 0x03, 0x26, 0x05, 0x2c, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x15, 0x20, 0x23, 0x03, 0x28, 0x2d, 0x2c, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
.byte 0x16, 0x21, 0x23, 0x03, 0x26, 0x05, 0x2c, 0x07, 0x2a, 0x2e, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x17, 0x22, 0x23, 0x03, 0x28, 0x2d, 0x2c, 0x07, 0x2a, 0x2e, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
.byte 0x18, 0x01, 0x24, 0x03, 0x04, 0x05, 0x06, 0x07, 0x29, 0x09, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x19, 0x20, 0x24, 0x03, 0x27, 0x2d, 0x06, 0x07, 0x29, 0x09, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
.byte 0x1a, 0x21, 0x24, 0x03, 0x04, 0x05, 0x06, 0x07, 0x2b, 0x2e, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x1b, 0x22, 0x24, 0x03, 0x27, 0x2d, 0x06, 0x07, 0x2b, 0x2e, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
.byte 0x1c, 0x01, 0x25, 0x03, 0x26, 0x05, 0x2c, 0x07, 0x29, 0x09, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x1d, 0x20, 0x25, 0x03, 0x28, 0x2d, 0x2c, 0x07, 0x29, 0x09, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
.byte 0x1e, 0x21, 0x25, 0x03, 0x26, 0x05, 0x2c, 0x07, 0x2b, 0x2e, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x1f, 0x22, 0x25, 0x03, 0x28, 0x2d, 0x2c, 0x07, 0x2b, 0x2e, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
.align 2
gUnknown_085B4018:: @ 85B4018
.4byte 0x00002003
.align 2
gUnknown_085B401C:: @ 85B401C
obj_tiles AreaMarkerTiles, 0x0080, 0x0002
.align 2
gUnknown_085B4024:: @ 85B4024
obj_pal AreaMarkerPalette, 0x0002
.align 2
gUnknown_085B402C:: @ 85B402C
.2byte 0x0000
.2byte 0x4000
.2byte 0x0400
.align 2
gUnknown_085B4034:: @ 85B4034
spr_template 0x0002, 0x0002, gUnknown_085B402C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
AreaMarkerPalette:: @ 85B404C
.incbin "graphics/pokedex/area_marker.gbapal"
.align 2
AreaMarkerTiles:: @ 85B406C
.incbin "graphics/pokedex/area_marker.4bpp"
.align 2
gUnknown_085B40EC:: @ 85B40EC
obj_pal gUnknown_08DC4120, 0x0003
.align 2
gOamData_85B40F4:: @ 85B40F4
.2byte 0x0000
.2byte 0x8000
.2byte 0x0400
.align 2
gSpriteTemplate_85B40FC:: @ 85B40FC
spr_template 0x0003, 0x0003, gOamData_85B40F4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
data/pokedex_cry_screen.s
+110
View File
@@ -0,0 +1,110 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
CryMeterNeedlePalette: @ 85B7B58
.incbin "graphics/pokedex/cry_meter_needle.gbapal"
.align 2
CryMeterNeedleTiles: @ 85B7B78
.incbin "graphics/pokedex/cry_meter_needle.4bpp"
.align 1
gUnknown_085B8378:: @ 85B8378
.incbin "graphics/pokedex/cry_meter_map.bin"
.align 1
gUnknown_085B8418:: @ 85B8418
.incbin "graphics/pokedex/cry_meter.gbapal"
.align 2
gUnknown_085B8438:: @ 85B8438
.incbin "graphics/pokedex/cry_meter.4bpp.lz"
.align 1
gUnknown_085B8770:: @ 85B8770
.2byte 0x0,0x4,0x8,0xC,0x10,0x14,0x18,0x1C,0x400,0x404,0x408,0x40C,0x410,0x414,0x418,0x41C,0x800,0x804,0x808,0x80C,0x810,0x814,0x818,0x81C,0xC00,0xC04,0xC08,0xC0C,0xC10,0xC14,0xC18,0xC1C,0x1000,0x1004,0x1008,0x100C,0x1010,0x1014,0x1018,0x101C,0x1400,0x1404,0x1408,0x140C,0x1410,0x1414,0x1418,0x141C,0x1800,0x1804,0x1808,0x180C,0x1810,0x1814,0x1818,0x181C,0x1C00,0x1C04,0x1C08,0x1C0C,0x1C10,0x1C14,0x1C18,0x1C1C,0x2000,0x2004,0x2008,0x200C,0x2010,0x2014,0x2018,0x201C
.2byte 0x0,0x4,0x8,0xC,0x10,0x14,0x18,0x1C,0x400,0x404,0x408,0x40C,0x410,0x414,0x418,0x41C,0x800,0x804,0x808,0x80C,0x810,0x814,0x818,0x81C,0xC00,0xC04,0xC08,0xC0C,0xC10,0xC14,0xC18,0xC1C,0x1000,0x1004,0x1008,0x100C,0x1010,0x1014,0x1018,0x101C,0x1400,0x1404,0x1408,0x140C,0x1410,0x1414,0x1418,0x141C,0x1800,0x1804,0x1808,0x180C,0x1810,0x1814,0x1818,0x181C,0x1C00,0x1C04,0x1C08,0x1C0C,0x1C10,0x1C14,0x1C18,0x1C1C,0x2000,0x2004,0x2008,0x200C,0x2010,0x2014,0x2018,0x201C
.2byte 0x1,0x5,0x9,0xD,0x11,0x15,0x19,0x1D,0x401,0x405,0x409,0x40D,0x411,0x415,0x419,0x41D,0x801,0x805,0x809,0x80D,0x811,0x815,0x819,0x81D,0xC01,0xC05,0xC09,0xC0D,0xC11,0xC15,0xC19,0xC1D,0x1001,0x1005,0x1009,0x100D,0x1011,0x1015,0x1019,0x101D,0x1401,0x1405,0x1409,0x140D,0x1411,0x1415,0x1419,0x141D,0x1801,0x1805,0x1809,0x180D,0x1811,0x1815,0x1819,0x181D,0x1C01,0x1C05,0x1C09,0x1C0D,0x1C11,0x1C15,0x1C19,0x1C1D,0x2001,0x2005,0x2009,0x200D,0x2011,0x2015,0x2019,0x201D
.2byte 0x1,0x5,0x9,0xD,0x11,0x15,0x19,0x1D,0x401,0x405,0x409,0x40D,0x411,0x415,0x419,0x41D,0x801,0x805,0x809,0x80D,0x811,0x815,0x819,0x81D,0xC01,0xC05,0xC09,0xC0D,0xC11,0xC15,0xC19,0xC1D,0x1001,0x1005,0x1009,0x100D,0x1011,0x1015,0x1019,0x101D,0x1401,0x1405,0x1409,0x140D,0x1411,0x1415,0x1419,0x141D,0x1801,0x1805,0x1809,0x180D,0x1811,0x1815,0x1819,0x181D,0x1C01,0x1C05,0x1C09,0x1C0D,0x1C11,0x1C15,0x1C19,0x1C1D,0x2001,0x2005,0x2009,0x200D,0x2011,0x2015,0x2019,0x201D
.2byte 0x2,0x6,0xA,0xE,0x12,0x16,0x1A,0x1E,0x402,0x406,0x40A,0x40E,0x412,0x416,0x41A,0x41E,0x802,0x806,0x80A,0x80E,0x812,0x816,0x81A,0x81E,0xC02,0xC06,0xC0A,0xC0E,0xC12,0xC16,0xC1A,0xC1E,0x1002,0x1006,0x100A,0x100E,0x1012,0x1016,0x101A,0x101E,0x1402,0x1406,0x140A,0x140E,0x1412,0x1416,0x141A,0x141E,0x1802,0x1806,0x180A,0x180E,0x1812,0x1816,0x181A,0x181E,0x1C02,0x1C06,0x1C0A,0x1C0E,0x1C12,0x1C16,0x1C1A,0x1C1E,0x2002,0x2006,0x200A,0x200E,0x2012,0x2016,0x201A,0x201E
.2byte 0x2,0x6,0xA,0xE,0x12,0x16,0x1A,0x1E,0x402,0x406,0x40A,0x40E,0x412,0x416,0x41A,0x41E,0x802,0x806,0x80A,0x80E,0x812,0x816,0x81A,0x81E,0xC02,0xC06,0xC0A,0xC0E,0xC12,0xC16,0xC1A,0xC1E,0x1002,0x1006,0x100A,0x100E,0x1012,0x1016,0x101A,0x101E,0x1402,0x1406,0x140A,0x140E,0x1412,0x1416,0x141A,0x141E,0x1802,0x1806,0x180A,0x180E,0x1812,0x1816,0x181A,0x181E,0x1C02,0x1C06,0x1C0A,0x1C0E,0x1C12,0x1C16,0x1C1A,0x1C1E,0x2002,0x2006,0x200A,0x200E,0x2012,0x2016,0x201A,0x201E
.2byte 0x3,0x7,0xB,0xF,0x13,0x17,0x1B,0x1F,0x403,0x407,0x40B,0x40F,0x413,0x417,0x41B,0x41F,0x803,0x807,0x80B,0x80F,0x813,0x817,0x81B,0x81F,0xC03,0xC07,0xC0B,0xC0F,0xC13,0xC17,0xC1B,0xC1F,0x1003,0x1007,0x100B,0x100F,0x1013,0x1017,0x101B,0x101F,0x1403,0x1407,0x140B,0x140F,0x1413,0x1417,0x141B,0x141F,0x1803,0x1807,0x180B,0x180F,0x1813,0x1817,0x181B,0x181F,0x1C03,0x1C07,0x1C0B,0x1C0F,0x1C13,0x1C17,0x1C1B,0x1C1F,0x2003,0x2007,0x200B,0x200F,0x2013,0x2017,0x201B,0x201F
.2byte 0x3,0x7,0xB,0xF,0x13,0x17,0x1B,0x1F,0x403,0x407,0x40B,0x40F,0x413,0x417,0x41B,0x41F,0x803,0x807,0x80B,0x80F,0x813,0x817,0x81B,0x81F,0xC03,0xC07,0xC0B,0xC0F,0xC13,0xC17,0xC1B,0xC1F,0x1003,0x1007,0x100B,0x100F,0x1013,0x1017,0x101B,0x101F,0x1403,0x1407,0x140B,0x140F,0x1413,0x1417,0x141B,0x141F,0x1803,0x1807,0x180B,0x180F,0x1813,0x1817,0x181B,0x181F,0x1C03,0x1C07,0x1C0B,0x1C0F,0x1C13,0x1C17,0x1C1B,0x1C1F,0x2003,0x2007,0x200B,0x200F,0x2013,0x2017,0x201B,0x201F
.align 1
gUnknown_085B8BF0:: @ 85B8BF0
.incbin "graphics/pokedex/85B8BF0.gbapal"
gUnknown_085B8C10:: @ 85B8C10
.byte 0x11
.byte 0x11
.byte 0x11
.byte 0x11
.byte 0x22
.byte 0x22
.byte 0x22
.byte 0x22
.byte 0x11
.byte 0x11
.byte 0x11
.byte 0x11
.byte 0x22
.byte 0x22
.byte 0x22
.byte 0x22
.byte 0x11
.byte 0x11
.byte 0x11
.byte 0x11
.byte 0x22
.byte 0x22
.byte 0x22
.byte 0x22
.byte 0x11
.byte 0x11
.byte 0x11
.byte 0x11
.byte 0x22
.byte 0x22
.byte 0x22
.byte 0x22
gUnknown_085B8C30:: @ 85B8C30
.byte 0xF0, 0x0F
gUnknown_085B8C32:: @ 85B8C32
.byte 0x0F,0x0E,0x0D,0x0C,0x0B,0x0A,0x09,0x08,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F
.byte 0xF0,0xE0,0xD0,0xC0,0xB0,0xA0,0x90,0x80,0x80,0x90,0xA0,0xB0,0xC0,0xD0,0xE0,0xF0
.align 2
gSpriteAnim_85B8C54:: @ 85B8C54
obj_image_anim_frame 0, 30
obj_image_anim_end
.align 2
gSpriteAnimTable_85B8C5C:: @ 85B8C5C
.4byte gSpriteAnim_85B8C54
.align 2
gOamData_85B8C60:: @ 85B8C60
.2byte 0x01A0
.2byte 0xC000
.2byte 0x0400
.align 2
gUnknown_085B8C68:: @ 85B8C68
spr_template 8192, 8192, gOamData_85B8C60, gSpriteAnimTable_85B8C5C, NULL, gDummySpriteAffineAnimTable, sub_814596C
.align 2
gCryMeterNeedleSpriteSheets:: @ 85B8C80
obj_tiles CryMeterNeedleTiles, 0x800, 8192
null_obj_tiles
.align 2
gCryMeterNeedleSpritePalettes:: @ 85B8C90
obj_pal CryMeterNeedlePalette, 8192
null_obj_pal
data/pokedex_entries.inc
+230 -230
View File
@@ -1,11 +1,11 @@
.align 2
gPokedexEntries:: @ 856B5B0
.string "UNKNOWN$", 12
pokedex_entry 0, 0, gDummyPokedexText, 256, 0, 256, 0
pokedex_entry 0, 0, gDummyPokedexText, 256, 0, 256, 0
.string "SEED$", 12
pokedex_entry 7, 69, gBulbasaurPokedexText, 356, 17, 256, 0
.string "SEED$", 12
pokedex_entry 10, 130, gIvysaurPokedexText, 335, 13, 256, 0
pokedex_entry 10, 130, gIvysaurPokedexText, 335, 13, 256, 0
.string "SEED$", 12
pokedex_entry 20, 1000, gVenusaurPokedexText, 256, 0, 388, 6
.string "LIZARD$", 12
@@ -23,37 +23,37 @@ gPokedexEntries:: @ 856B5B0
.string "WORM$", 12
pokedex_entry 3, 29, gCaterpiePokedexText, 549, 22, 256, 0
.string "COCOON$", 12
pokedex_entry 7, 99, gMetapodPokedexText, 350, 18, 256, 0
pokedex_entry 7, 99, gMetapodPokedexText, 350, 18, 256, 0
.string "BUTTERFLY$", 12
pokedex_entry 11, 320, gButterfreePokedexText, 312, 2, 256, 0
.string "HAIRY BUG$", 12
pokedex_entry 3, 32, gWeedlePokedexText, 455, 22, 256, 0
pokedex_entry 3, 32, gWeedlePokedexText, 455, 22, 256, 0
.string "COCOON$", 12
pokedex_entry 6, 100, gKakunaPokedexText, 424, 17, 256, 0
pokedex_entry 6, 100, gKakunaPokedexText, 424, 17, 256, 0
.string "POISON BEE$", 12
pokedex_entry 10, 295, gBeedrillPokedexText, 366, 2, 256, 0
.string "TINY BIRD$", 12
pokedex_entry 3, 18, gPidgeyPokedexText, 508, -3, 256, 0
pokedex_entry 3, 18, gPidgeyPokedexText, 508, -3, 256, 0
.string "BIRD$", 12
pokedex_entry 11, 300, gPidgeottoPokedexText, 331, 10, 256, 0
.string "BIRD$", 12
pokedex_entry 15, 395, gPidgeotPokedexText, 269, 0, 256, 0
pokedex_entry 15, 395, gPidgeotPokedexText, 269, 0, 256, 0
.string "MOUSE$", 12
pokedex_entry 3, 35, gRattataPokedexText, 481, 21, 256, 0
pokedex_entry 3, 35, gRattataPokedexText, 481, 21, 256, 0
.string "MOUSE$", 12
pokedex_entry 7, 185, gRaticatePokedexText, 459, 18, 256, 0
.string "TINY BIRD$", 12
pokedex_entry 3, 20, gSpearowPokedexText, 571, 22, 256, 0
pokedex_entry 3, 20, gSpearowPokedexText, 571, 22, 256, 0
.string "BEAK$", 12
pokedex_entry 12, 380, gFearowPokedexText, 278, 1, 256, 0
pokedex_entry 12, 380, gFearowPokedexText, 278, 1, 256, 0
.string "SNAKE$", 12
pokedex_entry 20, 69, gEkansPokedexText, 298, 12, 256, 0
pokedex_entry 20, 69, gEkansPokedexText, 298, 12, 256, 0
.string "COBRA$", 12
pokedex_entry 35, 650, gArbokPokedexText, 256, 0, 296, 2
pokedex_entry 35, 650, gArbokPokedexText, 256, 0, 296, 2
.string "MOUSE$", 12
pokedex_entry 4, 60, gPikachuPokedexText, 479, 19, 256, 0
pokedex_entry 4, 60, gPikachuPokedexText, 479, 19, 256, 0
.string "MOUSE$", 12
pokedex_entry 8, 300, gRaichuPokedexText, 426, 13, 256, 0
pokedex_entry 8, 300, gRaichuPokedexText, 426, 13, 256, 0
.string "MOUSE$", 12
pokedex_entry 6, 120, gSandshrewPokedexText, 365, 18, 256, 0
.string "MOUSE$", 12
@@ -75,7 +75,7 @@ gPokedexEntries:: @ 856B5B0
.string "FAIRY$", 12
pokedex_entry 13, 400, gClefablePokedexText, 256, 5, 256, 0
.string "FOX$", 12
pokedex_entry 6, 99, gVulpixPokedexText, 542, 19, 256, 0
pokedex_entry 6, 99, gVulpixPokedexText, 542, 19, 256, 0
.string "FOX$", 12
pokedex_entry 11, 199, gNinetalesPokedexText, 339, 10, 256, 0
.string "BALLOON$", 12
@@ -83,37 +83,37 @@ gPokedexEntries:: @ 856B5B0
.string "BALLOON$", 12
pokedex_entry 10, 120, gWigglytuffPokedexText, 328, 11, 256, 0
.string "BAT$", 12
pokedex_entry 8, 75, gZubatPokedexText, 362, -5, 256, 0
pokedex_entry 8, 75, gZubatPokedexText, 362, -5, 256, 0
.string "BAT$", 12
pokedex_entry 16, 550, gGolbatPokedexText, 256, 1, 256, 0
pokedex_entry 16, 550, gGolbatPokedexText, 256, 1, 256, 0
.string "WEED$", 12
pokedex_entry 5, 54, gOddishPokedexText, 423, 19, 256, 0
pokedex_entry 5, 54, gOddishPokedexText, 423, 19, 256, 0
.string "WEED$", 12
pokedex_entry 8, 86, gGloomPokedexText, 329, 13, 256, 0
pokedex_entry 8, 86, gGloomPokedexText, 329, 13, 256, 0
.string "FLOWER$", 12
pokedex_entry 12, 186, gVileplumePokedexText, 256, 4, 256, 0
.string "MUSHROOM$", 12
pokedex_entry 3, 54, gParasPokedexText, 593, 22, 256, 0
pokedex_entry 3, 54, gParasPokedexText, 593, 22, 256, 0
.string "MUSHROOM$", 12
pokedex_entry 10, 295, gParasectPokedexText, 307, 8, 256, 0
.string "INSECT$", 12
pokedex_entry 10, 300, gVenonatPokedexText, 360, 0, 256, -1
pokedex_entry 10, 300, gVenonatPokedexText, 360, 0, 256, -1
.string "POISON MOTH$", 12
pokedex_entry 15, 125, gVenomothPokedexText, 285, 2, 256, 1
.string "MOLE$", 12
pokedex_entry 2, 8, gDiglettPokedexText, 833, 25, 256, 0
pokedex_entry 2, 8, gDiglettPokedexText, 833, 25, 256, 0
.string "MOLE$", 12
pokedex_entry 7, 333, gDugtrioPokedexText, 406, 18, 256, 0
pokedex_entry 7, 333, gDugtrioPokedexText, 406, 18, 256, 0
.string "SCRATCH CAT$", 12
pokedex_entry 4, 42, gMeowthPokedexText, 480, 19, 256, 0
pokedex_entry 4, 42, gMeowthPokedexText, 480, 19, 256, 0
.string "CLASSY CAT$", 12
pokedex_entry 10, 320, gPersianPokedexText, 320, 10, 256, 0
pokedex_entry 10, 320, gPersianPokedexText, 320, 10, 256, 0
.string "DUCK$", 12
pokedex_entry 8, 196, gPsyduckPokedexText, 369, 15, 256, 0
pokedex_entry 8, 196, gPsyduckPokedexText, 369, 15, 256, 0
.string "DUCK$", 12
pokedex_entry 17, 766, gGolduckPokedexText, 256, 1, 273, 1
pokedex_entry 17, 766, gGolduckPokedexText, 256, 1, 273, 1
.string "PIG MONKEY$", 12
pokedex_entry 5, 280, gMankeyPokedexText, 404, 19, 256, 0
pokedex_entry 5, 280, gMankeyPokedexText, 404, 19, 256, 0
.string "PIG MONKEY$", 12
pokedex_entry 10, 320, gPrimeapePokedexText, 326, 10, 256, 0
.string "PUPPY$", 12
@@ -121,23 +121,23 @@ gPokedexEntries:: @ 856B5B0
.string "LEGENDARY$", 12
pokedex_entry 19, 1550, gArcaninePokedexText, 256, 1, 312, 4
.string "TADPOLE$", 12
pokedex_entry 6, 124, gPoliwagPokedexText, 369, 20, 256, 0
pokedex_entry 6, 124, gPoliwagPokedexText, 369, 20, 256, 0
.string "TADPOLE$", 12
pokedex_entry 10, 200, gPoliwhirlPokedexText, 288, 11, 256, 0
.string "TADPOLE$", 12
pokedex_entry 13, 540, gPoliwrathPokedexText, 256, 6, 256, 0
.string "PSI$", 12
pokedex_entry 9, 195, gAbraPokedexText, 363, 14, 256, 0
pokedex_entry 9, 195, gAbraPokedexText, 363, 14, 256, 0
.string "PSI$", 12
pokedex_entry 13, 565, gKadabraPokedexText, 256, 3, 256, 0
pokedex_entry 13, 565, gKadabraPokedexText, 256, 3, 256, 0
.string "PSI$", 12
pokedex_entry 15, 480, gAlakazamPokedexText, 256, 3, 256, 0
.string "SUPERPOWER$", 12
pokedex_entry 8, 195, gMachopPokedexText, 342, 14, 256, 0
pokedex_entry 8, 195, gMachopPokedexText, 342, 14, 256, 0
.string "SUPERPOWER$", 12
pokedex_entry 15, 705, gMachokePokedexText, 323, 9, 257, 0
pokedex_entry 15, 705, gMachokePokedexText, 323, 9, 257, 0
.string "SUPERPOWER$", 12
pokedex_entry 16, 1300, gMachampPokedexText, 280, 1, 269, -1
pokedex_entry 16, 1300, gMachampPokedexText, 280, 1, 269, -1
.string "FLOWER$", 12
pokedex_entry 7, 40, gBellsproutPokedexText, 354, 16, 256, 0
.string "FLYCATCHER$", 12
@@ -149,19 +149,19 @@ gPokedexEntries:: @ 856B5B0
.string "JELLYFISH$", 12
pokedex_entry 16, 550, gTentacruelPokedexText, 256, 0, 312, 1
.string "ROCK$", 12
pokedex_entry 4, 200, gGeodudePokedexText, 347, 18, 256, 0
pokedex_entry 4, 200, gGeodudePokedexText, 347, 18, 256, 0
.string "ROCK$", 12
pokedex_entry 10, 1050, gGravelerPokedexText, 256, 2, 256, 0
.string "MEGATON$", 12
pokedex_entry 14, 3000, gGolemPokedexText, 256, 3, 296, 2
pokedex_entry 14, 3000, gGolemPokedexText, 256, 3, 296, 2
.string "FIRE HORSE$", 12
pokedex_entry 10, 300, gPonytaPokedexText, 283, 8, 256, 0
pokedex_entry 10, 300, gPonytaPokedexText, 283, 8, 256, 0
.string "FIRE HORSE$", 12
pokedex_entry 17, 950, gRapidashPokedexText, 256, 0, 289, 1
.string "DOPEY$", 12
pokedex_entry 12, 360, gSlowpokePokedexText, 256, 10, 256, 0
.string "HERMIT CRAB$", 12
pokedex_entry 16, 785, gSlowbroPokedexText, 256, 6, 296, 2
pokedex_entry 16, 785, gSlowbroPokedexText, 256, 6, 296, 2
.string "MAGNET$", 12
pokedex_entry 3, 60, gMagnemitePokedexText, 288, -9, 256, 0
.string "MAGNET$", 12
@@ -169,39 +169,39 @@ gPokedexEntries:: @ 856B5B0
.string "WILD DUCK$", 12
pokedex_entry 8, 150, gFarfetchdPokedexText, 330, 2, 293, 2
.string "TWIN BIRD$", 12
pokedex_entry 14, 392, gDoduoPokedexText, 256, 3, 257, -1
pokedex_entry 14, 392, gDoduoPokedexText, 256, 3, 257, -1
.string "TRIPLE BIRD$", 12
pokedex_entry 18, 852, gDodrioPokedexText, 256, 0, 268, 0
pokedex_entry 18, 852, gDodrioPokedexText, 256, 0, 268, 0
.string "SEA LION$", 12
pokedex_entry 11, 900, gSeelPokedexText, 297, 8, 256, 0
pokedex_entry 11, 900, gSeelPokedexText, 297, 8, 256, 0
.string "SEA LION$", 12
pokedex_entry 17, 1200, gDewgongPokedexText, 256, 0, 275, 0
pokedex_entry 17, 1200, gDewgongPokedexText, 256, 0, 275, 0
.string "SLUDGE$", 12
pokedex_entry 9, 300, gGrimerPokedexText, 258, 10, 256, 0
pokedex_entry 9, 300, gGrimerPokedexText, 258, 10, 256, 0
.string "SLUDGE$", 12
pokedex_entry 12, 300, gMukPokedexText, 256, 2, 256, 0
pokedex_entry 12, 300, gMukPokedexText, 256, 2, 256, 0
.string "BIVALVE$", 12
pokedex_entry 3, 40, gShellderPokedexText, 675, 24, 256, 0
.string "BIVALVE$", 12
pokedex_entry 15, 1325, gCloysterPokedexText, 256, 0, 269, 1
.string "GAS$", 12
pokedex_entry 13, 1, gGastlyPokedexText, 256, 0, 256, 0
pokedex_entry 13, 1, gGastlyPokedexText, 256, 0, 256, 0
.string "GAS$", 12
pokedex_entry 16, 1, gHaunterPokedexText, 256, 2, 293, 2
pokedex_entry 16, 1, gHaunterPokedexText, 256, 2, 293, 2
.string "SHADOW$", 12
pokedex_entry 15, 405, gGengarPokedexText, 256, 2, 302, 2
pokedex_entry 15, 405, gGengarPokedexText, 256, 2, 302, 2
.string "ROCK SNAKE$", 12
pokedex_entry 88, 2100, gOnixPokedexText, 256, 1, 515, 14
pokedex_entry 88, 2100, gOnixPokedexText, 256, 1, 515, 14
.string "HYPNOSIS$", 12
pokedex_entry 10, 324, gDrowzeePokedexText, 274, 6, 256, 0
pokedex_entry 10, 324, gDrowzeePokedexText, 274, 6, 256, 0
.string "HYPNOSIS$", 12
pokedex_entry 16, 756, gHypnoPokedexText, 256, 3, 257, 0
pokedex_entry 16, 756, gHypnoPokedexText, 256, 3, 257, 0
.string "RIVER CRAB$", 12
pokedex_entry 4, 65, gKrabbyPokedexText, 469, 20, 256, 0
pokedex_entry 4, 65, gKrabbyPokedexText, 469, 20, 256, 0
.string "PINCER$", 12
pokedex_entry 13, 600, gKinglerPokedexText, 256, 2, 256, 0
pokedex_entry 13, 600, gKinglerPokedexText, 256, 2, 256, 0
.string "BALL$", 12
pokedex_entry 5, 104, gVoltorbPokedexText, 364, -8, 256, 0
pokedex_entry 5, 104, gVoltorbPokedexText, 364, -8, 256, 0
.string "BALL$", 12
pokedex_entry 12, 666, gElectrodePokedexText, 256, 0, 256, 0
.string "EGG$", 12
@@ -209,9 +209,9 @@ gPokedexEntries:: @ 856B5B0
.string "COCONUT$", 12
pokedex_entry 20, 1200, gExeggutorPokedexText, 256, 0, 309, 5
.string "LONELY$", 12
pokedex_entry 4, 65, gCubonePokedexText, 545, 21, 256, 0
pokedex_entry 4, 65, gCubonePokedexText, 545, 21, 256, 0
.string "BONE KEEPER$", 12
pokedex_entry 10, 450, gMarowakPokedexText, 293, 12, 256, 0
pokedex_entry 10, 450, gMarowakPokedexText, 293, 12, 256, 0
.string "KICKING$", 12
pokedex_entry 15, 498, gHitmonleePokedexText, 256, 3, 259, 1
.string "PUNCHING$", 12
@@ -219,101 +219,101 @@ gPokedexEntries:: @ 856B5B0
.string "LICKING$", 12
pokedex_entry 12, 655, gLickitungPokedexText, 256, 4, 256, 0
.string "POISON GAS$", 12
pokedex_entry 6, 10, gKoffingPokedexText, 369, -1, 256, 0
pokedex_entry 6, 10, gKoffingPokedexText, 369, -1, 256, 0
.string "POISON GAS$", 12
pokedex_entry 12, 95, gWeezingPokedexText, 305, 3, 256, 0
pokedex_entry 12, 95, gWeezingPokedexText, 305, 3, 256, 0
.string "SPIKES$", 12
pokedex_entry 10, 1150, gRhyhornPokedexText, 267, 6, 256, 0
pokedex_entry 10, 1150, gRhyhornPokedexText, 267, 6, 256, 0
.string "DRILL$", 12
pokedex_entry 19, 1200, gRhydonPokedexText, 256, 1, 299, 2
pokedex_entry 19, 1200, gRhydonPokedexText, 256, 1, 299, 2
.string "EGG$", 12
pokedex_entry 11, 346, gChanseyPokedexText, 257, 7, 256, 0
pokedex_entry 11, 346, gChanseyPokedexText, 257, 7, 256, 0
.string "VINE$", 12
pokedex_entry 10, 350, gTangelaPokedexText, 304, 1, 256, 0
pokedex_entry 10, 350, gTangelaPokedexText, 304, 1, 256, 0
.string "PARENT$", 12
pokedex_entry 22, 800, gKangaskhanPokedexText, 256, 0, 387, 8
.string "DRAGON$", 12
pokedex_entry 4, 80, gHorseaPokedexText, 399, -1, 256, 0
pokedex_entry 4, 80, gHorseaPokedexText, 399, -1, 256, 0
.string "DRAGON$", 12
pokedex_entry 12, 250, gSeadraPokedexText, 299, 3, 256, 0
pokedex_entry 12, 250, gSeadraPokedexText, 299, 3, 256, 0
.string "GOLDFISH$", 12
pokedex_entry 6, 150, gGoldeenPokedexText, 379, 4, 256, 0
pokedex_entry 6, 150, gGoldeenPokedexText, 379, 4, 256, 0
.string "GOLDFISH$", 12
pokedex_entry 13, 390, gSeakingPokedexText, 256, 3, 256, 0
pokedex_entry 13, 390, gSeakingPokedexText, 256, 3, 256, 0
.string "STAR SHAPE$", 12
pokedex_entry 8, 345, gStaryuPokedexText, 326, 1, 256, 0
pokedex_entry 8, 345, gStaryuPokedexText, 326, 1, 256, 0
.string "MYSTERIOUS$", 12
pokedex_entry 11, 800, gStarmiePokedexText, 301, 3, 256, 0
pokedex_entry 11, 800, gStarmiePokedexText, 301, 3, 256, 0
.string "BARRIER$", 12
pokedex_entry 13, 545, gMrmimePokedexText, 258, 6, 256, 0
pokedex_entry 13, 545, gMrmimePokedexText, 258, 6, 256, 0
.string "MANTIS$", 12
pokedex_entry 15, 560, gScytherPokedexText, 256, 1, 293, 2
pokedex_entry 15, 560, gScytherPokedexText, 256, 1, 293, 2
.string "HUMAN SHAPE$", 12
pokedex_entry 14, 406, gJynxPokedexText, 256, 3, 300, 1
pokedex_entry 14, 406, gJynxPokedexText, 256, 3, 300, 1
.string "ELECTRIC$", 12
pokedex_entry 11, 300, gElectabuzzPokedexText, 351, 8, 256, 0
.string "SPITFIRE$", 12
pokedex_entry 13, 445, gMagmarPokedexText, 277, 5, 256, 0
pokedex_entry 13, 445, gMagmarPokedexText, 277, 5, 256, 0
.string "STAG BEETLE$", 12
pokedex_entry 15, 550, gPinsirPokedexText, 256, 2, 257, 0
pokedex_entry 15, 550, gPinsirPokedexText, 256, 2, 257, 0
.string "WILD BULL$", 12
pokedex_entry 14, 884, gTaurosPokedexText, 256, 0, 256, 0
pokedex_entry 14, 884, gTaurosPokedexText, 256, 0, 256, 0
.string "FISH$", 12
pokedex_entry 9, 100, gMagikarpPokedexText, 310, 4, 256, 0
.string "ATROCIOUS$", 12
pokedex_entry 65, 2350, gGyaradosPokedexText, 256, 6, 481, 13
.string "TRANSPORT$", 12
pokedex_entry 25, 2200, gLaprasPokedexText, 257, 10, 423, 8
pokedex_entry 25, 2200, gLaprasPokedexText, 257, 10, 423, 8
.string "TRANSFORM$", 12
pokedex_entry 3, 40, gDittoPokedexText, 633, 23, 256, 0
pokedex_entry 3, 40, gDittoPokedexText, 633, 23, 256, 0
.string "EVOLUTION$", 12
pokedex_entry 3, 65, gEeveePokedexText, 476, 18, 256, 0
pokedex_entry 3, 65, gEeveePokedexText, 476, 18, 256, 0
.string "BUBBLE JET$", 12
pokedex_entry 10, 290, gVaporeonPokedexText, 316, 8, 256, 0
.string "LIGHTNING$", 12
pokedex_entry 8, 245, gJolteonPokedexText, 283, 8, 256, 0
pokedex_entry 8, 245, gJolteonPokedexText, 283, 8, 256, 0
.string "FLAME$", 12
pokedex_entry 9, 250, gFlareonPokedexText, 306, 12, 256, 0
pokedex_entry 9, 250, gFlareonPokedexText, 306, 12, 256, 0
.string "VIRTUAL$", 12
pokedex_entry 8, 365, gPorygonPokedexText, 328, 15, 256, 0
pokedex_entry 8, 365, gPorygonPokedexText, 328, 15, 256, 0
.string "SPIRAL$", 12
pokedex_entry 4, 75, gOmanytePokedexText, 521, 22, 256, 0
pokedex_entry 4, 75, gOmanytePokedexText, 521, 22, 256, 0
.string "SPIRAL$", 12
pokedex_entry 10, 350, gOmastarPokedexText, 307, 7, 256, 0
pokedex_entry 10, 350, gOmastarPokedexText, 307, 7, 256, 0
.string "SHELLFISH$", 12
pokedex_entry 5, 115, gKabutoPokedexText, 454, 21, 256, 0
pokedex_entry 5, 115, gKabutoPokedexText, 454, 21, 256, 0
.string "SHELLFISH$", 12
pokedex_entry 13, 405, gKabutopsPokedexText, 271, 3, 256, 0
.string "FOSSIL$", 12
pokedex_entry 18, 590, gAerodactylPokedexText, 256, 0, 302, 4
.string "SLEEPING$", 12
pokedex_entry 21, 4600, gSnorlaxPokedexText, 256, 4, 423, 11
pokedex_entry 21, 4600, gSnorlaxPokedexText, 256, 4, 423, 11
.string "FREEZE$", 12
pokedex_entry 17, 554, gArticunoPokedexText, 256, 0, 309, 2
.string "ELECTRIC$", 12
pokedex_entry 16, 526, gZapdosPokedexText, 256, 0, 318, 3
pokedex_entry 16, 526, gZapdosPokedexText, 256, 0, 318, 3
.string "FLAME$", 12
pokedex_entry 20, 600, gMoltresPokedexText, 270, 0, 387, 8
pokedex_entry 20, 600, gMoltresPokedexText, 270, 0, 387, 8
.string "DRAGON$", 12
pokedex_entry 18, 33, gDratiniPokedexText, 256, 8, 386, 6
pokedex_entry 18, 33, gDratiniPokedexText, 256, 8, 386, 6
.string "DRAGON$", 12
pokedex_entry 40, 165, gDragonairPokedexText, 256, 0, 411, 5
.string "DRAGON$", 12
pokedex_entry 22, 2100, gDragonitePokedexText, 256, 0, 309, 4
.string "GENETIC$", 12
pokedex_entry 20, 1220, gMewtwoPokedexText, 256, 0, 309, 4
pokedex_entry 20, 1220, gMewtwoPokedexText, 256, 0, 309, 4
.string "NEW SPECIES$", 12
pokedex_entry 4, 40, gMewPokedexText, 457, -2, 256, 0
pokedex_entry 4, 40, gMewPokedexText, 457, -2, 256, 0
.string "LEAF$", 12
pokedex_entry 9, 64, gChikoritaPokedexText, 512, 20, 256, 0
.string "LEAF$", 12
pokedex_entry 12, 158, gBayleefPokedexText, 296, 4, 256, 0
pokedex_entry 12, 158, gBayleefPokedexText, 296, 4, 256, 0
.string "HERB$", 12
pokedex_entry 18, 1005, gMeganiumPokedexText, 256, 0, 277, 1
.string "FIRE MOUSE$", 12
pokedex_entry 5, 79, gCyndaquilPokedexText, 539, 21, 256, 0
.string "VOLCANO$", 12
pokedex_entry 9, 190, gQuilavaPokedexText, 329, 11, 256, 0
pokedex_entry 9, 190, gQuilavaPokedexText, 329, 11, 256, 0
.string "VOLCANO$", 12
pokedex_entry 17, 795, gTyphlosionPokedexText, 256, 0, 268, 1
.string "BIG JAW$", 12
@@ -323,51 +323,51 @@ gPokedexEntries:: @ 856B5B0
.string "BIG JAW$", 12
pokedex_entry 23, 888, gFeraligatrPokedexText, 256, 0, 342, 7
.string "SCOUT$", 12
pokedex_entry 8, 60, gSentretPokedexText, 439, 12, 256, 0
pokedex_entry 8, 60, gSentretPokedexText, 439, 12, 256, 0
.string "LONG BODY$", 12
pokedex_entry 18, 325, gFurretPokedexText, 346, 11, 256, 0
pokedex_entry 18, 325, gFurretPokedexText, 346, 11, 256, 0
.string "OWL$", 12
pokedex_entry 7, 212, gHoothootPokedexText, 380, -2, 256, 0
.string "OWL$", 12
pokedex_entry 16, 408, gNoctowlPokedexText, 278, 3, 256, 0
pokedex_entry 16, 408, gNoctowlPokedexText, 278, 3, 256, 0
.string "FIVE STAR$", 12
pokedex_entry 10, 108, gLedybaPokedexText, 256, 4, 256, 0
pokedex_entry 10, 108, gLedybaPokedexText, 256, 4, 256, 0
.string "FIVE STAR$", 12
pokedex_entry 14, 356, gLedianPokedexText, 256, 2, 256, 0
pokedex_entry 14, 356, gLedianPokedexText, 256, 2, 256, 0
.string "STRING SPIT$", 12
pokedex_entry 5, 85, gSpinarakPokedexText, 414, 21, 256, 0
.string "LONG LEG$", 12
pokedex_entry 11, 335, gAriadosPokedexText, 316, 8, 256, 0
pokedex_entry 11, 335, gAriadosPokedexText, 316, 8, 256, 0
.string "BAT$", 12
pokedex_entry 18, 750, gCrobatPokedexText, 256, 0, 281, 1
pokedex_entry 18, 750, gCrobatPokedexText, 256, 0, 281, 1
.string "ANGLER$", 12
pokedex_entry 5, 120, gChinchouPokedexText, 424, -2, 256, 0
.string "LIGHT$", 12
pokedex_entry 12, 225, gLanturnPokedexText, 269, 6, 256, 0
pokedex_entry 12, 225, gLanturnPokedexText, 269, 6, 256, 0
.string "TINY MOUSE$", 12
pokedex_entry 3, 20, gPichuPokedexText, 508, 20, 256, 0
pokedex_entry 3, 20, gPichuPokedexText, 508, 20, 256, 0
.string "STAR SHAPE$", 12
pokedex_entry 3, 30, gCleffaPokedexText, 462, 23, 256, 0
pokedex_entry 3, 30, gCleffaPokedexText, 462, 23, 256, 0
.string "BALLOON$", 12
pokedex_entry 3, 10, gIgglybuffPokedexText, 457, -1, 256, 0
.string "SPIKE BALL$", 12
pokedex_entry 3, 15, gTogepiPokedexText, 507, 23, 256, 0
pokedex_entry 3, 15, gTogepiPokedexText, 507, 23, 256, 0
.string "HAPPINESS$", 12
pokedex_entry 6, 32, gTogeticPokedexText, 424, 17, 256, 0
pokedex_entry 6, 32, gTogeticPokedexText, 424, 17, 256, 0
.string "TINY BIRD$", 12
pokedex_entry 2, 20, gNatuPokedexText, 610, 25, 256, 0
pokedex_entry 2, 20, gNatuPokedexText, 610, 25, 256, 0
.string "MYSTIC$", 12
pokedex_entry 15, 150, gXatuPokedexText, 256, 6, 318, 4
pokedex_entry 15, 150, gXatuPokedexText, 256, 6, 318, 4
.string "WOOL$", 12
pokedex_entry 6, 78, gMareepPokedexText, 379, 18, 256, 0
pokedex_entry 6, 78, gMareepPokedexText, 379, 18, 256, 0
.string "WOOL$", 12
pokedex_entry 8, 133, gFlaaffyPokedexText, 372, 15, 256, 0
pokedex_entry 8, 133, gFlaaffyPokedexText, 372, 15, 256, 0
.string "LIGHT$", 12
pokedex_entry 14, 615, gAmpharosPokedexText, 256, 4, 256, 0
.string "FLOWER$", 12
pokedex_entry 4, 58, gBellossomPokedexText, 472, 21, 256, 0
.string "AQUA MOUSE$", 12
pokedex_entry 4, 85, gMarillPokedexText, 476, 20, 256, 0
pokedex_entry 4, 85, gMarillPokedexText, 476, 20, 256, 0
.string "AQUA RABBIT$", 12
pokedex_entry 8, 285, gAzumarillPokedexText, 448, 16, 256, 0
.string "IMITATION$", 12
@@ -375,49 +375,49 @@ gPokedexEntries:: @ 856B5B0
.string "FROG$", 12
pokedex_entry 11, 339, gPolitoedPokedexText, 289, 6, 256, 0
.string "COTTONWEED$", 12
pokedex_entry 4, 5, gHoppipPokedexText, 562, -7, 256, 0
pokedex_entry 4, 5, gHoppipPokedexText, 562, -7, 256, 0
.string "COTTONWEED$", 12
pokedex_entry 6, 10, gSkiploomPokedexText, 387, 0, 256, 0
.string "COTTONWEED$", 12
pokedex_entry 8, 30, gJumpluffPokedexText, 418, -4, 256, 0
.string "LONG TAIL$", 12
pokedex_entry 8, 115, gAipomPokedexText, 363, 6, 256, 0
pokedex_entry 8, 115, gAipomPokedexText, 363, 6, 256, 0
.string "SEED$", 12
pokedex_entry 3, 18, gSunkernPokedexText, 541, 0, 256, 0
pokedex_entry 3, 18, gSunkernPokedexText, 541, 0, 256, 0
.string "SUN$", 12
pokedex_entry 8, 85, gSunfloraPokedexText, 444, 15, 256, 0
.string "CLEAR WING$", 12
pokedex_entry 12, 380, gYanmaPokedexText, 274, -1, 256, 0
pokedex_entry 12, 380, gYanmaPokedexText, 274, -1, 256, 0
.string "WATER FISH$", 12
pokedex_entry 4, 85, gWooperPokedexText, 479, 21, 256, 0
pokedex_entry 4, 85, gWooperPokedexText, 479, 21, 256, 0
.string "WATER FISH$", 12
pokedex_entry 14, 750, gQuagsirePokedexText, 256, 4, 256, 0
.string "SUN$", 12
pokedex_entry 9, 265, gEspeonPokedexText, 363, 14, 256, 0
pokedex_entry 9, 265, gEspeonPokedexText, 363, 14, 256, 0
.string "MOONLIGHT$", 12
pokedex_entry 10, 270, gUmbreonPokedexText, 317, 11, 256, 0
pokedex_entry 10, 270, gUmbreonPokedexText, 317, 11, 256, 0
.string "DARKNESS$", 12
pokedex_entry 5, 21, gMurkrowPokedexText, 401, -8, 256, 1
pokedex_entry 5, 21, gMurkrowPokedexText, 401, -8, 256, 1
.string "ROYAL$", 12
pokedex_entry 20, 795, gSlowkingPokedexText, 256, 0, 309, 5
.string "SCREECH$", 12
pokedex_entry 7, 10, gMisdreavusPokedexText, 407, -8, 256, 0
.string "SYMBOL$", 12
pokedex_entry 5, 50, gUnownPokedexText, 411, 2, 256, 0
pokedex_entry 5, 50, gUnownPokedexText, 411, 2, 256, 0
.string "PATIENT$", 12
pokedex_entry 13, 285, gWobbuffetPokedexText, 274, 4, 256, 0
.string "LONG NECK$", 12
pokedex_entry 15, 415, gGirafarigPokedexText, 281, 1, 256, 0
.string "BAGWORM$", 12
pokedex_entry 6, 72, gPinecoPokedexText, 445, 2, 256, 0
pokedex_entry 6, 72, gPinecoPokedexText, 445, 2, 256, 0
.string "BAGWORM$", 12
pokedex_entry 12, 1258, gForretressPokedexText, 293, 5, 256, 0
.string "LAND SNAKE$", 12
pokedex_entry 15, 140, gDunsparcePokedexText, 316, 17, 256, 0
.string "FLYSCORPION$", 12
pokedex_entry 11, 648, gGligarPokedexText, 350, -1, 256, 0
pokedex_entry 11, 648, gGligarPokedexText, 350, -1, 256, 0
.string "IRON SNAKE$", 12
pokedex_entry 92, 4000, gSteelixPokedexText, 256, 0, 516, 13
pokedex_entry 92, 4000, gSteelixPokedexText, 256, 0, 516, 13
.string "FAIRY$", 12
pokedex_entry 6, 78, gSnubbullPokedexText, 465, 19, 256, 0
.string "FAIRY$", 12
@@ -425,27 +425,27 @@ gPokedexEntries:: @ 856B5B0
.string "BALLOON$", 12
pokedex_entry 5, 39, gQwilfishPokedexText, 430, 0, 256, 0
.string "PINCER$", 12
pokedex_entry 18, 1180, gScizorPokedexText, 278, 1, 256, 0
pokedex_entry 18, 1180, gScizorPokedexText, 278, 1, 256, 0
.string "MOLD$", 12
pokedex_entry 6, 205, gShucklePokedexText, 485, 18, 256, 0
pokedex_entry 6, 205, gShucklePokedexText, 485, 18, 256, 0
.string "SINGLE HORN$", 12
pokedex_entry 15, 540, gHeracrossPokedexText, 256, 0, 256, 0
.string "SHARP CLAW$", 12
pokedex_entry 9, 280, gSneaselPokedexText, 413, -3, 256, 0
pokedex_entry 9, 280, gSneaselPokedexText, 413, -3, 256, 0
.string "LITTLE BEAR$", 12
pokedex_entry 6, 88, gTeddiursaPokedexText, 455, 19, 256, 0
.string "HIBERNATOR$", 12
pokedex_entry 18, 1258, gUrsaringPokedexText, 256, 0, 256, 0
.string "LAVA$", 12
pokedex_entry 7, 350, gSlugmaPokedexText, 329, 15, 256, 0
pokedex_entry 7, 350, gSlugmaPokedexText, 329, 15, 256, 0
.string "LAVA$", 12
pokedex_entry 8, 550, gMagcargoPokedexText, 332, 15, 256, 0
.string "PIG$", 12
pokedex_entry 4, 65, gSwinubPokedexText, 324, 20, 256, 0
pokedex_entry 4, 65, gSwinubPokedexText, 324, 20, 256, 0
.string "SWINE$", 12
pokedex_entry 11, 558, gPiloswinePokedexText, 306, 10, 256, 0
.string "CORAL$", 12
pokedex_entry 6, 50, gCorsolaPokedexText, 410, 15, 256, 0
pokedex_entry 6, 50, gCorsolaPokedexText, 410, 15, 256, 0
.string "JET$", 12
pokedex_entry 6, 120, gRemoraidPokedexText, 316, 4, 256, 0
.string "JET$", 12
@@ -453,7 +453,7 @@ gPokedexEntries:: @ 856B5B0
.string "DELIVERY$", 12
pokedex_entry 9, 160, gDelibirdPokedexText, 293, 11, 256, 0
.string "KITE$", 12
pokedex_entry 21, 2200, gMantinePokedexText, 256, 0, 342, 7
pokedex_entry 21, 2200, gMantinePokedexText, 256, 0, 342, 7
.string "ARMOR BIRD$", 12
pokedex_entry 17, 505, gSkarmoryPokedexText, 256, 0, 271, 1
.string "DARK$", 12
@@ -461,11 +461,11 @@ gPokedexEntries:: @ 856B5B0
.string "DARK$", 12
pokedex_entry 14, 350, gHoundoomPokedexText, 256, 4, 256, 0
.string "DRAGON$", 12
pokedex_entry 18, 1520, gKingdraPokedexText, 256, 0, 287, 0
pokedex_entry 18, 1520, gKingdraPokedexText, 256, 0, 287, 0
.string "LONG NOSE$", 12
pokedex_entry 5, 335, gPhanpyPokedexText, 465, 21, 256, 0
pokedex_entry 5, 335, gPhanpyPokedexText, 465, 21, 256, 0
.string "ARMOR$", 12
pokedex_entry 11, 1200, gDonphanPokedexText, 313, 9, 256, 0
pokedex_entry 11, 1200, gDonphanPokedexText, 313, 9, 256, 0
.string "VIRTUAL$", 12
pokedex_entry 6, 325, gPorygon2PokedexText, 320, 17, 256, 0
.string "BIG HORN$", 12
@@ -473,51 +473,51 @@ gPokedexEntries:: @ 856B5B0
.string "PAINTER$", 12
pokedex_entry 12, 580, gSmearglePokedexText, 287, 5, 256, 0
.string "SCUFFLE$", 12
pokedex_entry 7, 210, gTyroguePokedexText, 292, 9, 256, 0
pokedex_entry 7, 210, gTyroguePokedexText, 292, 9, 256, 0
.string "HANDSTAND$", 12
pokedex_entry 14, 480, gHitmontopPokedexText, 256, 2, 257, 0
.string "KISS$", 12
pokedex_entry 4, 60, gSmoochumPokedexText, 440, 20, 256, 0
.string "ELECTRIC$", 12
pokedex_entry 6, 235, gElekidPokedexText, 363, 14, 256, 0
pokedex_entry 6, 235, gElekidPokedexText, 363, 14, 256, 0
.string "LIVE COAL$", 12
pokedex_entry 7, 214, gMagbyPokedexText, 284, 13, 256, 0
pokedex_entry 7, 214, gMagbyPokedexText, 284, 13, 256, 0
.string "MILK COW$", 12
pokedex_entry 12, 755, gMiltankPokedexText, 280, 5, 256, 0
pokedex_entry 12, 755, gMiltankPokedexText, 280, 5, 256, 0
.string "HAPPINESS$", 12
pokedex_entry 15, 468, gBlisseyPokedexText, 256, 4, 310, 3
pokedex_entry 15, 468, gBlisseyPokedexText, 256, 4, 310, 3
.string "THUNDER$", 12
pokedex_entry 19, 1780, gRaikouPokedexText, 256, 0, 345, 7
pokedex_entry 19, 1780, gRaikouPokedexText, 256, 0, 345, 7
.string "VOLCANO$", 12
pokedex_entry 21, 1980, gEnteiPokedexText, 259, 0, 345, 7
pokedex_entry 21, 1980, gEnteiPokedexText, 259, 0, 345, 7
.string "AURORA$", 12
pokedex_entry 20, 1870, gSuicunePokedexText, 269, 0, 345, 7
pokedex_entry 20, 1870, gSuicunePokedexText, 269, 0, 345, 7
.string "ROCK SKIN$", 12
pokedex_entry 6, 720, gLarvitarPokedexText, 472, 18, 256, 0
.string "HARD SHELL$", 12
pokedex_entry 12, 1520, gPupitarPokedexText, 292, 8, 256, 0
pokedex_entry 12, 1520, gPupitarPokedexText, 292, 8, 256, 0
.string "ARMOR$", 12
pokedex_entry 20, 2020, gTyranitarPokedexText, 256, 0, 345, 7
.string "DIVING$", 12
pokedex_entry 52, 2160, gLugiaPokedexText, 256, 0, 721, 19
pokedex_entry 52, 2160, gLugiaPokedexText, 256, 0, 721, 19
.string "RAINBOW$", 12
pokedex_entry 38, 1990, gHoOhPokedexText, 256, 0, 610, 17
pokedex_entry 38, 1990, gHoOhPokedexText, 256, 0, 610, 17
.string "TIME TRAVEL$", 12
pokedex_entry 6, 50, gCelebiPokedexText, 393, -10, 256, 0
pokedex_entry 6, 50, gCelebiPokedexText, 393, -10, 256, 0
.string "WOOD GECKO$", 12
pokedex_entry 5, 50, gTreeckoPokedexText, 541, 19, 256, 0
pokedex_entry 5, 50, gTreeckoPokedexText, 541, 19, 256, 0
.string "WOOD GECKO$", 12
pokedex_entry 9, 216, gGrovylePokedexText, 360, 5, 256, 0
pokedex_entry 9, 216, gGrovylePokedexText, 360, 5, 256, 0
.string "FOREST$", 12
pokedex_entry 17, 522, gSceptilePokedexText, 256, -1, 275, 2
.string "CHICK$", 12
pokedex_entry 4, 25, gTorchicPokedexText, 566, 19, 256, 0
pokedex_entry 4, 25, gTorchicPokedexText, 566, 19, 256, 0
.string "YOUNG FOWL$", 12
pokedex_entry 9, 195, gCombuskenPokedexText, 343, 5, 256, 0
.string "BLAZE$", 12
pokedex_entry 19, 520, gBlazikenPokedexText, 256, 0, 301, 4
.string "MUD FISH$", 12
pokedex_entry 4, 76, gMudkipPokedexText, 535, 20, 256, 0
pokedex_entry 4, 76, gMudkipPokedexText, 535, 20, 256, 0
.string "MUD FISH$", 12
pokedex_entry 7, 280, gMarshtompPokedexText, 340, 7, 256, 0
.string "MUD FISH$", 12
@@ -529,91 +529,91 @@ gPokedexEntries:: @ 856B5B0
.string "TINYRACCOON$", 12
pokedex_entry 4, 175, gZigzagoonPokedexText, 560, 22, 256, 0
.string "RUSHING$", 12
pokedex_entry 5, 325, gLinoonePokedexText, 321, 7, 256, 0
pokedex_entry 5, 325, gLinoonePokedexText, 321, 7, 256, 0
.string "WORM$", 12
pokedex_entry 3, 36, gWurmplePokedexText, 711, 24, 256, 0
pokedex_entry 3, 36, gWurmplePokedexText, 711, 24, 256, 0
.string "COCOON$", 12
pokedex_entry 6, 100, gSilcoonPokedexText, 431, 19, 256, 0
pokedex_entry 6, 100, gSilcoonPokedexText, 431, 19, 256, 0
.string "BUTTERFLY$", 12
pokedex_entry 10, 284, gBeautiflyPokedexText, 298, -1, 256, 0
.string "COCOON$", 12
pokedex_entry 7, 115, gCascoonPokedexText, 391, 20, 256, 0
pokedex_entry 7, 115, gCascoonPokedexText, 391, 20, 256, 0
.string "POISON MOTH$", 12
pokedex_entry 12, 316, gDustoxPokedexText, 269, 1, 256, 0
pokedex_entry 12, 316, gDustoxPokedexText, 269, 1, 256, 0
.string "WATER WEED$", 12
pokedex_entry 5, 26, gLotadPokedexText, 406, 19, 256, 0
pokedex_entry 5, 26, gLotadPokedexText, 406, 19, 256, 0
.string "JOLLY$", 12
pokedex_entry 12, 325, gLombrePokedexText, 277, 9, 256, 0
pokedex_entry 12, 325, gLombrePokedexText, 277, 9, 256, 0
.string "CAREFREE$", 12
pokedex_entry 15, 550, gLudicoloPokedexText, 256, 0, 268, -1
.string "ACORN$", 12
pokedex_entry 5, 40, gSeedotPokedexText, 472, 20, 256, 0
pokedex_entry 5, 40, gSeedotPokedexText, 472, 20, 256, 0
.string "WILY$", 12
pokedex_entry 10, 280, gNuzleafPokedexText, 299, 10, 256, 0
pokedex_entry 10, 280, gNuzleafPokedexText, 299, 10, 256, 0
.string "WICKED$", 12
pokedex_entry 13, 596, gShiftryPokedexText, 290, 4, 256, 0
pokedex_entry 13, 596, gShiftryPokedexText, 290, 4, 256, 0
.string "TINYSWALLOW$", 12
pokedex_entry 3, 23, gTaillowPokedexText, 465, 21, 256, 0
pokedex_entry 3, 23, gTaillowPokedexText, 465, 21, 256, 0
.string "SWALLOW$", 12
pokedex_entry 7, 198, gSwellowPokedexText, 428, 15, 256, 0
pokedex_entry 7, 198, gSwellowPokedexText, 428, 15, 256, 0
.string "SEAGULL$", 12
pokedex_entry 6, 95, gWingullPokedexText, 295, -2, 256, 0
pokedex_entry 6, 95, gWingullPokedexText, 295, -2, 256, 0
.string "WATER BIRD$", 12
pokedex_entry 12, 280, gPelipperPokedexText, 288, 1, 256, 0
.string "FEELING$", 12
pokedex_entry 4, 66, gRaltsPokedexText, 457, -3, 256, 0
pokedex_entry 4, 66, gRaltsPokedexText, 457, -3, 256, 0
.string "EMOTION$", 12
pokedex_entry 8, 202, gKirliaPokedexText, 354, 0, 256, 0
pokedex_entry 8, 202, gKirliaPokedexText, 354, 0, 256, 0
.string "EMBRACE$", 12
pokedex_entry 16, 484, gGardevoirPokedexText, 256, 0, 256, 0
.string "POND SKATER$", 12
pokedex_entry 5, 17, gSurskitPokedexText, 375, 17, 256, 0
pokedex_entry 5, 17, gSurskitPokedexText, 375, 17, 256, 0
.string "EYEBALL$", 12
pokedex_entry 8, 36, gMasquerainPokedexText, 378, 8, 256, 0
.string "MUSHROOM$", 12
pokedex_entry 4, 45, gShroomishPokedexText, 513, 22, 256, 0
.string "MUSHROOM$", 12
pokedex_entry 12, 392, gBreloomPokedexText, 324, 6, 256, 0
pokedex_entry 12, 392, gBreloomPokedexText, 324, 6, 256, 0
.string "SLACKER$", 12
pokedex_entry 8, 240, gSlakothPokedexText, 291, 16, 256, 0
pokedex_entry 8, 240, gSlakothPokedexText, 291, 16, 256, 0
.string "WILD MONKEY$", 12
pokedex_entry 14, 465, gVigorothPokedexText, 301, 2, 256, 0
.string "LAZY$", 12
pokedex_entry 20, 1305, gSlakingPokedexText, 256, 2, 300, 1
pokedex_entry 20, 1305, gSlakingPokedexText, 256, 2, 300, 1
.string "TRAINEE$", 12
pokedex_entry 5, 55, gNincadaPokedexText, 405, 21, 256, 0
pokedex_entry 5, 55, gNincadaPokedexText, 405, 21, 256, 0
.string "NINJA$", 12
pokedex_entry 8, 120, gNinjaskPokedexText, 383, -9, 256, 0
pokedex_entry 8, 120, gNinjaskPokedexText, 383, -9, 256, 0
.string "SHED$", 12
pokedex_entry 8, 12, gShedinjaPokedexText, 372, -8, 256, 0
.string "WHISPER$", 12
pokedex_entry 6, 163, gWhismurPokedexText, 373, 17, 256, 0
pokedex_entry 6, 163, gWhismurPokedexText, 373, 17, 256, 0
.string "BIG VOICE$", 12
pokedex_entry 10, 405, gLoudredPokedexText, 356, 10, 256, 0
pokedex_entry 10, 405, gLoudredPokedexText, 356, 10, 256, 0
.string "LOUD NOISE$", 12
pokedex_entry 15, 840, gExploudPokedexText, 284, 1, 256, 0
pokedex_entry 15, 840, gExploudPokedexText, 284, 1, 256, 0
.string "GUTS$", 12
pokedex_entry 10, 864, gMakuhitaPokedexText, 256, 10, 256, 0
.string "ARM THRUST$", 12
pokedex_entry 23, 2538, gHariyamaPokedexText, 256, 0, 343, 7
.string "POLKA DOT$", 12
pokedex_entry 2, 20, gAzurillPokedexText, 603, 23, 256, 0
pokedex_entry 2, 20, gAzurillPokedexText, 603, 23, 256, 0
.string "COMPASS$", 12
pokedex_entry 10, 970, gNosepassPokedexText, 256, 9, 289, 3
.string "KITTEN$", 12
pokedex_entry 6, 110, gSkittyPokedexText, 492, 19, 256, 0
pokedex_entry 6, 110, gSkittyPokedexText, 492, 19, 256, 0
.string "PRIM$", 12
pokedex_entry 11, 326, gDelcattyPokedexText, 322, 10, 256, 0
.string "DARKNESS$", 12
pokedex_entry 5, 110, gSableyePokedexText, 451, 17, 256, 0
pokedex_entry 5, 110, gSableyePokedexText, 451, 17, 256, 0
.string "DECEIVER$", 12
pokedex_entry 6, 115, gMawilePokedexText, 466, 17, 256, 0
pokedex_entry 6, 115, gMawilePokedexText, 466, 17, 256, 0
.string "IRON ARMOR$", 12
pokedex_entry 4, 600, gAronPokedexText, 419, 23, 256, 0
pokedex_entry 4, 600, gAronPokedexText, 419, 23, 256, 0
.string "IRON ARMOR$", 12
pokedex_entry 9, 1200, gLaironPokedexText, 275, 12, 256, 0
pokedex_entry 9, 1200, gLaironPokedexText, 275, 12, 256, 0
.string "IRON ARMOR$", 12
pokedex_entry 21, 3600, gAggronPokedexText, 256, -1, 350, 6
pokedex_entry 21, 3600, gAggronPokedexText, 256, -1, 350, 6
.string "MEDITATE$", 12
pokedex_entry 6, 112, gMedititePokedexText, 465, 17, 256, 0
.string "MEDITATE$", 12
@@ -623,61 +623,61 @@ gPokedexEntries:: @ 856B5B0
.string "DISCHARGE$", 12
pokedex_entry 15, 402, gManectricPokedexText, 256, 3, 257, 0
.string "CHEERING$", 12
pokedex_entry 4, 42, gPluslePokedexText, 515, -9, 256, 0
pokedex_entry 4, 42, gPluslePokedexText, 515, -9, 256, 0
.string "CHEERING$", 12
pokedex_entry 4, 42, gMinunPokedexText, 512, -7, 256, 0
pokedex_entry 4, 42, gMinunPokedexText, 512, -7, 256, 0
.string "FIREFLY$", 12
pokedex_entry 7, 177, gVolbeatPokedexText, 442, 16, 256, 0
pokedex_entry 7, 177, gVolbeatPokedexText, 442, 16, 256, 0
.string "FIREFLY$", 12
pokedex_entry 6, 177, gIllumisePokedexText, 572, 19, 256, 0
.string "THORN$", 12
pokedex_entry 3, 20, gRoseliaPokedexText, 677, 20, 256, 0
pokedex_entry 3, 20, gRoseliaPokedexText, 677, 20, 256, 0
.string "STOMACH$", 12
pokedex_entry 4, 103, gGulpinPokedexText, 593, 23, 256, 0
pokedex_entry 4, 103, gGulpinPokedexText, 593, 23, 256, 0
.string "POISON BAG$", 12
pokedex_entry 17, 800, gSwalotPokedexText, 256, 6, 345, 3
pokedex_entry 17, 800, gSwalotPokedexText, 256, 6, 345, 3
.string "SAVAGE$", 12
pokedex_entry 8, 208, gCarvanhaPokedexText, 362, 0, 256, 0
.string "BRUTAL$", 12
pokedex_entry 18, 888, gSharpedoPokedexText, 256, 0, 317, 3
.string "BALL WHALE$", 12
pokedex_entry 20, 1300, gWailmerPokedexText, 256, 2, 493, 0
pokedex_entry 20, 1300, gWailmerPokedexText, 256, 2, 493, 0
.string "FLOAT WHALE$", 12
pokedex_entry 145, 3980, gWailordPokedexText, 256, 0, 1352, 18
pokedex_entry 145, 3980, gWailordPokedexText, 256, 0, 1352, 18
.string "NUMB$", 12
pokedex_entry 7, 240, gNumelPokedexText, 342, 17, 256, 0
pokedex_entry 7, 240, gNumelPokedexText, 342, 17, 256, 0
.string "ERUPTION$", 12
pokedex_entry 19, 2200, gCameruptPokedexText, 256, 7, 345, 6
.string "COAL$", 12
pokedex_entry 5, 804, gTorkoalPokedexText, 390, 9, 256, 0
pokedex_entry 5, 804, gTorkoalPokedexText, 390, 9, 256, 0
.string "BOUNCE$", 12
pokedex_entry 7, 306, gSpoinkPokedexText, 423, 17, 256, 0
pokedex_entry 7, 306, gSpoinkPokedexText, 423, 17, 256, 0
.string "MANIPULATE$", 12
pokedex_entry 9, 715, gGrumpigPokedexText, 358, 10, 256, 0
pokedex_entry 9, 715, gGrumpigPokedexText, 358, 10, 256, 0
.string "SPOT PANDA$", 12
pokedex_entry 11, 50, gSpindaPokedexText, 321, 4, 256, 0
pokedex_entry 11, 50, gSpindaPokedexText, 321, 4, 256, 0
.string "ANT PIT$", 12
pokedex_entry 7, 150, gTrapinchPokedexText, 298, 17, 256, 0
.string "VIBRATION$", 12
pokedex_entry 11, 153, gVibravaPokedexText, 370, 11, 256, 0
pokedex_entry 11, 153, gVibravaPokedexText, 370, 11, 256, 0
.string "MYSTIC$", 12
pokedex_entry 20, 820, gFlygonPokedexText, 256, 0, 268, 1
pokedex_entry 20, 820, gFlygonPokedexText, 256, 0, 268, 1
.string "CACTUS$", 12
pokedex_entry 4, 513, gCacneaPokedexText, 455, 20, 256, 0
pokedex_entry 4, 513, gCacneaPokedexText, 455, 20, 256, 0
.string "SCARECROW$", 12
pokedex_entry 13, 774, gCacturnePokedexText, 327, 5, 256, 0
.string "COTTON BIRD$", 12
pokedex_entry 4, 12, gSwabluPokedexText, 422, -8, 256, 0
pokedex_entry 4, 12, gSwabluPokedexText, 422, -8, 256, 0
.string "HUMMING$", 12
pokedex_entry 11, 206, gAltariaPokedexText, 327, 0, 256, 0
pokedex_entry 11, 206, gAltariaPokedexText, 327, 0, 256, 0
.string "CAT FERRET$", 12
pokedex_entry 13, 403, gZangoosePokedexText, 256, 3, 256, 0
.string "FANG SNAKE$", 12
pokedex_entry 27, 525, gSeviperPokedexText, 275, 7, 256, 0
pokedex_entry 27, 525, gSeviperPokedexText, 275, 7, 256, 0
.string "METEORITE$", 12
pokedex_entry 10, 1680, gLunatonePokedexText, 300, 3, 256, 0
.string "METEORITE$", 12
pokedex_entry 12, 1540, gSolrockPokedexText, 328, 0, 256, 0
pokedex_entry 12, 1540, gSolrockPokedexText, 328, 0, 256, 0
.string "WHISKERS$", 12
pokedex_entry 4, 19, gBarboachPokedexText, 581, -3, 256, 0
.string "WHISKERS$", 12
@@ -687,90 +687,90 @@ gPokedexEntries:: @ 856B5B0
.string "ROGUE$", 12
pokedex_entry 11, 328, gCrawdauntPokedexText, 365, 9, 256, 0
.string "CLAY DOLL$", 12
pokedex_entry 5, 215, gBaltoyPokedexText, 457, 21, 256, 0
pokedex_entry 5, 215, gBaltoyPokedexText, 457, 21, 256, 0
.string "CLAY DOLL$", 12
pokedex_entry 15, 1080, gClaydolPokedexText, 256, 3, 280, 1
pokedex_entry 15, 1080, gClaydolPokedexText, 256, 3, 280, 1
.string "SEA LILY$", 12
pokedex_entry 10, 238, gLileepPokedexText, 305, 8, 256, 0
pokedex_entry 10, 238, gLileepPokedexText, 305, 8, 256, 0
.string "BARNACLE$", 12
pokedex_entry 15, 604, gCradilyPokedexText, 267, 0, 256, 0
pokedex_entry 15, 604, gCradilyPokedexText, 267, 0, 256, 0
.string "OLD SHRIMP$", 12
pokedex_entry 7, 125, gAnorithPokedexText, 296, 4, 256, 0
pokedex_entry 7, 125, gAnorithPokedexText, 296, 4, 256, 0
.string "PLATE$", 12
pokedex_entry 15, 682, gArmaldoPokedexText, 312, 3, 271, 0
pokedex_entry 15, 682, gArmaldoPokedexText, 312, 3, 271, 0
.string "FISH$", 12
pokedex_entry 6, 74, gFeebasPokedexText, 423, -4, 256, 0
pokedex_entry 6, 74, gFeebasPokedexText, 423, -4, 256, 0
.string "TENDER$", 12
pokedex_entry 62, 1620, gMiloticPokedexText, 256, 0, 360, 7
pokedex_entry 62, 1620, gMiloticPokedexText, 256, 0, 360, 7
.string "WEATHER$", 12
pokedex_entry 3, 8, gCastformPokedexText, 435, -5, 256, 0
pokedex_entry 3, 8, gCastformPokedexText, 435, -5, 256, 0
.string "COLOR SWAP$", 12
pokedex_entry 10, 220, gKecleonPokedexText, 316, 10, 256, 0
pokedex_entry 10, 220, gKecleonPokedexText, 316, 10, 256, 0
.string "PUPPET$", 12
pokedex_entry 6, 23, gShuppetPokedexText, 440, 20, 256, 0
pokedex_entry 6, 23, gShuppetPokedexText, 440, 20, 256, 0
.string "MARIONETTE$", 12
pokedex_entry 11, 125, gBanettePokedexText, 262, 9, 256, 0
pokedex_entry 11, 125, gBanettePokedexText, 262, 9, 256, 0
.string "REQUIEM$", 12
pokedex_entry 8, 150, gDuskullPokedexText, 406, -4, 256, 0
pokedex_entry 8, 150, gDuskullPokedexText, 406, -4, 256, 0
.string "BECKON$", 12
pokedex_entry 16, 306, gDusclopsPokedexText, 256, 3, 299, 1
.string "FRUIT$", 12
pokedex_entry 20, 1000, gTropiusPokedexText, 256, 0, 344, 7
pokedex_entry 20, 1000, gTropiusPokedexText, 256, 0, 344, 7
.string "WIND CHIME$", 12
pokedex_entry 6, 10, gChimechoPokedexText, 505, 0, 256, 0
.string "DISASTER$", 12
pokedex_entry 12, 470, gAbsolPokedexText, 301, 3, 256, 0
pokedex_entry 12, 470, gAbsolPokedexText, 301, 3, 256, 0
.string "BRIGHT$", 12
pokedex_entry 6, 140, gWynautPokedexText, 484, 19, 256, 0
pokedex_entry 6, 140, gWynautPokedexText, 484, 19, 256, 0
.string "SNOW HAT$", 12
pokedex_entry 7, 168, gSnoruntPokedexText, 380, 15, 256, 0
pokedex_entry 7, 168, gSnoruntPokedexText, 380, 15, 256, 0
.string "FACE$", 12
pokedex_entry 15, 2565, gGlaliePokedexText, 256, 3, 344, 0
pokedex_entry 15, 2565, gGlaliePokedexText, 256, 3, 344, 0
.string "CLAP$", 12
pokedex_entry 8, 395, gSphealPokedexText, 315, 16, 256, 0
pokedex_entry 8, 395, gSphealPokedexText, 315, 16, 256, 0
.string "BALL ROLL$", 12
pokedex_entry 11, 876, gSealeoPokedexText, 338, 13, 256, 0
pokedex_entry 11, 876, gSealeoPokedexText, 338, 13, 256, 0
.string "ICE BREAK$", 12
pokedex_entry 14, 1506, gWalreinPokedexText, 316, 4, 256, 0
pokedex_entry 14, 1506, gWalreinPokedexText, 316, 4, 256, 0
.string "BIVALVE$", 12
pokedex_entry 4, 525, gClamperlPokedexText, 691, 22, 256, 0
.string "DEEP SEA$", 12
pokedex_entry 17, 270, gHuntailPokedexText, 307, 1, 256, 0
pokedex_entry 17, 270, gHuntailPokedexText, 307, 1, 256, 0
.string "SOUTH SEA$", 12
pokedex_entry 18, 226, gGorebyssPokedexText, 278, 5, 256, 0
.string "LONGEVITY$", 12
pokedex_entry 10, 234, gRelicanthPokedexText, 316, 7, 256, 0
.string "RENDEZVOUS$", 12
pokedex_entry 6, 87, gLuvdiscPokedexText, 371, 2, 256, 0
pokedex_entry 6, 87, gLuvdiscPokedexText, 371, 2, 256, 0
.string "ROCK HEAD$", 12
pokedex_entry 6, 421, gBagonPokedexText, 448, 18, 256, 0
pokedex_entry 6, 421, gBagonPokedexText, 448, 18, 256, 0
.string "ENDURANCE$", 12
pokedex_entry 11, 1105, gShelgonPokedexText, 311, 12, 256, 0
pokedex_entry 11, 1105, gShelgonPokedexText, 311, 12, 256, 0
.string "DRAGON$", 12
pokedex_entry 15, 1026, gSalamencePokedexText, 256, 0, 256, 0
.string "IRON BALL$", 12
pokedex_entry 6, 952, gBeldumPokedexText, 414, -1, 256, 0
pokedex_entry 6, 952, gBeldumPokedexText, 414, -1, 256, 0
.string "IRON CLAW$", 12
pokedex_entry 12, 2025, gMetangPokedexText, 256, 6, 256, 0
pokedex_entry 12, 2025, gMetangPokedexText, 256, 6, 256, 0
.string "IRON LEG$", 12
pokedex_entry 16, 5500, gMetagrossPokedexText, 256, 4, 447, 9
.string "ROCK PEAK$", 12
pokedex_entry 17, 2300, gRegirockPokedexText, 256, 2, 309, 1
.string "ICEBERG$", 12
pokedex_entry 18, 1750, gRegicePokedexText, 256, 0, 301, 2
pokedex_entry 18, 1750, gRegicePokedexText, 256, 0, 301, 2
.string "IRON$", 12
pokedex_entry 19, 2050, gRegisteelPokedexText, 256, 0, 359, 6
.string "EON$", 12
pokedex_entry 14, 400, gLatiasPokedexText, 304, 3, 256, 0
pokedex_entry 14, 400, gLatiasPokedexText, 304, 3, 256, 0
.string "EON$", 12
pokedex_entry 20, 600, gLatiosPokedexText, 256, 0, 294, 3
pokedex_entry 20, 600, gLatiosPokedexText, 256, 0, 294, 3
.string "SEA BASIN$", 12
pokedex_entry 45, 3520, gKyogrePokedexText, 256, 0, 614, 13
pokedex_entry 45, 3520, gKyogrePokedexText, 256, 0, 614, 13
.string "CONTINENT$", 12
pokedex_entry 35, 9500, gGroudonPokedexText, 256, 0, 515, 14
pokedex_entry 35, 9500, gGroudonPokedexText, 256, 0, 515, 14
.string "SKY HIGH$", 12
pokedex_entry 70, 2065, gRayquazaPokedexText, 256, 0, 448, 12
.string "WISH$", 12
pokedex_entry 3, 11, gJirachiPokedexText, 608, -8, 256, 0
pokedex_entry 3, 11, gJirachiPokedexText, 608, -8, 256, 0
.string "DNA$", 12
pokedex_entry 17, 608, gDeoxysPokedexText, 256, 0, 290, 2
pokedex_entry 17, 608, gDeoxysPokedexText, 256, 0, 290, 2
data/pokemon_icon.s
-27
View File
@@ -1,27 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
@ 857BCA8
.include "data/graphics/pokemon/icon_table.inc"
@ 857C388
.include "data/graphics/pokemon/icon_palette_indices.inc"
@ 857C540
.include "data/graphics/pokemon/icon_palette_table.inc"
gUnknown_0857C570:: @ 857C570
.incbin "baserom.gba", 0x57c570, 0x44
gUnknown_0857C5B4:: @ 857C5B4
.incbin "baserom.gba", 0x57c5b4, 0x14
.incbin "baserom.gba", 0x57c5c8, 0x20
gUnknown_0857C5E8:: @ 857C5E8
.incbin "baserom.gba", 0x57c5e8, 0x8
gUnknown_0857C5F0:: @ 857C5F0
.incbin "baserom.gba", 0x57c5f0, 0x18
data/pokemon_storage_system.s
+118 -29
View File
@@ -1,23 +1,8 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_085716C0:: @ 85716C0
.incbin "baserom.gba", 0x5716c0, 0x28
gUnknown_085716E8:: @ 85716E8
.incbin "baserom.gba", 0x5716e8, 0x28
gUnknown_08571710:: @ 8571710
.incbin "baserom.gba", 0x571710, 0x24
gUnknown_08571734:: @ 8571734
.incbin "baserom.gba", 0x571734, 0x3
gUnknown_08571737:: @ 8571737
.incbin "baserom.gba", 0x571737, 0x5
.section .rodata
.align 2, 0
gUnknown_0857173C:: @ 857173C
.incbin "baserom.gba", 0x57173c, 0x20
@@ -59,7 +44,13 @@ gUnknown_085724A4:: @ 85724A4
.incbin "baserom.gba", 0x5724a4, 0x18
gUnknown_085724BC:: @ 85724BC
.incbin "baserom.gba", 0x5724bc, 0x238
.incbin "baserom.gba", 0x5724bc, 0x18
gUnknown_085724D4:: @ 85724D4
.incbin "baserom.gba", 0x5724d4, 0x20
gUnknown_085724F4:: @ 85724F4
.incbin "baserom.gba", 0x5724f4, 0x200
gUnknown_085726F4:: @ 85726F4
.incbin "baserom.gba", 0x5726f4, 0x20
@@ -71,28 +62,126 @@ gUnknown_08572734:: @ 8572734
.incbin "baserom.gba", 0x572734, 0x10
gUnknown_08572744:: @ 8572744
.incbin "baserom.gba", 0x572744, 0x8
obj_pal gUnknown_085724D4, 0xDACA
gUnknown_0857274C:: @ 857274C
.incbin "baserom.gba", 0x57274c, 0x8
obj_tiles gUnknown_085724F4, 0x1C0, 5
gUnknown_08572754:: @ 8572754
.incbin "baserom.gba", 0x572754, 0x18
spr_template 2, 0xDAC6, gOamData_857286C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_0857276C:: @ 857276C
.incbin "baserom.gba", 0x57276c, 0xf8
.4byte gUnknown_085EB7EF, 0
.4byte gUnknown_085EB802, 0
.4byte gUnknown_085EB81A, 0
.4byte gUnknown_085EB82F, 0
.4byte gUnknown_085EB843, 1
.4byte gUnknown_085EB853, 0
.4byte gUnknown_085EB866, 0
.4byte gUnknown_085EB87C, 1
.4byte gUnknown_085EB88E, 0
.4byte gUnknown_085EB89F, 0
.4byte gUnknown_085EB8B5, 4
.4byte gUnknown_085EB8C6, 6
.4byte gUnknown_085EB8D3, 0
.4byte gUnknown_085EB8E6, 0
.4byte gUnknown_085EB900, 0
.4byte gUnknown_085EB913, 0
.4byte gUnknown_085EB92D, 0
.4byte gUnknown_085EB946, 0
.4byte gUnknown_085EB960, 0
.4byte gUnknown_085EB979, 1
.4byte gUnknown_085EB987, 0
.4byte gUnknown_085EB9A1, 0
.4byte gUnknown_085EB9AB, 0
.4byte gUnknown_085EB843, 7
.4byte gUnknown_085EB9C3, 0
.4byte gUnknown_085EB9D6, 7
.4byte gUnknown_085EB9EE, 0
.4byte gUnknown_085EB9FF, 0
.4byte gUnknown_085EBA19, 7
.4byte gUnknown_085EBA29, 7
.4byte gUnknown_085EBA38, 0
.align 2
gUnknown_08572864:: @ 8572864
.incbin "baserom.gba", 0x572864, 0x58
window_template 0, 0x18, 0xB, 5, 4, 0xF, 0x5C
.align 2
gOamData_857286C:: @ 857286C
.2byte 0x0000
.2byte 0xC000
.2byte 0x0000
.align 2
gOamData_8572874:: @ 8572874
.2byte 0x4000
.2byte 0x0000
.2byte 0x0000
.align 2
gSpriteAnim_857287C:: @ 857287C
obj_image_anim_frame 0, 5
obj_image_anim_end
.align 2
gSpriteAnim_8572884:: @ 8572884
obj_image_anim_frame 2, 8
obj_image_anim_frame 4, 8
obj_image_anim_frame 6, 8
obj_image_anim_jump 0
.align 2
gSpriteAnim_8572894:: @ 8572894
obj_image_anim_frame 8, 5
obj_image_anim_end
.align 2
gSpriteAnim_857289C:: @ 857289C
obj_image_anim_frame 10, 8
obj_image_anim_frame 4, 8
obj_image_anim_frame 12, 8
obj_image_anim_jump 0
.align 2
gSpriteAnimTable_85728AC:: @ 85728AC
.4byte gSpriteAnim_857287C
.4byte gSpriteAnim_8572884
.4byte gSpriteAnim_8572894
.4byte gSpriteAnim_857289C
gUnknown_085728BC:: @ 85728BC
.incbin "baserom.gba", 0x5728bc, 0x18
spr_template 5, 0xDACA, gOamData_8572874, gSpriteAnimTable_85728AC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_085728D4:: @ 85728D4
.incbin "baserom.gba", 0x5728d4, 0x48
spr_template 0x12, 0xDAC0, gOamData_85728EC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_0857291C:: @ 857291C
.incbin "baserom.gba", 0x57291c, 0x4c58
.align 2
gOamData_85728EC:: @ 85728EC
.2byte 0x0000
.2byte 0x8000
.2byte 0x0000
.align 2
gSpriteAffineAnim_85728F4:: @ 85728F4
obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 0, 120
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_8572904:: @ 8572904
obj_rot_scal_anim_frame 0x10, 0x10, 0, 0
obj_rot_scal_anim_frame 0x10, 0x10, 0, 15
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnimTable_857291C:: @ 857291C
.4byte gSpriteAffineAnim_85728F4
.4byte gSpriteAffineAnim_8572904
gUnknown_08572924:: @ 8572924
.incbin "baserom.gba", 0x572924, 0x4c50
gUnknown_08577574:: @ 8577574
.incbin "baserom.gba", 0x577574, 0x44
data/pokemon_summary_screen.s
+8 -2
View File
@@ -121,7 +121,12 @@ gUnknown_0861F2C0:: @ 861F2C0
.incbin "baserom.gba", 0x61f2c0, 0x18
gUnknown_0861F2D8:: @ 861F2D8
.incbin "baserom.gba", 0x61f2d8, 0x30
.4byte gMenuText_Use, sub_81C61E0
.4byte gMenuText_Toss, sub_81C62C4
.4byte gMenuText_Give, sub_81C6648
.4byte gText_Cancel2, sub_81C6258
.4byte gMenuText_Use, sub_81C679C
.4byte gText_EmptyString2, NULL
gUnknown_0861F308:: @ 861F308
.incbin "baserom.gba", 0x61f308, 0x4
@@ -136,7 +141,8 @@ gUnknown_0861F310:: @ 861F310
.incbin "baserom.gba", 0x61f310, 0x4
gUnknown_0861F314:: @ 861F314
.incbin "baserom.gba", 0x61f314, 0x8
.4byte sub_81C654C
.4byte sub_81C63D0
gUnknown_0861F31C:: @ 861F31C
.incbin "baserom.gba", 0x61f31c, 0xc
data/pokenav.s
+1559 -47
View File
File diff suppressed because it is too large Load Diff
data/rayquaza_scene.s
-160
View File
@@ -1,160 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gUnknown_0862A6A0:: @ 862A6A0
.incbin "baserom.gba", 0x62a6a0, 0x8c
gUnknown_0862A72C:: @ 862A72C
.incbin "baserom.gba", 0x62a72c, 0x24
gUnknown_0862A750:: @ 862A750
.incbin "baserom.gba", 0x62a750, 0x24
gUnknown_0862A774:: @ 862A774
.incbin "baserom.gba", 0x62a774, 0xa8
gUnknown_0862A81C:: @ 862A81C
.incbin "baserom.gba", 0x62a81c, 0x30
gUnknown_0862A84C:: @ 862A84C
.incbin "baserom.gba", 0x62a84c, 0x18
gUnknown_0862A864:: @ 862A864
.incbin "baserom.gba", 0x62a864, 0x18
gUnknown_0862A87C:: @ 862A87C
.incbin "baserom.gba", 0x62a87c, 0xc
gUnknown_0862A888:: @ 862A888
.incbin "baserom.gba", 0x62a888, 0x3c
gUnknown_0862A8C4:: @ 862A8C4
.incbin "baserom.gba", 0x62a8c4, 0x8
gUnknown_0862A8CC:: @ 862A8CC
.incbin "baserom.gba", 0x62a8cc, 0x8
gUnknown_0862A8D4:: @ 862A8D4
.incbin "baserom.gba", 0x62a8d4, 0x24
gUnknown_0862A8F8:: @ 862A8F8
.incbin "baserom.gba", 0x62a8f8, 0x8
gUnknown_0862A900:: @ 862A900
.incbin "baserom.gba", 0x62a900, 0x24
gUnknown_0862A924:: @ 862A924
.incbin "baserom.gba", 0x62a924, 0x8
gUnknown_0862A92C:: @ 862A92C
.incbin "baserom.gba", 0x62a92c, 0xa8
gUnknown_0862A9D4:: @ 862A9D4
.incbin "baserom.gba", 0x62a9d4, 0x8
gUnknown_0862A9DC:: @ 862A9DC
.incbin "baserom.gba", 0x62a9dc, 0x8
gUnknown_0862A9E4:: @ 862A9E4
.incbin "baserom.gba", 0x62a9e4, 0x30
gUnknown_0862AA14:: @ 862AA14
.incbin "baserom.gba", 0x62aa14, 0x8
gUnknown_0862AA1C:: @ 862AA1C
.incbin "baserom.gba", 0x62aa1c, 0x18
gUnknown_0862AA34:: @ 862AA34
.incbin "baserom.gba", 0x62aa34, 0x8
gUnknown_0862AA3C:: @ 862AA3C
.incbin "baserom.gba", 0x62aa3c, 0x18
gUnknown_0862AA54:: @ 862AA54
.incbin "baserom.gba", 0x62aa54, 0x3c
gUnknown_0862AA90:: @ 862AA90
.incbin "baserom.gba", 0x62aa90, 0x8
gUnknown_0862AA98:: @ 862AA98
.incbin "baserom.gba", 0x62aa98, 0x8
gUnknown_0862AAA0:: @ 862AAA0
.incbin "baserom.gba", 0x62aaa0, 0x18
gUnknown_0862AAB8:: @ 862AAB8
.incbin "baserom.gba", 0x62aab8, 0x14
gUnknown_0862AACC:: @ 862AACC
.incbin "baserom.gba", 0x62aacc, 0x30
gUnknown_0862AAFC:: @ 862AAFC
.incbin "baserom.gba", 0x62aafc, 0x8
gUnknown_0862AB04:: @ 862AB04
.incbin "baserom.gba", 0x62ab04, 0x8
gUnknown_0862AB0C:: @ 862AB0C
.incbin "baserom.gba", 0x62ab0c, 0x8
gUnknown_0862AB14:: @ 862AB14
.incbin "baserom.gba", 0x62ab14, 0x18
gUnknown_0862AB2C:: @ 862AB2C
.incbin "baserom.gba", 0x62ab2c, 0x18
gUnknown_0862AB44:: @ 862AB44
.incbin "baserom.gba", 0x62ab44, 0xe4
gUnknown_0862AC28:: @ 862AC28
.incbin "baserom.gba", 0x62ac28, 0x8
gUnknown_0862AC30:: @ 862AC30
.incbin "baserom.gba", 0x62ac30, 0x8
gUnknown_0862AC38:: @ 862AC38
.incbin "baserom.gba", 0x62ac38, 0x8
gUnknown_0862AC40:: @ 862AC40
.incbin "baserom.gba", 0x62ac40, 0x8
gUnknown_0862AC48:: @ 862AC48
.incbin "baserom.gba", 0x62ac48, 0x8
gUnknown_0862AC50:: @ 862AC50
.incbin "baserom.gba", 0x62ac50, 0x8
gUnknown_0862AC58:: @ 862AC58
.incbin "baserom.gba", 0x62ac58, 0x8
gUnknown_0862AC60:: @ 862AC60
.incbin "baserom.gba", 0x62ac60, 0x8
gUnknown_0862AC68:: @ 862AC68
.incbin "baserom.gba", 0x62ac68, 0x8
gUnknown_0862AC70:: @ 862AC70
.incbin "baserom.gba", 0x62ac70, 0x8
gUnknown_0862AC78:: @ 862AC78
.incbin "baserom.gba", 0x62ac78, 0x18
gUnknown_0862AC90:: @ 862AC90
.incbin "baserom.gba", 0x62ac90, 0x18
gUnknown_0862ACA8:: @ 862ACA8
.incbin "baserom.gba", 0x62aca8, 0x18
gUnknown_0862ACC0:: @ 862ACC0
.incbin "baserom.gba", 0x62acc0, 0x18
gUnknown_0862ACD8:: @ 862ACD8
.incbin "baserom.gba", 0x62acd8, 0x18
gUnknown_0862ACF0:: @ 862ACF0
.incbin "baserom.gba", 0x62acf0, 0x18
gUnknown_0862AD08:: @ 862AD08
.incbin "baserom.gba", 0x62ad08, 0xc
data/record_mixing.s
+1 -1
View File
@@ -2,7 +2,7 @@
.include "constants/constants.inc"
.section .rodata
.align 2, 0
.align 2, 0
gUnknown_0858CF8C:: @ 858CF8C
.incbin "baserom.gba", 0x58cf8c, 0x2
data/reset_rtc_screen.s
+4 -4
View File
@@ -1,8 +1,8 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
.section .rodata
.align 2, 0
gUnknown_08510404:: @ 8510404 struct BgTemplate
.4byte 0x000001f0
data/rom_8486FEC.s
+4 -4
View File
@@ -1,8 +1,8 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
.section .rodata
.align 2, 0
gUnknown_8486FEC:: @ 8486FEC
.incbin "baserom.gba", 0x486fec, 0xFFA0
data/rom_8525F58.s
+9 -9
View File
@@ -1,34 +1,34 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.section .rodata
.align 2
.align 2
gUnknown_08525F58:: @ 8525F58
.byte 0x48, 0x50, 0x00, 0x00, 0xb0, 0x28, 0x00, 0x00
.byte 0x30, 0x28, 0x00, 0x00, 0x70, 0x50, 0x00, 0x00
.byte 0x20, 0x50, 0x00, 0x00, 0xc8, 0x28, 0x00, 0x00
.byte 0x5a, 0x58, 0x00, 0x00, 0x98, 0x20, 0x00, 0x00
.align 2
.align 2
gCastformFrontSpriteCoords:: @ 8525F78
.byte 0x44, 0x11, 0x00, 0x00, 0x66, 0x09, 0x00, 0x00
.byte 0x46, 0x09, 0x00, 0x00, 0x86, 0x08, 0x00, 0x00
.align 2
.align 2
gUnknown_08525F88:: @ 8525F88
.byte 0x0d, 0x0e, 0x0d, 0x0d
.align 2
.align 2
gUnknown_08525F8C:: @ 8525F8C
.byte 0x00, 0x00, 0x00, 0x00
.align 2
.align 2
gUnknown_08525F90:: @ 8525F90
spr_template 0xd755, 0xd755, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 0xd756, 0xd756, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
.align 2
gUnknown_08525FC0:: @ 8525FC0
obj_tiles gMiscBlank_Gfx, 0x0800, 0xd755
obj_tiles gMiscBlank_Gfx, 0x0800, 0xd756
data/roulette.s
+928
View File
@@ -0,0 +1,928 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 1
gUnknown_085B5BFC:: @ 85B5BFC
.incbin "graphics/roulette/85B5BFC.gbapal"
.align 2
gUnknown_085B5DFC:: @ 85B5DFC
.incbin "graphics/roulette/85B5DFC.bin.lz"
.align 2
gUnknown_085B5FA0:: @ 85B5FA0
.incbin "graphics/roulette/wheel_map.bin.lz"
.align 2
gUnknown_085B6140:: @ 85B6140
.4byte 0x000001f8, 0x00001241, 0x00002a66
.align 2
gUnknown_085B614C:: @ 85B614C
window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0f, 0x00c5
.align 2
gUnknown_085B6154:: @ 85B6154
.byte 0xFF, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x0C, 0x14, 0x00, 0x11, 0x07, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x42, 0x08, 0x01, 0x00, 0x00, 0xE0, 0x00, 0x00
.byte 0x0D, 0x24, 0x00, 0x14, 0x07, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x84, 0x10, 0x02, 0x00, 0x00, 0xE0, 0x00, 0x00
.byte 0x0E, 0x34, 0x00, 0x17, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x21, 0x04, 0x00, 0x00, 0xE0, 0x00, 0x00
.byte 0x0F, 0x44, 0x00, 0x1A, 0x07, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x42, 0x08, 0x00, 0x00, 0xE0, 0x00, 0x00
.byte 0x10, 0x03, 0x01, 0x0E, 0x0A, 0x00, 0x0C, 0x00, 0x20, 0x00, 0x00, 0x00, 0xE0, 0x03, 0x00, 0x00, 0x49, 0x02, 0x00, 0x00
.byte 0x00, 0x1C, 0x01, 0x11, 0x0A, 0x03, 0x03, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x01, 0x20, 0x00, 0x00
.byte 0x09, 0x2C, 0x01, 0x14, 0x0A, 0x03, 0x03, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x22, 0x00, 0x00
.byte 0x06, 0x3C, 0x01, 0x17, 0x0A, 0x03, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x40, 0x20, 0x00, 0x00
.byte 0x03, 0x4C, 0x01, 0x1A, 0x0A, 0x03, 0x03, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x08, 0x20, 0x00, 0x00
.byte 0x11, 0x03, 0x02, 0x0E, 0x0D, 0x03, 0x0F, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x7C, 0x00, 0x00, 0x92, 0x04, 0x00, 0x00
.byte 0x04, 0x1C, 0x02, 0x11, 0x0D, 0x06, 0x06, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x10, 0x20, 0x00, 0x00
.byte 0x01, 0x2C, 0x02, 0x14, 0x0D, 0x06, 0x06, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x02, 0x20, 0x00, 0x00
.byte 0x0A, 0x3C, 0x02, 0x17, 0x0D, 0x06, 0x06, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00
.byte 0x07, 0x4C, 0x02, 0x1A, 0x0D, 0x06, 0x06, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x80, 0x20, 0x00, 0x00
.byte 0x12, 0x03, 0x03, 0x0E, 0x10, 0x06, 0x12, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x0F, 0x00, 0x24, 0x09, 0x00, 0x00
.byte 0x08, 0x1C, 0x03, 0x11, 0x10, 0x09, 0x09, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x21, 0x00, 0x00
.byte 0x05, 0x2C, 0x03, 0x14, 0x10, 0x09, 0x09, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x20, 0x20, 0x00, 0x00
.byte 0x02, 0x3C, 0x03, 0x17, 0x10, 0x09, 0x09, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x04, 0x20, 0x00, 0x00
.byte 0x0B, 0x4C, 0x03, 0x1A, 0x10, 0x09, 0x09, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x28, 0x00, 0x00
.align 2
gUnknown_085B62E4:: @ 85B62E4
.byte 0, 1, 6, 0, 64, 0, 0, 0
.byte 1, 3, 12, 0, 0, 16, 0, 0
.byte 2, 5, 18, 0, 0, 0, 4, 0
.byte 3, 7, 9, 0, 0, 2, 0, 0
.byte 4, 9, 11, 0, 0, 8, 0, 0
.byte 5, 11, 17, 0, 0, 0, 2, 0
.byte 6, 13, 8, 0, 0, 1, 0, 0
.byte 7, 15, 14, 0, 0, 64, 0, 0
.byte 8, 17, 16, 0, 0, 0, 1, 0
.byte 9, 19, 7, 0, 128, 0, 0, 0
.byte 10, 21, 13, 0, 0, 32, 0, 0
.byte 11, 23, 19, 0, 0, 0, 8, 0
gUnknown_085B6344:: @ 85B6344
.byte 1, 3
.byte 1, 6
.align 2
gUnknown_085B6348:: @ 85B6348
.byte 0x01, 0x3C, 0x1E, 0x01, 0x01, 0x00, 0x00, 0x00, 0x2D, 0x00, 0x1E, 0x00, 0x01, 0x00, 0x00, 0x00, 0x4B, 0x00, 0x1B, 0x00, 0x18, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x68, 0x01, 0x00, 0x00, 0x00, 0xBF
.byte 0x03, 0x1E, 0x0F, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x00, 0x3C, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x00, 0x30, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x0E, 0x01, 0x00, 0x00, 0x80, 0xBF
.align 2
gUnknown_085B6388:: @ 85B6388
.byte 0x00, 0x80, 0x05, 0x00, 0x01, 0x01, 0xFF, 0x48
.byte 0x00, 0x80, 0x0A, 0x00, 0x01, 0x01, 0xFF, 0x48
.byte 0x00, 0x80, 0x15, 0x00, 0x01, 0x01, 0xFF, 0x48
.byte 0x00, 0x80, 0x55, 0x00, 0x01, 0x01, 0xFF, 0x48
.byte 0x00, 0x80, 0x5A, 0x00, 0x01, 0x01, 0xFF, 0x48
.byte 0x00, 0x80, 0x65, 0x00, 0x01, 0x01, 0xFF, 0x48
.byte 0x00, 0x80, 0x75, 0x00, 0x01, 0x01, 0xFF, 0x48
.byte 0x00, 0x80, 0x7A, 0x00, 0x01, 0x01, 0xFF, 0x48
.byte 0x00, 0x80, 0x85, 0x00, 0x01, 0x01, 0xFF, 0x48
.byte 0x00, 0x80, 0x95, 0x00, 0x01, 0x01, 0xFF, 0x48
.byte 0x00, 0x80, 0x9A, 0x00, 0x01, 0x01, 0xFF, 0x48
.byte 0x00, 0x80, 0xA5, 0x00, 0x01, 0x01, 0xFF, 0x48
.byte 0xD6, 0x77, 0x28, 0x00, 0x02, 0x0A, 0xFF, 0x4E
.align 1
gUnknown_085B63F0:: @ 85B63F0
.2byte 0x53FF
.2byte 0x0101
.2byte 0x1E05
.2byte 0x4EFF
.2byte 0x7FFB
.2byte 0x0106
.2byte 0x1E05
.2byte 0x4EFF
.2byte 0x7F7F
.2byte 0x010B
.2byte 0x1E05
.2byte 0x4EFF
.align 2
gUnknown_085B6408:: @ 85B6408
.4byte sub_8142918
.4byte sub_814297C
.align 2
gUnknown_085B6410:: @ 85B6410
.4byte sub_8140968
.4byte sub_8140994
.align 1
gUnknown_085B6418:: @ 85B6418
.2byte 0x2898
.2byte 0x1A6A
.2byte 0x2898
gUnknown_085B641E:: @ 85B641E
.byte 0xFB, 0x05, 0xFF, 0x01
.align 1
gUnknown_085B6422:: @ 85B6422
.2byte 0, 180
.2byte 90, 270
.align 2
gUnknown_085B642C:: @ 85B642C
.4byte 0x10842
.4byte 0x21084
.4byte 0x42108
.4byte 0x84210
.align 2
gUnknown_085B643C:: @ 85B643C
.4byte 0x3E0
.4byte 0x7C00
.4byte 0xF8000
gUnknown_085B6448:: @ 85B6448
.byte 0, 3, 4, 6, 12
.align 2
RouletteSpritePalette_01: @ 85B6450
.incbin "graphics/roulette/shadow.gbapal"
.align 2
RouletteSpritePalette_02: @ 85B6470
.incbin "graphics/roulette/ball.gbapal"
.align 2
RouletteSpritePalette_03: @ 85B6490
.incbin "graphics/roulette/ball_counter.gbapal"
.align 2
RouletteSpritePalette_04: @ 85B64B0
.incbin "graphics/roulette/cursor.gbapal"
.align 2
RouletteSpritePalette_05: @ 85B64D0
.incbin "graphics/roulette/credit.gbapal"
.align 2
RouletteSpritePalette_06: @ 85B64F0
.incbin "graphics/roulette/shroomish.gbapal"
.align 2
RouletteSpritePalette_07: @ 85B6510
.incbin "graphics/roulette/tailow.gbapal"
.align 2
RouletteSpritePalette_08: @ 85B6530
.incbin "graphics/roulette/poke_icons.gbapal"
.align 2
RouletteSpritePalette_09: @ 85B6550
.incbin "graphics/roulette/wynaut.gbapal"
.align 2
RouletteSpritePalette_10: @ 85B6570
.incbin "graphics/roulette/azurill.gbapal"
.align 2
RouletteSpritePalette_11: @ 85B6590
.incbin "graphics/roulette/skitty.gbapal"
.align 2
RouletteSpritePalette_12: @ 85B65B0
.incbin "graphics/roulette/makuhita.gbapal"
.align 2
RouletteSpritePalette_13: @ 85B65D0
.incbin "graphics/roulette/85B65D0.gbapal"
.align 2
RouletteSpritePalette_14: @ 85B65F0
.incbin "graphics/roulette/85B65F0.gbapal"
.align 2
RouletteSpritePalette_15: @ 85B6610
.incbin "graphics/roulette/85B6610.gbapal"
.align 2
RouletteSpritePalette_16: @ 85B6630
.incbin "graphics/roulette/85B6630.gbapal"
.align 2
gUnknown_085B6650:: @ 85B6650
.incbin "graphics/roulette/ball.4bpp.lz"
.align 2
RouletteBallCounterTiles: @ 85B6798
.incbin "graphics/roulette/ball_counter.4bpp.lz"
.align 2
gUnknown_085B67FC:: @ 85B67FC
.incbin "graphics/roulette/roulette_tilt.4bpp.lz"
.align 2
RoulettePokeIconsTiles: @ 85B6BEC
.incbin "graphics/roulette/poke_icons.4bpp.lz"
.align 2
RoulettePokeIcons2Tiles: @ 85B6D90
.incbin "graphics/roulette/poke_icons2.4bpp.lz"
.align 2
gUnknown_085B7290:: @ 85B7290
.incbin "graphics/roulette/shadow.4bpp.lz"
.align 2
RouletteCursorTiles: @ 85B7328
.incbin "graphics/roulette/cursor.4bpp.lz"
.align 2
gUnknown_085B7384:: @ 85B7384
obj_pal RouletteSpritePalette_01, 1
obj_pal RouletteSpritePalette_02, 2
obj_pal RouletteSpritePalette_03, 3
obj_pal RouletteSpritePalette_04, 4
obj_pal RouletteSpritePalette_05, 5
obj_pal RouletteSpritePalette_06, 6
obj_pal RouletteSpritePalette_07, 7
obj_pal RouletteSpritePalette_08, 8
obj_pal RouletteSpritePalette_09, 9
obj_pal RouletteSpritePalette_10, 10
obj_pal RouletteSpritePalette_11, 11
obj_pal RouletteSpritePalette_12, 12
null_obj_pal
.align 2
gOamData_85B73EC:: @ 85B73EC
.2byte 0x0000
.2byte 0x8000
.2byte 0x0400
.align 2
gOamData_85B73F4:: @ 85B73F4
.2byte 0x0000
.2byte 0x4000
.2byte 0x0400
.align 2
gOamData_85B73FC:: @ 85B73FC
.2byte 0x833C
.2byte 0x8000
.2byte 0x0800
.align 2
gSpriteAnim_85B7404:: @ 85B7404
obj_image_anim_frame 0, 0
obj_image_anim_end
.align 2
gSpriteAnimTable_85B740C:: @ 85B740C
.4byte gSpriteAnim_85B7404
.align 2
gSpriteAffineAnim_85B7410:: @ 85B7410
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnimTable_85B7418:: @ 85B7418
.4byte gSpriteAffineAnim_85B7410
.align 2
gUnknown_085B741C:: @ 85B741C
obj_tiles RoulettePokeIcons2Tiles, 0xC00, 0
.align 2
gSpriteAnim_85B7420:: @ 85B7420
obj_image_anim_frame 0, 0
obj_image_anim_frame 32, 0
obj_image_anim_frame 64, 0
obj_image_anim_frame 72, 0
obj_image_anim_frame 8, 0
obj_image_anim_frame 40, 0
obj_image_anim_frame 48, 0
obj_image_anim_frame 80, 0
obj_image_anim_frame 16, 0
obj_image_anim_frame 24, 0
obj_image_anim_frame 56, 0
obj_image_anim_frame 88, 0
obj_image_anim_end
.align 2
gSpriteAnimTable_85B7458:: @ 85B7458
.4byte gSpriteAnim_85B7420
.align 2
gSpriteAnimTable_85B745C:: @ 85B745C
.4byte gSpriteAnim_85B7420 + 0x4
.align 2
gSpriteAnimTable_85B7460:: @ 85B7460
.4byte gSpriteAnim_85B7420 + 0x8
.align 2
gSpriteAnimTable_85B7464:: @ 85B7464
.4byte gSpriteAnim_85B7420 + 0xC
.align 2
gSpriteAnimTable_85B7468:: @ 85B7468
.4byte gSpriteAnim_85B7420 + 0x10
.align 2
gSpriteAnimTable_85B746C:: @ 85B746C
.4byte gSpriteAnim_85B7420 + 0x14
.align 2
gSpriteAnimTable_85B7470:: @ 85B7470
.4byte gSpriteAnim_85B7420 + 0x18
.align 2
gSpriteAnimTable_85B7474:: @ 85B7474
.4byte gSpriteAnim_85B7420 + 0x1C
.align 2
gSpriteAnimTable_85B7478:: @ 85B7478
.4byte gSpriteAnim_85B7420 + 0x20
.align 2
gSpriteAnimTable_85B747C:: @ 85B747C
.4byte gSpriteAnim_85B7420 + 0x24
.align 2
gSpriteAnimTable_85B7480:: @ 85B7480
.4byte gSpriteAnim_85B7420 + 0x28
.align 2
gSpriteAnimTable_85B7484:: @ 85B7484
.4byte gSpriteAnim_85B7420 + 0x2C
.align 2
gUnknown_085B7488:: @ 85B7488
obj_tiles gRouletteHeadersTiles, 0x1600, 4
.align 2
gUnknown_085B7490:: @ 85B7490
obj_tiles RoulettePokeIconsTiles, 0x400, 5
.align 2
gSpriteAnim_85B7498:: @ 85B7498
obj_image_anim_frame 0, 0
obj_image_anim_frame 16, 0
obj_image_anim_frame 32, 0
obj_image_anim_frame 48, 0
obj_image_anim_frame 64, 0
obj_image_anim_frame 80, 0
obj_image_anim_frame 96, 0
obj_image_anim_frame 112, 0
obj_image_anim_frame 128, 0
obj_image_anim_frame 144, 0
obj_image_anim_frame 160, 0
obj_image_anim_end
.align 2
gSpriteAnim_85B74C8:: @ 85B74C8
obj_image_anim_frame 0, 0
obj_image_anim_frame 4, 0
obj_image_anim_frame 8, 0
obj_image_anim_frame 12, 0
obj_image_anim_end
.align 2
gSpriteAnimTable_85B74DC:: @ 85B74DC
.4byte gSpriteAnim_85B7498
.align 2
gSpriteAnimTable_85B74E0:: @ 85B74E0
.4byte gSpriteAnim_85B7498 + 0x8
.align 2
gSpriteAnimTable_85B74E4:: @ 85B74E4
.4byte gSpriteAnim_85B7498 + 0x10
.align 2
gSpriteAnimTable_85B74E8:: @ 85B74E8
.4byte gSpriteAnim_85B7498 + 0x18
.align 2
gSpriteAnimTable_85B74EC:: @ 85B74EC
.4byte gSpriteAnim_85B7498 + 0x20
.align 2
gSpriteAnimTable_85B74F0:: @ 85B74F0
.4byte gSpriteAnim_85B7498 + 0x24
.align 2
gSpriteAnimTable_85B74F4:: @ 85B74F4
.4byte gSpriteAnim_85B7498 + 0x28
.align 2
gSpriteAnimTable_85B74F8:: @ 85B74F8
.4byte gSpriteAnim_85B74C8
.align 2
gSpriteAnimTable_85B74FC:: @ 85B74FC
.4byte gSpriteAnim_85B74C8 + 0x4
.align 2
gSpriteAnimTable_85B7500:: @ 85B7500
.4byte gSpriteAnim_85B74C8 + 0x8
.align 2
gSpriteAnimTable_85B7504:: @ 85B7504
.4byte gSpriteAnim_85B74C8 + 0xC
.align 2
gSpriteTemplate_85B7508:: @ 85B7508
spr_template 4, 8, gOamData_85B73EC, gSpriteAnimTable_85B74DC, NULL, gDummySpriteAffineAnimTable, sub_814390C
.align 2
gSpriteTemplate_85B7520:: @ 85B7520
spr_template 4, 8, gOamData_85B73EC, gSpriteAnimTable_85B74E0, NULL, gDummySpriteAffineAnimTable, sub_814390C
.align 2
gSpriteTemplate_85B7538:: @ 85B7538
spr_template 4, 8, gOamData_85B73EC, gSpriteAnimTable_85B74E4, NULL, gDummySpriteAffineAnimTable, sub_814390C
.align 2
gSpriteTemplate_85B7550:: @ 85B7550
spr_template 4, 8, gOamData_85B73EC, gSpriteAnimTable_85B74E8, NULL, gDummySpriteAffineAnimTable, sub_814390C
.align 2
gSpriteTemplate_85B7568:: @ 85B7568
spr_template 4, 8, gOamData_85B73EC, gSpriteAnimTable_85B74EC, NULL, gDummySpriteAffineAnimTable, sub_814390C
.align 2
gSpriteTemplate_85B7580:: @ 85B7580
spr_template 4, 8, gOamData_85B73EC, gSpriteAnimTable_85B74F0, NULL, gDummySpriteAffineAnimTable, sub_814390C
.align 2
gSpriteTemplate_85B7598:: @ 85B7598
spr_template 4, 8, gOamData_85B73EC, gSpriteAnimTable_85B74F4, NULL, gDummySpriteAffineAnimTable, sub_814390C
.align 2
gSpriteTemplate_85B75B0:: @ 85B75B0
spr_template 5, 8, gOamData_85B73F4, gSpriteAnimTable_85B74F8, NULL, gDummySpriteAffineAnimTable, sub_814390C
.align 2
gSpriteTemplate_85B75C8:: @ 85B75C8
spr_template 5, 8, gOamData_85B73F4, gSpriteAnimTable_85B74FC, NULL, gDummySpriteAffineAnimTable, sub_814390C
.align 2
gSpriteTemplate_85B75E0:: @ 85B75E0
spr_template 5, 8, gOamData_85B73F4, gSpriteAnimTable_85B7500, NULL, gDummySpriteAffineAnimTable, sub_814390C
.align 2
gSpriteTemplate_85B75F8:: @ 85B75F8
spr_template 5, 8, gOamData_85B73F4, gSpriteAnimTable_85B7504, NULL, gDummySpriteAffineAnimTable, sub_814390C
.align 2
gSpriteTemplate_85B7610:: @ 85B7610
spr_template 0, 9, gOamData_85B73FC, gSpriteAnimTable_85B7458, NULL, gDummySpriteAffineAnimTable, sub_8143280
.align 2
gSpriteTemplate_85B7628:: @ 85B7628
spr_template 0, 10, gOamData_85B73FC, gSpriteAnimTable_85B745C, NULL, gDummySpriteAffineAnimTable, sub_8143280
.align 2
gSpriteTemplate_85B7640:: @ 85B7640
spr_template 0, 11, gOamData_85B73FC, gSpriteAnimTable_85B7460, NULL, gDummySpriteAffineAnimTable, sub_8143280
.align 2
gSpriteTemplate_85B7658:: @ 85B7658
spr_template 0, 12, gOamData_85B73FC, gSpriteAnimTable_85B7464, NULL, gDummySpriteAffineAnimTable, sub_8143280
.align 2
gSpriteTemplate_85B7670:: @ 85B7670
spr_template 0, 9, gOamData_85B73FC, gSpriteAnimTable_85B7468, NULL, gDummySpriteAffineAnimTable, sub_8143280
.align 2
gSpriteTemplate_85B7688:: @ 85B7688
spr_template 0, 10, gOamData_85B73FC, gSpriteAnimTable_85B746C, NULL, gDummySpriteAffineAnimTable, sub_8143280
.align 2
gSpriteTemplate_85B76A0:: @ 85B76A0
spr_template 0, 11, gOamData_85B73FC, gSpriteAnimTable_85B7470, NULL, gDummySpriteAffineAnimTable, sub_8143280
.align 2
gSpriteTemplate_85B76B8:: @ 85B76B8
spr_template 0, 12, gOamData_85B73FC, gSpriteAnimTable_85B7474, NULL, gDummySpriteAffineAnimTable, sub_8143280
.align 2
gSpriteTemplate_85B76D0:: @ 85B76D0
spr_template 0, 9, gOamData_85B73FC, gSpriteAnimTable_85B7478, NULL, gDummySpriteAffineAnimTable, sub_8143280
.align 2
gSpriteTemplate_85B76E8:: @ 85B76E8
spr_template 0, 10, gOamData_85B73FC, gSpriteAnimTable_85B747C, NULL, gDummySpriteAffineAnimTable, sub_8143280
.align 2
gSpriteTemplate_85B7700:: @ 85B7700
spr_template 0, 11, gOamData_85B73FC, gSpriteAnimTable_85B7480, NULL, gDummySpriteAffineAnimTable, sub_8143280
.align 2
gSpriteTemplate_85B7718:: @ 85B7718
spr_template 0, 12, gOamData_85B73FC, gSpriteAnimTable_85B7484, NULL, gDummySpriteAffineAnimTable, sub_8143280
.align 2
gOamData_85B7730:: @ 85B7730
.2byte 0x4000
.2byte 0xC000
.2byte 0x0400
.align 2
gOamData_85B7738:: @ 85B7738
.2byte 0x8000
.2byte 0x0000
.2byte 0x0400
.align 2
gOamData_85B7740:: @ 85B7740
.2byte 0x4000
.2byte 0x8000
.2byte 0x0400
.align 2
gOamData_85B7748:: @ 85B7748
.2byte 0x4000
.2byte 0x0000
.2byte 0x0400
.align 2
gUnknown_085B7750:: @ 85B7750
obj_tiles gRouletteCreditTiles, 0x400, 7
obj_tiles gRouletteNumbersTiles, 0x280, 8
obj_tiles gRouletteMultiplierTiles, 0x500, 9
obj_tiles RouletteBallCounterTiles, 0x140, 10
obj_tiles RouletteCursorTiles, 0x200, 11
null_obj_tiles
.align 2
gSpriteAnim_85B7780:: @ 85B7780
obj_image_anim_frame 0, 0
obj_image_anim_frame 2, 0
obj_image_anim_frame 4, 0
obj_image_anim_frame 6, 0
obj_image_anim_frame 8, 0
obj_image_anim_frame 10, 0
obj_image_anim_frame 12, 0
obj_image_anim_frame 14, 0
obj_image_anim_frame 16, 0
obj_image_anim_frame 18, 0
.align 2
gSpriteAnimTable_85B77A8:: @ 85B77A8
.4byte gSpriteAnim_85B7780
.align 2
gSpriteAnim_85B77AC:: @ 85B77AC
obj_image_anim_frame 0, 0
obj_image_anim_frame 8, 0
obj_image_anim_frame 16, 0
obj_image_anim_frame 24, 0
obj_image_anim_frame 32, 0
obj_image_anim_end
.align 2
gSpriteAnimTable_85B77C4:: @ 85B77C4
.4byte gSpriteAnim_85B77AC
.align 2
gSpriteAnim_85B77C8:: @ 85B77C8
obj_image_anim_frame 0, 0
obj_image_anim_frame 2, 0
obj_image_anim_frame 4, 0
obj_image_anim_frame 6, 0
obj_image_anim_frame 8, 0
obj_image_anim_end
.align 2
gSpriteAnimTable_85B77E0:: @ 85B77E0
.4byte gSpriteAnim_85B77C8
.align 2
gSpriteTemplate_85B77E4:: @ 85B77E4
spr_template 7, 5, gOamData_85B7730, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_085B77FC:: @ 85B77FC
spr_template 8, 5, gOamData_85B7738, gSpriteAnimTable_85B77A8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_085B7814:: @ 85B7814
spr_template 9, 5, gOamData_85B7740, gSpriteAnimTable_85B77C4, NULL, gDummySpriteAffineAnimTable, sub_814390C
.align 2
gUnknown_085B782C:: @ 85B782C
spr_template 10, 3, gOamData_85B7748, gSpriteAnimTable_85B77E0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_085B7844:: @ 85B7844
spr_template 11, 5, gOamData_85B73EC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gOamData_85B785C:: @ 85B785C
.2byte 0x0000
.2byte 0x4000
.2byte 0x0800
.align 2
gUnknown_085B7864:: @ 85B7864
obj_tiles gUnknown_085B6650, 0x200, 0xC
.align 2
gSpriteAnim_85B786C:: @ 85B786C
obj_image_anim_frame 0, 5
obj_image_anim_frame 4, 5
obj_image_anim_frame 8, 5
obj_image_anim_frame 4, 5
obj_image_anim_jump 0
.align 2
gSpriteAnim_85B7880:: @ 85B7880
obj_image_anim_frame 0, 10
obj_image_anim_frame 4, 10
obj_image_anim_frame 8, 10
obj_image_anim_frame 4, 10
obj_image_anim_jump 0
.align 2
gSpriteAnim_85B7894:: @ 85B7894
obj_image_anim_frame 0, 15
obj_image_anim_frame 4, 15
obj_image_anim_frame 8, 15
obj_image_anim_frame 4, 15
obj_image_anim_jump 0
.align 2
gSpriteAnim_85B78A8:: @ 85B78A8
obj_image_anim_frame 4, 2
obj_image_anim_frame 8, 5
obj_image_anim_frame 4, 5
obj_image_anim_frame 12, 5
obj_image_anim_end
.align 2
gSpriteAnim_85B78BC:: @ 85B78BC
obj_image_anim_frame 4, 2
obj_image_anim_frame 0, 4
obj_image_anim_frame 4, 4
obj_image_anim_frame 8, 4
obj_image_anim_frame 12, 4
obj_image_anim_end
.align 2
gSpriteAnim_85B78D4:: @ 85B78D4
obj_image_anim_frame 0, 2
obj_image_anim_frame 4, 5
obj_image_anim_frame 8, 5
obj_image_anim_frame 12, 5
obj_image_anim_end
.align 2
gSpriteAnim_85B78E8:: @ 85B78E8
obj_image_anim_frame 12, 0
obj_image_anim_end
.align 2
gSpriteAnim_85B78F0:: @ 85B78F0
obj_image_anim_frame 8, 2
obj_image_anim_frame 4, 5
obj_image_anim_frame 0, 5
obj_image_anim_frame 12, 5
obj_image_anim_end
.align 2
gSpriteAnimTable_85B7904:: @ 85B7904
.4byte gSpriteAnim_85B786C
.4byte gSpriteAnim_85B7880
.4byte gSpriteAnim_85B7894
.4byte gSpriteAnim_85B78A8
.4byte gSpriteAnim_85B78F0
.4byte gSpriteAnim_85B78BC
.4byte gSpriteAnim_85B78D4
.4byte gSpriteAnim_85B78D4
.4byte gSpriteAnim_85B78E8
.align 2
gSpriteTemplate_85B7928:: @ 85B7928
spr_template 12, 2, gOamData_85B785C, gSpriteAnimTable_85B7904, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gOamData_85B7940:: @ 85B7940
.2byte 0x0351
.2byte 0xC000
.2byte 0x0800
.align 2
gUnknown_085B7948:: @ 85B7948
obj_tiles gRouletteCenter_Gfx, 2048, 0x0006
.align 2
gSpriteTemplate_85B7950:: @ 85B7950
spr_template 6, 2, gOamData_85B7940, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_814399C
.align 2
gOamData_85B7968:: @ 85B7968
.2byte 0x0000
.2byte 0x8000
.2byte 0x0800
.align 2
gOamData_85B7970:: @ 85B7970
.2byte 0x0000
.2byte 0x8000
.2byte 0x0800
.align 2
gUnknown_085B7978:: @ 85B7978
obj_tiles gUnknown_085B67FC, 0xE00, 0x000D
.align 2
gSpriteAnim_85B7980:: @ 85B7980
obj_image_anim_frame 0x00, 6
obj_image_anim_frame 0x10, 6
obj_image_anim_frame 0x20, 6
obj_image_anim_frame 0x30, 6
obj_image_anim_frame 0x20, 6
obj_image_anim_frame 0x40, 6
obj_image_anim_jump 2
.align 2
gSpriteAnim_85B799C:: @ 85B799C
obj_image_anim_frame 0x50, 10
obj_image_anim_end
.align 2
gSpriteAnim_85B79A4:: @ 85B79A4
obj_image_anim_frame 0x50, 10, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_end
.align 2
gSpriteAnim_85B79AC:: @ 85B79AC
obj_image_anim_frame 0x50, 20
obj_image_anim_frame 0x60, 20
obj_image_anim_jump 0
.align 2
gSpriteAnim_85B79B8:: @ 85B79B8
obj_image_anim_frame 0x50, 20, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 0x60, 20, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_jump 0
.align 2
gSpriteAnim_85B79C4:: @ 85B79C4
obj_image_anim_frame 0x50, 10
obj_image_anim_frame 0x60, 10
obj_image_anim_jump 0
.align 2
gSpriteAnim_85B79D0:: @ 85B79D0
obj_image_anim_frame 0x50, 10, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 0x60, 10, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_jump 0
.align 2
gSpriteAnimTable_85B79DC:: @ 85B79DC
.4byte gSpriteAnim_85B7980
.align 2
gSpriteAnimTable_85B79E0:: @ 85B79E0
.4byte gSpriteAnim_85B799C
.4byte gSpriteAnim_85B79A4
.4byte gSpriteAnim_85B79AC
.4byte gSpriteAnim_85B79B8
.4byte gSpriteAnim_85B79C4
.4byte gSpriteAnim_85B79D0
.align 2
gSpriteTemplate_85B79F8:: @ 85B79F8
spr_template 13, 6, gOamData_85B7968, gSpriteAnimTable_85B79DC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gSpriteTemplate_85B7A10:: @ 85B7A10
spr_template 13, 7, gOamData_85B7970, gSpriteAnimTable_85B79E0, NULL, gDummySpriteAffineAnimTable, sub_8145294
.align 2
gOamData_85B7A28:: @ 85B7A28
.2byte 0x0000
.2byte 0x4000
.2byte 0x0800
.align 2
gOamData_85B7A30:: @ 85B7A30
.2byte 0x4000
.2byte 0x8000
.2byte 0x0800
.align 2
gOamData_85B7A38:: @ 85B7A38
.2byte 0x4100
.2byte 0x8000
.2byte 0x0800
.align 2
gUnknown_085B7A40:: @ 85B7A40
obj_tiles gUnknown_085B7290, 0x180, 0x000E
.align 2
gSpriteAffineAnim_85B7A48:: @ 85B7A48
obj_rot_scal_anim_frame 0x80, 0x80, 0, 0
obj_rot_scal_anim_frame 0x2, 0x2, 0, 60
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_85B7A60:: @ 85B7A60
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
obj_rot_scal_anim_frame 0xFFFE, 0x0, 0, 15
obj_rot_scal_anim_frame 0xFFFF, 0xFFFE, 0, 15
obj_rot_scal_anim_frame 0xFFFF, 0xFFFB, 0, 24
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnimTable_85B7A88:: @ 85B7A88
.4byte gSpriteAffineAnim_85B7A48
.align 2
gSpriteAffineAnimTable_85B7A8C:: @ 85B7A8C
.4byte gSpriteAffineAnim_85B7A60
.align 2
gSpriteAffineAnim_85B7A90:: @ 85B7A90
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnimTable_85B7AA0:: @ 85B7AA0
.4byte gSpriteAffineAnim_85B7A90
.align 2
gSpriteAnim_85B7AA4:: @ 85B7AA4
obj_image_anim_frame 0, 0
obj_image_anim_end
.align 2
gSpriteAnim_85B7AAC:: @ 85B7AAC
obj_image_anim_frame 4, 0
obj_image_anim_end
.align 2
gSpriteAnimTable_85B7AB4:: @ 85B7AB4
.4byte gSpriteAnim_85B7AA4
.align 2
gSpriteAnimTable_85B7AB8:: @ 85B7AB8
.4byte gSpriteAnim_85B7AAC
.align 2
gSpriteTemplate_85B7ABC:: @ 85B7ABC
spr_template 14, 1, gOamData_85B7A28, gSpriteAnimTable_85B7AB4, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gSpriteTemplate_83FA5D8:: @ 83FA5D8
spr_template 14, 1, gOamData_85B7A30, gSpriteAnimTable_85B7AB8, NULL, gDummySpriteAffineAnimTable, sub_8144E60
.align 2
gUnknown_085B7AEC:: @ 85B7AEC
spr_template 14, 1, gOamData_85B7A38, gSpriteAnimTable_85B7AB8, NULL, gSpriteAffineAnimTable_85B7A8C, sub_8145294
gUnknown_085B7B04:: @ 85B7B04
.byte 0, 1, 2, 3, 4
.align 1
gUnknown_085B7B0A:: @ 85B7B0A
.2byte 0x74, 0x2C
.2byte 0x74, 0x70
.align 1
gUnknown_085B7B12:: @ 85B7B12
.2byte 256, 84
.2byte -16, 84
.align 1
gUnknown_085B7B1A:: @ 85B7B1A
.2byte 0x907
.2byte 0x808
.2byte 0x709
.2byte 0x60A
.2byte 0x50B
.2byte 0x40C
.2byte 0x30D
.2byte 0x20E
.2byte 0x10F
.2byte 0x10
.align 1
gUnknown_085B7B2E:: @ 85B7B2E
.2byte -1, 0, 1, 0
.2byte -2, 0, 2, 0
.2byte -3, 0, 3, 0
gUnknown_085B7B46:: @ 85B7B46
.byte -1, 1
gUnknown_085B7B48:: @ 85B7B48
.byte 2, 0
.byte 2, 0
.byte 2, -1
.byte 2, -1
.byte 2, -1
.byte 2, -1
.byte 2, -2
.byte 2, -2
data/save.s
+14 -14
View File
@@ -4,17 +4,17 @@
.section .rodata
gSaveSectionOffsets:: @ 85CDC00
.2byte 0, 0xF2C
.2byte 0, 0xF80
.2byte 0xF80, 0xF80
.2byte 0x1F00, 0xF80
.2byte 0x2E80, 0xF08
.2byte 0, 0xF80
.2byte 0xF80, 0xF80
.2byte 0x1F00, 0xF80
.2byte 0x2E80, 0xF80
.2byte 0x3E00, 0xF80
.2byte 0x4D80, 0xF80
.2byte 0x5D00, 0xF80
.2byte 0x6C80, 0xF80
.2byte 0x7C00, 0x7D0
.2byte 0, 0xF2C
.2byte 0, 0xF80
.2byte 0xF80, 0xF80
.2byte 0x1F00, 0xF80
.2byte 0x2E80, 0xF08
.2byte 0, 0xF80
.2byte 0xF80, 0xF80
.2byte 0x1F00, 0xF80
.2byte 0x2E80, 0xF80
.2byte 0x3E00, 0xF80
.2byte 0x4D80, 0xF80
.2byte 0x5D00, 0xF80
.2byte 0x6C80, 0xF80
.2byte 0x7C00, 0x7D0
data/script_menu.s
+12 -12
View File
@@ -233,11 +233,11 @@ gUnknown_0858B040:: @ 58B040
.4byte gText_Exit, 0
gUnknown_0858B050:: @ 58B050
.4byte gUnknown_085EB676, 0
.4byte gUnknown_085EB673, 0
.4byte gUnknown_085EB670, 0
.4byte gUnknown_085EB66D, 0
.4byte gUnknown_085EB66A, 0
.4byte gText_5F, 0
.4byte gText_4F, 0
.4byte gText_3F, 0
.4byte gText_2F, 0
.4byte gText_1F, 0
.4byte gText_Exit, 0
gUnknown_0858B080:: @ 58B080
@@ -494,11 +494,11 @@ gUnknown_0858B578:: @ 58B578
.4byte gText_Exit, 0
gUnknown_0858B5A8:: @ 58B5A8
.4byte gUnknown_085EB4EB, 0
.4byte gUnknown_085EB4F9, 0
.4byte gUnknown_085EB508, 0
.4byte gUnknown_085EB516, 0
.4byte gUnknown_085EB523, 0
.4byte gText_BattleBasics, 0
.4byte gText_PokemonNature, 0
.4byte gText_PokemonMoves, 0
.4byte gText_Underpowered, 0
.4byte gText_WhenInDanger, 0
.4byte gText_Exit, 0
gUnknown_0858B5D8:: @ 58B5D8
@@ -559,7 +559,7 @@ gUnknown_0858B6D0:: @ 58B6D0
.4byte gText_Exit, 0
gUnknown_0858B700:: @ 58B700
.4byte gUnknown_085EB5A6, 0
.4byte gText_BattleTrainers, 0
.4byte gUnknown_085EB45C, 0
.4byte gUnknown_085EB469, 0
.4byte gUnknown_085EB475, 0
@@ -728,7 +728,7 @@ gUnknown_0858BAF0:: @ 858BAF0
gUnknown_0858BB68:: @ 858BB68
.byte 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F
.align 2
.align 2
gUnknown_0858BB70:: @ 858BB70
.4byte gText_SomeonesPC
.4byte gText_LanettesPC
data/script_pokemon_util_80F87D8.s
+2 -2
View File
@@ -2,6 +2,6 @@
.include "constants/constants.inc"
.section .rodata
.align 2, 0
.align 2, 0
gUnknown_0858D8EC:: @ 858D8EC
.incbin "baserom.gba", 0x58d8ec, 0x4
.byte 3, 4, 5, 14
data/scripts/day_care.inc
+1 -1
View File
@@ -67,7 +67,7 @@ Route117_EventScript_291CE8:: @ 8291CE8
special GetDaycareMonNicknames
msgbox Route117_Text_292299, 4
special SetDaycareCompatibilityString
special sub_8138AC0
special ShowFieldMessageStringVar4
waitmessage
waitbuttonpress
setvar VAR_0x8004, 0
data/scripts/maps/AbandonedShip_Deck.inc
+1 -1
View File
@@ -3,6 +3,6 @@ AbandonedShip_Deck_MapScripts:: @ 823799A
.byte 0
AbandonedShip_Deck_MapScript1_2379A0: @ 82379A0
setflag FLAG_0x89E
setflag FLAG_LANDMARK_ABANDONED_SHIP
end
data/scripts/maps/AlteringCave.inc
+1 -1
View File
@@ -3,6 +3,6 @@ AlteringCave_MapScripts:: @ 823B177
.byte 0
AlteringCave_MapScript1_23B17D: @ 823B17D
setflag FLAG_0x8DD
setflag FLAG_LANDMARK_ALTERING_CAVE
end
data/scripts/maps/AncientTomb.inc
+1 -1
View File
@@ -17,7 +17,7 @@ AncientTomb_EventScript_238FCD:: @ 8238FCD
return
AncientTomb_MapScript1_238FE1: @ 8238FE1
setflag FLAG_0x8B9
setflag FLAG_LANDMARK_ANCIENT_TOMB
checkflag FLAG_0x1BD
call_if 0, AncientTomb_EventScript_238FEE
end
data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc
+26 -26
View File
@@ -661,104 +661,104 @@ BattleFrontier_BattlePointExchangeServiceCorner_Text_26012D: @ 826012D
.string "the BATTLE facilities, they start\l"
.string "giving you more and more Battle Points.$"
BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA: @ 82601AA
BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA:: @ 82601AA
.string "A large poster with a SMOOCHUM print.$"
BattleFrontier_BattlePointExchangeServiceCorner_Text_2601D0: @ 82601D0
BattleFrontier_BattlePointExchangeServiceCorner_Text_2601D0:: @ 82601D0
.string "A SMOOCHUM cushion.\n"
.string "Place it on a mat or a desk.$"
BattleFrontier_BattlePointExchangeServiceCorner_Text_260201: @ 8260201
BattleFrontier_BattlePointExchangeServiceCorner_Text_260201:: @ 8260201
.string "A SMOOCHUM DOLL.\n"
.string "Place it on a mat or a desk.$"
BattleFrontier_BattlePointExchangeServiceCorner_Text_26022F: @ 826022F
BattleFrontier_BattlePointExchangeServiceCorner_Text_26022F:: @ 826022F
.string "A TOGEPI DOLL.\n"
.string "Place it on a mat or a desk.$"
BattleFrontier_BattlePointExchangeServiceCorner_Text_26025B: @ 826025B
BattleFrontier_BattlePointExchangeServiceCorner_Text_26025B:: @ 826025B
.string "A MEOWTH DOLL.\n"
.string "Place it on a mat or a desk.$"
BattleFrontier_BattlePointExchangeServiceCorner_Text_260287: @ 8260287
BattleFrontier_BattlePointExchangeServiceCorner_Text_260287:: @ 8260287
.string "A CLEFAIRY DOLL.\n"
.string "Place it on a mat or a desk.$"
BattleFrontier_BattlePointExchangeServiceCorner_Text_2602B5: @ 82602B5
BattleFrontier_BattlePointExchangeServiceCorner_Text_2602B5:: @ 82602B5
.string "A DITTO DOLL.\n"
.string "Place it on a mat or a desk.$"
BattleFrontier_BattlePointExchangeServiceCorner_Text_2602E0: @ 82602E0
BattleFrontier_BattlePointExchangeServiceCorner_Text_2602E0:: @ 82602E0
.string "A CYNDAQUIL DOLL.\n"
.string "Place it on a mat or a desk.$"
BattleFrontier_BattlePointExchangeServiceCorner_Text_26030F: @ 826030F
BattleFrontier_BattlePointExchangeServiceCorner_Text_26030F:: @ 826030F
.string "A CHIKORITA DOLL.\n"
.string "Place it on a mat or a desk.$"
BattleFrontier_BattlePointExchangeServiceCorner_Text_26033E: @ 826033E
BattleFrontier_BattlePointExchangeServiceCorner_Text_26033E:: @ 826033E
.string "A TOTODILE DOLL.\n"
.string "Place it on a mat or a desk.$"
BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C: @ 826036C
BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C:: @ 826036C
.string "A large DOLL.\n"
.string "Place it on a mat or a desk.$"
BattleFrontier_BattlePointExchangeServiceCorner_Text_260397: @ 8260397
BattleFrontier_BattlePointExchangeServiceCorner_Text_260397:: @ 8260397
.string "Raises the stat ATTACK of one\n"
.string "POKéMON.$"
BattleFrontier_BattlePointExchangeServiceCorner_Text_2603BE: @ 82603BE
BattleFrontier_BattlePointExchangeServiceCorner_Text_2603BE:: @ 82603BE
.string "Raises the stat SP. ATK of one\n"
.string "POKéMON.$"
BattleFrontier_BattlePointExchangeServiceCorner_Text_2603E6: @ 82603E6
BattleFrontier_BattlePointExchangeServiceCorner_Text_2603E6:: @ 82603E6
.string "Raises the stat DEFENSE of one\n"
.string "POKéMON.$"
BattleFrontier_BattlePointExchangeServiceCorner_Text_26040E: @ 826040E
BattleFrontier_BattlePointExchangeServiceCorner_Text_26040E:: @ 826040E
.string "Raises the stat SP. DEF of one\n"
.string "POKéMON.$"
BattleFrontier_BattlePointExchangeServiceCorner_Text_260436: @ 8260436
BattleFrontier_BattlePointExchangeServiceCorner_Text_260436:: @ 8260436
.string "Raises the stat SPEED of one\n"
.string "POKéMON.$"
BattleFrontier_BattlePointExchangeServiceCorner_Text_26045C: @ 826045C
BattleFrontier_BattlePointExchangeServiceCorner_Text_26045C:: @ 826045C
.string "Raises the HP of one POKéMON.$"
BattleFrontier_BattlePointExchangeServiceCorner_Text_26047A: @ 826047A
BattleFrontier_BattlePointExchangeServiceCorner_Text_26047A:: @ 826047A
.string "A hold item that gradually restores\n"
.string "HP in battle.$"
BattleFrontier_BattlePointExchangeServiceCorner_Text_2604AC: @ 82604AC
BattleFrontier_BattlePointExchangeServiceCorner_Text_2604AC:: @ 82604AC
.string "A hold item that restores any\n"
.string "lowered stat.$"
BattleFrontier_BattlePointExchangeServiceCorner_Text_2604D8: @ 82604D8
BattleFrontier_BattlePointExchangeServiceCorner_Text_2604D8:: @ 82604D8
.string "A hold item that occasionally allows\n"
.string "the first strike.$"
BattleFrontier_BattlePointExchangeServiceCorner_Text_26050F: @ 826050F
BattleFrontier_BattlePointExchangeServiceCorner_Text_26050F:: @ 826050F
.string "A hold item that snaps POKéMON out\n"
.string "of infatuation.$"
BattleFrontier_BattlePointExchangeServiceCorner_Text_260542: @ 8260542
BattleFrontier_BattlePointExchangeServiceCorner_Text_260542:: @ 8260542
.string "A hold item that casts a glare to\n"
.string "reduce accuracy.$"
BattleFrontier_BattlePointExchangeServiceCorner_Text_260575: @ 8260575
BattleFrontier_BattlePointExchangeServiceCorner_Text_260575:: @ 8260575
.string "Raises a move’s power, but permits\n"
.string "only that move.$"
BattleFrontier_BattlePointExchangeServiceCorner_Text_2605A8: @ 82605A8
BattleFrontier_BattlePointExchangeServiceCorner_Text_2605A8:: @ 82605A8
.string "A hold item that may cause flinching\n"
.string "when the foe is hit.$"
BattleFrontier_BattlePointExchangeServiceCorner_Text_2605E2: @ 82605E2
BattleFrontier_BattlePointExchangeServiceCorner_Text_2605E2:: @ 82605E2
.string "A hold item that occasionally\n"
.string "prevents fainting.$"
BattleFrontier_BattlePointExchangeServiceCorner_Text_260613: @ 8260613
BattleFrontier_BattlePointExchangeServiceCorner_Text_260613:: @ 8260613
.string "A hold item that raises the\n"
.string "critical-hit rate.$"
data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc
+126
View File
@@ -189,470 +189,596 @@ BattleFrontier_BattlePyramidEmptySquare_Text_252CFB:: @ 8252CFB
.string "Are you sure you want to quit your\n"
.string "PYRAMID quest?$"
BattleFrontier_BattlePyramidEmptySquare_Text_252D2D:: @ 8252D2D
.string "This floor’s exit is in\n"
.string "that direction: {UP_ARROW}$"
BattleFrontier_BattlePyramidEmptySquare_Text_252D57:: @ 8252D57
.string "This floor’s exit is in\n"
.string "that direction: {LEFT_ARROW}$"
BattleFrontier_BattlePyramidEmptySquare_Text_252D81:: @ 8252D81
.string "This floor’s exit is in\n"
.string "that direction: {RIGHT_ARROW}$"
BattleFrontier_BattlePyramidEmptySquare_Text_252DAB:: @ 8252DAB
.string "This floor’s exit is in\n"
.string "that direction: {DOWN_ARROW}$"
BattleFrontier_BattlePyramidEmptySquare_Text_252DD5:: @ 8252DD5
.string "The exit on this floor is in\n"
.string "the {UP_ARROW} direction.$"
BattleFrontier_BattlePyramidEmptySquare_Text_252E03:: @ 8252E03
.string "The exit on this floor is in\n"
.string "the {LEFT_ARROW} direction.$"
BattleFrontier_BattlePyramidEmptySquare_Text_252E31:: @ 8252E31
.string "The exit on this floor is in\n"
.string "the {RIGHT_ARROW} direction.$"
BattleFrontier_BattlePyramidEmptySquare_Text_252E5F:: @ 8252E5F
.string "The exit on this floor is in\n"
.string "the {DOWN_ARROW} direction.$"
BattleFrontier_BattlePyramidEmptySquare_Text_252E8D:: @ 8252E8D
.string "The exit is over\n"
.string "that {UP_ARROW} way.$"
BattleFrontier_BattlePyramidEmptySquare_Text_252EAA:: @ 8252EAA
.string "The exit is over\n"
.string "that {LEFT_ARROW} way.$"
BattleFrontier_BattlePyramidEmptySquare_Text_252EC7:: @ 8252EC7
.string "The exit is over\n"
.string "that {RIGHT_ARROW} way.$"
BattleFrontier_BattlePyramidEmptySquare_Text_252EE4:: @ 8252EE4
.string "The exit is over\n"
.string "that {DOWN_ARROW} way.$"
BattleFrontier_BattlePyramidEmptySquare_Text_252F01:: @ 8252F01
.string "On this floor, the exit is somewhere\n"
.string "in the {UP_ARROW} direction.$"
BattleFrontier_BattlePyramidEmptySquare_Text_252F3A:: @ 8252F3A
.string "On this floor, the exit is somewhere\n"
.string "in the {LEFT_ARROW} direction.$"
BattleFrontier_BattlePyramidEmptySquare_Text_252F73:: @ 8252F73
.string "On this floor, the exit is somewhere\n"
.string "in the {RIGHT_ARROW} direction.$"
BattleFrontier_BattlePyramidEmptySquare_Text_252FAC:: @ 8252FAC
.string "On this floor, the exit is somewhere\n"
.string "in the {DOWN_ARROW} direction.$"
BattleFrontier_BattlePyramidEmptySquare_Text_252FE5:: @ 8252FE5
.string "The exit?\n"
.string "It’s that {UP_ARROW} way.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253000:: @ 8253000
.string "The exit?\n"
.string "It’s that {LEFT_ARROW} way.$"
BattleFrontier_BattlePyramidEmptySquare_Text_25301B:: @ 825301B
.string "The exit?\n"
.string "It’s that {RIGHT_ARROW} way.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253036:: @ 8253036
.string "The exit?\n"
.string "It’s that {DOWN_ARROW} way.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253051:: @ 8253051
.string "The exit happens to be in\n"
.string "the {UP_ARROW} direction.$"
BattleFrontier_BattlePyramidEmptySquare_Text_25307C:: @ 825307C
.string "The exit happens to be in\n"
.string "the {LEFT_ARROW} direction.$"
BattleFrontier_BattlePyramidEmptySquare_Text_2530A7:: @ 82530A7
.string "The exit happens to be in\n"
.string "the {RIGHT_ARROW} direction.$"
BattleFrontier_BattlePyramidEmptySquare_Text_2530D2:: @ 82530D2
.string "The exit happens to be in\n"
.string "the {DOWN_ARROW} direction.$"
BattleFrontier_BattlePyramidEmptySquare_Text_2530FD:: @ 82530FD
.string "Are you looking for items?\p"
.string "There are eight items left to\n"
.string "be found.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253140:: @ 8253140
.string "Are you looking for items?\p"
.string "There are seven items left to\n"
.string "be found.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253183:: @ 8253183
.string "Are you looking for items?\p"
.string "There are six items left to\n"
.string "be found.$"
BattleFrontier_BattlePyramidEmptySquare_Text_2531C4:: @ 82531C4
.string "Are you looking for items?\p"
.string "There are five items left to\n"
.string "be found.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253206:: @ 8253206
.string "Are you looking for items?\p"
.string "There are four items left to\n"
.string "be found.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253248:: @ 8253248
.string "Are you looking for items?\p"
.string "There are three items left to\n"
.string "be found.$"
BattleFrontier_BattlePyramidEmptySquare_Text_25328B:: @ 825328B
.string "Are you looking for items?\p"
.string "There are two items left to\n"
.string "be found.$"
BattleFrontier_BattlePyramidEmptySquare_Text_2532CC:: @ 82532CC
.string "Are you looking for items?\p"
.string "There is one item left to\n"
.string "be found.$"
BattleFrontier_BattlePyramidEmptySquare_Text_25330B:: @ 825330B
.string "Are you looking for items?\p"
.string "There isn’t anything left to\n"
.string "be found!$"
BattleFrontier_BattlePyramidEmptySquare_Text_25334D:: @ 825334D
.string "Because you won, I’ll tell you\n"
.string "a little secret!\p"
.string "There are eight items\n"
.string "lying around here.$"
BattleFrontier_BattlePyramidEmptySquare_Text_2533A6:: @ 82533A6
.string "Because you won, I’ll tell you\n"
.string "a little secret!\p"
.string "There are seven items left\n"
.string "lying around here.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253404:: @ 8253404
.string "Because you won, I’ll tell you\n"
.string "a little secret!\p"
.string "There are six items left\n"
.string "lying around here.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253460:: @ 8253460
.string "Because you won, I’ll tell you\n"
.string "a little secret!\p"
.string "There are five items left\n"
.string "lying around here.$"
BattleFrontier_BattlePyramidEmptySquare_Text_2534BD:: @ 82534BD
.string "Because you won, I’ll tell you\n"
.string "a little secret!\p"
.string "There are four items left\n"
.string "lying around here.$"
BattleFrontier_BattlePyramidEmptySquare_Text_25351A:: @ 825351A
.string "Because you won, I’ll tell you\n"
.string "a little secret!\p"
.string "There are three items left\n"
.string "lying around here.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253578:: @ 8253578
.string "Because you won, I’ll tell you\n"
.string "a little secret!\p"
.string "There are two items left\n"
.string "lying around here.$"
BattleFrontier_BattlePyramidEmptySquare_Text_2535D4:: @ 82535D4
.string "Because you won, I’ll tell you\n"
.string "a little secret!\p"
.string "There is just one item\n"
.string "lying around here.$"
BattleFrontier_BattlePyramidEmptySquare_Text_25362E:: @ 825362E
.string "Because you won, I’ll tell you\n"
.string "a little secret!\p"
.string "There isn’t anything left\n"
.string "lying around here.$"
BattleFrontier_BattlePyramidEmptySquare_Text_25368B:: @ 825368B
.string "How’s your stock of items holding up?\p"
.string "I reckon there are eight items left\n"
.string "waiting to be found on this floor.$"
BattleFrontier_BattlePyramidEmptySquare_Text_2536F8:: @ 82536F8
.string "How’s your stock of items holding up?\p"
.string "I reckon there are seven items left\n"
.string "waiting to be found on this floor.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253765:: @ 8253765
.string "How’s your stock of items holding up?\p"
.string "I reckon there are six items left\n"
.string "waiting to be found on this floor.$"
BattleFrontier_BattlePyramidEmptySquare_Text_2537D0:: @ 82537D0
.string "How’s your stock of items holding up?\p"
.string "I reckon there are five items left\n"
.string "waiting to be found on this floor.$"
BattleFrontier_BattlePyramidEmptySquare_Text_25383C:: @ 825383C
.string "How’s your stock of items holding up?\p"
.string "I reckon there are four items left\n"
.string "waiting to be found on this floor.$"
BattleFrontier_BattlePyramidEmptySquare_Text_2538A8:: @ 82538A8
.string "How’s your stock of items holding up?\p"
.string "I reckon there are three items left\n"
.string "waiting to be found on this floor.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253915:: @ 8253915
.string "How’s your stock of items holding up?\p"
.string "I reckon there are two items left\n"
.string "waiting to be found on this floor.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253980:: @ 8253980
.string "How’s your stock of items holding up?\p"
.string "I reckon there’s but one item left\n"
.string "waiting to be found on this floor.$"
BattleFrontier_BattlePyramidEmptySquare_Text_2539EC:: @ 82539EC
.string "How’s your stock of items holding up?\p"
.string "I reckon there are no more items\n"
.string "waiting to be found on this floor.\l"
.string "You take care now!$"
BattleFrontier_BattlePyramidEmptySquare_Text_253A69:: @ 8253A69
.string "You’re strong, so you’ve earned\n"
.string "a hint!\p"
.string "There appear to be eight more\n"
.string "items on the ground.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253AC4:: @ 8253AC4
.string "You’re strong, so you’ve earned\n"
.string "a hint!\p"
.string "There appear to be seven more\n"
.string "items on the ground.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253B1F:: @ 8253B1F
.string "You’re strong, so you’ve earned\n"
.string "a hint!\p"
.string "There appear to be six more\n"
.string "items on the ground.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253B78:: @ 8253B78
.string "You’re strong, so you’ve earned\n"
.string "a hint!\p"
.string "There appear to be five more\n"
.string "items on the ground.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253BD2:: @ 8253BD2
.string "You’re strong, so you’ve earned\n"
.string "a hint!\p"
.string "There appear to be four more\n"
.string "items on the ground.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253C2C:: @ 8253C2C
.string "You’re strong, so you’ve earned\n"
.string "a hint!\p"
.string "There appear to be three more\n"
.string "items on the ground.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253C87:: @ 8253C87
.string "You’re strong, so you’ve earned\n"
.string "a hint!\p"
.string "There appear to be two more\n"
.string "items on the ground.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253CE0:: @ 8253CE0
.string "You’re strong, so you’ve earned\n"
.string "a hint!\p"
.string "There appears to be only one more\n"
.string "item on the ground.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253D3E:: @ 8253D3E
.string "You’re strong, so you’ve earned\n"
.string "a hint!\p"
.string "There appear to be no more\n"
.string "items on the ground.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253D96:: @ 8253D96
.string "On this floor of the PYRAMID,\n"
.string "I hear there are eight items…$"
BattleFrontier_BattlePyramidEmptySquare_Text_253DD2:: @ 8253DD2
.string "On this floor of the PYRAMID,\n"
.string "I hear there are seven items…$"
BattleFrontier_BattlePyramidEmptySquare_Text_253E0E:: @ 8253E0E
.string "On this floor of the PYRAMID,\n"
.string "I hear there are six items…$"
BattleFrontier_BattlePyramidEmptySquare_Text_253E48:: @ 8253E48
.string "On this floor of the PYRAMID,\n"
.string "I hear there are five items…$"
BattleFrontier_BattlePyramidEmptySquare_Text_253E83:: @ 8253E83
.string "On this floor of the PYRAMID,\n"
.string "I hear there are four items…$"
BattleFrontier_BattlePyramidEmptySquare_Text_253EBE:: @ 8253EBE
.string "On this floor of the PYRAMID,\n"
.string "I hear there are three items…$"
BattleFrontier_BattlePyramidEmptySquare_Text_253EFA:: @ 8253EFA
.string "On this floor of the PYRAMID,\n"
.string "I hear there are two items…$"
BattleFrontier_BattlePyramidEmptySquare_Text_253F34:: @ 8253F34
.string "On this floor of the PYRAMID,\n"
.string "I hear there is one item…$"
BattleFrontier_BattlePyramidEmptySquare_Text_253F6C:: @ 8253F6C
.string "On this floor of the PYRAMID,\n"
.string "I hear there are no items…$"
BattleFrontier_BattlePyramidEmptySquare_Text_253FA5:: @ 8253FA5
.string "Have you collected any items?\p"
.string "I believe there are eight more\n"
.string "items on this floor.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253FF7:: @ 8253FF7
.string "Have you collected any items?\p"
.string "I believe there are seven more\n"
.string "items on this floor.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254049:: @ 8254049
.string "Have you collected any items?\p"
.string "I believe there are six more\n"
.string "items on this floor.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254099:: @ 8254099
.string "Have you collected any items?\p"
.string "I believe there are five more\n"
.string "items on this floor.$"
BattleFrontier_BattlePyramidEmptySquare_Text_2540EA:: @ 82540EA
.string "Have you collected any items?\p"
.string "I believe there are four more\n"
.string "items on this floor.$"
BattleFrontier_BattlePyramidEmptySquare_Text_25413B:: @ 825413B
.string "Have you collected any items?\p"
.string "I believe there are three more\n"
.string "items on this floor.$"
BattleFrontier_BattlePyramidEmptySquare_Text_25418D:: @ 825418D
.string "Have you collected any items?\p"
.string "I believe there are two more\n"
.string "items on this floor.$"
BattleFrontier_BattlePyramidEmptySquare_Text_2541DD:: @ 82541DD
.string "Have you collected any items?\p"
.string "I believe there is one more\n"
.string "item on this floor.$"
BattleFrontier_BattlePyramidEmptySquare_Text_25422B:: @ 825422B
.string "Have you collected any items?\p"
.string "I believe there are no more\n"
.string "items on this floor.$"
BattleFrontier_BattlePyramidEmptySquare_Text_25427A:: @ 825427A
.string "You were really awesome!\p"
.string "But there are still seven tough\n"
.string "TRAINERS other than me!$"
BattleFrontier_BattlePyramidEmptySquare_Text_2542CB:: @ 82542CB
.string "You were really awesome!\p"
.string "But there are still six tough\n"
.string "TRAINERS other than me!$"
BattleFrontier_BattlePyramidEmptySquare_Text_25431A:: @ 825431A
.string "You were really awesome!\p"
.string "But there are still five tough\n"
.string "TRAINERS other than me!$"
BattleFrontier_BattlePyramidEmptySquare_Text_25436A:: @ 825436A
.string "You were really awesome!\p"
.string "But there are still four tough\n"
.string "TRAINERS other than me!$"
BattleFrontier_BattlePyramidEmptySquare_Text_2543BA:: @ 82543BA
.string "You were really awesome!\p"
.string "But there are still three tough\n"
.string "TRAINERS other than me!$"
BattleFrontier_BattlePyramidEmptySquare_Text_25440B:: @ 825440B
.string "You were really awesome!\p"
.string "But there are still two tough\n"
.string "TRAINERS other than me!$"
BattleFrontier_BattlePyramidEmptySquare_Text_25445A:: @ 825445A
.string "You were really awesome!\p"
.string "But there’s still one tough\n"
.string "TRAINER other than me!$"
BattleFrontier_BattlePyramidEmptySquare_Text_2544A6:: @ 82544A6
.string "You were really awesome!\p"
.string "There’s no one left that\n"
.string "can beat you!$"
BattleFrontier_BattlePyramidEmptySquare_Text_2544E6:: @ 82544E6
.string "This is so upsetting!\p"
.string "But there are seven TRAINERS left!\n"
.string "Someone will humble you!$"
BattleFrontier_BattlePyramidEmptySquare_Text_254538:: @ 8254538
.string "This is so upsetting!\p"
.string "But there are six TRAINERS left!\n"
.string "Someone will humble you!$"
BattleFrontier_BattlePyramidEmptySquare_Text_254588:: @ 8254588
.string "This is so upsetting!\p"
.string "But there are five TRAINERS left!\n"
.string "Someone will humble you!$"
BattleFrontier_BattlePyramidEmptySquare_Text_2545D9:: @ 82545D9
.string "This is so upsetting!\p"
.string "But there are four TRAINERS left!\n"
.string "Someone will humble you!$"
BattleFrontier_BattlePyramidEmptySquare_Text_25462A:: @ 825462A
.string "This is so upsetting!\p"
.string "But there are three TRAINERS left!\n"
.string "Someone will humble you!$"
BattleFrontier_BattlePyramidEmptySquare_Text_25467C:: @ 825467C
.string "This is so upsetting!\p"
.string "But there are two TRAINERS left!\n"
.string "Someone will humble you!$"
BattleFrontier_BattlePyramidEmptySquare_Text_2546CC:: @ 82546CC
.string "This is so upsetting!\p"
.string "But there’s one TRAINER left!\n"
.string "I’m sure you will be humbled!$"
BattleFrontier_BattlePyramidEmptySquare_Text_25471E:: @ 825471E
.string "This is so upsetting!\p"
.string "But there are no more TRAINERS\n"
.string "who can engage you!$"
BattleFrontier_BattlePyramidEmptySquare_Text_254767:: @ 8254767
.string "That’s pretty impressive!\p"
.string "But there are seven more TRAINERS\n"
.string "on this floor. Can you beat them all?$"
BattleFrontier_BattlePyramidEmptySquare_Text_2547C9:: @ 82547C9
.string "That’s pretty impressive!\p"
.string "But there are six more TRAINERS\n"
.string "on this floor. Can you beat them all?$"
BattleFrontier_BattlePyramidEmptySquare_Text_254829:: @ 8254829
.string "That’s pretty impressive!\p"
.string "But there are five more TRAINERS\n"
.string "on this floor. Can you beat them all?$"
BattleFrontier_BattlePyramidEmptySquare_Text_25488A:: @ 825488A
.string "That’s pretty impressive!\p"
.string "But there are four more TRAINERS\n"
.string "on this floor. Can you beat them all?$"
BattleFrontier_BattlePyramidEmptySquare_Text_2548EB:: @ 82548EB
.string "That’s pretty impressive!\p"
.string "But there are three more TRAINERS\n"
.string "on this floor. Can you beat them all?$"
BattleFrontier_BattlePyramidEmptySquare_Text_25494D:: @ 825494D
.string "That’s pretty impressive!\p"
.string "But there are two more TRAINERS\n"
.string "on this floor. Can you beat them both?$"
BattleFrontier_BattlePyramidEmptySquare_Text_2549AE:: @ 82549AE
.string "That’s pretty impressive!\p"
.string "But there’s still one more TRAINER\n"
.string "on this floor. Can you prevail?$"
BattleFrontier_BattlePyramidEmptySquare_Text_254A0B:: @ 8254A0B
.string "That’s pretty impressive!\p"
.string "You’ve gone through all the TRAINERS\n"
.string "on this floor.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254A59:: @ 8254A59
.string "Maybe you could sweep through\n"
.string "the seven TRAINERS left on this floor.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254A9E:: @ 8254A9E
.string "Maybe you could sweep through\n"
.string "the six TRAINERS left on this floor.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254AE1:: @ 8254AE1
.string "Maybe you could sweep through\n"
.string "the five TRAINERS left on this floor.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254B25:: @ 8254B25
.string "Maybe you could sweep through\n"
.string "the four TRAINERS left on this floor.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254B69:: @ 8254B69
.string "Maybe you could sweep through\n"
.string "the three TRAINERS left on this floor.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254BAE:: @ 8254BAE
.string "Maybe you could sweep through\n"
.string "the two TRAINERS left on this floor.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254BF1:: @ 8254BF1
.string "Maybe you could complete your sweep\n"
.string "with the one TRAINER left on this floor.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254C3E:: @ 8254C3E
.string "There isn’t a single person left who\n"
.string "can defeat you now…$"
BattleFrontier_BattlePyramidEmptySquare_Text_254C77:: @ 8254C77
.string "You may have what it takes to beat\n"
.string "the seven expert TRAINERS who remain.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254CC0:: @ 8254CC0
.string "You may have what it takes to beat\n"
.string "the six expert TRAINERS who remain.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254D07:: @ 8254D07
.string "You may have what it takes to beat\n"
.string "the five expert TRAINERS who remain.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254D4F:: @ 8254D4F
.string "You may have what it takes to beat\n"
.string "the four expert TRAINERS who remain.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254D97:: @ 8254D97
.string "You may have what it takes to beat\n"
.string "the three expert TRAINERS who remain.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254DE0:: @ 8254DE0
.string "You may have what it takes to beat\n"
.string "the two expert TRAINERS who remain.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254E27:: @ 8254E27
.string "You may have what it takes to beat\n"
.string "the one expert TRAINER who remains.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254E6E:: @ 8254E6E
.string "Your skills are beyond reproach.\p"
.string "There are no more TRAINERS here\n"
.string "who have any chance of beating you.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254ED3:: @ 8254ED3
.string "Can you keep winning against\n"
.string "the seven remaining TRAINERS?$"
BattleFrontier_BattlePyramidEmptySquare_Text_254F0E:: @ 8254F0E
.string "Can you keep winning against\n"
.string "the six remaining TRAINERS?$"
BattleFrontier_BattlePyramidEmptySquare_Text_254F47:: @ 8254F47
.string "Can you keep winning against\n"
.string "the five remaining TRAINERS?$"
BattleFrontier_BattlePyramidEmptySquare_Text_254F81:: @ 8254F81
.string "Can you keep winning against\n"
.string "the four remaining TRAINERS?$"
BattleFrontier_BattlePyramidEmptySquare_Text_254FBB:: @ 8254FBB
.string "Can you keep winning against\n"
.string "the three remaining TRAINERS?$"
BattleFrontier_BattlePyramidEmptySquare_Text_254FF6:: @ 8254FF6
.string "Can you keep winning against\n"
.string "the two remaining TRAINERS?$"
BattleFrontier_BattlePyramidEmptySquare_Text_25502F:: @ 825502F
.string "Can you keep winning against\n"
.string "the last remaining TRAINER?$"
BattleFrontier_BattlePyramidEmptySquare_Text_255068:: @ 8255068
.string "There aren’t any TRAINERS left that\n"
.string "can take you on now…$"
data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc
+341 -1
View File
File diff suppressed because it is too large Load Diff
data/scripts/maps/BattleFrontier_Lounge1.inc
+1 -1
View File
@@ -30,7 +30,7 @@ BattleFrontier_Lounge1_EventScript_25E7B6:: @ 825E7B6
return
BattleFrontier_Lounge1_EventScript_25E7BF:: @ 825E7BF
specialvar VAR_RESULT, sub_81396E0
specialvar VAR_RESULT, ScriptGetPartyMonSpecies
compare VAR_RESULT, 412
goto_eq BattleFrontier_Lounge1_EventScript_25E7FF
special sub_8139D98
data/scripts/maps/BattleFrontier_Lounge2.inc
+35 -35
View File
@@ -117,7 +117,7 @@ BattleFrontier_Lounge2_EventScript_26075D:: @ 826075D
msgbox BattleFrontier_Lounge2_Text_261D5C, 2
end
BattleFrontier_Lounge2_Text_260766: @ 8260766
BattleFrontier_Lounge2_Text_260766:: @ 8260766
.string "Howdy! When it comes to news about\n"
.string "the BATTLE FRONTIER, I’m no. 1.\p"
.string "You can think of me as\n"
@@ -127,33 +127,33 @@ BattleFrontier_Lounge2_Text_260766: @ 8260766
.string "I’ll happily share the hottest news\n"
.string "I gathered about the BATTLE FRONTIER.$"
BattleFrontier_Lounge2_Text_260857: @ 8260857
BattleFrontier_Lounge2_Text_260857:: @ 8260857
.string "Howdy! Did you swing by to grill me\n"
.string "about the latest word? Oh, all right!$"
BattleFrontier_Lounge2_Text_2608A1: @ 82608A1
BattleFrontier_Lounge2_Text_2608A1:: @ 82608A1
.string "Well? Well? Well?\p"
.string "I’m sure my information’s been\n"
.string "seriously useful to you, right?$"
BattleFrontier_Lounge2_Text_2608F2: @ 82608F2
BattleFrontier_Lounge2_Text_2608F2:: @ 82608F2
.string "Let’s see now…\p"
.string "It sounds like the {STR_VAR_1}\n"
.string "is the hottest place going.$"
BattleFrontier_Lounge2_Text_260933: @ 8260933
BattleFrontier_Lounge2_Text_260933:: @ 8260933
.string "Let’s see now…\p"
.string "It sounds like BATTLE TOWER\n"
.string "{STR_VAR_1} is the hottest.$"
BattleFrontier_Lounge2_Text_260971: @ 8260971
BattleFrontier_Lounge2_Text_260971:: @ 8260971
.string "Bet you didn’t know this!\p"
.string "One of those top TRAINERS that SCOTT\n"
.string "calls the FRONTIER BRAINS is there.\p"
.string "It’s this mysterious TRAINER called\n"
.string "the SALON MAIDEN that runs the place.$"
BattleFrontier_Lounge2_Text_260A1E: @ 8260A1E
BattleFrontier_Lounge2_Text_260A1E:: @ 8260A1E
.string "Have you battled the SALON MAIDEN?\p"
.string "When she’s measuring up her opponent,\n"
.string "she apparently uses these POKéMON:\p"
@@ -161,7 +161,7 @@ BattleFrontier_Lounge2_Text_260A1E: @ 8260A1E
.string "a FIRE-type VOLCANO POKéMON,\l"
.string "and a NORMAL-type SLEEPING POKéMON.$"
BattleFrontier_Lounge2_Text_260AE7: @ 8260AE7
BattleFrontier_Lounge2_Text_260AE7:: @ 8260AE7
.string "Have you battled the SALON MAIDEN\n"
.string "when she’s serious?\p"
.string "When she’s battling flat out,\n"
@@ -170,14 +170,14 @@ BattleFrontier_Lounge2_Text_260AE7: @ 8260AE7
.string "an ELECTRIC-type THUNDER POKéMON,\l"
.string "and a NORMAL-type SLEEPING POKéMON.$"
BattleFrontier_Lounge2_Text_260BC4: @ 8260BC4
BattleFrontier_Lounge2_Text_260BC4:: @ 8260BC4
.string "Bet you didn’t know this!\p"
.string "One of those top TRAINERS that SCOTT\n"
.string "calls the FRONTIER BRAINS is there.\p"
.string "It’s this flamboyant TRAINER called\n"
.string "the DOME ACE that runs the place.$"
BattleFrontier_Lounge2_Text_260C6D: @ 8260C6D
BattleFrontier_Lounge2_Text_260C6D:: @ 8260C6D
.string "Have you battled the DOME ACE?\p"
.string "When he’s treating the opponent\n"
.string "lightly, he uses these three POKéMON:\p"
@@ -185,7 +185,7 @@ BattleFrontier_Lounge2_Text_260C6D: @ 8260C6D
.string "a WATER & GROUND MUD FISH POKéMON,\l"
.string "and a FIRE & FLYING FLAME POKéMON.$"
BattleFrontier_Lounge2_Text_260D3A: @ 8260D3A
BattleFrontier_Lounge2_Text_260D3A:: @ 8260D3A
.string "Have you battled the DOME ACE\n"
.string "when he’s serious?\p"
.string "When he’s demonstrating his strategy,\n"
@@ -195,14 +195,14 @@ BattleFrontier_Lounge2_Text_260D3A: @ 8260D3A
.string "and a STEEL- & PSYCHIC-type IRON LEG\l"
.string "POKéMON.$"
BattleFrontier_Lounge2_Text_260E1E: @ 8260E1E
BattleFrontier_Lounge2_Text_260E1E:: @ 8260E1E
.string "Bet you didn’t know this!\p"
.string "One of those top TRAINERS that SCOTT\n"
.string "calls the FRONTIER BRAINS is there.\p"
.string "It’s this freaky TRAINER called\n"
.string "the FACTORY HEAD that runs the place.$"
BattleFrontier_Lounge2_Text_260EC7: @ 8260EC7
BattleFrontier_Lounge2_Text_260EC7:: @ 8260EC7
.string "Have you battled the FACTORY HEAD\n"
.string "already?\p"
.string "Let me think… When he goes to battle,\n"
@@ -210,7 +210,7 @@ BattleFrontier_Lounge2_Text_260EC7: @ 8260EC7
.string "He battles under pretty much the same\n"
.string "conditions as you.$"
BattleFrontier_Lounge2_Text_260F74: @ 8260F74
BattleFrontier_Lounge2_Text_260F74:: @ 8260F74
.string "Have you battled the FACTORY HEAD\n"
.string "when he’s serious?\p"
.string "When he goes seriously to battle,\n"
@@ -218,14 +218,14 @@ BattleFrontier_Lounge2_Text_260F74: @ 8260F74
.string "He battles under virtually the same\n"
.string "conditions as you.$"
BattleFrontier_Lounge2_Text_261026: @ 8261026
BattleFrontier_Lounge2_Text_261026:: @ 8261026
.string "Bet you didn’t know this!\p"
.string "One of those top TRAINERS that SCOTT\n"
.string "calls the FRONTIER BRAINS is there.\p"
.string "It’s this scary TRAINER called\n"
.string "the PIKE QUEEN that runs the place.$"
BattleFrontier_Lounge2_Text_2610CC: @ 82610CC
BattleFrontier_Lounge2_Text_2610CC:: @ 82610CC
.string "Have you battled the PIKE QUEEN\n"
.string "before?\p"
.string "When she’s in a good mood, they say\n"
@@ -234,7 +234,7 @@ BattleFrontier_Lounge2_Text_2610CC: @ 82610CC
.string "a BUG & ROCK MOLD POKéMON,\l"
.string "and a WATER-type TENDER POKéMON.$"
BattleFrontier_Lounge2_Text_261194: @ 8261194
BattleFrontier_Lounge2_Text_261194:: @ 8261194
.string "Have you battled the PIKE QUEEN\n"
.string "when she’s serious?\p"
.string "When she’s seriously annoyed, they say\n"
@@ -244,14 +244,14 @@ BattleFrontier_Lounge2_Text_261194: @ 8261194
.string "and a WATER- & FLYING-type ATROCIOUS\l"
.string "POKéMON.$"
BattleFrontier_Lounge2_Text_261282: @ 8261282
BattleFrontier_Lounge2_Text_261282:: @ 8261282
.string "Bet you didn’t know this!\p"
.string "One of those top TRAINERS that SCOTT\n"
.string "calls the FRONTIER BRAINS is there.\p"
.string "It’s this cute TRAINER called\n"
.string "the ARENA TYCOON that runs the place.$"
BattleFrontier_Lounge2_Text_261329: @ 8261329
BattleFrontier_Lounge2_Text_261329:: @ 8261329
.string "Have you battled the ARENA TYCOON\n"
.string "before?\p"
.string "When she’s assessing the foe’s ability,\n"
@@ -260,7 +260,7 @@ BattleFrontier_Lounge2_Text_261329: @ 8261329
.string "a DARK-type MOONLIGHT POKéMON,\l"
.string "and a BUG & GHOST SHED POKéMON.$"
BattleFrontier_Lounge2_Text_261403: @ 8261403
BattleFrontier_Lounge2_Text_261403:: @ 8261403
.string "Have you battled the ARENA TYCOON\n"
.string "when she’s serious?\p"
.string "When she battles for keeps,\n"
@@ -270,14 +270,14 @@ BattleFrontier_Lounge2_Text_261403: @ 8261403
.string "and a GRASS- & FIGHTING-type\l"
.string "MUSHROOM POKéMON.$"
BattleFrontier_Lounge2_Text_2614E6: @ 82614E6
BattleFrontier_Lounge2_Text_2614E6:: @ 82614E6
.string "Bet you didn’t know this!\p"
.string "One of those top TRAINERS that SCOTT\n"
.string "calls the FRONTIER BRAINS is there.\p"
.string "It’s this sinister TRAINER called\n"
.string "the PALACE MAVEN that runs the place.$"
BattleFrontier_Lounge2_Text_261591: @ 8261591
BattleFrontier_Lounge2_Text_261591:: @ 8261591
.string "Have you battled the PALACE MAVEN\n"
.string "before?\p"
.string "When he’s testing the opponent’s\n"
@@ -286,7 +286,7 @@ BattleFrontier_Lounge2_Text_261591: @ 8261591
.string "a NORMAL-type LAZY POKéMON, and a\l"
.string "WATER- & ICE-type TRANSPORT POKéMON.$"
BattleFrontier_Lounge2_Text_26166F: @ 826166F
BattleFrontier_Lounge2_Text_26166F:: @ 826166F
.string "Have you battled the PALACE MAVEN\n"
.string "when he’s serious?\p"
.string "When he throws his entire might into\n"
@@ -295,14 +295,14 @@ BattleFrontier_Lounge2_Text_26166F: @ 826166F
.string "a NORMAL-type LAZY POKéMON,\l"
.string "and a WATER-type AURORA POKéMON.$"
BattleFrontier_Lounge2_Text_26174D: @ 826174D
BattleFrontier_Lounge2_Text_26174D:: @ 826174D
.string "Bet you didn’t know this!\p"
.string "One of those top TRAINERS that SCOTT\n"
.string "calls the FRONTIER BRAINS is there.\p"
.string "It’s this fiery-hot TRAINER called\n"
.string "the PYRAMID KING that runs the place.$"
BattleFrontier_Lounge2_Text_2617F9: @ 82617F9
BattleFrontier_Lounge2_Text_2617F9:: @ 82617F9
.string "Have you battled the PYRAMID KING\n"
.string "before?\p"
.string "When he’s checking the foe’s power,\n"
@@ -311,7 +311,7 @@ BattleFrontier_Lounge2_Text_2617F9: @ 82617F9
.string "an ICE-type ICEBERG POKéMON,\l"
.string "and a STEEL-type IRON POKéMON.$"
BattleFrontier_Lounge2_Text_2618C4: @ 82618C4
BattleFrontier_Lounge2_Text_2618C4:: @ 82618C4
.string "Have you battled the PYRAMID KING\n"
.string "when he’s serious?\p"
.string "When he’s pumped with hot power,\n"
@@ -321,7 +321,7 @@ BattleFrontier_Lounge2_Text_2618C4: @ 82618C4
.string "and a FIRE- & FLYING-type FLAME\l"
.string "POKéMON.$"
BattleFrontier_Lounge2_Text_2619AC: @ 82619AC
BattleFrontier_Lounge2_Text_2619AC:: @ 82619AC
.string "Sure, there are several places where\n"
.string "you can enter DOUBLE BATTLES.\p"
.string "But the DOUBLE BATTLE ROOMS of\n"
@@ -330,44 +330,44 @@ BattleFrontier_Lounge2_Text_2619AC: @ 82619AC
.string "how DOUBLE BATTLES are played here\l"
.string "in the BATTLE FRONTIER.$"
BattleFrontier_Lounge2_Text_261A91: @ 8261A91
BattleFrontier_Lounge2_Text_261A91:: @ 8261A91
.string "Watch yourself in the battles here.\p"
.string "I hear there are TRAINERS that have\n"
.string "strategies they developed just for\l"
.string "DOUBLE BATTLES.$"
BattleFrontier_Lounge2_Text_261B0C: @ 8261B0C
BattleFrontier_Lounge2_Text_261B0C:: @ 8261B0C
.string "Once you’re confident and comfortable\n"
.string "with DOUBLE BATTLES here, you should\l"
.string "think about challenging other places\l"
.string "offering DOUBLE BATTLES.$"
BattleFrontier_Lounge2_Text_261B95: @ 8261B95
BattleFrontier_Lounge2_Text_261B95:: @ 8261B95
.string "All sorts of TRAINERS gather in\n"
.string "the BATTLE SALON.\p"
.string "Just think--you may run into your\n"
.string "friends or followers!\l"
.string "You should look carefully!$"
BattleFrontier_Lounge2_Text_261C1A: @ 8261C1A
BattleFrontier_Lounge2_Text_261C1A:: @ 8261C1A
.string "If you’re with a friend, head for the\n"
.string "LINK MULTI BATTLE ROOM.\p"
.string "If you play with a strong friend,\n"
.string "you can expect to see tough foes!$"
BattleFrontier_Lounge2_Text_261C9C: @ 8261C9C
BattleFrontier_Lounge2_Text_261C9C:: @ 8261C9C
.string "What amazing news-gathering power!\n"
.string "My mentor’s like none other!$"
BattleFrontier_Lounge2_Text_261CDC: @ 8261CDC
BattleFrontier_Lounge2_Text_261CDC:: @ 8261CDC
.string "What amazing powers of observation!\n"
.string "My mentor’s like none other!$"
BattleFrontier_Lounge2_Text_261D1D: @ 8261D1D
BattleFrontier_Lounge2_Text_261D1D:: @ 8261D1D
.string "What amazing power of persuasion!\n"
.string "My mentor’s like none other!$"
BattleFrontier_Lounge2_Text_261D5C: @ 8261D5C
BattleFrontier_Lounge2_Text_261D5C:: @ 8261D5C
.string "…What is this place?\n"
.string "It’s scaring me…$"
data/scripts/maps/BattleFrontier_Lounge3.inc
+41 -41
View File
@@ -211,12 +211,12 @@ BattleFrontier_Lounge3_EventScript_261FF1:: @ 8261FF1
release
end
BattleFrontier_Lounge3_Text_261FFE: @ 8261FFE
BattleFrontier_Lounge3_Text_261FFE:: @ 8261FFE
.string "…What’s that you want?\p"
.string "Can’t you see we’re kind of busy here?\n"
.string "Can’t your business wait till later?$"
BattleFrontier_Lounge3_Text_262061: @ 8262061
BattleFrontier_Lounge3_Text_262061:: @ 8262061
.string "…Huh?\n"
.string "You look to me like a tough TRAINER.\p"
.string "Heheh…\n"
@@ -236,201 +236,201 @@ BattleFrontier_Lounge3_Text_262061: @ 8262061
.string "Sounds simple, huh?\n"
.string "So, anyway…$"
BattleFrontier_Lounge3_Text_262261: @ 8262261
BattleFrontier_Lounge3_Text_262261:: @ 8262261
.string "What I’m looking for is a TRAINER who’s\n"
.string "going to be challenging the BATTLE\l"
.string "TOWER’s SINGLE BATTLE ROOMS.\p"
.string "But so far, I haven’t seen a TRAINER\n"
.string "that has that winning quality.$"
BattleFrontier_Lounge3_Text_26230D: @ 826230D
BattleFrontier_Lounge3_Text_26230D:: @ 826230D
.string "What I’m looking for is a TRAINER who’s\n"
.string "going to be challenging the BATTLE\l"
.string "TOWER’s DOUBLE BATTLE ROOMS.\p"
.string "But so far, I haven’t seen a TRAINER\n"
.string "that has that winning quality.$"
BattleFrontier_Lounge3_Text_2623B9: @ 82623B9
BattleFrontier_Lounge3_Text_2623B9:: @ 82623B9
.string "What I’m looking for is a TRAINER who’s\n"
.string "going to be challenging the BATTLE\l"
.string "TOWER’s MULTI BATTLE ROOMS.\p"
.string "But so far, I haven’t seen a TRAINER\n"
.string "that has that winning quality.$"
BattleFrontier_Lounge3_Text_262464: @ 8262464
BattleFrontier_Lounge3_Text_262464:: @ 8262464
.string "What I’m looking for is a TRAINER who’s\n"
.string "going to be entering the BATTLE\l"
.string "DOME’s SINGLE BATTLE Tourney.\p"
.string "But so far, I haven’t seen a TRAINER\n"
.string "that has that winning quality.$"
BattleFrontier_Lounge3_Text_26250E: @ 826250E
BattleFrontier_Lounge3_Text_26250E:: @ 826250E
.string "What I’m looking for is a TRAINER who’s\n"
.string "going to be entering the BATTLE\l"
.string "DOME’s DOUBLE BATTLE Tourney.\p"
.string "But so far, I haven’t seen a TRAINER\n"
.string "that has that winning quality.$"
BattleFrontier_Lounge3_Text_2625B8: @ 82625B8
BattleFrontier_Lounge3_Text_2625B8:: @ 82625B8
.string "What I’m looking for is a TRAINER who’s\n"
.string "going to be entering the BATTLE\l"
.string "FACTORY’s Battle Swap Single Tourney.\p"
.string "But so far, I haven’t seen a TRAINER\n"
.string "that has that winning quality.$"
BattleFrontier_Lounge3_Text_26266A: @ 826266A
BattleFrontier_Lounge3_Text_26266A:: @ 826266A
.string "What I’m looking for is a TRAINER who’s\n"
.string "going to be entering the BATTLE\l"
.string "FACTORY’s Battle Swap Double Tourney.\p"
.string "But so far, I haven’t seen a TRAINER\n"
.string "that has that winning quality.$"
BattleFrontier_Lounge3_Text_26271C: @ 826271C
BattleFrontier_Lounge3_Text_26271C:: @ 826271C
.string "What I’m looking for is a TRAINER who’s\n"
.string "going to be challenging the BATTLE\l"
.string "PALACE’s SINGLE BATTLE HALLS.\p"
.string "But so far, I haven’t seen a TRAINER\n"
.string "that has that winning quality.$"
BattleFrontier_Lounge3_Text_2627C9: @ 82627C9
BattleFrontier_Lounge3_Text_2627C9:: @ 82627C9
.string "What I’m looking for is a TRAINER who’s\n"
.string "going to be challenging the BATTLE\l"
.string "PALACE’s DOUBLE BATTLE HALLS.\p"
.string "But so far, I haven’t seen a TRAINER\n"
.string "that has that winning quality.$"
BattleFrontier_Lounge3_Text_262876: @ 8262876
BattleFrontier_Lounge3_Text_262876:: @ 8262876
.string "What I’m looking for is a TRAINER who’s\n"
.string "going to be entering the BATTLE\l"
.string "ARENA’s Set KO Tourney.\p"
.string "But so far, I haven’t seen a TRAINER\n"
.string "that has that winning quality.$"
BattleFrontier_Lounge3_Text_26291A: @ 826291A
BattleFrontier_Lounge3_Text_26291A:: @ 826291A
.string "What I’m looking for is a TRAINER who’s\n"
.string "going to be entering the BATTLE PIKE’s\l"
.string "Battle Choice.\p"
.string "But so far, I haven’t seen a TRAINER\n"
.string "that has that winning quality.$"
BattleFrontier_Lounge3_Text_2629BC: @ 82629BC
BattleFrontier_Lounge3_Text_2629BC:: @ 82629BC
.string "What I’m looking for is a TRAINER who’s\n"
.string "going to be entering the BATTLE\l"
.string "PYRAMID’s Battle Quest.\p"
.string "But so far, I haven’t seen a TRAINER\n"
.string "that has that winning quality.$"
BattleFrontier_Lounge3_Text_262A60: @ 8262A60
BattleFrontier_Lounge3_Text_262A60:: @ 8262A60
.string "I’ll see to it that you benefit, too.\n"
.string "So how about it?\l"
.string "How about entering that event for me?$"
BattleFrontier_Lounge3_Text_262ABD: @ 8262ABD
BattleFrontier_Lounge3_Text_262ABD:: @ 8262ABD
.string "All right, that’s perfect.\n"
.string "So, uh… How about spotting me some\l"
.string "of your Battle Points?\p"
.string "Trust me, I’ll show you my gratitude\n"
.string "afterward.$"
BattleFrontier_Lounge3_Text_262B42: @ 8262B42
BattleFrontier_Lounge3_Text_262B42:: @ 8262B42
.string "Great, great!\n"
.string "So, how much can you spot me?$"
BattleFrontier_Lounge3_Text_262B6E: @ 8262B6E
BattleFrontier_Lounge3_Text_262B6E:: @ 8262B6E
.string "Oh, no, no, no!\n"
.string "You don’t have enough Battle Points!\p"
.string "I wish you wouldn’t monkey around and\n"
.string "waste everyone’s time!$"
BattleFrontier_Lounge3_Text_262BE0: @ 8262BE0
BattleFrontier_Lounge3_Text_262BE0:: @ 8262BE0
.string "Heheh! Thanks much!\n"
.string "So, off you go!$"
BattleFrontier_Lounge3_Text_262C04: @ 8262C04
BattleFrontier_Lounge3_Text_262C04:: @ 8262C04
.string "Get to the BATTLE TOWER’s\n"
.string "SINGLE BATTLE ROOMS pronto!\p"
.string "It’s a must-win situation!\n"
.string "Don’t blow your chance!\l"
.string "Both of our futures depend on you!$"
BattleFrontier_Lounge3_Text_262C90: @ 8262C90
BattleFrontier_Lounge3_Text_262C90:: @ 8262C90
.string "Get to the BATTLE TOWER’s\n"
.string "DOUBLE BATTLE ROOMS pronto!\p"
.string "It’s a must-win situation!\n"
.string "Don’t blow your chance!\l"
.string "Both of our futures depend on you!$"
BattleFrontier_Lounge3_Text_262D1C: @ 8262D1C
BattleFrontier_Lounge3_Text_262D1C:: @ 8262D1C
.string "Get to the BATTLE TOWER’s\n"
.string "MULTI BATTLE ROOMS pronto!\p"
.string "It’s a must-win situation!\n"
.string "Don’t blow your chance!\l"
.string "Both of our futures depend on you!$"
BattleFrontier_Lounge3_Text_262DA7: @ 8262DA7
BattleFrontier_Lounge3_Text_262DA7:: @ 8262DA7
.string "Get to the BATTLE DOME’s\n"
.string "SINGLE BATTLE Tourney pronto!\p"
.string "It’s a must-win situation!\n"
.string "Don’t blow your chance!\l"
.string "Both of our futures depend on you!$"
BattleFrontier_Lounge3_Text_262E34: @ 8262E34
BattleFrontier_Lounge3_Text_262E34:: @ 8262E34
.string "Get to the BATTLE DOME’s\n"
.string "DOUBLE BATTLE Tourney pronto!\p"
.string "It’s a must-win situation!\n"
.string "Don’t blow your chance!\l"
.string "Both of our futures depend on you!$"
BattleFrontier_Lounge3_Text_262EC1: @ 8262EC1
BattleFrontier_Lounge3_Text_262EC1:: @ 8262EC1
.string "Get to the BATTLE FACTORY’s\n"
.string "Battle Swap Single Tourney pronto!\p"
.string "It’s a must-win situation!\n"
.string "Don’t blow your chance!\l"
.string "Both of our futures depend on you!$"
BattleFrontier_Lounge3_Text_262F56: @ 8262F56
BattleFrontier_Lounge3_Text_262F56:: @ 8262F56
.string "Get to the BATTLE FACTORY’s\n"
.string "Battle Swap Double Tourney pronto!\p"
.string "It’s a must-win situation!\n"
.string "Don’t blow your chance!\l"
.string "Both of our futures depend on you!$"
BattleFrontier_Lounge3_Text_262FEB: @ 8262FEB
BattleFrontier_Lounge3_Text_262FEB:: @ 8262FEB
.string "Get to the BATTLE PALACE’s\n"
.string "SINGLE BATTLE HALLS pronto!\p"
.string "It’s a must-win situation!\n"
.string "Don’t blow your chance!\l"
.string "Both of our futures depend on you!$"
BattleFrontier_Lounge3_Text_263078: @ 8263078
BattleFrontier_Lounge3_Text_263078:: @ 8263078
.string "Get to the BATTLE PALACE’s\n"
.string "DOUBLE BATTLE HALLS pronto!\p"
.string "It’s a must-win situation!\n"
.string "Don’t blow your chance!\l"
.string "Both of our futures depend on you!$"
BattleFrontier_Lounge3_Text_263105: @ 8263105
BattleFrontier_Lounge3_Text_263105:: @ 8263105
.string "Get to the BATTLE ARENA’s\n"
.string "Set KO Tourney pronto!\p"
.string "It’s a must-win situation!\n"
.string "Don’t blow your chance!\l"
.string "Both of our futures depend on you!$"
BattleFrontier_Lounge3_Text_26318C: @ 826318C
BattleFrontier_Lounge3_Text_26318C:: @ 826318C
.string "Get to the BATTLE PIKE’s\n"
.string "Battle Choice pronto!\p"
.string "It’s a must-win situation!\n"
.string "Don’t blow your chance!\l"
.string "Both of our futures depend on you!$"
BattleFrontier_Lounge3_Text_263211: @ 8263211
BattleFrontier_Lounge3_Text_263211:: @ 8263211
.string "Get to the BATTLE PYRAMID’s\n"
.string "Battle Quest pronto!\p"
.string "It’s a must-win situation!\n"
.string "Don’t blow your chance!\l"
.string "Both of our futures depend on you!$"
BattleFrontier_Lounge3_Text_263298: @ 8263298
BattleFrontier_Lounge3_Text_263298:: @ 8263298
.string "Oh, it’s you…\n"
.string "Nice try…\p"
.string "I hate to break it to you, but I can’t\n"
@@ -438,7 +438,7 @@ BattleFrontier_Lounge3_Text_263298: @ 8263298
.string "I guess we’ll have to let it motivate\n"
.string "us to try harder next time!$"
BattleFrontier_Lounge3_Text_263334: @ 8263334
BattleFrontier_Lounge3_Text_263334:: @ 8263334
.string "Oh, yes!\n"
.string "Hello there, champ!\p"
.string "I knew you could!\n"
@@ -447,36 +447,36 @@ BattleFrontier_Lounge3_Text_263334: @ 8263334
.string "I’ll return your Battle Points and,\n"
.string "of course, a little extra from me!$"
BattleFrontier_Lounge3_Text_2633D4: @ 82633D4
BattleFrontier_Lounge3_Text_2633D4:: @ 82633D4
.string "{PLAYER} obtained\n"
.string "{STR_VAR_1} Battle Points.$"
BattleFrontier_Lounge3_Text_2633F2: @ 82633F2
BattleFrontier_Lounge3_Text_2633F2:: @ 82633F2
.string "If you’re up for another challenge,\n"
.string "please do think of me!$"
BattleFrontier_Lounge3_Text_26342D: @ 826342D
BattleFrontier_Lounge3_Text_26342D:: @ 826342D
.string "Not interested?! You shouldn’t be\n"
.string "so afraid to take a chance!$"
BattleFrontier_Lounge3_Text_26346B: @ 826346B
BattleFrontier_Lounge3_Text_26346B:: @ 826346B
.string "Oh…$"
BattleFrontier_Lounge3_Text_26346F: @ 826346F
BattleFrontier_Lounge3_Text_26346F:: @ 826346F
.string "I backed the wrong TRAINER again!\p"
.string "Maybe I should be battling normally\n"
.string "like everyone else…$"
BattleFrontier_Lounge3_Text_2634C9: @ 82634C9
BattleFrontier_Lounge3_Text_2634C9:: @ 82634C9
.string "That TRAINER…\p"
.string "He’s good, but he gets rattled too\n"
.string "easily to survive the BATTLE DOME…$"
BattleFrontier_Lounge3_Text_26351D: @ 826351D
BattleFrontier_Lounge3_Text_26351D:: @ 826351D
.string "Giggle!\n"
.string "I know a winner when I see one!$"
BattleFrontier_Lounge3_Text_263545: @ 8263545
BattleFrontier_Lounge3_Text_263545:: @ 8263545
.string "Those TRAINERS…\n"
.string "What are they doing?\l"
.string "They should be taking challenges.$"
data/scripts/maps/BattleFrontier_Lounge5.inc
+29 -29
View File
@@ -13,7 +13,7 @@ BattleFrontier_Lounge5_EventScript_2645C6:: @ 82645C6
faceplayer
compare VAR_0x8004, 255
goto_eq BattleFrontier_Lounge5_EventScript_26460D
specialvar VAR_RESULT, sub_81396E0
specialvar VAR_RESULT, ScriptGetPartyMonSpecies
compare VAR_RESULT, 412
goto_eq BattleFrontier_Lounge5_EventScript_264603
special sub_813A7B8
@@ -44,162 +44,162 @@ BattleFrontier_Lounge5_EventScript_264629:: @ 8264629
msgbox BattleFrontier_Lounge5_Text_264FAB, 2
end
BattleFrontier_Lounge5_Text_264632: @ 8264632
BattleFrontier_Lounge5_Text_264632:: @ 8264632
.string "Ehehe!\n"
.string "I can tell what POKéMON are thinking!\p"
.string "Please!\n"
.string "Can I see your POKéMON?$"
BattleFrontier_Lounge5_Text_26467F: @ 826467F
BattleFrontier_Lounge5_Text_26467F:: @ 826467F
.string "Boo!\n"
.string "Cheapie!$"
BattleFrontier_Lounge5_Text_26468D: @ 826468D
BattleFrontier_Lounge5_Text_26468D:: @ 826468D
.string "Hmhm…\p"
.string "This one says it likes to battle!\n"
.string "It will battle even if it has a lot\l"
.string "of ouchies!$"
BattleFrontier_Lounge5_Text_2646E5: @ 82646E5
BattleFrontier_Lounge5_Text_2646E5:: @ 82646E5
.string "Hmhm…\p"
.string "This one says it likes to be sneaky!\n"
.string "But if it gets enough ouchies,\l"
.string "it will hit back!$"
BattleFrontier_Lounge5_Text_264741: @ 8264741
BattleFrontier_Lounge5_Text_264741:: @ 8264741
.string "Hmhm…\p"
.string "This one says it likes to battle!\n"
.string "But if it gets enough ouchies,\l"
.string "it will worry about itself!$"
BattleFrontier_Lounge5_Text_2647A4: @ 82647A4
BattleFrontier_Lounge5_Text_2647A4:: @ 82647A4
.string "Hmhm…\p"
.string "This one says it likes to battle!\n"
.string "It will battle even if it has a lot\l"
.string "of ouchies!$"
BattleFrontier_Lounge5_Text_2647FC: @ 82647FC
BattleFrontier_Lounge5_Text_2647FC:: @ 82647FC
.string "Hmhm…\p"
.string "This one says it looks after itself!\n"
.string "But if it gets enough ouchies,\l"
.string "it will hit back!$"
BattleFrontier_Lounge5_Text_264858: @ 8264858
BattleFrontier_Lounge5_Text_264858:: @ 8264858
.string "Hmhm…\p"
.string "This one says it likes to be sneaky!\n"
.string "But if it gets enough ouchies,\l"
.string "it will worry about itself!$"
BattleFrontier_Lounge5_Text_2648BE: @ 82648BE
BattleFrontier_Lounge5_Text_2648BE:: @ 82648BE
.string "Hmhm…\p"
.string "This one says it likes to battle!\n"
.string "It will battle even if it has a lot\l"
.string "of ouchies!$"
BattleFrontier_Lounge5_Text_264916: @ 8264916
BattleFrontier_Lounge5_Text_264916:: @ 8264916
.string "Hmhm…\p"
.string "This one says it likes to be sneaky!\n"
.string "But if it gets enough ouchies,\l"
.string "it will hit back!$"
BattleFrontier_Lounge5_Text_264972: @ 8264972
BattleFrontier_Lounge5_Text_264972:: @ 8264972
.string "Hmhm…\p"
.string "This one says it likes to battle!\n"
.string "But if it gets enough ouchies,\l"
.string "it will worry about itself!$"
BattleFrontier_Lounge5_Text_2649D5: @ 82649D5
BattleFrontier_Lounge5_Text_2649D5:: @ 82649D5
.string "Hmhm…\p"
.string "This one says it likes to be sneaky!\n"
.string "It says it likes to be sneaky even\l"
.string "if it has a lot of ouchies!$"
BattleFrontier_Lounge5_Text_264A3F: @ 8264A3F
BattleFrontier_Lounge5_Text_264A3F:: @ 8264A3F
.string "Hmhm…\p"
.string "This one says it likes to battle!\n"
.string "But if it gets enough ouchies,\l"
.string "it will turn sneaky!$"
BattleFrontier_Lounge5_Text_264A9B: @ 8264A9B
BattleFrontier_Lounge5_Text_264A9B:: @ 8264A9B
.string "Hmhm…\p"
.string "This one says it likes to battle!\n"
.string "It will battle even if it has a lot\l"
.string "of ouchies!$"
BattleFrontier_Lounge5_Text_264AF3: @ 8264AF3
BattleFrontier_Lounge5_Text_264AF3:: @ 8264AF3
.string "Hmhm…\p"
.string "This one says it likes to be sneaky!\n"
.string "It says it likes to be sneaky even\l"
.string "if it has a lot of ouchies!$"
BattleFrontier_Lounge5_Text_264B5D: @ 8264B5D
BattleFrontier_Lounge5_Text_264B5D:: @ 8264B5D
.string "Hmhm…\p"
.string "This one says it likes to be sneaky!\n"
.string "But if it gets enough ouchies,\l"
.string "it will worry about itself!$"
BattleFrontier_Lounge5_Text_264BC3: @ 8264BC3
BattleFrontier_Lounge5_Text_264BC3:: @ 8264BC3
.string "Hmhm…\p"
.string "This one says it looks after itself!\n"
.string "It says it worries about itself whether\l"
.string "or not it has a lot of ouchies!$"
BattleFrontier_Lounge5_Text_264C36: @ 8264C36
BattleFrontier_Lounge5_Text_264C36:: @ 8264C36
.string "Hmhm…\p"
.string "This one says it looks after itself!\n"
.string "But if it gets enough ouchies,\l"
.string "it will turn sneaky!$"
BattleFrontier_Lounge5_Text_264C95: @ 8264C95
BattleFrontier_Lounge5_Text_264C95:: @ 8264C95
.string "Hmhm…\p"
.string "This one says it looks after itself!\n"
.string "It says it worries about itself even\l"
.string "if it has a lot of ouchies!$"
BattleFrontier_Lounge5_Text_264D01: @ 8264D01
BattleFrontier_Lounge5_Text_264D01:: @ 8264D01
.string "Hmhm…\p"
.string "This one says it likes to be sneaky!\n"
.string "It says it likes to be sneaky even\l"
.string "if it has a lot of ouchies!$"
BattleFrontier_Lounge5_Text_264D6B: @ 8264D6B
BattleFrontier_Lounge5_Text_264D6B:: @ 8264D6B
.string "Hmhm…\p"
.string "This one says it looks after itself!\n"
.string "It says it worries about itself even\l"
.string "if it has a lot of ouchies!$"
BattleFrontier_Lounge5_Text_264DD7: @ 8264DD7
BattleFrontier_Lounge5_Text_264DD7:: @ 8264DD7
.string "Hmhm…\p"
.string "This one says it looks after itself!\n"
.string "But if it gets enough ouchies,\l"
.string "it will hit back!$"
BattleFrontier_Lounge5_Text_264E33: @ 8264E33
BattleFrontier_Lounge5_Text_264E33:: @ 8264E33
.string "Hmhm…\p"
.string "This one says it likes to battle!\n"
.string "But if it gets enough ouchies,\l"
.string "it will turn sneaky!$"
BattleFrontier_Lounge5_Text_264E8F: @ 8264E8F
BattleFrontier_Lounge5_Text_264E8F:: @ 8264E8F
.string "Hmhm…\p"
.string "This one says it looks after itself!\n"
.string "But if it gets enough ouchies,\l"
.string "it will turn sneaky!$"
BattleFrontier_Lounge5_Text_264EEE: @ 8264EEE
BattleFrontier_Lounge5_Text_264EEE:: @ 8264EEE
.string "That’s silly! An EGG is asleep!\n"
.string "I can’t talk to it!$"
BattleFrontier_Lounge5_Text_264F22: @ 8264F22
BattleFrontier_Lounge5_Text_264F22:: @ 8264F22
.string "How charming!\n"
.string "That little lady claims she can\l"
.string "understand POKéMON!$"
BattleFrontier_Lounge5_Text_264F64: @ 8264F64
BattleFrontier_Lounge5_Text_264F64:: @ 8264F64
.string "I have this feeling that the little girl\n"
.string "is saying something profound.$"
BattleFrontier_Lounge5_Text_264FAB: @ 8264FAB
BattleFrontier_Lounge5_Text_264FAB:: @ 8264FAB
.string "I know something!\p"
.string "That little girl plays at the red house\n"
.string "a lot!$"
data/scripts/maps/BattleFrontier_Lounge7.inc
+20 -20
View File
@@ -380,102 +380,102 @@ BattleFrontier_Lounge7_Text_265D17: @ 8265D17
.string "but feel this…\p"
.string "Time is so cruel…$"
BattleFrontier_Lounge7_Text_265E30: @ 8265E30
BattleFrontier_Lounge7_Text_265E30:: @ 8265E30
.string "Recovers up to\n"
.string "half the user’s\n"
.string "maximum HP.$"
BattleFrontier_Lounge7_Text_265E5B: @ 8265E5B
BattleFrontier_Lounge7_Text_265E5B:: @ 8265E5B
.string "Inflicts damage\n"
.string "identical to the\n"
.string "user’s level.$"
BattleFrontier_Lounge7_Text_265E8A: @ 8265E8A
BattleFrontier_Lounge7_Text_265E8A:: @ 8265E8A
.string "Recovers half the\n"
.string "damage inflicted\n"
.string "on a sleeping foe.$"
BattleFrontier_Lounge7_Text_265EC0: @ 8265EC0
BattleFrontier_Lounge7_Text_265EC0:: @ 8265EC0
.string "A strong punch\n"
.string "thrown with\n"
.string "incredible power.$"
BattleFrontier_Lounge7_Text_265EED: @ 8265EED
BattleFrontier_Lounge7_Text_265EED:: @ 8265EED
.string "An extremely\n"
.string "powerful kick with\n"
.string "intense force.$"
BattleFrontier_Lounge7_Text_265F1C: @ 8265F1C
BattleFrontier_Lounge7_Text_265F1C:: @ 8265F1C
.string "A full-body slam\n"
.string "that may cause\n"
.string "paralysis.$"
BattleFrontier_Lounge7_Text_265F47: @ 8265F47
BattleFrontier_Lounge7_Text_265F47:: @ 8265F47
.string "Large boulders\n"
.string "are hurled. May\n"
.string "cause flinching.$"
BattleFrontier_Lounge7_Text_265F77: @ 8265F77
BattleFrontier_Lounge7_Text_265F77:: @ 8265F77
.string "Retaliates any\n"
.string "physical hit with\n"
.string "double the power.$"
BattleFrontier_Lounge7_Text_265FAA: @ 8265FAA
BattleFrontier_Lounge7_Text_265FAA:: @ 8265FAA
.string "A weak jolt of\n"
.string "electricity that\n"
.string "paralyzes the foe.$"
BattleFrontier_Lounge7_Text_265FDD: @ 8265FDD
BattleFrontier_Lounge7_Text_265FDD:: @ 8265FDD
.string "A fighting dance\n"
.string "that sharply\n"
.string "raises ATTACK.$"
BattleFrontier_Lounge7_Text_26600A: @ 826600A
BattleFrontier_Lounge7_Text_26600A:: @ 826600A
.string "Curls up to con-\n"
.string "ceal weak spots\n"
.string "and raise DEFENSE.$"
BattleFrontier_Lounge7_Text_26603E: @ 826603E
BattleFrontier_Lounge7_Text_26603E:: @ 826603E
.string "A loud attack\n"
.string "that can be used\n"
.string "only while asleep.$"
BattleFrontier_Lounge7_Text_266070: @ 8266070
BattleFrontier_Lounge7_Text_266070:: @ 8266070
.string "Hurls mud in the\n"
.string "foe’s face to re-\n"
.string "duce its accuracy.$"
BattleFrontier_Lounge7_Text_2660A6: @ 82660A6
BattleFrontier_Lounge7_Text_2660A6:: @ 82660A6
.string "Sprays star-\n"
.string "shaped rays\n"
.string "that never miss.$"
BattleFrontier_Lounge7_Text_2660D0: @ 82660D0
BattleFrontier_Lounge7_Text_2660D0:: @ 82660D0
.string "A chilling attack\n"
.string "that lowers the\n"
.string "foe’s SPEED.$"
BattleFrontier_Lounge7_Text_2660FF: @ 82660FF
BattleFrontier_Lounge7_Text_2660FF:: @ 82660FF
.string "Endures any at-\n"
.string "tack for 1 turn,\n"
.string "leaving 1HP.$"
BattleFrontier_Lounge7_Text_26612D: @ 826612D
BattleFrontier_Lounge7_Text_26612D:: @ 826612D
.string "Copies the foe’s\n"
.string "effect(s) and\n"
.string "gives to the user.$"
BattleFrontier_Lounge7_Text_26615F: @ 826615F
BattleFrontier_Lounge7_Text_26615F:: @ 826615F
.string "An icy punch\n"
.string "that may\n"
.string "freeze the foe.$"
BattleFrontier_Lounge7_Text_266185: @ 8266185
BattleFrontier_Lounge7_Text_266185:: @ 8266185
.string "An electrified\n"
.string "punch that may\n"
.string "paralyze the foe.$"
BattleFrontier_Lounge7_Text_2661B5: @ 82661B5
BattleFrontier_Lounge7_Text_2661B5:: @ 82661B5
.string "A fiery punch\n"
.string "that may burn\n"
.string "the foe.$"
data/scripts/maps/BattleFrontier_ReceptionGate.inc
+1 -1
View File
@@ -4,7 +4,7 @@ BattleFrontier_ReceptionGate_MapScripts:: @ 82661DA
.byte 0
BattleFrontier_ReceptionGate_MapScript1_2661E5: @ 82661E5
setflag FLAG_UNLOCK_BATTLE_FRONTIER
setflag FLAG_LANDMARK_BATTLE_FRONTIER
end
BattleFrontier_ReceptionGate_MapScript2_2661E9: @ 82661E9
data/scripts/maps/DesertRuins.inc
+1 -1
View File
@@ -31,7 +31,7 @@ DesertRuins_EventScript_22D993:: @ 822D993
return
DesertRuins_MapScript1_22D9CA: @ 822D9CA
setflag FLAG_0x8B6
setflag FLAG_LANDMARK_DESERT_RUINS
checkflag FLAG_0x1BB
call_if 0, DesertRuins_EventScript_22D9D7
end
data/scripts/maps/DesertUnderpass.inc
+1 -1
View File
@@ -3,7 +3,7 @@ DesertUnderpass_MapScripts:: @ 823AF37
.byte 0
DesertUnderpass_MapScript1_23AF3D: @ 823AF3D
setflag FLAG_0x8DE
setflag FLAG_LANDMARK_DESERT_UNDERPASS
end
DesertUnderpass_EventScript_23AF41:: @ 823AF41
data/scripts/maps/EverGrandeCity_HallOfFame.inc
+2 -2
View File
@@ -53,7 +53,7 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9
setrespawn 1
fadescreenspeed 1, 24
special sub_8137734
special GameClear
waitstate
releaseall
end
@@ -61,7 +61,7 @@ EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9
EverGrandeCity_HallOfFame_EventScript_2298F5:: @ 82298F5
setrespawn 2
fadescreenspeed 1, 24
special sub_8137734
special GameClear
waitstate
releaseall
end
data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc
+1 -1
View File
@@ -5,7 +5,7 @@ EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2
EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD: @ 82295DD
setrespawn 20
setflag FLAG_SYS_POKEMON_LEAGUE_FLY
setflag FLAG_LANDMARK_POKEMON_LEAGUE
checkflag FLAG_0x107
call_if 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED
end
data/scripts/maps/FieryPath.inc
+2 -2
View File
@@ -3,9 +3,9 @@ FieryPath_MapScripts:: @ 8230F24
.byte 0
FieryPath_MapScript1_230F2A: @ 8230F2A
checkflag FLAG_0x8AA
checkflag FLAG_LANDMARK_FIERY_PATH
call_if 0, FieryPath_EventScript_230F37
setflag FLAG_0x8AA
setflag FLAG_LANDMARK_FIERY_PATH
end
FieryPath_EventScript_230F37:: @ 8230F37
data/scripts/maps/IslandCave.inc
+1 -1
View File
@@ -31,7 +31,7 @@ IslandCave_EventScript_238E62:: @ 8238E62
return
IslandCave_MapScript1_238E99: @ 8238E99
setflag FLAG_0x8B5
setflag FLAG_LANDMARK_ISLAND_CAVE
call IslandCave_EventScript_238F45
checkflag FLAG_0x1BC
call_if 0, IslandCave_EventScript_238EAB
data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
+1 -1
View File
@@ -29,7 +29,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_21870F:: @ 821870F
message LilycoveCity_CoveLilyMotel_2F_Text_21881C
waitmessage
call LilycoveCity_CoveLilyMotel_2F_EventScript_27207E
special sub_8137CB4
special Special_ShowDiploma
waitstate
release
end
data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
+2 -2
View File
@@ -26,10 +26,10 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C
applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_2725A8
waitmovement 0
playse SE_PC_ON
special sub_8138EC0
special DoLotteryCornerComputerEffect
special PickLotteryCornerTicket
delay 220
special sub_8138FAC
special EndLotteryCornerComputerEffect
delay 10
applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_27259E
waitmovement 0
data/scripts/maps/LittlerootTown.inc
+3 -3
View File
@@ -246,7 +246,7 @@ LittlerootTown_EventScript_1E8034:: @ 81E8034
end
LittlerootTown_EventScript_1E805D:: @ 81E805D
special sub_8138B10
special GetPlayerBigGuyGirlString
msgbox LittlerootTown_Text_1E8C3A, 4
closemessage
applymovement 1, LittlerootTown_Movement_2725A2
@@ -256,7 +256,7 @@ LittlerootTown_EventScript_1E805D:: @ 81E805D
end
LittlerootTown_EventScript_1E807A:: @ 81E807A
special sub_8138B10
special GetPlayerBigGuyGirlString
msgbox LittlerootTown_Text_1E8CE3, 4
release
end
@@ -364,7 +364,7 @@ LittlerootTown_EventScript_1E811F:: @ 81E811F
waitmovement 0
applymovement 255, LittlerootTown_Movement_2725A4
waitmovement 0
special sub_8138B10
special GetPlayerBigGuyGirlString
msgbox LittlerootTown_Text_1E8C3A, 4
closemessage
applymovement 1, LittlerootTown_Movement_2725A2
data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
+1 -1
View File
@@ -98,7 +98,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A4
applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C
waitmovement 0
special sub_8138B48
special GetRivalSonDaughterString
msgbox LittlerootTown_BrendansHouse_1F_Text_1F8BC5, 4
setflag FLAG_0x057
setvar VAR_0x4082, 2
data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
+2 -2
View File
@@ -256,7 +256,7 @@ gUnknown_081F860D:: @ 81F860D
LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626
setvar VAR_0x8004, 1
special sp0D9_ComputerRelated
special DoPCTurnOnEffect
playse SE_PC_ON
msgbox gUnknown_08272D87, 4
special sub_816AE58
@@ -267,7 +267,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626
LittlerootTown_BrendansHouse_2F_EventScript_1F863F:: @ 81F863F
setvar VAR_0x8004, 1
playse SE_PC_OFF
special sub_8138E20
special DoPCTurnOffEffect
releaseall
end
data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
+3 -3
View File
@@ -98,7 +98,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE
applymovement 255, LittlerootTown_MaysHouse_1F_Movement_2725A8
applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC
waitmovement 0
special sub_8138B48
special GetRivalSonDaughterString
msgbox LittlerootTown_MaysHouse_1F_Text_1F8BC5, 4
setflag FLAG_0x057
setvar VAR_0x408C, 2
@@ -124,7 +124,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89F3:: @ 81F89F3
goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A29
compare VAR_0x408D, 3
goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F
special sub_8138B48
special GetRivalSonDaughterString
msgbox LittlerootTown_BrendansHouse_1F_Text_1F8CA5, 4
release
end
@@ -148,7 +148,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D:: @ 81F8A3D
LittlerootTown_MaysHouse_1F_EventScript_1F8A3D:: @ 81F8A3D
lock
faceplayer
special sub_8138B10
special GetPlayerBigGuyGirlString
msgbox LittlerootTown_BrendansHouse_1F_Text_1F9262, 4
release
end
data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
+2 -2
View File
@@ -317,7 +317,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F956C:: @ 81F956C
LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576
setvar VAR_0x8004, 2
special sp0D9_ComputerRelated
special DoPCTurnOnEffect
playse SE_PC_ON
msgbox gUnknown_08272D87, 4
special sub_816AE58
@@ -328,7 +328,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576
LittlerootTown_MaysHouse_2F_EventScript_1F958F:: @ 81F958F
setvar VAR_0x8004, 2
playse SE_PC_OFF
special sub_8138E20
special DoPCTurnOffEffect
releaseall
end
data/scripts/maps/MauvilleCity_Gym.inc
+8 -8
View File
@@ -49,30 +49,30 @@ MauvilleCity_Gym_EventScript_20DDC4:: @ 820DDC4
MauvilleCity_Gym_EventScript_20DEAF:: @ 820DEAF
setvar VAR_0x8004, 0
special sub_81384F0
special MauvilleGymSpecial1
goto MauvilleCity_Gym_EventScript_20DDBA
end
MauvilleCity_Gym_EventScript_20DEBD:: @ 820DEBD
setvar VAR_0x8004, 1
special sub_81384F0
special MauvilleGymSpecial1
goto MauvilleCity_Gym_EventScript_20DDBA
end
MauvilleCity_Gym_EventScript_20DECB:: @ 820DECB
setvar VAR_0x8004, 2
special sub_81384F0
special MauvilleGymSpecial1
goto MauvilleCity_Gym_EventScript_20DDBA
end
MauvilleCity_Gym_EventScript_20DED9:: @ 820DED9
setvar VAR_0x8004, 3
special sub_81384F0
special MauvilleGymSpecial1
goto MauvilleCity_Gym_EventScript_20DDBA
end
MauvilleCity_Gym_EventScript_20DEE7:: @ 820DEE7
special sub_8138750
special MauvilleGymSpecial3
end
MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB
@@ -102,7 +102,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B
call_if 1, MauvilleCity_Gym_EventScript_271E84
setvar VAR_0x8008, 3
call MauvilleCity_Gym_EventScript_271F43
special sub_8138750
special MauvilleGymSpecial3
special DrawWholeMapView
playse SE_KI_GASYAN
call MauvilleCity_Gym_EventScript_20DFB1
@@ -189,8 +189,8 @@ MauvilleCity_Gym_EventScript_20E068:: @ 820E068
end
MauvilleCity_Gym_EventScript_20E08D:: @ 820E08D
special sub_8138540
special sub_81384F0
special MauvilleGymSpecial2
special MauvilleGymSpecial1
special DrawWholeMapView
playse SE_KI_GASYAN
checkflag FLAG_0x063
data/scripts/maps/MirageTower_1F.inc
+1 -1
View File
@@ -5,6 +5,6 @@ MirageTower_1F_MapScripts:: @ 823AD01
MirageTower_1F_MapScript1_23AD07: @ 823AD07
setflag FLAG_0x8DC
setflag FLAG_0x09D
setflag FLAG_0x078
setflag FLAG_LANDMARK_MIRAGE_TOWER
end
data/scripts/maps/MirageTower_4F.inc
+1 -1
View File
@@ -53,7 +53,7 @@ MirageTower_4F_EventScript_23ADCA:: @ 823ADCA
special sub_81BE994
waitstate
setvar VAR_0x40CB, 1
clearflag FLAG_0x078
clearflag FLAG_LANDMARK_MIRAGE_TOWER
warp ROUTE_111, 255, 19, 59
waitstate
release
data/scripts/maps/MossdeepCity_House1.inc
+1 -1
View File
@@ -6,7 +6,7 @@ MossdeepCity_House1_EventScript_221FD6:: @ 8221FD6
faceplayer
bufferleadmonspeciesname 0
msgbox MossdeepCity_House1_Text_22200F, 4
specialvar VAR_RESULT, sub_81391D0
specialvar VAR_RESULT, GetPokeblockNameByMonNature
compare VAR_RESULT, 0
goto_eq MossdeepCity_House1_EventScript_221FFC
msgbox MossdeepCity_House1_Text_22201D, 4
data/scripts/maps/MossdeepCity_House4.inc
+1 -1
View File
@@ -21,7 +21,7 @@ MossdeepCity_House4_EventScript_222DF7:: @ 8222DF7
special sub_80E8BC8
compare VAR_RESULT, 0
goto_eq MossdeepCity_House4_EventScript_222E14
special sub_8139200
special GetSecretBaseNearbyMapName
msgbox MossdeepCity_House4_Text_222ECC, 4
release
end
data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
+2 -2
View File
@@ -53,7 +53,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8
compare VAR_0x405D, 2
goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223024
dodailyevents
specialvar VAR_RESULT, sub_8138BDC
specialvar VAR_RESULT, GetWeekCount
buffernumberstring 0, VAR_RESULT
compare VAR_RESULT, 0
call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_223012
@@ -75,7 +75,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22301B:: @ 822301B
MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024
dodailyevents
specialvar VAR_RESULT, sub_8138BDC
specialvar VAR_RESULT, GetWeekCount
buffernumberstring 0, VAR_RESULT
compare VAR_RESULT, 0
call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_223051
data/scripts/maps/MtChimney_CableCarStation.inc
+1 -1
View File
@@ -47,7 +47,7 @@ MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C
setvar VAR_0x8004, 1
setvar VAR_0x40A3, 2
incrementgamestat 48
special sub_8138B8C
special CableCarWarp
special sub_814FC9C
waitstate
release
data/scripts/maps/NewMauville_Entrance.inc
+1 -1
View File
@@ -18,7 +18,7 @@ NewMauville_Entrance_EventScript_2372C4:: @ 82372C4
return
NewMauville_Entrance_MapScript1_2372FB: @ 82372FB
setflag FLAG_0x8A0
setflag FLAG_LANDMARK_NEW_MAUVILLE
end
NewMauville_Entrance_EventScript_2372FF:: @ 82372FF

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