diff options
283 files changed, 13690 insertions, 4033 deletions
@@ -84,9 +84,10 @@ tidy: include graphics_file_rules.mk %.s: ; -%.bin: ; %.png: ; %.pal: ; +%.aif: ; + %.1bpp: %.png ; $(GFX) $< $@ %.4bpp: %.png ; $(GFX) $< $@ %.8bpp: %.png ; $(GFX) $< $@ diff --git a/asm/battle_frontier_1.s b/asm/battle_frontier_1.s index f5d4013f6..f6e395065 100755 --- a/asm/battle_frontier_1.s +++ b/asm/battle_frontier_1.s @@ -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: diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s index a63267e48..fc5aaf958 100755 --- a/asm/battle_frontier_2.s +++ b/asm/battle_frontier_2.s @@ -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: diff --git a/asm/battle_transition.s b/asm/battle_transition.s index b7f2746ec..d7f6b9e03 100644 --- a/asm/battle_transition.s +++ b/asm/battle_transition.s @@ -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 diff --git a/asm/birch_pc.s b/asm/birch_pc.s new file mode 100644 index 000000000..6665d9beb --- /dev/null +++ b/asm/birch_pc.s @@ -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 diff --git a/asm/contest.s b/asm/contest.s index e3e4ccf86..5749350c7 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -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 diff --git a/asm/contest_link_80F57C4.s b/asm/contest_link_80F57C4.s index 7f32c880c..55503fde1 100644 --- a/asm/contest_link_80F57C4.s +++ b/asm/contest_link_80F57C4.s @@ -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 diff --git a/asm/rom_81370FC.s b/asm/field_specials.s index 49cf88d33..ec4ce00b5 100644 --- a/asm/rom_81370FC.s +++ b/asm/field_specials.s @@ -5,1388 +5,8 @@ .text - thumb_func_start sub_81370FC -sub_81370FC: @ 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 sub_81370FC - - 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, =gUnknown_085B2A90 - ldr r1, =0x0600c000 - bl LZ77UnCompVram - ldr r0, =gUnknown_085B28B0 - ldr r1, =0x0600f800 - bl LZ77UnCompVram - ldr r0, =gUnknown_085B2850 - 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, =gUnknown_085B2850 - 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, =gUnknown_085B2A90 - ldr r1, =0x0600c000 - bl LZ77UnCompVram - ldr r0, =gUnknown_085B28B0 - 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, =gUnknown_085B2850 - movs r1, 0xE0 - movs r2, 0x20 - bl LoadPalette - ldr r0, =gUnknown_085B2870 - 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, =gUnknown_085B2870 - 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 - - thumb_func_start sub_8137734 -sub_8137734: @ 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 sub_8137734 - - 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 - -@ time_events.o - - thumb_func_start sub_8137890 -sub_8137890: @ 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 sub_8137890 - - thumb_func_start sub_81378BC -sub_81378BC: @ 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 sub_81378BC - - thumb_func_start sub_81378E4 -sub_81378E4: @ 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 sub_81378BC - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81378E4 - - thumb_func_start UpdateMirageRnd -UpdateMirageRnd: @ 8137904 - push {r4,lr} - lsls r0, 16 - lsrs r4, r0, 16 - bl sub_8137890 - 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 sub_81378BC - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end UpdateMirageRnd - - thumb_func_start sub_813793C -sub_813793C: @ 813793C - push {r4-r6,lr} - bl sub_8137890 - 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 sub_813793C - - thumb_func_start sub_8137988 -sub_8137988: @ 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 sub_8137988 - - thumb_func_start sub_81379D8 -sub_81379D8: @ 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 sub_81379D8 - - thumb_func_start sub_81379F8 -sub_81379F8: @ 81379F8 - push {lr} - ldr r0, =sub_81379D8 - movs r1, 0x50 - bl CreateTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_81379F8 - - thumb_func_start sub_8137A0C -sub_8137A0C: @ 8137A0C - push {lr} - ldr r0, =0x00004049 - bl GetVarPointer - movs r1, 0 - strh r1, [r0] - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137A0C - - 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 - -@ birch_pc.o - - thumb_func_start sub_8137A4C -sub_8137A4C: @ 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 sub_8137A4C - - thumb_func_start sub_8137A98 -sub_8137A98: @ 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 sub_8137A98 - - thumb_func_start sub_8137C10 -sub_8137C10: @ 8137C10 - push {lr} - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - bl sub_8137A98 - bl ShowFieldMessage - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137C10 - - thumb_func_start sub_8137C28 -sub_8137C28: @ 8137C28 - push {lr} - ldr r0, =CB2_DoHallOfFamePC - bl SetMainCallback2 - bl ScriptContext2_Enable - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137C28 - - thumb_func_start sub_8137C3C -sub_8137C3C: @ 8137C3C - push {lr} - ldr r0, =c2_exit_to_overworld_2_switch - bl SetMainCallback2 - ldr r1, =gFieldCallback - ldr r0, =mapldr_080CA5C0 - str r0, [r1] - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137C3C - - thumb_func_start mapldr_080CA5C0 -mapldr_080CA5C0: @ 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, =sub_8137C94 - movs r1, 0xA - bl CreateTask - add sp, 0x4 - pop {r0} - bx r0 - .pool - thumb_func_end mapldr_080CA5C0 - - thumb_func_start sub_8137C94 -sub_8137C94: @ 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 sub_8137C94 - - thumb_func_start sub_8137CB4 -sub_8137CB4: @ 8137CB4 + thumb_func_start Special_ShowDiploma +Special_ShowDiploma: @ 8137CB4 push {lr} ldr r0, =CB2_ShowDiploma bl SetMainCallback2 @@ -1394,7 +14,7 @@ sub_8137CB4: @ 8137CB4 pop {r0} bx r0 .pool - thumb_func_end sub_8137CB4 + thumb_func_end Special_ShowDiploma thumb_func_start Special_ViewWallClock Special_ViewWallClock: @ 8137CC8 @@ -1410,8 +30,8 @@ Special_ViewWallClock: @ 8137CC8 .pool thumb_func_end Special_ViewWallClock - thumb_func_start wild_pokemon_reroll -wild_pokemon_reroll: @ 8137CEC + thumb_func_start ResetCyclingRoadChallengeData +ResetCyclingRoadChallengeData: @ 8137CEC ldr r0, =gBikeCyclingChallenge movs r1, 0 strb r1, [r0] @@ -1422,10 +42,10 @@ wild_pokemon_reroll: @ 8137CEC str r0, [r1] bx lr .pool - thumb_func_end wild_pokemon_reroll + thumb_func_end ResetCyclingRoadChallengeData - thumb_func_start sub_8137D0C -sub_8137D0C: @ 8137D0C + thumb_func_start Special_BeginCyclingRoadChallenge +Special_BeginCyclingRoadChallenge: @ 8137D0C ldr r1, =gBikeCyclingChallenge movs r0, 0x1 strb r0, [r1] @@ -1438,10 +58,10 @@ sub_8137D0C: @ 8137D0C str r0, [r1] bx lr .pool - thumb_func_end sub_8137D0C + thumb_func_end Special_BeginCyclingRoadChallenge - thumb_func_start sp0E3_walkrun_bitfield_interpretation -sp0E3_walkrun_bitfield_interpretation: @ 8137D34 + thumb_func_start GetPlayerAvatarBike +GetPlayerAvatarBike: @ 8137D34 push {lr} movs r0, 0x4 bl TestPlayerAvatarFlags @@ -1463,10 +83,10 @@ _08137D56: _08137D58: pop {r1} bx r1 - thumb_func_end sp0E3_walkrun_bitfield_interpretation + thumb_func_end GetPlayerAvatarBike - thumb_func_start sub_8137D5C -sub_8137D5C: @ 8137D5C + thumb_func_start DetermineCyclingRoadResults +DetermineCyclingRoadResults: @ 8137D5C push {r4-r7,lr} adds r7, r0, 0 lsls r1, 24 @@ -1588,10 +208,10 @@ _08137E5C: pop {r0} bx r0 .pool - thumb_func_end sub_8137D5C + thumb_func_end DetermineCyclingRoadResults - thumb_func_start sub_8137E6C -sub_8137E6C: @ 8137E6C + thumb_func_start FinishCyclingRoadChallenge +FinishCyclingRoadChallenge: @ 8137E6C push {r4,r5,lr} ldr r0, =gMain ldr r1, =gUnknown_0203AB58 @@ -1601,18 +221,18 @@ sub_8137E6C: @ 8137E6C ldr r5, =0x0203ab55 ldrb r1, [r5] adds r0, r4, 0 - bl sub_8137D5C + bl DetermineCyclingRoadResults ldrb r1, [r5] adds r0, r4, 0 - bl sub_8137E9C + bl RecordCyclingRoadResults pop {r4,r5} pop {r0} bx r0 .pool - thumb_func_end sub_8137E6C + thumb_func_end FinishCyclingRoadChallenge - thumb_func_start sub_8137E9C -sub_8137E9C: @ 8137E9C + thumb_func_start RecordCyclingRoadResults +RecordCyclingRoadResults: @ 8137E9C push {r4-r7,lr} mov r7, r8 push {r7} @@ -1653,10 +273,10 @@ _08137EE6: pop {r0} bx r0 .pool - thumb_func_end sub_8137E9C + thumb_func_end RecordCyclingRoadResults - thumb_func_start sub_8137EFC -sub_8137EFC: @ 8137EFC + thumb_func_start GetRecordedCyclingRoadResults +GetRecordedCyclingRoadResults: @ 8137EFC push {r4,lr} ldr r0, =0x00004028 bl VarGet @@ -1675,7 +295,7 @@ sub_8137EFC: @ 8137EFC lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl sub_8137D5C + bl DetermineCyclingRoadResults movs r0, 0x1 b _08137F3E .pool @@ -1685,10 +305,10 @@ _08137F3E: pop {r4} pop {r1} bx r1 - thumb_func_end sub_8137EFC + thumb_func_end GetRecordedCyclingRoadResults - thumb_func_start sub_8137F44 -sub_8137F44: @ 8137F44 + thumb_func_start UpdateCyclingRoadState +UpdateCyclingRoadState: @ 8137F44 push {r4,lr} ldr r0, =gUnknown_020322DC ldrh r1, [r0] @@ -1719,10 +339,10 @@ _08137F7C: pop {r0} bx r0 .pool - thumb_func_end sub_8137F44 + thumb_func_end UpdateCyclingRoadState - thumb_func_start sub_8137F90 -sub_8137F90: @ 8137F90 + thumb_func_start SetSSTidalFlag +SetSSTidalFlag: @ 8137F90 push {lr} ldr r0, =0x0000088d bl FlagSet @@ -1733,17 +353,17 @@ sub_8137F90: @ 8137F90 pop {r0} bx r0 .pool - thumb_func_end sub_8137F90 + thumb_func_end SetSSTidalFlag - thumb_func_start sub_8137FB0 -sub_8137FB0: @ 8137FB0 + thumb_func_start ResetSSTidalFlag +ResetSSTidalFlag: @ 8137FB0 push {lr} ldr r0, =0x0000088d bl FlagClear pop {r0} bx r0 .pool - thumb_func_end sub_8137FB0 + thumb_func_end ResetSSTidalFlag thumb_func_start CountSSTidalStep CountSSTidalStep: @ 8137FC0 @@ -2073,8 +693,8 @@ _0813823A: bx r1 thumb_func_end sub_81381F8 - thumb_func_start sub_8138240 -sub_8138240: @ 8138240 + thumb_func_start GetLinkPartnerNames +GetLinkPartnerNames: @ 8138240 push {r4-r7,lr} mov r7, r8 push {r7} @@ -2119,7 +739,7 @@ _0813828A: pop {r1} bx r1 .pool - thumb_func_end sub_8138240 + thumb_func_end GetLinkPartnerNames thumb_func_start SpawnLinkPartnerFieldObject SpawnLinkPartnerFieldObject: @ 81382A0 @@ -2419,8 +1039,8 @@ _081384E6: .pool thumb_func_end sub_813842C - thumb_func_start sub_81384F0 -sub_81384F0: @ 81384F0 + thumb_func_start MauvilleGymSpecial1 +MauvilleGymSpecial1: @ 81384F0 push {r4,r5,lr} movs r4, 0 ldr r5, =gUnknown_085B2B68 @@ -2454,10 +1074,10 @@ _0813852A: pop {r0} bx r0 .pool - thumb_func_end sub_81384F0 + thumb_func_end MauvilleGymSpecial1 - thumb_func_start sub_8138540 -sub_8138540: @ 8138540 + thumb_func_start MauvilleGymSpecial2 +MauvilleGymSpecial2: @ 8138540 push {r4-r6,lr} movs r5, 0xC _08138544: @@ -2668,10 +1288,10 @@ _08138744: pop {r0} bx r0 .pool - thumb_func_end sub_8138540 + thumb_func_end MauvilleGymSpecial2 - thumb_func_start sub_8138750 -sub_8138750: @ 8138750 + thumb_func_start MauvilleGymSpecial3 +MauvilleGymSpecial3: @ 8138750 push {r4-r6,lr} ldr r4, =gUnknown_085B2B68 movs r5, 0x3 @@ -2823,10 +1443,10 @@ _081388DA: pop {r0} bx r0 .pool - thumb_func_end sub_8138750 + thumb_func_end MauvilleGymSpecial3 - thumb_func_start sub_81388E4 -sub_81388E4: @ 81388E4 + thumb_func_start PetalburgGymSpecial1 +PetalburgGymSpecial1: @ 81388E4 push {lr} ldr r0, =gUnknown_0203AB5C movs r1, 0 @@ -2835,16 +1455,16 @@ sub_81388E4: @ 81388E4 strb r1, [r0] movs r0, 0x2C bl PlaySE - ldr r0, =sub_8138910 + ldr r0, =Task_PetalburgGym movs r1, 0x8 bl CreateTask pop {r0} bx r0 .pool - thumb_func_end sub_81388E4 + thumb_func_end PetalburgGymSpecial1 - thumb_func_start sub_8138910 -sub_8138910: @ 8138910 + thumb_func_start Task_PetalburgGym +Task_PetalburgGym: @ 8138910 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 @@ -2863,7 +1483,7 @@ sub_8138910: @ 8138910 lsls r1, 1 adds r1, r2 ldrh r1, [r1] - bl sub_8138978 + bl PetalburgGymFunc movs r0, 0 strb r0, [r4] ldrb r0, [r5] @@ -2885,10 +1505,10 @@ _08138970: pop {r4-r6} pop {r0} bx r0 - thumb_func_end sub_8138910 + thumb_func_end Task_PetalburgGym - thumb_func_start sub_8138978 -sub_8138978: @ 8138978 + thumb_func_start PetalburgGymFunc +PetalburgGymFunc: @ 8138978 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -3042,33 +1662,33 @@ _08138A92: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_8138978 + thumb_func_end PetalburgGymFunc - thumb_func_start sub_8138AA4 -sub_8138AA4: @ 8138AA4 + thumb_func_start PetalburgGymSpecial2 +PetalburgGymSpecial2: @ 8138AA4 push {lr} ldr r0, =gSpecialVar_0x8004 ldrb r0, [r0] ldr r1, =gUnknown_085B2B7E ldrh r1, [r1, 0x8] - bl sub_8138978 + bl PetalburgGymFunc pop {r0} bx r0 .pool - thumb_func_end sub_8138AA4 + thumb_func_end PetalburgGymSpecial2 - thumb_func_start sub_8138AC0 -sub_8138AC0: @ 8138AC0 + thumb_func_start ShowFieldMessageStringVar4 +ShowFieldMessageStringVar4: @ 8138AC0 push {lr} ldr r0, =gStringVar4 bl ShowFieldMessage pop {r0} bx r0 .pool - thumb_func_end sub_8138AC0 + thumb_func_end ShowFieldMessageStringVar4 - thumb_func_start sub_8138AD0 -sub_8138AD0: @ 8138AD0 + thumb_func_start StorePlayerCoordsInVars +StorePlayerCoordsInVars: @ 8138AD0 ldr r1, =gSpecialVar_0x8004 ldr r0, =gSaveBlock1Ptr ldr r2, [r0] @@ -3079,10 +1699,10 @@ sub_8138AD0: @ 8138AD0 strh r0, [r1] bx lr .pool - thumb_func_end sub_8138AD0 + thumb_func_end StorePlayerCoordsInVars - thumb_func_start sub_8138AF0 -sub_8138AF0: @ 8138AF0 + thumb_func_start GetPlayerTrainerIdOnesDigit +GetPlayerTrainerIdOnesDigit: @ 8138AF0 push {lr} ldr r0, =gSaveBlock2Ptr ldr r0, [r0] @@ -3097,10 +1717,10 @@ sub_8138AF0: @ 8138AF0 pop {r1} bx r1 .pool - thumb_func_end sub_8138AF0 + thumb_func_end GetPlayerTrainerIdOnesDigit - thumb_func_start sub_8138B10 -sub_8138B10: @ 8138B10 + thumb_func_start GetPlayerBigGuyGirlString +GetPlayerBigGuyGirlString: @ 8138B10 push {lr} ldr r0, =gSaveBlock2Ptr ldr r0, [r0] @@ -3120,10 +1740,10 @@ _08138B3C: pop {r0} bx r0 .pool - thumb_func_end sub_8138B10 + thumb_func_end GetPlayerBigGuyGirlString - thumb_func_start sub_8138B48 -sub_8138B48: @ 8138B48 + thumb_func_start GetRivalSonDaughterString +GetRivalSonDaughterString: @ 8138B48 push {lr} ldr r0, =gSaveBlock2Ptr ldr r0, [r0] @@ -3143,7 +1763,7 @@ _08138B74: pop {r0} bx r0 .pool - thumb_func_end sub_8138B48 + thumb_func_end GetRivalSonDaughterString thumb_func_start sub_8138B80 sub_8138B80: @ 8138B80 @@ -3153,8 +1773,8 @@ sub_8138B80: @ 8138B80 .pool thumb_func_end sub_8138B80 - thumb_func_start sub_8138B8C -sub_8138B8C: @ 8138B8C + thumb_func_start CableCarWarp +CableCarWarp: @ 8138B8C push {lr} sub sp, 0x4 ldr r0, =gSpecialVar_0x8004 @@ -3184,10 +1804,10 @@ _08138BC2: add sp, 0x4 pop {r0} bx r0 - thumb_func_end sub_8138B8C + thumb_func_end CableCarWarp - thumb_func_start sub_8138BC8 -sub_8138BC8: @ 8138BC8 + thumb_func_start SetFlagInVar +SetFlagInVar: @ 8138BC8 push {lr} ldr r0, =gSpecialVar_0x8004 ldrh r0, [r0] @@ -3195,10 +1815,10 @@ sub_8138BC8: @ 8138BC8 pop {r0} bx r0 .pool - thumb_func_end sub_8138BC8 + thumb_func_end SetFlagInVar - thumb_func_start sub_8138BDC -sub_8138BDC: @ 8138BDC + thumb_func_start GetWeekCount +GetWeekCount: @ 8138BDC push {lr} ldr r0, =gLocalTime movs r1, 0 @@ -3215,10 +1835,10 @@ _08138BF6: pop {r1} bx r1 .pool - thumb_func_end sub_8138BDC + thumb_func_end GetWeekCount - thumb_func_start sub_8138C04 -sub_8138C04: @ 8138C04 + thumb_func_start GetLeadMonFriendshipScore +GetLeadMonFriendshipScore: @ 8138C04 push {r4,lr} bl GetLeadMonIndex lsls r0, 24 @@ -3281,32 +1901,32 @@ _08138C7E: pop {r4} pop {r1} bx r1 - thumb_func_end sub_8138C04 + thumb_func_end GetLeadMonFriendshipScore - thumb_func_start sub_8138C84 -sub_8138C84: @ 8138C84 + thumb_func_start CB2_FieldShowRegionMap +CB2_FieldShowRegionMap: @ 8138C84 push {lr} ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl sub_817018C pop {r0} bx r0 .pool - thumb_func_end sub_8138C84 + thumb_func_end CB2_FieldShowRegionMap - thumb_func_start sub_8138C94 -sub_8138C94: @ 8138C94 + thumb_func_start FieldShowRegionMap +FieldShowRegionMap: @ 8138C94 push {lr} - ldr r0, =sub_8138C84 + ldr r0, =CB2_FieldShowRegionMap bl SetMainCallback2 pop {r0} bx r0 .pool - thumb_func_end sub_8138C94 + thumb_func_end FieldShowRegionMap - thumb_func_start sp0D9_ComputerRelated -sp0D9_ComputerRelated: @ 8138CA4 + thumb_func_start DoPCTurnOnEffect +DoPCTurnOnEffect: @ 8138CA4 push {r4,lr} - ldr r4, =sub_8138CE8 + ldr r4, =Task_PCTurnOnEffect adds r0, r4, 0 bl FuncIsActiveTask lsls r0, 24 @@ -3334,10 +1954,10 @@ _08138CD8: pop {r0} bx r0 .pool - thumb_func_end sp0D9_ComputerRelated + thumb_func_end DoPCTurnOnEffect - thumb_func_start sub_8138CE8 -sub_8138CE8: @ 8138CE8 + thumb_func_start Task_PCTurnOnEffect +Task_PCTurnOnEffect: @ 8138CE8 push {lr} lsls r0, 24 lsrs r0, 24 @@ -3351,15 +1971,15 @@ sub_8138CE8: @ 8138CE8 cmp r0, 0 bne _08138D06 adds r0, r1, 0 - bl sub_8138D10 + bl PCTurnOnEffect_0 _08138D06: pop {r0} bx r0 .pool - thumb_func_end sub_8138CE8 + thumb_func_end Task_PCTurnOnEffect - thumb_func_start sub_8138D10 -sub_8138D10: @ 8138D10 + thumb_func_start PCTurnOnEffect_0 +PCTurnOnEffect_0: @ 8138D10 push {r4-r6,lr} adds r4, r0, 0 movs r6, 0 @@ -3401,7 +2021,7 @@ _08138D4C: asrs r1, 24 lsls r2, r5, 24 asrs r2, 24 - bl sub_8138D88 + bl PCTurnOnEffect_1 bl DrawWholeMapView ldrh r0, [r4, 0x10] movs r1, 0x1 @@ -3423,10 +2043,10 @@ _08138D7C: pop {r4-r6} pop {r0} bx r0 - thumb_func_end sub_8138D10 + thumb_func_end PCTurnOnEffect_0 - thumb_func_start sub_8138D88 -sub_8138D88: @ 8138D88 + thumb_func_start PCTurnOnEffect_1 +PCTurnOnEffect_1: @ 8138D88 push {r4,r5,lr} lsls r1, 24 lsrs r1, 24 @@ -3498,18 +2118,18 @@ _08138DE6: pop {r0} bx r0 .pool - thumb_func_end sub_8138D88 + thumb_func_end PCTurnOnEffect_1 - thumb_func_start sub_8138E20 -sub_8138E20: @ 8138E20 + thumb_func_start DoPCTurnOffEffect +DoPCTurnOffEffect: @ 8138E20 push {lr} - bl sub_8138E2C + bl PCTurnOffEffect pop {r0} bx r0 - thumb_func_end sub_8138E20 + thumb_func_end DoPCTurnOffEffect - thumb_func_start sub_8138E2C -sub_8138E2C: @ 8138E2C + thumb_func_start PCTurnOffEffect +PCTurnOffEffect: @ 8138E2C push {r4-r6,lr} movs r6, 0 movs r5, 0 @@ -3583,12 +2203,12 @@ _08138E82: pop {r0} bx r0 .pool - thumb_func_end sub_8138E2C + thumb_func_end PCTurnOffEffect - thumb_func_start sub_8138EC0 -sub_8138EC0: @ 8138EC0 + thumb_func_start DoLotteryCornerComputerEffect +DoLotteryCornerComputerEffect: @ 8138EC0 push {r4,lr} - ldr r4, =sub_8138F04 + ldr r4, =Task_LotteryCornerComputerEffect adds r0, r4, 0 bl FuncIsActiveTask lsls r0, 24 @@ -3616,10 +2236,10 @@ _08138EF4: pop {r0} bx r0 .pool - thumb_func_end sub_8138EC0 + thumb_func_end DoLotteryCornerComputerEffect - thumb_func_start sub_8138F04 -sub_8138F04: @ 8138F04 + thumb_func_start Task_LotteryCornerComputerEffect +Task_LotteryCornerComputerEffect: @ 8138F04 push {lr} lsls r0, 24 lsrs r0, 24 @@ -3633,15 +2253,15 @@ sub_8138F04: @ 8138F04 cmp r0, 0 bne _08138F22 adds r0, r1, 0 - bl sub_8138F2C + bl LotteryCornerComputerEffect _08138F22: pop {r0} bx r0 .pool - thumb_func_end sub_8138F04 + thumb_func_end Task_LotteryCornerComputerEffect - thumb_func_start sub_8138F2C -sub_8138F2C: @ 8138F2C + thumb_func_start LotteryCornerComputerEffect +LotteryCornerComputerEffect: @ 8138F2C push {r4,lr} adds r4, r0, 0 movs r1, 0xE @@ -3697,10 +2317,10 @@ _08138F9A: pop {r0} bx r0 .pool - thumb_func_end sub_8138F2C + thumb_func_end LotteryCornerComputerEffect - thumb_func_start sub_8138FAC -sub_8138FAC: @ 8138FAC + thumb_func_start EndLotteryCornerComputerEffect +EndLotteryCornerComputerEffect: @ 8138FAC push {lr} ldr r2, =0x00000e9d movs r0, 0x12 @@ -3714,10 +2334,10 @@ sub_8138FAC: @ 8138FAC pop {r0} bx r0 .pool - thumb_func_end sub_8138FAC + thumb_func_end EndLotteryCornerComputerEffect - thumb_func_start sub_8138FD4 -sub_8138FD4: @ 8138FD4 + thumb_func_start SetTrickHouseEndRoomFlag +SetTrickHouseEndRoomFlag: @ 8138FD4 push {lr} ldr r1, =gSpecialVar_0x8004 ldr r0, =0x000001f5 @@ -3726,10 +2346,10 @@ sub_8138FD4: @ 8138FD4 pop {r0} bx r0 .pool - thumb_func_end sub_8138FD4 + thumb_func_end SetTrickHouseEndRoomFlag - thumb_func_start sub_8138FEC -sub_8138FEC: @ 8138FEC + thumb_func_start ResetTrickHouseEndRoomFlag +ResetTrickHouseEndRoomFlag: @ 8138FEC push {lr} ldr r1, =gSpecialVar_0x8004 ldr r0, =0x000001f5 @@ -3738,10 +2358,10 @@ sub_8138FEC: @ 8138FEC pop {r0} bx r0 .pool - thumb_func_end sub_8138FEC + thumb_func_end ResetTrickHouseEndRoomFlag - thumb_func_start sub_8139004 -sub_8139004: @ 8139004 + thumb_func_start CheckLeadMonCool +CheckLeadMonCool: @ 8139004 push {lr} bl GetLeadMonIndex lsls r0, 24 @@ -3762,10 +2382,10 @@ _08139028: _0813902A: pop {r1} bx r1 - thumb_func_end sub_8139004 + thumb_func_end CheckLeadMonCool - thumb_func_start sub_8139030 -sub_8139030: @ 8139030 + thumb_func_start CheckLeadMonBeauty +CheckLeadMonBeauty: @ 8139030 push {lr} bl GetLeadMonIndex lsls r0, 24 @@ -3786,10 +2406,10 @@ _08139054: _08139056: pop {r1} bx r1 - thumb_func_end sub_8139030 + thumb_func_end CheckLeadMonBeauty - thumb_func_start sub_813905C -sub_813905C: @ 813905C + thumb_func_start CheckLeadMonCute +CheckLeadMonCute: @ 813905C push {lr} bl GetLeadMonIndex lsls r0, 24 @@ -3810,10 +2430,10 @@ _08139080: _08139082: pop {r1} bx r1 - thumb_func_end sub_813905C + thumb_func_end CheckLeadMonCute - thumb_func_start sub_8139088 -sub_8139088: @ 8139088 + thumb_func_start CheckLeadMonSmart +CheckLeadMonSmart: @ 8139088 push {lr} bl GetLeadMonIndex lsls r0, 24 @@ -3834,10 +2454,10 @@ _081390AC: _081390AE: pop {r1} bx r1 - thumb_func_end sub_8139088 + thumb_func_end CheckLeadMonSmart - thumb_func_start sub_81390B4 -sub_81390B4: @ 81390B4 + thumb_func_start CheckLeadMonTough +CheckLeadMonTough: @ 81390B4 push {lr} bl GetLeadMonIndex lsls r0, 24 @@ -3858,10 +2478,10 @@ _081390D8: _081390DA: pop {r1} bx r1 - thumb_func_end sub_81390B4 + thumb_func_end CheckLeadMonTough - thumb_func_start sub_81390E0 -sub_81390E0: @ 81390E0 + thumb_func_start IsGrassTypeInParty +IsGrassTypeInParty: @ 81390E0 push {r4-r6,lr} movs r5, 0 ldr r6, =gBaseStats @@ -3915,7 +2535,7 @@ _0813914A: pop {r0} bx r0 .pool - thumb_func_end sub_81390E0 + thumb_func_end IsGrassTypeInParty thumb_func_start SpawnScriptFieldObject SpawnScriptFieldObject: @ 8139158 @@ -3975,8 +2595,8 @@ RemoveScriptFieldObject: @ 81391AC .pool thumb_func_end RemoveScriptFieldObject - thumb_func_start sub_81391D0 -sub_81391D0: @ 81391D0 + thumb_func_start GetPokeblockNameByMonNature +GetPokeblockNameByMonNature: @ 81391D0 push {lr} bl GetLeadMonIndex lsls r0, 24 @@ -3995,10 +2615,10 @@ sub_81391D0: @ 81391D0 pop {r1} bx r1 .pool - thumb_func_end sub_81391D0 + thumb_func_end GetPokeblockNameByMonNature - thumb_func_start sub_8139200 -sub_8139200: @ 8139200 + thumb_func_start GetSecretBaseNearbyMapName +GetSecretBaseNearbyMapName: @ 8139200 push {r4,lr} ldr r4, =gStringVar1 ldr r0, =0x00004026 @@ -4013,7 +2633,7 @@ sub_8139200: @ 8139200 pop {r0} bx r0 .pool - thumb_func_end sub_8139200 + thumb_func_end GetSecretBaseNearbyMapName thumb_func_start sub_8139228 sub_8139228: @ 8139228 @@ -4159,8 +2779,8 @@ _08139342: bx r1 thumb_func_end sub_8139320 - thumb_func_start sub_8139348 -sub_8139348: @ 8139348 + thumb_func_start LeadMonHasEffortRibbon +LeadMonHasEffortRibbon: @ 8139348 push {lr} bl GetLeadMonIndex lsls r0, 24 @@ -4177,10 +2797,10 @@ sub_8139348: @ 8139348 pop {r1} bx r1 .pool - thumb_func_end sub_8139348 + thumb_func_end LeadMonHasEffortRibbon - thumb_func_start sub_8139370 -sub_8139370: @ 8139370 + thumb_func_start GiveLeadMonEffortRibbon +GiveLeadMonEffortRibbon: @ 8139370 push {r4,lr} sub sp, 0x4 movs r0, 0x2A @@ -4216,10 +2836,10 @@ _081393B6: pop {r0} bx r0 .pool - thumb_func_end sub_8139370 + thumb_func_end GiveLeadMonEffortRibbon - thumb_func_start sub_81393C8 -sub_81393C8: @ 81393C8 + thumb_func_start Special_AreLeadMonEVsMaxedOut +Special_AreLeadMonEVsMaxedOut: @ 81393C8 push {lr} bl GetLeadMonIndex lsls r0, 24 @@ -4241,7 +2861,7 @@ _081393F4: _081393F6: pop {r1} bx r1 - thumb_func_end sub_81393C8 + thumb_func_end Special_AreLeadMonEVsMaxedOut thumb_func_start sub_81393FC sub_81393FC: @ 81393FC @@ -4298,8 +2918,8 @@ SetShoalItemFlag: @ 813945C .pool thumb_func_end SetShoalItemFlag - thumb_func_start sub_813946C -sub_813946C: @ 813946C + thumb_func_start PutZigzagoonInPlayerParty +PutZigzagoonInPlayerParty: @ 813946C push {r4,r5,lr} sub sp, 0x14 ldr r5, =gPlayerParty @@ -4347,10 +2967,10 @@ sub_813946C: @ 813946C pop {r0} bx r0 .pool - thumb_func_end sub_813946C + thumb_func_end PutZigzagoonInPlayerParty - thumb_func_start sub_81394D8 -sub_81394D8: @ 81394D8 + thumb_func_start IsStarterInParty +IsStarterInParty: @ 81394D8 push {r4-r6,lr} ldr r0, =0x00004023 bl VarGet @@ -4390,20 +3010,20 @@ _08139528: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_81394D8 + thumb_func_end IsStarterInParty - thumb_func_start sub_8139530 -sub_8139530: @ 8139530 + thumb_func_start ScriptCheckFreePokemonStorageSpace +ScriptCheckFreePokemonStorageSpace: @ 8139530 push {lr} - bl sub_80D2218 + bl CheckFreePokemonStorageSpace lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 - thumb_func_end sub_8139530 + thumb_func_end ScriptCheckFreePokemonStorageSpace - thumb_func_start sub_8139540 -sub_8139540: @ 8139540 + thumb_func_start IsPokerusInParty +IsPokerusInParty: @ 8139540 push {lr} ldr r0, =gPlayerParty movs r1, 0x3F @@ -4419,7 +3039,7 @@ _08139558: _0813955A: pop {r1} bx r1 - thumb_func_end sub_8139540 + thumb_func_end IsPokerusInParty thumb_func_start sub_8139560 sub_8139560: @ 8139560 @@ -4529,8 +3149,8 @@ sub_8139634: @ 8139634 bx r1 thumb_func_end sub_8139634 - thumb_func_start sub_8139648 -sub_8139648: @ 8139648 + thumb_func_start SetRoute119Weather +SetRoute119Weather: @ 8139648 push {lr} bl get_map_light_from_warp0 lsls r0, 24 @@ -4545,10 +3165,10 @@ sub_8139648: @ 8139648 _08139664: pop {r0} bx r0 - thumb_func_end sub_8139648 + thumb_func_end SetRoute119Weather - thumb_func_start sub_8139668 -sub_8139668: @ 8139668 + thumb_func_start SetRoute123Weather +SetRoute123Weather: @ 8139668 push {lr} bl get_map_light_from_warp0 lsls r0, 24 @@ -4563,7 +3183,7 @@ sub_8139668: @ 8139668 _08139684: pop {r0} bx r0 - thumb_func_end sub_8139668 + thumb_func_end SetRoute123Weather thumb_func_start GetLeadMonIndex GetLeadMonIndex: @ 8139688 @@ -4611,8 +3231,8 @@ _081396D8: bx r1 thumb_func_end GetLeadMonIndex - thumb_func_start sub_81396E0 -sub_81396E0: @ 81396E0 + thumb_func_start ScriptGetPartyMonSpecies +ScriptGetPartyMonSpecies: @ 81396E0 push {lr} ldr r0, =gSpecialVar_0x8004 ldrh r1, [r0] @@ -4628,7 +3248,7 @@ sub_81396E0: @ 81396E0 pop {r1} bx r1 .pool - thumb_func_end sub_81396E0 + thumb_func_end ScriptGetPartyMonSpecies thumb_func_start nullsub_54 nullsub_54: @ 8139708 @@ -5214,7 +3834,7 @@ sub_8139B60: @ 8139B60 movs r1, 0x1 adds r2, r4, 0 bl PrintTextOnWindow - ldr r6, =gUnknown_085B2BB4 + ldr r6, =gElevatorFloorsTable ldr r4, =gSpecialVar_0x8005 ldrh r0, [r4] lsls r0, 2 diff --git a/asm/fldeff_flash.s b/asm/fldeff_flash.s new file mode 100644 index 000000000..9cc3a59a5 --- /dev/null +++ b/asm/fldeff_flash.s @@ -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 diff --git a/asm/hof_pc.s b/asm/hof_pc.s new file mode 100644 index 000000000..29ca9204f --- /dev/null +++ b/asm/hof_pc.s @@ -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 diff --git a/asm/landmark.s b/asm/landmark.s deleted file mode 100644 index 12bb39885..000000000 --- a/asm/landmark.s +++ /dev/null @@ -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. diff --git a/asm/macros.inc b/asm/macros.inc index 0c6644002..ee58cc14e 100644 --- a/asm/macros.inc +++ b/asm/macros.inc @@ -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 diff --git a/asm/overworld.s b/asm/overworld.s index 6749cb8fd..5de62b896 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -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 diff --git a/asm/pokedex_area_screen.s b/asm/pokedex_area_screen.s index 9bf70a379..a222c43f9 100644 --- a/asm/pokedex_area_screen.s +++ b/asm/pokedex_area_screen.s @@ -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 diff --git a/asm/pokedex_cry_screen.s b/asm/pokedex_cry_screen.s index f6d5ec271..e8b8ad5e6 100644 --- a/asm/pokedex_cry_screen.s +++ b/asm/pokedex_cry_screen.s @@ -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] diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 45d56160a..162f4b4e2 100755 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -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 diff --git a/asm/pokenav.s b/asm/pokenav.s index de7b93c5f..a01117868 100755 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -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 diff --git a/asm/post_battle_event_funcs.s b/asm/post_battle_event_funcs.s new file mode 100644 index 000000000..da84a6565 --- /dev/null +++ b/asm/post_battle_event_funcs.s @@ -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 diff --git a/asm/roulette.s b/asm/roulette.s index 85d857f39..74a4d455b 100644 --- a/asm/roulette.s +++ b/asm/roulette.s @@ -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] diff --git a/asm/time_events.s b/asm/time_events.s new file mode 100644 index 000000000..de2d2d165 --- /dev/null +++ b/asm/time_events.s @@ -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 diff --git a/asm/trainer_card.s b/asm/trainer_card.s index e5d21adb8..3c1b46dcc 100644 --- a/asm/trainer_card.s +++ b/asm/trainer_card.s @@ -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 diff --git a/constants/species_constants.inc b/constants/species_constants.inc index 7ee94df61..64f1e19f7 100644 --- a/constants/species_constants.inc +++ b/constants/species_constants.inc @@ -384,3 +384,4 @@ .set SPECIES_JIRACHI, 0x199 .set SPECIES_DEOXYS, 0x19a .set SPECIES_CHIMECHO, 0x19b + .set SPECIES_EGG, 0x19c diff --git a/data/battle_anim_80A9C70.s b/data/battle_anim_80A9C70.s index 1b27b1044..c3768b355 100644 --- a/data/battle_anim_80A9C70.s +++ b/data/battle_anim_80A9C70.s @@ -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 diff --git a/data/battle_anim_815A0D4.s b/data/battle_anim_815A0D4.s index d89a83daf..f8ebc0971 100644 --- a/data/battle_anim_815A0D4.s +++ b/data/battle_anim_815A0D4.s @@ -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 diff --git a/data/battle_frontier_1.s b/data/battle_frontier_1.s index a32f3151b..de0d0cb46 100644 --- a/data/battle_frontier_1.s +++ b/data/battle_frontier_1.s @@ -5,12 +5,207 @@ .section .rodata - .align 2, 0 gUnknown_0860B358:: @ 860B358 - .incbin "baserom.gba", 0x60b358, 0x1630 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00 + .byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01 gUnknown_0860C988:: @ 860C988 - .incbin "baserom.gba", 0x60c988, 0x269 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 + .byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00 + .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x04, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfd, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfd, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00 gUnknown_0860CBF1:: @ 860CBF1 .byte 0x07, 0x01, 0x08, 0x10, 0x07, 0x01, 0x08, 0x10, 0x07, 0x01, 0x08, 0x10, 0x07, 0x01, 0x08, 0x10, 0x07, 0x01, 0x08, 0x10, 0x00, 0x02, 0x09, 0x10, 0x00, 0x02, 0x09, 0x10, 0x00, 0x02, 0x09, 0x10 @@ -35,18 +230,22 @@ gUnknown_0860CBF1:: @ 860CBF1 .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1c, 0x1d, 0xff, 0xff, 0x1c, 0x1d, 0x0f, 0x08, 0x08, 0x00, 0x0f, 0x08, 0x08, 0x00, 0x0f, 0x08, 0x08, 0x00, 0x0f, 0x08, 0x08, 0x00, 0x0f, 0x08, 0x08, 0x00 .byte 0x00, 0x00, 0x00 + .align 2 gUnknown_0860CE74:: @ 860CE74 - .incbin "baserom.gba", 0x60ce74, 0x10 + .4byte 0x000001c0, 0x000011d5, 0x000021ea, 0x000021fb + .align 2 gUnknown_0860CE84:: @ 860CE84 - .incbin "baserom.gba", 0x60ce84, 0x10 + .4byte 0x00000740, 0x00000785, 0x000017ca, 0x0000107b + .align 2 gUnknown_0860CE94:: @ 860CE94 window_template 0x00, 0x00, 0x03, 0x08, 0x10, 0x0f, 0x0010 window_template 0x00, 0x16, 0x03, 0x08, 0x10, 0x0f, 0x0090 window_template 0x00, 0x08, 0x01, 0x0e, 0x02, 0x0f, 0x0110 window_template_terminator + .align 2 gUnknown_0860CEB4:: @ 860CEB4 window_template 0x00, 0x02, 0x02, 0x1a, 0x02, 0x0f, 0x0001 window_template 0x00, 0x10, 0x05, 0x08, 0x02, 0x0f, 0x0035 @@ -67,30 +266,126 @@ gUnknown_0860CEB4:: @ 860CEB4 window_template 0x01, 0x14, 0x05, 0x08, 0x02, 0x0f, 0x0164 window_template 0x01, 0x02, 0x10, 0x1a, 0x02, 0x0f, 0x0174 + .align 2 gUnknown_0860CF44:: @ 860CF44 - .incbin "baserom.gba", 0x60cf44, 0xc + .4byte 0x0400000e, 0xa2600001, 0x00000001 + .align 2 gUnknown_0860CF50:: @ 860CF50 - .incbin "baserom.gba", 0x60cf50, 0x58 + obj_tiles gUnknown_08D85058, 0x0600, 0x0000 + null_obj_tiles + .align 2 +gUnknown_0860CF60:: @ 860CF60 + obj_pal gUnknown_08D85444, 0x0000 + null_obj_pal + + .align 2 +gUnknown_0860CF70:: @ 860CF70 + .byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_0860CF78:: @ 860CF78 + .byte 0x00, 0x40, 0x00, 0x80, 0x00, 0x10, 0x00, 0x00 + + .align 2 +gUnknown_0860CF80:: @ 860CF80 + .byte 0x00, 0x40, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00 + + .align 2 +gUnknown_0860CF88:: @ 860CF88 + .byte 0x00, 0x80, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00 + + .align 2 +gUnknown_0860CF90:: @ 860CF90 + .2byte 0x0014, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_0860CF98:: @ 860CF98 + .2byte 0x0018, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_0860CFA0:: @ 860CFA0 + .4byte gUnknown_0860CF90 + .4byte gUnknown_0860CF98 + + .align 2 gUnknown_0860CFA8:: @ 860CFA8 - .incbin "baserom.gba", 0x60cfa8, 0x30 + spr_template 0x0000, 0xffff, gUnknown_0860CF70, gUnknown_0860CFA0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gUnknown_0860CFC0:: @ 860CFC0 + .2byte 0x0008, 0x0001, 0xffff, 0x0000 + .align 2 +gUnknown_0860CFC8:: @ 860CFC8 + .2byte 0x0000, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_0860CFD0:: @ 860CFD0 + .4byte gUnknown_0860CFC0 + .4byte gUnknown_0860CFC8 + + .align 2 gUnknown_0860CFD8:: @ 860CFD8 - .incbin "baserom.gba", 0x60cfd8, 0x30 + spr_template 0x0000, 0xffff, gUnknown_0860CF78, gUnknown_0860CFD0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gUnknown_0860CFF0:: @ 860CFF0 + .2byte 0x0028, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_0860CFF8:: @ 860CFF8 + .2byte 0x0020, 0x0001, 0xffff, 0x0000 + .align 2 +gUnknown_0860D000:: @ 860D000 + .4byte gUnknown_0860CFF0 + .4byte gUnknown_0860CFF8 + + .align 2 gUnknown_0860D008:: @ 860D008 - .incbin "baserom.gba", 0x60d008, 0x48 + spr_template 0x0000, 0xffff, gUnknown_0860CF78, gUnknown_0860D000, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gUnknown_0860D020:: @ 860D020 + .2byte 0x0012, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_0860D028:: @ 860D028 + .2byte 0x0012, 0x0081, 0xffff, 0x0000 + + .align 2 +gUnknown_0860D030:: @ 860D030 + .2byte 0x0010, 0x0041, 0xffff, 0x0000 + .align 2 +gUnknown_0860D038:: @ 860D038 + .2byte 0x0010, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_0860D040:: @ 860D040 + .4byte gUnknown_0860D020 + .4byte gUnknown_0860D028 + + .align 2 +gUnknown_0860D048:: @ 860D048 + .4byte gUnknown_0860D030 + .4byte gUnknown_0860D038 + + .align 2 gUnknown_0860D050:: @ 860D050 - .incbin "baserom.gba", 0x60d050, 0x18 + spr_template 0x0000, 0xffff, gUnknown_0860CF88, gUnknown_0860D048, NULL, gDummySpriteAffineAnimTable, sub_8190B40 + .align 2 gUnknown_0860D068:: @ 860D068 - .incbin "baserom.gba", 0x60d068, 0x18 + spr_template 0x0000, 0xffff, gUnknown_0860CF80, gUnknown_0860D040, NULL, gDummySpriteAffineAnimTable, sub_8190C6C + .align 2 gUnknown_0860D080:: @ 860D080 .byte 0x00, 0x08, 0x0c, 0x04, 0x07, 0x0f, 0x0b, 0x03, 0x02, 0x0a, 0x0e, 0x06, 0x05, 0x0d, 0x09, 0x01 + .align 2 gUnknown_0860D090:: @ 860D090 .4byte sub_818E9CC .4byte sub_818EA84 @@ -116,32 +411,41 @@ gUnknown_0860D090:: @ 860D090 .4byte sub_8194F58 .4byte sub_818F02C + .align 2 gUnknown_0860D0EC:: @ 860D0EC .4byte 0x00000004, 0x00000008, 0x00100000, 0x00200000 + .align 2 gUnknown_0860D0FC:: @ 860D0FC .4byte 0xfffffffb, 0xfffffff7, 0xffefffff, 0xffdfffff + .align 2 gUnknown_0860D10C:: @ 860D10C .byte 0x08, 0x00, 0x04, 0x08, 0x09, 0x0c, 0x08, 0x00, 0x0a, 0x08, 0x0c, 0x00, 0x0b, 0x04, 0x00, 0x08, 0x0c, 0x00, 0x04, 0x08, 0x0d, 0x0c, 0x08, 0x00, 0x0e, 0x08, 0x0c, 0x00, 0x0f, 0x04, 0x00, 0x08 .byte 0x00, 0x00, 0x04, 0x08, 0x01, 0x0c, 0x08, 0x00, 0x02, 0x08, 0x0c, 0x00, 0x03, 0x04, 0x00, 0x08, 0x04, 0x00, 0x04, 0x08, 0x05, 0x0c, 0x08, 0x00, 0x06, 0x08, 0x0c, 0x00, 0x07, 0x04, 0x00, 0x08 + .align 2 gUnknown_0860D14C:: @ 860D14C .byte 0x00, 0x08, 0x04, 0x0c, 0x07, 0x0f, 0x03, 0x0b, 0x02, 0x0a, 0x06, 0x0e, 0x05, 0x0d, 0x01, 0x09 + .align 2 gUnknown_0860D15C:: @ 860D15C .byte 0x00, 0x08, 0x0c, 0x0e, 0x00, 0x08, 0x0c, 0x0e, 0x01, 0x08, 0x0c, 0x0e, 0x01, 0x08, 0x0c, 0x0e, 0x02, 0x09, 0x0c, 0x0e, 0x02, 0x09, 0x0c, 0x0e, 0x03, 0x09, 0x0c, 0x0e, 0x03, 0x09, 0x0c, 0x0e .byte 0x04, 0x0a, 0x0d, 0x0e, 0x04, 0x0a, 0x0d, 0x0e, 0x05, 0x0a, 0x0d, 0x0e, 0x05, 0x0a, 0x0d, 0x0e, 0x06, 0x0b, 0x0d, 0x0e, 0x06, 0x0b, 0x0d, 0x0e, 0x07, 0x0b, 0x0d, 0x0e, 0x07, 0x0b, 0x0d, 0x0e + .align 2 gUnknown_0860D19C:: @ 860D19C .byte 0x17, 0x1b, 0x1d, 0x1e + .align 2 gUnknown_0860D1A0:: @ 860D1A0 .byte 0x10, 0x18, 0x1c, 0x1e, 0x11, 0x18, 0x1c, 0x1e, 0x12, 0x19, 0x1c, 0x1e, 0x13, 0x19, 0x1c, 0x1e, 0x14, 0x1a, 0x1d, 0x1e, 0x15, 0x1a, 0x1d, 0x1e, 0x16, 0x1b, 0x1d, 0x1e, 0x17, 0x1b, 0x1d, 0x1e + .align 2 gUnknown_0860D1C0:: @ 860D1C0 .byte 0x00, 0x0f, 0x08, 0x07, 0x03, 0x0c, 0x0b, 0x04, 0x01, 0x0e, 0x09, 0x06, 0x02, 0x0d, 0x0a, 0x05 + .align 2 gBattleDomePotentialPointers:: @ 860D1D0 .4byte gBattleDomeOpponentPotential1 .4byte gBattleDomeOpponentPotential2 @@ -161,6 +465,7 @@ gBattleDomePotentialPointers:: @ 860D1D0 .4byte gBattleDomeOpponentPotential16 .4byte gBattleDomeOpponentPotential17 + .align 2 gBattleDomeOpponentStylePointers:: @ 860D214 .4byte gBattleDomeOpponentStyle1 .4byte gBattleDomeOpponentStyle2 @@ -195,6 +500,7 @@ gBattleDomeOpponentStylePointers:: @ 860D214 .4byte gBattleDomeOpponentStyleUnused3 .4byte gBattleDomeOpponentStyleUnused4 + .align 2 gBattleDomeOpponentStatsPointers:: @ 860D294 .4byte gBattleDomeOpponentStats1 .4byte gBattleDomeOpponentStats2 @@ -252,6 +558,7 @@ gUnknown_0860D346:: @ 860D346 gUnknown_0860D349:: @ 860D349 .byte 0x00, 0x05, 0x09, 0x0c, 0x0e, 0x00, 0x00 + .align 2 gBattleDomeMatchNumberPointers:: @ 860D350 .4byte gBattleDomeMatchNumber1 .4byte gBattleDomeMatchNumber2 @@ -269,6 +576,7 @@ gBattleDomeMatchNumberPointers:: @ 860D350 .4byte gBattleDomeMatchNumber14 .4byte gBattleDomeMatchNumber15 + .align 2 gBattleDomeWinStringsPointers:: @ 860D38C .4byte gBattleDomeWinStrings1 .4byte gBattleDomeWinStrings2 @@ -306,15 +614,18 @@ gUnknown_0860D3F1:: @ 860D3F1 gUnknown_0860D3F2:: @ 860D3F2 .byte 0x00, 0x01, 0x70, 0x01, 0x00, 0x00, 0x70, 0x00, 0x30, 0x01, 0x40, 0x01, 0x30, 0x00, 0x40, 0x00, 0x10, 0x01, 0x60, 0x01, 0x10, 0x00, 0x60, 0x00, 0x20, 0x01, 0x50, 0x01, 0x20, 0x00, 0x50 -gUnknown_0860D411:: @ 860D411 - .incbin "baserom.gba", 0x60d411, 0x3f //struct - byte 1 and 2 loaded seperately, 2 added to move 1 addr across +gUnknown_0860D411:: @ 860D411 struct - byte 1 and 2 loaded seperately, 2 added to move 1 addr across + .byte 0x44, 0x21, 0x44, 0x31, 0x44, 0x41, 0x44, 0x51, 0x44, 0x61, 0x44, 0x71, 0x44, 0x81, 0x44, 0x91, 0xac, 0x21, 0xac, 0x31, 0xac, 0x41, 0xac, 0x51, 0xac, 0x61, 0xac, 0x71, 0xac, 0x81, 0xac, 0x91 + .byte 0x57, 0x29, 0x57, 0x49, 0x57, 0x69, 0x57, 0x89, 0x99, 0x29, 0x99, 0x49, 0x99, 0x69, 0x99, 0x89, 0x5f, 0x39, 0x5f, 0x79, 0x91, 0x39, 0x91, 0x79, 0x67, 0x59, 0x89, 0x59, 0x78, 0x59, 0x00 + .align 2 gUnknown_0860d450:: @ 860D450 .4byte 0x60210409 .4byte 0x6023040a .4byte 0x6047050a .4byte 0x6043050b + .align 2 gUnknown_0860d460:: @ 860D460 .4byte 0x60210409 .4byte 0x6023040a @@ -324,6 +635,7 @@ gUnknown_0860d460:: @ 860D460 .4byte 0x6047070b .4byte 0x6043070c + .align 2 gUnknown_0860d47c:: @ 860D47C .4byte 0x60210409 .4byte 0x6023040a @@ -337,6 +649,7 @@ gUnknown_0860d47c:: @ 860D47C .4byte 0x60270a0c .4byte 0x603b0b0c + .align 2 gUnknown_0860d4a8:: @ 860D4A8 .4byte 0x60210409 .4byte 0x6023040a @@ -352,12 +665,14 @@ gUnknown_0860d4a8:: @ 860D4A8 .4byte 0x602c0b0d .4byte 0x602d0b0e + .align 2 gUnknown_0860d4dc:: @ 860D4DC .4byte 0x60210609 .4byte 0x6021060a .4byte 0x6027050a .4byte 0x6043050b + .align 2 gUnknown_0860d4ec:: @ 860D4EC .4byte 0x60210609 .4byte 0x6021060a @@ -367,6 +682,7 @@ gUnknown_0860d4ec:: @ 860D4EC .4byte 0x6047070b .4byte 0x6043070c + .align 2 gUnknown_0860d508:: @ 860D508 .4byte 0x60210609 .4byte 0x6021060a @@ -380,6 +696,7 @@ gUnknown_0860d508:: @ 860D508 .4byte 0x60270a0c .4byte 0x603b0b0c + .align 2 gUnknown_0860d534:: @ 860D534 .4byte 0x60210609 .4byte 0x6021060a @@ -395,12 +712,14 @@ gUnknown_0860d534:: @ 860D534 .4byte 0x602c0b0d .4byte 0x602d0b0e + .align 2 gUnknown_0860d568:: @ 860D568 .4byte 0x60210809 .4byte 0x6023080a .4byte 0x6047090a .4byte 0x6021090b + .align 2 gUnknown_0860d578:: @ 860D578 .4byte 0x60210809 .4byte 0x6023080a @@ -410,6 +729,7 @@ gUnknown_0860d578:: @ 860D578 .4byte 0x6027070b .4byte 0x6043070c + .align 2 gUnknown_0860d594:: @ 860D594 .4byte 0x60210809 .4byte 0x6023080a @@ -423,6 +743,7 @@ gUnknown_0860d594:: @ 860D594 .4byte 0x60270a0c .4byte 0x603b0b0c + .align 2 gUnknown_0860d5c0:: @ 860D5C0 .4byte 0x60210809 .4byte 0x6023080a @@ -438,12 +759,14 @@ gUnknown_0860d5c0:: @ 860D5C0 .4byte 0x602c0b0d .4byte 0x602d0b0e + .align 2 gUnknown_0860d5f4:: @ 860D5F4 .4byte 0x60210a09 .4byte 0x60210a0a .4byte 0x6027090a .4byte 0x6021090b + .align 2 gUnknown_0860d604:: @ 860D604 .4byte 0x60210a09 .4byte 0x60210a0a @@ -453,6 +776,7 @@ gUnknown_0860d604:: @ 860D604 .4byte 0x6027070b .4byte 0x6043070c + .align 2 gUnknown_0860d620:: @ 860D620 .4byte 0x60210a09 .4byte 0x60210a0a @@ -466,6 +790,7 @@ gUnknown_0860d620:: @ 860D620 .4byte 0x60270a0c .4byte 0x603b0b0c + .align 2 gUnknown_0860d64c:: @ 860D64C .4byte 0x60210a09 .4byte 0x60210a0a @@ -481,12 +806,14 @@ gUnknown_0860d64c:: @ 860D64C .4byte 0x602c0b0d .4byte 0x602d0b0e + .align 2 gUnknown_0860d680:: @ 860D680 .4byte 0x60210c09 .4byte 0x60230c0a .4byte 0x60470d0a .4byte 0x60430d0b + .align 2 gUnknown_0860d690:: @ 860D690 .4byte 0x60210c09 .4byte 0x60230c0a @@ -496,6 +823,7 @@ gUnknown_0860d690:: @ 860D690 .4byte 0x60470f0b .4byte 0x60210f0c + .align 2 gUnknown_0860d6ac:: @ 860D6AC .4byte 0x60210c09 .4byte 0x60230c0a @@ -509,6 +837,7 @@ gUnknown_0860d6ac:: @ 860D6AC .4byte 0x60310c0c .4byte 0x60300b0c + .align 2 gUnknown_0860d6d8:: @ 860D6D8 .4byte 0x60210c09 .4byte 0x60230c0a @@ -524,12 +853,14 @@ gUnknown_0860d6d8:: @ 860D6D8 .4byte 0x602c0b0d .4byte 0x602d0b0e + .align 2 gUnknown_0860d70c:: @ 860D70C .4byte 0x60210e09 .4byte 0x60210e0a .4byte 0x60270d0a .4byte 0x60430d0b + .align 2 gUnknown_0860d71c:: @ 860D71C .4byte 0x60210e09 .4byte 0x60210e0a @@ -539,6 +870,7 @@ gUnknown_0860d71c:: @ 860D71C .4byte 0x60470f0b .4byte 0x60210f0c + .align 2 gUnknown_0860d738:: @ 860D738 .4byte 0x60210e09 .4byte 0x60210e0a @@ -552,6 +884,7 @@ gUnknown_0860d738:: @ 860D738 .4byte 0x60310c0c .4byte 0x60300b0c + .align 2 gUnknown_0860d764:: @ 860D764 .4byte 0x60210e09 .4byte 0x60210e0a @@ -567,12 +900,14 @@ gUnknown_0860d764:: @ 860D764 .4byte 0x602c0b0d .4byte 0x602d0b0e + .align 2 gUnknown_0860d798:: @ 860D798 .4byte 0x60211009 .4byte 0x6023100a .4byte 0x6047110a .4byte 0x6021110b + .align 2 gUnknown_0860d7a8:: @ 860D7A8 .4byte 0x60211009 .4byte 0x6023100a @@ -582,6 +917,7 @@ gUnknown_0860d7a8:: @ 860D7A8 .4byte 0x60270f0b .4byte 0x60210f0c + .align 2 gUnknown_0860d7c4:: @ 860D7C4 .4byte 0x60211009 .4byte 0x6023100a @@ -595,6 +931,7 @@ gUnknown_0860d7c4:: @ 860D7C4 .4byte 0x60310c0c .4byte 0x60300b0c + .align 2 gUnknown_0860d7f0:: @ 860D7F0 .4byte 0x60211009 .4byte 0x6023100a @@ -610,12 +947,14 @@ gUnknown_0860d7f0:: @ 860D7F0 .4byte 0x602c0b0d .4byte 0x602d0b0e + .align 2 gUnknown_0860d824:: @ 860D824 .4byte 0x602b1209 .4byte 0x602b120a .4byte 0x6027110a .4byte 0x6021110b + .align 2 gUnknown_0860d834:: @ 860D834 .4byte 0x602b1209 .4byte 0x602b120a @@ -625,6 +964,7 @@ gUnknown_0860d834:: @ 860D834 .4byte 0x60270f0b .4byte 0x60210f0c + .align 2 gUnknown_0860d850:: @ 860D850 .4byte 0x602b1209 .4byte 0x602b120a @@ -638,6 +978,7 @@ gUnknown_0860d850:: @ 860D850 .4byte 0x60310c0c .4byte 0x60300b0c + .align 2 gUnknown_0860d87c:: @ 860D87C .4byte 0x602b1209 .4byte 0x602b120a @@ -652,13 +993,15 @@ gUnknown_0860d87c:: @ 860D87C .4byte 0x60300b0c .4byte 0x602c0b0d .4byte 0x602d0b0e - + + .align 2 gUnknown_0860d8b0:: @ 860D8B0 .4byte 0x60210414 .4byte 0x60250413 .4byte 0x60490513 .4byte 0x60450512 + .align 2 gUnknown_0860d8c0:: @ 860D8C0 .4byte 0x60210414 .4byte 0x60250413 @@ -668,6 +1011,7 @@ gUnknown_0860d8c0:: @ 860D8C0 .4byte 0x60490712 .4byte 0x60450711 + .align 2 gUnknown_0860d8dc:: @ 860D8DC .4byte 0x60210414 .4byte 0x60250413 @@ -681,6 +1025,7 @@ gUnknown_0860d8dc:: @ 860D8DC .4byte 0x60290a11 .4byte 0x603c0b11 + .align 2 gUnknown_0860d908:: @ 860D908 .4byte 0x60210414 .4byte 0x60250413 @@ -696,12 +1041,14 @@ gUnknown_0860d908:: @ 860D908 .4byte 0x602f0b10 .4byte 0x602e0b0f + .align 2 gUnknown_0860d93c:: @ 860D93C .4byte 0x60210614 .4byte 0x60210613 .4byte 0x60290513 .4byte 0x60450512 + .align 2 gUnknown_0860d94c:: @ 860D94C .4byte 0x60210614 .4byte 0x60210613 @@ -711,6 +1058,7 @@ gUnknown_0860d94c:: @ 860D94C .4byte 0x60490712 .4byte 0x60450711 + .align 2 gUnknown_0860d968:: @ 860D968 .4byte 0x60210614 .4byte 0x60210613 @@ -724,6 +1072,7 @@ gUnknown_0860d968:: @ 860D968 .4byte 0x60290a11 .4byte 0x603c0b11 + .align 2 gUnknown_0860d994:: @ 860D994 .4byte 0x60210614 .4byte 0x60210613 @@ -739,12 +1088,14 @@ gUnknown_0860d994:: @ 860D994 .4byte 0x602f0b10 .4byte 0x602e0b0f + .align 2 gUnknown_0860d9c8:: @ 860D9C8 .4byte 0x60210814 .4byte 0x60250813 .4byte 0x60490913 .4byte 0x60210912 + .align 2 gUnknown_0860d9d8:: @ 860D9D8 .4byte 0x60210814 .4byte 0x60250813 @@ -754,6 +1105,7 @@ gUnknown_0860d9d8:: @ 860D9D8 .4byte 0x60290712 .4byte 0x60450711 + .align 2 gUnknown_0860d9f4:: @ 860D9F4 .4byte 0x60210814 .4byte 0x60250813 @@ -767,6 +1119,7 @@ gUnknown_0860d9f4:: @ 860D9F4 .4byte 0x60290a11 .4byte 0x603c0b11 + .align 2 gUnknown_0860da20:: @ 860DA20 .4byte 0x60210814 .4byte 0x60250813 @@ -782,12 +1135,14 @@ gUnknown_0860da20:: @ 860DA20 .4byte 0x602f0b10 .4byte 0x602e0b0f + .align 2 gUnknown_0860da54:: @ 860DA54 .4byte 0x60210a14 .4byte 0x60210a13 .4byte 0x60290913 .4byte 0x60210912 + .align 2 gUnknown_0860da64:: @ 860DA64 .4byte 0x60210a14 .4byte 0x60210a13 @@ -797,6 +1152,7 @@ gUnknown_0860da64:: @ 860DA64 .4byte 0x60290712 .4byte 0x60450711 + .align 2 gUnknown_0860da80:: @ 860DA80 .4byte 0x60210a14 .4byte 0x60210a13 @@ -810,6 +1166,7 @@ gUnknown_0860da80:: @ 860DA80 .4byte 0x60290a11 .4byte 0x603c0b11 + .align 2 gUnknown_0860daac:: @ 860DAAC .4byte 0x60210a14 .4byte 0x60210a13 @@ -825,12 +1182,14 @@ gUnknown_0860daac:: @ 860DAAC .4byte 0x602f0b10 .4byte 0x602e0b0f + .align 2 gUnknown_0860dae0:: @ 860DAE0 .4byte 0x60210c14 .4byte 0x60250c13 .4byte 0x60490d13 .4byte 0x60450d12 - + + .align 2 gUnknown_0860daf0:: @ 860DAF0 .4byte 0x60210c14 .4byte 0x60250c13 @@ -840,6 +1199,7 @@ gUnknown_0860daf0:: @ 860DAF0 .4byte 0x60490f12 .4byte 0x60210f11 + .align 2 gUnknown_0860db0c:: @ 860DB0C .4byte 0x60210c14 .4byte 0x60250c13 @@ -853,6 +1213,7 @@ gUnknown_0860db0c:: @ 860DB0C .4byte 0x60360c11 .4byte 0x60350b11 + .align 2 gUnknown_0860db38:: @ 860DB38 .4byte 0x60210c14 .4byte 0x60250c13 @@ -868,12 +1229,14 @@ gUnknown_0860db38:: @ 860DB38 .4byte 0x602f0b10 .4byte 0x602e0b0f + .align 2 gUnknown_0860db6c:: @ 860DB6C .4byte 0x60210e14 .4byte 0x60210e13 .4byte 0x60290d13 .4byte 0x60450d12 + .align 2 gUnknown_0860db7c:: @ 860DB7C .4byte 0x60210e14 .4byte 0x60210e13 @@ -883,6 +1246,7 @@ gUnknown_0860db7c:: @ 860DB7C .4byte 0x60490f12 .4byte 0x60210f11 + .align 2 gUnknown_0860db98:: @ 860DB98 .4byte 0x60210e14 .4byte 0x60210e13 @@ -896,6 +1260,7 @@ gUnknown_0860db98:: @ 860DB98 .4byte 0x60360c11 .4byte 0x60350b11 + .align 2 gUnknown_0860dbc4:: @ 860DBC4 .4byte 0x60210e14 .4byte 0x60210e13 @@ -911,12 +1276,14 @@ gUnknown_0860dbc4:: @ 860DBC4 .4byte 0x602f0b10 .4byte 0x602e0b0f + .align 2 gUnknown_0860dbf8:: @ 860DBF8 .4byte 0x60211014 .4byte 0x60251013 .4byte 0x60491113 .4byte 0x60211112 + .align 2 gUnknown_0860dc08:: @ 860DC08 .4byte 0x60211014 .4byte 0x60251013 @@ -926,6 +1293,7 @@ gUnknown_0860dc08:: @ 860DC08 .4byte 0x60290f12 .4byte 0x60210f11 + .align 2 gUnknown_0860dc24:: @ 860DC24 .4byte 0x60211014 .4byte 0x60251013 @@ -938,7 +1306,8 @@ gUnknown_0860dc24:: @ 860DC24 .4byte 0x60370d11 .4byte 0x60360c11 .4byte 0x60350b11 - + + .align 2 gUnknown_0860dc50:: @ 860DC50 .4byte 0x60211014 .4byte 0x60251013 @@ -954,12 +1323,14 @@ gUnknown_0860dc50:: @ 860DC50 .4byte 0x602f0b10 .4byte 0x602e0b0f + .align 2 gUnknown_0860dc84:: @ 860DC84 .4byte 0x602b1214 .4byte 0x602b1213 .4byte 0x60291113 .4byte 0x60211112 + .align 2 gUnknown_0860dc94:: @ 860DC94 .4byte 0x602b1214 .4byte 0x602b1213 @@ -968,7 +1339,8 @@ gUnknown_0860dc94:: @ 860DC94 .4byte 0x60291012 .4byte 0x60290f12 .4byte 0x60210f11 - + + .align 2 gUnknown_0860dcb0:: @ 860DCB0 .4byte 0x602b1214 .4byte 0x602b1213 @@ -982,6 +1354,7 @@ gUnknown_0860dcb0:: @ 860DCB0 .4byte 0x60360c11 .4byte 0x60350b11 + .align 2 gUnknown_0860dcdc:: @ 860DCDC .4byte 0x602b1214 .4byte 0x602b1213 @@ -997,6 +1370,7 @@ gUnknown_0860dcdc:: @ 860DCDC .4byte 0x602f0b10 .4byte 0x602e0b0f + .align 2 gUnknown_0860DD10:: @ 860DD10 .4byte gUnknown_0860d450 .4byte gUnknown_0860d460 @@ -1067,6 +1441,7 @@ gUnknown_0860DE10:: @ 860DE10 .byte 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d .byte 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d + .align 2 gUnknown_0860DE50:: @ 860DE50 .4byte sub_8195980 .4byte sub_8195A38 @@ -1091,9 +1466,74 @@ gUnknown_0860DE98:: @ 860DE98 gUnknown_0860DEA8:: @ 860DEA8 .4byte 0xffffffef, 0xffffffdf, 0xffbfffff, 0xff7fffff + .align 2 gUnknown_0860DEB8:: @ 860DEB8 //struct - .incbin "baserom.gba", 0x60deb8, 0x500 - + .2byte 0x0025, 0x0000, 0x0108, 0x0208, 0x0308, 0x0103, 0x0008, 0x0108, 0x0208, 0x0000 + .2byte 0x02e1, 0x0000, 0x010c, 0x020c, 0x030c, 0x013e, 0x000c, 0x010c, 0x020c, 0x0000 + .2byte 0x002c, 0x0000, 0x010c, 0x020c, 0x030c, 0x0104, 0x000c, 0x010c, 0x020c, 0x0000 + .2byte 0x0039, 0x0000, 0x0102, 0x0202, 0x0302, 0x0105, 0x0002, 0x0102, 0x0202, 0x0000 + .2byte 0x0040, 0x0000, 0x0101, 0x0201, 0x0301, 0x0106, 0x0001, 0x0101, 0x0201, 0x0000 + .2byte 0x02af, 0x0004, 0x0101, 0x0201, 0x0301, 0x013d, 0x0001, 0x0101, 0x0201, 0x0000 + .2byte 0x02ff, 0x0000, 0x010a, 0x020a, 0x030a, 0x0140, 0x000a, 0x010a, 0x020a, 0x0000 + .2byte 0x005e, 0x0000, 0x0109, 0x0209, 0x0309, 0x0108, 0x0009, 0x0109, 0x0209, 0x0000 + .2byte 0x004e, 0x0000, 0x0106, 0x0206, 0x0306, 0x0107, 0x0006, 0x0106, 0x0206, 0x0000 + .2byte 0x006c, 0x0000, 0x0108, 0x0208, 0x0308, 0x0109, 0x0008, 0x0108, 0x0208, 0x0000 + .2byte 0x0072, 0x0000, 0x0108, 0x0208, 0x0308, 0x010a, 0x0008, 0x0108, 0x0208, 0x0000 + .2byte 0x0090, 0x0000, 0x0108, 0x020a, 0x030a, 0x010e, 0x000a, 0x0108, 0x020a, 0x0000 + .2byte 0x007f, 0x0000, 0x010a, 0x020a, 0x030a, 0x010b, 0x000a, 0x0108, 0x020a, 0x0000 + .2byte 0x0088, 0x0000, 0x0104, 0x0204, 0x0304, 0x010c, 0x0004, 0x0104, 0x0204, 0x0000 + .2byte 0x008f, 0x0000, 0x0107, 0x0207, 0x0307, 0x010d, 0x0007, 0x0107, 0x0207, 0x0000 + .2byte 0x009b, 0x0000, 0x0105, 0x0205, 0x0305, 0x010f, 0x0005, 0x0105, 0x0205, 0x0000 + .2byte 0x00b7, 0x0000, 0x0103, 0x0203, 0x0303, 0x0110, 0x0003, 0x0103, 0x0203, 0x0000 + .2byte 0x02a0, 0x0000, 0x0103, 0x0203, 0x0303, 0x013b, 0x0003, 0x0103, 0x0203, 0x0000 + .2byte 0x00c3, 0x0000, 0x0106, 0x0206, 0x0306, 0x0111, 0x0006, 0x0106, 0x0206, 0x0000 + .2byte 0x00c4, 0x0000, 0x0104, 0x0204, 0x0304, 0x0112, 0x0004, 0x0104, 0x0204, 0x0000 + .2byte 0x00ce, 0x0000, 0x010b, 0x020b, 0x030b, 0x0113, 0x000b, 0x010b, 0x020b, 0x0000 + .2byte 0x00d8, 0x0000, 0x0101, 0x0201, 0x0301, 0x0114, 0x0001, 0x0101, 0x0201, 0x0000 + .2byte 0x02a9, 0x0003, 0x010c, 0x020c, 0x030c, 0x013c, 0x000c, 0x010c, 0x020c, 0x0000 + .2byte 0x00e2, 0x0000, 0x0107, 0x0207, 0x0307, 0x0115, 0x0007, 0x0107, 0x0207, 0x0000 + .2byte 0x00ee, 0x0000, 0x0104, 0x0204, 0x0304, 0x0116, 0x0001, 0x0104, 0x0204, 0x0000 + .2byte 0x00f9, 0x0000, 0x0108, 0x0208, 0x0308, 0x0117, 0x0008, 0x0108, 0x0208, 0x0000 + .2byte 0x00fe, 0x0000, 0x010c, 0x020c, 0x030c, 0x0118, 0x000c, 0x010c, 0x020c, 0x0000 + .2byte 0x0118, 0x0000, 0x0102, 0x0202, 0x0302, 0x011a, 0x0002, 0x0102, 0x0202, 0x0000 + .2byte 0x0111, 0x0000, 0x0101, 0x0201, 0x0301, 0x0119, 0x0001, 0x0101, 0x0201, 0x0000 + .2byte 0x011f, 0x0006, 0x0109, 0x0209, 0x0309, 0x011b, 0x0009, 0x0109, 0x0209, 0x0000 + .2byte 0x012e, 0x0000, 0x010e, 0x020e, 0x030e, 0x011d, 0x000e, 0x010e, 0x020e, 0x0000 + .2byte 0x0125, 0x0000, 0x010b, 0x020b, 0x030b, 0x011c, 0x000b, 0x010b, 0x020b, 0x0000 + .2byte 0x0133, 0x0000, 0x010c, 0x020c, 0x030c, 0x011e, 0x000c, 0x010c, 0x020c, 0x0000 + .2byte 0x0139, 0x0000, 0x010d, 0x020d, 0x030d, 0x011f, 0x000d, 0x010d, 0x020d, 0x0000 + .2byte 0x013e, 0x0000, 0x0101, 0x0201, 0x0301, 0x0120, 0x0001, 0x0101, 0x0201, 0x0000 + .2byte 0x0153, 0x0000, 0x0103, 0x0203, 0x0303, 0x0121, 0x0003, 0x0103, 0x0203, 0x0000 + .2byte 0x0178, 0x0000, 0x0105, 0x0205, 0x0305, 0x0126, 0x0005, 0x0105, 0x0205, 0x0000 + .2byte 0x0171, 0x0000, 0x0109, 0x0209, 0x0309, 0x0125, 0x0009, 0x0109, 0x0209, 0x0000 + .2byte 0x0166, 0x0000, 0x0109, 0x0209, 0x0309, 0x0123, 0x0009, 0x0109, 0x0209, 0x0000 + .2byte 0x016c, 0x0000, 0x0105, 0x0205, 0x0305, 0x0124, 0x0005, 0x0105, 0x0205, 0x0000 + .2byte 0x0182, 0x0000, 0x0109, 0x0209, 0x0309, 0x0128, 0x0009, 0x0109, 0x0209, 0x0000 + .2byte 0x0161, 0x0000, 0x0105, 0x0205, 0x0305, 0x0122, 0x0005, 0x0105, 0x0205, 0x0000 + .2byte 0x0179, 0x0000, 0x0105, 0x0205, 0x0305, 0x0127, 0x0005, 0x0105, 0x0205, 0x0000 + .2byte 0x0188, 0x0000, 0x0104, 0x0204, 0x0304, 0x0129, 0x0004, 0x0104, 0x0204, 0x0000 + .2byte 0x0196, 0x0000, 0x0106, 0x0206, 0x0306, 0x012a, 0x0006, 0x0106, 0x0206, 0x0000 + .2byte 0x01a3, 0x0000, 0x0101, 0x0201, 0x0301, 0x012b, 0x0001, 0x0101, 0x0201, 0x0000 + .2byte 0x01ab, 0x0000, 0x0109, 0x0209, 0x0309, 0x012c, 0x0009, 0x0109, 0x0209, 0x0000 + .2byte 0x01b2, 0x0000, 0x0108, 0x0208, 0x0308, 0x012d, 0x0008, 0x0108, 0x0208, 0x0000 + .2byte 0x01c1, 0x0000, 0x0109, 0x0209, 0x0309, 0x012e, 0x0009, 0x0109, 0x0209, 0x0000 + .2byte 0x01da, 0x0000, 0x0102, 0x0202, 0x0302, 0x012f, 0x0002, 0x0102, 0x0202, 0x0000 + .2byte 0x01e1, 0x0002, 0x0102, 0x0202, 0x0302, 0x0130, 0x0001, 0x0102, 0x0202, 0x0000 + .2byte 0x01ec, 0x0000, 0x0103, 0x0203, 0x0303, 0x0131, 0x0003, 0x0103, 0x0203, 0x0000 + .2byte 0x02e4, 0x0000, 0x0103, 0x0203, 0x0303, 0x013f, 0x0003, 0x0103, 0x0203, 0x0000 + .2byte 0x0200, 0x0000, 0x0107, 0x0207, 0x0307, 0x0132, 0x0007, 0x0107, 0x0207, 0x0000 + .2byte 0x0221, 0x0000, 0x0108, 0x0208, 0x0308, 0x0134, 0x0008, 0x0108, 0x0208, 0x0000 + .2byte 0x021a, 0x0000, 0x0105, 0x0205, 0x0305, 0x0133, 0x0005, 0x0105, 0x0205, 0x0000 + .2byte 0x0009, 0x0000, 0x0108, 0x0208, 0x0308, 0x0102, 0x0008, 0x0108, 0x0208, 0x0000 + .2byte 0x022f, 0x0000, 0x0109, 0x0209, 0x0309, 0x0136, 0x0009, 0x0109, 0x0209, 0x0000 + .2byte 0x0228, 0x0000, 0x0105, 0x0205, 0x0305, 0x0135, 0x0005, 0x0105, 0x0205, 0x0000 + .2byte 0x025c, 0x0000, 0x0102, 0x0202, 0x0302, 0x0137, 0x0002, 0x0102, 0x0202, 0x0000 + .2byte 0x026d, 0x0000, 0x0101, 0x0201, 0x0301, 0x0138, 0x0001, 0x0101, 0x0201, 0x0000 + .2byte 0x0273, 0x0000, 0x0103, 0x0203, 0x0303, 0x0139, 0x0003, 0x0103, 0x0203, 0x0000 + .2byte 0x0001, 0x0000, 0x010f, 0x0203, 0x0303, 0x0101, 0x0003, 0x0103, 0x0203, 0x0000 + .2byte 0x0282, 0x0001, 0x0109, 0x0209, 0x0309, 0x013a, 0x0009, 0x0109, 0x0209, 0x0000 + + .align 2 gUnknown_0860E3B8:: @ 860E3B8 .4byte BattleFrontier_PokeNav_2A971C, 0x00ff0200 .4byte BattleFrontier_PokeNav_2A9798, 0x00ff0200 @@ -1111,6 +1551,7 @@ gUnknown_0860E3B8:: @ 860E3B8 .4byte BattleFrontier_PokeNav_2A9E70, 0x00ff0200 .4byte BattleFrontier_PokeNav_2A9EFD, 0x00ff0200 + .align 2 gUnknown_0860E430:: @ 860E430 .4byte BattleFrontier_PokeNav_2A9FAB, 0x00ffff00 .4byte BattleFrontier_PokeNav_2AA028, 0x00ffff00 @@ -1127,6 +1568,7 @@ gUnknown_0860E430:: @ 860E430 .4byte BattleFrontier_PokeNav_2AA5AD, 0x00ffff00 .4byte BattleFrontier_PokeNav_2AA64D, 0x00ffff00 + .align 2 gUnknown_0860E4A0:: @ 860E4A0 .4byte BattleFrontier_PokeNav_2AA6AF, 0x00ff0300 .4byte BattleFrontier_PokeNav_2AA730, 0x00ff0300 @@ -1142,7 +1584,8 @@ gUnknown_0860E4A0:: @ 860E4A0 .4byte BattleFrontier_PokeNav_2AAC9D, 0x00ff0300 .4byte BattleFrontier_PokeNav_2AAD41, 0x00ff0300 .4byte BattleFrontier_PokeNav_2AAE00, 0x00ff0300 - + + .align 2 gUnknown_0860E510:: @ 860E510 .4byte BattleFrontier_PokeNav_2AAE7F, 0x00ff0100 .4byte BattleFrontier_PokeNav_2AAEF1, 0x00ff0100 @@ -1158,7 +1601,8 @@ gUnknown_0860E510:: @ 860E510 .4byte BattleFrontier_PokeNav_2AB4B0, 0x00ff0100 .4byte BattleFrontier_PokeNav_2AB538, 0x00ff0100 .4byte BattleFrontier_PokeNav_2AB5E4, 0x00ff0100 - + + .align 2 gUnknown_0860E580:: @ 860E580 .4byte BattleFrontier_PokeNav_2AB670, 0x00ff0100 .4byte BattleFrontier_PokeNav_2AB6CD, 0x00ff0100 @@ -1175,6 +1619,7 @@ gUnknown_0860E580:: @ 860E580 .4byte BattleFrontier_PokeNav_2ABE5E, 0x00ff0100 .4byte BattleFrontier_PokeNav_2ABF36, 0x00ff0100 + .align 2 gUnknown_0860E5F0:: @ 860E5F0 .4byte BattleFrontier_PokeNav_2AC009, 0x00ff0100 .4byte BattleFrontier_PokeNav_2AC0BD, 0x00ffff00 @@ -1241,6 +1686,7 @@ gUnknown_0860E5F0:: @ 860E5F0 .4byte BattleFrontier_PokeNav_2AFA39, 0x00ffff00 .4byte BattleFrontier_PokeNav_2AFB26, 0x00ffff00 + .align 2 gUnknown_0860E7F0:: @860E7F0 .4byte BattleFrontier_PokeNav_2AFC07, 0x00050400 .4byte BattleFrontier_PokeNav_2AFC78, 0x00050400 @@ -1257,6 +1703,7 @@ gUnknown_0860E7F0:: @860E7F0 .4byte BattleFrontier_PokeNav_2B02D9, 0x00050400 .4byte BattleFrontier_PokeNav_2B0366, 0x00050400 + .align 2 gUnknown_0860E860:: @860E860 .4byte BattleFrontier_PokeNav_2B03E6, 0x00050400 .4byte BattleFrontier_PokeNav_2B0457, 0x00050400 @@ -1273,6 +1720,7 @@ gUnknown_0860E860:: @860E860 .4byte BattleFrontier_PokeNav_2B0AB8, 0x00050400 .4byte BattleFrontier_PokeNav_2B0B45, 0x00050400 + .align 2 gUnknown_0860E8D0:: @860E8D0 .4byte BattleFrontier_PokeNav_2B0BC5, 0x00050400 .4byte BattleFrontier_PokeNav_2B0C4A, 0x00050400 @@ -1289,6 +1737,7 @@ gUnknown_0860E8D0:: @860E8D0 .4byte BattleFrontier_PokeNav_2B124D, 0x00050400 .4byte BattleFrontier_PokeNav_2B12D0, 0x00050400 + .align 2 gUnknown_0860E940:: @860E940 .4byte BattleFrontier_PokeNav_2B1347, 0x00050400 .4byte BattleFrontier_PokeNav_2B13B1, 0x00050400 @@ -1305,6 +1754,7 @@ gUnknown_0860E940:: @860E940 .4byte BattleFrontier_PokeNav_2B19C7, 0x00050400 .4byte BattleFrontier_PokeNav_2B1A4C, 0x00050400 + .align 2 gUnknown_0860E9B0:: @860E9B0 .4byte BattleFrontier_PokeNav_2B1ACA, 0x00050400 .4byte BattleFrontier_PokeNav_2B1B50, 0x00050400 @@ -1321,15 +1771,18 @@ gUnknown_0860E9B0:: @860E9B0 .4byte BattleFrontier_PokeNav_2B2175, 0x00050400 .4byte BattleFrontier_PokeNav_2B21FC, 0x00050400 + .align 2 gUnknown_0860EA20:: @ 860EA20 .4byte gUnknown_0860E3B8 .4byte gUnknown_0860E430 .4byte gUnknown_0860E4A0 + .align 2 gUnknown_0860EA2C:: @ 860EA2C .4byte gUnknown_0860E510 .4byte gUnknown_0860E580 + .align 2 gUnknown_0860EA34:: @ 860EA34 .4byte gUnknown_0860E5F0 .4byte gUnknown_0860E7F0 @@ -1338,21 +1791,27 @@ gUnknown_0860EA34:: @ 860EA34 .4byte gUnknown_0860E940 .4byte gUnknown_0860E9B0 + .align 2 gUnknown_0860EA4C:: @ 860EA4C - .incbin "baserom.gba", 0x60ea4c, 0x20 + .incbin "graphics/unknown/unknown_60EA4C.gbapal" + .align 2 gUnknown_0860EA6C:: @ 860EA6C - .incbin "baserom.gba", 0x60ea6c, 0x100 + .incbin "graphics/interface/menu_border.4bpp" + .align 2 gUnknown_0860EB6C:: @ 860EB6C - .incbin "baserom.gba", 0x60eb6c, 0x20 + .incbin "graphics/pokenav/icon.gbapal" + .align 2 gUnknown_0860EB8C:: @ 860EB8C - .incbin "baserom.gba", 0x60eb8c, 0x3e4 + .incbin "graphics/pokenav/icon.4bpp.lz" -gUnknown_0860EF70:: @ 860EF70 - .incbin "baserom.gba", 0x60ef70, 0x8 + .align 2 +gText_PokenavCallEllipsis:: @ 860EF70 + .string "………………\p$" + .align 2 gUnknown_0860EF78:: @ 860EF78 .4byte sub_819612C .4byte sub_81961F0 @@ -1363,14 +1822,17 @@ gUnknown_0860EF78:: @ 860EF78 .4byte sub_8196390 .4byte sub_81963F0 + .align 2 gUnknown_0860EF98:: @ 860EF98 - .incbin "baserom.gba", 0x60ef98, 0x8 + window_template 0x00, 0x01, 0x0f, 0x1c, 0x04, 0x0f, 0x0200 + .align 2 gUnknown_0860EFA0:: @ 860EFA0 .4byte gStringVar1 .4byte gStringVar2 .4byte gStringVar3 + .align 2 gUnknown_0860EFAC:: @ 860EFAC .4byte sub_8196A44 .4byte sub_8196A9C @@ -1379,10 +1841,16 @@ gUnknown_0860EFAC:: @ 860EFAC .4byte sub_8196CF4 .4byte sub_8196D14 + .align 2 gUnknown_0860EFC4:: @ 860EFC4 - .2byte 0x0282, 0x0000, 0xfa72, 0x085e, 0x01e1, 0x0000, 0xfa77, 0x085e, 0x02a9, 0x0000, 0xfa7b, 0x085e, 0x02af, 0x0000, 0xfa80, 0x085e - .2byte 0x0033, 0x0000, 0xfa84, 0x085e, 0x011f, 0x0000, 0xfa8a, 0x085e - + .4byte 0x00000282, gText_Kira + .4byte 0x000001e1, gText_Amy + .4byte 0x000002a9, gText_John + .4byte 0x000002af, gText_Roy + .4byte 0x00000033, gText_Gabby + .4byte 0x0000011f, gText_Anna + + .align 2 gUnknown_0860EFF4:: @ 860EFF4 .4byte gText_BattleTower2 .4byte gText_BattleDome @@ -1392,6 +1860,7 @@ gUnknown_0860EFF4:: @ 860EFF4 .4byte gText_BattleFactory .4byte gText_BattlePyramid + .align 2 gUnknown_0860F010:: @ 860F010 .2byte FLAG_BADGE01_GET .2byte FLAG_BADGE02_GET diff --git a/data/battle_frontier_2.s b/data/battle_frontier_2.s index 74abbe788..bfb99f97d 100644 --- a/data/battle_frontier_2.s +++ b/data/battle_frontier_2.s @@ -5,291 +5,1334 @@ .section .rodata + .align 2 gUnknown_0860F13C:: @ 860F13C - .incbin "baserom.gba", 0x60f13c, 0x1100 + .incbin "graphics/unknown/unknown_60F13C.gbapal" + + .align 2 +gUnknown_0860F15C:: @ 860F15C + .incbin "graphics/unknown/unknown_60F15C.gbapal" + + .align 2 +gUnknown_0860F17C:: @ 860F17C + .incbin "graphics/unknown/unknown_60F17C.gbapal" + + .align 2 +gUnknown_0860F1BC:: @ 860F1BC + .incbin "graphics/unknown/unknown_60F1BC.4bpp" + + .align 2 +gUnknown_0860F3BC:: @ 860F3BC + .incbin "graphics/unknown/unknown_60F3BC.4bpp" + + .align 2 +gUnknown_0860F43C:: @ 860F43C + .incbin "graphics/unknown/unknown_60F43C.4bpp" + + .align 2 +gUnknown_0860F53C:: @ 860F53C + .incbin "graphics/unknown/unknown_60F53C.4bpp" + + .align 2 +gUnknown_0860F63C:: @ 860F63C + .incbin "graphics/unknown/unknown_60F63C.4bpp" + + .align 2 +gUnknown_0860F6BC:: @ 860F6BC + .incbin "graphics/unknown/unknown_60F6BC.4bpp" + + .align 2 +gUnknown_0860F7BC:: @ 860F7BC + .incbin "graphics/unknown/unknown_60F7BC.4bpp" + + .align 2 +gUnknown_0860F83C:: @ 860F83C + .incbin "graphics/unknown/unknown_60F83C.4bpp" + + .align 2 +gUnknown_0860F93C:: @ 860F93C + .incbin "graphics/unknown/unknown_60F93C.4bpp" + + .align 2 +gUnknown_0860FA3C:: @ 860FA3C + .incbin "graphics/unknown/unknown_60FA3C.4bpp" + .align 2 gUnknown_0861023C:: @ 861023C - .incbin "baserom.gba", 0x61023c, 0x100 + .incbin "graphics/unknown/unknown_61023C.bin" + .align 2 gUnknown_0861033C:: @ 861033C - .incbin "baserom.gba", 0x61033c, 0x60 + .incbin "graphics/unknown/unknown_61033C.4bpp" + .align 2 gUnknown_0861039C:: @ 861039C - .incbin "baserom.gba", 0x61039c, 0x20 + .incbin "graphics/unknown/unknown_61039C.gbapal" + .align 2 gUnknown_086103BC:: @ 86103BC - .incbin "baserom.gba", 0x6103bc, 0x28 + obj_tiles gUnknown_0860F3BC, 0x0080, 0x0065 + obj_tiles gUnknown_0860F43C, 0x0100, 0x0066 + obj_tiles gUnknown_0860F53C, 0x0100, 0x0067 + obj_tiles gUnknown_0860FA3C, 0x0800, 0x006d + null_obj_tiles + .align 2 gUnknown_086103E4:: @ 86103E4 - .incbin "baserom.gba", 0x6103e4, 0x10 + obj_tiles gUnknown_085B18AC, 0x0800, 0x0064 + null_obj_tiles + .align 2 gUnknown_086103F4:: @ 86103F4 - .incbin "baserom.gba", 0x6103f4, 0x28 + obj_pal gUnknown_0860F13C, 0x0064 + obj_pal gUnknown_0860F15C, 0x0065 + obj_pal gUnknown_0860F17C, 0x0066 + obj_pal gUnknown_0861039C, 0x0067 + null_obj_pal + .align 2 gUnknown_0861041C:: @ 861041C - .incbin "baserom.gba", 0x61041c, 0xc + .4byte sub_819BCCC + .4byte sub_819BC30 + .4byte sub_819BCD0 + .align 2 gUnknown_08610428:: @ 8610428 - .incbin "baserom.gba", 0x610428, 0xc + .4byte 0x00000180, 0x00003195, 0x000021bb + .align 2 gUnknown_08610434:: @ 8610434 - .incbin "baserom.gba", 0x610434, 0x38 - + window_template 0x00, 0x00, 0x02, 0x0c, 0x02, 0x0f, 0x0001 + window_template 0x00, 0x13, 0x02, 0x0b, 0x02, 0x0e, 0x0019 + window_template 0x00, 0x00, 0x0f, 0x14, 0x03, 0x0f, 0x002f + window_template 0x00, 0x16, 0x0e, 0x08, 0x06, 0x0f, 0x006b + window_template 0x00, 0x16, 0x0e, 0x08, 0x04, 0x0f, 0x009b + window_template 0x00, 0x0f, 0x00, 0x0f, 0x02, 0x0f, 0x00bb + window_template_terminator + + .align 1 gUnknown_0861046C:: @ 861046C - .incbin "baserom.gba", 0x61046c, 0xa + .incbin "graphics/unknown/unknown_61046C.gbapal" gUnknown_08610476:: @ 8610476 - .incbin "baserom.gba", 0x610476, 0x3 + .byte 0x00, 0x02, 0x00 gUnknown_08610479:: @ 8610479 - .incbin "baserom.gba", 0x610479, 0x15f + .byte 0x00, 0x04, 0x00 + + .align 2 +gUnknown_0861047C:: @ 861047C + .byte 0x00, 0x00, 0x00, 0x80, 0x00, 0x0c, 0x00, 0x00 + + .align 2 +gUnknown_08610484:: @ 8610484 + .byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x0c, 0x00, 0x00 + + .align 2 +gUnknown_0861048C:: @ 861048C + .byte 0x00, 0x40, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00 + + .align 2 +gUnknown_08610494:: @ 8610494 + .byte 0x00, 0x07, 0x00, 0xc0, 0x00, 0x00, 0x01, 0x00 + + .align 2 +gUnknown_0861049C:: @ 861049C + .2byte 0x0000, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_086104A4:: @ 86104A4 + .2byte 0x0000, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_086104AC:: @ 86104AC + .2byte 0x0000, 0x001e, 0xffff, 0x0000 + .align 2 +gUnknown_086104B4:: @ 86104B4 + .2byte 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004, 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004 + .2byte 0x0000, 0x0020, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008, 0x0000, 0x0008, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008 + .2byte 0x0000, 0x0008, 0xffff, 0x0000 + + .align 2 +gUnknown_086104FC:: @ 86104FC + .4byte gUnknown_0861049C + + .align 2 +gUnknown_08610500:: @ 8610500 + .4byte gUnknown_086104A4 + + .align 2 +gUnknown_08610504:: @ 8610504 + .4byte gUnknown_086104AC + .4byte gUnknown_086104B4 + + .align 2 +gUnknown_0861050C:: @ 861050C + .2byte 0x0005, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0010, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 + .2byte 0x0020, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0040, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 + .2byte 0x0080, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0100, 0x0005, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_0861056C:: @ 861056C + .2byte 0x0080, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0040, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 + .2byte 0x0020, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0010, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 + .2byte 0x0005, 0x0005, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_086105BC:: @ 86105BC + .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_086105CC:: @ 86105CC + .4byte gUnknown_0861050C + .4byte gUnknown_0861056C + .4byte gUnknown_086105BC + + .align 2 gUnknown_086105D8:: @ 86105D8 - .incbin "baserom.gba", 0x6105d8, 0x18 + spr_template 0x0064, 0x0064, gUnknown_0861047C, gUnknown_08610504, NULL, gDummySpriteAffineAnimTable, sub_819A44C + .align 2 gUnknown_086105F0:: @ 86105F0 - .incbin "baserom.gba", 0x6105f0, 0x18 + spr_template 0x0065, 0x0066, gUnknown_08610484, gUnknown_086104FC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_08610608:: @ 8610608 - .incbin "baserom.gba", 0x610608, 0x18 + spr_template 0x0066, 0x0066, gUnknown_0861048C, gUnknown_086104FC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_08610620:: @ 8610620 - .incbin "baserom.gba", 0x610620, 0x18 + spr_template 0x0067, 0x0066, gUnknown_0861048C, gUnknown_086104FC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_08610638:: @ 8610638 - .incbin "baserom.gba", 0x610638, 0x18 + spr_template 0x006d, 0x0067, gUnknown_08610494, gUnknown_08610500, NULL, gUnknown_086105CC, SpriteCallbackDummy + .align 2 gUnknown_08610650:: @ 8610650 - .incbin "baserom.gba", 0x610650, 0x50 + obj_tiles gUnknown_0860F3BC, 0x0080, 0x0065 + obj_tiles gUnknown_0860F43C, 0x0100, 0x0066 + obj_tiles gUnknown_0860F53C, 0x0100, 0x0067 + obj_tiles gUnknown_0860F63C, 0x0080, 0x0068 + obj_tiles gUnknown_0860F6BC, 0x0100, 0x0069 + obj_tiles gUnknown_0860F7BC, 0x0100, 0x006a + obj_tiles gUnknown_0860F83C, 0x0100, 0x006b + obj_tiles gUnknown_0860F93C, 0x0100, 0x006c + obj_tiles gUnknown_0860FA3C, 0x0800, 0x006d + null_obj_tiles + .align 2 gUnknown_086106A0:: @ 86106A0 - .incbin "baserom.gba", 0x6106a0, 0x10 + obj_tiles gUnknown_085B18AC, 0x0800, 0x0064 + null_obj_tiles + .align 2 gUnknown_086106B0:: @ 86106B0 - .incbin "baserom.gba", 0x6106b0, 0x184 + obj_pal gUnknown_0860F13C, 0x0064 + obj_pal gUnknown_0860F15C, 0x0065 + obj_pal gUnknown_0860F17C, 0x0066 + obj_pal gUnknown_0861039C, 0x0067 + null_obj_pal + .align 2 +gUnknown_086106D8:: @ 86106D8 + .byte 0x00, 0x00, 0x00, 0x80, 0x00, 0x0c, 0x00, 0x00 + + .align 2 +gUnknown_086106E0:: @ 86106E0 + .byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x0c, 0x00, 0x00 + + .align 2 +gUnknown_086106E8:: @ 86106E8 + .byte 0x00, 0x40, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00 + + .align 2 +gUnknown_086106F0:: @ 86106F0 + .byte 0x00, 0x07, 0x00, 0xc0, 0x00, 0x00, 0x01, 0x00 + + .align 2 +gUnknown_086106F8:: @ 86106F8 + .2byte 0x0000, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_08610700:: @ 8610700 + .2byte 0x0000, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_08610708:: @ 8610708 + .2byte 0x0000, 0x001e, 0xffff, 0x0000 + + .align 2 +gUnknown_08610710:: @ 8610710 + .2byte 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004, 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004 + .2byte 0x0000, 0x0020, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008, 0x0000, 0x0008, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008 + .2byte 0x0000, 0x0008, 0xffff, 0x0000 + + .align 2 +gUnknown_08610758:: @ 8610758 + .4byte gUnknown_086106F8 + + .align 2 +gUnknown_0861075C:: @ 861075C + .4byte gUnknown_08610700 + + .align 2 +gUnknown_08610760:: @ 8610760 + .4byte gUnknown_08610708 + .4byte gUnknown_08610710 + + .align 2 +gUnknown_08610768:: @ 8610768 + .2byte 0x0005, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0010, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 + .2byte 0x0020, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0040, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 + .2byte 0x0080, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0100, 0x0005, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_086107C8:: @ 86107C8 + .2byte 0x0080, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0040, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 + .2byte 0x0020, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0010, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 + .2byte 0x0005, 0x0005, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_08610818:: @ 8610818 + .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_08610828:: @ 8610828 + .4byte gUnknown_08610768 + .4byte gUnknown_086107C8 + .4byte gUnknown_08610818 + + .align 2 gUnknown_08610834:: @ 8610834 - .incbin "baserom.gba", 0x610834, 0x18 + spr_template 0x0064, 0x0064, gUnknown_086106D8, gUnknown_08610760, NULL, gDummySpriteAffineAnimTable, sub_819A44C + .align 2 gUnknown_0861084C:: @ 861084C - .incbin "baserom.gba", 0x61084c, 0x18 + spr_template 0x0065, 0x0066, gUnknown_086106E0, gUnknown_08610758, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_08610864:: @ 8610864 - .incbin "baserom.gba", 0x610864, 0x18 + spr_template 0x0066, 0x0066, gUnknown_086106E8, gUnknown_08610758, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_0861087C:: @ 861087C - .incbin "baserom.gba", 0x61087c, 0x18 + spr_template 0x0067, 0x0066, gUnknown_086106E8, gUnknown_08610758, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_08610894:: @ 8610894 - .incbin "baserom.gba", 0x610894, 0x18 + spr_template 0x006d, 0x0067, gUnknown_086106F0, gUnknown_0861075C, NULL, gUnknown_08610828, SpriteCallbackDummy + .align 2 gUnknown_086108AC:: @ 86108AC - .incbin "baserom.gba", 0x6108ac, 0xc + .4byte sub_819F114 + .4byte sub_819F0CC + .4byte sub_819F134 + .align 2 gUnknown_086108B8:: @ 86108B8 - .incbin "baserom.gba", 0x6108b8, 0x10 + .4byte 0x00001180, 0x00003195, 0x000001aa, 0x000021bb + .align 2 gUnknown_086108C8:: @ 86108C8 - .incbin "baserom.gba", 0x6108c8, 0x50 + window_template 0x00, 0x00, 0x02, 0x0c, 0x02, 0x0f, 0x0001 + window_template 0x02, 0x13, 0x02, 0x0b, 0x02, 0x0e, 0x0019 + window_template 0x00, 0x00, 0x0f, 0x14, 0x03, 0x0f, 0x002f + window_template 0x00, 0x15, 0x0e, 0x09, 0x06, 0x0f, 0x006b + window_template 0x00, 0x16, 0x0e, 0x08, 0x04, 0x0f, 0x00a1 + window_template 0x02, 0x15, 0x0f, 0x09, 0x05, 0x0e, 0x006b + window_template 0x02, 0x0a, 0x02, 0x04, 0x02, 0x0e, 0x00c1 + window_template 0x00, 0x13, 0x02, 0x0b, 0x02, 0x0f, 0x00c9 + window_template 0x00, 0x0f, 0x00, 0x0f, 0x02, 0x0f, 0x00df + window_template_terminator gUnknown_08610918:: @ 8610918 - .incbin "baserom.gba", 0x610918, 0xa + .byte 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x1f, 0x00 gUnknown_08610922:: @ 8610922 - .incbin "baserom.gba", 0x610922, 0x3 + .byte 0x00, 0x02, 0x00 gUnknown_08610925:: @ 8610925 - .incbin "baserom.gba", 0x610925, 0x3 + .byte 0x00, 0x04, 0x00 + .align 2 gUnknown_08610928:: @ 8610928 - .incbin "baserom.gba", 0x610928, 0x20 + .4byte 0x00000001, sub_819F20C + .4byte 0x00000001, sub_819F20C + .4byte 0x00000001, sub_819F20C + .4byte 0x00000003, sub_819F1AC + .align 2 gUnknown_08610948:: @ 8610948 - .incbin "baserom.gba", 0x610948, 0x28 + .4byte 0x00000001, sub_819F20C + .4byte 0x00000001, sub_819F20C + .4byte 0x00000001, sub_819F20C + .4byte 0x00000002, sub_819F1DC + .4byte 0x00000003, sub_819F1AC + .align 2 @ struct, eight bytes x6 for names in different languages, then 0x28 more bytes of data gUnknown_08610970:: @ 8610970 - .incbin "baserom.gba", 0x610970, 0x34 - -gUnknown_086109A4:: @ 86109A4 - .incbin "baserom.gba", 0x6109a4, 0x16 - -gUnknown_086109BA:: @ 86109BA - .incbin "baserom.gba", 0x6109ba, 0x536 + .incbin "baserom.gba", 0x610970, 0x580 + .align 2 gUnknown_08610EF0:: @ 8610EF0 - .incbin "baserom.gba", 0x610ef0, 0x100 + .4byte gText_082B7229 + .4byte gText_082B731C + .4byte gText_082B735B + .4byte gText_082B7423 + .4byte gText_082B74C1 + .4byte gText_082B756F + .4byte gText_082B75B2 + .4byte gText_082B763F + .4byte gText_082B76AC + .4byte gText_082B7772 + .4byte gText_082B77CE + .4byte gText_082B7871 + .4byte gText_082B78D4 + .4byte gText_082B7B1A + .4byte gText_082B7C13 + .4byte gText_082B7D18 + .4byte gText_082B7DD4 + .4byte gText_082B7EE5 + .4byte gText_082B7F35 + .4byte gText_082B7FE8 + .4byte gText_082B8087 + .4byte gText_082B822B + .4byte gText_082B8286 + .4byte gText_082B8356 + .4byte gText_082B83CE + .4byte gText_082B84FC + .4byte gText_082B8559 + .4byte gText_082B8656 + .4byte gText_082B86EA + .4byte gText_082B87DA + .4byte gText_082B887C + .4byte gText_082B8957 + .4byte gText_082B89C6 + .4byte gText_082B8ACF + .4byte gText_082B8B66 + .4byte gText_082B8C20 + .4byte gText_082B8CAA + .4byte gText_082B8DD3 + .4byte gText_082B8E24 + .4byte gText_082B8ED5 + .4byte gText_082B8F45 + .4byte gText_082B905F + .4byte gText_082B910E + .4byte gText_082B9204 + .4byte gText_082B929C + .4byte gText_082B9438 + .4byte gText_082B9488 + .4byte gText_082B9564 + .4byte gText_082B95D8 + .4byte gText_082B9763 + .4byte gText_082B97E5 + .4byte gText_082B989A + .4byte gText_082B992D + .4byte gText_082B9A84 + .4byte gText_082B9AB9 + .4byte gText_082B9B76 + .4byte gText_082B9BF2 + .4byte gText_082B9D83 + .4byte gText_082B9DF9 + .4byte gText_082B9EAA + .4byte gText_082B9F55 + .4byte gText_082BA084 + .4byte gText_082BA11D + .4byte gText_082BA1F3 + .align 2 gUnknown_08610FF0:: @ 8610FF0 - .incbin "baserom.gba", 0x610ff0, 0x80 + .4byte gText_082BE50D + .4byte gText_082BE5F5 + .4byte gText_082BE679 + .4byte gText_082BE71E + .4byte gText_082BE762 + .4byte gText_082BE7F8 + .4byte gText_082BE850 + .4byte gText_082BE99C + .4byte gText_082BEA1B + .4byte gText_082BEAE9 + .4byte gText_082BEB72 + .4byte gText_082BEC8E + .4byte gText_082BED16 + .4byte gText_082BEE29 + .4byte gText_082BEEB4 + .4byte gText_082BEFE2 + .4byte gText_082BF04E + .4byte gText_082BF11D + .4byte gText_082BF1A8 + .4byte gText_082BF268 + .4byte gText_082BF2D1 + .4byte gText_082BF3CF + .4byte gText_082BF46A + .4byte gText_082BF551 + .4byte gText_082BF5C3 + .4byte gText_082BF6E5 + .4byte gText_082BF773 + .4byte gText_082BF869 + .4byte gText_082BF8DD + .4byte gText_082BF9BA + .4byte gText_082BFA5A + .4byte gText_082BFB4E + .align 2 gUnknown_08611070:: @ 8611070 - .incbin "baserom.gba", 0x611070, 0x140 + .4byte gText_082BA2A3 + .4byte gText_082BA34E + .4byte gText_082BA380 + .4byte gText_082BA3D2 + .4byte gText_082BA448 + .4byte gText_082BA4D3 + .4byte gText_082BA58C + .4byte gText_082BA5BF + .4byte gText_082BA5F3 + .4byte gText_082BA635 + .4byte gText_082BA6E6 + .4byte gText_082BA742 + .4byte gText_082BA770 + .4byte gText_082BA78F + .4byte gText_082BA7D8 + .4byte gText_082BA867 + .4byte gText_082BA96B + .4byte gText_082BA9B7 + .4byte gText_082BAA1B + .4byte gText_082BAA81 + .4byte gText_082BAB22 + .4byte gText_082BAC43 + .4byte gText_082BAC78 + .4byte gText_082BAD17 + .4byte gText_082BADB6 + .4byte gText_082BAE36 + .4byte gText_082BAF4E + .4byte gText_082BAF8F + .4byte gText_082BAFDB + .4byte gText_082BB05F + .4byte gText_082BB0D4 + .4byte gText_082BB18C + .4byte gText_082BB1CE + .4byte gText_082BB242 + .4byte gText_082BB2D9 + .4byte gText_082BB370 + .4byte gText_082BB4C3 + .4byte gText_082BB4FB + .4byte gText_082BB575 + .4byte gText_082BB5E1 + .4byte gText_082BB656 + .4byte gText_082BB6E5 + .4byte gText_082BB72C + .4byte gText_082BB7A2 + .4byte gText_082BB84A + .4byte gText_082BB8CD + .4byte gText_082BB970 + .4byte gText_082BB9AE + .4byte gText_082BBA05 + .4byte gText_082BBA6C + .4byte gText_082BBB01 + .4byte gText_082BBC1C + .4byte gText_082BBC4B + .4byte gText_082BBCF6 + .4byte gText_082BBD90 + .4byte gText_082BBE0B + .4byte gText_082BBEE5 + .4byte gText_082BBF25 + .4byte gText_082BBFA4 + .4byte gText_082BC024 + .4byte gText_082BC0C8 + .4byte gText_082BC213 + .4byte gText_082BC247 + .4byte gText_082BC2DD + .4byte gText_082BC373 + .4byte gText_082BC40E + .4byte gText_082BC514 + .4byte gText_082BC555 + .4byte gText_082BC5CE + .4byte gText_082BC666 + .4byte gText_082BC714 + .4byte gText_082BC808 + .4byte gText_082BC84D + .4byte gText_082BC8EA + .4byte gText_082BC984 + .4byte gText_082BCA4D + .4byte gText_082BCB75 + .4byte gText_082BCBA6 + .4byte gText_082BCBFC + .4byte gText_082BCCA4 + .align 2 gUnknown_086111B0:: @ 86111B0 - .incbin "baserom.gba", 0x6111b0, 0x80 + .4byte gText_082BFBF2 + .4byte gText_082BFCAE + .4byte gText_082BFD26 + .4byte gText_082BFDB1 + .4byte gText_082BFE24 + .4byte gText_082BFEAD + .4byte gText_082BFF0A + .4byte gText_082C0032 + .4byte gText_082C0090 + .4byte gText_082C016E + .4byte gText_082C01F7 + .4byte gText_082C034C + .4byte gText_082C03CA + .4byte gText_082C046E + .4byte gText_082C04F9 + .4byte gText_082C0598 + .4byte gText_082C0602 + .4byte gText_082C06D8 + .4byte gText_082C074A + .4byte gText_082C0809 + .4byte gText_082C086E + .4byte gText_082C0982 + .4byte gText_082C0A1D + .4byte gText_082C0AFD + .4byte gText_082C0B6F + .4byte gText_082C0C7D + .4byte gText_082C0D0B + .4byte gText_082C0DFE + .4byte gText_082C0E71 + .4byte gText_082C0F6D + .4byte gText_082C1003 + .4byte gText_082C1122 + .align 2 gUnknown_08611230:: @ 8611230 - .incbin "baserom.gba", 0x611230, 0x80 + .4byte gText_082BCD68 + .4byte gText_082BCE64 + .4byte gText_082BCEF2 + .4byte gText_082BCF61 + .4byte gText_082BCFA1 + .4byte gText_082BD03C + .4byte gText_082BD06D + .4byte gText_082BD18A + .4byte gText_082BD222 + .4byte gText_082BD325 + .4byte gText_082BD3B1 + .4byte gText_082BD493 + .4byte gText_082BD51C + .4byte gText_082BD609 + .4byte gText_082BD697 + .4byte gText_082BD797 + .4byte gText_082BD806 + .4byte gText_082BD8F5 + .4byte gText_082BD9BE + .4byte gText_082BDAE1 + .4byte gText_082BDB4E + .4byte gText_082BDC6B + .4byte gText_082BDD0D + .4byte gText_082BDDEC + .4byte gText_082BDE68 + .4byte gText_082BDF4D + .4byte gText_082BDFD8 + .4byte gText_082BE0FD + .4byte gText_082BE189 + .4byte gText_082BE2A5 + .4byte gText_082BE33E + .4byte gText_082BE46C + .align 2 gUnknown_086112B0:: @ 86112B0 - .incbin "baserom.gba", 0x6112b0, 0x80 + .4byte gText_082C11D1 + .4byte gText_082C12D5 + .4byte gText_082C13AB + .4byte gText_082C1444 + .4byte gText_082C1501 + .4byte gText_082C15B6 + .4byte gText_082C165E + .4byte gText_082C174F + .4byte gText_082C1862 + .4byte gText_082C19A0 + .4byte gText_082C1A76 + .4byte gText_082C1C16 + .4byte gText_082C1CF5 + .4byte gText_082C1DC1 + .4byte gText_082C1EDC + .4byte gText_082C1FEC + .4byte gText_082C20D1 + .4byte gText_082C21FF + .4byte gText_082C231C + .4byte gText_082C2407 + .4byte gText_082C24B5 + .4byte gText_082C25B1 + .4byte gText_082C2707 + .4byte gText_082C27D4 + .4byte gText_082C28D6 + .4byte gText_082C2A0B + .4byte gText_082C2B50 + .4byte gText_082C2C77 + .4byte gText_082C2D67 + .4byte gText_082C2E41 + .4byte gText_082C2EF5 + .4byte gText_082C3023 + .align 2 gUnknown_08611330:: @ 8611330 - .incbin "baserom.gba", 0x611330, 0x40 + .4byte gText_082B6EA5 + .4byte gText_082B6EEC + .4byte gText_082B6F16 + .4byte gText_082B6F4C + .4byte gText_082B6F92 + .4byte gText_082B6FC9 + .4byte gText_082B700C + .4byte gText_082B703A + .4byte gText_082B706A + .4byte gText_082B709C + .4byte gText_082B70CC + .4byte gText_082B710A + .4byte gText_082B714D + .4byte gText_082B7185 + .4byte gText_082B71C1 + .4byte gText_082B71F9 gUnknown_08611370:: @ 8611370 - .incbin "baserom.gba", 0x611370, 0x163 + .byte 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00 + .byte 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01 + .byte 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01 + .byte 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01 + .byte 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01 + .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 + .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01 + .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 + .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 + .byte 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 + .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01 + .byte 0x01, 0x01, 0x01 gUnknown_086114D3:: @ 86114D3 - .incbin "baserom.gba", 0x6114d3, 0xd + .byte 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00 + .align 2 gUnknown_086114E0:: @ 86114E0 - .incbin "baserom.gba", 0x6114e0, 0x68 + .4byte sub_81A093C + .4byte sub_81A0964 + .4byte sub_81A0978 + .4byte sub_819FC60 + .4byte sub_81A0984 + .4byte sub_81A0990 + .4byte sub_81A09D0 + .4byte sub_81A0A20 + .4byte sub_81A0C9C + .4byte sub_81A087C + .4byte sub_81A1638 + .4byte sub_81A0CC0 + .4byte sub_81A09B4 + .4byte sub_81A0D40 + .4byte sub_81A0DD4 + .4byte sub_81A0FE4 + .4byte sub_81A0FFC + .4byte sub_81A0D80 + .4byte sub_81A11F8 + .4byte sub_81A1218 + .4byte sub_81A1224 + .4byte sub_81A1438 + .4byte sub_81A150C + .4byte sub_81A15A4 + .4byte sub_81A1644 + .4byte sub_81A1370 + .align 2 gUnknown_08611548:: @ 8611548 - .incbin "baserom.gba", 0x611548, 0x8 + .byte 0x00, 0x01, 0x02, 0x03, 0x06, 0x07, 0x08, 0x09 + .align 2 gUnknown_08611550:: @ 8611550 - .incbin "baserom.gba", 0x611550, 0x1c + .byte 0x23, 0x46, 0x23, 0x01, 0x04, 0x09, 0x05, 0x00, 0x15, 0x2a, 0x15, 0x01, 0x1c, 0x38, 0x1c, 0x01, 0x15, 0x2a, 0x15, 0x01, 0x1c, 0x8c, 0x38, 0x01, 0x15, 0x46, 0x23, 0x00 + .align 2 gUnknown_0861156C:: @ 861156C - .incbin "baserom.gba", 0x61156c, 0xc + .byte 0x41, 0x00, 0xb3, 0x00, 0x18, 0x0f, 0x6a, 0x00, 0x98, 0x98, 0x64, 0x00 + .align 2 gUnknown_08611578:: @ 8611578 - .incbin "baserom.gba", 0x611578, 0x33c + .2byte 0x0009, 0x0007, 0x0008, 0x0032, 0x00f4, 0x008d, 0x0118, 0x9864, 0x0098, 0x0664, 0x007e, 0x015b, 0x00d8, 0x002e, 0x008f, 0x00b7 + .2byte 0x0318, 0x9898, 0x0000, 0x646a, 0x0022, 0x00bb, 0x0119, 0x00f7, 0x00f3, 0x008d, 0x0f1f, 0x009e, 0x64fc, 0x0000, 0x0055, 0x015b + .2byte 0x0073, 0x009c, 0x0198, 0x00b3, 0x0f1f, 0x00fc, 0x06fc, 0x0000, 0x005e, 0x015b, 0x0069, 0x0151, 0x008f, 0x0086, 0x031f, 0xfcfc + .2byte 0x0000, 0x0006, 0x00ae, 0x00d8, 0x009c, 0x00f7, 0x011d, 0x00c4, 0x0214, 0x9898, 0x006a, 0x0064, 0x0039, 0x0059, 0x003a, 0x0044 + .2byte 0x018d, 0x008d, 0x0314, 0x9898, 0x646a, 0x0000, 0x0059, 0x0118, 0x0151, 0x014c, 0x0006, 0x00b4, 0x1114, 0x9864, 0x986a, 0x0000 + .2byte 0x013b, 0x009d, 0x014c, 0x0059, 0x011d, 0x00c8, 0x021f, 0xfcfc, 0x0006, 0x0000, 0x0039, 0x0059, 0x003a, 0x00f3, 0x0190, 0x00b7 + .2byte 0x021f, 0xfcfc, 0x0006, 0x0000, 0x005e, 0x0135, 0x0059, 0x00b6, 0x0197, 0x0086, 0x0f1f, 0x00fc, 0x06fc, 0x0000, 0x0055, 0x005e + .2byte 0x015b, 0x009c, 0x00a9, 0x00b3, 0x0310, 0x0098, 0x9800, 0x6a64, 0x006d, 0x0068, 0x005c, 0x0013, 0x016e, 0x00c6, 0x0010, 0x9898 + .2byte 0x6a00, 0x0064, 0x0059, 0x00cf, 0x00f7, 0x0118, 0x0083, 0x00b7, 0x1110, 0x0000, 0x00fc, 0x986a, 0x003a, 0x0020, 0x006d, 0x00b6 + .2byte 0x003b, 0x00b4, 0x0b1f, 0xfc06, 0x00fc, 0x0000, 0x013b, 0x00f5, 0x002e, 0x00b6, 0x016e, 0x00c6, 0x001f, 0xfc06, 0xfc00, 0x0000 + .2byte 0x003f, 0x0059, 0x00f7, 0x0119, 0x00f5, 0x00bb, 0x0b1f, 0x00fc, 0x06fc, 0x0000, 0x003b, 0x0039, 0x002c, 0x015b, 0x00d6, 0x00aa + .2byte 0x0d14, 0x986a, 0x9800, 0x6400, 0x00e0, 0x013d, 0x00cb, 0x00b3, 0x00c5, 0x00c8, 0x1414, 0x0098, 0x0064, 0x6a98, 0x0022, 0x006d + .2byte 0x005e, 0x00b9, 0x012f, 0x00b3, 0x0314, 0xfc00, 0xfc06, 0x0000, 0x00f7, 0x00d8, 0x006d, 0x014c, 0x00c5, 0x0086, 0x141f, 0x00fc + .2byte 0x0000, 0x06fc, 0x0026, 0x006d, 0x009c, 0x005e, 0x005e, 0x00c8, 0x0f1f, 0x00fc, 0x00fc, 0x0006, 0x005e, 0x005f, 0x008a, 0x00c2 + .2byte 0x0133, 0x008d, 0x0d1f, 0xfc06, 0xfc00, 0x0000, 0x0093, 0x0108, 0x00ca, 0x001d, 0x018f, 0x008e, 0x021f, 0xfc00, 0x00fc, 0x0006 + .2byte 0x0071, 0x005e, 0x0073, 0x00e8, 0x00e3, 0x008e, 0x081f, 0x00fc, 0x0000, 0xfc06, 0x005c, 0x014c, 0x00b6, 0x00d3, 0x0180, 0x008e + .2byte 0x031f, 0xfc00, 0x0000, 0x06fc, 0x0055, 0x00b6, 0x004c, 0x0151, 0x018f, 0x008e, 0x021f, 0xfc00, 0x00fc, 0x0006, 0x0071, 0x005e + .2byte 0x0073, 0x00e8, 0x00e3, 0x008e, 0x081f, 0x00fc, 0x0000, 0xfc06, 0x005c, 0x014c, 0x00b6, 0x00d3, 0x0180, 0x008e, 0x031f, 0xfc00 + .2byte 0x0000, 0x06fc, 0x0055, 0x00b6, 0x004c, 0x0151, 0x017b, 0x00b7, 0x0210, 0x00fc, 0x00fc, 0x0006, 0x00cf, 0x00f2, 0x0131, 0x00ca + .2byte 0x00d5, 0x0086, 0x0510, 0x00fc, 0x0000, 0xfc6a, 0x005c, 0x00c9, 0x00b6, 0x009c, 0x0149, 0x00c8, 0x0f10, 0x0098, 0x0064, 0x6a98 + .2byte 0x003a, 0x00f3, 0x0039, 0x0069, 0x017b, 0x00c4, 0x051f, 0x00fc, 0x0000, 0x06fc, 0x00cf, 0x00f2, 0x00bc, 0x00ca, 0x00d0, 0x00b3 + .2byte 0x021f, 0x00fc, 0x0000, 0xfc06, 0x0059, 0x009d, 0x0099, 0x0067, 0x0082, 0x0086, 0x031f, 0x06fc, 0x0000, 0xfc00, 0x015d, 0x00d8 + .2byte 0x002e, 0x009c, 0x0191, 0x00b7, 0x0310, 0x9898, 0x0000, 0x646a, 0x0099, 0x0114, 0x0059, 0x00f6, 0x0193, 0x00c8, 0x0310, 0x9898 + .2byte 0x0000, 0xc806, 0x0059, 0x00e8, 0x005c, 0x014e, 0x0192, 0x0086, 0x0f10, 0x006a, 0x0098, 0x9864, 0x003a, 0x0085, 0x0057, 0x009c + .2byte 0x0090, 0x00c6, 0x101f, 0x0006, 0xfcfc, 0x0000, 0x003b, 0x0160, 0x014c, 0x0073, 0x0091, 0x008d, 0x101f, 0x0006, 0xfcfc, 0x0000 + .2byte 0x0057, 0x00c5, 0x0041, 0x0071, 0x0092, 0x00b3, 0x101f, 0x0006, 0xfcfc, 0x0000, 0x007e, 0x003f, 0x014c, 0x00db gUnknown_086118B4:: @ 86118B4 - .incbin "baserom.gba", 0x6118b4, 0x348 + .byte 0x01, 0x02, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x04, 0x05, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x04, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x02, 0x03, 0x04, 0x04 + .byte 0x01, 0x01, 0x00, 0x00, 0x04, 0x05, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x04, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x03, 0x04, 0x05, 0x05, 0x02, 0x02, 0x00, 0x00 + .byte 0x05, 0x06, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x04, 0x05, 0x06, 0x06, 0x02, 0x02, 0x00, 0x00, 0x05, 0x06, 0x00, 0x00 + .byte 0x02, 0x00, 0x00, 0x00, 0x04, 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x05, 0x06, 0x07, 0x07, 0x03, 0x03, 0x00, 0x00, 0x06, 0x07, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 + .byte 0x05, 0x06, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x06, 0x07, 0x08, 0x08, 0x03, 0x03, 0x00, 0x00, 0x06, 0x07, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x05, 0x06, 0x00, 0x00 + .byte 0x04, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x08, 0x09, 0x09, 0x04, 0x04, 0x00, 0x00, 0x07, 0x08, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x07, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 + .byte 0x08, 0x00, 0x00, 0x00, 0x08, 0x09, 0x0a, 0x0a, 0x04, 0x04, 0x00, 0x00, 0x07, 0x08, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x07, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00 + .byte 0x09, 0x0a, 0x0b, 0x0b, 0x05, 0x05, 0x00, 0x00, 0x08, 0x09, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x07, 0x08, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0c, 0x0c + .byte 0x05, 0x05, 0x00, 0x00, 0x08, 0x09, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x07, 0x08, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0b, 0x0c, 0x0d, 0x0d, 0x06, 0x06, 0x00, 0x00 + .byte 0x09, 0x0a, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x08, 0x09, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0c, 0x0d, 0x0e, 0x0e, 0x06, 0x06, 0x00, 0x00, 0x09, 0x0a, 0x00, 0x00 + .byte 0x06, 0x00, 0x00, 0x00, 0x08, 0x09, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x0e, 0x0f, 0x0f, 0x07, 0x07, 0x00, 0x00, 0x0a, 0x0b, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00 + .byte 0x09, 0x0a, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x0e, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x00, 0x00, 0x0a, 0x0b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x09, 0x0a, 0x00, 0x00 + .byte 0x0a, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x08, 0x08, 0x00, 0x00, 0x0b, 0x0c, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00 + .byte 0x0c, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x08, 0x08, 0x00, 0x00, 0x0b, 0x0c, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00 + .byte 0x0f, 0x0f, 0x0f, 0x0f, 0x09, 0x09, 0x00, 0x00, 0x0c, 0x0d, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x0b, 0x0c, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f + .byte 0x09, 0x09, 0x00, 0x00, 0x0c, 0x0d, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0b, 0x0c, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0a, 0x0a, 0x00, 0x00 + .byte 0x0d, 0x0e, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x0c, 0x0d, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0a, 0x0a, 0x00, 0x00, 0x0d, 0x0e, 0x00, 0x00 + .byte 0x0e, 0x00, 0x00, 0x00, 0x0c, 0x0d, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0b, 0x0b, 0x00, 0x00, 0x0e, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00 + .byte 0x0d, 0x0e, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0b, 0x0b, 0x00, 0x00, 0x0e, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0d, 0x0e, 0x00, 0x00 + .byte 0x0e, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0c, 0x0c, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0e, 0x0f, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00 + .byte 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0c, 0x0c, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0e, 0x0f, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00 + .byte 0x0f, 0x0f, 0x0f, 0x0f, 0x0d, 0x0d, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f + .byte 0x0d, 0x0d, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0e, 0x0e, 0x00, 0x00 + .byte 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0e, 0x0e, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00 + .byte 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00 + .byte 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00 + .byte 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00 + .align 2 gUnknown_08611BFC:: @ 8611BFC - .incbin "baserom.gba", 0x611bfc, 0x1c + .2byte 0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080, 0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000 + .align 2 gUnknown_08611C18:: @ 8611C18 - .incbin "baserom.gba", 0x611c18, 0x5c + .4byte sub_81A17A0 + .4byte sub_81A1830 + .4byte sub_81A1968 + .4byte sub_81A1AD4 + .4byte sub_81A1B1C + .4byte sub_81A1B28 + .4byte sub_81A1B38 + .4byte sub_81A1B98 + .4byte sub_81A31FC + .4byte sub_81A35EC + .4byte sub_81A3B00 + .4byte sub_81A3B64 + .4byte sub_81A3D30 + .4byte sub_81A3D58 + .4byte sub_81A3DA0 + .4byte sub_81A3FD4 + .4byte sub_81A4224 + .4byte sub_81A4230 + .4byte sub_81A43A8 + .4byte sub_81A4410 + .4byte sub_81A443C + .4byte sub_81A447C + .4byte sub_81A457C + .align 2 gUnknown_08611C74:: @ 8611C74 - .incbin "baserom.gba", 0x611c74, 0x8 + window_template 0x00, 0x01, 0x01, 0x1c, 0x12, 0x0f, 0x0001 + .align 2 gUnknown_08611C7C:: @ 8611C7C - .incbin "baserom.gba", 0x611c7c, 0x8 + window_template 0x00, 0x02, 0x02, 0x1a, 0x0f, 0x0f, 0x0001 + .align 2 gUnknown_08611C84:: @ 8611C84 - .incbin "baserom.gba", 0x611c84, 0x8 + window_template 0x00, 0x02, 0x01, 0x1a, 0x11, 0x0f, 0x0001 gUnknown_08611C8C:: @ 8611C8C - .incbin "baserom.gba", 0x611c8c, 0xe + .byte 0x46, 0x01, 0x47, 0x00, 0x49, 0x00, 0x48, 0x01, 0x4a, 0x00, 0x4b, 0x01, 0xea, 0x00 gUnknown_08611C9A:: @ 8611C9A - .incbin "baserom.gba", 0x611c9a, 0x16 + .2byte 0x0097, 0x0096, 0x00fa, 0x00f9, 0x00fb, 0x0194, 0x0195, 0x0196, 0x0199, 0x019a, 0xffff + .align 2 gUnknown_08611CB0:: @ 8611CB0 - .incbin "baserom.gba", 0x611cb0, 0x50 + .4byte gText_BattleTower2 + .4byte gUnknown_085ED164 + .4byte gText_BattleTower2 + .4byte gUnknown_085ED170 + .4byte gText_BattleTower2 + .4byte gUnknown_085ED17C + .4byte gText_BattleDome + .4byte gUnknown_085ED164 + .4byte gText_BattlePalace + .4byte gUnknown_085ED164 + .4byte gText_BattleArena + .4byte gUnknown_085ED190 + .4byte gText_BattleFactory + .4byte gUnknown_085ED164 + .4byte gText_BattlePike + .4byte gUnknown_085ED190 + .4byte gText_BattlePyramid + .4byte gUnknown_085ED190 + .4byte gText_BattleTower2 + .4byte gUnknown_085ED188 + .align 2 gUnknown_08611D00:: @ 8611D00 - .incbin "baserom.gba", 0x611d00, 0x8 + .4byte gUnknown_085EE3B0 + .4byte gUnknown_085EE3B8 + .align 2 gUnknown_08611D08:: @ 8611D08 - .incbin "baserom.gba", 0x611d08, 0x28 - + .4byte gUnknown_085EE3C4 + .4byte gUnknown_085EE3C4 + .4byte gUnknown_085EE3C4 + .4byte gUnknown_085EE3D4 + .4byte gUnknown_085EE3C4 + .4byte gUnknown_085EE3FC + .4byte gUnknown_085EE3C4 + .4byte gUnknown_085EE3E8 + .4byte gUnknown_085EE410 + .4byte gUnknown_085EE3C4 + + .align 1 gUnknown_08611D30:: @ 8611D30 - .incbin "baserom.gba", 0x611d30, 0x80 + .2byte 0x0325, 0x0326, 0x0327, 0x0328, 0x0329, 0x032a, 0x032b, 0x0000 + + .align 2 +gUnknown_08611D40:: @ 8611D40 + .4byte gText_082C843F + .4byte gText_082C848B + .4byte gText_082C8628 + .4byte gText_082C85B4 + .4byte gText_082C8512 + .4byte gText_082C859D + .4byte gText_082C86C3 + + .align 2 +gUnknown_08611D5C:: @ 8611D5C + .4byte gText_082C8458 + .4byte gText_082C84C1 + .4byte gText_082C8662 + .4byte gText_082C85E3 + .4byte gText_082C853B + .4byte gText_082C85A4 + .4byte gText_082C86FE + + .align 2 +gUnknown_08611D78:: @ 8611D78 + .4byte gText_082C846C + .4byte gText_082C84D0 + .4byte gText_082C8682 + .4byte gText_082C85F5 + .4byte gText_082C8561 + .4byte gText_082C85A9 + .4byte gText_082C8739 + + .align 2 +gUnknown_08611D94:: @ 8611D94 + .4byte gText_082C8480 + .4byte gText_082C84F7 + .4byte gText_082C86B3 + .4byte gText_082C8611 + .4byte gText_082C8589 + .4byte gText_082C85AE + .4byte gText_082C877B + .align 2 gUnknown_08611DB0:: @ 8611DB0 - .incbin "baserom.gba", 0x611db0, 0x8 + .4byte gUnknown_08611D40 + .4byte gUnknown_08611D78 + .align 2 gUnknown_08611DB8:: @ 8611DB8 - .incbin "baserom.gba", 0x611db8, 0x8 + .4byte gUnknown_08611D5C + .4byte gUnknown_08611D94 @ 8611DC0 .include "data/battle_frontier/battle_arena_move_mind_ratings.inc" .align 2 -@ 8611F24 - .incbin "baserom.gba", 0x611f24, 0x38 +gUnknown_08611F24:: @ 8611F24 + .byte 0x00, 0x00, 0x00, 0x40, 0x00, 0xf0, 0x00, 0x00 + .align 2 +gUnknown_08611F2C:: @ 8611F2C + .2byte 0x0000, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_08611F34:: @ 8611F34 + .2byte 0x0004, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_08611F3C:: @ 8611F3C + .2byte 0x0008, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_08611F44:: @ 8611F44 + .2byte 0x000c, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_08611F4C:: @ 8611F4C + .4byte gUnknown_08611F2C + .4byte gUnknown_08611F34 + .4byte gUnknown_08611F3C + .4byte gUnknown_08611F44 + + .align 2 gUnknown_08611F5C:: @ 8611F5C - .incbin "baserom.gba", 0x611f5c, 0x18 + spr_template 0x03e8, 0xffff, gUnknown_08611F24, gUnknown_08611F4C, NULL, gDummySpriteAffineAnimTable, sub_81A5698 + .align 2 gUnknown_08611F74:: @ 8611F74 - .incbin "baserom.gba", 0x611f74, 0x10 + obj_tiles gUnknown_08D854E8, 0x0200, 0x03e8 + null_obj_tiles + .align 2 gUnknown_08611F84:: @ 8611F84 - .incbin "baserom.gba", 0x611f84, 0x1c - + .4byte sub_81A58B4 + .4byte sub_81A5964 + .4byte sub_81A59FC + .4byte sub_81A5AC4 + .4byte sub_81A5B08 + .4byte sub_81A5B88 + .4byte sub_81A5BE0 + + .align 1 gUnknown_08611FA0:: @ 8611FA0 - .incbin "baserom.gba", 0x611fa0, 0xc + .2byte 0x003f, 0x0040, 0x0041, 0x0043, 0x0042, 0x0046 + .align 1 gUnknown_08611FAC:: @ 8611FAC - .incbin "baserom.gba", 0x611fac, 0x14 + .2byte 0x00b3, 0x00b4, 0x00b7, 0x00c8, 0x00b9, 0x00bb, 0x00c4, 0x00c6, 0x00ba, 0x0000 @ 8611FC0 .include "data/battle_frontier/battle_factory_style_move_lists.inc" + .align 2 gUnknown_08612120:: @ 8612120 - .incbin "baserom.gba", 0x612120, 0x44 + .4byte sub_81A5E94 + .4byte sub_81A5FA8 + .4byte sub_81A6054 + .4byte sub_81A613C + .4byte nullsub_75 + .4byte nullsub_123 + .4byte sub_81A6188 + .4byte sub_81A6198 + .4byte sub_81A61A4 + .4byte sub_81A63CC + .4byte sub_81A64C4 + .4byte sub_81A63B8 + .4byte sub_81A61B0 + .4byte sub_81A67EC + .4byte sub_81A6A08 + .4byte sub_81A6AEC + .4byte sub_81A6C1C + .align 2 gUnknown_08612164:: @ 8612164 - .incbin "baserom.gba", 0x612164, 0x10 + .4byte 0x00000100, 0x00000200, 0x01000000, 0x02000000 + .align 2 gUnknown_08612174:: @ 8612174 - .incbin "baserom.gba", 0x612174, 0x10 + .4byte 0xfffffeff, 0xfffffdff, 0xfeffffff, 0xfdffffff gUnknown_08612184:: @ 8612184 - .incbin "baserom.gba", 0x612184, 0x10 + .byte 0x03, 0x06, 0x06, 0x09, 0x09, 0x0c, 0x0c, 0x0f, 0x0f, 0x12, 0x15, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f + .align 1 gUnknown_08612194:: @ 8612194 - .incbin "baserom.gba", 0x612194, 0x180 + .2byte 0x006e, 0x00c7, 0x00a2, 0x010a, 0x010b, 0x0173, 0x0174, 0x01d3, 0x01d4, 0x0233, 0x0234, 0x0293, 0x0294, 0x02f3, 0x0174, 0x0351 + .2byte 0x0174, 0x01d3, 0x01d4, 0x0233, 0x0234, 0x0293, 0x0294, 0x02f3, 0x0174, 0x0371, 0x0174, 0x0371, 0x0174, 0x0371, 0x0174, 0x0371 + + .align 1 +gUnknown_086121D4:: @ 86121D4 + .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0022, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x0039, 0x016a, 0x0005, 0x0105, 0x00d4 + .2byte 0x005c, 0x0145 + + .align 1 +gUnknown_086121F8:: @ 86121F8 + .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0022, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x0039, 0x0065, 0x0005, 0x0099, 0x0078 + .2byte 0x0057, 0x005c + + .align 1 +gUnknown_0861221C:: @ 861221C + .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0022, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x0039, 0x0133, 0x0005, 0x0093, 0x004e + .2byte 0x004d, 0x00ed + + .align 1 +gUnknown_08612240:: @ 8612240 + .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0022, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x0039, 0x00ca, 0x0005, 0x0044, 0x00f3 + .2byte 0x00db, 0x00c2 + + .align 2 +gUnknown_08612264:: @ 8612264 + .4byte gUnknown_086121D4 + .4byte gUnknown_086121F8 + .4byte gUnknown_0861221C + .4byte gUnknown_08612240 + + .align 1 +gUnknown_08612274:: @ 8612274 + .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0131, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x003a, 0x016a, 0x0005, 0x0105, 0x00d4 + .2byte 0x005c, 0x003a + + .align 1 +gUnknown_08612298:: @ 8612298 + .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0131, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x003a, 0x0065, 0x0005, 0x0099, 0x0078 + .2byte 0x0057, 0x005c + + .align 1 +gUnknown_086122BC:: @ 86122BC + .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0131, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x003a, 0x0133, 0x0005, 0x0093, 0x004e + .2byte 0x004d, 0x00ed + + .align 1 +gUnknown_086122E0:: @ 86122E0 + .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0131, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x003a, 0x00ca, 0x0005, 0x0044, 0x00f3 + .2byte 0x00db, 0x00e3 + + .align 2 +gUnknown_08612304:: @ 8612304 + .4byte gUnknown_08612274 + .4byte gUnknown_08612298 + .4byte gUnknown_086122BC + .4byte gUnknown_086122E0 + .align 2 gUnknown_08612314:: @ 8612314 - .incbin "baserom.gba", 0x612314, 0x8 + .4byte gUnknown_08612264 + .4byte gUnknown_08612304 + .align 2 gUnknown_0861231C:: @ 861231C - .incbin "baserom.gba", 0x61231c, 0xc8 + .2byte 0x0012 + .byte 0x03, 0x05, 0x06 + + .align 2 + .2byte 0x0005 + .byte 0x0d, 0x20, 0x25 + + .align 2 + .2byte 0x0011 + .byte 0x08, 0x0b, 0x0c + + .align 2 + .2byte 0x0024 + .byte 0x22, 0x1e, 0x21 + + .align 2 + .2byte 0x0015 + .byte 0x00, 0x00, 0x00 + + .align 2 + .2byte 0x001e + .byte 0x01, 0x01, 0x01 + + .align 2 + .2byte 0x002c + .byte 0x16, 0x17, 0x1b + + .align 2 + .2byte 0x0037 + .byte 0x08, 0x16, 0x1f + + .align 2 + .2byte 0x000e + .byte 0x0d, 0x27, 0x15 + + .align 2 + .2byte 0x0014 + .byte 0x02, 0x04, 0x11 + + .align 2 + .2byte 0x0038 + .byte 0x1e, 0x14, 0x24 + + .align 2 + .2byte 0x0042 + .byte 0x1c, 0x22, 0x19 + .align 2 + .2byte 0x0026 + .byte 0x17, 0x26, 0x1a + + .align 2 + .2byte 0x0032 + .byte 0x17, 0x1e, 0x0b + + .align 2 + .2byte 0x002f + .byte 0x0f, 0x13, 0x0e + + .align 2 + .2byte 0x0027 + .byte 0x02, 0x1d, 0x1a + + .align 2 + .2byte 0x0033 + .byte 0x25, 0x0c, 0x20 + + .align 2 + .2byte 0x0021 + .byte 0x18, 0x17, 0x26 + + .align 2 + .2byte 0x0018 + .byte 0x05, 0x16, 0x04 + + .align 2 + .2byte 0x000b + .byte 0x29, 0x25, 0x23 + + .align 2 + .2byte 0x0035 + .byte 0x27, 0x0e, 0x0d + + .align 2 + .2byte 0x0030 + .byte 0x0a, 0x07, 0x09 + + .align 2 + .2byte 0x000c + .byte 0x28, 0x14, 0x10 + + .align 2 + .2byte 0x0034 + .byte 0x12, 0x0d, 0x15 + + .align 2 + .2byte 0x0013 + .byte 0x16, 0x1f, 0x1b + + .align 2 gUnknown_086123E4:: @ 86123E4 - .incbin "baserom.gba", 0x6123e4, 0x1f8 + .byte 0x29, 0x0a, 0x30, 0x06, 0x01, 0x0a, 0x0f, 0x14, 0x20, 0x10, 0x0e, 0x27 + .byte 0x2a, 0x0a, 0x1d, 0x08, 0x1b, 0x06, 0x34, 0x10, 0x20, 0x1e, 0x29, 0x0a + .byte 0x22, 0x1e, 0x31, 0x12, 0x01, 0x0a, 0x18, 0x10, 0x1a, 0x1c, 0x03, 0x0c + .byte 0x0f, 0x1e, 0x0b, 0x10, 0x39, 0x10, 0x0f, 0x20, 0x2b, 0x10, 0x14, 0x0a + .byte 0x3b, 0x10, 0x02, 0x0a, 0x1e, 0x16, 0x20, 0x10, 0x3e, 0x14, 0x03, 0x0c + .byte 0x31, 0x0a, 0x02, 0x0e, 0x15, 0x0e, 0x36, 0x14, 0x37, 0x10, 0x0a, 0x1e + .byte 0x29, 0x0a, 0x25, 0x10, 0x2a, 0x14, 0x34, 0x10, 0x0f, 0x1e, 0x1b, 0x0a + .byte 0x01, 0x0a, 0x07, 0x0e, 0x2a, 0x12, 0x0f, 0x1e, 0x1f, 0x06, 0xff, 0xff + .byte 0x35, 0x1a, 0x36, 0x10, 0x0f, 0x0e, 0x01, 0x0a, 0x21, 0x26, 0x0f, 0x1e + .byte 0x25, 0x0e, 0x2f, 0x10, 0x2d, 0x06, 0x1e, 0x20, 0x03, 0x0c, 0xff, 0xff + .byte 0x1d, 0x0c, 0x1d, 0x08, 0x2b, 0x0a, 0x0f, 0x10, 0x02, 0x0a, 0x03, 0x0c + .byte 0x2a, 0x0a, 0x3e, 0x0a, 0x00, 0x20, 0x27, 0x10, 0x08, 0x1c, 0x04, 0x0c + .byte 0x01, 0x0a, 0x12, 0x12, 0x01, 0x0a, 0x00, 0x10, 0x2d, 0x06, 0xff, 0xff + .byte 0x22, 0x1e, 0x31, 0x12, 0x01, 0x0a, 0x18, 0x10, 0x1c, 0x1c, 0x03, 0x0c + .byte 0x01, 0x0a, 0x0b, 0x06, 0x30, 0x10, 0x28, 0x0a, 0x49, 0x25, 0x24, 0x06 + .byte 0x14, 0x10, 0x2c, 0x0a, 0x15, 0x04, 0x42, 0x16, 0x1b, 0x1e, 0x03, 0x0c + .byte 0x28, 0x06, 0x0f, 0x1a, 0x0b, 0x10, 0x17, 0x20, 0x00, 0x0c, 0xff, 0xff + .byte 0x01, 0x0a, 0x15, 0x10, 0x47, 0x16, 0x0f, 0x1e, 0x39, 0x0e, 0x36, 0x0e + .byte 0x01, 0x0a, 0x17, 0x10, 0x20, 0x16, 0x19, 0x0e, 0x31, 0x0a, 0x38, 0x0c + .byte 0x1d, 0x0c, 0x1d, 0x08, 0x00, 0x0c, 0x22, 0x10, 0x12, 0x1c, 0x0b, 0x02 + .byte 0x29, 0x10, 0x04, 0x14, 0x2f, 0x10, 0x06, 0x10, 0x28, 0x1e, 0x1c, 0x1c + .byte 0x29, 0x10, 0x20, 0x0e, 0x28, 0x10, 0x16, 0x1c, 0x29, 0x1e, 0x03, 0x0c + .byte 0x0f, 0x1e, 0x0b, 0x10, 0x2f, 0x0e, 0x38, 0x06, 0x0c, 0x10, 0xff, 0xff + .byte 0x29, 0x0a, 0x08, 0x14, 0x2f, 0x10, 0x1e, 0x06, 0x2c, 0x10, 0xff, 0xff + .byte 0x23, 0x10, 0x0b, 0x10, 0x1d, 0x08, 0x2d, 0x06, 0x37, 0x10, 0x14, 0x0a + .byte 0x29, 0x0a, 0x22, 0x10, 0x08, 0x14, 0x2f, 0x10, 0x1e, 0x16, 0x29, 0x10 + .byte 0x01, 0x06, 0x2c, 0x10, 0x01, 0x0a, 0x15, 0x10, 0x39, 0x0e, 0x36, 0x0e + .byte 0x20, 0x10, 0x0b, 0x02, 0x3f, 0x10, 0x12, 0x1c, 0x04, 0x0c, 0xff, 0xff + .byte 0x18, 0x10, 0x02, 0x0a, 0x3a, 0x10, 0x46, 0x04, 0x0e, 0x02, 0x03, 0x0c + .byte 0x10, 0x1e, 0x0b, 0x02, 0x0a, 0x1e, 0x0b, 0x10, 0x3a, 0x06, 0xff, 0xff + .byte 0x02, 0x0a, 0x12, 0x12, 0x0f, 0x1e, 0x0b, 0x10, 0x38, 0x06, 0x03, 0x0c + .byte 0x22, 0x1e, 0x00, 0x10, 0x1b, 0x16, 0x3f, 0x10, 0x0f, 0x1e, 0x03, 0x0c + .byte 0x29, 0x0a, 0x1e, 0x0e, 0x25, 0x10, 0x26, 0x1e, 0x00, 0x0c, 0xff, 0xff + .byte 0x01, 0x0a, 0x1e, 0x0e, 0x36, 0x12, 0x2f, 0x10, 0x0b, 0x12, 0x04, 0x0c + .byte 0x05, 0x28, 0x0f, 0x1e, 0x1b, 0x0a, 0x0b, 0x10, 0x20, 0x10, 0x3b, 0x06 + .byte 0x01, 0x0a, 0x1f, 0x10, 0x3e, 0x0a, 0x37, 0x10, 0x20, 0x10, 0x28, 0x06 + .byte 0x26, 0x10, 0x31, 0x0a, 0x29, 0x1e, 0x1c, 0x1c, 0x01, 0x0a, 0x12, 0x12 + .byte 0x0a, 0x0c, 0x00, 0x0c, 0x29, 0x10, 0x1c, 0x10, 0x0f, 0x1e, 0x23, 0x0c + .byte 0x28, 0x0a, 0x0e, 0x02, 0x0f, 0x10, 0x39, 0x10, 0x2a, 0x14, 0x04, 0x0c + .byte 0x28, 0x0a, 0x0e, 0x02, 0x0f, 0x10, 0x20, 0x06, 0x2f, 0x10, 0x3c, 0x04 + .byte 0x39, 0x0c, 0x39, 0x0c, 0x00, 0x0c, 0x29, 0x0a, 0x17, 0x20, 0x39, 0x0c + .byte 0x5c, 0x26, 0x0b, 0x10, 0x20, 0x10, 0x30, 0x12, 0x05, 0x1e, 0x0c, 0x10 gUnknown_086125DC:: @ 86125DC - .incbin "baserom.gba", 0x6125dc, 0x1c + .byte 0x23, 0x46, 0x23, 0x01, 0x04, 0x09, 0x05, 0x00, 0x15, 0x2a, 0x15, 0x01, 0x1c, 0x38, 0x1c, 0x01, 0x15, 0x2a, 0x15, 0x01, 0x1c, 0x8c, 0x38, 0x01, 0x15, 0x46, 0x23, 0x00 + .align 2 gUnknown_086125F8:: @ 86125F8 - .incbin "baserom.gba", 0x6125f8, 0x74 + .4byte sub_81A705C + .4byte sub_81A7140 + .4byte sub_81A7248 + .4byte sub_81A73B8 + .4byte sub_81A7070 + .4byte sub_81A73EC + .4byte sub_81A7400 + .4byte sub_81A740C + .4byte sub_81A7418 + .4byte nullsub_76 + .4byte nullsub_124 + .4byte sub_81A7468 + .4byte sub_81A74CC + .4byte sub_81A74E0 + .4byte sub_81A7508 + .4byte sub_81A7580 + .4byte sub_81A8090 + .4byte sub_81A80DC + .4byte sub_81A825C + .4byte sub_81A827C + .4byte sub_81A84B4 + .4byte sub_81A84EC + .4byte sub_81A863C + .4byte sub_81A8658 + .4byte sub_81A869C + .4byte sub_81A86C0 + .4byte sub_81A8794 + .4byte sub_81A87E8 + .4byte sub_81A8830 gUnknown_0861266C:: @ 861266C - .incbin "baserom.gba", 0x61266c, 0x9 + .byte 0x03, 0x03, 0x01, 0x00, 0x00, 0x02, 0x02, 0x01, 0x04 gUnknown_08612675:: @ 8612675 - .incbin "baserom.gba", 0x612675, 0x13 + .byte 0x02, 0x01, 0x00, 0x02, 0x00, 0x01, 0x01, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x01, 0x02, 0x00 + .align 2 gUnknown_08612688:: @ 8612688 - .incbin "baserom.gba", 0x612688, 0x8 + .4byte sub_81A7D8C + .4byte sub_81A7DE8 + .align 2 gUnknown_08612690:: @ 8612690 - .incbin "baserom.gba", 0x612690, 0x8 + .4byte 0x00000400, 0x00000800 gUnknown_08612698:: @ 8612698 - .incbin "baserom.gba", 0x612698, 0x4 + step_94 + step_right + step_95 + step_end gUnknown_0861269C:: @ 861269C - .incbin "baserom.gba", 0x61269c, 0x4 + step_94 + step_down + step_95 + step_end gUnknown_086126A0:: @ 86126A0 - .incbin "baserom.gba", 0x6126a0, 0x4 + step_94 + step_left + step_95 + step_end gUnknown_086126A4:: @ 86126A4 - .incbin "baserom.gba", 0x6126a4, 0x4 + step_94 + step_up + step_95 + step_end gUnknown_086126A8:: @ 86126A8 - .incbin "baserom.gba", 0x6126a8, 0x2 + step_03 + step_end gUnknown_086126AA:: @ 86126AA - .incbin "baserom.gba", 0x6126aa, 0x2 + step_00 + step_end gUnknown_086126AC:: @ 86126AC - .incbin "baserom.gba", 0x6126ac, 0x2 + step_02 + step_end gUnknown_086126AE:: @ 86126AE - .incbin "baserom.gba", 0x6126ae, 0x2 + step_01 + step_end @ 86126B0 .include "data/battle_frontier/battle_pyramid_level_50_wild_mons.inc" @@ -297,53 +1340,497 @@ gUnknown_086126AE:: @ 86126AE @ 8612E80 .include "data/battle_frontier/battle_pyramid_open_level_wild_mons.inc" + .align 2 gUnknown_08613650:: @ 8613650 - .incbin "baserom.gba", 0x613650, 0x5 - -gUnknown_08613655:: @ 8613655 - .incbin "baserom.gba", 0x613655, 0xfb + .byte 0x07, 0x03, 0x00, 0x00, 0x80, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x00, 0x00, 0x00, 0x06, 0x03, 0x00, 0x00, 0x80, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x00, 0x00, 0x00 + .byte 0x05, 0x03, 0x00, 0x00, 0x78, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x00, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x78, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x00, 0x00, 0x00 + .byte 0x04, 0x04, 0x00, 0x01, 0x70, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07, 0x00, 0x00, 0x00, 0x03, 0x05, 0x00, 0x02, 0x70, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x00, 0x00, 0x00 + .byte 0x03, 0x05, 0x00, 0x00, 0x68, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x00, 0x00, 0x00, 0x02, 0x04, 0x00, 0x01, 0x68, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x00, 0x00, 0x00 + .byte 0x04, 0x05, 0x00, 0x02, 0x60, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x00, 0x00, 0x00, 0x03, 0x06, 0x00, 0x04, 0x60, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x00, 0x00, 0x00 + .byte 0x02, 0x03, 0x00, 0x00, 0x58, 0x0c, 0x0d, 0x0e, 0x0c, 0x0d, 0x0e, 0x0c, 0x0d, 0x00, 0x00, 0x00, 0x04, 0x05, 0x00, 0x00, 0x58, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x00, 0x00, 0x00 + .byte 0x03, 0x07, 0x00, 0x00, 0x50, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x02, 0x04, 0x00, 0x00, 0x50, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x00, 0x00, 0x00 + .byte 0x03, 0x06, 0x00, 0x00, 0x50, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x03, 0x08, 0x00, 0x00, 0x50, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x00, 0x00, 0x00 gUnknown_08613750:: @ 8613750 - .incbin "baserom.gba", 0x613750, 0x44 + .byte 0x28, 0x00, 0x46, 0x01, 0x5a, 0x02, 0x64, 0x03, 0x23, 0x01, 0x37, 0x02, 0x4b, 0x03, 0x5a, 0x04, 0x64, 0x0a, 0x23, 0x02, 0x37, 0x03, 0x4b, 0x04, 0x5a, 0x05, 0x64, 0x0b, 0x23, 0x03, 0x37, 0x04 + .byte 0x4b, 0x05, 0x5a, 0x06, 0x64, 0x0c, 0x23, 0x04, 0x37, 0x05, 0x4b, 0x06, 0x5a, 0x07, 0x64, 0x0d, 0x23, 0x05, 0x37, 0x06, 0x4b, 0x07, 0x5a, 0x08, 0x64, 0x0e, 0x23, 0x06, 0x37, 0x07, 0x4b, 0x08 + .byte 0x5a, 0x09, 0x64, 0x0f gUnknown_08613794:: @ 8613794 - .incbin "baserom.gba", 0x613794, 0x8 + .byte 0x00, 0x04, 0x09, 0x0e, 0x13, 0x18, 0x1d, 0x00 + .align 1 gUnknown_0861379C:: @ 861379C - .incbin "baserom.gba", 0x61379c, 0x190 - + .2byte 0x0015, 0x0051, 0x0085, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db, 0x0019, 0x002d, 0x0015, 0x004a, 0x0087, 0x0022, 0x008a, 0x0018 + .2byte 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004b, 0x0088, 0x0022, 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x004c + .2byte 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025, 0x0015, 0x004d, 0x0086, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db + .2byte 0x0019, 0x002d, 0x0015, 0x004e, 0x008d, 0x0022, 0x008a, 0x0018, 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004f, 0x008d, 0x0022 + .2byte 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x0049, 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025 + .2byte 0x0015, 0x0051, 0x008d, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db, 0x0019, 0x002d, 0x0015, 0x004a, 0x008d, 0x0022, 0x008a, 0x0018 + .2byte 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004b, 0x008d, 0x0022, 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x004c + .2byte 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025, 0x0015, 0x004d, 0x008d, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db + .2byte 0x0019, 0x002d, 0x0015, 0x004e, 0x008d, 0x0022, 0x008a, 0x0018, 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004f, 0x008d, 0x0022 + .2byte 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x0049, 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025 + .2byte 0x0015, 0x0051, 0x008d, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db, 0x0019, 0x002d, 0x0015, 0x004a, 0x008d, 0x0022, 0x008a, 0x0018 + .2byte 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004b, 0x008d, 0x0022, 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x004c + .2byte 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025 + + .align 1 gUnknown_0861392C:: @ 861392C - .incbin "baserom.gba", 0x61392c, 0x190 + .2byte 0x0015, 0x0051, 0x0085, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db, 0x0019, 0x002d, 0x0015, 0x004a, 0x0087, 0x0022, 0x008a, 0x0018 + .2byte 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004b, 0x0088, 0x0022, 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x004c + .2byte 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025, 0x0015, 0x004d, 0x0086, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db + .2byte 0x0019, 0x002d, 0x0015, 0x004e, 0x008d, 0x0022, 0x008a, 0x0018, 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004f, 0x008d, 0x0022 + .2byte 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x0049, 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025 + .2byte 0x0015, 0x0051, 0x008d, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db, 0x0019, 0x002d, 0x0015, 0x004a, 0x008d, 0x0022, 0x008a, 0x0018 + .2byte 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004b, 0x008d, 0x0022, 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x004c + .2byte 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025, 0x0015, 0x004d, 0x008d, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db + .2byte 0x0019, 0x002d, 0x0015, 0x004e, 0x008d, 0x0022, 0x008a, 0x0018, 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004f, 0x008d, 0x0022 + .2byte 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x0049, 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025 + .2byte 0x0015, 0x0051, 0x008d, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db, 0x0019, 0x002d, 0x0015, 0x004a, 0x008d, 0x0022, 0x008a, 0x0018 + .2byte 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004b, 0x008d, 0x0022, 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x004c + .2byte 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025 gUnknown_08613ABC:: @ 8613ABC - .incbin "baserom.gba", 0x613abc, 0x7e + .byte 0x1f, 0x00, 0x2e, 0x01, 0x3d, 0x02, 0x47, 0x03, 0x51, 0x04, 0x5b, 0x05, 0x5e, 0x06, 0x61, 0x07, 0x64, 0x08, 0x0f, 0x00, 0x2e, 0x01, 0x3d, 0x02, 0x47, 0x03, 0x51, 0x04, 0x5b, 0x05, 0x5e, 0x06 + .byte 0x61, 0x08, 0x64, 0x09, 0x0f, 0x00, 0x1e, 0x01, 0x3d, 0x02, 0x47, 0x03, 0x51, 0x04, 0x5b, 0x05, 0x5e, 0x06, 0x61, 0x07, 0x64, 0x08, 0x1c, 0x00, 0x2b, 0x01, 0x3a, 0x02, 0x44, 0x03, 0x4e, 0x04 + .byte 0x58, 0x05, 0x5c, 0x07, 0x60, 0x08, 0x64, 0x09, 0x0f, 0x00, 0x2b, 0x01, 0x3a, 0x02, 0x44, 0x03, 0x4e, 0x04, 0x58, 0x05, 0x5c, 0x06, 0x60, 0x07, 0x64, 0x09, 0x0f, 0x00, 0x1e, 0x01, 0x3a, 0x02 + .byte 0x44, 0x03, 0x4e, 0x04, 0x58, 0x05, 0x5c, 0x06, 0x60, 0x07, 0x64, 0x08, 0x1c, 0x00, 0x2b, 0x01, 0x3a, 0x02, 0x44, 0x03, 0x4e, 0x04, 0x58, 0x05, 0x5c, 0x06, 0x60, 0x08, 0x64, 0x09 gUnknown_08613B3A:: @ 8613B3A - .incbin "baserom.gba", 0x613b3a, 0xa + .byte 0x00, 0x09, 0x12, 0x1b, 0x24, 0x2d, 0x36, 0x00, 0x00, 0x00 + .align 2 gUnknown_08613B44:: @ 8613B44 - .incbin "baserom.gba", 0x613b44, 0xd8 + .byte 0x03, 0x06 + + .align 2 + .byte 0x0b, 0x06 + + .align 2 + .byte 0x0d, 0x06 + + .align 2 + .byte 0x0f, 0x01 + + .align 2 + .byte 0x2b, 0x04 + + .align 2 + .byte 0x2d, 0x01 + + .align 2 + .byte 0x24, 0x09 + + .align 2 + .byte 0x29, 0x04 + + .align 2 + .byte 0x05, 0x05 + + .align 2 + .byte 0x18, 0x04 + + .align 2 + .byte 0x2f, 0x00 + + .align 2 + .byte 0x2e, 0x09 + + .align 2 + .byte 0x11, 0x0c + + .align 2 + .byte 0x10, 0x0b + + .align 2 + .byte 0x1e, 0x0d + + .align 2 + .byte 0x08, 0x01 + + .align 2 + .byte 0x17, 0x03 + + .align 2 + .byte 0x0c, 0x04 + + .align 2 + .byte 0x38, 0x04 + + .align 2 + .byte 0x1c, 0x03 + + .align 2 + .byte 0x1a, 0x00 + + .align 2 + .byte 0x19, 0x0b + + .align 2 + .byte 0x09, 0x07 + + .align 2 + .byte 0x31, 0x07 + + .align 2 + .byte 0x35, 0x07 + + .align 2 + .byte 0x36, 0x01 + + .align 2 + .byte 0x33, 0x00 + + .align 2 + .byte 0x2a, 0x03 + + .align 2 + .byte 0x16, 0x0d + + .align 2 + .byte 0x0e, 0x03 + + .align 2 + .byte 0x15, 0x01 + + .align 2 + .byte 0x14, 0x01 + + .align 2 + .byte 0x2c, 0x01 + + .align 2 + .byte 0x1b, 0x02 + + .align 2 + .byte 0x04, 0x01 + + .align 2 + .byte 0x07, 0x03 + + .align 2 + .byte 0x34, 0x05 + + .align 2 + .byte 0x32, 0x00 + + .align 2 + .byte 0x37, 0x02 + + .align 2 + .byte 0x1d, 0x04 + + .align 2 + .byte 0x22, 0x09 + + .align 2 + .byte 0x1f, 0x01 + + .align 2 + .byte 0x25, 0x00 + + .align 2 + .byte 0x0a, 0x04 + + .align 2 + .byte 0x28, 0x00 + .align 2 + .byte 0x06, 0x05 + + .align 2 + .byte 0x27, 0x0b + + .align 2 + .byte 0x26, 0x00 + + .align 2 + .byte 0x13, 0x00 + + .align 2 + .byte 0x12, 0x02 + + .align 2 + .byte 0x39, 0x08 + + .align 2 + .byte 0x02, 0x0b + + .align 2 + .byte 0x20, 0x01 + + .align 2 + .byte 0x21, 0x00 + + .align 2 gUnknown_08613C1C:: @ 8613C1C - .incbin "baserom.gba", 0x613c1c, 0x2a4 + .byte 0x0d, 0x03, 0x0e, 0x04, 0x10, 0x01, 0x11, 0x00, 0x03, 0x02, 0x12, 0x03, 0x0c, 0x03, 0x13, 0x03, 0x14, 0x03, 0x15, 0x02, 0x17, 0x02, 0x07, 0x02, 0x0a, 0x04, 0x19, 0x02, 0x1a, 0x02, 0x1b, 0x00 + .byte 0x1d, 0x02, 0x1e, 0x02, 0x1f, 0x03, 0x20, 0x04, 0x26, 0x00, 0x27, 0x01, 0x29, 0x04, 0x2a, 0x05, 0x09, 0x04, 0x16, 0x05, 0x2b, 0x00, 0x2d, 0x04, 0x2e, 0x02, 0x30, 0x02, 0x32, 0x02, 0x31, 0x03 + .byte 0x2f, 0x03, 0x33, 0x03, 0x34, 0x02, 0x04, 0x02, 0x35, 0x00, 0x36, 0x03, 0x37, 0x03, 0x38, 0x03, 0x1c, 0x01, 0x3a, 0x02, 0x05, 0x02, 0x42, 0x02, 0x02, 0x03, 0x44, 0x02, 0x45, 0x03, 0x47, 0x03 + .byte 0x43, 0x00, 0x00, 0x04 + + .align 2 +gUnknown_08613C80:: @ 8613C80 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252D2D + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252D57 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252D81 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252DAB + .align 2 +gUnknown_08613C90:: @ 8613C90 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25330B + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2532CC + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25328B + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253248 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253206 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2531C4 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253183 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253140 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2530FD + + .align 2 +gUnknown_08613CB4:: @ 8613CB4 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2544A6 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25445A + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25440B + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2543BA + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25436A + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25431A + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2542CB + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25427A + + .align 2 +gUnknown_08613CD4:: @ 8613CD4 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252DD5 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252E03 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252E31 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252E5F + + .align 2 +gUnknown_08613CE4:: @ 8613CE4 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25362E + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2535D4 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253578 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25351A + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2534BD + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253460 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253404 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2533A6 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25334D + + .align 2 +gUnknown_08613D08:: @ 8613D08 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25471E + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2546CC + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25467C + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25462A + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2545D9 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254588 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254538 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2544E6 + + .align 2 +gUnknown_08613D28:: @ 8613D28 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252E8D + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252EAA + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252EC7 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252EE4 + + .align 2 +gUnknown_08613D38:: @ 8613D38 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2539EC + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253980 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253915 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2538A8 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25383C + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2537D0 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253765 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2536F8 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25368B + + .align 2 +gUnknown_08613D5C:: @ 8613D5C + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254A0B + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2549AE + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25494D + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2548EB + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25488A + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254829 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2547C9 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254767 + + .align 2 +gUnknown_08613D7C:: @ 8613D7C + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252F01 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252F3A + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252F73 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252FAC + + .align 2 +gUnknown_08613D8C:: @ 8613D8C + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253D3E + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253CE0 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253C87 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253C2C + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253BD2 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253B78 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253B1F + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253AC4 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253A69 + + .align 2 +gUnknown_08613DB0:: @ 8613DB0 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254C3E + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254BF1 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254BAE + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254B69 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254B25 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254AE1 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254A9E + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254A59 + + .align 2 +gUnknown_08613DD0:: @ 8613DD0 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252FE5 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253000 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25301B + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253036 + + .align 2 +gUnknown_08613DE0:: @ 8613DE0 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253F6C + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253F34 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253EFA + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253EBE + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253E83 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253E48 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253E0E + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253DD2 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253D96 + + .align 2 +gUnknown_08613E04:: @ 8613E04 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254E6E + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254E27 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254DE0 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254D97 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254D4F + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254D07 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254CC0 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254C77 + + .align 2 +gUnknown_08613E24:: @ 8613E24 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253051 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25307C + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2530A7 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2530D2 + + .align 2 +gUnknown_08613E34:: @ 8613E34 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25422B + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2541DD + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25418D + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25413B + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2540EA + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254099 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254049 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253FF7 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253FA5 + + .align 2 +gUnknown_08613E58:: @ 8613E58 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_255068 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25502F + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254FF6 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254FBB + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254F81 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254F47 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254F0E + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254ED3 + + .align 2 +gUnknown_08613E78:: @ 8613E78 + .4byte gUnknown_08613C80 + .4byte gUnknown_08613C90 + .4byte gUnknown_08613CB4 + + .align 2 +gUnknown_08613E84:: @ 8613E84 + .4byte gUnknown_08613CD4 + .4byte gUnknown_08613CE4 + .4byte gUnknown_08613D08 + + .align 2 +gUnknown_08613E90:: @ 8613E90 + .4byte gUnknown_08613D28 + .4byte gUnknown_08613D38 + .4byte gUnknown_08613D5C + + .align 2 +gUnknown_08613E9C:: @ 8613E9C + .4byte gUnknown_08613D7C + .4byte gUnknown_08613D8C + .4byte gUnknown_08613DB0 + + .align 2 +gUnknown_08613EA8:: @ 8613EA8 + .4byte gUnknown_08613DD0 + .4byte gUnknown_08613DE0 + .4byte gUnknown_08613E04 + + .align 2 +gUnknown_08613EB4:: @ 8613EB4 + .4byte gUnknown_08613E24 + .4byte gUnknown_08613E34 + .4byte gUnknown_08613E58 + + .align 2 gUnknown_08613EC0:: @ 8613EC0 - .incbin "baserom.gba", 0x613ec0, 0x18 + .4byte gUnknown_08613E78 + .4byte gUnknown_08613E84 + .4byte gUnknown_08613E90 + .4byte gUnknown_08613E9C + .4byte gUnknown_08613EA8 + .4byte gUnknown_08613EB4 gUnknown_08613ED8:: @ 8613ED8 - .incbin "baserom.gba", 0x613ed8, 0x8 + .byte 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x03, 0x04 + .align 2 gUnknown_08613EE0:: @ 8613EE0 - .incbin "baserom.gba", 0x613ee0, 0x48 - + .4byte sub_81A8E9C + .4byte sub_81A8F38 + .4byte sub_81A9048 + .4byte sub_81A9134 + .4byte sub_81A917C + .4byte sub_81A91FC + .4byte sub_81A9254 + .4byte CalculateBattlePyramidItemBallItemId + .4byte sub_81A93C8 + .4byte sub_81A9414 + .4byte sub_81A9424 + .4byte sub_81A9618 + .4byte sub_81A966C + .4byte sub_81A9684 + .4byte sub_81A975C + .4byte sub_81A97C8 + .4byte sub_81A9828 + .4byte sub_81A9834 + + .align 1 gUnknown_08613F28:: @ 8613F28 - .incbin "baserom.gba", 0x613f28, 0xc + .2byte 0x003f, 0x0040, 0x0041, 0x0043, 0x0042, 0x0046 + .align 2 gUnknown_08613F34:: @ 8613F34 - .incbin "baserom.gba", 0x613f34, 0x12 + .2byte 0x00b3, 0x00b4, 0x00b7, 0x00c8, 0x00b9, 0x00bb, 0x00c4, 0x00c6, 0x00ba gUnknown_08613F46:: @ 8613F46 - .incbin "baserom.gba", 0x613f46, 0x40 + .byte 0x01, 0x04, 0xff, 0xff, 0x00, 0x02, 0x05, 0xff, 0x01, 0x03, 0x06, 0xff, 0x02, 0x07, 0xff, 0xff, 0x00, 0x05, 0x08, 0xff, 0x01, 0x04, 0x06, 0x09, 0x02, 0x05, 0x07, 0x0a, 0x03, 0x06, 0x0b, 0xff + .byte 0x04, 0x09, 0x0c, 0xff, 0x05, 0x08, 0x0a, 0x0d, 0x06, 0x09, 0x0b, 0x0e, 0x07, 0x0a, 0x0f, 0xff, 0x08, 0x0d, 0xff, 0xff, 0x09, 0x0c, 0x0e, 0xff, 0x0a, 0x0d, 0x0f, 0xff, 0x0b, 0x0e, 0xff, 0xff gUnknown_08613F86:: @ 8613F86 - .incbin "baserom.gba", 0x613f86, 0xa + .byte 0x1e, 0x28, 0x32, 0x3c, 0x46, 0x50, 0x55, 0x5a, 0x5f, 0x64 + diff --git a/data/battle_records.s b/data/battle_records.s new file mode 100644 index 000000000..22c487e4c --- /dev/null +++ b/data/battle_records.s @@ -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 "----$" + diff --git a/data/battle_tent.s b/data/battle_tent.s index 0fd1f28ea..06cfac50e 100644 --- a/data/battle_tent.s +++ b/data/battle_tent.s @@ -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 + diff --git a/data/battle_tower.s b/data/battle_tower.s index b3926d19a..d28303263 100644 --- a/data/battle_tower.s +++ b/data/battle_tower.s @@ -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 + diff --git a/data/battle_transition.s b/data/battle_transition.s new file mode 100644 index 000000000..bd0386e2b --- /dev/null +++ b/data/battle_transition.s @@ -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 + diff --git a/data/contest.s b/data/contest.s index 66a055b7d..970a5d9b8 100644 --- a/data/contest.s +++ b/data/contest.s @@ -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 - -gUnknown_08587AD0:: @ 8587AD0 - .incbin "baserom.gba", 0x587ad0, 0x18 - + obj_tiles gUnknown_08C19450, 0x0020, 0x4e20 + + .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 - -gUnknown_08587B18:: @ 8587B18 - .incbin "baserom.gba", 0x587b18, 0x68 - -gUnknown_08587B80:: @ 8587B80 - .incbin "baserom.gba", 0x587b80, 0x30 - + obj_pal gContestPal, 0x4e22 + + .align 2 +gOamData_8587B10:: @ 8587B10 + .2byte 0x4000 + .2byte 0x4000 + .2byte 0x0000 + + .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 + + .align 2 +gOamData_8587BC0:: @ 8587BC0 + .2byte 0x4000 + .2byte 0xC000 + .2byte 0x0000 -gUnknown_08587BC8:: @ 8587BC8 - .incbin "baserom.gba", 0x587bc8, 0x20 + .align 2 +gSpriteTemplate_8587BC8:: @ 8587BC8 + spr_template 0xabe2, 0xabe2, gOamData_8587BC0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy -gUnknown_08587BE8:: @ 8587BE8 - .incbin "baserom.gba", 0x587be8, 0x18 + .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 - -gUnknown_08589924:: @ 8589924 - .incbin "baserom.gba", 0x589924, 0x68 - -gUnknown_0858998C:: @ 858998C - .incbin "baserom.gba", 0x58998c, 0x60 - + obj_tiles gBlankGfxCompressed, 0x1000, 0x80e8 + obj_tiles gBlankGfxCompressed, 0x1000, 0x80e9 + obj_tiles gBlankGfxCompressed, 0x1000, 0x80ea + obj_tiles gBlankGfxCompressed, 0x1000, 0x80eb + + .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 + + .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 + diff --git a/data/contest_link_80F57C4.s b/data/contest_link_80F57C4.s index 7d30cea57..6bf51d174 100644 --- a/data/contest_link_80F57C4.s +++ b/data/contest_link_80F57C4.s @@ -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" + + .align 2 +gMiscBlank_Pal:: @ 858D7D0 + .incbin "graphics/interface/blank.gbapal" + + .align 2 +gOamData_858D7F0:: @ 858D7F0 + .2byte 0x4000 + .2byte 0xC000 + .2byte 0x2C00 -gUnknown_0858D7F8:: @ 858D7F8 - .incbin "baserom.gba", 0x58d7f8, 0x18 + .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 + + .align 2 +gUnknown_0858D8C0:: @ 858D8C0 + .byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00 -gUnknown_0858D8C8:: @ 858D8C8 - .incbin "baserom.gba", 0x58d8c8, 0x18 + .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 + diff --git a/data/contest_painting.s b/data/contest_painting.s index fca82a2b5..42d76f9bc 100644 --- a/data/contest_painting.s +++ b/data/contest_painting.s @@ -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 diff --git a/data/coord_event_weather.s b/data/coord_event_weather.s index 907a7c09f..c7b995912 100644 --- a/data/coord_event_weather.s +++ b/data/coord_event_weather.s @@ -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 + diff --git a/data/data4.s b/data/data4.s deleted file mode 100644 index a49cebbe6..000000000 --- a/data/data4.s +++ /dev/null @@ -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 - diff --git a/data/data4d.s b/data/data4d.s deleted file mode 100644 index 57dc8befc..000000000 --- a/data/data4d.s +++ /dev/null @@ -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 diff --git a/data/event_scripts.s b/data/event_scripts.s index 30db7638c..d0f286848 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1481,7 +1481,7 @@ OldaleTown_PokemonCenter_1F_EventScript_271A19:: @ 8271A19 return OldaleTown_PokemonCenter_1F_EventScript_271A43:: @ 8271A43 - specialvar VAR_RESULT, sub_8139540 + specialvar VAR_RESULT, IsPokerusInParty compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_1F_EventScript_271A5F compare VAR_RESULT, 0 @@ -1724,7 +1724,7 @@ EventScript_271D2A:: @ 8271D2A copyvar VAR_0x8004, VAR_0x8008 msgbox gUnknown_08272A9A, 4 special sub_80EDCE8 - special sub_8138BC8 + special SetFlagInVar releaseall end @@ -1761,7 +1761,7 @@ EventScript_271D89:: @ 8271D89 EventScript_271D92:: @ 8271D92 lockall setvar VAR_0x8004, 0 - special sp0D9_ComputerRelated + special DoPCTurnOnEffect playse SE_PC_ON msgbox Text_27265A, 4 goto EventScript_271DAC @@ -1815,7 +1815,7 @@ EventScript_271E3E:: @ 8271E3E EventScript_271E47:: @ 8271E47 setvar VAR_0x8004, 0 playse SE_PC_OFF - special sub_8138E20 + special DoPCTurnOffEffect releaseall end @@ -1823,7 +1823,7 @@ EventScript_271E54:: @ 8271E54 checkflag FLAG_SYS_GAME_CLEAR goto_if 0, EventScript_271E47 playse SE_PC_LOGIN - special sub_8137C28 + special AccessHallOfFamePC waitstate goto EventScript_271DBC end @@ -2202,7 +2202,7 @@ EventScript_27208F:: @ 827208F lockall msgbox LittlerootTown_BrendansHouse_2F_Text_1F8820, 4 fadescreen 1 - special sub_8138C94 + special FieldShowRegionMap waitstate releaseall end @@ -2292,7 +2292,7 @@ Route101_EventScript_27216F:: @ 827216F Route101_EventScript_272179:: @ 8272179 copyvar VAR_0x8004, VAR_0x8009 - special sub_8137C10 + special ShowPokedexRatingMessage waitmessage waitbuttonpress return @@ -2300,7 +2300,7 @@ Route101_EventScript_272179:: @ 8272179 EverGrandeCity_ChampionsRoom_EventScript_272184:: @ 8272184 Route101_EventScript_272184:: @ 8272184 setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_8137A4C + specialvar VAR_RESULT, ScriptGetPokedexInfo copyvar VAR_0x8008, VAR_0x8005 copyvar VAR_0x8009, VAR_0x8006 copyvar VAR_0x800A, VAR_RESULT @@ -2311,7 +2311,7 @@ Route101_EventScript_272184:: @ 8272184 compare VAR_0x800A, 0 goto_eq Route101_EventScript_27374E setvar VAR_0x8004, 1 - specialvar VAR_RESULT, sub_8137A4C + specialvar VAR_RESULT, ScriptGetPokedexInfo copyvar VAR_0x8008, VAR_0x8005 copyvar VAR_0x8009, VAR_0x8006 buffernumberstring 0, VAR_0x8008 @@ -4594,7 +4594,7 @@ EventScript_275BE8:: @ 8275BE8 setfieldeffectargument 0, VAR_RESULT setorcopyvar VAR_0x8004, VAR_RESULT lockall - special sub_8139200 + special GetSecretBaseNearbyMapName msgbox Text_276A3D, 5 compare VAR_RESULT, 0 goto_eq EventScript_275CDE @@ -10192,54 +10192,71 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 step_31 step_end +gText_082B6EA5:: @ 82B6EA5 .string "Um, I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" .string "Snivel… This tension is getting to me…$" +gText_082B6EEC:: @ 82B6EEC .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!\n" .string "Here we come!$" +gText_082B6F16:: @ 82B6F16 .string "I’m the no. {STR_VAR_2} apprentice of {STR_VAR_1}!\n" .string "Accept my challenge!$" +gText_082B6F4C:: @ 82B6F4C .string "Um… I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice…\n" .string "Do you think someone like me can win?$" +gText_082B6F92:: @ 82B6F92 .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!\n" .string "I’ll let you challenge me!$" +gText_082B6FC9:: @ 82B6FC9 .string "I’m horribly busy, but I also happen\n" .string "to be {STR_VAR_1}’s no. {STR_VAR_2} apprentice.$" +gText_082B700C:: @ 82B700C .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" .string "Glad to meet you!$" +gText_082B703A:: @ 82B703A .string "I serve as {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" .string "May I begin?$" +gText_082B706A:: @ 82B706A .string "Eek! I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!\n" .string "I’ll do my best!$" +gText_082B709C:: @ 82B709C .string "Yeehaw! I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!\n" .string "Put ’em up!$" +gText_082B70CC:: @ 82B70CC .string "I’m {STR_VAR_1}’s 1,000th apprentice!\n" .string "Actually, I’m no. {STR_VAR_2}! Here goes!$" +gText_082B710A:: @ 82B710A .string "Yeah, I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!\n" .string "Let’s get rockin’ and a-rollin’!$" +gText_082B714D:: @ 82B714D .string "Yippee-yahoo! I’m what you call\n" .string "{STR_VAR_1}’s no. {STR_VAR_2} apprentice!$" +gText_082B7185:: @ 82B7185 .string "Cough! I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" .string "Good to meet you! Cough!$" +gText_082B71C1:: @ 82B71C1 .string "This is nerve-racking…\n" .string "I’m the no. {STR_VAR_2} apprentice of {STR_VAR_1}.$" +gText_082B71F9:: @ 82B71F9 .string "I am {STR_VAR_1}’s no. {STR_VAR_2} apprentice,\n" .string "and that’s no lie.$" +gText_082B7229:: @ 82B7229 .string "Are you… {PLAYER}?\n" .string "Oh! Sniff…sob…\p" .string "Oh! S-sorry…\n" @@ -10251,11 +10268,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Please, please, {PLAYER}!\n" .string "Please teach me about POKéMON!$" +gText_082B731C:: @ 82B731C .string "Oh… B-but…\n" .string "Snivel… Waaaaaaah!\p" .string "Please!\n" .string "I’m begging you, please!$" +gText_082B735B:: @ 82B735B .string "Oh, really? You will?\n" .string "Awesome! Wicked! Awoooh!\p" .string "Oh… I’m sorry…\n" @@ -10265,6 +10284,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which would be better for me: Level 50\n" .string "or the Open Level?$" +gText_082B7423:: @ 82B7423 .string "{STR_VAR_1}?\n" .string "Waaaaah!\p" .string "Oh! I’m so sorry!\n" @@ -10274,6 +10294,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Thank you so much!\l" .string "Please talk with me again!$" +gText_082B74C1:: @ 82B74C1 .string "Wowee! You’re {PLAYER}, aren’t you?\n" .string "You’re awesomely strong, aren’t you?\p" .string "I’m {STR_VAR_1}!\n" @@ -10282,21 +10303,25 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Can you be my teacher and tell me\l" .string "lots about being a TRAINER?$" +gText_082B756F:: @ 82B756F .string "Aww, why?\n" .string "Oh, please? Pretty please?\l" .string "Please be my teacher, please!$" +gText_082B75B2:: @ 82B75B2 .string "Yay! Great!\p" .string "The first thing I wanted to ask you is\n" .string "about the BATTLE TOWER!\p" .string "The Level 50 and Open Level Rooms…\n" .string "Which would be perfect for me?$" +gText_082B763F:: @ 82B763F .string "{STR_VAR_1}, huh? That’s true!\n" .string "I’ll do my best there!\p" .string "If we meet here again, please teach\n" .string "me something else, teacher!$" +gText_082B76AC:: @ 82B76AC .string "Um… Are you {PLAYER}?\n" .string "My name is {STR_VAR_1}.\p" .string "I want to become a POKéMON TRAINER,\n" @@ -10305,11 +10330,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "advice because you’re so famous.\p" .string "{PLAYER}, could you give me advice?$" +gText_082B7772:: @ 82B7772 .string "Oh, but…\p" .string "I sincerely want to become a POKéMON\n" .string "TRAINER!\p" .string "Please, can you answer my questions?$" +gText_082B77CE:: @ 82B77CE .string "Thank you!\n" .string "Here’s my first question right away!\p" .string "The BATTLE TOWER has two levels,\n" @@ -10317,11 +10344,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which level do you think is more\n" .string "suitable for me?$" +gText_082B7871:: @ 82B7871 .string "Oh, the {STR_VAR_1} challenge?\n" .string "Understood!\p" .string "If I have another question, I’ll come\n" .string "back here for your advice!$" +gText_082B78D4:: @ 82B78D4 .string "Oh? Huh? You’re…\n" .string "No, that can’t be true.\p" .string "There isn’t any way that someone\n" @@ -10345,6 +10374,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "…Or will you be so kind as to give\n" .string "me advice?$" +gText_082B7B1A:: @ 82B7B1A .string "I knew it…\p" .string "It had to happen because I’m such\n" .string "a really boring nobody…\p" @@ -10355,6 +10385,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Please, will you be so kind as to give\n" .string "me advice?$" +gText_082B7C13:: @ 82B7C13 .string "Really? I can’t believe it!\n" .string "I can’t believe you’ll advise me!\l" .string "I… I’m so happy…\p" @@ -10365,6 +10396,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which course do you think even I may\n" .string "have a chance at?$" +gText_082B7D18:: @ 82B7D18 .string "{STR_VAR_1}? Okay!\n" .string "But do you really think someone like\l" .string "me would have a chance?\p" @@ -10373,6 +10405,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Thank you very much for spending\n" .string "time with someone like me.$" +gText_082B7DD4:: @ 82B7DD4 .string "Oh! You’re {PLAYER}{STRING 5}, aren’t you?\p" .string "I’ve heard that you’re tough at\n" .string "POKéMON!\p" @@ -10385,10 +10418,12 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "I’m willing to listen to your advice.\n" .string "You’ll agree, of course?$" +gText_082B7EE5:: @ 82B7EE5 .string "Huh? Why are you refusing me?\n" .string "It’s me who’s asking you!\l" .string "You have to reconsider!$" +gText_082B7F35:: @ 82B7F35 .string "Okay, so there is this something.\n" .string "I want you to decide it for me.\p" .string "You know that the BATTLE TOWER has\n" @@ -10396,6 +10431,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which do you think would be good\n" .string "for me, {PLAYER}{STRING 5}?$" +gText_082B7FE8:: @ 82B7FE8 .string "Okay, {STR_VAR_1} is suitable for me?\n" .string "Thank you!\p" .string "Knowing that you made the decision,\n" @@ -10404,6 +10440,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Okay, I’ll look to you for advice again.\n" .string "Bye!$" +gText_082B8087:: @ 82B8087 .string "Oh, hi, there! {PLAYER}{STRING 5}!\n" .string "I know you because you’re famous!\l" .string "Call me {STR_VAR_1}! Glad to meet you!\p" @@ -10418,11 +10455,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "So, {PLAYER}{STRING 5}, how about sharing your\l" .string "wisdom with me every so often?$" +gText_082B822B:: @ 82B822B .string "Oh, but, please?\n" .string "A guy like me needs someone like\l" .string "you, {PLAYER}{STRING 5}!\p" .string "Honestly, I need your advice!$" +gText_082B8286:: @ 82B8286 .string "Thank you! That’s more like it!\n" .string "So, let’s start with an easy one!\p" .string "You know about the BATTLE TOWER’s\n" @@ -10431,11 +10470,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Me being a busy guy, which one should\n" .string "I gear up for?$" +gText_082B8356:: @ 82B8356 .string "{STR_VAR_1}, huh? Okay, gotcha.\n" .string "I’ll find time somehow and give it a go!\p" .string "…Whoops, I’d better go to work!\n" .string "Thanks! See you around!$" +gText_082B83CE:: @ 82B83CE .string "No way! Uh-uh!\n" .string "Are you maybe the real {PLAYER}?\p" .string "A-hah! Awesome! I’m {STR_VAR_1},\n" @@ -10449,10 +10490,12 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Isn’t it a great idea?\n" .string "Please, I want your advice!$" +gText_082B84FC:: @ 82B84FC .string "Ahahaha, you can pretend to be mean,\n" .string "but you can’t fool me!\l" .string "You really mean okay, don’t you?$" +gText_082B8559:: @ 82B8559 .string "Yay! I knew you’d have a big heart,\n" .string "{PLAYER}!\p" .string "What should I ask you first?\n" @@ -10464,6 +10507,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Level 50 or Open Level?\n" .string "Which suits me more?$" +gText_082B8656:: @ 82B8656 .string "Oh-oh-oh!\n" .string "{STR_VAR_1}, you say!\l" .string "Thank you for a totally cool reply!\p" @@ -10472,6 +10516,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Let’s meet here again, okay?\n" .string "Thanks!$" +gText_082B86EA:: @ 82B86EA .string "I beg your pardon, but…\n" .string "Are you {PLAYER}?\p" .string "I’m {STR_VAR_1}, and I am delighted to\n" @@ -10484,6 +10529,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "May I become your apprentice,\n" .string "{PLAYER}?$" +gText_082B87DA:: @ 82B87DA .string "Oh…!\p" .string "… … … … … …\n" .string "… … … … … …\p" @@ -10492,6 +10538,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Please! Please say that you will\n" .string "accept me as your apprentice!$" +gText_082B887C:: @ 82B887C .string "Oh… I’m delighted!\p" .string "I don’t wish to waste your time,\n" .string "so please advise me on this.\p" @@ -10501,12 +10548,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which would be most suitable for me?\n" .string "Level 50 or Open Level?$" +gText_082B8957:: @ 82B8957 .string "{STR_VAR_1} is your choice!\n" .string "I see. I will do my best!\p" .string "Thank you, {PLAYER}.\n" .string "I hope I can count on you again.\l" .string "Please take care!$" +gText_082B89C6:: @ 82B89C6 .string "Eek! Eek! {PLAYER}!\n" .string "You spoke to me!\l" .string "I… I’m overjoyed!\p" @@ -10519,6 +10568,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Please take me in as your apprentice!\n" .string "I want to learn from you!$" +gText_082B8ACF:: @ 82B8ACF .string "Waaaah!\n" .string "{PLAYER} turned me down…\l" .string "It… It’s an invaluable experience!\p" @@ -10526,6 +10576,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "an affirmative answer this time!\p" .string "I beg you for your guidance!$" +gText_082B8B66:: @ 82B8B66 .string "Hieeeeh! {PLAYER} said yes!\n" .string "{PLAYER} said yes!\p" .string "I won’t be able to sleep tonight…\n" @@ -10534,12 +10585,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "At the BATTLE TOWER, what is right\n" .string "for me, Level 50 or Open Level?$" +gText_082B8C20:: @ 82B8C20 .string "{STR_VAR_1}! Perfectly understood!\n" .string "I understand perfectly!\l" .string "I’m deliriously delighted!\p" .string "I hope you’ll be willing to teach me\n" .string "some more another time.$" +gText_082B8CAA:: @ 82B8CAA .string "Whoa! Could you be…\n" .string "Might you be… {PLAYER}{STRING 5}?!\l" .string "That strong and famous TRAINER?\l" @@ -10552,11 +10605,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "So, there you have it, {PLAYER}{STRING 5}!\n" .string "Let me apprentice under you!$" +gText_082B8DD3:: @ 82B8DD3 .string "Gwaaaah!\n" .string "You’re quite cool and tough…\p" .string "Don’t be that way, please.\n" .string "I’m asking you!$" +gText_082B8E24:: @ 82B8E24 .string "Oh, yeah! That’s a solid reply!\n" .string "Excellent, I might add!\p" .string "So how about a first piece of advice\n" @@ -10564,12 +10619,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "If I were to go, what would be better?\n" .string "Level 50 or Open Level?$" +gText_082B8ED5:: @ 82B8ED5 .string "Uh-huh, {STR_VAR_1} it is!\n" .string "OK, A-OK!\l" .string "I’ll go show my mettle, like, jam!\p" .string "All right, I’ll look to you as my mentor!\n" .string "Adios!$" +gText_082B8F45:: @ 82B8F45 .string "Oh, hey, {PLAYER}{STRING 5}, right?\n" .string "The police were looking for you!\p" .string "… … …\n" @@ -10582,6 +10639,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "So, how about you becoming my master\n" .string "about all things POKéMON?$" +gText_082B905F:: @ 82B905F .string "If you’re going to act cold like that,\n" .string "I’ll show you what I’ll do!\p" .string "Waaah! Waaah! Waaah!\n" @@ -10590,6 +10648,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Come on, will you please be\n" .string "my POKéMON master?$" +gText_082B910E:: @ 82B910E .string "Yippee!\n" .string "I’ll buy you a boat for that!\p" .string "Of course I’m lying again!\n" @@ -10600,6 +10659,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "level I should challenge…\p" .string "Can you decide for me, master?$" +gText_082B9204:: @ 82B9204 .string "Okay, so {STR_VAR_1} is better!\n" .string "I’ll go to the other level, then!\p" .string "Just kidding!\n" @@ -10607,6 +10667,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Thanks, master!\n" .string "I hope you’ll keep teaching me!$" +gText_082B929C:: @ 82B929C .string "A-H-O-Y!\n" .string "And that spells ahoy, and it means hi!\p" .string "I’m {STR_VAR_1}, the rappin’ SAILOR\n" @@ -10624,11 +10685,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Let’s make that a celebration!\n" .string "Become my mentor for commemoration!$" +gText_082B9438:: @ 82B9438 .string "But!\n" .string "You have to work with me!\p" .string "Don’t be such a tease!\n" .string "Become my mentor, please!$" +gText_082B9488:: @ 82B9488 .string "That’s it!\n" .string "{PLAYER}, you’ve got the spirit!\p" .string "So here’s my first question\n" @@ -10638,11 +10701,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Level 50 and Open Level there be,\n" .string "which is the one that’s good for me?$" +gText_082B9564:: @ 82B9564 .string "Okay, {STR_VAR_1} it is, you say!\n" .string "I’ll go and take it on my way!\p" .string "If it’s advice I ever need,\n" .string "{PLAYER}, your word I’ll always heed!$" +gText_082B95D8:: @ 82B95D8 .string "Say, hey, aren’t you {PLAYER}?\n" .string "What should I do? Talk to you?\l" .string "Why not? I’m already talking to you!\p" @@ -10658,11 +10723,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{PLAYER}, let me be your underling!\n" .string "I want you to teach me everything!$" +gText_082B9763:: @ 82B9763 .string "You’re turning me down, then?\n" .string "I’ll just have to ask you again!\p" .string "{PLAYER}, I beg to be your underling!\n" .string "I need you to teach me everything!$" +gText_082B97E5:: @ 82B97E5 .string "Lucky, yeah, woohoo!\n" .string "Should I pop a question to you?\p" .string "Since we’re near the BATTLE TOWER,\n" @@ -10670,12 +10737,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Of the choices you see,\n" .string "which is the right one for me?$" +gText_082B989A:: @ 82B989A .string "If {STR_VAR_1} is what you suggest,\n" .string "it must be the very best!\p" .string "Well, {PLAYER}, I have to roam free,\n" .string "but don’t you forget about me.\p" .string "See you again, my smart friend!$" +gText_082B992D:: @ 82B992D .string "Oh, hi! You there!\n" .string "Can I get you to massage my shoulder?\p" .string "…Yes, there! That’s it!\n" @@ -10690,10 +10759,12 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Listen, can I get you to give me\n" .string "advice?$" +gText_082B9A84:: @ 82B9A84 .string "Oh, why?\p" .string "I won’t be a big bother, I promise!\n" .string "Please?$" +gText_082B9AB9:: @ 82B9AB9 .string "Thank you. Mighty good of you!\n" .string "…Cough! Cough!\p" .string "Oogh, I have to toughen up quick…\p" @@ -10701,11 +10772,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "right away, but what would be better\l" .string "for me? Level 50 or Open Level?$" +gText_082B9B76:: @ 82B9B76 .string "Hm, all right. That’s {STR_VAR_1}.\n" .string "I’ll go there right away.\p" .string "I hope I can keep hitting you up for\n" .string "help--after all, you’re my mentor!$" +gText_082B9BF2:: @ 82B9BF2 .string "Er… Um…\n" .string "{PLAYER}{STRING 5}…?\p" .string "Please, don’t look at me that way.\n" @@ -10722,11 +10795,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Could you become my teacher and\n" .string "give me advice?$" +gText_082B9D83:: @ 82B9D83 .string "Please don’t brush me off like this!\n" .string "I can’t live with the humiliation.\p" .string "Please become my teacher!\n" .string "I need your advice!$" +gText_082B9DF9:: @ 82B9DF9 .string "Th-thank you…\p" .string "But please don’t look at me like that.\n" .string "It makes me all flustered.\p" @@ -10735,6 +10810,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "At the BATTLE TOWER…\n" .string "Which level should I attempt?$" +gText_082B9EAA:: @ 82B9EAA .string "Oh… Okay!\n" .string "I’ll try my hand at that.\p" .string "I hope I can make a valiant challenge\n" @@ -10743,6 +10819,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "If we meet again, I hope you will be\l" .string "as helpful.$" +gText_082B9F55:: @ 82B9F55 .string "Hm? You appear to be {PLAYER}{STRING 5}…\n" .string "But are you really real?\p" .string "You may call me {STR_VAR_1}.\p" @@ -10754,6 +10831,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "I merely want you to recognize me\l" .string "as your apprentice.$" +gText_082BA084:: @ 82BA084 .string "Oh?\n" .string "But what would compel you to refuse?\p" .string "I apologize for being skeptical about\n" @@ -10761,6 +10839,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Please accept my apology and\n" .string "accept me as your apprentice.$" +gText_082BA11D:: @ 82BA11D .string "You really are accepting me?\n" .string "I don’t wish to celebrate prematurely.\p" .string "If it is true, I apologize.\n" @@ -10769,6 +10848,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "what would be worthy of me?\l" .string "Level 50 or Open Level?$" +gText_082BA1F3:: @ 82BA1F3 .string "{STR_VAR_1}?\n" .string "Are you certain?\p" .string "I see. If that’s the case, that’s fine.\n" @@ -10777,6 +10857,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "me that you have accepted me.\p" .string "Let us meet again!$" +gText_082BA2A3:: @ 82BA2A3 .string "Sigh… Sob…\n" .string "Oh, {PLAYER}!\p" .string "I’m all tangled up in a dilemma\n" @@ -10786,25 +10867,30 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Please tell me, {PLAYER}.\n" .string "What item should I make it hold?$" +gText_082BA34E:: @ 82BA34E .string "Oh, really? I shouldn’t make\n" .string "my {STR_VAR_1} hold anything?$" +gText_082BA380:: @ 82BA380 .string "Oh, okay! I’m delighted it’s settled!\n" .string "Awesome! Wicked! Awoooh!\p" .string "Thank you so much!$" +gText_082BA3D2:: @ 82BA3D2 .string "Oh, I’m so glad…\n" .string "I think I have that {STR_VAR_1}, too.\p" .string "I’m delighted it’s settled!\n" .string "Awesome! Wicked! Awoooh!\p" .string "Thank you so much!$" +gText_082BA448:: @ 82BA448 .string "Waaaah! Please don’t be mean!\p" .string "That item {STR_VAR_1} was already\n" .string "recommended to me before, sob…\p" .string "Or do you mean I shouldn’t make\n" .string "my {STR_VAR_2} hold anything?$" +gText_082BA4D3:: @ 82BA4D3 .string "Yay! It’s {PLAYER}!\n" .string "Great! I wanted to ask you something!\p" .string "Do you make your POKéMON hold items?\n" @@ -10813,38 +10899,47 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{STR_VAR_1} to hold?\p" .string "What do you think?$" +gText_082BA58C:: @ 82BA58C .string "Huh? You mean my {STR_VAR_1} doesn’t\n" .string "have to hold anything?$" +gText_082BA5BF:: @ 82BA5BF .string "Oh, I get it! I’ll do that!\n" .string "Thanks for teaching me!$" +gText_082BA5F3:: @ 82BA5F3 .string "Oh, wow! One {STR_VAR_1}, huh?\n" .string "Okay, I’ll do that!\p" .string "Thanks for teaching me!$" +gText_082BA635:: @ 82BA635 .string "Oh, uh, no, that’s not what I meant.\n" .string "I want to know about a different item\l" .string "than the ones I already know.\p" .string "Or do you mean that my POKéMON doesn’t\n" .string "have to hold anything this time?$" +gText_082BA6E6:: @ 82BA6E6 .string "{PLAYER}, hello!\n" .string "It’s about my {STR_VAR_1}…\p" .string "I want to make it hold a good item.\n" .string "What would be good for it?$" +gText_082BA742:: @ 82BA742 .string "Oh, then my {STR_VAR_1} doesn’t have\n" .string "to hold anything?$" +gText_082BA770:: @ 82BA770 .string "Okay, I got it!\n" .string "See you again!$" +gText_082BA78F:: @ 82BA78F .string "Oh, the item {STR_VAR_1}?\n" .string "Understood!\p" .string "I’ll do my best to find one!\n" .string "See you again!$" +gText_082BA7D8:: @ 82BA7D8 .string "Somebody taught me about\n" .string "the {STR_VAR_1} already.\p" .string "I want my POKéMON to hold a different\n" @@ -10852,6 +10947,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Or do you think {STR_VAR_2} doesn’t\n" .string "have to hold anything?$" +gText_082BA867:: @ 82BA867 .string "Hello, {PLAYER}…\n" .string "I’m sorry to disturb you, but I have\l" .string "something else I wanted to ask you.\p" @@ -10862,19 +10958,23 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{PLAYER}, please, could you decide\n" .string "for me?$" +gText_082BA96B:: @ 82BA96B .string "A POKéMON belonging to someone like me\n" .string "would be better off without an item?$" +gText_082BA9B7:: @ 82BA9B7 .string "I understand…\n" .string "You’re saying I shouldn’t rely on items.\l" .string "I’ll do my best not to!\p" .string "Thank you very much!$" +gText_082BAA1B:: @ 82BAA1B .string "The item {STR_VAR_1}, okay.\n" .string "I’m not sure if I can get one…\l" .string "No! I’ll do my best to get it.\p" .string "Thank you very much!$" +gText_082BAA81:: @ 82BAA81 .string "Oh, but…\n" .string "I think I’ve heard about that before…\p" .string "Is it maybe because I haven’t handled\n" @@ -10882,6 +10982,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Or do you mean I shouldn’t make\n" .string "my {STR_VAR_2} hold anything?$" +gText_082BAB22:: @ 82BAB22 .string "Oh, {PLAYER}{STRING 5}.\n" .string "There’s something I wanted to ask you.\p" .string "You know how you decided which\n" @@ -10893,9 +10994,11 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "What would be good? I want to make\n" .string "my {STR_VAR_1} hold something.$" +gText_082BAC43:: @ 82BAC43 .string "Oh! So my {STR_VAR_1} should do\n" .string "the best it can empty-handed?$" +gText_082BAC78:: @ 82BAC78 .string "If you think that’s best, I’ll do that.\p" .string "Knowing that you made the decision,\n" .string "{PLAYER}{STRING 5}, I won’t be so upset if\l" @@ -10903,6 +11006,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Okay, I’ll look to you for advice again.\n" .string "Bye!$" +gText_082BAD17:: @ 82BAD17 .string "The item {STR_VAR_1}, huh?\n" .string "Not bad. I’ll use it!\p" .string "Knowing that you made the decision,\n" @@ -10911,12 +11015,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Okay, I’ll look to you for advice again.\n" .string "Bye!$" +gText_082BADB6:: @ 82BADB6 .string "Huh? What are you saying?\n" .string "You told me about the {STR_VAR_1}\l" .string "already before.\p" .string "Or do you mean my {STR_VAR_2} should\n" .string "do the best it can empty-handed?$" +gText_082BAE36:: @ 82BAE36 .string "Yo, {PLAYER}{STRING 5}!\p" .string "We’re both busy, but we seem to run\n" .string "into each other often anyway!\p" @@ -10928,26 +11034,31 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "giving me advice on what I should make\l" .string "my {STR_VAR_1} hold?$" +gText_082BAF4E:: @ 82BAF4E .string "Oh, so me being a busy guy, you say\n" .string "my {STR_VAR_1} doesn’t need anything?$" +gText_082BAF8F:: @ 82BAF8F .string "Okay, gotcha.\n" .string "I won’t need any time for that.\p" .string "Thanks today!\n" .string "See you around!$" +gText_082BAFDB:: @ 82BAFDB .string "Okay, gotcha.\n" .string "I’ll find time somehow and find\l" .string "that {STR_VAR_1} you recommended.\p" .string "I’m glad I met a good mentor in you.\n" .string "Thanks! See you around!$" +gText_082BB05F:: @ 82BB05F .string "Huh? I already know about\n" .string "that {STR_VAR_1}.\p" .string "Oh, right, I get it.\n" .string "So me being a busy guy, you say\l" .string "my {STR_VAR_2} doesn’t need anything?$" +gText_082BB0D4:: @ 82BB0D4 .string "Hiya, {PLAYER}! It’s me!\n" .string "I need to tap your mind again today.\l" .string "Please, I need your advice!\p" @@ -10956,15 +11067,18 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "If I want to make my {STR_VAR_1} hold\n" .string "an item, what should it be?$" +gText_082BB18C:: @ 82BB18C .string "Is that right? My {STR_VAR_1} doesn’t\n" .string "need to hold an item, you’re saying.$" +gText_082BB1CE:: @ 82BB1CE .string "Okay, that’s what I’ll do!\p" .string "I guess that’s about all I wanted\n" .string "to ask you today.\p" .string "Let’s meet here again, okay?\n" .string "Thanks!$" +gText_082BB242:: @ 82BB242 .string "Uh-huh! One {STR_VAR_1}.\n" .string "What a cool choice!\l" .string "I’ll definitely try that!\p" @@ -10973,6 +11087,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Let’s meet here again, okay?\n" .string "Thanks!$" +gText_082BB2D9:: @ 82BB2D9 .string "Ahahah! That’s silly!\n" .string "You already told me about that\l" .string "{STR_VAR_1} before!\p" @@ -10980,6 +11095,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Oh, wait! My {STR_VAR_2} doesn’t\n" .string "need to hold an item, you’re saying.$" +gText_082BB370:: @ 82BB370 .string "Hello, {PLAYER}. I hope you’ve been\n" .string "keeping well.\p" .string "May I approach you for advice?\p" @@ -10993,26 +11109,31 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "It would please me if you could decide\n" .string "what would be right for my POKéMON…$" +gText_082BB4C3:: @ 82BB4C3 .string "In other words… My POKéMON has\n" .string "no need to hold an item?$" +gText_082BB4FB:: @ 82BB4FB .string "I understand clearly now!\n" .string "I will keep trying like this.\p" .string "Thank you, {PLAYER}.\n" .string "I hope I can count on you again.\l" .string "Please take care!$" +gText_082BB575:: @ 82BB575 .string "One {STR_VAR_1} it is!\n" .string "I will order it right away.\p" .string "Thank you, {PLAYER}.\n" .string "I hope I can count on you again.\l" .string "Please take care!$" +gText_082BB5E1:: @ 82BB5E1 .string "You’ve already told me about that,\n" .string "and I already have it.\p" .string "Or are you saying… My POKéMON has\n" .string "no need to hold an item?$" +gText_082BB656:: @ 82BB656 .string "Eek! {PLAYER}!\n" .string "I… I’m overjoyed to see you again!\p" .string "Oh-oh-oh! There’s something I just\n" @@ -11020,14 +11141,17 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Please decide what my {STR_VAR_1}\n" .string "should be holding!$" +gText_082BB6E5:: @ 82BB6E5 .string "Oh, wow! I didn’t expect that answer!\n" .string "So, a hold item isn’t necessary?$" +gText_082BB72C:: @ 82BB72C .string "Perfectly understood!\n" .string "I’ll keep at this without an item!\p" .string "I hope you’ll be willing to teach me\n" .string "some more another time.$" +gText_082BB7A2:: @ 82BB7A2 .string "{STR_VAR_1}! I’ll use that!\p" .string "Um… Could it be, {PLAYER}, you also\n" .string "make your POKéMON hold that item?\p" @@ -11035,12 +11159,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "I hope you’ll be willing to teach me\l" .string "some more another time.$" +gText_082BB84A:: @ 82BB84A .string "Oh? You recommended that\n" .string "{STR_VAR_1} before, too.\p" .string "Or is it the best thing to hold?\n" .string "Or do you mean that my {STR_VAR_2}\l" .string "doesn’t need anything to hold?$" +gText_082BB8CD:: @ 82BB8CD .string "Hola!\n" .string "My maestro, {PLAYER}{STRING 5}!\p" .string "I want to hit you up for advice on\n" @@ -11050,26 +11176,31 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Don’t be shy now.\n" .string "Let’s blurt it out!$" +gText_082BB970:: @ 82BB970 .string "Oh? So, you’re saying my {STR_VAR_1}\n" .string "can win without holding any item?$" +gText_082BB9AE:: @ 82BB9AE .string "Si, bueno!\n" .string "I’ll give it my best shot, like, slam!\p" .string "All right, thanks, as always!\n" .string "Adios!$" +gText_082BBA05:: @ 82BBA05 .string "Uh-huh, that’s one {STR_VAR_1}?\n" .string "Si, bueno!\l" .string "I’ll go find me one, like, bam!\p" .string "All right, thanks, as always!\n" .string "Adios!$" +gText_082BBA6C:: @ 82BBA6C .string "No, no! You already told me about\n" .string "that {STR_VAR_1} thing before.\p" .string "Oh, now wait just one minute here…\n" .string "So, you’re saying my {STR_VAR_2}\l" .string "can win without holding any item?$" +gText_082BBB01:: @ 82BBB01 .string "{PLAYER}{STRING 5}, something unbelievable\n" .string "has happened!\p" .string "I woke up this morning, and my POKéMON\n" @@ -11082,9 +11213,11 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "So, how about deciding for me what\n" .string "my {STR_VAR_1} should hold, master?$" +gText_082BBC1C:: @ 82BBC1C .string "What’s that mean?\n" .string "Don’t make it hold anything?$" +gText_082BBC4B:: @ 82BBC4B .string "Okay, so it shouldn’t hold anything.\n" .string "Then, I’d better get something for it!\p" .string "Just kidding!\n" @@ -11092,6 +11225,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Thanks, master!\n" .string "I hope you’ll keep teaching me!$" +gText_082BBCF6:: @ 82BBCF6 .string "Okay, so it’s one {STR_VAR_1}!\n" .string "I’ll make it hold anything but that!\p" .string "Just kidding!\n" @@ -11099,12 +11233,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Thanks, master!\n" .string "I hope you’ll keep teaching me!$" +gText_082BBD90:: @ 82BBD90 .string "Um, you told me about that before,\n" .string "didn’t you?\p" .string "Isn’t there something else?\p" .string "Or do you mean, don’t make\n" .string "my {STR_VAR_2} hold anything?$" +gText_082BBE0B:: @ 82BBE0B .string "A-H-O-Y!\n" .string "And that spells ahoy!\p" .string "The rappin’ SAILOR am I!\n" @@ -11115,21 +11251,25 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "My {STR_VAR_1} needs an item to hold,\n" .string "What should it be, if I may be bold?$" +gText_082BBEE5:: @ 82BBEE5 .string "Is that right?\n" .string "My {STR_VAR_1} doesn’t need to be\l" .string "holding anything tight?$" +gText_082BBF25:: @ 82BBF25 .string "Okay, I hear you, sure I do!\n" .string "My POKéMON will go empty-handed, too!\p" .string "If it’s advice I ever need,\n" .string "{PLAYER}, your word I’ll always heed!$" +gText_082BBFA4:: @ 82BBFA4 .string "Okay, one {STR_VAR_1},\n" .string "that’s what I’ll use.\l" .string "I was right to make you choose!\p" .string "If it’s advice I ever need,\n" .string "{PLAYER}, your word I’ll always heed!$" +gText_082BC024:: @ 82BC024 .string "Okay, one {STR_VAR_1}, you say?\n" .string "You told me that the other day.\l" .string "I need a new idea, a brand new way.\p" @@ -11137,6 +11277,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "My POKéMON doesn’t need to hold\l" .string "anything tight?$" +gText_082BC0C8:: @ 82BC0C8 .string "Say, hey, {PLAYER}!\n" .string "I found you again today!\p" .string "What should I do? Get your advice?\n" @@ -11150,21 +11291,25 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "my {STR_VAR_1} that’d be good.\l" .string "My indecision is making me brood.$" +gText_082BC213:: @ 82BC213 .string "My {STR_VAR_1} needs nothing?\n" .string "Doesn’t need to hold anything?$" +gText_082BC247:: @ 82BC247 .string "If holding nothing is the best,\n" .string "I’ll do as you suggest!\p" .string "Well, {PLAYER}, I have to roam free,\n" .string "but don’t you forget about me.\p" .string "See you again, my smart friend!$" +gText_082BC2DD:: @ 82BC2DD .string "If holding that {STR_VAR_1} is\n" .string "the best, I’ll do as you suggest!\p" .string "Well, {PLAYER}, I have to roam free,\n" .string "but don’t you forget about me.\p" .string "See you again, my smart friend!$" +gText_082BC373:: @ 82BC373 .string "Haven’t I heard about that\n" .string "{STR_VAR_1} before?\l" .string "I’m certain I have, that’s for sure!\p" @@ -11172,6 +11317,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Or, my {STR_VAR_2} needs nothing?\l" .string "Doesn’t need to hold anything?$" +gText_082BC40E:: @ 82BC40E .string "Gwah! Ouch! {PLAYER}{STRING 5}, my arm’s broken!\n" .string "Don’t touch it, please!\p" .string "I must’ve broken it while I was trying\n" @@ -11182,21 +11328,25 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{PLAYER}{STRING 5}, what do you think would be\n" .string "good for my {STR_VAR_1} to hold?$" +gText_082BC514:: @ 82BC514 .string "Ouch…\p" .string "So your suggestion is my {STR_VAR_1}\n" .string "doesn’t have to hold anything?$" +gText_082BC555:: @ 82BC555 .string "Hm, all right. That would be easier\n" .string "for me, the way things are now.\p" .string "I hope I can keep hitting you up\n" .string "for help like this.$" +gText_082BC5CE:: @ 82BC5CE .string "Hm, all right. That’s one {STR_VAR_1}.\n" .string "My POKéMON’s arm is fine, so I’ll make\l" .string "it hold that item right away.\p" .string "I hope I can keep hitting you up\n" .string "for help like this.$" +gText_082BC666:: @ 82BC666 .string "No, no, you told me about that\n" .string "{STR_VAR_1} before, remember?\p" .string "How about telling me something\n" @@ -11205,6 +11355,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "So your suggestion is my {STR_VAR_2}\l" .string "doesn’t have to hold anything?$" +gText_082BC714:: @ 82BC714 .string "Er… Um…\n" .string "{PLAYER}{STRING 5}…\p" .string "Please, don’t look at me that way.\n" @@ -11216,9 +11367,11 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{PLAYER}{STRING 5}, what do you think would\n" .string "be good?$" +gText_082BC808:: @ 82BC808 .string "Oh… Then, you think it would be better\n" .string "if my {STR_VAR_1} didn’t have an item?$" +gText_082BC84D:: @ 82BC84D .string "Oh… Okay!\n" .string "I’ll go without an item.\p" .string "This is nerve-racking, though.\n" @@ -11227,6 +11380,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "If we meet again, I hope you will be\l" .string "as helpful.$" +gText_082BC8EA:: @ 82BC8EA .string "Oh… Okay!\n" .string "I’ll go with that {STR_VAR_1}.\p" .string "This is nerve-racking, though.\n" @@ -11235,6 +11389,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "If we meet again, I hope you will be\l" .string "as helpful.$" +gText_082BC984:: @ 82BC984 .string "B-but I already heard about that.\p" .string "Please don’t brush me off like this!\n" .string "I can’t live with the humiliation.\p" @@ -11242,6 +11397,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Do you think it would be better if\l" .string "my {STR_VAR_2} didn’t have an item?$" +gText_082BCA4D:: @ 82BCA4D .string "Hm? You appear to be {PLAYER}{STRING 5}…\n" .string "But are you really?\l" .string "Perhaps you’re a twin?\p" @@ -11254,13 +11410,16 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "to make hold a convenient item.\p" .string "What would be worthy of it?$" +gText_082BCB75:: @ 82BCB75 .string "It’s better if it held nothing?\n" .string "Are you certain?$" +gText_082BCBA6:: @ 82BCBA6 .string "I see. If that’s the case, that’s fine.\n" .string "I thank you for your time.\p" .string "Let us meet again!$" +gText_082BCBFC:: @ 82BCBFC .string "One {STR_VAR_1}?\n" .string "Are you certain?\p" .string "I see. If that’s the case, that’s fine.\n" @@ -11269,6 +11428,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "put it to good use.\p" .string "Let us meet again!$" +gText_082BCCA4:: @ 82BCCA4 .string "No, no, wait a minute.\n" .string "I believe you taught me that before.\p" .string "I would like you to recommend\n" @@ -11277,6 +11437,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "my {STR_VAR_2} should hold nothing?\l" .string "Are you certain?$" +gText_082BCD68:: @ 82BCD68 .string "Waah, {PLAYER}!\n" .string "I have a dilemma, sob…\p" .string "I want to begin battling other people,\n" @@ -11287,6 +11448,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "If you were me, which of these POKéMON\l" .string "would you send out first?$" +gText_082BCE64:: @ 82BCE64 .string "My {STR_VAR_1} should go first?\n" .string "Waaaaah!\p" .string "Oh! I’m so sorry!\n" @@ -11294,25 +11456,30 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "my first POKéMON, and it’s made me cry…\p" .string "Thank you so much!$" +gText_082BCEF2:: @ 82BCEF2 .string "Yay! It’s {PLAYER}!\n" .string "Great! I wanted to ask you something!\p" .string "Um, of my POKéMON, which do you\n" .string "think should go out first?$" +gText_082BCF61:: @ 82BCF61 .string "My {STR_VAR_1}? That’s true.\n" .string "Okay, I’ll do that!\p" .string "Thanks for teaching me!$" +gText_082BCFA1:: @ 82BCFA1 .string "{PLAYER}, hello!\p" .string "I think, in a battle, it’s very important\n" .string "which POKéMON comes out first.\p" .string "Out of the POKéMON that I have,\n" .string "which would be good to send out first?$" +gText_082BD03C:: @ 82BD03C .string "My {STR_VAR_1} goes first?\n" .string "Okay, I got it!\p" .string "See you again!$" +gText_082BD06D:: @ 82BD06D .string "Hello, {PLAYER}…\n" .string "I’m sorry to disturb you again with\l" .string "another question.\p" @@ -11324,6 +11491,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which of my POKéMON should I send\n" .string "out first in a battle?$" +gText_082BD18A:: @ 82BD18A .string "My {STR_VAR_1}?\n" .string "Understood!\p" .string "I can’t believe that you would bother\n" @@ -11331,6 +11499,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "I’m so grateful that you would even\n" .string "speak with me… Thank you!$" +gText_082BD222:: @ 82BD222 .string "Oh, {PLAYER}{STRING 5}! It’s me!\n" .string "I’m so glad to see you because I have\l" .string "this little problem.\p" @@ -11341,6 +11510,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "How about deciding just the first\n" .string "POKéMON for me?$" +gText_082BD325:: @ 82BD325 .string "My {STR_VAR_1}? That’s great!\p" .string "Knowing that you made the decision,\n" .string "{PLAYER}{STRING 5}, I won’t be so upset if\l" @@ -11348,6 +11518,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Okay, I’ll look to you for advice again.\n" .string "Bye!$" +gText_082BD3B1:: @ 82BD3B1 .string "Hi, my teacher {PLAYER}{STRING 5}!\n" .string "I’m busy again today!\p" .string "I have to do some cycling, shopping,\n" @@ -11357,12 +11528,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "So, how about checking out my team?\n" .string "Which one should go first?$" +gText_082BD493:: @ 82BD493 .string "Okay, gotcha.\n" .string "I have enough time at least to put\l" .string "my {STR_VAR_1} at the head of the line!\p" .string "Whoops, my girlfriend’s waiting!\n" .string "Thanks! See you around!$" +gText_082BD51C:: @ 82BD51C .string "Yoohoo! Hiya, {PLAYER}!\n" .string "You always walk around looking tough!\p" .string "Listen, I need something from you\n" @@ -11372,6 +11545,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which POKéMON of mine should be first\n" .string "to go out in a battle?$" +gText_082BD609:: @ 82BD609 .string "Hmhm!\n" .string "My {STR_VAR_1}, you say!\l" .string "Thanks for a most cool answer!\p" @@ -11380,6 +11554,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Let’s meet here again, okay?\n" .string "Thanks!$" +gText_082BD697:: @ 82BD697 .string "Thank you so much for stopping to\n" .string "chat with me, {PLAYER}.\p" .string "I know I’m taking advantage of your\n" @@ -11389,12 +11564,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "It would please me if you could decide\n" .string "which POKéMON should come first.$" +gText_082BD797:: @ 82BD797 .string "My {STR_VAR_1} it is!\n" .string "I will put it first right away!\p" .string "Thank you, {PLAYER}.\n" .string "I hope I can count on you again.\l" .string "Please take care!$" +gText_082BD806:: @ 82BD806 .string "Eek! {PLAYER}!\n" .string "I… I’m overjoyed to see you again!\p" .string "My POKéMON have become much\n" @@ -11405,6 +11582,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Please decide which of my POKéMON\n" .string "should go out first!$" +gText_082BD8F5:: @ 82BD8F5 .string "Sigh… I’m overwhelmed with happiness…\p" .string "It’s like a dream having you decide\n" .string "for me, {PLAYER}.\p" @@ -11413,6 +11591,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "I hope you’ll be willing to teach me\n" .string "some more another time.$" +gText_082BD9BE:: @ 82BD9BE .string "Hello, hello!\n" .string "My mentor, {PLAYER}{STRING 5}!\l" .string "Hit me with your sage advice today!\p" @@ -11425,12 +11604,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Don’t be shy now.\n" .string "Let’s blurt it out!$" +gText_082BDAE1:: @ 82BDAE1 .string "Uh-huh, my {STR_VAR_1} leads off!\n" .string "OK, A-OK!\l" .string "I’ll reorder the lineup, like, wham!\p" .string "All right, thanks, as always!\n" .string "Adios!$" +gText_082BDB4E:: @ 82BDB4E .string "{PLAYER}{STRING 5}, listen!\n" .string "It’s a crisis!\p" .string "My POKéMON, all three of them, go into\n" @@ -11443,6 +11624,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "So, how about deciding for me which\n" .string "POKéMON should go first, master?$" +gText_082BDC6B:: @ 82BDC6B .string "Okay, so it’s my {STR_VAR_1} you chose?\n" .string "I’ll let any but that one go first!\p" .string "Just kidding!\n" @@ -11450,6 +11632,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Thanks, master!\n" .string "I hope you’ll keep teaching me!$" +gText_082BDD0D:: @ 82BDD0D .string "A-H-O-Y!\n" .string "And that spells ahoy!\p" .string "The rappin’ SAILOR am I!\n" @@ -11460,11 +11643,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Out of this lot, which should go first\n" .string "as the first on the spot?$" +gText_082BDDEC:: @ 82BDDEC .string "Okay, I hear you, sure I do!\n" .string "I’ll switch them up, that I’ll do!\p" .string "If it’s advice I ever need,\n" .string "{PLAYER}, your word I’ll always heed!$" +gText_082BDE68:: @ 82BDE68 .string "Yahoo, {PLAYER}!\n" .string "How do you do?\p" .string "What should I do? Go ahead and ask?\n" @@ -11475,12 +11660,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "POKéMON is the first to ride!\l" .string "Into battle, I mean to say.$" +gText_082BDF4D:: @ 82BDF4D .string "My {STR_VAR_1}? Yes!\n" .string "That’ll do, there’s no distress!\p" .string "Well, {PLAYER}, I have to roam free,\n" .string "but don’t you forget about me.\p" .string "See you again, my smart friend!$" +gText_082BDFD8:: @ 82BDFD8 .string "…Oof…ooch… {PLAYER}{STRING 5}…\n" .string "My stomach’s hurting all of a sudden…\p" .string "…It’s getting better now…\p" @@ -11492,6 +11679,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{PLAYER}{STRING 5}, which of my POKéMON should\n" .string "go first? So I’d win, I mean.$" +gText_082BE0FD:: @ 82BE0FD .string "Hm, all right.\n" .string "My {STR_VAR_1} goes first.\p" .string "I’ll fix the lineup like that after\n" @@ -11499,6 +11687,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "I hope I can keep hitting you up\n" .string "for help like this.$" +gText_082BE189:: @ 82BE189 .string "Er… Um…\n" .string "{PLAYER}{STRING 5}?\p" .string "Please, don’t look at me that way.\n" @@ -11511,6 +11700,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which POKéMON should I send out first\n" .string "so I at least look capable?$" +gText_082BE2A5:: @ 82BE2A5 .string "Oh… Okay!\n" .string "I’ll lead with my {STR_VAR_1}.\p" .string "I hope I can do my best without\n" @@ -11519,6 +11709,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "If we meet again, I hope you will be\l" .string "as helpful.$" +gText_082BE33E:: @ 82BE33E .string "Hm? You appear to be {PLAYER}{STRING 5}…\n" .string "But are you really?\l" .string "Perhaps you’re a clever look-alike?\p" @@ -11530,6 +11721,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "I would like you to tell me which one\l" .string "should go first in a battle.$" +gText_082BE46C:: @ 82BE46C .string "My {STR_VAR_1}…\n" .string "You aren’t pulling my leg?\p" .string "I see. If that’s the case, that’s fine.\n" @@ -11538,6 +11730,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "my best.\p" .string "Let us meet again!$" +gText_082BE50D:: @ 82BE50D .string "Snivel…\n" .string "Oh, {PLAYER}!\p" .string "What perfect timing!\n" @@ -11549,6 +11742,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{PLAYER}, which do you think will give\n" .string "even me a chance at winning?$" +gText_082BE5F5:: @ 82BE5F5 .string "Snivel… I… I understand!\n" .string "Oh! I’m so sorry!\l" .string "You’ve made me so happy, I’m crying…\p" @@ -11556,6 +11750,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{STR_VAR_1}!\p" .string "Thank you so much!$" +gText_082BE679:: @ 82BE679 .string "Yay! It’s {PLAYER}!\n" .string "Yay, you came at the right time, too!\l" .string "I need your advice again!\p" @@ -11564,10 +11759,12 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which do you think I should raise,\n" .string "{PLAYER}?$" +gText_082BE71E:: @ 82BE71E .string "Oh, so my {STR_VAR_1} is better!\n" .string "Okay, I’ll do that!\p" .string "Thanks for teaching me!$" +gText_082BE762:: @ 82BE762 .string "{PLAYER}, hello!\n" .string "I have a question I wanted to ask.\p" .string "I’m in a dilemma over whether I should\n" @@ -11575,12 +11772,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which POKéMON do you think will\n" .string "be stronger?$" +gText_082BE7F8:: @ 82BE7F8 .string "{STR_VAR_1} is your choice?\n" .string "Okay, I got it!\p" .string "I’ll go catch a strong {STR_VAR_1}\n" .string "right away!\p" .string "See you again!$" +gText_082BE850:: @ 82BE850 .string "Hello, {PLAYER}…\p" .string "Um, you’ve probably already forgotten\n" .string "about someone like me…\p" @@ -11594,6 +11793,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{PLAYER}, you probably don’t want to\n" .string "bother, but please decide for me.$" +gText_082BE99C:: @ 82BE99C .string "But will a wild {STR_VAR_1} even pay\n" .string "attention to me?\p" .string "I will try!\p" @@ -11601,6 +11801,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "No! I’ll do my best!\p" .string "Thank you!$" +gText_082BEA1B:: @ 82BEA1B .string "Oh, {PLAYER}{STRING 5}! I’m so glad to see you!\n" .string "I was about to go looking for you!\p" .string "Can you decide what kind of POKéMON\n" @@ -11611,6 +11812,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which one do you think would be\n" .string "better?$" +gText_082BEAE9:: @ 82BEAE9 .string "{STR_VAR_1}? That’s great!\p" .string "Knowing that you made the decision,\n" .string "{PLAYER}{STRING 5}, I won’t be so upset if\l" @@ -11618,6 +11820,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Okay, I’ll look to you for advice again.\n" .string "Bye!$" +gText_082BEB72:: @ 82BEB72 .string "If it isn’t {PLAYER}{STRING 5}! How’s it going?\n" .string "I’m busy again as always!\p" .string "I want to do good with POKéMON, too,\n" @@ -11628,12 +11831,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{PLAYER}{STRING 5}, give me some of your good\n" .string "advice! Which one’d be good for me?$" +gText_082BEC8E:: @ 82BEC8E .string "Okay, gotcha.\n" .string "I’ll find time somehow and catch me\l" .string "that {STR_VAR_1} you recommended.\p" .string "I’m glad I met a good mentor in you.\n" .string "Thanks! See you around!$" +gText_082BED16:: @ 82BED16 .string "Oh!\n" .string "Yay, it’s {PLAYER}!\p" .string "I didn’t waste any time boasting to\n" @@ -11646,6 +11851,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "and the choices were one {STR_VAR_1}\l" .string "or {STR_VAR_2}, which should it be?$" +gText_082BEE29:: @ 82BEE29 .string "Ahhh!\n" .string "{STR_VAR_1}, you say!\l" .string "Thanks for a most cool answer!\p" @@ -11654,6 +11860,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Let’s meet here again, okay?\n" .string "Thanks!$" +gText_082BEEB4:: @ 82BEEB4 .string "Oh, is it you, {PLAYER}?\n" .string "I’m delighted to see you again!\p" .string "Ever since I became your apprentice,\n" @@ -11666,12 +11873,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{STR_VAR_1} or {STR_VAR_2}…\l" .string "Which POKéMON is right for me?$" +gText_082BEFE2:: @ 82BEFE2 .string "One {STR_VAR_1} it is!\n" .string "I will find one right away!\p" .string "Thank you, {PLAYER}.\n" .string "I hope I can count on you again.\l" .string "Please take care!$" +gText_082BF04E:: @ 82BF04E .string "Eek! {PLAYER}! I met you again!\n" .string "I… I’m overjoyed!\p" .string "Oh-oh-oh, I know!\n" @@ -11681,12 +11890,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Please decide which would be better,\n" .string "{STR_VAR_1} or {STR_VAR_2}!$" +gText_082BF11D:: @ 82BF11D .string "Wow! You decided for me!\n" .string "One {STR_VAR_1} is what I’ll raise to\l" .string "the best of my ability.\p" .string "I hope you’ll be willing to teach me\n" .string "some more another time.$" +gText_082BF1A8:: @ 82BF1A8 .string "Hey, hey!\n" .string "My mentor, {PLAYER}{STRING 5}!\p" .string "Hello, I’ve been looking for you\n" @@ -11696,12 +11907,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Don’t be shy now.\n" .string "Let’s blurt it out!$" +gText_082BF268:: @ 82BF268 .string "Uh-huh, one {STR_VAR_1} it is!\n" .string "OK, A-OK!\l" .string "I’ll get one in a BALL, like, cram!\p" .string "All right, thanks, as always!\n" .string "Adios!$" +gText_082BF2D1:: @ 82BF2D1 .string "{PLAYER}{STRING 5}, listen! Big news!\n" .string "I caught a mirage POKéMON!\p" .string "Of course I’m lying!\n" @@ -11715,6 +11928,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which would be better?\n" .string "{STR_VAR_1} or {STR_VAR_2}?$" +gText_082BF3CF:: @ 82BF3CF .string "Okay, so it’s {STR_VAR_1} you chose?\n" .string "I’ll grab the other kind, then!\p" .string "Just kidding!\n" @@ -11722,6 +11936,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Thanks, master!\n" .string "I hope you’ll keep teaching me!$" +gText_082BF46A:: @ 82BF46A .string "A-H-O-Y!\n" .string "And that spells ahoy!\p" .string "The rappin’ SAILOR am I!\n" @@ -11732,11 +11947,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{STR_VAR_1} and {STR_VAR_2}, you see.\l" .string "Which is the one to catch for me?$" +gText_082BF551:: @ 82BF551 .string "{STR_VAR_1}, you say, hey, hey!\n" .string "I’ll go get me one right away!\p" .string "If it’s advice I ever need,\n" .string "{PLAYER}, your word I’ll always heed!$" +gText_082BF5C3:: @ 82BF5C3 .string "Oh, wow, if it isn’t {PLAYER}!\p" .string "What should I do? Get your advice?\n" .string "Why not? I’m already talking to you!\p" @@ -11748,12 +11965,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "It’s either {STR_VAR_1} or {STR_VAR_2}.\l" .string "Which do you choose?$" +gText_082BF6E5:: @ 82BF6E5 .string "If that {STR_VAR_1} is the best,\n" .string "I’ll do as you suggest!\p" .string "Well, {PLAYER}, I have to roam free,\n" .string "but don’t you forget about me.\p" .string "See you again, my smart friend!$" +gText_082BF773:: @ 82BF773 .string "Oh, hi, {PLAYER}{STRING 5}…\n" .string "I have this horrible headache…\p" .string "I must’ve worried too much about\n" @@ -11764,11 +11983,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "the POKéMON {STR_VAR_1} and\l" .string "{STR_VAR_2}, which should it be?$" +gText_082BF869:: @ 82BF869 .string "Hm, one {STR_VAR_1}, all right.\n" .string "I’ll go look for one when I get better.\p" .string "I hope I can keep hitting you up\n" .string "for help like this.$" +gText_082BF8DD:: @ 82BF8DD .string "Er… Um…\n" .string "{PLAYER}{STRING 5}…?\p" .string "Please, don’t look at me that way.\n" @@ -11779,6 +12000,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "If the choices were {STR_VAR_1} or\n" .string "{STR_VAR_2}, which would be better?$" +gText_082BF9BA:: @ 82BF9BA .string "Oh… Okay!\n" .string "I’ll do my best with one {STR_VAR_1}.\p" .string "I hope I can do my best without\n" @@ -11787,6 +12009,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "If we meet again, I hope you will be\l" .string "as helpful.$" +gText_082BFA5A:: @ 82BFA5A .string "Hm? You appear to be {PLAYER}{STRING 5}…\n" .string "But are you really real?\p" .string "No, no, if you are real, it’s fine.\n" @@ -11797,6 +12020,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{STR_VAR_1} and {STR_VAR_2}, which is\l" .string "more worthy of me?$" +gText_082BFB4E:: @ 82BFB4E .string "{STR_VAR_1}?\n" .string "Are you certain?\p" .string "I see. If that’s the case, that’s fine.\n" @@ -11805,6 +12029,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "handle with aplomb.\p" .string "Let us meet again!$" +gText_082BFBF2:: @ 82BFBF2 .string "Waaah! Oh, {PLAYER}!\n" .string "Snivel… Hiccup…\p" .string "I have a dilemma!\n" @@ -11816,6 +12041,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "be the better choice: {STR_VAR_2}\l" .string "or {STR_VAR_3}?$" +gText_082BFCAE:: @ 82BFCAE .string "{STR_VAR_1}?\n" .string "Waaaaah!\p" .string "Oh! I’m so sorry, {PLAYER}!\n" @@ -11824,6 +12050,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Snivel…\n" .string "Thank you so much!$" +gText_082BFD26:: @ 82BFD26 .string "Yay! Hi, {PLAYER}!\n" .string "I need your advice again!\p" .string "I want to teach my {STR_VAR_1}\n" @@ -11832,11 +12059,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{STR_VAR_2} or {STR_VAR_3}.\l" .string "What’s your recommendation?$" +gText_082BFDB1:: @ 82BFDB1 .string "{STR_VAR_1} is better? I guess so!\n" .string "Okay, I’ll go with that!\p" .string "If we meet here again, please teach\n" .string "me something else, teacher!$" +gText_082BFE24:: @ 82BFE24 .string "{PLAYER}, hello!\n" .string "It’s about my {STR_VAR_1}, but I’m\l" .string "worried about its moves.\p" @@ -11845,12 +12074,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which is stronger and better for\n" .string "my {STR_VAR_1}?$" +gText_082BFEAD:: @ 82BFEAD .string "{STR_VAR_1} is your choice?\n" .string "Okay, I got it!\p" .string "I’ll go teach {STR_VAR_1} to\n" .string "my POKéMON right away!\p" .string "See you again!$" +gText_082BFF0A:: @ 82BFF0A .string "Ohhh, {PLAYER}…\n" .string "I’m hopeless, no, really!\p" .string "I’ve decided to raise a POKéMON,\n" @@ -11864,12 +12095,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "If you could even choose between\n" .string "{STR_VAR_2} and {STR_VAR_3}…$" +gText_082C0032:: @ 82C0032 .string "I understand!\p" .string "But will it even be willing to learn\n" .string "{STR_VAR_1} for me…\l" .string "No! I’ll do my best!\p" .string "Thank you!$" +gText_082C0090:: @ 82C0090 .string "Oh, {PLAYER}{STRING 5}!\n" .string "I was just hoping to see you, too!\p" .string "I was wondering what move would\n" @@ -11880,6 +12113,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{STR_VAR_2} and {STR_VAR_3}?\l" .string "Which one would be better?$" +gText_082C016E:: @ 82C016E .string "{STR_VAR_1}? That’s great!\p" .string "Knowing that you made the decision,\n" .string "{PLAYER}{STRING 5}, I won’t be so upset if\l" @@ -11887,6 +12121,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Okay, I’ll look to you for advice again.\n" .string "Bye!$" +gText_082C01F7:: @ 82C01F7 .string "How could things be this busy?\n" .string "Hey, if it isn’t {PLAYER}{STRING 5}!\l" .string "How’s it going?\p" @@ -11900,12 +12135,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{PLAYER}{STRING 5}, give me some of your good\n" .string "advice! Which move’d be good for me?$" +gText_082C034C:: @ 82C034C .string "Okay, gotcha.\n" .string "I’ll make room in my schedule and\l" .string "teach that move.\p" .string "I’m glad I met a good mentor in you.\n" .string "Thanks! See you around!$" +gText_082C03CA:: @ 82C03CA .string "Oh! Lucky!\n" .string "I met you again, {PLAYER}!\l" .string "I need to tap your mind again today.\p" @@ -11915,6 +12152,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "best suited, {STR_VAR_2} or\l" .string "{STR_VAR_3}?$" +gText_082C046E:: @ 82C046E .string "Ahhh!\n" .string "{STR_VAR_1}, you say!\l" .string "Thanks for a most cool answer!\p" @@ -11923,6 +12161,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Let’s meet here again, okay?\n" .string "Thanks!$" +gText_082C04F9:: @ 82C04F9 .string "Oh, hello, {PLAYER}.\n" .string "I trust you’ve been well?\p" .string "I have to seek your advice again.\n" @@ -11931,12 +12170,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "my lovable {STR_VAR_1}?\l" .string "{STR_VAR_2} or {STR_VAR_3}?$" +gText_082C0598:: @ 82C0598 .string "{STR_VAR_1} it is!\n" .string "I will teach that right away!\p" .string "Thank you, {PLAYER}.\n" .string "I hope I can count on you again.\l" .string "Please take care!$" +gText_082C0602:: @ 82C0602 .string "Eek! {PLAYER}! I met you again!\n" .string "I… I’m overjoyed!\p" .string "Whenever I’m in need, you’re always\n" @@ -11948,12 +12189,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which move would be better,\n" .string "{STR_VAR_2} or {STR_VAR_3}?$" +gText_082C06D8:: @ 82C06D8 .string "Oh-oh-oh! Thank you!\n" .string "{STR_VAR_1} is it!\l" .string "Perfectly understood!\p" .string "I hope you’ll be willing to teach me\n" .string "some more another time.$" +gText_082C074A:: @ 82C074A .string "Hola, {PLAYER}{STRING 5}, bueno!\n" .string "I’m hoping for some more of\l" .string "your sage advice today!\p" @@ -11964,12 +12207,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Would it be {STR_VAR_2}?\n" .string "Or {STR_VAR_3}?$" +gText_082C0809:: @ 82C0809 .string "Uh-huh, {STR_VAR_1} it is!\n" .string "Si, bueno!\l" .string "I’ll get it taught, like, ka-blam!\p" .string "All right, thanks, as always!\n" .string "Adios!$" +gText_082C086E:: @ 82C086E .string "{PLAYER}{STRING 5}, it’s completely wild!\p" .string "My POKéMON!\n" .string "It learned six moves!\p" @@ -11983,6 +12228,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{STR_VAR_2} or {STR_VAR_3}--which\n" .string "would go with my {STR_VAR_1} best?$" +gText_082C0982:: @ 82C0982 .string "Okay, so it’s {STR_VAR_1} you chose?\n" .string "I’ll choose another move, then!\p" .string "Just kidding!\n" @@ -11990,6 +12236,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Thanks, master!\n" .string "I hope you’ll keep teaching me!$" +gText_082C0A1D:: @ 82C0A1D .string "A-H-O-Y!\n" .string "And that spells ahoy!\p" .string "The rappin’ SAILOR am I!\n" @@ -12000,11 +12247,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "the moves. What would be the best\l" .string "for my {STR_VAR_1} so it grooves?$" +gText_082C0AFD:: @ 82C0AFD .string "{STR_VAR_1}, you say, hey, hey!\n" .string "I’ll go teach that right away!\p" .string "If it’s advice I ever need,\n" .string "{PLAYER}, your word I’ll always heed!$" +gText_082C0B6F:: @ 82C0B6F .string "Oh, yeahah, if it isn’t {PLAYER}!\p" .string "What should I do? Get your advice?\n" .string "Why not? I’m already talking to you!\p" @@ -12016,12 +12265,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "It’s {STR_VAR_2} or {STR_VAR_3},\l" .string "what do you choose?$" +gText_082C0C7D:: @ 82C0C7D .string "If that {STR_VAR_1} is the best,\n" .string "I’ll do as you suggest!\p" .string "Well, {PLAYER}, I have to roam free,\n" .string "but don’t you forget about me.\p" .string "See you again, my smart friend!$" +gText_082C0D0B:: @ 82C0D0B .string "Gahack! Gaah! Oh, {PLAYER}{STRING 5}…\n" .string "I have this lousy cold, I do…\p" .string "I want to pick a move for my POKéMON,\n" @@ -12032,11 +12283,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{STR_VAR_2} and {STR_VAR_3} for\l" .string "my {STR_VAR_1}, which would it be?$" +gText_082C0DFE:: @ 82C0DFE .string "Hm, {STR_VAR_1}, all right. Cough!\n" .string "I’ll go teach it when I get better.\p" .string "I hope I can keep hitting you up\n" .string "for help like this.$" +gText_082C0E71:: @ 82C0E71 .string "Er… Um…\n" .string "{PLAYER}{STRING 5}…?\p" .string "Please, don’t look at me that way.\n" @@ -12049,6 +12302,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "If the choices were {STR_VAR_2} or\l" .string "{STR_VAR_3}, which would be better?$" +gText_082C0F6D:: @ 82C0F6D .string "Oh… Okay!\n" .string "I’ll try that {STR_VAR_1}.\p" .string "I hope I can teach that move…\n" @@ -12057,6 +12311,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "If we meet again, I hope you will be\l" .string "as helpful.$" +gText_082C1003:: @ 82C1003 .string "Hm? You appear to be {PLAYER}{STRING 5}…\n" .string "But are you really real?\p" .string "Perhaps you’re one of those popular\n" @@ -12069,6 +12324,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which move would be better for it to\n" .string "use, {STR_VAR_2} or {STR_VAR_3}?$" +gText_082C1122:: @ 82C1122 .string "{STR_VAR_1}?\n" .string "There’s no question about that?\p" .string "I see. If that’s the case, that’s fine.\n" @@ -12077,6 +12333,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "my POKéMON can learn.\p" .string "Let us meet again!$" +gText_082C11D1:: @ 82C11D1 .string "Oh… {PLAYER}?\n" .string "It is {PLAYER}!\l" .string "Oh! Sniff…sob… Please, listen!\p" @@ -12088,6 +12345,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Could you maybe teach me something\l" .string "cool to say when I win so I don’t cry?$" +gText_082C12D5:: @ 82C12D5 .string "{STR_VAR_1}\p" .string "Awesome! Wicked! Awoooh!\n" .string "It’s really cool!\p" @@ -12100,6 +12358,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{PLAYER}…\n" .string "Next time… We should battle!$" +gText_082C13AB:: @ 82C13AB .string "Yay! It’s {PLAYER}! Hello!\n" .string "I wanted to ask you something!\p" .string "I want to say something cool when\n" @@ -12107,6 +12366,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Do you have a cool saying that\n" .string "you could recommend?$" +gText_082C1444:: @ 82C1444 .string "{STR_VAR_1}\p" .string "Oh, wow! That is so cool!\n" .string "Okay, I’ll say that!\p" @@ -12116,6 +12376,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "When we meet again, it’ll be for\n" .string "a battle!$" +gText_082C1501:: @ 82C1501 .string "{PLAYER}, hello!\p" .string "My POKéMON and I are ready for\n" .string "anything, except for one thing.\p" @@ -12124,6 +12385,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Could you think up something good\n" .string "to say?$" +gText_082C15B6:: @ 82C15B6 .string "{STR_VAR_1}\p" .string "…Cool!\n" .string "I will use that!\p" @@ -12134,6 +12396,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Next time, let’s meet at a place\n" .string "of battle!$" +gText_082C165E:: @ 82C165E .string "Hello, {PLAYER}…\n" .string "I’m sorry to bug you, but I’m hopeless…\p" .string "Even when…\n" @@ -12145,6 +12408,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Please, {PLAYER}, what should I say\n" .string "if I win a battle?$" +gText_082C174F:: @ 82C174F .string "{STR_VAR_1}\p" .string "That’s inspired…\p" .string "Uh… Is it okay for someone like me\n" @@ -12157,6 +12421,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "someone like me, but let’s meet\l" .string "somewhere again!$" +gText_082C1862:: @ 82C1862 .string "Oh, {PLAYER}{STRING 5}.\n" .string "There’s something I want you to hear.\p" .string "I know that I don’t always sound\n" @@ -12169,6 +12434,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "But I can’t think of anything good!\n" .string "Could you think something up for me?$" +gText_082C19A0:: @ 82C19A0 .string "{STR_VAR_1}\p" .string "Not bad!\n" .string "Yup, that’s what I’ll go with!\p" @@ -12180,6 +12446,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Next time, we battle, okay?\n" .string "See you!$" +gText_082C1A76:: @ 82C1A76 .string "Oh, I can’t get over how busy I am!\n" .string "Oh, hey, I was looking for you, {PLAYER}{STRING 5}.\p" .string "Are you well as usual?\n" @@ -12193,6 +12460,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "underline my coolness when I’m done\l" .string "and walking away? {PLAYER}{STRING 5}, help me!$" +gText_082C1C16:: @ 82C1C16 .string "{STR_VAR_1}\p" .string "Okay, gotcha.\n" .string "I can find time to say that!\p" @@ -12203,6 +12471,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Thanks for everything, {PLAYER}{STRING 5}!\n" .string "We have to battle, you and me, one day!$" +gText_082C1CF5:: @ 82C1CF5 .string "I lucked out again!\n" .string "{PLAYER}! Am I glad to see you!\l" .string "Like usual, I need your advice!\p" @@ -12212,6 +12481,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "it with a cool flourish, what\l" .string "should I say?$" +gText_082C1DC1:: @ 82C1DC1 .string "{STR_VAR_1}\p" .string "That… That’s fabulous!\n" .string "It’s dignified and cool! I claim it!\p" @@ -12224,6 +12494,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "we battle!\p" .string "Thank you for everything!$" +gText_082C1EDC:: @ 82C1EDC .string "Oh, {PLAYER}.\n" .string "I’m so glad I met you!\p" .string "I no longer have any concerns with\n" @@ -12236,6 +12507,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Please, what should I say when\n" .string "I win a battle?$" +gText_082C1FEC:: @ 82C1FEC .string "{STR_VAR_1}\p" .string "Ah! That saying! It refreshes me\n" .string "and makes me feel reborn!\p" @@ -12247,6 +12519,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Perhaps one day…\n" .string "Farewell!$" +gText_082C20D1:: @ 82C20D1 .string "Eek! I spotted {PLAYER}!\n" .string "I… I’m overjoyed to see you!\p" .string "Oh-oh-oh! There’s something I just\n" @@ -12258,6 +12531,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "So now, {PLAYER}, please, I want you to\n" .string "think up an exit line for when I win!$" +gText_082C21FF:: @ 82C21FF .string "{STR_VAR_1}\p" .string "Waaaaah!\n" .string "I’m going to say that?!\l" @@ -12271,6 +12545,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "I’ve got to go now, but let’s meet\n" .string "in battle one day!$" +gText_082C231C:: @ 82C231C .string "Hola, bueno!\n" .string "{PLAYER}{STRING 5}!\p" .string "You know, I’m getting the itch to roam\n" @@ -12281,6 +12556,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "be a good boast I could say to my\l" .string "fallen TRAINER opponent?$" +gText_082C2407:: @ 82C2407 .string "{STR_VAR_1}\p" .string "Uh-huh, that’s sweet!\n" .string "Si, bueno!\l" @@ -12290,6 +12566,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Give me a battle one day, OK?\n" .string "Adios!$" +gText_082C24B5:: @ 82C24B5 .string "{PLAYER}{STRING 5}, there’s big trouble!\p" .string "When I win a battle, I brag about it\n" .string "for an hour at least!\p" @@ -12301,6 +12578,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "I should say after winning a battle,\l" .string "master?$" +gText_082C25B1:: @ 82C25B1 .string "{STR_VAR_1}\p" .string "That’s what I should say, huh?\n" .string "Then, I’ll stay away from that!\p" @@ -12316,6 +12594,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "That’s all!\n" .string "Farewell, my master!$" +gText_082C2707:: @ 82C2707 .string "A-H-O-Y!\n" .string "And that spells ahoy!\p" .string "The rappin’ SAILOR am I!\n" @@ -12326,6 +12605,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "If I win a match, what can I say\n" .string "in a real cool way?$" +gText_082C27D4:: @ 82C27D4 .string "{STR_VAR_1}\p" .string "Perfect! That’s what I’ll use.\n" .string "I was right to make you choose!\p" @@ -12337,6 +12617,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "And that spells bon voyage,\l" .string "to you this is my homage!$" +gText_082C28D6:: @ 82C28D6 .string "Oh, yeah, {PLAYER}!\n" .string "I found you again today!\p" .string "What should I do? Ask you again?\n" @@ -12350,6 +12631,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "a battle ends well.\p" .string "Come on, I wanna hear you say it!$" +gText_082C2A0B:: @ 82C2A0B .string "{STR_VAR_1}\p" .string "All right, all right!\n" .string "I’ll use that because it’s so tight!\p" @@ -12363,6 +12645,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Take care, {PLAYER}!\n" .string "Love ya!$" +gText_082C2B50:: @ 82C2B50 .string "{PLAYER}{STRING 5}, I’m finished…\n" .string "My nose won’t stop dripping…\p" .string "I was trying to think up something\n" @@ -12374,6 +12657,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "When I win a battle,\n" .string "what should I say?$" +gText_082C2C77:: @ 82C2C77 .string "{STR_VAR_1}\p" .string "… … …That’s good.\n" .string "No, it’s awe inspiring!\l" @@ -12385,6 +12669,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "From now on, we’re rivals!\n" .string "Thanks for everything!$" +gText_082C2D67:: @ 82C2D67 .string "Er… Um…\n" .string "{PLAYER}{STRING 5}…\p" .string "Please, don’t look at me that way.\n" @@ -12395,6 +12680,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "but what if I win a battle?\l" .string "What should I say?$" +gText_082C2E41:: @ 82C2E41 .string "{STR_VAR_1}\p" .string "Oh… Okay!\n" .string "I’ll try to say that!\l" @@ -12404,6 +12690,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "I’ll obey all that you’ve taught me,\n" .string "{PLAYER}{STRING 5}, and do the best I can.$" +gText_082C2EF5:: @ 82C2EF5 .string "Hm? You appear to be {PLAYER}{STRING 5}…\n" .string "But are you really?\l" .string "Perhaps a clever {PLAYER} DOLL?\p" @@ -12416,6 +12703,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "More precisely, what should I say\n" .string "if I win a battle?$" +gText_082C3023:: @ 82C3023 .string "{STR_VAR_1}\p" .string "… … … … … …\n" .string "When I win a match…\p" @@ -14325,77 +14613,105 @@ EventScript_TestSignpostMsg:: @ 82C8436 msgbox Text_ThisIsATestSignpostMsg, 3 end +gText_082C843F:: @ 82C843F .string "It’s very disappointing…$" +gText_082C8458:: @ 82C8458 .string "Okay, I understand…$" +gText_082C846C:: @ 82C846C .string "I’m terribly sorry…$" +gText_082C8480:: @ 82C8480 .string "Thank you…$" +gText_082C848B:: @ 82C848B .string "Ahahaha! Aren’t you embarrassed?\n" .string "Everyone’s watching!$" +gText_082C84C1:: @ 82C84C1 .string "Grr…\n" .string "What the…$" +gText_082C84D0:: @ 82C84D0 .string "My DOME ACE title isn’t just for show!$" +gText_082C84F7:: @ 82C84F7 .string "Ahahaha!\n" .string "You’re inspiring!$" +gText_082C8512:: @ 82C8512 .string "Way to work!\n" .string "That was a good lesson, eh?$" +gText_082C853B:: @ 82C853B .string "Good job!\n" .string "You know what you’re doing!$" +gText_082C8561:: @ 82C8561 .string "Hey, hey, hey!\n" .string "You’re finished already?$" +gText_082C8589:: @ 82C8589 .string "What happened here?$" +gText_082C859D:: @ 82C859D .string "Humph…$" +gText_082C85A4:: @ 82C85A4 .string "Urk…$" +gText_082C85A9:: @ 82C85A9 .string "Hah!$" +gText_082C85AE:: @ 82C85AE .string "Darn!$" +gText_082C85B4:: @ 82C85B4 .string "Oh, come on!\n" .string "You have to try harder than that!$" +gText_082C85E3:: @ 82C85E3 .string "No way!\n" .string "Good job!$" +gText_082C85F5:: @ 82C85F5 .string "Heheh!\n" .string "What did you expect?$" +gText_082C8611:: @ 82C8611 .string "Huh?\n" .string "Are you serious?!$" +gText_082C8628:: @ 82C8628 .string "Your POKéMON are wimpy because\n" .string "you’re wimpy as a TRAINER!$" +gText_082C8662:: @ 82C8662 .string "Ah…\n" .string "Now this is something else…$" +gText_082C8682:: @ 82C8682 .string "Gwahahaha!\n" .string "My brethren, we have nothing to fear!$" +gText_082C86B3:: @ 82C86B3 .string "Gwah!\n" .string "Hahahaha!$" +gText_082C86C3:: @ 82C86C3 .string "Hey! What’s wrong with you!\n" .string "Let’s see some effort! Get up!$" +gText_082C86FE:: @ 82C86FE .string "That’s it! You’ve done great!\n" .string "You’ve worked hard for this!$" +gText_082C8739:: @ 82C8739 .string "Hey! Don’t you give up now!\n" .string "Get up! Don’t lose faith in yourself!$" +gText_082C877B:: @ 82C877B .string "That’s it! You’ve done it!\n" .string "You kept working for this!$" diff --git a/data/field_specials.s b/data/field_specials.s new file mode 100644 index 000000000..8f9734a01 --- /dev/null +++ b/data/field_specials.s @@ -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 + diff --git a/data/fldeff_flash.s b/data/fldeff_flash.s new file mode 100644 index 000000000..3c3071b37 --- /dev/null +++ b/data/fldeff_flash.s @@ -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" diff --git a/data/graphics.s b/data/graphics.s index 01c2bfee9..ff1034587 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -120,7 +120,7 @@ gInterfacePal_PremierBall:: gOpenPokeballGfx:: @ 8C02300 .incbin "baserom.gba", 0xc02300, 0x7c -gUnknown_08C0237C:: @ 8C0237C +gBlankGfxCompressed:: @ 8C0237C .incbin "baserom.gba", 0xc0237c, 0x7074 gUnknown_08C093F0:: @ 8C093F0 @@ -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 @@ -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 @@ -1183,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 diff --git a/data/graphics/field_objects/field_object_oam.inc b/data/graphics/field_objects/field_object_oam.inc index 0e02efa57..ea4da1c02 100644 --- a/data/graphics/field_objects/field_object_oam.inc +++ b/data/graphics/field_objects/field_object_oam.inc @@ -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 diff --git a/data/learn_move.s b/data/learn_move.s index bcb8aeba1..94805bacb 100644 --- a/data/learn_move.s +++ b/data/learn_move.s @@ -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 diff --git a/data/pokedex_area_screen.s b/data/pokedex_area_screen.s new file mode 100644 index 000000000..e55f03fab --- /dev/null +++ b/data/pokedex_area_screen.s @@ -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 diff --git a/data/pokedex_cry_screen.s b/data/pokedex_cry_screen.s new file mode 100644 index 000000000..4b84c3ece --- /dev/null +++ b/data/pokedex_cry_screen.s @@ -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 diff --git a/data/roulette.s b/data/roulette.s new file mode 100644 index 000000000..3cb412084 --- /dev/null +++ b/data/roulette.s @@ -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 diff --git a/data/script_menu.s b/data/script_menu.s index 33c185d39..6cd7bf381 100644 --- a/data/script_menu.s +++ b/data/script_menu.s @@ -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 diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index d20cfa799..07ed1b82d 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -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 diff --git a/data/scripts/maps/AbandonedShip_Deck.inc b/data/scripts/maps/AbandonedShip_Deck.inc index d049423a1..1f0c0e2f2 100644 --- a/data/scripts/maps/AbandonedShip_Deck.inc +++ b/data/scripts/maps/AbandonedShip_Deck.inc @@ -3,6 +3,6 @@ AbandonedShip_Deck_MapScripts:: @ 823799A .byte 0 AbandonedShip_Deck_MapScript1_2379A0: @ 82379A0 - setflag FLAG_0x89E + setflag FLAG_LANDMARK_ABANDONED_SHIP end diff --git a/data/scripts/maps/AlteringCave.inc b/data/scripts/maps/AlteringCave.inc index c5f1286d2..a9faddc36 100644 --- a/data/scripts/maps/AlteringCave.inc +++ b/data/scripts/maps/AlteringCave.inc @@ -3,6 +3,6 @@ AlteringCave_MapScripts:: @ 823B177 .byte 0 AlteringCave_MapScript1_23B17D: @ 823B17D - setflag FLAG_0x8DD + setflag FLAG_LANDMARK_ALTERING_CAVE end diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index f97c3fc5a..3cd0b9eff 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -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 diff --git a/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc b/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc index 9184f3cd3..2a39d844b 100644 --- a/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc +++ b/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc @@ -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.$" diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc index bf031e090..cff676124 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc @@ -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…$" diff --git a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc index c3ed02996..e334e2413 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc @@ -306,54 +306,68 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_24410C: @ 824410C .string "Then, please find a partner from\n" .string "the TRAINERS gathered here.$" -BattleFrontier_BattleTowerMultiBattleRoom_Text_244149: @ 8244149 +BattleFrontier_BattleTowerMultiBattleRoom_Text_244149:: @ 8244149 .string "Thank you for choosing a partner.\p" .string "I will now show you to your\n" .string "MULTI BATTLE ROOM.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24419A:: @ 824419A .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" .string "You can call me {STR_VAR_3}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2441CA:: @ 82441CA .string "On {STR_VAR_1}’s advice, I brought\n" .string "one {STR_VAR_3} with {STR_VAR_2} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2441F7:: @ 82441F7 .string "one {STR_VAR_2} with {STR_VAR_1}.\p" .string "Please, let me join you as a tag team.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24422E:: @ 824422E .string "Thank you!\n" .string "I’ll go register right now.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244255:: @ 8244255 .string "I really wanted to form a tag team\n" .string "with you, {PLAYER}…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244286:: @ 8244286 .string "I am {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" .string "My name is {STR_VAR_3}.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2442B2:: @ 82442B2 .string "I got advice from {STR_VAR_1} and chose\n" .string "one {STR_VAR_3} with {STR_VAR_2} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2442E4:: @ 82442E4 .string "one {STR_VAR_2} with {STR_VAR_1}.\p" .string "Please, let’s form a tag team!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244313:: @ 8244313 .string "Thank you very much!\n" .string "I’ll be done with registration quickly!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244350:: @ 8244350 .string "{PLAYER}, I was hoping that I could\n" .string "partner up with you…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244383:: @ 8244383 .string "Um, my name’s {STR_VAR_3}, and I’m\n" .string "{STR_VAR_1}’s no. {STR_VAR_2} apprentice.\p" .string "Snivel…\p" .string "I’m sorry!\n" .string "This tension is making me cry…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2443E7:: @ 82443E7 .string "{STR_VAR_3} advised me, so I have\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244413:: @ 8244413 .string "one {STR_VAR_2} with {STR_VAR_1}.\p" .string "Snivel…\n" .string "Please, please team up with me!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24444B:: @ 824444B .string "Oh, really? You will?\n" .string "Awesome! Wicked! Awoooh!\p" .string "Oh… I’m sorry…\n" @@ -361,95 +375,119 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244149: @ 8244149 .string "I’ll go register right away.\n" .string "Please don’t go away!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2444D6:: @ 82444D6 .string "Oh, b-but…\n" .string "Sob… Waaaaah!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2444EF:: @ 82444EF .string "Hi, there! I’m {STR_VAR_3}!\n" .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E:: @ 824451E .string "{STR_VAR_3} recommended my crew.\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244549:: @ 8244549 .string "one {STR_VAR_2} with {STR_VAR_1},\n" .string "that’s what I have! Cool, huh?\p" .string "So come on!\n" .string "Let’s form a tag team!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24459B:: @ 824459B .string "Yay! Great!\n" .string "Okay, I’ll go register, okay?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2445C5:: @ 82445C5 .string "Aww, why?\n" .string "I wanted to team up, {PLAYER}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2445E8:: @ 82445E8 .string "I’m {STR_VAR_3}, the no. {STR_VAR_2} apprentice\n" .string "of the famous {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244618:: @ 8244618 .string "I looked to {STR_VAR_3} for advice.\n" .string "One {STR_VAR_1}-using {STR_VAR_2}$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244643:: @ 8244643 .string "and one {STR_VAR_2} with {STR_VAR_1},\n" .string "that’s my pair.\p" .string "Please, will you join me in\n" .string "a tag team?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24468F:: @ 824468F .string "Thank you!\n" .string "I’ll register right away!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2446B4:: @ 82446B4 .string "{PLAYER}, I had been hoping to join\n" .string "you in a tag team…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2446E5:: @ 82446E5 .string "Um… I’m sincerely happy that you\n" .string "would take the time to talk to me.\p" .string "I’m {STR_VAR_3}.\n" .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24474D:: @ 824474D .string "{STR_VAR_3} gave me advice.\n" .string "I’m very grateful for it.\p" .string "I have a team of one {STR_VAR_2}\n" .string "with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24479E:: @ 824479E .string "one {STR_VAR_2} with {STR_VAR_1}.\n" .string "I know I’m asking a lot…\p" .string "I don’t think you’ll be willing to,\n" .string "but may I join you as a partner?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24480C:: @ 824480C .string "Really? I can’t believe it!\n" .string "I can’t believe you’ll let me join you!\l" .string "I… I won’t let you down!\p" .string "Um… If it’s really okay, I’ll go register\n" .string "right this instant!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2448A7:: @ 82448A7 .string "Oh…\n" .string "I didn’t think I was good enough…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2448CD:: @ 82448CD .string "Hi, I’m {STR_VAR_3}.\n" .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2448F5:: @ 82448F5 .string "{STR_VAR_3} told me that it would be\n" .string "good to make this team:\l" .string "one {STR_VAR_1}-using {STR_VAR_2}$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244939:: @ 8244939 .string "and one {STR_VAR_2} that knows how\n" .string "to use {STR_VAR_1}.\p" .string "Not bad, huh?\n" .string "Want me to team up with you?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244989:: @ 8244989 .string "Okay, glad to join you!\n" .string "I hope you won’t mess things up for me!\l" .string "I’ll do my registration now.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2449E6:: @ 82449E6 .string "Huh? Why did you turn me down?\n" .string "You’re no judge of character!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244A23:: @ 8244A23 .string "I’m {STR_VAR_3} and I’m a TRIATHLETE.\n" .string "I’m busy every day what with jogging,\l" .string "training, and rapping.\p" .string "I also happen to be {STR_VAR_1}’s\n" .string "no. {STR_VAR_2} apprentice.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244AA9:: @ 8244AA9 .string "This is what {STR_VAR_3} recommended.\n" .string "One {STR_VAR_1}-using {STR_VAR_2}$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244AD6:: @ 8244AD6 .string "and one {STR_VAR_1}-using\n" .string "{STR_VAR_2}.\p" .string "I put a lot of effort into raising\n" @@ -457,90 +495,113 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244149: @ 8244149 .string "Let’s form a tag team\n" .string "and give it a go!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244B52:: @ 8244B52 .string "Thanks, that’s the spirit!\n" .string "Hang tight while I go register, okay?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93:: @ 8244B93 .string "I took time from my busy schedule\n" .string "to be here! Give me a break!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244BD2:: @ 8244BD2 .string "Hi!\n" .string "How’s it going?\p" .string "I’m {STR_VAR_3}, {STR_VAR_1}’s\n" .string "no. {STR_VAR_2} apprentice. Glad to meet you!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244C18:: @ 8244C18 .string "Listen, listen! You have to hear about\n" .string "the POKéMON {STR_VAR_3} recommended.\l" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244C6E:: @ 8244C6E .string "one {STR_VAR_2} with {STR_VAR_1}.\n" .string "Of course I raised them superbly!\p" .string "So, want to team up?\n" .string "I’m sure it’ll be a great combo!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244CD6:: @ 8244CD6 .string "Yay, I think this will be fun!\n" .string "I’ll go register!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244D07:: @ 8244D07 .string "Oh, you’re mean!\n" .string "I come recommended, you know.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244D36:: @ 8244D36 .string "Please let me introduce myself.\n" .string "I am {STR_VAR_3}.\p" .string "I serve as {STR_VAR_1}’s\n" .string "no. {STR_VAR_2} apprentice.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244D82:: @ 8244D82 .string "I sought the sage advice of\n" .string "{STR_VAR_3} and raised my team\l" .string "of one {STR_VAR_2} with {STR_VAR_1}$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244DC6:: @ 8244DC6 .string "and one {STR_VAR_2} with {STR_VAR_1}.\p" .string "Please agree to a tag team with me!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244DFE:: @ 8244DFE .string "Oh… I’m delighted!\n" .string "I promise to give you my best!\p" .string "Of course I will register us!\n" .string "Please wait!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244E5B:: @ 8244E5B .string "I had been hoping to join you,\n" .string "{PLAYER}…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244E7E:: @ 8244E7E .string "Eek! You spoke to me!\n" .string "I… I’m overjoyed!\p" .string "I’m {STR_VAR_3}! I’m {STR_VAR_1}’s\n" .string "no. {STR_VAR_2} apprentice!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244ECA:: @ 8244ECA .string "On {STR_VAR_3}’s advice, I trained\n" .string "one {STR_VAR_1}-using {STR_VAR_2}$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244EF4:: @ 8244EF4 .string "and one {STR_VAR_1}-using\n" .string "{STR_VAR_2}.\p" .string "Please, can you grant me my wish?\n" .string "I want to be your tag-team partner!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244F4F:: @ 8244F4F .string "Eek! I… I feel giddy!\n" .string "Thank you so much!\l" .string "I’ll go register us right away!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244F98:: @ 8244F98 .string "Waaah! Don’t you feel any pity?\n" .string "But that makes you cooler…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244FD3:: @ 8244FD3 .string "Yeehaw! I’m {STR_VAR_1}’s\n" .string "no. {STR_VAR_2} apprentice!\p" .string "{STR_VAR_3}’s my name, hello, hello!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245013:: @ 8245013 .string "My mentor {STR_VAR_3} recommended\n" .string "one {STR_VAR_1}-master {STR_VAR_2}$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24503D:: @ 824503D .string "and one {STR_VAR_1}-master\n" .string "{STR_VAR_2}.\p" .string "Good stuff, huh?\n" .string "You’ll partner with me, won’t you?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245087:: @ 8245087 .string "Okay, excellent!\n" .string "I’ll get the registration done quickly!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2450C0:: @ 82450C0 .string "Gwaaah!\n" .string "You’re a calculating one, {PLAYER}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2450E6:: @ 82450E6 .string "Hey! There’s big trouble! This is\n" .string "the BATTLE TOWER’s last day!\p" .string "… … … … … …\n" @@ -549,24 +610,29 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244149: @ 8244149 .string "I’m {STR_VAR_1}’s 1,000th apprentice!\l" .string "Actually, I’m no. {STR_VAR_2}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245196:: @ 8245196 .string "{STR_VAR_3} gave me some advice.\n" .string "{STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2451BD:: @ 82451BD .string "{STR_VAR_2} with {STR_VAR_1}.\n" .string "I’ve got ten of each kind!\l" .string "Actually, just one of each!\p" .string "How about it?\n" .string "Want to try tag battles with me?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24522F:: @ 824522F .string "Yippee!\n" .string "I’ll give you a POKéMON as my thanks!\p" .string "Just joking! But I will really go do\n" .string "the registration, okay?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24529A:: @ 824529A .string "Oh, that’s so cold! I’ll have to wreck\n" .string "the BATTLE TOWER for that!\p" .string "Of course I won’t!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2452EF:: @ 82452EF .string "Hey, there, I’m rockin’ and a-rollin’!\n" .string "POKéMON, I be controllin’!\p" .string "I’m {STR_VAR_3} the rappin’ SAILOR.\n" @@ -574,29 +640,36 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244149: @ 8244149 .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" .string "Me, you shouldn’t be quick to dismiss!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2453B4:: @ 82453B4 .string "With the advice of {STR_VAR_3} I did\n" .string "abide, put together my team of pride!\l" .string "One {STR_VAR_1}-using {STR_VAR_2}$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245406:: @ 8245406 .string "and one {STR_VAR_1}-using\n" .string "{STR_VAR_2}!\p" .string "Our meeting we should commemorate,\n" .string "with a tag-team victory to celebrate!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245464:: @ 8245464 .string "Hey, hey, I like your style!\n" .string "Our registration, I will go file!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2454A3:: @ 82454A3 .string "Oh, hey, {PLAYER}, now that’s cold!\n" .string "If I may be so bold!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2454D6:: @ 82454D6 .string "Yippee-yahoo!\n" .string "Oh, don’t run! I was just having fun!\p" .string "Howdy! I’m {STR_VAR_3}!\n" .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245535:: @ 8245535 .string "{STR_VAR_3} told me what to do.\n" .string "So one {STR_VAR_1}-using {STR_VAR_2}$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24555F:: @ 824555F .string "and one {STR_VAR_1}-using\n" .string "{STR_VAR_2}, I did choose.\p" .string "So, what do you say?\n" @@ -604,24 +677,29 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244149: @ 8244149 .string "Please, I’m begging you!\n" .string "Let me join you, don’t leave me blue!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2455EC:: @ 82455EC .string "Yeahah! Luck is with me!\n" .string "It sure makes me happy!\p" .string "Before we go join the fray,\n" .string "I’ll go register right away!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245656:: @ 8245656 .string "You’re turning me down?\n" .string "{PLAYER}, you’re making me frown!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24568A:: @ 824568A .string "Cough!\p" .string "Oh, sorry, I have a cold.\n" .string "My POKéMON are fine, though.\p" .string "My name’s {STR_VAR_3}, {STR_VAR_1}’s\n" .string "no. {STR_VAR_2} apprentice. Cough!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2456F5:: @ 82456F5 .string "I took {STR_VAR_3}’s advice to heart\n" .string "and put together my team of\l" .string "one {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245740:: @ 8245740 .string "one {STR_VAR_2} with {STR_VAR_1}.\p" .string "I trained them every day,\n" .string "even in wind and rain.\p" @@ -630,853 +708,1115 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244149: @ 8244149 .string "That’s what I’m about.\n" .string "Want to be my tag partner?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2457D9:: @ 82457D9 .string "Thanks, I appreciate this!\n" .string "Cough, cough!\l" .string "Hang on while I go register.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24581F:: @ 824581F .string "Oh, you won’t?\n" .string "{PLAYER}, I think we’d make a good pair.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245851:: @ 8245851 .string "Oh, hello!\n" .string "This is nerve-racking.\p" .string "I’m {STR_VAR_3}.\n" .string "I’m the no. {STR_VAR_2} apprentice of {STR_VAR_1}.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24589C:: @ 824589C .string "{STR_VAR_3} said this team’ll be good--\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2458CE:: @ 82458CE .string "one {STR_VAR_2} with {STR_VAR_1}.\p" .string "I’m feeling self-conscious about this,\n" .string "but will you let me join you?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245923:: @ 8245923 .string "Oh, gee, thank you!\n" .string "I feel bashful, but I’ll do my best!\p" .string "I’ll go get the registration done.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24597F:: @ 824597F .string "Oh, please don’t say no!\n" .string "I feel self-conscious enough already…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2459BE:: @ 82459BE .string "I am {STR_VAR_3}, and that’s no lie.\n" .string "I am {STR_VAR_1}’s no. {STR_VAR_2} apprentice.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2459F7:: @ 82459F7 .string "{STR_VAR_3} recommended my team.\p" .string "Since the advice sounded sincere,\n" .string "I decided to bring with me\l" .string "my {STR_VAR_1}-using {STR_VAR_2} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245A5F:: @ 8245A5F .string "my {STR_VAR_1}-using {STR_VAR_2}.\p" .string "If possible, I would like you to accept\n" .string "me as your tag-team partner.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245AB4:: @ 8245AB4 .string "You really will accept me?\n" .string "It would be too terrible otherwise.\p" .string "But since you’ve agreed, this is fine.\n" .string "I shall go register the both of us.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E:: @ 8245B3E .string "Hm? Now why would you refuse?\n" .string "Is this your idea of a joke?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245B79:: @ 8245B79 .string "I’m {STR_VAR_1}, and I’m a LASS!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245B91:: @ 8245B91 .string "What I have are one {STR_VAR_2}\n" .string "that uses {STR_VAR_1} and one$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245BBD:: @ 8245BBD .string "{STR_VAR_2} that uses {STR_VAR_1}.\n" .string "Those are what I have with me.\p" .string "Will you be my partner?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245C05:: @ 8245C05 .string "Thank you!\n" .string "I’ll go do the registration!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245C2D:: @ 8245C2D .string "You don’t want to be my partner?\n" .string "You’ll regret it later!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245C66:: @ 8245C66 .string "Hello!\p" .string "I’m YOUNGSTER {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F:: @ 8245C7F .string "Want to know what I have?\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245CAC:: @ 8245CAC .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "You’ll be my tag-team partner,\n" .string "won’t you?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245CE6:: @ 8245CE6 .string "Yay!\n" .string "I’ll go and register, okay?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245D07:: @ 8245D07 .string "Aww! If you’d form a tag team with\n" .string "my POKéMON, we’d be unstoppable!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245D4B:: @ 8245D4B .string "Yahoo!\n" .string "I’m HIKER {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245D60:: @ 8245D60 .string "Know what I have with me?\n" .string "My {STR_VAR_1}-using {STR_VAR_2} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245D8D:: @ 8245D8D .string "my {STR_VAR_1}-using {STR_VAR_2}!\p" .string "Sounds good, eh?\n" .string "Want to form a tag team?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245DC7:: @ 8245DC7 .string "Yahoo!\n" .string "I’ll go do the registering, then.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245DF0:: @ 8245DF0 .string "I would’ve liked to battle with you\n" .string "at my side.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245E20:: @ 8245E20 .string "Hello!\n" .string "I’m {STR_VAR_1}, and I’m a BEAUTY!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245E41:: @ 8245E41 .string "Do you know what I’ve been raising?\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245E78:: @ 8245E78 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "What do you think?\n" .string "Want to make a tag team together?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245EBD:: @ 8245EBD .string "Wonderful!\n" .string "I’ll get the registration done now!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245EEC:: @ 8245EEC .string "How disappointing!\p" .string "We two together--we would’ve been\n" .string "the best!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245F2B:: @ 8245F2B .string "Yo!\p" .string "You know who I am?\n" .string "I’m {STR_VAR_1} the FISHERMAN!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245F58:: @ 8245F58 .string "I’ve got with me a team of one\n" .string "{STR_VAR_1}-using {STR_VAR_2} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245F87:: @ 8245F87 .string "one {STR_VAR_1}-using {STR_VAR_2}.\p" .string "So, how about it?\n" .string "Will you battle at my side?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245FC6:: @ 8245FC6 .string "Good, good!\n" .string "Leave it up to me!\p" .string "I’ll go and register us now.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246002:: @ 8246002 .string "We matched up perfectly, too…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246020:: @ 8246020 .string "Glad to make your acquaintance.\n" .string "I am {STR_VAR_1}, a LADY.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246051:: @ 8246051 .string "I am accompanied by a team of\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246082:: @ 8246082 .string "one {STR_VAR_2} with {STR_VAR_1}.\p" .string "I hope I meet your approval.\n" .string "For I wish to have you as my partner.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2460D5:: @ 82460D5 .string "I thank you sincerely.\n" .string "I shall handle the registration.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24610D:: @ 824610D .string "I’m sure that you will regret not\n" .string "having me as your partner.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24614A:: @ 824614A .string "I’m TRIATHLETE {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D:: @ 824615D .string "What I have…\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24617D:: @ 824617D .string "one {STR_VAR_2} with {STR_VAR_1}!\n" .string "That’s my pair!\p" .string "Please?\n" .string "Will you form a tag team with me?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2461C7:: @ 82461C7 .string "Gee, thanks!\n" .string "I’ll go register at the counter.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2461F5:: @ 82461F5 .string "We two together, we would’ve been\n" .string "tough for certain!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24622A:: @ 824622A .string "Hiya!\n" .string "I’m BUG CATCHER {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246244:: @ 8246244 .string "Check out what I have!\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24626E:: @ 824626E .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "So, listen!\n" .string "Do you want to form a tag team?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2462AA:: @ 82462AA .string "Gotcha!\p" .string "I’ll go do the registration stuff\n" .string "at the counter.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2462E4:: @ 82462E4 .string "Aww, my POKéMON are awesome.\n" .string "I hope you won’t regret this!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24631F:: @ 824631F .string "Good day!\n" .string "I’m SCHOOL KID {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24633C:: @ 824633C .string "What I’ve been raising are one\n" .string "{STR_VAR_2} that uses {STR_VAR_1}$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24636B:: @ 824636B .string "and one {STR_VAR_2} that uses\n" .string "{STR_VAR_1}.\p" .string "Not too bad, don’t you think?\n" .string "Would you care to form a tag team?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2463C5:: @ 82463C5 .string "Thank you very much!\n" .string "I’ll get done with the registration.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2463FF:: @ 82463FF .string "That’s too bad…\p" .string "I was hoping that I could learn\n" .string "from you as your partner…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246449:: @ 8246449 .string "Yo! Let me tell you who I am!\n" .string "I’m RICH BOY {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246478:: @ 8246478 .string "Guess what I got!\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D:: @ 824649D .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "I’m willing to offer you the chance\n" .string "to be in a tag team with me.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2464EE:: @ 82464EE .string "Smart move!\p" .string "I’ll finish up the registration\n" .string "process quick!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246529:: @ 8246529 .string "You’d turn me of all people down?\n" .string "You’ll regret that decision for sure!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246571:: @ 8246571 .string "Hiyah!\n" .string "I am BLACK BELT {STR_VAR_1}.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24658C:: @ 824658C .string "As my companions, I have\n" .string "one {STR_VAR_2} using {STR_VAR_1}$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2465B5:: @ 82465B5 .string "and one {STR_VAR_2} using\n" .string "{STR_VAR_1}.\p" .string "Please, grant me my wish!\n" .string "Allow me to be your tag partner!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246605:: @ 8246605 .string "Hiyah!\n" .string "I will go register forthwith!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24662A:: @ 824662A .string "I see… I hope for an opportunity\n" .string "the next time we meet…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246662:: @ 8246662 .string "Hi, there!\n" .string "I’m {STR_VAR_1}, and I’m a TUBER!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246686:: @ 8246686 .string "I’ll tell you what I have.\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2466B4:: @ 82466B4 .string "one {STR_VAR_2} with {STR_VAR_1}!\n" .string "May I please be on your tag team?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2466E6:: @ 82466E6 .string "Thank you!\n" .string "I’ll go register us now!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24670A:: @ 824670A .string "If we’d become partners, we could\n" .string "have been so strong!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246741:: @ 8246741 .string "Greetings…\n" .string "I am HEX MANIAC {STR_VAR_1}…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246760:: @ 8246760 .string "I bear with me one {STR_VAR_1}-using\n" .string "{STR_VAR_2} together with one$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246791:: @ 8246791 .string "{STR_VAR_1}-using {STR_VAR_2}…\p" .string "I beseech you…\n" .string "Join me in a tag team…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2467C4:: @ 82467C4 .string "I thank you…\n" .string "I shall register us…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2467E6:: @ 82467E6 .string "I so longed to join you…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2467FF:: @ 82467FF .string "How do you do? I’m {STR_VAR_1},\n" .string "and I’m a POKéMON BREEDER!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246831:: @ 8246831 .string "I’m raising a couple good ones!\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246864:: @ 8246864 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "How about it?\n" .string "Feel like making a tag team with me?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2468A7:: @ 82468A7 .string "Thank you kindly!\p" .string "I’ll go take care of the registration\n" .string "stuff, so you wait right here!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE:: @ 82468FE .string "I was looking forward to being\n" .string "your partner…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B:: @ 824692B .string "Well, hello!\n" .string "I’m TRIATHLETE {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24694B:: @ 824694B .string "Want to know what I run with?\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24697C:: @ 824697C .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "Well?\n" .string "Want to be in a tag team with me?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2469B4:: @ 82469B4 .string "Good going!\p" .string "I’ll be quick and get the registration\n" .string "all done!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2469F1:: @ 82469F1 .string "You and me, we would’ve been tops.\n" .string "It’s too bad…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246A22:: @ 8246A22 .string "Hey, there! My name’s {STR_VAR_1}!\n" .string "I’m a TRIATHLETE!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246A4E:: @ 8246A4E .string "I go on runs with my durable team--\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246A85:: @ 8246A85 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "Not too shabby, huh?\n" .string "We should be in a tag team together!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF:: @ 8246ACF .string "All right!\n" .string "I’ll go register in a flash!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246AF7:: @ 8246AF7 .string "I really wanted to battle as your\n" .string "tag-team partner…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246B2B:: @ 8246B2B .string "I’m BATTLE GIRL {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246B3F:: @ 8246B3F .string "I’ve been toughening up one\n" .string "{STR_VAR_1}-using {STR_VAR_2} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246B6B:: @ 8246B6B .string "one {STR_VAR_1}-using {STR_VAR_2}!\p" .string "Do you like that combo?\n" .string "How about you and me join up?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246BB2:: @ 8246BB2 .string "Why, thanks!\p" .string "I’ll get the registration done\n" .string "right now!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9:: @ 8246BE9 .string "With you, I thought we could form\n" .string "the ultimate tag team…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246C22:: @ 8246C22 .string "I’m TRIATHLETE {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246C35:: @ 8246C35 .string "I’ve been running with one {STR_VAR_2}\n" .string "that knows how to use {STR_VAR_1}$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246C6C:: @ 8246C6C .string "and one {STR_VAR_2} with {STR_VAR_1}!\p" .string "We could be in a tag team.\n" .string "Wouldn’t that be great?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246CB3:: @ 8246CB3 .string "Thank you!\p" .string "I’ll go register us, and that’s\n" .string "right now!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246CE9:: @ 8246CE9 .string "Aww, that’s too bad. We would’ve been\n" .string "the toughest tag team around!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246D2D:: @ 8246D2D .string "Me?\n" .string "I’m TUBER {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F:: @ 8246D3F .string "What do I have with me?\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246D6A:: @ 8246D6A .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "Hey?\n" .string "You’ll team up with me, right?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246D9E:: @ 8246D9E .string "Okay!\p" .string "I’ll go register!\n" .string "Let’s be excellent together!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246DD3:: @ 8246DD3 .string "My POKéMON are tough for sure…\n" .string "It’s too bad you don’t want to team up.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246E1A:: @ 8246E1A .string "Yay-hey!\n" .string "Call me GUITARIST {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246E39:: @ 8246E39 .string "Check out my entourage!\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246E64:: @ 8246E64 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "Yay-hey! Pretty wild, huh?\n" .string "We’ll have to do a duet in a tag team!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246EB6:: @ 8246EB6 .string "Yay-hey! Right on!\n" .string "I’ll do that registration stuff now!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246EEE:: @ 8246EEE .string "My POKéMON rock hard!\n" .string "You’ll be sorry, I tell you!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246F21:: @ 8246F21 .string "Pleased to meet you.\n" .string "I am {STR_VAR_1}, a GENTLEMAN.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246F4C:: @ 8246F4C .string "I am accompanied by my trusted\n" .string "{STR_VAR_1}-using {STR_VAR_2} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246F7B:: @ 8246F7B .string "one {STR_VAR_1}-using {STR_VAR_2}.\p" .string "May I ask you to join me in a tag-team\n" .string "partnership arrangement?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246FCC:: @ 8246FCC .string "Ah, I thank you for your trust.\n" .string "I shall be done with the registration.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247013:: @ 8247013 .string "That is most unfortunate…\p" .string "I shall look forward to the next\n" .string "opportunity…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24705B:: @ 824705B .string "Hello, I’m {STR_VAR_1},\n" .string "and I’m a POKéFAN.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D:: @ 824707D .string "I have with me now one {STR_VAR_2}\n" .string "that knows the move {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2470B2:: @ 82470B2 .string "one {STR_VAR_2} with {STR_VAR_1}.\p" .string "Do you like what you see?\n" .string "Why don’t you be my tag partner?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2470FD:: @ 82470FD .string "Thank you!\n" .string "I’ll look after the registration!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24712A:: @ 824712A .string "My POKéMON are top grade…\n" .string "It’s too bad you can’t appreciate that.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24716C:: @ 824716C .string "Hm!\n" .string "I am {STR_VAR_1}, and an EXPERT am I!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24718D:: @ 824718D .string "The POKéMON that I’ve toughened up are\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2471C7:: @ 82471C7 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "What say you to a tag team with me?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2471FB:: @ 82471FB .string "Hm!\n" .string "I shall register us right away!\l" .string "Let us both do our best!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247238:: @ 8247238 .string "I will hope that your choice is\n" .string "indeed correct…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247268:: @ 8247268 .string "Hello, hello.\n" .string "I’m {STR_VAR_1}, and I’m an EXPERT.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247291:: @ 8247291 .string "I’ve raised my POKéMON thoroughly.\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2472C7:: @ 82472C7 .string "one {STR_VAR_2} with {STR_VAR_1}--\n" .string "they’re what I have.\p" .string "Wouldn’t you like to team up with me?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247313:: @ 8247313 .string "Good, good.\n" .string "I’ll see to the registration right away.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247348:: @ 8247348 .string "Perhaps we can form a team the next\n" .string "time we meet.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24737A:: @ 824737A .string "I’m DRAGON TAMER {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24738F:: @ 824738F .string "The team I’ve been toughening up is\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2473C6:: @ 82473C6 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "How about it?\n" .string "Want to be my partner?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2473FB:: @ 82473FB .string "Okay, I’ll give it my best!\n" .string "I’ll go register now, all right?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247438:: @ 8247438 .string "You’re not going to find many tougher\n" .string "partners than me!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247470:: @ 8247470 .string "I’m BIRD KEEPER {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247484:: @ 8247484 .string "What POKéMON do I have?\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2474AF:: @ 82474AF .string "one {STR_VAR_2} with {STR_VAR_1}.\p" .string "Don’t you think we’d make a decent\n" .string "tag team?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2474EC:: @ 82474EC .string "Great, thanks!\n" .string "I’ll look after the registration!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24751D:: @ 824751D .string "My POKéMON and I are strong.\n" .string "What a letdown.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24754A:: @ 824754A .string "I’m NINJA BOY {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C:: @ 824755C .string "My POKéMON team consists of one\n" .string "{STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24758B:: @ 824758B .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "Let’s be in a tag team together!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2475BC:: @ 82475BC .string "Yay!\n" .string "Let me go register!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2475D5:: @ 82475D5 .string "You’ll regret not having my tough\n" .string "POKéMON on your side!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24760D:: @ 824760D .string "Hello!\n" .string "I’m PARASOL LADY {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247629:: @ 8247629 .string "Escorting me now are my {STR_VAR_2}\n" .string "that uses {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247655:: @ 8247655 .string "one {STR_VAR_2} that uses\n" .string "{STR_VAR_1}.\p" .string "Aren’t they nice?\n" .string "Care to join us in a tag team?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24769B:: @ 824769B .string "Thanks a bunch!\p" .string "I’ll go register at the counter.\n" .string "Let’s not disappoint each other!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED:: @ 82476ED .string "My POKéMON are tremendously strong.\n" .string "How disappointing…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247724:: @ 8247724 .string "Hello.\n" .string "I’m {STR_VAR_1}, and I’m a BUG MANIAC!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247749:: @ 8247749 .string "I have found my POKéMON, yes.\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24777A:: @ 824777A .string "one {STR_VAR_2} with {STR_VAR_1}--\n" .string "they are what I found.\p" .string "Could I interest you in forming\n" .string "a tag team?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2477CE:: @ 82477CE .string "Okay!\n" .string "Understood!\p" .string "I won’t be long with the registration!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247807:: @ 8247807 .string "With the POKéMON I found, we wouldn’t\n" .string "have lost…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247838:: @ 8247838 .string "Ahoy, there!\n" .string "I’m SAILOR {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247854:: @ 8247854 .string "Let me show you my pride and joy!\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247889:: @ 8247889 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "Of course you’re not going to turn\n" .string "me down. We will team up, right?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2478DD:: @ 82478DD .string "I didn’t expect any less!\n" .string "I’ll go register now.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24790D:: @ 824790D .string "We would’ve stormed through\n" .string "the opposition! Too bad!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247942:: @ 8247942 .string "Hi, I’m {STR_VAR_1}.\n" .string "I’m a COLLECTOR.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24795F:: @ 824795F .string "The jewels in my collection are\n" .string "my {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247991:: @ 8247991 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "Swell, huh?\n" .string "We should be in a team together.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2479CE:: @ 82479CE .string "Oh, yeah!\p" .string "Well, let’s not waste any time.\n" .string "I’ll go register the two of us.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247A18:: @ 8247A18 .string "Well, that’s upsetting.\n" .string "You don’t appreciate my POKéMON.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247A51:: @ 8247A51 .string "Howdy, I’m {STR_VAR_1}.\n" .string "I’m a POKéMON RANGER.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76:: @ 8247A76 .string "Keeping me company are one\n" .string "{STR_VAR_1}-using {STR_VAR_2} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247AA1:: @ 8247AA1 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "Don’t you think we’d make an impressive\n" .string "tag team?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247AE3:: @ 8247AE3 .string "That’s super!\n" .string "I’ll deal with the registration now.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247B16:: @ 8247B16 .string "Next time, choose my POKéMON,\n" .string "will you?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247B3E:: @ 8247B3E .string "My name’s {STR_VAR_1}.\n" .string "I’m a POKéMON RANGER!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247B62:: @ 8247B62 .string "Let me tell you about my team. I have\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247B9B:: @ 8247B9B .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "How would you like to form a tag team\n" .string "with my little posse?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247BE7:: @ 8247BE7 .string "We’ll be at our best!\n" .string "I’ll get the registration done quick!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247C23:: @ 8247C23 .string "I hope you’ll choose my POKéMON\n" .string "next time.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247C4E:: @ 8247C4E .string "Pleased to meet you. I’m {STR_VAR_1}.\n" .string "I consider myself an AROMA LADY.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247C8C:: @ 8247C8C .string "I travel with one {STR_VAR_2}\n" .string "that uses {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247CB2:: @ 8247CB2 .string "one {STR_VAR_2} that uses\n" .string "{STR_VAR_1}.\p" .string "I hope they strike your fancy.\n" .string "Would you care to be my partner?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247D07:: @ 8247D07 .string "I’m honored by your acceptance.\n" .string "I will go register right this instant.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E:: @ 8247D4E .string "It would be wonderful if we could form\n" .string "a tag team the next time we meet.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247D97:: @ 8247D97 .string "Want to know who I am?\n" .string "I’m {STR_VAR_1}, the RUIN MANIAC!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247DC7:: @ 8247DC7 .string "The POKéMON that I have with me are\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247DFE:: @ 8247DFE .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "Intriguing, eh?\n" .string "How about you and I partner up?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247E3E:: @ 8247E3E .string "That’s a sound decision!\n" .string "I’ll go do the registration paperwork.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247E7E:: @ 8247E7E .string "Hmm…\n" .string "I think my POKéMON are tough…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247EA1:: @ 8247EA1 .string "I’m COOLTRAINER {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5:: @ 8247EB5 .string "The POKéMON I have right now are one\n" .string "{STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247EE9:: @ 8247EE9 .string "one {STR_VAR_2} with {STR_VAR_1}.\n" .string "Cool, huh?\p" .string "Don’t you think it’d be pretty cool\n" .string "if we made a tag team?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247F3F:: @ 8247F3F .string "Cool!\n" .string "I’ll go do the registration in a flash!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247F6D:: @ 8247F6D .string "I thought that we’d make just\n" .string "the greatest team ever.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247FA3:: @ 8247FA3 .string "I’m COOLTRAINER {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247FB7:: @ 8247FB7 .string "The team I’ve been raising has one\n" .string "{STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247FE9:: @ 8247FE9 .string "one {STR_VAR_2} with {STR_VAR_1}.\p" .string "Does that sound okay?\n" .string "How about we become tag partners?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248031:: @ 8248031 .string "Sounds A-OK!\n" .string "I’d better do the registration.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E:: @ 824805E .string "I was thinking how we would be\n" .string "one tough team…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24808D:: @ 824808D .string "Heyo!\n" .string "I’m {STR_VAR_1}, the POKéMANIAC!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB:: @ 82480AB .string "What does a guy like me have?\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2480DC:: @ 82480DC .string "one {STR_VAR_2} with {STR_VAR_1},\n" .string "that’s what!\p" .string "Let’s do it!\n" .string "We’ll stomp around as a tag team!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248128:: @ 8248128 .string "Good call!\n" .string "I’ll register the both of us!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248151:: @ 8248151 .string "My POKéMON are brutal!\n" .string "It’s not my fault if you regret this!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24818E:: @ 824818E .string "Yo, there!\n" .string "I’m KINDLER {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2481A9:: @ 82481A9 .string "You know what my training cooked up?\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2481E1:: @ 82481E1 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "Well, what do you say?\n" .string "Want to form a tag team?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248221:: @ 8248221 .string "All right!\n" .string "I’ll get on with the registration.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24824F:: @ 824824F .string "Promise you’ll partner up with me\n" .string "the next time we run into each other.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248297:: @ 8248297 .string "I’m {STR_VAR_1}, and I’m a CAMPER!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2482B1:: @ 82482B1 .string "I’ve been raising one {STR_VAR_1}-\n" .string "using {STR_VAR_2} and one$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2482DC:: @ 82482DC .string "{STR_VAR_1}-using {STR_VAR_2}.\p" .string "Do you think it’d be fun to team up?\n" .string "I bet it would be!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248321:: @ 8248321 .string "Yeah!\n" .string "Off I go to register!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24833D:: @ 824833D .string "Next time, okay?\n" .string "I want to be on your team.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248369:: @ 8248369 .string "Hello!\n" .string "I’m {STR_VAR_1}, and I’m a PICNICKER!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24838D:: @ 824838D .string "The POKéMON I’ve been taking are\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2483C1:: @ 82483C1 .string "one {STR_VAR_2} with {STR_VAR_1}.\p" .string "Are you interested in joining me\n" .string "on a tag team?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248401:: @ 8248401 .string "Why, thank you!\n" .string "I will do the registration now.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248431:: @ 8248431 .string "It would be nice if I could join you\n" .string "some other time.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248467:: @ 8248467 .string "I’m PSYCHIC {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248477:: @ 8248477 .string "The twosome I’ve been raising are\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2484AC:: @ 82484AC .string "one {STR_VAR_2} with {STR_VAR_1}.\p" .string "Would you like to form a tag team\n" .string "with me?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2484E7:: @ 82484E7 .string "Sure thing!\n" .string "I’ll take care of the registration!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248517:: @ 8248517 .string "If we meet again, that’s when I’d like\n" .string "to team up with you.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248553:: @ 8248553 .string "I’m {STR_VAR_1}.\n" .string "I’m a PSYCHIC.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24856A:: @ 824856A .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24857D:: @ 824857D .string "one {STR_VAR_2} with {STR_VAR_1}--\n" .string "they’re my disciples.\p" .string "Doesn’t the idea of forming a tag-team\n" .string "partnership intrigue you?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2485E5:: @ 82485E5 .string "Thank you.\n" .string "I’ll go deal with the registration.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248614:: @ 8248614 .string "I hope there will be another chance\n" .string "to forge an alliance.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24864E:: @ 824864E .string "I’m SCHOOL KID {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248661:: @ 8248661 .string "One {STR_VAR_1}-using {STR_VAR_2}$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248671:: @ 8248671 .string "and one {STR_VAR_1}-using\n" .string "{STR_VAR_2} are my POKéMON pair.\p" .string "May I please be your partner on\n" .string "a tag team?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2486C6:: @ 82486C6 .string "Ooh, thank you!\n" .string "I’ll register at the counter right away!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2486FF:: @ 82486FF .string "Please?\n" .string "May I join you the next time?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248725:: @ 8248725 .string "Hiya! The name’s {STR_VAR_1}!\n" .string "I’m a POKéMON BREEDER!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248751:: @ 8248751 .string "The POKéMON I’ve raised are one\n" .string "{STR_VAR_1}-using {STR_VAR_2} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248781:: @ 8248781 .string "one {STR_VAR_1}-using {STR_VAR_2}.\p" .string "Sound interesting?\n" .string "How about we form a tag team, then?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2487C9:: @ 82487C9 .string "All righty!\n" .string "You leave the registration to me!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2487F7:: @ 82487F7 .string "You have to team up with me next time,\n" .string "all right?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248829:: @ 8248829 .string "I’m {STR_VAR_1}, and I’m proud to say\n" .string "that I am a POKéFAN.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24885B:: @ 824885B .string "The darling POKéMON I’ve raised are\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248892:: @ 8248892 .string "one {STR_VAR_2} with {STR_VAR_1}.\p" .string "Aren’t they just the cutest?\n" .string "We ought to make a team!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2488D8:: @ 82488D8 .string "Thank you, dear!\n" .string "I’ll be on my way to register!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248908:: @ 8248908 .string "My darling POKéMON are the best,\n" .string "I’ll have you know. How annoying!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24894B:: @ 824894B .string "Hi, I’m SWIMMER {STR_VAR_1}.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24895F:: @ 824895F .string "One {STR_VAR_1}-using {STR_VAR_2}$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24896F:: @ 824896F .string "and one {STR_VAR_1}-using\n" .string "{STR_VAR_2} are what I’ve trained.\p" .string "You and me, let’s make a tag team.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2489BD:: @ 82489BD .string "That’s cool!\n" .string "I’ll register the two of us.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2489E7:: @ 82489E7 .string "If we meet again, you owe me\n" .string "a tag team!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248A10:: @ 8248A10 .string "What’s happening?\n" .string "I’m {STR_VAR_1}, and I’m a TRIATHLETE.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40:: @ 8248A40 .string "I got a couple decent POKéMON.\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248A72:: @ 8248A72 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "It’d be neat if we made a tag team\n" .string "together, so how about it?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248AC0:: @ 8248AC0 .string "Right on!\n" .string "You wait while I register, okay?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248AEB:: @ 8248AEB .string "I expect you’ll let me join you\n" .string "next time, how’s that?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248B22:: @ 8248B22 .string "I’m the TRIATHLETE {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248B39:: @ 8248B39 .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248B4C:: @ 8248B4C .string "another {STR_VAR_2} that knows how\n" .string "to use {STR_VAR_1}. That’s my pair.\p" .string "What do you think?\n" .string "We’d make a good team, I’d say.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248BB4:: @ 8248BB4 .string "I like that answer!\n" .string "I’ll get done with registration fast!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248BEE:: @ 8248BEE .string "You’ll give me another chance to form\n" .string "a partnership, won’t you?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248C2E:: @ 8248C2E .string "Hi, there! Hello!\n" .string "I’m {STR_VAR_1}, and I’m a SWIMMER!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248C5B:: @ 8248C5B .string "Check out what I’ve been raising!\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248C90:: @ 8248C90 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "Sweet, huh?\n" .string "It’d be sweet to form a team, too!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248CCF:: @ 8248CCF .string "Much obliged!\n" .string "I’ll get this registration thing done!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248D04:: @ 8248D04 .string "If we meet again, you have to team up\n" .string "with me. You’ll do that, right?$" diff --git a/data/scripts/maps/BattleFrontier_Lounge1.inc b/data/scripts/maps/BattleFrontier_Lounge1.inc index 5449fa8ee..ba8ca0cb6 100644 --- a/data/scripts/maps/BattleFrontier_Lounge1.inc +++ b/data/scripts/maps/BattleFrontier_Lounge1.inc @@ -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 diff --git a/data/scripts/maps/BattleFrontier_Lounge2.inc b/data/scripts/maps/BattleFrontier_Lounge2.inc index d5fee28e9..bbb298b5b 100644 --- a/data/scripts/maps/BattleFrontier_Lounge2.inc +++ b/data/scripts/maps/BattleFrontier_Lounge2.inc @@ -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…$" diff --git a/data/scripts/maps/BattleFrontier_Lounge3.inc b/data/scripts/maps/BattleFrontier_Lounge3.inc index b8d52deec..4568dd2c8 100644 --- a/data/scripts/maps/BattleFrontier_Lounge3.inc +++ b/data/scripts/maps/BattleFrontier_Lounge3.inc @@ -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.$" diff --git a/data/scripts/maps/BattleFrontier_Lounge5.inc b/data/scripts/maps/BattleFrontier_Lounge5.inc index 497857b63..bb1feceec 100644 --- a/data/scripts/maps/BattleFrontier_Lounge5.inc +++ b/data/scripts/maps/BattleFrontier_Lounge5.inc @@ -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!$" diff --git a/data/scripts/maps/BattleFrontier_Lounge7.inc b/data/scripts/maps/BattleFrontier_Lounge7.inc index b12c911ce..f6f957cae 100644 --- a/data/scripts/maps/BattleFrontier_Lounge7.inc +++ b/data/scripts/maps/BattleFrontier_Lounge7.inc @@ -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.$" diff --git a/data/scripts/maps/BattleFrontier_ReceptionGate.inc b/data/scripts/maps/BattleFrontier_ReceptionGate.inc index 7ecf83788..eca861f85 100644 --- a/data/scripts/maps/BattleFrontier_ReceptionGate.inc +++ b/data/scripts/maps/BattleFrontier_ReceptionGate.inc @@ -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 diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index fdd8515e9..9137902f2 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -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 diff --git a/data/scripts/maps/DesertUnderpass.inc b/data/scripts/maps/DesertUnderpass.inc index 0db62ff75..486bd2577 100644 --- a/data/scripts/maps/DesertUnderpass.inc +++ b/data/scripts/maps/DesertUnderpass.inc @@ -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 diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index 20192a4e6..5cb4ee7fd 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -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 diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc index 63817688d..0a174bf0c 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc @@ -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 diff --git a/data/scripts/maps/FieryPath.inc b/data/scripts/maps/FieryPath.inc index 870b70e91..a040a5327 100644 --- a/data/scripts/maps/FieryPath.inc +++ b/data/scripts/maps/FieryPath.inc @@ -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 diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index fb1798804..a96d13902 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -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 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index ed34cd953..90769b550 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -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 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 3eb61ed91..8de2d5d6f 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -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 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index e60eccbaa..0fcdc46d5 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -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 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 112311462..0f3fa1a0e 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -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 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index f1763753a..0e7ecbf22 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -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 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 2fdf79b03..e0229b9ea 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -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 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 3a983cdd4..327112d2f 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -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 diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 94da547d5..049833db0 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -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 diff --git a/data/scripts/maps/MirageTower_1F.inc b/data/scripts/maps/MirageTower_1F.inc index 5b9725c9e..d7d9619b5 100644 --- a/data/scripts/maps/MirageTower_1F.inc +++ b/data/scripts/maps/MirageTower_1F.inc @@ -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 diff --git a/data/scripts/maps/MirageTower_4F.inc b/data/scripts/maps/MirageTower_4F.inc index 19b8c6c91..10d465b74 100644 --- a/data/scripts/maps/MirageTower_4F.inc +++ b/data/scripts/maps/MirageTower_4F.inc @@ -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 diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/scripts/maps/MossdeepCity_House1.inc index a06979ddf..b08d296c7 100644 --- a/data/scripts/maps/MossdeepCity_House1.inc +++ b/data/scripts/maps/MossdeepCity_House1.inc @@ -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 diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index 0cd8ddf84..cb3cc0d16 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -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 diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index 106dc5570..8fc55295f 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -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 diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 06621451e..1dd9c2725 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -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 diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index 9d13b5cf4..727b77985 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -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 diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index bf671d01e..0e87677e6 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -13,10 +13,10 @@ PacifidlogTown_House2_EventScript_203792:: @ 8203792 checkflag FLAG_0x12C call_if 0, PacifidlogTown_House2_EventScript_203801 setflag FLAG_0x12C - specialvar VAR_RESULT, sub_8138C04 + specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 4 goto_if 4, PacifidlogTown_House2_EventScript_203816 - specialvar VAR_RESULT, sub_8138C04 + specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 2 goto_if 4, PacifidlogTown_House2_EventScript_203845 goto PacifidlogTown_House2_EventScript_20384F diff --git a/data/scripts/maps/PacifidlogTown_House5.inc b/data/scripts/maps/PacifidlogTown_House5.inc index aa02cc017..ec97a639e 100644 --- a/data/scripts/maps/PacifidlogTown_House5.inc +++ b/data/scripts/maps/PacifidlogTown_House5.inc @@ -4,7 +4,7 @@ PacifidlogTown_House5_MapScripts:: @ 8204110 PacifidlogTown_House5_EventScript_204111:: @ 8204111 lock faceplayer - specialvar VAR_RESULT, sub_813793C + specialvar VAR_RESULT, IsMirageIslandPresent compare VAR_RESULT, 1 goto_eq PacifidlogTown_House5_EventScript_20412D msgbox PacifidlogTown_House5_Text_204140, 4 diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 1f6de9966..0da686052 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -31,7 +31,7 @@ PetalburgCity_MapScript2_1DC31C: @ 81DC31C PetalburgCity_EventScript_1DC32E:: @ 81DC32E lockall special copy_player_party_to_sav1 - special sub_813946C + special PutZigzagoonInPlayerParty applymovement 2, PetalburgCity_Movement_1DC451 applymovement 255, PetalburgCity_Movement_1DC430 waitmovement 0 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index c07b89eec..060531c97 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -222,7 +222,7 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC clearflag FLAG_0x2D6 clearflag FLAG_0x362 setflag FLAG_0x379 - special sub_8137A0C + special InitBirchState warp PETALBURG_CITY, 255, 15, 8 waitstate release @@ -1204,12 +1204,12 @@ PetalburgCity_Gym_EventScript_205733:: @ 8205733 return PetalburgCity_Gym_EventScript_205746:: @ 8205746 - special sub_81388E4 + special PetalburgGymSpecial1 waitstate return PetalburgCity_Gym_EventScript_20574B:: @ 820574B - special sub_8138AA4 + special PetalburgGymSpecial2 return PetalburgCity_Gym_EventScript_20574F:: @ 820574F diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index 8d5d79d73..f4a31854e 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -28,7 +28,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_207A1C:: @ 8207A1C lock faceplayer msgbox PetalburgCity_PokemonCenter_1F_Text_207B09, 4 - specialvar VAR_RESULT, sub_81394D8 + specialvar VAR_RESULT, IsStarterInParty compare VAR_RESULT, 1 goto_eq PetalburgCity_PokemonCenter_1F_EventScript_207A38 release diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 128888939..e672b7ad2 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -1035,14 +1035,14 @@ Route104_EventScript_1ED580:: @ 81ED580 Route104_EventScript_1ED597:: @ 81ED597 trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2952BB, Route104_Text_2952E6, Route104_Text_295330 - special sub_8138B10 + special GetPlayerBigGuyGirlString msgbox Route104_Text_2952FE, 4 release end Route104_EventScript_1ED5B6:: @ 81ED5B6 trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2953AF, Route104_Text_2953E1, Route104_Text_295449 - special sub_8138B10 + special GetPlayerBigGuyGirlString msgbox Route104_Text_29540D, 4 release end diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index 2e901b5f4..c0c3888e1 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -3,7 +3,7 @@ Route104_MrBrineysHouse_MapScripts:: @ 8229D2E .byte 0 Route104_MrBrineysHouse_MapScript1_229D34: @ 8229D34 - setflag FLAG_0x89D + setflag FLAG_LANDMARK_MR_BRINEY_HOUSE compare VAR_0x4090, 1 call_if 1, Route104_MrBrineysHouse_EventScript_229D50 checkflag FLAG_0x0BC diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 3b7dcf601..5142a1282 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -3,7 +3,7 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 822A34C .byte 0 Route104_PrettyPetalFlowerShop_MapScript1_22A352: @ 822A352 - setflag FLAG_0x89C + setflag FLAG_LANDMARK_FLOWER_SHOP checkflag FLAG_0x07F goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_22A36B checkflag FLAG_BADGE03_GET diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index b8503593d..d708246de 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -328,7 +328,7 @@ Route109_EventScript_1EE99E:: @ 81EE99E Route109_EventScript_1EE9B5:: @ 81EE9B5 lock faceplayer - special sub_8138B10 + special GetPlayerBigGuyGirlString checkflag FLAG_0x118 goto_eq Route109_EventScript_1EE9F2 msgbox Route109_Text_1EEFDE, 4 diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index 90113bd5b..e70f91ca8 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -3,7 +3,7 @@ Route109_SeashoreHouse_MapScripts:: @ 82693F4 .byte 0 Route109_SeashoreHouse_MapScript1_2693FA: @ 82693FA - setflag FLAG_0x89F + setflag FLAG_LANDMARK_SEASHORE_HOUSE end Route109_SeashoreHouse_EventScript_2693FE:: @ 82693FE diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 210354444..3c743fb3c 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -5,7 +5,7 @@ Route110_MapScripts:: @ 81EF269 .byte 0 Route110_MapScript1_1EF279: @ 81EF279 - special sub_8137F44 + special UpdateCyclingRoadState end Route110_MapScript1_1EF27D: @ 81EF27D @@ -24,7 +24,7 @@ Route110_MapScript2_1EF297: @ 81EF297 .2byte 0 Route110_EventScript_1EF2A1:: @ 81EF2A1 - special sub_8137D0C + special Special_BeginCyclingRoadChallenge setvar VAR_0x40A9, 2 return @@ -130,7 +130,7 @@ Route110_EventScript_1EF389:: @ 81EF389 Route110_EventScript_1EF392:: @ 81EF392 lockall - specialvar VAR_RESULT, sub_8137EFC + specialvar VAR_RESULT, GetRecordedCyclingRoadResults compare VAR_RESULT, 0 goto_eq Route110_EventScript_1EF3AD msgbox Route110_Text_1F0A1E, 4 @@ -145,7 +145,7 @@ Route110_EventScript_1EF3AD:: @ 81EF3AD Route110_EventScript_1EF3B7:: @ 81EF3B7 lock faceplayer - specialvar VAR_RESULT, sp0E3_walkrun_bitfield_interpretation + specialvar VAR_RESULT, GetPlayerAvatarBike compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF3E8 compare VAR_0x40A9, 0 @@ -326,7 +326,7 @@ Route110_EventScript_1EF661:: @ 81EF661 end Route110_EventScript_1EF673:: @ 81EF673 - special sub_8137E6C + special FinishCyclingRoadChallenge msgbox Route110_Text_1F03FF, 4 switch VAR_RESULT case 10, Route110_EventScript_1EF6FD diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc index 8772f96b8..053183b28 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc @@ -10,7 +10,7 @@ Route110_SeasideCyclingRoadEntrance1_EventScript_26EA78:: @ 826EA78 Route110_SeasideCyclingRoadEntrance1_EventScript_26EA84:: @ 826EA84 lockall - specialvar VAR_RESULT, sp0E3_walkrun_bitfield_interpretation + specialvar VAR_RESULT, GetPlayerAvatarBike compare VAR_RESULT, 0 goto_eq Route110_SeasideCyclingRoadEntrance1_EventScript_26EA9F setflag FLAG_SYS_CYCLING_ROAD diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc index ca7f558a8..602373825 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc @@ -22,7 +22,7 @@ Route110_SeasideCyclingRoadEntrance2_EventScript_26EBC4:: @ 826EBC4 Route110_SeasideCyclingRoadEntrance2_EventScript_26EBD0:: @ 826EBD0 lockall - specialvar VAR_RESULT, sp0E3_walkrun_bitfield_interpretation + specialvar VAR_RESULT, GetPlayerAvatarBike compare VAR_RESULT, 2 call_if 1, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBF6 compare VAR_RESULT, 0 diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index cafa9c827..a0aa5856c 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -13,7 +13,7 @@ Route110_TrickHouseEnd_MapScript1_26ACC4: @ 826ACC4 Route110_TrickHouseEnd_MapScript1_26ACD0: @ 826ACD0 setvar VAR_0x4001, 0 setvar VAR_0x4002, 0 - special sub_8138FD4 + special SetTrickHouseEndRoomFlag end Route110_TrickHouseEnd_MapScript2_26ACDE: @ 826ACDE @@ -171,7 +171,7 @@ Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 call_if 1, Route110_TrickHouseEnd_EventScript_26B002 msgbox Route110_TrickHouseEnd_Text_26B69A, 4 call Route110_TrickHouseEnd_EventScript_26AFCF - special sub_8138FEC + special ResetTrickHouseEndRoomFlag release end diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 580848838..4bf7eb10a 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -5,7 +5,7 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8269A50 .byte 0 Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60 - setflag FLAG_0x8A2 + setflag FLAG_LANDMARK_TRICK_HOUSE compare VAR_0x40B5, 1 goto_eq Route110_TrickHouseEntrance_EventScript_269AF3 compare VAR_0x40C1, 1 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 3d9914b83..8e1672dfe 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -170,7 +170,7 @@ Route111_EventScript_1F0EB9:: @ 81F0EB9 compare VAR_RESULT, 0 goto_eq Route111_EventScript_272054 setflag FLAG_0x92C - special sub_8138B10 + special GetPlayerBigGuyGirlString msgbox Route111_Text_2A6F3D, 4 release end @@ -278,7 +278,7 @@ Route111_EventScript_1F0FBD:: @ 81F0FBD Route111_EventScript_1F0FC5:: @ 81F0FC5 lock faceplayer - setflag FLAG_0x8A3 + setflag FLAG_LANDMARK_WINSTRATE_FAMILY msgbox Route111_Text_1F1475, 5 compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F0FE7 diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/scripts/maps/Route111_OldLadysRestStop.inc index fbf150dff..015a584f4 100644 --- a/data/scripts/maps/Route111_OldLadysRestStop.inc +++ b/data/scripts/maps/Route111_OldLadysRestStop.inc @@ -3,7 +3,7 @@ Route111_OldLadysRestStop_MapScripts:: @ 822A916 .byte 0 Route111_OldLadysRestStop_MapScript1_22A91C: @ 822A91C - setflag FLAG_0x8A1 + setflag FLAG_LANDMARK_OLD_LADY_REST_SHOP end Route111_OldLadysRestStop_EventScript_22A920:: @ 822A920 diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index 4835dffa6..72c003d99 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -48,7 +48,7 @@ Route112_CableCarStation_EventScript_22AB38:: @ 822AB38 setvar VAR_0x8004, 0 setvar VAR_0x40A3, 1 incrementgamestat 48 - special sub_8138B8C + special CableCarWarp special sub_814FC9C waitstate release diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 985a43805..5ea100567 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -3,7 +3,7 @@ Route113_GlassWorkshop_MapScripts:: @ 826ED03 .byte 0 Route113_GlassWorkshop_MapScript1_26ED09: @ 826ED09 - setflag FLAG_0x8A4 + setflag FLAG_LANDMARK_GLASS_WORKSHOP compare VAR_0x40BE, 1 call_if 1, Route113_GlassWorkshop_EventScript_26ED18 end diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc index 44d4b9d9b..f14c15f9e 100644 --- a/data/scripts/maps/Route114_FossilManiacsHouse.inc +++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc @@ -3,7 +3,7 @@ Route114_FossilManiacsHouse_MapScripts:: @ 822AD30 .byte 0 Route114_FossilManiacsHouse_MapScript1_22AD36: @ 822AD36 - setflag FLAG_0x8B7 + setflag FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE end Route114_FossilManiacsHouse_EventScript_22AD3A:: @ 822AD3A diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index 961535930..00bb4f226 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -3,7 +3,7 @@ Route114_LanettesHouse_MapScripts:: @ 822B2C8 .byte 0 Route114_LanettesHouse_MapScript1_22B2CE: @ 822B2CE - setflag FLAG_0x8A5 + setflag FLAG_LANDMARK_LANETTES_HOUSE end Route114_LanettesHouse_EventScript_22B2D2:: @ 822B2D2 diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.inc b/data/scripts/maps/Route116_TunnelersRestHouse.inc index d9d74911a..f9dbbd3f2 100644 --- a/data/scripts/maps/Route116_TunnelersRestHouse.inc +++ b/data/scripts/maps/Route116_TunnelersRestHouse.inc @@ -3,7 +3,7 @@ Route116_TunnelersRestHouse_MapScripts:: @ 822B850 .byte 0 Route116_TunnelersRestHouse_MapScript1_22B856: @ 822B856 - setflag FLAG_0x8BA + setflag FLAG_LANDMARK_TUNNELERS_REST_HOUSE end Route116_TunnelersRestHouse_EventScript_22B85A:: @ 822B85A diff --git a/data/scripts/maps/Route117_PokemonDayCare.inc b/data/scripts/maps/Route117_PokemonDayCare.inc index 9f191616d..b2e9ddfaa 100644 --- a/data/scripts/maps/Route117_PokemonDayCare.inc +++ b/data/scripts/maps/Route117_PokemonDayCare.inc @@ -3,6 +3,6 @@ Route117_PokemonDayCare_MapScripts:: @ 822BBB1 .byte 0 Route117_PokemonDayCare_MapScript1_22BBB7: @ 822BBB7 - setflag FLAG_0x8A6 + setflag FLAG_LANDMARK_POKEMON_DAYCARE end diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 53c2c14ff..72707186b 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -20,7 +20,7 @@ Route119_MapScript1_1F444D: @ 81F444D call Route119_EventScript_271EFB compare VAR_0x40B3, 1 call_if 1, Route119_EventScript_1F4466 - special sub_8139648 + special SetRoute119Weather end Route119_EventScript_1F4466:: @ 81F4466 diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc index eb7032672..399692db3 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc @@ -15,7 +15,7 @@ Route119_WeatherInstitute_1F_EventScript_26FA98:: @ 826FA98 Route119_WeatherInstitute_1F_EventScript_26FAA4:: @ 826FAA4 lock faceplayer - special sub_8138B10 + special GetPlayerBigGuyGirlString compare VAR_0x40B3, 0 goto_eq Route119_WeatherInstitute_1F_EventScript_26FABE msgbox Route119_WeatherInstitute_1F_Text_26FCE5, 4 diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index c1cc0c230..f89ac7e86 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -110,7 +110,7 @@ Route120_EventScript_1F5527:: @ 81F5527 call_if 1, Route120_EventScript_1F562F compare VAR_RESULT, 0 call_if 1, Route120_EventScript_1F5638 - specialvar VAR_RESULT, sub_8138AF0 + specialvar VAR_RESULT, GetPlayerTrainerIdOnesDigit switch VAR_RESULT case 0, Route120_EventScript_1F55CA case 5, Route120_EventScript_1F55CA diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 4b60f1428..1369b5721 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -91,7 +91,7 @@ Route121_SafariZoneEntrance_EventScript_22BCBF:: @ 822BCBF getpartysize compare VAR_RESULT, 6 goto_if 5, Route121_SafariZoneEntrance_EventScript_22BCE9 - specialvar VAR_RESULT, sub_8139530 + specialvar VAR_RESULT, ScriptCheckFreePokemonStorageSpace compare VAR_RESULT, 1 goto_eq Route121_SafariZoneEntrance_EventScript_22BCE9 msgbox Route121_SafariZoneEntrance_Text_2A50E5, 4 diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index feec8adeb..f6d535e38 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -3,7 +3,7 @@ Route123_MapScripts:: @ 81F6147 .byte 0 Route123_MapScript1_1F614D: @ 81F614D - special sub_8139668 + special SetRoute123Weather end Route123_EventScript_1F6151:: @ 81F6151 @@ -12,7 +12,7 @@ Route123_EventScript_1F6151:: @ 81F6151 checkflag FLAG_0x0E8 goto_eq Route123_EventScript_1F61A0 msgbox Route123_Text_1F641E, 4 - special sub_81390E0 + special IsGrassTypeInParty compare VAR_RESULT, 0 goto_eq Route123_EventScript_1F619E msgbox Route123_Text_1F645D, 4 diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index 245b828a9..9e865ad6a 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -3,7 +3,7 @@ Route123_BerryMastersHouse_MapScripts:: @ 826F83B .byte 0 Route123_BerryMastersHouse_MapScript1_26F841: @ 826F841 - setflag FLAG_0x8C3 + setflag FLAG_LANDMARK_BERRY_MASTERS_HOUSE end Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 3480ad465..dd5218e1d 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -3,7 +3,7 @@ Route124_DivingTreasureHuntersHouse_MapScripts:: @ 8270A28 .byte 0 Route124_DivingTreasureHuntersHouse_MapScript1_270A2E: @ 8270A2E - setflag FLAG_0x8BB + setflag FLAG_LANDMARK_HUNTERS_HOUSE end Route124_DivingTreasureHuntersHouse_EventScript_270A32:: @ 8270A32 diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc index 0b9d85e30..26278cf50 100644 --- a/data/scripts/maps/Route130.inc +++ b/data/scripts/maps/Route130.inc @@ -5,7 +5,7 @@ Route130_MapScripts:: @ 81F735F Route130_MapScript1_1F7365: @ 81F7365 compare VAR_0x405E, 4 call_if 4, Route130_EventScript_1F73B5 - specialvar VAR_RESULT, sub_813793C + specialvar VAR_RESULT, IsMirageIslandPresent compare VAR_RESULT, 1 goto_eq Route130_EventScript_1F73B1 setflag FLAG_0x011 diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index a3bf1ac36..ad10e2669 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -11,7 +11,7 @@ SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5 .2byte 0 SSTidalCorridor_EventScript_23BFFF:: @ 823BFFF - special sub_8137F90 + special SetSSTidalFlag setvar VAR_PORTHOLE, 2 lockall playse SE_PINPON @@ -28,14 +28,14 @@ SSTidalCorridor_EventScript_23C015:: @ 823C015 end SSTidalRooms_EventScript_23C028:: @ 823C028 - special sub_8137F90 + special SetSSTidalFlag setvar VAR_PORTHOLE, 7 playse SE_PINPON msgbox SSTidalRooms_Text_23C462, 4 return SSTidalRooms_EventScript_23C03C:: @ 823C03C - special sub_8137FB0 + special ResetSSTidalFlag setvar VAR_PORTHOLE, 4 playse SE_PINPON msgbox SSTidalRooms_Text_23C553, 4 @@ -49,7 +49,7 @@ SSTidalCorridor_EventScript_23C050:: @ 823C050 end SSTidalCorridor_EventScript_23C067:: @ 823C067 - special sub_8137FB0 + special ResetSSTidalFlag setvar VAR_PORTHOLE, 3 lockall playse SE_PINPON @@ -58,7 +58,7 @@ SSTidalCorridor_EventScript_23C067:: @ 823C067 end SSTidalCorridor_EventScript_23C07D:: @ 823C07D - special sub_8137FB0 + special ResetSSTidalFlag setvar VAR_PORTHOLE, 8 lockall playse SE_PINPON @@ -67,7 +67,7 @@ SSTidalCorridor_EventScript_23C07D:: @ 823C07D end SSTidalRooms_EventScript_23C093:: @ 823C093 - special sub_8137FB0 + special ResetSSTidalFlag setvar VAR_PORTHOLE, 8 playse SE_PINPON msgbox SSTidalRooms_Text_23C50F, 4 diff --git a/data/scripts/maps/ScorchedSlab.inc b/data/scripts/maps/ScorchedSlab.inc index c435eb000..f83724ec5 100644 --- a/data/scripts/maps/ScorchedSlab.inc +++ b/data/scripts/maps/ScorchedSlab.inc @@ -3,6 +3,6 @@ ScorchedSlab_MapScripts:: @ 8239291 .byte 0 ScorchedSlab_MapScript1_239297: @ 8239297 - setflag FLAG_0x8B8 + setflag FLAG_LANDMARK_SCORCHED_SLAB end diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 087459bbb..a2247286c 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -33,7 +33,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 special sub_80B05B4 waitstate msgbox SeafloorCavern_Room9_Text_235279, 4 - special sub_81379F8 + special WaitWeather waitstate setvar VAR_RESULT, 1 playse SE_W197 diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index a0e16c442..b7b55f256 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -10,7 +10,7 @@ SealedChamber_OuterRoom_MapScript1_239116: @ 8239116 end SealedChamber_OuterRoom_MapScript1_239127: @ 8239127 - setflag FLAG_0x8BC + setflag FLAG_LANDMARK_SEALED_CHAMBER end SealedChamber_OuterRoom_MapScript1_23912B: @ 823912B diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index dcf29081a..f57a27c1d 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -3,7 +3,7 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 8236DBA .byte 0 ShoalCave_LowTideEntranceRoom_MapScript1_236DC0: @ 8236DC0 - special sub_8137988 + special UpdateShoalTideFlag checkflag FLAG_SYS_SHOAL_TIDE goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236DD1 goto ShoalCave_LowTideEntranceRoom_EventScript_236DD5 diff --git a/data/scripts/maps/SkyPillar_Entrance.inc b/data/scripts/maps/SkyPillar_Entrance.inc index b565dff92..09ee9eae2 100644 --- a/data/scripts/maps/SkyPillar_Entrance.inc +++ b/data/scripts/maps/SkyPillar_Entrance.inc @@ -3,6 +3,6 @@ SkyPillar_Entrance_MapScripts:: @ 823929E .byte 0 SkyPillar_Entrance_MapScript1_2392A4: @ 82392A4 - setflag FLAG_0x8BE + setflag FLAG_LANDMARK_SKY_PILLAR end diff --git a/data/scripts/maps/SkyPillar_Outside.inc b/data/scripts/maps/SkyPillar_Outside.inc index aa0b51414..cced073aa 100644 --- a/data/scripts/maps/SkyPillar_Outside.inc +++ b/data/scripts/maps/SkyPillar_Outside.inc @@ -76,7 +76,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 setflag FLAG_SYS_WEATHER_CTRL setweather 15 doweather - special sub_81379F8 + special WaitWeather waitstate delay 30 msgbox SkyPillar_Outside_Text_23953A, 4 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 566c37a51..fe7cfc0fd 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -142,10 +142,10 @@ SlateportCity_EventScript_1DCDE4:: @ 81DCDE4 faceplayer bufferleadmonspeciesname 0 msgbox SlateportCity_Text_1DD68A, 4 - specialvar VAR_RESULT, sub_8139348 + specialvar VAR_RESULT, LeadMonHasEffortRibbon compare VAR_RESULT, 1 call_if 1, SlateportCity_EventScript_1DCE38 - specialvar VAR_RESULT, sub_81393C8 + specialvar VAR_RESULT, Special_AreLeadMonEVsMaxedOut compare VAR_RESULT, 0 call_if 1, SlateportCity_EventScript_1DCE2E msgbox SlateportCity_Text_1DD697, 4 @@ -153,7 +153,7 @@ SlateportCity_EventScript_1DCDE4:: @ 81DCDE4 message SlateportCity_Text_1DD6E3 waitfanfare msgbox SlateportCity_Text_1DD702, 4 - special sub_8139370 + special GiveLeadMonEffortRibbon release end diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index f8ae54145..8ecc859f7 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -27,7 +27,7 @@ SlateportCity_House1_EventScript_209AE9:: @ 8209AE9 end SlateportCity_House1_EventScript_209AF3:: @ 8209AF3 - specialvar VAR_RESULT, sub_81396E0 + specialvar VAR_RESULT, ScriptGetPartyMonSpecies compare VAR_RESULT, 412 goto_eq SlateportCity_House1_EventScript_209B46 special TV_CopyNicknameToStringVar1AndEnsureTerminated diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 19094db0d..192870003 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -144,7 +144,7 @@ SlateportCity_PokemonFanClub_EventScript_20A0D5:: @ 820A0D5 end SlateportCity_PokemonFanClub_EventScript_20A0DF:: @ 820A0DF - specialvar VAR_RESULT, sub_8139004 + specialvar VAR_RESULT, CheckLeadMonCool compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A0F0 return @@ -154,7 +154,7 @@ SlateportCity_PokemonFanClub_EventScript_20A0F0:: @ 820A0F0 return SlateportCity_PokemonFanClub_EventScript_20A0F6:: @ 820A0F6 - specialvar VAR_RESULT, sub_8139030 + specialvar VAR_RESULT, CheckLeadMonBeauty compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A107 return @@ -164,7 +164,7 @@ SlateportCity_PokemonFanClub_EventScript_20A107:: @ 820A107 return SlateportCity_PokemonFanClub_EventScript_20A10D:: @ 820A10D - specialvar VAR_RESULT, sub_813905C + specialvar VAR_RESULT, CheckLeadMonCute compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A11E return @@ -174,7 +174,7 @@ SlateportCity_PokemonFanClub_EventScript_20A11E:: @ 820A11E return SlateportCity_PokemonFanClub_EventScript_20A124:: @ 820A124 - specialvar VAR_RESULT, sub_8139088 + specialvar VAR_RESULT, CheckLeadMonSmart compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A135 return @@ -184,7 +184,7 @@ SlateportCity_PokemonFanClub_EventScript_20A135:: @ 820A135 return SlateportCity_PokemonFanClub_EventScript_20A13B:: @ 820A13B - specialvar VAR_RESULT, sub_81390B4 + specialvar VAR_RESULT, CheckLeadMonTough compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A14C return @@ -217,7 +217,7 @@ SlateportCity_PokemonFanClub_EventScript_20A17E:: @ 820A17E checkflag FLAG_0x116 goto_eq SlateportCity_PokemonFanClub_EventScript_20A1DE msgbox SlateportCity_PokemonFanClub_Text_20AA77, 4 - specialvar VAR_RESULT, sub_8138C04 + specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 4 goto_if 4, SlateportCity_PokemonFanClub_EventScript_20A1A3 release diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index a274d1f78..793b6f4fd 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -202,7 +202,7 @@ SootopolisCity_MapScript2_1E5914: @ 81E5914 SootopolisCity_EventScript_1E5926:: @ 81E5926 lockall - special sub_8138AD0 + special StorePlayerCoordsInVars compare VAR_0x8004, 43 goto_if 5, SootopolisCity_EventScript_1E5A82 compare VAR_0x8005, 32 @@ -492,7 +492,7 @@ SootopolisCity_Movement_1E5BF7: @ 81E5BF7 SootopolisCity_EventScript_1E5BFE:: @ 81E5BFE lockall - special sub_8138AD0 + special StorePlayerCoordsInVars compare VAR_0x8004, 43 goto_if 5, SootopolisCity_EventScript_1E5CCE compare VAR_0x8005, 32 @@ -541,7 +541,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E applymovement 11, SootopolisCity_Movement_1E5E5B waitmovement 0 removeobject 11 - special sub_81379F8 + special WaitWeather waitstate clearflag FLAG_SYS_WEATHER_CTRL setvar VAR_0x40CA, 3 @@ -594,7 +594,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE applymovement 11, SootopolisCity_Movement_1E5E5B waitmovement 0 removeobject 11 - special sub_81379F8 + special WaitWeather waitstate clearflag FLAG_SYS_WEATHER_CTRL setvar VAR_0x40CA, 2 @@ -747,7 +747,7 @@ SootopolisCity_EventScript_1E5F10:: @ 81E5F10 SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B dodailyevents - special sub_8138B10 + special GetPlayerBigGuyGirlString checkflag FLAG_0x932 goto_eq SootopolisCity_EventScript_1E5FBB msgbox SootopolisCity_Text_2A7BB0, 4 diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc index f5b867405..78c7303ae 100644 --- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc +++ b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc @@ -46,14 +46,14 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF:: @ 8227ECF SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD:: @ 8227EDD setvar VAR_0x40C0, 1 - special sub_8138AC0 + special ShowFieldMessageStringVar4 waitmessage waitbuttonpress return SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8:: @ 8227EE8 setvar VAR_0x40C0, 2 - special sub_8138AC0 + special ShowFieldMessageStringVar4 waitmessage waitbuttonpress return diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index ba1c6caec..8784a6424 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -3,7 +3,7 @@ SouthernIsland_Exterior_MapScripts:: @ 82429C8 .byte 0 SouthernIsland_Exterior_MapScript1_2429CE: @ 82429CE - setflag FLAG_UNLOCK_SOUTHERN_ISLAND + setflag FLAG_LANDMARK_SOUTHERN_ISLAND end SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2 diff --git a/data/scripts/maps/TrainerHill_Entrance.inc b/data/scripts/maps/TrainerHill_Entrance.inc index 38ae5b85f..77b67fb14 100644 --- a/data/scripts/maps/TrainerHill_Entrance.inc +++ b/data/scripts/maps/TrainerHill_Entrance.inc @@ -7,7 +7,7 @@ TrainerHill_Entrance_MapScripts:: @ 82680AC .byte 0 TrainerHill_Entrance_MapScript1_2680C6: @ 82680C6 - setflag FLAG_0x8E2 + setflag FLAG_LANDMARK_TRAINER_HILL getplayerxy VAR_0x400D, VAR_RESULT end diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc index 2e439d4d2..d3f0aa5e5 100644 --- a/data/scripts/maps/Underwater_SeafloorCavern.inc +++ b/data/scripts/maps/Underwater_SeafloorCavern.inc @@ -5,7 +5,7 @@ Underwater_SeafloorCavern_MapScripts:: @ 823433B .byte 0 Underwater_SeafloorCavern_MapScript1_23434B: @ 823434B - setflag FLAG_0x8A7 + setflag FLAG_LANDMARK_SEAFLOOR_CAVERN checkflag FLAG_0x081 goto_eq Underwater_SeafloorCavern_EventScript_234358 end diff --git a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc index ee62be96e..28030d869 100644 --- a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc +++ b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc @@ -5,7 +5,7 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_203031:: @ 8203031 lock faceplayer msgbox VerdanturfTown_FriendshipRatersHouse_Text_2030ED, 4 - specialvar VAR_RESULT, sub_8138C04 + specialvar VAR_RESULT, GetLeadMonFriendshipScore switch VAR_RESULT case 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203094 case 1, VerdanturfTown_FriendshipRatersHouse_EventScript_20309E diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 1597a66eb..327c0cbc6 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -816,7 +816,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_29034B:: @ 829034B MauvilleCity_PokemonCenter_1F_EventScript_290359:: @ 8290359 special sub_81203FC - special sub_8138AC0 + special ShowFieldMessageStringVar4 waitmessage yesnobox 20, 8 compare VAR_RESULT, 1 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 03ee0d510..0f705c841 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -680,7 +680,7 @@ LilycoveCity_ContestLobby_EventScript_29419D:: @ 829419D LilycoveCity_ContestLobby_EventScript_2941AA:: @ 82941AA fadescreen 1 - specialvar VAR_RESULT, sub_8138240 + specialvar VAR_RESULT, GetLinkPartnerNames copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8004, VAR_0x8008 special SpawnLinkPartnerFieldObject diff --git a/data/specials.inc b/data/specials.inc index 15aa2b7a6..f0c1fa114 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -45,7 +45,7 @@ gSpecials:: @ 81DBA64 def_special nullsub_37 def_special sub_80B3254 def_special sub_80B2FD8 - def_special sub_8138240 + def_special GetLinkPartnerNames def_special SpawnLinkPartnerFieldObject def_special copy_player_party_to_sav1 def_special copy_player_party_from_sav1 @@ -149,19 +149,19 @@ gSpecials:: @ 81DBA64 def_special sub_80F8864 def_special sub_80F8940 def_special ShowContestWinner - def_special sub_8138540 - def_special sub_81384F0 - def_special sub_8138AC0 + def_special MauvilleGymSpecial2 + def_special MauvilleGymSpecial1 + def_special ShowFieldMessageStringVar4 def_special DrawWholeMapView - def_special sub_8138AD0 - def_special sub_8138750 - def_special sub_81388E4 - def_special sub_8138AA4 - def_special sub_8138AF0 - def_special sub_8138B10 - def_special sub_8138B48 - def_special sub_8138BC8 - def_special sub_8138B8C + def_special StorePlayerCoordsInVars + def_special MauvilleGymSpecial3 + def_special PetalburgGymSpecial1 + def_special PetalburgGymSpecial2 + def_special GetPlayerTrainerIdOnesDigit + def_special GetPlayerBigGuyGirlString + def_special GetRivalSonDaughterString + def_special SetFlagInVar + def_special CableCarWarp def_special sub_814FC9C def_special Overworld_PlaySpecialMapMusic def_special StartWallClock @@ -213,34 +213,34 @@ gSpecials:: @ 81DBA64 def_special sp0C8_whiteout_maybe def_special sub_80FBE90 def_special sub_80FBED0 - def_special sub_8137F90 - def_special sub_8137FB0 + def_special SetSSTidalFlag + def_special ResetSSTidalFlag def_special EnterSafariMode def_special ExitSafariMode def_special GetPokeblockFeederInFront def_special OpenPokeblockCaseOnFeeder - def_special sub_813793C - def_special sub_8137988 - def_special sub_8137A0C - def_special sub_8137A4C - def_special sub_8137C10 - def_special sp0D9_ComputerRelated - def_special sub_8138E20 + def_special IsMirageIslandPresent + def_special UpdateShoalTideFlag + def_special InitBirchState + def_special ScriptGetPokedexInfo + def_special ShowPokedexRatingMessage + def_special DoPCTurnOnEffect + def_special DoPCTurnOffEffect def_special sub_8139994 - def_special sub_8138EC0 - def_special sub_8138FAC + def_special DoLotteryCornerComputerEffect + def_special EndLotteryCornerComputerEffect def_special sub_81B951C def_special sub_81B968C def_special sub_81B9770 def_special sub_81B9718 def_special sub_81B96D0 def_special sub_8160638 - def_special sub_8137EFC - def_special sub_8137D0C - def_special sp0E3_walkrun_bitfield_interpretation - def_special sub_8137E6C - def_special sub_8137F44 - def_special sub_8138C04 + def_special GetRecordedCyclingRoadResults + def_special Special_BeginCyclingRoadChallenge + def_special GetPlayerAvatarBike + def_special FinishCyclingRoadChallenge + def_special UpdateCyclingRoadState + def_special GetLeadMonFriendshipScore def_special sub_81A1780 def_special sub_8161F74 def_special sub_818E9AC @@ -261,39 +261,39 @@ gSpecials:: @ 81DBA64 def_special sub_80F94E8 def_special sub_816AE58 def_special sub_816AE98 - def_special sub_8138C94 + def_special FieldShowRegionMap def_special sub_807E73C def_special sub_807EA10 def_special sub_807F0E4 def_special sub_807E9D4 - def_special sub_8138BDC + def_special GetWeekCount def_special RetrieveLotteryNumber def_special PickLotteryCornerTicket def_special ShowBerryBlenderRecordWindow - def_special sub_8138FEC - def_special sub_8138FD4 + def_special ResetTrickHouseEndRoomFlag + def_special SetTrickHouseEndRoomFlag def_special sp109_CreatePCMenu - def_special sub_8137C28 - def_special sub_8137CB4 - def_special sub_8139004 - def_special sub_8139030 - def_special sub_813905C - def_special sub_8139088 - def_special sub_81390B4 + def_special AccessHallOfFamePC + def_special Special_ShowDiploma + def_special CheckLeadMonCool + def_special CheckLeadMonBeauty + def_special CheckLeadMonCute + def_special CheckLeadMonSmart + def_special CheckLeadMonTough def_special sub_80FB7A4 def_special DoSoftReset - def_special sub_8137734 + def_special GameClear def_special sub_8139A78 def_special nullsub_55 def_special SpawnScriptFieldObject def_special RemoveScriptFieldObject - def_special sub_81391D0 - def_special sub_8139200 + def_special GetPokeblockNameByMonNature + def_special GetSecretBaseNearbyMapName def_special CheckRelicanthWailord def_special ShouldDoBrailleStrengthEffectOld def_special sub_80B0534 def_special sub_80B058C - def_special sub_81379F8 + def_special WaitWeather def_special sub_8139238 def_special sub_8139248 def_special player_get_direction_lower_nybble @@ -301,23 +301,23 @@ gSpecials:: @ 81DBA64 def_special sub_81392D4 def_special sub_81392F8 def_special sub_8139320 - def_special sub_8139348 - def_special sub_8139370 - def_special sub_81393C8 + def_special LeadMonHasEffortRibbon + def_special GiveLeadMonEffortRibbon + def_special Special_AreLeadMonEVsMaxedOut def_special sub_8098574 def_special sub_809859C def_special InitRoamer def_special sub_81393FC - def_special sub_81390E0 + def_special IsGrassTypeInParty def_special sub_80AFC60 - def_special sub_813946C - def_special sub_81394D8 + def_special PutZigzagoonInPlayerParty + def_special IsStarterInParty def_special sub_80E980C - def_special sub_8139530 + def_special ScriptCheckFreePokemonStorageSpace def_special DoSealedChamberShakingEffect1 def_special sub_8139B60 def_special sub_80FAC78 - def_special sub_8139540 + def_special IsPokerusInParty def_special sub_809E1C8 def_special sub_8139560 def_special StartGroudonKyogreBattle @@ -333,10 +333,10 @@ gSpecials:: @ 81DBA64 def_special sub_80F8EB8 def_special sub_8162794 def_special BattleSetup_StartLatiBattle - def_special sub_8139648 - def_special sub_8139668 + def_special SetRoute119Weather + def_special SetRoute123Weather def_special sub_80F8FA0 - def_special sub_81396E0 + def_special ScriptGetPartyMonSpecies def_special sub_81B98DC def_special nullsub_54 def_special sub_80E9B70 diff --git a/data/starter_choose.s b/data/starter_choose.s index d20b4f99a..160046d4c 100644 --- a/data/starter_choose.s +++ b/data/starter_choose.s @@ -14,7 +14,10 @@ gBirchGrassTilemap:: @ 85B0C0C .incbin "baserom.gba", 0x5b0c0c, 0x1f8 gBirchHelpGfx:: @ 85B0E04 - .incbin "baserom.gba", 0x5b0e04, 0xfc8 + .incbin "baserom.gba", 0x5b0e04, 0xaa8 + +gUnknown_085B18AC:: @ 85B18AC + .incbin "baserom.gba", 0x5b18AC, 0x520 gUnknown_085B1DCC:: @ 85B1DCC .incbin "baserom.gba", 0x5b1dcc, 0x10 diff --git a/data/strings.s b/data/strings.s index c354c82ef..9e45b2e04 100644 --- a/data/strings.s +++ b/data/strings.s @@ -1619,16 +1619,16 @@ gText_DecorationReturnedToPC:: @ 85EAAC5 gText_NoDecorationsInUse:: @ 85EAAEC .string "There are no decorations in use.{PAUSE_UNTIL_PRESS}$" -gUnknown_085EAB0F:: @ 85EAB0F +gText_Tristan:: @ 85EAB0F .string "TRISTAN$" -gUnknown_085EAB17:: @ 85EAB17 +gText_Philip:: @ 85EAB17 .string "PHILIP$" -gUnknown_085EAB1E:: @ 85EAB1E +gText_Dennis:: @ 85EAB1E .string "DENNIS$" -gUnknown_085EAB25:: @ 85EAB25 +gText_Roberto:: @ 85EAB25 .string "ROBERTO$" gText_TurnOff:: @ 85EAB2D @@ -2282,19 +2282,19 @@ gUnknown_085EB4D4:: @ 85EB4D4 gUnknown_085EB4E0:: @ 85EB4E0 .string "OPEN LEVEL$" -gUnknown_085EB4EB:: @ 85EB4EB +gText_BattleBasics:: @ 85EB4EB .string "BATTLE BASICS$" -gUnknown_085EB4F9:: @ 85EB4F9 +gText_PokemonNature:: @ 85EB4F9 .string "POKéMON NATURE$" -gUnknown_085EB508:: @ 85EB508 +gText_PokemonMoves:: @ 85EB508 .string "POKéMON MOVES$" -gUnknown_085EB516:: @ 85EB516 +gText_Underpowered:: @ 85EB516 .string "UNDERPOWERED$" -gUnknown_085EB523:: @ 85EB523 +gText_WhenInDanger:: @ 85EB523 .string "WHEN IN DANGER$" gUnknown_085EB532:: @ 85EB532 @@ -2321,7 +2321,7 @@ gUnknown_085EB589:: @ 85EB589 gUnknown_085EB597:: @ 85EB597 .string "BATTLE POKéMON$" -gUnknown_085EB5A6:: @ 85EB5A6 +gText_BattleTrainers:: @ 85EB5A6 .string "BATTLE TRAINERS$" gUnknown_085EB5B6:: @ 85EB5B6 @@ -2363,73 +2363,73 @@ gText_Son:: @ 85EB60A gText_Daughter:: @ 85EB60E .string "daughter$" -gUnknown_085EB617:: @ 85EB617 +gText_BlueFlute:: @ 85EB617 .string "BLUE FLUTE$" -gUnknown_085EB622:: @ 85EB622 +gText_YellowFlute:: @ 85EB622 .string "YELLOW FLUTE$" -gUnknown_085EB62F:: @ 85EB62F +gText_RedFlute:: @ 85EB62F .string "RED FLUTE$" -gUnknown_085EB639:: @ 85EB639 +gText_WhiteFlute:: @ 85EB639 .string "WHITE FLUTE$" -gUnknown_085EB645:: @ 85EB645 +gText_BlackFlute:: @ 85EB645 .string "BLACK FLUTE$" -gUnknown_085EB651:: @ 85EB651 +gText_PrettyChair:: @ 85EB651 .string "PRETTY CHAIR$" -gUnknown_085EB65E:: @ 85EB65E +gText_PrettyDesk:: @ 85EB65E .string "PRETTY DESK$" -gUnknown_085EB66A:: @ 85EB66A +gText_1F:: @ 85EB66A .string "1F$" -gUnknown_085EB66D:: @ 85EB66D +gText_2F:: @ 85EB66D .string "2F$" -gUnknown_085EB670:: @ 85EB670 +gText_3F:: @ 85EB670 .string "3F$" -gUnknown_085EB673:: @ 85EB673 +gText_4F:: @ 85EB673 .string "4F$" -gUnknown_085EB676:: @ 85EB676 +gText_5F:: @ 85EB676 .string "5F$" -gUnknown_085EB679:: @ 85EB679 +gText_6F:: @ 85EB679 .string "6F$" -gUnknown_085EB67C:: @ 85EB67C +gText_7F:: @ 85EB67C .string "7F$" -gUnknown_085EB67F:: @ 85EB67F +gText_8F:: @ 85EB67F .string "8F$" -gUnknown_085EB682:: @ 85EB682 +gText_9F:: @ 85EB682 .string "9F$" -gUnknown_085EB685:: @ 85EB685 +gText_10F:: @ 85EB685 .string "10F$" -gUnknown_085EB689:: @ 85EB689 +gText_11F:: @ 85EB689 .string "11F$" -gUnknown_085EB68D:: @ 85EB68D +gText_B1F:: @ 85EB68D .string "B1F$" -gUnknown_085EB691:: @ 85EB691 +gText_B2F:: @ 85EB691 .string "B2F$" -gUnknown_085EB695:: @ 85EB695 +gText_B3F:: @ 85EB695 .string "B3F$" -gUnknown_085EB699:: @ 85EB699 +gText_B4F:: @ 85EB699 .string "B4F$" -gUnknown_085EB69D:: @ 85EB69D +gText_Rooftop:: @ 85EB69D .string "ROOFTOP$" gText_ElevatorNowOn:: @ 85EB6A5 @@ -2438,43 +2438,43 @@ gText_ElevatorNowOn:: @ 85EB6A5 gText_BP:: @ 85EB6AD .string "BP$" -gUnknown_085EB6B0:: @ 85EB6B0 +gText_EnergyPowder50:: @ 85EB6B0 .string "ENERGYPOWDER{CLEAR_TO 0x72}{SIZE 0}50$" -gUnknown_085EB6C5:: @ 85EB6C5 +gText_EnergyRoot80:: @ 85EB6C5 .string "ENERGY ROOT{CLEAR_TO 0x72}{SIZE 0}80$" -gUnknown_085EB6D9:: @ 85EB6D9 +gText_HealPowder50:: @ 85EB6D9 .string "HEAL POWDER{CLEAR_TO 0x72}{SIZE 0}50$" -gUnknown_085EB6ED:: @ 85EB6ED +gText_RevivalHerb300:: @ 85EB6ED .string "REVIVAL HERB{CLEAR_TO 0x6C}{SIZE 0}300$" -gUnknown_085EB703:: @ 85EB703 +gText_Protein1000:: @ 85EB703 .string "PROTEIN{CLEAR_TO 0x63}{SIZE 0}1,000$" -gUnknown_085EB716:: @ 85EB716 +gText_Iron1000:: @ 85EB716 .string "IRON{CLEAR_TO 0x63}{SIZE 0}1,000$" -gUnknown_085EB726:: @ 85EB726 +gText_Carbos1000:: @ 85EB726 .string "CARBOS{CLEAR_TO 0x63}{SIZE 0}1,000$" -gUnknown_085EB738:: @ 85EB738 +gText_Calcium1000:: @ 85EB738 .string "CALCIUM{CLEAR_TO 0x63}{SIZE 0}1,000$" -gUnknown_085EB74B:: @ 85EB74B +gText_Zinc1000:: @ 85EB74B .string "ZINC{CLEAR_TO 0x63}{SIZE 0}1,000$" -gUnknown_085EB75B:: @ 85EB75B +gText_HPUp1000:: @ 85EB75B .string "HP UP{CLEAR_TO 0x63}{SIZE 0}1,000$" -gUnknown_085EB76C:: @ 85EB76C +gText_PPUp3000:: @ 85EB76C .string "PP UP{CLEAR_TO 0x63}{SIZE 0}3,000$" -gUnknown_085EB77D:: @ 85EB77D +gText_RankingHall:: @ 85EB77D .string "RANKING HALL$" -gUnknown_085EB78A:: @ 85EB78A +gText_ExchangeService:: @ 85EB78A .string "EXCHANGE SERVICE$" gText_LilycoveCity:: @ 85EB79B @@ -3293,190 +3293,190 @@ gText_Second:: @ 85ECB80 gText_Third:: @ 85ECB87 .string "third$" -gUnknown_085ECB8D:: @ 85ECB8D +gText_0Pts:: @ 85ECB8D .string "0 pts$" -gUnknown_085ECB93:: @ 85ECB93 +gText_10Pts:: @ 85ECB93 .string "10 pts$" -gUnknown_085ECB9A:: @ 85ECB9A +gText_20Pts:: @ 85ECB9A .string "20 pts$" -gUnknown_085ECBA1:: @ 85ECBA1 +gText_30Pts:: @ 85ECBA1 .string "30 pts$" -gUnknown_085ECBA8:: @ 85ECBA8 +gText_40Pts:: @ 85ECBA8 .string "40 pts$" -gUnknown_085ECBAF:: @ 85ECBAF +gText_50Pts:: @ 85ECBAF .string "50 pts$" -gUnknown_085ECBB6:: @ 85ECBB6 +gText_60Pts:: @ 85ECBB6 .string "60 pts$" -gUnknown_085ECBBD:: @ 85ECBBD +gText_70Pts:: @ 85ECBBD .string "70 pts$" -gUnknown_085ECBC4:: @ 85ECBC4 +gText_80Pts:: @ 85ECBC4 .string "80 pts$" -gUnknown_085ECBCB:: @ 85ECBCB +gText_90Pts:: @ 85ECBCB .string "90 pts$" -gUnknown_085ECBD2:: @ 85ECBD2 +gText_100Pts:: @ 85ECBD2 .string "100 pts$" -gUnknown_085ECBDA:: @ 85ECBDA +gText_QuestionMark:: @ 85ECBDA .string "?$" -gUnknown_085ECBDC:: @ 85ECBDC +gText_KissPoster16BP:: @ 85ECBDC .string "KISS POSTER{CLEAR_TO 0x5E}16BP$" -gUnknown_085ECBEF:: @ 85ECBEF +gText_KissCushion32BP:: @ 85ECBEF .string "KISS CUSHION{CLEAR_TO 0x5E}32BP$" -gUnknown_085ECC03:: @ 85ECC03 +gText_SmoochumDoll32BP:: @ 85ECC03 .string "SMOOCHUM DOLL{CLEAR_TO 0x5E}32BP$" -gUnknown_085ECC18:: @ 85ECC18 +gText_TogepiDoll48BP:: @ 85ECC18 .string "TOGEPI DOLL{CLEAR_TO 0x5E}48BP$" -gUnknown_085ECC2B:: @ 85ECC2B +gText_MeowthDoll48BP:: @ 85ECC2B .string "MEOWTH DOLL{CLEAR_TO 0x5E}48BP$" -gUnknown_085ECC3E:: @ 85ECC3E +gText_ClefairyDoll48BP:: @ 85ECC3E .string "CLEFAIRY DOLL{CLEAR_TO 0x5E}48BP$" -gUnknown_085ECC53:: @ 85ECC53 +gText_DittoDoll48BP:: @ 85ECC53 .string "DITTO DOLL{CLEAR_TO 0x5E}48BP$" -gUnknown_085ECC65:: @ 85ECC65 +gText_CyndaquilDoll80BP:: @ 85ECC65 .string "CYNDAQUIL DOLL{CLEAR_TO 0x5E}80BP$" -gUnknown_085ECC7B:: @ 85ECC7B +gText_ChikoritaDoll80BP:: @ 85ECC7B .string "CHIKORITA DOLL{CLEAR_TO 0x5E}80BP$" -gUnknown_085ECC91:: @ 85ECC91 +gText_TotodileDoll80BP:: @ 85ECC91 .string "TOTODILE DOLL{CLEAR_TO 0x5E}80BP$" -gUnknown_085ECCA6:: @ 85ECCA6 +gText_LaprasDoll128BP:: @ 85ECCA6 .string "LAPRAS DOLL{CLEAR_TO 0x58}128BP$" -gUnknown_085ECCBA:: @ 85ECCBA +gText_SnorlaxDoll128BP:: @ 85ECCBA .string "SNORLAX DOLL{CLEAR_TO 0x58}128BP$" -gUnknown_085ECCCF:: @ 85ECCCF +gText_VenusaurDoll256BP:: @ 85ECCCF .string "VENUSAUR DOLL{CLEAR_TO 0x58}256BP$" -gUnknown_085ECCE5:: @ 85ECCE5 +gText_CharizardDoll256BP:: @ 85ECCE5 .string "CHARIZARD DOLL{CLEAR_TO 0x58}256BP$" -gUnknown_085ECCFC:: @ 85ECCFC +gText_BlastoiseDoll256BP:: @ 85ECCFC .string "BLASTOISE DOLL{CLEAR_TO 0x58}256BP$" -gUnknown_085ECD13:: @ 85ECD13 +gText_Protein1BP:: @ 85ECD13 .string "PROTEIN{CLEAR_TO 0x64}1BP$" -gUnknown_085ECD21:: @ 85ECD21 +gText_Calcium1BP:: @ 85ECD21 .string "CALCIUM{CLEAR_TO 0x64}1BP$" -gUnknown_085ECD2F:: @ 85ECD2F +gText_Iron1BP:: @ 85ECD2F .string "IRON{CLEAR_TO 0x64}1BP$" -gUnknown_085ECD3A:: @ 85ECD3A +gText_Zinc1BP:: @ 85ECD3A .string "ZINC{CLEAR_TO 0x64}1BP$" -gUnknown_085ECD45:: @ 85ECD45 +gText_Carbos1BP:: @ 85ECD45 .string "CARBOS{CLEAR_TO 0x64}1BP$" -gUnknown_085ECD52:: @ 85ECD52 +gText_HpUp1BP:: @ 85ECD52 .string "HP UP{CLEAR_TO 0x64}1BP$" -gUnknown_085ECD5E:: @ 85ECD5E +gText_Leftovers48BP:: @ 85ECD5E .string "LEFTOVERS{CLEAR_TO 0x5E}48BP$" -gUnknown_085ECD6F:: @ 85ECD6F +gText_WhiteHerb48BP:: @ 85ECD6F .string "WHITE HERB{CLEAR_TO 0x5E}48BP$" -gUnknown_085ECD81:: @ 85ECD81 +gText_QuickClaw48BP:: @ 85ECD81 .string "QUICK CLAW{CLEAR_TO 0x5E}48BP$" -gUnknown_085ECD93:: @ 85ECD93 +gText_MentalHerb48BP:: @ 85ECD93 .string "MENTAL HERB{CLEAR_TO 0x5E}48BP$" -gUnknown_085ECDA6:: @ 85ECDA6 +gText_BrightPowder64BP:: @ 85ECDA6 .string "BRIGHTPOWDER{CLEAR_TO 0x5E}64BP$" -gUnknown_085ECDBA:: @ 85ECDBA +gText_ChoiceBand64BP:: @ 85ECDBA .string "CHOICE BAND{CLEAR_TO 0x5E}64BP$" -gUnknown_085ECDCD:: @ 85ECDCD +gText_KingsRock64BP:: @ 85ECDCD .string "KING’S ROCK{CLEAR_TO 0x5E}64BP$" -gUnknown_085ECDE0:: @ 85ECDE0 +gText_FocusBand64BP:: @ 85ECDE0 .string "FOCUS BAND{CLEAR_TO 0x5E}64BP$" -gUnknown_085ECDF2:: @ 85ECDF2 +gText_ScopeLens64BP:: @ 85ECDF2 .string "SCOPE LENS{CLEAR_TO 0x5E}64BP$" -gUnknown_085ECE04:: @ 85ECE04 +gText_Softboiled16BP:: @ 85ECE04 .string "SOFTBOILED{CLEAR_TO 0x4E}16BP$" -gUnknown_085ECE16:: @ 85ECE16 +gText_SeismicToss24BP:: @ 85ECE16 .string "SEISMIC TOSS{CLEAR_TO 0x4E}24BP$" -gUnknown_085ECE2A:: @ 85ECE2A +gText_DreamEater24BP:: @ 85ECE2A .string "DREAM EATER{CLEAR_TO 0x4E}24BP$" -gUnknown_085ECE3D:: @ 85ECE3D +gText_MegaPunch24BP:: @ 85ECE3D .string "MEGA PUNCH{CLEAR_TO 0x4E}24BP$" -gUnknown_085ECE4F:: @ 85ECE4F +gText_MegaKick48BP:: @ 85ECE4F .string "MEGA KICK{CLEAR_TO 0x4E}48BP$" -gUnknown_085ECE60:: @ 85ECE60 +gText_BodySlam48BP:: @ 85ECE60 .string "BODY SLAM{CLEAR_TO 0x4E}48BP$" -gUnknown_085ECE71:: @ 85ECE71 +gText_RockSlide48BP:: @ 85ECE71 .string "ROCK SLIDE{CLEAR_TO 0x4E}48BP$" -gUnknown_085ECE83:: @ 85ECE83 +gText_Counter48BP:: @ 85ECE83 .string "COUNTER{CLEAR_TO 0x4E}48BP$" -gUnknown_085ECE92:: @ 85ECE92 +gText_ThunderWave48BP:: @ 85ECE92 .string "THUNDER WAVE{CLEAR_TO 0x4E}48BP$" -gUnknown_085ECEA6:: @ 85ECEA6 +gText_SwordsDance48BP:: @ 85ECEA6 .string "SWORDS DANCE{CLEAR_TO 0x4E}48BP$" -gUnknown_085ECEBA:: @ 85ECEBA +gText_DefenseCurl16BP:: @ 85ECEBA .string "DEFENSE CURL{CLEAR_TO 0x4E}16BP$" -gUnknown_085ECECE:: @ 85ECECE +gText_Snore24BP:: @ 85ECECE .string "SNORE{CLEAR_TO 0x4E}24BP$" -gUnknown_085ECEDB:: @ 85ECEDB +gText_MudSlap24BP:: @ 85ECEDB .string "MUD-SLAP{CLEAR_TO 0x4E}24BP$" -gUnknown_085ECEEB:: @ 85ECEEB +gText_Swift24BP:: @ 85ECEEB .string "SWIFT{CLEAR_TO 0x4E}24BP$" -gUnknown_085ECEF8:: @ 85ECEF8 +gText_IcyWind24BP:: @ 85ECEF8 .string "ICY WIND{CLEAR_TO 0x4E}24BP$" -gUnknown_085ECF08:: @ 85ECF08 +gText_Endure48BP:: @ 85ECF08 .string "ENDURE{CLEAR_TO 0x4E}48BP$" -gUnknown_085ECF16:: @ 85ECF16 +gText_PsychUp48BP:: @ 85ECF16 .string "PSYCH UP{CLEAR_TO 0x4E}48BP$" -gUnknown_085ECF26:: @ 85ECF26 +gText_IcePunch48BP:: @ 85ECF26 .string "ICE PUNCH{CLEAR_TO 0x4E}48BP$" -gUnknown_085ECF37:: @ 85ECF37 +gText_ThunderPunch48BP:: @ 85ECF37 .string "THUNDERPUNCH{CLEAR_TO 0x4E}48BP$" -gUnknown_085ECF4B:: @ 85ECF4B +gText_FirePunch48BP:: @ 85ECF4B .string "FIRE PUNCH{CLEAR_TO 0x4E}48BP$" gText_PkmnFainted3:: @ 85ECF5D @@ -5217,22 +5217,22 @@ gText_Appeal2:: @ 85EFA67 gText_Jam2:: @ 85EFA6E .string "JAM$" -gUnknown_085EFA72:: @ 85EFA72 +gText_Kira:: @ 85EFA72 .string "KIRA$" -gUnknown_085EFA77:: @ 85EFA77 +gText_Amy:: @ 85EFA77 .string "AMY$" -gUnknown_085EFA7B:: @ 85EFA7B +gText_John:: @ 85EFA7B .string "JOHN$" -gUnknown_085EFA80:: @ 85EFA80 +gText_Roy:: @ 85EFA80 .string "ROY$" -gUnknown_085EFA84:: @ 85EFA84 +gText_Gabby:: @ 85EFA84 .string "GABBY$" -gUnknown_085EFA8A:: @ 85EFA8A +gText_Anna:: @ 85EFA8A .string "ANNA$" gText_ClearAllSaveData:: @ 85EFA8F diff --git a/data/time_events.s b/data/time_events.s new file mode 100644 index 000000000..7a543fff5 --- /dev/null +++ b/data/time_events.s @@ -0,0 +1,7 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + +gUnknown_085B2B44:: @ 85B2B44 + .byte 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01 diff --git a/data/trader.s b/data/trader.s new file mode 100644 index 000000000..1fe929ae7 --- /dev/null +++ b/data/trader.s @@ -0,0 +1,22 @@ + + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gUnknown_085B09E4:: @ 85B09E4 + .4byte gText_Tristan + .4byte gText_Philip + .4byte gText_Dennis + .4byte gText_Roberto + + .align 2 +gUnknown_085B09F4:: @ 85B09F4 + .byte 0x5b, 0x6b, 0x25, 0x15 + + .align 2 +gUnknown_085B09F8:: @ 85B09F8 + .4byte 0x0a010100, 0x00010f0a + + diff --git a/graphics/battle_transitions/85BBC14.png b/graphics/battle_transitions/85BBC14.png Binary files differnew file mode 100644 index 000000000..a08310737 --- /dev/null +++ b/graphics/battle_transitions/85BBC14.png diff --git a/graphics/battle_transitions/85BC2B4.pal b/graphics/battle_transitions/85BC2B4.pal new file mode 100644 index 000000000..f508de938 --- /dev/null +++ b/graphics/battle_transitions/85BC2B4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 213 0 +57 57 0 +123 123 0 +189 189 0 +255 255 0 +255 255 82 +255 255 172 +255 255 255 diff --git a/graphics/battle_transitions/85BC2D4.pal b/graphics/battle_transitions/85BC2D4.pal new file mode 100644 index 000000000..6a46ddacf --- /dev/null +++ b/graphics/battle_transitions/85BC2D4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 0 0 +0 0 0 +139 0 0 +197 0 0 +255 0 0 +255 65 65 +255 139 139 +255 255 255 diff --git a/graphics/battle_transitions/85BC2F4.pal b/graphics/battle_transitions/85BC2F4.pal new file mode 100644 index 000000000..2a65c3a9e --- /dev/null +++ b/graphics/battle_transitions/85BC2F4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +213 148 0 +0 0 0 +74 49 0 +156 98 0 +230 156 0 +238 189 82 +246 222 172 +255 255 255 diff --git a/graphics/battle_transitions/85BC314.bin b/graphics/battle_transitions/85BC314.bin Binary files differnew file mode 100644 index 000000000..37149e37b --- /dev/null +++ b/graphics/battle_transitions/85BC314.bin diff --git a/graphics/battle_transitions/85BCB14.bin b/graphics/battle_transitions/85BCB14.bin Binary files differnew file mode 100644 index 000000000..29fde971c --- /dev/null +++ b/graphics/battle_transitions/85BCB14.bin diff --git a/graphics/battle_transitions/85BD314.bin b/graphics/battle_transitions/85BD314.bin Binary files differnew file mode 100644 index 000000000..cd1a672b5 --- /dev/null +++ b/graphics/battle_transitions/85BD314.bin diff --git a/graphics/battle_transitions/85BDB14.pal b/graphics/battle_transitions/85BDB14.pal new file mode 100644 index 000000000..920669dcd --- /dev/null +++ b/graphics/battle_transitions/85BDB14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +255 255 255 +82 0 0 +98 0 0 +115 0 0 +131 0 0 +139 0 0 +156 0 0 +172 0 0 +189 0 0 +197 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_transitions/big_pokeball.png b/graphics/battle_transitions/big_pokeball.png Binary files differnew file mode 100644 index 000000000..21b227441 --- /dev/null +++ b/graphics/battle_transitions/big_pokeball.png diff --git a/graphics/battle_transitions/big_pokeball_map.bin b/graphics/battle_transitions/big_pokeball_map.bin Binary files differnew file mode 100644 index 000000000..691e16ef7 --- /dev/null +++ b/graphics/battle_transitions/big_pokeball_map.bin diff --git a/graphics/battle_transitions/brendan_bg.pal b/graphics/battle_transitions/brendan_bg.pal new file mode 100644 index 000000000..e43b0f74c --- /dev/null +++ b/graphics/battle_transitions/brendan_bg.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 180 213 +123 197 230 +139 213 246 +156 230 255 +172 246 255 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_transitions/drake_bg.pal b/graphics/battle_transitions/drake_bg.pal new file mode 100644 index 000000000..6717a90bd --- /dev/null +++ b/graphics/battle_transitions/drake_bg.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 49 49 +115 115 115 +148 148 148 +180 180 180 +213 213 213 +0 0 131 +16 16 148 +32 32 164 +49 49 180 +65 65 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_transitions/elite_four_bg.png b/graphics/battle_transitions/elite_four_bg.png Binary files differnew file mode 100644 index 000000000..1d327cdaf --- /dev/null +++ b/graphics/battle_transitions/elite_four_bg.png diff --git a/graphics/battle_transitions/elite_four_bg_map.bin b/graphics/battle_transitions/elite_four_bg_map.bin Binary files differnew file mode 100644 index 000000000..4f170b470 --- /dev/null +++ b/graphics/battle_transitions/elite_four_bg_map.bin diff --git a/graphics/battle_transitions/evil_team.pal b/graphics/battle_transitions/evil_team.pal new file mode 100644 index 000000000..c76de7dfe --- /dev/null +++ b/graphics/battle_transitions/evil_team.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +106 106 106 +164 164 164 +205 205 205 +65 65 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +156 32 74 +230 82 123 +255 255 255 diff --git a/graphics/battle_transitions/frontier_brain.bin b/graphics/battle_transitions/frontier_brain.bin Binary files differnew file mode 100644 index 000000000..968b6eaca --- /dev/null +++ b/graphics/battle_transitions/frontier_brain.bin diff --git a/graphics/battle_transitions/frontier_brain.png b/graphics/battle_transitions/frontier_brain.png Binary files differnew file mode 100644 index 000000000..25af2e3ab --- /dev/null +++ b/graphics/battle_transitions/frontier_brain.png diff --git a/graphics/battle_transitions/frontier_squares.bin b/graphics/battle_transitions/frontier_squares.bin Binary files differnew file mode 100644 index 000000000..e64979134 --- /dev/null +++ b/graphics/battle_transitions/frontier_squares.bin diff --git a/graphics/battle_transitions/frontier_squares_1.png b/graphics/battle_transitions/frontier_squares_1.png Binary files differnew file mode 100644 index 000000000..7ceb90434 --- /dev/null +++ b/graphics/battle_transitions/frontier_squares_1.png diff --git a/graphics/battle_transitions/frontier_squares_2.png b/graphics/battle_transitions/frontier_squares_2.png Binary files differnew file mode 100644 index 000000000..24467544c --- /dev/null +++ b/graphics/battle_transitions/frontier_squares_2.png diff --git a/graphics/battle_transitions/frontier_squares_3.png b/graphics/battle_transitions/frontier_squares_3.png Binary files differnew file mode 100644 index 000000000..3bf0c5720 --- /dev/null +++ b/graphics/battle_transitions/frontier_squares_3.png diff --git a/graphics/battle_transitions/frontier_squares_4.png b/graphics/battle_transitions/frontier_squares_4.png Binary files differnew file mode 100644 index 000000000..3f79a382d --- /dev/null +++ b/graphics/battle_transitions/frontier_squares_4.png diff --git a/graphics/battle_transitions/frontier_squares_blanktiles.png b/graphics/battle_transitions/frontier_squares_blanktiles.png Binary files differnew file mode 100644 index 000000000..92c401d77 --- /dev/null +++ b/graphics/battle_transitions/frontier_squares_blanktiles.png diff --git a/graphics/battle_transitions/glacia_bg.pal b/graphics/battle_transitions/glacia_bg.pal new file mode 100644 index 000000000..4aac79fec --- /dev/null +++ b/graphics/battle_transitions/glacia_bg.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 49 49 +115 115 115 +148 148 148 +180 180 180 +213 213 213 +255 82 172 +255 98 189 +255 115 205 +255 131 222 +255 148 238 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_transitions/groudon.bin b/graphics/battle_transitions/groudon.bin Binary files differnew file mode 100644 index 000000000..6432affbf --- /dev/null +++ b/graphics/battle_transitions/groudon.bin diff --git a/graphics/battle_transitions/groudon.png b/graphics/battle_transitions/groudon.png Binary files differnew file mode 100644 index 000000000..aec84e4b5 --- /dev/null +++ b/graphics/battle_transitions/groudon.png diff --git a/graphics/battle_transitions/groudon_pt1.pal b/graphics/battle_transitions/groudon_pt1.pal new file mode 100644 index 000000000..0a3853df4 --- /dev/null +++ b/graphics/battle_transitions/groudon_pt1.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 0 0 +0 0 255 +74 123 255 +65 106 230 +57 90 213 +49 82 197 +41 65 180 +41 65 180 +49 82 197 +57 90 213 +65 106 230 +74 123 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 213 +74 123 255 +74 123 255 +65 106 230 +57 90 213 +49 82 197 +41 65 180 +41 65 180 +49 82 197 +57 90 213 +65 106 230 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 172 +65 106 230 +74 123 255 +74 123 255 +65 106 230 +57 90 213 +49 82 197 +41 65 180 +41 65 180 +49 82 197 +57 90 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 131 +57 90 213 +65 106 230 +74 123 255 +74 123 255 +65 106 230 +57 90 213 +49 82 197 +41 65 180 +41 65 180 +49 82 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 90 +49 82 197 +57 90 213 +65 106 230 +74 123 255 +74 123 255 +65 106 230 +57 90 213 +49 82 197 +41 65 180 +41 65 180 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 90 +41 65 180 +49 82 197 +57 90 213 +65 106 230 +74 123 255 +74 123 255 +65 106 230 +57 90 213 +49 82 197 +41 65 180 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 131 +41 65 180 +41 65 180 +49 82 197 +57 90 213 +65 106 230 +74 123 255 +74 123 255 +65 106 230 +57 90 213 +49 82 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 172 +49 82 197 +41 65 180 +41 65 180 +49 82 197 +57 90 213 +65 106 230 +74 123 255 +74 123 255 +65 106 230 +57 90 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 213 +57 90 213 +49 82 197 +41 65 180 +41 65 180 +49 82 197 +57 90 213 +65 106 230 +74 123 255 +74 123 255 +65 106 230 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 255 +74 123 255 +65 106 230 +57 90 213 +49 82 197 +41 65 180 +49 82 197 +57 90 213 +65 106 230 +65 106 230 +74 123 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +230 32 172 +230 82 32 +230 16 32 +16 148 32 +16 255 230 +16 255 0 +115 115 32 +222 115 32 +255 197 222 +115 82 255 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_transitions/groudon_pt2.pal b/graphics/battle_transitions/groudon_pt2.pal new file mode 100644 index 000000000..524ab4019 --- /dev/null +++ b/graphics/battle_transitions/groudon_pt2.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 123 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 148 +0 0 90 +0 0 90 +0 0 90 +0 0 90 +0 0 90 +0 0 90 +0 0 90 +0 0 90 +0 0 90 +0 0 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 164 +0 65 255 +0 65 255 +0 65 255 +0 65 255 +0 65 255 +0 65 255 +0 65 255 +0 65 255 +0 65 255 +0 65 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 172 +0 65 255 +0 65 255 +0 65 255 +0 65 255 +0 65 255 +0 65 255 +0 65 255 +0 65 255 +0 65 255 +0 65 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 189 +74 123 255 +74 123 255 +74 123 255 +74 123 255 +74 123 255 +74 123 255 +74 123 255 +74 123 255 +74 123 255 +74 123 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 197 +148 189 255 +148 189 255 +148 189 255 +148 189 255 +148 189 255 +148 189 255 +148 189 255 +148 189 255 +148 189 255 +148 189 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 255 255 +222 255 255 +222 255 255 +222 255 255 +222 255 255 +222 255 255 +222 255 255 +222 255 255 +222 255 255 +222 255 255 +222 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 222 +148 189 255 +148 189 255 +148 189 255 +148 189 255 +148 189 255 +148 189 255 +148 189 255 +148 189 255 +148 189 255 +148 189 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 238 +74 123 255 +74 123 255 +74 123 255 +74 123 255 +74 123 255 +74 123 255 +74 123 255 +74 123 255 +74 123 255 +74 123 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_transitions/kyogre.bin b/graphics/battle_transitions/kyogre.bin Binary files differnew file mode 100644 index 000000000..9fa18ed59 --- /dev/null +++ b/graphics/battle_transitions/kyogre.bin diff --git a/graphics/battle_transitions/kyogre.png b/graphics/battle_transitions/kyogre.png Binary files differnew file mode 100644 index 000000000..53949ed79 --- /dev/null +++ b/graphics/battle_transitions/kyogre.png diff --git a/graphics/battle_transitions/kyogre_pt1.pal b/graphics/battle_transitions/kyogre_pt1.pal new file mode 100644 index 000000000..4cabc773e --- /dev/null +++ b/graphics/battle_transitions/kyogre_pt1.pal @@ -0,0 +1,163 @@ +JASC-PAL +0100 +160 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 0 0 +180 0 0 +139 0 0 +106 0 0 +0 0 0 +74 0 0 +106 0 0 +139 0 0 +180 0 0 +222 0 0 +255 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +180 0 0 +139 0 0 +106 0 0 +0 0 0 +74 0 0 +106 0 0 +139 0 0 +180 0 0 +222 0 0 +255 0 0 +222 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +139 0 0 +106 0 0 +0 0 0 +74 0 0 +106 0 0 +139 0 0 +180 0 0 +222 0 0 +255 0 0 +222 0 0 +180 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +106 0 0 +0 0 0 +74 0 0 +106 0 0 +139 0 0 +180 0 0 +222 0 0 +255 0 0 +222 0 0 +180 0 0 +139 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +74 0 0 +106 0 0 +139 0 0 +180 0 0 +222 0 0 +255 0 0 +222 0 0 +180 0 0 +139 0 0 +106 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +74 0 0 +106 0 0 +139 0 0 +180 0 0 +222 0 0 +255 0 0 +222 0 0 +180 0 0 +139 0 0 +106 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +106 0 0 +139 0 0 +180 0 0 +222 0 0 +255 0 0 +222 0 0 +180 0 0 +139 0 0 +106 0 0 +0 0 0 +74 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +139 0 0 +180 0 0 +222 0 0 +255 0 0 +222 0 0 +180 0 0 +139 0 0 +106 0 0 +0 0 0 +74 0 0 +106 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +180 0 0 +222 0 0 +255 0 0 +222 0 0 +180 0 0 +139 0 0 +106 0 0 +0 0 0 +74 0 0 +106 0 0 +139 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 0 0 +255 0 0 +222 0 0 +180 0 0 +139 0 0 +106 0 0 +0 0 0 +74 0 0 +106 0 0 +139 0 0 +180 0 0 +0 0 0 diff --git a/graphics/battle_transitions/kyogre_pt2.pal b/graphics/battle_transitions/kyogre_pt2.pal new file mode 100644 index 000000000..7f7976ece --- /dev/null +++ b/graphics/battle_transitions/kyogre_pt2.pal @@ -0,0 +1,227 @@ +JASC-PAL +0100 +224 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +82 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +82 0 0 +0 0 0 +0 0 0 +156 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +156 0 0 +0 0 0 +0 0 0 +189 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +189 0 0 +0 0 0 +0 0 0 +230 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +230 0 0 +0 0 0 +0 0 0 +255 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 0 0 +0 0 0 +0 0 0 +255 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 0 0 +0 0 0 +0 0 0 +255 0 0 +156 0 0 +156 0 0 +156 0 0 +156 0 0 +156 0 0 +156 0 0 +156 0 0 +156 0 0 +156 0 0 +156 0 0 +156 0 0 +156 0 0 +255 0 0 +0 0 0 +0 0 0 +255 0 0 +230 0 0 +230 0 0 +230 0 0 +230 0 0 +230 0 0 +230 0 0 +230 0 0 +230 0 0 +230 0 0 +230 0 0 +230 0 0 +230 0 0 +255 0 0 +0 0 0 +0 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +0 0 0 +0 0 0 +255 0 0 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 0 0 +0 0 0 +0 0 0 +255 0 0 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 0 0 +0 0 0 +0 0 0 +255 0 0 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 131 131 +255 0 0 +0 0 0 +0 0 0 +255 0 0 +255 74 74 +255 74 74 +255 74 74 +255 74 74 +255 74 74 +255 74 74 +255 74 74 +255 74 74 +255 74 74 +255 74 74 +255 74 74 +255 74 74 +230 0 0 diff --git a/graphics/battle_transitions/may_bg.pal b/graphics/battle_transitions/may_bg.pal new file mode 100644 index 000000000..8ebd38309 --- /dev/null +++ b/graphics/battle_transitions/may_bg.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 123 139 +246 139 156 +255 156 172 +255 172 189 +255 189 205 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_transitions/phoebe_bg.pal b/graphics/battle_transitions/phoebe_bg.pal new file mode 100644 index 000000000..b55e6a6cd --- /dev/null +++ b/graphics/battle_transitions/phoebe_bg.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 49 49 +115 115 115 +148 148 148 +180 180 180 +213 213 213 +8 213 8 +32 238 32 +49 246 49 +74 255 74 +123 255 123 +230 123 139 +246 139 156 +255 156 172 +255 172 189 +255 189 205 +230 123 139 diff --git a/graphics/battle_transitions/pokeball.png b/graphics/battle_transitions/pokeball.png Binary files differnew file mode 100644 index 000000000..3802a915b --- /dev/null +++ b/graphics/battle_transitions/pokeball.png diff --git a/graphics/battle_transitions/pokeball_trail.png b/graphics/battle_transitions/pokeball_trail.png Binary files differnew file mode 100644 index 000000000..ff2a75ee4 --- /dev/null +++ b/graphics/battle_transitions/pokeball_trail.png diff --git a/graphics/battle_transitions/rayquaza.bin b/graphics/battle_transitions/rayquaza.bin Binary files differnew file mode 100644 index 000000000..fd1a20b0f --- /dev/null +++ b/graphics/battle_transitions/rayquaza.bin diff --git a/graphics/battle_transitions/rayquaza.pal b/graphics/battle_transitions/rayquaza.pal new file mode 100644 index 000000000..ac2f9009d --- /dev/null +++ b/graphics/battle_transitions/rayquaza.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 0 0 +0 0 0 +255 255 0 +230 230 0 +172 172 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +255 255 0 +230 230 0 +172 172 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +255 255 0 +255 255 0 +230 230 0 +172 172 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +255 255 0 +255 255 0 +255 255 0 +230 230 0 +172 172 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +255 255 0 +255 255 0 +255 255 0 +230 230 0 +172 172 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +255 255 0 +255 255 0 +255 255 0 +230 230 0 +172 172 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +82 82 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +255 255 0 +255 255 0 +255 255 0 +230 230 0 +172 172 0 +0 0 0 +0 0 0 +82 82 0 +82 82 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +255 255 0 +255 255 0 +255 255 0 +230 230 0 +172 172 0 +0 0 0 +180 180 0 +123 123 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +255 255 0 +255 255 0 +255 255 0 +230 230 0 +0 0 0 +255 255 0 +164 164 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +255 255 0 +255 255 0 +255 255 0 +0 0 0 +255 255 115 +205 205 0 +0 0 0 +0 0 0 +255 255 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 189 +255 255 189 +255 255 189 +255 255 189 +0 0 0 +255 255 0 +164 164 0 +0 0 0 +0 0 0 +213 213 213 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +213 213 213 +213 213 213 +213 213 213 +213 213 213 +255 255 255 +180 180 0 +123 123 0 +255 255 255 +0 0 0 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +164 164 0 +255 255 255 +0 0 0 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 115 +205 205 0 +255 255 255 +0 0 0 +255 255 0 +0 115 0 +0 205 0 +123 24 0 +123 24 131 +230 246 131 +255 0 246 +255 0 8 +0 238 222 +0 16 139 +238 148 139 +0 156 74 +255 255 255 +255 255 255 +0 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +82 82 0 +0 0 0 diff --git a/graphics/battle_transitions/rayquaza.png b/graphics/battle_transitions/rayquaza.png Binary files differnew file mode 100644 index 000000000..5c3a91474 --- /dev/null +++ b/graphics/battle_transitions/rayquaza.png diff --git a/graphics/battle_transitions/shrinking_box.png b/graphics/battle_transitions/shrinking_box.png Binary files differnew file mode 100644 index 000000000..cde6f2107 --- /dev/null +++ b/graphics/battle_transitions/shrinking_box.png diff --git a/graphics/battle_transitions/sidney_bg.pal b/graphics/battle_transitions/sidney_bg.pal new file mode 100644 index 000000000..1f30ed062 --- /dev/null +++ b/graphics/battle_transitions/sidney_bg.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 49 49 +115 115 115 +148 148 148 +180 180 180 +213 213 213 +189 0 189 +205 16 205 +222 32 222 +238 49 238 +255 65 255 +106 180 213 +123 197 230 +139 213 246 +156 230 255 +172 246 255 +255 255 255 diff --git a/graphics/battle_transitions/team_aqua.bin b/graphics/battle_transitions/team_aqua.bin Binary files differnew file mode 100644 index 000000000..3526dde59 --- /dev/null +++ b/graphics/battle_transitions/team_aqua.bin diff --git a/graphics/battle_transitions/team_aqua.png b/graphics/battle_transitions/team_aqua.png Binary files differnew file mode 100644 index 000000000..4b0b1ac1d --- /dev/null +++ b/graphics/battle_transitions/team_aqua.png diff --git a/graphics/battle_transitions/team_magma.bin b/graphics/battle_transitions/team_magma.bin Binary files differnew file mode 100644 index 000000000..5c90fbf6a --- /dev/null +++ b/graphics/battle_transitions/team_magma.bin diff --git a/graphics/battle_transitions/team_magma.png b/graphics/battle_transitions/team_magma.png Binary files differnew file mode 100644 index 000000000..44ffed071 --- /dev/null +++ b/graphics/battle_transitions/team_magma.png diff --git a/graphics/battle_transitions/unused_brendan.png b/graphics/battle_transitions/unused_brendan.png Binary files differnew file mode 100644 index 000000000..926ba0ff7 --- /dev/null +++ b/graphics/battle_transitions/unused_brendan.png diff --git a/graphics/battle_transitions/unused_lass.png b/graphics/battle_transitions/unused_lass.png Binary files differnew file mode 100644 index 000000000..378fa3c19 --- /dev/null +++ b/graphics/battle_transitions/unused_lass.png diff --git a/graphics/battle_transitions/unused_trainer.pal b/graphics/battle_transitions/unused_trainer.pal new file mode 100644 index 000000000..ad94d728a --- /dev/null +++ b/graphics/battle_transitions/unused_trainer.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +222 164 148 +205 131 115 +123 90 82 +57 74 123 +41 57 98 +24 41 82 +16 32 57 +222 230 238 +255 197 90 +189 156 90 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/battle_transitions/wallace_bg.pal b/graphics/battle_transitions/wallace_bg.pal new file mode 100644 index 000000000..30da9c5f9 --- /dev/null +++ b/graphics/battle_transitions/wallace_bg.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 49 49 +115 115 115 +148 148 148 +180 180 180 +213 213 213 +197 197 65 +213 213 82 +230 230 98 +246 246 115 +255 255 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/evolution_scene/bg.bin b/graphics/evolution_scene/bg.bin Binary files differnew file mode 100644 index 000000000..583ebac2b --- /dev/null +++ b/graphics/evolution_scene/bg.bin diff --git a/graphics/evolution_scene/bg.png b/graphics/evolution_scene/bg.png Binary files differnew file mode 100644 index 000000000..d62ac543e --- /dev/null +++ b/graphics/evolution_scene/bg.png diff --git a/graphics/evolution_scene/bg2.bin b/graphics/evolution_scene/bg2.bin Binary files differnew file mode 100644 index 000000000..7afab112a --- /dev/null +++ b/graphics/evolution_scene/bg2.bin diff --git a/graphics/evolution_scene/gray_transition_darken.pal b/graphics/evolution_scene/gray_transition_darken.pal new file mode 100644 index 000000000..97d117330 --- /dev/null +++ b/graphics/evolution_scene/gray_transition_darken.pal @@ -0,0 +1,211 @@ +JASC-PAL +0100 +208 +0 0 0 +255 255 255 +246 246 246 +230 230 230 +213 213 213 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +246 246 246 +230 230 230 +213 213 213 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +98 106 106 +0 0 0 +0 0 0 +0 0 0 +230 230 230 +213 213 213 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +98 106 106 +115 123 123 +0 0 0 +0 0 0 +0 0 0 +213 213 213 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +0 0 0 +0 0 0 +0 0 0 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +0 0 0 +0 0 0 +0 0 0 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +0 0 0 +0 0 0 +0 0 0 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +0 0 0 +0 0 0 +0 0 0 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +0 0 0 +0 0 0 +0 0 0 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +0 0 0 +0 0 0 +0 0 0 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +0 0 0 +0 0 0 +0 0 0 +115 123 123 +98 106 106 +90 90 90 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +0 0 0 +0 0 0 +0 0 0 +98 106 106 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +0 0 0 +0 0 0 +0 0 0 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +255 255 255 +0 0 0 +0 0 0 diff --git a/graphics/evolution_scene/gray_transition_intro.pal b/graphics/evolution_scene/gray_transition_intro.pal new file mode 100644 index 000000000..323623a15 --- /dev/null +++ b/graphics/evolution_scene/gray_transition_intro.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +90 90 90 +98 106 106 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +90 90 90 +98 106 106 +115 123 123 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +0 0 0 +0 0 0 +0 0 0 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +255 255 255 +246 246 246 +0 0 0 +0 0 0 +0 0 0 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +255 255 255 +246 246 246 +246 246 246 +0 0 0 +0 0 0 diff --git a/graphics/evolution_scene/gray_transition_lighten.pal b/graphics/evolution_scene/gray_transition_lighten.pal new file mode 100644 index 000000000..813db93dc --- /dev/null +++ b/graphics/evolution_scene/gray_transition_lighten.pal @@ -0,0 +1,179 @@ +JASC-PAL +0100 +176 +0 0 0 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +255 255 255 +246 246 246 +230 230 230 +0 0 0 +0 0 0 +0 0 0 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +255 255 255 +246 246 246 +230 230 230 +213 213 213 +0 0 0 +0 0 0 +0 0 0 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +255 255 255 +246 246 246 +230 230 230 +213 213 213 +197 205 205 +0 0 0 +0 0 0 +0 0 0 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +255 255 255 +246 246 246 +230 230 230 +213 213 213 +197 205 205 +189 189 189 +0 0 0 +0 0 0 +0 0 0 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +255 255 255 +246 246 246 +230 230 230 +213 213 213 +197 205 205 +189 189 189 +172 172 172 +0 0 0 +0 0 0 +0 0 0 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +255 255 255 +246 246 246 +230 230 230 +213 213 213 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +0 0 0 +0 0 0 +0 0 0 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +255 255 255 +246 246 246 +230 230 230 +213 213 213 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +0 0 0 +0 0 0 +0 0 0 +213 213 213 +230 230 230 +246 246 246 +255 255 255 +246 246 246 +230 230 230 +213 213 213 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +0 0 0 +0 0 0 +0 0 0 +230 230 230 +246 246 246 +255 255 255 +246 246 246 +230 230 230 +213 213 213 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +0 0 0 +0 0 0 +0 0 0 +246 246 246 +255 255 255 +246 246 246 +230 230 230 +213 213 213 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +246 246 246 +230 230 230 +213 213 213 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +0 0 0 +0 0 0 diff --git a/graphics/evolution_scene/gray_transition_outro.pal b/graphics/evolution_scene/gray_transition_outro.pal new file mode 100644 index 000000000..f122f40fe --- /dev/null +++ b/graphics/evolution_scene/gray_transition_outro.pal @@ -0,0 +1,211 @@ +JASC-PAL +0100 +208 +0 0 0 +246 246 246 +230 230 230 +213 213 213 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +230 230 230 +213 213 213 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +213 213 213 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +115 123 123 +98 106 106 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +98 106 106 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/evolution_scene/transition.pal b/graphics/evolution_scene/transition.pal new file mode 100644 index 000000000..b0f4d3815 --- /dev/null +++ b/graphics/evolution_scene/transition.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +0 0 0 +16 16 16 +24 32 32 +41 49 49 +49 65 74 +65 82 90 +74 98 115 +90 115 131 +106 131 148 +115 148 172 +131 164 189 +139 180 213 +156 197 230 +172 213 255 +0 0 0 +0 0 0 +0 0 0 +65 90 106 +74 98 115 +82 106 131 +90 115 139 +98 131 156 +106 139 164 +115 148 180 +123 156 189 +131 172 205 +139 180 213 +148 189 230 +156 197 238 +172 213 255 +0 0 0 +0 0 0 diff --git a/graphics/evolution_scene/unknown_5B4114.pal b/graphics/evolution_scene/unknown_5B4114.pal new file mode 100644 index 000000000..2cd4981fd --- /dev/null +++ b/graphics/evolution_scene/unknown_5B4114.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +255 255 255 +0 0 0 +0 0 0 diff --git a/graphics/interface/menu_border.png b/graphics/interface/menu_border.png Binary files differnew file mode 100644 index 000000000..ba748b169 --- /dev/null +++ b/graphics/interface/menu_border.png diff --git a/graphics/misc/85B2890.pal b/graphics/misc/85B2890.pal new file mode 100644 index 000000000..fea15a176 --- /dev/null +++ b/graphics/misc/85B2890.pal @@ -0,0 +1,11 @@ +JASC-PAL +0100 +8 +148 197 172 +16 16 16 +32 32 32 +49 49 49 +65 65 65 +82 82 82 +98 98 98 +115 115 115 diff --git a/graphics/misc/85B28A0.pal b/graphics/misc/85B28A0.pal new file mode 100644 index 000000000..09eb37624 --- /dev/null +++ b/graphics/misc/85B28A0.pal @@ -0,0 +1,11 @@ +JASC-PAL +0100 +8 +131 131 131 +148 148 148 +164 164 164 +180 180 180 +197 197 197 +213 213 213 +230 230 230 +255 255 255 diff --git a/graphics/misc/cave_transition.png b/graphics/misc/cave_transition.png Binary files differnew file mode 100644 index 000000000..dd265149f --- /dev/null +++ b/graphics/misc/cave_transition.png diff --git a/graphics/misc/cave_transition_black.pal b/graphics/misc/cave_transition_black.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/graphics/misc/cave_transition_black.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/misc/cave_transition_map.bin b/graphics/misc/cave_transition_map.bin Binary files differnew file mode 100644 index 000000000..4293bfd1c --- /dev/null +++ b/graphics/misc/cave_transition_map.bin diff --git a/graphics/misc/cave_transition_white.pal b/graphics/misc/cave_transition_white.pal new file mode 100644 index 000000000..98a1fb3c8 --- /dev/null +++ b/graphics/misc/cave_transition_white.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 diff --git a/graphics/picture_frame/bg.pal b/graphics/picture_frame/bg.pal new file mode 100644 index 000000000..88b2d393d --- /dev/null +++ b/graphics/picture_frame/bg.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 0 0 +255 255 255 +230 230 230 +213 213 213 +197 197 197 +180 180 180 +164 164 164 +148 148 148 +131 131 131 +115 115 115 +98 98 98 +82 82 82 +65 65 65 +49 49 49 +32 32 32 +16 16 16 +0 0 0 +90 24 0 +139 65 16 +164 90 16 +189 115 16 +222 148 49 +255 180 82 +255 222 131 +98 172 115 +148 197 156 +222 255 230 +255 255 255 +205 189 164 +180 164 139 +164 139 115 +131 98 74 +0 0 0 +180 148 213 +180 164 197 +180 189 189 +180 205 180 +180 230 172 +189 255 164 +222 255 139 +246 238 123 +255 230 98 +255 205 139 +255 180 139 +238 164 189 +205 156 197 +255 246 255 +90 57 74 +0 0 0 +255 123 164 +255 139 180 +255 180 205 +255 213 255 +255 205 0 +255 213 57 +255 230 123 +255 238 189 +255 255 255 +90 24 0 +139 65 16 +205 189 164 +180 164 139 +164 139 115 +131 98 74 +0 0 0 +90 24 0 +139 65 16 +222 148 49 +255 222 131 +131 131 131 +65 65 65 +255 0 0 +255 82 82 +255 164 164 +255 98 197 +255 148 213 +255 197 230 +74 255 90 +131 255 139 +189 255 197 +0 0 0 +90 24 0 +139 65 16 +222 148 49 +255 222 131 +131 131 131 +65 65 65 +74 148 238 +131 180 238 +189 213 246 +74 255 90 +131 255 139 +189 255 197 +255 255 0 +255 255 123 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/picture_frame/frame0.png b/graphics/picture_frame/frame0.png Binary files differnew file mode 100644 index 000000000..33f2baf09 --- /dev/null +++ b/graphics/picture_frame/frame0.png diff --git a/graphics/picture_frame/frame0_map.bin b/graphics/picture_frame/frame0_map.bin Binary files differnew file mode 100644 index 000000000..6f7a7b165 --- /dev/null +++ b/graphics/picture_frame/frame0_map.bin diff --git a/graphics/picture_frame/frame1.png b/graphics/picture_frame/frame1.png Binary files differnew file mode 100644 index 000000000..72e9d0ab7 --- /dev/null +++ b/graphics/picture_frame/frame1.png diff --git a/graphics/picture_frame/frame1_map.bin b/graphics/picture_frame/frame1_map.bin Binary files differnew file mode 100644 index 000000000..523ff9e28 --- /dev/null +++ b/graphics/picture_frame/frame1_map.bin diff --git a/graphics/picture_frame/frame2.png b/graphics/picture_frame/frame2.png Binary files differnew file mode 100644 index 000000000..38e6ba209 --- /dev/null +++ b/graphics/picture_frame/frame2.png diff --git a/graphics/picture_frame/frame2_map.bin b/graphics/picture_frame/frame2_map.bin Binary files differnew file mode 100644 index 000000000..3333c2a01 --- /dev/null +++ b/graphics/picture_frame/frame2_map.bin diff --git a/graphics/picture_frame/frame3.png b/graphics/picture_frame/frame3.png Binary files differnew file mode 100644 index 000000000..93fbf373f --- /dev/null +++ b/graphics/picture_frame/frame3.png diff --git a/graphics/picture_frame/frame3_map.bin b/graphics/picture_frame/frame3_map.bin Binary files differnew file mode 100644 index 000000000..c2adf40c2 --- /dev/null +++ b/graphics/picture_frame/frame3_map.bin diff --git a/graphics/picture_frame/frame4.png b/graphics/picture_frame/frame4.png Binary files differnew file mode 100644 index 000000000..c7db2e3be --- /dev/null +++ b/graphics/picture_frame/frame4.png diff --git a/graphics/picture_frame/frame4_map.bin b/graphics/picture_frame/frame4_map.bin Binary files differnew file mode 100644 index 000000000..c2adf40c2 --- /dev/null +++ b/graphics/picture_frame/frame4_map.bin diff --git a/graphics/picture_frame/frame5.png b/graphics/picture_frame/frame5.png Binary files differnew file mode 100644 index 000000000..1b7da4a1a --- /dev/null +++ b/graphics/picture_frame/frame5.png diff --git a/graphics/picture_frame/frame5_map.bin b/graphics/picture_frame/frame5_map.bin Binary files differnew file mode 100644 index 000000000..8d2502cd4 --- /dev/null +++ b/graphics/picture_frame/frame5_map.bin diff --git a/graphics/picture_frame/frame5_map.bin.rl.bak b/graphics/picture_frame/frame5_map.bin.rl.bak Binary files differnew file mode 100644 index 000000000..c009f0a95 --- /dev/null +++ b/graphics/picture_frame/frame5_map.bin.rl.bak diff --git a/graphics/pokedex/85B8BF0.pal b/graphics/pokedex/85B8BF0.pal new file mode 100644 index 000000000..969c38cbd --- /dev/null +++ b/graphics/pokedex/85B8BF0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 148 +0 131 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 148 255 +156 156 255 +172 172 255 +189 189 255 +205 205 255 +222 222 255 +238 238 255 +255 255 255 diff --git a/graphics/pokedex/area_glow.png b/graphics/pokedex/area_glow.png Binary files differnew file mode 100644 index 000000000..3cf5387f3 --- /dev/null +++ b/graphics/pokedex/area_glow.png diff --git a/graphics/pokedex/area_marker.png b/graphics/pokedex/area_marker.png Binary files differnew file mode 100644 index 000000000..a0b828ea9 --- /dev/null +++ b/graphics/pokedex/area_marker.png diff --git a/graphics/pokedex/cry_meter.png b/graphics/pokedex/cry_meter.png Binary files differnew file mode 100644 index 000000000..ec6b0ed43 --- /dev/null +++ b/graphics/pokedex/cry_meter.png diff --git a/graphics/pokedex/cry_meter_map.bin b/graphics/pokedex/cry_meter_map.bin Binary files differnew file mode 100644 index 000000000..cd58849a4 --- /dev/null +++ b/graphics/pokedex/cry_meter_map.bin diff --git a/graphics/pokedex/cry_meter_needle.png b/graphics/pokedex/cry_meter_needle.png Binary files differnew file mode 100644 index 000000000..34e5ab410 --- /dev/null +++ b/graphics/pokedex/cry_meter_needle.png diff --git a/graphics/pokenav/icon.png b/graphics/pokenav/icon.png Binary files differnew file mode 100644 index 000000000..8c2739530 --- /dev/null +++ b/graphics/pokenav/icon.png diff --git a/graphics/roulette/85B5BFC.pal b/graphics/roulette/85B5BFC.pal new file mode 100644 index 000000000..ed68618ff --- /dev/null +++ b/graphics/roulette/85B5BFC.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +82 156 49 +41 41 41 +98 98 115 +172 180 197 +255 255 255 +255 205 41 +255 172 0 +213 164 65 +205 164 82 +139 106 65 +131 222 189 +74 189 156 +115 189 148 +123 180 172 +74 115 115 +255 255 0 +74 106 156 +41 41 41 +98 98 115 +156 156 164 +255 255 255 +205 156 205 +164 106 164 +172 131 164 +156 123 156 +90 57 106 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +74 106 156 +41 41 41 +123 123 131 +172 180 197 +255 255 255 +238 238 156 +189 180 106 +131 90 32 +255 131 90 +189 106 98 +230 222 255 +74 189 156 +255 255 255 +123 180 172 +255 255 255 +255 255 255 +74 106 156 +57 57 65 +98 98 115 +156 156 164 +255 255 255 +106 205 205 +246 98 90 +106 156 255 +255 255 255 +156 255 106 +246 230 74 +255 230 123 +255 255 255 +255 255 156 +156 255 148 +205 156 255 +74 106 156 +41 41 41 +98 98 115 +205 205 213 +255 255 255 +123 238 139 +255 172 139 +16 156 74 +197 164 255 +49 106 32 +115 197 131 +197 139 189 +255 82 57 +255 238 82 +205 180 8 +255 205 8 +74 106 156 +106 139 230 +82 115 205 +255 255 255 +255 255 255 +255 205 41 +255 172 0 +213 164 65 +205 164 82 +139 106 65 +131 222 189 +74 189 156 +115 189 148 +123 180 172 +74 115 115 +255 255 255 +74 106 156 +255 246 65 +255 255 164 +255 246 65 +255 255 255 +205 156 205 +164 106 164 +172 131 164 +156 123 156 +90 57 106 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +65 65 57 +74 106 156 +172 255 238 +222 255 255 +148 255 238 +255 255 255 +255 205 41 +255 172 0 +213 164 65 +205 164 82 +139 106 65 +131 222 189 +74 189 156 +115 189 148 +123 180 172 +74 115 115 +65 65 57 +74 106 156 +255 205 255 +255 222 255 +255 197 255 +255 255 255 +205 156 205 +164 106 164 +172 131 164 +156 123 156 +90 57 106 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +65 65 57 +74 106 156 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 205 41 +255 172 0 +213 164 65 +205 164 82 +139 106 65 +131 222 189 +74 189 156 +115 189 148 +123 180 172 +74 115 115 +255 255 255 +74 106 156 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +205 156 205 +164 106 164 +172 131 164 +156 123 156 +90 57 106 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +74 106 156 +255 246 82 +164 255 222 +172 180 197 +255 255 255 +255 246 65 +246 205 24 +238 197 98 +205 172 90 +164 131 90 +156 246 222 +90 213 180 +131 222 172 +115 189 156 +98 148 148 +65 65 57 +74 106 156 +238 189 238 +156 148 148 +172 180 197 +255 255 255 +255 205 255 +222 156 230 +197 156 197 +172 139 172 +139 106 148 +205 205 230 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +65 65 57 +74 106 156 +238 230 246 +205 205 230 +172 180 197 +255 255 255 +255 255 230 +255 255 164 +255 255 255 +222 255 255 +255 246 255 +255 222 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +65 65 57 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 diff --git a/graphics/roulette/85B5DFC.bin b/graphics/roulette/85B5DFC.bin Binary files differnew file mode 100644 index 000000000..6950027c3 --- /dev/null +++ b/graphics/roulette/85B5DFC.bin diff --git a/graphics/roulette/85B65D0.pal b/graphics/roulette/85B65D0.pal new file mode 100644 index 000000000..9d44b25c8 --- /dev/null +++ b/graphics/roulette/85B65D0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 106 156 +57 57 65 +106 106 123 +255 255 164 +106 222 222 +246 98 90 +222 255 255 +106 222 222 +246 98 90 +255 222 255 +106 222 222 +246 98 90 +222 222 230 +222 222 230 +222 222 230 +222 222 230 diff --git a/graphics/roulette/85B65F0.pal b/graphics/roulette/85B65F0.pal new file mode 100644 index 000000000..81b0328a5 --- /dev/null +++ b/graphics/roulette/85B65F0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 106 156 +57 57 65 +106 106 123 +255 255 164 +106 156 255 +222 222 230 +222 255 255 +106 156 255 +222 222 230 +255 222 255 +106 156 255 +222 222 230 +222 222 230 +222 222 230 +222 222 230 +222 222 230 diff --git a/graphics/roulette/85B6610.pal b/graphics/roulette/85B6610.pal new file mode 100644 index 000000000..42a1bae94 --- /dev/null +++ b/graphics/roulette/85B6610.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 106 156 +57 57 65 +106 106 123 +255 255 164 +255 156 139 +246 246 156 +222 255 255 +255 156 139 +246 246 156 +255 222 255 +255 156 139 +246 246 156 +222 222 230 +222 222 230 +222 222 230 +222 222 230 diff --git a/graphics/roulette/85B6630.pal b/graphics/roulette/85B6630.pal new file mode 100644 index 000000000..ff76379c8 --- /dev/null +++ b/graphics/roulette/85B6630.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 106 156 +57 57 65 +106 106 123 +255 255 164 +255 230 123 +222 222 230 +222 255 255 +255 230 123 +222 222 230 +255 222 255 +255 230 123 +222 222 230 +222 222 230 +222 222 230 +222 222 230 +222 222 230 diff --git a/graphics/roulette/azurill.png b/graphics/roulette/azurill.png Binary files differnew file mode 100644 index 000000000..b99bc1a33 --- /dev/null +++ b/graphics/roulette/azurill.png diff --git a/graphics/roulette/ball.png b/graphics/roulette/ball.png Binary files differnew file mode 100644 index 000000000..2352e9be5 --- /dev/null +++ b/graphics/roulette/ball.png diff --git a/graphics/roulette/ball_counter.png b/graphics/roulette/ball_counter.png Binary files differnew file mode 100644 index 000000000..30c88b894 --- /dev/null +++ b/graphics/roulette/ball_counter.png diff --git a/graphics/roulette/center.png b/graphics/roulette/center.png Binary files differnew file mode 100644 index 000000000..0653b0e97 --- /dev/null +++ b/graphics/roulette/center.png diff --git a/graphics/roulette/credit.png b/graphics/roulette/credit.png Binary files differnew file mode 100644 index 000000000..687d47934 --- /dev/null +++ b/graphics/roulette/credit.png diff --git a/graphics/roulette/cursor.png b/graphics/roulette/cursor.png Binary files differnew file mode 100644 index 000000000..962ebb2c7 --- /dev/null +++ b/graphics/roulette/cursor.png diff --git a/graphics/roulette/headers.png b/graphics/roulette/headers.png Binary files differnew file mode 100644 index 000000000..70f5fec90 --- /dev/null +++ b/graphics/roulette/headers.png diff --git a/graphics/roulette/makuhita.png b/graphics/roulette/makuhita.png Binary files differnew file mode 100644 index 000000000..756157496 --- /dev/null +++ b/graphics/roulette/makuhita.png diff --git a/graphics/roulette/multiplier.png b/graphics/roulette/multiplier.png Binary files differnew file mode 100644 index 000000000..b993f8091 --- /dev/null +++ b/graphics/roulette/multiplier.png diff --git a/graphics/roulette/numbers.png b/graphics/roulette/numbers.png Binary files differnew file mode 100644 index 000000000..97d0b0e03 --- /dev/null +++ b/graphics/roulette/numbers.png diff --git a/graphics/roulette/poke_icons.png b/graphics/roulette/poke_icons.png Binary files differnew file mode 100644 index 000000000..91a2f301f --- /dev/null +++ b/graphics/roulette/poke_icons.png diff --git a/graphics/roulette/shadow.png b/graphics/roulette/shadow.png Binary files differnew file mode 100644 index 000000000..d3793b1c8 --- /dev/null +++ b/graphics/roulette/shadow.png diff --git a/graphics/roulette/shroomish.png b/graphics/roulette/shroomish.png Binary files differnew file mode 100644 index 000000000..12ee2a870 --- /dev/null +++ b/graphics/roulette/shroomish.png diff --git a/graphics/roulette/skitty.png b/graphics/roulette/skitty.png Binary files differnew file mode 100644 index 000000000..a1d6f1ab5 --- /dev/null +++ b/graphics/roulette/skitty.png diff --git a/graphics/roulette/tailow.png b/graphics/roulette/tailow.png Binary files differnew file mode 100644 index 000000000..acd2fc4ba --- /dev/null +++ b/graphics/roulette/tailow.png diff --git a/graphics/roulette/wheel.png b/graphics/roulette/wheel.png Binary files differnew file mode 100644 index 000000000..a0f121843 --- /dev/null +++ b/graphics/roulette/wheel.png diff --git a/graphics/roulette/wheel_map.bin b/graphics/roulette/wheel_map.bin Binary files differnew file mode 100644 index 000000000..53d919545 --- /dev/null +++ b/graphics/roulette/wheel_map.bin diff --git a/graphics/roulette/wynaut.png b/graphics/roulette/wynaut.png Binary files differnew file mode 100644 index 000000000..8ba7d3c0f --- /dev/null +++ b/graphics/roulette/wynaut.png diff --git a/graphics/unknown/unknown_587C30.pal b/graphics/unknown/unknown_587C30.pal new file mode 100644 index 000000000..1c10c781f --- /dev/null +++ b/graphics/unknown/unknown_587C30.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +74 74 74 +255 0 0 +0 255 0 +0 0 255 +255 255 0 +0 255 255 +255 0 255 +213 213 205 +0 0 0 +0 0 0 +230 230 238 +255 255 255 +156 205 255 +123 189 230 +255 255 255 diff --git a/graphics/unknown/unknown_58D6B0.pal b/graphics/unknown/unknown_58D6B0.pal new file mode 100644 index 000000000..1c10c781f --- /dev/null +++ b/graphics/unknown/unknown_58D6B0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +74 74 74 +255 0 0 +0 255 0 +0 0 255 +255 255 0 +0 255 255 +255 0 255 +213 213 205 +0 0 0 +0 0 0 +230 230 238 +255 255 255 +156 205 255 +123 189 230 +255 255 255 diff --git a/graphics/unknown/unknown_58D6D0.png b/graphics/unknown/unknown_58D6D0.png Binary files differnew file mode 100644 index 000000000..da421b501 --- /dev/null +++ b/graphics/unknown/unknown_58D6D0.png diff --git a/graphics/unknown/unknown_5B3280.pal b/graphics/unknown/unknown_5B3280.pal new file mode 100644 index 000000000..a23813afb --- /dev/null +++ b/graphics/unknown/unknown_5B3280.pal @@ -0,0 +1,179 @@ +JASC-PAL +0100 +176 +115 197 164 +180 180 180 +148 148 148 +90 90 98 +57 57 74 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +222 222 222 +0 0 0 +115 197 164 +180 180 172 +156 139 139 +98 82 90 +57 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +115 197 164 +189 180 172 +164 131 131 +106 74 82 +65 41 57 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +115 197 164 +197 180 172 +172 123 123 +123 65 74 +74 41 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +115 197 164 +205 189 164 +189 115 115 +131 65 65 +82 32 41 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +115 197 164 +213 189 164 +197 115 115 +148 57 65 +90 32 41 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +115 197 164 +222 189 164 +205 106 106 +156 49 57 +98 24 32 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +115 197 164 +230 197 156 +222 98 98 +164 49 49 +106 16 24 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +115 197 164 +238 197 156 +230 90 90 +180 41 41 +115 16 16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +115 197 164 +246 197 156 +238 82 82 +189 32 32 +123 8 8 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +115 197 164 +255 205 156 +255 82 82 +205 32 32 +131 8 8 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/unknown/unknown_5B3484.png b/graphics/unknown/unknown_5B3484.png Binary files differnew file mode 100644 index 000000000..1a39ccb74 --- /dev/null +++ b/graphics/unknown/unknown_5B3484.png diff --git a/graphics/unknown/unknown_5B3564.bin b/graphics/unknown/unknown_5B3564.bin Binary files differnew file mode 100644 index 000000000..a3691cfd7 --- /dev/null +++ b/graphics/unknown/unknown_5B3564.bin diff --git a/graphics/unknown/unknown_60EA4C.pal b/graphics/unknown/unknown_60EA4C.pal new file mode 100644 index 000000000..87bb7840e --- /dev/null +++ b/graphics/unknown/unknown_60EA4C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +0 0 0 +197 197 205 +32 222 148 +106 238 180 +180 255 213 +213 197 255 +238 230 255 +255 189 180 +255 222 213 +189 148 0 +238 238 230 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/unknown/unknown_60F13C.pal b/graphics/unknown/unknown_60F13C.pal new file mode 100644 index 000000000..1f6d1400e --- /dev/null +++ b/graphics/unknown/unknown_60F13C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +148 148 164 +115 115 131 +164 90 90 +65 65 82 +213 213 123 +189 189 197 +148 148 164 +115 115 131 +213 213 222 +65 65 82 +123 123 172 +156 156 205 +0 0 0 +255 255 255 +65 65 65 diff --git a/graphics/unknown/unknown_60F15C.pal b/graphics/unknown/unknown_60F15C.pal new file mode 100644 index 000000000..a25d0d910 --- /dev/null +++ b/graphics/unknown/unknown_60F15C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +230 131 98 +197 115 98 +164 90 90 +131 74 82 +213 213 123 +189 189 197 +148 148 164 +115 115 131 +255 172 180 +65 65 82 +123 123 172 +156 156 205 +0 0 0 +255 255 255 +65 65 65 diff --git a/graphics/unknown/unknown_60F17C.pal b/graphics/unknown/unknown_60F17C.pal new file mode 100644 index 000000000..7f6b43f35 --- /dev/null +++ b/graphics/unknown/unknown_60F17C.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +0 0 0 +0 0 0 +255 0 0 +164 115 246 +238 238 238 +164 115 246 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +98 98 90 +246 246 246 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +131 90 41 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +213 213 213 +0 0 0 diff --git a/graphics/unknown/unknown_60F1BC.png b/graphics/unknown/unknown_60F1BC.png Binary files differnew file mode 100644 index 000000000..185b93d57 --- /dev/null +++ b/graphics/unknown/unknown_60F1BC.png diff --git a/graphics/unknown/unknown_60F3BC.png b/graphics/unknown/unknown_60F3BC.png Binary files differnew file mode 100644 index 000000000..3114f2eb8 --- /dev/null +++ b/graphics/unknown/unknown_60F3BC.png diff --git a/graphics/unknown/unknown_60F43C.png b/graphics/unknown/unknown_60F43C.png Binary files differnew file mode 100644 index 000000000..3c2c1d5cd --- /dev/null +++ b/graphics/unknown/unknown_60F43C.png diff --git a/graphics/unknown/unknown_60F53C.png b/graphics/unknown/unknown_60F53C.png Binary files differnew file mode 100644 index 000000000..65450c7b3 --- /dev/null +++ b/graphics/unknown/unknown_60F53C.png diff --git a/graphics/unknown/unknown_60F63C.png b/graphics/unknown/unknown_60F63C.png Binary files differnew file mode 100644 index 000000000..01fcea2fa --- /dev/null +++ b/graphics/unknown/unknown_60F63C.png diff --git a/graphics/unknown/unknown_60F6BC.png b/graphics/unknown/unknown_60F6BC.png Binary files differnew file mode 100644 index 000000000..bda46587f --- /dev/null +++ b/graphics/unknown/unknown_60F6BC.png diff --git a/graphics/unknown/unknown_60F7BC.png b/graphics/unknown/unknown_60F7BC.png Binary files differnew file mode 100644 index 000000000..487b428bd --- /dev/null +++ b/graphics/unknown/unknown_60F7BC.png diff --git a/graphics/unknown/unknown_60F83C.png b/graphics/unknown/unknown_60F83C.png Binary files differnew file mode 100644 index 000000000..2a44e9455 --- /dev/null +++ b/graphics/unknown/unknown_60F83C.png diff --git a/graphics/unknown/unknown_60F93C.png b/graphics/unknown/unknown_60F93C.png Binary files differnew file mode 100644 index 000000000..2a44e9455 --- /dev/null +++ b/graphics/unknown/unknown_60F93C.png diff --git a/graphics/unknown/unknown_60FA3C.png b/graphics/unknown/unknown_60FA3C.png Binary files differnew file mode 100644 index 000000000..c4ae096d0 --- /dev/null +++ b/graphics/unknown/unknown_60FA3C.png diff --git a/graphics/unknown/unknown_61023C.bin b/graphics/unknown/unknown_61023C.bin Binary files differnew file mode 100644 index 000000000..c4e7c913d --- /dev/null +++ b/graphics/unknown/unknown_61023C.bin diff --git a/graphics/unknown/unknown_61033C.png b/graphics/unknown/unknown_61033C.png Binary files differnew file mode 100644 index 000000000..ec874f98c --- /dev/null +++ b/graphics/unknown/unknown_61033C.png diff --git a/graphics/unknown/unknown_61039C.pal b/graphics/unknown/unknown_61039C.pal new file mode 100644 index 000000000..89f527ce4 --- /dev/null +++ b/graphics/unknown/unknown_61039C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +213 255 238 +213 255 238 +213 255 238 +213 255 238 +213 255 238 +213 255 238 +213 255 238 +213 255 238 +213 255 238 +213 255 238 +213 255 238 +213 255 238 +213 255 238 +213 255 238 +213 255 238 diff --git a/graphics/unknown/unknown_61046C.pal b/graphics/unknown/unknown_61046C.pal new file mode 100644 index 000000000..40d83bc59 --- /dev/null +++ b/graphics/unknown/unknown_61046C.pal @@ -0,0 +1,8 @@ +JASC-PAL +0100 +5 +0 0 0 +0 0 0 +255 255 255 +0 0 0 +255 0 0 diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 565020836..fb96dd9ad 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -4,6 +4,8 @@ monfrontdir := graphics/pokemon/anim_front_pics monpaldir := graphics/pokemon/palettes tilesetdir := data/tilesets fontdir := data/graphics/fonts +roulgfxdir := graphics/roulette +battletransgfxdir := graphics/battle_transitions $(monstillfrontdir)/castform_still_front_pic.4bpp: $(monstillfrontdir)/castform_normal_form_still_front_pic.4bpp \ $(monstillfrontdir)/castform_sunny_form_still_front_pic.4bpp \ @@ -292,3 +294,31 @@ graphics/pokenav/region_map.8bpp: %.8bpp: %.png graphics/misc/japanese_hof.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 29 + +graphics/picture_frame/frame5.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 86 + +$(roulgfxdir)/roulette_tilt.4bpp: $(roulgfxdir)/shroomish.4bpp $(roulgfxdir)/tailow.4bpp + @cat $(roulgfxdir)/shroomish.4bpp $(roulgfxdir)/tailow.4bpp >$@ + +$(roulgfxdir)/poke_icons2.4bpp: $(roulgfxdir)/wynaut.4bpp $(roulgfxdir)/azurill.4bpp $(roulgfxdir)/skitty.4bpp $(roulgfxdir)/makuhita.4bpp + @cat $^ >$@ + +$(battletransgfxdir)/85BBC14.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 53 + +$(battletransgfxdir)/rayquaza.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 938 + +$(battletransgfxdir)/frontier_square_1.4bpp: $(battletransgfxdir)/frontier_squares_blanktiles.4bpp $(battletransgfxdir)/frontier_squares_1.4bpp + @cat $^ >$@ + +$(battletransgfxdir)/frontier_square_2.4bpp: $(battletransgfxdir)/frontier_squares_blanktiles.4bpp $(battletransgfxdir)/frontier_squares_2.4bpp + @cat $^ >$@ + +$(battletransgfxdir)/frontier_square_3.4bpp: $(battletransgfxdir)/frontier_squares_blanktiles.4bpp $(battletransgfxdir)/frontier_squares_3.4bpp + @cat $^ >$@ + +$(battletransgfxdir)/frontier_square_4.4bpp: $(battletransgfxdir)/frontier_squares_blanktiles.4bpp $(battletransgfxdir)/frontier_squares_4.4bpp + @cat $^ >$@ + diff --git a/include/constants/flags.h b/include/constants/flags.h index 26d015c84..941f40efb 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -120,7 +120,7 @@ #define FLAG_0x075 0x75 #define FLAG_0x076 0x76 #define FLAG_0x077 0x77 -#define FLAG_0x078 0x78 +#define FLAG_LANDMARK_MIRAGE_TOWER 0x78 #define FLAG_0x079 0x79 #define FLAG_0x07A 0x7A #define FLAG_0x07B 0x7B @@ -1284,289 +1284,290 @@ #define FLAG_TRAINER_FLAG_START 0x500 #define TRAINERS_FLAG_NO 0x356 -#define CODE_FLAGS (FLAG_TRAINER_FLAG_START + TRAINERS_FLAG_NO + 0xA) // 0x860 +#define SYSTEM_FLAGS (FLAG_TRAINER_FLAG_START + TRAINERS_FLAG_NO + 0xA) // 0x860 // SYSTEM FLAGS // 0x860 -#define FLAG_SYS_POKEMON_GET (CODE_FLAGS + 0) -#define FLAG_SYS_POKEDEX_GET (CODE_FLAGS + 1) -#define FLAG_SYS_POKENAV_GET (CODE_FLAGS + 2) +#define FLAG_SYS_POKEMON_GET (SYSTEM_FLAGS + 0) +#define FLAG_SYS_POKEDEX_GET (SYSTEM_FLAGS + 1) +#define FLAG_SYS_POKENAV_GET (SYSTEM_FLAGS + 2) // third one appears unused -#define FLAG_SYS_GAME_CLEAR (CODE_FLAGS + 4) -#define FLAG_SYS_CHAT_USED (CODE_FLAGS + 5) -#define FLAG_SYS_HIPSTER_MEET (CODE_FLAGS + 6) +#define FLAG_SYS_GAME_CLEAR (SYSTEM_FLAGS + 4) +#define FLAG_SYS_CHAT_USED (SYSTEM_FLAGS + 5) +#define FLAG_SYS_HIPSTER_MEET (SYSTEM_FLAGS + 6) // badges -#define FLAG_BADGE01_GET (CODE_FLAGS + 7) -#define FLAG_BADGE02_GET (CODE_FLAGS + 8) -#define FLAG_BADGE03_GET (CODE_FLAGS + 9) -#define FLAG_BADGE04_GET (CODE_FLAGS + 0xA) -#define FLAG_BADGE05_GET (CODE_FLAGS + 0xB) -#define FLAG_BADGE06_GET (CODE_FLAGS + 0xC) -#define FLAG_BADGE07_GET (CODE_FLAGS + 0xD) -#define FLAG_BADGE08_GET (CODE_FLAGS + 0xE) +#define FLAG_BADGE01_GET (SYSTEM_FLAGS + 7) +#define FLAG_BADGE02_GET (SYSTEM_FLAGS + 8) +#define FLAG_BADGE03_GET (SYSTEM_FLAGS + 9) +#define FLAG_BADGE04_GET (SYSTEM_FLAGS + 0xA) +#define FLAG_BADGE05_GET (SYSTEM_FLAGS + 0xB) +#define FLAG_BADGE06_GET (SYSTEM_FLAGS + 0xC) +#define FLAG_BADGE07_GET (SYSTEM_FLAGS + 0xD) +#define FLAG_BADGE08_GET (SYSTEM_FLAGS + 0xE) // cities and towns -#define FLAG_VISITED_LITTLEROOT_TOWN (CODE_FLAGS + 0xF) -#define FLAG_VISITED_OLDALE_TOWN (CODE_FLAGS + 0x10) -#define FLAG_VISITED_DEWFORD_TOWN (CODE_FLAGS + 0x11) -#define FLAG_VISITED_LAVARIDGE_TOWN (CODE_FLAGS + 0x12) -#define FLAG_VISITED_FALLARBOR_TOWN (CODE_FLAGS + 0x13) -#define FLAG_VISITED_VERDANTURF_TOWN (CODE_FLAGS + 0x14) -#define FLAG_VISITED_PACIFIDLOG_TOWN (CODE_FLAGS + 0x15) -#define FLAG_VISITED_PETALBURG_CITY (CODE_FLAGS + 0x16) -#define FLAG_VISITED_SLATEPORT_CITY (CODE_FLAGS + 0x17) -#define FLAG_VISITED_MAUVILLE_CITY (CODE_FLAGS + 0x18) -#define FLAG_VISITED_RUSTBORO_CITY (CODE_FLAGS + 0x19) -#define FLAG_VISITED_FORTREE_CITY (CODE_FLAGS + 0x1A) -#define FLAG_VISITED_LILYCOVE_CITY (CODE_FLAGS + 0x1B) -#define FLAG_VISITED_MOSSDEEP_CITY (CODE_FLAGS + 0x1C) -#define FLAG_VISITED_SOOTOPOLIS_CITY (CODE_FLAGS + 0x1D) -#define FLAG_VISITED_EVER_GRANDE_CITY (CODE_FLAGS + 0x1E) +#define FLAG_VISITED_LITTLEROOT_TOWN (SYSTEM_FLAGS + 0xF) +#define FLAG_VISITED_OLDALE_TOWN (SYSTEM_FLAGS + 0x10) +#define FLAG_VISITED_DEWFORD_TOWN (SYSTEM_FLAGS + 0x11) +#define FLAG_VISITED_LAVARIDGE_TOWN (SYSTEM_FLAGS + 0x12) +#define FLAG_VISITED_FALLARBOR_TOWN (SYSTEM_FLAGS + 0x13) +#define FLAG_VISITED_VERDANTURF_TOWN (SYSTEM_FLAGS + 0x14) +#define FLAG_VISITED_PACIFIDLOG_TOWN (SYSTEM_FLAGS + 0x15) +#define FLAG_VISITED_PETALBURG_CITY (SYSTEM_FLAGS + 0x16) +#define FLAG_VISITED_SLATEPORT_CITY (SYSTEM_FLAGS + 0x17) +#define FLAG_VISITED_MAUVILLE_CITY (SYSTEM_FLAGS + 0x18) +#define FLAG_VISITED_RUSTBORO_CITY (SYSTEM_FLAGS + 0x19) +#define FLAG_VISITED_FORTREE_CITY (SYSTEM_FLAGS + 0x1A) +#define FLAG_VISITED_LILYCOVE_CITY (SYSTEM_FLAGS + 0x1B) +#define FLAG_VISITED_MOSSDEEP_CITY (SYSTEM_FLAGS + 0x1C) +#define FLAG_VISITED_SOOTOPOLIS_CITY (SYSTEM_FLAGS + 0x1D) +#define FLAG_VISITED_EVER_GRANDE_CITY (SYSTEM_FLAGS + 0x1E) -#define FLAG_0x87F (CODE_FLAGS + 0x1F) -#define FLAG_0x880 (CODE_FLAGS + 0x20) -#define FLAG_0x881 (CODE_FLAGS + 0x21) -#define FLAG_0x882 (CODE_FLAGS + 0x22) -#define FLAG_0x883 (CODE_FLAGS + 0x23) -#define FLAG_0x884 (CODE_FLAGS + 0x24) -#define FLAG_0x885 (CODE_FLAGS + 0x25) -#define FLAG_0x886 (CODE_FLAGS + 0x26) -#define FLAG_0x887 (CODE_FLAGS + 0x27) +#define FLAG_0x87F (SYSTEM_FLAGS + 0x1F) +#define FLAG_0x880 (SYSTEM_FLAGS + 0x20) +#define FLAG_0x881 (SYSTEM_FLAGS + 0x21) +#define FLAG_0x882 (SYSTEM_FLAGS + 0x22) +#define FLAG_0x883 (SYSTEM_FLAGS + 0x23) +#define FLAG_0x884 (SYSTEM_FLAGS + 0x24) +#define FLAG_0x885 (SYSTEM_FLAGS + 0x25) +#define FLAG_0x886 (SYSTEM_FLAGS + 0x26) +#define FLAG_0x887 (SYSTEM_FLAGS + 0x27) -#define FLAG_SYS_USE_FLASH (CODE_FLAGS + 0x28) -#define FLAG_SYS_USE_STRENGTH (CODE_FLAGS + 0x29) -#define FLAG_SYS_WEATHER_CTRL (CODE_FLAGS + 0x2A) -#define FLAG_SYS_CYCLING_ROAD (CODE_FLAGS + 0x2B) -#define FLAG_SYS_SAFARI_MODE (CODE_FLAGS + 0x2C) -#define FLAG_SYS_CRUISE_MODE (CODE_FLAGS + 0x2D) +#define FLAG_SYS_USE_FLASH (SYSTEM_FLAGS + 0x28) +#define FLAG_SYS_USE_STRENGTH (SYSTEM_FLAGS + 0x29) +#define FLAG_SYS_WEATHER_CTRL (SYSTEM_FLAGS + 0x2A) +#define FLAG_SYS_CYCLING_ROAD (SYSTEM_FLAGS + 0x2B) +#define FLAG_SYS_SAFARI_MODE (SYSTEM_FLAGS + 0x2C) +#define FLAG_SYS_CRUISE_MODE (SYSTEM_FLAGS + 0x2D) -#define FLAG_0x88E (CODE_FLAGS + 0x2E) -#define FLAG_0x88F (CODE_FLAGS + 0x2F) +#define FLAG_0x88E (SYSTEM_FLAGS + 0x2E) +#define FLAG_0x88F (SYSTEM_FLAGS + 0x2F) -#define FLAG_SYS_TV_HOME (CODE_FLAGS + 0x30) -#define FLAG_SYS_TV_WATCH (CODE_FLAGS + 0x31) -#define FLAG_SYS_TV_START (CODE_FLAGS + 0x32) -#define FLAG_SYS_POPWORD_INPUT (CODE_FLAGS + 0x33) -#define FLAG_SYS_MIX_RECORD (CODE_FLAGS + 0x34) -#define FLAG_SYS_CLOCK_SET (CODE_FLAGS + 0x35) -#define FLAG_SYS_NATIONAL_DEX (CODE_FLAGS + 0x36) -#define FLAG_SYS_CAVE_SHIP (CODE_FLAGS + 0x37) -#define FLAG_SYS_CAVE_WONDER (CODE_FLAGS + 0x38) -#define FLAG_SYS_CAVE_BATTLE (CODE_FLAGS + 0x39) -#define FLAG_SYS_SHOAL_TIDE (CODE_FLAGS + 0x3A) -#define FLAG_SYS_RIBBON_GET (CODE_FLAGS + 0x3B) +#define FLAG_SYS_TV_HOME (SYSTEM_FLAGS + 0x30) +#define FLAG_SYS_TV_WATCH (SYSTEM_FLAGS + 0x31) +#define FLAG_SYS_TV_START (SYSTEM_FLAGS + 0x32) +#define FLAG_SYS_POPWORD_INPUT (SYSTEM_FLAGS + 0x33) +#define FLAG_SYS_MIX_RECORD (SYSTEM_FLAGS + 0x34) +#define FLAG_SYS_CLOCK_SET (SYSTEM_FLAGS + 0x35) +#define FLAG_SYS_NATIONAL_DEX (SYSTEM_FLAGS + 0x36) +#define FLAG_SYS_CAVE_SHIP (SYSTEM_FLAGS + 0x37) +#define FLAG_SYS_CAVE_WONDER (SYSTEM_FLAGS + 0x38) +#define FLAG_SYS_CAVE_BATTLE (SYSTEM_FLAGS + 0x39) +#define FLAG_SYS_SHOAL_TIDE (SYSTEM_FLAGS + 0x3A) +#define FLAG_SYS_RIBBON_GET (SYSTEM_FLAGS + 0x3B) -#define FLAG_0x89C (CODE_FLAGS + 0x3C) -#define FLAG_0x89D (CODE_FLAGS + 0x3D) -#define FLAG_0x89E (CODE_FLAGS + 0x3E) -#define FLAG_0x89F (CODE_FLAGS + 0x3F) -#define FLAG_0x8A0 (CODE_FLAGS + 0x40) -#define FLAG_0x8A1 (CODE_FLAGS + 0x41) -#define FLAG_0x8A2 (CODE_FLAGS + 0x42) -#define FLAG_0x8A3 (CODE_FLAGS + 0x43) -#define FLAG_0x8A4 (CODE_FLAGS + 0x44) -#define FLAG_0x8A5 (CODE_FLAGS + 0x45) -#define FLAG_0x8A6 (CODE_FLAGS + 0x46) -#define FLAG_0x8A7 (CODE_FLAGS + 0x47) -#define FLAG_UNLOCK_BATTLE_FRONTIER (CODE_FLAGS + 0x48) -#define FLAG_UNLOCK_SOUTHERN_ISLAND (CODE_FLAGS + 0x49) -#define FLAG_0x8AA (CODE_FLAGS + 0x4A) +#define FLAG_LANDMARK_FLOWER_SHOP (SYSTEM_FLAGS + 0x3C) +#define FLAG_LANDMARK_MR_BRINEY_HOUSE (SYSTEM_FLAGS + 0x3D) +#define FLAG_LANDMARK_ABANDONED_SHIP (SYSTEM_FLAGS + 0x3E) +#define FLAG_LANDMARK_SEASHORE_HOUSE (SYSTEM_FLAGS + 0x3F) +#define FLAG_LANDMARK_NEW_MAUVILLE (SYSTEM_FLAGS + 0x40) +#define FLAG_LANDMARK_OLD_LADY_REST_SHOP (SYSTEM_FLAGS + 0x41) +#define FLAG_LANDMARK_TRICK_HOUSE (SYSTEM_FLAGS + 0x42) +#define FLAG_LANDMARK_WINSTRATE_FAMILY (SYSTEM_FLAGS + 0x43) +#define FLAG_LANDMARK_GLASS_WORKSHOP (SYSTEM_FLAGS + 0x44) +#define FLAG_LANDMARK_LANETTES_HOUSE (SYSTEM_FLAGS + 0x45) +#define FLAG_LANDMARK_POKEMON_DAYCARE (SYSTEM_FLAGS + 0x46) +#define FLAG_LANDMARK_SEAFLOOR_CAVERN (SYSTEM_FLAGS + 0x47) +#define FLAG_LANDMARK_BATTLE_FRONTIER (SYSTEM_FLAGS + 0x48) +#define FLAG_LANDMARK_SOUTHERN_ISLAND (SYSTEM_FLAGS + 0x49) +#define FLAG_LANDMARK_FIERY_PATH (SYSTEM_FLAGS + 0x4A) -#define FLAG_SYS_PC_LANETTE (CODE_FLAGS + 0x4B) -#define FLAG_SYS_MYSTERY_EVENT_ENABLE (CODE_FLAGS + 0x4C) -#define FLAG_SYS_ENC_UP_ITEM (CODE_FLAGS + 0x4D) -#define FLAG_SYS_ENC_DOWN_ITEM (CODE_FLAGS + 0x4E) -#define FLAG_SYS_BRAILLE_DIG (CODE_FLAGS + 0x4F) -#define FLAG_SYS_BRAILLE_STRENGTH (CODE_FLAGS + 0x50) -#define FLAG_SYS_BRAILLE_WAIT (CODE_FLAGS + 0x51) -#define FLAG_SYS_BRAILLE_FLY (CODE_FLAGS + 0x52) -#define FLAG_SYS_HAS_EON_TICKET (CODE_FLAGS + 0x53) +#define FLAG_SYS_PC_LANETTE (SYSTEM_FLAGS + 0x4B) +#define FLAG_SYS_MYSTERY_EVENT_ENABLE (SYSTEM_FLAGS + 0x4C) +#define FLAG_SYS_ENC_UP_ITEM (SYSTEM_FLAGS + 0x4D) +#define FLAG_SYS_ENC_DOWN_ITEM (SYSTEM_FLAGS + 0x4E) +#define FLAG_SYS_BRAILLE_DIG (SYSTEM_FLAGS + 0x4F) +#define FLAG_SYS_BRAILLE_STRENGTH (SYSTEM_FLAGS + 0x50) +#define FLAG_SYS_BRAILLE_WAIT (SYSTEM_FLAGS + 0x51) +#define FLAG_SYS_BRAILLE_FLY (SYSTEM_FLAGS + 0x52) +#define FLAG_SYS_HAS_EON_TICKET (SYSTEM_FLAGS + 0x53) -#define FLAG_SYS_POKEMON_LEAGUE_FLY (CODE_FLAGS + 0x54) +#define FLAG_LANDMARK_POKEMON_LEAGUE (SYSTEM_FLAGS + 0x54) -#define FLAG_0x8B5 (CODE_FLAGS + 0x55) -#define FLAG_0x8B6 (CODE_FLAGS + 0x56) -#define FLAG_0x8B7 (CODE_FLAGS + 0x57) -#define FLAG_0x8B8 (CODE_FLAGS + 0x58) -#define FLAG_0x8B9 (CODE_FLAGS + 0x59) -#define FLAG_0x8BA (CODE_FLAGS + 0x5A) -#define FLAG_0x8BB (CODE_FLAGS + 0x5B) -#define FLAG_0x8BC (CODE_FLAGS + 0x5C) +#define FLAG_LANDMARK_ISLAND_CAVE (SYSTEM_FLAGS + 0x55) +#define FLAG_LANDMARK_DESERT_RUINS (SYSTEM_FLAGS + 0x56) +#define FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE (SYSTEM_FLAGS + 0x57) +#define FLAG_LANDMARK_SCORCHED_SLAB (SYSTEM_FLAGS + 0x58) +#define FLAG_LANDMARK_ANCIENT_TOMB (SYSTEM_FLAGS + 0x59) +#define FLAG_LANDMARK_TUNNELERS_REST_HOUSE (SYSTEM_FLAGS + 0x5A) +#define FLAG_LANDMARK_HUNTERS_HOUSE (SYSTEM_FLAGS + 0x5B) +#define FLAG_LANDMARK_SEALED_CHAMBER (SYSTEM_FLAGS + 0x5C) -#define FLAG_SYS_TV_LATI (CODE_FLAGS + 0x5D) +#define FLAG_SYS_TV_LATI (SYSTEM_FLAGS + 0x5D) -#define FLAG_0x8BE (CODE_FLAGS + 0x5E) +#define FLAG_LANDMARK_SKY_PILLAR (SYSTEM_FLAGS + 0x5E) -#define FLAG_SYS_SHOAL_ITEM (CODE_FLAGS + 0x5F) -#define FLAG_SYS_B_DASH (CODE_FLAGS + 0x60) // got Running Shoes -#define FLAG_SYS_CTRL_OBJ_DELETE (CODE_FLAGS + 0x61) -#define FLAG_SYS_RESET_RTC_ENABLE (CODE_FLAGS + 0x62) +#define FLAG_SYS_SHOAL_ITEM (SYSTEM_FLAGS + 0x5F) +#define FLAG_SYS_B_DASH (SYSTEM_FLAGS + 0x60) // got Running Shoes +#define FLAG_SYS_CTRL_OBJ_DELETE (SYSTEM_FLAGS + 0x61) +#define FLAG_SYS_RESET_RTC_ENABLE (SYSTEM_FLAGS + 0x62) -#define FLAG_0x8C3 (CODE_FLAGS + 0x63) +#define FLAG_LANDMARK_BERRY_MASTERS_HOUSE (SYSTEM_FLAGS + 0x63) -#define FLAG_SYS_TOWER_SILVER (CODE_FLAGS + 0x64) -#define FLAG_SYS_TOWER_GOLD (CODE_FLAGS + 0x65) -#define FLAG_SYS_DOME_SILVER (CODE_FLAGS + 0x66) -#define FLAG_SYS_DOME_GOLD (CODE_FLAGS + 0x67) -#define FLAG_SYS_PALACE_SILVER (CODE_FLAGS + 0x68) -#define FLAG_SYS_PALACE_GOLD (CODE_FLAGS + 0x69) -#define FLAG_SYS_ARENA_SILVER (CODE_FLAGS + 0x6A) -#define FLAG_SYS_ARENA_GOLD (CODE_FLAGS + 0x6B) -#define FLAG_SYS_FACTORY_SILVER (CODE_FLAGS + 0x6C) -#define FLAG_SYS_FACTORY_GOLD (CODE_FLAGS + 0x6D) -#define FLAG_SYS_PIKE_SILVER (CODE_FLAGS + 0x6E) -#define FLAG_SYS_PIKE_GOLD (CODE_FLAGS + 0x6F) -#define FLAG_SYS_PYRAMID_SILVER (CODE_FLAGS + 0x70) -#define FLAG_SYS_PYRAMID_GOLD (CODE_FLAGS + 0x71) -#define FLAG_SYS_FRONTIER_PASS (CODE_FLAGS + 0x72) +#define FLAG_SYS_TOWER_SILVER (SYSTEM_FLAGS + 0x64) +#define FLAG_SYS_TOWER_GOLD (SYSTEM_FLAGS + 0x65) +#define FLAG_SYS_DOME_SILVER (SYSTEM_FLAGS + 0x66) +#define FLAG_SYS_DOME_GOLD (SYSTEM_FLAGS + 0x67) +#define FLAG_SYS_PALACE_SILVER (SYSTEM_FLAGS + 0x68) +#define FLAG_SYS_PALACE_GOLD (SYSTEM_FLAGS + 0x69) +#define FLAG_SYS_ARENA_SILVER (SYSTEM_FLAGS + 0x6A) +#define FLAG_SYS_ARENA_GOLD (SYSTEM_FLAGS + 0x6B) +#define FLAG_SYS_FACTORY_SILVER (SYSTEM_FLAGS + 0x6C) +#define FLAG_SYS_FACTORY_GOLD (SYSTEM_FLAGS + 0x6D) +#define FLAG_SYS_PIKE_SILVER (SYSTEM_FLAGS + 0x6E) +#define FLAG_SYS_PIKE_GOLD (SYSTEM_FLAGS + 0x6F) +#define FLAG_SYS_PYRAMID_SILVER (SYSTEM_FLAGS + 0x70) +#define FLAG_SYS_PYRAMID_GOLD (SYSTEM_FLAGS + 0x71) +#define FLAG_SYS_FRONTIER_PASS (SYSTEM_FLAGS + 0x72) -#define FLAG_0x8D3 (CODE_FLAGS + 0x73) -#define FLAG_0x8D4 (CODE_FLAGS + 0x74) -#define FLAG_0x8D5 (CODE_FLAGS + 0x75) -#define FLAG_0x8D6 (CODE_FLAGS + 0x76) +#define FLAG_0x8D3 (SYSTEM_FLAGS + 0x73) +#define FLAG_0x8D4 (SYSTEM_FLAGS + 0x74) +#define FLAG_0x8D5 (SYSTEM_FLAGS + 0x75) +#define FLAG_0x8D6 (SYSTEM_FLAGS + 0x76) -#define FLAG_SYS_STORAGE_UNKNOWN_FLAG (CODE_FLAGS + 0x77) +#define FLAG_SYS_STORAGE_UNKNOWN_FLAG (SYSTEM_FLAGS + 0x77) -#define FLAG_0x8D8 (CODE_FLAGS + 0x78) -#define FLAG_0x8D9 (CODE_FLAGS + 0x79) -#define FLAG_0x8DA (CODE_FLAGS + 0x7A) +#define FLAG_0x8D8 (SYSTEM_FLAGS + 0x78) +#define FLAG_0x8D9 (SYSTEM_FLAGS + 0x79) +#define FLAG_0x8DA (SYSTEM_FLAGS + 0x7A) -#define FLAG_SYS_MYSTERY_GIFT_ENABLE (CODE_FLAGS + 0x7B) +#define FLAG_SYS_MYSTERY_GIFT_ENABLE (SYSTEM_FLAGS + 0x7B) -#define FLAG_0x8DC (CODE_FLAGS + 0x7C) -#define FLAG_0x8DD (CODE_FLAGS + 0x7D) -#define FLAG_0x8DE (CODE_FLAGS + 0x7E) -#define FLAG_0x8DF (CODE_FLAGS + 0x7F) -#define FLAG_0x8E0 (CODE_FLAGS + 0x80) -#define FLAG_0x8E1 (CODE_FLAGS + 0x81) -#define FLAG_0x8E2 (CODE_FLAGS + 0x82) -#define FLAG_0x8E3 (CODE_FLAGS + 0x83) -#define FLAG_0x8E4 (CODE_FLAGS + 0x84) -#define FLAG_0x8E5 (CODE_FLAGS + 0x85) -#define FLAG_0x8E6 (CODE_FLAGS + 0x86) -#define FLAG_0x8E7 (CODE_FLAGS + 0x87) -#define FLAG_0x8E8 (CODE_FLAGS + 0x88) -#define FLAG_0x8E9 (CODE_FLAGS + 0x89) -#define FLAG_0x8EA (CODE_FLAGS + 0x8A) -#define FLAG_0x8EB (CODE_FLAGS + 0x8B) -#define FLAG_0x8EC (CODE_FLAGS + 0x8C) -#define FLAG_0x8ED (CODE_FLAGS + 0x8D) -#define FLAG_0x8EE (CODE_FLAGS + 0x8E) -#define FLAG_0x8EF (CODE_FLAGS + 0x8F) -#define FLAG_0x8F0 (CODE_FLAGS + 0x90) -#define FLAG_0x8F1 (CODE_FLAGS + 0x91) -#define FLAG_0x8F2 (CODE_FLAGS + 0x92) -#define FLAG_0x8F3 (CODE_FLAGS + 0x93) -#define FLAG_0x8F4 (CODE_FLAGS + 0x94) -#define FLAG_0x8F5 (CODE_FLAGS + 0x95) -#define FLAG_0x8F6 (CODE_FLAGS + 0x96) -#define FLAG_0x8F7 (CODE_FLAGS + 0x97) -#define FLAG_0x8F8 (CODE_FLAGS + 0x98) -#define FLAG_0x8F9 (CODE_FLAGS + 0x99) -#define FLAG_0x8FA (CODE_FLAGS + 0x9A) -#define FLAG_0x8FB (CODE_FLAGS + 0x9B) -#define FLAG_0x8FC (CODE_FLAGS + 0x9C) -#define FLAG_0x8FD (CODE_FLAGS + 0x9D) -#define FLAG_0x8FE (CODE_FLAGS + 0x9E) -#define FLAG_0x8FF (CODE_FLAGS + 0x9F) -#define FLAG_0x900 (CODE_FLAGS + 0xA0) -#define FLAG_0x901 (CODE_FLAGS + 0xA1) -#define FLAG_0x902 (CODE_FLAGS + 0xA2) -#define FLAG_0x903 (CODE_FLAGS + 0xA3) -#define FLAG_0x904 (CODE_FLAGS + 0xA4) -#define FLAG_0x905 (CODE_FLAGS + 0xA5) -#define FLAG_0x906 (CODE_FLAGS + 0xA6) -#define FLAG_0x907 (CODE_FLAGS + 0xA7) -#define FLAG_0x908 (CODE_FLAGS + 0xA8) -#define FLAG_0x909 (CODE_FLAGS + 0xA9) -#define FLAG_0x90A (CODE_FLAGS + 0xAA) -#define FLAG_0x90B (CODE_FLAGS + 0xAB) -#define FLAG_0x90C (CODE_FLAGS + 0xAC) -#define FLAG_0x90D (CODE_FLAGS + 0xAD) -#define FLAG_0x90E (CODE_FLAGS + 0xAE) -#define FLAG_0x90F (CODE_FLAGS + 0xAF) -#define FLAG_0x910 (CODE_FLAGS + 0xB0) -#define FLAG_0x911 (CODE_FLAGS + 0xB1) -#define FLAG_0x912 (CODE_FLAGS + 0xB2) -#define FLAG_0x913 (CODE_FLAGS + 0xB3) -#define FLAG_0x914 (CODE_FLAGS + 0xB4) -#define FLAG_0x915 (CODE_FLAGS + 0xB5) -#define FLAG_0x916 (CODE_FLAGS + 0xB6) -#define FLAG_0x917 (CODE_FLAGS + 0xB7) -#define FLAG_0x918 (CODE_FLAGS + 0xB8) -#define FLAG_0x919 (CODE_FLAGS + 0xB9) -#define FLAG_0x91A (CODE_FLAGS + 0xBA) -#define FLAG_0x91B (CODE_FLAGS + 0xBB) -#define FLAG_0x91C (CODE_FLAGS + 0xBC) -#define FLAG_0x91D (CODE_FLAGS + 0xBD) -#define FLAG_0x91E (CODE_FLAGS + 0xBE) -#define FLAG_0x91F (CODE_FLAGS + 0xBF) -#define FLAG_0x920 (CODE_FLAGS + 0xC0) -#define FLAG_0x921 (CODE_FLAGS + 0xC1) -#define FLAG_0x922 (CODE_FLAGS + 0xC2) -#define FLAG_0x923 (CODE_FLAGS + 0xC3) -#define FLAG_0x924 (CODE_FLAGS + 0xC4) -#define FLAG_0x925 (CODE_FLAGS + 0xC5) -#define FLAG_0x926 (CODE_FLAGS + 0xC6) -#define FLAG_0x927 (CODE_FLAGS + 0xC7) -#define FLAG_0x928 (CODE_FLAGS + 0xC8) -#define FLAG_0x929 (CODE_FLAGS + 0xC9) -#define FLAG_0x92A (CODE_FLAGS + 0xCA) -#define FLAG_0x92B (CODE_FLAGS + 0xCB) -#define FLAG_0x92C (CODE_FLAGS + 0xCC) -#define FLAG_0x92D (CODE_FLAGS + 0xCD) -#define FLAG_0x92E (CODE_FLAGS + 0xCE) -#define FLAG_0x92F (CODE_FLAGS + 0xCF) -#define FLAG_0x930 (CODE_FLAGS + 0xD0) -#define FLAG_0x931 (CODE_FLAGS + 0xD1) -#define FLAG_0x932 (CODE_FLAGS + 0xD2) -#define FLAG_0x933 (CODE_FLAGS + 0xD3) -#define FLAG_0x934 (CODE_FLAGS + 0xD4) -#define FLAG_0x935 (CODE_FLAGS + 0xD5) -#define FLAG_0x936 (CODE_FLAGS + 0xD6) -#define FLAG_0x937 (CODE_FLAGS + 0xD7) -#define FLAG_0x938 (CODE_FLAGS + 0xD8) -#define FLAG_0x939 (CODE_FLAGS + 0xD9) -#define FLAG_0x93A (CODE_FLAGS + 0xDA) -#define FLAG_0x93B (CODE_FLAGS + 0xDB) -#define FLAG_0x93C (CODE_FLAGS + 0xDC) -#define FLAG_0x93D (CODE_FLAGS + 0xDD) -#define FLAG_0x93E (CODE_FLAGS + 0xDE) -#define FLAG_0x93F (CODE_FLAGS + 0xDF) -#define FLAG_0x940 (CODE_FLAGS + 0xE0) -#define FLAG_0x941 (CODE_FLAGS + 0xE1) -#define FLAG_0x942 (CODE_FLAGS + 0xE2) -#define FLAG_0x943 (CODE_FLAGS + 0xE3) -#define FLAG_0x944 (CODE_FLAGS + 0xE4) -#define FLAG_0x945 (CODE_FLAGS + 0xE5) -#define FLAG_0x946 (CODE_FLAGS + 0xE6) -#define FLAG_0x947 (CODE_FLAGS + 0xE7) -#define FLAG_0x948 (CODE_FLAGS + 0xE8) -#define FLAG_0x949 (CODE_FLAGS + 0xE9) -#define FLAG_0x94A (CODE_FLAGS + 0xEA) -#define FLAG_0x94B (CODE_FLAGS + 0xEB) -#define FLAG_0x94C (CODE_FLAGS + 0xEC) -#define FLAG_0x94D (CODE_FLAGS + 0xED) -#define FLAG_0x94E (CODE_FLAGS + 0xEE) -#define FLAG_0x94F (CODE_FLAGS + 0xEF) -#define FLAG_0x950 (CODE_FLAGS + 0xF0) -#define FLAG_0x951 (CODE_FLAGS + 0xF1) -#define FLAG_0x952 (CODE_FLAGS + 0xF2) -#define FLAG_0x953 (CODE_FLAGS + 0xF3) -#define FLAG_0x954 (CODE_FLAGS + 0xF4) -#define FLAG_0x955 (CODE_FLAGS + 0xF5) -#define FLAG_0x956 (CODE_FLAGS + 0xF6) -#define FLAG_0x957 (CODE_FLAGS + 0xF7) -#define FLAG_0x958 (CODE_FLAGS + 0xF8) -#define FLAG_0x959 (CODE_FLAGS + 0xF9) -#define FLAG_0x95A (CODE_FLAGS + 0xFA) -#define FLAG_0x95B (CODE_FLAGS + 0xFB) -#define FLAG_0x95C (CODE_FLAGS + 0xFC) -#define FLAG_0x95D (CODE_FLAGS + 0xFD) -#define FLAG_0x95E (CODE_FLAGS + 0xFE) -#define FLAG_0x95F (CODE_FLAGS + 0xFF) +#define FLAG_0x8DC (SYSTEM_FLAGS + 0x7C) +#define FLAG_LANDMARK_ALTERING_CAVE (SYSTEM_FLAGS + 0x7D) +#define FLAG_LANDMARK_DESERT_UNDERPASS (SYSTEM_FLAGS + 0x7E) +#define FLAG_0x8DF (SYSTEM_FLAGS + 0x7F) +#define FLAG_0x8E0 (SYSTEM_FLAGS + 0x80) +#define FLAG_0x8E1 (SYSTEM_FLAGS + 0x81) +#define FLAG_LANDMARK_TRAINER_HILL (SYSTEM_FLAGS + 0x82) + +#define FLAG_0x8E3 (SYSTEM_FLAGS + 0x83) +#define FLAG_0x8E4 (SYSTEM_FLAGS + 0x84) +#define FLAG_0x8E5 (SYSTEM_FLAGS + 0x85) +#define FLAG_0x8E6 (SYSTEM_FLAGS + 0x86) +#define FLAG_0x8E7 (SYSTEM_FLAGS + 0x87) +#define FLAG_0x8E8 (SYSTEM_FLAGS + 0x88) +#define FLAG_0x8E9 (SYSTEM_FLAGS + 0x89) +#define FLAG_0x8EA (SYSTEM_FLAGS + 0x8A) +#define FLAG_0x8EB (SYSTEM_FLAGS + 0x8B) +#define FLAG_0x8EC (SYSTEM_FLAGS + 0x8C) +#define FLAG_0x8ED (SYSTEM_FLAGS + 0x8D) +#define FLAG_0x8EE (SYSTEM_FLAGS + 0x8E) +#define FLAG_0x8EF (SYSTEM_FLAGS + 0x8F) +#define FLAG_0x8F0 (SYSTEM_FLAGS + 0x90) +#define FLAG_0x8F1 (SYSTEM_FLAGS + 0x91) +#define FLAG_0x8F2 (SYSTEM_FLAGS + 0x92) +#define FLAG_0x8F3 (SYSTEM_FLAGS + 0x93) +#define FLAG_0x8F4 (SYSTEM_FLAGS + 0x94) +#define FLAG_0x8F5 (SYSTEM_FLAGS + 0x95) +#define FLAG_0x8F6 (SYSTEM_FLAGS + 0x96) +#define FLAG_0x8F7 (SYSTEM_FLAGS + 0x97) +#define FLAG_0x8F8 (SYSTEM_FLAGS + 0x98) +#define FLAG_0x8F9 (SYSTEM_FLAGS + 0x99) +#define FLAG_0x8FA (SYSTEM_FLAGS + 0x9A) +#define FLAG_0x8FB (SYSTEM_FLAGS + 0x9B) +#define FLAG_0x8FC (SYSTEM_FLAGS + 0x9C) +#define FLAG_0x8FD (SYSTEM_FLAGS + 0x9D) +#define FLAG_0x8FE (SYSTEM_FLAGS + 0x9E) +#define FLAG_0x8FF (SYSTEM_FLAGS + 0x9F) +#define FLAG_0x900 (SYSTEM_FLAGS + 0xA0) +#define FLAG_0x901 (SYSTEM_FLAGS + 0xA1) +#define FLAG_0x902 (SYSTEM_FLAGS + 0xA2) +#define FLAG_0x903 (SYSTEM_FLAGS + 0xA3) +#define FLAG_0x904 (SYSTEM_FLAGS + 0xA4) +#define FLAG_0x905 (SYSTEM_FLAGS + 0xA5) +#define FLAG_0x906 (SYSTEM_FLAGS + 0xA6) +#define FLAG_0x907 (SYSTEM_FLAGS + 0xA7) +#define FLAG_0x908 (SYSTEM_FLAGS + 0xA8) +#define FLAG_0x909 (SYSTEM_FLAGS + 0xA9) +#define FLAG_0x90A (SYSTEM_FLAGS + 0xAA) +#define FLAG_0x90B (SYSTEM_FLAGS + 0xAB) +#define FLAG_0x90C (SYSTEM_FLAGS + 0xAC) +#define FLAG_0x90D (SYSTEM_FLAGS + 0xAD) +#define FLAG_0x90E (SYSTEM_FLAGS + 0xAE) +#define FLAG_0x90F (SYSTEM_FLAGS + 0xAF) +#define FLAG_0x910 (SYSTEM_FLAGS + 0xB0) +#define FLAG_0x911 (SYSTEM_FLAGS + 0xB1) +#define FLAG_0x912 (SYSTEM_FLAGS + 0xB2) +#define FLAG_0x913 (SYSTEM_FLAGS + 0xB3) +#define FLAG_0x914 (SYSTEM_FLAGS + 0xB4) +#define FLAG_0x915 (SYSTEM_FLAGS + 0xB5) +#define FLAG_0x916 (SYSTEM_FLAGS + 0xB6) +#define FLAG_0x917 (SYSTEM_FLAGS + 0xB7) +#define FLAG_0x918 (SYSTEM_FLAGS + 0xB8) +#define FLAG_0x919 (SYSTEM_FLAGS + 0xB9) +#define FLAG_0x91A (SYSTEM_FLAGS + 0xBA) +#define FLAG_0x91B (SYSTEM_FLAGS + 0xBB) +#define FLAG_0x91C (SYSTEM_FLAGS + 0xBC) +#define FLAG_0x91D (SYSTEM_FLAGS + 0xBD) +#define FLAG_0x91E (SYSTEM_FLAGS + 0xBE) +#define FLAG_0x91F (SYSTEM_FLAGS + 0xBF) +#define FLAG_0x920 (SYSTEM_FLAGS + 0xC0) +#define FLAG_0x921 (SYSTEM_FLAGS + 0xC1) +#define FLAG_0x922 (SYSTEM_FLAGS + 0xC2) +#define FLAG_0x923 (SYSTEM_FLAGS + 0xC3) +#define FLAG_0x924 (SYSTEM_FLAGS + 0xC4) +#define FLAG_0x925 (SYSTEM_FLAGS + 0xC5) +#define FLAG_0x926 (SYSTEM_FLAGS + 0xC6) +#define FLAG_0x927 (SYSTEM_FLAGS + 0xC7) +#define FLAG_0x928 (SYSTEM_FLAGS + 0xC8) +#define FLAG_0x929 (SYSTEM_FLAGS + 0xC9) +#define FLAG_0x92A (SYSTEM_FLAGS + 0xCA) +#define FLAG_0x92B (SYSTEM_FLAGS + 0xCB) +#define FLAG_0x92C (SYSTEM_FLAGS + 0xCC) +#define FLAG_0x92D (SYSTEM_FLAGS + 0xCD) +#define FLAG_0x92E (SYSTEM_FLAGS + 0xCE) +#define FLAG_0x92F (SYSTEM_FLAGS + 0xCF) +#define FLAG_0x930 (SYSTEM_FLAGS + 0xD0) +#define FLAG_0x931 (SYSTEM_FLAGS + 0xD1) +#define FLAG_0x932 (SYSTEM_FLAGS + 0xD2) +#define FLAG_0x933 (SYSTEM_FLAGS + 0xD3) +#define FLAG_0x934 (SYSTEM_FLAGS + 0xD4) +#define FLAG_0x935 (SYSTEM_FLAGS + 0xD5) +#define FLAG_0x936 (SYSTEM_FLAGS + 0xD6) +#define FLAG_0x937 (SYSTEM_FLAGS + 0xD7) +#define FLAG_0x938 (SYSTEM_FLAGS + 0xD8) +#define FLAG_0x939 (SYSTEM_FLAGS + 0xD9) +#define FLAG_0x93A (SYSTEM_FLAGS + 0xDA) +#define FLAG_0x93B (SYSTEM_FLAGS + 0xDB) +#define FLAG_0x93C (SYSTEM_FLAGS + 0xDC) +#define FLAG_0x93D (SYSTEM_FLAGS + 0xDD) +#define FLAG_0x93E (SYSTEM_FLAGS + 0xDE) +#define FLAG_0x93F (SYSTEM_FLAGS + 0xDF) +#define FLAG_0x940 (SYSTEM_FLAGS + 0xE0) +#define FLAG_0x941 (SYSTEM_FLAGS + 0xE1) +#define FLAG_0x942 (SYSTEM_FLAGS + 0xE2) +#define FLAG_0x943 (SYSTEM_FLAGS + 0xE3) +#define FLAG_0x944 (SYSTEM_FLAGS + 0xE4) +#define FLAG_0x945 (SYSTEM_FLAGS + 0xE5) +#define FLAG_0x946 (SYSTEM_FLAGS + 0xE6) +#define FLAG_0x947 (SYSTEM_FLAGS + 0xE7) +#define FLAG_0x948 (SYSTEM_FLAGS + 0xE8) +#define FLAG_0x949 (SYSTEM_FLAGS + 0xE9) +#define FLAG_0x94A (SYSTEM_FLAGS + 0xEA) +#define FLAG_0x94B (SYSTEM_FLAGS + 0xEB) +#define FLAG_0x94C (SYSTEM_FLAGS + 0xEC) +#define FLAG_0x94D (SYSTEM_FLAGS + 0xED) +#define FLAG_0x94E (SYSTEM_FLAGS + 0xEE) +#define FLAG_0x94F (SYSTEM_FLAGS + 0xEF) +#define FLAG_0x950 (SYSTEM_FLAGS + 0xF0) +#define FLAG_0x951 (SYSTEM_FLAGS + 0xF1) +#define FLAG_0x952 (SYSTEM_FLAGS + 0xF2) +#define FLAG_0x953 (SYSTEM_FLAGS + 0xF3) +#define FLAG_0x954 (SYSTEM_FLAGS + 0xF4) +#define FLAG_0x955 (SYSTEM_FLAGS + 0xF5) +#define FLAG_0x956 (SYSTEM_FLAGS + 0xF6) +#define FLAG_0x957 (SYSTEM_FLAGS + 0xF7) +#define FLAG_0x958 (SYSTEM_FLAGS + 0xF8) +#define FLAG_0x959 (SYSTEM_FLAGS + 0xF9) +#define FLAG_0x95A (SYSTEM_FLAGS + 0xFA) +#define FLAG_0x95B (SYSTEM_FLAGS + 0xFB) +#define FLAG_0x95C (SYSTEM_FLAGS + 0xFC) +#define FLAG_0x95D (SYSTEM_FLAGS + 0xFD) +#define FLAG_0x95E (SYSTEM_FLAGS + 0xFE) +#define FLAG_0x95F (SYSTEM_FLAGS + 0xFF) // SPECIAL FLAGS (unknown purpose) #define FLAG_SPECIAL_FLAG_0x4000 0x4000 diff --git a/include/constants/region_map_sections.h b/include/constants/region_map_sections.h new file mode 100644 index 000000000..b9c518b1b --- /dev/null +++ b/include/constants/region_map_sections.h @@ -0,0 +1,219 @@ +#ifndef GUARD_REGIONMAPSEC_H +#define GUARD_REGIONMAPSEC_H + +#define MAPSEC_LITTLEROOT_TOWN 0x00 +#define MAPSEC_OLDALE_TOWN 0x01 +#define MAPSEC_DEWFORD_TOWN 0x02 +#define MAPSEC_LAVARIDGE_TOWN 0x03 +#define MAPSEC_FALLARBOR_TOWN 0x04 +#define MAPSEC_VERDANTURF_TOWN 0x05 +#define MAPSEC_PACIFIDLOG_TOWN 0x06 +#define MAPSEC_PETALBURG_CITY 0x07 +#define MAPSEC_SLATEPORT_CITY 0x08 +#define MAPSEC_MAUVILLE_CITY 0x09 +#define MAPSEC_RUSTBORO_CITY 0x0A +#define MAPSEC_FORTREE_CITY 0x0B +#define MAPSEC_LILYCOVE_CITY 0x0C +#define MAPSEC_MOSSDEEP_CITY 0x0D +#define MAPSEC_SOOTOPOLIS_CITY 0x0E +#define MAPSEC_EVER_GRANDE_CITY 0x0F +#define MAPSEC_ROUTE_101 0x10 +#define MAPSEC_ROUTE_102 0x11 +#define MAPSEC_ROUTE_103 0x12 +#define MAPSEC_ROUTE_104 0x13 +#define MAPSEC_ROUTE_105 0x14 +#define MAPSEC_ROUTE_106 0x15 +#define MAPSEC_ROUTE_107 0x16 +#define MAPSEC_ROUTE_108 0x17 +#define MAPSEC_ROUTE_109 0x18 +#define MAPSEC_ROUTE_110 0x19 +#define MAPSEC_ROUTE_111 0x1A +#define MAPSEC_ROUTE_112 0x1B +#define MAPSEC_ROUTE_113 0x1C +#define MAPSEC_ROUTE_114 0x1D +#define MAPSEC_ROUTE_115 0x1E +#define MAPSEC_ROUTE_116 0x1F +#define MAPSEC_ROUTE_117 0x20 +#define MAPSEC_ROUTE_118 0x21 +#define MAPSEC_ROUTE_119 0x22 +#define MAPSEC_ROUTE_120 0x23 +#define MAPSEC_ROUTE_121 0x24 +#define MAPSEC_ROUTE_122 0x25 +#define MAPSEC_ROUTE_123 0x26 +#define MAPSEC_ROUTE_124 0x27 +#define MAPSEC_ROUTE_125 0x28 +#define MAPSEC_ROUTE_126 0x29 +#define MAPSEC_ROUTE_127 0x2A +#define MAPSEC_ROUTE_128 0x2B +#define MAPSEC_ROUTE_129 0x2C +#define MAPSEC_ROUTE_130 0x2D +#define MAPSEC_ROUTE_131 0x2E +#define MAPSEC_ROUTE_132 0x2F +#define MAPSEC_ROUTE_133 0x30 +#define MAPSEC_ROUTE_134 0x31 +#define MAPSEC_UNDERWATER_124 0x32 +#define MAPSEC_UNDERWATER_125 0x33 +#define MAPSEC_UNDERWATER_126 0x34 +#define MAPSEC_UNDERWATER_127 0x35 +#define MAPSEC_UNDERWATER_SOOTOPOLIS 0x36 +#define MAPSEC_GRANITE_CAVE 0x37 +#define MAPSEC_MT_CHIMNEY 0x38 +#define MAPSEC_SAFARI_ZONE 0x39 +#define MAPSEC_BATTLE_FRONTIER 0x3A +#define MAPSEC_PETALBURG_WOODS 0x3B +#define MAPSEC_RUSTURF_TUNNEL 0x3C +#define MAPSEC_ABANDONED_SHIP 0x3D +#define MAPSEC_NEW_MAUVILLE 0x3E +#define MAPSEC_METEOR_FALLS 0x3F +#define MAPSEC_METEOR_FALLS2 0x40 +#define MAPSEC_MT_PYRE 0x41 +#define MAPSEC_AQUA_HIDEOUT_OLD 0x42 +#define MAPSEC_SHOAL_CAVE 0x43 +#define MAPSEC_SEAFLOOR_CAVERN 0x44 +#define MAPSEC_UNDERWATER_128 0x45 +#define MAPSEC_VICTORY_ROAD 0x46 +#define MAPSEC_MIRAGE_ISLAND 0x47 +#define MAPSEC_CAVE_OF_ORIGIN 0x48 +#define MAPSEC_SOUTHERN_ISLAND 0x49 +#define MAPSEC_FIERY_PATH 0x4A +#define MAPSEC_FIERY_PATH2 0x4B +#define MAPSEC_JAGGED_PASS 0x4C +#define MAPSEC_JAGGED_PASS2 0x4D +#define MAPSEC_SEALED_CHAMBER 0x4E +#define MAPSEC_UNDERWATER_SEALED_CHAMBER 0x4F +#define MAPSEC_SCORCHED_SLAB 0x50 +#define MAPSEC_ISLAND_CAVE 0x51 +#define MAPSEC_DESERT_RUINS 0x52 +#define MAPSEC_ANCIENT_TOMB 0x53 +#define MAPSEC_INSIDE_OF_TRUCK 0x54 +#define MAPSEC_SKY_PILLAR 0x55 +#define MAPSEC_SECRET_BASE 0x56 +#define MAPSEC_DYNAMIC 0x57 +#define MAPSEC_PALLET_TOWN 0x58 +#define MAPSEC_VIRIDIAN_CITY 0x59 +#define MAPSEC_PEWTER_CITY 0x5A +#define MAPSEC_CERULEAN_CITY 0x5B +#define MAPSEC_LAVENDER_TOWN 0x5C +#define MAPSEC_VERMILION_CITY 0x5D +#define MAPSEC_CELADON_CITY 0x5E +#define MAPSEC_FUCHSIA_CITY 0x5F +#define MAPSEC_CINNABAR_ISLAND 0x60 +#define MAPSEC_INDIGO_PLATEAU 0x61 +#define MAPSEC_SAFFRON_CITY 0x62 +#define MAPSEC_ROUTE_4_FLYDUP 0x63 +#define MAPSEC_ROUTE_10_FLYDUP 0x64 +#define MAPSEC_ROUTE_1 0x65 +#define MAPSEC_ROUTE_2 0x66 +#define MAPSEC_ROUTE_3 0x67 +#define MAPSEC_ROUTE_4 0x68 +#define MAPSEC_ROUTE_5 0x69 +#define MAPSEC_ROUTE_6 0x6A +#define MAPSEC_ROUTE_7 0x6B +#define MAPSEC_ROUTE_8 0x6C +#define MAPSEC_ROUTE_9 0x6D +#define MAPSEC_ROUTE_10 0x6E +#define MAPSEC_ROUTE_11 0x6F +#define MAPSEC_ROUTE_12 0x70 +#define MAPSEC_ROUTE_13 0x71 +#define MAPSEC_ROUTE_14 0x72 +#define MAPSEC_ROUTE_15 0x73 +#define MAPSEC_ROUTE_16 0x74 +#define MAPSEC_ROUTE_17 0x75 +#define MAPSEC_ROUTE_18 0x76 +#define MAPSEC_ROUTE_19 0x77 +#define MAPSEC_ROUTE_20 0x78 +#define MAPSEC_ROUTE_21 0x79 +#define MAPSEC_ROUTE_22 0x7A +#define MAPSEC_ROUTE_23 0x7B +#define MAPSEC_ROUTE_24 0x7C +#define MAPSEC_ROUTE_25 0x7D +#define MAPSEC_VIRIDIAN_FOREST 0x7E +#define MAPSEC_MT_MOON 0x7F +#define MAPSEC_S_S_ANNE 0x80 +#define MAPSEC_UNDERGROUND_PATH 0x81 +#define MAPSEC_UNDERGROUND_PATH_2 0x82 +#define MAPSEC_DIGLETTS_CAVE 0x83 +#define MAPSEC_KANTO_VICTORY_ROAD 0x84 +#define MAPSEC_ROCKET_HIDEOUT 0x85 +#define MAPSEC_SILPH_CO 0x86 +#define MAPSEC_POKEMON_MANSION 0x87 +#define MAPSEC_KANTO_SAFARI_ZONE 0x88 +#define MAPSEC_POKEMON_LEAGUE 0x89 +#define MAPSEC_ROCK_TUNNEL 0x8A +#define MAPSEC_SEAFOAM_ISLANDS 0x8B +#define MAPSEC_POKEMON_TOWER 0x8C +#define MAPSEC_CERULEAN_CAVE 0x8D +#define MAPSEC_POWER_PLANT 0x8E +#define MAPSEC_ONE_ISLAND 0x8F +#define MAPSEC_TWO_ISLAND 0x90 +#define MAPSEC_THREE_ISLAND 0x91 +#define MAPSEC_FOUR_ISLAND 0x92 +#define MAPSEC_FIVE_ISLAND 0x93 +#define MAPSEC_SEVEN_ISLAND 0x94 +#define MAPSEC_SIX_ISLAND 0x95 +#define MAPSEC_KINDLE_ROAD 0x96 +#define MAPSEC_TREASURE_BEACH 0x97 +#define MAPSEC_CAPE_BRINK 0x98 +#define MAPSEC_BOND_BRIDGE 0x99 +#define MAPSEC_THREE_ISLE_PORT 0x9A +#define MAPSEC_SEVII_ISLE_6 0x9B +#define MAPSEC_SEVII_ISLE_7 0x9C +#define MAPSEC_SEVII_ISLE_8 0x9D +#define MAPSEC_SEVII_ISLE_9 0x9E +#define MAPSEC_RESORT_GORGEOUS 0x9F +#define MAPSEC_WATER_LABYRINTH 0xA0 +#define MAPSEC_FIVE_ISLE_MEADOW 0xA1 +#define MAPSEC_MEMORIAL_PILLAR 0xA2 +#define MAPSEC_OUTCAST_ISLAND 0xA3 +#define MAPSEC_GREEN_PATH 0xA4 +#define MAPSEC_WATER_PATH 0xA5 +#define MAPSEC_RUIN_VALLEY 0xA6 +#define MAPSEC_TRAINER_TOWER 0xA7 +#define MAPSEC_CANYON_ENTRANCE 0xA8 +#define MAPSEC_SEVAULT_CANYON 0xA9 +#define MAPSEC_TANOBY_RUINS 0xAA +#define MAPSEC_SEVII_ISLE_22 0xAB +#define MAPSEC_SEVII_ISLE_23 0xAC +#define MAPSEC_SEVII_ISLE_24 0xAD +#define MAPSEC_NAVEL_ROCK 0xAE +#define MAPSEC_MT_EMBER 0xAF +#define MAPSEC_BERRY_FOREST 0xB0 +#define MAPSEC_ICEFALL_CAVE 0xB1 +#define MAPSEC_ROCKET_WAREHOUSE 0xB2 +#define MAPSEC_TRAINER_TOWER_2 0xB3 +#define MAPSEC_DOTTED_HOLE 0xB4 +#define MAPSEC_LOST_CAVE 0xB5 +#define MAPSEC_PATTERN_BUSH 0xB6 +#define MAPSEC_ALTERING_CAVE 0xB7 +#define MAPSEC_TANOBY_CHAMBERS 0xB8 +#define MAPSEC_THREE_ISLE_PATH 0xB9 +#define MAPSEC_TANOBY_KEY 0xBA +#define MAPSEC_BIRTH_ISLAND 0xBB +#define MAPSEC_MONEAN_CHAMBER 0xBC +#define MAPSEC_LIPTOO_CHAMBER 0xBD +#define MAPSEC_WEEPTH_CHAMBER 0xBE +#define MAPSEC_DILFORD_CHAMBER 0xBF +#define MAPSEC_SCUFIB_CHAMBER 0xC0 +#define MAPSEC_RIXY_CHAMBER 0xC1 +#define MAPSEC_VIAPOIS_CHAMBER 0xC2 +#define MAPSEC_EMBER_SPA 0xC3 +#define MAPSEC_SPECIAL_AREA 0xC4 +#define MAPSEC_AQUA_HIDEOUT 0xC5 +#define MAPSEC_MAGMA_HIDEOUT 0xC6 +#define MAPSEC_MIRAGE_TOWER 0xC7 +#define MAPSEC_BIRTH_ISLAND_2 0xC8 +#define MAPSEC_FARAWAY_ISLAND 0xC9 +#define MAPSEC_ARTISAN_CAVE 0xCA +#define MAPSEC_MARINE_CAVE 0xCB +#define MAPSEC_UNDERWATER_MARINE_CAVE 0xCC +#define MAPSEC_TERRA_CAVE 0xCD +#define MAPSEC_UNDERWATER_TERRA_CAVE 0xCE +#define MAPSEC_UNDERWATER_UNK1 0xCF +#define MAPSEC_UNDERWATER_129 0xD0 +#define MAPSEC_DESERT_UNDERPASS 0xD1 +#define MAPSEC_ALTERING_CAVE_2 0xD2 +#define MAPSEC_NAVEL_ROCK2 0xD3 +#define MAPSEC_TRAINER_HILL 0xD4 +#define MAPSEC_NONE 0xD5 + +#endif //GUARD_REGIONMAPSEC_H diff --git a/include/landmark.h b/include/landmark.h new file mode 100644 index 000000000..395905033 --- /dev/null +++ b/include/landmark.h @@ -0,0 +1,6 @@ +#ifndef GUARD_LANDMARK_H +#define GUARD_LANDMARK_H + +const u8 *GetLandmarkName(u8 mapSection, u8 id, u8 count); + +#endif // GUARD_LANDMARK_H diff --git a/include/palette.h b/include/palette.h index d3bcd2271..cb03699a6 100644 --- a/include/palette.h +++ b/include/palette.h @@ -14,7 +14,7 @@ enum { FAST_FADE_IN_FROM_WHITE, - FAST_FADE_OUT_TO_WHTIE, + FAST_FADE_OUT_TO_WHITE, FAST_FADE_IN_FROM_BLACK, FAST_FADE_OUT_TO_BLACK, }; diff --git a/include/region_map.h b/include/region_map.h index 91384d166..e8cc80f82 100644 --- a/include/region_map.h +++ b/include/region_map.h @@ -5,223 +5,6 @@ // Exported type declarations -enum { - MAPSEC_LITTLEROOT_TOWN, - MAPSEC_OLDALE_TOWN, - MAPSEC_DEWFORD_TOWN, - MAPSEC_LAVARIDGE_TOWN, - MAPSEC_FALLARBOR_TOWN, - MAPSEC_VERDANTURF_TOWN, - MAPSEC_PACIFIDLOG_TOWN, - MAPSEC_PETALBURG_CITY, - MAPSEC_SLATEPORT_CITY, - MAPSEC_MAUVILLE_CITY, - MAPSEC_RUSTBORO_CITY, - MAPSEC_FORTREE_CITY, - MAPSEC_LILYCOVE_CITY, - MAPSEC_MOSSDEEP_CITY, - MAPSEC_SOOTOPOLIS_CITY, - MAPSEC_EVER_GRANDE_CITY, - MAPSEC_ROUTE_101, - MAPSEC_ROUTE_102, - MAPSEC_ROUTE_103, - MAPSEC_ROUTE_104, - MAPSEC_ROUTE_105, - MAPSEC_ROUTE_106, - MAPSEC_ROUTE_107, - MAPSEC_ROUTE_108, - MAPSEC_ROUTE_109, - MAPSEC_ROUTE_110, - MAPSEC_ROUTE_111, - MAPSEC_ROUTE_112, - MAPSEC_ROUTE_113, - MAPSEC_ROUTE_114, - MAPSEC_ROUTE_115, - MAPSEC_ROUTE_116, - MAPSEC_ROUTE_117, - MAPSEC_ROUTE_118, - MAPSEC_ROUTE_119, - MAPSEC_ROUTE_120, - MAPSEC_ROUTE_121, - MAPSEC_ROUTE_122, - MAPSEC_ROUTE_123, - MAPSEC_ROUTE_124, - MAPSEC_ROUTE_125, - MAPSEC_ROUTE_126, - MAPSEC_ROUTE_127, - MAPSEC_ROUTE_128, - MAPSEC_ROUTE_129, - MAPSEC_ROUTE_130, - MAPSEC_ROUTE_131, - MAPSEC_ROUTE_132, - MAPSEC_ROUTE_133, - MAPSEC_ROUTE_134, - MAPSEC_UNDERWATER_124, - MAPSEC_UNDERWATER_125, - MAPSEC_UNDERWATER_126, - MAPSEC_UNDERWATER_127, - MAPSEC_UNDERWATER_SOOTOPOLIS, - MAPSEC_GRANITE_CAVE, - MAPSEC_MT_CHIMNEY, - MAPSEC_SAFARI_ZONE, - MAPSEC_BATTLE_FRONTIER, - MAPSEC_PETALBURG_WOODS, - MAPSEC_RUSTURF_TUNNEL, - MAPSEC_ABANDONED_SHIP, - MAPSEC_NEW_MAUVILLE, - MAPSEC_METEOR_FALLS, - MAPSEC_METEOR_FALLS2, - MAPSEC_MT_PYRE, - MAPSEC_AQUA_HIDEOUT_OLD, - MAPSEC_SHOAL_CAVE, - MAPSEC_SEAFLOOR_CAVERN, - MAPSEC_UNDERWATER_128, - MAPSEC_VICTORY_ROAD, - MAPSEC_MIRAGE_ISLAND, - MAPSEC_CAVE_OF_ORIGIN, - MAPSEC_SOUTHERN_ISLAND, - MAPSEC_FIERY_PATH, - MAPSEC_FIERY_PATH2, - MAPSEC_JAGGED_PASS, - MAPSEC_JAGGED_PASS2, - MAPSEC_SEALED_CHAMBER, - MAPSEC_UNDERWATER_SEALED_CHAMBER, - MAPSEC_SCORCHED_SLAB, - MAPSEC_ISLAND_CAVE, - MAPSEC_DESERT_RUINS, - MAPSEC_ANCIENT_TOMB, - MAPSEC_INSIDE_OF_TRUCK, - MAPSEC_SKY_PILLAR, - MAPSEC_SECRET_BASE, - MAPSEC_DYNAMIC, - MAPSEC_PALLET_TOWN, - MAPSEC_VIRIDIAN_CITY, - MAPSEC_PEWTER_CITY, - MAPSEC_CERULEAN_CITY, - MAPSEC_LAVENDER_TOWN, - MAPSEC_VERMILION_CITY, - MAPSEC_CELADON_CITY, - MAPSEC_FUCHSIA_CITY, - MAPSEC_CINNABAR_ISLAND, - MAPSEC_INDIGO_PLATEAU, - MAPSEC_SAFFRON_CITY, - MAPSEC_ROUTE_4, - MAPSEC_ROUTE_10, - MAPSEC_ROUTE_1, - MAPSEC_ROUTE_2, - MAPSEC_ROUTE_3, - MAPSEC_ROUTE_4_2, - MAPSEC_ROUTE_5, - MAPSEC_ROUTE_6, - MAPSEC_ROUTE_7, - MAPSEC_ROUTE_8, - MAPSEC_ROUTE_9, - MAPSEC_ROUTE_10_2, - MAPSEC_ROUTE_11, - MAPSEC_ROUTE_12, - MAPSEC_ROUTE_13, - MAPSEC_ROUTE_14, - MAPSEC_ROUTE_15, - MAPSEC_ROUTE_16, - MAPSEC_ROUTE_17, - MAPSEC_ROUTE_18, - MAPSEC_ROUTE_19, - MAPSEC_ROUTE_20, - MAPSEC_ROUTE_21, - MAPSEC_ROUTE_22, - MAPSEC_ROUTE_23, - MAPSEC_ROUTE_24, - MAPSEC_ROUTE_25, - MAPSEC_VIRIDIAN_FOREST, - MAPSEC_MT_MOON, - MAPSEC_S_S_ANNE, - MAPSEC_UNDERGROUND_PATH, - MAPSEC_UNDERGROUND_PATH_2, - MAPSEC_DIGLETTS_CAVE, - MAPSEC_KANTO_VICTORY_ROAD, - MAPSEC_ROCKET_HIDEOUT, - MAPSEC_SILPH_CO, - MAPSEC_POKEMON_MANSION, - MAPSEC_KANTO_SAFARI_ZONE, - MAPSEC_POKEMON_LEAGUE, - MAPSEC_ROCK_TUNNEL, - MAPSEC_SEAFOAM_ISLANDS, - MAPSEC_POKEMON_TOWER, - MAPSEC_CERULEAN_CAVE, - MAPSEC_POWER_PLANT, - MAPSEC_ONE_ISLAND, - MAPSEC_TWO_ISLAND, - MAPSEC_THREE_ISLAND, - MAPSEC_FOUR_ISLAND, - MAPSEC_FIVE_ISLAND, - MAPSEC_SEVEN_ISLAND, - MAPSEC_SIX_ISLAND, - MAPSEC_KINDLE_ROAD, - MAPSEC_TREASURE_BEACH, - MAPSEC_CAPE_BRINK, - MAPSEC_BOND_BRIDGE, - MAPSEC_THREE_ISLE_PORT, - MAPSEC_SEVII_ISLE_6, - MAPSEC_SEVII_ISLE_7, - MAPSEC_SEVII_ISLE_8, - MAPSEC_SEVII_ISLE_9, - MAPSEC_RESORT_GORGEOUS, - MAPSEC_WATER_LABYRINTH, - MAPSEC_FIVE_ISLE_MEADOW, - MAPSEC_MEMORIAL_PILLAR, - MAPSEC_OUTCAST_ISLAND, - MAPSEC_GREEN_PATH, - MAPSEC_WATER_PATH, - MAPSEC_RUIN_VALLEY, - MAPSEC_TRAINER_TOWER, - MAPSEC_CANYON_ENTRANCE, - MAPSEC_SEVAULT_CANYON, - MAPSEC_TANOBY_RUINS, - MAPSEC_SEVII_ISLE_22, - MAPSEC_SEVII_ISLE_23, - MAPSEC_SEVII_ISLE_24, - MAPSEC_NAVEL_ROCK, - MAPSEC_MT_EMBER, - MAPSEC_BERRY_FOREST, - MAPSEC_ICEFALL_CAVE, - MAPSEC_ROCKET_WAREHOUSE, - MAPSEC_TRAINER_TOWER_2, - MAPSEC_DOTTED_HOLE, - MAPSEC_LOST_CAVE, - MAPSEC_PATTERN_BUSH, - MAPSEC_ALTERING_CAVE, - MAPSEC_TANOBY_CHAMBERS, - MAPSEC_THREE_ISLE_PATH, - MAPSEC_TANOBY_KEY, - MAPSEC_BIRTH_ISLAND, - MAPSEC_MONEAN_CHAMBER, - MAPSEC_LIPTOO_CHAMBER, - MAPSEC_WEEPTH_CHAMBER, - MAPSEC_DILFORD_CHAMBER, - MAPSEC_SCUFIB_CHAMBER, - MAPSEC_RIXY_CHAMBER, - MAPSEC_VIAPOIS_CHAMBER, - MAPSEC_EMBER_SPA, - MAPSEC_SPECIAL_AREA, - MAPSEC_AQUA_HIDEOUT, - MAPSEC_MAGMA_HIDEOUT, - MAPSEC_MIRAGE_TOWER, - MAPSEC_BIRTH_ISLAND_2, - MAPSEC_FARAWAY_ISLAND, - MAPSEC_ARTISAN_CAVE, - MAPSEC_MARINE_CAVE, - MAPSEC_UNDERWATER_MARINE_CAVE, - MAPSEC_TERRA_CAVE, - MAPSEC_UNDERWATER_TERRA_CAVE, - MAPSEC_UNDERWATER_UNK1, - MAPSEC_UNDERWATER_129, - MAPSEC_DESERT_UNDERPASS, - MAPSEC_ALTERING_CAVE_2, - MAPSEC_NAVEL_ROCK2, - MAPSEC_TRAINER_HILL, - MAPSEC_NONE -}; - enum { INPUT_EVENT_NONE, diff --git a/ld_script.txt b/ld_script.txt index 6507fd06c..af40a1de4 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -182,14 +182,19 @@ SECTIONS { src/wallclock.o(.text); asm/rom6.o(.text); src/pokeblock.o(.text); - asm/rom_81370FC.o(.text); + asm/fldeff_flash.o(.text); + asm/post_battle_event_funcs.o(.text); + asm/time_events.o(.text); + asm/birch_pc.o(.text); + asm/hof_pc.o(.text); + asm/field_specials.o(.text); asm/battle_records.o(.text); asm/pokedex_area_screen.o(.text); src/evolution_scene.o(.text); asm/roulette.o(.text); asm/pokedex_cry_screen.o(.text); src/coins.o(.text); - asm/landmark.o(.text); + src/landmark.o(.text); asm/fldeff_strength.o(.text); asm/battle_transition.o(.text); src/battle_controller_link_partner.o(.text); @@ -429,11 +434,20 @@ SECTIONS { data/slot_machine.o(.rodata); data/contest_painting.o(.rodata); src/battle_ai_script_commands.o(.rodata); - data/data4.o(.rodata); + data/trader.o(.rodata); data/starter_choose.o(.rodata); src/wallclock.o(.rodata); src/pokeblock.o(.rodata); - data/data4d.o(.rodata); + data/fldeff_flash.o(.rodata); + data/time_events.o(.rodata); + data/field_specials.o(.rodata); + data/battle_records.o(.rodata); + data/pokedex_area_screen.o(.rodata); + src/evolution_scene.o(.rodata); + data/roulette.o(.rodata); + data/pokedex_cry_screen.o(.rodata); + src/landmark.o(.rodata); + data/battle_transition.o(.rodata); src/battle_controller_link_partner.o(.rodata); src/battle_message.o(.rodata); data/cable_car.o(.rodata); diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 22be086f0..70b4d7d31 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -63,7 +63,7 @@ extern const u8 gUnknown_08C1F46C[]; extern const u8 gUnknown_08C1F5E8[]; extern const u8 gUnknown_08C1F76C[]; extern const u8 gUnknown_08C1F8E8[]; -extern const u8 gUnknown_08C0237C[]; +extern const u8 gBlankGfxCompressed[]; extern const u16 gBattleInterface_BallStatusBarPal[]; extern const u16 gBattleInterface_BallDisplayPal[]; @@ -110,10 +110,10 @@ static const struct CompressedSpriteSheet gUnknown_0832C100 = static const struct CompressedSpriteSheet gUnknown_0832C108[BATTLE_BANKS_COUNT] = { - {gUnknown_08C0237C, 0x0100, 0xd704}, - {gUnknown_08C0237C, 0x0120, 0xd705}, - {gUnknown_08C0237C, 0x0100, 0xd706}, - {gUnknown_08C0237C, 0x0120, 0xd707} + {gBlankGfxCompressed, 0x0100, 0xd704}, + {gBlankGfxCompressed, 0x0120, 0xd705}, + {gBlankGfxCompressed, 0x0100, 0xd706}, + {gBlankGfxCompressed, 0x0120, 0xd707} }; static const struct SpritePalette gUnknown_0832C128[2] = diff --git a/src/decoration.c b/src/decoration.c index faef779b7..c539091c8 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -25,7 +25,7 @@ #include "sound.h" #include "event_scripts.h" #include "event_data.h" -#include "region_map.h" +#include "constants/region_map_sections.h" #include "player_pc.h" #include "strings.h" #include "tv.h" diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 85310eace..4b59147ff 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -60,16 +60,8 @@ extern u8 gBattleCommunication[]; extern const struct WindowTemplate gUnknown_0833900C; extern const struct CompressedSpriteSheet gMonFrontPicTable[]; -extern const u8 gUnknown_085B58C9[][4]; -extern const u16 gUnknown_085B5884[]; -extern const u8 gUnknown_085B58D9[]; -extern const u16 gUnknown_085B51E4[]; -extern const u32 gUnknown_085B4134[]; -extern const u32 gUnknown_085B482C[]; -extern const u32 gUnknown_085B4D10[]; // strings -extern const u8 gText_ShedinjaJapaneseName2[]; extern const u8 gText_PkmnIsEvolving[]; extern const u8 gText_CongratsPkmnEvolved[]; extern const u8 gText_BattleYesNoChoice[]; @@ -108,6 +100,80 @@ static void InitMovingBackgroundTask(bool8 isLink); static void sub_813FEE8(u8 taskId); static void sub_8140174(void); +// const data +static const u16 sUnknown_085B4114[] = INCBIN_U16("graphics/evolution_scene/unknown_5B4114.gbapal"); +static const u32 sUnknown_085B4134[] = INCBIN_U32("graphics/evolution_scene/bg.4bpp.lz"); +static const u32 sUnknown_085B482C[] = INCBIN_U32("graphics/evolution_scene/bg.bin.lz"); +static const u32 sUnknown_085B4D10[] = INCBIN_U32("graphics/evolution_scene/bg2.bin.lz"); +static const u16 sUnknown_085B51E4[] = INCBIN_U16("graphics/evolution_scene/gray_transition_intro.gbapal"); +static const u16 sUnknown_085B53E4[] = INCBIN_U16("graphics/evolution_scene/gray_transition_lighten.gbapal"); +static const u16 sUnknown_085B5544[] = INCBIN_U16("graphics/evolution_scene/gray_transition_darken.gbapal"); +static const u16 sUnknown_085B56E4[] = INCBIN_U16("graphics/evolution_scene/gray_transition_outro.gbapal"); +static const u16 sUnknown_085B5884[] = INCBIN_U16("graphics/evolution_scene/transition.gbapal"); + +static const u8 Text_ShedinjaJapaneseName[] = _("ヌケニン"); + +static const u8 sUnknown_085B58C9[][4] = +{ + { 0x00, 0x0C, 0x01, 0x06 }, + { 0x0D, 0x24, 0x05, 0x02 }, + { 0x0D, 0x18, 0x01, 0x02 }, + { 0x25, 0x31, 0x01, 0x06 }, +}; + +static const u8 sUnknown_085B58D9[][16] = { + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00, 0x0B, 0x00, 0x00 }, + { 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x00, 0x00 }, + { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x00, 0x00 }, + { 0x00, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x00, 0x00 }, + { 0x00, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x00, 0x00 }, + { 0x00, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x00, 0x00 }, + { 0x00, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x00, 0x00 }, + { 0x00, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x00, 0x00 }, + { 0x00, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x00, 0x00 }, + { 0x00, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x00, 0x00 }, + { 0x00, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x00, 0x00 }, + { 0x00, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x00, 0x00 }, + { 0x00, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x00, 0x00 }, + { 0x00, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x00, 0x00 }, + { 0x00, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00 }, + { 0x00, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x00, 0x00 }, + { 0x00, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x00, 0x00 }, + { 0x00, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x00, 0x00 }, + { 0x00, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x00 }, + { 0x00, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00, 0x00 }, + { 0x00, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x00, 0x00 }, + { 0x00, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x00, 0x00 }, + { 0x00, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00, 0x00 }, + { 0x00, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x00, 0x00 }, + { 0x00, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x00, 0x00 }, + { 0x00, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x00, 0x00 }, + { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x00, 0x00 }, + { 0x00, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00 }, + { 0x00, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } +}; + static void CB2_BeginEvolutionScene(void) { UpdatePaletteFade(); @@ -544,7 +610,7 @@ static void CreateShedinja(u16 preEvoSpecies, struct Pokemon* mon) if (GetMonData(Shedinja, MON_DATA_SPECIES) == SPECIES_SHEDINJA && GetMonData(Shedinja, MON_DATA_LANGUAGE) == LANGUAGE_JAPANESE && GetMonData(mon, MON_DATA_SPECIES) == SPECIES_NINJASK) - SetMonData(Shedinja, MON_DATA_NICKNAME, gText_ShedinjaJapaneseName2); + SetMonData(Shedinja, MON_DATA_NICKNAME, Text_ShedinjaJapaneseName); } } @@ -1330,17 +1396,17 @@ static void sub_813FDEC(u8 taskId) if (data[5]++ < 20) return; - if (data[0]++ > gUnknown_085B58C9[data[2]][3]) + if (data[0]++ > sUnknown_085B58C9[data[2]][3]) { - if (gUnknown_085B58C9[data[2]][1] == data[1]) + if (sUnknown_085B58C9[data[2]][1] == data[1]) { data[3]++; - if (data[3] == gUnknown_085B58C9[data[2]][2]) + if (data[3] == sUnknown_085B58C9[data[2]][2]) { data[3] = 0; data[2]++; } - data[1] = gUnknown_085B58C9[data[2]][0]; + data[1] = sUnknown_085B58C9[data[2]][0]; } else { @@ -1411,7 +1477,7 @@ static void InitMovingBgValues(u16 *movingBgs) { for (j = 0; j < 16; j++) { - movingBgs[i * 16 + j] = gUnknown_085B5884[gUnknown_085B58D9[i * 16 + j]]; + movingBgs[i * 16 + j] = sUnknown_085B5884[sUnknown_085B58D9[i][j]]; } } } @@ -1428,11 +1494,11 @@ static void InitMovingBackgroundTask(bool8 isLink) else innerBgId = 1, outerBgId = 3; - LoadPalette(gUnknown_085B51E4, 0xA0, 0x20); + LoadPalette(sUnknown_085B51E4, 0xA0, 0x20); - copy_decompressed_tile_data_to_vram_autofree(1, gUnknown_085B4134, FALSE, 0, 0); - CopyToBgTilemapBuffer(1, gUnknown_085B482C, 0, 0); - CopyToBgTilemapBuffer(outerBgId, gUnknown_085B4D10, 0, 0); + copy_decompressed_tile_data_to_vram_autofree(1, sUnknown_085B4134, FALSE, 0, 0); + CopyToBgTilemapBuffer(1, sUnknown_085B482C, 0, 0); + CopyToBgTilemapBuffer(outerBgId, sUnknown_085B4D10, 0, 0); CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(outerBgId); diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 2496b9564..414959882 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -97,7 +97,7 @@ extern u16 sub_818D7D8(u16 species, u32 trainerId, u32 personality, u8 arg3, s16 extern void sub_8198204(u8 *dst, const u8 *src, u8, u8, u8); extern bool8 sub_80F9C30(void); extern void sub_8198314(void); -extern void sub_8137C3C(void); +extern void ReturnFromHallOfFamePC(void); extern void sub_8198180(const u8 *src, u8, u8); extern void sub_80F9BF4(u16, u16, u8); extern void sub_81980F0(u8, u8, u8, u8, u16); @@ -1108,7 +1108,7 @@ static void Task_HofPC_HandleExit(u8 taskId) if (sHofMonPtr != NULL) FREE_AND_SET_NULL(sHofMonPtr); - sub_8137C3C(); + ReturnFromHallOfFamePC(); } } diff --git a/src/landmark.c b/src/landmark.c new file mode 100644 index 000000000..4eade159a --- /dev/null +++ b/src/landmark.c @@ -0,0 +1,441 @@ +#include "global.h" +#include "event_data.h" +#include "constants/region_map_sections.h" + +struct Landmark +{ + const u8 *name; + u16 flag; +}; + +struct LandmarkList +{ + u8 mapSection; + u8 id; + const struct Landmark *const *landmarks; +}; + +static const u8 LandmarkName_FlowerShop[] = _("FLOWER SHOP"); +static const u8 LandmarkName_PetalburgWoods[] = _("PETALBURG WOODS"); +static const u8 LandmarkName_MrBrineysCottage[] = _("MR. BRINEY’S COTTAGE"); +static const u8 LandmarkName_AbandonedShip[] = _("ABANDONED SHIP"); +static const u8 LandmarkName_SeashoreHouse[] = _("SEASHORE HOUSE"); +static const u8 LandmarkName_SlateportBeach[] = _("SLATEPORT BEACH"); +static const u8 LandmarkName_CyclingRoad[] = _("CYCLING ROAD"); +static const u8 LandmarkName_NewMauville[] = _("NEW MAUVILLE"); +static const u8 LandmarkName_TrickHouse[] = _("TRICK HOUSE"); +static const u8 LandmarkName_OldLadysRestShop[] = _("OLD LADY’S REST STOP"); +static const u8 LandmarkName_Desert[] = _("DESERT"); +static const u8 LandmarkName_WinstrateFamily[] = _("THE WINSTRATE FAMILY"); +static const u8 LandmarkName_CableCar[] = _("CABLE CAR"); +static const u8 LandmarkName_GlassWorkshop[] = _("GLASS WORKSHOP"); +static const u8 LandmarkName_WeatherInstitute[] = _("WEATHER INSTITUTE"); +static const u8 LandmarkName_MeteorFalls[] = _("METEOR FALLS"); +static const u8 LandmarkName_TunnelersRestHouse[] = _("TUNNELER’S RESTHOUSE"); +static const u8 LandmarkName_RusturfTunnel[] = _("RUSTURF TUNNEL"); +static const u8 LandmarkName_PokemonDayCare[] = _("POKéMON DAY CARE"); +static const u8 LandmarkName_SafariZoneEntrance[] = _("SAFARI ZONE ENTRANCE"); +static const u8 LandmarkName_MtPyre[] = _("MT. PYRE"); +static const u8 LandmarkName_ShoalCave[] = _("SHOAL CAVE"); +static const u8 LandmarkName_SeafloorCavern[] = _("SEAFLOOR CAVERN"); +static const u8 LandmarkName_GraniteCave[] = _("GRANITE CAVE"); +static const u8 LandmarkName_OceanCurrent[] = _("OCEAN CURRENT"); +static const u8 LandmarkName_LanettesHouse[] = _("LANETTE’S HOUSE"); +static const u8 LandmarkName_FieryPath[] = _("FIERY PATH"); +static const u8 LandmarkName_JaggedPass[] = _("JAGGED PASS"); +static const u8 LandmarkName_SkyPillar[] = _("SKY PILLAR"); +static const u8 LandmarkName_BerryMastersHouse[] = _("BERRY MASTER’S HOUSE"); +static const u8 LandmarkName_IslandCave[] = _("ISLAND CAVE"); +static const u8 LandmarkName_DesertRuins[] = _("DESERT RUINS"); +static const u8 LandmarkName_ScorchedSlab[] = _("SCORCHED SLAB"); +static const u8 LandmarkName_AncientTomb[] = _("ANCIENT TOMB"); +static const u8 LandmarkName_SealedChamber[] = _("SEALED CHAMBER"); +static const u8 LandmarkName_FossilManiacsHouse[] = _("FOSSIL MANIAC’S HOUSE"); +static const u8 LandmarkName_HuntersHouse[] = _("HUNTER’S HOUSE"); +static const u8 LandmarkName_MagmaHideout[] = _("MAGMA HIDEOUT"); +static const u8 LandmarkName_MirageTower[] = _("MIRAGE TOWER"); +static const u8 LandmarkName_AlteringCave[] = _("ALTERING CAVE"); +static const u8 LandmarkName_DesertUnderpass[] = _("DESERT UNDERPASS"); +static const u8 LandmarkName_TrainerHill[] = _("TRAINER HILL"); + +static const struct Landmark Landmark_FlowerShop = {LandmarkName_FlowerShop, FLAG_LANDMARK_FLOWER_SHOP}; +static const struct Landmark Landmark_PetalburgWoods = {LandmarkName_PetalburgWoods, -1}; +static const struct Landmark Landmark_MrBrineysCottage = {LandmarkName_MrBrineysCottage, FLAG_LANDMARK_MR_BRINEY_HOUSE}; +static const struct Landmark Landmark_AbandonedShip = {LandmarkName_AbandonedShip, FLAG_LANDMARK_ABANDONED_SHIP}; +static const struct Landmark Landmark_SeashoreHouse = {LandmarkName_SeashoreHouse, FLAG_LANDMARK_SEASHORE_HOUSE}; +static const struct Landmark Landmark_SlateportBeach = {LandmarkName_SlateportBeach, -1}; +static const struct Landmark Landmark_CyclingRoad = {LandmarkName_CyclingRoad, -1}; +static const struct Landmark Landmark_NewMauville = {LandmarkName_NewMauville, FLAG_LANDMARK_NEW_MAUVILLE}; +static const struct Landmark Landmark_TrickHouse = {LandmarkName_TrickHouse, FLAG_LANDMARK_TRICK_HOUSE}; +static const struct Landmark Landmark_OldLadysRestShop = {LandmarkName_OldLadysRestShop, FLAG_LANDMARK_OLD_LADY_REST_SHOP}; +static const struct Landmark Landmark_Desert = {LandmarkName_Desert, -1}; +static const struct Landmark Landmark_WinstrateFamily = {LandmarkName_WinstrateFamily, FLAG_LANDMARK_WINSTRATE_FAMILY}; +static const struct Landmark Landmark_CableCar = {LandmarkName_CableCar, -1}; +static const struct Landmark Landmark_GlassWorkshop = {LandmarkName_GlassWorkshop, FLAG_LANDMARK_GLASS_WORKSHOP}; +static const struct Landmark Landmark_WeatherInstitute = {LandmarkName_WeatherInstitute, -1}; +static const struct Landmark Landmark_MeteorFalls = {LandmarkName_MeteorFalls, -1}; +static const struct Landmark Landmark_TunnelersRestHouse = {LandmarkName_TunnelersRestHouse, FLAG_LANDMARK_TUNNELERS_REST_HOUSE}; +static const struct Landmark Landmark_RusturfTunnel = {LandmarkName_RusturfTunnel, -1}; +static const struct Landmark Landmark_PokemonDayCare = {LandmarkName_PokemonDayCare, FLAG_LANDMARK_POKEMON_DAYCARE}; +static const struct Landmark Landmark_SafariZoneEntrance = {LandmarkName_SafariZoneEntrance, -1}; +static const struct Landmark Landmark_MtPyre = {LandmarkName_MtPyre, -1}; +static const struct Landmark Landmark_ShoalCave = {LandmarkName_ShoalCave, -1}; +static const struct Landmark Landmark_SeafloorCavern = {LandmarkName_SeafloorCavern, FLAG_LANDMARK_SEAFLOOR_CAVERN}; +static const struct Landmark Landmark_GraniteCave = {LandmarkName_GraniteCave, -1}; +static const struct Landmark Landmark_OceanCurrent = {LandmarkName_OceanCurrent, -1}; +static const struct Landmark Landmark_LanettesHouse = {LandmarkName_LanettesHouse, FLAG_LANDMARK_LANETTES_HOUSE}; +static const struct Landmark Landmark_FieryPath = {LandmarkName_FieryPath, FLAG_LANDMARK_FIERY_PATH}; +static const struct Landmark Landmark_JaggedPass = {LandmarkName_JaggedPass, -1}; +static const struct Landmark Landmark_BerryMastersHouse = {LandmarkName_BerryMastersHouse, FLAG_LANDMARK_BERRY_MASTERS_HOUSE}; +static const struct Landmark Landmark_IslandCave = {LandmarkName_IslandCave, FLAG_LANDMARK_ISLAND_CAVE}; +static const struct Landmark Landmark_DesertRuins = {LandmarkName_DesertRuins, FLAG_LANDMARK_DESERT_RUINS}; +static const struct Landmark Landmark_ScorchedSlab = {LandmarkName_ScorchedSlab, FLAG_LANDMARK_SCORCHED_SLAB}; +static const struct Landmark Landmark_AncientTomb = {LandmarkName_AncientTomb, FLAG_LANDMARK_ANCIENT_TOMB}; +static const struct Landmark Landmark_SealedChamber = {LandmarkName_SealedChamber, FLAG_LANDMARK_SEALED_CHAMBER}; +static const struct Landmark Landmark_FossilManiacsHouse = {LandmarkName_FossilManiacsHouse, FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE}; +static const struct Landmark Landmark_HuntersHouse = {LandmarkName_HuntersHouse, FLAG_LANDMARK_HUNTERS_HOUSE}; +static const struct Landmark Landmark_SkyPillar = {LandmarkName_SkyPillar, FLAG_LANDMARK_SKY_PILLAR}; +static const struct Landmark Landmark_MirageTower = {LandmarkName_MirageTower, FLAG_LANDMARK_MIRAGE_TOWER}; +static const struct Landmark Landmark_AlteringCave = {LandmarkName_AlteringCave, FLAG_LANDMARK_ALTERING_CAVE}; +static const struct Landmark Landmark_DesertUnderpass = {LandmarkName_DesertUnderpass, FLAG_LANDMARK_DESERT_UNDERPASS}; +static const struct Landmark Landmark_TrainerHill = {LandmarkName_TrainerHill, FLAG_LANDMARK_TRAINER_HILL}; + +static const struct Landmark *const Landmarks_Route103_2[] = +{ + &Landmark_AlteringCave, + NULL, +}; + +static const struct Landmark *const Landmarks_Route104_0[] = +{ + &Landmark_FlowerShop, + NULL, +}; + +static const struct Landmark *const Landmarks_Route104_1[] = +{ + &Landmark_PetalburgWoods, + &Landmark_MrBrineysCottage, + NULL, +}; + +static const struct Landmark *const Landmarks_Route105_0[] = +{ + &Landmark_IslandCave, + NULL, +}; + +static const struct Landmark *const Landmarks_Route106_1[] = +{ + &Landmark_GraniteCave, + NULL, +}; + +static const struct Landmark *const Landmarks_Route108_0[] = +{ + &Landmark_AbandonedShip, + NULL, +}; + +static const struct Landmark *const Landmarks_Route109_0[] = +{ + &Landmark_SeashoreHouse, + &Landmark_SlateportBeach, + NULL, +}; + +static const struct Landmark *const Landmarks_Route110_0[] = +{ + &Landmark_CyclingRoad, + &Landmark_NewMauville, + NULL, +}; + +static const struct Landmark *const Landmarks_Route110_1[] = +{ + &Landmark_CyclingRoad, + NULL, +}; + +static const struct Landmark *const Landmarks_Route110_2[] = +{ + &Landmark_CyclingRoad, + &Landmark_TrickHouse, + NULL, +}; + +static const struct Landmark *const Landmarks_Route111_0[] = +{ + &Landmark_OldLadysRestShop, + NULL, +}; + +static const struct Landmark *const Landmarks_Route111_1[] = +{ + &Landmark_Desert, + NULL, +}; + +static const struct Landmark *const Landmarks_Route111_2[] = +{ + &Landmark_MirageTower, + &Landmark_Desert, + NULL, +}; + +static const struct Landmark *const Landmarks_Route111_3[] = +{ + &Landmark_DesertRuins, + &Landmark_Desert, + NULL, +}; + +static const struct Landmark *const Landmarks_Route111_4[] = +{ + &Landmark_TrainerHill, + &Landmark_WinstrateFamily, + &Landmark_Desert, + NULL, +}; + +static const struct Landmark *const Landmarks_Route112_0[] = +{ + &Landmark_FieryPath, + &Landmark_JaggedPass, + NULL, +}; + +static const struct Landmark *const Landmarks_Route112_1[] = +{ + &Landmark_CableCar, + &Landmark_FieryPath, + NULL, +}; + +static const struct Landmark *const Landmarks_Route113_1[] = +{ + &Landmark_GlassWorkshop, + NULL, +}; + +static const struct Landmark *const Landmarks_Route114_1[] = +{ + &Landmark_DesertUnderpass, + &Landmark_FossilManiacsHouse, + NULL, +}; + +static const struct Landmark *const Landmarks_Route114_2[] = +{ + &Landmark_LanettesHouse, + NULL, +}; + +static const struct Landmark *const Landmarks_MeteorFalls[] = +{ + &Landmark_MeteorFalls, + NULL, +}; + +static const struct Landmark *const Landmarks_Route116_1[] = +{ + &Landmark_TunnelersRestHouse, + &Landmark_RusturfTunnel, + NULL, +}; + +static const struct Landmark *const Landmarks_Route116_2[] = +{ + &Landmark_RusturfTunnel, + NULL, +}; + +static const struct Landmark *const Landmarks_Route117_2[] = +{ + &Landmark_PokemonDayCare, + NULL, +}; + +static const struct Landmark *const Landmarks_Route119_1[] = +{ + &Landmark_WeatherInstitute, + NULL, +}; + +static const struct Landmark *const Landmarks_Route120_0[] = +{ + &Landmark_ScorchedSlab, + NULL, +}; + +static const struct Landmark *const Landmarks_Route120_2[] = +{ + &Landmark_AncientTomb, + NULL, +}; + +static const struct Landmark *const Landmarks_Route121_2[] = +{ + &Landmark_SafariZoneEntrance, + NULL, +}; + +static const struct Landmark *const Landmarks_Route122_0[] = +{ + &Landmark_MtPyre, + NULL, +}; + +static const struct Landmark *const Landmarks_Route123_0[] = +{ + &Landmark_BerryMastersHouse, + NULL, +}; + +static const struct Landmark *const Landmarks_Route124_7[] = +{ + &Landmark_HuntersHouse, + NULL, +}; + +static const struct Landmark *const Landmarks_Route125_2[] = +{ + &Landmark_ShoalCave, + NULL, +}; + +static const struct Landmark *const Landmarks_Route128_1[] = +{ + &Landmark_SeafloorCavern, + NULL, +}; + +static const struct Landmark *const Landmarks_Route131_1[] = +{ + &Landmark_SkyPillar, + NULL, +}; + +static const struct Landmark *const Landmarks_OceanCurrent[] = +{ + &Landmark_OceanCurrent, + NULL, +}; + +static const struct Landmark *const Landmarks_Route134_2[] = +{ + &Landmark_SealedChamber, + &Landmark_OceanCurrent, + NULL, +}; + +static const struct Landmark *const Landmarks_MtChimney_2[] = +{ + &Landmark_CableCar, + &Landmark_JaggedPass, + NULL, +}; + +static const struct LandmarkList gLandmarkLists[] = +{ + {MAPSEC_ROUTE_103, 2, Landmarks_Route103_2}, + {MAPSEC_ROUTE_104, 0, Landmarks_Route104_0}, + {MAPSEC_ROUTE_104, 1, Landmarks_Route104_1}, + {MAPSEC_ROUTE_105, 0, Landmarks_Route105_0}, + {MAPSEC_ROUTE_106, 1, Landmarks_Route106_1}, + {MAPSEC_ROUTE_108, 0, Landmarks_Route108_0}, + {MAPSEC_ROUTE_109, 0, Landmarks_Route109_0}, + {MAPSEC_ROUTE_110, 0, Landmarks_Route110_0}, + {MAPSEC_ROUTE_110, 1, Landmarks_Route110_1}, + {MAPSEC_ROUTE_110, 2, Landmarks_Route110_2}, + {MAPSEC_ROUTE_111, 0, Landmarks_Route111_0}, + {MAPSEC_ROUTE_111, 1, Landmarks_Route111_1}, + {MAPSEC_ROUTE_111, 2, Landmarks_Route111_2}, + {MAPSEC_ROUTE_111, 3, Landmarks_Route111_3}, + {MAPSEC_ROUTE_111, 4, Landmarks_Route111_4}, + {MAPSEC_ROUTE_112, 0, Landmarks_Route112_0}, + {MAPSEC_ROUTE_112, 1, Landmarks_Route112_1}, + {MAPSEC_ROUTE_113, 1, Landmarks_Route113_1}, + {MAPSEC_ROUTE_114, 1, Landmarks_Route114_1}, + {MAPSEC_ROUTE_114, 2, Landmarks_Route114_2}, + {MAPSEC_ROUTE_114, 3, Landmarks_MeteorFalls}, + {MAPSEC_ROUTE_115, 0, Landmarks_MeteorFalls}, + {MAPSEC_ROUTE_115, 1, Landmarks_MeteorFalls}, + {MAPSEC_ROUTE_116, 1, Landmarks_Route116_1}, + {MAPSEC_ROUTE_116, 2, Landmarks_Route116_2}, + {MAPSEC_ROUTE_117, 2, Landmarks_Route117_2}, + {MAPSEC_ROUTE_119, 1, Landmarks_Route119_1}, + {MAPSEC_ROUTE_120, 0, Landmarks_Route120_0}, + {MAPSEC_ROUTE_120, 2, Landmarks_Route120_2}, + {MAPSEC_ROUTE_121, 2, Landmarks_Route121_2}, + {MAPSEC_ROUTE_122, 0, Landmarks_Route122_0}, + {MAPSEC_ROUTE_123, 0, Landmarks_Route123_0}, + {MAPSEC_ROUTE_122, 1, Landmarks_Route122_0}, + {MAPSEC_ROUTE_124, 7, Landmarks_Route124_7}, + {MAPSEC_ROUTE_125, 2, Landmarks_Route125_2}, + {MAPSEC_ROUTE_128, 1, Landmarks_Route128_1}, + {MAPSEC_ROUTE_131, 1, Landmarks_Route131_1}, + {MAPSEC_ROUTE_132, 0, Landmarks_OceanCurrent}, + {MAPSEC_ROUTE_132, 1, Landmarks_OceanCurrent}, + {MAPSEC_ROUTE_133, 0, Landmarks_OceanCurrent}, + {MAPSEC_ROUTE_133, 1, Landmarks_OceanCurrent}, + {MAPSEC_ROUTE_133, 2, Landmarks_OceanCurrent}, + {MAPSEC_ROUTE_134, 0, Landmarks_OceanCurrent}, + {MAPSEC_ROUTE_134, 1, Landmarks_OceanCurrent}, + {MAPSEC_ROUTE_134, 2, Landmarks_Route134_2}, + {MAPSEC_MT_CHIMNEY, 2, Landmarks_MtChimney_2}, + {MAPSEC_NONE, 0, NULL}, +}; + +static const struct Landmark *const *GetLandmarks(u8 mapSection, u8 id); + +const u8 *GetLandmarkName(u8 mapSection, u8 id, u8 count) +{ + const struct Landmark *const *landmarks = GetLandmarks(mapSection, id); + + if (!landmarks) + return NULL; + + while (1) + { + const struct Landmark *landmark = *landmarks; + + if (landmark->flag == 0xFFFF || FlagGet(landmark->flag) == TRUE) + { + if (count == 0) + break; + else + count--; + } + + landmarks++; + if (!*landmarks) + return NULL; + } + + return (*landmarks)->name; +} + +static const struct Landmark *const *GetLandmarks(u8 mapSection, u8 id) +{ + u16 i = 0; + + for (; gLandmarkLists[i].mapSection != MAPSEC_NONE; i++) + { + if (gLandmarkLists[i].mapSection > mapSection) + return NULL; + if (gLandmarkLists[i].mapSection == mapSection) + break; + } + + if (gLandmarkLists[i].mapSection == MAPSEC_NONE) + return NULL; + + for (; gLandmarkLists[i].mapSection == mapSection; i++) + { + if (gLandmarkLists[i].id == id) + return gLandmarkLists[i].landmarks; + } + + return NULL; +} diff --git a/src/palette.c b/src/palette.c index 6d8abbde6..d7b6ad479 100644 --- a/src/palette.c +++ b/src/palette.c @@ -65,7 +65,8 @@ static const struct PaletteStructTemplate gDummyPaletteStructTemplate = { .uid = 0xFFFF, .pst_field_B_5 = 1 }; -static const u8 sUnknown_0852489C[] = { + +static const u8 sRoundedDownGrayscaleMap[] = { 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 11, 11, 11, 11, 11, @@ -620,7 +621,7 @@ static u8 UpdateFastPaletteFade(void) gPlttBufferFaded[i] = r | (g << 5) | (b << 10); } break; - case FAST_FADE_OUT_TO_WHTIE: + case FAST_FADE_OUT_TO_WHITE: for (i = paletteOffsetStart; i < paletteOffsetEnd; i++) { struct PlttData *data = (struct PlttData *)&gPlttBufferFaded[i]; @@ -701,7 +702,7 @@ static u8 UpdateFastPaletteFade(void) case FAST_FADE_IN_FROM_BLACK: CpuCopy32(gPlttBufferUnfaded, gPlttBufferFaded, PLTT_SIZE); break; - case FAST_FADE_OUT_TO_WHTIE: + case FAST_FADE_OUT_TO_WHITE: CpuFill32(0xFFFFFFFF, gPlttBufferFaded, PLTT_SIZE); break; case FAST_FADE_OUT_TO_BLACK: @@ -838,10 +839,10 @@ void BlendPalettesUnfaded(u32 selectedPalettes, u8 coeff, u16 color) void TintPalette_GrayScale(u16 *palette, u16 count) { - s32 r; - s32 g; - s32 b; - s32 gray; + int r; + int g; + int b; + u32 gray; int i; for (i = 0; i < count; i++) @@ -850,23 +851,22 @@ void TintPalette_GrayScale(u16 *palette, u16 count) g = (*palette >> 5) & 0x1F; b = (*palette >> 10) & 0x1F; - r *= 0x4C; - r += g * 0x97; - r += b * 0x1D; + r = r * Q_8_8(0.2969); + r += g * Q_8_8(0.5899); + r += b * Q_8_8(0.1133); gray = r >> 8; *palette++ = gray << 10 | gray << 5 | gray; } - return; } void TintPalette_GrayScale2(u16 *palette, u16 count) { - s32 r; - s32 g; - s32 b; - s32 gray; + int r; + int g; + int b; + u32 gray; int i; for (i = 0; i < count; i++) @@ -875,28 +875,27 @@ void TintPalette_GrayScale2(u16 *palette, u16 count) g = (*palette >> 5) & 0x1F; b = (*palette >> 10) & 0x1F; - r *= 0x4C; - r += g * 0x97; - r += b * 0x1D; + r = r * Q_8_8(0.2969); + r += g * Q_8_8(0.5899); + r += b * Q_8_8(0.1133); gray = r >> 8; - if ((u32)gray > 0x1F) + if (gray > 0x1F) gray = 0x1F; - gray = sUnknown_0852489C[gray]; + gray = sRoundedDownGrayscaleMap[gray]; *palette++ = gray << 10 | gray << 5 | gray; } - return; } #ifdef NONMATCHING void TintPalette_SepiaTone(u16 *palette, u16 count) { - s32 r; - s32 g; - s32 b; + int red; + int green; + int blue; u32 gray; u32 sepia; s8 r2; @@ -929,7 +928,6 @@ void TintPalette_SepiaTone(u16 *palette, u16 count) *palette++ = b2 << 10 | g2 << 5 | r2; } - return; } #else __attribute__((naked)) @@ -995,7 +993,7 @@ _080A2BA2:\n\ #endif // NONMATCHING #ifdef NONMATCHING -void sub_80A2BAC(u16 *palette, u16 count, u16 a3, u16 a4, u16 a5) +void TintPalette_CustomTone(u16 *palette, u16 count, u16 a3, u16 a4, u16 a5) { s32 r; s32 g; @@ -1039,7 +1037,7 @@ void sub_80A2BAC(u16 *palette, u16 count, u16 a3, u16 a4, u16 a5) } #else __attribute__((naked)) -void sub_80A2BAC(u16 *palette, u16 count, u16 a3, u16 a4, u16 a5) +void TintPalette_CustomTone(u16 *palette, u16 count, u16 a3, u16 a4, u16 a5) { asm("push {r4-r7,lr}\n\ mov r7, r9\n\ @@ -1153,7 +1151,7 @@ void sub_80A2C44(u32 a1, s8 a2, u8 a3, u8 a4, u16 a5, u8 a6, u8 a7) gTasks[taskId].func(taskId); } -u32 sub_80A2CF8(u8 var) +bool32 sub_80A2CF8(u8 var) { int i; @@ -1181,7 +1179,7 @@ void sub_80A2D54(u8 taskId) { u32 wordVar; s16 *data; - u16 temp; + s16 temp; data = gTasks[taskId].data; wordVar = GetWordTaskArg(taskId, 5); @@ -1191,7 +1189,7 @@ void sub_80A2D54(u8 taskId) data[4] = 0; BlendPalettes(wordVar, data[0], data[7]); temp = data[1]; - if (data[0] == (s16)temp) + if (data[0] == temp) { DestroyTask(taskId); } @@ -1200,12 +1198,12 @@ void sub_80A2D54(u8 taskId) data[0] += data[2]; if (data[2] >= 0) { - if (data[0] < (s16)temp) + if (data[0] < temp) { return; } } - else if (data[0] > (s16)temp) + else if (data[0] > temp) { return; } diff --git a/src/region_map.c b/src/region_map.c index f28f07d52..086c0ba68 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -21,6 +21,7 @@ #include "m4a.h" #include "field_effect.h" #include "region_map.h" +#include "constants/region_map_sections.h" #define MAP_WIDTH 28 #define MAP_HEIGHT 15 @@ -306,7 +307,7 @@ static const struct { } gUnknown_085A1EDC[] = { gUnknown_085A1ED4, MAPSEC_EVER_GRANDE_CITY, - FLAG_SYS_POKEMON_LEAGUE_FLY + FLAG_LANDMARK_POKEMON_LEAGUE }; static const struct BgTemplate gUnknown_085A1EE4[] = { @@ -327,7 +328,7 @@ static const struct SpritePalette gUnknown_085A1F10 = { }; static const u16 sUnknown_085A1F18[][2] = { - {FLAG_UNLOCK_BATTLE_FRONTIER, MAPSEC_BATTLE_FRONTIER}, + {FLAG_LANDMARK_BATTLE_FRONTIER, MAPSEC_BATTLE_FRONTIER}, {-1, MAPSEC_NONE} }; @@ -1126,9 +1127,9 @@ static u8 get_flagnr_blue_points(u16 mapSecId) case MAPSEC_EVER_GRANDE_CITY: return FlagGet(FLAG_VISITED_EVER_GRANDE_CITY) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY; case MAPSEC_BATTLE_FRONTIER: - return FlagGet(FLAG_UNLOCK_BATTLE_FRONTIER) ? MAPSECTYPE_BATTLE_FRONTIER : MAPSECTYPE_NONE; + return FlagGet(FLAG_LANDMARK_BATTLE_FRONTIER) ? MAPSECTYPE_BATTLE_FRONTIER : MAPSECTYPE_NONE; case MAPSEC_SOUTHERN_ISLAND: - return FlagGet(FLAG_UNLOCK_SOUTHERN_ISLAND) ? MAPSECTYPE_PLAIN : MAPSECTYPE_NONE; + return FlagGet(FLAG_LANDMARK_SOUTHERN_ISLAND) ? MAPSECTYPE_PLAIN : MAPSECTYPE_NONE; default: return MAPSECTYPE_PLAIN; } @@ -1916,7 +1917,7 @@ static void sub_8124E0C(void) sub_8084CCC(gSaveBlock2Ptr->playerGender == MALE ? 0x0C : 0x0D); break; case MAPSEC_EVER_GRANDE_CITY: - sub_8084CCC(FlagGet(FLAG_SYS_POKEMON_LEAGUE_FLY) && gUnknown_0203A148->regionMap.posWithinMapSec == 0 ? 0x14 : 0x0B); + sub_8084CCC(FlagGet(FLAG_LANDMARK_POKEMON_LEAGUE) && gUnknown_0203A148->regionMap.posWithinMapSec == 0 ? 0x14 : 0x0B); break; default: if (sUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][2] != 0) @@ -1,5 +1,3 @@ - -// Includes #include "global.h" #include "rtc.h" #include "overworld.h" @@ -34,6 +32,7 @@ #include "naming_screen.h" #include "malloc.h" #include "region_map.h" +#include "constants/region_map_sections.h" #include "decoration.h" #include "secret_base.h" #include "tv.h" @@ -6504,7 +6503,7 @@ void DoTVShowTodaysRivalTrainer(void) break; case 1: TV_PrintIntToStringVar(0, show->rivalTrainer.badgeCount); - if (FlagGet(CODE_FLAGS + 0x48)) + if (FlagGet(FLAG_LANDMARK_BATTLE_FRONTIER)) { if (show->rivalTrainer.nSilverSymbols || show->rivalTrainer.nGoldSymbols) { @@ -6521,7 +6520,7 @@ void DoTVShowTodaysRivalTrainer(void) } break; case 2: - if (FlagGet(CODE_FLAGS + 0x48)) + if (FlagGet(FLAG_LANDMARK_BATTLE_FRONTIER)) { if (show->rivalTrainer.nSilverSymbols || show->rivalTrainer.nGoldSymbols) { |
