From ba176dfe0729e8c8c46a8f79c2f1b6e732ee13c8 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 1 Jan 2018 17:41:34 +0100 Subject: [PATCH 01/64] start working on battle transition --- asm/battle_transition.s | 455 ++++++++++-------------------------- asm/overworld.s | 18 +- asm/unk_transition.s | 308 ++++++++++++++++++++++-- asm/unk_transition_2.s | 268 --------------------- data/battle_transition.s | 257 -------------------- include/battle_transition.h | 2 + include/overworld.h | 2 + include/unk_transition.h | 13 ++ ld_script.txt | 3 +- src/battle_transition.c | 287 +++++++++++++++++++++++ sym_bss.txt | 11 +- sym_ewram.txt | 5 +- 12 files changed, 730 insertions(+), 899 deletions(-) delete mode 100755 asm/unk_transition_2.s create mode 100644 include/unk_transition.h create mode 100644 src/battle_transition.c diff --git a/asm/battle_transition.s b/asm/battle_transition.s index d7f6b9e039..45c62656af 100644 --- a/asm/battle_transition.s +++ b/asm/battle_transition.s @@ -4,210 +4,9 @@ .syntax unified .text - - thumb_func_start CB2_TestBattleTransition -CB2_TestBattleTransition: @ 8145E84 - push {r4,lr} - ldr r4, =sTestingTransitionState - ldrb r0, [r4] - cmp r0, 0 - beq _08145E98 - cmp r0, 0x1 - beq _08145EAC - b _08145EC0 - .pool -_08145E98: - ldr r0, =sTestingTransitionId - ldrb r0, [r0] - bl LaunchBattleTransitionTask - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] - b _08145EC0 - .pool -_08145EAC: - bl IsBattleTransitionDone - lsls r0, 24 - cmp r0, 0 - beq _08145EC0 - movs r0, 0 - strb r0, [r4] - ldr r0, =c2_exit_to_overworld_2_switch - bl SetMainCallback2 -_08145EC0: - bl RunTasks - bl AnimateSprites - bl BuildOamBuffer - bl UpdatePaletteFade - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end CB2_TestBattleTransition - thumb_func_start TestBattleTransition -TestBattleTransition: @ 8145EDC - push {lr} - ldr r1, =sTestingTransitionId - strb r0, [r1] - ldr r0, =CB2_TestBattleTransition - bl SetMainCallback2 - pop {r0} - bx r0 - .pool - thumb_func_end TestBattleTransition - - thumb_func_start BattleTransition_StartOnField -BattleTransition_StartOnField: @ 8145EF4 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gMain - ldr r1, =sub_8085E50 - str r1, [r2, 0x4] - bl LaunchBattleTransitionTask - pop {r0} - bx r0 - .pool - thumb_func_end BattleTransition_StartOnField - - thumb_func_start BattleTransition_Start -BattleTransition_Start: @ 8145F10 - push {lr} - lsls r0, 24 - lsrs r0, 24 - bl LaunchBattleTransitionTask - pop {r0} - bx r0 - thumb_func_end BattleTransition_Start - - thumb_func_start IsBattleTransitionDone -IsBattleTransitionDone: @ 8145F20 - push {r4,lr} - ldr r0, =Task_BattleTransitionMain - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r2, r0, 24 - ldr r1, =gTasks - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r0, r1 - movs r1, 0x26 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _08145F4C - movs r0, 0 - b _08145F60 - .pool -_08145F4C: - adds r0, r2, 0 - bl DestroyTask - ldr r4, =sTransitionStructPtr - ldr r0, [r4] - bl Free - movs r0, 0 - str r0, [r4] - movs r0, 0x1 -_08145F60: - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end IsBattleTransitionDone - - thumb_func_start LaunchBattleTransitionTask -LaunchBattleTransitionTask: @ 8145F6C - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r0, =Task_BattleTransitionMain - movs r1, 0x2 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - strh r4, [r1, 0xA] - ldr r4, =sTransitionStructPtr - movs r0, 0x3C - bl AllocZeroed - str r0, [r4] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end LaunchBattleTransitionTask - - thumb_func_start Task_BattleTransitionMain -Task_BattleTransitionMain: @ 8145FA8 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =sMainTransitionPhases - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_08145FBA: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _08145FBA - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Task_BattleTransitionMain - - thumb_func_start sub_8145FE0 -sub_8145FE0: @ 8145FE0 - push {r4,lr} - adds r4, r0, 0 - bl sub_80AC3D0 - ldr r0, =gPlttBufferFaded - ldr r1, =gPlttBufferUnfaded - ldr r2, =0x04000100 - bl CpuSet - ldr r1, =sPhase1_Tasks - movs r2, 0xA - ldrsh r0, [r4, r2] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - cmp r0, 0 - bne _0814601C - movs r0, 0x2 - strh r0, [r4, 0x8] - movs r0, 0x1 - b _0814602A - .pool -_0814601C: - movs r1, 0x4 - bl CreateTask - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 -_0814602A: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8145FE0 - - thumb_func_start sub_8146030 -sub_8146030: @ 8146030 + thumb_func_start Transition_WaitForPhase1 +Transition_WaitForPhase1: @ 8146030 push {r4,lr} adds r4, r0, 0 ldr r1, =sPhase1_Tasks @@ -233,10 +32,10 @@ _0814605C: pop {r4} pop {r1} bx r1 - thumb_func_end sub_8146030 + thumb_func_end Transition_WaitForPhase1 - thumb_func_start sub_8146064 -sub_8146064: @ 8146064 + thumb_func_start Transition_Phase2 +Transition_Phase2: @ 8146064 push {r4,lr} adds r4, r0, 0 ldr r1, =sPhase2_Tasks @@ -255,10 +54,10 @@ sub_8146064: @ 8146064 pop {r1} bx r1 .pool - thumb_func_end sub_8146064 + thumb_func_end Transition_Phase2 - thumb_func_start sub_814608C -sub_814608C: @ 814608C + thumb_func_start Transition_WaitForPhase2 +Transition_WaitForPhase2: @ 814608C push {r4,lr} adds r4, r0, 0 movs r0, 0 @@ -282,10 +81,10 @@ _081460B0: pop {r1} bx r1 .pool - thumb_func_end sub_814608C + thumb_func_end Transition_WaitForPhase2 - thumb_func_start sub_81460BC -sub_81460BC: @ 81460BC + thumb_func_start Phase1Task_TransitionAll +Phase1Task_TransitionAll: @ 81460BC push {r4,lr} sub sp, 0x4 lsls r0, 24 @@ -324,10 +123,10 @@ _08146104: pop {r4} pop {r0} bx r0 - thumb_func_end sub_81460BC + thumb_func_end Phase1Task_TransitionAll - thumb_func_start sub_814610C -sub_814610C: @ 814610C + thumb_func_start Phase2Task_Transition_Blur +Phase2Task_Transition_Blur: @ 814610C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -352,7 +151,7 @@ _0814611E: pop {r0} bx r0 .pool - thumb_func_end sub_814610C + thumb_func_end Phase2Task_Transition_Blur thumb_func_start sub_8146144 sub_8146144: @ 8146144 @@ -441,7 +240,7 @@ sub_81461D8: @ 81461D8 ands r0, r1 cmp r0, 0 bne _081461F4 - ldr r0, =sub_814610C + ldr r0, =Phase2Task_Transition_Blur bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -453,8 +252,8 @@ _081461F4: .pool thumb_func_end sub_81461D8 - thumb_func_start sub_8146204 -sub_8146204: @ 8146204 + thumb_func_start Phase2Task_Transition_Swirl +Phase2Task_Transition_Swirl: @ 8146204 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -479,7 +278,7 @@ _08146216: pop {r0} bx r0 .pool - thumb_func_end sub_8146204 + thumb_func_end Phase2Task_Transition_Swirl thumb_func_start sub_814623C sub_814623C: @ 814623C @@ -559,7 +358,7 @@ sub_81462A8: @ 81462A8 ands r0, r1 cmp r0, 0 bne _081462FA - ldr r0, =sub_8146204 + ldr r0, =Phase2Task_Transition_Swirl bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -624,8 +423,8 @@ sub_8146358: @ 8146358 .pool thumb_func_end sub_8146358 - thumb_func_start sub_8146384 -sub_8146384: @ 8146384 + thumb_func_start Phase2Task_Transition_Shuffle +Phase2Task_Transition_Shuffle: @ 8146384 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -650,7 +449,7 @@ _08146396: pop {r0} bx r0 .pool - thumb_func_end sub_8146384 + thumb_func_end Phase2Task_Transition_Shuffle thumb_func_start sub_81463BC sub_81463BC: @ 81463BC @@ -742,7 +541,7 @@ _08146448: ands r0, r1 cmp r0, 0 bne _0814648E - ldr r0, =sub_8146384 + ldr r0, =Phase2Task_Transition_Shuffle bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -806,8 +605,8 @@ sub_81464E8: @ 81464E8 .pool thumb_func_end sub_81464E8 - thumb_func_start sub_8146514 -sub_8146514: @ 8146514 + thumb_func_start Phase2Task_Transition_BigPokeball +Phase2Task_Transition_BigPokeball: @ 8146514 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -832,10 +631,10 @@ _08146526: pop {r0} bx r0 .pool - thumb_func_end sub_8146514 + thumb_func_end Phase2Task_Transition_BigPokeball - thumb_func_start sub_814654C -sub_814654C: @ 814654C + thumb_func_start Phase2Task_Transition_Aqua +Phase2Task_Transition_Aqua: @ 814654C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -860,10 +659,10 @@ _0814655E: pop {r0} bx r0 .pool - thumb_func_end sub_814654C + thumb_func_end Phase2Task_Transition_Aqua - thumb_func_start sub_8146584 -sub_8146584: @ 8146584 + thumb_func_start Phase2Task_Transition_Magma +Phase2Task_Transition_Magma: @ 8146584 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -888,10 +687,10 @@ _08146596: pop {r0} bx r0 .pool - thumb_func_end sub_8146584 + thumb_func_end Phase2Task_Transition_Magma - thumb_func_start sub_81465BC -sub_81465BC: @ 81465BC + thumb_func_start Phase2Task_Transition_Regice +Phase2Task_Transition_Regice: @ 81465BC push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -916,10 +715,10 @@ _081465CE: pop {r0} bx r0 .pool - thumb_func_end sub_81465BC + thumb_func_end Phase2Task_Transition_Regice - thumb_func_start sub_81465F4 -sub_81465F4: @ 81465F4 + thumb_func_start Phase2Task_Transition_Registeel +Phase2Task_Transition_Registeel: @ 81465F4 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -944,10 +743,10 @@ _08146606: pop {r0} bx r0 .pool - thumb_func_end sub_81465F4 + thumb_func_end Phase2Task_Transition_Registeel - thumb_func_start sub_814662C -sub_814662C: @ 814662C + thumb_func_start Phase2Task_Transition_Regirock +Phase2Task_Transition_Regirock: @ 814662C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -972,10 +771,10 @@ _0814663E: pop {r0} bx r0 .pool - thumb_func_end sub_814662C + thumb_func_end Phase2Task_Transition_Regirock - thumb_func_start sub_8146664 -sub_8146664: @ 8146664 + thumb_func_start Phase2Task_Transition_Kyogre +Phase2Task_Transition_Kyogre: @ 8146664 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -1000,7 +799,7 @@ _08146676: pop {r0} bx r0 .pool - thumb_func_end sub_8146664 + thumb_func_end Phase2Task_Transition_Kyogre thumb_func_start sub_814669C sub_814669C: @ 814669C @@ -2069,8 +1868,8 @@ sub_8146F68: @ 8146F68 .pool thumb_func_end sub_8146F68 - thumb_func_start sub_8146F94 -sub_8146F94: @ 8146F94 + thumb_func_start Phase2Task_Transition_PokeballsTrail +Phase2Task_Transition_PokeballsTrail: @ 8146F94 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -2095,7 +1894,7 @@ _08146FA6: pop {r0} bx r0 .pool - thumb_func_end sub_8146F94 + thumb_func_end Phase2Task_Transition_PokeballsTrail thumb_func_start sub_8146FCC sub_8146FCC: @ 8146FCC @@ -2205,7 +2004,7 @@ sub_81470A4: @ 81470A4 cmp r0, 0 bne _081470C4 bl sub_8149F84 - ldr r0, =sub_8146F94 + ldr r0, =Phase2Task_Transition_PokeballsTrail bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -2365,8 +2164,8 @@ _081471F2: .pool thumb_func_end sub_814713C - thumb_func_start sub_8147204 -sub_8147204: @ 8147204 + thumb_func_start Phase2Task_Transition_Clockwise_BlackFade +Phase2Task_Transition_Clockwise_BlackFade: @ 8147204 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -2391,7 +2190,7 @@ _08147216: pop {r0} bx r0 .pool - thumb_func_end sub_8147204 + thumb_func_end Phase2Task_Transition_Clockwise_BlackFade thumb_func_start sub_814723C sub_814723C: @ 814723C @@ -2923,7 +2722,7 @@ sub_8147648: @ 8147648 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] bl sub_8149F84 - ldr r0, =sub_8147204 + ldr r0, =Phase2Task_Transition_Clockwise_BlackFade bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -2992,8 +2791,8 @@ _081476C0: .pool thumb_func_end sub_8147688 - thumb_func_start sub_8147718 -sub_8147718: @ 8147718 + thumb_func_start Phase2Task_Transition_Ripple +Phase2Task_Transition_Ripple: @ 8147718 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -3018,7 +2817,7 @@ _0814772A: pop {r0} bx r0 .pool - thumb_func_end sub_8147718 + thumb_func_end Phase2Task_Transition_Ripple thumb_func_start sub_8147750 sub_8147750: @ 8147750 @@ -3141,7 +2940,7 @@ _08147838: ands r0, r1 cmp r0, 0 bne _0814785A - ldr r0, =sub_8147718 + ldr r0, =Phase2Task_Transition_Ripple bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -3209,8 +3008,8 @@ sub_81478C0: @ 81478C0 .pool thumb_func_end sub_81478C0 - thumb_func_start sub_81478EC -sub_81478EC: @ 81478EC + thumb_func_start Phase2Task_Transition_Wave +Phase2Task_Transition_Wave: @ 81478EC push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -3235,7 +3034,7 @@ _081478FE: pop {r0} bx r0 .pool - thumb_func_end sub_81478EC + thumb_func_end Phase2Task_Transition_Wave thumb_func_start sub_8147924 sub_8147924: @ 8147924 @@ -3373,7 +3172,7 @@ sub_8147A18: @ 8147A18 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] bl sub_8149F84 - ldr r0, =sub_81478EC + ldr r0, =Phase2Task_Transition_Wave bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -3437,8 +3236,8 @@ _08147A90: .pool thumb_func_end sub_8147A58 - thumb_func_start sub_8147AE4 -sub_8147AE4: @ 8147AE4 + thumb_func_start Phase2Task_Transition_Sydney +Phase2Task_Transition_Sydney: @ 8147AE4 push {lr} lsls r0, 24 lsrs r0, 24 @@ -3453,10 +3252,10 @@ sub_8147AE4: @ 8147AE4 pop {r0} bx r0 .pool - thumb_func_end sub_8147AE4 + thumb_func_end Phase2Task_Transition_Sydney - thumb_func_start sub_8147B04 -sub_8147B04: @ 8147B04 + thumb_func_start Phase2Task_Transition_Phoebe +Phase2Task_Transition_Phoebe: @ 8147B04 push {lr} lsls r0, 24 lsrs r0, 24 @@ -3471,10 +3270,10 @@ sub_8147B04: @ 8147B04 pop {r0} bx r0 .pool - thumb_func_end sub_8147B04 + thumb_func_end Phase2Task_Transition_Phoebe - thumb_func_start sub_8147B24 -sub_8147B24: @ 8147B24 + thumb_func_start Phase2Task_Transition_Glacia +Phase2Task_Transition_Glacia: @ 8147B24 push {lr} lsls r0, 24 lsrs r0, 24 @@ -3489,10 +3288,10 @@ sub_8147B24: @ 8147B24 pop {r0} bx r0 .pool - thumb_func_end sub_8147B24 + thumb_func_end Phase2Task_Transition_Glacia - thumb_func_start sub_8147B44 -sub_8147B44: @ 8147B44 + thumb_func_start Phase2Task_Transition_Drake +Phase2Task_Transition_Drake: @ 8147B44 push {lr} lsls r0, 24 lsrs r0, 24 @@ -3507,10 +3306,10 @@ sub_8147B44: @ 8147B44 pop {r0} bx r0 .pool - thumb_func_end sub_8147B44 + thumb_func_end Phase2Task_Transition_Drake - thumb_func_start sub_8147B64 -sub_8147B64: @ 8147B64 + thumb_func_start Phase2Task_Transition_Wallace +Phase2Task_Transition_Wallace: @ 8147B64 push {lr} lsls r0, 24 lsrs r0, 24 @@ -3525,7 +3324,7 @@ sub_8147B64: @ 8147B64 pop {r0} bx r0 .pool - thumb_func_end sub_8147B64 + thumb_func_end Phase2Task_Transition_Wallace thumb_func_start sub_8147B84 sub_8147B84: @ 8147B84 @@ -4664,8 +4463,8 @@ sub_81484B8: @ 81484B8 .pool thumb_func_end sub_81484B8 - thumb_func_start sub_81484D0 -sub_81484D0: @ 81484D0 + thumb_func_start Phase2Task_Transition_Slice +Phase2Task_Transition_Slice: @ 81484D0 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -4690,7 +4489,7 @@ _081484E2: pop {r0} bx r0 .pool - thumb_func_end sub_81484D0 + thumb_func_end Phase2Task_Transition_Slice thumb_func_start sub_8148508 sub_8148508: @ 8148508 @@ -4873,7 +4672,7 @@ sub_814865C: @ 814865C strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] bl sub_8149F84 - ldr r0, =sub_81484D0 + ldr r0, =Phase2Task_Transition_Slice bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -4963,8 +4762,8 @@ _0814874E: .pool thumb_func_end sub_8148728 - thumb_func_start sub_8148760 -sub_8148760: @ 8148760 + thumb_func_start Phase2Task_Transition_25 +Phase2Task_Transition_25: @ 8148760 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -4989,7 +4788,7 @@ _08148772: pop {r0} bx r0 .pool - thumb_func_end sub_8148760 + thumb_func_end Phase2Task_Transition_25 thumb_func_start sub_8148798 sub_8148798: @ 8148798 @@ -5442,7 +5241,7 @@ sub_8148B14: @ 8148B14 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] bl sub_8149F84 - ldr r0, =sub_8148760 + ldr r0, =Phase2Task_Transition_25 bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -5453,8 +5252,8 @@ sub_8148B14: @ 8148B14 .pool thumb_func_end sub_8148B14 - thumb_func_start sub_8148B54 -sub_8148B54: @ 8148B54 + thumb_func_start Phase2Task_Transition_26 +Phase2Task_Transition_26: @ 8148B54 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -5479,10 +5278,10 @@ _08148B66: pop {r0} bx r0 .pool - thumb_func_end sub_8148B54 + thumb_func_end Phase2Task_Transition_26 - thumb_func_start sub_8148B8C -sub_8148B8C: @ 8148B8C + thumb_func_start Phase2Task_Transition_27 +Phase2Task_Transition_27: @ 8148B8C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -5507,7 +5306,7 @@ _08148B9E: pop {r0} bx r0 .pool - thumb_func_end sub_8148B8C + thumb_func_end Phase2Task_Transition_27 thumb_func_start sub_8148BC4 sub_8148BC4: @ 8148BC4 @@ -5819,8 +5618,8 @@ _08148E3C: .pool thumb_func_end sub_8148D6C - thumb_func_start sub_8148E54 -sub_8148E54: @ 8148E54 + thumb_func_start Phase2Task_Transition_28 +Phase2Task_Transition_28: @ 8148E54 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -5845,7 +5644,7 @@ _08148E66: pop {r0} bx r0 .pool - thumb_func_end sub_8148E54 + thumb_func_end Phase2Task_Transition_28 thumb_func_start sub_8148E8C sub_8148E8C: @ 8148E8C @@ -6187,8 +5986,8 @@ _08149138: bx r1 thumb_func_end sub_8149048 - thumb_func_start sub_8149140 -sub_8149140: @ 8149140 + thumb_func_start Phase2Task_Transition_Groudon +Phase2Task_Transition_Groudon: @ 8149140 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -6213,7 +6012,7 @@ _08149152: pop {r0} bx r0 .pool - thumb_func_end sub_8149140 + thumb_func_end Phase2Task_Transition_Groudon thumb_func_start sub_8149178 sub_8149178: @ 8149178 @@ -6341,8 +6140,8 @@ _0814926E: .pool thumb_func_end sub_8149224 - thumb_func_start sub_814927C -sub_814927C: @ 814927C + thumb_func_start Phase2Task_Transition_Rayquaza +Phase2Task_Transition_Rayquaza: @ 814927C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -6367,7 +6166,7 @@ _0814928E: pop {r0} bx r0 .pool - thumb_func_end sub_814927C + thumb_func_end Phase2Task_Transition_Rayquaza thumb_func_start sub_81492B4 sub_81492B4: @ 81492B4 @@ -6695,8 +6494,8 @@ _08149554: .pool thumb_func_end sub_8149508 - thumb_func_start sub_8149578 -sub_8149578: @ 8149578 + thumb_func_start Phase2Task_Transition_WhiteFade +Phase2Task_Transition_WhiteFade: @ 8149578 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -6721,7 +6520,7 @@ _0814958A: pop {r0} bx r0 .pool - thumb_func_end sub_8149578 + thumb_func_end Phase2Task_Transition_WhiteFade thumb_func_start sub_81495B0 sub_81495B0: @ 81495B0 @@ -6916,7 +6715,7 @@ sub_8149740: @ 8149740 cmp r0, 0x10 bls _08149766 bl sub_8149F84 - ldr r0, =sub_8149578 + ldr r0, =Phase2Task_Transition_WhiteFade bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -7158,8 +6957,8 @@ _0814994C: .pool thumb_func_end sub_8149864 - thumb_func_start sub_814995C -sub_814995C: @ 814995C + thumb_func_start Phase2Task_Transition_GridSquares +Phase2Task_Transition_GridSquares: @ 814995C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -7184,7 +6983,7 @@ _0814996E: pop {r0} bx r0 .pool - thumb_func_end sub_814995C + thumb_func_end Phase2Task_Transition_GridSquares thumb_func_start sub_8149994 sub_8149994: @ 8149994 @@ -7277,7 +7076,7 @@ sub_8149A40: @ 8149A40 cmp r1, 0 bne _08149A60 bl sub_8149F84 - ldr r0, =sub_814995C + ldr r0, =Phase2Task_Transition_GridSquares bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -7289,8 +7088,8 @@ _08149A60: .pool thumb_func_end sub_8149A40 - thumb_func_start sub_8149A6C -sub_8149A6C: @ 8149A6C + thumb_func_start Phase2Task_Transition_Shards +Phase2Task_Transition_Shards: @ 8149A6C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -7315,7 +7114,7 @@ _08149A7E: pop {r0} bx r0 .pool - thumb_func_end sub_8149A6C + thumb_func_end Phase2Task_Transition_Shards thumb_func_start sub_8149AA4 sub_8149AA4: @ 8149AA4 @@ -7559,7 +7358,7 @@ sub_8149C60: @ 8149C60 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] bl sub_8149F84 - ldr r0, =sub_8149A6C + ldr r0, =Phase2Task_Transition_Shards bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -8511,8 +8310,8 @@ sub_814A374: @ 814A374 .pool thumb_func_end sub_814A374 - thumb_func_start sub_814A3BC -sub_814A3BC: @ 814A3BC + thumb_func_start Phase2Task_Transition_29 +Phase2Task_Transition_29: @ 814A3BC push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -8537,10 +8336,10 @@ _0814A3CE: pop {r0} bx r0 .pool - thumb_func_end sub_814A3BC + thumb_func_end Phase2Task_Transition_29 - thumb_func_start sub_814A3F4 -sub_814A3F4: @ 814A3F4 + thumb_func_start Phase2Task_Transition_30 +Phase2Task_Transition_30: @ 814A3F4 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -8565,7 +8364,7 @@ _0814A406: pop {r0} bx r0 .pool - thumb_func_end sub_814A3F4 + thumb_func_end Phase2Task_Transition_30 thumb_func_start sub_814A42C sub_814A42C: @ 814A42C @@ -8815,7 +8614,7 @@ _0814A632: ands r0, r1 cmp r0, 0 bne _0814A654 - ldr r0, =sub_814A3F4 + ldr r0, =Phase2Task_Transition_30 bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -8888,8 +8687,8 @@ sub_814A6CC: @ 814A6CC .pool thumb_func_end sub_814A6CC - thumb_func_start sub_814A6F0 -sub_814A6F0: @ 814A6F0 + thumb_func_start Phase2Task_Transition_31 +Phase2Task_Transition_31: @ 814A6F0 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -8914,10 +8713,10 @@ _0814A702: pop {r0} bx r0 .pool - thumb_func_end sub_814A6F0 + thumb_func_end Phase2Task_Transition_31 - thumb_func_start sub_814A728 -sub_814A728: @ 814A728 + thumb_func_start Phase2Task_Transition_33 +Phase2Task_Transition_33: @ 814A728 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -8942,10 +8741,10 @@ _0814A73A: pop {r0} bx r0 .pool - thumb_func_end sub_814A728 + thumb_func_end Phase2Task_Transition_33 - thumb_func_start sub_814A760 -sub_814A760: @ 814A760 + thumb_func_start Phase2Task_Transition_32 +Phase2Task_Transition_32: @ 814A760 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -8970,7 +8769,7 @@ _0814A772: pop {r0} bx r0 .pool - thumb_func_end sub_814A760 + thumb_func_end Phase2Task_Transition_32 thumb_func_start sub_814A798 sub_814A798: @ 814A798 diff --git a/asm/overworld.s b/asm/overworld.s index 5de62b896f..92a63932e4 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -3055,9 +3055,9 @@ _08085E18: .pool thumb_func_end c1_overworld - thumb_func_start c2_overworld_basic -@ void c2_overworld_basic() -c2_overworld_basic: @ 8085E24 + thumb_func_start OverworldBasic +@ void OverworldBasic() +OverworldBasic: @ 8085E24 push {lr} bl ScriptContext2_RunScript bl RunTasks @@ -3070,15 +3070,15 @@ c2_overworld_basic: @ 8085E24 bl do_scheduled_bg_tilemap_copies_to_vram pop {r0} bx r0 - thumb_func_end c2_overworld_basic + thumb_func_end OverworldBasic - thumb_func_start sub_8085E50 -sub_8085E50: @ 8085E50 + thumb_func_start CB2_OverworldBasic +CB2_OverworldBasic: @ 8085E50 push {lr} - bl c2_overworld_basic + bl OverworldBasic pop {r0} bx r0 - thumb_func_end sub_8085E50 + thumb_func_end CB2_OverworldBasic thumb_func_start c2_overworld c2_overworld: @ 8085E5C @@ -3092,7 +3092,7 @@ c2_overworld: @ 8085E5C movs r0, 0 bl SetVBlankCallback _08085E70: - bl c2_overworld_basic + bl OverworldBasic cmp r4, 0 beq _08085E7C bl SetFieldVBlankCallback diff --git a/asm/unk_transition.s b/asm/unk_transition.s index 385a8771e2..564d2fbad1 100755 --- a/asm/unk_transition.s +++ b/asm/unk_transition.s @@ -24,8 +24,8 @@ _081DABD2: bx r1 thumb_func_end sub_81DABBC - thumb_func_start sub_81DABDC -sub_81DABDC: @ 81DABDC + thumb_func_start Phase2Task_Transition_34 +Phase2Task_Transition_34: @ 81DABDC push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -50,7 +50,7 @@ _081DABEE: pop {r0} bx r0 .pool - thumb_func_end sub_81DABDC + thumb_func_end Phase2Task_Transition_34 thumb_func_start sub_81DAC14 sub_81DAC14: @ 81DAC14 @@ -119,7 +119,7 @@ sub_81DAC80: @ 81DAC80 bne _081DACA4 adds r0, r2, 0 bl sub_81DAA20 - ldr r0, =sub_81DABDC + ldr r0, =Phase2Task_Transition_34 bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -131,8 +131,8 @@ _081DACA4: .pool thumb_func_end sub_81DAC80 - thumb_func_start sub_81DACB4 -sub_81DACB4: @ 81DACB4 + thumb_func_start Phase2Task_Transition_35 +Phase2Task_Transition_35: @ 81DACB4 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -157,7 +157,7 @@ _081DACC6: pop {r0} bx r0 .pool - thumb_func_end sub_81DACB4 + thumb_func_end Phase2Task_Transition_35 thumb_func_start sub_81DACEC sub_81DACEC: @ 81DACEC @@ -226,7 +226,7 @@ sub_81DAD58: @ 81DAD58 bne _081DAD7C adds r0, r2, 0 bl sub_81DAA20 - ldr r0, =sub_81DACB4 + ldr r0, =Phase2Task_Transition_35 bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -238,8 +238,8 @@ _081DAD7C: .pool thumb_func_end sub_81DAD58 - thumb_func_start sub_81DAD8C -sub_81DAD8C: @ 81DAD8C + thumb_func_start Phase2Task_Transition_36 +Phase2Task_Transition_36: @ 81DAD8C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -264,7 +264,7 @@ _081DAD9E: pop {r0} bx r0 .pool - thumb_func_end sub_81DAD8C + thumb_func_end Phase2Task_Transition_36 thumb_func_start sub_81DADC4 sub_81DADC4: @ 81DADC4 @@ -342,7 +342,7 @@ sub_81DAE44: @ 81DAE44 bne _081DAE68 adds r0, r2, 0 bl sub_81DAA20 - ldr r0, =sub_81DAD8C + ldr r0, =Phase2Task_Transition_36 bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -354,8 +354,8 @@ _081DAE68: .pool thumb_func_end sub_81DAE44 - thumb_func_start sub_81DAE78 -sub_81DAE78: @ 81DAE78 + thumb_func_start Phase2Task_Transition_37 +Phase2Task_Transition_37: @ 81DAE78 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -380,7 +380,7 @@ _081DAE8A: pop {r0} bx r0 .pool - thumb_func_end sub_81DAE78 + thumb_func_end Phase2Task_Transition_37 thumb_func_start sub_81DAEB0 sub_81DAEB0: @ 81DAEB0 @@ -460,7 +460,7 @@ sub_81DAF34: @ 81DAF34 bne _081DAF58 adds r0, r2, 0 bl sub_81DAA20 - ldr r0, =sub_81DAE78 + ldr r0, =Phase2Task_Transition_37 bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -472,8 +472,8 @@ _081DAF58: .pool thumb_func_end sub_81DAF34 - thumb_func_start sub_81DAF68 -sub_81DAF68: @ 81DAF68 + thumb_func_start Phase2Task_Transition_38 +Phase2Task_Transition_38: @ 81DAF68 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -498,7 +498,7 @@ _081DAF7A: pop {r0} bx r0 .pool - thumb_func_end sub_81DAF68 + thumb_func_end Phase2Task_Transition_38 thumb_func_start sub_81DAFA0 sub_81DAFA0: @ 81DAFA0 @@ -585,7 +585,7 @@ sub_81DB02C: @ 81DB02C bne _081DB050 adds r0, r2, 0 bl sub_81DAA20 - ldr r0, =sub_81DAF68 + ldr r0, =Phase2Task_Transition_38 bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -597,8 +597,8 @@ _081DB050: .pool thumb_func_end sub_81DB02C - thumb_func_start sub_81DB060 -sub_81DB060: @ 81DB060 + thumb_func_start Phase2Task_Transition_39 +Phase2Task_Transition_39: @ 81DB060 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -623,7 +623,7 @@ _081DB072: pop {r0} bx r0 .pool - thumb_func_end sub_81DB060 + thumb_func_end Phase2Task_Transition_39 thumb_func_start sub_81DB098 sub_81DB098: @ 81DB098 @@ -710,7 +710,7 @@ sub_81DB124: @ 81DB124 bne _081DB148 adds r0, r2, 0 bl sub_81DAA20 - ldr r0, =sub_81DB060 + ldr r0, =Phase2Task_Transition_39 bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -722,4 +722,264 @@ _081DB148: .pool thumb_func_end sub_81DB124 + thumb_func_start Phase2Task_Transition_40 +Phase2Task_Transition_40: @ 81DB158 + push {r4,r5,lr} + lsls r0, 24 + lsrs r0, 24 + ldr r5, =gUnknown_0862B7E8 + ldr r2, =gTasks + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 3 + adds r4, r1, r2 +_081DB16A: + movs r1, 0x8 + ldrsh r0, [r4, r1] + lsls r0, 2 + adds r0, r5 + ldr r1, [r0] + adds r0, r4, 0 + bl _call_via_r1 + lsls r0, 24 + cmp r0, 0 + bne _081DB16A + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end Phase2Task_Transition_40 + + thumb_func_start sub_81DB190 +sub_81DB190: @ 81DB190 + push {r4,lr} + sub sp, 0x10 + adds r4, r0, 0 + movs r0, 0xA + ldrsh r1, [r4, r0] + cmp r1, 0 + bne _081DB1BE + movs r0, 0x80 + str r0, [sp] + str r1, [sp, 0x4] + subs r0, 0x84 + str r0, [sp, 0x8] + str r1, [sp, 0xC] + movs r0, 0x78 + movs r1, 0x2D + movs r2, 0xC + movs r3, 0x4 + bl sub_81DA8BC + lsls r0, 24 + lsrs r0, 24 + strh r0, [r4, 0x10] + b _081DB212 +_081DB1BE: + cmp r1, 0x10 + bne _081DB1E6 + movs r0, 0x80 + str r0, [sp] + movs r0, 0 + str r0, [sp, 0x4] + subs r0, 0x4 + str r0, [sp, 0x8] + movs r0, 0x1 + str r0, [sp, 0xC] + movs r0, 0x59 + movs r1, 0x61 + movs r2, 0xFC + movs r3, 0x4 + bl sub_81DA8BC + lsls r0, 24 + lsrs r0, 24 + strh r0, [r4, 0x12] + b _081DB212 +_081DB1E6: + cmp r1, 0x20 + bne _081DB212 + movs r0, 0x80 + str r0, [sp] + movs r0, 0 + str r0, [sp, 0x4] + subs r0, 0x4 + str r0, [sp, 0x8] + movs r0, 0x2 + str r0, [sp, 0xC] + movs r0, 0x97 + movs r1, 0x61 + movs r2, 0x84 + movs r3, 0x4 + bl sub_81DA8BC + lsls r0, 24 + lsrs r0, 24 + strh r0, [r4, 0x14] + ldrh r0, [r4, 0x8] + adds r0, 0x1 + strh r0, [r4, 0x8] +_081DB212: + ldrh r0, [r4, 0xA] + adds r0, 0x1 + strh r0, [r4, 0xA] + movs r0, 0 + add sp, 0x10 + pop {r4} + pop {r1} + bx r1 + thumb_func_end sub_81DB190 + + thumb_func_start sub_81DB224 +sub_81DB224: @ 81DB224 + push {lr} + adds r2, r0, 0 + ldr r0, =gPaletteFade + ldrb r1, [r0, 0x7] + movs r0, 0x80 + ands r0, r1 + cmp r0, 0 + bne _081DB248 + adds r0, r2, 0 + bl sub_81DAA20 + ldr r0, =Phase2Task_Transition_40 + bl FindTaskIdByFunc + lsls r0, 24 + lsrs r0, 24 + bl DestroyTask +_081DB248: + movs r0, 0 + pop {r1} + bx r1 + .pool + thumb_func_end sub_81DB224 + + thumb_func_start Phase2Task_Transition_41 +Phase2Task_Transition_41: @ 81DB258 + push {r4,r5,lr} + lsls r0, 24 + lsrs r0, 24 + ldr r5, =gUnknown_0862B7FC + ldr r2, =gTasks + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 3 + adds r4, r1, r2 +_081DB26A: + movs r1, 0x8 + ldrsh r0, [r4, r1] + lsls r0, 2 + adds r0, r5 + ldr r1, [r0] + adds r0, r4, 0 + bl _call_via_r1 + lsls r0, 24 + cmp r0, 0 + bne _081DB26A + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end Phase2Task_Transition_41 + + thumb_func_start sub_81DB290 +sub_81DB290: @ 81DB290 + push {r4,lr} + sub sp, 0x10 + adds r4, r0, 0 + movs r0, 0xA + ldrsh r1, [r4, r0] + cmp r1, 0 + bne _081DB2C2 + movs r2, 0x8E + lsls r2, 1 + movs r0, 0x83 + str r0, [sp] + movs r0, 0x23 + str r0, [sp, 0x4] + subs r0, 0x26 + str r0, [sp, 0x8] + str r1, [sp, 0xC] + movs r0, 0x78 + movs r1, 0x50 + movs r3, 0x8 + bl sub_81DA8BC + lsls r0, 24 + lsrs r0, 24 + strh r0, [r4, 0x10] + b _081DB316 +_081DB2C2: + cmp r1, 0x10 + bne _081DB2EA + movs r0, 0x83 + str r0, [sp] + movs r0, 0x23 + str r0, [sp, 0x4] + subs r0, 0x26 + str r0, [sp, 0x8] + movs r0, 0x1 + str r0, [sp, 0xC] + movs r0, 0x78 + movs r1, 0x50 + movs r2, 0x2C + movs r3, 0x8 + bl sub_81DA8BC + lsls r0, 24 + lsrs r0, 24 + strh r0, [r4, 0x12] + b _081DB316 +_081DB2EA: + cmp r1, 0x20 + bne _081DB316 + movs r0, 0x83 + str r0, [sp] + movs r0, 0x23 + str r0, [sp, 0x4] + subs r0, 0x26 + str r0, [sp, 0x8] + movs r0, 0x2 + str r0, [sp, 0xC] + movs r0, 0x79 + movs r1, 0x50 + movs r2, 0xA4 + movs r3, 0x8 + bl sub_81DA8BC + lsls r0, 24 + lsrs r0, 24 + strh r0, [r4, 0x14] + ldrh r0, [r4, 0x8] + adds r0, 0x1 + strh r0, [r4, 0x8] +_081DB316: + ldrh r0, [r4, 0xA] + adds r0, 0x1 + strh r0, [r4, 0xA] + movs r0, 0 + add sp, 0x10 + pop {r4} + pop {r1} + bx r1 + thumb_func_end sub_81DB290 + + thumb_func_start sub_81DB328 +sub_81DB328: @ 81DB328 + push {lr} + adds r2, r0, 0 + ldr r0, =gPaletteFade + ldrb r1, [r0, 0x7] + movs r0, 0x80 + ands r0, r1 + cmp r0, 0 + bne _081DB34C + adds r0, r2, 0 + bl sub_81DAA20 + ldr r0, =Phase2Task_Transition_41 + bl FindTaskIdByFunc + lsls r0, 24 + lsrs r0, 24 + bl DestroyTask +_081DB34C: + movs r0, 0 + pop {r1} + bx r1 + .pool + thumb_func_end sub_81DB328 + .align 2, 0 @ Don't pad with nop. diff --git a/asm/unk_transition_2.s b/asm/unk_transition_2.s deleted file mode 100755 index a2ec93e5de..0000000000 --- a/asm/unk_transition_2.s +++ /dev/null @@ -1,268 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_81DB158 -sub_81DB158: @ 81DB158 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_0862B7E8 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_081DB16A: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _081DB16A - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81DB158 - - thumb_func_start sub_81DB190 -sub_81DB190: @ 81DB190 - push {r4,lr} - sub sp, 0x10 - adds r4, r0, 0 - movs r0, 0xA - ldrsh r1, [r4, r0] - cmp r1, 0 - bne _081DB1BE - movs r0, 0x80 - str r0, [sp] - str r1, [sp, 0x4] - subs r0, 0x84 - str r0, [sp, 0x8] - str r1, [sp, 0xC] - movs r0, 0x78 - movs r1, 0x2D - movs r2, 0xC - movs r3, 0x4 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x10] - b _081DB212 -_081DB1BE: - cmp r1, 0x10 - bne _081DB1E6 - movs r0, 0x80 - str r0, [sp] - movs r0, 0 - str r0, [sp, 0x4] - subs r0, 0x4 - str r0, [sp, 0x8] - movs r0, 0x1 - str r0, [sp, 0xC] - movs r0, 0x59 - movs r1, 0x61 - movs r2, 0xFC - movs r3, 0x4 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x12] - b _081DB212 -_081DB1E6: - cmp r1, 0x20 - bne _081DB212 - movs r0, 0x80 - str r0, [sp] - movs r0, 0 - str r0, [sp, 0x4] - subs r0, 0x4 - str r0, [sp, 0x8] - movs r0, 0x2 - str r0, [sp, 0xC] - movs r0, 0x97 - movs r1, 0x61 - movs r2, 0x84 - movs r3, 0x4 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x14] - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_081DB212: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - movs r0, 0 - add sp, 0x10 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81DB190 - - thumb_func_start sub_81DB224 -sub_81DB224: @ 81DB224 - push {lr} - adds r2, r0, 0 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _081DB248 - adds r0, r2, 0 - bl sub_81DAA20 - ldr r0, =sub_81DB158 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_081DB248: - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81DB224 - - thumb_func_start sub_81DB258 -sub_81DB258: @ 81DB258 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_0862B7FC - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_081DB26A: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _081DB26A - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81DB258 - - thumb_func_start sub_81DB290 -sub_81DB290: @ 81DB290 - push {r4,lr} - sub sp, 0x10 - adds r4, r0, 0 - movs r0, 0xA - ldrsh r1, [r4, r0] - cmp r1, 0 - bne _081DB2C2 - movs r2, 0x8E - lsls r2, 1 - movs r0, 0x83 - str r0, [sp] - movs r0, 0x23 - str r0, [sp, 0x4] - subs r0, 0x26 - str r0, [sp, 0x8] - str r1, [sp, 0xC] - movs r0, 0x78 - movs r1, 0x50 - movs r3, 0x8 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x10] - b _081DB316 -_081DB2C2: - cmp r1, 0x10 - bne _081DB2EA - movs r0, 0x83 - str r0, [sp] - movs r0, 0x23 - str r0, [sp, 0x4] - subs r0, 0x26 - str r0, [sp, 0x8] - movs r0, 0x1 - str r0, [sp, 0xC] - movs r0, 0x78 - movs r1, 0x50 - movs r2, 0x2C - movs r3, 0x8 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x12] - b _081DB316 -_081DB2EA: - cmp r1, 0x20 - bne _081DB316 - movs r0, 0x83 - str r0, [sp] - movs r0, 0x23 - str r0, [sp, 0x4] - subs r0, 0x26 - str r0, [sp, 0x8] - movs r0, 0x2 - str r0, [sp, 0xC] - movs r0, 0x79 - movs r1, 0x50 - movs r2, 0xA4 - movs r3, 0x8 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x14] - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_081DB316: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - movs r0, 0 - add sp, 0x10 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81DB290 - - thumb_func_start sub_81DB328 -sub_81DB328: @ 81DB328 - push {lr} - adds r2, r0, 0 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _081DB34C - adds r0, r2, 0 - bl sub_81DAA20 - ldr r0, =sub_81DB258 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_081DB34C: - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81DB328 - - .align 2, 0 @ Don't pad with nop. diff --git a/data/battle_transition.s b/data/battle_transition.s index bd0386e2b9..901eeb69d0 100644 --- a/data/battle_transition.s +++ b/data/battle_transition.s @@ -4,263 +4,6 @@ .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 diff --git a/include/battle_transition.h b/include/battle_transition.h index 84b5e37ec7..108b6232b4 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -1,6 +1,7 @@ #ifndef GUARD_BATTLE_TRANSITION_H #define GUARD_BATTLE_TRANSITION_H +void TestBattleTransition(u8 transitionId); void sub_8149DFC(u8 a1); void BattleTransition_StartOnField(u8 transitionID); void BattleTransition_Start(u8 transitionID); @@ -52,5 +53,6 @@ bool8 IsBattleTransitionDone(void); #define B_TRANSITION_39 39 #define B_TRANSITION_40 40 #define B_TRANSITION_41 41 +#define B_TRANSITION_COUNT 42 #endif // GUARD_BATTLE_TRANSITION_H diff --git a/include/overworld.h b/include/overworld.h index a5fba0c10a..9f0f80a233 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -71,4 +71,6 @@ void mapldr_default(void); void IncrementGameStat(u8); u32 GetGameStat(u8); +void CB2_OverworldBasic(void); + #endif //GUARD_ROM4_H diff --git a/include/unk_transition.h b/include/unk_transition.h new file mode 100644 index 0000000000..ef7b33ed7f --- /dev/null +++ b/include/unk_transition.h @@ -0,0 +1,13 @@ +#ifndef GUARD_UNK_TRANSITION_H +#define GUARD_UNK_TRANSITION_H + +void Phase2Task_Transition_34(u8 taskId); +void Phase2Task_Transition_35(u8 taskId); +void Phase2Task_Transition_36(u8 taskId); +void Phase2Task_Transition_37(u8 taskId); +void Phase2Task_Transition_38(u8 taskId); +void Phase2Task_Transition_39(u8 taskId); +void Phase2Task_Transition_40(u8 taskId); +void Phase2Task_Transition_41(u8 taskId); + +#endif // GUARD_UNK_TRANSITION_H diff --git a/ld_script.txt b/ld_script.txt index af40a1de40..7aeee8c8d7 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -196,6 +196,7 @@ SECTIONS { src/coins.o(.text); src/landmark.o(.text); asm/fldeff_strength.o(.text); + src/battle_transition.o(.text); asm/battle_transition.o(.text); src/battle_controller_link_partner.o(.text); src/battle_message.o(.text); @@ -274,7 +275,6 @@ SECTIONS { asm/trainer_rematch.o(.text); asm/unk_sprite_file.o(.text); asm/unk_transition.o(.text); - asm/unk_transition_2.o(.text); src/international_string_util.o(.text); asm/international_string_util.o(.text); } =0 @@ -447,6 +447,7 @@ SECTIONS { data/roulette.o(.rodata); data/pokedex_cry_screen.o(.rodata); src/landmark.o(.rodata); + src/battle_transition.o(.rodata); data/battle_transition.o(.rodata); src/battle_controller_link_partner.o(.rodata); src/battle_message.o(.rodata); diff --git a/src/battle_transition.c b/src/battle_transition.c new file mode 100644 index 0000000000..386b0dd791 --- /dev/null +++ b/src/battle_transition.c @@ -0,0 +1,287 @@ +#include "global.h" +#include "battle_transition.h" +#include "unk_transition.h" +#include "main.h" +#include "overworld.h" +#include "task.h" +#include "palette.h" +#include "trig.h" +#include "field_effect.h" +#include "random.h" +#include "sprite.h" +#include "sound.h" +#include "constants/songs.h" +#include "constants/trainers.h" +#include "field_camera.h" +#include "unknown_task.h" +#include "malloc.h" + +struct TransitionData +{ + vs8 VBlank_DMA; + u16 WININ; + u16 WINOUT; + u16 field_6; + u16 WIN0V; + u16 field_A; + u16 field_C; + u16 BLDCNT; + u16 BLDALPHA; + u16 BLDY; + s16 field_14; + s16 field_16; + s16 field_18; + s16 field_1A; + s16 field_1C; + s16 field_1E; // unused + s16 field_20; + s16 field_22; // unused + s16 data[11]; +}; + +typedef bool8 (*TransitionState)(struct Task *task); +typedef bool8 (*TransitionSpriteCallback)(struct Sprite *sprite); + +extern void c2_exit_to_overworld_2_switch(void); +extern void sub_80AC3D0(void); + +// this file's functions +void LaunchBattleTransitionTask(u8 transitionId); +void Task_BattleTransitionMain(u8 taskId); +void Phase1Task_TransitionAll(u8 taskId); +void Phase2Task_Transition_Blur(u8 taskId); +void Phase2Task_Transition_Swirl(u8 taskId); +void Phase2Task_Transition_Shuffle(u8 taskId); +void Phase2Task_Transition_BigPokeball(u8 taskId); +void Phase2Task_Transition_PokeballsTrail(u8 taskId); +void Phase2Task_Transition_Clockwise_BlackFade(u8 taskId); +void Phase2Task_Transition_Ripple(u8 taskId); +void Phase2Task_Transition_Wave(u8 taskId); +void Phase2Task_Transition_Slice(u8 taskId); +void Phase2Task_Transition_WhiteFade(u8 taskId); +void Phase2Task_Transition_GridSquares(u8 taskId); +void Phase2Task_Transition_Shards(u8 taskId); +void Phase2Task_Transition_Sydney(u8 taskId); +void Phase2Task_Transition_Phoebe(u8 taskId); +void Phase2Task_Transition_Glacia(u8 taskId); +void Phase2Task_Transition_Drake(u8 taskId); +void Phase2Task_Transition_Wallace(u8 taskId); +void Phase2Task_Transition_Aqua(u8 taskId); +void Phase2Task_Transition_Magma(u8 taskId); +void Phase2Task_Transition_Regice(u8 taskId); +void Phase2Task_Transition_Registeel(u8 taskId); +void Phase2Task_Transition_Regirock(u8 taskId); +void Phase2Task_Transition_Kyogre(u8 taskId); +void Phase2Task_Transition_Groudon(u8 taskId); +void Phase2Task_Transition_Rayquaza(u8 taskId); +void Phase2Task_Transition_25(u8 taskId); +void Phase2Task_Transition_26(u8 taskId); +void Phase2Task_Transition_27(u8 taskId); +void Phase2Task_Transition_28(u8 taskId); +void Phase2Task_Transition_29(u8 taskId); +void Phase2Task_Transition_30(u8 taskId); +void Phase2Task_Transition_31(u8 taskId); +void Phase2Task_Transition_32(u8 taskId); +void Phase2Task_Transition_33(u8 taskId); +bool8 Transition_Phase1(struct Task *task); +bool8 Transition_WaitForPhase1(struct Task *task); +bool8 Transition_Phase2(struct Task *task); +bool8 Transition_WaitForPhase2(struct Task *task); + +// iwram bss vars +IWRAM_DATA u16 gUnknown_03001208; +IWRAM_DATA static u8 sTestingTransitionId; +IWRAM_DATA static u8 sTestingTransitionState; + +// ewram vars +EWRAM_DATA struct TransitionData *sTransitionStructPtr = NULL; + +// const rom data +const u32 sBigPokeball_Tileset[] = INCBIN_U32("graphics/battle_transitions/big_pokeball.4bpp"); +const u32 sPokeballTrail_Tileset[] = INCBIN_U32("graphics/battle_transitions/pokeball_trail.4bpp"); +const u32 sSpriteImage_85B98F0[] = INCBIN_U32("graphics/battle_transitions/pokeball.4bpp"); +const u32 sUnknown_085B9AF0[] = INCBIN_U32("graphics/battle_transitions/elite_four_bg.4bpp"); +const u32 sSpriteImage_85B9CD0[] = INCBIN_U32("graphics/battle_transitions/unused_brendan.4bpp"); +const u32 sSpriteImage_85BA4D0[] = INCBIN_U32("graphics/battle_transitions/unused_lass.4bpp"); +const u32 sShrinkingBoxTileset[] = INCBIN_U32("graphics/battle_transitions/shrinking_box.4bpp"); +const u32 sEvilTeam_Palette[] = INCBIN_U32("graphics/battle_transitions/evil_team.gbapal"); +const u32 sTeamAqua_Tileset[] = INCBIN_U32("graphics/battle_transitions/team_aqua.4bpp.lz"); +const u32 sTeamAqua_Tilemap[] = INCBIN_U32("graphics/battle_transitions/team_aqua.bin.lz"); +const u32 sTeamMagma_Tileset[] = INCBIN_U32("graphics/battle_transitions/team_magma.4bpp.lz"); +const u32 sTeamMagma_Tilemap[] = INCBIN_U32("graphics/battle_transitions/team_magma.bin.lz"); +const u32 gUnknown_085BBC14[] = INCBIN_U32("graphics/battle_transitions/85BBC14.4bpp"); +const u32 gUnknown_085BC2B4[] = INCBIN_U32("graphics/battle_transitions/85BC2B4.gbapal"); +const u32 gUnknown_085BC2D4[] = INCBIN_U32("graphics/battle_transitions/85BC2D4.gbapal"); +const u32 gUnknown_085BC2F4[] = INCBIN_U32("graphics/battle_transitions/85BC2F4.gbapal"); +const u32 gUnknown_085BC314[] = INCBIN_U32("graphics/battle_transitions/85BC314.bin"); +const u32 gUnknown_085BCB14[] = INCBIN_U32("graphics/battle_transitions/85BCB14.bin"); +const u32 gUnknown_085BD314[] = INCBIN_U32("graphics/battle_transitions/85BD314.bin"); +const u32 gUnknown_085BDB14[] = INCBIN_U32("graphics/battle_transitions/85BDB14.gbapal"); +const u32 gUnknown_085BDB34[] = INCBIN_U32("graphics/battle_transitions/kyogre.4bpp.lz"); +const u32 gUnknown_085BE1E8[] = INCBIN_U32("graphics/battle_transitions/kyogre.bin.lz"); +const u32 gUnknown_085BE51C[] = INCBIN_U32("graphics/battle_transitions/groudon.4bpp.lz"); +const u32 gUnknown_085BEA88[] = INCBIN_U32("graphics/battle_transitions/groudon.bin.lz"); +const u32 gUnknown_085BEDA0[] = INCBIN_U32("graphics/battle_transitions/kyogre_pt1.gbapal"); +const u32 gUnknown_085BEEE0[] = INCBIN_U32("graphics/battle_transitions/kyogre_pt2.gbapal"); +const u32 gUnknown_085BF0A0[] = INCBIN_U32("graphics/battle_transitions/groudon_pt1.gbapal"); +const u32 gUnknown_085BF2A0[] = INCBIN_U32("graphics/battle_transitions/groudon_pt2.gbapal"); +const u32 gUnknown_085BF4A0[] = INCBIN_U32("graphics/battle_transitions/rayquaza.gbapal"); +const u32 gUnknown_085BF6A0[] = INCBIN_U32("graphics/battle_transitions/rayquaza.4bpp"); +const u32 gUnknown_085C6BE0[] = INCBIN_U32("graphics/battle_transitions/rayquaza.bin"); +const u32 gUnknown_085C7BE0[] = INCBIN_U32("graphics/battle_transitions/frontier_brain.gbapal"); +const u32 gUnknown_085C7C00[] = INCBIN_U32("graphics/battle_transitions/frontier_brain.4bpp.lz"); +const u32 gUnknown_085C828C[] = INCBIN_U32("graphics/battle_transitions/frontier_brain.bin.lz"); +const u32 gUnknown_085C8578[] = INCBIN_U32("graphics/battle_transitions/frontier_squares_blanktiles.gbapal"); +const u32 gUnknown_085C8598[] = INCBIN_U32("graphics/battle_transitions/frontier_square_1.4bpp.lz"); +const u32 gUnknown_085C86F4[] = INCBIN_U32("graphics/battle_transitions/frontier_square_2.4bpp.lz"); +const u32 gUnknown_085C87F4[] = INCBIN_U32("graphics/battle_transitions/frontier_square_3.4bpp.lz"); +const u32 gUnknown_085C88A4[] = INCBIN_U32("graphics/battle_transitions/frontier_square_4.4bpp.lz"); +const u32 gUnknown_085C8928[] = INCBIN_U32("graphics/battle_transitions/frontier_squares.bin"); + +const TaskFunc sPhase1_Tasks[B_TRANSITION_COUNT] = +{ + [0 ... B_TRANSITION_COUNT - 1] = &Phase1Task_TransitionAll +}; + +const TaskFunc sPhase2_Tasks[B_TRANSITION_COUNT] = +{ + Phase2Task_Transition_Blur, // 0 + Phase2Task_Transition_Swirl, // 1 + Phase2Task_Transition_Shuffle, // 2 + Phase2Task_Transition_BigPokeball, // 3 + Phase2Task_Transition_PokeballsTrail, // 4 + Phase2Task_Transition_Clockwise_BlackFade, // 5 + Phase2Task_Transition_Ripple, // 6 + Phase2Task_Transition_Wave, // 7 + Phase2Task_Transition_Slice, // 8 + Phase2Task_Transition_WhiteFade, // 9 + Phase2Task_Transition_GridSquares, // 10 + Phase2Task_Transition_Shards, // 11 + Phase2Task_Transition_Sydney, // 12 + Phase2Task_Transition_Phoebe, // 13 + Phase2Task_Transition_Glacia, // 14 + Phase2Task_Transition_Drake, // 15 + Phase2Task_Transition_Wallace, // 16 + Phase2Task_Transition_Aqua, // 17 + Phase2Task_Transition_Magma, // 18 + Phase2Task_Transition_Regice, // 19 + Phase2Task_Transition_Registeel, // 20 + Phase2Task_Transition_Regirock, // 21 + Phase2Task_Transition_Kyogre, // 22 + Phase2Task_Transition_Groudon, // 23 + Phase2Task_Transition_Rayquaza, // 24 + Phase2Task_Transition_25, // 25 + Phase2Task_Transition_26, // 26 + Phase2Task_Transition_27, // 27 + Phase2Task_Transition_28, // 28 + Phase2Task_Transition_29, // 29 + Phase2Task_Transition_30, // 30 + Phase2Task_Transition_31, // 31 + Phase2Task_Transition_32, // 32 + Phase2Task_Transition_33, // 33 + Phase2Task_Transition_34, // 34 + Phase2Task_Transition_35, // 35 + Phase2Task_Transition_36, // 36 + Phase2Task_Transition_37, // 37 + Phase2Task_Transition_38, // 38 + Phase2Task_Transition_39, // 39 + Phase2Task_Transition_40, // 40 + Phase2Task_Transition_41, // 41 +}; + +const TransitionState sMainTransitionPhases[] = +{ + &Transition_Phase1, + &Transition_WaitForPhase1, + &Transition_Phase2, + &Transition_WaitForPhase2 +}; + +// code +static void CB2_TestBattleTransition(void) +{ + switch (sTestingTransitionState) + { + case 0: + LaunchBattleTransitionTask(sTestingTransitionId); + sTestingTransitionState++; + break; + case 1: + if (IsBattleTransitionDone()) + { + sTestingTransitionState = 0; + SetMainCallback2(c2_exit_to_overworld_2_switch); + } + break; + } + + RunTasks(); + AnimateSprites(); + BuildOamBuffer(); + UpdatePaletteFade(); +} + +void TestBattleTransition(u8 transitionId) +{ + sTestingTransitionId = transitionId; + SetMainCallback2(CB2_TestBattleTransition); +} + +void BattleTransition_StartOnField(u8 transitionId) +{ + gMain.callback2 = CB2_OverworldBasic; + LaunchBattleTransitionTask(transitionId); +} + +void BattleTransition_Start(u8 transitionId) +{ + LaunchBattleTransitionTask(transitionId); +} + +#define tState data[0] +#define tTransitionID data[1] +#define tTransitionDone data[15] + +bool8 IsBattleTransitionDone(void) +{ + u8 taskId = FindTaskIdByFunc(Task_BattleTransitionMain); + if (gTasks[taskId].tTransitionDone) + { + DestroyTask(taskId); + FREE_AND_SET_NULL(sTransitionStructPtr); + return TRUE; + } + else + { + return FALSE; + } +} + +void LaunchBattleTransitionTask(u8 transitionId) +{ + u8 taskId = CreateTask(Task_BattleTransitionMain, 2); + gTasks[taskId].tTransitionID = transitionId; + sTransitionStructPtr = AllocZeroed(sizeof(*sTransitionStructPtr)); +} + +void Task_BattleTransitionMain(u8 taskId) +{ + while (sMainTransitionPhases[gTasks[taskId].tState](&gTasks[taskId])); +} + +bool8 Transition_Phase1(struct Task *task) +{ + sub_80AC3D0(); + CpuCopy32(gPlttBufferFaded, gPlttBufferUnfaded, 0x400); + if (sPhase1_Tasks[task->tTransitionID] != NULL) + { + CreateTask(sPhase1_Tasks[task->tTransitionID], 4); + task->tState++; + return FALSE; + } + else + { + task->tState = 2; + return TRUE; + } +} diff --git a/sym_bss.txt b/sym_bss.txt index de452b2e7d..0524f5545f 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -73,14 +73,9 @@ gUnknown_03001202: @ 3001202 gUnknown_03001204: @ 3001204 .space 0x4 -gUnknown_03001208: @ 3001208 - .space 0x2 - -sTestingTransitionId: @ 300120A - .space 0x1 - -sTestingTransitionState: @ 300120B - .space 0x5 + .include "src/battle_transition.o" + + .align 4 gUnknown_03001210: @ 3001210 .space 0x30 diff --git a/sym_ewram.txt b/sym_ewram.txt index 4af63595e2..d328d8864e 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -1193,10 +1193,7 @@ gUnknown_0203AB98: @ 203AB98 .space 0x4 .include "src/coins.o" - - .align 2 -sTransitionStructPtr: @ 203ABA0 - .space 0x4 + .include "src/battle_transition.o" gAbilitiesPerBank: @ 203ABA4 .space 0x4 From eb00e8ba4acab773b5bcebbc622563c60abb512d Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 2 Jan 2018 20:38:33 +0100 Subject: [PATCH 02/64] more work on battle transition --- asm/battle_transition.s | 4893 +---------------------------------- asm/field_effect.s | 6 +- asm/main_menu.s | 4 +- asm/unk_transition.s | 64 +- data/battle_transition.s | 197 +- data/field_effect_scripts.s | 2 +- include/battle_transition.h | 10 + include/field_effect.h | 1 + include/gba/io_reg.h | 61 +- include/unk_transition.h | 16 +- src/battle_transition.c | 2072 ++++++++++++++- 11 files changed, 2174 insertions(+), 5152 deletions(-) diff --git a/asm/battle_transition.s b/asm/battle_transition.s index 45c62656af..ef5c95332d 100644 --- a/asm/battle_transition.s +++ b/asm/battle_transition.s @@ -5,4765 +5,8 @@ .text - thumb_func_start Transition_WaitForPhase1 -Transition_WaitForPhase1: @ 8146030 - push {r4,lr} - adds r4, r0, 0 - ldr r1, =sPhase1_Tasks - movs r2, 0xA - ldrsh r0, [r4, r2] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xFF - beq _08146054 - movs r0, 0 - b _0814605C - .pool -_08146054: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0x1 -_0814605C: - pop {r4} - pop {r1} - bx r1 - thumb_func_end Transition_WaitForPhase1 - - thumb_func_start Transition_Phase2 -Transition_Phase2: @ 8146064 - push {r4,lr} - adds r4, r0, 0 - ldr r1, =sPhase2_Tasks - movs r2, 0xA - ldrsh r0, [r4, r2] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - movs r1, 0 - bl CreateTask - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end Transition_Phase2 - - thumb_func_start Transition_WaitForPhase2 -Transition_WaitForPhase2: @ 814608C - push {r4,lr} - adds r4, r0, 0 - movs r0, 0 - strh r0, [r4, 0x26] - ldr r1, =sPhase2_Tasks - movs r2, 0xA - ldrsh r0, [r4, r2] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xFF - bne _081460B0 - movs r0, 0x1 - strh r0, [r4, 0x26] -_081460B0: - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end Transition_WaitForPhase2 - - thumb_func_start Phase1Task_TransitionAll -Phase1Task_TransitionAll: @ 81460BC - push {r4,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r0, 24 - adds r4, r0, 0 - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r1, r0, r1 - ldrh r2, [r1, 0x8] - movs r3, 0x8 - ldrsh r0, [r1, r3] - cmp r0, 0 - bne _081460F4 - adds r0, r2, 0x1 - strh r0, [r1, 0x8] - movs r0, 0x2 - str r0, [sp] - movs r0, 0 - movs r1, 0 - movs r2, 0x3 - movs r3, 0x2 - bl sub_8149D78 - b _08146104 - .pool -_081460F4: - bl sub_8149DDC - lsls r0, 24 - cmp r0, 0 - beq _08146104 - adds r0, r4, 0 - bl DestroyTask -_08146104: - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - thumb_func_end Phase1Task_TransitionAll - - thumb_func_start Phase2Task_Transition_Blur -Phase2Task_Transition_Blur: @ 814610C - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =sPhase2_Transition_Blur_Funcs - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_0814611E: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _0814611E - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_Transition_Blur - - thumb_func_start sub_8146144 -sub_8146144: @ 8146144 - push {r4,lr} - adds r4, r0, 0 - movs r0, 0x4C - movs r1, 0 - bl SetGpuReg - movs r0, 0xA - movs r1, 0x40 - bl SetGpuRegBits - movs r0, 0xC - movs r1, 0x40 - bl SetGpuRegBits - movs r0, 0xE - movs r1, 0x40 - bl SetGpuRegBits - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0x1 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8146144 - - thumb_func_start sub_8146178 -sub_8146178: @ 8146178 - push {r4,lr} - sub sp, 0x4 - adds r4, r0, 0 - ldrh r0, [r4, 0xA] - movs r1, 0xA - ldrsh r2, [r4, r1] - cmp r2, 0 - beq _0814618E - subs r0, 0x1 - strh r0, [r4, 0xA] - b _081461CE -_0814618E: - movs r0, 0x4 - strh r0, [r4, 0xA] - ldrh r0, [r4, 0xC] - adds r0, 0x1 - strh r0, [r4, 0xC] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xA - bne _081461B0 - movs r1, 0x1 - negs r1, r1 - str r2, [sp] - adds r0, r1, 0 - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade -_081461B0: - ldrh r1, [r4, 0xC] - movs r0, 0xF - ands r0, r1 - lsls r1, r0, 4 - orrs r1, r0 - movs r0, 0x4C - bl SetGpuReg - movs r1, 0xC - ldrsh r0, [r4, r1] - cmp r0, 0xE - ble _081461CE - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_081461CE: - movs r0, 0 - add sp, 0x4 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8146178 - - thumb_func_start sub_81461D8 -sub_81461D8: @ 81461D8 - push {lr} - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _081461F4 - ldr r0, =Phase2Task_Transition_Blur - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_081461F4: - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81461D8 - - thumb_func_start Phase2Task_Transition_Swirl -Phase2Task_Transition_Swirl: @ 8146204 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =sPhase2_Transition_Swirl_Funcs - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_08146216: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _08146216 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_Transition_Swirl - - thumb_func_start sub_814623C -sub_814623C: @ 814623C - push {r4,r5,lr} - sub sp, 0x8 - adds r5, r0, 0 - bl sub_8149F08 - bl dp12_8087EA4 - movs r0, 0x1 - negs r0, r0 - movs r4, 0 - str r4, [sp] - movs r1, 0x4 - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - ldr r0, =gUnknown_020393A8 - ldr r1, =sTransitionStructPtr - ldr r1, [r1] - movs r2, 0x14 - ldrsh r1, [r1, r2] - str r4, [sp] - movs r2, 0xA0 - str r2, [sp, 0x4] - movs r2, 0 - movs r3, 0x2 - bl sub_8149F98 - ldr r0, =sub_8146320 - bl SetVBlankCallback - ldr r0, =sub_8146358 - bl SetHBlankCallback - movs r0, 0x3 - bl EnableInterrupts - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] - movs r0, 0 - add sp, 0x8 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_814623C - - thumb_func_start sub_81462A8 -sub_81462A8: @ 81462A8 - push {r4,r5,lr} - sub sp, 0x8 - ldr r4, =sTransitionStructPtr - ldr r2, [r4] - ldrb r1, [r2] - movs r1, 0 - strb r1, [r2] - ldrh r1, [r0, 0xA] - adds r1, 0x4 - strh r1, [r0, 0xA] - ldrh r1, [r0, 0xC] - adds r1, 0x8 - strh r1, [r0, 0xC] - ldr r3, =gUnknown_02038C28 - ldr r1, [r4] - movs r2, 0x14 - ldrsh r1, [r1, r2] - movs r5, 0xA - ldrsh r2, [r0, r5] - movs r5, 0xC - ldrsh r0, [r0, r5] - str r0, [sp] - movs r0, 0xA0 - str r0, [sp, 0x4] - adds r0, r3, 0 - movs r3, 0x2 - bl sub_8149F98 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _081462FA - ldr r0, =Phase2Task_Transition_Swirl - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_081462FA: - ldr r0, [r4] - ldrb r1, [r0] - adds r1, 0x1 - ldrb r2, [r0] - strb r1, [r0] - movs r0, 0 - add sp, 0x8 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81462A8 - - thumb_func_start sub_8146320 -sub_8146320: @ 8146320 - push {lr} - bl sub_8149F2C - ldr r0, =sTransitionStructPtr - ldr r0, [r0] - ldrb r0, [r0] - cmp r0, 0 - beq _08146344 - ldr r1, =0x040000d4 - ldr r0, =gUnknown_02038C28 - str r0, [r1] - movs r2, 0xF0 - lsls r2, 3 - adds r0, r2 - str r0, [r1, 0x4] - ldr r0, =0x800000a0 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] -_08146344: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8146320 - - thumb_func_start sub_8146358 -sub_8146358: @ 8146358 - ldr r1, =gUnknown_02038C28 - ldr r0, =0x04000006 - ldrh r0, [r0] - lsls r0, 1 - movs r2, 0xF0 - lsls r2, 3 - adds r1, r2 - adds r0, r1 - ldrh r1, [r0] - ldr r0, =0x04000014 - strh r1, [r0] - adds r0, 0x4 - strh r1, [r0] - adds r0, 0x4 - strh r1, [r0] - bx lr - .pool - thumb_func_end sub_8146358 - - thumb_func_start Phase2Task_Transition_Shuffle -Phase2Task_Transition_Shuffle: @ 8146384 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =sPhase2_Transition_Shuffle_Funcs - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_08146396: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _08146396 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_Transition_Shuffle - - thumb_func_start sub_81463BC -sub_81463BC: @ 81463BC - push {r4,lr} - sub sp, 0x4 - adds r4, r0, 0 - bl sub_8149F08 - bl dp12_8087EA4 - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r1, 0x4 - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - ldr r0, =gUnknown_020393A8 - movs r2, 0x16 - ldrsh r1, [r1, r2] - movs r2, 0xA0 - lsls r2, 1 - bl memset - ldr r0, =sub_81464B0 - bl SetVBlankCallback - ldr r0, =sub_81464E8 - bl SetHBlankCallback - movs r0, 0x3 - bl EnableInterrupts - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - add sp, 0x4 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81463BC - - thumb_func_start sub_8146420 -sub_8146420: @ 8146420 - push {r4-r7,lr} - ldr r1, =sTransitionStructPtr - ldr r2, [r1] - ldrb r1, [r2] - movs r1, 0 - strb r1, [r2] - ldrh r4, [r0, 0xA] - ldrh r2, [r0, 0xC] - lsls r3, r2, 16 - asrs r3, 24 - movs r5, 0x84 - lsls r5, 5 - adds r1, r4, r5 - strh r1, [r0, 0xA] - movs r1, 0xC0 - lsls r1, 1 - adds r2, r1 - strh r2, [r0, 0xC] - movs r5, 0 - lsls r7, r3, 16 -_08146448: - lsrs r0, r4, 8 - asrs r1, r7, 16 - bl Sin - ldr r1, =gUnknown_02038C28 - lsls r2, r5, 1 - adds r2, r1 - ldr r6, =sTransitionStructPtr - ldr r1, [r6] - ldrh r1, [r1, 0x16] - adds r0, r1 - strh r0, [r2] - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - movs r1, 0x84 - lsls r1, 5 - adds r0, r4, r1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r5, 0x9F - bls _08146448 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _0814648E - ldr r0, =Phase2Task_Transition_Shuffle - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_0814648E: - ldr r0, [r6] - ldrb r1, [r0] - adds r1, 0x1 - ldrb r2, [r0] - strb r1, [r0] - movs r0, 0 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8146420 - - thumb_func_start sub_81464B0 -sub_81464B0: @ 81464B0 - push {lr} - bl sub_8149F2C - ldr r0, =sTransitionStructPtr - ldr r0, [r0] - ldrb r0, [r0] - cmp r0, 0 - beq _081464D4 - ldr r1, =0x040000d4 - ldr r0, =gUnknown_02038C28 - str r0, [r1] - movs r2, 0xF0 - lsls r2, 3 - adds r0, r2 - str r0, [r1, 0x4] - ldr r0, =0x800000a0 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] -_081464D4: - pop {r0} - bx r0 - .pool - thumb_func_end sub_81464B0 - - thumb_func_start sub_81464E8 -sub_81464E8: @ 81464E8 - ldr r1, =gUnknown_02038C28 - ldr r0, =0x04000006 - ldrh r0, [r0] - lsls r0, 1 - movs r2, 0xF0 - lsls r2, 3 - adds r1, r2 - adds r0, r1 - ldrh r1, [r0] - ldr r0, =0x04000016 - strh r1, [r0] - adds r0, 0x4 - strh r1, [r0] - adds r0, 0x4 - strh r1, [r0] - bx lr - .pool - thumb_func_end sub_81464E8 - - thumb_func_start Phase2Task_Transition_BigPokeball -Phase2Task_Transition_BigPokeball: @ 8146514 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_085C8AFC - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_08146526: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _08146526 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_Transition_BigPokeball - - thumb_func_start Phase2Task_Transition_Aqua -Phase2Task_Transition_Aqua: @ 814654C - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_085C8AC4 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_0814655E: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _0814655E - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_Transition_Aqua - - thumb_func_start Phase2Task_Transition_Magma -Phase2Task_Transition_Magma: @ 8146584 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_085C8AE0 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_08146596: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _08146596 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_Transition_Magma - - thumb_func_start Phase2Task_Transition_Regice -Phase2Task_Transition_Regice: @ 81465BC - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_085C8B14 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_081465CE: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _081465CE - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_Transition_Regice - - thumb_func_start Phase2Task_Transition_Registeel -Phase2Task_Transition_Registeel: @ 81465F4 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_085C8B2C - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_08146606: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _08146606 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_Transition_Registeel - - thumb_func_start Phase2Task_Transition_Regirock -Phase2Task_Transition_Regirock: @ 814662C - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_085C8B44 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_0814663E: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _0814663E - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_Transition_Regirock - - thumb_func_start Phase2Task_Transition_Kyogre -Phase2Task_Transition_Kyogre: @ 8146664 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_085C8B5C - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_08146676: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _08146676 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_Transition_Kyogre - - thumb_func_start sub_814669C -sub_814669C: @ 814669C - push {r4,lr} - adds r4, r0, 0 - bl sub_8149F08 - bl dp12_8087EA4 - movs r1, 0 - movs r0, 0x10 - strh r0, [r4, 0xA] - strh r1, [r4, 0xC] - strh r1, [r4, 0x10] - movs r0, 0x80 - lsls r0, 7 - strh r0, [r4, 0x12] - ldr r0, =sTransitionStructPtr - ldr r2, [r0] - movs r0, 0x3F - strh r0, [r2, 0x2] - strh r1, [r2, 0x4] - movs r0, 0xF0 - strh r0, [r2, 0x6] - movs r0, 0xA0 - strh r0, [r2, 0x8] - ldr r0, =0x00003f41 - strh r0, [r2, 0xE] - ldrh r0, [r4, 0xA] - lsls r0, 8 - ldrh r1, [r4, 0xC] - orrs r0, r1 - strh r0, [r2, 0x10] - ldr r0, =gUnknown_02038C28 - movs r2, 0xF0 - movs r1, 0x9F - ldr r3, =0x000008be - adds r0, r3 -_081466E2: - strh r2, [r0] - subs r0, 0x2 - subs r1, 0x1 - cmp r1, 0 - bge _081466E2 - ldr r0, =sub_8146F3C - bl SetVBlankCallback - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_814669C - - thumb_func_start sub_814670C -sub_814670C: @ 814670C - push {r4,r5,lr} - sub sp, 0xC - adds r4, r0, 0 - movs r5, 0 - movs r0, 0x3C - strh r0, [r4, 0x18] - adds r0, r4, 0 - bl sub_814669C - add r0, sp, 0x4 - add r1, sp, 0x8 - bl sub_8149F58 - mov r0, sp - strh r5, [r0] - ldr r1, [sp, 0x4] - ldr r2, =0x01000400 - bl CpuSet - ldr r0, =sTeamAqua_Tileset - ldr r1, [sp, 0x8] - bl LZ77UnCompVram - ldr r0, =sEvilTeam_Palette - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - add sp, 0xC - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_814670C - - thumb_func_start sub_8146760 -sub_8146760: @ 8146760 - push {r4,r5,lr} - sub sp, 0xC - adds r4, r0, 0 - movs r5, 0 - movs r0, 0x3C - strh r0, [r4, 0x18] - adds r0, r4, 0 - bl sub_814669C - add r0, sp, 0x4 - add r1, sp, 0x8 - bl sub_8149F58 - mov r0, sp - strh r5, [r0] - ldr r1, [sp, 0x4] - ldr r2, =0x01000400 - bl CpuSet - ldr r0, =sTeamMagma_Tileset - ldr r1, [sp, 0x8] - bl LZ77UnCompVram - ldr r0, =sEvilTeam_Palette - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - add sp, 0xC - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8146760 - - thumb_func_start sub_81467B4 -sub_81467B4: @ 81467B4 - push {r4,r5,lr} - sub sp, 0xC - adds r4, r0, 0 - movs r5, 0 - movs r0, 0x3C - strh r0, [r4, 0x18] - adds r0, r4, 0 - bl sub_814669C - add r0, sp, 0x4 - add r1, sp, 0x8 - bl sub_8149F58 - mov r0, sp - strh r5, [r0] - ldr r1, [sp, 0x4] - ldr r2, =0x01000400 - bl CpuSet - ldr r0, =gUnknown_085BBC14 - ldr r1, [sp, 0x8] - movs r2, 0x80 - lsls r2, 5 - bl CpuSet - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - add sp, 0xC - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81467B4 - - thumb_func_start sub_8146800 -sub_8146800: @ 8146800 - push {r4,lr} - sub sp, 0xC - adds r4, r0, 0 - bl sub_814669C - add r0, sp, 0x4 - add r1, sp, 0x8 - bl sub_8149F58 - mov r1, sp - movs r0, 0 - strh r0, [r1] - ldr r1, [sp, 0x4] - ldr r2, =0x01000400 - mov r0, sp - bl CpuSet - ldr r0, =sBigPokeball_Tileset - ldr r1, [sp, 0x8] - movs r2, 0xB0 - lsls r2, 2 - bl CpuSet - ldr r0, =gFieldEffectObjectPalette10 - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - add sp, 0xC - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8146800 - - thumb_func_start sub_8146854 -sub_8146854: @ 8146854 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x10 - adds r7, r0, 0 - add r1, sp, 0xC - add r0, sp, 0x8 - bl sub_8149F58 - ldr r5, =sBigPokeball_Tilemap - movs r1, 0 - ldr r0, [sp, 0x8] - mov r9, r0 - ldr r6, =gUnknown_02038C28 - mov r8, r6 - movs r0, 0xF0 - lsls r0, 8 - mov r12, r0 -_0814687A: - movs r0, 0 - lsls r3, r1, 16 - asrs r4, r3, 11 -_08146880: - lsls r2, r0, 16 - asrs r2, 16 - adds r1, r4, r2 - lsls r1, 1 - add r1, r9 - ldrh r0, [r5] - mov r6, r12 - orrs r0, r6 - strh r0, [r1] - adds r2, 0x1 - lsls r2, 16 - adds r5, 0x2 - lsrs r0, r2, 16 - asrs r2, 16 - cmp r2, 0x1D - ble _08146880 - movs r1, 0x80 - lsls r1, 9 - adds r0, r3, r1 - lsrs r1, r0, 16 - asrs r0, 16 - cmp r0, 0x13 - ble _0814687A - movs r6, 0x10 - ldrsh r2, [r7, r6] - movs r1, 0x12 - ldrsh r0, [r7, r1] - str r0, [sp] - movs r0, 0xA0 - str r0, [sp, 0x4] - mov r0, r8 - movs r1, 0 - movs r3, 0x84 - bl sub_8149F98 - ldrh r0, [r7, 0x8] - adds r0, 0x1 - strh r0, [r7, 0x8] - movs r0, 0x1 - add sp, 0x10 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8146854 - - thumb_func_start sub_81468E4 -sub_81468E4: @ 81468E4 - push {r4,lr} - sub sp, 0x10 - adds r4, r0, 0 - add r1, sp, 0xC - add r0, sp, 0x8 - bl sub_8149F58 - ldr r0, =sTeamAqua_Tilemap - ldr r1, [sp, 0x8] - bl LZ77UnCompVram - ldr r0, =gUnknown_02038C28 - movs r1, 0x10 - ldrsh r2, [r4, r1] - movs r3, 0x12 - ldrsh r1, [r4, r3] - str r1, [sp] - movs r1, 0xA0 - str r1, [sp, 0x4] - movs r1, 0 - movs r3, 0x84 - bl sub_8149F98 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - add sp, 0x10 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81468E4 - - thumb_func_start sub_814692C -sub_814692C: @ 814692C - push {r4,lr} - sub sp, 0x10 - adds r4, r0, 0 - add r1, sp, 0xC - add r0, sp, 0x8 - bl sub_8149F58 - ldr r0, =sTeamMagma_Tilemap - ldr r1, [sp, 0x8] - bl LZ77UnCompVram - ldr r0, =gUnknown_02038C28 - movs r1, 0x10 - ldrsh r2, [r4, r1] - movs r3, 0x12 - ldrsh r1, [r4, r3] - str r1, [sp] - movs r1, 0xA0 - str r1, [sp, 0x4] - movs r1, 0 - movs r3, 0x84 - bl sub_8149F98 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - add sp, 0x10 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_814692C - - thumb_func_start sub_8146974 -sub_8146974: @ 8146974 - push {r4,lr} - sub sp, 0x10 - adds r4, r0, 0 - add r1, sp, 0xC - add r0, sp, 0x8 - bl sub_8149F58 - ldr r0, =gUnknown_085BC2B4 - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - ldr r0, =gUnknown_085BC314 - ldr r1, [sp, 0x8] - movs r2, 0xA0 - lsls r2, 2 - bl CpuSet - ldr r0, =gUnknown_02038C28 - movs r1, 0x10 - ldrsh r2, [r4, r1] - movs r3, 0x12 - ldrsh r1, [r4, r3] - str r1, [sp] - movs r1, 0xA0 - str r1, [sp, 0x4] - movs r1, 0 - movs r3, 0x84 - bl sub_8149F98 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - add sp, 0x10 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8146974 - - thumb_func_start sub_81469CC -sub_81469CC: @ 81469CC - push {r4,lr} - sub sp, 0x10 - adds r4, r0, 0 - add r1, sp, 0xC - add r0, sp, 0x8 - bl sub_8149F58 - ldr r0, =gUnknown_085BC2D4 - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - ldr r0, =gUnknown_085BCB14 - ldr r1, [sp, 0x8] - movs r2, 0xA0 - lsls r2, 2 - bl CpuSet - ldr r0, =gUnknown_02038C28 - movs r1, 0x10 - ldrsh r2, [r4, r1] - movs r3, 0x12 - ldrsh r1, [r4, r3] - str r1, [sp] - movs r1, 0xA0 - str r1, [sp, 0x4] - movs r1, 0 - movs r3, 0x84 - bl sub_8149F98 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - add sp, 0x10 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81469CC - - thumb_func_start sub_8146A24 -sub_8146A24: @ 8146A24 - push {r4,lr} - sub sp, 0x10 - adds r4, r0, 0 - add r1, sp, 0xC - add r0, sp, 0x8 - bl sub_8149F58 - ldr r0, =gUnknown_085BC2F4 - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - ldr r0, =gUnknown_085BD314 - ldr r1, [sp, 0x8] - movs r2, 0xA0 - lsls r2, 2 - bl CpuSet - ldr r0, =gUnknown_02038C28 - movs r1, 0x10 - ldrsh r2, [r4, r1] - movs r3, 0x12 - ldrsh r1, [r4, r3] - str r1, [sp] - movs r1, 0xA0 - str r1, [sp, 0x4] - movs r1, 0 - movs r3, 0x84 - bl sub_8149F98 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - add sp, 0x10 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8146A24 - - thumb_func_start sub_8146A7C -sub_8146A7C: @ 8146A7C - push {r4,lr} - sub sp, 0xC - adds r4, r0, 0 - add r0, sp, 0x4 - add r1, sp, 0x8 - bl sub_8149F58 - mov r1, sp - movs r0, 0 - strh r0, [r1] - ldr r1, [sp, 0x4] - ldr r2, =0x01000400 - mov r0, sp - bl CpuSet - ldr r0, =gUnknown_085BDB34 - ldr r1, [sp, 0x8] - bl LZ77UnCompVram - ldr r0, =gUnknown_085BE1E8 - ldr r1, [sp, 0x4] - bl LZ77UnCompVram - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - add sp, 0xC - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8146A7C - - thumb_func_start sub_8146AC8 -sub_8146AC8: @ 8146AC8 - push {r4,r5,lr} - adds r4, r0, 0 - movs r0, 0xA - ldrsh r5, [r4, r0] - adds r0, r5, 0 - movs r1, 0x3 - bl __modsi3 - lsls r0, 16 - cmp r0, 0 - bne _08146B00 - adds r0, r5, 0 - movs r1, 0x1E - bl __modsi3 - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x3 - bl __udivsi3 - lsls r0, 16 - lsrs r0, 11 - ldr r1, =gUnknown_085BEDA0 - adds r0, r1 - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette -_08146B00: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3A - ble _08146B18 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - strh r0, [r4, 0xA] -_08146B18: - movs r0, 0 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8146AC8 - - thumb_func_start sub_8146B24 -sub_8146B24: @ 8146B24 - push {r4,r5,lr} - adds r4, r0, 0 - movs r0, 0xA - ldrsh r5, [r4, r0] - adds r0, r5, 0 - movs r1, 0x5 - bl __modsi3 - lsls r0, 16 - cmp r0, 0 - bne _08146B52 - adds r0, r5, 0 - movs r1, 0x5 - bl __divsi3 - lsls r0, 16 - asrs r0, 11 - ldr r1, =gUnknown_085BEEE0 - adds r0, r1 - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette -_08146B52: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x44 - ble _08146B6E - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - strh r0, [r4, 0xA] - movs r0, 0x1E - strh r0, [r4, 0x18] -_08146B6E: - movs r0, 0 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8146B24 - - thumb_func_start sub_8146B7C -sub_8146B7C: @ 8146B7C - push {r4,lr} - sub sp, 0x4 - adds r4, r0, 0 - ldr r0, =0xffff8000 - movs r1, 0 - str r1, [sp] - movs r1, 0x1 - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - add sp, 0x4 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8146B7C - - thumb_func_start sub_8146BA8 -sub_8146BA8: @ 8146BA8 - push {r4,lr} - adds r4, r0, 0 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08146BDE - ldr r1, =0x040000b0 - ldrh r2, [r1, 0xA] - ldr r0, =0x0000c5ff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r2, [r1, 0xA] - ldr r0, =0x00007fff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r0, [r1, 0xA] - bl sub_8149F84 - ldr r0, [r4] - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_08146BDE: - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8146BA8 - - thumb_func_start sub_8146BF8 -sub_8146BF8: @ 8146BF8 - push {r4,r5,lr} - sub sp, 0x8 - adds r3, r0, 0 - ldr r2, =sTransitionStructPtr - ldr r1, [r2] - ldrb r0, [r1] - movs r0, 0 - strb r0, [r1] - ldrh r1, [r3, 0xE] - movs r4, 0xE - ldrsh r0, [r3, r4] - adds r4, r2, 0 - cmp r0, 0 - beq _08146C1E - subs r0, r1, 0x1 - strh r0, [r3, 0xE] - lsls r0, 16 - cmp r0, 0 - bne _08146C28 -_08146C1E: - ldrh r0, [r3, 0xC] - adds r0, 0x1 - strh r0, [r3, 0xC] - movs r0, 0x2 - strh r0, [r3, 0xE] -_08146C28: - ldr r2, [r4] - ldrh r0, [r3, 0xA] - lsls r0, 8 - ldrh r1, [r3, 0xC] - orrs r0, r1 - strh r0, [r2, 0x10] - movs r5, 0xC - ldrsh r0, [r3, r5] - cmp r0, 0xF - ble _08146C42 - ldrh r0, [r3, 0x8] - adds r0, 0x1 - strh r0, [r3, 0x8] -_08146C42: - ldrh r0, [r3, 0x10] - adds r0, 0x8 - strh r0, [r3, 0x10] - ldr r0, =0xffffff00 - adds r1, r0, 0 - ldrh r5, [r3, 0x12] - adds r1, r5 - strh r1, [r3, 0x12] - ldr r0, =gUnknown_02038C28 - movs r5, 0x10 - ldrsh r2, [r3, r5] - lsls r1, 16 - asrs r1, 24 - str r1, [sp] - movs r1, 0xA0 - str r1, [sp, 0x4] - movs r1, 0 - movs r3, 0x84 - bl sub_8149F98 - ldr r1, [r4] - ldrb r0, [r1] - adds r0, 0x1 - ldrb r2, [r1] - strb r0, [r1] - movs r0, 0 - add sp, 0x8 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8146BF8 - - thumb_func_start sub_8146C8C -sub_8146C8C: @ 8146C8C - push {r4,r5,lr} - sub sp, 0x8 - adds r3, r0, 0 - ldr r2, =sTransitionStructPtr - ldr r1, [r2] - ldrb r0, [r1] - movs r0, 0 - strb r0, [r1] - ldrh r1, [r3, 0xE] - movs r4, 0xE - ldrsh r0, [r3, r4] - adds r4, r2, 0 - cmp r0, 0 - beq _08146CB2 - subs r0, r1, 0x1 - strh r0, [r3, 0xE] - lsls r0, 16 - cmp r0, 0 - bne _08146CBC -_08146CB2: - ldrh r0, [r3, 0xA] - subs r0, 0x1 - strh r0, [r3, 0xA] - movs r0, 0x2 - strh r0, [r3, 0xE] -_08146CBC: - ldr r2, [r4] - ldrh r0, [r3, 0xA] - lsls r0, 8 - ldrh r1, [r3, 0xC] - orrs r0, r1 - strh r0, [r2, 0x10] - movs r5, 0xA - ldrsh r0, [r3, r5] - cmp r0, 0 - bne _08146CD6 - ldrh r0, [r3, 0x8] - adds r0, 0x1 - strh r0, [r3, 0x8] -_08146CD6: - ldrh r0, [r3, 0x10] - adds r0, 0x8 - strh r0, [r3, 0x10] - ldr r0, =0xffffff00 - adds r1, r0, 0 - ldrh r5, [r3, 0x12] - adds r1, r5 - strh r1, [r3, 0x12] - ldr r0, =gUnknown_02038C28 - movs r5, 0x10 - ldrsh r2, [r3, r5] - lsls r1, 16 - asrs r1, 24 - str r1, [sp] - movs r1, 0xA0 - str r1, [sp, 0x4] - movs r1, 0 - movs r3, 0x84 - bl sub_8149F98 - ldr r1, [r4] - ldrb r0, [r1] - adds r0, 0x1 - ldrb r2, [r1] - strb r0, [r1] - movs r0, 0 - add sp, 0x8 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8146C8C - - thumb_func_start sub_8146D20 -sub_8146D20: @ 8146D20 - push {r4-r7,lr} - sub sp, 0x8 - adds r4, r0, 0 - ldr r7, =sTransitionStructPtr - ldr r0, [r7] - ldrb r1, [r0] - movs r6, 0 - strb r6, [r0] - ldrh r0, [r4, 0x10] - adds r0, 0x8 - strh r0, [r4, 0x10] - ldr r0, =0xffffff00 - adds r1, r0, 0 - ldrh r3, [r4, 0x12] - adds r1, r3 - strh r1, [r4, 0x12] - ldr r0, =gUnknown_02038C28 - movs r3, 0x10 - ldrsh r2, [r4, r3] - lsls r1, 16 - asrs r1, 24 - str r1, [sp] - movs r5, 0xA0 - str r5, [sp, 0x4] - movs r1, 0 - movs r3, 0x84 - bl sub_8149F98 - movs r1, 0x12 - ldrsh r0, [r4, r1] - cmp r0, 0 - bgt _08146D70 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - strh r5, [r4, 0xA] - movs r0, 0x80 - lsls r0, 1 - strh r0, [r4, 0xC] - strh r6, [r4, 0xE] -_08146D70: - ldr r0, [r7] - ldrb r1, [r0] - adds r1, 0x1 - ldrb r2, [r0] - strb r1, [r0] - movs r0, 0 - add sp, 0x8 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8146D20 - - thumb_func_start sub_8146D90 -sub_8146D90: @ 8146D90 - push {lr} - adds r1, r0, 0 - ldrh r0, [r1, 0x18] - subs r0, 0x1 - strh r0, [r1, 0x18] - lsls r0, 16 - cmp r0, 0 - bne _08146DA6 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] -_08146DA6: - movs r0, 0 - pop {r1} - bx r1 - thumb_func_end sub_8146D90 - - thumb_func_start sub_8146DAC -sub_8146DAC: @ 8146DAC - push {r4,lr} - sub sp, 0x4 - adds r4, r0, 0 - ldr r0, =0x0000ffff - movs r1, 0 - str r1, [sp] - movs r1, 0x1 - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - add sp, 0x4 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8146DAC - - thumb_func_start sub_8146DD8 -sub_8146DD8: @ 8146DD8 - push {lr} - adds r2, r0, 0 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08146DEE - ldrh r0, [r2, 0x8] - adds r0, 0x1 - strh r0, [r2, 0x8] -_08146DEE: - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_8146DD8 - - thumb_func_start sub_8146DF8 -sub_8146DF8: @ 8146DF8 - push {r4,lr} - adds r4, r0, 0 - ldr r0, =sTransitionStructPtr - ldr r0, [r0] - ldrb r1, [r0] - movs r3, 0 - strb r3, [r0] - ldrh r2, [r4, 0xC] - movs r0, 0xC - ldrsh r1, [r4, r0] - ldr r0, =0x000003ff - cmp r1, r0 - bgt _08146E18 - adds r0, r2, 0 - adds r0, 0x80 - strh r0, [r4, 0xC] -_08146E18: - ldrh r1, [r4, 0xA] - movs r2, 0xA - ldrsh r0, [r4, r2] - cmp r0, 0 - beq _08146E34 - ldrh r0, [r4, 0xC] - lsls r0, 16 - asrs r0, 24 - subs r0, r1, r0 - strh r0, [r4, 0xA] - lsls r0, 16 - cmp r0, 0 - bge _08146E34 - strh r3, [r4, 0xA] -_08146E34: - ldr r0, =gUnknown_02038C28 - movs r1, 0xA - ldrsh r3, [r4, r1] - movs r1, 0x78 - movs r2, 0x50 - bl sub_814A014 - movs r2, 0xA - ldrsh r0, [r4, r2] - cmp r0, 0 - bne _08146E90 - movs r0, 0 - bl SetVBlankCallback - ldr r1, =0x040000b0 - ldrh r2, [r1, 0xA] - ldr r0, =0x0000c5ff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r2, [r1, 0xA] - ldr r0, =0x00007fff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r0, [r1, 0xA] - bl sub_8149F84 - ldr r0, [r4] - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask - b _08146EB0 - .pool -_08146E90: - ldrh r1, [r4, 0xE] - movs r2, 0xE - ldrsh r0, [r4, r2] - cmp r0, 0 - bne _08146EA4 - adds r0, r1, 0x1 - strh r0, [r4, 0xE] - ldr r0, =sub_8146F68 - bl SetVBlankCallback -_08146EA4: - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - ldrb r0, [r1] - adds r0, 0x1 - ldrb r2, [r1] - strb r0, [r1] -_08146EB0: - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8146DF8 - - thumb_func_start sub_8146EC0 -sub_8146EC0: @ 8146EC0 - push {lr} - ldr r1, =0x040000b0 - ldrh r2, [r1, 0xA] - ldr r0, =0x0000c5ff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r2, [r1, 0xA] - ldr r0, =0x00007fff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r0, [r1, 0xA] - bl sub_8149F2C - ldr r2, =sTransitionStructPtr - ldr r0, [r2] - ldrb r0, [r0] - cmp r0, 0 - beq _08146EF8 - ldr r1, =0x040000d4 - ldr r0, =gUnknown_02038C28 - str r0, [r1] - movs r3, 0xF0 - lsls r3, 3 - adds r0, r3 - str r0, [r1, 0x4] - ldr r0, =0x800000a0 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] -_08146EF8: - ldr r1, =0x04000048 - ldr r2, [r2] - ldrh r0, [r2, 0x2] - strh r0, [r1] - adds r1, 0x2 - ldrh r0, [r2, 0x4] - strh r0, [r1] - subs r1, 0x6 - ldrh r0, [r2, 0x8] - strh r0, [r1] - adds r1, 0xC - ldrh r0, [r2, 0xE] - strh r0, [r1] - adds r1, 0x2 - ldrh r0, [r2, 0x10] - strh r0, [r1] - pop {r0} - bx r0 - .pool - thumb_func_end sub_8146EC0 - - thumb_func_start sub_8146F3C -sub_8146F3C: @ 8146F3C - push {lr} - bl sub_8146EC0 - ldr r1, =0x040000b0 - ldr r0, =gUnknown_020393A8 - str r0, [r1] - ldr r0, =0x04000010 - str r0, [r1, 0x4] - ldr r0, =0xa2400001 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - pop {r0} - bx r0 - .pool - thumb_func_end sub_8146F3C - - thumb_func_start sub_8146F68 -sub_8146F68: @ 8146F68 - push {lr} - bl sub_8146EC0 - ldr r1, =0x040000b0 - ldr r0, =gUnknown_020393A8 - str r0, [r1] - ldr r0, =0x04000040 - str r0, [r1, 0x4] - ldr r0, =0xa2400001 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - pop {r0} - bx r0 - .pool - thumb_func_end sub_8146F68 - - thumb_func_start Phase2Task_Transition_PokeballsTrail -Phase2Task_Transition_PokeballsTrail: @ 8146F94 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =sPhase2_Transition_PokeballsTrail_Funcs - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_08146FA6: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _08146FA6 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_Transition_PokeballsTrail - - thumb_func_start sub_8146FCC -sub_8146FCC: @ 8146FCC - push {r4,lr} - sub sp, 0xC - adds r4, r0, 0 - add r0, sp, 0x4 - add r1, sp, 0x8 - bl sub_8149F58 - ldr r0, =sPokeballTrail_Tileset - ldr r1, [sp, 0x8] - movs r2, 0x20 - bl CpuSet - movs r0, 0 - str r0, [sp] - ldr r1, [sp, 0x4] - ldr r2, =0x05000200 - mov r0, sp - bl CpuSet - ldr r0, =gFieldEffectObjectPalette10 - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - add sp, 0xC - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8146FCC - - thumb_func_start sub_8147018 -sub_8147018: @ 8147018 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x10 - adds r7, r0, 0 - ldr r1, =sUnknown_085C8B88 - mov r0, sp - movs r2, 0x4 - bl memcpy - add r4, sp, 0x4 - ldr r1, =sUnknown_085C8B8C - adds r0, r4, 0 - movs r2, 0xA - bl memcpy - bl Random - movs r5, 0x1 - ands r5, r0 - movs r1, 0 - mov r8, r4 - ldr r6, =gFieldEffectArguments -_08147046: - lsls r5, 16 - asrs r5, 16 - lsls r0, r5, 1 - add r0, sp - movs r2, 0 - ldrsh r0, [r0, r2] - str r0, [r6] - lsls r4, r1, 16 - asrs r4, 16 - lsls r0, r4, 5 - adds r0, 0x10 - str r0, [r6, 0x4] - str r5, [r6, 0x8] - lsls r0, r4, 1 - add r0, r8 - movs r1, 0 - ldrsh r0, [r0, r1] - str r0, [r6, 0xC] - movs r0, 0x2D - bl FieldEffectStart - adds r4, 0x1 - lsls r4, 16 - movs r0, 0x1 - eors r5, r0 - lsls r5, 16 - lsrs r5, 16 - lsrs r1, r4, 16 - asrs r4, 16 - cmp r4, 0x4 - ble _08147046 - ldrh r0, [r7, 0x8] - adds r0, 0x1 - strh r0, [r7, 0x8] - movs r0, 0 - add sp, 0x10 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8147018 - - thumb_func_start sub_81470A4 -sub_81470A4: @ 81470A4 - push {lr} - movs r0, 0x2D - bl FieldEffectActiveListContains - lsls r0, 24 - cmp r0, 0 - bne _081470C4 - bl sub_8149F84 - ldr r0, =Phase2Task_Transition_PokeballsTrail - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_081470C4: - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81470A4 - - thumb_func_start sub_81470D0 -sub_81470D0: @ 81470D0 - push {r4,r5,lr} - ldr r0, =gUnknown_085C8E68 - ldr r5, =gFieldEffectArguments - movs r2, 0 - ldrsh r1, [r5, r2] - movs r3, 0x4 - ldrsh r2, [r5, r3] - movs r3, 0 - bl CreateSpriteAtEnd - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gSprites - lsls r4, r0, 4 - adds r4, r0 - lsls r4, 2 - adds r4, r1 - ldrb r1, [r4, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r1 - strb r0, [r4, 0x5] - ldrb r1, [r4, 0x1] - movs r0, 0x4 - negs r0, r0 - ands r0, r1 - movs r1, 0x1 - orrs r0, r1 - strb r0, [r4, 0x1] - ldr r0, [r5, 0x8] - strh r0, [r4, 0x2E] - ldr r0, [r5, 0xC] - strh r0, [r4, 0x30] - ldr r0, =0x0000ffff - strh r0, [r4, 0x32] - adds r0, r4, 0 - bl InitSpriteAffineAnim - ldrb r1, [r5, 0x8] - adds r0, r4, 0 - bl StartSpriteAffineAnim - movs r0, 0 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81470D0 - - thumb_func_start sub_814713C -sub_814713C: @ 814713C - push {r4-r6,lr} - sub sp, 0x4 - adds r4, r0, 0 - ldr r1, =sUnknown_085C8B96 - mov r0, sp - movs r2, 0x4 - bl memcpy - ldrh r1, [r4, 0x30] - movs r2, 0x30 - ldrsh r0, [r4, r2] - cmp r0, 0 - beq _08147160 - subs r0, r1, 0x1 - strh r0, [r4, 0x30] - b _081471F2 - .pool -_08147160: - ldrh r0, [r4, 0x20] - lsls r1, r0, 16 - lsrs r0, r1, 16 - cmp r0, 0xF0 - bhi _081471CE - asrs r0, r1, 19 - lsls r0, 16 - ldrh r1, [r4, 0x22] - lsls r1, 16 - asrs r1, 19 - lsls r1, 16 - lsrs r1, 16 - lsrs r2, r0, 16 - asrs r5, r0, 16 - movs r3, 0x32 - ldrsh r0, [r4, r3] - cmp r5, r0 - beq _081471CE - strh r2, [r4, 0x32] - ldr r0, =0x04000008 - ldrh r2, [r0] - lsrs r2, 8 - movs r0, 0x1F - ands r2, r0 - lsls r2, 11 - movs r0, 0xC0 - lsls r0, 19 - adds r2, r0 - lsls r1, 16 - asrs r1, 16 - subs r0, r1, 0x2 - lsls r0, 5 - adds r0, r5 - lsls r0, 1 - adds r0, r2 - ldr r6, =0x0000f001 - adds r3, r6, 0 - strh r3, [r0] - subs r0, r1, 0x1 - lsls r0, 5 - adds r0, r5 - lsls r0, 1 - adds r0, r2 - strh r3, [r0] - lsls r0, r1, 5 - adds r0, r5 - lsls r0, 1 - adds r0, r2 - strh r3, [r0] - adds r1, 0x1 - lsls r1, 5 - adds r1, r5 - lsls r1, 1 - adds r1, r2 - strh r3, [r1] -_081471CE: - movs r1, 0x2E - ldrsh r0, [r4, r1] - lsls r0, 1 - add r0, sp - ldrh r0, [r0] - ldrh r2, [r4, 0x20] - adds r0, r2 - strh r0, [r4, 0x20] - adds r0, 0xF - lsls r0, 16 - movs r1, 0x87 - lsls r1, 17 - cmp r0, r1 - bls _081471F2 - adds r0, r4, 0 - movs r1, 0x2D - bl FieldEffectStop -_081471F2: - add sp, 0x4 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_814713C - - thumb_func_start Phase2Task_Transition_Clockwise_BlackFade -Phase2Task_Transition_Clockwise_BlackFade: @ 8147204 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =sPhase2_Transition_Clockwise_BlackFade_Funcs - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_08147216: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _08147216 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_Transition_Clockwise_BlackFade - - thumb_func_start sub_814723C -sub_814723C: @ 814723C - push {r4,lr} - adds r4, r0, 0 - bl sub_8149F08 - bl dp12_8087EA4 - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - movs r0, 0 - strh r0, [r1, 0x2] - movs r0, 0x3F - strh r0, [r1, 0x4] - ldr r0, =0x0000f0f1 - strh r0, [r1, 0x6] - movs r0, 0xA0 - strh r0, [r1, 0x8] - movs r1, 0 - ldr r3, =gUnknown_020393A8 - ldr r2, =0x0000f3f4 -_08147262: - lsls r0, r1, 1 - adds r0, r3 - strh r2, [r0] - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, 0x9F - bls _08147262 - ldr r0, =sub_8147688 - bl SetVBlankCallback - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - movs r0, 0x78 - strh r0, [r1, 0x2C] - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0x1 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_814723C - - thumb_func_start sub_81472A4 -sub_81472A4: @ 81472A4 - push {r4-r7,lr} - sub sp, 0xC - adds r6, r0, 0 - ldr r2, =sTransitionStructPtr - ldr r1, [r2] - ldrb r0, [r1] - movs r0, 0 - strb r0, [r1] - ldr r1, [r2] - adds r0, r1, 0 - adds r0, 0x24 - movs r2, 0x2C - ldrsh r3, [r1, r2] - movs r1, 0x1 - negs r1, r1 - str r1, [sp] - movs r1, 0x1 - str r1, [sp, 0x4] - str r1, [sp, 0x8] - movs r1, 0x78 - movs r2, 0x50 - bl sub_814A1AC - ldr r5, =gUnknown_02038C28 -_081472D4: - ldr r4, =sTransitionStructPtr - ldr r0, [r4] - movs r7, 0x2A - ldrsh r3, [r0, r7] - lsls r3, 1 - adds r3, r5 - ldrh r1, [r0, 0x28] - adds r1, 0x1 - movs r7, 0xF0 - lsls r7, 7 - adds r2, r7, 0 - orrs r1, r2 - strh r1, [r3] - adds r0, 0x24 - movs r1, 0x1 - movs r2, 0x1 - bl sub_814A228 - lsls r0, 24 - cmp r0, 0 - beq _081472D4 - ldr r1, [r4] - ldrh r0, [r1, 0x2C] - adds r0, 0x10 - strh r0, [r1, 0x2C] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xEF - ble _08147318 - movs r0, 0 - strh r0, [r1, 0x2E] - ldrh r0, [r6, 0x8] - adds r0, 0x1 - strh r0, [r6, 0x8] -_08147318: - ldr r0, [r4] - ldrb r1, [r0] - adds r1, 0x1 - ldrb r2, [r0] - strb r1, [r0] - movs r0, 0 - add sp, 0xC - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81472A4 - - thumb_func_start sub_8147334 -sub_8147334: @ 8147334 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x10 - mov r8, r0 - add r1, sp, 0xC - movs r0, 0 - strb r0, [r1] - ldr r4, =sTransitionStructPtr - ldr r1, [r4] - ldrb r0, [r1] - movs r0, 0 - strb r0, [r1] - ldr r1, [r4] - adds r0, r1, 0 - adds r0, 0x24 - movs r2, 0x2E - ldrsh r1, [r1, r2] - str r1, [sp] - movs r1, 0x1 - str r1, [sp, 0x4] - str r1, [sp, 0x8] - movs r1, 0x78 - movs r2, 0x50 - movs r3, 0xF0 - bl sub_814A1AC - mov r9, r4 - mov r7, r9 - add r5, sp, 0xC -_08147372: - movs r1, 0x78 - ldr r3, [r7] - ldrh r0, [r3, 0x28] - adds r0, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - movs r2, 0x2E - ldrsh r0, [r3, r2] - cmp r0, 0x4F - ble _0814738A - ldrh r1, [r3, 0x28] - movs r4, 0xF0 -_0814738A: - ldr r6, =gUnknown_02038C28 - movs r0, 0x2A - ldrsh r2, [r3, r0] - lsls r2, 1 - adds r2, r6 - lsls r1, 16 - asrs r1, 8 - lsls r0, r4, 16 - asrs r4, r0, 16 - orrs r4, r1 - strh r4, [r2] - ldrb r0, [r5] - cmp r0, 0 - bne _081473C0 - adds r0, r3, 0 - adds r0, 0x24 - movs r1, 0x1 - movs r2, 0x1 - bl sub_814A228 - strb r0, [r5] - b _08147372 - .pool -_081473C0: - ldr r1, [r7] - ldrh r0, [r1, 0x2E] - adds r0, 0x8 - strh r0, [r1, 0x2E] - lsls r0, 16 - asrs r2, r0, 16 - cmp r2, 0x9F - ble _081473DE - movs r0, 0xF0 - strh r0, [r1, 0x2C] - mov r1, r8 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - b _08147406 -_081473DE: - movs r3, 0x2A - ldrsh r0, [r1, r3] - cmp r0, r2 - bge _08147406 - adds r3, r4, 0 - ldr r5, =sTransitionStructPtr -_081473EA: - ldr r2, [r5] - ldrh r0, [r2, 0x2A] - adds r0, 0x1 - strh r0, [r2, 0x2A] - lsls r0, 16 - asrs r0, 15 - adds r0, r6 - strh r3, [r0] - movs r4, 0x2A - ldrsh r1, [r2, r4] - movs r4, 0x2E - ldrsh r0, [r2, r4] - cmp r1, r0 - blt _081473EA -_08147406: - mov r1, r9 - ldr r0, [r1] - ldrb r1, [r0] - adds r1, 0x1 - ldrb r2, [r0] - strb r1, [r0] - movs r0, 0 - add sp, 0x10 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8147334 - - thumb_func_start sub_8147428 -sub_8147428: @ 8147428 - push {r4-r6,lr} - sub sp, 0xC - adds r6, r0, 0 - ldr r2, =sTransitionStructPtr - ldr r1, [r2] - ldrb r0, [r1] - movs r0, 0 - strb r0, [r1] - ldr r1, [r2] - adds r0, r1, 0 - adds r0, 0x24 - movs r2, 0x2C - ldrsh r3, [r1, r2] - movs r1, 0xA0 - str r1, [sp] - movs r1, 0x1 - str r1, [sp, 0x4] - str r1, [sp, 0x8] - movs r1, 0x78 - movs r2, 0x50 - bl sub_814A1AC - ldr r5, =gUnknown_02038C28 -_08147456: - ldr r4, =sTransitionStructPtr - ldr r0, [r4] - movs r1, 0x2A - ldrsh r3, [r0, r1] - lsls r3, 1 - adds r3, r5 - ldrh r1, [r0, 0x28] - lsls r1, 8 - movs r2, 0xF0 - orrs r1, r2 - strh r1, [r3] - adds r0, 0x24 - movs r1, 0x1 - movs r2, 0x1 - bl sub_814A228 - lsls r0, 24 - cmp r0, 0 - beq _08147456 - ldr r1, [r4] - ldrh r0, [r1, 0x2C] - subs r0, 0x10 - strh r0, [r1, 0x2C] - lsls r0, 16 - cmp r0, 0 - bgt _08147494 - movs r0, 0xA0 - strh r0, [r1, 0x2E] - ldrh r0, [r6, 0x8] - adds r0, 0x1 - strh r0, [r6, 0x8] -_08147494: - ldr r0, [r4] - ldrb r1, [r0] - adds r1, 0x1 - ldrb r2, [r0] - strb r1, [r0] - movs r0, 0 - add sp, 0xC - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8147428 - - thumb_func_start sub_81474B0 -sub_81474B0: @ 81474B0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x10 - mov r9, r0 - add r1, sp, 0xC - movs r0, 0 - strb r0, [r1] - ldr r4, =sTransitionStructPtr - ldr r1, [r4] - ldrb r0, [r1] - movs r0, 0 - strb r0, [r1] - ldr r1, [r4] - adds r0, r1, 0 - adds r0, 0x24 - movs r2, 0x2E - ldrsh r1, [r1, r2] - str r1, [sp] - movs r1, 0x1 - str r1, [sp, 0x4] - str r1, [sp, 0x8] - movs r1, 0x78 - movs r2, 0x50 - movs r3, 0 - bl sub_814A1AC - ldr r7, =gUnknown_02038C28 - mov r10, r7 - ldr r0, =sTransitionStructPtr - mov r8, r0 - add r6, sp, 0xC -_081474F4: - mov r1, r8 - ldr r4, [r1] - movs r2, 0x2A - ldrsh r0, [r4, r2] - lsls r0, 1 - mov r7, r10 - adds r5, r0, r7 - ldrb r1, [r5] - ldrh r2, [r4, 0x28] - adds r3, r2, 0 - movs r7, 0x2E - ldrsh r0, [r4, r7] - cmp r0, 0x50 - bgt _08147514 - movs r2, 0x78 - adds r1, r3, 0 -_08147514: - lsls r0, r2, 16 - asrs r0, 8 - lsls r1, 16 - asrs r1, 16 - orrs r1, r0 - movs r7, 0 - strh r1, [r5] - ldrb r0, [r6] - cmp r0, 0 - bne _08147540 - adds r0, r4, 0 - adds r0, 0x24 - movs r1, 0x1 - movs r2, 0x1 - bl sub_814A228 - strb r0, [r6] - b _081474F4 - .pool -_08147540: - mov r0, r8 - ldr r2, [r0] - ldrh r0, [r2, 0x2E] - subs r0, 0x8 - strh r0, [r2, 0x2E] - lsls r0, 16 - asrs r3, r0, 16 - cmp r3, 0 - bgt _0814755E - strh r7, [r2, 0x2C] - mov r1, r9 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - b _08147588 -_0814755E: - movs r4, 0x2A - ldrsh r0, [r2, r4] - cmp r0, r3 - ble _08147588 - ldr r6, =gUnknown_02038C28 - adds r3, r1, 0 - ldr r5, =sTransitionStructPtr -_0814756C: - ldr r2, [r5] - ldrh r0, [r2, 0x2A] - subs r0, 0x1 - strh r0, [r2, 0x2A] - lsls r0, 16 - asrs r0, 15 - adds r0, r6 - strh r3, [r0] - movs r7, 0x2A - ldrsh r1, [r2, r7] - movs r4, 0x2E - ldrsh r0, [r2, r4] - cmp r1, r0 - bgt _0814756C -_08147588: - ldr r7, =sTransitionStructPtr - ldr r0, [r7] - ldrb r1, [r0] - adds r1, 0x1 - ldrb r2, [r0] - strb r1, [r0] - movs r0, 0 - add sp, 0x10 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81474B0 - - thumb_func_start sub_81475B0 -sub_81475B0: @ 81475B0 - push {r4-r7,lr} - sub sp, 0xC - adds r7, r0, 0 - ldr r1, =sTransitionStructPtr - ldr r0, [r1] - ldrb r2, [r0] - movs r2, 0 - strb r2, [r0] - ldr r1, [r1] - adds r0, r1, 0 - adds r0, 0x24 - movs r4, 0x2C - ldrsh r3, [r1, r4] - str r2, [sp] - movs r1, 0x1 - str r1, [sp, 0x4] - str r1, [sp, 0x8] - movs r1, 0x78 - movs r2, 0x50 - bl sub_814A1AC - ldr r6, =gUnknown_02038C28 -_081475DC: - movs r2, 0x78 - ldr r5, =sTransitionStructPtr - ldr r3, [r5] - ldrh r4, [r3, 0x28] - movs r1, 0x28 - ldrsh r0, [r3, r1] - cmp r0, 0x77 - ble _081475F0 - movs r2, 0 - movs r4, 0xF0 -_081475F0: - movs r0, 0x2A - ldrsh r1, [r3, r0] - lsls r1, 1 - adds r1, r6 - lsls r2, 8 - lsls r0, r4, 16 - asrs r0, 16 - orrs r0, r2 - strh r0, [r1] - adds r0, r3, 0 - adds r0, 0x24 - movs r1, 0x1 - movs r2, 0x1 - bl sub_814A228 - lsls r0, 24 - cmp r0, 0 - beq _081475DC - ldr r0, [r5] - ldrh r1, [r0, 0x2C] - adds r1, 0x10 - strh r1, [r0, 0x2C] - movs r1, 0x28 - ldrsh r0, [r0, r1] - cmp r0, 0x78 - ble _0814762A - ldrh r0, [r7, 0x8] - adds r0, 0x1 - strh r0, [r7, 0x8] -_0814762A: - ldr r0, [r5] - ldrb r1, [r0] - adds r1, 0x1 - ldrb r2, [r0] - strb r1, [r0] - movs r0, 0 - add sp, 0xC - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81475B0 - - thumb_func_start sub_8147648 -sub_8147648: @ 8147648 - push {lr} - ldr r1, =0x040000b0 - ldrh r2, [r1, 0xA] - ldr r0, =0x0000c5ff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r2, [r1, 0xA] - ldr r0, =0x00007fff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r0, [r1, 0xA] - bl sub_8149F84 - ldr r0, =Phase2Task_Transition_Clockwise_BlackFade - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_8147648 - - thumb_func_start sub_8147688 -sub_8147688: @ 8147688 - push {r4,lr} - ldr r4, =0x040000b0 - ldrh r1, [r4, 0xA] - ldr r0, =0x0000c5ff - ands r0, r1 - strh r0, [r4, 0xA] - ldrh r1, [r4, 0xA] - ldr r0, =0x00007fff - ands r0, r1 - strh r0, [r4, 0xA] - ldrh r0, [r4, 0xA] - bl sub_8149F2C - ldr r3, =sTransitionStructPtr - ldr r0, [r3] - ldrb r0, [r0] - cmp r0, 0 - beq _081476C0 - ldr r1, =0x040000d4 - ldr r0, =gUnknown_02038C28 - str r0, [r1] - movs r2, 0xF0 - lsls r2, 3 - adds r0, r2 - str r0, [r1, 0x4] - ldr r0, =0x800000a0 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] -_081476C0: - ldr r2, =0x04000048 - ldr r1, [r3] - ldrh r0, [r1, 0x2] - strh r0, [r2] - adds r2, 0x2 - ldrh r0, [r1, 0x4] - strh r0, [r2] - subs r2, 0x6 - ldrh r0, [r1, 0x8] - strh r0, [r2] - subs r2, 0x4 - ldr r0, =gUnknown_02038C28 - movs r1, 0xF0 - lsls r1, 3 - adds r0, r1 - ldrh r1, [r0] - strh r1, [r2] - str r0, [r4] - str r2, [r4, 0x4] - ldr r0, =0xa2400001 - str r0, [r4, 0x8] - ldr r0, [r4, 0x8] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8147688 - - thumb_func_start Phase2Task_Transition_Ripple -Phase2Task_Transition_Ripple: @ 8147718 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =sPhase2_Transition_Ripple_Funcs - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_0814772A: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _0814772A - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_Transition_Ripple - - thumb_func_start sub_8147750 -sub_8147750: @ 8147750 - push {r4,r5,lr} - adds r5, r0, 0 - bl sub_8149F08 - bl dp12_8087EA4 - movs r2, 0 - ldr r4, =gUnknown_020393A8 - ldr r3, =sTransitionStructPtr -_08147762: - lsls r1, r2, 1 - adds r1, r4 - ldr r0, [r3] - ldrh r0, [r0, 0x16] - strh r0, [r1] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x9F - bls _08147762 - ldr r0, =sub_8147888 - bl SetVBlankCallback - ldr r0, =sub_81478C0 - bl SetHBlankCallback - movs r0, 0x2 - bl EnableInterrupts - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] - movs r0, 0x1 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8147750 - - thumb_func_start sub_81477A8 -sub_81477A8: @ 81477A8 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - adds r6, r0, 0 - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - ldrb r0, [r1] - movs r0, 0 - strb r0, [r1] - ldrh r2, [r6, 0xC] - lsls r1, r2, 16 - asrs r0, r1, 24 - lsls r0, 16 - lsrs r3, r0, 16 - ldrh r4, [r6, 0xA] - movs r0, 0xC0 - lsls r0, 1 - mov r8, r0 - movs r5, 0x80 - lsls r5, 3 - adds r0, r4, r5 - strh r0, [r6, 0xA] - ldr r0, =0x1fff0000 - cmp r1, r0 - bgt _081477E4 - movs r1, 0xC0 - lsls r1, 1 - adds r0, r2, r1 - strh r0, [r6, 0xC] -_081477E4: - movs r5, 0 - lsls r7, r3, 16 -_081477E8: - lsrs r0, r4, 8 - asrs r1, r7, 16 - bl Sin - ldr r1, =gUnknown_02038C28 - lsls r2, r5, 1 - adds r2, r1 - ldr r1, =sTransitionStructPtr - ldr r1, [r1] - ldrh r1, [r1, 0x16] - adds r0, r1 - strh r0, [r2] - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - mov r1, r8 - adds r0, r4, r1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r5, 0x9F - bls _081477E8 - ldrh r0, [r6, 0xE] - adds r0, 0x1 - strh r0, [r6, 0xE] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x51 - bne _08147838 - ldrh r0, [r6, 0x10] - adds r0, 0x1 - strh r0, [r6, 0x10] - movs r0, 0x1 - negs r0, r0 - movs r1, 0x2 - negs r1, r1 - movs r2, 0 - str r2, [sp] - movs r3, 0x10 - bl BeginNormalPaletteFade -_08147838: - movs r5, 0x10 - ldrsh r0, [r6, r5] - cmp r0, 0 - beq _0814785A - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _0814785A - ldr r0, =Phase2Task_Transition_Ripple - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_0814785A: - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - ldrb r0, [r1] - adds r0, 0x1 - ldrb r2, [r1] - strb r0, [r1] - movs r0, 0 - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81477A8 - - thumb_func_start sub_8147888 -sub_8147888: @ 8147888 - push {lr} - bl sub_8149F2C - ldr r0, =sTransitionStructPtr - ldr r0, [r0] - ldrb r0, [r0] - cmp r0, 0 - beq _081478AC - ldr r1, =0x040000d4 - ldr r0, =gUnknown_02038C28 - str r0, [r1] - movs r2, 0xF0 - lsls r2, 3 - adds r0, r2 - str r0, [r1, 0x4] - ldr r0, =0x800000a0 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] -_081478AC: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8147888 - - thumb_func_start sub_81478C0 -sub_81478C0: @ 81478C0 - ldr r1, =gUnknown_02038C28 - ldr r0, =0x04000006 - ldrh r0, [r0] - lsls r0, 1 - movs r2, 0xF0 - lsls r2, 3 - adds r1, r2 - adds r0, r1 - ldrh r1, [r0] - ldr r0, =0x04000016 - strh r1, [r0] - adds r0, 0x4 - strh r1, [r0] - adds r0, 0x4 - strh r1, [r0] - bx lr - .pool - thumb_func_end sub_81478C0 - - thumb_func_start Phase2Task_Transition_Wave -Phase2Task_Transition_Wave: @ 81478EC - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =sPhase2_Transition_Wave_Funcs - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_081478FE: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _081478FE - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_Transition_Wave - - thumb_func_start sub_8147924 -sub_8147924: @ 8147924 - push {r4,lr} - adds r4, r0, 0 - bl sub_8149F08 - bl dp12_8087EA4 - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - movs r2, 0 - movs r0, 0x3F - strh r0, [r1, 0x2] - strh r2, [r1, 0x4] - movs r0, 0xF0 - strh r0, [r1, 0x6] - movs r0, 0xA0 - strh r0, [r1, 0x8] - movs r1, 0 - ldr r3, =gUnknown_020393A8 - movs r2, 0xF2 -_0814794A: - lsls r0, r1, 1 - adds r0, r3 - strh r2, [r0] - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x9F - bls _0814794A - ldr r0, =sub_8147A58 - bl SetVBlankCallback - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0x1 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8147924 - - thumb_func_start sub_814797C -sub_814797C: @ 814797C - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r4, r0, 0 - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - ldrb r0, [r1] - movs r0, 0 - strb r0, [r1] - ldr r7, =gUnknown_02038C28 - ldrh r0, [r4, 0xC] - ldrb r5, [r4, 0xC] - adds r0, 0x10 - strh r0, [r4, 0xC] - ldrh r0, [r4, 0xA] - adds r0, 0x8 - strh r0, [r4, 0xA] - movs r6, 0 - movs r0, 0x1 - mov r8, r0 -_081479A4: - adds r0, r5, 0 - movs r1, 0x28 - bl Sin - ldrh r1, [r4, 0xA] - adds r0, r1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r0, 0 - bge _081479BA - movs r1, 0 -_081479BA: - lsls r0, r1, 16 - asrs r0, 16 - cmp r0, 0xF0 - ble _081479C4 - movs r1, 0xF0 -_081479C4: - lsls r0, r1, 16 - asrs r0, 16 - lsls r1, r0, 8 - movs r2, 0xF1 - orrs r1, r2 - strh r1, [r7] - cmp r0, 0xEF - bgt _081479D8 - movs r0, 0 - mov r8, r0 -_081479D8: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - adds r0, r5, 0x4 - lsls r0, 24 - lsrs r5, r0, 24 - adds r7, 0x2 - cmp r6, 0x9F - bls _081479A4 - mov r1, r8 - cmp r1, 0 - beq _081479F6 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_081479F6: - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - ldrb r0, [r1] - adds r0, 0x1 - ldrb r2, [r1] - strb r0, [r1] - movs r0, 0 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_814797C - - thumb_func_start sub_8147A18 -sub_8147A18: @ 8147A18 - push {lr} - ldr r1, =0x040000b0 - ldrh r2, [r1, 0xA] - ldr r0, =0x0000c5ff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r2, [r1, 0xA] - ldr r0, =0x00007fff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r0, [r1, 0xA] - bl sub_8149F84 - ldr r0, =Phase2Task_Transition_Wave - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_8147A18 - - thumb_func_start sub_8147A58 -sub_8147A58: @ 8147A58 - push {r4,lr} - ldr r4, =0x040000b0 - ldrh r1, [r4, 0xA] - ldr r0, =0x0000c5ff - ands r0, r1 - strh r0, [r4, 0xA] - ldrh r1, [r4, 0xA] - ldr r0, =0x00007fff - ands r0, r1 - strh r0, [r4, 0xA] - ldrh r0, [r4, 0xA] - bl sub_8149F2C - ldr r3, =sTransitionStructPtr - ldr r0, [r3] - ldrb r0, [r0] - cmp r0, 0 - beq _08147A90 - ldr r1, =0x040000d4 - ldr r0, =gUnknown_02038C28 - str r0, [r1] - movs r2, 0xF0 - lsls r2, 3 - adds r0, r2 - str r0, [r1, 0x4] - ldr r0, =0x800000a0 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] -_08147A90: - ldr r2, =0x04000048 - ldr r1, [r3] - ldrh r0, [r1, 0x2] - strh r0, [r2] - adds r2, 0x2 - ldrh r0, [r1, 0x4] - strh r0, [r2] - subs r2, 0x6 - ldrh r0, [r1, 0x8] - strh r0, [r2] - ldr r0, =gUnknown_020393A8 - str r0, [r4] - ldr r0, =0x04000040 - str r0, [r4, 0x4] - ldr r0, =0xa2400001 - str r0, [r4, 0x8] - ldr r0, [r4, 0x8] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8147A58 - - thumb_func_start Phase2Task_Transition_Sydney -Phase2Task_Transition_Sydney: @ 8147AE4 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - movs r2, 0 - strh r2, [r1, 0x26] - bl sub_8147B84 - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_Transition_Sydney - - thumb_func_start Phase2Task_Transition_Phoebe -Phase2Task_Transition_Phoebe: @ 8147B04 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - movs r2, 0x1 - strh r2, [r1, 0x26] - bl sub_8147B84 - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_Transition_Phoebe - - thumb_func_start Phase2Task_Transition_Glacia -Phase2Task_Transition_Glacia: @ 8147B24 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - movs r2, 0x2 - strh r2, [r1, 0x26] - bl sub_8147B84 - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_Transition_Glacia - - thumb_func_start Phase2Task_Transition_Drake -Phase2Task_Transition_Drake: @ 8147B44 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - movs r2, 0x3 - strh r2, [r1, 0x26] - bl sub_8147B84 - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_Transition_Drake - - thumb_func_start Phase2Task_Transition_Wallace -Phase2Task_Transition_Wallace: @ 8147B64 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - movs r2, 0x4 - strh r2, [r1, 0x26] - bl sub_8147B84 - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_Transition_Wallace - - thumb_func_start sub_8147B84 -sub_8147B84: @ 8147B84 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =sPhase2_Mugshot_Transition_Funcs - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_08147B96: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _08147B96 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8147B84 - - thumb_func_start sub_8147BBC -sub_8147BBC: @ 8147BBC - push {r4,lr} - adds r4, r0, 0 - bl sub_8149F08 - bl dp12_8087EA4 - adds r0, r4, 0 - bl sub_8148218 - movs r0, 0 - strh r0, [r4, 0xA] - movs r0, 0x1 - strh r0, [r4, 0xC] - movs r0, 0xEF - strh r0, [r4, 0xE] - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - movs r0, 0x3F - strh r0, [r1, 0x2] - movs r0, 0x3E - strh r0, [r1, 0x4] - movs r0, 0xA0 - strh r0, [r1, 0x8] - movs r1, 0 - ldr r3, =gUnknown_020393A8 - ldr r2, =0x0000f0f1 -_08147BF0: - lsls r0, r1, 1 - adds r0, r3 - strh r2, [r0] - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x9F - bls _08147BF0 - ldr r0, =sub_81480CC - bl SetVBlankCallback - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8147BBC - - thumb_func_start sub_8147C24 -sub_8147C24: @ 8147C24 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x8 - mov r8, r0 - ldr r6, =sMugshotsTilemap - add r1, sp, 0x4 - mov r0, sp - bl sub_8149F58 - ldr r0, =sUnknown_085B9AF0 - ldr r1, [sp, 0x4] - movs r2, 0xF0 - bl CpuSet - ldr r1, =sOpponentMugshotsPals - mov r2, r8 - movs r3, 0x26 - ldrsh r0, [r2, r3] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - ldr r1, =sPlayerMugshotsPals - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldrb r0, [r0, 0x8] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - movs r1, 0xFA - movs r2, 0xC - bl LoadPalette - movs r1, 0 - ldr r5, [sp] - movs r0, 0xF0 - lsls r0, 8 - adds r7, r0, 0 -_08147C78: - movs r0, 0 - lsls r3, r1, 16 - asrs r4, r3, 11 -_08147C7E: - lsls r2, r0, 16 - asrs r2, 16 - adds r1, r4, r2 - lsls r1, 1 - adds r1, r5 - ldrh r0, [r6] - orrs r0, r7 - strh r0, [r1] - adds r2, 0x1 - lsls r2, 16 - adds r6, 0x2 - lsrs r0, r2, 16 - asrs r2, 16 - cmp r2, 0x1F - ble _08147C7E - movs r1, 0x80 - lsls r1, 9 - adds r0, r3, r1 - lsrs r1, r0, 16 - asrs r0, 16 - cmp r0, 0x13 - ble _08147C78 - movs r0, 0x2 - bl EnableInterrupts - ldr r0, =sub_81481E0 - bl SetHBlankCallback - mov r2, r8 - ldrh r0, [r2, 0x8] - adds r0, 0x1 - strh r0, [r2, 0x8] - movs r0, 0 - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8147C24 - - thumb_func_start sub_8147CE4 -sub_8147CE4: @ 8147CE4 - push {r4-r7,lr} - adds r4, r0, 0 - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - ldrb r0, [r1] - movs r0, 0 - strb r0, [r1] - ldr r7, =gUnknown_02038C28 - ldrh r0, [r4, 0xA] - ldrb r5, [r4, 0xA] - adds r0, 0x10 - strh r0, [r4, 0xA] - movs r6, 0 -_08147CFE: - adds r0, r5, 0 - movs r1, 0x10 - bl Sin - ldrh r1, [r4, 0xC] - adds r0, r1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r0, 0 - bge _08147D14 - movs r2, 0x1 -_08147D14: - lsls r0, r2, 16 - asrs r0, 16 - cmp r0, 0xF0 - ble _08147D1E - movs r2, 0xF0 -_08147D1E: - strh r2, [r7] - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - adds r7, 0x2 - adds r0, r5, 0 - adds r0, 0x10 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r6, 0x4F - bls _08147CFE - cmp r6, 0x9F - bhi _08147D76 -_08147D38: - adds r0, r5, 0 - movs r1, 0x10 - bl Sin - ldrh r1, [r4, 0xE] - subs r1, r0 - lsls r1, 16 - lsrs r2, r1, 16 - cmp r1, 0 - bge _08147D4E - movs r2, 0 -_08147D4E: - lsls r0, r2, 16 - asrs r0, 16 - cmp r0, 0xEF - ble _08147D58 - movs r2, 0xEF -_08147D58: - lsls r0, r2, 16 - asrs r0, 8 - movs r1, 0xF0 - orrs r0, r1 - strh r0, [r7] - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - adds r7, 0x2 - adds r0, r5, 0 - adds r0, 0x10 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r6, 0x9F - bls _08147D38 -_08147D76: - ldrh r1, [r4, 0xC] - adds r1, 0x8 - strh r1, [r4, 0xC] - ldrh r0, [r4, 0xE] - subs r0, 0x8 - strh r0, [r4, 0xE] - lsls r1, 16 - asrs r1, 16 - cmp r1, 0xF0 - ble _08147D8E - movs r0, 0xF0 - strh r0, [r4, 0xC] -_08147D8E: - movs r1, 0xE - ldrsh r0, [r4, r1] - cmp r0, 0 - bge _08147D9A - movs r0, 0 - strh r0, [r4, 0xE] -_08147D9A: - ldr r0, [r4, 0xC] - cmp r0, 0xF0 - bne _08147DA6 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_08147DA6: - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - ldrh r0, [r1, 0x18] - subs r0, 0x8 - strh r0, [r1, 0x18] - ldrh r0, [r1, 0x1A] - adds r0, 0x8 - strh r0, [r1, 0x1A] - ldrb r0, [r1] - adds r0, 0x1 - ldrb r2, [r1] - strb r0, [r1] - movs r0, 0 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8147CE4 - - thumb_func_start sub_8147DD0 -sub_8147DD0: @ 8147DD0 - push {r4,r5,lr} - adds r4, r0, 0 - ldr r2, =sTransitionStructPtr - ldr r1, [r2] - ldrb r0, [r1] - movs r0, 0 - strb r0, [r1] - ldr r1, =gUnknown_02038C28 - adds r5, r2, 0 - movs r2, 0xF0 -_08147DE4: - strh r2, [r1] - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - adds r1, 0x2 - cmp r0, 0x9F - bls _08147DE4 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - movs r1, 0 - strh r0, [r4, 0x8] - strh r1, [r4, 0xA] - strh r1, [r4, 0xC] - strh r1, [r4, 0xE] - ldr r1, [r5] - ldrh r0, [r1, 0x18] - subs r0, 0x8 - strh r0, [r1, 0x18] - ldrh r0, [r1, 0x1A] - adds r0, 0x8 - strh r0, [r1, 0x1A] - movs r1, 0x22 - ldrsh r0, [r4, r1] - movs r1, 0 - bl sub_8148484 - movs r1, 0x24 - ldrsh r0, [r4, r1] - movs r1, 0x1 - bl sub_8148484 - movs r1, 0x22 - ldrsh r0, [r4, r1] - bl sub_814849C - movs r0, 0x68 - bl PlaySE - ldr r1, [r5] - ldrb r0, [r1] - adds r0, 0x1 - ldrb r2, [r1] - strb r0, [r1] - movs r0, 0 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8147DD0 - - thumb_func_start sub_8147E4C -sub_8147E4C: @ 8147E4C - push {r4,lr} - adds r4, r0, 0 - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - ldrh r0, [r1, 0x18] - subs r0, 0x8 - strh r0, [r1, 0x18] - ldrh r0, [r1, 0x1A] - adds r0, 0x8 - strh r0, [r1, 0x1A] - movs r1, 0x22 - ldrsh r0, [r4, r1] - bl sub_81484B8 - lsls r0, 16 - cmp r0, 0 - beq _08147E7C - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r1, 0x24 - ldrsh r0, [r4, r1] - bl sub_814849C -_08147E7C: - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8147E4C - - thumb_func_start sub_8147E88 -sub_8147E88: @ 8147E88 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r6, r0, 0 - ldr r7, =sTransitionStructPtr - ldr r1, [r7] - ldrh r0, [r1, 0x18] - subs r0, 0x8 - movs r2, 0 - mov r8, r2 - strh r0, [r1, 0x18] - ldrh r0, [r1, 0x1A] - adds r0, 0x8 - strh r0, [r1, 0x1A] - movs r1, 0x24 - ldrsh r0, [r6, r1] - bl sub_81484B8 - lsls r0, 16 - cmp r0, 0 - beq _08147F1C - ldr r1, [r7] - ldrb r0, [r1] - movs r0, 0 - strb r0, [r1] - movs r0, 0 - bl SetVBlankCallback - ldr r1, =0x040000b0 - ldrh r2, [r1, 0xA] - ldr r0, =0x0000c5ff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r2, [r1, 0xA] - ldr r0, =0x00007fff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r0, [r1, 0xA] - ldr r4, =gUnknown_02038C28 - movs r5, 0xA0 - lsls r5, 1 - adds r0, r4, 0 - movs r1, 0 - adds r2, r5, 0 - bl memset - movs r2, 0xF0 - lsls r2, 3 - adds r4, r2 - adds r0, r4, 0 - movs r1, 0 - adds r2, r5, 0 - bl memset - movs r0, 0x40 - movs r1, 0xF0 - bl SetGpuReg - movs r0, 0x54 - movs r1, 0 - bl SetGpuReg - ldrh r0, [r6, 0x8] - adds r0, 0x1 - strh r0, [r6, 0x8] - mov r0, r8 - strh r0, [r6, 0xE] - strh r0, [r6, 0x10] - ldr r1, [r7] - movs r0, 0xBF - strh r0, [r1, 0xE] - ldr r0, =sub_8148160 - bl SetVBlankCallback -_08147F1C: - movs r0, 0 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8147E88 - - thumb_func_start sub_8147F40 -sub_8147F40: @ 8147F40 - push {r4-r7,lr} - adds r4, r0, 0 - ldr r2, =sTransitionStructPtr - ldr r1, [r2] - ldrb r0, [r1] - movs r0, 0 - strb r0, [r1] - movs r6, 0x1 - ldr r1, [r2] - ldrh r0, [r1, 0x18] - subs r0, 0x8 - strh r0, [r1, 0x18] - ldrh r0, [r1, 0x1A] - adds r0, 0x8 - strh r0, [r1, 0x1A] - ldrh r1, [r4, 0x10] - movs r3, 0x10 - ldrsh r0, [r4, r3] - mov r12, r2 - cmp r0, 0x4F - bgt _08147F6E - adds r0, r1, 0x2 - strh r0, [r4, 0x10] -_08147F6E: - movs r1, 0x10 - ldrsh r0, [r4, r1] - cmp r0, 0x50 - ble _08147F7A - movs r0, 0x50 - strh r0, [r4, 0x10] -_08147F7A: - ldrh r0, [r4, 0xE] - adds r0, 0x1 - strh r0, [r4, 0xE] - movs r1, 0x1 - ands r0, r1 - ldrh r3, [r4, 0x10] - cmp r0, 0 - beq _08147FDC - movs r2, 0 - lsls r0, r3, 16 - movs r6, 0 - cmp r0, 0 - blt _08147FDC - movs r7, 0x50 - ldr r5, =gUnknown_02038C28 -_08147F98: - lsls r0, r2, 16 - asrs r3, r0, 16 - subs r1, r7, r3 - adds r0, r3, 0 - adds r0, 0x50 - lsls r0, 16 - lsrs r2, r0, 16 - lsls r1, 16 - asrs r1, 15 - adds r1, r5 - ldrh r0, [r1] - cmp r0, 0xF - bhi _08147FB8 - movs r6, 0x1 - adds r0, 0x1 - strh r0, [r1] -_08147FB8: - lsls r0, r2, 16 - asrs r0, 15 - adds r1, r0, r5 - ldrh r0, [r1] - cmp r0, 0xF - bhi _08147FCA - movs r6, 0x1 - adds r0, 0x1 - strh r0, [r1] -_08147FCA: - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - asrs r0, 16 - movs r3, 0x10 - ldrsh r1, [r4, r3] - ldrh r3, [r4, 0x10] - cmp r0, r1 - ble _08147F98 -_08147FDC: - cmp r3, 0x50 - bne _08147FEA - cmp r6, 0 - bne _08147FEA - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_08147FEA: - mov r1, r12 - ldr r0, [r1] - ldrb r1, [r0] - adds r1, 0x1 - ldrb r2, [r0] - strb r1, [r0] - movs r0, 0 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8147F40 - - thumb_func_start sub_8148008 -sub_8148008: @ 8148008 - push {r4-r6,lr} - adds r4, r0, 0 - ldr r5, =sTransitionStructPtr - ldr r0, [r5] - ldrb r1, [r0] - movs r6, 0 - strb r6, [r0] - movs r0, 0x1 - negs r0, r0 - ldr r2, =0x00007fff - movs r1, 0x10 - bl BlendPalettes - ldr r1, [r5] - movs r0, 0xFF - strh r0, [r1, 0xE] - strh r6, [r4, 0xE] - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0x1 - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8148008 - - thumb_func_start sub_8148040 -sub_8148040: @ 8148040 - push {r4,r5,lr} - adds r4, r0, 0 - ldr r5, =sTransitionStructPtr - ldr r1, [r5] - ldrb r0, [r1] - movs r0, 0 - strb r0, [r1] - ldrh r0, [r4, 0xE] - adds r0, 0x1 - strh r0, [r4, 0xE] - ldr r0, =gUnknown_02038C28 - movs r2, 0xE - ldrsh r1, [r4, r2] - movs r2, 0xA0 - lsls r2, 1 - bl memset - movs r1, 0xE - ldrsh r0, [r4, r1] - cmp r0, 0xF - ble _08148070 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_08148070: - ldr r0, [r5] - ldrb r1, [r0] - adds r1, 0x1 - ldrb r2, [r0] - strb r1, [r0] - movs r0, 0 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8148040 - - thumb_func_start sub_814808C -sub_814808C: @ 814808C - push {r4,lr} - adds r4, r0, 0 - ldr r1, =0x040000b0 - ldrh r2, [r1, 0xA] - ldr r0, =0x0000c5ff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r2, [r1, 0xA] - ldr r0, =0x00007fff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r0, [r1, 0xA] - bl sub_8149F84 - ldr r0, [r4] - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_814808C - - thumb_func_start sub_81480CC -sub_81480CC: @ 81480CC - push {r4,lr} - ldr r4, =0x040000b0 - ldrh r1, [r4, 0xA] - ldr r0, =0x0000c5ff - ands r0, r1 - strh r0, [r4, 0xA] - ldrh r1, [r4, 0xA] - ldr r0, =0x00007fff - ands r0, r1 - strh r0, [r4, 0xA] - ldrh r0, [r4, 0xA] - bl sub_8149F2C - ldr r3, =sTransitionStructPtr - ldr r0, [r3] - ldrb r0, [r0] - cmp r0, 0 - beq _08148104 - ldr r1, =0x040000d4 - ldr r0, =gUnknown_02038C28 - str r0, [r1] - movs r2, 0xF0 - lsls r2, 3 - adds r0, r2 - str r0, [r1, 0x4] - ldr r0, =0x800000a0 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] -_08148104: - ldr r2, =0x04000012 - ldr r1, [r3] - ldrh r0, [r1, 0x1C] - strh r0, [r2] - adds r2, 0x36 - ldrh r0, [r1, 0x2] - strh r0, [r2] - adds r2, 0x2 - ldrh r0, [r1, 0x4] - strh r0, [r2] - subs r2, 0x6 - ldrh r0, [r1, 0x8] - strh r0, [r2] - ldr r0, =gUnknown_020393A8 - str r0, [r4] - ldr r0, =0x04000040 - str r0, [r4, 0x4] - ldr r0, =0xa2400001 - str r0, [r4, 0x8] - ldr r0, [r4, 0x8] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81480CC - - thumb_func_start sub_8148160 -sub_8148160: @ 8148160 - push {r4,lr} - ldr r4, =0x040000b0 - ldrh r1, [r4, 0xA] - ldr r0, =0x0000c5ff - ands r0, r1 - strh r0, [r4, 0xA] - ldrh r1, [r4, 0xA] - ldr r0, =0x00007fff - ands r0, r1 - strh r0, [r4, 0xA] - ldrh r0, [r4, 0xA] - bl sub_8149F2C - ldr r2, =sTransitionStructPtr - ldr r0, [r2] - ldrb r0, [r0] - cmp r0, 0 - beq _08148198 - ldr r1, =0x040000d4 - ldr r0, =gUnknown_02038C28 - str r0, [r1] - movs r3, 0xF0 - lsls r3, 3 - adds r0, r3 - str r0, [r1, 0x4] - ldr r0, =0x800000a0 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] -_08148198: - ldr r1, =0x04000050 - ldr r0, [r2] - ldrh r0, [r0, 0xE] - strh r0, [r1] - ldr r0, =gUnknown_020393A8 - str r0, [r4] - ldr r0, =0x04000054 - str r0, [r4, 0x4] - ldr r0, =0xa2400001 - str r0, [r4, 0x8] - ldr r0, [r4, 0x8] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8148160 - - thumb_func_start sub_81481E0 -sub_81481E0: @ 81481E0 - push {lr} - ldr r0, =0x04000006 - ldrh r0, [r0] - cmp r0, 0x4F - bhi _08148200 - ldr r1, =0x04000010 - ldr r0, =sTransitionStructPtr - ldr r0, [r0] - ldrh r0, [r0, 0x18] - b _08148208 - .pool -_08148200: - ldr r1, =0x04000010 - ldr r0, =sTransitionStructPtr - ldr r0, [r0] - ldrh r0, [r0, 0x1A] -_08148208: - strh r0, [r1] - pop {r0} - bx r0 - .pool - thumb_func_end sub_81481E0 - - thumb_func_start sub_8148218 -sub_8148218: @ 8148218 - push {r4-r6,lr} - mov r6, r9 - mov r5, r8 - push {r5,r6} - sub sp, 0x4 - adds r4, r0, 0 - ldr r0, =sMugshotsTrainerPicIDsTable - movs r2, 0x26 - ldrsh r1, [r4, r2] - mov r8, r1 - add r0, r8 - ldrb r0, [r0] - ldr r2, =sMugshotsOpponentCoords - lsls r1, 2 - mov r8, r1 - adds r1, r2 - ldrh r1, [r1] - subs r1, 0x20 - lsls r1, 16 - asrs r1, 16 - adds r2, 0x2 - add r2, r8 - ldrh r2, [r2] - adds r2, 0x2A - lsls r2, 16 - asrs r2, 16 - ldr r5, =0x0201c000 - str r5, [sp] - movs r3, 0 - bl sub_80B5E6C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x22] - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldrb r0, [r0, 0x8] - bl PlayerGenderToFrontTrainerPicId - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x88 - lsls r1, 1 - str r5, [sp] - movs r2, 0x6A - movs r3, 0 - bl sub_80B5E6C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x24] - movs r3, 0x22 - ldrsh r0, [r4, r3] - lsls r5, r0, 4 - adds r5, r0 - lsls r5, 2 - ldr r1, =gSprites - adds r5, r1 - movs r2, 0x24 - ldrsh r0, [r4, r2] - lsls r6, r0, 4 - adds r6, r0 - lsls r6, 2 - adds r6, r1 - ldr r0, =sub_8148380 - str r0, [r5, 0x1C] - str r0, [r6, 0x1C] - ldrb r0, [r5, 0x1] - movs r1, 0x3 - orrs r0, r1 - strb r0, [r5, 0x1] - ldrb r0, [r6, 0x1] - orrs r0, r1 - strb r0, [r6, 0x1] - bl AllocOamMatrix - lsls r0, 24 - lsrs r0, 24 - movs r3, 0x1F - mov r9, r3 - mov r4, r9 - ands r0, r4 - lsls r0, 1 - ldrb r2, [r5, 0x3] - movs r4, 0x3F - negs r4, r4 - adds r1, r4, 0 - ands r1, r2 - orrs r1, r0 - strb r1, [r5, 0x3] - bl AllocOamMatrix - lsls r0, 24 - lsrs r0, 24 - mov r1, r9 - ands r0, r1 - lsls r0, 1 - ldrb r1, [r6, 0x3] - ands r4, r1 - orrs r4, r0 - strb r4, [r6, 0x3] - ldrb r2, [r5, 0x1] - movs r1, 0x3F - adds r0, r1, 0 - ands r0, r2 - movs r2, 0x40 - orrs r0, r2 - strb r0, [r5, 0x1] - ldrb r0, [r6, 0x1] - ands r1, r0 - orrs r1, r2 - strb r1, [r6, 0x1] - ldrb r0, [r5, 0x3] - movs r1, 0xC0 - orrs r0, r1 - strb r0, [r5, 0x3] - ldrb r0, [r6, 0x3] - orrs r0, r1 - strb r0, [r6, 0x3] - adds r0, r5, 0 - movs r1, 0x1 - movs r2, 0x3 - movs r3, 0x3 - bl CalcCenterToCornerVec - adds r0, r6, 0 - movs r1, 0x1 - movs r2, 0x3 - movs r3, 0x3 - bl CalcCenterToCornerVec - ldrb r0, [r5, 0x3] - lsls r0, 26 - lsrs r0, 27 - ldr r2, =sMugshotsOpponentRotationScales - mov r3, r8 - adds r1, r3, r2 - movs r4, 0 - ldrsh r1, [r1, r4] - adds r2, 0x2 - add r8, r2 - mov r3, r8 - movs r4, 0 - ldrsh r2, [r3, r4] - movs r3, 0 - bl SetOamMatrixRotationScaling - ldrb r0, [r6, 0x3] - lsls r0, 26 - lsrs r0, 27 - ldr r1, =0xfffffe00 - movs r2, 0x80 - lsls r2, 2 - movs r3, 0 - bl SetOamMatrixRotationScaling - add sp, 0x4 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8148218 - - thumb_func_start sub_8148380 -sub_8148380: @ 8148380 - push {r4,r5,lr} - adds r4, r0, 0 - ldr r5, =sUnknown_085C8C24 -_08148386: - movs r1, 0x2E - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _08148386 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8148380 - - thumb_func_start sub_81483A8 -sub_81483A8: @ 81483A8 - movs r0, 0 - bx lr - thumb_func_end sub_81483A8 - - thumb_func_start sub_81483AC -sub_81483AC: @ 81483AC - push {r4,r5,lr} - sub sp, 0x8 - adds r5, r0, 0 - ldr r1, =sUnknown_085C8C40 - mov r0, sp - movs r2, 0x4 - bl memcpy - add r4, sp, 0x4 - ldr r1, =sUnknown_085C8C44 - adds r0, r4, 0 - movs r2, 0x4 - bl memcpy - ldrh r0, [r5, 0x2E] - adds r0, 0x1 - strh r0, [r5, 0x2E] - movs r1, 0x3C - ldrsh r0, [r5, r1] - lsls r0, 1 - add r0, sp - ldrh r0, [r0] - strh r0, [r5, 0x30] - movs r1, 0x3C - ldrsh r0, [r5, r1] - lsls r0, 1 - adds r4, r0 - ldrh r0, [r4] - strh r0, [r5, 0x32] - movs r0, 0x1 - add sp, 0x8 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81483AC - - thumb_func_start sub_81483F8 -sub_81483F8: @ 81483F8 - push {lr} - adds r1, r0, 0 - ldrh r0, [r1, 0x30] - ldrh r3, [r1, 0x20] - adds r2, r0, r3 - strh r2, [r1, 0x20] - movs r3, 0x3C - ldrsh r0, [r1, r3] - cmp r0, 0 - beq _08148416 - lsls r0, r2, 16 - asrs r0, 16 - cmp r0, 0x84 - bgt _08148424 - b _0814841E -_08148416: - lsls r0, r2, 16 - asrs r0, 16 - cmp r0, 0x67 - ble _08148424 -_0814841E: - ldrh r0, [r1, 0x2E] - adds r0, 0x1 - strh r0, [r1, 0x2E] -_08148424: - movs r0, 0 - pop {r1} - bx r1 - thumb_func_end sub_81483F8 - - thumb_func_start sub_814842C -sub_814842C: @ 814842C - push {lr} - adds r2, r0, 0 - ldrh r3, [r2, 0x32] - ldrh r0, [r2, 0x30] - adds r1, r3, r0 - strh r1, [r2, 0x30] - ldrh r0, [r2, 0x20] - adds r0, r1 - strh r0, [r2, 0x20] - lsls r1, 16 - cmp r1, 0 - bne _08148452 - ldrh r0, [r2, 0x2E] - adds r0, 0x1 - strh r0, [r2, 0x2E] - negs r0, r3 - strh r0, [r2, 0x32] - movs r0, 0x1 - strh r0, [r2, 0x3A] -_08148452: - movs r0, 0 - pop {r1} - bx r1 - thumb_func_end sub_814842C - - thumb_func_start sub_8148458 -sub_8148458: @ 8148458 - push {lr} - adds r2, r0, 0 - ldrh r0, [r2, 0x32] - ldrh r1, [r2, 0x30] - adds r0, r1 - strh r0, [r2, 0x30] - ldrh r1, [r2, 0x20] - adds r1, r0 - strh r1, [r2, 0x20] - adds r1, 0x1F - lsls r1, 16 - movs r0, 0x97 - lsls r0, 17 - cmp r1, r0 - bls _0814847C - ldrh r0, [r2, 0x2E] - adds r0, 0x1 - strh r0, [r2, 0x2E] -_0814847C: - movs r0, 0 - pop {r1} - bx r1 - thumb_func_end sub_8148458 - - thumb_func_start sub_8148484 -sub_8148484: @ 8148484 - ldr r3, =gSprites - lsls r0, 16 - asrs r0, 16 - lsls r2, r0, 4 - adds r2, r0 - lsls r2, 2 - adds r2, r3 - strh r1, [r2, 0x3C] - bx lr - .pool - thumb_func_end sub_8148484 - - thumb_func_start sub_814849C -sub_814849C: @ 814849C - ldr r2, =gSprites - lsls r0, 16 - asrs r0, 16 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - ldrh r0, [r1, 0x2E] - adds r0, 0x1 - strh r0, [r1, 0x2E] - bx lr - .pool - thumb_func_end sub_814849C - - thumb_func_start sub_81484B8 -sub_81484B8: @ 81484B8 - ldr r2, =gSprites - lsls r0, 16 - asrs r0, 16 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - movs r2, 0x3A - ldrsh r0, [r1, r2] - bx lr - .pool - thumb_func_end sub_81484B8 - - thumb_func_start Phase2Task_Transition_Slice -Phase2Task_Transition_Slice: @ 81484D0 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_085C8C48 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_081484E2: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _081484E2 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_Transition_Slice - - thumb_func_start sub_8148508 -sub_8148508: @ 8148508 - push {r4-r6,lr} - adds r5, r0, 0 - bl sub_8149F08 - bl dp12_8087EA4 - movs r4, 0 - movs r3, 0 - movs r0, 0x80 - lsls r0, 1 - strh r0, [r5, 0xC] - movs r0, 0x1 - strh r0, [r5, 0xE] - ldr r2, =sTransitionStructPtr - ldr r1, [r2] - movs r0, 0x3F - strh r0, [r1, 0x2] - strh r3, [r1, 0x4] - movs r0, 0xA0 - strh r0, [r1, 0x8] - ldrb r0, [r1] - strb r4, [r1] - ldr r4, =gUnknown_020393A8 - adds r6, r2, 0 - movs r2, 0xF0 -_0814853A: - lsls r1, r3, 1 - adds r1, r4 - ldr r0, [r6] - ldrh r0, [r0, 0x14] - strh r0, [r1] - adds r0, r3, 0 - adds r0, 0xA0 - lsls r0, 1 - adds r0, r4 - strh r2, [r0] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x9F - bls _0814853A - movs r0, 0x2 - bl EnableInterrupts - movs r0, 0x4 - movs r1, 0x10 - bl SetGpuRegBits - ldr r0, =sub_814869C - bl SetVBlankCallback - ldr r0, =sub_8148728 - bl SetHBlankCallback - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] - movs r0, 0x1 - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8148508 - - thumb_func_start sub_8148590 -sub_8148590: @ 8148590 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r3, r0, 0 - ldr r2, =sTransitionStructPtr - ldr r1, [r2] - ldrb r0, [r1] - movs r0, 0 - strb r0, [r1] - ldrh r0, [r3, 0xC] - lsls r0, 16 - asrs r0, 24 - ldrh r1, [r3, 0xA] - adds r0, r1 - strh r0, [r3, 0xA] - lsls r0, 16 - asrs r0, 16 - mov r8, r2 - cmp r0, 0xF0 - ble _081485BC - movs r0, 0xF0 - strh r0, [r3, 0xA] -_081485BC: - ldrh r4, [r3, 0xC] - movs r0, 0xC - ldrsh r1, [r3, r0] - ldr r0, =0x00000fff - ldrh r2, [r3, 0xE] - cmp r1, r0 - bgt _081485CE - adds r0, r4, r2 - strh r0, [r3, 0xC] -_081485CE: - lsls r0, r2, 16 - asrs r0, 16 - cmp r0, 0x7F - bgt _081485DA - lsls r0, r2, 1 - strh r0, [r3, 0xE] -_081485DA: - movs r5, 0 - ldr r7, =gUnknown_02038C28 - movs r1, 0xA0 - lsls r1, 1 - adds r1, r7 - mov r12, r1 - mov r6, r8 -_081485E8: - lsls r0, r5, 1 - adds r2, r0, r7 - mov r1, r12 - adds r4, r0, r1 - movs r0, 0x1 - ands r0, r5 - cmp r0, 0 - beq _08148618 - ldr r1, [r6] - ldrh r0, [r3, 0xA] - ldrh r1, [r1, 0x14] - adds r0, r1 - strh r0, [r2] - ldrh r1, [r3, 0xA] - movs r0, 0xF0 - subs r0, r1 - b _0814862A - .pool -_08148618: - ldr r0, [r6] - ldrh r0, [r0, 0x14] - ldrh r1, [r3, 0xA] - subs r0, r1 - strh r0, [r2] - ldrh r0, [r3, 0xA] - lsls r0, 8 - movs r1, 0xF1 - orrs r0, r1 -_0814862A: - strh r0, [r4] - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x9F - bls _081485E8 - movs r1, 0xA - ldrsh r0, [r3, r1] - cmp r0, 0xEF - ble _08148644 - ldrh r0, [r3, 0x8] - adds r0, 0x1 - strh r0, [r3, 0x8] -_08148644: - mov r1, r8 - ldr r0, [r1] - ldrb r1, [r0] - adds r1, 0x1 - ldrb r2, [r0] - strb r1, [r0] - movs r0, 0 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_8148590 - - thumb_func_start sub_814865C -sub_814865C: @ 814865C - push {lr} - ldr r1, =0x040000b0 - ldrh r2, [r1, 0xA] - ldr r0, =0x0000c5ff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r2, [r1, 0xA] - ldr r0, =0x00007fff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r0, [r1, 0xA] - bl sub_8149F84 - ldr r0, =Phase2Task_Transition_Slice - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_814865C - - thumb_func_start sub_814869C -sub_814869C: @ 814869C - push {r4,lr} - ldr r4, =0x040000b0 - ldrh r1, [r4, 0xA] - ldr r0, =0x0000c5ff - ands r0, r1 - strh r0, [r4, 0xA] - ldrh r1, [r4, 0xA] - ldr r0, =0x00007fff - ands r0, r1 - strh r0, [r4, 0xA] - ldrh r0, [r4, 0xA] - bl sub_8149F2C - ldr r2, =0x04000048 - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - ldrh r0, [r1, 0x2] - strh r0, [r2] - adds r2, 0x2 - ldrh r0, [r1, 0x4] - strh r0, [r2] - subs r2, 0x6 - ldrh r0, [r1, 0x8] - strh r0, [r2] - ldrb r0, [r1] - cmp r0, 0 - beq _081486E6 - ldr r1, =0x040000d4 - ldr r0, =gUnknown_02038C28 - str r0, [r1] - movs r2, 0xF0 - lsls r2, 3 - adds r0, r2 - str r0, [r1, 0x4] - ldr r0, =0x80000140 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] -_081486E6: - ldr r0, =gUnknown_020394E8 - str r0, [r4] - ldr r0, =0x04000040 - str r0, [r4, 0x4] - ldr r0, =0xa2400001 - str r0, [r4, 0x8] - ldr r0, [r4, 0x8] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_814869C - - thumb_func_start sub_8148728 -sub_8148728: @ 8148728 - push {lr} - ldr r2, =0x04000006 - ldrh r0, [r2] - cmp r0, 0x9F - bhi _0814874E - ldr r1, =gUnknown_02038C28 - ldrh r0, [r2] - lsls r0, 1 - movs r2, 0xF0 - lsls r2, 3 - adds r1, r2 - adds r0, r1 - ldrh r1, [r0] - ldr r0, =0x04000014 - strh r1, [r0] - adds r0, 0x4 - strh r1, [r0] - adds r0, 0x4 - strh r1, [r0] -_0814874E: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8148728 - - thumb_func_start Phase2Task_Transition_25 -Phase2Task_Transition_25: @ 8148760 + thumb_func_start Phase2Task_25 +Phase2Task_25: @ 8148760 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -4788,7 +31,7 @@ _08148772: pop {r0} bx r0 .pool - thumb_func_end Phase2Task_Transition_25 + thumb_func_end Phase2Task_25 thumb_func_start sub_8148798 sub_8148798: @ 8148798 @@ -4868,9 +111,9 @@ _081487CC: strh r0, [r6, 0x14] movs r0, 0x2 bl EnableInterrupts - ldr r0, =sub_814869C + ldr r0, =VBlankCB_Phase2_Slice bl SetVBlankCallback - ldr r0, =sub_8148728 + ldr r0, =HBlankCB_Phase2_Slice bl SetHBlankCallback ldrh r0, [r6, 0x8] adds r0, 0x1 @@ -5241,7 +484,7 @@ sub_8148B14: @ 8148B14 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] bl sub_8149F84 - ldr r0, =Phase2Task_Transition_25 + ldr r0, =Phase2Task_25 bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -5252,8 +495,8 @@ sub_8148B14: @ 8148B14 .pool thumb_func_end sub_8148B14 - thumb_func_start Phase2Task_Transition_26 -Phase2Task_Transition_26: @ 8148B54 + thumb_func_start Phase2Task_26 +Phase2Task_26: @ 8148B54 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -5278,10 +521,10 @@ _08148B66: pop {r0} bx r0 .pool - thumb_func_end Phase2Task_Transition_26 + thumb_func_end Phase2Task_26 - thumb_func_start Phase2Task_Transition_27 -Phase2Task_Transition_27: @ 8148B8C + thumb_func_start Phase2Task_27 +Phase2Task_27: @ 8148B8C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -5306,7 +549,7 @@ _08148B9E: pop {r0} bx r0 .pool - thumb_func_end Phase2Task_Transition_27 + thumb_func_end Phase2Task_27 thumb_func_start sub_8148BC4 sub_8148BC4: @ 8148BC4 @@ -5336,7 +579,7 @@ _08148BEE: cmp r1, 0 bge _08148BEE movs r4, 0 - ldr r0, =sub_8146F68 + ldr r0, =VBlankCB1_Phase2_BigPokeball bl SetVBlankCallback ldrh r0, [r5, 0x8] adds r0, 0x1 @@ -5618,8 +861,8 @@ _08148E3C: .pool thumb_func_end sub_8148D6C - thumb_func_start Phase2Task_Transition_28 -Phase2Task_Transition_28: @ 8148E54 + thumb_func_start Phase2Task_28 +Phase2Task_28: @ 8148E54 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -5644,7 +887,7 @@ _08148E66: pop {r0} bx r0 .pool - thumb_func_end Phase2Task_Transition_28 + thumb_func_end Phase2Task_28 thumb_func_start sub_8148E8C sub_8148E8C: @ 8148E8C @@ -5986,12 +1229,12 @@ _08149138: bx r1 thumb_func_end sub_8149048 - thumb_func_start Phase2Task_Transition_Groudon -Phase2Task_Transition_Groudon: @ 8149140 + thumb_func_start Phase2Task_Groudon +Phase2Task_Groudon: @ 8149140 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, =gUnknown_085C8D40 + ldr r5, =sPhase2_Groudon_Funcs ldr r2, =gTasks lsls r1, r0, 2 adds r1, r0 @@ -6012,7 +1255,7 @@ _08149152: pop {r0} bx r0 .pool - thumb_func_end Phase2Task_Transition_Groudon + thumb_func_end Phase2Task_Groudon thumb_func_start sub_8149178 sub_8149178: @ 8149178 @@ -6140,12 +1383,12 @@ _0814926E: .pool thumb_func_end sub_8149224 - thumb_func_start Phase2Task_Transition_Rayquaza -Phase2Task_Transition_Rayquaza: @ 814927C + thumb_func_start Phase2Task_Rayquaza +Phase2Task_Rayquaza: @ 814927C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, =gUnknown_085C8D60 + ldr r5, =sPhase2_Rayquaza_Funcs ldr r2, =gTasks lsls r1, r0, 2 adds r1, r0 @@ -6166,7 +1409,7 @@ _0814928E: pop {r0} bx r0 .pool - thumb_func_end Phase2Task_Transition_Rayquaza + thumb_func_end Phase2Task_Rayquaza thumb_func_start sub_81492B4 sub_81492B4: @ 81492B4 @@ -6419,7 +1662,7 @@ _0814949A: movs r0, 0xA0 strh r0, [r1, 0x8] movs r1, 0 - ldr r5, =sub_8146F68 + ldr r5, =VBlankCB1_Phase2_BigPokeball ldr r3, =gUnknown_020393A8 movs r2, 0 _081494C4: @@ -6464,7 +1707,7 @@ sub_8149508: @ 8149508 ands r0, r2 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] - bl sub_8149F2C + bl VBlankCB_BattleTransition ldr r0, =sTransitionStructPtr ldr r0, [r0] movs r1, 0x20 @@ -6494,8 +1737,8 @@ _08149554: .pool thumb_func_end sub_8149508 - thumb_func_start Phase2Task_Transition_WhiteFade -Phase2Task_Transition_WhiteFade: @ 8149578 + thumb_func_start Phase2Task_WhiteFade +Phase2Task_WhiteFade: @ 8149578 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -6520,7 +1763,7 @@ _0814958A: pop {r0} bx r0 .pool - thumb_func_end Phase2Task_Transition_WhiteFade + thumb_func_end Phase2Task_WhiteFade thumb_func_start sub_81495B0 sub_81495B0: @ 81495B0 @@ -6715,7 +1958,7 @@ sub_8149740: @ 8149740 cmp r0, 0x10 bls _08149766 bl sub_8149F84 - ldr r0, =Phase2Task_Transition_WhiteFade + ldr r0, =Phase2Task_WhiteFade bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -6740,7 +1983,7 @@ sub_8149774: @ 8149774 ands r0, r1 strh r0, [r4, 0xA] ldrh r0, [r4, 0xA] - bl sub_8149F2C + bl VBlankCB_BattleTransition ldr r2, =0x04000050 ldr r0, =sTransitionStructPtr ldr r1, [r0] @@ -6785,7 +2028,7 @@ _081497C4: thumb_func_start sub_8149804 sub_8149804: @ 8149804 push {lr} - bl sub_8149F2C + bl VBlankCB_BattleTransition ldr r1, =0x04000054 ldr r0, =sTransitionStructPtr ldr r2, [r0] @@ -6957,8 +2200,8 @@ _0814994C: .pool thumb_func_end sub_8149864 - thumb_func_start Phase2Task_Transition_GridSquares -Phase2Task_Transition_GridSquares: @ 814995C + thumb_func_start Phase2Task_GridSquares +Phase2Task_GridSquares: @ 814995C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -6983,7 +2226,7 @@ _0814996E: pop {r0} bx r0 .pool - thumb_func_end Phase2Task_Transition_GridSquares + thumb_func_end Phase2Task_GridSquares thumb_func_start sub_8149994 sub_8149994: @ 8149994 @@ -7076,7 +2319,7 @@ sub_8149A40: @ 8149A40 cmp r1, 0 bne _08149A60 bl sub_8149F84 - ldr r0, =Phase2Task_Transition_GridSquares + ldr r0, =Phase2Task_GridSquares bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -7088,12 +2331,12 @@ _08149A60: .pool thumb_func_end sub_8149A40 - thumb_func_start Phase2Task_Transition_Shards -Phase2Task_Transition_Shards: @ 8149A6C + thumb_func_start Phase2Task_Shards +Phase2Task_Shards: @ 8149A6C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, =sPhase2_Transition_Shards_Funcs + ldr r5, =sPhase2_Shards_Funcs ldr r2, =gTasks lsls r1, r0, 2 adds r1, r0 @@ -7114,7 +2357,7 @@ _08149A7E: pop {r0} bx r0 .pool - thumb_func_end Phase2Task_Transition_Shards + thumb_func_end Phase2Task_Shards thumb_func_start sub_8149AA4 sub_8149AA4: @ 8149AA4 @@ -7358,7 +2601,7 @@ sub_8149C60: @ 8149C60 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] bl sub_8149F84 - ldr r0, =Phase2Task_Transition_Shards + ldr r0, =Phase2Task_Shards bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -7418,7 +2661,7 @@ sub_8149CE8: @ 8149CE8 ands r0, r1 strh r0, [r4, 0xA] ldrh r0, [r4, 0xA] - bl sub_8149F2C + bl VBlankCB_BattleTransition ldr r3, =sTransitionStructPtr ldr r0, [r3] ldrb r0, [r0] @@ -7463,8 +2706,8 @@ _08149D20: .pool thumb_func_end sub_8149CE8 - thumb_func_start sub_8149D78 -sub_8149D78: @ 8149D78 + thumb_func_start CreatePhase1Task +CreatePhase1Task: @ 8149D78 push {r4-r6,lr} mov r6, r8 push {r6} @@ -7511,10 +2754,10 @@ sub_8149D78: @ 8149D78 pop {r0} bx r0 .pool - thumb_func_end sub_8149D78 + thumb_func_end CreatePhase1Task - thumb_func_start sub_8149DDC -sub_8149DDC: @ 8149DDC + thumb_func_start IsPhase1Done +IsPhase1Done: @ 8149DDC push {lr} ldr r0, =sub_8149DFC bl FindTaskIdByFunc @@ -7530,7 +2773,7 @@ _08149DF4: _08149DF6: pop {r1} bx r1 - thumb_func_end sub_8149DDC + thumb_func_end IsPhase1Done thumb_func_start sub_8149DFC sub_8149DFC: @ 8149DFC @@ -7691,15 +2934,15 @@ sub_8149F08: @ 8149F08 .pool thumb_func_end sub_8149F08 - thumb_func_start sub_8149F2C -sub_8149F2C: @ 8149F2C + thumb_func_start VBlankCB_BattleTransition +VBlankCB_BattleTransition: @ 8149F2C push {lr} bl LoadOam bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 - thumb_func_end sub_8149F2C + thumb_func_end VBlankCB_BattleTransition thumb_func_start sub_8149F40 sub_8149F40: @ 8149F40 @@ -8310,8 +3553,8 @@ sub_814A374: @ 814A374 .pool thumb_func_end sub_814A374 - thumb_func_start Phase2Task_Transition_29 -Phase2Task_Transition_29: @ 814A3BC + thumb_func_start Phase2Task_29 +Phase2Task_29: @ 814A3BC push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -8336,10 +3579,10 @@ _0814A3CE: pop {r0} bx r0 .pool - thumb_func_end Phase2Task_Transition_29 + thumb_func_end Phase2Task_29 - thumb_func_start Phase2Task_Transition_30 -Phase2Task_Transition_30: @ 814A3F4 + thumb_func_start Phase2Task_30 +Phase2Task_30: @ 814A3F4 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -8364,7 +3607,7 @@ _0814A406: pop {r0} bx r0 .pool - thumb_func_end Phase2Task_Transition_30 + thumb_func_end Phase2Task_30 thumb_func_start sub_814A42C sub_814A42C: @ 814A42C @@ -8614,7 +3857,7 @@ _0814A632: ands r0, r1 cmp r0, 0 bne _0814A654 - ldr r0, =Phase2Task_Transition_30 + ldr r0, =Phase2Task_30 bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -8642,7 +3885,7 @@ _0814A654: thumb_func_start sub_814A684 sub_814A684: @ 814A684 push {lr} - bl sub_8149F2C + bl VBlankCB_BattleTransition ldr r2, =0x04000050 ldr r0, =sTransitionStructPtr ldr r1, [r0] @@ -8687,8 +3930,8 @@ sub_814A6CC: @ 814A6CC .pool thumb_func_end sub_814A6CC - thumb_func_start Phase2Task_Transition_31 -Phase2Task_Transition_31: @ 814A6F0 + thumb_func_start Phase2Task_31 +Phase2Task_31: @ 814A6F0 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -8713,10 +3956,10 @@ _0814A702: pop {r0} bx r0 .pool - thumb_func_end Phase2Task_Transition_31 + thumb_func_end Phase2Task_31 - thumb_func_start Phase2Task_Transition_33 -Phase2Task_Transition_33: @ 814A728 + thumb_func_start Phase2Task_33 +Phase2Task_33: @ 814A728 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -8741,10 +3984,10 @@ _0814A73A: pop {r0} bx r0 .pool - thumb_func_end Phase2Task_Transition_33 + thumb_func_end Phase2Task_33 - thumb_func_start Phase2Task_Transition_32 -Phase2Task_Transition_32: @ 814A760 + thumb_func_start Phase2Task_32 +Phase2Task_32: @ 814A760 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -8769,7 +4012,7 @@ _0814A772: pop {r0} bx r0 .pool - thumb_func_end Phase2Task_Transition_32 + thumb_func_end Phase2Task_32 thumb_func_start sub_814A798 sub_814A798: @ 814A798 diff --git a/asm/field_effect.s b/asm/field_effect.s index b6b4803d8d..770f1932ce 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -498,8 +498,8 @@ _080B5E68: bx r1 thumb_func_end FieldEffectActiveListContains - thumb_func_start sub_80B5E6C -sub_80B5E6C: @ 80B5E6C + thumb_func_start CreateTrainerSprite +CreateTrainerSprite: @ 80B5E6C push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -566,7 +566,7 @@ sub_80B5E6C: @ 80B5E6C pop {r1} bx r1 .pool - thumb_func_end sub_80B5E6C + thumb_func_end CreateTrainerSprite thumb_func_start sub_80B5F0C sub_80B5F0C: @ 80B5F0C diff --git a/asm/main_menu.s b/asm/main_menu.s index 52afc783e7..5b50c42deb 100644 --- a/asm/main_menu.s +++ b/asm/main_menu.s @@ -3948,7 +3948,7 @@ AddBirchSpeechObjects: @ 803192C movs r1, 0x78 movs r2, 0x3C movs r3, 0 - bl sub_80B5E6C + bl CreateTrainerSprite lsls r0, 24 lsrs r0, 24 lsls r2, r0, 4 @@ -3981,7 +3981,7 @@ AddBirchSpeechObjects: @ 803192C movs r1, 0x78 movs r2, 0x3C movs r3, 0 - bl sub_80B5E6C + bl CreateTrainerSprite lsls r0, 24 lsrs r0, 24 lsls r2, r0, 4 diff --git a/asm/unk_transition.s b/asm/unk_transition.s index 564d2fbad1..4b96ccaf71 100755 --- a/asm/unk_transition.s +++ b/asm/unk_transition.s @@ -24,8 +24,8 @@ _081DABD2: bx r1 thumb_func_end sub_81DABBC - thumb_func_start Phase2Task_Transition_34 -Phase2Task_Transition_34: @ 81DABDC + thumb_func_start Phase2Task_34 +Phase2Task_34: @ 81DABDC push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -50,7 +50,7 @@ _081DABEE: pop {r0} bx r0 .pool - thumb_func_end Phase2Task_Transition_34 + thumb_func_end Phase2Task_34 thumb_func_start sub_81DAC14 sub_81DAC14: @ 81DAC14 @@ -119,7 +119,7 @@ sub_81DAC80: @ 81DAC80 bne _081DACA4 adds r0, r2, 0 bl sub_81DAA20 - ldr r0, =Phase2Task_Transition_34 + ldr r0, =Phase2Task_34 bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -131,8 +131,8 @@ _081DACA4: .pool thumb_func_end sub_81DAC80 - thumb_func_start Phase2Task_Transition_35 -Phase2Task_Transition_35: @ 81DACB4 + thumb_func_start Phase2Task_35 +Phase2Task_35: @ 81DACB4 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -157,7 +157,7 @@ _081DACC6: pop {r0} bx r0 .pool - thumb_func_end Phase2Task_Transition_35 + thumb_func_end Phase2Task_35 thumb_func_start sub_81DACEC sub_81DACEC: @ 81DACEC @@ -226,7 +226,7 @@ sub_81DAD58: @ 81DAD58 bne _081DAD7C adds r0, r2, 0 bl sub_81DAA20 - ldr r0, =Phase2Task_Transition_35 + ldr r0, =Phase2Task_35 bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -238,8 +238,8 @@ _081DAD7C: .pool thumb_func_end sub_81DAD58 - thumb_func_start Phase2Task_Transition_36 -Phase2Task_Transition_36: @ 81DAD8C + thumb_func_start Phase2Task_36 +Phase2Task_36: @ 81DAD8C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -264,7 +264,7 @@ _081DAD9E: pop {r0} bx r0 .pool - thumb_func_end Phase2Task_Transition_36 + thumb_func_end Phase2Task_36 thumb_func_start sub_81DADC4 sub_81DADC4: @ 81DADC4 @@ -342,7 +342,7 @@ sub_81DAE44: @ 81DAE44 bne _081DAE68 adds r0, r2, 0 bl sub_81DAA20 - ldr r0, =Phase2Task_Transition_36 + ldr r0, =Phase2Task_36 bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -354,8 +354,8 @@ _081DAE68: .pool thumb_func_end sub_81DAE44 - thumb_func_start Phase2Task_Transition_37 -Phase2Task_Transition_37: @ 81DAE78 + thumb_func_start Phase2Task_37 +Phase2Task_37: @ 81DAE78 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -380,7 +380,7 @@ _081DAE8A: pop {r0} bx r0 .pool - thumb_func_end Phase2Task_Transition_37 + thumb_func_end Phase2Task_37 thumb_func_start sub_81DAEB0 sub_81DAEB0: @ 81DAEB0 @@ -460,7 +460,7 @@ sub_81DAF34: @ 81DAF34 bne _081DAF58 adds r0, r2, 0 bl sub_81DAA20 - ldr r0, =Phase2Task_Transition_37 + ldr r0, =Phase2Task_37 bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -472,8 +472,8 @@ _081DAF58: .pool thumb_func_end sub_81DAF34 - thumb_func_start Phase2Task_Transition_38 -Phase2Task_Transition_38: @ 81DAF68 + thumb_func_start Phase2Task_38 +Phase2Task_38: @ 81DAF68 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -498,7 +498,7 @@ _081DAF7A: pop {r0} bx r0 .pool - thumb_func_end Phase2Task_Transition_38 + thumb_func_end Phase2Task_38 thumb_func_start sub_81DAFA0 sub_81DAFA0: @ 81DAFA0 @@ -585,7 +585,7 @@ sub_81DB02C: @ 81DB02C bne _081DB050 adds r0, r2, 0 bl sub_81DAA20 - ldr r0, =Phase2Task_Transition_38 + ldr r0, =Phase2Task_38 bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -597,8 +597,8 @@ _081DB050: .pool thumb_func_end sub_81DB02C - thumb_func_start Phase2Task_Transition_39 -Phase2Task_Transition_39: @ 81DB060 + thumb_func_start Phase2Task_39 +Phase2Task_39: @ 81DB060 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -623,7 +623,7 @@ _081DB072: pop {r0} bx r0 .pool - thumb_func_end Phase2Task_Transition_39 + thumb_func_end Phase2Task_39 thumb_func_start sub_81DB098 sub_81DB098: @ 81DB098 @@ -710,7 +710,7 @@ sub_81DB124: @ 81DB124 bne _081DB148 adds r0, r2, 0 bl sub_81DAA20 - ldr r0, =Phase2Task_Transition_39 + ldr r0, =Phase2Task_39 bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -722,8 +722,8 @@ _081DB148: .pool thumb_func_end sub_81DB124 - thumb_func_start Phase2Task_Transition_40 -Phase2Task_Transition_40: @ 81DB158 + thumb_func_start Phase2Task_40 +Phase2Task_40: @ 81DB158 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -748,7 +748,7 @@ _081DB16A: pop {r0} bx r0 .pool - thumb_func_end Phase2Task_Transition_40 + thumb_func_end Phase2Task_40 thumb_func_start sub_81DB190 sub_81DB190: @ 81DB190 @@ -839,7 +839,7 @@ sub_81DB224: @ 81DB224 bne _081DB248 adds r0, r2, 0 bl sub_81DAA20 - ldr r0, =Phase2Task_Transition_40 + ldr r0, =Phase2Task_40 bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 @@ -851,8 +851,8 @@ _081DB248: .pool thumb_func_end sub_81DB224 - thumb_func_start Phase2Task_Transition_41 -Phase2Task_Transition_41: @ 81DB258 + thumb_func_start Phase2Task_41 +Phase2Task_41: @ 81DB258 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -877,7 +877,7 @@ _081DB26A: pop {r0} bx r0 .pool - thumb_func_end Phase2Task_Transition_41 + thumb_func_end Phase2Task_41 thumb_func_start sub_81DB290 sub_81DB290: @ 81DB290 @@ -970,7 +970,7 @@ sub_81DB328: @ 81DB328 bne _081DB34C adds r0, r2, 0 bl sub_81DAA20 - ldr r0, =Phase2Task_Transition_41 + ldr r0, =Phase2Task_41 bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 diff --git a/data/battle_transition.s b/data/battle_transition.s index 901eeb69d0..98b0224320 100644 --- a/data/battle_transition.s +++ b/data/battle_transition.s @@ -4,175 +4,6 @@ .section .rodata - .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 @@ -286,20 +117,20 @@ gUnknown_085C8D38:: @ 85C8D38 .4byte gUnknown_085C8D18 .align 2 -gUnknown_085C8D40:: @ 85C8D40 - .4byte sub_8146DAC - .4byte sub_8146DD8 +sPhase2_Groudon_Funcs:: @ 85C8D40 + .4byte Phase2_WeatherTrio_Func1 + .4byte Phase2_WaitPaletteFade .4byte sub_8149178 .4byte sub_81491C8 .4byte sub_8149224 - .4byte sub_8146D90 - .4byte sub_8146B7C - .4byte sub_8146BA8 + .4byte Phase2_FramesCountdown + .4byte Phase2_WeatherDuo_Func6 + .4byte Phase2_WeatherDuo_Func7 .align 2 -gUnknown_085C8D60:: @ 85C8D60 - .4byte sub_8146DAC - .4byte sub_8146DD8 +sPhase2_Rayquaza_Funcs:: @ 85C8D60 + .4byte Phase2_WeatherTrio_Func1 + .4byte Phase2_WaitPaletteFade .4byte sub_81492B4 .4byte sub_8149358 .4byte sub_8149388 @@ -329,7 +160,7 @@ sUnknown_085C8DB0:: @ 85C8DB0 .4byte sub_8149A40 .align 2 -sPhase2_Transition_Shards_Funcs:: @ 85C8DBC +sPhase2_Shards_Funcs:: @ 85C8DBC .4byte sub_8149AA4 .4byte sub_8149B08 .4byte sub_8149B84 @@ -481,10 +312,10 @@ sMugshotsTilemap:: @ 85C94D0 gUnknown_085C99D0:: @ 85C99D0 .4byte sub_814A324 .4byte sub_814A374 - .4byte sub_8146BF8 - .4byte sub_8146C8C - .4byte sub_8146D20 - .4byte sub_8146DF8 + .4byte Phase2_BigPokeball_Func3 + .4byte Phase2_BigPokeball_Func4 + .4byte Phase2_BigPokeball_Func5 + .4byte Phase2_BigPokeball_Func6 .align 2 gUnknown_085C99E8:: @ 85C99E8 diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 9457094f9a..1a877daa92 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -256,7 +256,7 @@ gFieldEffectScript_Unknown44:: @ 82DBC45 gFieldEffectScript_Unknown45:: @ 82DBC4B field_eff_loadpal gFieldEffectObjectPaletteInfo10 - field_eff_callnative sub_81470D0 + field_eff_callnative FldEff_Pokeball field_eff_end gFieldEffectScript_HeartIcon:: @ 82DBC56 diff --git a/include/battle_transition.h b/include/battle_transition.h index 108b6232b4..2ad27dc293 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -7,6 +7,16 @@ void BattleTransition_StartOnField(u8 transitionID); void BattleTransition_Start(u8 transitionID); bool8 IsBattleTransitionDone(void); +enum // TRANSITION_MUGSHOT +{ + MUGSHOT_SYDNEY, + MUGSHOT_PHOEBE, + MUGSHOT_GLACIA, + MUGSHOT_DRAKE, + MUGSHOT_CHAMPION, + MUGSHOTS_COUNT +}; + // credits for the names go to Dyskinesia and Tetrable // names are naturally subject to change diff --git a/include/field_effect.h b/include/field_effect.h index 772b20d37a..2d1d3b3b03 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -75,5 +75,6 @@ u32 FieldEffectStart(u8); bool8 FieldEffectActiveListContains(u8 id); void sub_80B69DC(void); void FieldEffectStop(struct Sprite *sprite, u8 id); +u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buffer); #endif //GUARD_FIELD_EFFECTS_H diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h index f86f2434cb..6dbe5e8ed8 100644 --- a/include/gba/io_reg.h +++ b/include/gba/io_reg.h @@ -137,8 +137,6 @@ #define REG_OFFSET_DMA3CNT_H 0xde #define REG_OFFSET_TMCNT 0x100 -#define REG_OFFSET_TMCNT_L 0x100 -#define REG_OFFSET_TMCNT_H 0x102 #define REG_OFFSET_TM0CNT 0x100 #define REG_OFFSET_TM0CNT_L 0x100 #define REG_OFFSET_TM0CNT_H 0x102 @@ -300,8 +298,6 @@ #define REG_ADDR_DMA3CNT_H (REG_BASE + REG_OFFSET_DMA3CNT_H) #define REG_ADDR_TMCNT (REG_BASE + REG_OFFSET_TMCNT) -#define REG_ADDR_TMCNT_L (REG_BASE + REG_OFFSET_TMCNT_L) -#define REG_ADDR_TMCNT_H (REG_BASE + REG_OFFSET_TMCNT_H) #define REG_ADDR_TM0CNT (REG_BASE + REG_OFFSET_TM0CNT) #define REG_ADDR_TM0CNT_L (REG_BASE + REG_OFFSET_TM0CNT_L) #define REG_ADDR_TM0CNT_H (REG_BASE + REG_OFFSET_TM0CNT_H) @@ -462,8 +458,6 @@ #define REG_DMA3CNT_H (*(vu16 *)REG_ADDR_DMA3CNT_H) #define REG_TMCNT(n) (*(vu16 *)(REG_ADDR_TMCNT + ((n) * 4))) -#define REG_TMCNT_L(n) (*(vu16 *)(REG_ADDR_TMCNT_L + ((n) * 4))) -#define REG_TMCNT_H(n) (*(vu16 *)(REG_ADDR_TMCNT_H + ((n) * 4))) #define REG_TM0CNT (*(vu32 *)REG_ADDR_TM0CNT) #define REG_TM0CNT_L (*(vu16 *)REG_ADDR_TM0CNT_L) #define REG_TM0CNT_H (*(vu16 *)REG_ADDR_TM0CNT_H) @@ -501,12 +495,12 @@ // I/O register fields // DISPCNT -#define DISPCNT_MODE_0 0x0000 -#define DISPCNT_MODE_1 0x0001 -#define DISPCNT_MODE_2 0x0002 -#define DISPCNT_MODE_3 0x0003 -#define DISPCNT_MODE_4 0x0004 -#define DISPCNT_MODE_5 0x0005 +#define DISPCNT_MODE_0 0x0000 // BG0: text, BG1: text, BG2: text, BG3: text +#define DISPCNT_MODE_1 0x0001 // BG0: text, BG1: text, BG2: affine, BG3: off +#define DISPCNT_MODE_2 0x0002 // BG0: off, BG1: off, BG2: affine, BG3: affine +#define DISPCNT_MODE_3 0x0003 // Bitmap mode, 240x160, BGR555 color +#define DISPCNT_MODE_4 0x0004 // Bitmap mode, 240x160, 256 color palette +#define DISPCNT_MODE_5 0x0005 // Bitmap mode, 160x128, BGR555 color #define DISPCNT_OBJ_1D_MAP 0x0040 #define DISPCNT_FORCED_BLANK 0x0080 #define DISPCNT_BG0_ON 0x0100 @@ -527,7 +521,46 @@ #define DISPSTAT_HBLANK_INTR 0x0010 // H-Blank interrupt enabled #define DISPSTAT_VCOUNT_INTR 0x0020 // V-Count interrupt enabled +// BGCNT +#define BGCNT_PRIORITY(n) (n) // Values 0 - 3. Lower priority BGs will be drawn on top of higher priority BGs. +#define BGCNT_CHARBASE(n) ((n) << 2) // Values 0 - 3. Base block for tile pixel data. +#define BGCNT_MOSAIC 0x0040 +#define BGCNT_16COLOR 0x0000 // 4 bits per pixel +#define BGCNT_256COLOR 0x0080 // 8 bits per pixel +#define BGCNT_SCREENBASE(n) ((n) << 8) // Values 0 - 31. Base block for tile map. +#define BGCNT_WRAP 0x2000 // Only affects affine BGs. Text BGs wrap by default. +#define BGCNT_TXT256x256 0x0000 // Internal screen size size of text mode BG in pixels. +#define BGCNT_TXT512x256 0x4000 +#define BGCNT_TXT256x512 0x8000 +#define BGCNT_TXT512x512 0xC000 +#define BGCNT_AFF128x128 0x0000 // Internal screen size size of affine mode BG in pixels. +#define BGCNT_AFF256x256 0x4000 +#define BGCNT_AFF512x512 0x8000 +#define BGCNT_AFF1024x1024 0xC000 + // BLDCNT +// Bits 0-5 select layers for the 1st target +#define BLDCNT_TGT1_BG0 (1 << 0) +#define BLDCNT_TGT1_BG1 (1 << 1) +#define BLDCNT_TGT1_BG2 (1 << 2) +#define BLDCNT_TGT1_BG3 (1 << 3) +#define BLDCNT_TGT1_OBJ (1 << 4) +#define BLDCNT_TGT1_BD (1 << 5) +// Bits 6-7 select the special effect +#define BLDCNT_EFFECT_NONE (0 << 6) // no special effect +#define BLDCNT_EFFECT_BLEND (1 << 6) // 1st+2nd targets mixed (controlled by BLDALPHA) +#define BLDCNT_EFFECT_LIGHTEN (2 << 6) // 1st target becomes whiter (controlled by BLDY) +#define BLDCNT_EFFECT_DARKEN (3 << 6) // 1st target becomes blacker (controlled by BLDY) +// Bits 8-13 select layers for the 2nd target +#define BLDCNT_TGT2_BG0 (1 << 8) +#define BLDCNT_TGT2_BG1 (1 << 9) +#define BLDCNT_TGT2_BG2 (1 << 10) +#define BLDCNT_TGT2_BG3 (1 << 11) +#define BLDCNT_TGT2_OBJ (1 << 12) +#define BLDCNT_TGT2_BD (1 << 13) + +// BLDALPHA +#define BLDALPHA_BLEND(target1, target2) (((target2) << 8) | (target1)) // SOUNDCNT_H #define SOUND_CGB_MIX_QUARTER 0x0000 @@ -627,8 +660,8 @@ #define KEY_INTR_ENABLE 0x0400 #define KEY_OR_INTR 0x0000 #define KEY_AND_INTR 0x8000 - -#define DPAD_ANY ((DPAD_RIGHT | DPAD_LEFT | DPAD_UP | DPAD_DOWN)) +#define DPAD_ANY 0x00F0 +#define JOY_EXCL_DPAD 0x030F // interrupt flags #define INTR_FLAG_VBLANK (1 << 0) diff --git a/include/unk_transition.h b/include/unk_transition.h index ef7b33ed7f..a9caac419b 100644 --- a/include/unk_transition.h +++ b/include/unk_transition.h @@ -1,13 +1,13 @@ #ifndef GUARD_UNK_TRANSITION_H #define GUARD_UNK_TRANSITION_H -void Phase2Task_Transition_34(u8 taskId); -void Phase2Task_Transition_35(u8 taskId); -void Phase2Task_Transition_36(u8 taskId); -void Phase2Task_Transition_37(u8 taskId); -void Phase2Task_Transition_38(u8 taskId); -void Phase2Task_Transition_39(u8 taskId); -void Phase2Task_Transition_40(u8 taskId); -void Phase2Task_Transition_41(u8 taskId); +void Phase2Task_34(u8 taskId); +void Phase2Task_35(u8 taskId); +void Phase2Task_36(u8 taskId); +void Phase2Task_37(u8 taskId); +void Phase2Task_38(u8 taskId); +void Phase2Task_39(u8 taskId); +void Phase2Task_40(u8 taskId); +void Phase2Task_41(u8 taskId); #endif // GUARD_UNK_TRANSITION_H diff --git a/src/battle_transition.c b/src/battle_transition.c index 386b0dd791..e60a2d91fa 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -15,6 +15,8 @@ #include "field_camera.h" #include "unknown_task.h" #include "malloc.h" +#include "gpu_regs.h" +#include "decompress.h" struct TransitionData { @@ -39,54 +41,169 @@ struct TransitionData s16 data[11]; }; -typedef bool8 (*TransitionState)(struct Task *task); +typedef bool8 (*TransitionStateFunc)(struct Task *task); typedef bool8 (*TransitionSpriteCallback)(struct Sprite *sprite); +extern u16 gUnknown_020393A8[]; +extern u16 gUnknown_02038C28[][0x3C0]; + extern void c2_exit_to_overworld_2_switch(void); extern void sub_80AC3D0(void); +extern void dp12_8087EA4(void); // this file's functions void LaunchBattleTransitionTask(u8 transitionId); void Task_BattleTransitionMain(u8 taskId); void Phase1Task_TransitionAll(u8 taskId); -void Phase2Task_Transition_Blur(u8 taskId); -void Phase2Task_Transition_Swirl(u8 taskId); -void Phase2Task_Transition_Shuffle(u8 taskId); -void Phase2Task_Transition_BigPokeball(u8 taskId); -void Phase2Task_Transition_PokeballsTrail(u8 taskId); -void Phase2Task_Transition_Clockwise_BlackFade(u8 taskId); -void Phase2Task_Transition_Ripple(u8 taskId); -void Phase2Task_Transition_Wave(u8 taskId); -void Phase2Task_Transition_Slice(u8 taskId); -void Phase2Task_Transition_WhiteFade(u8 taskId); -void Phase2Task_Transition_GridSquares(u8 taskId); -void Phase2Task_Transition_Shards(u8 taskId); -void Phase2Task_Transition_Sydney(u8 taskId); -void Phase2Task_Transition_Phoebe(u8 taskId); -void Phase2Task_Transition_Glacia(u8 taskId); -void Phase2Task_Transition_Drake(u8 taskId); -void Phase2Task_Transition_Wallace(u8 taskId); -void Phase2Task_Transition_Aqua(u8 taskId); -void Phase2Task_Transition_Magma(u8 taskId); -void Phase2Task_Transition_Regice(u8 taskId); -void Phase2Task_Transition_Registeel(u8 taskId); -void Phase2Task_Transition_Regirock(u8 taskId); -void Phase2Task_Transition_Kyogre(u8 taskId); -void Phase2Task_Transition_Groudon(u8 taskId); -void Phase2Task_Transition_Rayquaza(u8 taskId); -void Phase2Task_Transition_25(u8 taskId); -void Phase2Task_Transition_26(u8 taskId); -void Phase2Task_Transition_27(u8 taskId); -void Phase2Task_Transition_28(u8 taskId); -void Phase2Task_Transition_29(u8 taskId); -void Phase2Task_Transition_30(u8 taskId); -void Phase2Task_Transition_31(u8 taskId); -void Phase2Task_Transition_32(u8 taskId); -void Phase2Task_Transition_33(u8 taskId); +void Phase2Task_Blur(u8 taskId); +void Phase2Task_Swirl(u8 taskId); +void Phase2Task_Shuffle(u8 taskId); +void Phase2Task_BigPokeball(u8 taskId); +void Phase2Task_PokeballsTrail(u8 taskId); +void Phase2Task_Clockwise_BlackFade(u8 taskId); +void Phase2Task_Ripple(u8 taskId); +void Phase2Task_Wave(u8 taskId); +void Phase2Task_Slice(u8 taskId); +void Phase2Task_WhiteFade(u8 taskId); +void Phase2Task_GridSquares(u8 taskId); +void Phase2Task_Shards(u8 taskId); +void Phase2Task_Sydney(u8 taskId); +void Phase2Task_Phoebe(u8 taskId); +void Phase2Task_Glacia(u8 taskId); +void Phase2Task_Drake(u8 taskId); +void Phase2Task_Champion(u8 taskId); +void Phase2Task_Aqua(u8 taskId); +void Phase2Task_Magma(u8 taskId); +void Phase2Task_Regice(u8 taskId); +void Phase2Task_Registeel(u8 taskId); +void Phase2Task_Regirock(u8 taskId); +void Phase2Task_Kyogre(u8 taskId); +void Phase2Task_Groudon(u8 taskId); +void Phase2Task_Rayquaza(u8 taskId); +void Phase2Task_25(u8 taskId); +void Phase2Task_26(u8 taskId); +void Phase2Task_27(u8 taskId); +void Phase2Task_28(u8 taskId); +void Phase2Task_29(u8 taskId); +void Phase2Task_30(u8 taskId); +void Phase2Task_31(u8 taskId); +void Phase2Task_32(u8 taskId); +void Phase2Task_33(u8 taskId); +void VBlankCB_BattleTransition(void); +void VBlankCB_Phase2_Swirl(void); +void HBlankCB_Phase2_Swirl(void); +void VBlankCB_Phase2_Shuffle(void); +void HBlankCB_Phase2_Shuffle(void); +void VBlankCB0_Phase2_BigPokeball(void); +void VBlankCB1_Phase2_BigPokeball(void); +void VBlankCB_Phase2_Clockwise_BlackFade(void); +void VBlankCB_Phase2_Ripple(void); +void HBlankCB_Phase2_Ripple(void); +void VBlankCB_Phase2_Wave(void); +void VBlankCB_Phase2_Slice(void); +void HBlankCB_Phase2_Slice(void); +void VBlankCB0_Phase2_WhiteFade(void); +void VBlankCB1_Phase2_WhiteFade(void); +void HBlankCB_Phase2_WhiteFade(void); +void VBlankCB_Phase2_Shards(void); +bool8 Phase2_Blur_Func1(struct Task *task); +bool8 Phase2_Blur_Func2(struct Task *task); +bool8 Phase2_Blur_Func3(struct Task *task); +bool8 Phase2_Swirl_Func1(struct Task *task); +bool8 Phase2_Swirl_Func2(struct Task *task); +bool8 Phase2_Shuffle_Func1(struct Task *task); +bool8 Phase2_Shuffle_Func2(struct Task *task); +bool8 Phase2_Aqua_Func1(struct Task *task); +bool8 Phase2_Aqua_Func2(struct Task *task); +bool8 Phase2_Magma_Func1(struct Task *task); +bool8 Phase2_Magma_Func2(struct Task *task); +bool8 Phase2_FramesCountdown(struct Task *task); +bool8 Phase2_Regi_Func1(struct Task *task); +bool8 Phase2_Regice_Func2(struct Task *task); +bool8 Phase2_Registeel_Func2(struct Task *task); +bool8 Phase2_Regirock_Func2(struct Task *task); +bool8 Phase2_WeatherTrio_Func1(struct Task *task); +bool8 Phase2_WaitPaletteFade(struct Task *task); +bool8 Phase2_Kyogre_Func3(struct Task *task); +bool8 Phase2_Kyogre_Func4(struct Task *task); +bool8 Phase2_Kyogre_Func5(struct Task *task); +bool8 Phase2_WeatherDuo_Func6(struct Task *task); +bool8 Phase2_WeatherDuo_Func7(struct Task *task); +bool8 Phase2_BigPokeball_Func1(struct Task *task); +bool8 Phase2_BigPokeball_Func2(struct Task *task); +bool8 Phase2_BigPokeball_Func3(struct Task *task); +bool8 Phase2_BigPokeball_Func4(struct Task *task); +bool8 Phase2_BigPokeball_Func5(struct Task *task); +bool8 Phase2_BigPokeball_Func6(struct Task *task); +bool8 Phase2_PokeballsTrail_Func1(struct Task *task); +bool8 Phase2_PokeballsTrail_Func2(struct Task *task); +bool8 Phase2_PokeballsTrail_Func3(struct Task *task); +bool8 Phase2_Clockwise_BlackFade_Func1(struct Task *task); +bool8 Phase2_Clockwise_BlackFade_Func2(struct Task *task); +bool8 Phase2_Clockwise_BlackFade_Func3(struct Task *task); +bool8 Phase2_Clockwise_BlackFade_Func4(struct Task *task); +bool8 Phase2_Clockwise_BlackFade_Func5(struct Task *task); +bool8 Phase2_Clockwise_BlackFade_Func6(struct Task *task); +bool8 Phase2_Clockwise_BlackFade_Func7(struct Task *task); +bool8 Phase2_Ripple_Func1(struct Task *task); +bool8 Phase2_Ripple_Func2(struct Task *task); +bool8 Phase2_Wave_Func1(struct Task *task); +bool8 Phase2_Wave_Func2(struct Task *task); +bool8 Phase2_Wave_Func3(struct Task *task); +bool8 Phase2_Slice_Func1(struct Task *task); +bool8 Phase2_Slice_Func2(struct Task *task); +bool8 Phase2_Slice_Func3(struct Task *task); +bool8 Phase2_WhiteFade_Func1(struct Task *task); +bool8 Phase2_WhiteFade_Func2(struct Task *task); +bool8 Phase2_WhiteFade_Func3(struct Task *task); +bool8 Phase2_WhiteFade_Func4(struct Task *task); +bool8 Phase2_WhiteFade_Func5(struct Task *task); +bool8 Phase2_GridSquares_Func1(struct Task *task); +bool8 Phase2_GridSquares_Func2(struct Task *task); +bool8 Phase2_GridSquares_Func3(struct Task *task); +bool8 Phase2_Shards_Func1(struct Task *task); +bool8 Phase2_Shards_Func2(struct Task *task); +bool8 Phase2_Shards_Func3(struct Task *task); +bool8 Phase2_Shards_Func4(struct Task *task); +bool8 Phase2_Shards_Func5(struct Task *task); +bool8 Phase2_Mugshot_Func1(struct Task *task); +bool8 Phase2_Mugshot_Func2(struct Task *task); +bool8 Phase2_Mugshot_Func3(struct Task *task); +bool8 Phase2_Mugshot_Func4(struct Task *task); +bool8 Phase2_Mugshot_Func5(struct Task *task); +bool8 Phase2_Mugshot_Func6(struct Task *task); +bool8 Phase2_Mugshot_Func7(struct Task *task); +bool8 Phase2_Mugshot_Func8(struct Task *task); +bool8 Phase2_Mugshot_Func9(struct Task *task); +bool8 Phase2_Mugshot_Func10(struct Task *task); +void Phase2Task_MugShotTransition(u8 taskId); +void Mugshots_CreateOpponentPlayerSprites(struct Task *task); +void VBlankCB0_Phase2_Mugshots(void); +void VBlankCB1_Phase2_Mugshots(void); +void HBlankCB_Phase2_Mugshots(void); bool8 Transition_Phase1(struct Task *task); bool8 Transition_WaitForPhase1(struct Task *task); bool8 Transition_Phase2(struct Task *task); bool8 Transition_WaitForPhase2(struct Task *task); +void sub_8149F08(void); +void sub_8149F84(void); +void CreatePhase1Task(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4); +void sub_814A014(u16 *a0, s16 a1, s16 a2, s16 a3); +void sub_8149F98(s16 *array, s16 sinAdd, s16 index, s16 indexIncrementer, s16 amplitude, s16 arrSize); +void sub_8149F58(u16 **a0, u16 **a1); +void sub_814A1AC(s16 *a0, s16 a1, s16 a2, s16 a3, s16 a4, s16 a5, s16 a6); +bool8 sub_814A228(s16 *a0, bool8 a1, bool8 a2); +void sub_8148484(s16 spriteId, s16 value); +void sub_814849C(s16 spriteId); +s16 sub_81484B8(s16 spriteId); +bool8 IsPhase1Done(void); +void sub_814713C(struct Sprite *sprite); +void sub_8148380(struct Sprite *sprite); +bool8 sub_81483A8(struct Sprite *sprite); +bool8 sub_81483AC(struct Sprite *sprite); +bool8 sub_81483F8(struct Sprite *sprite); +bool8 sub_814842C(struct Sprite *sprite); +bool8 sub_8148458(struct Sprite *sprite); // iwram bss vars IWRAM_DATA u16 gUnknown_03001208; @@ -116,16 +233,16 @@ const u32 gUnknown_085BC2F4[] = INCBIN_U32("graphics/battle_transitions/85BC2F4. const u32 gUnknown_085BC314[] = INCBIN_U32("graphics/battle_transitions/85BC314.bin"); const u32 gUnknown_085BCB14[] = INCBIN_U32("graphics/battle_transitions/85BCB14.bin"); const u32 gUnknown_085BD314[] = INCBIN_U32("graphics/battle_transitions/85BD314.bin"); -const u32 gUnknown_085BDB14[] = INCBIN_U32("graphics/battle_transitions/85BDB14.gbapal"); +const u16 gUnknown_085BDB14[] = INCBIN_U16("graphics/battle_transitions/85BDB14.gbapal"); const u32 gUnknown_085BDB34[] = INCBIN_U32("graphics/battle_transitions/kyogre.4bpp.lz"); const u32 gUnknown_085BE1E8[] = INCBIN_U32("graphics/battle_transitions/kyogre.bin.lz"); const u32 gUnknown_085BE51C[] = INCBIN_U32("graphics/battle_transitions/groudon.4bpp.lz"); const u32 gUnknown_085BEA88[] = INCBIN_U32("graphics/battle_transitions/groudon.bin.lz"); -const u32 gUnknown_085BEDA0[] = INCBIN_U32("graphics/battle_transitions/kyogre_pt1.gbapal"); -const u32 gUnknown_085BEEE0[] = INCBIN_U32("graphics/battle_transitions/kyogre_pt2.gbapal"); -const u32 gUnknown_085BF0A0[] = INCBIN_U32("graphics/battle_transitions/groudon_pt1.gbapal"); -const u32 gUnknown_085BF2A0[] = INCBIN_U32("graphics/battle_transitions/groudon_pt2.gbapal"); -const u32 gUnknown_085BF4A0[] = INCBIN_U32("graphics/battle_transitions/rayquaza.gbapal"); +const u16 gUnknown_085BEDA0[] = INCBIN_U16("graphics/battle_transitions/kyogre_pt1.gbapal"); +const u16 gUnknown_085BEEE0[] = INCBIN_U16("graphics/battle_transitions/kyogre_pt2.gbapal"); +const u16 gUnknown_085BF0A0[] = INCBIN_U16("graphics/battle_transitions/groudon_pt1.gbapal"); +const u16 gUnknown_085BF2A0[] = INCBIN_U16("graphics/battle_transitions/groudon_pt2.gbapal"); +const u16 gUnknown_085BF4A0[] = INCBIN_U16("graphics/battle_transitions/rayquaza.gbapal"); const u32 gUnknown_085BF6A0[] = INCBIN_U32("graphics/battle_transitions/rayquaza.4bpp"); const u32 gUnknown_085C6BE0[] = INCBIN_U32("graphics/battle_transitions/rayquaza.bin"); const u32 gUnknown_085C7BE0[] = INCBIN_U32("graphics/battle_transitions/frontier_brain.gbapal"); @@ -145,51 +262,51 @@ const TaskFunc sPhase1_Tasks[B_TRANSITION_COUNT] = const TaskFunc sPhase2_Tasks[B_TRANSITION_COUNT] = { - Phase2Task_Transition_Blur, // 0 - Phase2Task_Transition_Swirl, // 1 - Phase2Task_Transition_Shuffle, // 2 - Phase2Task_Transition_BigPokeball, // 3 - Phase2Task_Transition_PokeballsTrail, // 4 - Phase2Task_Transition_Clockwise_BlackFade, // 5 - Phase2Task_Transition_Ripple, // 6 - Phase2Task_Transition_Wave, // 7 - Phase2Task_Transition_Slice, // 8 - Phase2Task_Transition_WhiteFade, // 9 - Phase2Task_Transition_GridSquares, // 10 - Phase2Task_Transition_Shards, // 11 - Phase2Task_Transition_Sydney, // 12 - Phase2Task_Transition_Phoebe, // 13 - Phase2Task_Transition_Glacia, // 14 - Phase2Task_Transition_Drake, // 15 - Phase2Task_Transition_Wallace, // 16 - Phase2Task_Transition_Aqua, // 17 - Phase2Task_Transition_Magma, // 18 - Phase2Task_Transition_Regice, // 19 - Phase2Task_Transition_Registeel, // 20 - Phase2Task_Transition_Regirock, // 21 - Phase2Task_Transition_Kyogre, // 22 - Phase2Task_Transition_Groudon, // 23 - Phase2Task_Transition_Rayquaza, // 24 - Phase2Task_Transition_25, // 25 - Phase2Task_Transition_26, // 26 - Phase2Task_Transition_27, // 27 - Phase2Task_Transition_28, // 28 - Phase2Task_Transition_29, // 29 - Phase2Task_Transition_30, // 30 - Phase2Task_Transition_31, // 31 - Phase2Task_Transition_32, // 32 - Phase2Task_Transition_33, // 33 - Phase2Task_Transition_34, // 34 - Phase2Task_Transition_35, // 35 - Phase2Task_Transition_36, // 36 - Phase2Task_Transition_37, // 37 - Phase2Task_Transition_38, // 38 - Phase2Task_Transition_39, // 39 - Phase2Task_Transition_40, // 40 - Phase2Task_Transition_41, // 41 + Phase2Task_Blur, // 0 + Phase2Task_Swirl, // 1 + Phase2Task_Shuffle, // 2 + Phase2Task_BigPokeball, // 3 + Phase2Task_PokeballsTrail, // 4 + Phase2Task_Clockwise_BlackFade, // 5 + Phase2Task_Ripple, // 6 + Phase2Task_Wave, // 7 + Phase2Task_Slice, // 8 + Phase2Task_WhiteFade, // 9 + Phase2Task_GridSquares, // 10 + Phase2Task_Shards, // 11 + Phase2Task_Sydney, // 12 + Phase2Task_Phoebe, // 13 + Phase2Task_Glacia, // 14 + Phase2Task_Drake, // 15 + Phase2Task_Champion, // 16 + Phase2Task_Aqua, // 17 + Phase2Task_Magma, // 18 + Phase2Task_Regice, // 19 + Phase2Task_Registeel, // 20 + Phase2Task_Regirock, // 21 + Phase2Task_Kyogre, // 22 + Phase2Task_Groudon, // 23 + Phase2Task_Rayquaza, // 24 + Phase2Task_25, // 25 + Phase2Task_26, // 26 + Phase2Task_27, // 27 + Phase2Task_28, // 28 + Phase2Task_29, // 29 + Phase2Task_30, // 30 + Phase2Task_31, // 31 + Phase2Task_32, // 32 + Phase2Task_33, // 33 + Phase2Task_34, // 34 + Phase2Task_35, // 35 + Phase2Task_36, // 36 + Phase2Task_37, // 37 + Phase2Task_38, // 38 + Phase2Task_39, // 39 + Phase2Task_40, // 40 + Phase2Task_41, // 41 }; -const TransitionState sMainTransitionPhases[] = +const TransitionStateFunc sMainTransitionPhases[] = { &Transition_Phase1, &Transition_WaitForPhase1, @@ -197,6 +314,201 @@ const TransitionState sMainTransitionPhases[] = &Transition_WaitForPhase2 }; +const TransitionStateFunc sPhase2_Blur_Funcs[] = +{ + Phase2_Blur_Func1, + Phase2_Blur_Func2, + Phase2_Blur_Func3 +}; + +const TransitionStateFunc sPhase2_Swirl_Funcs[] = +{ + Phase2_Swirl_Func1, + Phase2_Swirl_Func2, +}; + +const TransitionStateFunc sPhase2_Shuffle_Funcs[] = +{ + Phase2_Shuffle_Func1, + Phase2_Shuffle_Func2, +}; + +const TransitionStateFunc sPhase2_Aqua_Funcs[] = +{ + Phase2_Aqua_Func1, + Phase2_Aqua_Func2, + Phase2_BigPokeball_Func3, + Phase2_BigPokeball_Func4, + Phase2_BigPokeball_Func5, + Phase2_FramesCountdown, + Phase2_BigPokeball_Func6 +}; + +const TransitionStateFunc sPhase2_Magma_Funcs[] = +{ + Phase2_Magma_Func1, + Phase2_Magma_Func2, + Phase2_BigPokeball_Func3, + Phase2_BigPokeball_Func4, + Phase2_BigPokeball_Func5, + Phase2_FramesCountdown, + Phase2_BigPokeball_Func6 +}; + +const TransitionStateFunc sPhase2_BigPokeball_Funcs[] = +{ + Phase2_BigPokeball_Func1, + Phase2_BigPokeball_Func2, + Phase2_BigPokeball_Func3, + Phase2_BigPokeball_Func4, + Phase2_BigPokeball_Func5, + Phase2_BigPokeball_Func6 +}; + +const TransitionStateFunc sPhase2_Regice_Funcs[] = +{ + Phase2_Regi_Func1, + Phase2_Regice_Func2, + Phase2_BigPokeball_Func3, + Phase2_BigPokeball_Func4, + Phase2_BigPokeball_Func5, + Phase2_BigPokeball_Func6 +}; + +const TransitionStateFunc sPhase2_Registeel_Funcs[] = +{ + Phase2_Regi_Func1, + Phase2_Registeel_Func2, + Phase2_BigPokeball_Func3, + Phase2_BigPokeball_Func4, + Phase2_BigPokeball_Func5, + Phase2_BigPokeball_Func6 +}; + +const TransitionStateFunc sPhase2_Regirock_Funcs[] = +{ + Phase2_Regi_Func1, + Phase2_Regirock_Func2, + Phase2_BigPokeball_Func3, + Phase2_BigPokeball_Func4, + Phase2_BigPokeball_Func5, + Phase2_BigPokeball_Func6 +}; + +const TransitionStateFunc sPhase2_Kyogre_Funcs[] = +{ + Phase2_WeatherTrio_Func1, + Phase2_WaitPaletteFade, + Phase2_Kyogre_Func3, + Phase2_Kyogre_Func4, + Phase2_Kyogre_Func5, + Phase2_FramesCountdown, + Phase2_WeatherDuo_Func6, + Phase2_WeatherDuo_Func7 +}; + +const TransitionStateFunc sPhase2_PokeballsTrail_Funcs[] = +{ + Phase2_PokeballsTrail_Func1, + Phase2_PokeballsTrail_Func2, + Phase2_PokeballsTrail_Func3 +}; + +const s16 sUnknown_085C8B88[2] = {-16, 256}; +const s16 sUnknown_085C8B8C[5] = {0, 32, 64, 18, 48}; +const s16 sUnknown_085C8B96[2] = {8, -8}; + +const TransitionStateFunc sPhase2_Clockwise_BlackFade_Funcs[] = +{ + Phase2_Clockwise_BlackFade_Func1, + Phase2_Clockwise_BlackFade_Func2, + Phase2_Clockwise_BlackFade_Func3, + Phase2_Clockwise_BlackFade_Func4, + Phase2_Clockwise_BlackFade_Func5, + Phase2_Clockwise_BlackFade_Func6, + Phase2_Clockwise_BlackFade_Func7 +}; + +const TransitionStateFunc sPhase2_Ripple_Funcs[] = +{ + Phase2_Ripple_Func1, + Phase2_Ripple_Func2 +}; + +const TransitionStateFunc sPhase2_Wave_Funcs[] = +{ + Phase2_Wave_Func1, + Phase2_Wave_Func2, + Phase2_Wave_Func3 +}; + +const TransitionStateFunc sPhase2_Mugshot_Funcs[] = +{ + Phase2_Mugshot_Func1, + Phase2_Mugshot_Func2, + Phase2_Mugshot_Func3, + Phase2_Mugshot_Func4, + Phase2_Mugshot_Func5, + Phase2_Mugshot_Func6, + Phase2_Mugshot_Func7, + Phase2_Mugshot_Func8, + Phase2_Mugshot_Func9, + Phase2_Mugshot_Func10 +}; + +const u8 sMugshotsTrainerPicIDsTable[MUGSHOTS_COUNT] = +{ + TRAINER_PIC_ELITE_FOUR_SIDNEY, + TRAINER_PIC_ELITE_FOUR_PHOEBE, + TRAINER_PIC_ELITE_FOUR_GLACIA, + TRAINER_PIC_ELITE_FOUR_DRAKE, + TRAINER_PIC_CHAMPION_WALLACE +}; +const s16 sMugshotsOpponentRotationScales[MUGSHOTS_COUNT][2] = +{ + {0x200, 0x200}, + {0x200, 0x200}, + {0x1B0, 0x1B0}, + {0x1A0, 0x1A0}, + {0x188, 0x188}, +}; +const s16 sMugshotsOpponentCoords[MUGSHOTS_COUNT][2] = +{ + {0, 0}, + {0, 0}, + {-4, 4}, + {0, 5}, + {-8, 7}, +}; + +const TransitionSpriteCallback sUnknown_085C8C24[] = +{ + sub_81483A8, + sub_81483AC, + sub_81483F8, + sub_814842C, + sub_81483A8, + sub_8148458, + sub_81483A8 +}; + +const s16 sUnknown_085C8C40[2] = {12, -12}; +const s16 sUnknown_085C8C44[2] = {-1, 1}; + +const TransitionStateFunc sPhase2_Slice_Funcs[] = +{ + Phase2_Slice_Func1, + Phase2_Slice_Func2, + Phase2_Slice_Func3 +}; + +extern const u16 gFieldEffectObjectPalette10[]; +extern const u16 sBigPokeball_Tilemap[]; +extern const u16 sMugshotsTilemap[]; +extern const struct SpriteTemplate gUnknown_085C8E68; +extern const u16 *const sOpponentMugshotsPals[MUGSHOTS_COUNT]; +extern const u16 *const sPlayerMugshotsPals[2]; + // code static void CB2_TestBattleTransition(void) { @@ -238,6 +550,7 @@ void BattleTransition_Start(u8 transitionId) LaunchBattleTransitionTask(transitionId); } +// main task that launches sub-tasks for phase1 and phase2 #define tState data[0] #define tTransitionID data[1] #define tTransitionDone data[15] @@ -285,3 +598,1594 @@ bool8 Transition_Phase1(struct Task *task) return TRUE; } } + +bool8 Transition_WaitForPhase1(struct Task *task) +{ + if (FindTaskIdByFunc(sPhase1_Tasks[task->tTransitionID]) == 0xFF) + { + task->tState++; + return TRUE; + } + else + { + return FALSE; + } +} + +bool8 Transition_Phase2(struct Task *task) +{ + CreateTask(sPhase2_Tasks[task->tTransitionID], 0); + task->tState++; + return FALSE; +} + +bool8 Transition_WaitForPhase2(struct Task *task) +{ + task->tTransitionDone = FALSE; + if (FindTaskIdByFunc(sPhase2_Tasks[task->tTransitionID]) == 0xFF) + task->tTransitionDone = TRUE; + return FALSE; +} + +#undef tState +#undef tTransitionID +#undef tTransitionDone + +// sub-task for phase1 +#define tState data[0] + +void Phase1Task_TransitionAll(u8 taskId) +{ + if (gTasks[taskId].tState == 0) + { + gTasks[taskId].tState++; + CreatePhase1Task(0, 0, 3, 2, 2); // creates a sub-task for this sub-task + } + else if (IsPhase1Done()) + { + DestroyTask(taskId); + } +} + +#undef tState + +// sub-task for phase2 +#define tState data[0] +#define tFrames data[8] +#define tOpponentSpriteId data[13] +#define tPlayerSpriteId data[14] +#define tMugshotId data[15] + +void Phase2Task_Blur(u8 taskId) +{ + while (sPhase2_Blur_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +bool8 Phase2_Blur_Func1(struct Task *task) +{ + SetGpuReg(REG_OFFSET_MOSAIC, 0); + SetGpuRegBits(REG_OFFSET_BG1CNT, BGCNT_MOSAIC); + SetGpuRegBits(REG_OFFSET_BG2CNT, BGCNT_MOSAIC); + SetGpuRegBits(REG_OFFSET_BG3CNT, BGCNT_MOSAIC); + task->tState++; + return TRUE; +} + +bool8 Phase2_Blur_Func2(struct Task *task) +{ + if (task->data[1] != 0) + { + task->data[1]--; + } + else + { + task->data[1] = 4; + if (++task->data[2] == 10) + BeginNormalPaletteFade(-1, -1, 0, 0x10, 0); + SetGpuReg(REG_OFFSET_MOSAIC, (task->data[2] & 15) * 17); + if (task->data[2] > 14) + task->tState++; + } + return FALSE; +} + +bool8 Phase2_Blur_Func3(struct Task *task) +{ + if (!gPaletteFade.active) + { + u8 taskId = FindTaskIdByFunc(Phase2Task_Blur); + DestroyTask(taskId); + } + return FALSE; +} + +void Phase2Task_Swirl(u8 taskId) +{ + while (sPhase2_Swirl_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +bool8 Phase2_Swirl_Func1(struct Task *task) +{ + sub_8149F08(); + dp12_8087EA4(); + BeginNormalPaletteFade(-1, 4, 0, 0x10, 0); + sub_8149F98(gUnknown_020393A8, sTransitionStructPtr->field_14, 0, 2, 0, 160); + + SetVBlankCallback(VBlankCB_Phase2_Swirl); + SetHBlankCallback(HBlankCB_Phase2_Swirl); + + EnableInterrupts(INTR_FLAG_VBLANK | INTR_FLAG_HBLANK); + + task->tState++; + return FALSE; +} + +bool8 Phase2_Swirl_Func2(struct Task *task) +{ + sTransitionStructPtr->VBlank_DMA = 0; + task->data[1] += 4; + task->data[2] += 8; + + sub_8149F98(gUnknown_02038C28[0], sTransitionStructPtr->field_14, task->data[1], 2, task->data[2], 160); + + if (!gPaletteFade.active) + { + u8 taskId = FindTaskIdByFunc(Phase2Task_Swirl); + DestroyTask(taskId); + } + + sTransitionStructPtr->VBlank_DMA++; + return FALSE; +} + +void VBlankCB_Phase2_Swirl(void) +{ + VBlankCB_BattleTransition(); + if (sTransitionStructPtr->VBlank_DMA) + DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320); +} + +void HBlankCB_Phase2_Swirl(void) +{ + u16 var = gUnknown_02038C28[1][REG_VCOUNT]; + REG_BG1HOFS = var; + REG_BG2HOFS = var; + REG_BG3HOFS = var; +} + +void Phase2Task_Shuffle(u8 taskId) +{ + while (sPhase2_Shuffle_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +bool8 Phase2_Shuffle_Func1(struct Task *task) +{ + sub_8149F08(); + dp12_8087EA4(); + + BeginNormalPaletteFade(-1, 4, 0, 0x10, 0); + memset(gUnknown_020393A8, sTransitionStructPtr->field_16, 0x140); + + SetVBlankCallback(VBlankCB_Phase2_Shuffle); + SetHBlankCallback(HBlankCB_Phase2_Shuffle); + + EnableInterrupts(INTR_FLAG_VBLANK | INTR_FLAG_HBLANK); + + task->tState++; + return FALSE; +} + +bool8 Phase2_Shuffle_Func2(struct Task *task) +{ + u8 i; + u16 r3, r4; + + sTransitionStructPtr->VBlank_DMA = 0; + r4 = task->data[1]; + r3 = task->data[2] >> 8; + task->data[1] += 4224; + task->data[2] += 384; + + for (i = 0; i < 160; i++, r4 += 4224) + { + u16 var = r4 / 256; + gUnknown_02038C28[0][i] = sTransitionStructPtr->field_16 + Sin(var, r3); + } + + if (!gPaletteFade.active) + DestroyTask(FindTaskIdByFunc(Phase2Task_Shuffle)); + + sTransitionStructPtr->VBlank_DMA++; + return FALSE; +} + +void VBlankCB_Phase2_Shuffle(void) +{ + VBlankCB_BattleTransition(); + if (sTransitionStructPtr->VBlank_DMA) + DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320); +} + +void HBlankCB_Phase2_Shuffle(void) +{ + u16 var = gUnknown_02038C28[1][REG_VCOUNT]; + REG_BG1VOFS = var; + REG_BG2VOFS = var; + REG_BG3VOFS = var; +} + +void Phase2Task_BigPokeball(u8 taskId) +{ + while (sPhase2_BigPokeball_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +void Phase2Task_Aqua(u8 taskId) +{ + while (sPhase2_Aqua_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +void Phase2Task_Magma(u8 taskId) +{ + while (sPhase2_Magma_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +void Phase2Task_Regice(u8 taskId) +{ + while (sPhase2_Regice_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +void Phase2Task_Registeel(u8 taskId) +{ + while (sPhase2_Registeel_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +void Phase2Task_Regirock(u8 taskId) +{ + while (sPhase2_Regirock_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +void Phase2Task_Kyogre(u8 taskId) +{ + while (sPhase2_Kyogre_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +void sub_814669C(struct Task *task) +{ + s32 i; + + sub_8149F08(); + dp12_8087EA4(); + + task->data[1] = 16; + task->data[2] = 0; + task->data[4] = 0; + task->data[5] = 0x4000; + sTransitionStructPtr->WININ = 63; + sTransitionStructPtr->WINOUT = 0; + sTransitionStructPtr->field_6 = 240; + sTransitionStructPtr->WIN0V = 160; + sTransitionStructPtr->BLDCNT = 0x3F41; + sTransitionStructPtr->BLDALPHA = (task->data[1] << 8) | (task->data[2]); + + for (i = 0; i < 160; i++) + { + gUnknown_02038C28[1][i] = 240; + } + + SetVBlankCallback(VBlankCB0_Phase2_BigPokeball); +} + +bool8 Phase2_Aqua_Func1(struct Task *task) +{ + u16 *dst1, *dst2; + + task->tFrames = 60; + sub_814669C(task); + sub_8149F58(&dst1, &dst2); + CpuFill16(0, dst1, 0x800); + LZ77UnCompVram(sTeamAqua_Tileset, dst2); + LoadPalette(sEvilTeam_Palette, 0xF0, 0x20); + + task->tState++; + return FALSE; +} + +bool8 Phase2_Magma_Func1(struct Task *task) +{ + u16 *dst1, *dst2; + + task->tFrames = 60; + sub_814669C(task); + sub_8149F58(&dst1, &dst2); + CpuFill16(0, dst1, 0x800); + LZ77UnCompVram(sTeamMagma_Tileset, dst2); + LoadPalette(sEvilTeam_Palette, 0xF0, 0x20); + + task->tState++; + return FALSE; +} + +bool8 Phase2_Regi_Func1(struct Task *task) +{ + u16 *dst1, *dst2; + + task->tFrames = 60; + sub_814669C(task); + sub_8149F58(&dst1, &dst2); + CpuFill16(0, dst1, 0x800); + CpuCopy16(gUnknown_085BBC14, dst2, 0x2000); + + task->tState++; + return FALSE; +} + +bool8 Phase2_BigPokeball_Func1(struct Task *task) +{ + u16 *dst1, *dst2; + + sub_814669C(task); + sub_8149F58(&dst1, &dst2); + CpuFill16(0, dst1, 0x800); + CpuCopy16(sBigPokeball_Tileset, dst2, 0x580); + LoadPalette(gFieldEffectObjectPalette10, 0xF0, 0x20); + + task->tState++; + return FALSE; +} + +bool8 Phase2_BigPokeball_Func2(struct Task *task) +{ + s16 i, j; + u16 *dst1, *dst2; + const u16 *BigPokeballMap; + + sub_8149F58(&dst1, &dst2); + BigPokeballMap = sBigPokeball_Tilemap; + for (i = 0; i < 20; i++) + { + for (j = 0; j < 30; j++, BigPokeballMap++) + { + dst1[i * 32 + j] = *BigPokeballMap | 0xF000; + } + } + sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5], 160); + + task->tState++; + return TRUE; +} + +bool8 Phase2_Aqua_Func2(struct Task *task) +{ + u16 *dst1, *dst2; + + sub_8149F58(&dst1, &dst2); + LZ77UnCompVram(sTeamAqua_Tilemap, dst1); + sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5], 160); + + task->tState++; + return FALSE; +} + +bool8 Phase2_Magma_Func2(struct Task *task) +{ + u16 *dst1, *dst2; + + sub_8149F58(&dst1, &dst2); + LZ77UnCompVram(sTeamMagma_Tilemap, dst1); + sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5], 160); + + task->tState++; + return FALSE; +} + +bool8 Phase2_Regice_Func2(struct Task *task) +{ + u16 *dst1, *dst2; + + sub_8149F58(&dst1, &dst2); + LoadPalette(gUnknown_085BC2B4, 0xF0, 0x20); + CpuCopy16(gUnknown_085BC314, dst1, 0x500); + sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5], 160); + + task->tState++; + return FALSE; +} + +bool8 Phase2_Registeel_Func2(struct Task *task) +{ + u16 *dst1, *dst2; + + sub_8149F58(&dst1, &dst2); + LoadPalette(gUnknown_085BC2D4, 0xF0, 0x20); + CpuCopy16(gUnknown_085BCB14, dst1, 0x500); + sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5], 160); + + task->tState++; + return FALSE; +} + +bool8 Phase2_Regirock_Func2(struct Task *task) +{ + u16 *dst1, *dst2; + + sub_8149F58(&dst1, &dst2); + LoadPalette(gUnknown_085BC2F4, 0xF0, 0x20); + CpuCopy16(gUnknown_085BD314, dst1, 0x500); + sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5], 160); + + task->tState++; + return FALSE; +} + +bool8 Phase2_Kyogre_Func3(struct Task *task) +{ + u16 *dst1, *dst2; + + sub_8149F58(&dst1, &dst2); + CpuFill16(0, dst1, 0x800); + LZ77UnCompVram(gUnknown_085BDB34, dst2); + LZ77UnCompVram(gUnknown_085BE1E8, dst1); + + task->tState++; + return FALSE; +} + +bool8 Phase2_Kyogre_Func4(struct Task *task) +{ + if (task->data[1] % 3 == 0) + { + u16 var = task->data[1] % 30; + var /= 3; + LoadPalette(gUnknown_085BEDA0 + (var * 16), 0xF0, 0x20); + } + if (++task->data[1] > 58) + { + task->tState++; + task->data[1] = 0; + } + + return FALSE; +} + +bool8 Phase2_Kyogre_Func5(struct Task *task) +{ + if (task->data[1] % 5 == 0) + { + s16 var = task->data[1] / 5; + LoadPalette(gUnknown_085BEEE0 + (var * 16), 0xF0, 0x20); + } + if (++task->data[1] > 68) + { + task->tState++; + task->data[1] = 0; + task->tFrames = 30; + } + + return FALSE; +} + +bool8 Phase2_WeatherDuo_Func6(struct Task *task) +{ + BeginNormalPaletteFade(0xFFFF8000, 1, 0, 0x10, 0); + task->tState++; + return FALSE; +} + +bool8 Phase2_WeatherDuo_Func7(struct Task *task) +{ + if (!gPaletteFade.active) + { + DmaStop(0); + sub_8149F84(); + DestroyTask(FindTaskIdByFunc(task->func)); + } + return FALSE; +} + +bool8 Phase2_BigPokeball_Func3(struct Task *task) +{ + sTransitionStructPtr->VBlank_DMA = 0; + if (task->data[3] == 0 || --task->data[3] == 0) + { + task->data[2]++; + task->data[3] = 2; + } + sTransitionStructPtr->BLDALPHA = (task->data[1] << 8) | task->data[2]; + if (task->data[2] > 15) + task->tState++; + task->data[4] += 8; + task->data[5] -= 256; + + sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5] >> 8, 160); + + sTransitionStructPtr->VBlank_DMA++; + return FALSE; +} + +bool8 Phase2_BigPokeball_Func4(struct Task *task) +{ + sTransitionStructPtr->VBlank_DMA = 0; + if (task->data[3] == 0 || --task->data[3] == 0) + { + task->data[1]--; + task->data[3] = 2; + } + sTransitionStructPtr->BLDALPHA = (task->data[1] << 8) | task->data[2]; + if (task->data[1] == 0) + task->tState++; + task->data[4] += 8; + task->data[5] -= 256; + + sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5] >> 8, 160); + + sTransitionStructPtr->VBlank_DMA++; + return FALSE; +} + +bool8 Phase2_BigPokeball_Func5(struct Task *task) +{ + sTransitionStructPtr->VBlank_DMA = 0; + task->data[4] += 8; + task->data[5] -= 256; + + sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5] >> 8, 160); + + if (task->data[5] <= 0) + { + task->tState++; + task->data[1] = 160; + task->data[2] = 256; + task->data[3] = 0; + } + + sTransitionStructPtr->VBlank_DMA++; + return FALSE; +} + +bool8 Phase2_FramesCountdown(struct Task *task) +{ + if (--task->tFrames == 0) + task->tState++; + return FALSE; +} + +bool8 Phase2_WeatherTrio_Func1(struct Task *task) +{ + BeginNormalPaletteFade(0x0000FFFF, 1, 0, 0x10, 0); + task->tState++; + return FALSE; +} + +bool8 Phase2_WaitPaletteFade(struct Task *task) +{ + if (!gPaletteFade.active) + task->tState++; + return FALSE; +} + +bool8 Phase2_BigPokeball_Func6(struct Task *task) +{ + sTransitionStructPtr->VBlank_DMA = 0; + if (task->data[2] < 1024) + task->data[2] += 128; + if (task->data[1] != 0) + { + task->data[1] -= (task->data[2] >> 8); + if (task->data[1] < 0) + task->data[1] = 0; + } + sub_814A014(gUnknown_02038C28[0], 120, 80, task->data[1]); + if (task->data[1] == 0) + { + SetVBlankCallback(NULL); + DmaStop(0); + sub_8149F84(); + DestroyTask(FindTaskIdByFunc(task->func)); + } + else + { + if (task->data[3] == 0) + { + task->data[3]++; + SetVBlankCallback(VBlankCB1_Phase2_BigPokeball); + } + + sTransitionStructPtr->VBlank_DMA++; + } + + return FALSE; +} + +void Transition_BigPokeball_Vblank(void) +{ + DmaStop(0); + VBlankCB_BattleTransition(); + if (sTransitionStructPtr->VBlank_DMA) + DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320); + REG_WININ = sTransitionStructPtr->WININ; + REG_WINOUT = sTransitionStructPtr->WINOUT; + REG_WIN0V = sTransitionStructPtr->WIN0V; + REG_BLDCNT = sTransitionStructPtr->BLDCNT; + REG_BLDALPHA = sTransitionStructPtr->BLDALPHA; +} + +void VBlankCB0_Phase2_BigPokeball(void) +{ + Transition_BigPokeball_Vblank(); + DmaSet(0, gUnknown_020393A8, ®_BG0HOFS, 0xA2400001); +} + +void VBlankCB1_Phase2_BigPokeball(void) +{ + Transition_BigPokeball_Vblank(); + DmaSet(0, gUnknown_020393A8, ®_WIN0H, 0xA2400001); +} + +void Phase2Task_PokeballsTrail(u8 taskId) +{ + while (sPhase2_PokeballsTrail_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +bool8 Phase2_PokeballsTrail_Func1(struct Task *task) +{ + u16 *dst1, *dst2; + + sub_8149F58(&dst1, &dst2); + CpuSet(sPokeballTrail_Tileset, dst2, 0x20); + CpuFill32(0, dst1, 0x800); + LoadPalette(gFieldEffectObjectPalette10, 0xF0, 0x20); + + task->tState++; + return FALSE; +} + +bool8 Phase2_PokeballsTrail_Func2(struct Task *task) +{ + s16 i; + s16 rand; + s16 arr0[ARRAY_COUNT(sUnknown_085C8B88)]; + s16 arr1[ARRAY_COUNT(sUnknown_085C8B8C)]; + + memcpy(arr0, sUnknown_085C8B88, sizeof(sUnknown_085C8B88)); + memcpy(arr1, sUnknown_085C8B8C, sizeof(sUnknown_085C8B8C)); + rand = Random() & 1; + for (i = 0; i <= 4; i++, rand ^= 1) + { + gFieldEffectArguments[0] = arr0[rand]; // x + gFieldEffectArguments[1] = (i * 32) + 16; // y + gFieldEffectArguments[2] = rand; + gFieldEffectArguments[3] = arr1[i]; + FieldEffectStart(FLDEFF_POKEBALL); + } + + task->tState++; + return FALSE; +} + +bool8 Phase2_PokeballsTrail_Func3(struct Task *task) +{ + if (!FieldEffectActiveListContains(FLDEFF_POKEBALL)) + { + sub_8149F84(); + DestroyTask(FindTaskIdByFunc(Phase2Task_PokeballsTrail)); + } + return FALSE; +} + +bool8 FldEff_Pokeball(void) +{ + u8 spriteId = CreateSpriteAtEnd(&gUnknown_085C8E68, gFieldEffectArguments[0], gFieldEffectArguments[1], 0); + gSprites[spriteId].oam.priority = 0; + gSprites[spriteId].oam.affineMode = 1; + gSprites[spriteId].data[0] = gFieldEffectArguments[2]; + gSprites[spriteId].data[1] = gFieldEffectArguments[3]; + gSprites[spriteId].data[2] = -1; + InitSpriteAffineAnim(&gSprites[spriteId]); + StartSpriteAffineAnim(&gSprites[spriteId], gFieldEffectArguments[2]); + return FALSE; +} + +#define SOME_VRAM_STORE(ptr, posY, posX, toStore) \ +{ \ + u32 index = (posY) * 32 + posX; \ + ptr[index] = toStore; \ +} + +void sub_814713C(struct Sprite *sprite) +{ + s16 arr0[ARRAY_COUNT(sUnknown_085C8B96)]; + + memcpy(arr0, sUnknown_085C8B96, sizeof(sUnknown_085C8B96)); + if (sprite->data[1] != 0) + { + sprite->data[1]--; + } + else + { + if (sprite->pos1.x >= 0 && sprite->pos1.x <= 240) + { + s16 posX = sprite->pos1.x >> 3; + s16 posY = sprite->pos1.y >> 3; + + if (posX != sprite->data[2]) + { + u32 var; + u16 *ptr; + + sprite->data[2] = posX; + var = (((REG_BG0CNT >> 8) & 0x1F) << 11); // r2 + ptr = (u16 *)(VRAM + var); + + SOME_VRAM_STORE(ptr, posY - 2, posX, 0xF001); + SOME_VRAM_STORE(ptr, posY - 1, posX, 0xF001); + SOME_VRAM_STORE(ptr, posY - 0, posX, 0xF001); + SOME_VRAM_STORE(ptr, posY + 1, posX, 0xF001); + } + } + sprite->pos1.x += arr0[sprite->data[0]]; + if (sprite->pos1.x < -15 || sprite->pos1.x > 255) + FieldEffectStop(sprite, FLDEFF_POKEBALL); + } +} + +void Phase2Task_Clockwise_BlackFade(u8 taskId) +{ + while (sPhase2_Clockwise_BlackFade_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +bool8 Phase2_Clockwise_BlackFade_Func1(struct Task *task) +{ + u16 i; + + sub_8149F08(); + dp12_8087EA4(); + + sTransitionStructPtr->WININ = 0; + sTransitionStructPtr->WINOUT = 63; + sTransitionStructPtr->field_6 = -3855; + sTransitionStructPtr->WIN0V = 160; + + for (i = 0; i < 160; i++) + { + gUnknown_020393A8[i] = 0xF3F4; + } + + SetVBlankCallback(VBlankCB_Phase2_Clockwise_BlackFade); + sTransitionStructPtr->data[4] = 120; + + task->tState++; + return TRUE; +} + +bool8 Phase2_Clockwise_BlackFade_Func2(struct Task *task) +{ + sTransitionStructPtr->VBlank_DMA = 0; + + sub_814A1AC(sTransitionStructPtr->data, 120, 80, sTransitionStructPtr->data[4], -1, 1, 1); + do + { + gUnknown_02038C28[0][sTransitionStructPtr->data[3]] = (sTransitionStructPtr->data[2] + 1) | 0x7800; + } while (!sub_814A228(sTransitionStructPtr->data, 1, 1)); + + sTransitionStructPtr->data[4] += 16; + if (sTransitionStructPtr->data[4] >= 240) + { + sTransitionStructPtr->data[5] = 0; + task->tState++; + } + + sTransitionStructPtr->VBlank_DMA++; + return FALSE; +} + +bool8 Phase2_Clockwise_BlackFade_Func3(struct Task *task) +{ + s16 r1, r3; + vu8 var = 0; + + sTransitionStructPtr->VBlank_DMA = 0; + + sub_814A1AC(sTransitionStructPtr->data, 120, 80, 240, sTransitionStructPtr->data[5], 1, 1); + + while (1) + { + r1 = 120, r3 = sTransitionStructPtr->data[2] + 1; + if (sTransitionStructPtr->data[5] >= 80) + r1 = sTransitionStructPtr->data[2], r3 = 240; + gUnknown_02038C28[0][sTransitionStructPtr->data[3]] = (r3) | (r1 << 8); + if (var != 0) + break; + var = sub_814A228(sTransitionStructPtr->data, 1, 1); + } + + sTransitionStructPtr->data[5] += 8; + if (sTransitionStructPtr->data[5] >= 160) + { + sTransitionStructPtr->data[4] = 240; + task->tState++; + } + else + { + while (sTransitionStructPtr->data[3] < sTransitionStructPtr->data[5]) + { + gUnknown_02038C28[0][++sTransitionStructPtr->data[3]] = (r3) | (r1 << 8); + } + } + + sTransitionStructPtr->VBlank_DMA++; + return FALSE; +} + +bool8 Phase2_Clockwise_BlackFade_Func4(struct Task *task) +{ + sTransitionStructPtr->VBlank_DMA = 0; + + sub_814A1AC(sTransitionStructPtr->data, 120, 80, sTransitionStructPtr->data[4], 160, 1, 1); + do + { + gUnknown_02038C28[0][sTransitionStructPtr->data[3]] = (sTransitionStructPtr->data[2] << 8) | 0xF0; + } while (!sub_814A228(sTransitionStructPtr->data, 1, 1)); + + sTransitionStructPtr->data[4] -= 16; + if (sTransitionStructPtr->data[4] <= 0) + { + sTransitionStructPtr->data[5] = 160; + task->tState++; + } + + sTransitionStructPtr->VBlank_DMA++; + return FALSE; +} + +bool8 Phase2_Clockwise_BlackFade_Func5(struct Task *task) +{ + s16 r1, r2, var4; + vu8 var = 0; + + sTransitionStructPtr->VBlank_DMA = 0; + + sub_814A1AC(sTransitionStructPtr->data, 120, 80, 0, sTransitionStructPtr->data[5], 1, 1); + + while (1) + { + r1 = (gUnknown_02038C28[0][sTransitionStructPtr->data[3]]) & 0xFF; + r2 = sTransitionStructPtr->data[2]; + if (sTransitionStructPtr->data[5] <= 80) + r2 = 120, r1 = sTransitionStructPtr->data[2]; + var4 = (r1) | (r2 << 8); + gUnknown_02038C28[0][sTransitionStructPtr->data[3]] = var4; + if (var != 0) + break; + var = sub_814A228(sTransitionStructPtr->data, 1, 1); + } + + sTransitionStructPtr->data[5] -= 8; + if (sTransitionStructPtr->data[5] <= 0) + { + sTransitionStructPtr->data[4] = 0; + task->tState++; + } + else + { + while (sTransitionStructPtr->data[3] > sTransitionStructPtr->data[5]) + { + gUnknown_02038C28[0][--sTransitionStructPtr->data[3]] = (r1) | (r2 << 8); + } + } + + sTransitionStructPtr->VBlank_DMA++; + return FALSE; +} + +bool8 Phase2_Clockwise_BlackFade_Func6(struct Task *task) +{ + sTransitionStructPtr->VBlank_DMA = 0; + + sub_814A1AC(sTransitionStructPtr->data, 120, 80, sTransitionStructPtr->data[4], 0, 1, 1); + do + { + s16 r2, r3; + + r2 = 120, r3 = sTransitionStructPtr->data[2]; + if (sTransitionStructPtr->data[2] >= 120) + r2 = 0, r3 = 240; + gUnknown_02038C28[0][sTransitionStructPtr->data[3]] = (r3) | (r2 << 8); + + } while (!sub_814A228(sTransitionStructPtr->data, 1, 1)); + + sTransitionStructPtr->data[4] += 16; + if (sTransitionStructPtr->data[2] > 120) + task->tState++; + + sTransitionStructPtr->VBlank_DMA++; + return FALSE; +} + +bool8 Phase2_Clockwise_BlackFade_Func7(struct Task *task) +{ + DmaStop(0); + sub_8149F84(); + DestroyTask(FindTaskIdByFunc(Phase2Task_Clockwise_BlackFade)); + return FALSE; +} + +void VBlankCB_Phase2_Clockwise_BlackFade(void) +{ + DmaStop(0); + VBlankCB_BattleTransition(); + if (sTransitionStructPtr->VBlank_DMA != 0) + DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320); + REG_WININ = sTransitionStructPtr->WININ; + REG_WINOUT = sTransitionStructPtr->WINOUT; + REG_WIN0V = sTransitionStructPtr->WIN0V; + REG_WIN0H = gUnknown_02038C28[1][0]; + DmaSet(0, gUnknown_02038C28[1], ®_WIN0H, 0xA2400001); +} + +void Phase2Task_Ripple(u8 taskId) +{ + while (sPhase2_Ripple_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +bool8 Phase2_Ripple_Func1(struct Task *task) +{ + u8 i; + + sub_8149F08(); + dp12_8087EA4(); + + for (i = 0; i < 160; i++) + { + gUnknown_020393A8[i] = sTransitionStructPtr->field_16; + } + + SetVBlankCallback(VBlankCB_Phase2_Ripple); + SetHBlankCallback(HBlankCB_Phase2_Ripple); + + EnableInterrupts(INTR_FLAG_HBLANK); + + task->tState++; + return TRUE; +} + +bool8 Phase2_Ripple_Func2(struct Task *task) +{ + u8 i; + s16 r3; + u16 r4, r8; + + sTransitionStructPtr->VBlank_DMA = 0; + + r3 = task->data[2] >> 8; + r4 = task->data[1]; + r8 = 384; + task->data[1] += 0x400; + if (task->data[2] <= 0x1FFF) + task->data[2] += 0x180; + + for (i = 0; i < 160; i++, r4 += r8) + { + // todo: fix the asm + s16 var = r4 >> 8; + asm(""); + gUnknown_02038C28[0][i] = sTransitionStructPtr->field_16 + Sin(var, r3); + } + + if (++task->data[3] == 81) + { + task->data[4]++; + BeginNormalPaletteFade(-1, -2, 0, 0x10, 0); + } + + if (task->data[4] != 0 && !gPaletteFade.active) + DestroyTask(FindTaskIdByFunc(Phase2Task_Ripple)); + + sTransitionStructPtr->VBlank_DMA++; + return FALSE; +} + +void VBlankCB_Phase2_Ripple(void) +{ + VBlankCB_BattleTransition(); + if (sTransitionStructPtr->VBlank_DMA) + DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320); +} + +void HBlankCB_Phase2_Ripple(void) +{ + u16 var = gUnknown_02038C28[1][REG_VCOUNT]; + REG_BG1VOFS = var; + REG_BG2VOFS = var; + REG_BG3VOFS = var; +} + +void Phase2Task_Wave(u8 taskId) +{ + while (sPhase2_Wave_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +bool8 Phase2_Wave_Func1(struct Task *task) +{ + u8 i; + + sub_8149F08(); + dp12_8087EA4(); + + sTransitionStructPtr->WININ = 63; + sTransitionStructPtr->WINOUT = 0; + sTransitionStructPtr->field_6 = 240; + sTransitionStructPtr->WIN0V = 160; + + for (i = 0; i < 160; i++) + { + gUnknown_02038C28[1][i] = 242; + } + + SetVBlankCallback(VBlankCB_Phase2_Wave); + + task->tState++; + return TRUE; +} + +bool8 Phase2_Wave_Func2(struct Task *task) +{ + u8 i, r5; + u16* toStore; + bool8 nextFunc; + + sTransitionStructPtr->VBlank_DMA = 0; + toStore = gUnknown_02038C28[0]; + r5 = task->data[2]; + task->data[2] += 16; + task->data[1] += 8; + + for (i = 0, nextFunc = TRUE; i < 160; i++, r5 += 4, toStore++) + { + s16 value = task->data[1] + Sin(r5, 40); + if (value < 0) + value = 0; + if (value > 240) + value = 240; + *toStore = (value << 8) | (0xF1); + if (value < 240) + nextFunc = FALSE; + } + if (nextFunc) + task->tState++; + + sTransitionStructPtr->VBlank_DMA++; + return FALSE; +} + +bool8 Phase2_Wave_Func3(struct Task *task) +{ + DmaStop(0); + sub_8149F84(); + DestroyTask(FindTaskIdByFunc(Phase2Task_Wave)); + return FALSE; +} + +void VBlankCB_Phase2_Wave(void) +{ + DmaStop(0); + VBlankCB_BattleTransition(); + if (sTransitionStructPtr->VBlank_DMA != 0) + DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320); + REG_WININ = sTransitionStructPtr->WININ; + REG_WINOUT = sTransitionStructPtr->WINOUT; + REG_WIN0V = sTransitionStructPtr->WIN0V; + DmaSet(0, gUnknown_02038C28[1], ®_WIN0H, 0xA2400001); +} + +void Phase2Task_Sydney(u8 taskId) +{ + gTasks[taskId].tMugshotId = MUGSHOT_SYDNEY; + Phase2Task_MugShotTransition(taskId); +} + +void Phase2Task_Phoebe(u8 taskId) +{ + gTasks[taskId].tMugshotId = MUGSHOT_PHOEBE; + Phase2Task_MugShotTransition(taskId); +} + +void Phase2Task_Glacia(u8 taskId) +{ + gTasks[taskId].tMugshotId = MUGSHOT_GLACIA; + Phase2Task_MugShotTransition(taskId); +} + +void Phase2Task_Drake(u8 taskId) +{ + gTasks[taskId].tMugshotId = MUGSHOT_DRAKE; + Phase2Task_MugShotTransition(taskId); +} + +void Phase2Task_Champion(u8 taskId) +{ + gTasks[taskId].tMugshotId = MUGSHOT_CHAMPION; + Phase2Task_MugShotTransition(taskId); +} + +void Phase2Task_MugShotTransition(u8 taskId) +{ + while (sPhase2_Mugshot_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +bool8 Phase2_Mugshot_Func1(struct Task *task) +{ + u8 i; + + sub_8149F08(); + dp12_8087EA4(); + Mugshots_CreateOpponentPlayerSprites(task); + + task->data[1] = 0; + task->data[2] = 1; + task->data[3] = 239; + sTransitionStructPtr->WININ = 63; + sTransitionStructPtr->WINOUT = 62; + sTransitionStructPtr->WIN0V = 160; + + for (i = 0; i < 160; i++) + { + gUnknown_02038C28[1][i] = 0xF0F1; + } + + SetVBlankCallback(VBlankCB0_Phase2_Mugshots); + + task->tState++; + return FALSE; +} + +bool8 Phase2_Mugshot_Func2(struct Task *task) +{ + s16 i, j; + u16 *dst1, *dst2; + const u16 *MugshotsMap; + + MugshotsMap = sMugshotsTilemap; + sub_8149F58(&dst1, &dst2); + CpuSet(sUnknown_085B9AF0, dst2, 0xF0); + LoadPalette(sOpponentMugshotsPals[task->tMugshotId], 0xF0, 0x20); + LoadPalette(sPlayerMugshotsPals[gSaveBlock2Ptr->playerGender], 0xFA, 0xC); + + for (i = 0; i < 20; i++) + { + for (j = 0; j < 32; j++, MugshotsMap++) + { + dst1[i * 32 + j] = *MugshotsMap | 0xF000; + } + } + + EnableInterrupts(INTR_FLAG_HBLANK); + + SetHBlankCallback(HBlankCB_Phase2_Mugshots); + task->tState++; + return FALSE; +} + +bool8 Phase2_Mugshot_Func3(struct Task *task) +{ + u8 i, r5; + u16* toStore; + s16 value; + s32 mergedValue; + + sTransitionStructPtr->VBlank_DMA = 0; + + toStore = gUnknown_02038C28[0]; + r5 = task->data[1]; + task->data[1] += 0x10; + + for (i = 0; i < 80; i++, toStore++, r5 += 0x10) + { + value = task->data[2] + Sin(r5, 0x10); + if (value < 0) + value = 1; + if (value > 0xF0) + value = 0xF0; + *toStore = value; + } + for (; i < 160; i++, toStore++, r5 += 0x10) + { + value = task->data[3] - Sin(r5, 0x10); + if (value < 0) + value = 0; + if (value > 0xEF) + value = 0xEF; + *toStore = (value << 8) | (0xF0); + } + + task->data[2] += 8; + task->data[3] -= 8; + if (task->data[2] > 0xF0) + task->data[2] = 0xF0; + if (task->data[3] < 0) + task->data[3] = 0; + mergedValue = *(s32*)(&task->data[2]); + if (mergedValue == 0xF0) + task->tState++; + + sTransitionStructPtr->field_18 -= 8; + sTransitionStructPtr->field_1A += 8; + sTransitionStructPtr->VBlank_DMA++; + return FALSE; +} + +bool8 Phase2_Mugshot_Func4(struct Task *task) +{ + u8 i; + u16* toStore; + + sTransitionStructPtr->VBlank_DMA = 0; + + for (i = 0, toStore = gUnknown_02038C28[0]; i < 160; i++, toStore++) + { + *toStore = 0xF0; + } + + task->tState++; + task->data[1] = 0; + task->data[2] = 0; + task->data[3] = 0; + sTransitionStructPtr->field_18 -= 8; + sTransitionStructPtr->field_1A += 8; + + sub_8148484(task->tOpponentSpriteId, 0); + sub_8148484(task->tPlayerSpriteId, 1); + sub_814849C(task->tOpponentSpriteId); + + PlaySE(SE_BT_START); + + sTransitionStructPtr->VBlank_DMA++; + return FALSE; +} + +bool8 Phase2_Mugshot_Func5(struct Task *task) +{ + sTransitionStructPtr->field_18 -= 8; + sTransitionStructPtr->field_1A += 8; + if (sub_81484B8(task->tOpponentSpriteId)) + { + task->tState++; + sub_814849C(task->tPlayerSpriteId); + } + return FALSE; +} + +bool8 Phase2_Mugshot_Func6(struct Task *task) +{ + sTransitionStructPtr->field_18 -= 8; + sTransitionStructPtr->field_1A += 8; + if (sub_81484B8(task->tPlayerSpriteId)) + { + sTransitionStructPtr->VBlank_DMA = 0; + SetVBlankCallback(NULL); + DmaStop(0); + memset(gUnknown_02038C28[0], 0, 0x140); + memset(gUnknown_02038C28[1], 0, 0x140); + SetGpuReg(REG_OFFSET_WIN0H, 0xF0); + SetGpuReg(REG_OFFSET_BLDY, 0); + task->tState++; + task->data[3] = 0; + task->data[4] = 0; + sTransitionStructPtr->BLDCNT = 0xBF; + SetVBlankCallback(VBlankCB1_Phase2_Mugshots); + } + return FALSE; +} + +bool8 Phase2_Mugshot_Func7(struct Task *task) +{ + bool32 r6; + + sTransitionStructPtr->VBlank_DMA = 0; + r6 = TRUE; + sTransitionStructPtr->field_18 -= 8; + sTransitionStructPtr->field_1A += 8; + + if (task->data[4] < 0x50) + task->data[4] += 2; + if (task->data[4] > 0x50) + task->data[4] = 0x50; + + if (++task->data[3] & 1) + { + s16 i; + for (i = 0, r6 = FALSE; i <= task->data[4]; i++) + { + s16 index1 = 0x50 - i; + s16 index2 = 0x50 + i; + if (gUnknown_02038C28[0][index1] <= 15) + { + r6 = TRUE; + gUnknown_02038C28[0][index1]++; + } + if (gUnknown_02038C28[0][index2] <= 15) + { + r6 = TRUE; + gUnknown_02038C28[0][index2]++; + } + } + } + + if (task->data[4] == 0x50 && !r6) + task->tState++; + + sTransitionStructPtr->VBlank_DMA++; + return FALSE; +} + +bool8 Phase2_Mugshot_Func8(struct Task *task) +{ + sTransitionStructPtr->VBlank_DMA = 0; + BlendPalettes(-1, 0x10, 0x7FFF); + sTransitionStructPtr->BLDCNT = 0xFF; + task->data[3] = 0; + + task->tState++; + return TRUE; +} + +bool8 Phase2_Mugshot_Func9(struct Task *task) +{ + sTransitionStructPtr->VBlank_DMA = 0; + + task->data[3]++; + memset(gUnknown_02038C28[0], task->data[3], 0x140); + if (task->data[3] > 15) + task->tState++; + + sTransitionStructPtr->VBlank_DMA++; + return FALSE; +} + +bool8 Phase2_Mugshot_Func10(struct Task *task) +{ + DmaStop(0); + sub_8149F84(); + DestroyTask(FindTaskIdByFunc(task->func)); + return FALSE; +} + +void VBlankCB0_Phase2_Mugshots(void) +{ + DmaStop(0); + VBlankCB_BattleTransition(); + if (sTransitionStructPtr->VBlank_DMA != 0) + DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320); + REG_BG0VOFS = sTransitionStructPtr->field_1C; + REG_WININ = sTransitionStructPtr->WININ; + REG_WINOUT = sTransitionStructPtr->WINOUT; + REG_WIN0V = sTransitionStructPtr->WIN0V; + DmaSet(0, gUnknown_02038C28[1], ®_WIN0H, 0xA2400001); +} + +void VBlankCB1_Phase2_Mugshots(void) +{ + DmaStop(0); + VBlankCB_BattleTransition(); + if (sTransitionStructPtr->VBlank_DMA != 0) + DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320); + REG_BLDCNT = sTransitionStructPtr->BLDCNT; + DmaSet(0, gUnknown_02038C28[1], ®_BLDY, 0xA2400001); +} + +void HBlankCB_Phase2_Mugshots(void) +{ + if (REG_VCOUNT < 80) + REG_BG0HOFS = sTransitionStructPtr->field_18; + else + REG_BG0HOFS = sTransitionStructPtr->field_1A; +} + +void Mugshots_CreateOpponentPlayerSprites(struct Task *task) +{ + struct Sprite *opponentSprite, *playerSprite; + + s16 mugshotId = task->tMugshotId; + task->tOpponentSpriteId = CreateTrainerSprite(sMugshotsTrainerPicIDsTable[mugshotId], + sMugshotsOpponentCoords[mugshotId][0] - 32, + sMugshotsOpponentCoords[mugshotId][1] + 42, + 0, gDecompressionBuffer); + task->tPlayerSpriteId = CreateTrainerSprite(PlayerGenderToFrontTrainerPicId(gSaveBlock2Ptr->playerGender), 272, 106, 0, gDecompressionBuffer); + + opponentSprite = &gSprites[task->tOpponentSpriteId]; + playerSprite = &gSprites[task->tPlayerSpriteId]; + + opponentSprite->callback = sub_8148380; + playerSprite->callback = sub_8148380; + + opponentSprite->oam.affineMode = 3; + playerSprite->oam.affineMode = 3; + + opponentSprite->oam.matrixNum = AllocOamMatrix(); + playerSprite->oam.matrixNum = AllocOamMatrix(); + + opponentSprite->oam.shape = 1; + playerSprite->oam.shape = 1; + + opponentSprite->oam.size = 3; + playerSprite->oam.size = 3; + + CalcCenterToCornerVec(opponentSprite, 1, 3, 3); + CalcCenterToCornerVec(playerSprite, 1, 3, 3); + + SetOamMatrixRotationScaling(opponentSprite->oam.matrixNum, sMugshotsOpponentRotationScales[mugshotId][0], sMugshotsOpponentRotationScales[mugshotId][1], 0); + SetOamMatrixRotationScaling(playerSprite->oam.matrixNum, -512, 512, 0); +} + +void sub_8148380(struct Sprite *sprite) +{ + while (sUnknown_085C8C24[sprite->data[0]](sprite)); +} + +bool8 sub_81483A8(struct Sprite *sprite) +{ + return FALSE; +} + +bool8 sub_81483AC(struct Sprite *sprite) +{ + s16 arr0[2]; + s16 arr1[2]; + + memcpy(arr0, sUnknown_085C8C40, sizeof(sUnknown_085C8C40)); + memcpy(arr1, sUnknown_085C8C44, sizeof(sUnknown_085C8C44)); + + sprite->data[0]++; + sprite->data[1] = arr0[sprite->data[7]]; + sprite->data[2] = arr1[sprite->data[7]]; + return TRUE; +} + +bool8 sub_81483F8(struct Sprite *sprite) +{ + sprite->pos1.x += sprite->data[1]; + if (sprite->data[7] && sprite->pos1.x < 133) + sprite->data[0]++; + else if (!sprite->data[7] && sprite->pos1.x > 103) + sprite->data[0]++; + return FALSE; +} + +bool8 sub_814842C(struct Sprite *sprite) +{ + sprite->data[1] += sprite->data[2]; + sprite->pos1.x += sprite->data[1]; + if (sprite->data[1] == 0) + { + sprite->data[0]++; + sprite->data[2] = -sprite->data[2]; + sprite->data[6] = 1; + } + return FALSE; +} + +bool8 sub_8148458(struct Sprite *sprite) +{ + sprite->data[1] += sprite->data[2]; + sprite->pos1.x += sprite->data[1]; + if (sprite->pos1.x < -31 || sprite->pos1.x > 271) + sprite->data[0]++; + return FALSE; +} + +void sub_8148484(s16 spriteId, s16 value) +{ + gSprites[spriteId].data[7] = value; +} + +void sub_814849C(s16 spriteId) +{ + gSprites[spriteId].data[0]++; +} + +s16 sub_81484B8(s16 spriteId) +{ + return gSprites[spriteId].data[6]; +} + +void Phase2Task_Slice(u8 taskId) +{ + while (sPhase2_Slice_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +bool8 Phase2_Slice_Func1(struct Task *task) +{ + u16 i; + + sub_8149F08(); + dp12_8087EA4(); + + task->data[2] = 256; + task->data[3] = 1; + sTransitionStructPtr->WININ = 63; + sTransitionStructPtr->WINOUT = 0; + sTransitionStructPtr->WIN0V = 160; + sTransitionStructPtr->VBlank_DMA = 0; + + for (i = 0; i < 160; i++) + { + gUnknown_02038C28[1][i] = sTransitionStructPtr->field_14; + gUnknown_02038C28[1][160 + i] = 0xF0; + } + + EnableInterrupts(INTR_FLAG_HBLANK); + SetGpuRegBits(REG_OFFSET_DISPSTAT, DISPSTAT_HBLANK_INTR); + + SetVBlankCallback(VBlankCB_Phase2_Slice); + SetHBlankCallback(HBlankCB_Phase2_Slice); + + task->tState++; + return TRUE; +} + +bool8 Phase2_Slice_Func2(struct Task *task) +{ + u16 i; + + sTransitionStructPtr->VBlank_DMA = 0; + + task->data[1] += (task->data[2] >> 8); + if (task->data[1] > 0xF0) + task->data[1] = 0xF0; + if (task->data[2] <= 0xFFF) + task->data[2] += task->data[3]; + if (task->data[3] < 128) + task->data[3] <<= 1; // multiplying by two + + for (i = 0; i < 160; i++) + { + u16* storeLoc1 = &gUnknown_02038C28[0][i]; + u16* storeLoc2 = &gUnknown_02038C28[0][i + 160]; + if (1 & i) + { + *storeLoc1 = sTransitionStructPtr->field_14 + task->data[1]; + *storeLoc2 = 0xF0 - task->data[1]; + } + else + { + *storeLoc1 = sTransitionStructPtr->field_14 - task->data[1]; + *storeLoc2 = (task->data[1] << 8) | (0xF1); + } + } + + if (task->data[1] > 0xEF) + task->tState++; + + sTransitionStructPtr->VBlank_DMA++; + return FALSE; +} + +bool8 Phase2_Slice_Func3(struct Task *task) +{ + DmaStop(0); + sub_8149F84(); + DestroyTask(FindTaskIdByFunc(Phase2Task_Slice)); + return FALSE; +} + +void VBlankCB_Phase2_Slice(void) +{ + DmaStop(0); + VBlankCB_BattleTransition(); + REG_WININ = sTransitionStructPtr->WININ; + REG_WINOUT = sTransitionStructPtr->WINOUT; + REG_WIN0V = sTransitionStructPtr->WIN0V; + if (sTransitionStructPtr->VBlank_DMA) + DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 640); + DmaSet(0, &gUnknown_02038C28[1][160], ®_WIN0H, 0xA2400001); +} + +void HBlankCB_Phase2_Slice(void) +{ + if (REG_VCOUNT < 160) + { + u16 var = gUnknown_02038C28[1][REG_VCOUNT]; + REG_BG1HOFS = var; + REG_BG2HOFS = var; + REG_BG3HOFS = var; + } +} From 09d3da101bd1b1c9d7471e7a193f0af7cae0ab73 Mon Sep 17 00:00:00 2001 From: scnorton Date: Tue, 9 Jan 2018 15:53:17 -0500 Subject: [PATCH 03/64] Implement agbcc's libc and allow a custom cxx compiler to be passed to build_tools.sh --- Makefile | 3 +- build_tools.sh | 14 ++-- ld_script.txt | 5 +- src/libc.c | 173 ------------------------------------------------- 4 files changed, 13 insertions(+), 182 deletions(-) delete mode 100644 src/libc.c diff --git a/Makefile b/Makefile index 382b69888d..32cacc1fce 100644 --- a/Makefile +++ b/Makefile @@ -31,6 +31,7 @@ LDFLAGS = -Map ../../$(MAP) OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy LIBGCC := tools/agbcc/lib/libgcc.a +LIBC := tools/agbcc/lib/libc.a SHA1 := sha1sum -c @@ -154,7 +155,7 @@ $(OBJ_DIR)/ld_script.ld: ld_script.txt $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_comm cd $(OBJ_DIR) && sed -f ../../ld_script.sed ../../$< | sed "s#tools/#../../tools/#g" > ld_script.ld $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) - cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) ../../$(LIBGCC) + cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) ../../$(LIBGCC) ../../$(LIBC) $(ROM): $(ELF) $(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@ diff --git a/build_tools.sh b/build_tools.sh index 26f1f35b30..f4656e2d87 100644 --- a/build_tools.sh +++ b/build_tools.sh @@ -1,8 +1,8 @@ #!/bin/sh -make -C tools/gbagfx -make -C tools/scaninc -make -C tools/preproc -make -C tools/bin2c -make -C tools/rsfont -make -C tools/aif2pcm -make -C tools/ramscrgen +make -C tools/gbagfx CXX=${1:=g++} +make -C tools/scaninc CXX=${1:=g++} +make -C tools/preproc CXX=${1:=g++} +make -C tools/bin2c CXX=${1:=g++} +make -C tools/rsfont CXX=${1:=g++} +make -C tools/aif2pcm CXX=${1:=g++} +make -C tools/ramscrgen CXX=${1:=g++} diff --git a/ld_script.txt b/ld_script.txt index 9f922126eb..abb9c0d5e2 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -325,7 +325,10 @@ SECTIONS { tools/agbcc/lib/libgcc.a:fp-bit.o(.text); tools/agbcc/lib/libgcc.a:_lshrdi3.o(.text); tools/agbcc/lib/libgcc.a:_negdi2.o(.text); - src/libc.o(.text); + tools/agbcc/lib/libc.a:memcpy.o(.text); + tools/agbcc/lib/libc.a:memset.o(.text); + tools/agbcc/lib/libc.a:strcmp.o(.text); + tools/agbcc/lib/libc.a:strcpy.o(.text); } =0 .rodata : diff --git a/src/libc.c b/src/libc.c deleted file mode 100644 index 1f457957ba..0000000000 --- a/src/libc.c +++ /dev/null @@ -1,173 +0,0 @@ -#include "global.h" -#include - -#define LBLOCKSIZE (sizeof(long)) - -// Nonzero if (long)X contains a NULL byte. -#define CONTAINSNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080) - -// Nonzero if X is not aligned on a "long" boundary. -#define UNALIGNED(X) ((long)X & (LBLOCKSIZE - 1)) - -void *memcpy(void *dst0, const void *src0, size_t len0) -{ - char *dst = dst0; - const char *src = src0; - long *aligned_dst; - const long *aligned_src; - unsigned int len = len0; - - // If the size is small, or either src or dst is unaligned, - // then go to the byte copy loop. This should be rare. - if(len >= 16 && !(UNALIGNED(src) | UNALIGNED(dst))) - { - aligned_dst = (long *)dst; - aligned_src = (long *)src; - - // Copy 4X long words at a time if possible. - while(len >= 16) - { - *aligned_dst++ = *aligned_src++; - *aligned_dst++ = *aligned_src++; - *aligned_dst++ = *aligned_src++; - *aligned_dst++ = *aligned_src++; - len -= 16; - } - - // Copy one long word at a time if possible - while(len >= 4) - { - *aligned_dst++ = *aligned_src++; - len -= 4; - } - - dst = (char *)aligned_dst; - src = (char *)aligned_src; - } - - // Pick up any remaining bytes with a byte copier. - while(len--) - *dst++ = *src++; - - return dst0; -} - -void *memset(void *m, int c, size_t n) -{ - char *s = (char *)m; - int count, i; - unsigned long buffer; - unsigned long *aligned_addr; - unsigned char *unaligned_addr; - - // If the size is small or m is unaligned, - // then go to the byte copy loop. This should be rare. - if(n >= LBLOCKSIZE && !UNALIGNED(m)) - { - // We know that n is large and m is word-aligned. - aligned_addr = (unsigned long *)m; - - // Store C into each char sized location in buffer so that - // we can set large blocks quickly. - c &= 0xFF; - if(LBLOCKSIZE == 4) - { - buffer = (c << 8) | c; - buffer |= (buffer << 16); - } - else - { - buffer = 0; - for(i = 0; i < LBLOCKSIZE; i++) - buffer = (buffer << 8) | c; - } - - while(n >= LBLOCKSIZE * 4) - { - *aligned_addr++ = buffer; - *aligned_addr++ = buffer; - *aligned_addr++ = buffer; - *aligned_addr++ = buffer; - n -= LBLOCKSIZE * 4; - } - while(n >= LBLOCKSIZE) - { - *aligned_addr++ = buffer; - n -= LBLOCKSIZE; - } - - s = (char *)aligned_addr; - } - - // Pick up the remainder with a bytewise loop. - while(n--) - *s++ = (char)c; - - return m; -} - -int strcmp(const char *s1, const char *s2) -{ - unsigned long *a1; - unsigned long *a2; - - // If s1 or s2 are unaligned, then skip this and compare bytes. - if(!(UNALIGNED(s1) | UNALIGNED(s2))) - { - // Compare them a word at a time. - a1 = (unsigned long *)s1; - a2 = (unsigned long *)s2; - while(*a1 == *a2) - { - // If *a1 == *a2, and we find a null in *a1, - // then the strings must be equal, so return zero. - if(CONTAINSNULL(*a1)) - return 0; - - a1++; - a2++; - } - - s1 = (char *)a1; - s2 = (char *)a2; - } - - // Check the remaining few bytes. - while(*s1 != '\0' && *s1 == *s2) - { - s1++; - s2++; - } - - return (*(unsigned char *) s1) - (*(unsigned char *) s2); -} - -char* strcpy(char *dst0, const char *src0) -{ - char *dst = dst0; - const char *src = src0; - unsigned long *a1; - const unsigned long *a2; - - // If SRC or DEST is unaligned, then copy bytes. - if(!(UNALIGNED(src) | UNALIGNED(dst))) - { - // SRC and DEST are both "long int" aligned, try to do "long int" - // sized copies. - a1 = (unsigned long *)dst; - a2 = (unsigned long *)src; - while(!CONTAINSNULL(*a2)) - { - *a1++ = *a2++; - } - - dst = (char *)a1; - src = (char *)a2; - } - - // Copy the remaining few bytes. - while(*dst++ = *src++); - - return dst0; -} - From 294c9656bec076e1993375966a725723a931fa33 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 13 Jan 2018 01:30:08 -0500 Subject: [PATCH 04/64] fix broken build after building without tools --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a0f93e2509..585236e75f 100644 --- a/Makefile +++ b/Makefile @@ -43,8 +43,10 @@ SCANINC := tools/scaninc/scaninc PREPROC := tools/preproc/preproc RAMSCRGEN := tools/ramscrgen/ramscrgen -# Clear the default suffixes. +# Clear the default suffixes .SUFFIXES: +# Delete files that weren't built properly +.DELETE_ON_ERROR: # Secondary expansion is required for dependency variables in object rules. .SECONDEXPANSION: From 98ee41806e87f5b1cd43bab4dff1466b65aa036c Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 13 Jan 2018 01:30:43 -0500 Subject: [PATCH 05/64] use .SECONDARY instead of .PRECIOUS to prevent files from being deleted --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 585236e75f..14768cd2fd 100644 --- a/Makefile +++ b/Makefile @@ -45,14 +45,14 @@ RAMSCRGEN := tools/ramscrgen/ramscrgen # Clear the default suffixes .SUFFIXES: +# Don't delete intermediate files +.SECONDARY: # Delete files that weren't built properly .DELETE_ON_ERROR: # Secondary expansion is required for dependency variables in object rules. .SECONDEXPANSION: -.PRECIOUS: %.1bpp %.4bpp %.8bpp %.gbapal %.lz %.rl %.pcm %.bin sound/direct_sound_samples/cry_%.bin - .PHONY: rom clean compare tidy $(shell mkdir -p $(C_BUILDDIR) $(ASM_BUILDDIR) $(DATA_ASM_BUILDDIR) $(SONG_BUILDDIR)) From 84d364819acb147ea7651ec3d890cd0b985e40be Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 13 Jan 2018 01:31:07 -0500 Subject: [PATCH 06/64] add a rule for baserom.gba --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 14768cd2fd..fa2acb282a 100644 --- a/Makefile +++ b/Makefile @@ -168,3 +168,6 @@ $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) $(ROM): $(ELF) $(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@ + +baserom.gba: ; + $(error baserom.gba is required to build) From 0051d8aeeaea614b3d8c23f80df7d8b1dd6c607f Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 13 Jan 2018 01:32:29 -0500 Subject: [PATCH 07/64] make build_tools.sh executable --- build_tools.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 build_tools.sh diff --git a/build_tools.sh b/build_tools.sh old mode 100644 new mode 100755 From 9106d8df1856c65b2bc85da6d61b6968669814ea Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 13 Jan 2018 21:03:07 +0100 Subject: [PATCH 08/64] up to groudon transition --- asm/battle_transition.s | 1377 +---------------------------------- data/battle_transition.s | 127 +--- include/battle_transition.h | 8 +- src/battle_transition.c | 679 ++++++++++++++++- sym_bss.txt | 5 - 5 files changed, 658 insertions(+), 1538 deletions(-) diff --git a/asm/battle_transition.s b/asm/battle_transition.s index ef5c95332d..675f46bfda 100644 --- a/asm/battle_transition.s +++ b/asm/battle_transition.s @@ -5,1383 +5,8 @@ .text - thumb_func_start Phase2Task_25 -Phase2Task_25: @ 8148760 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_085C8C54 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_08148772: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _08148772 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_25 + - thumb_func_start sub_8148798 -sub_8148798: @ 8148798 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - adds r6, r0, 0 - bl sub_8149F08 - bl dp12_8087EA4 - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - movs r2, 0 - movs r0, 0x3F - strh r0, [r1, 0x2] - strh r2, [r1, 0x4] - movs r0, 0xA0 - strh r0, [r1, 0x8] - movs r4, 0 - ldr r5, =gUnknown_02038C28 - movs r0, 0xF0 - lsls r0, 3 - adds r0, r5 - mov r12, r0 - mov r8, r4 - movs r1, 0xF0 - mov r9, r1 -_081487CC: - lsls r2, r4, 1 - mov r7, r12 - adds r1, r2, r7 - ldr r0, =sTransitionStructPtr - ldr r3, [r0] - ldrh r0, [r3, 0x14] - strh r0, [r1] - adds r1, r4, 0 - adds r1, 0xA0 - lsls r1, 1 - adds r0, r1, r7 - mov r7, r9 - strh r7, [r0] - adds r2, r5 - ldrh r0, [r3, 0x14] - strh r0, [r2] - adds r1, r5 - mov r0, r9 - strh r0, [r1] - movs r1, 0xA0 - lsls r1, 1 - adds r0, r4, r1 - lsls r0, 1 - adds r0, r5 - mov r7, r8 - strh r7, [r0] - adds r1, 0xA0 - adds r0, r4, r1 - lsls r0, 1 - adds r0, r5 - subs r1, 0xE0 - strh r1, [r0] - movs r7, 0xA0 - lsls r7, 2 - adds r0, r4, r7 - lsls r0, 1 - adds r0, r5 - movs r1, 0x1 - strh r1, [r0] - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x9F - bls _081487CC - movs r0, 0 - strh r0, [r6, 0x10] - strh r0, [r6, 0x12] - movs r0, 0x7 - strh r0, [r6, 0x14] - movs r0, 0x2 - bl EnableInterrupts - ldr r0, =VBlankCB_Phase2_Slice - bl SetVBlankCallback - ldr r0, =HBlankCB_Phase2_Slice - bl SetHBlankCallback - ldrh r0, [r6, 0x8] - adds r0, 0x1 - strh r0, [r6, 0x8] - movs r0, 0x1 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8148798 - - thumb_func_start sub_8148864 -sub_8148864: @ 8148864 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x18 - mov r9, r0 - ldr r1, =gUnknown_085C8C64 - mov r0, sp - movs r2, 0x2 - bl memcpy - add r4, sp, 0x4 - ldr r1, =gUnknown_085C8C66 - adds r0, r4, 0 - movs r2, 0x4 - bl memcpy - ldr r2, =sTransitionStructPtr - ldr r1, [r2] - ldrb r0, [r1] - movs r0, 0 - strb r0, [r1] - str r0, [sp, 0x8] - mov r10, r0 - mov r1, r9 - movs r3, 0x12 - ldrsh r0, [r1, r3] - ldr r1, [sp, 0x8] - cmp r1, r0 - ble _081488A4 - b _08148A68 -_081488A4: - movs r7, 0 - mov r2, r10 - negs r2, r2 - str r2, [sp, 0xC] - mov r3, r10 - adds r3, 0x1 - str r3, [sp, 0x10] -_081488B2: - movs r6, 0 - mov r0, sp - adds r0, r7 - mov r12, r0 -_081488BA: - lsls r0, r6, 1 - add r0, sp - adds r0, 0x4 - movs r1, 0 - ldrsh r0, [r0, r1] - ldr r2, [sp, 0xC] - muls r0, r2 - lsls r0, 1 - mov r3, r12 - ldrb r3, [r3] - adds r0, r3 - lsls r0, 16 - lsrs r5, r0, 16 - asrs r0, 16 - cmp r0, 0 - blt _08148966 - cmp r0, 0x4F - bne _081488E2 - cmp r7, 0x1 - beq _08148966 -_081488E2: - lsls r1, r0, 1 - ldr r0, =gUnknown_02038EA8 - adds r4, r1, r0 - movs r2, 0xA0 - lsls r2, 1 - adds r0, r2 - adds r3, r1, r0 - ldr r0, =gUnknown_02039128 - adds r1, r0 - ldrh r2, [r4] - cmp r2, 0xEF - bls _08148920 - movs r1, 0xF0 - strh r1, [r4] - ldr r0, [sp, 0x8] - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0x8] - b _08148940 - .pool -_08148920: - ldrh r0, [r3] - lsrs r0, 8 - adds r0, r2, r0 - strh r0, [r4] - ldrh r0, [r1] - cmp r0, 0x7F - bhi _08148932 - lsls r0, 1 - strh r0, [r1] -_08148932: - ldrh r2, [r3] - ldr r0, =0x00000fff - cmp r2, r0 - bhi _08148940 - ldrh r0, [r1] - adds r0, r2, r0 - strh r0, [r3] -_08148940: - lsls r0, r5, 16 - asrs r0, 15 - ldr r1, =gUnknown_02038C28 - adds r2, r0, r1 - ldr r1, =gUnknown_02038D68 - adds r3, r0, r1 - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - ldrh r0, [r4] - ldrh r1, [r1, 0x14] - adds r0, r1 - strh r0, [r2] - ldrh r0, [r4] - movs r1, 0xF0 - subs r0, r1, r0 - strh r0, [r3] - mov r2, r10 - cmp r2, 0 - beq _08148970 -_08148966: - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0x1 - bls _081488BA -_08148970: - adds r0, r7, 0x1 - lsls r0, 16 - lsrs r7, r0, 16 - cmp r7, 0x1 - bls _081488B2 - movs r7, 0 - ldr r3, =gUnknown_02038EA8 - mov r8, r3 -_08148980: - movs r6, 0 - mov r0, sp - adds r0, r7 - mov r12, r0 - adds r1, r7, 0x1 - str r1, [sp, 0x14] -_0814898C: - mov r2, r12 - ldrb r1, [r2] - adds r1, 0x1 - lsls r0, r6, 1 - add r0, sp - adds r0, 0x4 - movs r3, 0 - ldrsh r0, [r0, r3] - ldr r2, [sp, 0xC] - muls r0, r2 - lsls r0, 1 - adds r1, r0 - lsls r1, 16 - lsrs r5, r1, 16 - asrs r1, 16 - cmp r1, 0xA0 - bgt _08148A40 - cmp r1, 0x50 - bne _081489B6 - cmp r7, 0x1 - beq _08148A40 -_081489B6: - lsls r1, 1 - mov r3, r8 - adds r4, r1, r3 - movs r0, 0xA0 - lsls r0, 1 - add r0, r8 - adds r3, r1, r0 - ldr r0, =gUnknown_02039128 - adds r1, r0 - ldrh r2, [r4] - cmp r2, 0xEF - bls _081489F8 - movs r1, 0xF0 - strh r1, [r4] - ldr r0, [sp, 0x8] - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0x8] - b _08148A18 - .pool -_081489F8: - ldrh r0, [r3] - lsrs r0, 8 - adds r0, r2, r0 - strh r0, [r4] - ldrh r0, [r1] - cmp r0, 0x7F - bhi _08148A0A - lsls r0, 1 - strh r0, [r1] -_08148A0A: - ldrh r2, [r3] - ldr r0, =0x00000fff - cmp r2, r0 - bhi _08148A18 - ldrh r0, [r1] - adds r0, r2, r0 - strh r0, [r3] -_08148A18: - lsls r0, r5, 16 - asrs r0, 15 - ldr r1, =gUnknown_02038C28 - adds r2, r0, r1 - ldr r1, =gUnknown_02038D68 - adds r3, r0, r1 - ldr r1, =sTransitionStructPtr - ldr r0, [r1] - ldrh r1, [r0, 0x14] - ldrh r0, [r4] - subs r1, r0 - strh r1, [r2] - ldrh r0, [r4] - lsls r0, 8 - movs r1, 0xF1 - orrs r0, r1 - strh r0, [r3] - mov r2, r10 - cmp r2, 0 - beq _08148A4A -_08148A40: - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0x1 - bls _0814898C -_08148A4A: - ldr r3, [sp, 0x14] - lsls r0, r3, 16 - lsrs r7, r0, 16 - cmp r7, 0x1 - bls _08148980 - ldr r1, [sp, 0x10] - lsls r0, r1, 16 - lsrs r0, 16 - mov r10, r0 - mov r2, r9 - movs r3, 0x12 - ldrsh r0, [r2, r3] - cmp r10, r0 - bgt _08148A68 - b _081488A4 -_08148A68: - mov r1, r9 - ldrh r0, [r1, 0x10] - subs r0, 0x1 - strh r0, [r1, 0x10] - lsls r0, 16 - cmp r0, 0 - bge _08148A7A - movs r0, 0 - strh r0, [r1, 0x10] -_08148A7A: - mov r2, r9 - movs r3, 0x10 - ldrsh r0, [r2, r3] - cmp r0, 0 - bgt _08148A98 - movs r1, 0x12 - ldrsh r0, [r2, r1] - adds r0, 0x1 - cmp r0, 0x14 - bgt _08148A98 - ldrh r0, [r2, 0x14] - strh r0, [r2, 0x10] - ldrh r0, [r2, 0x12] - adds r0, 0x1 - strh r0, [r2, 0x12] -_08148A98: - ldr r2, [sp, 0x8] - cmp r2, 0x9F - bls _08148AA6 - mov r3, r9 - ldrh r0, [r3, 0x8] - adds r0, 0x1 - strh r0, [r3, 0x8] -_08148AA6: - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - ldrb r0, [r1] - adds r0, 0x1 - ldrb r2, [r1] - strb r0, [r1] - movs r0, 0 - add sp, 0x18 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8148864 - - thumb_func_start sub_8148AD4 -sub_8148AD4: @ 8148AD4 - push {r4,r5,lr} - adds r3, r0, 0 - movs r2, 0x1 - ldr r5, =0x0000ff10 - movs r1, 0 - ldr r4, =gUnknown_020393A8 -_08148AE0: - lsls r0, r1, 1 - adds r0, r4 - ldrh r0, [r0] - cmp r0, 0xF0 - beq _08148AF0 - cmp r0, r5 - beq _08148AF0 - movs r2, 0 -_08148AF0: - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, 0x9F - bls _08148AE0 - cmp r2, 0x1 - bne _08148B04 - ldrh r0, [r3, 0x8] - adds r0, 0x1 - strh r0, [r3, 0x8] -_08148B04: - movs r0, 0 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8148AD4 - - thumb_func_start sub_8148B14 -sub_8148B14: @ 8148B14 - push {lr} - ldr r1, =0x040000b0 - ldrh r2, [r1, 0xA] - ldr r0, =0x0000c5ff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r2, [r1, 0xA] - ldr r0, =0x00007fff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r0, [r1, 0xA] - bl sub_8149F84 - ldr r0, =Phase2Task_25 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_8148B14 - - thumb_func_start Phase2Task_26 -Phase2Task_26: @ 8148B54 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_085C8C6C - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_08148B66: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _08148B66 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_26 - - thumb_func_start Phase2Task_27 -Phase2Task_27: @ 8148B8C - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_085C8C78 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_08148B9E: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _08148B9E - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_27 - - thumb_func_start sub_8148BC4 -sub_8148BC4: @ 8148BC4 - push {r4,r5,lr} - adds r5, r0, 0 - bl sub_8149F08 - bl dp12_8087EA4 - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - movs r0, 0 - strh r0, [r1, 0x2] - movs r0, 0x3F - strh r0, [r1, 0x4] - movs r0, 0xF0 - strh r0, [r1, 0x6] - movs r0, 0xA0 - strh r0, [r1, 0x8] - ldr r0, =gUnknown_02038C28 - movs r2, 0 - movs r1, 0x9F - ldr r3, =0x000008be - adds r0, r3 -_08148BEE: - strh r2, [r0] - subs r0, 0x2 - subs r1, 0x1 - cmp r1, 0 - bge _08148BEE - movs r4, 0 - ldr r0, =VBlankCB1_Phase2_BigPokeball - bl SetVBlankCallback - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] - movs r0, 0x1 - strh r0, [r5, 0xA] - adds r0, 0xFF - strh r0, [r5, 0xC] - strh r4, [r5, 0x16] - movs r0, 0 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8148BC4 - - thumb_func_start sub_8148C28 -sub_8148C28: @ 8148C28 - push {r4,r5,lr} - adds r4, r0, 0 - movs r1, 0x16 - ldrsh r0, [r4, r1] - cmp r0, 0x1 - bne _08148C6C - ldr r1, =0x040000b0 - ldrh r2, [r1, 0xA] - ldr r0, =0x0000c5ff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r2, [r1, 0xA] - ldr r0, =0x00007fff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r0, [r1, 0xA] - movs r0, 0 - bl SetVBlankCallback - ldr r0, [r4] - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask - b _08148CDE - .pool -_08148C6C: - ldr r5, =sTransitionStructPtr - ldr r1, [r5] - ldrb r0, [r1] - movs r0, 0 - strb r0, [r1] - ldrh r2, [r4, 0xC] - movs r0, 0xC - ldrsh r1, [r4, r0] - ldr r0, =0x000003ff - cmp r1, r0 - bgt _08148C88 - adds r0, r2, 0 - adds r0, 0x80 - strh r0, [r4, 0xC] -_08148C88: - ldrh r1, [r4, 0xA] - movs r2, 0xA - ldrsh r0, [r4, r2] - cmp r0, 0x9F - bgt _08148C9C - ldrh r0, [r4, 0xC] - lsls r0, 16 - asrs r0, 24 - adds r0, r1, r0 - strh r0, [r4, 0xA] -_08148C9C: - movs r1, 0xA - ldrsh r0, [r4, r1] - cmp r0, 0xA0 - ble _08148CA8 - movs r0, 0xA0 - strh r0, [r4, 0xA] -_08148CA8: - ldr r0, =gUnknown_02038C28 - movs r2, 0xA - ldrsh r3, [r4, r2] - movs r1, 0x78 - movs r2, 0x50 - bl sub_814A014 - movs r1, 0xA - ldrsh r0, [r4, r1] - cmp r0, 0xA0 - bne _08148CD4 - movs r0, 0x1 - strh r0, [r4, 0x16] - bl sub_8149F84 - b _08148CDE - .pool -_08148CD4: - ldr r0, [r5] - ldrb r1, [r0] - adds r1, 0x1 - ldrb r2, [r0] - strb r1, [r0] -_08148CDE: - movs r0, 0 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8148C28 - - thumb_func_start sub_8148CE8 -sub_8148CE8: @ 8148CE8 - push {r4-r6,lr} - adds r4, r0, 0 - ldr r6, =sTransitionStructPtr - ldr r0, [r6] - ldrb r1, [r0] - movs r5, 0 - strb r5, [r0] - ldrh r1, [r4, 0x16] - movs r2, 0x16 - ldrsh r0, [r4, r2] - cmp r0, 0 - bne _08148D0A - adds r0, r1, 0x1 - strh r0, [r4, 0x16] - movs r0, 0x30 - strh r0, [r4, 0xA] - strh r5, [r4, 0x14] -_08148D0A: - ldr r1, =gUnknown_085C8C80 - movs r2, 0x14 - ldrsh r0, [r4, r2] - lsls r0, 1 - adds r0, r1 - ldrh r0, [r0] - ldrh r1, [r4, 0xA] - adds r0, r1 - strh r0, [r4, 0xA] - movs r2, 0x14 - ldrsh r1, [r4, r2] - adds r1, 0x1 - lsrs r0, r1, 31 - adds r0, r1, r0 - asrs r0, 1 - lsls r0, 1 - subs r1, r0 - strh r1, [r4, 0x14] - ldr r0, =gUnknown_02038C28 - movs r1, 0xA - ldrsh r3, [r4, r1] - movs r1, 0x78 - movs r2, 0x50 - bl sub_814A014 - movs r2, 0xA - ldrsh r0, [r4, r2] - cmp r0, 0x8 - bgt _08148D4C - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - strh r5, [r4, 0x16] -_08148D4C: - ldr r0, [r6] - ldrb r1, [r0] - adds r1, 0x1 - ldrb r2, [r0] - strb r1, [r0] - movs r0, 0 - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8148CE8 - - thumb_func_start sub_8148D6C -sub_8148D6C: @ 8148D6C - push {r4,lr} - adds r4, r0, 0 - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - ldrb r0, [r1] - movs r0, 0 - strb r0, [r1] - ldrh r1, [r4, 0x16] - movs r2, 0x16 - ldrsh r0, [r4, r2] - cmp r0, 0 - bne _08148D8E - adds r0, r1, 0x1 - strh r0, [r4, 0x16] - movs r0, 0x2 - strh r0, [r4, 0x12] - strh r0, [r4, 0x14] -_08148D8E: - movs r1, 0xA - ldrsh r0, [r4, r1] - cmp r0, 0xA0 - ble _08148D9A - movs r0, 0xA0 - strh r0, [r4, 0xA] -_08148D9A: - ldr r0, =gUnknown_02038C28 - movs r2, 0xA - ldrsh r3, [r4, r2] - movs r1, 0x78 - movs r2, 0x50 - bl sub_814A014 - movs r1, 0xA - ldrsh r0, [r4, r1] - cmp r0, 0xA0 - bne _08148DD6 - ldr r1, =0x040000b0 - ldrh r2, [r1, 0xA] - ldr r0, =0x0000c5ff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r2, [r1, 0xA] - ldr r0, =0x00007fff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r0, [r1, 0xA] - bl sub_8149F84 - ldr r0, [r4] - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_08148DD6: - ldrh r2, [r4, 0x12] - ldrb r0, [r4, 0x12] - cmp r0, 0x80 - bgt _08148DFC - ldrh r1, [r4, 0x14] - adds r0, r2, 0 - adds r0, 0x8 - b _08148E08 - .pool -_08148DFC: - ldrh r0, [r4, 0x14] - subs r0, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - adds r0, r2, 0 - adds r0, 0x10 -_08148E08: - strh r0, [r4, 0x12] - movs r0, 0xFF - ands r2, r0 - lsls r1, 16 - asrs r1, 16 - adds r0, r2, 0 - bl Sin - ldrh r2, [r4, 0xA] - adds r0, r2 - strh r0, [r4, 0xA] - lsls r0, 16 - cmp r0, 0 - bgt _08148E28 - movs r0, 0x1 - strh r0, [r4, 0xA] -_08148E28: - ldrh r0, [r4, 0x12] - lsls r1, r0, 16 - asrs r0, r1, 16 - cmp r0, 0xFE - ble _08148E3C - asrs r0, r1, 24 - strh r0, [r4, 0x12] - ldrh r0, [r4, 0x14] - adds r0, 0x1 - strh r0, [r4, 0x14] -_08148E3C: - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - ldrb r0, [r1] - adds r0, 0x1 - ldrb r2, [r1] - strb r0, [r1] - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8148D6C - - thumb_func_start Phase2Task_28 -Phase2Task_28: @ 8148E54 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_085C8C84 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_08148E66: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _08148E66 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_28 - - thumb_func_start sub_8148E8C -sub_8148E8C: @ 8148E8C - push {r4,r5,lr} - sub sp, 0xC - adds r5, r0, 0 - add r0, sp, 0x4 - add r1, sp, 0x8 - bl sub_8149F58 - ldr r4, =sShrinkingBoxTileset - ldr r1, [sp, 0x8] - adds r0, r4, 0 - movs r2, 0x10 - bl CpuSet - movs r0, 0xE0 - lsls r0, 1 - adds r4, r0 - ldr r1, [sp, 0x8] - adds r1, 0x40 - adds r0, r4, 0 - movs r2, 0x10 - bl CpuSet - mov r1, sp - movs r2, 0xF0 - lsls r2, 8 - adds r0, r2, 0 - strh r0, [r1] - ldr r1, [sp, 0x4] - ldr r2, =0x01000400 - mov r0, sp - bl CpuSet - ldr r0, =gFieldEffectObjectPalette10 - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - movs r1, 0 - movs r4, 0x1 - movs r0, 0x1 - strh r0, [r5, 0xE] - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] - ldr r5, =gUnknown_03001210 - strb r1, [r5] - ldr r0, =0x0000ffff - strh r0, [r5, 0x2] - strb r4, [r5, 0x4] - movs r2, 0x9A - lsls r2, 1 - strh r2, [r5, 0x6] - strb r1, [r5, 0x8] - strb r1, [r5, 0xC] - movs r0, 0x1 - negs r0, r0 - strh r0, [r5, 0xE] - strb r4, [r5, 0x10] - strh r2, [r5, 0x12] - strb r1, [r5, 0x14] - strb r1, [r5, 0x18] - ldr r2, =0x0000fffd - strh r2, [r5, 0x1A] - strb r4, [r5, 0x1C] - ldr r3, =0x00000133 - strh r3, [r5, 0x1E] - adds r0, r5, 0 - adds r0, 0x20 - strb r1, [r0] - adds r0, 0x4 - strb r1, [r0] - strh r2, [r5, 0x26] - adds r0, 0x4 - strb r4, [r0] - strh r3, [r5, 0x2A] - adds r0, 0x4 - strb r1, [r0] - movs r0, 0 - add sp, 0xC - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8148E8C - - thumb_func_start sub_8148F4C -sub_8148F4C: @ 8148F4C - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x8 - mov r8, r0 - movs r7, 0x1 - add r1, sp, 0x4 - mov r0, sp - bl sub_8149F58 - movs r0, 0 -_08148F62: - movs r5, 0 - adds r6, r0, 0x1 -_08148F66: - ldr r1, =gUnknown_085C8D38 - lsrs r0, r5, 1 - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - lsls r1, r5, 1 - adds r1, r5 - lsls r1, 2 - ldr r2, =gUnknown_03001210 - adds r4, r1, r2 - adds r1, r4, 0 - bl sub_8149048 - lsls r0, 16 - cmp r0, 0 - beq _08148FCA - movs r7, 0 - ldrh r2, [r4, 0x2] - movs r0, 0x1 - ands r0, r5 - cmp r0, 0x1 - bne _08148FA0 - ldr r0, =0x0000027d - adds r1, r0, 0 - lsls r0, r2, 16 - asrs r0, 16 - subs r1, r0 - lsls r1, 16 - lsrs r2, r1, 16 -_08148FA0: - lsls r0, r2, 16 - asrs r1, r0, 16 - adds r0, r1, 0 - cmp r1, 0 - bge _08148FAC - adds r0, 0x1F -_08148FAC: - asrs r2, r0, 5 - lsls r0, r2, 5 - subs r0, r1, r0 - lsls r0, 16 - lsrs r0, 16 - lsls r1, r2, 5 - lsls r0, 16 - asrs r0, 16 - adds r1, r0 - ldr r0, [sp] - lsls r1, 1 - adds r1, r0 - ldr r2, =0x0000f002 - adds r0, r2, 0 - strh r0, [r1] -_08148FCA: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x3 - bls _08148F66 - lsls r0, r6, 24 - lsrs r0, 24 - cmp r0, 0x1 - bls _08148F62 - cmp r7, 0x1 - bne _08148FE8 - mov r1, r8 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] -_08148FE8: - movs r0, 0 - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8148F4C - - thumb_func_start sub_8149008 -sub_8149008: @ 8149008 - push {r4,lr} - adds r4, r0, 0 - ldr r1, =0x040000b0 - ldrh r2, [r1, 0xA] - ldr r0, =0x0000c5ff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r2, [r1, 0xA] - ldr r0, =0x00007fff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r0, [r1, 0xA] - bl sub_8149F84 - ldr r0, [r4] - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8149008 - - thumb_func_start sub_8149048 -sub_8149048: @ 8149048 - push {r4,lr} - adds r2, r1, 0 - ldrb r1, [r2] - lsls r1, 2 - adds r1, r0 - ldr r3, [r1] - ldrb r0, [r2, 0x4] - lsls r0, 1 - adds r0, r3 - movs r4, 0 - ldrsh r1, [r0, r4] - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _081490CE - ldr r1, =gUnknown_03001208 - ldrh r0, [r3] - strh r0, [r1] - ldrh r0, [r3, 0x2] - strh r0, [r1] - ldrh r0, [r3, 0x4] - strh r0, [r1] - ldrh r0, [r3, 0x6] - strh r0, [r1] - movs r1, 0 - ldrsh r0, [r3, r1] - cmp r0, 0x2 - beq _081490A0 - cmp r0, 0x2 - bgt _08149090 - cmp r0, 0x1 - beq _0814909A - b _081490B2 - .pool -_08149090: - cmp r0, 0x3 - beq _081490A6 - cmp r0, 0x4 - beq _081490AC - b _081490B2 -_0814909A: - ldrh r0, [r2, 0x2] - adds r0, 0x1 - b _081490B0 -_081490A0: - ldrh r0, [r2, 0x2] - subs r0, 0x1 - b _081490B0 -_081490A6: - ldrh r0, [r2, 0x2] - subs r0, 0x20 - b _081490B0 -_081490AC: - ldrh r0, [r2, 0x2] - adds r0, 0x20 -_081490B0: - strh r0, [r2, 0x2] -_081490B2: - movs r4, 0x2 - ldrsh r1, [r2, r4] - ldr r0, =0x0000027f - cmp r1, r0 - bgt _081490CE - ldrb r0, [r2, 0x4] - lsls r0, 1 - adds r0, r3 - movs r4, 0 - ldrsh r1, [r0, r4] - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - bne _081490D8 -_081490CE: - movs r0, 0 - b _08149138 - .pool -_081490D8: - ldrb r0, [r2, 0x8] - cmp r0, 0 - bne _081490F4 - movs r0, 0x2 - negs r0, r0 - cmp r1, r0 - bne _081490F4 - movs r0, 0x1 - strb r0, [r2, 0x8] - strb r0, [r2, 0x4] - ldrh r0, [r2, 0x6] - strh r0, [r2, 0x2] - movs r0, 0x4 - strb r0, [r2] -_081490F4: - ldrb r0, [r2, 0x4] - lsls r0, 1 - adds r0, r3 - movs r3, 0x2 - ldrsh r1, [r2, r3] - movs r4, 0 - ldrsh r0, [r0, r4] - cmp r1, r0 - bne _08149136 - ldrb r0, [r2] - adds r1, r0, 0x1 - strb r1, [r2] - ldrb r0, [r2, 0x8] - cmp r0, 0x1 - bne _08149124 - lsls r0, r1, 24 - lsrs r0, 24 - cmp r0, 0x7 - bls _08149136 - ldrb r0, [r2, 0x4] - adds r0, 0x1 - strb r0, [r2, 0x4] - movs r0, 0x4 - b _08149134 -_08149124: - lsls r0, r1, 24 - lsrs r0, 24 - cmp r0, 0x3 - bls _08149136 - ldrb r0, [r2, 0x4] - adds r0, 0x1 - strb r0, [r2, 0x4] - movs r0, 0 -_08149134: - strb r0, [r2] -_08149136: - movs r0, 0x1 -_08149138: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8149048 - - thumb_func_start Phase2Task_Groudon -Phase2Task_Groudon: @ 8149140 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =sPhase2_Groudon_Funcs - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_08149152: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _08149152 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_Groudon - - thumb_func_start sub_8149178 -sub_8149178: @ 8149178 - push {r4,lr} - sub sp, 0xC - adds r4, r0, 0 - add r0, sp, 0x4 - add r1, sp, 0x8 - bl sub_8149F58 - mov r1, sp - movs r0, 0 - strh r0, [r1] - ldr r1, [sp, 0x4] - ldr r2, =0x01000400 - mov r0, sp - bl CpuSet - ldr r0, =gUnknown_085BE51C - ldr r1, [sp, 0x8] - bl LZ77UnCompVram - ldr r0, =gUnknown_085BEA88 - ldr r1, [sp, 0x4] - bl LZ77UnCompVram - ldrh r0, [r4, 0x8] - adds r0, 0x1 - movs r1, 0 - strh r0, [r4, 0x8] - strh r1, [r4, 0xA] - movs r0, 0 - add sp, 0xC - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8149178 - - thumb_func_start sub_81491C8 -sub_81491C8: @ 81491C8 - push {r4,r5,lr} - adds r4, r0, 0 - movs r0, 0xA - ldrsh r5, [r4, r0] - adds r0, r5, 0 - movs r1, 0x3 - bl __modsi3 - lsls r0, 16 - cmp r0, 0 - bne _08149200 - adds r0, r5, 0 - movs r1, 0x1E - bl __modsi3 - lsls r0, 16 - asrs r0, 16 - movs r1, 0x3 - bl __divsi3 - lsls r0, 16 - lsrs r0, 11 - ldr r1, =gUnknown_085BF0A0 - adds r0, r1 - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette -_08149200: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3A - ble _08149218 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - strh r0, [r4, 0xA] -_08149218: - movs r0, 0 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81491C8 - - thumb_func_start sub_8149224 -sub_8149224: @ 8149224 - push {r4,r5,lr} - adds r4, r0, 0 - movs r0, 0xA - ldrsh r5, [r4, r0] - adds r0, r5, 0 - movs r1, 0x5 - bl __modsi3 - lsls r0, 16 - cmp r0, 0 - bne _08149252 - adds r0, r5, 0 - movs r1, 0x5 - bl __divsi3 - lsls r0, 16 - asrs r0, 11 - ldr r1, =gUnknown_085BF2A0 - adds r0, r1 - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette -_08149252: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x44 - ble _0814926E - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - strh r0, [r4, 0xA] - movs r0, 0x1E - strh r0, [r4, 0x18] -_0814926E: - movs r0, 0 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8149224 thumb_func_start Phase2Task_Rayquaza Phase2Task_Rayquaza: @ 814927C diff --git a/data/battle_transition.s b/data/battle_transition.s index 98b0224320..68801b22e5 100644 --- a/data/battle_transition.s +++ b/data/battle_transition.s @@ -4,129 +4,6 @@ .section .rodata - - .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 -sPhase2_Groudon_Funcs:: @ 85C8D40 - .4byte Phase2_WeatherTrio_Func1 - .4byte Phase2_WaitPaletteFade - .4byte sub_8149178 - .4byte sub_81491C8 - .4byte sub_8149224 - .4byte Phase2_FramesCountdown - .4byte Phase2_WeatherDuo_Func6 - .4byte Phase2_WeatherDuo_Func7 - .align 2 sPhase2_Rayquaza_Funcs:: @ 85C8D60 .4byte Phase2_WeatherTrio_Func1 @@ -138,8 +15,8 @@ sPhase2_Rayquaza_Funcs:: @ 85C8D60 .4byte sub_8149410 .4byte sub_814943C .4byte sub_814946C - .4byte sub_8148CE8 - .4byte sub_8148C28 + .4byte Phase2_Blackhole1_Func2 + .4byte Phase2_Blackhole1_Func3 .align 2 gUnknown_085C8D8C:: @ 85C8D8C diff --git a/include/battle_transition.h b/include/battle_transition.h index 2ad27dc293..bb8505edba 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -17,7 +17,7 @@ enum // TRANSITION_MUGSHOT MUGSHOTS_COUNT }; -// credits for the names go to Dyskinesia and Tetrable +// credits for the names go to Dyskinesia, Tetrable and Farore // names are naturally subject to change #define B_TRANSITION_BLUR 0 @@ -47,9 +47,9 @@ enum // TRANSITION_MUGSHOT #define B_TRANSITION_GROUDON 23 #define B_TRANSITION_RAYQUAZA 24 #define B_TRANSITION_25 25 -#define B_TRANSITION_26 26 -#define B_TRANSITION_27 27 -#define B_TRANSITION_28 28 +#define B_TRANSITION_BLACKHOLE1 26 +#define B_TRANSITION_BLACKHOLE2 27 +#define B_TRANSITION_RECTANGULAR_SPIRAL 28 #define B_TRANSITION_29 29 #define B_TRANSITION_30 30 #define B_TRANSITION_31 31 diff --git a/src/battle_transition.c b/src/battle_transition.c index e60a2d91fa..04f48b1261 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -41,6 +41,15 @@ struct TransitionData s16 data[11]; }; +struct StructRectangularSpiral +{ + u8 field_0; + s16 field_2; + u8 field_4; + s16 field_6; + u8 field_8; +}; + typedef bool8 (*TransitionStateFunc)(struct Task *task); typedef bool8 (*TransitionSpriteCallback)(struct Sprite *sprite); @@ -81,9 +90,9 @@ void Phase2Task_Kyogre(u8 taskId); void Phase2Task_Groudon(u8 taskId); void Phase2Task_Rayquaza(u8 taskId); void Phase2Task_25(u8 taskId); -void Phase2Task_26(u8 taskId); -void Phase2Task_27(u8 taskId); -void Phase2Task_28(u8 taskId); +void Phase2Task_Blackhole1(u8 taskId); +void Phase2Task_Blackhole2(u8 taskId); +void Phase2Task_RectangularSpiral(u8 taskId); void Phase2Task_29(u8 taskId); void Phase2Task_30(u8 taskId); void Phase2Task_31(u8 taskId); @@ -127,6 +136,9 @@ bool8 Phase2_WaitPaletteFade(struct Task *task); bool8 Phase2_Kyogre_Func3(struct Task *task); bool8 Phase2_Kyogre_Func4(struct Task *task); bool8 Phase2_Kyogre_Func5(struct Task *task); +bool8 Phase2_Groudon_Func3(struct Task *task); +bool8 Phase2_Groudon_Func4(struct Task *task); +bool8 Phase2_Groudon_Func5(struct Task *task); bool8 Phase2_WeatherDuo_Func6(struct Task *task); bool8 Phase2_WeatherDuo_Func7(struct Task *task); bool8 Phase2_BigPokeball_Func1(struct Task *task); @@ -166,6 +178,17 @@ bool8 Phase2_Shards_Func2(struct Task *task); bool8 Phase2_Shards_Func3(struct Task *task); bool8 Phase2_Shards_Func4(struct Task *task); bool8 Phase2_Shards_Func5(struct Task *task); +bool8 Phase2_25_Func1(struct Task *task); +bool8 Phase2_25_Func2(struct Task *task); +bool8 Phase2_25_Func3(struct Task *task); +bool8 Phase2_25_Func4(struct Task *task); +bool8 Phase2_Blackhole_Func1(struct Task *task); +bool8 Phase2_Blackhole1_Func2(struct Task *task); +bool8 Phase2_Blackhole1_Func3(struct Task *task); +bool8 Phase2_Blackhole2_Func2(struct Task *task); +bool8 Phase2_RectangularSpiral_Func1(struct Task *task); +bool8 Phase2_RectangularSpiral_Func2(struct Task *task); +bool8 Phase2_RectangularSpiral_Func3(struct Task *task); bool8 Phase2_Mugshot_Func1(struct Task *task); bool8 Phase2_Mugshot_Func2(struct Task *task); bool8 Phase2_Mugshot_Func3(struct Task *task); @@ -197,6 +220,7 @@ void sub_8148484(s16 spriteId, s16 value); void sub_814849C(s16 spriteId); s16 sub_81484B8(s16 spriteId); bool8 IsPhase1Done(void); +bool16 sub_8149048(const s16 * const *arg0, struct StructRectangularSpiral *arg1); void sub_814713C(struct Sprite *sprite); void sub_8148380(struct Sprite *sprite); bool8 sub_81483A8(struct Sprite *sprite); @@ -206,9 +230,10 @@ bool8 sub_814842C(struct Sprite *sprite); bool8 sub_8148458(struct Sprite *sprite); // iwram bss vars -IWRAM_DATA u16 gUnknown_03001208; +IWRAM_DATA static s16 sUnusedRectangularSpiralVar; IWRAM_DATA static u8 sTestingTransitionId; IWRAM_DATA static u8 sTestingTransitionState; +IWRAM_DATA static struct StructRectangularSpiral sRectangularSpiralTransition[4]; // ewram vars EWRAM_DATA struct TransitionData *sTransitionStructPtr = NULL; @@ -288,9 +313,9 @@ const TaskFunc sPhase2_Tasks[B_TRANSITION_COUNT] = Phase2Task_Groudon, // 23 Phase2Task_Rayquaza, // 24 Phase2Task_25, // 25 - Phase2Task_26, // 26 - Phase2Task_27, // 27 - Phase2Task_28, // 28 + Phase2Task_Blackhole1, // 26 + Phase2Task_Blackhole2, // 27 + Phase2Task_RectangularSpiral, // 28 Phase2Task_29, // 29 Phase2Task_30, // 30 Phase2Task_31, // 31 @@ -502,6 +527,98 @@ const TransitionStateFunc sPhase2_Slice_Funcs[] = Phase2_Slice_Func3 }; +const TransitionStateFunc sPhase2_25_Funcs[] = +{ + Phase2_25_Func1, + Phase2_25_Func2, + Phase2_25_Func3, + Phase2_25_Func4 +}; + +const u8 gUnknown_085C8C64[] = {39, 119}; +const s16 gUnknown_085C8C66[] = {1, -1}; + +const TransitionStateFunc sPhase2_Blackhole1_Funcs[] = +{ + Phase2_Blackhole_Func1, + Phase2_Blackhole1_Func2, + Phase2_Blackhole1_Func3 +}; + +const TransitionStateFunc sPhase2_Blackhole2_Funcs[] = +{ + Phase2_Blackhole_Func1, + Phase2_Blackhole2_Func2 +}; + +const s16 gUnknown_085C8C80[] = {-6, 4}; + +const TransitionStateFunc sPhase2_RectangularSpiral_Funcs[] = +{ + Phase2_RectangularSpiral_Func1, + Phase2_RectangularSpiral_Func2, + Phase2_RectangularSpiral_Func3 +}; + +const s16 gUnknown_085C8C90[] = {1, 27, 275, -1}; +const s16 gUnknown_085C8C98[] = {2, 486, -1}; +const s16 gUnknown_085C8C9E[] = {3, 262, -1}; +const s16 gUnknown_085C8CA4[] = {4, 507, -2}; +const s16 gUnknown_085C8CAA[] = {1, 213, -1}; +const s16 gUnknown_085C8CB0[] = {2, 548, -2}; +const s16 gUnknown_085C8CB6[] = {3, 196, -1}; +const s16 gUnknown_085C8CBC[] = {4, 573, 309, -1}; +const s16 gUnknown_085C8CC4[] = {1, 474, -1}; +const s16 gUnknown_085C8CCA[] = {2, 295, 32, -1}; +const s16 gUnknown_085C8CD2[] = {3, 58, -1}; +const s16 gUnknown_085C8CD8[] = {4, 455, -1}; +const s16 gUnknown_085C8CDE[] = {1, 540, -1}; +const s16 gUnknown_085C8CE4[] = {2, 229, -1}; +const s16 gUnknown_085C8CEA[] = {3, 244, 28, -1}; +const s16 gUnknown_085C8CF2[] = {4, 517, -1}; + +const s16 *const gUnknown_085C8CF8[] = +{ + gUnknown_085C8C90, + gUnknown_085C8CA4, + gUnknown_085C8C98, + gUnknown_085C8C9E, + gUnknown_085C8CEA, + gUnknown_085C8CE4, + gUnknown_085C8CF2, + gUnknown_085C8CDE +}; + +const s16 *const gUnknown_085C8D18[] = +{ + gUnknown_085C8CBC, + gUnknown_085C8CB0, + gUnknown_085C8CB6, + gUnknown_085C8CAA, + gUnknown_085C8CCA, + gUnknown_085C8CD8, + gUnknown_085C8CC4, + gUnknown_085C8CD2 +}; + +const s16 *const *const gUnknown_085C8D38[] = +{ + gUnknown_085C8CF8, + gUnknown_085C8D18 +}; + +const TransitionStateFunc sPhase2_Groudon_Funcs[] = +{ + Phase2_WeatherTrio_Func1, + Phase2_WaitPaletteFade, + Phase2_Groudon_Func3, + Phase2_Groudon_Func4, + Phase2_Groudon_Func5, + Phase2_FramesCountdown, + Phase2_WeatherDuo_Func6, + Phase2_WeatherDuo_Func7 +}; + extern const u16 gFieldEffectObjectPalette10[]; extern const u16 sBigPokeball_Tilemap[]; extern const u16 sMugshotsTilemap[]; @@ -722,7 +839,7 @@ bool8 Phase2_Swirl_Func1(struct Task *task) bool8 Phase2_Swirl_Func2(struct Task *task) { - sTransitionStructPtr->VBlank_DMA = 0; + sTransitionStructPtr->VBlank_DMA = FALSE; task->data[1] += 4; task->data[2] += 8; @@ -780,7 +897,7 @@ bool8 Phase2_Shuffle_Func2(struct Task *task) u8 i; u16 r3, r4; - sTransitionStructPtr->VBlank_DMA = 0; + sTransitionStructPtr->VBlank_DMA = FALSE; r4 = task->data[1]; r3 = task->data[2] >> 8; task->data[1] += 4224; @@ -1084,7 +1201,7 @@ bool8 Phase2_WeatherDuo_Func7(struct Task *task) bool8 Phase2_BigPokeball_Func3(struct Task *task) { - sTransitionStructPtr->VBlank_DMA = 0; + sTransitionStructPtr->VBlank_DMA = FALSE; if (task->data[3] == 0 || --task->data[3] == 0) { task->data[2]++; @@ -1104,7 +1221,7 @@ bool8 Phase2_BigPokeball_Func3(struct Task *task) bool8 Phase2_BigPokeball_Func4(struct Task *task) { - sTransitionStructPtr->VBlank_DMA = 0; + sTransitionStructPtr->VBlank_DMA = FALSE; if (task->data[3] == 0 || --task->data[3] == 0) { task->data[1]--; @@ -1124,7 +1241,7 @@ bool8 Phase2_BigPokeball_Func4(struct Task *task) bool8 Phase2_BigPokeball_Func5(struct Task *task) { - sTransitionStructPtr->VBlank_DMA = 0; + sTransitionStructPtr->VBlank_DMA = FALSE; task->data[4] += 8; task->data[5] -= 256; @@ -1165,7 +1282,7 @@ bool8 Phase2_WaitPaletteFade(struct Task *task) bool8 Phase2_BigPokeball_Func6(struct Task *task) { - sTransitionStructPtr->VBlank_DMA = 0; + sTransitionStructPtr->VBlank_DMA = FALSE; if (task->data[2] < 1024) task->data[2] += 128; if (task->data[1] != 0) @@ -1359,7 +1476,7 @@ bool8 Phase2_Clockwise_BlackFade_Func1(struct Task *task) bool8 Phase2_Clockwise_BlackFade_Func2(struct Task *task) { - sTransitionStructPtr->VBlank_DMA = 0; + sTransitionStructPtr->VBlank_DMA = FALSE; sub_814A1AC(sTransitionStructPtr->data, 120, 80, sTransitionStructPtr->data[4], -1, 1, 1); do @@ -1383,7 +1500,7 @@ bool8 Phase2_Clockwise_BlackFade_Func3(struct Task *task) s16 r1, r3; vu8 var = 0; - sTransitionStructPtr->VBlank_DMA = 0; + sTransitionStructPtr->VBlank_DMA = FALSE; sub_814A1AC(sTransitionStructPtr->data, 120, 80, 240, sTransitionStructPtr->data[5], 1, 1); @@ -1418,7 +1535,7 @@ bool8 Phase2_Clockwise_BlackFade_Func3(struct Task *task) bool8 Phase2_Clockwise_BlackFade_Func4(struct Task *task) { - sTransitionStructPtr->VBlank_DMA = 0; + sTransitionStructPtr->VBlank_DMA = FALSE; sub_814A1AC(sTransitionStructPtr->data, 120, 80, sTransitionStructPtr->data[4], 160, 1, 1); do @@ -1442,7 +1559,7 @@ bool8 Phase2_Clockwise_BlackFade_Func5(struct Task *task) s16 r1, r2, var4; vu8 var = 0; - sTransitionStructPtr->VBlank_DMA = 0; + sTransitionStructPtr->VBlank_DMA = FALSE; sub_814A1AC(sTransitionStructPtr->data, 120, 80, 0, sTransitionStructPtr->data[5], 1, 1); @@ -1479,7 +1596,7 @@ bool8 Phase2_Clockwise_BlackFade_Func5(struct Task *task) bool8 Phase2_Clockwise_BlackFade_Func6(struct Task *task) { - sTransitionStructPtr->VBlank_DMA = 0; + sTransitionStructPtr->VBlank_DMA = FALSE; sub_814A1AC(sTransitionStructPtr->data, 120, 80, sTransitionStructPtr->data[4], 0, 1, 1); do @@ -1554,7 +1671,7 @@ bool8 Phase2_Ripple_Func2(struct Task *task) s16 r3; u16 r4, r8; - sTransitionStructPtr->VBlank_DMA = 0; + sTransitionStructPtr->VBlank_DMA = FALSE; r3 = task->data[2] >> 8; r4 = task->data[1]; @@ -1633,7 +1750,7 @@ bool8 Phase2_Wave_Func2(struct Task *task) u16* toStore; bool8 nextFunc; - sTransitionStructPtr->VBlank_DMA = 0; + sTransitionStructPtr->VBlank_DMA = FALSE; toStore = gUnknown_02038C28[0]; r5 = task->data[2]; task->data[2] += 16; @@ -1772,7 +1889,7 @@ bool8 Phase2_Mugshot_Func3(struct Task *task) s16 value; s32 mergedValue; - sTransitionStructPtr->VBlank_DMA = 0; + sTransitionStructPtr->VBlank_DMA = FALSE; toStore = gUnknown_02038C28[0]; r5 = task->data[1]; @@ -1818,7 +1935,7 @@ bool8 Phase2_Mugshot_Func4(struct Task *task) u8 i; u16* toStore; - sTransitionStructPtr->VBlank_DMA = 0; + sTransitionStructPtr->VBlank_DMA = FALSE; for (i = 0, toStore = gUnknown_02038C28[0]; i < 160; i++, toStore++) { @@ -1860,7 +1977,7 @@ bool8 Phase2_Mugshot_Func6(struct Task *task) sTransitionStructPtr->field_1A += 8; if (sub_81484B8(task->tPlayerSpriteId)) { - sTransitionStructPtr->VBlank_DMA = 0; + sTransitionStructPtr->VBlank_DMA = FALSE; SetVBlankCallback(NULL); DmaStop(0); memset(gUnknown_02038C28[0], 0, 0x140); @@ -1880,7 +1997,7 @@ bool8 Phase2_Mugshot_Func7(struct Task *task) { bool32 r6; - sTransitionStructPtr->VBlank_DMA = 0; + sTransitionStructPtr->VBlank_DMA = FALSE; r6 = TRUE; sTransitionStructPtr->field_18 -= 8; sTransitionStructPtr->field_1A += 8; @@ -1919,7 +2036,7 @@ bool8 Phase2_Mugshot_Func7(struct Task *task) bool8 Phase2_Mugshot_Func8(struct Task *task) { - sTransitionStructPtr->VBlank_DMA = 0; + sTransitionStructPtr->VBlank_DMA = FALSE; BlendPalettes(-1, 0x10, 0x7FFF); sTransitionStructPtr->BLDCNT = 0xFF; task->data[3] = 0; @@ -1930,7 +2047,7 @@ bool8 Phase2_Mugshot_Func8(struct Task *task) bool8 Phase2_Mugshot_Func9(struct Task *task) { - sTransitionStructPtr->VBlank_DMA = 0; + sTransitionStructPtr->VBlank_DMA = FALSE; task->data[3]++; memset(gUnknown_02038C28[0], task->data[3], 0x140); @@ -2104,7 +2221,7 @@ bool8 Phase2_Slice_Func1(struct Task *task) sTransitionStructPtr->WININ = 63; sTransitionStructPtr->WINOUT = 0; sTransitionStructPtr->WIN0V = 160; - sTransitionStructPtr->VBlank_DMA = 0; + sTransitionStructPtr->VBlank_DMA = FALSE; for (i = 0; i < 160; i++) { @@ -2126,7 +2243,7 @@ bool8 Phase2_Slice_Func2(struct Task *task) { u16 i; - sTransitionStructPtr->VBlank_DMA = 0; + sTransitionStructPtr->VBlank_DMA = FALSE; task->data[1] += (task->data[2] >> 8); if (task->data[1] > 0xF0) @@ -2189,3 +2306,509 @@ void HBlankCB_Phase2_Slice(void) REG_BG3HOFS = var; } } + +void Phase2Task_25(u8 taskId) +{ + while (sPhase2_25_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +bool8 Phase2_25_Func1(struct Task *task) +{ + u16 i; + + sub_8149F08(); + dp12_8087EA4(); + + sTransitionStructPtr->WININ = 63; + sTransitionStructPtr->WINOUT = 0; + sTransitionStructPtr->WIN0V = 160; + + for (i = 0; i < 0xA0; i++) + { + gUnknown_02038C28[1][i] = sTransitionStructPtr->field_14; + gUnknown_02038C28[1][0xA0 + i] = 0xF0; + gUnknown_02038C28[0][i] = sTransitionStructPtr->field_14; + gUnknown_02038C28[0][0xA0 + i] = 0xF0; + gUnknown_02038C28[0][0x140 + i] = 0; + gUnknown_02038C28[0][0x1E0 + i] = 0x100; + gUnknown_02038C28[0][0x280 + i] = 1; + } + + task->data[4] = 0; + task->data[5] = 0; + task->data[6] = 7; + + EnableInterrupts(INTR_FLAG_HBLANK); + + SetVBlankCallback(VBlankCB_Phase2_Slice); + SetHBlankCallback(HBlankCB_Phase2_Slice); + + task->tState++; + return TRUE; +} + +bool8 Phase2_25_Func2(struct Task *task) +{ + u16 i, j, k; + u8 arr1[ARRAY_COUNT(gUnknown_085C8C64)]; + s16 arr2[ARRAY_COUNT(gUnknown_085C8C66)]; + u8 var; + u16 *ptr4, *ptr3, *ptr1, *ptr2; + s16 unkVar; + + memcpy(arr1, gUnknown_085C8C64, sizeof(arr1)); + memcpy(arr2, gUnknown_085C8C66, sizeof(arr2)); + + sTransitionStructPtr->VBlank_DMA = FALSE; + var = 0; + + for (i = 0; i <= task->data[5]; i++) + { + for (j = 0; j < 2; j++) + { + for (k = 0; k < 2; k++) + { + unkVar = (arr1[j]) + (arr2[k] * -(i) * 2); + if (unkVar >= 0 && (unkVar != 79 || j != 1)) + { + ptr4 = &gUnknown_02038C28[0][unkVar + 320]; + ptr3 = &gUnknown_02038C28[0][unkVar + 480]; + ptr1 = &gUnknown_02038C28[0][unkVar + 640]; + if (*ptr4 > 0xEF) + { + *ptr4 = 0xF0; + var++; + } + else + { + *ptr4 += (*ptr3 >> 8); + if (*ptr1 <= 0x7F) + *ptr1 *= 2; + if (*ptr3 <= 0xFFF) + *ptr3 += *ptr1; + } + ptr2 = &gUnknown_02038C28[0][unkVar]; + ptr3 = &gUnknown_02038C28[0][unkVar + 160]; + *ptr2 = sTransitionStructPtr->field_14 + *ptr4; + *ptr3 = 0xF0 - *ptr4; + + if (i == 0) + break; + } + } + } + + for (j = 0; j < 2; j++) + { + for (k = 0; k < 2; k++) + { + unkVar = (arr1[j] + 1) + (arr2[k] * -(i) * 2); + if (unkVar <= 160 && (unkVar != 80 || j != 1)) + { + ptr4 = &gUnknown_02038C28[0][unkVar + 320]; + ptr3 = &gUnknown_02038C28[0][unkVar + 480]; + ptr1 = &gUnknown_02038C28[0][unkVar + 640]; + if (*ptr4 > 0xEF) + { + *ptr4 = 0xF0; + var++; + } + else + { + *ptr4 += (*ptr3 >> 8); + if (*ptr1 <= 0x7F) + *ptr1 *= 2; + if (*ptr3 <= 0xFFF) + *ptr3 += *ptr1; + } + ptr2 = &gUnknown_02038C28[0][unkVar]; + ptr3 = &gUnknown_02038C28[0][unkVar + 160]; + *ptr2 = sTransitionStructPtr->field_14 - *ptr4; + *ptr3 = (*ptr4 << 8) | (0xF1); + + if (i == 0) + break; + } + } + } + } + + if (--task->data[4] < 0) + task->data[4] = 0; + if (task->data[4] <= 0 && task->data[5] + 1 <= 20) + task->data[4] = task->data[6], task->data[5]++; + if (var > 0x9F) + task->tState++; + + sTransitionStructPtr->VBlank_DMA++; + return FALSE; +} + +bool8 Phase2_25_Func3(struct Task *task) +{ + u16 i; + bool32 done = TRUE; + u16 checkVar2 = 0xFF10; + + for (i = 0; i < 0xA0; i++) + { + if (gUnknown_02038C28[1][i] != 0xF0 && gUnknown_02038C28[1][i] != checkVar2) + done = FALSE; // a break statement should be put here + } + + if (done == TRUE) + task->tState++; + + return FALSE; +} + +bool8 Phase2_25_Func4(struct Task *task) +{ + DmaStop(0); + sub_8149F84(); + DestroyTask(FindTaskIdByFunc(Phase2Task_25)); + return FALSE; +} + +void Phase2Task_Blackhole1(u8 taskId) +{ + while (sPhase2_Blackhole1_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +void Phase2Task_Blackhole2(u8 taskId) +{ + while (sPhase2_Blackhole2_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +bool8 Phase2_Blackhole_Func1(struct Task *task) +{ + s32 i; + + sub_8149F08(); + dp12_8087EA4(); + + sTransitionStructPtr->WININ = 0; + sTransitionStructPtr->WINOUT = 63; + sTransitionStructPtr->field_6 = 240; + sTransitionStructPtr->WIN0V = 160; + + for (i = 0; i < 0xA0; i++) + { + gUnknown_02038C28[1][i] = 0; + } + + SetVBlankCallback(VBlankCB1_Phase2_BigPokeball); + + task->tState++; + task->data[1] = 1; + task->data[2] = 0x100; + task->data[7] = 0; + + return FALSE; +} + +bool8 Phase2_Blackhole1_Func3(struct Task *task) +{ + if (task->data[7] == 1) + { + DmaStop(0); + SetVBlankCallback(NULL); + DestroyTask(FindTaskIdByFunc(task->func)); + } + else + { + sTransitionStructPtr->VBlank_DMA = FALSE; + if (task->data[2] < 0x400) + task->data[2] += 0x80; + if (task->data[1] < 0xA0) + task->data[1] += (task->data[2] >> 8); + if (task->data[1] > 0xA0) + task->data[1] = 0xA0; + sub_814A014(gUnknown_02038C28[0], 0x78, 0x50, task->data[1]); + if (task->data[1] == 0xA0) + { + task->data[7] = 1; + sub_8149F84(); + } + else + { + sTransitionStructPtr->VBlank_DMA++; + } + } + + return FALSE; +} + +bool8 Phase2_Blackhole1_Func2(struct Task *task) +{ + sTransitionStructPtr->VBlank_DMA = FALSE; + if (task->data[7] == 0) + { + task->data[7]++; + task->data[1] = 0x30; + task->data[6] = 0; + } + task->data[1] += gUnknown_085C8C80[task->data[6]]; + task->data[6] = (task->data[6] + 1) % 2; + sub_814A014(gUnknown_02038C28[0], 0x78, 0x50, task->data[1]); + if (task->data[1] < 9) + { + task->tState++; + task->data[7] = 0; + } + + sTransitionStructPtr->VBlank_DMA++; + return FALSE; +} + +bool8 Phase2_Blackhole2_Func2(struct Task *task) +{ + u16 index; // should be s16 I think + s16 amplitude; + + sTransitionStructPtr->VBlank_DMA = FALSE; + if (task->data[7] == 0) + { + task->data[7]++; + task->data[5] = 2; + task->data[6] = 2; + } + if (task->data[1] > 0xA0) + task->data[1] = 0xA0; + + sub_814A014(gUnknown_02038C28[0], 0x78, 0x50, task->data[1]); + if (task->data[1] == 0xA0) + { + DmaStop(0); + sub_8149F84(); + DestroyTask(FindTaskIdByFunc(task->func)); + } + + index = task->data[5]; + if ((task->data[5] & 0xFF) <= 128) + { + amplitude = task->data[6]; + task->data[5] += 8; + } + else + { + amplitude = task->data[6] - 1; + task->data[5] += 16; + } + task->data[1] += Sin(index & 0xFF, amplitude); + + if (task->data[1] <= 0) + task->data[1] = 1; + if (task->data[5] > 0xFE) + task->data[5] >>= 8, task->data[6]++; + + sTransitionStructPtr->VBlank_DMA++; + return FALSE; +} + +void Phase2Task_RectangularSpiral(u8 taskId) +{ + while (sPhase2_RectangularSpiral_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +bool8 Phase2_RectangularSpiral_Func1(struct Task *task) +{ + u16 *dst1, *dst2; + + sub_8149F58(&dst1, &dst2); + CpuCopy16(sShrinkingBoxTileset, dst2, 0x20); + CpuCopy16(sShrinkingBoxTileset + 0x70, dst2 + 0x20, 0x20); + CpuFill16(0xF000, dst1, 0x800); + LoadPalette(gFieldEffectObjectPalette10, 0xF0, 0x20); + + task->data[3] = 1; + task->tState++; + + sRectangularSpiralTransition[0].field_0 = 0; + sRectangularSpiralTransition[0].field_2 = -1; + sRectangularSpiralTransition[0].field_4 = 1; + sRectangularSpiralTransition[0].field_6 = 308; + sRectangularSpiralTransition[0].field_8 = 0; + + sRectangularSpiralTransition[1].field_0 = 0; + sRectangularSpiralTransition[1].field_2 = -1; + sRectangularSpiralTransition[1].field_4 = 1; + sRectangularSpiralTransition[1].field_6 = 308; + sRectangularSpiralTransition[1].field_8 = 0; + + sRectangularSpiralTransition[2].field_0 = 0; + sRectangularSpiralTransition[2].field_2 = -3; + sRectangularSpiralTransition[2].field_4 = 1; + sRectangularSpiralTransition[2].field_6 = 307; + sRectangularSpiralTransition[2].field_8 = 0; + + sRectangularSpiralTransition[3].field_0 = 0; + sRectangularSpiralTransition[3].field_2 = -3; + sRectangularSpiralTransition[3].field_4 = 1; + sRectangularSpiralTransition[3].field_6 = 307; + sRectangularSpiralTransition[3].field_8 = 0; + + return FALSE; +} + +bool8 Phase2_RectangularSpiral_Func2(struct Task *task) +{ + u16 *dst1, *dst2; + u8 i; + u16 j; + bool32 done = TRUE; + + sub_8149F58(&dst1, &dst2); + + for (i = 0; i < 2; i++) + { + for (j = 0; j < ARRAY_COUNT(sRectangularSpiralTransition); j++) + { + s16 var = 0, var2 = 0; + s32 var3 = 0; + + if (sub_8149048(gUnknown_085C8D38[j / 2], &sRectangularSpiralTransition[j])) + { + u32 one; + done = FALSE; + var = sRectangularSpiralTransition[j].field_2; + one = 1; + if ((j & 1) == one) + var = 0x27D - var; + + var2 = var % 32; + var3 = var / 32 * 32; + + dst1[var3 + var2] = 0xF002; + } + } + } + + if (done == TRUE) + task->tState++; + return FALSE; +} + +bool8 Phase2_RectangularSpiral_Func3(struct Task *task) +{ + DmaStop(0); + sub_8149F84(); + DestroyTask(FindTaskIdByFunc(task->func)); + return FALSE; +} + +bool16 sub_8149048(const s16 * const *arg0, struct StructRectangularSpiral *arg1) +{ + const s16 *array = arg0[arg1->field_0]; + if (array[arg1->field_4] == -1) + return FALSE; + + // ?? + sUnusedRectangularSpiralVar = array[0]; + sUnusedRectangularSpiralVar = array[1]; + sUnusedRectangularSpiralVar = array[2]; + sUnusedRectangularSpiralVar = array[3]; + + switch (array[0]) + { + case 1: + arg1->field_2 += 0x1; + break; + case 2: + arg1->field_2 -= 0x1; + break; + case 3: + arg1->field_2 -= 0x20; + break; + case 4: + arg1->field_2 += 0x20; + break; + } + + if (arg1->field_2 > 0x27F || array[arg1->field_4] == -1) + return FALSE; + + if (arg1->field_8 == 0 && array[arg1->field_4] == -2) + { + arg1->field_8 = 1; + arg1->field_4 = 1; + arg1->field_2 = arg1->field_6; + arg1->field_0 = 4; + } + + if (arg1->field_2 == array[arg1->field_4]) + { + (arg1->field_0)++; + if (arg1->field_8 == 1) + { + if (arg1->field_0 > 7) + { + (arg1->field_4)++; + (arg1->field_0) = 4; + } + } + else + { + if (arg1->field_0 > 3) + { + (arg1->field_4)++; + (arg1->field_0) = 0; + } + } + } + + return TRUE; +} + +void Phase2Task_Groudon(u8 taskId) +{ + while (sPhase2_Groudon_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +bool8 Phase2_Groudon_Func3(struct Task *task) +{ + u16 *dst1, *dst2; + + sub_8149F58(&dst1, &dst2); + CpuFill16(0, dst1, 0x800); + LZ77UnCompVram(gUnknown_085BE51C, dst2); + LZ77UnCompVram(gUnknown_085BEA88, dst1); + + task->tState++; + task->data[1] = 0; + return FALSE; +} + +bool8 Phase2_Groudon_Func4(struct Task *task) +{ + if (task->data[1] % 3 == 0) + { + u16 var = (task->data[1] % 30) / 3; + LoadPalette(gUnknown_085BF0A0 + (var * 16), 0xF0, 0x20); + } + if (++task->data[1] > 58) + { + task->tState++; + task->data[1] = 0; + } + + return FALSE; +} + +bool8 Phase2_Groudon_Func5(struct Task *task) +{ + if (task->data[1] % 5 == 0) + { + s16 var = task->data[1] / 5; + LoadPalette(gUnknown_085BF2A0 + (var * 16), 0xF0, 0x20); + } + if (++task->data[1] > 68) + { + task->tState++; + task->data[1] = 0; + task->tFrames = 30; + } + + return FALSE; +} + diff --git a/sym_bss.txt b/sym_bss.txt index 0524f5545f..e413e08f9c 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -74,11 +74,6 @@ gUnknown_03001204: @ 3001204 .space 0x4 .include "src/battle_transition.o" - - .align 4 - -gUnknown_03001210: @ 3001210 - .space 0x30 gUnknown_03001240: @ 3001240 .space 0x30 From fdbe7fa7de9b2e1f8a22efca87201901fcea32b4 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 14 Jan 2018 20:45:44 +0100 Subject: [PATCH 09/64] up to 30 battle transitions --- asm/battle_transition.s | 2712 +---------------------------------- data/battle_transition.s | 235 --- include/battle_transition.h | 3 +- include/field_camera.h | 1 + ld_script.txt | 1 - src/battle_transition.c | 1664 ++++++++++++++++++--- src/tileset_anims.c | 5 +- 7 files changed, 1485 insertions(+), 3136 deletions(-) delete mode 100644 data/battle_transition.s diff --git a/asm/battle_transition.s b/asm/battle_transition.s index 675f46bfda..eb87f05631 100644 --- a/asm/battle_transition.s +++ b/asm/battle_transition.s @@ -5,2642 +5,8 @@ .text - - - - thumb_func_start Phase2Task_Rayquaza -Phase2Task_Rayquaza: @ 814927C - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =sPhase2_Rayquaza_Funcs - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_0814928E: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _0814928E - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_Rayquaza - - thumb_func_start sub_81492B4 -sub_81492B4: @ 81492B4 - push {r4-r6,lr} - sub sp, 0xC - adds r4, r0, 0 - bl sub_8149F08 - bl dp12_8087EA4 - ldr r1, =0x00009a08 - movs r0, 0x8 - bl SetGpuReg - add r0, sp, 0x4 - add r1, sp, 0x8 - bl sub_8149F58 - mov r1, sp - movs r0, 0 - strh r0, [r1] - ldr r1, [sp, 0x4] - ldr r2, =0x01000400 - mov r0, sp - bl CpuSet - ldr r0, =gUnknown_085BF6A0 - ldr r1, [sp, 0x8] - movs r2, 0x80 - lsls r2, 5 - bl CpuSet - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - movs r0, 0 - strh r0, [r1, 0x20] - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - ldr r0, =gUnknown_085BF4A0+0xA0 - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - movs r2, 0 - ldr r3, =gUnknown_02038C28 - movs r6, 0 - movs r0, 0xF0 - lsls r0, 3 - adds r5, r3, r0 - movs r4, 0x80 - lsls r4, 1 -_08149316: - lsls r1, r2, 1 - adds r0, r1, r3 - strh r6, [r0] - adds r1, r5 - strh r4, [r1] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x9F - bls _08149316 - ldr r0, =sub_8149508 - bl SetVBlankCallback - movs r0, 0 - add sp, 0xC - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81492B4 - - thumb_func_start sub_8149358 -sub_8149358: @ 8149358 - push {r4,lr} - sub sp, 0x8 - adds r4, r0, 0 - add r1, sp, 0x4 - mov r0, sp - bl sub_8149F58 - ldr r0, =gUnknown_085C6BE0 - ldr r1, [sp] - movs r2, 0x80 - lsls r2, 4 - bl CpuSet - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - add sp, 0x8 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8149358 - - thumb_func_start sub_8149388 -sub_8149388: @ 8149388 - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0xA] - movs r1, 0x3 - ands r0, r1 - cmp r0, 0 - bne _081493B4 - movs r1, 0xA - ldrsh r0, [r4, r1] - cmp r0, 0 - bge _081493A0 - adds r0, 0x3 -_081493A0: - lsls r0, 14 - lsrs r0, 16 - adds r0, 0x5 - lsls r0, 5 - ldr r1, =gUnknown_085BF4A0 - adds r0, r1 - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette -_081493B4: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x28 - ble _081493CC - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - strh r0, [r4, 0xA] -_081493CC: - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8149388 - - thumb_func_start sub_81493D8 -sub_81493D8: @ 81493D8 - push {lr} - sub sp, 0x4 - adds r1, r0, 0 - ldrh r0, [r1, 0xA] - adds r0, 0x1 - movs r2, 0 - strh r0, [r1, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x14 - ble _08149402 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - strh r2, [r1, 0xA] - ldr r0, =0xffff8000 - str r2, [sp] - movs r1, 0x2 - movs r3, 0x10 - bl BeginNormalPaletteFade -_08149402: - movs r0, 0 - add sp, 0x4 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81493D8 - - thumb_func_start sub_8149410 -sub_8149410: @ 8149410 - push {lr} - adds r2, r0, 0 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _0814942E - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - movs r0, 0x1 - strh r0, [r1, 0x20] - ldrh r0, [r2, 0x8] - adds r0, 0x1 - strh r0, [r2, 0x8] -_0814942E: - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_8149410 - - thumb_func_start sub_814943C -sub_814943C: @ 814943C - push {r4,lr} - adds r4, r0, 0 - ldr r0, =0x00007fff - movs r1, 0x8 - movs r2, 0 - bl BlendPalettes - ldr r0, =0xffff8000 - movs r1, 0 - movs r2, 0 - bl BlendPalettes - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_814943C - - thumb_func_start sub_814946C -sub_814946C: @ 814946C - push {r4,r5,lr} - adds r4, r0, 0 - movs r0, 0xA - ldrsh r5, [r4, r0] - adds r0, r5, 0 - movs r1, 0x3 - bl __modsi3 - lsls r0, 16 - cmp r0, 0 - bne _0814949A - adds r0, r5, 0 - movs r1, 0x3 - bl __divsi3 - lsls r0, 16 - lsrs r0, 11 - ldr r1, =gUnknown_085BF4A0 - adds r0, r1 - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette -_0814949A: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x27 - ble _081494F0 - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - movs r0, 0 - strh r0, [r1, 0x2] - movs r0, 0x3F - strh r0, [r1, 0x4] - movs r0, 0xF0 - strh r0, [r1, 0x6] - movs r0, 0xA0 - strh r0, [r1, 0x8] - movs r1, 0 - ldr r5, =VBlankCB1_Phase2_BigPokeball - ldr r3, =gUnknown_020393A8 - movs r2, 0 -_081494C4: - lsls r0, r1, 1 - adds r0, r3 - strh r2, [r0] - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, 0x9F - bls _081494C4 - adds r0, r5, 0 - bl SetVBlankCallback - ldrh r0, [r4, 0x8] - adds r0, 0x1 - movs r2, 0 - strh r0, [r4, 0x8] - movs r1, 0x80 - lsls r1, 1 - strh r1, [r4, 0xC] - strh r2, [r4, 0x16] - movs r0, 0 - bl ClearGpuRegBits -_081494F0: - movs r0, 0 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_814946C - - thumb_func_start sub_8149508 -sub_8149508: @ 8149508 - push {lr} - ldr r1, =0x040000b0 - ldrh r2, [r1, 0xA] - ldr r0, =0x0000c5ff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r2, [r1, 0xA] - ldr r0, =0x00007fff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r0, [r1, 0xA] - bl VBlankCB_BattleTransition - ldr r0, =sTransitionStructPtr - ldr r0, [r0] - movs r1, 0x20 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _08149548 - ldr r2, =gUnknown_02038C28 - b _08149554 - .pool -_08149548: - ldr r2, =gUnknown_02038C28 - cmp r0, 0x1 - bne _08149554 - movs r0, 0xF0 - lsls r0, 3 - adds r2, r0 -_08149554: - ldr r1, =0x040000b0 - str r2, [r1] - ldr r0, =0x04000012 - str r0, [r1, 0x4] - ldr r0, =0xa2400001 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - pop {r0} - bx r0 - .pool - thumb_func_end sub_8149508 - - thumb_func_start Phase2Task_WhiteFade -Phase2Task_WhiteFade: @ 8149578 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_085C8D8C - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_0814958A: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _0814958A - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_WhiteFade - - thumb_func_start sub_81495B0 -sub_81495B0: @ 81495B0 - push {r4,r5,lr} - adds r5, r0, 0 - bl sub_8149F08 - bl dp12_8087EA4 - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - movs r2, 0 - movs r0, 0xBF - strh r0, [r1, 0xE] - strh r2, [r1, 0x12] - movs r0, 0x1E - strh r0, [r1, 0x2] - movs r0, 0x3F - strh r0, [r1, 0x4] - movs r0, 0xA0 - strh r0, [r1, 0x8] - movs r1, 0 - ldr r2, =gUnknown_020393A8 - movs r4, 0 - movs r3, 0xF0 -_081495DC: - lsls r0, r1, 1 - adds r0, r2 - strh r4, [r0] - adds r0, r1, 0 - adds r0, 0xA0 - lsls r0, 1 - adds r0, r2 - strh r3, [r0] - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, 0x9F - bls _081495DC - movs r0, 0x2 - bl EnableInterrupts - ldr r0, =sub_8149840 - bl SetHBlankCallback - ldr r0, =sub_8149774 - bl SetVBlankCallback - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] - movs r0, 0 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81495B0 - - thumb_func_start sub_8149628 -sub_8149628: @ 8149628 - push {r4-r6,lr} - sub sp, 0x10 - adds r6, r0, 0 - ldr r1, =sUnknown_085C8DA0 - mov r0, sp - movs r2, 0x10 - bl memcpy - movs r5, 0 - movs r4, 0 -_0814963C: - ldr r0, =sub_8149864 - bl CreateInvisibleSprite - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - ldr r0, =gSprites - adds r2, r1, r0 - movs r0, 0xF0 - strh r0, [r2, 0x20] - strh r4, [r2, 0x22] - lsls r1, r5, 16 - asrs r1, 16 - lsls r0, r1, 1 - add r0, sp - ldrh r0, [r0] - strh r0, [r2, 0x38] - adds r1, 0x1 - lsls r1, 16 - lsls r0, r4, 16 - movs r3, 0xA0 - lsls r3, 13 - adds r0, r3 - lsrs r4, r0, 16 - lsrs r5, r1, 16 - asrs r1, 16 - cmp r1, 0x7 - ble _0814963C - ldrh r0, [r2, 0x3A] - adds r0, 0x1 - strh r0, [r2, 0x3A] - ldrh r0, [r6, 0x8] - adds r0, 0x1 - strh r0, [r6, 0x8] - movs r0, 0 - add sp, 0x10 - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8149628 - - thumb_func_start sub_814969C -sub_814969C: @ 814969C - push {r4,lr} - adds r4, r0, 0 - ldr r2, =sTransitionStructPtr - ldr r1, [r2] - ldrb r0, [r1] - movs r0, 0 - strb r0, [r1] - ldr r0, [r2] - movs r1, 0x20 - ldrsh r0, [r0, r1] - cmp r0, 0x7 - ble _081496C6 - movs r0, 0x1 - negs r0, r0 - ldr r2, =0x00007fff - movs r1, 0x10 - bl BlendPalettes - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_081496C6: - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_814969C - - thumb_func_start sub_81496D8 -sub_81496D8: @ 81496D8 - push {r4-r6,lr} - adds r6, r0, 0 - ldr r4, =sTransitionStructPtr - ldr r0, [r4] - ldrb r1, [r0] - movs r5, 0 - strb r5, [r0] - ldr r1, =0x040000b0 - ldrh r2, [r1, 0xA] - ldr r0, =0x0000c5ff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r2, [r1, 0xA] - ldr r0, =0x00007fff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r0, [r1, 0xA] - movs r0, 0 - bl SetVBlankCallback - movs r0, 0 - bl SetHBlankCallback - ldr r1, [r4] - movs r0, 0xF0 - strh r0, [r1, 0x6] - strh r5, [r1, 0x12] - movs r0, 0xFF - strh r0, [r1, 0xE] - movs r0, 0x3F - strh r0, [r1, 0x2] - ldr r0, =sub_8149804 - bl SetVBlankCallback - ldrh r0, [r6, 0x8] - adds r0, 0x1 - strh r0, [r6, 0x8] - movs r0, 0 - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81496D8 - - thumb_func_start sub_8149740 -sub_8149740: @ 8149740 - push {lr} - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - ldrh r0, [r1, 0x12] - adds r0, 0x1 - strh r0, [r1, 0x12] - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x10 - bls _08149766 - bl sub_8149F84 - ldr r0, =Phase2Task_WhiteFade - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_08149766: - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_8149740 - - thumb_func_start sub_8149774 -sub_8149774: @ 8149774 - push {r4,lr} - ldr r4, =0x040000b0 - ldrh r1, [r4, 0xA] - ldr r0, =0x0000c5ff - ands r0, r1 - strh r0, [r4, 0xA] - ldrh r1, [r4, 0xA] - ldr r0, =0x00007fff - ands r0, r1 - strh r0, [r4, 0xA] - ldrh r0, [r4, 0xA] - bl VBlankCB_BattleTransition - ldr r2, =0x04000050 - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - ldrh r0, [r1, 0xE] - strh r0, [r2] - subs r2, 0x8 - ldrh r0, [r1, 0x2] - strh r0, [r2] - adds r2, 0x2 - ldrh r0, [r1, 0x4] - strh r0, [r2] - subs r2, 0x6 - ldrh r0, [r1, 0x8] - strh r0, [r2] - ldrb r0, [r1] - cmp r0, 0 - beq _081497C4 - ldr r1, =0x040000d4 - ldr r0, =gUnknown_02038C28 - str r0, [r1] - movs r2, 0xF0 - lsls r2, 3 - adds r0, r2 - str r0, [r1, 0x4] - ldr r0, =0x80000140 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] -_081497C4: - ldr r0, =gUnknown_020394E8 - str r0, [r4] - ldr r0, =0x04000040 - str r0, [r4, 0x4] - ldr r0, =0xa2400001 - str r0, [r4, 0x8] - ldr r0, [r4, 0x8] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8149774 - - thumb_func_start sub_8149804 -sub_8149804: @ 8149804 - push {lr} - bl VBlankCB_BattleTransition - ldr r1, =0x04000054 - ldr r0, =sTransitionStructPtr - ldr r2, [r0] - ldrh r0, [r2, 0x12] - strh r0, [r1] - subs r1, 0x4 - ldrh r0, [r2, 0xE] - strh r0, [r1] - subs r1, 0x8 - ldrh r0, [r2, 0x2] - strh r0, [r1] - adds r1, 0x2 - ldrh r0, [r2, 0x4] - strh r0, [r1] - subs r1, 0xA - ldrh r0, [r2, 0x6] - strh r0, [r1] - adds r1, 0x4 - ldrh r0, [r2, 0x8] - strh r0, [r1] - pop {r0} - bx r0 - .pool - thumb_func_end sub_8149804 - - thumb_func_start sub_8149840 -sub_8149840: @ 8149840 - ldr r2, =0x04000054 - ldr r1, =gUnknown_02038C28 - ldr r0, =0x04000006 - ldrh r0, [r0] - lsls r0, 1 - movs r3, 0xF0 - lsls r3, 3 - adds r1, r3 - adds r0, r1 - ldrh r0, [r0] - strh r0, [r2] - bx lr - .pool - thumb_func_end sub_8149840 - - thumb_func_start sub_8149864 -sub_8149864: @ 8149864 - push {r4-r6,lr} - adds r3, r0, 0 - ldrh r1, [r3, 0x38] - movs r2, 0x38 - ldrsh r0, [r3, r2] - cmp r0, 0 - beq _08149890 - subs r0, r1, 0x1 - strh r0, [r3, 0x38] - movs r1, 0x3A - ldrsh r0, [r3, r1] - cmp r0, 0 - beq _0814994C - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - ldrb r0, [r1] - movs r0, 0x1 - strb r0, [r1] - b _0814994C - .pool -_08149890: - movs r2, 0x22 - ldrsh r1, [r3, r2] - lsls r1, 1 - ldr r0, =gUnknown_02038C28 - adds r6, r1, r0 - movs r2, 0xA0 - lsls r2, 1 - adds r0, r2 - adds r5, r1, r0 - movs r4, 0 -_081498A4: - lsls r1, r4, 1 - adds r2, r1, r6 - ldrh r0, [r3, 0x2E] - lsls r0, 16 - asrs r0, 24 - strh r0, [r2] - adds r1, r5 - ldrh r0, [r3, 0x20] - lsls r0, 24 - lsrs r0, 24 - strh r0, [r1] - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x13 - bls _081498A4 - movs r1, 0x20 - ldrsh r0, [r3, r1] - ldrh r2, [r3, 0x20] - cmp r0, 0 - bne _081498DE - movs r0, 0x2E - ldrsh r1, [r3, r0] - movs r0, 0x80 - lsls r0, 5 - cmp r1, r0 - bne _081498DE - movs r0, 0x1 - strh r0, [r3, 0x30] -_081498DE: - adds r1, r2, 0 - subs r1, 0x10 - strh r1, [r3, 0x20] - ldrh r0, [r3, 0x2E] - adds r0, 0x80 - strh r0, [r3, 0x2E] - lsls r1, 16 - cmp r1, 0 - bge _081498F4 - movs r0, 0 - strh r0, [r3, 0x20] -_081498F4: - movs r1, 0x2E - ldrsh r0, [r3, r1] - movs r1, 0x80 - lsls r1, 5 - cmp r0, r1 - ble _08149902 - strh r1, [r3, 0x2E] -_08149902: - movs r2, 0x3A - ldrsh r0, [r3, r2] - cmp r0, 0 - beq _08149914 - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - ldrb r0, [r1] - movs r0, 0x1 - strb r0, [r1] -_08149914: - movs r1, 0x30 - ldrsh r0, [r3, r1] - cmp r0, 0 - beq _0814994C - movs r2, 0x3A - ldrsh r0, [r3, r2] - ldr r2, =sTransitionStructPtr - cmp r0, 0 - beq _0814993E - ldr r0, [r2] - movs r1, 0x20 - ldrsh r0, [r0, r1] - cmp r0, 0x6 - ble _0814994C - ldrh r0, [r3, 0x32] - adds r1, r0, 0x1 - strh r1, [r3, 0x32] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x7 - ble _0814994C -_0814993E: - ldr r1, [r2] - ldrh r0, [r1, 0x20] - adds r0, 0x1 - strh r0, [r1, 0x20] - adds r0, r3, 0 - bl DestroySprite -_0814994C: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8149864 - - thumb_func_start Phase2Task_GridSquares -Phase2Task_GridSquares: @ 814995C - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =sUnknown_085C8DB0 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_0814996E: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _0814996E - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_GridSquares - - thumb_func_start sub_8149994 -sub_8149994: @ 8149994 - push {r4,lr} - sub sp, 0xC - adds r4, r0, 0 - add r0, sp, 0x4 - add r1, sp, 0x8 - bl sub_8149F58 - ldr r0, =sShrinkingBoxTileset - ldr r1, [sp, 0x8] - movs r2, 0x10 - bl CpuSet - mov r1, sp - movs r2, 0xF0 - lsls r2, 8 - adds r0, r2, 0 - strh r0, [r1] - ldr r1, [sp, 0x4] - ldr r2, =0x01000400 - mov r0, sp - bl CpuSet - ldr r0, =gFieldEffectObjectPalette10 - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - add sp, 0xC - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8149994 - - thumb_func_start sub_81499E8 -sub_81499E8: @ 81499E8 - push {r4,lr} - sub sp, 0x4 - adds r4, r0, 0 - movs r1, 0xA - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _08149A2A - mov r0, sp - bl sub_8149F40 - movs r0, 0x3 - strh r0, [r4, 0xA] - ldrh r0, [r4, 0xC] - adds r0, 0x1 - strh r0, [r4, 0xC] - movs r1, 0xC - ldrsh r0, [r4, r1] - lsls r0, 5 - ldr r1, =sShrinkingBoxTileset - adds r0, r1 - ldr r1, [sp] - movs r2, 0x10 - bl CpuSet - movs r1, 0xC - ldrsh r0, [r4, r1] - cmp r0, 0xD - ble _08149A2A - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0x10 - strh r0, [r4, 0xA] -_08149A2A: - ldrh r0, [r4, 0xA] - subs r0, 0x1 - strh r0, [r4, 0xA] - movs r0, 0 - add sp, 0x4 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81499E8 - - thumb_func_start sub_8149A40 -sub_8149A40: @ 8149A40 - push {lr} - ldrh r1, [r0, 0xA] - subs r1, 0x1 - strh r1, [r0, 0xA] - lsls r1, 16 - cmp r1, 0 - bne _08149A60 - bl sub_8149F84 - ldr r0, =Phase2Task_GridSquares - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_08149A60: - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_8149A40 - - thumb_func_start Phase2Task_Shards -Phase2Task_Shards: @ 8149A6C - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =sPhase2_Shards_Funcs - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_08149A7E: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _08149A7E - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_Shards - - thumb_func_start sub_8149AA4 -sub_8149AA4: @ 8149AA4 - push {r4,r5,lr} - adds r5, r0, 0 - bl sub_8149F08 - bl dp12_8087EA4 - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - movs r2, 0 - movs r0, 0x3F - strh r0, [r1, 0x2] - strh r2, [r1, 0x4] - movs r0, 0xA0 - strh r0, [r1, 0x8] - movs r1, 0 - ldr r2, =gUnknown_02038C28 - movs r3, 0xF0 - adds r4, r2, 0 -_08149AC8: - lsls r0, r1, 1 - adds r0, r2 - strh r3, [r0] - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, 0x9F - bls _08149AC8 - movs r0, 0xF0 - lsls r0, 3 - adds r1, r4, r0 - adds r0, r4, 0 - movs r2, 0xA0 - bl CpuSet - ldr r0, =sub_8149CE8 - bl SetVBlankCallback - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] - movs r0, 0x1 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8149AA4 - - thumb_func_start sub_8149B08 -sub_8149B08: @ 8149B08 - push {r4-r6,lr} - mov r6, r8 - push {r6} - sub sp, 0xC - mov r8, r0 - ldr r0, =sTransitionStructPtr - ldr r0, [r0] - adds r0, 0x24 - ldr r6, =sUnknown_085C8DD0 - mov r2, r8 - movs r3, 0xA - ldrsh r1, [r2, r3] - lsls r4, r1, 2 - adds r4, r1 - lsls r4, 1 - adds r1, r4, r6 - movs r5, 0 - ldrsh r1, [r1, r5] - adds r2, r6, 0x2 - adds r2, r4, r2 - movs r3, 0 - ldrsh r2, [r2, r3] - adds r3, r6, 0x4 - adds r3, r4, r3 - movs r5, 0 - ldrsh r3, [r3, r5] - adds r5, r6, 0x6 - adds r4, r5 - movs r5, 0 - ldrsh r4, [r4, r5] - str r4, [sp] - movs r4, 0x1 - str r4, [sp, 0x4] - str r4, [sp, 0x8] - bl sub_814A1AC - mov r0, r8 - movs r2, 0xA - ldrsh r1, [r0, r2] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 1 - adds r6, 0x8 - adds r0, r6 - ldrh r0, [r0] - mov r3, r8 - strh r0, [r3, 0xC] - ldrh r0, [r3, 0x8] - adds r0, 0x1 - strh r0, [r3, 0x8] - movs r0, 0x1 - add sp, 0xC - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8149B08 - - thumb_func_start sub_8149B84 -sub_8149B84: @ 8149B84 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - adds r6, r0, 0 - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - ldrb r0, [r1] - movs r0, 0 - strb r0, [r1] - mov r8, r0 - movs r7, 0 - ldr r0, =gUnknown_02038C28 - mov r9, r0 -_08149BA0: - ldr r1, =gUnknown_02038C28 - ldr r0, =sTransitionStructPtr - ldr r2, [r0] - movs r3, 0x2A - ldrsh r0, [r2, r3] - lsls r0, 1 - adds r0, r1 - ldrh r0, [r0] - lsrs r3, r0, 8 - movs r5, 0xFF - ands r5, r0 - movs r4, 0xC - ldrsh r0, [r6, r4] - cmp r0, 0 - bne _08149BDC - movs r1, 0x28 - ldrsh r0, [r2, r1] - cmp r3, r0 - bge _08149BC8 - ldrh r3, [r2, 0x28] -_08149BC8: - lsls r0, r3, 16 - lsls r1, r5, 16 - cmp r0, r1 - ble _08149BF4 - lsrs r3, r1, 16 - b _08149BF4 - .pool -_08149BDC: - lsls r0, r5, 16 - asrs r0, 16 - movs r4, 0x28 - ldrsh r1, [r2, r4] - cmp r0, r1 - ble _08149BEA - ldrh r5, [r2, 0x28] -_08149BEA: - lsls r0, r5, 16 - lsls r1, r3, 16 - cmp r0, r1 - bgt _08149BF4 - lsrs r5, r1, 16 -_08149BF4: - ldr r0, =sTransitionStructPtr - ldr r4, [r0] - movs r0, 0x2A - ldrsh r2, [r4, r0] - lsls r2, 1 - add r2, r9 - lsls r1, r3, 16 - asrs r1, 8 - lsls r0, r5, 16 - asrs r0, 16 - orrs r0, r1 - strh r0, [r2] - cmp r7, 0 - beq _08149C1C - ldrh r0, [r6, 0x8] - adds r0, 0x1 - strh r0, [r6, 0x8] - b _08149C40 - .pool -_08149C1C: - adds r0, r4, 0 - adds r0, 0x24 - movs r1, 0x1 - movs r2, 0x1 - bl sub_814A228 - lsls r0, 24 - lsrs r7, r0, 24 - mov r1, r8 - lsls r0, r1, 16 - movs r3, 0x80 - lsls r3, 9 - adds r0, r3 - lsrs r4, r0, 16 - mov r8, r4 - asrs r0, 16 - cmp r0, 0xF - ble _08149BA0 -_08149C40: - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - ldrb r0, [r1] - adds r0, 0x1 - ldrb r2, [r1] - strb r0, [r1] - movs r0, 0 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8149B84 - - thumb_func_start sub_8149C60 -sub_8149C60: @ 8149C60 - push {lr} - adds r2, r0, 0 - ldrh r0, [r2, 0xA] - adds r0, 0x1 - strh r0, [r2, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x6 - ble _08149CAC - ldr r1, =0x040000b0 - ldrh r2, [r1, 0xA] - ldr r0, =0x0000c5ff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r2, [r1, 0xA] - ldr r0, =0x00007fff - ands r0, r2 - strh r0, [r1, 0xA] - ldrh r0, [r1, 0xA] - bl sub_8149F84 - ldr r0, =Phase2Task_Shards - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask - movs r0, 0 - b _08149CC4 - .pool -_08149CAC: - ldrh r0, [r2, 0x8] - adds r0, 0x1 - strh r0, [r2, 0x8] - ldr r1, =sUnknown_085C8E16 - movs r3, 0xA - ldrsh r0, [r2, r3] - subs r0, 0x1 - lsls r0, 1 - adds r0, r1 - ldrh r0, [r0] - strh r0, [r2, 0xE] - movs r0, 0x1 -_08149CC4: - pop {r1} - bx r1 - .pool - thumb_func_end sub_8149C60 - - thumb_func_start sub_8149CCC -sub_8149CCC: @ 8149CCC - push {lr} - adds r1, r0, 0 - ldrh r0, [r1, 0xE] - subs r0, 0x1 - strh r0, [r1, 0xE] - lsls r0, 16 - cmp r0, 0 - beq _08149CE0 - movs r0, 0 - b _08149CE4 -_08149CE0: - movs r0, 0x1 - strh r0, [r1, 0x8] -_08149CE4: - pop {r1} - bx r1 - thumb_func_end sub_8149CCC - - thumb_func_start sub_8149CE8 -sub_8149CE8: @ 8149CE8 - push {r4,lr} - ldr r4, =0x040000b0 - ldrh r1, [r4, 0xA] - ldr r0, =0x0000c5ff - ands r0, r1 - strh r0, [r4, 0xA] - ldrh r1, [r4, 0xA] - ldr r0, =0x00007fff - ands r0, r1 - strh r0, [r4, 0xA] - ldrh r0, [r4, 0xA] - bl VBlankCB_BattleTransition - ldr r3, =sTransitionStructPtr - ldr r0, [r3] - ldrb r0, [r0] - cmp r0, 0 - beq _08149D20 - ldr r1, =0x040000d4 - ldr r0, =gUnknown_02038C28 - str r0, [r1] - movs r2, 0xF0 - lsls r2, 3 - adds r0, r2 - str r0, [r1, 0x4] - ldr r0, =0x800000a0 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] -_08149D20: - ldr r2, =0x04000048 - ldr r1, [r3] - ldrh r0, [r1, 0x2] - strh r0, [r2] - adds r2, 0x2 - ldrh r0, [r1, 0x4] - strh r0, [r2] - subs r2, 0x6 - ldrh r0, [r1, 0x8] - strh r0, [r2] - subs r2, 0x4 - ldr r0, =gUnknown_02038C28 - movs r1, 0xF0 - lsls r1, 3 - adds r0, r1 - ldrh r1, [r0] - strh r1, [r2] - str r0, [r4] - str r2, [r4, 0x4] - ldr r0, =0xa2400001 - str r0, [r4, 0x8] - ldr r0, [r4, 0x8] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8149CE8 - - thumb_func_start CreatePhase1Task -CreatePhase1Task: @ 8149D78 - push {r4-r6,lr} - mov r6, r8 - push {r6} - sub sp, 0x4 - mov r8, r0 - adds r4, r1, 0 - adds r5, r2, 0 - adds r6, r3, 0 - ldr r3, [sp, 0x18] - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - lsls r4, 16 - lsrs r4, 16 - lsls r5, 16 - lsrs r5, 16 - lsls r6, 16 - lsrs r6, 16 - lsls r3, 16 - lsrs r3, 16 - ldr r0, =sub_8149DFC - movs r1, 0x3 - str r3, [sp] - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - mov r0, r8 - strh r0, [r1, 0xA] - strh r4, [r1, 0xC] - strh r5, [r1, 0xE] - strh r6, [r1, 0x10] - ldr r3, [sp] - strh r3, [r1, 0x12] - strh r0, [r1, 0x14] - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end CreatePhase1Task - - thumb_func_start IsPhase1Done -IsPhase1Done: @ 8149DDC - push {lr} - ldr r0, =sub_8149DFC - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xFF - beq _08149DF4 - movs r0, 0 - b _08149DF6 - .pool -_08149DF4: - movs r0, 0x1 -_08149DF6: - pop {r1} - bx r1 - thumb_func_end IsPhase1Done - - thumb_func_start sub_8149DFC -sub_8149DFC: @ 8149DFC - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =sPhase1_TransitionAll_Funcs - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_08149E0E: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _08149E0E - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8149DFC - - thumb_func_start sub_8149E34 -sub_8149E34: @ 8149E34 - push {r4,lr} - adds r4, r0, 0 - ldrh r1, [r4, 0x14] - movs r2, 0x14 - ldrsh r0, [r4, r2] - cmp r0, 0 - beq _08149E4C - subs r0, r1, 0x1 - strh r0, [r4, 0x14] - lsls r0, 16 - cmp r0, 0 - bne _08149E70 -_08149E4C: - ldrh r0, [r4, 0xA] - strh r0, [r4, 0x14] - ldrh r0, [r4, 0x10] - ldrh r1, [r4, 0x16] - adds r0, r1 - strh r0, [r4, 0x16] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x10 - ble _08149E64 - movs r0, 0x10 - strh r0, [r4, 0x16] -_08149E64: - movs r0, 0x1 - negs r0, r0 - ldrb r1, [r4, 0x16] - ldr r2, =0x00002d6b - bl BlendPalettes -_08149E70: - movs r2, 0x16 - ldrsh r0, [r4, r2] - cmp r0, 0xF - ble _08149E82 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - ldrh r0, [r4, 0xC] - strh r0, [r4, 0x14] -_08149E82: - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8149E34 - - thumb_func_start sub_8149E90 -sub_8149E90: @ 8149E90 - push {r4,lr} - adds r4, r0, 0 - ldrh r1, [r4, 0x14] - movs r2, 0x14 - ldrsh r0, [r4, r2] - cmp r0, 0 - beq _08149EA8 - subs r0, r1, 0x1 - strh r0, [r4, 0x14] - lsls r0, 16 - cmp r0, 0 - bne _08149ECA -_08149EA8: - ldrh r0, [r4, 0xC] - strh r0, [r4, 0x14] - ldrh r0, [r4, 0x16] - ldrh r1, [r4, 0x12] - subs r0, r1 - strh r0, [r4, 0x16] - lsls r0, 16 - cmp r0, 0 - bge _08149EBE - movs r0, 0 - strh r0, [r4, 0x16] -_08149EBE: - movs r0, 0x1 - negs r0, r0 - ldrb r1, [r4, 0x16] - ldr r2, =0x00002d6b - bl BlendPalettes -_08149ECA: - movs r0, 0x16 - ldrsh r1, [r4, r0] - cmp r1, 0 - bne _08149EFE - ldrh r0, [r4, 0xE] - subs r0, 0x1 - strh r0, [r4, 0xE] - lsls r0, 16 - cmp r0, 0 - bne _08149EF8 - ldr r0, =sub_8149DFC - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask - b _08149EFE - .pool -_08149EF8: - ldrh r0, [r4, 0xA] - strh r0, [r4, 0x14] - strh r1, [r4, 0x8] -_08149EFE: - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8149E90 - - thumb_func_start sub_8149F08 -sub_8149F08: @ 8149F08 - push {r4,lr} - ldr r4, =sTransitionStructPtr - ldr r0, [r4] - movs r1, 0 - movs r2, 0x3C - bl memset - ldr r1, [r4] - adds r0, r1, 0 - adds r0, 0x14 - adds r1, 0x16 - bl sub_8089C08 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8149F08 - - thumb_func_start VBlankCB_BattleTransition -VBlankCB_BattleTransition: @ 8149F2C - push {lr} - bl LoadOam - bl ProcessSpriteCopyRequests - bl TransferPlttBuffer - pop {r0} - bx r0 - thumb_func_end VBlankCB_BattleTransition - - thumb_func_start sub_8149F40 -sub_8149F40: @ 8149F40 - ldr r1, =0x04000008 - ldrh r1, [r1] - lsrs r1, 2 - lsls r1, 30 - lsrs r1, 16 - movs r2, 0xC0 - lsls r2, 19 - adds r1, r2 - str r1, [r0] - bx lr - .pool - thumb_func_end sub_8149F40 - - thumb_func_start sub_8149F58 -sub_8149F58: @ 8149F58 - push {r4,lr} - ldr r3, =0x04000008 - ldrh r2, [r3] - lsrs r2, 8 - ldrh r3, [r3] - lsrs r3, 2 - lsls r2, 27 - lsrs r2, 16 - lsls r3, 30 - lsrs r3, 16 - movs r4, 0xC0 - lsls r4, 19 - adds r2, r4 - str r2, [r0] - adds r3, r4 - str r3, [r1] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8149F58 - - thumb_func_start sub_8149F84 -sub_8149F84: @ 8149F84 - push {lr} - movs r0, 0x1 - negs r0, r0 - movs r1, 0x10 - movs r2, 0 - bl BlendPalettes - pop {r0} - bx r0 - thumb_func_end sub_8149F84 - - thumb_func_start sub_8149F98 -sub_8149F98: @ 8149F98 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - mov r10, r0 - ldr r0, [sp, 0x20] - ldr r4, [sp, 0x24] - lsls r1, 16 - lsrs r7, r1, 16 - lsls r2, 16 - lsrs r2, 16 - lsls r3, 16 - lsrs r3, 16 - lsls r0, 16 - lsrs r1, r0, 16 - lsls r4, 16 - movs r6, 0 - lsrs r5, r4, 16 - cmp r4, 0 - ble _0814A000 - lsls r0, r7, 16 - asrs r0, 16 - mov r9, r0 - lsls r1, 16 - mov r8, r1 - lsls r0, r3, 16 - asrs r7, r0, 16 -_08149FD0: - lsls r4, r2, 16 - asrs r4, 16 - movs r0, 0xFF - ands r0, r4 - mov r2, r8 - asrs r1, r2, 16 - bl Sin - lsls r1, r6, 1 - add r1, r10 - add r0, r9 - strh r0, [r1] - lsls r1, r5, 16 - ldr r0, =0xffff0000 - adds r1, r0 - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - adds r4, r7 - lsls r4, 16 - lsrs r2, r4, 16 - lsrs r5, r1, 16 - cmp r1, 0 - bgt _08149FD0 -_0814A000: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8149F98 - - thumb_func_start sub_814A014 -sub_814A014: @ 814A014 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x14 - mov r9, r0 - adds r5, r2, 0 - adds r4, r3, 0 - lsls r1, 16 - lsrs r1, 16 - str r1, [sp] - lsls r5, 16 - lsrs r5, 16 - lsls r4, 16 - lsrs r4, 16 - movs r2, 0xA0 - lsls r2, 1 - movs r1, 0xA - bl memset - movs r1, 0 - lsls r4, 16 - asrs r4, 16 - str r4, [sp, 0x4] - lsls r5, 16 - asrs r5, 16 - str r5, [sp, 0x8] -_0814A04C: - lsls r5, r1, 16 - asrs r0, r5, 16 - mov r10, r0 - ldr r1, [sp, 0x4] - bl Sin - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - mov r0, r10 - ldr r1, [sp, 0x4] - bl Cos - ldr r2, [sp] - lsls r1, r2, 16 - asrs r1, 16 - lsls r4, 16 - asrs r4, 16 - subs r2, r1, r4 - lsls r2, 16 - adds r1, r4 - lsls r1, 16 - lsrs r6, r1, 16 - lsls r0, 16 - asrs r0, 16 - ldr r3, [sp, 0x8] - subs r1, r3, r0 - lsls r1, 16 - lsrs r7, r1, 16 - adds r0, r3, r0 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - lsrs r1, r2, 16 - str r5, [sp, 0x10] - cmp r2, 0 - bge _0814A098 - movs r1, 0 -_0814A098: - lsls r0, r6, 16 - asrs r0, 16 - cmp r0, 0xF0 - ble _0814A0A2 - movs r6, 0xF0 -_0814A0A2: - lsls r0, r7, 16 - cmp r0, 0 - bge _0814A0AA - movs r7, 0 -_0814A0AA: - mov r2, r8 - lsls r0, r2, 16 - asrs r0, 16 - cmp r0, 0x9F - ble _0814A0B8 - movs r3, 0x9F - mov r8, r3 -_0814A0B8: - lsls r0, r1, 24 - lsrs r0, 16 - orrs r6, r0 - lsls r0, r7, 16 - asrs r0, 16 - str r0, [sp, 0xC] - lsls r0, 1 - add r0, r9 - strh r6, [r0] - mov r0, r8 - lsls r4, r0, 16 - asrs r0, r4, 15 - add r0, r9 - strh r6, [r0] - mov r0, r10 - adds r0, 0x1 - lsls r0, 16 - asrs r0, 16 - ldr r1, [sp, 0x4] - bl Cos - lsls r0, 16 - asrs r0, 16 - ldr r2, [sp, 0x8] - subs r1, r2, r0 - lsls r1, 16 - adds r0, r2, r0 - lsls r0, 16 - lsrs r2, r0, 16 - lsrs r3, r1, 16 - cmp r1, 0 - bge _0814A0FA - movs r3, 0 -_0814A0FA: - lsls r0, r2, 16 - asrs r0, 16 - cmp r0, 0x9F - ble _0814A104 - movs r2, 0x9F -_0814A104: - lsls r0, r3, 16 - asrs r1, r0, 16 - adds r3, r0, 0 - lsls r5, r2, 16 - ldr r0, [sp, 0xC] - cmp r0, r1 - ble _0814A128 - adds r2, r1, 0 -_0814A114: - lsls r1, r7, 16 - ldr r0, =0xffff0000 - adds r1, r0 - asrs r0, r1, 15 - add r0, r9 - strh r6, [r0] - lsrs r7, r1, 16 - asrs r1, 16 - cmp r1, r2 - bgt _0814A114 -_0814A128: - lsls r1, r7, 16 - asrs r0, r3, 16 - cmp r1, r3 - bge _0814A146 - adds r2, r0, 0 -_0814A132: - movs r3, 0x80 - lsls r3, 9 - adds r0, r1, r3 - asrs r1, r0, 15 - add r1, r9 - strh r6, [r1] - adds r1, r0, 0 - asrs r0, r1, 16 - cmp r0, r2 - blt _0814A132 -_0814A146: - asrs r0, r5, 16 - cmp r4, r5 - ble _0814A164 - adds r1, r0, 0 -_0814A14E: - ldr r2, =0xffff0000 - adds r0, r4, r2 - lsrs r3, r0, 16 - mov r8, r3 - asrs r0, 15 - add r0, r9 - strh r6, [r0] - lsls r4, r3, 16 - asrs r0, r4, 16 - cmp r0, r1 - bgt _0814A14E -_0814A164: - mov r0, r8 - lsls r4, r0, 16 - asrs r0, r5, 16 - cmp r4, r5 - bge _0814A184 - adds r2, r0, 0 -_0814A170: - movs r1, 0x80 - lsls r1, 9 - adds r0, r4, r1 - asrs r1, r0, 15 - add r1, r9 - strh r6, [r1] - adds r4, r0, 0 - asrs r0, r4, 16 - cmp r0, r2 - blt _0814A170 -_0814A184: - ldr r2, [sp, 0x10] - movs r3, 0x80 - lsls r3, 9 - adds r0, r2, r3 - lsrs r1, r0, 16 - asrs r0, 16 - cmp r0, 0x3F - bgt _0814A196 - b _0814A04C -_0814A196: - add sp, 0x14 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_814A014 - - thumb_func_start sub_814A1AC -sub_814A1AC: @ 814A1AC - push {r4-r7,lr} - adds r6, r0, 0 - ldr r0, [sp, 0x14] - ldr r5, [sp, 0x18] - ldr r4, [sp, 0x1C] - lsls r1, 16 - lsrs r1, 16 - lsls r2, 16 - lsrs r2, 16 - lsls r3, 16 - lsrs r3, 16 - lsls r0, 16 - lsrs r0, 16 - adds r7, r0, 0 - lsls r5, 16 - lsrs r5, 16 - lsls r4, 16 - lsrs r4, 16 - strh r1, [r6] - strh r2, [r6, 0x2] - strh r1, [r6, 0x4] - strh r2, [r6, 0x6] - strh r3, [r6, 0x8] - strh r7, [r6, 0xA] - strh r5, [r6, 0xC] - strh r4, [r6, 0xE] - lsls r3, 16 - asrs r3, 16 - lsls r1, 16 - asrs r1, 16 - subs r3, r1 - strh r3, [r6, 0x10] - lsls r0, r3, 16 - cmp r0, 0 - bge _0814A1FE - negs r0, r3 - strh r0, [r6, 0x10] - lsls r0, r5, 16 - asrs r0, 16 - negs r0, r0 - strh r0, [r6, 0xC] -_0814A1FE: - lsls r0, r7, 16 - asrs r0, 16 - lsls r1, r2, 16 - asrs r1, 16 - subs r1, r0, r1 - strh r1, [r6, 0x12] - lsls r0, r1, 16 - cmp r0, 0 - bge _0814A21C - negs r0, r1 - strh r0, [r6, 0x12] - lsls r0, r4, 16 - asrs r0, 16 - negs r0, r0 - strh r0, [r6, 0xE] -_0814A21C: - movs r0, 0 - strh r0, [r6, 0x14] - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_814A1AC - - thumb_func_start sub_814A228 -sub_814A228: @ 814A228 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - adds r3, r0, 0 - lsls r1, 24 - lsrs r1, 24 - mov r9, r1 - lsls r2, 24 - lsrs r2, 24 - mov r10, r2 - ldrh r0, [r3, 0x10] - mov r8, r0 - movs r1, 0x10 - ldrsh r6, [r3, r1] - ldrh r2, [r3, 0x12] - mov r12, r2 - movs r4, 0x12 - ldrsh r5, [r3, r4] - cmp r6, r5 - ble _0814A278 - ldrh r0, [r3, 0xC] - ldrh r2, [r3, 0x4] - adds r1, r0, r2 - strh r1, [r3, 0x4] - ldrh r2, [r3, 0x14] - add r2, r12 - strh r2, [r3, 0x14] - lsls r1, r2, 16 - asrs r1, 16 - adds r4, r0, 0 - ldrh r7, [r3, 0xE] - cmp r1, r6 - ble _0814A29E - ldrh r1, [r3, 0x6] - adds r0, r7, r1 - strh r0, [r3, 0x6] - mov r1, r8 - b _0814A29A -_0814A278: - ldrh r0, [r3, 0xE] - ldrh r2, [r3, 0x6] - adds r1, r0, r2 - strh r1, [r3, 0x6] - ldrh r2, [r3, 0x14] - add r2, r8 - strh r2, [r3, 0x14] - lsls r1, r2, 16 - asrs r1, 16 - ldrh r4, [r3, 0xC] - adds r7, r0, 0 - cmp r1, r5 - ble _0814A29E - ldrh r1, [r3, 0x4] - adds r0, r4, r1 - strh r0, [r3, 0x4] - mov r1, r12 -_0814A29A: - subs r0, r2, r1 - strh r0, [r3, 0x14] -_0814A29E: - movs r5, 0 - lsls r0, r4, 16 - asrs r2, r0, 16 - cmp r2, 0 - ble _0814A2B6 - movs r4, 0x4 - ldrsh r1, [r3, r4] - movs r4, 0x8 - ldrsh r0, [r3, r4] - ldrh r4, [r3, 0x8] - cmp r1, r0 - bge _0814A2C8 -_0814A2B6: - cmp r2, 0 - bge _0814A2D6 - movs r0, 0x4 - ldrsh r1, [r3, r0] - movs r2, 0x8 - ldrsh r0, [r3, r2] - ldrh r4, [r3, 0x8] - cmp r1, r0 - bgt _0814A2D6 -_0814A2C8: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - mov r0, r9 - cmp r0, 0 - beq _0814A2D6 - strh r4, [r3, 0x4] -_0814A2D6: - lsls r0, r7, 16 - asrs r2, r0, 16 - cmp r2, 0 - ble _0814A2EC - movs r4, 0x6 - ldrsh r1, [r3, r4] - movs r4, 0xA - ldrsh r0, [r3, r4] - ldrh r4, [r3, 0xA] - cmp r1, r0 - bge _0814A2FE -_0814A2EC: - cmp r2, 0 - bge _0814A30C - movs r0, 0x6 - ldrsh r1, [r3, r0] - movs r2, 0xA - ldrsh r0, [r3, r2] - ldrh r4, [r3, 0xA] - cmp r1, r0 - bgt _0814A30C -_0814A2FE: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - mov r0, r10 - cmp r0, 0 - beq _0814A30C - strh r4, [r3, 0x6] -_0814A30C: - cmp r5, 0x2 - beq _0814A314 - movs r0, 0 - b _0814A316 -_0814A314: - movs r0, 0x1 -_0814A316: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_814A228 - - thumb_func_start sub_814A324 -sub_814A324: @ 814A324 - push {r4,lr} - sub sp, 0xC - adds r4, r0, 0 - bl sub_814669C - add r0, sp, 0x4 - add r1, sp, 0x8 - bl sub_8149F58 - mov r1, sp - movs r0, 0 - strh r0, [r1] - ldr r1, [sp, 0x4] - ldr r2, =0x01000400 - mov r0, sp - bl CpuSet - ldr r0, =gUnknown_085C7C00 - ldr r1, [sp, 0x8] - bl LZ77UnCompVram - ldr r0, =gUnknown_085C7BE0 - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - add sp, 0xC - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_814A324 - - thumb_func_start sub_814A374 -sub_814A374: @ 814A374 - push {r4,lr} - sub sp, 0x10 - adds r4, r0, 0 - add r1, sp, 0xC - add r0, sp, 0x8 - bl sub_8149F58 - ldr r0, =gUnknown_085C828C - ldr r1, [sp, 0x8] - bl LZ77UnCompVram - ldr r0, =gUnknown_02038C28 - movs r1, 0x10 - ldrsh r2, [r4, r1] - movs r3, 0x12 - ldrsh r1, [r4, r3] - str r1, [sp] - movs r1, 0xA0 - str r1, [sp, 0x4] - movs r1, 0 - movs r3, 0x84 - bl sub_8149F98 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0x1 - add sp, 0x10 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_814A374 - - thumb_func_start Phase2Task_29 -Phase2Task_29: @ 814A3BC - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_085C99D0 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_0814A3CE: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _0814A3CE - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_29 - - thumb_func_start Phase2Task_30 -Phase2Task_30: @ 814A3F4 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_085C99E8 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_0814A406: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _0814A406 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_30 - - thumb_func_start sub_814A42C -sub_814A42C: @ 814A42C - push {r4-r6,lr} - sub sp, 0xC - adds r4, r0, 0 - bl sub_8149F08 - bl dp12_8087EA4 - movs r1, 0xC0 - lsls r1, 7 - movs r0, 0 - bl ClearGpuRegBits - movs r5, 0 - movs r0, 0x80 - lsls r0, 6 - strh r0, [r4, 0xC] - ldr r0, =0x00007fff - strh r0, [r4, 0xA] - strh r5, [r4, 0x12] - movs r0, 0x10 - strh r0, [r4, 0x14] - movs r0, 0xA0 - lsls r0, 4 - strh r0, [r4, 0x16] - ldr r6, =sTransitionStructPtr - ldr r2, [r6] - ldr r3, =0x00003f41 - strh r3, [r2, 0xE] - ldrh r0, [r4, 0x14] - lsls r0, 8 - ldrh r1, [r4, 0x12] - orrs r0, r1 - strh r0, [r2, 0x10] - ldr r0, =0x04000050 - strh r3, [r0] - ldr r1, =0x04000052 - ldrh r0, [r2, 0x10] - strh r0, [r1] - add r0, sp, 0x4 - add r1, sp, 0x8 - bl sub_8149F58 - mov r0, sp - strh r5, [r0] - ldr r1, [sp, 0x4] - ldr r2, =0x01000400 - bl CpuSet - ldr r0, =gUnknown_085C7C00 - ldr r1, [sp, 0x8] - bl LZ77UnCompVram - ldr r0, =gUnknown_085C7BE0 - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - ldr r0, [r6] - strh r5, [r0, 0x16] - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - add sp, 0xC - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end sub_814A42C - - thumb_func_start sub_814A4D4 -sub_814A4D4: @ 814A4D4 - push {r4,lr} - sub sp, 0x8 - adds r4, r0, 0 - add r1, sp, 0x4 - mov r0, sp - bl sub_8149F58 - ldr r0, =gUnknown_085C828C - ldr r1, [sp] - bl LZ77UnCompVram - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0x1 - add sp, 0x8 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_814A4D4 - - thumb_func_start sub_814A500 -sub_814A500: @ 814A500 - push {r4-r6,lr} - adds r5, r0, 0 - movs r2, 0 - ldr r6, =sub_814A684 - ldr r4, =gUnknown_020393A8 - ldr r3, =sTransitionStructPtr -_0814A50C: - lsls r1, r2, 1 - adds r1, r4 - ldr r0, [r3] - ldrh r0, [r0, 0x16] - strh r0, [r1] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x9F - bls _0814A50C - adds r0, r6, 0 - bl SetVBlankCallback - ldr r0, =sub_814A6CC - bl SetHBlankCallback - movs r0, 0x2 - bl EnableInterrupts - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] - movs r0, 0x1 - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end sub_814A500 - - thumb_func_start sub_814A550 -sub_814A550: @ 814A550 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - adds r4, r0, 0 - ldr r1, =sTransitionStructPtr - ldr r0, [r1] - ldrb r2, [r0] - movs r3, 0 - strb r3, [r0] - ldrh r2, [r4, 0xC] - lsls r0, r2, 16 - asrs r0, 24 - lsls r0, 16 - lsrs r7, r0, 16 - ldrh r6, [r4, 0xA] - movs r0, 0xC0 - lsls r0, 1 - mov r8, r0 - ldrh r0, [r4, 0x16] - subs r0, r6, r0 - strh r0, [r4, 0xA] - movs r5, 0xE - ldrsh r0, [r4, r5] - adds r5, r1, 0 - cmp r0, 0x45 - ble _0814A5A2 - movs r1, 0xC - ldrsh r0, [r4, r1] - ldr r1, =0xfffffe80 - adds r0, r1 - cmp r0, 0 - blt _0814A5A0 - adds r0, r2, r1 - strh r0, [r4, 0xC] - b _0814A5A2 - .pool -_0814A5A0: - strh r3, [r4, 0xC] -_0814A5A2: - movs r2, 0xE - ldrsh r0, [r4, r2] - cmp r0, 0 - blt _0814A5E0 - movs r1, 0x3 - bl __modsi3 - lsls r0, 16 - cmp r0, 0 - bne _0814A5E0 - ldrh r1, [r4, 0x12] - movs r2, 0x12 - ldrsh r0, [r4, r2] - cmp r0, 0xF - bgt _0814A5C6 - adds r0, r1, 0x1 - strh r0, [r4, 0x12] - b _0814A5D4 -_0814A5C6: - ldrh r1, [r4, 0x14] - movs r2, 0x14 - ldrsh r0, [r4, r2] - cmp r0, 0 - ble _0814A5D4 - subs r0, r1, 0x1 - strh r0, [r4, 0x14] -_0814A5D4: - ldr r0, [r5] - ldrh r1, [r4, 0x14] - lsls r1, 8 - ldrh r2, [r4, 0x12] - orrs r1, r2 - strh r1, [r0, 0x10] -_0814A5E0: - movs r5, 0 - lsls r7, 16 -_0814A5E4: - lsrs r0, r6, 8 - asrs r1, r7, 16 - bl Sin - ldr r1, =gUnknown_02038C28 - lsls r2, r5, 1 - adds r2, r1 - ldr r1, =sTransitionStructPtr - ldr r1, [r1] - ldrh r1, [r1, 0x16] - adds r0, r1 - strh r0, [r2] - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - mov r1, r8 - adds r0, r6, r1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r5, 0x9F - bls _0814A5E4 - ldrh r0, [r4, 0xE] - adds r0, 0x1 - strh r0, [r4, 0xE] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x65 - bne _0814A632 - ldrh r0, [r4, 0x10] - adds r0, 0x1 - strh r0, [r4, 0x10] - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade -_0814A632: - movs r2, 0x10 - ldrsh r0, [r4, r2] - cmp r0, 0 - beq _0814A654 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _0814A654 - ldr r0, =Phase2Task_30 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_0814A654: - ldrh r0, [r4, 0x16] - subs r0, 0x11 - strh r0, [r4, 0x16] - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - ldrb r0, [r1] - adds r0, 0x1 - ldrb r2, [r1] - strb r0, [r1] - movs r0, 0 - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_814A550 - - thumb_func_start sub_814A684 -sub_814A684: @ 814A684 - push {lr} - bl VBlankCB_BattleTransition - ldr r2, =0x04000050 - ldr r0, =sTransitionStructPtr - ldr r1, [r0] - ldrh r0, [r1, 0xE] - strh r0, [r2] - adds r2, 0x2 - ldrh r0, [r1, 0x10] - strh r0, [r2] - ldrb r0, [r1] - cmp r0, 0 - beq _0814A6B4 - ldr r1, =0x040000d4 - ldr r0, =gUnknown_02038C28 - str r0, [r1] - movs r2, 0xF0 - lsls r2, 3 - adds r0, r2 - str r0, [r1, 0x4] - ldr r0, =0x800000a0 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] -_0814A6B4: - pop {r0} - bx r0 - .pool - thumb_func_end sub_814A684 - - thumb_func_start sub_814A6CC -sub_814A6CC: @ 814A6CC - ldr r1, =gUnknown_02038C28 - ldr r0, =0x04000006 - ldrh r0, [r0] - lsls r0, 1 - movs r2, 0xF0 - lsls r2, 3 - adds r1, r2 - adds r0, r1 - ldrh r1, [r0] - ldr r0, =0x04000012 - strh r1, [r0] - bx lr - .pool - thumb_func_end sub_814A6CC - - thumb_func_start Phase2Task_31 -Phase2Task_31: @ 814A6F0 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_085C99F8 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_0814A702: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _0814A702 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_31 - - thumb_func_start Phase2Task_33 -Phase2Task_33: @ 814A728 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_085C9A08 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_0814A73A: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _0814A73A - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_33 - - thumb_func_start Phase2Task_32 -Phase2Task_32: @ 814A760 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_085C9A1C - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_0814A772: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _0814A772 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_32 - - thumb_func_start sub_814A798 -sub_814A798: @ 814A798 + thumb_func_start Phase2_31_Func1 +Phase2_31_Func1: @ 814A798 push {r4-r6,lr} mov r6, r8 push {r6} @@ -2702,10 +68,10 @@ sub_814A798: @ 814A798 pop {r1} bx r1 .pool - thumb_func_end sub_814A798 + thumb_func_end Phase2_31_Func1 - thumb_func_start sub_814A828 -sub_814A828: @ 814A828 + thumb_func_start Phase2_31_Func2 +Phase2_31_Func2: @ 814A828 push {r4,r5,lr} sub sp, 0x24 adds r4, r0, 0 @@ -2760,10 +126,10 @@ _0814A88A: pop {r1} bx r1 .pool - thumb_func_end sub_814A828 + thumb_func_end Phase2_31_Func2 - thumb_func_start sub_814A898 -sub_814A898: @ 814A898 + thumb_func_start Phase2_31_Func3 +Phase2_31_Func3: @ 814A898 push {r4-r6,lr} sub sp, 0x10 adds r4, r0, 0 @@ -2858,10 +224,10 @@ _0814A956: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_814A898 + thumb_func_end Phase2_31_Func3 - thumb_func_start sub_814A960 -sub_814A960: @ 814A960 + thumb_func_start Phase2_33_Func1 +Phase2_33_Func1: @ 814A960 push {r4-r6,lr} mov r6, r8 push {r6} @@ -2931,10 +297,10 @@ sub_814A960: @ 814A960 pop {r1} bx r1 .pool - thumb_func_end sub_814A960 + thumb_func_end Phase2_33_Func1 - thumb_func_start sub_814AA04 -sub_814AA04: @ 814AA04 + thumb_func_start Phase2_33_Func2 +Phase2_33_Func2: @ 814AA04 push {r4-r6,lr} sub sp, 0x24 adds r6, r0, 0 @@ -2992,10 +358,10 @@ _0814AA70: pop {r1} bx r1 .pool - thumb_func_end sub_814AA04 + thumb_func_end Phase2_33_Func2 - thumb_func_start sub_814AA84 -sub_814AA84: @ 814AA84 + thumb_func_start Phase2_33_Func3 +Phase2_33_Func3: @ 814AA84 push {r4,lr} adds r4, r0, 0 movs r0, 0xE0 @@ -3018,10 +384,10 @@ sub_814AA84: @ 814AA84 pop {r1} bx r1 .pool - thumb_func_end sub_814AA84 + thumb_func_end Phase2_33_Func3 - thumb_func_start sub_814AAB8 -sub_814AAB8: @ 814AAB8 + thumb_func_start Phase2_33_Func4 +Phase2_33_Func4: @ 814AAB8 push {r4-r7,lr} mov r7, r8 push {r7} @@ -3130,10 +496,10 @@ _0814AB86: pop {r1} bx r1 .pool - thumb_func_end sub_814AAB8 + thumb_func_end Phase2_33_Func4 - thumb_func_start sub_814ABA0 -sub_814ABA0: @ 814ABA0 + thumb_func_start Phase2_31_33_Func5 +Phase2_31_33_Func5: @ 814ABA0 push {r4,lr} sub sp, 0x8 adds r4, r0, 0 @@ -3162,7 +528,7 @@ sub_814ABA0: @ 814ABA0 pop {r4} pop {r1} bx r1 - thumb_func_end sub_814ABA0 + thumb_func_end Phase2_31_33_Func5 thumb_func_start sub_814ABE4 sub_814ABE4: @ 814ABE4 @@ -3203,8 +569,8 @@ _0814AC24: .pool thumb_func_end sub_814ABE4 - thumb_func_start sub_814AC38 -sub_814AC38: @ 814AC38 + thumb_func_start Phase2_32_Func1 +Phase2_32_Func1: @ 814AC38 push {r4-r6,lr} sub sp, 0x10 adds r6, r0, 0 @@ -3318,10 +684,10 @@ _0814AD2E: pop {r1} bx r1 .pool - thumb_func_end sub_814AC38 + thumb_func_end Phase2_32_Func1 - thumb_func_start sub_814AD48 -sub_814AD48: @ 814AD48 + thumb_func_start Phase2_32_Func2 +Phase2_32_Func2: @ 814AD48 push {r4,lr} sub sp, 0x24 adds r4, r0, 0 @@ -3371,10 +737,10 @@ _0814ADA0: pop {r1} bx r1 .pool - thumb_func_end sub_814AD48 + thumb_func_end Phase2_32_Func2 - thumb_func_start sub_814ADB4 -sub_814ADB4: @ 814ADB4 + thumb_func_start Phase2_32_Func3 +Phase2_32_Func3: @ 814ADB4 push {r4,lr} adds r4, r0, 0 ldr r0, =0xffff7fff @@ -3391,10 +757,10 @@ sub_814ADB4: @ 814ADB4 pop {r1} bx r1 .pool - thumb_func_end sub_814ADB4 + thumb_func_end Phase2_32_Func3 - thumb_func_start sub_814ADD8 -sub_814ADD8: @ 814ADD8 + thumb_func_start Phase2_32_Func4 +Phase2_32_Func4: @ 814ADD8 push {r4,lr} sub sp, 0xC adds r4, r0, 0 @@ -3441,10 +807,10 @@ _0814AE2E: pop {r1} bx r1 .pool - thumb_func_end sub_814ADD8 + thumb_func_end Phase2_32_Func4 - thumb_func_start sub_814AE40 -sub_814AE40: @ 814AE40 + thumb_func_start Phase2_32_Func5 +Phase2_32_Func5: @ 814AE40 push {r4,r5,lr} sub sp, 0x8 adds r5, r0, 0 @@ -3488,6 +854,6 @@ sub_814AE40: @ 814AE40 pop {r1} bx r1 .pool - thumb_func_end sub_814AE40 + thumb_func_end Phase2_32_Func5 .align 2, 0 @ Don't pad with nop. diff --git a/data/battle_transition.s b/data/battle_transition.s deleted file mode 100644 index 68801b22e5..0000000000 --- a/data/battle_transition.s +++ /dev/null @@ -1,235 +0,0 @@ - - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -sPhase2_Rayquaza_Funcs:: @ 85C8D60 - .4byte Phase2_WeatherTrio_Func1 - .4byte Phase2_WaitPaletteFade - .4byte sub_81492B4 - .4byte sub_8149358 - .4byte sub_8149388 - .4byte sub_81493D8 - .4byte sub_8149410 - .4byte sub_814943C - .4byte sub_814946C - .4byte Phase2_Blackhole1_Func2 - .4byte Phase2_Blackhole1_Func3 - - .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_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 Phase2_BigPokeball_Func3 - .4byte Phase2_BigPokeball_Func4 - .4byte Phase2_BigPokeball_Func5 - .4byte Phase2_BigPokeball_Func6 - - .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/include/battle_transition.h b/include/battle_transition.h index bb8505edba..cd4cdd1b3a 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -6,6 +6,7 @@ void sub_8149DFC(u8 a1); void BattleTransition_StartOnField(u8 transitionID); void BattleTransition_Start(u8 transitionID); bool8 IsBattleTransitionDone(void); +void Phase1_Task_RunFuncs(u8 taskId); enum // TRANSITION_MUGSHOT { @@ -46,7 +47,7 @@ enum // TRANSITION_MUGSHOT #define B_TRANSITION_KYOGRE 22 #define B_TRANSITION_GROUDON 23 #define B_TRANSITION_RAYQUAZA 24 -#define B_TRANSITION_25 25 +#define B_TRANSITION_SHRED_SPLIT 25 #define B_TRANSITION_BLACKHOLE1 26 #define B_TRANSITION_BLACKHOLE2 27 #define B_TRANSITION_RECTANGULAR_SPIRAL 28 diff --git a/include/field_camera.h b/include/field_camera.h index a8559e1c27..4686742d32 100644 --- a/include/field_camera.h +++ b/include/field_camera.h @@ -24,5 +24,6 @@ extern u16 gUnknown_03005DE8; void DrawWholeMapView(void); void CurrentMapDrawMetatileAt(int x, int y); +void sub_8089C08(s16 *a0, s16 *a1); #endif //GUARD_FIELD_CAMERA_H diff --git a/ld_script.txt b/ld_script.txt index 7aeee8c8d7..c74413f19f 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -448,7 +448,6 @@ SECTIONS { data/pokedex_cry_screen.o(.rodata); src/landmark.o(.rodata); src/battle_transition.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_transition.c b/src/battle_transition.c index 04f48b1261..def3028890 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -7,6 +7,7 @@ #include "palette.h" #include "trig.h" #include "field_effect.h" +#include "field_camera.h" #include "random.h" #include "sprite.h" #include "sound.h" @@ -56,6 +57,8 @@ typedef bool8 (*TransitionSpriteCallback)(struct Sprite *sprite); extern u16 gUnknown_020393A8[]; extern u16 gUnknown_02038C28[][0x3C0]; +extern const struct OamData gFieldObjectBaseOam_32x32; + extern void c2_exit_to_overworld_2_switch(void); extern void sub_80AC3D0(void); extern void dp12_8087EA4(void); @@ -89,7 +92,7 @@ void Phase2Task_Regirock(u8 taskId); void Phase2Task_Kyogre(u8 taskId); void Phase2Task_Groudon(u8 taskId); void Phase2Task_Rayquaza(u8 taskId); -void Phase2Task_25(u8 taskId); +void Phase2Task_ShredSplit(u8 taskId); void Phase2Task_Blackhole1(u8 taskId); void Phase2Task_Blackhole2(u8 taskId); void Phase2Task_RectangularSpiral(u8 taskId); @@ -108,6 +111,8 @@ void VBlankCB1_Phase2_BigPokeball(void); void VBlankCB_Phase2_Clockwise_BlackFade(void); void VBlankCB_Phase2_Ripple(void); void HBlankCB_Phase2_Ripple(void); +void VBlankCB_Phase2_30(void); +void HBlankCB_Phase2_30(void); void VBlankCB_Phase2_Wave(void); void VBlankCB_Phase2_Slice(void); void HBlankCB_Phase2_Slice(void); @@ -115,6 +120,7 @@ void VBlankCB0_Phase2_WhiteFade(void); void VBlankCB1_Phase2_WhiteFade(void); void HBlankCB_Phase2_WhiteFade(void); void VBlankCB_Phase2_Shards(void); +void VBlankCB_Phase2_Rayquaza(void); bool8 Phase2_Blur_Func1(struct Task *task); bool8 Phase2_Blur_Func2(struct Task *task); bool8 Phase2_Blur_Func3(struct Task *task); @@ -178,10 +184,10 @@ bool8 Phase2_Shards_Func2(struct Task *task); bool8 Phase2_Shards_Func3(struct Task *task); bool8 Phase2_Shards_Func4(struct Task *task); bool8 Phase2_Shards_Func5(struct Task *task); -bool8 Phase2_25_Func1(struct Task *task); -bool8 Phase2_25_Func2(struct Task *task); -bool8 Phase2_25_Func3(struct Task *task); -bool8 Phase2_25_Func4(struct Task *task); +bool8 Phase2_ShredSplit_Func1(struct Task *task); +bool8 Phase2_ShredSplit_Func2(struct Task *task); +bool8 Phase2_ShredSplit_Func3(struct Task *task); +bool8 Phase2_ShredSplit_Func4(struct Task *task); bool8 Phase2_Blackhole_Func1(struct Task *task); bool8 Phase2_Blackhole1_Func2(struct Task *task); bool8 Phase2_Blackhole1_Func3(struct Task *task); @@ -189,6 +195,32 @@ bool8 Phase2_Blackhole2_Func2(struct Task *task); bool8 Phase2_RectangularSpiral_Func1(struct Task *task); bool8 Phase2_RectangularSpiral_Func2(struct Task *task); bool8 Phase2_RectangularSpiral_Func3(struct Task *task); +bool8 Phase2_29_Func1(struct Task *task); +bool8 Phase2_29_Func2(struct Task *task); +bool8 Phase2_30_Func1(struct Task *task); +bool8 Phase2_30_Func2(struct Task *task); +bool8 Phase2_30_Func3(struct Task *task); +bool8 Phase2_30_Func4(struct Task *task); +bool8 Phase2_Rayquaza_Func3(struct Task *task); +bool8 Phase2_Rayquaza_Func4(struct Task *task); +bool8 Phase2_Rayquaza_Func5(struct Task *task); +bool8 Phase2_Rayquaza_Func6(struct Task *task); +bool8 Phase2_Rayquaza_Func7(struct Task *task); +bool8 Phase2_Rayquaza_Func8(struct Task *task); +bool8 Phase2_Rayquaza_Func9(struct Task *task); +bool8 Phase2_31_Func1(struct Task *task); +bool8 Phase2_31_Func2(struct Task *task); +bool8 Phase2_31_Func3(struct Task *task); +bool8 Phase2_31_33_Func5(struct Task *task); +bool8 Phase2_33_Func1(struct Task *task); +bool8 Phase2_33_Func2(struct Task *task); +bool8 Phase2_33_Func3(struct Task *task); +bool8 Phase2_33_Func4(struct Task *task); +bool8 Phase2_32_Func1(struct Task *task); +bool8 Phase2_32_Func2(struct Task *task); +bool8 Phase2_32_Func3(struct Task *task); +bool8 Phase2_32_Func4(struct Task *task); +bool8 Phase2_32_Func5(struct Task *task); bool8 Phase2_Mugshot_Func1(struct Task *task); bool8 Phase2_Mugshot_Func2(struct Task *task); bool8 Phase2_Mugshot_Func3(struct Task *task); @@ -214,15 +246,19 @@ void CreatePhase1Task(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4); void sub_814A014(u16 *a0, s16 a1, s16 a2, s16 a3); void sub_8149F98(s16 *array, s16 sinAdd, s16 index, s16 indexIncrementer, s16 amplitude, s16 arrSize); void sub_8149F58(u16 **a0, u16 **a1); +void sub_8149F40(u16 **a0); void sub_814A1AC(s16 *a0, s16 a1, s16 a2, s16 a3, s16 a4, s16 a5, s16 a6); bool8 sub_814A228(s16 *a0, bool8 a1, bool8 a2); void sub_8148484(s16 spriteId, s16 value); void sub_814849C(s16 spriteId); s16 sub_81484B8(s16 spriteId); +bool8 Phase1_TransitionAll_Func1(struct Task *task); +bool8 Phase1_TransitionAll_Func2(struct Task *task); bool8 IsPhase1Done(void); bool16 sub_8149048(const s16 * const *arg0, struct StructRectangularSpiral *arg1); void sub_814713C(struct Sprite *sprite); void sub_8148380(struct Sprite *sprite); +void sub_8149864(struct Sprite *sprite); bool8 sub_81483A8(struct Sprite *sprite); bool8 sub_81483AC(struct Sprite *sprite); bool8 sub_81483F8(struct Sprite *sprite); @@ -236,15 +272,15 @@ IWRAM_DATA static u8 sTestingTransitionState; IWRAM_DATA static struct StructRectangularSpiral sRectangularSpiralTransition[4]; // ewram vars -EWRAM_DATA struct TransitionData *sTransitionStructPtr = NULL; +EWRAM_DATA static struct TransitionData *sTransitionStructPtr = NULL; // const rom data const u32 sBigPokeball_Tileset[] = INCBIN_U32("graphics/battle_transitions/big_pokeball.4bpp"); const u32 sPokeballTrail_Tileset[] = INCBIN_U32("graphics/battle_transitions/pokeball_trail.4bpp"); -const u32 sSpriteImage_85B98F0[] = INCBIN_U32("graphics/battle_transitions/pokeball.4bpp"); +const u8 sSpriteImage_85B98F0[] = INCBIN_U8("graphics/battle_transitions/pokeball.4bpp"); const u32 sUnknown_085B9AF0[] = INCBIN_U32("graphics/battle_transitions/elite_four_bg.4bpp"); -const u32 sSpriteImage_85B9CD0[] = INCBIN_U32("graphics/battle_transitions/unused_brendan.4bpp"); -const u32 sSpriteImage_85BA4D0[] = INCBIN_U32("graphics/battle_transitions/unused_lass.4bpp"); +const u8 sSpriteImage_85B9CD0[] = INCBIN_U8("graphics/battle_transitions/unused_brendan.4bpp"); +const u8 sSpriteImage_85BA4D0[] = INCBIN_U8("graphics/battle_transitions/unused_lass.4bpp"); const u32 sShrinkingBoxTileset[] = INCBIN_U32("graphics/battle_transitions/shrinking_box.4bpp"); const u32 sEvilTeam_Palette[] = INCBIN_U32("graphics/battle_transitions/evil_team.gbapal"); const u32 sTeamAqua_Tileset[] = INCBIN_U32("graphics/battle_transitions/team_aqua.4bpp.lz"); @@ -312,7 +348,7 @@ const TaskFunc sPhase2_Tasks[B_TRANSITION_COUNT] = Phase2Task_Kyogre, // 22 Phase2Task_Groudon, // 23 Phase2Task_Rayquaza, // 24 - Phase2Task_25, // 25 + Phase2Task_ShredSplit, // 25 Phase2Task_Blackhole1, // 26 Phase2Task_Blackhole2, // 27 Phase2Task_RectangularSpiral, // 28 @@ -527,12 +563,12 @@ const TransitionStateFunc sPhase2_Slice_Funcs[] = Phase2_Slice_Func3 }; -const TransitionStateFunc sPhase2_25_Funcs[] = +const TransitionStateFunc sPhase2_ShredSplit_Funcs[] = { - Phase2_25_Func1, - Phase2_25_Func2, - Phase2_25_Func3, - Phase2_25_Func4 + Phase2_ShredSplit_Func1, + Phase2_ShredSplit_Func2, + Phase2_ShredSplit_Func3, + Phase2_ShredSplit_Func4 }; const u8 gUnknown_085C8C64[] = {39, 119}; @@ -619,12 +655,257 @@ const TransitionStateFunc sPhase2_Groudon_Funcs[] = Phase2_WeatherDuo_Func7 }; -extern const u16 gFieldEffectObjectPalette10[]; -extern const u16 sBigPokeball_Tilemap[]; -extern const u16 sMugshotsTilemap[]; -extern const struct SpriteTemplate gUnknown_085C8E68; -extern const u16 *const sOpponentMugshotsPals[MUGSHOTS_COUNT]; -extern const u16 *const sPlayerMugshotsPals[2]; +const TransitionStateFunc sPhase2_Rayquaza_Funcs[] = +{ + Phase2_WeatherTrio_Func1, + Phase2_WaitPaletteFade, + Phase2_Rayquaza_Func3, + Phase2_Rayquaza_Func4, + Phase2_Rayquaza_Func5, + Phase2_Rayquaza_Func6, + Phase2_Rayquaza_Func7, + Phase2_Rayquaza_Func8, + Phase2_Rayquaza_Func9, + Phase2_Blackhole1_Func2, + Phase2_Blackhole1_Func3 +}; + +const TransitionStateFunc sPhase2_WhiteFade_Funcs[] = +{ + Phase2_WhiteFade_Func1, + Phase2_WhiteFade_Func2, + Phase2_WhiteFade_Func3, + Phase2_WhiteFade_Func4, + Phase2_WhiteFade_Func5 +}; + +const s16 sUnknown_085C8DA0[] = {0, 20, 15, 40, 10, 25, 35, 5}; + +const TransitionStateFunc sPhase2_GridSquares_Funcs[] = +{ + Phase2_GridSquares_Func1, + Phase2_GridSquares_Func2, + Phase2_GridSquares_Func3 +}; + +const TransitionStateFunc sPhase2_Shards_Funcs[] = +{ + Phase2_Shards_Func1, + Phase2_Shards_Func2, + Phase2_Shards_Func3, + Phase2_Shards_Func4, + Phase2_Shards_Func5 +}; + +const s16 sUnknown_085C8DD0[][5] = +{ + {56, 0, 0, 160, 0}, + {104, 160, 240, 88, 1}, + {240, 72, 56, 0, 1}, + {0, 32, 144, 160, 0}, + {144, 160, 184, 0, 1}, + {56, 0, 168, 160, 0}, + {168, 160, 48, 0, 1}, +}; + +const s16 sUnknown_085C8E16[] = {8, 4, 2, 1, 1, 1, 0}; + +const TransitionStateFunc sPhase1_TransitionAll_Funcs[] = +{ + Phase1_TransitionAll_Func1, + Phase1_TransitionAll_Func2 +}; + +const struct SpriteFrameImage sSpriteImageTable_85C8E2C[] = +{ + sSpriteImage_85B98F0, 0x200 +}; + +const union AnimCmd sSpriteAnim_85C8E34[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END +}; + +const union AnimCmd *const sSpriteAnimTable_85C8E3C[] = +{ + sSpriteAnim_85C8E34 +}; + +const union AffineAnimCmd sSpriteAffineAnim_85C8E40[] = +{ + AFFINEANIMCMD_FRAME(0, 0, -4, 1), + AFFINEANIMCMD_JUMP(0) +}; + +const union AffineAnimCmd sSpriteAffineAnim_85C8E50[] = +{ + AFFINEANIMCMD_FRAME(0, 0, 4, 1), + AFFINEANIMCMD_JUMP(0) +}; + +const union AffineAnimCmd *const sSpriteAffineAnimTable_85C8E60[] = +{ + sSpriteAffineAnim_85C8E40, + sSpriteAffineAnim_85C8E50 +}; + +const struct SpriteTemplate gUnknown_085C8E68 = +{ + .tileTag = 0xFFFF, + .paletteTag = 4105, + .oam = &gFieldObjectBaseOam_32x32, + .anims = sSpriteAnimTable_85C8E3C, + .images = sSpriteImageTable_85C8E2C, + .affineAnims = sSpriteAffineAnimTable_85C8E60, + .callback = sub_814713C +}; + +const struct OamData gOamData_85C8E80 = +{ + .y = 0, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 0, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct SpriteFrameImage sSpriteImageTable_85C8E88[] = +{ + sSpriteImage_85B9CD0, 0x800 +}; + +const struct SpriteFrameImage sSpriteImageTable_85C8E90[] = +{ + sSpriteImage_85BA4D0, 0x800 +}; + +const union AnimCmd sSpriteAnim_85C8E98[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END +}; + +const union AnimCmd *const sSpriteAnimTable_85C8EA0[] = +{ + sSpriteAnim_85C8E98 +}; + +const struct SpriteTemplate sSpriteTemplate_85C8EA4 = +{ + .tileTag = 0xFFFF, + .paletteTag = 4106, + .oam = &gOamData_85C8E80, + .anims = sSpriteAnimTable_85C8EA0, + .images = sSpriteImageTable_85C8E88, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_8148380 +}; + +const struct SpriteTemplate sSpriteTemplate_85C8EBC = +{ + .tileTag = 0xFFFF, + .paletteTag = 4106, + .oam = &gOamData_85C8E80, + .anims = sSpriteAnimTable_85C8EA0, + .images = sSpriteImageTable_85C8E90, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_8148380 +}; + +const u16 gFieldEffectObjectPalette10[] = INCBIN_U16("graphics/map_objects/palettes/field_effect_object_palette_10.gbapal"); + +const struct SpritePalette gFieldEffectObjectPaletteInfo10 = +{ + gFieldEffectObjectPalette10, 0x1009 +}; + +const u16 sMugshotPal_Sydney[] = INCBIN_U16("graphics/battle_transitions/sidney_bg.gbapal"); +const u16 sMugshotPal_Phoebe[] = INCBIN_U16("graphics/battle_transitions/phoebe_bg.gbapal"); +const u16 sMugshotPal_Glacia[] = INCBIN_U16("graphics/battle_transitions/glacia_bg.gbapal"); +const u16 sMugshotPal_Drake[] = INCBIN_U16("graphics/battle_transitions/drake_bg.gbapal"); +const u16 sMugshotPal_Champion[] = INCBIN_U16("graphics/battle_transitions/wallace_bg.gbapal"); +const u16 sMugshotPal_Brendan[] = INCBIN_U16("graphics/battle_transitions/brendan_bg.gbapal"); +const u16 sMugshotPal_May[] = INCBIN_U16("graphics/battle_transitions/may_bg.gbapal"); + +const u16 *const sOpponentMugshotsPals[MUGSHOTS_COUNT] = +{ + sMugshotPal_Sydney, + sMugshotPal_Phoebe, + sMugshotPal_Glacia, + sMugshotPal_Drake, + sMugshotPal_Champion +}; + +const u16 *const sPlayerMugshotsPals[2] = +{ + sMugshotPal_Brendan, + sMugshotPal_May +}; + +const u16 sUnusedTrainerPalette[] = INCBIN_U16("graphics/battle_transitions/unused_trainer.gbapal"); +const struct SpritePalette sSpritePalette_UnusedTrainer = +{ + sUnusedTrainerPalette, 0x100A +}; + +const u16 sBigPokeball_Tilemap[] = INCBIN_U16("graphics/battle_transitions/big_pokeball_map.bin"); +const u16 sMugshotsTilemap[] = INCBIN_U16("graphics/battle_transitions/elite_four_bg_map.bin"); + +const TransitionStateFunc sPhase2_29_Funcs[] = +{ + Phase2_29_Func1, + Phase2_29_Func2, + Phase2_BigPokeball_Func3, + Phase2_BigPokeball_Func4, + Phase2_BigPokeball_Func5, + Phase2_BigPokeball_Func6 +}; + +const TransitionStateFunc sPhase2_30_Funcs[] = +{ + Phase2_30_Func1, + Phase2_30_Func2, + Phase2_30_Func3, + Phase2_30_Func4 +}; + +const TransitionStateFunc sPhase2_31_Funcs[] = +{ + Phase2_31_Func1, + Phase2_31_Func2, + Phase2_31_Func3, + Phase2_31_33_Func5 +}; + +const TransitionStateFunc sPhase2_33_Funcs[] = +{ + Phase2_33_Func1, + Phase2_33_Func2, + Phase2_33_Func3, + Phase2_33_Func4, + Phase2_31_33_Func5 +}; + +const TransitionStateFunc sPhase2_32_Funcs[] = +{ + Phase2_32_Func1, + Phase2_32_Func2, + Phase2_32_Func3, + Phase2_32_Func4, + Phase2_32_Func5 +}; + +const u8 gUnknown_085C9A30[] = {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, 0x10, 0x11, 0x12}; +const u8 gUnknown_085C9A53[] = {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, 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, 0x00}; // code static void CB2_TestBattleTransition(void) @@ -667,9 +948,11 @@ void BattleTransition_Start(u8 transitionId) LaunchBattleTransitionTask(transitionId); } -// main task that launches sub-tasks for phase1 and phase2 +// in all tasks data[0] is reserved for the state #define tState data[0] -#define tTransitionID data[1] + +// main task that launches sub-tasks for phase1 and phase2 +#define tTransitionId data[1] #define tTransitionDone data[15] bool8 IsBattleTransitionDone(void) @@ -690,7 +973,7 @@ bool8 IsBattleTransitionDone(void) void LaunchBattleTransitionTask(u8 transitionId) { u8 taskId = CreateTask(Task_BattleTransitionMain, 2); - gTasks[taskId].tTransitionID = transitionId; + gTasks[taskId].tTransitionId = transitionId; sTransitionStructPtr = AllocZeroed(sizeof(*sTransitionStructPtr)); } @@ -703,9 +986,9 @@ bool8 Transition_Phase1(struct Task *task) { sub_80AC3D0(); CpuCopy32(gPlttBufferFaded, gPlttBufferUnfaded, 0x400); - if (sPhase1_Tasks[task->tTransitionID] != NULL) + if (sPhase1_Tasks[task->tTransitionId] != NULL) { - CreateTask(sPhase1_Tasks[task->tTransitionID], 4); + CreateTask(sPhase1_Tasks[task->tTransitionId], 4); task->tState++; return FALSE; } @@ -718,7 +1001,7 @@ bool8 Transition_Phase1(struct Task *task) bool8 Transition_WaitForPhase1(struct Task *task) { - if (FindTaskIdByFunc(sPhase1_Tasks[task->tTransitionID]) == 0xFF) + if (FindTaskIdByFunc(sPhase1_Tasks[task->tTransitionId]) == 0xFF) { task->tState++; return TRUE; @@ -731,7 +1014,7 @@ bool8 Transition_WaitForPhase1(struct Task *task) bool8 Transition_Phase2(struct Task *task) { - CreateTask(sPhase2_Tasks[task->tTransitionID], 0); + CreateTask(sPhase2_Tasks[task->tTransitionId], 0); task->tState++; return FALSE; } @@ -739,18 +1022,14 @@ bool8 Transition_Phase2(struct Task *task) bool8 Transition_WaitForPhase2(struct Task *task) { task->tTransitionDone = FALSE; - if (FindTaskIdByFunc(sPhase2_Tasks[task->tTransitionID]) == 0xFF) + if (FindTaskIdByFunc(sPhase2_Tasks[task->tTransitionId]) == 0xFF) task->tTransitionDone = TRUE; return FALSE; } -#undef tState -#undef tTransitionID +#undef tTransitionId #undef tTransitionDone -// sub-task for phase1 -#define tState data[0] - void Phase1Task_TransitionAll(u8 taskId) { if (gTasks[taskId].tState == 0) @@ -764,10 +1043,14 @@ void Phase1Task_TransitionAll(u8 taskId) } } -#undef tState - // sub-task for phase2 -#define tState data[0] +#define tData1 data[1] +#define tData2 data[2] +#define tData3 data[3] +#define tData4 data[4] +#define tData5 data[5] +#define tData6 data[6] +#define tFuncState data[7] #define tFrames data[8] #define tOpponentSpriteId data[13] #define tPlayerSpriteId data[14] @@ -790,17 +1073,17 @@ bool8 Phase2_Blur_Func1(struct Task *task) bool8 Phase2_Blur_Func2(struct Task *task) { - if (task->data[1] != 0) + if (task->tData1 != 0) { - task->data[1]--; + task->tData1--; } else { - task->data[1] = 4; - if (++task->data[2] == 10) + task->tData1 = 4; + if (++task->tData2 == 10) BeginNormalPaletteFade(-1, -1, 0, 0x10, 0); - SetGpuReg(REG_OFFSET_MOSAIC, (task->data[2] & 15) * 17); - if (task->data[2] > 14) + SetGpuReg(REG_OFFSET_MOSAIC, (task->tData2 & 15) * 17); + if (task->tData2 > 14) task->tState++; } return FALSE; @@ -840,10 +1123,10 @@ bool8 Phase2_Swirl_Func1(struct Task *task) bool8 Phase2_Swirl_Func2(struct Task *task) { sTransitionStructPtr->VBlank_DMA = FALSE; - task->data[1] += 4; - task->data[2] += 8; + task->tData1 += 4; + task->tData2 += 8; - sub_8149F98(gUnknown_02038C28[0], sTransitionStructPtr->field_14, task->data[1], 2, task->data[2], 160); + sub_8149F98(gUnknown_02038C28[0], sTransitionStructPtr->field_14, task->tData1, 2, task->tData2, 160); if (!gPaletteFade.active) { @@ -898,10 +1181,10 @@ bool8 Phase2_Shuffle_Func2(struct Task *task) u16 r3, r4; sTransitionStructPtr->VBlank_DMA = FALSE; - r4 = task->data[1]; - r3 = task->data[2] >> 8; - task->data[1] += 4224; - task->data[2] += 384; + r4 = task->tData1; + r3 = task->tData2 >> 8; + task->tData1 += 4224; + task->tData2 += 384; for (i = 0; i < 160; i++, r4 += 4224) { @@ -973,16 +1256,16 @@ void sub_814669C(struct Task *task) sub_8149F08(); dp12_8087EA4(); - task->data[1] = 16; - task->data[2] = 0; - task->data[4] = 0; - task->data[5] = 0x4000; + task->tData1 = 16; + task->tData2 = 0; + task->tData4 = 0; + task->tData5 = 0x4000; sTransitionStructPtr->WININ = 63; sTransitionStructPtr->WINOUT = 0; sTransitionStructPtr->field_6 = 240; sTransitionStructPtr->WIN0V = 160; sTransitionStructPtr->BLDCNT = 0x3F41; - sTransitionStructPtr->BLDALPHA = (task->data[1] << 8) | (task->data[2]); + sTransitionStructPtr->BLDALPHA = (task->tData1 << 8) | (task->tData2); for (i = 0; i < 160; i++) { @@ -1065,7 +1348,7 @@ bool8 Phase2_BigPokeball_Func2(struct Task *task) dst1[i * 32 + j] = *BigPokeballMap | 0xF000; } } - sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5], 160); + sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 132, task->tData5, 160); task->tState++; return TRUE; @@ -1077,7 +1360,7 @@ bool8 Phase2_Aqua_Func2(struct Task *task) sub_8149F58(&dst1, &dst2); LZ77UnCompVram(sTeamAqua_Tilemap, dst1); - sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5], 160); + sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 132, task->tData5, 160); task->tState++; return FALSE; @@ -1089,7 +1372,7 @@ bool8 Phase2_Magma_Func2(struct Task *task) sub_8149F58(&dst1, &dst2); LZ77UnCompVram(sTeamMagma_Tilemap, dst1); - sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5], 160); + sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 132, task->tData5, 160); task->tState++; return FALSE; @@ -1102,7 +1385,7 @@ bool8 Phase2_Regice_Func2(struct Task *task) sub_8149F58(&dst1, &dst2); LoadPalette(gUnknown_085BC2B4, 0xF0, 0x20); CpuCopy16(gUnknown_085BC314, dst1, 0x500); - sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5], 160); + sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 132, task->tData5, 160); task->tState++; return FALSE; @@ -1115,7 +1398,7 @@ bool8 Phase2_Registeel_Func2(struct Task *task) sub_8149F58(&dst1, &dst2); LoadPalette(gUnknown_085BC2D4, 0xF0, 0x20); CpuCopy16(gUnknown_085BCB14, dst1, 0x500); - sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5], 160); + sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 132, task->tData5, 160); task->tState++; return FALSE; @@ -1128,7 +1411,7 @@ bool8 Phase2_Regirock_Func2(struct Task *task) sub_8149F58(&dst1, &dst2); LoadPalette(gUnknown_085BC2F4, 0xF0, 0x20); CpuCopy16(gUnknown_085BD314, dst1, 0x500); - sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5], 160); + sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 132, task->tData5, 160); task->tState++; return FALSE; @@ -1149,16 +1432,16 @@ bool8 Phase2_Kyogre_Func3(struct Task *task) bool8 Phase2_Kyogre_Func4(struct Task *task) { - if (task->data[1] % 3 == 0) + if (task->tData1 % 3 == 0) { - u16 var = task->data[1] % 30; + u16 var = task->tData1 % 30; var /= 3; LoadPalette(gUnknown_085BEDA0 + (var * 16), 0xF0, 0x20); } - if (++task->data[1] > 58) + if (++task->tData1 > 58) { task->tState++; - task->data[1] = 0; + task->tData1 = 0; } return FALSE; @@ -1166,15 +1449,15 @@ bool8 Phase2_Kyogre_Func4(struct Task *task) bool8 Phase2_Kyogre_Func5(struct Task *task) { - if (task->data[1] % 5 == 0) + if (task->tData1 % 5 == 0) { - s16 var = task->data[1] / 5; + s16 var = task->tData1 / 5; LoadPalette(gUnknown_085BEEE0 + (var * 16), 0xF0, 0x20); } - if (++task->data[1] > 68) + if (++task->tData1 > 68) { task->tState++; - task->data[1] = 0; + task->tData1 = 0; task->tFrames = 30; } @@ -1202,18 +1485,18 @@ bool8 Phase2_WeatherDuo_Func7(struct Task *task) bool8 Phase2_BigPokeball_Func3(struct Task *task) { sTransitionStructPtr->VBlank_DMA = FALSE; - if (task->data[3] == 0 || --task->data[3] == 0) + if (task->tData3 == 0 || --task->tData3 == 0) { - task->data[2]++; - task->data[3] = 2; + task->tData2++; + task->tData3 = 2; } - sTransitionStructPtr->BLDALPHA = (task->data[1] << 8) | task->data[2]; - if (task->data[2] > 15) + sTransitionStructPtr->BLDALPHA = (task->tData1 << 8) | task->tData2; + if (task->tData2 > 15) task->tState++; - task->data[4] += 8; - task->data[5] -= 256; + task->tData4 += 8; + task->tData5 -= 256; - sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5] >> 8, 160); + sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 132, task->tData5 >> 8, 160); sTransitionStructPtr->VBlank_DMA++; return FALSE; @@ -1222,18 +1505,18 @@ bool8 Phase2_BigPokeball_Func3(struct Task *task) bool8 Phase2_BigPokeball_Func4(struct Task *task) { sTransitionStructPtr->VBlank_DMA = FALSE; - if (task->data[3] == 0 || --task->data[3] == 0) + if (task->tData3 == 0 || --task->tData3 == 0) { - task->data[1]--; - task->data[3] = 2; + task->tData1--; + task->tData3 = 2; } - sTransitionStructPtr->BLDALPHA = (task->data[1] << 8) | task->data[2]; - if (task->data[1] == 0) + sTransitionStructPtr->BLDALPHA = (task->tData1 << 8) | task->tData2; + if (task->tData1 == 0) task->tState++; - task->data[4] += 8; - task->data[5] -= 256; + task->tData4 += 8; + task->tData5 -= 256; - sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5] >> 8, 160); + sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 132, task->tData5 >> 8, 160); sTransitionStructPtr->VBlank_DMA++; return FALSE; @@ -1242,17 +1525,17 @@ bool8 Phase2_BigPokeball_Func4(struct Task *task) bool8 Phase2_BigPokeball_Func5(struct Task *task) { sTransitionStructPtr->VBlank_DMA = FALSE; - task->data[4] += 8; - task->data[5] -= 256; + task->tData4 += 8; + task->tData5 -= 256; - sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5] >> 8, 160); + sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 132, task->tData5 >> 8, 160); - if (task->data[5] <= 0) + if (task->tData5 <= 0) { task->tState++; - task->data[1] = 160; - task->data[2] = 256; - task->data[3] = 0; + task->tData1 = 160; + task->tData2 = 256; + task->tData3 = 0; } sTransitionStructPtr->VBlank_DMA++; @@ -1283,16 +1566,16 @@ bool8 Phase2_WaitPaletteFade(struct Task *task) bool8 Phase2_BigPokeball_Func6(struct Task *task) { sTransitionStructPtr->VBlank_DMA = FALSE; - if (task->data[2] < 1024) - task->data[2] += 128; - if (task->data[1] != 0) + if (task->tData2 < 1024) + task->tData2 += 128; + if (task->tData1 != 0) { - task->data[1] -= (task->data[2] >> 8); - if (task->data[1] < 0) - task->data[1] = 0; + task->tData1 -= (task->tData2 >> 8); + if (task->tData1 < 0) + task->tData1 = 0; } - sub_814A014(gUnknown_02038C28[0], 120, 80, task->data[1]); - if (task->data[1] == 0) + sub_814A014(gUnknown_02038C28[0], 120, 80, task->tData1); + if (task->tData1 == 0) { SetVBlankCallback(NULL); DmaStop(0); @@ -1301,9 +1584,9 @@ bool8 Phase2_BigPokeball_Func6(struct Task *task) } else { - if (task->data[3] == 0) + if (task->tData3 == 0) { - task->data[3]++; + task->tData3++; SetVBlankCallback(VBlankCB1_Phase2_BigPokeball); } @@ -1673,12 +1956,12 @@ bool8 Phase2_Ripple_Func2(struct Task *task) sTransitionStructPtr->VBlank_DMA = FALSE; - r3 = task->data[2] >> 8; - r4 = task->data[1]; + r3 = task->tData2 >> 8; + r4 = task->tData1; r8 = 384; - task->data[1] += 0x400; - if (task->data[2] <= 0x1FFF) - task->data[2] += 0x180; + task->tData1 += 0x400; + if (task->tData2 <= 0x1FFF) + task->tData2 += 0x180; for (i = 0; i < 160; i++, r4 += r8) { @@ -1688,13 +1971,13 @@ bool8 Phase2_Ripple_Func2(struct Task *task) gUnknown_02038C28[0][i] = sTransitionStructPtr->field_16 + Sin(var, r3); } - if (++task->data[3] == 81) + if (++task->tData3 == 81) { - task->data[4]++; + task->tData4++; BeginNormalPaletteFade(-1, -2, 0, 0x10, 0); } - if (task->data[4] != 0 && !gPaletteFade.active) + if (task->tData4 != 0 && !gPaletteFade.active) DestroyTask(FindTaskIdByFunc(Phase2Task_Ripple)); sTransitionStructPtr->VBlank_DMA++; @@ -1752,13 +2035,13 @@ bool8 Phase2_Wave_Func2(struct Task *task) sTransitionStructPtr->VBlank_DMA = FALSE; toStore = gUnknown_02038C28[0]; - r5 = task->data[2]; - task->data[2] += 16; - task->data[1] += 8; + r5 = task->tData2; + task->tData2 += 16; + task->tData1 += 8; for (i = 0, nextFunc = TRUE; i < 160; i++, r5 += 4, toStore++) { - s16 value = task->data[1] + Sin(r5, 40); + s16 value = task->tData1 + Sin(r5, 40); if (value < 0) value = 0; if (value > 240) @@ -1837,9 +2120,9 @@ bool8 Phase2_Mugshot_Func1(struct Task *task) dp12_8087EA4(); Mugshots_CreateOpponentPlayerSprites(task); - task->data[1] = 0; - task->data[2] = 1; - task->data[3] = 239; + task->tData1 = 0; + task->tData2 = 1; + task->tData3 = 239; sTransitionStructPtr->WININ = 63; sTransitionStructPtr->WINOUT = 62; sTransitionStructPtr->WIN0V = 160; @@ -1892,12 +2175,12 @@ bool8 Phase2_Mugshot_Func3(struct Task *task) sTransitionStructPtr->VBlank_DMA = FALSE; toStore = gUnknown_02038C28[0]; - r5 = task->data[1]; - task->data[1] += 0x10; + r5 = task->tData1; + task->tData1 += 0x10; for (i = 0; i < 80; i++, toStore++, r5 += 0x10) { - value = task->data[2] + Sin(r5, 0x10); + value = task->tData2 + Sin(r5, 0x10); if (value < 0) value = 1; if (value > 0xF0) @@ -1906,7 +2189,7 @@ bool8 Phase2_Mugshot_Func3(struct Task *task) } for (; i < 160; i++, toStore++, r5 += 0x10) { - value = task->data[3] - Sin(r5, 0x10); + value = task->tData3 - Sin(r5, 0x10); if (value < 0) value = 0; if (value > 0xEF) @@ -1914,13 +2197,13 @@ bool8 Phase2_Mugshot_Func3(struct Task *task) *toStore = (value << 8) | (0xF0); } - task->data[2] += 8; - task->data[3] -= 8; - if (task->data[2] > 0xF0) - task->data[2] = 0xF0; - if (task->data[3] < 0) - task->data[3] = 0; - mergedValue = *(s32*)(&task->data[2]); + task->tData2 += 8; + task->tData3 -= 8; + if (task->tData2 > 0xF0) + task->tData2 = 0xF0; + if (task->tData3 < 0) + task->tData3 = 0; + mergedValue = *(s32*)(&task->tData2); if (mergedValue == 0xF0) task->tState++; @@ -1943,9 +2226,9 @@ bool8 Phase2_Mugshot_Func4(struct Task *task) } task->tState++; - task->data[1] = 0; - task->data[2] = 0; - task->data[3] = 0; + task->tData1 = 0; + task->tData2 = 0; + task->tData3 = 0; sTransitionStructPtr->field_18 -= 8; sTransitionStructPtr->field_1A += 8; @@ -1985,8 +2268,8 @@ bool8 Phase2_Mugshot_Func6(struct Task *task) SetGpuReg(REG_OFFSET_WIN0H, 0xF0); SetGpuReg(REG_OFFSET_BLDY, 0); task->tState++; - task->data[3] = 0; - task->data[4] = 0; + task->tData3 = 0; + task->tData4 = 0; sTransitionStructPtr->BLDCNT = 0xBF; SetVBlankCallback(VBlankCB1_Phase2_Mugshots); } @@ -2002,15 +2285,15 @@ bool8 Phase2_Mugshot_Func7(struct Task *task) sTransitionStructPtr->field_18 -= 8; sTransitionStructPtr->field_1A += 8; - if (task->data[4] < 0x50) - task->data[4] += 2; - if (task->data[4] > 0x50) - task->data[4] = 0x50; + if (task->tData4 < 0x50) + task->tData4 += 2; + if (task->tData4 > 0x50) + task->tData4 = 0x50; - if (++task->data[3] & 1) + if (++task->tData3 & 1) { s16 i; - for (i = 0, r6 = FALSE; i <= task->data[4]; i++) + for (i = 0, r6 = FALSE; i <= task->tData4; i++) { s16 index1 = 0x50 - i; s16 index2 = 0x50 + i; @@ -2027,7 +2310,7 @@ bool8 Phase2_Mugshot_Func7(struct Task *task) } } - if (task->data[4] == 0x50 && !r6) + if (task->tData4 == 0x50 && !r6) task->tState++; sTransitionStructPtr->VBlank_DMA++; @@ -2039,7 +2322,7 @@ bool8 Phase2_Mugshot_Func8(struct Task *task) sTransitionStructPtr->VBlank_DMA = FALSE; BlendPalettes(-1, 0x10, 0x7FFF); sTransitionStructPtr->BLDCNT = 0xFF; - task->data[3] = 0; + task->tData3 = 0; task->tState++; return TRUE; @@ -2049,9 +2332,9 @@ bool8 Phase2_Mugshot_Func9(struct Task *task) { sTransitionStructPtr->VBlank_DMA = FALSE; - task->data[3]++; - memset(gUnknown_02038C28[0], task->data[3], 0x140); - if (task->data[3] > 15) + task->tData3++; + memset(gUnknown_02038C28[0], task->tData3, 0x140); + if (task->tData3 > 15) task->tState++; sTransitionStructPtr->VBlank_DMA++; @@ -2216,8 +2499,8 @@ bool8 Phase2_Slice_Func1(struct Task *task) sub_8149F08(); dp12_8087EA4(); - task->data[2] = 256; - task->data[3] = 1; + task->tData2 = 256; + task->tData3 = 1; sTransitionStructPtr->WININ = 63; sTransitionStructPtr->WINOUT = 0; sTransitionStructPtr->WIN0V = 160; @@ -2245,13 +2528,13 @@ bool8 Phase2_Slice_Func2(struct Task *task) sTransitionStructPtr->VBlank_DMA = FALSE; - task->data[1] += (task->data[2] >> 8); - if (task->data[1] > 0xF0) - task->data[1] = 0xF0; - if (task->data[2] <= 0xFFF) - task->data[2] += task->data[3]; - if (task->data[3] < 128) - task->data[3] <<= 1; // multiplying by two + task->tData1 += (task->tData2 >> 8); + if (task->tData1 > 0xF0) + task->tData1 = 0xF0; + if (task->tData2 <= 0xFFF) + task->tData2 += task->tData3; + if (task->tData3 < 128) + task->tData3 <<= 1; // multiplying by two for (i = 0; i < 160; i++) { @@ -2259,17 +2542,17 @@ bool8 Phase2_Slice_Func2(struct Task *task) u16* storeLoc2 = &gUnknown_02038C28[0][i + 160]; if (1 & i) { - *storeLoc1 = sTransitionStructPtr->field_14 + task->data[1]; - *storeLoc2 = 0xF0 - task->data[1]; + *storeLoc1 = sTransitionStructPtr->field_14 + task->tData1; + *storeLoc2 = 0xF0 - task->tData1; } else { - *storeLoc1 = sTransitionStructPtr->field_14 - task->data[1]; - *storeLoc2 = (task->data[1] << 8) | (0xF1); + *storeLoc1 = sTransitionStructPtr->field_14 - task->tData1; + *storeLoc2 = (task->tData1 << 8) | (0xF1); } } - if (task->data[1] > 0xEF) + if (task->tData1 > 0xEF) task->tState++; sTransitionStructPtr->VBlank_DMA++; @@ -2307,12 +2590,12 @@ void HBlankCB_Phase2_Slice(void) } } -void Phase2Task_25(u8 taskId) +void Phase2Task_ShredSplit(u8 taskId) { - while (sPhase2_25_Funcs[gTasks[taskId].tState](&gTasks[taskId])); + while (sPhase2_ShredSplit_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -bool8 Phase2_25_Func1(struct Task *task) +bool8 Phase2_ShredSplit_Func1(struct Task *task) { u16 i; @@ -2334,9 +2617,9 @@ bool8 Phase2_25_Func1(struct Task *task) gUnknown_02038C28[0][0x280 + i] = 1; } - task->data[4] = 0; - task->data[5] = 0; - task->data[6] = 7; + task->tData4 = 0; + task->tData5 = 0; + task->tData6 = 7; EnableInterrupts(INTR_FLAG_HBLANK); @@ -2347,7 +2630,7 @@ bool8 Phase2_25_Func1(struct Task *task) return TRUE; } -bool8 Phase2_25_Func2(struct Task *task) +bool8 Phase2_ShredSplit_Func2(struct Task *task) { u16 i, j, k; u8 arr1[ARRAY_COUNT(gUnknown_085C8C64)]; @@ -2362,7 +2645,7 @@ bool8 Phase2_25_Func2(struct Task *task) sTransitionStructPtr->VBlank_DMA = FALSE; var = 0; - for (i = 0; i <= task->data[5]; i++) + for (i = 0; i <= task->tData5; i++) { for (j = 0; j < 2; j++) { @@ -2433,10 +2716,10 @@ bool8 Phase2_25_Func2(struct Task *task) } } - if (--task->data[4] < 0) - task->data[4] = 0; - if (task->data[4] <= 0 && task->data[5] + 1 <= 20) - task->data[4] = task->data[6], task->data[5]++; + if (--task->tData4 < 0) + task->tData4 = 0; + if (task->tData4 <= 0 && task->tData5 + 1 <= 20) + task->tData4 = task->tData6, task->tData5++; if (var > 0x9F) task->tState++; @@ -2444,7 +2727,7 @@ bool8 Phase2_25_Func2(struct Task *task) return FALSE; } -bool8 Phase2_25_Func3(struct Task *task) +bool8 Phase2_ShredSplit_Func3(struct Task *task) { u16 i; bool32 done = TRUE; @@ -2462,11 +2745,11 @@ bool8 Phase2_25_Func3(struct Task *task) return FALSE; } -bool8 Phase2_25_Func4(struct Task *task) +bool8 Phase2_ShredSplit_Func4(struct Task *task) { DmaStop(0); sub_8149F84(); - DestroyTask(FindTaskIdByFunc(Phase2Task_25)); + DestroyTask(FindTaskIdByFunc(Phase2Task_ShredSplit)); return FALSE; } @@ -2500,16 +2783,16 @@ bool8 Phase2_Blackhole_Func1(struct Task *task) SetVBlankCallback(VBlankCB1_Phase2_BigPokeball); task->tState++; - task->data[1] = 1; - task->data[2] = 0x100; - task->data[7] = 0; + task->tData1 = 1; + task->tData2 = 0x100; + task->tFuncState = 0; return FALSE; } bool8 Phase2_Blackhole1_Func3(struct Task *task) { - if (task->data[7] == 1) + if (task->tFuncState == 1) { DmaStop(0); SetVBlankCallback(NULL); @@ -2518,16 +2801,16 @@ bool8 Phase2_Blackhole1_Func3(struct Task *task) else { sTransitionStructPtr->VBlank_DMA = FALSE; - if (task->data[2] < 0x400) - task->data[2] += 0x80; - if (task->data[1] < 0xA0) - task->data[1] += (task->data[2] >> 8); - if (task->data[1] > 0xA0) - task->data[1] = 0xA0; - sub_814A014(gUnknown_02038C28[0], 0x78, 0x50, task->data[1]); - if (task->data[1] == 0xA0) + if (task->tData2 < 0x400) + task->tData2 += 0x80; + if (task->tData1 < 0xA0) + task->tData1 += (task->tData2 >> 8); + if (task->tData1 > 0xA0) + task->tData1 = 0xA0; + sub_814A014(gUnknown_02038C28[0], 0x78, 0x50, task->tData1); + if (task->tData1 == 0xA0) { - task->data[7] = 1; + task->tFuncState = 1; sub_8149F84(); } else @@ -2542,19 +2825,19 @@ bool8 Phase2_Blackhole1_Func3(struct Task *task) bool8 Phase2_Blackhole1_Func2(struct Task *task) { sTransitionStructPtr->VBlank_DMA = FALSE; - if (task->data[7] == 0) + if (task->tFuncState == 0) { - task->data[7]++; - task->data[1] = 0x30; - task->data[6] = 0; + task->tFuncState++; + task->tData1 = 0x30; + task->tData6 = 0; } - task->data[1] += gUnknown_085C8C80[task->data[6]]; - task->data[6] = (task->data[6] + 1) % 2; - sub_814A014(gUnknown_02038C28[0], 0x78, 0x50, task->data[1]); - if (task->data[1] < 9) + task->tData1 += gUnknown_085C8C80[task->tData6]; + task->tData6 = (task->tData6 + 1) % 2; + sub_814A014(gUnknown_02038C28[0], 0x78, 0x50, task->tData1); + if (task->tData1 < 9) { task->tState++; - task->data[7] = 0; + task->tFuncState = 0; } sTransitionStructPtr->VBlank_DMA++; @@ -2567,40 +2850,40 @@ bool8 Phase2_Blackhole2_Func2(struct Task *task) s16 amplitude; sTransitionStructPtr->VBlank_DMA = FALSE; - if (task->data[7] == 0) + if (task->tFuncState == 0) { - task->data[7]++; - task->data[5] = 2; - task->data[6] = 2; + task->tFuncState++; + task->tData5 = 2; + task->tData6 = 2; } - if (task->data[1] > 0xA0) - task->data[1] = 0xA0; + if (task->tData1 > 0xA0) + task->tData1 = 0xA0; - sub_814A014(gUnknown_02038C28[0], 0x78, 0x50, task->data[1]); - if (task->data[1] == 0xA0) + sub_814A014(gUnknown_02038C28[0], 0x78, 0x50, task->tData1); + if (task->tData1 == 0xA0) { DmaStop(0); sub_8149F84(); DestroyTask(FindTaskIdByFunc(task->func)); } - index = task->data[5]; - if ((task->data[5] & 0xFF) <= 128) + index = task->tData5; + if ((task->tData5 & 0xFF) <= 128) { - amplitude = task->data[6]; - task->data[5] += 8; + amplitude = task->tData6; + task->tData5 += 8; } else { - amplitude = task->data[6] - 1; - task->data[5] += 16; + amplitude = task->tData6 - 1; + task->tData5 += 16; } - task->data[1] += Sin(index & 0xFF, amplitude); + task->tData1 += Sin(index & 0xFF, amplitude); - if (task->data[1] <= 0) - task->data[1] = 1; - if (task->data[5] > 0xFE) - task->data[5] >>= 8, task->data[6]++; + if (task->tData1 <= 0) + task->tData1 = 1; + if (task->tData5 > 0xFE) + task->tData5 >>= 8, task->tData6++; sTransitionStructPtr->VBlank_DMA++; return FALSE; @@ -2621,7 +2904,7 @@ bool8 Phase2_RectangularSpiral_Func1(struct Task *task) CpuFill16(0xF000, dst1, 0x800); LoadPalette(gFieldEffectObjectPalette10, 0xF0, 0x20); - task->data[3] = 1; + task->tData3 = 1; task->tState++; sRectangularSpiralTransition[0].field_0 = 0; @@ -2775,21 +3058,21 @@ bool8 Phase2_Groudon_Func3(struct Task *task) LZ77UnCompVram(gUnknown_085BEA88, dst1); task->tState++; - task->data[1] = 0; + task->tData1 = 0; return FALSE; } bool8 Phase2_Groudon_Func4(struct Task *task) { - if (task->data[1] % 3 == 0) + if (task->tData1 % 3 == 0) { - u16 var = (task->data[1] % 30) / 3; + u16 var = (task->tData1 % 30) / 3; LoadPalette(gUnknown_085BF0A0 + (var * 16), 0xF0, 0x20); } - if (++task->data[1] > 58) + if (++task->tData1 > 58) { task->tState++; - task->data[1] = 0; + task->tData1 = 0; } return FALSE; @@ -2797,18 +3080,951 @@ bool8 Phase2_Groudon_Func4(struct Task *task) bool8 Phase2_Groudon_Func5(struct Task *task) { - if (task->data[1] % 5 == 0) + if (task->tData1 % 5 == 0) { - s16 var = task->data[1] / 5; + s16 var = task->tData1 / 5; LoadPalette(gUnknown_085BF2A0 + (var * 16), 0xF0, 0x20); } - if (++task->data[1] > 68) + if (++task->tData1 > 68) { task->tState++; - task->data[1] = 0; + task->tData1 = 0; task->tFrames = 30; } return FALSE; } +void Phase2Task_Rayquaza(u8 taskId) +{ + while (sPhase2_Rayquaza_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +bool8 Phase2_Rayquaza_Func3(struct Task *task) +{ + u16 *dst1, *dst2; + u16 i; + + sub_8149F08(); + dp12_8087EA4(); + + SetGpuReg(REG_OFFSET_BG0CNT, 0x9A08); + sub_8149F58(&dst1, &dst2); + CpuFill16(0, dst1, 0x800); + CpuCopy16(gUnknown_085BF6A0, dst2, 0x2000); + + sTransitionStructPtr->field_20 = 0; + task->tState++; + LoadPalette(gUnknown_085BF4A0 + 0x50, 0xF0, 0x20); + + for (i = 0; i < 160; i++) + { + gUnknown_02038C28[0][i] = 0; + gUnknown_02038C28[1][i] = 0x100; + } + + SetVBlankCallback(VBlankCB_Phase2_Rayquaza); + return FALSE; +} + +bool8 Phase2_Rayquaza_Func4(struct Task *task) +{ + u16 *dst1, *dst2; + + sub_8149F58(&dst1, &dst2); + CpuCopy16(gUnknown_085C6BE0, dst1, 0x1000); + task->tState++; + return FALSE; +} + +bool8 Phase2_Rayquaza_Func5(struct Task *task) +{ + if ((task->tData1 % 4) == 0) + { + u16 value = task->tData1 / 4; + const u16 *palPtr = &gUnknown_085BF4A0[(value + 5) * 16]; + LoadPalette(palPtr, 0xF0, 0x20); + } + if (++task->tData1 > 40) + { + task->tState++; + task->tData1 = 0; + } + + return FALSE; +} + +bool8 Phase2_Rayquaza_Func6(struct Task *task) +{ + if (++task->tData1 > 20) + { + task->tState++; + task->tData1 = 0; + BeginNormalPaletteFade(0xFFFF8000, 2, 0, 0x10, 0); + } + + return FALSE; +} + +bool8 Phase2_Rayquaza_Func7(struct Task *task) +{ + if (!gPaletteFade.active) + { + sTransitionStructPtr->field_20 = 1; + task->tState++; + } + + return FALSE; +} + +bool8 Phase2_Rayquaza_Func8(struct Task *task) +{ + BlendPalettes(0x00007FFF, 8, 0); + BlendPalettes(0xFFFF8000, 0, 0); + + task->tState++; + return FALSE; +} + +bool8 Phase2_Rayquaza_Func9(struct Task *task) +{ + if ((task->tData1 % 3) == 0) + { + u16 value = task->tData1 / 3; + const u16 *palPtr = &gUnknown_085BF4A0[(value + 0) * 16]; + LoadPalette(palPtr, 0xF0, 0x20); + } + if (++task->tData1 >= 40) + { + u16 i; + + sTransitionStructPtr->WININ = 0; + sTransitionStructPtr->WINOUT = 63; + sTransitionStructPtr->field_6 = 240; + sTransitionStructPtr->WIN0V = 160; + + for (i = 0; i < 160; i++) + { + gUnknown_02038C28[1][i] = 0; + } + + SetVBlankCallback(VBlankCB1_Phase2_BigPokeball); + task->tState++; + task->tData2 = 0x100; + task->tFuncState = 0; + ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG0_ON); + } + + return FALSE; +} + +void VBlankCB_Phase2_Rayquaza(void) +{ + void *dmaSrc; + + DmaStop(0); + VBlankCB_BattleTransition(); + + if (sTransitionStructPtr->field_20 == 0) + dmaSrc = gUnknown_02038C28[0]; + else if (sTransitionStructPtr->field_20 == 1) + dmaSrc = gUnknown_02038C28[1]; + else + dmaSrc = gUnknown_02038C28[0]; + + DmaSet(0, dmaSrc, ®_BG0VOFS, 0xA2400001); +} + +void Phase2Task_WhiteFade(u8 taskId) +{ + while (sPhase2_WhiteFade_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +bool8 Phase2_WhiteFade_Func1(struct Task *task) +{ + u16 i; + + sub_8149F08(); + dp12_8087EA4(); + + sTransitionStructPtr->BLDCNT = 0xBF; + sTransitionStructPtr->BLDY = 0; + sTransitionStructPtr->WININ = 0x1E; + sTransitionStructPtr->WINOUT = 0x3F; + sTransitionStructPtr->WIN0V = 0xA0; + + for (i = 0; i < 160; i++) + { + gUnknown_02038C28[1][i] = 0; + gUnknown_02038C28[1][i + 160] = 0xF0; + } + + EnableInterrupts(INTR_FLAG_HBLANK); + SetHBlankCallback(HBlankCB_Phase2_WhiteFade); + SetVBlankCallback(VBlankCB0_Phase2_WhiteFade); + + task->tState++; + return FALSE; +} + +bool8 Phase2_WhiteFade_Func2(struct Task *task) +{ + s16 i, posY; + s16 arr1[ARRAY_COUNT(sUnknown_085C8DA0)]; + struct Sprite *sprite; + + memcpy(arr1, sUnknown_085C8DA0, sizeof(sUnknown_085C8DA0)); + for (i = 0, posY = 0; i < 8; i++, posY += 0x14) + { + sprite = &gSprites[CreateInvisibleSprite(sub_8149864)]; + sprite->pos1.x = 0xF0; + sprite->pos1.y = posY; + sprite->data[5] = arr1[i]; + } + sprite->data[6]++; + + task->tState++; + return FALSE; +} + +bool8 Phase2_WhiteFade_Func3(struct Task *task) +{ + sTransitionStructPtr->VBlank_DMA = 0; + if (sTransitionStructPtr->field_20 > 7) + { + BlendPalettes(-1, 0x10, 0x7FFF); + task->tState++; + } + return FALSE; +} + +bool8 Phase2_WhiteFade_Func4(struct Task *task) +{ + sTransitionStructPtr->VBlank_DMA = 0; + + DmaStop(0); + SetVBlankCallback(0); + SetHBlankCallback(0); + + sTransitionStructPtr->field_6 = 0xF0; + sTransitionStructPtr->BLDY = 0; + sTransitionStructPtr->BLDCNT = 0xFF; + sTransitionStructPtr->WININ = 0x3F; + + SetVBlankCallback(VBlankCB1_Phase2_WhiteFade); + + task->tState++; + return FALSE; +} + +bool8 Phase2_WhiteFade_Func5(struct Task *task) +{ + if (++sTransitionStructPtr->BLDY > 16) + { + sub_8149F84(); + DestroyTask(FindTaskIdByFunc(Phase2Task_WhiteFade)); + } + return FALSE; +} + +void VBlankCB0_Phase2_WhiteFade(void) +{ + DmaStop(0); + VBlankCB_BattleTransition(); + REG_BLDCNT = sTransitionStructPtr->BLDCNT; + REG_WININ = sTransitionStructPtr->WININ; + REG_WINOUT = sTransitionStructPtr->WINOUT; + REG_WIN0V = sTransitionStructPtr->WIN0V; + if (sTransitionStructPtr->VBlank_DMA) + DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 640); + DmaSet(0, &gUnknown_02038C28[1][160], ®_WIN0H, 0xA2400001); +} + +void VBlankCB1_Phase2_WhiteFade(void) +{ + VBlankCB_BattleTransition(); + REG_BLDY = sTransitionStructPtr->BLDY; + REG_BLDCNT = sTransitionStructPtr->BLDCNT; + REG_WININ = sTransitionStructPtr->WININ; + REG_WINOUT = sTransitionStructPtr->WINOUT; + REG_WIN0H = sTransitionStructPtr->field_6; + REG_WIN0V = sTransitionStructPtr->WIN0V; +} + +void HBlankCB_Phase2_WhiteFade(void) +{ + REG_BLDY = gUnknown_02038C28[1][REG_VCOUNT]; +} + +void sub_8149864(struct Sprite *sprite) +{ + if (sprite->data[5]) + { + sprite->data[5]--; + if (sprite->data[6]) + sTransitionStructPtr->VBlank_DMA = 1; + } + else + { + u16 i; + u16* ptr1 = &gUnknown_02038C28[0][sprite->pos1.y]; + u16* ptr2 = &gUnknown_02038C28[0][sprite->pos1.y + 160]; + for (i = 0; i < 20; i++) + { + ptr1[i] = sprite->data[0] >> 8; + ptr2[i] = (u8)(sprite->pos1.x); + } + if (sprite->pos1.x == 0 && sprite->data[0] == 0x1000) + sprite->data[1] = 1; + + sprite->pos1.x -= 16; + sprite->data[0] += 0x80; + + if (sprite->pos1.x < 0) + sprite->pos1.x = 0; + if (sprite->data[0] > 0x1000) + sprite->data[0] = 0x1000; + + if (sprite->data[6]) + sTransitionStructPtr->VBlank_DMA = 1; + + if (sprite->data[1]) + { + if (sprite->data[6] == 0 || (sTransitionStructPtr->field_20 > 6 && sprite->data[2]++ > 7)) + { + sTransitionStructPtr->field_20++; + DestroySprite(sprite); + } + } + } +} + +void Phase2Task_GridSquares(u8 taskId) +{ + while (sPhase2_GridSquares_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +bool8 Phase2_GridSquares_Func1(struct Task *task) +{ + u16 *dst1, *dst2; + + sub_8149F58(&dst1, &dst2); + CpuSet(sShrinkingBoxTileset, dst2, 0x10); + CpuFill16(0xF000, dst1, 0x800); + LoadPalette(gFieldEffectObjectPalette10, 0xF0, 0x20); + + task->tState++; + return FALSE; +} + +bool8 Phase2_GridSquares_Func2(struct Task *task) +{ + u16* dst1; + + if (task->tData1 == 0) + { + sub_8149F40(&dst1); + task->tData1 = 3; + task->tData2++; + CpuSet(sShrinkingBoxTileset + (task->tData2 * 8), dst1, 0x10); + if (task->tData2 > 0xD) + { + task->tState++; + task->tData1 = 16; + } + } + + task->tData1--; + return FALSE; +} + +bool8 Phase2_GridSquares_Func3(struct Task *task) +{ + if (--task->tData1 == 0) + { + sub_8149F84(); + DestroyTask(FindTaskIdByFunc(Phase2Task_GridSquares)); + } + return FALSE; +} + +void Phase2Task_Shards(u8 taskId) +{ + while (sPhase2_Shards_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +bool8 Phase2_Shards_Func1(struct Task *task) +{ + u16 i; + + sub_8149F08(); + dp12_8087EA4(); + + sTransitionStructPtr->WININ = 0x3F; + sTransitionStructPtr->WINOUT = 0; + sTransitionStructPtr->WIN0V = 0xA0; + + for (i = 0; i < 160; i++) + { + gUnknown_02038C28[0][i] = 0xF0; + } + + CpuSet(gUnknown_02038C28[0], gUnknown_02038C28[1], 0xA0); + SetVBlankCallback(VBlankCB_Phase2_Shards); + + task->tState++; + return TRUE; +} + +bool8 Phase2_Shards_Func2(struct Task *task) +{ + sub_814A1AC(sTransitionStructPtr->data, + sUnknown_085C8DD0[task->tData1][0], + sUnknown_085C8DD0[task->tData1][1], + sUnknown_085C8DD0[task->tData1][2], + sUnknown_085C8DD0[task->tData1][3], + 1, 1); + task->tData2 = sUnknown_085C8DD0[task->tData1][4]; + task->tState++; + return TRUE; +} + +bool8 Phase2_Shards_Func3(struct Task *task) +{ + s16 i; + bool8 nextFunc; + + sTransitionStructPtr->VBlank_DMA = 0; + + for (i = 0, nextFunc = FALSE; i < 16; i++) + { + s16 r3 = gUnknown_02038C28[0][sTransitionStructPtr->data[3]] >> 8; + s16 r4 = gUnknown_02038C28[0][sTransitionStructPtr->data[3]] & 0xFF; + if (task->tData2 == 0) + { + if (r3 < sTransitionStructPtr->data[2]) + r3 = sTransitionStructPtr->data[2]; + if (r3 > r4) + r3 = r4; + } + else + { + if (r4 > sTransitionStructPtr->data[2]) + r4 = sTransitionStructPtr->data[2]; + if (r4 <= r3) + r4 = r3; + } + gUnknown_02038C28[0][sTransitionStructPtr->data[3]] = (r4) | (r3 << 8); + if (nextFunc) + { + task->tState++; + break; + } + else + nextFunc = sub_814A228(sTransitionStructPtr->data, 1, 1); + } + + sTransitionStructPtr->VBlank_DMA++; + return FALSE; +} + +bool8 Phase2_Shards_Func4(struct Task *task) +{ + if (++task->tData1 < 7) + { + task->tState++; + task->tData3 = sUnknown_085C8E16[task->tData1 - 1]; + return TRUE; + } + else + { + DmaStop(0); + sub_8149F84(); + DestroyTask(FindTaskIdByFunc(Phase2Task_Shards)); + return FALSE; + } +} + +bool8 Phase2_Shards_Func5(struct Task *task) +{ + if (--task->tData3 == 0) + { + task->tState = 1; + return TRUE; + } + else + return FALSE; +} + +void VBlankCB_Phase2_Shards(void) +{ + DmaStop(0); + VBlankCB_BattleTransition(); + if (sTransitionStructPtr->VBlank_DMA) + DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320); + REG_WININ = sTransitionStructPtr->WININ; + REG_WINOUT = sTransitionStructPtr->WINOUT; + REG_WIN0V = sTransitionStructPtr->WIN0V; + REG_WIN0H = gUnknown_02038C28[1][0]; + DmaSet(0, gUnknown_02038C28[1], ®_WIN0H, 0xA2400001); +} + +// sub-task for phase2 +#undef tData1 +#undef tData2 +#undef tData3 +#undef tData4 +#undef tData5 +#undef tData6 +#undef tFuncState +#undef tFrames +#undef tOpponentSpriteId +#undef tPlayerSpriteId +#undef tMugshotId + +// sub-task for sub-task phase +#define tData1 data[1] +#define tData2 data[2] +#define tData3 data[3] +#define tData4 data[4] +#define tData5 data[5] +#define tData6 data[6] +#define tData7 data[7] + +void CreatePhase1Task(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4) +{ + u8 taskId = CreateTask(Phase1_Task_RunFuncs, 3); + gTasks[taskId].tData1 = a0; + gTasks[taskId].tData2 = a1; + gTasks[taskId].tData3 = a2; + gTasks[taskId].tData4 = a3; + gTasks[taskId].tData5 = a4; + gTasks[taskId].tData6 = a0; +} + +bool8 IsPhase1Done(void) +{ + if (FindTaskIdByFunc(Phase1_Task_RunFuncs) == 0xFF) + return TRUE; + else + return FALSE; +} + +void Phase1_Task_RunFuncs(u8 taskId) +{ + while (sPhase1_TransitionAll_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +bool8 Phase1_TransitionAll_Func1(struct Task *task) +{ + if (task->tData6 == 0 || --task->tData6 == 0) + { + task->tData6 = task->tData1; + task->tData7 += task->tData4; + if (task->tData7 > 16) + task->tData7 = 16; + BlendPalettes(-1, task->tData7, 0x2D6B); + } + if (task->tData7 > 15) + { + task->tState++; + task->tData6 = task->tData2; + } + return FALSE; +} + +bool8 Phase1_TransitionAll_Func2(struct Task *task) +{ + if (task->tData6 == 0 || --task->tData6 == 0) + { + task->tData6 = task->tData2; + task->tData7 -= task->tData5; + if (task->tData7 < 0) + task->tData7 = 0; + BlendPalettes(-1, task->tData7, 0x2D6B); + } + if (task->tData7 == 0) + { + if (--task->tData3 == 0) + DestroyTask(FindTaskIdByFunc(Phase1_Task_RunFuncs)); + else + { + task->tData6 = task->tData1; + task->tState = 0; + } + } + return FALSE; +} + +#undef tData1 +#undef tData2 +#undef tData3 +#undef tData4 +#undef tData5 +#undef tData6 +#undef tData7 + +void sub_8149F08(void) +{ + memset(sTransitionStructPtr, 0, sizeof(*sTransitionStructPtr)); + sub_8089C08(&sTransitionStructPtr->field_14, &sTransitionStructPtr->field_16); +} + +void VBlankCB_BattleTransition(void) +{ + LoadOam(); + ProcessSpriteCopyRequests(); + TransferPlttBuffer(); +} + +void sub_8149F40(u16 **a0) +{ + u16 reg, *vram; + + reg = REG_BG0CNT >> 2; + reg <<= 0xE; + vram = (u16*)(VRAM + reg); + + *a0 = vram; +} + +void sub_8149F58(u16 **a0, u16 **a1) +{ + u16 reg0, reg1, *vram0, *vram1; + + reg0 = REG_BG0CNT >> 8; + reg1 = REG_BG0CNT >> 2; + + reg0 <<= 0xB; + reg1 <<= 0xE; + + vram0 = (u16*)(VRAM + reg0); + *a0 = vram0; + + vram1 = (u16*)(VRAM + reg1); + *a1 = vram1; +} + +void sub_8149F84(void) +{ + BlendPalettes(-1, 0x10, 0); +} + +void sub_8149F98(s16 *array, s16 sinAdd, s16 index, s16 indexIncrementer, s16 amplitude, s16 arrSize) +{ + u8 i; + for (i = 0; arrSize > 0; arrSize--, i++, index += indexIncrementer) + { + array[i] = sinAdd + Sin(0xFF & index, amplitude); + } +} + +void sub_814A014(u16 *array, s16 a1, s16 a2, s16 a3) +{ + s16 i; + + memset(array, 0xA, 160 * sizeof(s16)); + for (i = 0; i < 64; i++) + { + s16 sinResult, cosResult; + s16 toStoreOrr, r2, r3, toStore, r7, r8; + + sinResult = Sin(i, a3); + cosResult = Cos(i, a3); + + toStoreOrr = a1 - sinResult; + toStore = a1 + sinResult; + r7 = a2 - cosResult; + r8 = a2 + cosResult; + + if (toStoreOrr < 0) + toStoreOrr = 0; + if (toStore > 0xF0) + toStore = 0xF0; + if (r7 < 0) + r7 = 0; + if (r8 > 0x9F) + r8 = 0x9F; + + toStore |= (toStoreOrr << 8); + array[r7] = toStore; + array[r8] = toStore; + + cosResult = Cos(i + 1, a3); + r3 = a2 - cosResult; + r2 = a2 + cosResult; + + if (r3 < 0) + r3 = 0; + if (r2 > 0x9F) + r2 = 0x9F; + + while (r7 > r3) + array[--r7] = toStore; + while (r7 < r3) + array[++r7] = toStore; + + while (r8 > r2) + array[--r8] = toStore; + while (r8 < r2) + array[++r8] = toStore; + } +} + +void sub_814A1AC(s16 *data, s16 a1, s16 a2, s16 a3, s16 a4, s16 a5, s16 a6) +{ + data[0] = a1; + data[1] = a2; + data[2] = a1; + data[3] = a2; + data[4] = a3; + data[5] = a4; + data[6] = a5; + data[7] = a6; + data[8] = a3 - a1; + if (data[8] < 0) + { + data[8] = -data[8]; + data[6] = -a5; + } + data[9] = a4 - a2; + if (data[9] < 0) + { + data[9] = -data[9]; + data[7] = -a6; + } + data[10] = 0; +} + +bool8 sub_814A228(s16 *data, bool8 a1, bool8 a2) +{ + u8 var; + if (data[8] > data[9]) + { + data[2] += data[6]; + data[10] += data[9]; + if (data[10] > data[8]) + { + data[3] += data[7]; + data[10] -= data[8]; + } + } + else + { + data[3] += data[7]; + data[10] += data[8]; + if (data[10] > data[9]) + { + data[2] += data[6]; + data[10] -= data[9]; + } + } + var = 0; + if ((data[6] > 0 && data[2] >= data[4]) || (data[6] < 0 && data[2] <= data[4])) + { + var++; + if (a1) + data[2] = data[4]; + } + if ((data[7] > 0 && data[3] >= data[5]) || (data[7] < 0 && data[3] <= data[5])) + { + var++; + if (a2) + data[3] = data[5]; + } + + if (var == 2) + return TRUE; + else + return FALSE; +} + +// sub-task for phase2 of a couple of new transitions +#define tData1 data[1] +#define tData2 data[2] +#define tData3 data[3] +#define tData4 data[4] +#define tData5 data[5] +#define tData6 data[6] +#define tData7 data[7] + +bool8 Phase2_29_Func1(struct Task *task) +{ + u16 *dst1, *dst2; + + sub_814669C(task); + sub_8149F58(&dst1, &dst2); + CpuFill16(0, dst1, 0x800); + LZ77UnCompVram(gUnknown_085C7C00, dst2); + LoadPalette(gUnknown_085C7BE0, 0xF0, 0x20); + + task->tState++; + return FALSE; +} + +bool8 Phase2_29_Func2(struct Task *task) +{ + u16 *dst1, *dst2; + + sub_8149F58(&dst1, &dst2); + LZ77UnCompVram(gUnknown_085C828C, dst1); + sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 0x84, task->tData5, 160); + + task->tState++; + return TRUE; +} + +void Phase2Task_29(u8 taskId) +{ + while (sPhase2_29_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +void Phase2Task_30(u8 taskId) +{ + while (sPhase2_30_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +bool8 Phase2_30_Func1(struct Task *task) +{ + u16 *dst1, *dst2; + + sub_8149F08(); + dp12_8087EA4(); + ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON | DISPCNT_WIN1_ON); + task->data[2] = 0x2000; + task->data[1] = 0x7FFF; + task->data[5] = 0; + task->data[6] = 16; + task->data[7] = 2560; + sTransitionStructPtr->BLDCNT = 0x3F41; + sTransitionStructPtr->BLDALPHA = (task->tData6 << 8) | (task->tData5); + REG_BLDCNT = sTransitionStructPtr->BLDCNT; + REG_BLDALPHA = sTransitionStructPtr->BLDALPHA; + sub_8149F58(&dst1, &dst2); + CpuFill16(0, dst1, 0x800); + LZ77UnCompVram(gUnknown_085C7C00, dst2); + LoadPalette(gUnknown_085C7BE0, 0xF0, 0x20); + sTransitionStructPtr->field_16 = 0; + + task->tState++; + return FALSE; +} + +bool8 Phase2_30_Func2(struct Task *task) +{ + u16 *dst1, *dst2; + + sub_8149F58(&dst1, &dst2); + LZ77UnCompVram(gUnknown_085C828C, dst1); + + task->tState++; + return TRUE; +} + +bool8 Phase2_30_Func3(struct Task *task) +{ + u8 i; + + for (i = 0; i < 160; i++) + { + gUnknown_02038C28[1][i] = sTransitionStructPtr->field_16; + } + + SetVBlankCallback(VBlankCB_Phase2_30); + SetHBlankCallback(HBlankCB_Phase2_30); + EnableInterrupts(INTR_FLAG_HBLANK); + + task->tState++; + return TRUE; +} + +bool8 Phase2_30_Func4(struct Task *task) +{ + u8 i; + u16 var6, amplitude, var8; + + sTransitionStructPtr->VBlank_DMA = FALSE; + + amplitude = task->tData2 >> 8; + var6 = task->tData1; + var8 = 384; + + task->tData1 = var6 - task->tData7; + + if (task->tData3 >= 70) + { + if (task->tData2 - 384 >= 0) + task->tData2 -= 384; + else + task->tData2 = 0; + } + + if (task->tData3 >= 0 && task->tData3 % 3 == 0) + { + if (task->tData5 < 16) + task->tData5++; + else if (task->tData6 > 0) + task->tData6--; + + sTransitionStructPtr->BLDALPHA = (task->tData6 << 8) | (task->tData5); + } + + for (i = 0; i < 160; i++, var6 += var8) + { + s16 index = var6 / 256; + asm(""); + gUnknown_02038C28[0][i] = sTransitionStructPtr->field_16 + Sin(index, amplitude); + } + + if (++task->tData3 == 101) + { + task->tData4++; + BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + } + + if (task->tData4 != 0 && !gPaletteFade.active) + DestroyTask(FindTaskIdByFunc(Phase2Task_30)); + + task->tData7 -= 17; + sTransitionStructPtr->VBlank_DMA++; + return FALSE; +} + +void VBlankCB_Phase2_30(void) +{ + VBlankCB_BattleTransition(); + REG_BLDCNT = sTransitionStructPtr->BLDCNT; + REG_BLDALPHA = sTransitionStructPtr->BLDALPHA; + + if (sTransitionStructPtr->VBlank_DMA) + DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320); +} + +void HBlankCB_Phase2_30(void) +{ + u16 var = gUnknown_02038C28[1][REG_VCOUNT]; + REG_BG0VOFS = var; +} + +void Phase2Task_31(u8 taskId) +{ + while (sPhase2_31_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +void Phase2Task_33(u8 taskId) +{ + while (sPhase2_33_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +void Phase2Task_32(u8 taskId) +{ + while (sPhase2_32_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +#undef tData1 +#undef tData2 +#undef tData3 +#undef tData4 +#undef tData5 +#undef tData6 +#undef tData7 diff --git a/src/tileset_anims.c b/src/tileset_anims.c index 4ad787e1c8..0626472026 100644 --- a/src/tileset_anims.c +++ b/src/tileset_anims.c @@ -5,6 +5,7 @@ #include "blend_palette.h" #include "battle_transition.h" #include "task.h" +#include "battle_transition.h" // Static type declarations @@ -1392,7 +1393,7 @@ static void sub_80A1818(u16 a1) { CpuCopy16(gTilesetAnims_BattleDomePals0[a1 & 0x3], gPlttBufferUnfaded + 0x80, 32); BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); - if ((u8)FindTaskIdByFunc(sub_8149DFC) != 0xFF ) + if ((u8)FindTaskIdByFunc(Phase1_Task_RunFuncs) != 0xFF ) { sSecondaryTilesetCB = sub_80A1670; sSecondaryTilesetCBBufferSize = 0x20; @@ -1402,7 +1403,7 @@ static void sub_80A1818(u16 a1) static void sub_80A1884(u16 a1) { CpuCopy16(gTilesetAnims_BattleDomePals0[a1 & 0x3], gPlttBufferUnfaded + 0x80, 32); - if ((u8)FindTaskIdByFunc(sub_8149DFC) == 0xFF ) + if ((u8)FindTaskIdByFunc(Phase1_Task_RunFuncs) == 0xFF ) { BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); if (!--sSecondaryTilesetCBBufferSize) From d7644cd3d8070cb12c84263a4707ec0211bd434a Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 14 Jan 2018 22:09:35 +0100 Subject: [PATCH 10/64] battle transition is decompiled --- asm/battle_transition.s | 859 ---------------------- include/battle_transition.h | 11 +- include/bg.h | 2 +- ld_script.txt | 1 - src/battle_transition.c | 1386 +++++++++++++++++++++-------------- src/tileset_anims.c | 4 +- 6 files changed, 861 insertions(+), 1402 deletions(-) delete mode 100644 asm/battle_transition.s diff --git a/asm/battle_transition.s b/asm/battle_transition.s deleted file mode 100644 index eb87f05631..0000000000 --- a/asm/battle_transition.s +++ /dev/null @@ -1,859 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start Phase2_31_Func1 -Phase2_31_Func1: @ 814A798 - push {r4-r6,lr} - mov r6, r8 - push {r6} - sub sp, 0x14 - mov r8, r0 - add r1, sp, 0x10 - add r0, sp, 0xC - bl sub_8149F58 - ldr r0, =gUnknown_085C8598 - ldr r1, [sp, 0x10] - bl LZ77UnCompVram - movs r4, 0x20 - str r4, [sp] - str r4, [sp, 0x4] - movs r0, 0 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - movs r6, 0x1 - str r6, [sp] - str r4, [sp, 0x4] - movs r5, 0xF - str r5, [sp, 0x8] - movs r0, 0 - movs r1, 0x1 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect - str r6, [sp] - str r4, [sp, 0x4] - str r5, [sp, 0x8] - movs r0, 0 - movs r1, 0x1 - movs r2, 0x1D - movs r3, 0 - bl FillBgTilemapBufferRect - movs r0, 0 - bl CopyBgTilemapBufferToVram - ldr r0, =gUnknown_085C8578 - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - movs r0, 0 - mov r1, r8 - strh r6, [r1, 0xC] - strh r0, [r1, 0xE] - strh r0, [r1, 0x10] - movs r0, 0xA - strh r0, [r1, 0x16] - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - movs r0, 0 - add sp, 0x14 - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end Phase2_31_Func1 - - thumb_func_start Phase2_31_Func2 -Phase2_31_Func2: @ 814A828 - push {r4,r5,lr} - sub sp, 0x24 - adds r4, r0, 0 - ldr r1, =gUnknown_085C8928 - movs r2, 0x4 - str r2, [sp] - str r2, [sp, 0x4] - ldrb r0, [r4, 0xC] - str r0, [sp, 0x8] - ldrb r0, [r4, 0xE] - str r0, [sp, 0xC] - str r2, [sp, 0x10] - str r2, [sp, 0x14] - movs r0, 0xF - str r0, [sp, 0x18] - movs r5, 0 - str r5, [sp, 0x1C] - str r5, [sp, 0x20] - movs r0, 0 - movs r2, 0 - movs r3, 0 - bl CopyRectToBgTilemapBufferRect - movs r0, 0 - bl CopyBgTilemapBufferToVram - ldrh r0, [r4, 0xC] - adds r0, 0x4 - strh r0, [r4, 0xC] - ldrh r0, [r4, 0x10] - adds r0, 0x1 - strh r0, [r4, 0x10] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x7 - bne _0814A88A - movs r0, 0x1 - strh r0, [r4, 0xC] - ldrh r0, [r4, 0xE] - adds r0, 0x4 - strh r0, [r4, 0xE] - strh r5, [r4, 0x10] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x13 - ble _0814A88A - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_0814A88A: - movs r0, 0 - add sp, 0x24 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end Phase2_31_Func2 - - thumb_func_start Phase2_31_Func3 -Phase2_31_Func3: @ 814A898 - push {r4-r6,lr} - sub sp, 0x10 - adds r4, r0, 0 - add r1, sp, 0xC - add r0, sp, 0x8 - bl sub_8149F58 - ldrh r0, [r4, 0x14] - adds r1, r0, 0x1 - strh r1, [r4, 0x14] - lsls r0, 16 - asrs r0, 16 - movs r2, 0x16 - ldrsh r1, [r4, r2] - cmp r0, r1 - blt _0814A956 - movs r1, 0x12 - ldrsh r0, [r4, r1] - cmp r0, 0x1 - beq _0814A8FC - cmp r0, 0x1 - bgt _0814A8CA - cmp r0, 0 - beq _0814A8D4 - b _0814A92C -_0814A8CA: - cmp r0, 0x2 - beq _0814A914 - cmp r0, 0x3 - beq _0814A91C - b _0814A92C -_0814A8D4: - movs r2, 0xFA - ldr r6, =gPlttBufferUnfaded - movs r3, 0 - ldr r5, =gPlttBufferFaded -_0814A8DC: - lsls r1, r2, 1 - adds r0, r1, r6 - strh r3, [r0] - adds r1, r5 - strh r3, [r1] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0xFE - bls _0814A8DC - b _0814A94C - .pool -_0814A8FC: - ldr r0, =0xffff7fff - movs r1, 0x10 - movs r2, 0 - bl BlendPalettes - ldr r0, =gUnknown_085C86F4 - b _0814A91E - .pool -_0814A914: - ldr r0, =gUnknown_085C87F4 - b _0814A91E - .pool -_0814A91C: - ldr r0, =gUnknown_085C88A4 -_0814A91E: - ldr r1, [sp, 0xC] - bl LZ77UnCompVram - b _0814A94C - .pool -_0814A92C: - movs r0, 0x20 - str r0, [sp] - str r0, [sp, 0x4] - movs r0, 0 - movs r1, 0x1 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - movs r0, 0 - bl CopyBgTilemapBufferToVram - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _0814A956 -_0814A94C: - movs r0, 0 - strh r0, [r4, 0x14] - ldrh r0, [r4, 0x12] - adds r0, 0x1 - strh r0, [r4, 0x12] -_0814A956: - movs r0, 0 - add sp, 0x10 - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end Phase2_31_Func3 - - thumb_func_start Phase2_33_Func1 -Phase2_33_Func1: @ 814A960 - push {r4-r6,lr} - mov r6, r8 - push {r6} - sub sp, 0x14 - mov r8, r0 - add r1, sp, 0x10 - add r0, sp, 0xC - bl sub_8149F58 - ldr r0, =gUnknown_085C8598 - ldr r1, [sp, 0x10] - bl LZ77UnCompVram - movs r4, 0x20 - str r4, [sp] - str r4, [sp, 0x4] - movs r0, 0 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - movs r6, 0x1 - str r6, [sp] - str r4, [sp, 0x4] - movs r5, 0xF - str r5, [sp, 0x8] - movs r0, 0 - movs r1, 0x1 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect - str r6, [sp] - str r4, [sp, 0x4] - str r5, [sp, 0x8] - movs r0, 0 - movs r1, 0x1 - movs r2, 0x1D - movs r3, 0 - bl FillBgTilemapBufferRect - movs r0, 0 - bl CopyBgTilemapBufferToVram - ldr r4, =gUnknown_085C8578 - adds r0, r4, 0 - movs r1, 0xE0 - movs r2, 0x20 - bl LoadPalette - adds r0, r4, 0 - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - movs r0, 0xE0 - movs r1, 0x10 - movs r2, 0x8 - movs r3, 0 - bl BlendPalette - movs r1, 0 - movs r0, 0x22 - mov r2, r8 - strh r0, [r2, 0xC] - strh r1, [r2, 0xE] - ldrh r0, [r2, 0x8] - adds r0, 0x1 - strh r0, [r2, 0x8] - movs r0, 0 - add sp, 0x14 - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end Phase2_33_Func1 - - thumb_func_start Phase2_33_Func2 -Phase2_33_Func2: @ 814AA04 - push {r4-r6,lr} - sub sp, 0x24 - adds r6, r0, 0 - ldr r1, =gUnknown_085C9A30 - movs r2, 0xC - ldrsh r0, [r6, r2] - adds r0, r1 - ldrb r5, [r0] - adds r0, r5, 0 - movs r1, 0x7 - bl __umodsi3 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - adds r0, r5, 0 - movs r1, 0x7 - bl __udivsi3 - ldr r1, =gUnknown_085C8928 - movs r2, 0x4 - str r2, [sp] - str r2, [sp, 0x4] - lsls r4, 2 - adds r4, 0x1 - lsls r4, 24 - lsrs r4, 24 - str r4, [sp, 0x8] - lsls r0, 26 - lsrs r0, 24 - str r0, [sp, 0xC] - str r2, [sp, 0x10] - str r2, [sp, 0x14] - movs r0, 0xF - str r0, [sp, 0x18] - movs r0, 0 - str r0, [sp, 0x1C] - str r0, [sp, 0x20] - movs r2, 0 - movs r3, 0 - bl CopyRectToBgTilemapBufferRect - movs r0, 0 - bl CopyBgTilemapBufferToVram - ldrh r0, [r6, 0xC] - subs r0, 0x1 - strh r0, [r6, 0xC] - lsls r0, 16 - cmp r0, 0 - bge _0814AA70 - ldrh r0, [r6, 0x8] - adds r0, 0x1 - strh r0, [r6, 0x8] -_0814AA70: - movs r0, 0 - add sp, 0x24 - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end Phase2_33_Func2 - - thumb_func_start Phase2_33_Func3 -Phase2_33_Func3: @ 814AA84 - push {r4,lr} - adds r4, r0, 0 - movs r0, 0xE0 - movs r1, 0x10 - movs r2, 0x3 - movs r3, 0 - bl BlendPalette - ldr r0, =0xffff3fff - movs r1, 0x10 - movs r2, 0 - bl BlendPalettes - movs r0, 0 - strh r0, [r4, 0xC] - strh r0, [r4, 0xE] - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end Phase2_33_Func3 - - thumb_func_start Phase2_33_Func4 -Phase2_33_Func4: @ 814AAB8 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x24 - adds r7, r0, 0 - ldrh r0, [r7, 0xE] - movs r1, 0x1 - eors r0, r1 - movs r6, 0 - strh r0, [r7, 0xE] - cmp r0, 0 - beq _0814AB2C - ldr r0, =gUnknown_085C8928 - mov r8, r0 - movs r4, 0x4 - str r4, [sp] - str r4, [sp, 0x4] - ldr r5, =gUnknown_085C9A30 - movs r1, 0xC - ldrsh r0, [r7, r1] - adds r0, r5 - ldrb r0, [r0] - movs r1, 0x7 - bl __umodsi3 - lsls r0, 24 - lsrs r0, 22 - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0x8] - movs r2, 0xC - ldrsh r0, [r7, r2] - adds r0, r5 - ldrb r0, [r0] - movs r1, 0x7 - bl __udivsi3 - lsls r0, 26 - lsrs r0, 24 - str r0, [sp, 0xC] - str r4, [sp, 0x10] - str r4, [sp, 0x14] - movs r0, 0xE - str r0, [sp, 0x18] - str r6, [sp, 0x1C] - str r6, [sp, 0x20] - movs r0, 0 - mov r1, r8 - movs r2, 0 - movs r3, 0 - bl CopyRectToBgTilemapBufferRect - b _0814AB78 - .pool -_0814AB2C: - movs r1, 0xC - ldrsh r0, [r7, r1] - cmp r0, 0 - ble _0814AB72 - ldr r1, =gUnknown_085C9A30 - subs r0, 0x1 - adds r0, r1 - ldrb r5, [r0] - adds r0, r5, 0 - movs r1, 0x7 - bl __umodsi3 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 22 - adds r4, 0x1 - lsls r4, 24 - lsrs r4, 24 - adds r0, r5, 0 - movs r1, 0x7 - bl __udivsi3 - adds r3, r0, 0 - lsls r3, 26 - lsrs r3, 24 - movs r0, 0x4 - str r0, [sp] - str r0, [sp, 0x4] - movs r0, 0xF - str r0, [sp, 0x8] - movs r0, 0 - movs r1, 0x1 - adds r2, r4, 0 - bl FillBgTilemapBufferRect -_0814AB72: - ldrh r0, [r7, 0xC] - adds r0, 0x1 - strh r0, [r7, 0xC] -_0814AB78: - movs r1, 0xC - ldrsh r0, [r7, r1] - cmp r0, 0x22 - ble _0814AB86 - ldrh r0, [r7, 0x8] - adds r0, 0x1 - strh r0, [r7, 0x8] -_0814AB86: - movs r0, 0 - bl CopyBgTilemapBufferToVram - movs r0, 0 - add sp, 0x24 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end Phase2_33_Func4 - - thumb_func_start Phase2_31_33_Func5 -Phase2_31_33_Func5: @ 814ABA0 - push {r4,lr} - sub sp, 0x8 - adds r4, r0, 0 - movs r0, 0x20 - str r0, [sp] - str r0, [sp, 0x4] - movs r0, 0 - movs r1, 0x1 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - movs r0, 0 - bl CopyBgTilemapBufferToVram - movs r0, 0x1 - negs r0, r0 - movs r1, 0x10 - movs r2, 0 - bl BlendPalettes - ldr r0, [r4] - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask - movs r0, 0 - add sp, 0x8 - pop {r4} - pop {r1} - bx r1 - thumb_func_end Phase2_31_33_Func5 - - thumb_func_start sub_814ABE4 -sub_814ABE4: @ 814ABE4 - push {r4-r6,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r6, r1, r2 - ldrh r0, [r6, 0xC] - movs r1, 0x1 - eors r0, r1 - strh r0, [r6, 0xC] - cmp r0, 0 - bne _0814AC24 - ldr r5, =gBattle_BG0_X - ldrh r1, [r5] - movs r0, 0x12 - bl SetGpuReg - ldr r4, =gBattle_BG0_Y - ldrh r1, [r4] - movs r0, 0x10 - bl SetGpuReg - ldrh r0, [r6, 0x8] - ldrh r1, [r5] - adds r0, r1 - strh r0, [r5] - ldrh r0, [r6, 0xA] - ldrh r1, [r4] - adds r0, r1 - strh r0, [r4] -_0814AC24: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_814ABE4 - - thumb_func_start Phase2_32_Func1 -Phase2_32_Func1: @ 814AC38 - push {r4-r6,lr} - sub sp, 0x10 - adds r6, r0, 0 - movs r5, 0 - add r1, sp, 0xC - add r0, sp, 0x8 - bl sub_8149F58 - ldr r0, =gUnknown_085C8598 - ldr r1, [sp, 0xC] - bl LZ77UnCompVram - movs r0, 0x20 - str r0, [sp] - str r0, [sp, 0x4] - movs r0, 0 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - movs r0, 0 - bl CopyBgTilemapBufferToVram - ldr r0, =gUnknown_085C8578 - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - ldr r0, =gBattle_BG0_X - strh r5, [r0] - ldr r4, =gBattle_BG0_Y - strh r5, [r4] - movs r0, 0x12 - movs r1, 0 - bl SetGpuReg - ldrh r1, [r4] - movs r0, 0x10 - bl SetGpuReg - strh r5, [r6, 0xC] - ldr r0, =sub_814ABE4 - movs r1, 0x1 - bl CreateTask - lsls r0, 24 - lsrs r5, r0, 24 - bl Random - lsls r0, 16 - movs r1, 0xC0 - lsls r1, 10 - ands r1, r0 - lsrs r1, 16 - cmp r1, 0x1 - beq _0814ACE4 - cmp r1, 0x1 - bgt _0814ACC8 - cmp r1, 0 - beq _0814ACCE - b _0814AD1C - .pool -_0814ACC8: - cmp r1, 0x2 - beq _0814AD00 - b _0814AD1C -_0814ACCE: - ldr r0, =gTasks - lsls r1, r5, 2 - adds r1, r5 - lsls r1, 3 - adds r1, r0 - movs r0, 0x1 - strh r0, [r1, 0x8] - strh r0, [r1, 0xA] - b _0814AD2E - .pool -_0814ACE4: - ldr r1, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r1 - ldr r1, =0x0000ffff - strh r1, [r0, 0x8] - movs r1, 0x1 - negs r1, r1 - b _0814AD2C - .pool -_0814AD00: - ldr r1, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r1 - movs r1, 0x1 - strh r1, [r0, 0x8] - ldr r1, =0x0000ffff - b _0814AD2C - .pool -_0814AD1C: - ldr r1, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r1 - ldr r1, =0x0000ffff - strh r1, [r0, 0x8] - movs r1, 0x1 -_0814AD2C: - strh r1, [r0, 0xA] -_0814AD2E: - ldrh r0, [r6, 0x8] - adds r0, 0x1 - strh r0, [r6, 0x8] - movs r0, 0 - add sp, 0x10 - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end Phase2_32_Func1 - - thumb_func_start Phase2_32_Func2 -Phase2_32_Func2: @ 814AD48 - push {r4,lr} - sub sp, 0x24 - adds r4, r0, 0 - ldr r1, =gUnknown_085C9A53 - movs r2, 0xC - ldrsh r0, [r4, r2] - adds r0, r1 - ldrb r3, [r0] - lsrs r2, r3, 3 - movs r0, 0x7 - ands r3, r0 - ldr r1, =gUnknown_085C8928 - movs r0, 0x4 - str r0, [sp] - str r0, [sp, 0x4] - lsls r2, 2 - adds r2, 0x1 - str r2, [sp, 0x8] - lsls r3, 2 - str r3, [sp, 0xC] - str r0, [sp, 0x10] - str r0, [sp, 0x14] - movs r0, 0xF - str r0, [sp, 0x18] - movs r0, 0 - str r0, [sp, 0x1C] - str r0, [sp, 0x20] - movs r2, 0 - movs r3, 0 - bl CopyRectToBgTilemapBufferRect - movs r0, 0 - bl CopyBgTilemapBufferToVram - ldrh r0, [r4, 0xC] - adds r0, 0x1 - strh r0, [r4, 0xC] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3F - ble _0814ADA0 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_0814ADA0: - movs r0, 0 - add sp, 0x24 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end Phase2_32_Func2 - - thumb_func_start Phase2_32_Func3 -Phase2_32_Func3: @ 814ADB4 - push {r4,lr} - adds r4, r0, 0 - ldr r0, =0xffff7fff - movs r1, 0x10 - movs r2, 0 - bl BlendPalettes - movs r0, 0 - strh r0, [r4, 0xC] - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end Phase2_32_Func3 - - thumb_func_start Phase2_32_Func4 -Phase2_32_Func4: @ 814ADD8 - push {r4,lr} - sub sp, 0xC - adds r4, r0, 0 - ldr r1, =gUnknown_085C9A53 - movs r2, 0xC - ldrsh r0, [r4, r2] - adds r0, r1 - ldrb r3, [r0] - lsrs r2, r3, 3 - movs r0, 0x7 - ands r3, r0 - lsls r2, 2 - adds r2, 0x1 - lsls r3, 2 - movs r0, 0x4 - str r0, [sp] - str r0, [sp, 0x4] - movs r0, 0xF - str r0, [sp, 0x8] - movs r0, 0 - movs r1, 0x1 - bl FillBgTilemapBufferRect - movs r0, 0 - bl CopyBgTilemapBufferToVram - ldrh r0, [r4, 0xC] - adds r0, 0x1 - strh r0, [r4, 0xC] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3F - ble _0814AE2E - ldr r0, =sub_814ABE4 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_0814AE2E: - movs r0, 0 - add sp, 0xC - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end Phase2_32_Func4 - - thumb_func_start Phase2_32_Func5 -Phase2_32_Func5: @ 814AE40 - push {r4,r5,lr} - sub sp, 0x8 - adds r5, r0, 0 - ldr r0, =gBattle_BG0_X - movs r1, 0 - strh r1, [r0] - ldr r4, =gBattle_BG0_Y - strh r1, [r4] - movs r0, 0x12 - movs r1, 0 - bl SetGpuReg - ldrh r1, [r4] - movs r0, 0x10 - bl SetGpuReg - movs r0, 0x20 - str r0, [sp] - str r0, [sp, 0x4] - movs r0, 0 - movs r1, 0x1 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - movs r0, 0 - bl CopyBgTilemapBufferToVram - movs r0, 0x1 - negs r0, r0 - movs r1, 0x10 - movs r2, 0 - bl BlendPalettes - ldr r0, [r5] - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] - movs r0, 0 - add sp, 0x8 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end Phase2_32_Func5 - - .align 2, 0 @ Don't pad with nop. diff --git a/include/battle_transition.h b/include/battle_transition.h index cd4cdd1b3a..0d6ef3c83e 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -2,11 +2,14 @@ #define GUARD_BATTLE_TRANSITION_H void TestBattleTransition(u8 transitionId); -void sub_8149DFC(u8 a1); -void BattleTransition_StartOnField(u8 transitionID); -void BattleTransition_Start(u8 transitionID); +void BattleTransition_StartOnField(u8 transitionId); +void BattleTransition_Start(u8 transitionId); bool8 IsBattleTransitionDone(void); -void Phase1_Task_RunFuncs(u8 taskId); +bool8 FldEff_Pokeball(void); +void TransitionPhase1_Task_RunFuncs(u8 taskId); +void sub_8149F58(u16 **a0, u16 **a1); + +extern const struct SpritePalette gFieldEffectObjectPaletteInfo10; enum // TRANSITION_MUGSHOT { diff --git a/include/bg.h b/include/bg.h index 0c6b4ac26b..de3897fa40 100644 --- a/include/bg.h +++ b/include/bg.h @@ -70,7 +70,7 @@ void CopyToBgTilemapBuffer(u8 bg, const void *src, u16 mode, u16 destOffset); void CopyBgTilemapBufferToVram(u8 bg); void CopyToBgTilemapBufferRect(u8 bg, void* src, u8 destX, u8 destY, u8 width, u8 height); void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette); -void CopyRectToBgTilemapBufferRect(u8 bg, void* src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2); +void CopyRectToBgTilemapBufferRect(u8 bg, const void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2); void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height); void FillBgTilemapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette); void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 width, u8 height, u8 paletteSlot, s16 tileNumDelta); diff --git a/ld_script.txt b/ld_script.txt index c74413f19f..49a87503a7 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -197,7 +197,6 @@ SECTIONS { src/landmark.o(.text); asm/fldeff_strength.o(.text); src/battle_transition.o(.text); - asm/battle_transition.o(.text); src/battle_controller_link_partner.o(.text); src/battle_message.o(.text); asm/cable_car.o(.text); diff --git a/src/battle_transition.c b/src/battle_transition.c index def3028890..af156da12e 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -18,6 +18,8 @@ #include "malloc.h" #include "gpu_regs.h" #include "decompress.h" +#include "bg.h" +#include "blend_palette.h" struct TransitionData { @@ -56,6 +58,8 @@ typedef bool8 (*TransitionSpriteCallback)(struct Sprite *sprite); extern u16 gUnknown_020393A8[]; extern u16 gUnknown_02038C28[][0x3C0]; +extern u16 gBattle_BG0_X; +extern u16 gBattle_BG0_Y; extern const struct OamData gFieldObjectBaseOam_32x32; @@ -64,206 +68,205 @@ extern void sub_80AC3D0(void); extern void dp12_8087EA4(void); // this file's functions -void LaunchBattleTransitionTask(u8 transitionId); -void Task_BattleTransitionMain(u8 taskId); -void Phase1Task_TransitionAll(u8 taskId); -void Phase2Task_Blur(u8 taskId); -void Phase2Task_Swirl(u8 taskId); -void Phase2Task_Shuffle(u8 taskId); -void Phase2Task_BigPokeball(u8 taskId); -void Phase2Task_PokeballsTrail(u8 taskId); -void Phase2Task_Clockwise_BlackFade(u8 taskId); -void Phase2Task_Ripple(u8 taskId); -void Phase2Task_Wave(u8 taskId); -void Phase2Task_Slice(u8 taskId); -void Phase2Task_WhiteFade(u8 taskId); -void Phase2Task_GridSquares(u8 taskId); -void Phase2Task_Shards(u8 taskId); -void Phase2Task_Sydney(u8 taskId); -void Phase2Task_Phoebe(u8 taskId); -void Phase2Task_Glacia(u8 taskId); -void Phase2Task_Drake(u8 taskId); -void Phase2Task_Champion(u8 taskId); -void Phase2Task_Aqua(u8 taskId); -void Phase2Task_Magma(u8 taskId); -void Phase2Task_Regice(u8 taskId); -void Phase2Task_Registeel(u8 taskId); -void Phase2Task_Regirock(u8 taskId); -void Phase2Task_Kyogre(u8 taskId); -void Phase2Task_Groudon(u8 taskId); -void Phase2Task_Rayquaza(u8 taskId); -void Phase2Task_ShredSplit(u8 taskId); -void Phase2Task_Blackhole1(u8 taskId); -void Phase2Task_Blackhole2(u8 taskId); -void Phase2Task_RectangularSpiral(u8 taskId); -void Phase2Task_29(u8 taskId); -void Phase2Task_30(u8 taskId); -void Phase2Task_31(u8 taskId); -void Phase2Task_32(u8 taskId); -void Phase2Task_33(u8 taskId); -void VBlankCB_BattleTransition(void); -void VBlankCB_Phase2_Swirl(void); -void HBlankCB_Phase2_Swirl(void); -void VBlankCB_Phase2_Shuffle(void); -void HBlankCB_Phase2_Shuffle(void); -void VBlankCB0_Phase2_BigPokeball(void); -void VBlankCB1_Phase2_BigPokeball(void); -void VBlankCB_Phase2_Clockwise_BlackFade(void); -void VBlankCB_Phase2_Ripple(void); -void HBlankCB_Phase2_Ripple(void); -void VBlankCB_Phase2_30(void); -void HBlankCB_Phase2_30(void); -void VBlankCB_Phase2_Wave(void); -void VBlankCB_Phase2_Slice(void); -void HBlankCB_Phase2_Slice(void); -void VBlankCB0_Phase2_WhiteFade(void); -void VBlankCB1_Phase2_WhiteFade(void); -void HBlankCB_Phase2_WhiteFade(void); -void VBlankCB_Phase2_Shards(void); -void VBlankCB_Phase2_Rayquaza(void); -bool8 Phase2_Blur_Func1(struct Task *task); -bool8 Phase2_Blur_Func2(struct Task *task); -bool8 Phase2_Blur_Func3(struct Task *task); -bool8 Phase2_Swirl_Func1(struct Task *task); -bool8 Phase2_Swirl_Func2(struct Task *task); -bool8 Phase2_Shuffle_Func1(struct Task *task); -bool8 Phase2_Shuffle_Func2(struct Task *task); -bool8 Phase2_Aqua_Func1(struct Task *task); -bool8 Phase2_Aqua_Func2(struct Task *task); -bool8 Phase2_Magma_Func1(struct Task *task); -bool8 Phase2_Magma_Func2(struct Task *task); -bool8 Phase2_FramesCountdown(struct Task *task); -bool8 Phase2_Regi_Func1(struct Task *task); -bool8 Phase2_Regice_Func2(struct Task *task); -bool8 Phase2_Registeel_Func2(struct Task *task); -bool8 Phase2_Regirock_Func2(struct Task *task); -bool8 Phase2_WeatherTrio_Func1(struct Task *task); -bool8 Phase2_WaitPaletteFade(struct Task *task); -bool8 Phase2_Kyogre_Func3(struct Task *task); -bool8 Phase2_Kyogre_Func4(struct Task *task); -bool8 Phase2_Kyogre_Func5(struct Task *task); -bool8 Phase2_Groudon_Func3(struct Task *task); -bool8 Phase2_Groudon_Func4(struct Task *task); -bool8 Phase2_Groudon_Func5(struct Task *task); -bool8 Phase2_WeatherDuo_Func6(struct Task *task); -bool8 Phase2_WeatherDuo_Func7(struct Task *task); -bool8 Phase2_BigPokeball_Func1(struct Task *task); -bool8 Phase2_BigPokeball_Func2(struct Task *task); -bool8 Phase2_BigPokeball_Func3(struct Task *task); -bool8 Phase2_BigPokeball_Func4(struct Task *task); -bool8 Phase2_BigPokeball_Func5(struct Task *task); -bool8 Phase2_BigPokeball_Func6(struct Task *task); -bool8 Phase2_PokeballsTrail_Func1(struct Task *task); -bool8 Phase2_PokeballsTrail_Func2(struct Task *task); -bool8 Phase2_PokeballsTrail_Func3(struct Task *task); -bool8 Phase2_Clockwise_BlackFade_Func1(struct Task *task); -bool8 Phase2_Clockwise_BlackFade_Func2(struct Task *task); -bool8 Phase2_Clockwise_BlackFade_Func3(struct Task *task); -bool8 Phase2_Clockwise_BlackFade_Func4(struct Task *task); -bool8 Phase2_Clockwise_BlackFade_Func5(struct Task *task); -bool8 Phase2_Clockwise_BlackFade_Func6(struct Task *task); -bool8 Phase2_Clockwise_BlackFade_Func7(struct Task *task); -bool8 Phase2_Ripple_Func1(struct Task *task); -bool8 Phase2_Ripple_Func2(struct Task *task); -bool8 Phase2_Wave_Func1(struct Task *task); -bool8 Phase2_Wave_Func2(struct Task *task); -bool8 Phase2_Wave_Func3(struct Task *task); -bool8 Phase2_Slice_Func1(struct Task *task); -bool8 Phase2_Slice_Func2(struct Task *task); -bool8 Phase2_Slice_Func3(struct Task *task); -bool8 Phase2_WhiteFade_Func1(struct Task *task); -bool8 Phase2_WhiteFade_Func2(struct Task *task); -bool8 Phase2_WhiteFade_Func3(struct Task *task); -bool8 Phase2_WhiteFade_Func4(struct Task *task); -bool8 Phase2_WhiteFade_Func5(struct Task *task); -bool8 Phase2_GridSquares_Func1(struct Task *task); -bool8 Phase2_GridSquares_Func2(struct Task *task); -bool8 Phase2_GridSquares_Func3(struct Task *task); -bool8 Phase2_Shards_Func1(struct Task *task); -bool8 Phase2_Shards_Func2(struct Task *task); -bool8 Phase2_Shards_Func3(struct Task *task); -bool8 Phase2_Shards_Func4(struct Task *task); -bool8 Phase2_Shards_Func5(struct Task *task); -bool8 Phase2_ShredSplit_Func1(struct Task *task); -bool8 Phase2_ShredSplit_Func2(struct Task *task); -bool8 Phase2_ShredSplit_Func3(struct Task *task); -bool8 Phase2_ShredSplit_Func4(struct Task *task); -bool8 Phase2_Blackhole_Func1(struct Task *task); -bool8 Phase2_Blackhole1_Func2(struct Task *task); -bool8 Phase2_Blackhole1_Func3(struct Task *task); -bool8 Phase2_Blackhole2_Func2(struct Task *task); -bool8 Phase2_RectangularSpiral_Func1(struct Task *task); -bool8 Phase2_RectangularSpiral_Func2(struct Task *task); -bool8 Phase2_RectangularSpiral_Func3(struct Task *task); -bool8 Phase2_29_Func1(struct Task *task); -bool8 Phase2_29_Func2(struct Task *task); -bool8 Phase2_30_Func1(struct Task *task); -bool8 Phase2_30_Func2(struct Task *task); -bool8 Phase2_30_Func3(struct Task *task); -bool8 Phase2_30_Func4(struct Task *task); -bool8 Phase2_Rayquaza_Func3(struct Task *task); -bool8 Phase2_Rayquaza_Func4(struct Task *task); -bool8 Phase2_Rayquaza_Func5(struct Task *task); -bool8 Phase2_Rayquaza_Func6(struct Task *task); -bool8 Phase2_Rayquaza_Func7(struct Task *task); -bool8 Phase2_Rayquaza_Func8(struct Task *task); -bool8 Phase2_Rayquaza_Func9(struct Task *task); -bool8 Phase2_31_Func1(struct Task *task); -bool8 Phase2_31_Func2(struct Task *task); -bool8 Phase2_31_Func3(struct Task *task); -bool8 Phase2_31_33_Func5(struct Task *task); -bool8 Phase2_33_Func1(struct Task *task); -bool8 Phase2_33_Func2(struct Task *task); -bool8 Phase2_33_Func3(struct Task *task); -bool8 Phase2_33_Func4(struct Task *task); -bool8 Phase2_32_Func1(struct Task *task); -bool8 Phase2_32_Func2(struct Task *task); -bool8 Phase2_32_Func3(struct Task *task); -bool8 Phase2_32_Func4(struct Task *task); -bool8 Phase2_32_Func5(struct Task *task); -bool8 Phase2_Mugshot_Func1(struct Task *task); -bool8 Phase2_Mugshot_Func2(struct Task *task); -bool8 Phase2_Mugshot_Func3(struct Task *task); -bool8 Phase2_Mugshot_Func4(struct Task *task); -bool8 Phase2_Mugshot_Func5(struct Task *task); -bool8 Phase2_Mugshot_Func6(struct Task *task); -bool8 Phase2_Mugshot_Func7(struct Task *task); -bool8 Phase2_Mugshot_Func8(struct Task *task); -bool8 Phase2_Mugshot_Func9(struct Task *task); -bool8 Phase2_Mugshot_Func10(struct Task *task); -void Phase2Task_MugShotTransition(u8 taskId); -void Mugshots_CreateOpponentPlayerSprites(struct Task *task); -void VBlankCB0_Phase2_Mugshots(void); -void VBlankCB1_Phase2_Mugshots(void); -void HBlankCB_Phase2_Mugshots(void); -bool8 Transition_Phase1(struct Task *task); -bool8 Transition_WaitForPhase1(struct Task *task); -bool8 Transition_Phase2(struct Task *task); -bool8 Transition_WaitForPhase2(struct Task *task); -void sub_8149F08(void); -void sub_8149F84(void); -void CreatePhase1Task(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4); -void sub_814A014(u16 *a0, s16 a1, s16 a2, s16 a3); -void sub_8149F98(s16 *array, s16 sinAdd, s16 index, s16 indexIncrementer, s16 amplitude, s16 arrSize); -void sub_8149F58(u16 **a0, u16 **a1); -void sub_8149F40(u16 **a0); -void sub_814A1AC(s16 *a0, s16 a1, s16 a2, s16 a3, s16 a4, s16 a5, s16 a6); -bool8 sub_814A228(s16 *a0, bool8 a1, bool8 a2); -void sub_8148484(s16 spriteId, s16 value); -void sub_814849C(s16 spriteId); -s16 sub_81484B8(s16 spriteId); -bool8 Phase1_TransitionAll_Func1(struct Task *task); -bool8 Phase1_TransitionAll_Func2(struct Task *task); -bool8 IsPhase1Done(void); -bool16 sub_8149048(const s16 * const *arg0, struct StructRectangularSpiral *arg1); -void sub_814713C(struct Sprite *sprite); -void sub_8148380(struct Sprite *sprite); -void sub_8149864(struct Sprite *sprite); -bool8 sub_81483A8(struct Sprite *sprite); -bool8 sub_81483AC(struct Sprite *sprite); -bool8 sub_81483F8(struct Sprite *sprite); -bool8 sub_814842C(struct Sprite *sprite); -bool8 sub_8148458(struct Sprite *sprite); +static void LaunchBattleTransitionTask(u8 transitionId); +static void Task_BattleTransitionMain(u8 taskId); +static void Phase1Task_TransitionAll(u8 taskId); +static void Phase2Task_Blur(u8 taskId); +static void Phase2Task_Swirl(u8 taskId); +static void Phase2Task_Shuffle(u8 taskId); +static void Phase2Task_BigPokeball(u8 taskId); +static void Phase2Task_PokeballsTrail(u8 taskId); +static void Phase2Task_Clockwise_BlackFade(u8 taskId); +static void Phase2Task_Ripple(u8 taskId); +static void Phase2Task_Wave(u8 taskId); +static void Phase2Task_Slice(u8 taskId); +static void Phase2Task_WhiteFade(u8 taskId); +static void Phase2Task_GridSquares(u8 taskId); +static void Phase2Task_Shards(u8 taskId); +static void Phase2Task_Sydney(u8 taskId); +static void Phase2Task_Phoebe(u8 taskId); +static void Phase2Task_Glacia(u8 taskId); +static void Phase2Task_Drake(u8 taskId); +static void Phase2Task_Champion(u8 taskId); +static void Phase2Task_Aqua(u8 taskId); +static void Phase2Task_Magma(u8 taskId); +static void Phase2Task_Regice(u8 taskId); +static void Phase2Task_Registeel(u8 taskId); +static void Phase2Task_Regirock(u8 taskId); +static void Phase2Task_Kyogre(u8 taskId); +static void Phase2Task_Groudon(u8 taskId); +static void Phase2Task_Rayquaza(u8 taskId); +static void Phase2Task_ShredSplit(u8 taskId); +static void Phase2Task_Blackhole1(u8 taskId); +static void Phase2Task_Blackhole2(u8 taskId); +static void Phase2Task_RectangularSpiral(u8 taskId); +static void Phase2Task_29(u8 taskId); +static void Phase2Task_30(u8 taskId); +static void Phase2Task_31(u8 taskId); +static void Phase2Task_32(u8 taskId); +static void Phase2Task_33(u8 taskId); +static void VBlankCB_BattleTransition(void); +static void VBlankCB_Phase2_Swirl(void); +static void HBlankCB_Phase2_Swirl(void); +static void VBlankCB_Phase2_Shuffle(void); +static void HBlankCB_Phase2_Shuffle(void); +static void VBlankCB0_Phase2_BigPokeball(void); +static void VBlankCB1_Phase2_BigPokeball(void); +static void VBlankCB_Phase2_Clockwise_BlackFade(void); +static void VBlankCB_Phase2_Ripple(void); +static void HBlankCB_Phase2_Ripple(void); +static void VBlankCB_Phase2_30(void); +static void HBlankCB_Phase2_30(void); +static void VBlankCB_Phase2_Wave(void); +static void VBlankCB_Phase2_Slice(void); +static void HBlankCB_Phase2_Slice(void); +static void VBlankCB0_Phase2_WhiteFade(void); +static void VBlankCB1_Phase2_WhiteFade(void); +static void HBlankCB_Phase2_WhiteFade(void); +static void VBlankCB_Phase2_Shards(void); +static void VBlankCB_Phase2_Rayquaza(void); +static bool8 Phase2_Blur_Func1(struct Task *task); +static bool8 Phase2_Blur_Func2(struct Task *task); +static bool8 Phase2_Blur_Func3(struct Task *task); +static bool8 Phase2_Swirl_Func1(struct Task *task); +static bool8 Phase2_Swirl_Func2(struct Task *task); +static bool8 Phase2_Shuffle_Func1(struct Task *task); +static bool8 Phase2_Shuffle_Func2(struct Task *task); +static bool8 Phase2_Aqua_Func1(struct Task *task); +static bool8 Phase2_Aqua_Func2(struct Task *task); +static bool8 Phase2_Magma_Func1(struct Task *task); +static bool8 Phase2_Magma_Func2(struct Task *task); +static bool8 Phase2_FramesCountdown(struct Task *task); +static bool8 Phase2_Regi_Func1(struct Task *task); +static bool8 Phase2_Regice_Func2(struct Task *task); +static bool8 Phase2_Registeel_Func2(struct Task *task); +static bool8 Phase2_Regirock_Func2(struct Task *task); +static bool8 Phase2_WeatherTrio_Func1(struct Task *task); +static bool8 Phase2_WaitPaletteFade(struct Task *task); +static bool8 Phase2_Kyogre_Func3(struct Task *task); +static bool8 Phase2_Kyogre_Func4(struct Task *task); +static bool8 Phase2_Kyogre_Func5(struct Task *task); +static bool8 Phase2_Groudon_Func3(struct Task *task); +static bool8 Phase2_Groudon_Func4(struct Task *task); +static bool8 Phase2_Groudon_Func5(struct Task *task); +static bool8 Phase2_WeatherDuo_Func6(struct Task *task); +static bool8 Phase2_WeatherDuo_Func7(struct Task *task); +static bool8 Phase2_BigPokeball_Func1(struct Task *task); +static bool8 Phase2_BigPokeball_Func2(struct Task *task); +static bool8 Phase2_BigPokeball_Func3(struct Task *task); +static bool8 Phase2_BigPokeball_Func4(struct Task *task); +static bool8 Phase2_BigPokeball_Func5(struct Task *task); +static bool8 Phase2_BigPokeball_Func6(struct Task *task); +static bool8 Phase2_PokeballsTrail_Func1(struct Task *task); +static bool8 Phase2_PokeballsTrail_Func2(struct Task *task); +static bool8 Phase2_PokeballsTrail_Func3(struct Task *task); +static bool8 Phase2_Clockwise_BlackFade_Func1(struct Task *task); +static bool8 Phase2_Clockwise_BlackFade_Func2(struct Task *task); +static bool8 Phase2_Clockwise_BlackFade_Func3(struct Task *task); +static bool8 Phase2_Clockwise_BlackFade_Func4(struct Task *task); +static bool8 Phase2_Clockwise_BlackFade_Func5(struct Task *task); +static bool8 Phase2_Clockwise_BlackFade_Func6(struct Task *task); +static bool8 Phase2_Clockwise_BlackFade_Func7(struct Task *task); +static bool8 Phase2_Ripple_Func1(struct Task *task); +static bool8 Phase2_Ripple_Func2(struct Task *task); +static bool8 Phase2_Wave_Func1(struct Task *task); +static bool8 Phase2_Wave_Func2(struct Task *task); +static bool8 Phase2_Wave_Func3(struct Task *task); +static bool8 Phase2_Slice_Func1(struct Task *task); +static bool8 Phase2_Slice_Func2(struct Task *task); +static bool8 Phase2_Slice_Func3(struct Task *task); +static bool8 Phase2_WhiteFade_Func1(struct Task *task); +static bool8 Phase2_WhiteFade_Func2(struct Task *task); +static bool8 Phase2_WhiteFade_Func3(struct Task *task); +static bool8 Phase2_WhiteFade_Func4(struct Task *task); +static bool8 Phase2_WhiteFade_Func5(struct Task *task); +static bool8 Phase2_GridSquares_Func1(struct Task *task); +static bool8 Phase2_GridSquares_Func2(struct Task *task); +static bool8 Phase2_GridSquares_Func3(struct Task *task); +static bool8 Phase2_Shards_Func1(struct Task *task); +static bool8 Phase2_Shards_Func2(struct Task *task); +static bool8 Phase2_Shards_Func3(struct Task *task); +static bool8 Phase2_Shards_Func4(struct Task *task); +static bool8 Phase2_Shards_Func5(struct Task *task); +static bool8 Phase2_ShredSplit_Func1(struct Task *task); +static bool8 Phase2_ShredSplit_Func2(struct Task *task); +static bool8 Phase2_ShredSplit_Func3(struct Task *task); +static bool8 Phase2_ShredSplit_Func4(struct Task *task); +static bool8 Phase2_Blackhole_Func1(struct Task *task); +static bool8 Phase2_Blackhole1_Func2(struct Task *task); +static bool8 Phase2_Blackhole1_Func3(struct Task *task); +static bool8 Phase2_Blackhole2_Func2(struct Task *task); +static bool8 Phase2_RectangularSpiral_Func1(struct Task *task); +static bool8 Phase2_RectangularSpiral_Func2(struct Task *task); +static bool8 Phase2_RectangularSpiral_Func3(struct Task *task); +static bool8 Phase2_29_Func1(struct Task *task); +static bool8 Phase2_29_Func2(struct Task *task); +static bool8 Phase2_30_Func1(struct Task *task); +static bool8 Phase2_30_Func2(struct Task *task); +static bool8 Phase2_30_Func3(struct Task *task); +static bool8 Phase2_30_Func4(struct Task *task); +static bool8 Phase2_Rayquaza_Func3(struct Task *task); +static bool8 Phase2_Rayquaza_Func4(struct Task *task); +static bool8 Phase2_Rayquaza_Func5(struct Task *task); +static bool8 Phase2_Rayquaza_Func6(struct Task *task); +static bool8 Phase2_Rayquaza_Func7(struct Task *task); +static bool8 Phase2_Rayquaza_Func8(struct Task *task); +static bool8 Phase2_Rayquaza_Func9(struct Task *task); +static bool8 Phase2_31_Func1(struct Task *task); +static bool8 Phase2_31_Func2(struct Task *task); +static bool8 Phase2_31_Func3(struct Task *task); +static bool8 Phase2_31_33_Func5(struct Task *task); +static bool8 Phase2_33_Func1(struct Task *task); +static bool8 Phase2_33_Func2(struct Task *task); +static bool8 Phase2_33_Func3(struct Task *task); +static bool8 Phase2_33_Func4(struct Task *task); +static bool8 Phase2_32_Func1(struct Task *task); +static bool8 Phase2_32_Func2(struct Task *task); +static bool8 Phase2_32_Func3(struct Task *task); +static bool8 Phase2_32_Func4(struct Task *task); +static bool8 Phase2_32_Func5(struct Task *task); +static bool8 Phase2_Mugshot_Func1(struct Task *task); +static bool8 Phase2_Mugshot_Func2(struct Task *task); +static bool8 Phase2_Mugshot_Func3(struct Task *task); +static bool8 Phase2_Mugshot_Func4(struct Task *task); +static bool8 Phase2_Mugshot_Func5(struct Task *task); +static bool8 Phase2_Mugshot_Func6(struct Task *task); +static bool8 Phase2_Mugshot_Func7(struct Task *task); +static bool8 Phase2_Mugshot_Func8(struct Task *task); +static bool8 Phase2_Mugshot_Func9(struct Task *task); +static bool8 Phase2_Mugshot_Func10(struct Task *task); +static void Phase2Task_MugShotTransition(u8 taskId); +static void Mugshots_CreateOpponentPlayerSprites(struct Task *task); +static void VBlankCB0_Phase2_Mugshots(void); +static void VBlankCB1_Phase2_Mugshots(void); +static void HBlankCB_Phase2_Mugshots(void); +static bool8 Transition_Phase1(struct Task *task); +static bool8 Transition_WaitForPhase1(struct Task *task); +static bool8 Transition_Phase2(struct Task *task); +static bool8 Transition_WaitForPhase2(struct Task *task); +static void sub_8149F08(void); +static void sub_8149F84(void); +static void CreatePhase1Task(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4); +static void sub_814A014(u16 *a0, s16 a1, s16 a2, s16 a3); +static void sub_8149F98(s16 *array, s16 sinAdd, s16 index, s16 indexIncrementer, s16 amplitude, s16 arrSize); +static void sub_8149F40(u16 **a0); +static void sub_814A1AC(s16 *a0, s16 a1, s16 a2, s16 a3, s16 a4, s16 a5, s16 a6); +static bool8 sub_814A228(s16 *a0, bool8 a1, bool8 a2); +static void sub_8148484(s16 spriteId, s16 value); +static void sub_814849C(s16 spriteId); +static s16 sub_81484B8(s16 spriteId); +static bool8 Phase1_TransitionAll_Func1(struct Task *task); +static bool8 Phase1_TransitionAll_Func2(struct Task *task); +static bool8 IsPhase1Done(void); +static bool16 sub_8149048(const s16 * const *arg0, struct StructRectangularSpiral *arg1); +static void sub_814713C(struct Sprite *sprite); +static void sub_8148380(struct Sprite *sprite); +static void sub_8149864(struct Sprite *sprite); +static bool8 sub_81483A8(struct Sprite *sprite); +static bool8 sub_81483AC(struct Sprite *sprite); +static bool8 sub_81483F8(struct Sprite *sprite); +static bool8 sub_814842C(struct Sprite *sprite); +static bool8 sub_8148458(struct Sprite *sprite); // iwram bss vars IWRAM_DATA static s16 sUnusedRectangularSpiralVar; @@ -275,53 +278,53 @@ IWRAM_DATA static struct StructRectangularSpiral sRectangularSpiralTransition[4] EWRAM_DATA static struct TransitionData *sTransitionStructPtr = NULL; // const rom data -const u32 sBigPokeball_Tileset[] = INCBIN_U32("graphics/battle_transitions/big_pokeball.4bpp"); -const u32 sPokeballTrail_Tileset[] = INCBIN_U32("graphics/battle_transitions/pokeball_trail.4bpp"); -const u8 sSpriteImage_85B98F0[] = INCBIN_U8("graphics/battle_transitions/pokeball.4bpp"); -const u32 sUnknown_085B9AF0[] = INCBIN_U32("graphics/battle_transitions/elite_four_bg.4bpp"); -const u8 sSpriteImage_85B9CD0[] = INCBIN_U8("graphics/battle_transitions/unused_brendan.4bpp"); -const u8 sSpriteImage_85BA4D0[] = INCBIN_U8("graphics/battle_transitions/unused_lass.4bpp"); -const u32 sShrinkingBoxTileset[] = INCBIN_U32("graphics/battle_transitions/shrinking_box.4bpp"); -const u32 sEvilTeam_Palette[] = INCBIN_U32("graphics/battle_transitions/evil_team.gbapal"); -const u32 sTeamAqua_Tileset[] = INCBIN_U32("graphics/battle_transitions/team_aqua.4bpp.lz"); -const u32 sTeamAqua_Tilemap[] = INCBIN_U32("graphics/battle_transitions/team_aqua.bin.lz"); -const u32 sTeamMagma_Tileset[] = INCBIN_U32("graphics/battle_transitions/team_magma.4bpp.lz"); -const u32 sTeamMagma_Tilemap[] = INCBIN_U32("graphics/battle_transitions/team_magma.bin.lz"); -const u32 gUnknown_085BBC14[] = INCBIN_U32("graphics/battle_transitions/85BBC14.4bpp"); -const u32 gUnknown_085BC2B4[] = INCBIN_U32("graphics/battle_transitions/85BC2B4.gbapal"); -const u32 gUnknown_085BC2D4[] = INCBIN_U32("graphics/battle_transitions/85BC2D4.gbapal"); -const u32 gUnknown_085BC2F4[] = INCBIN_U32("graphics/battle_transitions/85BC2F4.gbapal"); -const u32 gUnknown_085BC314[] = INCBIN_U32("graphics/battle_transitions/85BC314.bin"); -const u32 gUnknown_085BCB14[] = INCBIN_U32("graphics/battle_transitions/85BCB14.bin"); -const u32 gUnknown_085BD314[] = INCBIN_U32("graphics/battle_transitions/85BD314.bin"); -const u16 gUnknown_085BDB14[] = INCBIN_U16("graphics/battle_transitions/85BDB14.gbapal"); -const u32 gUnknown_085BDB34[] = INCBIN_U32("graphics/battle_transitions/kyogre.4bpp.lz"); -const u32 gUnknown_085BE1E8[] = INCBIN_U32("graphics/battle_transitions/kyogre.bin.lz"); -const u32 gUnknown_085BE51C[] = INCBIN_U32("graphics/battle_transitions/groudon.4bpp.lz"); -const u32 gUnknown_085BEA88[] = INCBIN_U32("graphics/battle_transitions/groudon.bin.lz"); -const u16 gUnknown_085BEDA0[] = INCBIN_U16("graphics/battle_transitions/kyogre_pt1.gbapal"); -const u16 gUnknown_085BEEE0[] = INCBIN_U16("graphics/battle_transitions/kyogre_pt2.gbapal"); -const u16 gUnknown_085BF0A0[] = INCBIN_U16("graphics/battle_transitions/groudon_pt1.gbapal"); -const u16 gUnknown_085BF2A0[] = INCBIN_U16("graphics/battle_transitions/groudon_pt2.gbapal"); -const u16 gUnknown_085BF4A0[] = INCBIN_U16("graphics/battle_transitions/rayquaza.gbapal"); -const u32 gUnknown_085BF6A0[] = INCBIN_U32("graphics/battle_transitions/rayquaza.4bpp"); -const u32 gUnknown_085C6BE0[] = INCBIN_U32("graphics/battle_transitions/rayquaza.bin"); -const u32 gUnknown_085C7BE0[] = INCBIN_U32("graphics/battle_transitions/frontier_brain.gbapal"); -const u32 gUnknown_085C7C00[] = INCBIN_U32("graphics/battle_transitions/frontier_brain.4bpp.lz"); -const u32 gUnknown_085C828C[] = INCBIN_U32("graphics/battle_transitions/frontier_brain.bin.lz"); -const u32 gUnknown_085C8578[] = INCBIN_U32("graphics/battle_transitions/frontier_squares_blanktiles.gbapal"); -const u32 gUnknown_085C8598[] = INCBIN_U32("graphics/battle_transitions/frontier_square_1.4bpp.lz"); -const u32 gUnknown_085C86F4[] = INCBIN_U32("graphics/battle_transitions/frontier_square_2.4bpp.lz"); -const u32 gUnknown_085C87F4[] = INCBIN_U32("graphics/battle_transitions/frontier_square_3.4bpp.lz"); -const u32 gUnknown_085C88A4[] = INCBIN_U32("graphics/battle_transitions/frontier_square_4.4bpp.lz"); -const u32 gUnknown_085C8928[] = INCBIN_U32("graphics/battle_transitions/frontier_squares.bin"); +static const u32 sBigPokeball_Tileset[] = INCBIN_U32("graphics/battle_transitions/big_pokeball.4bpp"); +static const u32 sPokeballTrail_Tileset[] = INCBIN_U32("graphics/battle_transitions/pokeball_trail.4bpp"); +static const u8 sSpriteImage_85B98F0[] = INCBIN_U8("graphics/battle_transitions/pokeball.4bpp"); +static const u32 sUnknown_085B9AF0[] = INCBIN_U32("graphics/battle_transitions/elite_four_bg.4bpp"); +static const u8 sSpriteImage_85B9CD0[] = INCBIN_U8("graphics/battle_transitions/unused_brendan.4bpp"); +static const u8 sSpriteImage_85BA4D0[] = INCBIN_U8("graphics/battle_transitions/unused_lass.4bpp"); +static const u32 sShrinkingBoxTileset[] = INCBIN_U32("graphics/battle_transitions/shrinking_box.4bpp"); +static const u32 sEvilTeam_Palette[] = INCBIN_U32("graphics/battle_transitions/evil_team.gbapal"); +static const u32 sTeamAqua_Tileset[] = INCBIN_U32("graphics/battle_transitions/team_aqua.4bpp.lz"); +static const u32 sTeamAqua_Tilemap[] = INCBIN_U32("graphics/battle_transitions/team_aqua.bin.lz"); +static const u32 sTeamMagma_Tileset[] = INCBIN_U32("graphics/battle_transitions/team_magma.4bpp.lz"); +static const u32 sTeamMagma_Tilemap[] = INCBIN_U32("graphics/battle_transitions/team_magma.bin.lz"); +static const u32 gUnknown_085BBC14[] = INCBIN_U32("graphics/battle_transitions/85BBC14.4bpp"); +static const u32 gUnknown_085BC2B4[] = INCBIN_U32("graphics/battle_transitions/85BC2B4.gbapal"); +static const u32 gUnknown_085BC2D4[] = INCBIN_U32("graphics/battle_transitions/85BC2D4.gbapal"); +static const u32 gUnknown_085BC2F4[] = INCBIN_U32("graphics/battle_transitions/85BC2F4.gbapal"); +static const u32 gUnknown_085BC314[] = INCBIN_U32("graphics/battle_transitions/85BC314.bin"); +static const u32 gUnknown_085BCB14[] = INCBIN_U32("graphics/battle_transitions/85BCB14.bin"); +static const u32 gUnknown_085BD314[] = INCBIN_U32("graphics/battle_transitions/85BD314.bin"); +static const u16 gUnknown_085BDB14[] = INCBIN_U16("graphics/battle_transitions/85BDB14.gbapal"); +static const u32 gUnknown_085BDB34[] = INCBIN_U32("graphics/battle_transitions/kyogre.4bpp.lz"); +static const u32 gUnknown_085BE1E8[] = INCBIN_U32("graphics/battle_transitions/kyogre.bin.lz"); +static const u32 gUnknown_085BE51C[] = INCBIN_U32("graphics/battle_transitions/groudon.4bpp.lz"); +static const u32 gUnknown_085BEA88[] = INCBIN_U32("graphics/battle_transitions/groudon.bin.lz"); +static const u16 gUnknown_085BEDA0[] = INCBIN_U16("graphics/battle_transitions/kyogre_pt1.gbapal"); +static const u16 gUnknown_085BEEE0[] = INCBIN_U16("graphics/battle_transitions/kyogre_pt2.gbapal"); +static const u16 gUnknown_085BF0A0[] = INCBIN_U16("graphics/battle_transitions/groudon_pt1.gbapal"); +static const u16 gUnknown_085BF2A0[] = INCBIN_U16("graphics/battle_transitions/groudon_pt2.gbapal"); +static const u16 gUnknown_085BF4A0[] = INCBIN_U16("graphics/battle_transitions/rayquaza.gbapal"); +static const u32 gUnknown_085BF6A0[] = INCBIN_U32("graphics/battle_transitions/rayquaza.4bpp"); +static const u32 gUnknown_085C6BE0[] = INCBIN_U32("graphics/battle_transitions/rayquaza.bin"); +static const u32 gUnknown_085C7BE0[] = INCBIN_U32("graphics/battle_transitions/frontier_brain.gbapal"); +static const u32 gUnknown_085C7C00[] = INCBIN_U32("graphics/battle_transitions/frontier_brain.4bpp.lz"); +static const u32 gUnknown_085C828C[] = INCBIN_U32("graphics/battle_transitions/frontier_brain.bin.lz"); +static const u32 gUnknown_085C8578[] = INCBIN_U32("graphics/battle_transitions/frontier_squares_blanktiles.gbapal"); +static const u32 gUnknown_085C8598[] = INCBIN_U32("graphics/battle_transitions/frontier_square_1.4bpp.lz"); +static const u32 gUnknown_085C86F4[] = INCBIN_U32("graphics/battle_transitions/frontier_square_2.4bpp.lz"); +static const u32 gUnknown_085C87F4[] = INCBIN_U32("graphics/battle_transitions/frontier_square_3.4bpp.lz"); +static const u32 gUnknown_085C88A4[] = INCBIN_U32("graphics/battle_transitions/frontier_square_4.4bpp.lz"); +static const u32 gUnknown_085C8928[] = INCBIN_U32("graphics/battle_transitions/frontier_squares.bin"); -const TaskFunc sPhase1_Tasks[B_TRANSITION_COUNT] = +static const TaskFunc sPhase1_Tasks[B_TRANSITION_COUNT] = { [0 ... B_TRANSITION_COUNT - 1] = &Phase1Task_TransitionAll }; -const TaskFunc sPhase2_Tasks[B_TRANSITION_COUNT] = +static const TaskFunc sPhase2_Tasks[B_TRANSITION_COUNT] = { Phase2Task_Blur, // 0 Phase2Task_Swirl, // 1 @@ -367,7 +370,7 @@ const TaskFunc sPhase2_Tasks[B_TRANSITION_COUNT] = Phase2Task_41, // 41 }; -const TransitionStateFunc sMainTransitionPhases[] = +static const TransitionStateFunc sMainTransitionPhases[] = { &Transition_Phase1, &Transition_WaitForPhase1, @@ -375,26 +378,26 @@ const TransitionStateFunc sMainTransitionPhases[] = &Transition_WaitForPhase2 }; -const TransitionStateFunc sPhase2_Blur_Funcs[] = +static const TransitionStateFunc sPhase2_Blur_Funcs[] = { Phase2_Blur_Func1, Phase2_Blur_Func2, Phase2_Blur_Func3 }; -const TransitionStateFunc sPhase2_Swirl_Funcs[] = +static const TransitionStateFunc sPhase2_Swirl_Funcs[] = { Phase2_Swirl_Func1, Phase2_Swirl_Func2, }; -const TransitionStateFunc sPhase2_Shuffle_Funcs[] = +static const TransitionStateFunc sPhase2_Shuffle_Funcs[] = { Phase2_Shuffle_Func1, Phase2_Shuffle_Func2, }; -const TransitionStateFunc sPhase2_Aqua_Funcs[] = +static const TransitionStateFunc sPhase2_Aqua_Funcs[] = { Phase2_Aqua_Func1, Phase2_Aqua_Func2, @@ -405,7 +408,7 @@ const TransitionStateFunc sPhase2_Aqua_Funcs[] = Phase2_BigPokeball_Func6 }; -const TransitionStateFunc sPhase2_Magma_Funcs[] = +static const TransitionStateFunc sPhase2_Magma_Funcs[] = { Phase2_Magma_Func1, Phase2_Magma_Func2, @@ -416,7 +419,7 @@ const TransitionStateFunc sPhase2_Magma_Funcs[] = Phase2_BigPokeball_Func6 }; -const TransitionStateFunc sPhase2_BigPokeball_Funcs[] = +static const TransitionStateFunc sPhase2_BigPokeball_Funcs[] = { Phase2_BigPokeball_Func1, Phase2_BigPokeball_Func2, @@ -426,7 +429,7 @@ const TransitionStateFunc sPhase2_BigPokeball_Funcs[] = Phase2_BigPokeball_Func6 }; -const TransitionStateFunc sPhase2_Regice_Funcs[] = +static const TransitionStateFunc sPhase2_Regice_Funcs[] = { Phase2_Regi_Func1, Phase2_Regice_Func2, @@ -436,7 +439,7 @@ const TransitionStateFunc sPhase2_Regice_Funcs[] = Phase2_BigPokeball_Func6 }; -const TransitionStateFunc sPhase2_Registeel_Funcs[] = +static const TransitionStateFunc sPhase2_Registeel_Funcs[] = { Phase2_Regi_Func1, Phase2_Registeel_Func2, @@ -446,7 +449,7 @@ const TransitionStateFunc sPhase2_Registeel_Funcs[] = Phase2_BigPokeball_Func6 }; -const TransitionStateFunc sPhase2_Regirock_Funcs[] = +static const TransitionStateFunc sPhase2_Regirock_Funcs[] = { Phase2_Regi_Func1, Phase2_Regirock_Func2, @@ -456,7 +459,7 @@ const TransitionStateFunc sPhase2_Regirock_Funcs[] = Phase2_BigPokeball_Func6 }; -const TransitionStateFunc sPhase2_Kyogre_Funcs[] = +static const TransitionStateFunc sPhase2_Kyogre_Funcs[] = { Phase2_WeatherTrio_Func1, Phase2_WaitPaletteFade, @@ -468,18 +471,18 @@ const TransitionStateFunc sPhase2_Kyogre_Funcs[] = Phase2_WeatherDuo_Func7 }; -const TransitionStateFunc sPhase2_PokeballsTrail_Funcs[] = +static const TransitionStateFunc sPhase2_PokeballsTrail_Funcs[] = { Phase2_PokeballsTrail_Func1, Phase2_PokeballsTrail_Func2, Phase2_PokeballsTrail_Func3 }; -const s16 sUnknown_085C8B88[2] = {-16, 256}; -const s16 sUnknown_085C8B8C[5] = {0, 32, 64, 18, 48}; -const s16 sUnknown_085C8B96[2] = {8, -8}; +static const s16 sUnknown_085C8B88[2] = {-16, 256}; +static const s16 sUnknown_085C8B8C[5] = {0, 32, 64, 18, 48}; +static const s16 sUnknown_085C8B96[2] = {8, -8}; -const TransitionStateFunc sPhase2_Clockwise_BlackFade_Funcs[] = +static const TransitionStateFunc sPhase2_Clockwise_BlackFade_Funcs[] = { Phase2_Clockwise_BlackFade_Func1, Phase2_Clockwise_BlackFade_Func2, @@ -490,20 +493,20 @@ const TransitionStateFunc sPhase2_Clockwise_BlackFade_Funcs[] = Phase2_Clockwise_BlackFade_Func7 }; -const TransitionStateFunc sPhase2_Ripple_Funcs[] = +static const TransitionStateFunc sPhase2_Ripple_Funcs[] = { Phase2_Ripple_Func1, Phase2_Ripple_Func2 }; -const TransitionStateFunc sPhase2_Wave_Funcs[] = +static const TransitionStateFunc sPhase2_Wave_Funcs[] = { Phase2_Wave_Func1, Phase2_Wave_Func2, Phase2_Wave_Func3 }; -const TransitionStateFunc sPhase2_Mugshot_Funcs[] = +static const TransitionStateFunc sPhase2_Mugshot_Funcs[] = { Phase2_Mugshot_Func1, Phase2_Mugshot_Func2, @@ -517,7 +520,7 @@ const TransitionStateFunc sPhase2_Mugshot_Funcs[] = Phase2_Mugshot_Func10 }; -const u8 sMugshotsTrainerPicIDsTable[MUGSHOTS_COUNT] = +static const u8 sMugshotsTrainerPicIDsTable[MUGSHOTS_COUNT] = { TRAINER_PIC_ELITE_FOUR_SIDNEY, TRAINER_PIC_ELITE_FOUR_PHOEBE, @@ -525,7 +528,7 @@ const u8 sMugshotsTrainerPicIDsTable[MUGSHOTS_COUNT] = TRAINER_PIC_ELITE_FOUR_DRAKE, TRAINER_PIC_CHAMPION_WALLACE }; -const s16 sMugshotsOpponentRotationScales[MUGSHOTS_COUNT][2] = +static const s16 sMugshotsOpponentRotationScales[MUGSHOTS_COUNT][2] = { {0x200, 0x200}, {0x200, 0x200}, @@ -533,7 +536,7 @@ const s16 sMugshotsOpponentRotationScales[MUGSHOTS_COUNT][2] = {0x1A0, 0x1A0}, {0x188, 0x188}, }; -const s16 sMugshotsOpponentCoords[MUGSHOTS_COUNT][2] = +static const s16 sMugshotsOpponentCoords[MUGSHOTS_COUNT][2] = { {0, 0}, {0, 0}, @@ -542,7 +545,7 @@ const s16 sMugshotsOpponentCoords[MUGSHOTS_COUNT][2] = {-8, 7}, }; -const TransitionSpriteCallback sUnknown_085C8C24[] = +static const TransitionSpriteCallback sUnknown_085C8C24[] = { sub_81483A8, sub_81483AC, @@ -553,17 +556,17 @@ const TransitionSpriteCallback sUnknown_085C8C24[] = sub_81483A8 }; -const s16 sUnknown_085C8C40[2] = {12, -12}; -const s16 sUnknown_085C8C44[2] = {-1, 1}; +static const s16 sUnknown_085C8C40[2] = {12, -12}; +static const s16 sUnknown_085C8C44[2] = {-1, 1}; -const TransitionStateFunc sPhase2_Slice_Funcs[] = +static const TransitionStateFunc sPhase2_Slice_Funcs[] = { Phase2_Slice_Func1, Phase2_Slice_Func2, Phase2_Slice_Func3 }; -const TransitionStateFunc sPhase2_ShredSplit_Funcs[] = +static const TransitionStateFunc sPhase2_ShredSplit_Funcs[] = { Phase2_ShredSplit_Func1, Phase2_ShredSplit_Func2, @@ -571,49 +574,49 @@ const TransitionStateFunc sPhase2_ShredSplit_Funcs[] = Phase2_ShredSplit_Func4 }; -const u8 gUnknown_085C8C64[] = {39, 119}; -const s16 gUnknown_085C8C66[] = {1, -1}; +static const u8 gUnknown_085C8C64[] = {39, 119}; +static const s16 gUnknown_085C8C66[] = {1, -1}; -const TransitionStateFunc sPhase2_Blackhole1_Funcs[] = +static const TransitionStateFunc sPhase2_Blackhole1_Funcs[] = { Phase2_Blackhole_Func1, Phase2_Blackhole1_Func2, Phase2_Blackhole1_Func3 }; -const TransitionStateFunc sPhase2_Blackhole2_Funcs[] = +static const TransitionStateFunc sPhase2_Blackhole2_Funcs[] = { Phase2_Blackhole_Func1, Phase2_Blackhole2_Func2 }; -const s16 gUnknown_085C8C80[] = {-6, 4}; +static const s16 gUnknown_085C8C80[] = {-6, 4}; -const TransitionStateFunc sPhase2_RectangularSpiral_Funcs[] = +static const TransitionStateFunc sPhase2_RectangularSpiral_Funcs[] = { Phase2_RectangularSpiral_Func1, Phase2_RectangularSpiral_Func2, Phase2_RectangularSpiral_Func3 }; -const s16 gUnknown_085C8C90[] = {1, 27, 275, -1}; -const s16 gUnknown_085C8C98[] = {2, 486, -1}; -const s16 gUnknown_085C8C9E[] = {3, 262, -1}; -const s16 gUnknown_085C8CA4[] = {4, 507, -2}; -const s16 gUnknown_085C8CAA[] = {1, 213, -1}; -const s16 gUnknown_085C8CB0[] = {2, 548, -2}; -const s16 gUnknown_085C8CB6[] = {3, 196, -1}; -const s16 gUnknown_085C8CBC[] = {4, 573, 309, -1}; -const s16 gUnknown_085C8CC4[] = {1, 474, -1}; -const s16 gUnknown_085C8CCA[] = {2, 295, 32, -1}; -const s16 gUnknown_085C8CD2[] = {3, 58, -1}; -const s16 gUnknown_085C8CD8[] = {4, 455, -1}; -const s16 gUnknown_085C8CDE[] = {1, 540, -1}; -const s16 gUnknown_085C8CE4[] = {2, 229, -1}; -const s16 gUnknown_085C8CEA[] = {3, 244, 28, -1}; -const s16 gUnknown_085C8CF2[] = {4, 517, -1}; +static const s16 gUnknown_085C8C90[] = {1, 27, 275, -1}; +static const s16 gUnknown_085C8C98[] = {2, 486, -1}; +static const s16 gUnknown_085C8C9E[] = {3, 262, -1}; +static const s16 gUnknown_085C8CA4[] = {4, 507, -2}; +static const s16 gUnknown_085C8CAA[] = {1, 213, -1}; +static const s16 gUnknown_085C8CB0[] = {2, 548, -2}; +static const s16 gUnknown_085C8CB6[] = {3, 196, -1}; +static const s16 gUnknown_085C8CBC[] = {4, 573, 309, -1}; +static const s16 gUnknown_085C8CC4[] = {1, 474, -1}; +static const s16 gUnknown_085C8CCA[] = {2, 295, 32, -1}; +static const s16 gUnknown_085C8CD2[] = {3, 58, -1}; +static const s16 gUnknown_085C8CD8[] = {4, 455, -1}; +static const s16 gUnknown_085C8CDE[] = {1, 540, -1}; +static const s16 gUnknown_085C8CE4[] = {2, 229, -1}; +static const s16 gUnknown_085C8CEA[] = {3, 244, 28, -1}; +static const s16 gUnknown_085C8CF2[] = {4, 517, -1}; -const s16 *const gUnknown_085C8CF8[] = +static const s16 *const gUnknown_085C8CF8[] = { gUnknown_085C8C90, gUnknown_085C8CA4, @@ -625,7 +628,7 @@ const s16 *const gUnknown_085C8CF8[] = gUnknown_085C8CDE }; -const s16 *const gUnknown_085C8D18[] = +static const s16 *const gUnknown_085C8D18[] = { gUnknown_085C8CBC, gUnknown_085C8CB0, @@ -637,13 +640,13 @@ const s16 *const gUnknown_085C8D18[] = gUnknown_085C8CD2 }; -const s16 *const *const gUnknown_085C8D38[] = +static const s16 *const *const gUnknown_085C8D38[] = { gUnknown_085C8CF8, gUnknown_085C8D18 }; -const TransitionStateFunc sPhase2_Groudon_Funcs[] = +static const TransitionStateFunc sPhase2_Groudon_Funcs[] = { Phase2_WeatherTrio_Func1, Phase2_WaitPaletteFade, @@ -655,7 +658,7 @@ const TransitionStateFunc sPhase2_Groudon_Funcs[] = Phase2_WeatherDuo_Func7 }; -const TransitionStateFunc sPhase2_Rayquaza_Funcs[] = +static const TransitionStateFunc sPhase2_Rayquaza_Funcs[] = { Phase2_WeatherTrio_Func1, Phase2_WaitPaletteFade, @@ -670,7 +673,7 @@ const TransitionStateFunc sPhase2_Rayquaza_Funcs[] = Phase2_Blackhole1_Func3 }; -const TransitionStateFunc sPhase2_WhiteFade_Funcs[] = +static const TransitionStateFunc sPhase2_WhiteFade_Funcs[] = { Phase2_WhiteFade_Func1, Phase2_WhiteFade_Func2, @@ -679,16 +682,16 @@ const TransitionStateFunc sPhase2_WhiteFade_Funcs[] = Phase2_WhiteFade_Func5 }; -const s16 sUnknown_085C8DA0[] = {0, 20, 15, 40, 10, 25, 35, 5}; +static const s16 sUnknown_085C8DA0[] = {0, 20, 15, 40, 10, 25, 35, 5}; -const TransitionStateFunc sPhase2_GridSquares_Funcs[] = +static const TransitionStateFunc sPhase2_GridSquares_Funcs[] = { Phase2_GridSquares_Func1, Phase2_GridSquares_Func2, Phase2_GridSquares_Func3 }; -const TransitionStateFunc sPhase2_Shards_Funcs[] = +static const TransitionStateFunc sPhase2_Shards_Funcs[] = { Phase2_Shards_Func1, Phase2_Shards_Func2, @@ -697,7 +700,7 @@ const TransitionStateFunc sPhase2_Shards_Funcs[] = Phase2_Shards_Func5 }; -const s16 sUnknown_085C8DD0[][5] = +static const s16 sUnknown_085C8DD0[][5] = { {56, 0, 0, 160, 0}, {104, 160, 240, 88, 1}, @@ -708,49 +711,49 @@ const s16 sUnknown_085C8DD0[][5] = {168, 160, 48, 0, 1}, }; -const s16 sUnknown_085C8E16[] = {8, 4, 2, 1, 1, 1, 0}; +static const s16 sUnknown_085C8E16[] = {8, 4, 2, 1, 1, 1, 0}; -const TransitionStateFunc sPhase1_TransitionAll_Funcs[] = +static const TransitionStateFunc sPhase1_TransitionAll_Funcs[] = { Phase1_TransitionAll_Func1, Phase1_TransitionAll_Func2 }; -const struct SpriteFrameImage sSpriteImageTable_85C8E2C[] = +static const struct SpriteFrameImage sSpriteImageTable_85C8E2C[] = { sSpriteImage_85B98F0, 0x200 }; -const union AnimCmd sSpriteAnim_85C8E34[] = +static const union AnimCmd sSpriteAnim_85C8E34[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END }; -const union AnimCmd *const sSpriteAnimTable_85C8E3C[] = +static const union AnimCmd *const sSpriteAnimTable_85C8E3C[] = { sSpriteAnim_85C8E34 }; -const union AffineAnimCmd sSpriteAffineAnim_85C8E40[] = +static const union AffineAnimCmd sSpriteAffineAnim_85C8E40[] = { AFFINEANIMCMD_FRAME(0, 0, -4, 1), AFFINEANIMCMD_JUMP(0) }; -const union AffineAnimCmd sSpriteAffineAnim_85C8E50[] = +static const union AffineAnimCmd sSpriteAffineAnim_85C8E50[] = { AFFINEANIMCMD_FRAME(0, 0, 4, 1), AFFINEANIMCMD_JUMP(0) }; -const union AffineAnimCmd *const sSpriteAffineAnimTable_85C8E60[] = +static const union AffineAnimCmd *const sSpriteAffineAnimTable_85C8E60[] = { sSpriteAffineAnim_85C8E40, sSpriteAffineAnim_85C8E50 }; -const struct SpriteTemplate gUnknown_085C8E68 = +static const struct SpriteTemplate gUnknown_085C8E68 = { .tileTag = 0xFFFF, .paletteTag = 4105, @@ -761,7 +764,7 @@ const struct SpriteTemplate gUnknown_085C8E68 = .callback = sub_814713C }; -const struct OamData gOamData_85C8E80 = +static const struct OamData gOamData_85C8E80 = { .y = 0, .affineMode = 0, @@ -778,28 +781,28 @@ const struct OamData gOamData_85C8E80 = .affineParam = 0, }; -const struct SpriteFrameImage sSpriteImageTable_85C8E88[] = +static const struct SpriteFrameImage sSpriteImageTable_85C8E88[] = { sSpriteImage_85B9CD0, 0x800 }; -const struct SpriteFrameImage sSpriteImageTable_85C8E90[] = +static const struct SpriteFrameImage sSpriteImageTable_85C8E90[] = { sSpriteImage_85BA4D0, 0x800 }; -const union AnimCmd sSpriteAnim_85C8E98[] = +static const union AnimCmd sSpriteAnim_85C8E98[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END }; -const union AnimCmd *const sSpriteAnimTable_85C8EA0[] = +static const union AnimCmd *const sSpriteAnimTable_85C8EA0[] = { sSpriteAnim_85C8E98 }; -const struct SpriteTemplate sSpriteTemplate_85C8EA4 = +static const struct SpriteTemplate sSpriteTemplate_85C8EA4 = { .tileTag = 0xFFFF, .paletteTag = 4106, @@ -810,7 +813,7 @@ const struct SpriteTemplate sSpriteTemplate_85C8EA4 = .callback = sub_8148380 }; -const struct SpriteTemplate sSpriteTemplate_85C8EBC = +static const struct SpriteTemplate sSpriteTemplate_85C8EBC = { .tileTag = 0xFFFF, .paletteTag = 4106, @@ -821,22 +824,22 @@ const struct SpriteTemplate sSpriteTemplate_85C8EBC = .callback = sub_8148380 }; -const u16 gFieldEffectObjectPalette10[] = INCBIN_U16("graphics/map_objects/palettes/field_effect_object_palette_10.gbapal"); +static const u16 gFieldEffectObjectPalette10[] = INCBIN_U16("graphics/map_objects/palettes/field_effect_object_palette_10.gbapal"); const struct SpritePalette gFieldEffectObjectPaletteInfo10 = { gFieldEffectObjectPalette10, 0x1009 }; -const u16 sMugshotPal_Sydney[] = INCBIN_U16("graphics/battle_transitions/sidney_bg.gbapal"); -const u16 sMugshotPal_Phoebe[] = INCBIN_U16("graphics/battle_transitions/phoebe_bg.gbapal"); -const u16 sMugshotPal_Glacia[] = INCBIN_U16("graphics/battle_transitions/glacia_bg.gbapal"); -const u16 sMugshotPal_Drake[] = INCBIN_U16("graphics/battle_transitions/drake_bg.gbapal"); -const u16 sMugshotPal_Champion[] = INCBIN_U16("graphics/battle_transitions/wallace_bg.gbapal"); -const u16 sMugshotPal_Brendan[] = INCBIN_U16("graphics/battle_transitions/brendan_bg.gbapal"); -const u16 sMugshotPal_May[] = INCBIN_U16("graphics/battle_transitions/may_bg.gbapal"); +static const u16 sMugshotPal_Sydney[] = INCBIN_U16("graphics/battle_transitions/sidney_bg.gbapal"); +static const u16 sMugshotPal_Phoebe[] = INCBIN_U16("graphics/battle_transitions/phoebe_bg.gbapal"); +static const u16 sMugshotPal_Glacia[] = INCBIN_U16("graphics/battle_transitions/glacia_bg.gbapal"); +static const u16 sMugshotPal_Drake[] = INCBIN_U16("graphics/battle_transitions/drake_bg.gbapal"); +static const u16 sMugshotPal_Champion[] = INCBIN_U16("graphics/battle_transitions/wallace_bg.gbapal"); +static const u16 sMugshotPal_Brendan[] = INCBIN_U16("graphics/battle_transitions/brendan_bg.gbapal"); +static const u16 sMugshotPal_May[] = INCBIN_U16("graphics/battle_transitions/may_bg.gbapal"); -const u16 *const sOpponentMugshotsPals[MUGSHOTS_COUNT] = +static const u16 *const sOpponentMugshotsPals[MUGSHOTS_COUNT] = { sMugshotPal_Sydney, sMugshotPal_Phoebe, @@ -845,22 +848,22 @@ const u16 *const sOpponentMugshotsPals[MUGSHOTS_COUNT] = sMugshotPal_Champion }; -const u16 *const sPlayerMugshotsPals[2] = +static const u16 *const sPlayerMugshotsPals[2] = { sMugshotPal_Brendan, sMugshotPal_May }; -const u16 sUnusedTrainerPalette[] = INCBIN_U16("graphics/battle_transitions/unused_trainer.gbapal"); -const struct SpritePalette sSpritePalette_UnusedTrainer = +static const u16 sUnusedTrainerPalette[] = INCBIN_U16("graphics/battle_transitions/unused_trainer.gbapal"); +static const struct SpritePalette sSpritePalette_UnusedTrainer = { sUnusedTrainerPalette, 0x100A }; -const u16 sBigPokeball_Tilemap[] = INCBIN_U16("graphics/battle_transitions/big_pokeball_map.bin"); -const u16 sMugshotsTilemap[] = INCBIN_U16("graphics/battle_transitions/elite_four_bg_map.bin"); +static const u16 sBigPokeball_Tilemap[] = INCBIN_U16("graphics/battle_transitions/big_pokeball_map.bin"); +static const u16 sMugshotsTilemap[] = INCBIN_U16("graphics/battle_transitions/elite_four_bg_map.bin"); -const TransitionStateFunc sPhase2_29_Funcs[] = +static const TransitionStateFunc sPhase2_29_Funcs[] = { Phase2_29_Func1, Phase2_29_Func2, @@ -870,7 +873,7 @@ const TransitionStateFunc sPhase2_29_Funcs[] = Phase2_BigPokeball_Func6 }; -const TransitionStateFunc sPhase2_30_Funcs[] = +static const TransitionStateFunc sPhase2_30_Funcs[] = { Phase2_30_Func1, Phase2_30_Func2, @@ -878,7 +881,7 @@ const TransitionStateFunc sPhase2_30_Funcs[] = Phase2_30_Func4 }; -const TransitionStateFunc sPhase2_31_Funcs[] = +static const TransitionStateFunc sPhase2_31_Funcs[] = { Phase2_31_Func1, Phase2_31_Func2, @@ -886,7 +889,7 @@ const TransitionStateFunc sPhase2_31_Funcs[] = Phase2_31_33_Func5 }; -const TransitionStateFunc sPhase2_33_Funcs[] = +static const TransitionStateFunc sPhase2_33_Funcs[] = { Phase2_33_Func1, Phase2_33_Func2, @@ -895,7 +898,7 @@ const TransitionStateFunc sPhase2_33_Funcs[] = Phase2_31_33_Func5 }; -const TransitionStateFunc sPhase2_32_Funcs[] = +static const TransitionStateFunc sPhase2_32_Funcs[] = { Phase2_32_Func1, Phase2_32_Func2, @@ -904,8 +907,8 @@ const TransitionStateFunc sPhase2_32_Funcs[] = Phase2_32_Func5 }; -const u8 gUnknown_085C9A30[] = {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, 0x10, 0x11, 0x12}; -const u8 gUnknown_085C9A53[] = {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, 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, 0x00}; +static const u8 gUnknown_085C9A30[] = {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, 0x10, 0x11, 0x12}; +static const u8 gUnknown_085C9A53[] = {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, 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, 0x00}; // code static void CB2_TestBattleTransition(void) @@ -970,19 +973,19 @@ bool8 IsBattleTransitionDone(void) } } -void LaunchBattleTransitionTask(u8 transitionId) +static void LaunchBattleTransitionTask(u8 transitionId) { u8 taskId = CreateTask(Task_BattleTransitionMain, 2); gTasks[taskId].tTransitionId = transitionId; sTransitionStructPtr = AllocZeroed(sizeof(*sTransitionStructPtr)); } -void Task_BattleTransitionMain(u8 taskId) +static void Task_BattleTransitionMain(u8 taskId) { while (sMainTransitionPhases[gTasks[taskId].tState](&gTasks[taskId])); } -bool8 Transition_Phase1(struct Task *task) +static bool8 Transition_Phase1(struct Task *task) { sub_80AC3D0(); CpuCopy32(gPlttBufferFaded, gPlttBufferUnfaded, 0x400); @@ -999,7 +1002,7 @@ bool8 Transition_Phase1(struct Task *task) } } -bool8 Transition_WaitForPhase1(struct Task *task) +static bool8 Transition_WaitForPhase1(struct Task *task) { if (FindTaskIdByFunc(sPhase1_Tasks[task->tTransitionId]) == 0xFF) { @@ -1012,14 +1015,14 @@ bool8 Transition_WaitForPhase1(struct Task *task) } } -bool8 Transition_Phase2(struct Task *task) +static bool8 Transition_Phase2(struct Task *task) { CreateTask(sPhase2_Tasks[task->tTransitionId], 0); task->tState++; return FALSE; } -bool8 Transition_WaitForPhase2(struct Task *task) +static bool8 Transition_WaitForPhase2(struct Task *task) { task->tTransitionDone = FALSE; if (FindTaskIdByFunc(sPhase2_Tasks[task->tTransitionId]) == 0xFF) @@ -1030,7 +1033,7 @@ bool8 Transition_WaitForPhase2(struct Task *task) #undef tTransitionId #undef tTransitionDone -void Phase1Task_TransitionAll(u8 taskId) +static void Phase1Task_TransitionAll(u8 taskId) { if (gTasks[taskId].tState == 0) { @@ -1056,12 +1059,12 @@ void Phase1Task_TransitionAll(u8 taskId) #define tPlayerSpriteId data[14] #define tMugshotId data[15] -void Phase2Task_Blur(u8 taskId) +static void Phase2Task_Blur(u8 taskId) { while (sPhase2_Blur_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -bool8 Phase2_Blur_Func1(struct Task *task) +static bool8 Phase2_Blur_Func1(struct Task *task) { SetGpuReg(REG_OFFSET_MOSAIC, 0); SetGpuRegBits(REG_OFFSET_BG1CNT, BGCNT_MOSAIC); @@ -1071,7 +1074,7 @@ bool8 Phase2_Blur_Func1(struct Task *task) return TRUE; } -bool8 Phase2_Blur_Func2(struct Task *task) +static bool8 Phase2_Blur_Func2(struct Task *task) { if (task->tData1 != 0) { @@ -1089,7 +1092,7 @@ bool8 Phase2_Blur_Func2(struct Task *task) return FALSE; } -bool8 Phase2_Blur_Func3(struct Task *task) +static bool8 Phase2_Blur_Func3(struct Task *task) { if (!gPaletteFade.active) { @@ -1099,12 +1102,12 @@ bool8 Phase2_Blur_Func3(struct Task *task) return FALSE; } -void Phase2Task_Swirl(u8 taskId) +static void Phase2Task_Swirl(u8 taskId) { while (sPhase2_Swirl_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -bool8 Phase2_Swirl_Func1(struct Task *task) +static bool8 Phase2_Swirl_Func1(struct Task *task) { sub_8149F08(); dp12_8087EA4(); @@ -1120,7 +1123,7 @@ bool8 Phase2_Swirl_Func1(struct Task *task) return FALSE; } -bool8 Phase2_Swirl_Func2(struct Task *task) +static bool8 Phase2_Swirl_Func2(struct Task *task) { sTransitionStructPtr->VBlank_DMA = FALSE; task->tData1 += 4; @@ -1138,14 +1141,14 @@ bool8 Phase2_Swirl_Func2(struct Task *task) return FALSE; } -void VBlankCB_Phase2_Swirl(void) +static void VBlankCB_Phase2_Swirl(void) { VBlankCB_BattleTransition(); if (sTransitionStructPtr->VBlank_DMA) DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320); } -void HBlankCB_Phase2_Swirl(void) +static void HBlankCB_Phase2_Swirl(void) { u16 var = gUnknown_02038C28[1][REG_VCOUNT]; REG_BG1HOFS = var; @@ -1153,12 +1156,12 @@ void HBlankCB_Phase2_Swirl(void) REG_BG3HOFS = var; } -void Phase2Task_Shuffle(u8 taskId) +static void Phase2Task_Shuffle(u8 taskId) { while (sPhase2_Shuffle_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -bool8 Phase2_Shuffle_Func1(struct Task *task) +static bool8 Phase2_Shuffle_Func1(struct Task *task) { sub_8149F08(); dp12_8087EA4(); @@ -1175,7 +1178,7 @@ bool8 Phase2_Shuffle_Func1(struct Task *task) return FALSE; } -bool8 Phase2_Shuffle_Func2(struct Task *task) +static bool8 Phase2_Shuffle_Func2(struct Task *task) { u8 i; u16 r3, r4; @@ -1199,14 +1202,14 @@ bool8 Phase2_Shuffle_Func2(struct Task *task) return FALSE; } -void VBlankCB_Phase2_Shuffle(void) +static void VBlankCB_Phase2_Shuffle(void) { VBlankCB_BattleTransition(); if (sTransitionStructPtr->VBlank_DMA) DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320); } -void HBlankCB_Phase2_Shuffle(void) +static void HBlankCB_Phase2_Shuffle(void) { u16 var = gUnknown_02038C28[1][REG_VCOUNT]; REG_BG1VOFS = var; @@ -1214,42 +1217,42 @@ void HBlankCB_Phase2_Shuffle(void) REG_BG3VOFS = var; } -void Phase2Task_BigPokeball(u8 taskId) +static void Phase2Task_BigPokeball(u8 taskId) { while (sPhase2_BigPokeball_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -void Phase2Task_Aqua(u8 taskId) +static void Phase2Task_Aqua(u8 taskId) { while (sPhase2_Aqua_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -void Phase2Task_Magma(u8 taskId) +static void Phase2Task_Magma(u8 taskId) { while (sPhase2_Magma_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -void Phase2Task_Regice(u8 taskId) +static void Phase2Task_Regice(u8 taskId) { while (sPhase2_Regice_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -void Phase2Task_Registeel(u8 taskId) +static void Phase2Task_Registeel(u8 taskId) { while (sPhase2_Registeel_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -void Phase2Task_Regirock(u8 taskId) +static void Phase2Task_Regirock(u8 taskId) { while (sPhase2_Regirock_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -void Phase2Task_Kyogre(u8 taskId) +static void Phase2Task_Kyogre(u8 taskId) { while (sPhase2_Kyogre_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -void sub_814669C(struct Task *task) +static void sub_814669C(struct Task *task) { s32 i; @@ -1275,7 +1278,7 @@ void sub_814669C(struct Task *task) SetVBlankCallback(VBlankCB0_Phase2_BigPokeball); } -bool8 Phase2_Aqua_Func1(struct Task *task) +static bool8 Phase2_Aqua_Func1(struct Task *task) { u16 *dst1, *dst2; @@ -1290,7 +1293,7 @@ bool8 Phase2_Aqua_Func1(struct Task *task) return FALSE; } -bool8 Phase2_Magma_Func1(struct Task *task) +static bool8 Phase2_Magma_Func1(struct Task *task) { u16 *dst1, *dst2; @@ -1305,7 +1308,7 @@ bool8 Phase2_Magma_Func1(struct Task *task) return FALSE; } -bool8 Phase2_Regi_Func1(struct Task *task) +static bool8 Phase2_Regi_Func1(struct Task *task) { u16 *dst1, *dst2; @@ -1319,7 +1322,7 @@ bool8 Phase2_Regi_Func1(struct Task *task) return FALSE; } -bool8 Phase2_BigPokeball_Func1(struct Task *task) +static bool8 Phase2_BigPokeball_Func1(struct Task *task) { u16 *dst1, *dst2; @@ -1333,7 +1336,7 @@ bool8 Phase2_BigPokeball_Func1(struct Task *task) return FALSE; } -bool8 Phase2_BigPokeball_Func2(struct Task *task) +static bool8 Phase2_BigPokeball_Func2(struct Task *task) { s16 i, j; u16 *dst1, *dst2; @@ -1354,7 +1357,7 @@ bool8 Phase2_BigPokeball_Func2(struct Task *task) return TRUE; } -bool8 Phase2_Aqua_Func2(struct Task *task) +static bool8 Phase2_Aqua_Func2(struct Task *task) { u16 *dst1, *dst2; @@ -1366,7 +1369,7 @@ bool8 Phase2_Aqua_Func2(struct Task *task) return FALSE; } -bool8 Phase2_Magma_Func2(struct Task *task) +static bool8 Phase2_Magma_Func2(struct Task *task) { u16 *dst1, *dst2; @@ -1378,7 +1381,7 @@ bool8 Phase2_Magma_Func2(struct Task *task) return FALSE; } -bool8 Phase2_Regice_Func2(struct Task *task) +static bool8 Phase2_Regice_Func2(struct Task *task) { u16 *dst1, *dst2; @@ -1391,7 +1394,7 @@ bool8 Phase2_Regice_Func2(struct Task *task) return FALSE; } -bool8 Phase2_Registeel_Func2(struct Task *task) +static bool8 Phase2_Registeel_Func2(struct Task *task) { u16 *dst1, *dst2; @@ -1404,7 +1407,7 @@ bool8 Phase2_Registeel_Func2(struct Task *task) return FALSE; } -bool8 Phase2_Regirock_Func2(struct Task *task) +static bool8 Phase2_Regirock_Func2(struct Task *task) { u16 *dst1, *dst2; @@ -1417,7 +1420,7 @@ bool8 Phase2_Regirock_Func2(struct Task *task) return FALSE; } -bool8 Phase2_Kyogre_Func3(struct Task *task) +static bool8 Phase2_Kyogre_Func3(struct Task *task) { u16 *dst1, *dst2; @@ -1430,7 +1433,7 @@ bool8 Phase2_Kyogre_Func3(struct Task *task) return FALSE; } -bool8 Phase2_Kyogre_Func4(struct Task *task) +static bool8 Phase2_Kyogre_Func4(struct Task *task) { if (task->tData1 % 3 == 0) { @@ -1447,7 +1450,7 @@ bool8 Phase2_Kyogre_Func4(struct Task *task) return FALSE; } -bool8 Phase2_Kyogre_Func5(struct Task *task) +static bool8 Phase2_Kyogre_Func5(struct Task *task) { if (task->tData1 % 5 == 0) { @@ -1464,14 +1467,14 @@ bool8 Phase2_Kyogre_Func5(struct Task *task) return FALSE; } -bool8 Phase2_WeatherDuo_Func6(struct Task *task) +static bool8 Phase2_WeatherDuo_Func6(struct Task *task) { BeginNormalPaletteFade(0xFFFF8000, 1, 0, 0x10, 0); task->tState++; return FALSE; } -bool8 Phase2_WeatherDuo_Func7(struct Task *task) +static bool8 Phase2_WeatherDuo_Func7(struct Task *task) { if (!gPaletteFade.active) { @@ -1482,7 +1485,7 @@ bool8 Phase2_WeatherDuo_Func7(struct Task *task) return FALSE; } -bool8 Phase2_BigPokeball_Func3(struct Task *task) +static bool8 Phase2_BigPokeball_Func3(struct Task *task) { sTransitionStructPtr->VBlank_DMA = FALSE; if (task->tData3 == 0 || --task->tData3 == 0) @@ -1502,7 +1505,7 @@ bool8 Phase2_BigPokeball_Func3(struct Task *task) return FALSE; } -bool8 Phase2_BigPokeball_Func4(struct Task *task) +static bool8 Phase2_BigPokeball_Func4(struct Task *task) { sTransitionStructPtr->VBlank_DMA = FALSE; if (task->tData3 == 0 || --task->tData3 == 0) @@ -1522,7 +1525,7 @@ bool8 Phase2_BigPokeball_Func4(struct Task *task) return FALSE; } -bool8 Phase2_BigPokeball_Func5(struct Task *task) +static bool8 Phase2_BigPokeball_Func5(struct Task *task) { sTransitionStructPtr->VBlank_DMA = FALSE; task->tData4 += 8; @@ -1542,28 +1545,28 @@ bool8 Phase2_BigPokeball_Func5(struct Task *task) return FALSE; } -bool8 Phase2_FramesCountdown(struct Task *task) +static bool8 Phase2_FramesCountdown(struct Task *task) { if (--task->tFrames == 0) task->tState++; return FALSE; } -bool8 Phase2_WeatherTrio_Func1(struct Task *task) +static bool8 Phase2_WeatherTrio_Func1(struct Task *task) { BeginNormalPaletteFade(0x0000FFFF, 1, 0, 0x10, 0); task->tState++; return FALSE; } -bool8 Phase2_WaitPaletteFade(struct Task *task) +static bool8 Phase2_WaitPaletteFade(struct Task *task) { if (!gPaletteFade.active) task->tState++; return FALSE; } -bool8 Phase2_BigPokeball_Func6(struct Task *task) +static bool8 Phase2_BigPokeball_Func6(struct Task *task) { sTransitionStructPtr->VBlank_DMA = FALSE; if (task->tData2 < 1024) @@ -1596,7 +1599,7 @@ bool8 Phase2_BigPokeball_Func6(struct Task *task) return FALSE; } -void Transition_BigPokeball_Vblank(void) +static void Transition_BigPokeball_Vblank(void) { DmaStop(0); VBlankCB_BattleTransition(); @@ -1609,24 +1612,24 @@ void Transition_BigPokeball_Vblank(void) REG_BLDALPHA = sTransitionStructPtr->BLDALPHA; } -void VBlankCB0_Phase2_BigPokeball(void) +static void VBlankCB0_Phase2_BigPokeball(void) { Transition_BigPokeball_Vblank(); DmaSet(0, gUnknown_020393A8, ®_BG0HOFS, 0xA2400001); } -void VBlankCB1_Phase2_BigPokeball(void) +static void VBlankCB1_Phase2_BigPokeball(void) { Transition_BigPokeball_Vblank(); DmaSet(0, gUnknown_020393A8, ®_WIN0H, 0xA2400001); } -void Phase2Task_PokeballsTrail(u8 taskId) +static void Phase2Task_PokeballsTrail(u8 taskId) { while (sPhase2_PokeballsTrail_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -bool8 Phase2_PokeballsTrail_Func1(struct Task *task) +static bool8 Phase2_PokeballsTrail_Func1(struct Task *task) { u16 *dst1, *dst2; @@ -1639,7 +1642,7 @@ bool8 Phase2_PokeballsTrail_Func1(struct Task *task) return FALSE; } -bool8 Phase2_PokeballsTrail_Func2(struct Task *task) +static bool8 Phase2_PokeballsTrail_Func2(struct Task *task) { s16 i; s16 rand; @@ -1662,7 +1665,7 @@ bool8 Phase2_PokeballsTrail_Func2(struct Task *task) return FALSE; } -bool8 Phase2_PokeballsTrail_Func3(struct Task *task) +static bool8 Phase2_PokeballsTrail_Func3(struct Task *task) { if (!FieldEffectActiveListContains(FLDEFF_POKEBALL)) { @@ -1691,7 +1694,7 @@ bool8 FldEff_Pokeball(void) ptr[index] = toStore; \ } -void sub_814713C(struct Sprite *sprite) +static void sub_814713C(struct Sprite *sprite) { s16 arr0[ARRAY_COUNT(sUnknown_085C8B96)]; @@ -1728,12 +1731,12 @@ void sub_814713C(struct Sprite *sprite) } } -void Phase2Task_Clockwise_BlackFade(u8 taskId) +static void Phase2Task_Clockwise_BlackFade(u8 taskId) { while (sPhase2_Clockwise_BlackFade_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -bool8 Phase2_Clockwise_BlackFade_Func1(struct Task *task) +static bool8 Phase2_Clockwise_BlackFade_Func1(struct Task *task) { u16 i; @@ -1757,7 +1760,7 @@ bool8 Phase2_Clockwise_BlackFade_Func1(struct Task *task) return TRUE; } -bool8 Phase2_Clockwise_BlackFade_Func2(struct Task *task) +static bool8 Phase2_Clockwise_BlackFade_Func2(struct Task *task) { sTransitionStructPtr->VBlank_DMA = FALSE; @@ -1778,7 +1781,7 @@ bool8 Phase2_Clockwise_BlackFade_Func2(struct Task *task) return FALSE; } -bool8 Phase2_Clockwise_BlackFade_Func3(struct Task *task) +static bool8 Phase2_Clockwise_BlackFade_Func3(struct Task *task) { s16 r1, r3; vu8 var = 0; @@ -1816,7 +1819,7 @@ bool8 Phase2_Clockwise_BlackFade_Func3(struct Task *task) return FALSE; } -bool8 Phase2_Clockwise_BlackFade_Func4(struct Task *task) +static bool8 Phase2_Clockwise_BlackFade_Func4(struct Task *task) { sTransitionStructPtr->VBlank_DMA = FALSE; @@ -1837,7 +1840,7 @@ bool8 Phase2_Clockwise_BlackFade_Func4(struct Task *task) return FALSE; } -bool8 Phase2_Clockwise_BlackFade_Func5(struct Task *task) +static bool8 Phase2_Clockwise_BlackFade_Func5(struct Task *task) { s16 r1, r2, var4; vu8 var = 0; @@ -1877,7 +1880,7 @@ bool8 Phase2_Clockwise_BlackFade_Func5(struct Task *task) return FALSE; } -bool8 Phase2_Clockwise_BlackFade_Func6(struct Task *task) +static bool8 Phase2_Clockwise_BlackFade_Func6(struct Task *task) { sTransitionStructPtr->VBlank_DMA = FALSE; @@ -1901,7 +1904,7 @@ bool8 Phase2_Clockwise_BlackFade_Func6(struct Task *task) return FALSE; } -bool8 Phase2_Clockwise_BlackFade_Func7(struct Task *task) +static bool8 Phase2_Clockwise_BlackFade_Func7(struct Task *task) { DmaStop(0); sub_8149F84(); @@ -1909,7 +1912,7 @@ bool8 Phase2_Clockwise_BlackFade_Func7(struct Task *task) return FALSE; } -void VBlankCB_Phase2_Clockwise_BlackFade(void) +static void VBlankCB_Phase2_Clockwise_BlackFade(void) { DmaStop(0); VBlankCB_BattleTransition(); @@ -1922,12 +1925,12 @@ void VBlankCB_Phase2_Clockwise_BlackFade(void) DmaSet(0, gUnknown_02038C28[1], ®_WIN0H, 0xA2400001); } -void Phase2Task_Ripple(u8 taskId) +static void Phase2Task_Ripple(u8 taskId) { while (sPhase2_Ripple_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -bool8 Phase2_Ripple_Func1(struct Task *task) +static bool8 Phase2_Ripple_Func1(struct Task *task) { u8 i; @@ -1948,7 +1951,7 @@ bool8 Phase2_Ripple_Func1(struct Task *task) return TRUE; } -bool8 Phase2_Ripple_Func2(struct Task *task) +static bool8 Phase2_Ripple_Func2(struct Task *task) { u8 i; s16 r3; @@ -1984,14 +1987,14 @@ bool8 Phase2_Ripple_Func2(struct Task *task) return FALSE; } -void VBlankCB_Phase2_Ripple(void) +static void VBlankCB_Phase2_Ripple(void) { VBlankCB_BattleTransition(); if (sTransitionStructPtr->VBlank_DMA) DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320); } -void HBlankCB_Phase2_Ripple(void) +static void HBlankCB_Phase2_Ripple(void) { u16 var = gUnknown_02038C28[1][REG_VCOUNT]; REG_BG1VOFS = var; @@ -1999,12 +2002,12 @@ void HBlankCB_Phase2_Ripple(void) REG_BG3VOFS = var; } -void Phase2Task_Wave(u8 taskId) +static void Phase2Task_Wave(u8 taskId) { while (sPhase2_Wave_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -bool8 Phase2_Wave_Func1(struct Task *task) +static bool8 Phase2_Wave_Func1(struct Task *task) { u8 i; @@ -2027,7 +2030,7 @@ bool8 Phase2_Wave_Func1(struct Task *task) return TRUE; } -bool8 Phase2_Wave_Func2(struct Task *task) +static bool8 Phase2_Wave_Func2(struct Task *task) { u8 i, r5; u16* toStore; @@ -2057,7 +2060,7 @@ bool8 Phase2_Wave_Func2(struct Task *task) return FALSE; } -bool8 Phase2_Wave_Func3(struct Task *task) +static bool8 Phase2_Wave_Func3(struct Task *task) { DmaStop(0); sub_8149F84(); @@ -2065,7 +2068,7 @@ bool8 Phase2_Wave_Func3(struct Task *task) return FALSE; } -void VBlankCB_Phase2_Wave(void) +static void VBlankCB_Phase2_Wave(void) { DmaStop(0); VBlankCB_BattleTransition(); @@ -2077,42 +2080,42 @@ void VBlankCB_Phase2_Wave(void) DmaSet(0, gUnknown_02038C28[1], ®_WIN0H, 0xA2400001); } -void Phase2Task_Sydney(u8 taskId) +static void Phase2Task_Sydney(u8 taskId) { gTasks[taskId].tMugshotId = MUGSHOT_SYDNEY; Phase2Task_MugShotTransition(taskId); } -void Phase2Task_Phoebe(u8 taskId) +static void Phase2Task_Phoebe(u8 taskId) { gTasks[taskId].tMugshotId = MUGSHOT_PHOEBE; Phase2Task_MugShotTransition(taskId); } -void Phase2Task_Glacia(u8 taskId) +static void Phase2Task_Glacia(u8 taskId) { gTasks[taskId].tMugshotId = MUGSHOT_GLACIA; Phase2Task_MugShotTransition(taskId); } -void Phase2Task_Drake(u8 taskId) +static void Phase2Task_Drake(u8 taskId) { gTasks[taskId].tMugshotId = MUGSHOT_DRAKE; Phase2Task_MugShotTransition(taskId); } -void Phase2Task_Champion(u8 taskId) +static void Phase2Task_Champion(u8 taskId) { gTasks[taskId].tMugshotId = MUGSHOT_CHAMPION; Phase2Task_MugShotTransition(taskId); } -void Phase2Task_MugShotTransition(u8 taskId) +static void Phase2Task_MugShotTransition(u8 taskId) { while (sPhase2_Mugshot_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -bool8 Phase2_Mugshot_Func1(struct Task *task) +static bool8 Phase2_Mugshot_Func1(struct Task *task) { u8 i; @@ -2138,7 +2141,7 @@ bool8 Phase2_Mugshot_Func1(struct Task *task) return FALSE; } -bool8 Phase2_Mugshot_Func2(struct Task *task) +static bool8 Phase2_Mugshot_Func2(struct Task *task) { s16 i, j; u16 *dst1, *dst2; @@ -2165,7 +2168,7 @@ bool8 Phase2_Mugshot_Func2(struct Task *task) return FALSE; } -bool8 Phase2_Mugshot_Func3(struct Task *task) +static bool8 Phase2_Mugshot_Func3(struct Task *task) { u8 i, r5; u16* toStore; @@ -2213,7 +2216,7 @@ bool8 Phase2_Mugshot_Func3(struct Task *task) return FALSE; } -bool8 Phase2_Mugshot_Func4(struct Task *task) +static bool8 Phase2_Mugshot_Func4(struct Task *task) { u8 i; u16* toStore; @@ -2242,7 +2245,7 @@ bool8 Phase2_Mugshot_Func4(struct Task *task) return FALSE; } -bool8 Phase2_Mugshot_Func5(struct Task *task) +static bool8 Phase2_Mugshot_Func5(struct Task *task) { sTransitionStructPtr->field_18 -= 8; sTransitionStructPtr->field_1A += 8; @@ -2254,7 +2257,7 @@ bool8 Phase2_Mugshot_Func5(struct Task *task) return FALSE; } -bool8 Phase2_Mugshot_Func6(struct Task *task) +static bool8 Phase2_Mugshot_Func6(struct Task *task) { sTransitionStructPtr->field_18 -= 8; sTransitionStructPtr->field_1A += 8; @@ -2276,7 +2279,7 @@ bool8 Phase2_Mugshot_Func6(struct Task *task) return FALSE; } -bool8 Phase2_Mugshot_Func7(struct Task *task) +static bool8 Phase2_Mugshot_Func7(struct Task *task) { bool32 r6; @@ -2317,7 +2320,7 @@ bool8 Phase2_Mugshot_Func7(struct Task *task) return FALSE; } -bool8 Phase2_Mugshot_Func8(struct Task *task) +static bool8 Phase2_Mugshot_Func8(struct Task *task) { sTransitionStructPtr->VBlank_DMA = FALSE; BlendPalettes(-1, 0x10, 0x7FFF); @@ -2328,7 +2331,7 @@ bool8 Phase2_Mugshot_Func8(struct Task *task) return TRUE; } -bool8 Phase2_Mugshot_Func9(struct Task *task) +static bool8 Phase2_Mugshot_Func9(struct Task *task) { sTransitionStructPtr->VBlank_DMA = FALSE; @@ -2341,7 +2344,7 @@ bool8 Phase2_Mugshot_Func9(struct Task *task) return FALSE; } -bool8 Phase2_Mugshot_Func10(struct Task *task) +static bool8 Phase2_Mugshot_Func10(struct Task *task) { DmaStop(0); sub_8149F84(); @@ -2349,7 +2352,7 @@ bool8 Phase2_Mugshot_Func10(struct Task *task) return FALSE; } -void VBlankCB0_Phase2_Mugshots(void) +static void VBlankCB0_Phase2_Mugshots(void) { DmaStop(0); VBlankCB_BattleTransition(); @@ -2362,7 +2365,7 @@ void VBlankCB0_Phase2_Mugshots(void) DmaSet(0, gUnknown_02038C28[1], ®_WIN0H, 0xA2400001); } -void VBlankCB1_Phase2_Mugshots(void) +static void VBlankCB1_Phase2_Mugshots(void) { DmaStop(0); VBlankCB_BattleTransition(); @@ -2372,7 +2375,7 @@ void VBlankCB1_Phase2_Mugshots(void) DmaSet(0, gUnknown_02038C28[1], ®_BLDY, 0xA2400001); } -void HBlankCB_Phase2_Mugshots(void) +static void HBlankCB_Phase2_Mugshots(void) { if (REG_VCOUNT < 80) REG_BG0HOFS = sTransitionStructPtr->field_18; @@ -2380,7 +2383,7 @@ void HBlankCB_Phase2_Mugshots(void) REG_BG0HOFS = sTransitionStructPtr->field_1A; } -void Mugshots_CreateOpponentPlayerSprites(struct Task *task) +static void Mugshots_CreateOpponentPlayerSprites(struct Task *task) { struct Sprite *opponentSprite, *playerSprite; @@ -2416,17 +2419,17 @@ void Mugshots_CreateOpponentPlayerSprites(struct Task *task) SetOamMatrixRotationScaling(playerSprite->oam.matrixNum, -512, 512, 0); } -void sub_8148380(struct Sprite *sprite) +static void sub_8148380(struct Sprite *sprite) { while (sUnknown_085C8C24[sprite->data[0]](sprite)); } -bool8 sub_81483A8(struct Sprite *sprite) +static bool8 sub_81483A8(struct Sprite *sprite) { return FALSE; } -bool8 sub_81483AC(struct Sprite *sprite) +static bool8 sub_81483AC(struct Sprite *sprite) { s16 arr0[2]; s16 arr1[2]; @@ -2440,7 +2443,7 @@ bool8 sub_81483AC(struct Sprite *sprite) return TRUE; } -bool8 sub_81483F8(struct Sprite *sprite) +static bool8 sub_81483F8(struct Sprite *sprite) { sprite->pos1.x += sprite->data[1]; if (sprite->data[7] && sprite->pos1.x < 133) @@ -2450,7 +2453,7 @@ bool8 sub_81483F8(struct Sprite *sprite) return FALSE; } -bool8 sub_814842C(struct Sprite *sprite) +static bool8 sub_814842C(struct Sprite *sprite) { sprite->data[1] += sprite->data[2]; sprite->pos1.x += sprite->data[1]; @@ -2463,7 +2466,7 @@ bool8 sub_814842C(struct Sprite *sprite) return FALSE; } -bool8 sub_8148458(struct Sprite *sprite) +static bool8 sub_8148458(struct Sprite *sprite) { sprite->data[1] += sprite->data[2]; sprite->pos1.x += sprite->data[1]; @@ -2472,27 +2475,27 @@ bool8 sub_8148458(struct Sprite *sprite) return FALSE; } -void sub_8148484(s16 spriteId, s16 value) +static void sub_8148484(s16 spriteId, s16 value) { gSprites[spriteId].data[7] = value; } -void sub_814849C(s16 spriteId) +static void sub_814849C(s16 spriteId) { gSprites[spriteId].data[0]++; } -s16 sub_81484B8(s16 spriteId) +static s16 sub_81484B8(s16 spriteId) { return gSprites[spriteId].data[6]; } -void Phase2Task_Slice(u8 taskId) +static void Phase2Task_Slice(u8 taskId) { while (sPhase2_Slice_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -bool8 Phase2_Slice_Func1(struct Task *task) +static bool8 Phase2_Slice_Func1(struct Task *task) { u16 i; @@ -2522,7 +2525,7 @@ bool8 Phase2_Slice_Func1(struct Task *task) return TRUE; } -bool8 Phase2_Slice_Func2(struct Task *task) +static bool8 Phase2_Slice_Func2(struct Task *task) { u16 i; @@ -2559,7 +2562,7 @@ bool8 Phase2_Slice_Func2(struct Task *task) return FALSE; } -bool8 Phase2_Slice_Func3(struct Task *task) +static bool8 Phase2_Slice_Func3(struct Task *task) { DmaStop(0); sub_8149F84(); @@ -2567,7 +2570,7 @@ bool8 Phase2_Slice_Func3(struct Task *task) return FALSE; } -void VBlankCB_Phase2_Slice(void) +static void VBlankCB_Phase2_Slice(void) { DmaStop(0); VBlankCB_BattleTransition(); @@ -2579,7 +2582,7 @@ void VBlankCB_Phase2_Slice(void) DmaSet(0, &gUnknown_02038C28[1][160], ®_WIN0H, 0xA2400001); } -void HBlankCB_Phase2_Slice(void) +static void HBlankCB_Phase2_Slice(void) { if (REG_VCOUNT < 160) { @@ -2590,12 +2593,12 @@ void HBlankCB_Phase2_Slice(void) } } -void Phase2Task_ShredSplit(u8 taskId) +static void Phase2Task_ShredSplit(u8 taskId) { while (sPhase2_ShredSplit_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -bool8 Phase2_ShredSplit_Func1(struct Task *task) +static bool8 Phase2_ShredSplit_Func1(struct Task *task) { u16 i; @@ -2630,7 +2633,7 @@ bool8 Phase2_ShredSplit_Func1(struct Task *task) return TRUE; } -bool8 Phase2_ShredSplit_Func2(struct Task *task) +static bool8 Phase2_ShredSplit_Func2(struct Task *task) { u16 i, j, k; u8 arr1[ARRAY_COUNT(gUnknown_085C8C64)]; @@ -2727,7 +2730,7 @@ bool8 Phase2_ShredSplit_Func2(struct Task *task) return FALSE; } -bool8 Phase2_ShredSplit_Func3(struct Task *task) +static bool8 Phase2_ShredSplit_Func3(struct Task *task) { u16 i; bool32 done = TRUE; @@ -2745,7 +2748,7 @@ bool8 Phase2_ShredSplit_Func3(struct Task *task) return FALSE; } -bool8 Phase2_ShredSplit_Func4(struct Task *task) +static bool8 Phase2_ShredSplit_Func4(struct Task *task) { DmaStop(0); sub_8149F84(); @@ -2753,17 +2756,17 @@ bool8 Phase2_ShredSplit_Func4(struct Task *task) return FALSE; } -void Phase2Task_Blackhole1(u8 taskId) +static void Phase2Task_Blackhole1(u8 taskId) { while (sPhase2_Blackhole1_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -void Phase2Task_Blackhole2(u8 taskId) +static void Phase2Task_Blackhole2(u8 taskId) { while (sPhase2_Blackhole2_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -bool8 Phase2_Blackhole_Func1(struct Task *task) +static bool8 Phase2_Blackhole_Func1(struct Task *task) { s32 i; @@ -2790,7 +2793,7 @@ bool8 Phase2_Blackhole_Func1(struct Task *task) return FALSE; } -bool8 Phase2_Blackhole1_Func3(struct Task *task) +static bool8 Phase2_Blackhole1_Func3(struct Task *task) { if (task->tFuncState == 1) { @@ -2822,7 +2825,7 @@ bool8 Phase2_Blackhole1_Func3(struct Task *task) return FALSE; } -bool8 Phase2_Blackhole1_Func2(struct Task *task) +static bool8 Phase2_Blackhole1_Func2(struct Task *task) { sTransitionStructPtr->VBlank_DMA = FALSE; if (task->tFuncState == 0) @@ -2844,7 +2847,7 @@ bool8 Phase2_Blackhole1_Func2(struct Task *task) return FALSE; } -bool8 Phase2_Blackhole2_Func2(struct Task *task) +static bool8 Phase2_Blackhole2_Func2(struct Task *task) { u16 index; // should be s16 I think s16 amplitude; @@ -2889,12 +2892,12 @@ bool8 Phase2_Blackhole2_Func2(struct Task *task) return FALSE; } -void Phase2Task_RectangularSpiral(u8 taskId) +static void Phase2Task_RectangularSpiral(u8 taskId) { while (sPhase2_RectangularSpiral_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -bool8 Phase2_RectangularSpiral_Func1(struct Task *task) +static bool8 Phase2_RectangularSpiral_Func1(struct Task *task) { u16 *dst1, *dst2; @@ -2934,7 +2937,7 @@ bool8 Phase2_RectangularSpiral_Func1(struct Task *task) return FALSE; } -bool8 Phase2_RectangularSpiral_Func2(struct Task *task) +static bool8 Phase2_RectangularSpiral_Func2(struct Task *task) { u16 *dst1, *dst2; u8 i; @@ -2972,7 +2975,7 @@ bool8 Phase2_RectangularSpiral_Func2(struct Task *task) return FALSE; } -bool8 Phase2_RectangularSpiral_Func3(struct Task *task) +static bool8 Phase2_RectangularSpiral_Func3(struct Task *task) { DmaStop(0); sub_8149F84(); @@ -2980,7 +2983,7 @@ bool8 Phase2_RectangularSpiral_Func3(struct Task *task) return FALSE; } -bool16 sub_8149048(const s16 * const *arg0, struct StructRectangularSpiral *arg1) +static bool16 sub_8149048(const s16 * const *arg0, struct StructRectangularSpiral *arg1) { const s16 *array = arg0[arg1->field_0]; if (array[arg1->field_4] == -1) @@ -3043,12 +3046,12 @@ bool16 sub_8149048(const s16 * const *arg0, struct StructRectangularSpiral *arg1 return TRUE; } -void Phase2Task_Groudon(u8 taskId) +static void Phase2Task_Groudon(u8 taskId) { while (sPhase2_Groudon_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -bool8 Phase2_Groudon_Func3(struct Task *task) +static bool8 Phase2_Groudon_Func3(struct Task *task) { u16 *dst1, *dst2; @@ -3062,7 +3065,7 @@ bool8 Phase2_Groudon_Func3(struct Task *task) return FALSE; } -bool8 Phase2_Groudon_Func4(struct Task *task) +static bool8 Phase2_Groudon_Func4(struct Task *task) { if (task->tData1 % 3 == 0) { @@ -3078,7 +3081,7 @@ bool8 Phase2_Groudon_Func4(struct Task *task) return FALSE; } -bool8 Phase2_Groudon_Func5(struct Task *task) +static bool8 Phase2_Groudon_Func5(struct Task *task) { if (task->tData1 % 5 == 0) { @@ -3095,12 +3098,12 @@ bool8 Phase2_Groudon_Func5(struct Task *task) return FALSE; } -void Phase2Task_Rayquaza(u8 taskId) +static void Phase2Task_Rayquaza(u8 taskId) { while (sPhase2_Rayquaza_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -bool8 Phase2_Rayquaza_Func3(struct Task *task) +static bool8 Phase2_Rayquaza_Func3(struct Task *task) { u16 *dst1, *dst2; u16 i; @@ -3127,7 +3130,7 @@ bool8 Phase2_Rayquaza_Func3(struct Task *task) return FALSE; } -bool8 Phase2_Rayquaza_Func4(struct Task *task) +static bool8 Phase2_Rayquaza_Func4(struct Task *task) { u16 *dst1, *dst2; @@ -3137,7 +3140,7 @@ bool8 Phase2_Rayquaza_Func4(struct Task *task) return FALSE; } -bool8 Phase2_Rayquaza_Func5(struct Task *task) +static bool8 Phase2_Rayquaza_Func5(struct Task *task) { if ((task->tData1 % 4) == 0) { @@ -3154,7 +3157,7 @@ bool8 Phase2_Rayquaza_Func5(struct Task *task) return FALSE; } -bool8 Phase2_Rayquaza_Func6(struct Task *task) +static bool8 Phase2_Rayquaza_Func6(struct Task *task) { if (++task->tData1 > 20) { @@ -3166,7 +3169,7 @@ bool8 Phase2_Rayquaza_Func6(struct Task *task) return FALSE; } -bool8 Phase2_Rayquaza_Func7(struct Task *task) +static bool8 Phase2_Rayquaza_Func7(struct Task *task) { if (!gPaletteFade.active) { @@ -3177,7 +3180,7 @@ bool8 Phase2_Rayquaza_Func7(struct Task *task) return FALSE; } -bool8 Phase2_Rayquaza_Func8(struct Task *task) +static bool8 Phase2_Rayquaza_Func8(struct Task *task) { BlendPalettes(0x00007FFF, 8, 0); BlendPalettes(0xFFFF8000, 0, 0); @@ -3186,7 +3189,7 @@ bool8 Phase2_Rayquaza_Func8(struct Task *task) return FALSE; } -bool8 Phase2_Rayquaza_Func9(struct Task *task) +static bool8 Phase2_Rayquaza_Func9(struct Task *task) { if ((task->tData1 % 3) == 0) { @@ -3218,7 +3221,7 @@ bool8 Phase2_Rayquaza_Func9(struct Task *task) return FALSE; } -void VBlankCB_Phase2_Rayquaza(void) +static void VBlankCB_Phase2_Rayquaza(void) { void *dmaSrc; @@ -3235,12 +3238,12 @@ void VBlankCB_Phase2_Rayquaza(void) DmaSet(0, dmaSrc, ®_BG0VOFS, 0xA2400001); } -void Phase2Task_WhiteFade(u8 taskId) +static void Phase2Task_WhiteFade(u8 taskId) { while (sPhase2_WhiteFade_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -bool8 Phase2_WhiteFade_Func1(struct Task *task) +static bool8 Phase2_WhiteFade_Func1(struct Task *task) { u16 i; @@ -3267,7 +3270,7 @@ bool8 Phase2_WhiteFade_Func1(struct Task *task) return FALSE; } -bool8 Phase2_WhiteFade_Func2(struct Task *task) +static bool8 Phase2_WhiteFade_Func2(struct Task *task) { s16 i, posY; s16 arr1[ARRAY_COUNT(sUnknown_085C8DA0)]; @@ -3287,7 +3290,7 @@ bool8 Phase2_WhiteFade_Func2(struct Task *task) return FALSE; } -bool8 Phase2_WhiteFade_Func3(struct Task *task) +static bool8 Phase2_WhiteFade_Func3(struct Task *task) { sTransitionStructPtr->VBlank_DMA = 0; if (sTransitionStructPtr->field_20 > 7) @@ -3298,7 +3301,7 @@ bool8 Phase2_WhiteFade_Func3(struct Task *task) return FALSE; } -bool8 Phase2_WhiteFade_Func4(struct Task *task) +static bool8 Phase2_WhiteFade_Func4(struct Task *task) { sTransitionStructPtr->VBlank_DMA = 0; @@ -3317,7 +3320,7 @@ bool8 Phase2_WhiteFade_Func4(struct Task *task) return FALSE; } -bool8 Phase2_WhiteFade_Func5(struct Task *task) +static bool8 Phase2_WhiteFade_Func5(struct Task *task) { if (++sTransitionStructPtr->BLDY > 16) { @@ -3327,7 +3330,7 @@ bool8 Phase2_WhiteFade_Func5(struct Task *task) return FALSE; } -void VBlankCB0_Phase2_WhiteFade(void) +static void VBlankCB0_Phase2_WhiteFade(void) { DmaStop(0); VBlankCB_BattleTransition(); @@ -3340,7 +3343,7 @@ void VBlankCB0_Phase2_WhiteFade(void) DmaSet(0, &gUnknown_02038C28[1][160], ®_WIN0H, 0xA2400001); } -void VBlankCB1_Phase2_WhiteFade(void) +static void VBlankCB1_Phase2_WhiteFade(void) { VBlankCB_BattleTransition(); REG_BLDY = sTransitionStructPtr->BLDY; @@ -3351,12 +3354,12 @@ void VBlankCB1_Phase2_WhiteFade(void) REG_WIN0V = sTransitionStructPtr->WIN0V; } -void HBlankCB_Phase2_WhiteFade(void) +static void HBlankCB_Phase2_WhiteFade(void) { REG_BLDY = gUnknown_02038C28[1][REG_VCOUNT]; } -void sub_8149864(struct Sprite *sprite) +static void sub_8149864(struct Sprite *sprite) { if (sprite->data[5]) { @@ -3399,12 +3402,12 @@ void sub_8149864(struct Sprite *sprite) } } -void Phase2Task_GridSquares(u8 taskId) +static void Phase2Task_GridSquares(u8 taskId) { while (sPhase2_GridSquares_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -bool8 Phase2_GridSquares_Func1(struct Task *task) +static bool8 Phase2_GridSquares_Func1(struct Task *task) { u16 *dst1, *dst2; @@ -3417,7 +3420,7 @@ bool8 Phase2_GridSquares_Func1(struct Task *task) return FALSE; } -bool8 Phase2_GridSquares_Func2(struct Task *task) +static bool8 Phase2_GridSquares_Func2(struct Task *task) { u16* dst1; @@ -3438,7 +3441,7 @@ bool8 Phase2_GridSquares_Func2(struct Task *task) return FALSE; } -bool8 Phase2_GridSquares_Func3(struct Task *task) +static bool8 Phase2_GridSquares_Func3(struct Task *task) { if (--task->tData1 == 0) { @@ -3448,12 +3451,12 @@ bool8 Phase2_GridSquares_Func3(struct Task *task) return FALSE; } -void Phase2Task_Shards(u8 taskId) +static void Phase2Task_Shards(u8 taskId) { while (sPhase2_Shards_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -bool8 Phase2_Shards_Func1(struct Task *task) +static bool8 Phase2_Shards_Func1(struct Task *task) { u16 i; @@ -3476,7 +3479,7 @@ bool8 Phase2_Shards_Func1(struct Task *task) return TRUE; } -bool8 Phase2_Shards_Func2(struct Task *task) +static bool8 Phase2_Shards_Func2(struct Task *task) { sub_814A1AC(sTransitionStructPtr->data, sUnknown_085C8DD0[task->tData1][0], @@ -3489,7 +3492,7 @@ bool8 Phase2_Shards_Func2(struct Task *task) return TRUE; } -bool8 Phase2_Shards_Func3(struct Task *task) +static bool8 Phase2_Shards_Func3(struct Task *task) { s16 i; bool8 nextFunc; @@ -3528,7 +3531,7 @@ bool8 Phase2_Shards_Func3(struct Task *task) return FALSE; } -bool8 Phase2_Shards_Func4(struct Task *task) +static bool8 Phase2_Shards_Func4(struct Task *task) { if (++task->tData1 < 7) { @@ -3545,7 +3548,7 @@ bool8 Phase2_Shards_Func4(struct Task *task) } } -bool8 Phase2_Shards_Func5(struct Task *task) +static bool8 Phase2_Shards_Func5(struct Task *task) { if (--task->tData3 == 0) { @@ -3556,7 +3559,7 @@ bool8 Phase2_Shards_Func5(struct Task *task) return FALSE; } -void VBlankCB_Phase2_Shards(void) +static void VBlankCB_Phase2_Shards(void) { DmaStop(0); VBlankCB_BattleTransition(); @@ -3591,9 +3594,9 @@ void VBlankCB_Phase2_Shards(void) #define tData6 data[6] #define tData7 data[7] -void CreatePhase1Task(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4) +static void CreatePhase1Task(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4) { - u8 taskId = CreateTask(Phase1_Task_RunFuncs, 3); + u8 taskId = CreateTask(TransitionPhase1_Task_RunFuncs, 3); gTasks[taskId].tData1 = a0; gTasks[taskId].tData2 = a1; gTasks[taskId].tData3 = a2; @@ -3602,20 +3605,20 @@ void CreatePhase1Task(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4) gTasks[taskId].tData6 = a0; } -bool8 IsPhase1Done(void) +static bool8 IsPhase1Done(void) { - if (FindTaskIdByFunc(Phase1_Task_RunFuncs) == 0xFF) + if (FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) == 0xFF) return TRUE; else return FALSE; } -void Phase1_Task_RunFuncs(u8 taskId) +void TransitionPhase1_Task_RunFuncs(u8 taskId) { while (sPhase1_TransitionAll_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -bool8 Phase1_TransitionAll_Func1(struct Task *task) +static bool8 Phase1_TransitionAll_Func1(struct Task *task) { if (task->tData6 == 0 || --task->tData6 == 0) { @@ -3633,7 +3636,7 @@ bool8 Phase1_TransitionAll_Func1(struct Task *task) return FALSE; } -bool8 Phase1_TransitionAll_Func2(struct Task *task) +static bool8 Phase1_TransitionAll_Func2(struct Task *task) { if (task->tData6 == 0 || --task->tData6 == 0) { @@ -3646,7 +3649,7 @@ bool8 Phase1_TransitionAll_Func2(struct Task *task) if (task->tData7 == 0) { if (--task->tData3 == 0) - DestroyTask(FindTaskIdByFunc(Phase1_Task_RunFuncs)); + DestroyTask(FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs)); else { task->tData6 = task->tData1; @@ -3664,20 +3667,20 @@ bool8 Phase1_TransitionAll_Func2(struct Task *task) #undef tData6 #undef tData7 -void sub_8149F08(void) +static void sub_8149F08(void) { memset(sTransitionStructPtr, 0, sizeof(*sTransitionStructPtr)); sub_8089C08(&sTransitionStructPtr->field_14, &sTransitionStructPtr->field_16); } -void VBlankCB_BattleTransition(void) +static void VBlankCB_BattleTransition(void) { LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); } -void sub_8149F40(u16 **a0) +static void sub_8149F40(u16 **a0) { u16 reg, *vram; @@ -3705,12 +3708,12 @@ void sub_8149F58(u16 **a0, u16 **a1) *a1 = vram1; } -void sub_8149F84(void) +static void sub_8149F84(void) { BlendPalettes(-1, 0x10, 0); } -void sub_8149F98(s16 *array, s16 sinAdd, s16 index, s16 indexIncrementer, s16 amplitude, s16 arrSize) +static void sub_8149F98(s16 *array, s16 sinAdd, s16 index, s16 indexIncrementer, s16 amplitude, s16 arrSize) { u8 i; for (i = 0; arrSize > 0; arrSize--, i++, index += indexIncrementer) @@ -3719,7 +3722,7 @@ void sub_8149F98(s16 *array, s16 sinAdd, s16 index, s16 indexIncrementer, s16 am } } -void sub_814A014(u16 *array, s16 a1, s16 a2, s16 a3) +static void sub_814A014(u16 *array, s16 a1, s16 a2, s16 a3) { s16 i; @@ -3771,7 +3774,7 @@ void sub_814A014(u16 *array, s16 a1, s16 a2, s16 a3) } } -void sub_814A1AC(s16 *data, s16 a1, s16 a2, s16 a3, s16 a4, s16 a5, s16 a6) +static void sub_814A1AC(s16 *data, s16 a1, s16 a2, s16 a3, s16 a4, s16 a5, s16 a6) { data[0] = a1; data[1] = a2; @@ -3796,7 +3799,7 @@ void sub_814A1AC(s16 *data, s16 a1, s16 a2, s16 a3, s16 a4, s16 a5, s16 a6) data[10] = 0; } -bool8 sub_814A228(s16 *data, bool8 a1, bool8 a2) +static bool8 sub_814A228(s16 *data, bool8 a1, bool8 a2) { u8 var; if (data[8] > data[9]) @@ -3848,7 +3851,7 @@ bool8 sub_814A228(s16 *data, bool8 a1, bool8 a2) #define tData6 data[6] #define tData7 data[7] -bool8 Phase2_29_Func1(struct Task *task) +static bool8 Phase2_29_Func1(struct Task *task) { u16 *dst1, *dst2; @@ -3862,7 +3865,7 @@ bool8 Phase2_29_Func1(struct Task *task) return FALSE; } -bool8 Phase2_29_Func2(struct Task *task) +static bool8 Phase2_29_Func2(struct Task *task) { u16 *dst1, *dst2; @@ -3874,28 +3877,28 @@ bool8 Phase2_29_Func2(struct Task *task) return TRUE; } -void Phase2Task_29(u8 taskId) +static void Phase2Task_29(u8 taskId) { while (sPhase2_29_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -void Phase2Task_30(u8 taskId) +static void Phase2Task_30(u8 taskId) { while (sPhase2_30_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -bool8 Phase2_30_Func1(struct Task *task) +static bool8 Phase2_30_Func1(struct Task *task) { u16 *dst1, *dst2; sub_8149F08(); dp12_8087EA4(); ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON | DISPCNT_WIN1_ON); - task->data[2] = 0x2000; - task->data[1] = 0x7FFF; - task->data[5] = 0; - task->data[6] = 16; - task->data[7] = 2560; + task->tData2 = 0x2000; + task->tData1 = 0x7FFF; + task->tData5 = 0; + task->tData6 = 16; + task->tData7 = 2560; sTransitionStructPtr->BLDCNT = 0x3F41; sTransitionStructPtr->BLDALPHA = (task->tData6 << 8) | (task->tData5); REG_BLDCNT = sTransitionStructPtr->BLDCNT; @@ -3910,7 +3913,7 @@ bool8 Phase2_30_Func1(struct Task *task) return FALSE; } -bool8 Phase2_30_Func2(struct Task *task) +static bool8 Phase2_30_Func2(struct Task *task) { u16 *dst1, *dst2; @@ -3921,7 +3924,7 @@ bool8 Phase2_30_Func2(struct Task *task) return TRUE; } -bool8 Phase2_30_Func3(struct Task *task) +static bool8 Phase2_30_Func3(struct Task *task) { u8 i; @@ -3938,7 +3941,7 @@ bool8 Phase2_30_Func3(struct Task *task) return TRUE; } -bool8 Phase2_30_Func4(struct Task *task) +static bool8 Phase2_30_Func4(struct Task *task) { u8 i; u16 var6, amplitude, var8; @@ -3990,7 +3993,7 @@ bool8 Phase2_30_Func4(struct Task *task) return FALSE; } -void VBlankCB_Phase2_30(void) +static void VBlankCB_Phase2_30(void) { VBlankCB_BattleTransition(); REG_BLDCNT = sTransitionStructPtr->BLDCNT; @@ -4000,27 +4003,340 @@ void VBlankCB_Phase2_30(void) DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320); } -void HBlankCB_Phase2_30(void) +static void HBlankCB_Phase2_30(void) { u16 var = gUnknown_02038C28[1][REG_VCOUNT]; REG_BG0VOFS = var; } -void Phase2Task_31(u8 taskId) +static void Phase2Task_31(u8 taskId) { while (sPhase2_31_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -void Phase2Task_33(u8 taskId) +static void Phase2Task_33(u8 taskId) { while (sPhase2_33_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } -void Phase2Task_32(u8 taskId) +static void Phase2Task_32(u8 taskId) { while (sPhase2_32_Funcs[gTasks[taskId].tState](&gTasks[taskId])); } +static bool8 Phase2_31_Func1(struct Task *task) +{ + u16 *dst1, *dst2; + + sub_8149F58(&dst1, &dst2); + LZ77UnCompVram(gUnknown_085C8598, dst2); + + FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20); + FillBgTilemapBufferRect(0, 1, 0, 0, 1, 0x20, 0xF); + FillBgTilemapBufferRect(0, 1, 0x1D, 0, 1, 0x20, 0xF); + CopyBgTilemapBufferToVram(0); + LoadPalette(gUnknown_085C8578, 0xF0, 0x20); + + task->tData2 = 1; + task->tData3 = 0; + task->tData4 = 0; + task->tData7 = 10; + + task->tState++; + return FALSE; +} + +static bool8 Phase2_31_Func2(struct Task *task) +{ + CopyRectToBgTilemapBufferRect(0, gUnknown_085C8928, 0, 0, 4, 4, task->tData2, task->tData3, 4, 4, 0xF, 0, 0); + CopyBgTilemapBufferToVram(0); + + task->tData2 += 4; + if (++task->tData4 == 7) + { + task->tData2 = 1; + task->tData3 += 4; + task->tData4 = 0; + if (task->tData3 > 19) + task->tState++; + } + + return FALSE; +} + +static bool8 Phase2_31_Func3(struct Task *task) +{ + u8 i; + u16 *dst1, *dst2; + + sub_8149F58(&dst1, &dst2); + if (task->tData6++ >= task->tData7) + { + switch (task->tData5) + { + case 0: + for (i = 250; i < 255; i++) + { + gPlttBufferUnfaded[i] = 0; + gPlttBufferFaded[i] = 0; + } + break; + case 1: + BlendPalettes(0xFFFF7FFF, 0x10, 0); + LZ77UnCompVram(gUnknown_085C86F4, dst2); + break; + case 2: + LZ77UnCompVram(gUnknown_085C87F4, dst2); + break; + case 3: + LZ77UnCompVram(gUnknown_085C88A4, dst2); + break; + default: + FillBgTilemapBufferRect_Palette0(0, 1, 0, 0, 0x20, 0x20); + CopyBgTilemapBufferToVram(0); + task->tState++; + return FALSE; + } + + task->tData6 = 0; + task->tData5++; + } + + return FALSE; +} + +static bool8 Phase2_33_Func1(struct Task *task) +{ + u16 *dst1, *dst2; + + sub_8149F58(&dst1, &dst2); + LZ77UnCompVram(gUnknown_085C8598, dst2); + + FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20); + FillBgTilemapBufferRect(0, 1, 0, 0, 1, 0x20, 0xF); + FillBgTilemapBufferRect(0, 1, 0x1D, 0, 1, 0x20, 0xF); + CopyBgTilemapBufferToVram(0); + LoadPalette(gUnknown_085C8578, 0xE0, 0x20); + LoadPalette(gUnknown_085C8578, 0xF0, 0x20); + BlendPalette(0xE0, 0x10, 8, 0); + + task->tData2 = 34; + task->tData3 = 0; + + task->tState++; + return FALSE; +} + +static bool8 Phase2_33_Func2(struct Task *task) +{ + u8 var = gUnknown_085C9A30[task->tData2]; + u8 varMod = var % 7; + u8 varDiv = var / 7; + CopyRectToBgTilemapBufferRect(0, &gUnknown_085C8928, 0, 0, 4, 4, 4 * varMod + 1, 4 * varDiv, 4, 4, 0xF, 0, 0); + CopyBgTilemapBufferToVram(0); + + if (--task->tData2 < 0) + task->tState++; + return FALSE; +} + +static bool8 Phase2_33_Func3(struct Task *task) +{ + BlendPalette(0xE0, 0x10, 3, 0); + BlendPalettes(0xFFFF3FFF, 0x10, 0); + + task->tData2 = 0; + task->tData3 = 0; + + task->tState++; + return FALSE; +} + +static bool8 Phase2_33_Func4(struct Task *task) +{ + if ((task->tData3 ^= 1)) + { + CopyRectToBgTilemapBufferRect( + 0, + gUnknown_085C8928, + 0, + 0, + 4, + 4, + 4 * (gUnknown_085C9A30[task->tData2] % 7) + 1, + 4 * (gUnknown_085C9A30[task->tData2] / 7), + 4, + 4, + 0xE, + 0, + 0); + } + else + { + if (task->tData2 > 0) + { + FillBgTilemapBufferRect( + 0, + 1, + 4 * (gUnknown_085C9A30[task->tData2 - 1] % 7) + 1, + 4 * (gUnknown_085C9A30[task->tData2 - 1] / 7), + 4, + 4, + 0xF); + } + + task->tData2++; + } + + if (task->tData2 > 34) + task->tState++; + + CopyBgTilemapBufferToVram(0); + return FALSE; +} + +static bool8 Phase2_31_33_Func5(struct Task *task) +{ + FillBgTilemapBufferRect_Palette0(0, 1, 0, 0, 0x20, 0x20); + CopyBgTilemapBufferToVram(0); + BlendPalettes(0xFFFFFFFF, 0x10, 0); + DestroyTask(FindTaskIdByFunc(task->func)); + return FALSE; +} + +// sub task for phase2 32 +#define tSub32_X_delta data[0] +#define tSub32_Y_delta data[1] +#define tSub32_Bool data[2] + +static void sub_814ABE4(u8 taskId) +{ + if (!(gTasks[taskId].tSub32_Bool ^= 1)) + { + SetGpuReg(REG_OFFSET_BG0VOFS, gBattle_BG0_X); + SetGpuReg(REG_OFFSET_BG0HOFS, gBattle_BG0_Y); + gBattle_BG0_X += gTasks[taskId].tSub32_X_delta; + gBattle_BG0_Y += gTasks[taskId].tSub32_Y_delta; + } +} + +static bool8 Phase2_32_Func1(struct Task *task) +{ + u8 taskId = 0; + u16 *dst1, *dst2; + + sub_8149F58(&dst1, &dst2); + LZ77UnCompVram(gUnknown_085C8598, dst2); + FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20); + CopyBgTilemapBufferToVram(0); + LoadPalette(gUnknown_085C8578, 0xF0, 0x20); + + gBattle_BG0_X = 0; + gBattle_BG0_Y = 0; + SetGpuReg(REG_OFFSET_BG0VOFS, gBattle_BG0_X); + SetGpuReg(REG_OFFSET_BG0HOFS, gBattle_BG0_Y); + + task->tData2 = 0; + taskId = CreateTask(sub_814ABE4, 1); + switch (Random() % 4) + { + case 0: + gTasks[taskId].tSub32_X_delta = 1; + gTasks[taskId].tSub32_Y_delta = 1; + break; + case 1: + gTasks[taskId].tSub32_X_delta = -1; + gTasks[taskId].tSub32_Y_delta = -1; + break; + case 2: + gTasks[taskId].tSub32_X_delta = 1; + gTasks[taskId].tSub32_Y_delta = -1; + break; + default: + gTasks[taskId].tSub32_X_delta = -1; + gTasks[taskId].tSub32_Y_delta = 1; + break; + } + + task->tState++; + return FALSE; +} + +static bool8 Phase2_32_Func2(struct Task *task) +{ + u8 var = gUnknown_085C9A53[task->tData2]; + u8 varDiv = var / 8; + u8 varAnd = var & 7; + + CopyRectToBgTilemapBufferRect( + 0, + &gUnknown_085C8928, + 0, + 0, + 4, + 4, + 4 * varDiv + 1, + 4 * varAnd, + 4, + 4, + 0xF, + 0, + 0); + CopyBgTilemapBufferToVram(0); + + if (++task->tData2 > 63) + task->tState++; + return 0; +} + +static bool8 Phase2_32_Func3(struct Task *task) +{ + BlendPalettes(0xFFFF7FFF, 0x10, 0); + + task->tData2 = 0; + + task->tState++; + return FALSE; +} + +static bool8 Phase2_32_Func4(struct Task *task) +{ + u8 var = gUnknown_085C9A53[task->tData2]; + u8 varDiv = var / 8; + u8 varAnd = var & 7; + + FillBgTilemapBufferRect(0, 1, 4 * varDiv + 1, 4 * varAnd, 4, 4, 0xF); + CopyBgTilemapBufferToVram(0); + + if (++task->tData2 > 63) + { + DestroyTask(FindTaskIdByFunc(sub_814ABE4)); + task->tState++; + } + + return FALSE; +} + +#undef tSub32_X_delta +#undef tSub32_Y_delta +#undef tSub32_Bool + +static bool8 Phase2_32_Func5(struct Task *task) +{ + gBattle_BG0_X = 0; + gBattle_BG0_Y = 0; + SetGpuReg(REG_OFFSET_BG0VOFS, 0); + SetGpuReg(REG_OFFSET_BG0HOFS, gBattle_BG0_Y); + + FillBgTilemapBufferRect_Palette0(0, 1, 0, 0, 0x20, 0x20); + CopyBgTilemapBufferToVram(0); + BlendPalettes(0xFFFFFFFF, 0x10, 0); + + DestroyTask(FindTaskIdByFunc(task->func)); + task->tState++; // UB: changing value of a destroyed task + return FALSE; +} + #undef tData1 #undef tData2 #undef tData3 diff --git a/src/tileset_anims.c b/src/tileset_anims.c index 0626472026..f89cfdd2bd 100644 --- a/src/tileset_anims.c +++ b/src/tileset_anims.c @@ -1393,7 +1393,7 @@ static void sub_80A1818(u16 a1) { CpuCopy16(gTilesetAnims_BattleDomePals0[a1 & 0x3], gPlttBufferUnfaded + 0x80, 32); BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); - if ((u8)FindTaskIdByFunc(Phase1_Task_RunFuncs) != 0xFF ) + if ((u8)FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) != 0xFF ) { sSecondaryTilesetCB = sub_80A1670; sSecondaryTilesetCBBufferSize = 0x20; @@ -1403,7 +1403,7 @@ static void sub_80A1818(u16 a1) static void sub_80A1884(u16 a1) { CpuCopy16(gTilesetAnims_BattleDomePals0[a1 & 0x3], gPlttBufferUnfaded + 0x80, 32); - if ((u8)FindTaskIdByFunc(Phase1_Task_RunFuncs) == 0xFF ) + if ((u8)FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) == 0xFF ) { BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); if (!--sSecondaryTilesetCBBufferSize) From bc1a957674e84daf181c508afd2b623304de121d Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 14 Jan 2018 22:15:50 +0100 Subject: [PATCH 11/64] make battle transition compile --- include/gba/io_reg.h | 8 +++++++- src/bg.c | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h index 6dbe5e8ed8..0364c38bcd 100644 --- a/include/gba/io_reg.h +++ b/include/gba/io_reg.h @@ -137,6 +137,8 @@ #define REG_OFFSET_DMA3CNT_H 0xde #define REG_OFFSET_TMCNT 0x100 +#define REG_OFFSET_TMCNT_L 0x100 +#define REG_OFFSET_TMCNT_H 0x102 #define REG_OFFSET_TM0CNT 0x100 #define REG_OFFSET_TM0CNT_L 0x100 #define REG_OFFSET_TM0CNT_H 0x102 @@ -298,6 +300,8 @@ #define REG_ADDR_DMA3CNT_H (REG_BASE + REG_OFFSET_DMA3CNT_H) #define REG_ADDR_TMCNT (REG_BASE + REG_OFFSET_TMCNT) +#define REG_ADDR_TMCNT_L (REG_BASE + REG_OFFSET_TMCNT_L) +#define REG_ADDR_TMCNT_H (REG_BASE + REG_OFFSET_TMCNT_H) #define REG_ADDR_TM0CNT (REG_BASE + REG_OFFSET_TM0CNT) #define REG_ADDR_TM0CNT_L (REG_BASE + REG_OFFSET_TM0CNT_L) #define REG_ADDR_TM0CNT_H (REG_BASE + REG_OFFSET_TM0CNT_H) @@ -458,6 +462,8 @@ #define REG_DMA3CNT_H (*(vu16 *)REG_ADDR_DMA3CNT_H) #define REG_TMCNT(n) (*(vu16 *)(REG_ADDR_TMCNT + ((n) * 4))) +#define REG_TMCNT_L(n) (*(vu16 *)(REG_ADDR_TMCNT_L + ((n) * 4))) +#define REG_TMCNT_H(n) (*(vu16 *)(REG_ADDR_TMCNT_H + ((n) * 4))) #define REG_TM0CNT (*(vu32 *)REG_ADDR_TM0CNT) #define REG_TM0CNT_L (*(vu16 *)REG_ADDR_TM0CNT_L) #define REG_TM0CNT_H (*(vu16 *)REG_ADDR_TM0CNT_H) @@ -660,7 +666,7 @@ #define KEY_INTR_ENABLE 0x0400 #define KEY_OR_INTR 0x0000 #define KEY_AND_INTR 0x8000 -#define DPAD_ANY 0x00F0 +#define DPAD_ANY ((DPAD_RIGHT | DPAD_LEFT | DPAD_UP | DPAD_DOWN)) #define JOY_EXCL_DPAD 0x030F // interrupt flags diff --git a/src/bg.c b/src/bg.c index 74e3ea830c..b699a0b1ff 100644 --- a/src/bg.c +++ b/src/bg.c @@ -1007,7 +1007,7 @@ void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, void *src, u8 destX, u8 dest } // Skipping for now, it probably uses structs passed by value /* -void CopyRectToBgTilemapBufferRect(u8 bg, void* src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2) +void CopyRectToBgTilemapBufferRect(u8 bg, const void* src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2) { u16 attribute; u16 mode; @@ -1049,7 +1049,7 @@ void CopyRectToBgTilemapBufferRect(u8 bg, void* src, u8 srcX, u8 srcY, u8 srcWid } }*/ __attribute__((naked)) -void CopyRectToBgTilemapBufferRect(u8 bg, void* src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2) +void CopyRectToBgTilemapBufferRect(u8 bg, const void* src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2) { asm("push {r4-r7,lr}\n\ mov r7, r10\n\ From 79451b5bb453ed761b508d6eb2ed1dd4836cc539 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sun, 14 Jan 2018 23:40:55 -0600 Subject: [PATCH 12/64] Extract data around Deoxys icon --- data/graphics/pokemon/graphics.inc | 8 +++++++- graphics/pokemon/icons/deoxys_speed_icon.png | Bin 0 -> 376 bytes graphics/unknown/unknown_D437F8.bin | Bin 0 -> 1024 bytes graphics/unused/deoxys_speed_icon_wide.png | Bin 0 -> 401 bytes 4 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 graphics/pokemon/icons/deoxys_speed_icon.png create mode 100644 graphics/unknown/unknown_D437F8.bin create mode 100644 graphics/unused/deoxys_speed_icon_wide.png diff --git a/data/graphics/pokemon/graphics.inc b/data/graphics/pokemon/graphics.inc index 45ddfe1b5e..4c4a0f57bb 100644 --- a/data/graphics/pokemon/graphics.inc +++ b/data/graphics/pokemon/graphics.inc @@ -9250,7 +9250,13 @@ gMonShinyPalette_Deoxys:: @ 8D3B7D0 gMonIcon_Deoxys:: @ 8D3B7F8 .incbin "graphics/pokemon/icons/deoxys_icon.4bpp" - .incbin "baserom.gba", 0xd3bbf8, 0x8000 + .incbin "graphics/pokemon/icons/deoxys_speed_icon.4bpp" + + .incbin "graphics/unused/deoxys_speed_icon_wide.4bpp" + + .space 0x6800 + + .incbin "graphics/unknown/unknown_D437F8.bin" .align 2 gMonFootprint_Deoxys:: @ 8D43BF8 diff --git a/graphics/pokemon/icons/deoxys_speed_icon.png b/graphics/pokemon/icons/deoxys_speed_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..674b93a9c1dcaaf8caf68dde7ba7e340fe623df6 GIT binary patch literal 376 zcmV-;0f+vHP)i+lfKO3m(bod2|>q{aVgtej$ET0ucUS*eg@00034 zNklb>k6o%gkc*@d|d-OuiR<<(LK1T;1DT=yeL#9i*7>rcOmL=p@NC=Rw zU7BCA44;2J8~FoxydYH@A|QV(&rnKQ-b4n=BBkg~t^m`&imnu3R{d!ar2zP>hPf&L zuIl>^z^aCZTwUoKVe28DXx+|TCU~&Z`$qdNgClHY9m!k8J8XBH^n9y~nzg%03igtK z(c_c-YAu}g6<9EwX2UZ8_|(8g4lIMXVjp>1YWHEk!NcUg=ur89Q`Dgm`OCbDI@m@g zf`={Y;D{3O;TClWC)me1IE3q>Lm=^880b}pc*-<3=}?k%sDQobP!fN<;ktmo`SAm$ Wdc_ue-`=tS0000i+lfKO3m(bod2|>q{aVgtej$ET0ucUS*eg@0003T zNkl1sx5Jl$%9=1uTd*njiF6yEx_Bm4cNXwFDJ7J~SG`4IA*cgN-(qTg(YKHge08twb>Y1-!u$ZS7UU0nQ_3_z3LV(K#T1ztHuiu zKihuEC_uc~?<@dqwyz~)3&dTmea;~Sk!`=WFo92gdf(;P!hkdF;%6~vg)nn-P~sM} z!r-drFd1FFfPm2rPyVa%bafcO)2L(_6$~KybW{zBDj1L^s}FemuSQ<*4V08TQi|S- z-jm)l{LWL-d#&M{6l~JFuMJ4x)1LG`i-3d>$CBRTjXomhz Date: Mon, 15 Jan 2018 02:49:52 -0600 Subject: [PATCH 13/64] Extract baseroms from field_effect.s --- data/field_effect.s | 357 +++++++++++++++--- graphics/misc/big_hof_monitor.png | Bin 0 -> 184 bytes graphics/misc/darkness_field_move_streaks.png | Bin 0 -> 159 bytes .../misc/darkness_field_move_streaks_map.bin | Bin 0 -> 640 bytes graphics/misc/field_move_streaks.png | Bin 0 -> 157 bytes graphics/misc/field_move_streaks_map.bin | Bin 0 -> 640 bytes graphics/misc/pokeball_glow.png | Bin 0 -> 100 bytes graphics/misc/pokecenter_monitor/0.png | Bin 0 -> 143 bytes graphics/misc/pokecenter_monitor/1.png | Bin 0 -> 150 bytes graphics/misc/small_hof_monitor.png | Bin 0 -> 177 bytes graphics/misc/spotlight.png | Bin 0 -> 312 bytes graphics/unknown/unknown_55C170.png | Bin 0 -> 151 bytes graphics/unused/intro_birch_beauty.png | Bin 0 -> 2268 bytes graphics_file_rules.mk | 3 + 14 files changed, 304 insertions(+), 56 deletions(-) create mode 100644 graphics/misc/big_hof_monitor.png create mode 100644 graphics/misc/darkness_field_move_streaks.png create mode 100644 graphics/misc/darkness_field_move_streaks_map.bin create mode 100644 graphics/misc/field_move_streaks.png create mode 100644 graphics/misc/field_move_streaks_map.bin create mode 100644 graphics/misc/pokeball_glow.png create mode 100644 graphics/misc/pokecenter_monitor/0.png create mode 100644 graphics/misc/pokecenter_monitor/1.png create mode 100644 graphics/misc/small_hof_monitor.png create mode 100644 graphics/misc/spotlight.png create mode 100644 graphics/unknown/unknown_55C170.png create mode 100644 graphics/unused/intro_birch_beauty.png diff --git a/data/field_effect.s b/data/field_effect.s index a1ddcc2470..e6f8a558ef 100644 --- a/data/field_effect.s +++ b/data/field_effect.s @@ -8,51 +8,88 @@ gNewGameBirchPic:: @ 8553A90 .incbin "graphics/birch_speech/birch.4bpp" - .incbin "baserom.gba", 0x554290, 0x66c0 + .space 0x3800 + + .incbin "graphics/unused/intro_birch_beauty.4bpp" .align 2 gNewGameBirchPalette:: @ 855A950 .incbin "graphics/birch_speech/birch.gbapal" .align 2 - .incbin "baserom.gba", 0x55a970, 0x20 +gSpriteImage_855A970:: @ 855A970 + .incbin "graphics/misc/pokeball_glow.4bpp" .align 2 gFieldEffectObjectPalette4:: @ 855A990 .incbin "graphics/map_objects/palettes/field_effect_object_palette_04.gbapal" - .incbin "baserom.gba", 0x55a9b0, 0x480 + .align 2 +gSpriteImage_855A9B0:: @ 855A9B0 + .incbin "graphics/misc/pokecenter_monitor/0.4bpp" + + .align 2 +gSpriteImage_855AA70:: @ 855AA70 + .incbin "graphics/misc/pokecenter_monitor/1.4bpp" + + .align 2 +gSpriteImage_855AB30:: @ 855AB30 + .incbin "graphics/misc/big_hof_monitor.4bpp" + + .align 2 +gSpriteImage_855AD30:: @ 855AD30 + .incbin "graphics/misc/small_hof_monitor.4bpp" .align 2 gFieldEffectObjectPalette5:: @ 855AE30 .incbin "graphics/map_objects/palettes/field_effect_object_palette_05.gbapal" + .align 2 gUnknown_0855AE50:: @ 855AE50 - .incbin "baserom.gba", 0x55ae50, 0x200 + .incbin "graphics/misc/field_move_streaks.4bpp" + .align 2 gUnknown_0855B050:: @ 855B050 - .incbin "baserom.gba", 0x55b050, 0x20 + .incbin "graphics/misc/field_move_streaks.gbapal" + .align 2 gUnknown_0855B070:: @ 855B070 - .incbin "baserom.gba", 0x55b070, 0x280 + .incbin "graphics/misc/field_move_streaks_map.bin" + .align 2 gUnknown_0855B2F0:: @ 855B2F0 - .incbin "baserom.gba", 0x55b2f0, 0x80 + .incbin "graphics/misc/darkness_field_move_streaks.4bpp" + .align 2 gUnknown_0855B370:: @ 855B370 - .incbin "baserom.gba", 0x55b370, 0x20 + .incbin "graphics/misc/darkness_field_move_streaks.gbapal" + .align 2 gUnknown_0855B390:: @ 855B390 - .incbin "baserom.gba", 0x55b390, 0x280 + .incbin "graphics/misc/darkness_field_move_streaks_map.bin" + .align 2 gUnknown_0855B610:: @ 855B610 - .incbin "baserom.gba", 0x55b610, 0x20 + .incbin "graphics/misc/spotlight.gbapal" + .align 2 gUnknown_0855B630:: @ 855B630 - .incbin "baserom.gba", 0x55b630, 0xbc0 + .incbin "graphics/misc/spotlight.4bpp" + .align 2 +gUnknown_0855C170:: @ 855C170 + .incbin "graphics/unknown/unknown_55C170.4bpp" + + .align 2 gUnknown_0855C1F0:: @ 855C1F0 - .incbin "baserom.gba", 0x55c1f0, 0x20 + .4byte FieldEffectCmd_loadtiles + .4byte FieldEffectCmd_loadfadedpal + .4byte FieldEffectCmd_loadpal + .4byte FieldEffectCmd_callnative + .4byte FieldEffectCmd_end + .4byte FieldEffectCmd_loadgfx_callnative + .4byte FieldEffectCmd_loadtiles_callnative + .4byte FieldEffectCmd_loadfadedpal_callnative .align 2 @ TODO: something else uses these too @@ -61,7 +98,12 @@ gNewGameBirchOamAttributes:: @ 855C210 .2byte 0 .align 2 - .incbin "baserom.gba", 0x55c218, 0x10 +gOamData_855C218:: @ 855C218 + .2byte 0x0000, 0x0000, 0x0000, 0x0000 + + .align 2 +gOamData_855C220:: @ 855C220 + .2byte 0x0000, 0x4000, 0x0000, 0x0000 .align 2 gNewGameBirchPicTable:: @ 855C228 @@ -82,13 +124,7 @@ gNewGameBirchImageAnimTable:: @ 855C240 .align 2 gNewGameBirchObjectTemplate:: @ 855C244 - .2byte 0xFFFF @ tiles tag - .2byte 0x1006 @ palette tag - .4byte gNewGameBirchOamAttributes - .4byte gNewGameBirchImageAnimTable - .4byte gNewGameBirchPicTable - .4byte gDummySpriteAffineAnimTable - .4byte SpriteCallbackDummy + spr_template 0xFFFF, 0x1006, gNewGameBirchOamAttributes, gNewGameBirchImageAnimTable, gNewGameBirchPicTable, gDummySpriteAffineAnimTable, SpriteCallbackDummy .align 2 gFieldEffectObjectPaletteInfo4:: @ 855C25C @@ -98,109 +134,318 @@ gFieldEffectObjectPaletteInfo4:: @ 855C25C gFieldEffectObjectPaletteInfo5:: @ 855C264 obj_pal gFieldEffectObjectPalette5, 0x1010 - .incbin "baserom.gba", 0x55c26c, 0x40 + .align 2 +gOamData_855C26C:: @ 855C26C + .2byte 0x4000, 0x8000, 0x0000, 0x0000 + .align 2 +gUnknown_855C274:: @ 855C274 + obj_frame_tiles gSpriteImage_855A970, 0x0020 + + .align 2 +gUnknown_855C27C:: @ 855C27C + obj_frame_tiles gSpriteImage_855A9B0, 0x00c0 + obj_frame_tiles gSpriteImage_855AA70, 0x00c0 + + .align 2 +gUnknown_855C28C:: @ 855C28C + obj_frame_tiles gSpriteImage_855AB30, 0x0200 + + .align 2 +gUnknown_855C294:: @ 855C294 + obj_frame_tiles gSpriteImage_855AD30, 0x0200 + + .align 2 +gSubspriteTable_855C29C:: @ 855C29C + subsprite -12, -8, 2, 0, 16x8 + subsprite 4, -8, 2, 2, 8x8 + subsprite -12, 0, 2, 3, 16x8 + subsprite 4, 0, 2, 5, 8x8 + + .align 2 gUnknown_0855C2AC:: @ 855C2AC - .incbin "baserom.gba", 0x55c2ac, 0x18 + .4byte 4, gSubspriteTable_855C29C + .align 2 +gSubspriteTable_855C2B4:: @ 855C2B4 + subsprite -32, -8, 2, 0, 32x8 + subsprite 0, -8, 2, 4, 32x8 + subsprite -32, 0, 2, 8, 32x8 + subsprite 0, 0, 2, 12, 32x8 + + .align 2 gUnknown_0855C2C4:: @ 855C2C4 - .incbin "baserom.gba", 0x55c2c4, 0x40 + .4byte 4, gSubspriteTable_855C2B4 + .align 2 +gUnknown_0855C2CC:: @ 855C2CC + .2byte 0x0000, 0x0001, 0xfffe, 0x0000 + + .align 2 +gUnknown_0855C2D4:: @ 855C2D4 + .2byte 0x0000, 0x0010, 0x0001, 0x0010, 0x0000, 0x0010, 0x0001, 0x0010, 0x0000, 0x0010, 0x0001, 0x0010, 0x0000, 0x0010, 0x0001, 0x0010 + .2byte 0xffff, 0x0000 + + .align 2 +gUnknown_0855C2F8:: @ 855C2F8 + .4byte gUnknown_0855C2CC + .4byte gUnknown_0855C2D4 + + .align 2 +gUnknown_0855C300:: @ 855C300 + .4byte gUnknown_0855C2CC + + .align 2 gUnknown_0855C304:: @ 855C304 - .incbin "baserom.gba", 0x55c304, 0x18 + spr_template 0xffff, 0x1007, gOamData_855C218, gUnknown_0855C2F8, gUnknown_855C274, gDummySpriteAffineAnimTable, sub_80B6828 + .align 2 gUnknown_0855C31C:: @ 855C31C - .incbin "baserom.gba", 0x55c31c, 0x18 + spr_template 0xffff, 0x1004, gOamData_855C220, gUnknown_0855C2F8, gUnknown_855C27C, gDummySpriteAffineAnimTable, sub_80B68AC + .align 2 gUnknown_0855C334:: @ 855C334 - .incbin "baserom.gba", 0x55c334, 0x18 + spr_template 0xffff, 0x1010, gOamData_855C220, gUnknown_0855C300, gUnknown_855C28C, gDummySpriteAffineAnimTable, sub_80B6970 + .align 2 gUnknown_0855C34C:: @ 855C34C - .incbin "baserom.gba", 0x55c34c, 0x18 + spr_template 0xffff, 0x1010, gOamData_855C26C, gUnknown_0855C300, gUnknown_855C294, gDummySpriteAffineAnimTable, sub_80B6970 + .align 2 gUnknown_0855C364:: @ 855C364 - .incbin "baserom.gba", 0x55c364, 0x10 + .4byte sub_80B6214 + .4byte sub_80B6250 + .4byte sub_80B628C + .4byte sub_80B62B4 + .align 2 gUnknown_0855C374:: @ 855C374 - .incbin "baserom.gba", 0x55c374, 0x10 + .4byte sub_80B6360 + .4byte sub_80B63D4 + .4byte sub_80B6404 + .4byte sub_80B642C + .align 2 gUnknown_0855C384:: @ 855C384 - .incbin "baserom.gba", 0x55c384, 0x20 + .4byte sub_80B64DC + .4byte sub_80B6574 + .4byte sub_80B65A8 + .4byte sub_80B66E8 + .4byte sub_80B67DC + .4byte sub_80B67F8 + .4byte sub_80B6800 + .4byte nullsub_97 + .align 1 gUnknown_0855C3A4:: @ 855C3A4 - .incbin "baserom.gba", 0x55c3a4, 0x18 + .2byte 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0004, 0x0006, 0x0004, 0x0000, 0x0008, 0x0006, 0x0008 gUnknown_0855C3BC:: @ 855C3BC - .incbin "baserom.gba", 0x55c3bc, 0x4 + .byte 0x10, 0x0c, 0x08, 0x00 gUnknown_0855C3C0:: @ 855C3C0 - .incbin "baserom.gba", 0x55c3c0, 0x4 + .byte 0x10, 0x0c, 0x08, 0x00 gUnknown_0855C3C4:: @ 855C3C4 - .incbin "baserom.gba", 0x55c3c4, 0x4 + .byte 0x00, 0x00, 0x00, 0x00 + .align 2 gUnknown_0855C3C8:: @ 855C3C8 - .incbin "baserom.gba", 0x55c3c8, 0x1c + .4byte sub_80B6BCC + .4byte sub_80B6C74 + .4byte sub_80B6C90 + .4byte sub_80B6D04 + .4byte sub_80B6DBC + .4byte sub_80B6DD8 + .4byte sub_80B6E18 + .align 2 gUnknown_0855C3E4:: @ 855C3E4 - .incbin "baserom.gba", 0x55c3e4, 0x18 + .4byte sub_80B6EC0 + .4byte sub_80B6EE0 + .4byte sub_80B6F50 + .4byte sub_80B6F74 + .4byte sub_80B6F84 + .4byte sub_80B6FA8 + .align 2 gUnknown_0855C3FC:: @ 855C3FC - .incbin "baserom.gba", 0x55c3fc, 0x1c + .4byte sub_80B7114 + .4byte sub_80B7190 + .4byte sub_80B71D0 + .4byte sub_80B7230 + .4byte sub_80B7270 + .4byte sub_80B72D0 + .4byte sub_80B72F4 + .align 2 gUnknown_0855C418:: @ 855C418 - .incbin "baserom.gba", 0x55c418, 0x14 + .4byte sub_80B73D0 + .4byte waterfall_1_do_anim_probably + .4byte waterfall_2_wait_anim_finish_probably + .4byte sub_80B7450 + .4byte sub_80B7478 + .align 2 gUnknown_0855C42C:: @ 855C42C - .incbin "baserom.gba", 0x55c42c, 0xc + .4byte dive_1_lock + .4byte dive_2_unknown + .4byte dive_3_unknown + .align 2 gUnknown_0855C438:: @ 855C438 - .incbin "baserom.gba", 0x55c438, 0x18 + .4byte sub_80B764C + .4byte sub_80B7684 + .4byte sub_80B76B8 + .4byte sub_80B7704 + .4byte sub_80B77F8 + .4byte sub_80B7814 + .align 2 gUnknown_0855C450:: @ 855C450 - .incbin "baserom.gba", 0x55c450, 0x10 + .4byte sub_80B78EC + .4byte sub_80B791C + .4byte sub_80B7968 + .4byte sub_80B79BC + .align 2 gUnknown_0855C460:: @ 855C460 - .incbin "baserom.gba", 0x55c460, 0x14 + .4byte sub_80B7AE8 + .4byte sub_80B7B18 + .4byte sub_80B7B94 + .4byte sub_80B7BCC + .4byte sub_80B7BF4 + .align 2 gUnknown_0855C474:: @ 855C474 - .incbin "baserom.gba", 0x55c474, 0x8 + .4byte sub_80B7D14 + .4byte sub_80B7D34 gUnknown_0855C47C:: @ 855C47C - .incbin "baserom.gba", 0x55c47c, 0x8 + .byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00 + .align 2 gUnknown_0855C484:: @ 855C484 - .incbin "baserom.gba", 0x55c484, 0x8 + .4byte sub_80B7EC4 + .4byte sub_80B7EE8 + .align 2 gUnknown_0855C48C:: @ 855C48C - .incbin "baserom.gba", 0x55c48c, 0x10 + .4byte sub_80B800C + .4byte sub_80B8034 + .4byte sub_80B80C4 + .4byte sub_80B8198 + .align 2 gUnknown_0855C49C:: @ 855C49C - .incbin "baserom.gba", 0x55c49c, 0xc + .4byte sub_80B8280 + .4byte sub_80B830C + .4byte sub_80B8410 + .align 2 gUnknown_0855C4A8:: @ 855C4A8 - .incbin "baserom.gba", 0x55c4a8, 0x1c + .4byte sub_80B8584 + .4byte sub_80B85F8 + .4byte sub_80B8660 + .4byte sub_80B86EC + .4byte sub_80B871C + .4byte sub_80B8770 + .4byte overworld_bg_setup_2 + .align 2 gUnknown_0855C4C4:: @ 855C4C4 - .incbin "baserom.gba", 0x55c4c4, 0x1c + .4byte sub_80B88E4 + .4byte sub_80B8920 + .4byte sub_80B898C + .4byte sub_80B89DC + .4byte sub_80B8A0C + .4byte sub_80B8A44 + .4byte sub_80B8A64 + .align 2 gUnknown_0855C4E0:: @ 855C4E0 - .incbin "baserom.gba", 0x55c4e0, 0x14 + .4byte sub_80B8DB4 + .4byte sub_80B8E14 + .4byte sub_80B8E60 + .4byte sub_80B8EA8 + .4byte sub_80B8F24 + .align 2 gUnknown_0855C4F4:: @ 855C4F4 - .incbin "baserom.gba", 0x55c4f4, 0x54 + .4byte sub_80B9204 + .4byte sub_80B925C + .4byte sub_80B92A0 + .4byte sub_80B92F8 + .4byte sub_80B933C + .4byte sub_80B9390 + .4byte sub_80B9418 + .4byte sub_80B9474 + .4byte sub_80B9494 + .align 2 +gUnknown_0855C518:: @ 855C518 + .2byte 0x0008, 0x0008, 0x00e2, 0x0000, 0x001c, 0x001c, 0x1e00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_0855C530:: @ 855C530 + .2byte 0x0100, 0x0100, 0x0040, 0x0000, 0xfff6, 0xfff6, 0x1600, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 gUnknown_0855C548:: @ 855C548 - .incbin "baserom.gba", 0x55c548, 0x8 + .4byte gUnknown_0855C518 + .4byte gUnknown_0855C530 + .align 2 gUnknown_0855C550:: @ 855C550 - .incbin "baserom.gba", 0x55c550, 0x1c + .4byte sub_80B9804 + .4byte sub_80B98B8 + .4byte sub_80B9924 + .4byte sub_80B9978 + .4byte sub_80B99F0 + .4byte sub_80B9A28 + .4byte sub_80B9A60 gUnknown_0855C56C:: @ 855C56C - .incbin "baserom.gba", 0x55c56c, 0x24 + .byte 0xfe, 0xff, 0xfc, 0xff, 0xfb, 0xff, 0xfa, 0xff, 0xf9, 0xff, 0xf8, 0xff, 0xf8, 0xff, 0xf8, 0xff, 0xf9, 0xff, 0xf9, 0xff, 0xfa, 0xff, 0xfb, 0xff, 0xfd, 0xff, 0xfe, 0xff, 0x00, 0x00, 0x02, 0x00 + .byte 0x04, 0x00, 0x08, 0x00 + .align 2 gUnknown_0855C590:: @ 855C590 - .incbin "baserom.gba", 0x55c590, 0x5c + .4byte sub_80B9C28 + .4byte sub_80B9C54 + .4byte sub_80B9CDC + .align 2 +gUnknown_0855C59C:: @ 855C59C + obj_frame_tiles gUnknown_0855C170, 0x0020 + obj_frame_tiles gUnknown_0855C170 + 0x20, 0x0020 + obj_frame_tiles gUnknown_0855C170 + 0x40, 0x0020 + obj_frame_tiles gUnknown_0855C170 + 0x60, 0x0020 + + .align 2 +gUnknown_0855C5BC:: @ 855C5BC + .2byte 0x0000, 0x0000, 0xffff, 0x0000 + + .align 2 +gUnknown_0855C5C4:: @ 855C5C4 + .2byte 0x0001, 0x0000, 0xffff, 0x0000 + + .align 2 +gUnknown_0855C5CC:: @ 855C5CC + .2byte 0x0002, 0x0000, 0xffff, 0x0000 + + .align 2 +gUnknown_0855C5D4:: @ 855C5D4 + .2byte 0x0003, 0x0000, 0xffff, 0x0000 + + .align 2 +gUnknown_0855C5DC:: @ 855C5DC + .4byte gUnknown_0855C5BC + .4byte gUnknown_0855C5C4 + .4byte gUnknown_0855C5CC + .4byte gUnknown_0855C5D4 + + .align 2 gUnknown_0855C5EC:: @ 855C5EC - .incbin "baserom.gba", 0x55c5ec, 0x18 + spr_template 0xffff, 0x111a, gOamData_855C218, gUnknown_0855C5DC, gUnknown_0855C59C, gDummySpriteAffineAnimTable, sub_80B9DB8 + diff --git a/graphics/misc/big_hof_monitor.png b/graphics/misc/big_hof_monitor.png new file mode 100644 index 0000000000000000000000000000000000000000..510e6a232d74f5e953b84d1c89f87fcb3dbc0a5b GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^0zmA*0wfqdKXdg4QuUrLjv*Qo*PgfLYA_IBxvFLcr~N5c|HfnTZ&heTQgy!fTK zEM{Ljk)R^Y>Be`@Bk|m``*UaHr2FjJY*etgk3+8RR5SS3j3^P6Gj}di4MQ z|J8Gz0l9cU$qgw9ptP2!i(?4K%;W@yrT_&27AAqS48j3SOd^cQ3J!t=jZ8Zjd<0w> cT)F)i8NS!aY)s#JJ

EaloF)=xTfyvS2fP>b8E=DJ>f(0Ja7`;3a5_lHe;9lX-P{+o=u;(=Q=l32a Q4?qTcy85}Sb4q9e06kA3F#rGn literal 0 HcmV?d00001 diff --git a/graphics/misc/field_move_streaks_map.bin b/graphics/misc/field_move_streaks_map.bin new file mode 100644 index 0000000000000000000000000000000000000000..466f456bed3f489017b0f46627d1b11e875a4235 GIT binary patch literal 640 zcmZQ%U}9iqU}0dy0-11#V^d3-7^a;d5nS#7nT@G~G#g1%O<&va`;OjjArw-?xQF{y(9jpKV literal 0 HcmV?d00001 diff --git a/graphics/misc/pokecenter_monitor/0.png b/graphics/misc/pokecenter_monitor/0.png new file mode 100644 index 0000000000000000000000000000000000000000..4748839086d765b602997713c880532cb542e481 GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^5*b`Hptj*kzo0x2m^7sn8enaK$X p{5u*LTh1~)w3u+#(XiKufgz!tr}kZCR3K0lgQu&X%Q~loCIFAvIhFtb literal 0 HcmV?d00001 diff --git a/graphics/misc/pokecenter_monitor/1.png b/graphics/misc/pokecenter_monitor/1.png new file mode 100644 index 0000000000000000000000000000000000000000..1a26060113f031f8b787bc39d1ebc4d088f9f71c GIT binary patch literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^5*b`Hptj*kzo0x3mL7sn8enaK$X x+#8lQGEQNCsG{JV_;AD0hmQ;v%y1KAVAz-}_+EOm{&S#W22WQ%mvv4FO#oqZJ=XvL literal 0 HcmV?d00001 diff --git a/graphics/misc/small_hof_monitor.png b/graphics/misc/small_hof_monitor.png new file mode 100644 index 0000000000000000000000000000000000000000..dcff330952e03025fba2b774dd6b5358e7907d70 GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et0wfrw&pzJ*q$)gJ9780ghV~osH7M}778ZQZ z(6iX}^2Nbf9N!DCH#(NHYcGwLig#ktmp@g0=7@RVl&Ra_{O}9m3_K#{Hz7>WXE%HD z&O`m>2jaDU>0M5V5?wgG`Gnb2&4WUkt2Ve?(Vli-v1y~`W%IHC$KyO=B^%c-?w;yA bJ^ruwO!X<^^G#M*g52Wi>gTe~DWM4fN1Q=d literal 0 HcmV?d00001 diff --git a/graphics/misc/spotlight.png b/graphics/misc/spotlight.png new file mode 100644 index 0000000000000000000000000000000000000000..62e21e41198292f8b7c12d21a4ef6363dacf948b GIT binary patch literal 312 zcmeAS@N?(olHy`uVBq!ia0vp^20&cF!VDzc)N{51DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(ehe1_3@Ht_1}ZKYlRWxWVw^1;d343=bXvCGdew_g3Zs?Ea^yX_&;BmdEwu|wx(2pYVJ~vqp!*Ma`)}6B;%J>nv4Z@=@1Xs=yetJiyD5<%ZwB zDNek1q|WbSyuP#h`sB)j^Rv!W72K3LAtf$eRWBa=S-4L5 zOVY0C;f>X{#kL>4OZPs>k9pUbWqsb{;q_XExiXb5Zx4yef^773^>bP0l+XkKkBv44 literal 0 HcmV?d00001 diff --git a/graphics/unused/intro_birch_beauty.png b/graphics/unused/intro_birch_beauty.png new file mode 100644 index 0000000000000000000000000000000000000000..817db46f7070722262e732863ddc89eac9a2eae2 GIT binary patch literal 2268 zcmV<22qX82P)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMR35N_~6LcxRAh*aA-(CU|?`4I6$y)P;f{% z$jI1`kdU~TScq^qNH7@q`1k+-7(b4r=>Px#32;bRa{vGi!vFvd!vV){sAK>D2sKGW zK~!ko?V4|B8|NLzA0o*UW1;IH#J%1Oz z?THSSE|-p8hHLz2dR{tr8@%m4_xf3;?_3J0XLsU^{}>3Eo9$+L&ccBC*r<=4^MOrt&#|vCXZc>Jg7c-z=N}FQ zd_`cK+@H=p`8;#@W^XU_fEi});lD9m!2y842cGAU$zFK~Z&hSNG}Fc{>T*Wh0v zw;5mW5g>#4>3|04yTLOLHLc(Xk#L3``+4(trxX`>CcyYT*O~7%uQJL6e2=hsAOZJu zG(N^Y_I~j?;{zJ`S-?MgwznRzv1(k0W9Qy1-C+A}Fw8;V86JUWxzFn8oVOs`0kghW_|Z%rMP!7@$&@oYMR#T5{cQIoPLo>pY6Hc7$3`&ce5CSZU|RWqt6YI&&X#(1&{ z4lXN+L=pr<2%ta!TWSL!d`ydfY8gFH6b0-9SyfY8CP1!j!%)wVu@!nBDBy)YWg#dVR z4^T))YC0igCg90t*H+i90B=dsX#&{7wY}&xuNwrA+iVVSMl`@JNqRY{$OIrZt3&{~ zj{yKW9x(yrf{%;+O{#d-vf0gi9_WP74~-@eKmmt?5TFDC!cUMzw6r~QpTsY++%cdD zFu-{TtA!~Q-y?el1o(G0`>q8*#`swkUm$=G+uyWKQ3o`SN3Ihj@+W!WRgBXog3Zqm zUJU?^LIi7o*vKr#DV!dM0M}XrWK32g0NBW0D_Q}PBe9Wagk%5!$S|xz#}m{^00|)$ zjq0fYfL#KBma|I-jD4;Hl0c>6S`GvtG78TKLNWR(#=wh#0CKra5D*i^H-)jgvr$nL zffgVSSxYb=8Wn^eduFx2P#rG;EL#J-(UDn7fOB*qA0PFO#`F0F3qT$|r)n8|g0u|A zK)_cP02GhM7k-Jph{xf6vIZRB^flCcGbsad767NQh{+)eJkNV~bNTgFfCIiZ0S*QR zAOZki&nUzS1_0JHs1$}3Q^)iE)&O*e1Ler6iStLbn{IL9IWXP}?x|>~|F9%!H#=V7 zBp9%94Fa5+kY@D$nd|E6hsU}E_F+fKeDhzBj7+GDy97VwTQ4oue~Z#m{kJHdBf9z@ zqy`Z6&swVgR^>ab)PJkeQvJ6CydeVJTCCY04b z^+YJEfBL0psQ*pscvJni0q}%1_215BqN)G3HWP0#Uuq|T&d7_U!%Or8Q~gsDD(at> zu&4f4#;E`qRWa4SoS=z!rA+moQRx7ag^KzwPysSq74?tlGT17se??B(3w3D6GFK{D z7VoMo+Z%>}b|^~YYQVBBfHTzHg-G6I^{<}5OSS+g%yb>X$;q;KS0i}ER=k5_{5=A$ z019al+nUWz&PPtCPh=|U-_q}DQg}8HX4#&MA>N5#B9g}zU}#7X_zHkb#Ct(|JG)cR zjJD&3eQ=sg#Jg-CvRwoh0sLco=AMf2Kf5`KErF~?)l~me0fq*EQ|iUM@D2eiQ2{y? zj4!UO5r8rk=&~QLi|JY0j?SV9Aenplz`n_jsOHUXdj@d z|Esz6OBx^?q&Q<3fRA@Iz@l)Q7O=jX{YaY#h#GJ*`wk@lk@5dyZheX#@azSADZf3F z`v6zD`F4ss7hlcYMjNZ~1-es`o2Y+s(kJRaPx*R3A1rDYC&y6&g2wc5au(X#vV=Gj z;OnCU3>g5_&C>$>M%x3l8L(#O@jkjfAfny)@P?0W6o$nYP4O*m)5M4UL#Aez*um#0 z0GfTE1KeF*ewsE^>;vyaoAv?vR_%j*e_-Dq*!KtYvhNR||CT>MpF;W90kla}`~kc| zN7(ZR=+yb1KagtMAAtTBXI-lN0Zav`@&{xpgP_VEh}bj;8vKEXY){%Y_ydYfZQS4w zq;bMtFV_15ifC^p)cXUfZ1X_h;13Xe^^6@ry+44Lo(|eN3O4uyOT0Z<*WeEXpYlW{=n1yG<%xq4-h~qDN+J7e}DiA1xyLJY5-E0 z9-#XJ1u8(bKhOri@CVw-U^m+);G_;{%OCi#U4P)CeShHp#~=9Xq5H2HUzh$>Tg@rx zrAaeu{DF7hzVLhG8b<@CzPj=a0k!_Xr@jxapx7z&i$5QEudbp2XiT8iADBGwv)?*i zlg7VBr5orQl{$am=JhMv4wik~>;d4Z9aTR>sPhND|912y;>||E?XCjU`2!DK|J{4Y q@pvmhN3+K0{s2k6s`DTK>i7>+_)L4~YL#yQ0000 Date: Mon, 15 Jan 2018 04:41:24 -0500 Subject: [PATCH 14/64] Add most English song and SFX names as comments in songs.h and song_table.inc --- include/constants/songs.h | 931 ++++++++++++++++++------------------- sound/song_table.inc | 935 +++++++++++++++++++------------------- 2 files changed, 937 insertions(+), 929 deletions(-) diff --git a/include/constants/songs.h b/include/constants/songs.h index fdecff09a5..fe964cb2d9 100644 --- a/include/constants/songs.h +++ b/include/constants/songs.h @@ -2,485 +2,488 @@ #define GUARD_CONSTANTS_SONGS_H #define MUS_DUMMY 0 -#define SE_KAIFUKU 1 -#define SE_PC_LOGIN 2 -#define SE_PC_OFF 3 -#define SE_PC_ON 4 -#define SE_SELECT 5 -#define SE_WIN_OPEN 6 -#define SE_WALL_HIT 7 -#define SE_DOOR 8 -#define SE_KAIDAN 9 -#define SE_DANSA 10 -#define SE_JITENSYA 11 -#define SE_KOUKA_L 12 -#define SE_KOUKA_M 13 -#define SE_KOUKA_H 14 -#define SE_BOWA2 15 -#define SE_POKE_DEAD 16 -#define SE_NIGERU 17 -#define SE_JIDO_DOA 18 -#define SE_NAMINORI 19 -#define SE_BAN 20 -#define SE_PIN 21 -#define SE_BOO 22 -#define SE_BOWA 23 -#define SE_JYUNI 24 -#define SE_A 25 -#define SE_I 26 -#define SE_U 27 -#define SE_E 28 -#define SE_O 29 -#define SE_N 30 -#define SE_SEIKAI 31 -#define SE_HAZURE 32 -#define SE_EXP 33 -#define SE_JITE_PYOKO 34 +#define SE_KAIFUKU 1 // Healing Item +#define SE_PC_LOGIN 2 // PC Logon +#define SE_PC_OFF 3 // PC Shutdown +#define SE_PC_ON 4 // PC Startup +#define SE_SELECT 5 // Cursor Selection +#define SE_WIN_OPEN 6 // Start Menu +#define SE_WALL_HIT 7 // Wall Bump +#define SE_DOOR 8 // Opening Door +#define SE_KAIDAN 9 // Stairs +#define SE_DANSA 10 // Ledge +#define SE_JITENSYA 11 // Bicycle Bell +#define SE_KOUKA_L 12 // Not Very Effective +#define SE_KOUKA_M 13 // Normal Effectiveness +#define SE_KOUKA_H 14 // Super Effective +#define SE_BOWA2 15 // Pokémon Withdrawl +#define SE_POKE_DEAD 16 // Pokémon Fainted +#define SE_NIGERU 17 // Flee from Wild Battle +#define SE_JIDO_DOA 18 // Pokémon Center Door +#define SE_NAMINORI 19 // Briney's Ship +#define SE_BAN 20 // Bang +#define SE_PIN 21 // Exclamation Bubble +#define SE_BOO 22 // Contest Jam +#define SE_BOWA 23 // Giving Poké Ball to Nurse, Poké Ball Wiggle +#define SE_JYUNI 24 // Places in Contest Appearing +#define SE_A 25 // Bard A +#define SE_I 26 // Bard I +#define SE_U 27 // Bard U +#define SE_E 28 // Bard E +#define SE_O 29 // Bard O +#define SE_N 30 // Bard N +#define SE_SEIKAI 31 // Success +#define SE_HAZURE 32 // Failure +#define SE_EXP 33 // Exp. Bar +#define SE_JITE_PYOKO 34 // Bunny Hop #define SE_MU_PACHI 35 -#define SE_TK_KASYA 36 +#define SE_TK_KASYA 36 // Mossdeep Gym/Trick House Switch #define SE_FU_ZAKU 37 #define SE_FU_ZAKU2 38 -#define SE_FU_ZUZUZU 39 -#define SE_RU_GASHIN 40 -#define SE_RU_GASYAN 41 -#define SE_RU_BARI 42 -#define SE_RU_HYUU 43 +#define SE_FU_ZUZUZU 39 // Lavaridge Gym Warp +#define SE_RU_GASHIN 40 // Sootopolis Gym - Stairs Appear +#define SE_RU_GASYAN 41 // Sootopolis Gym - Ice Breaking +#define SE_RU_BARI 42 // Sootopolis Gym - Stepping on Ice +#define SE_RU_HYUU 43 // Falling Down #define SE_KI_GASYAN 44 -#define SE_TK_WARPIN 45 -#define SE_TK_WARPOUT 46 -#define SE_TU_SAA 47 -#define SE_HI_TURUN 48 -#define SE_TRACK_MOVE 49 -#define SE_TRACK_STOP 50 -#define SE_TRACK_HAIKI 51 -#define SE_TRACK_DOOR 52 +#define SE_TK_WARPIN 45 // Warp In +#define SE_TK_WARPOUT 46 // Warp Out +#define SE_TU_SAA 47 // Repel +#define SE_HI_TURUN 48 // Moving Obstacle in Fortree Gym +#define SE_TRACK_MOVE 49 // Moving Truck +#define SE_TRACK_STOP 50 // Moving Truck Stop +#define SE_TRACK_HAIKI 51 // Moving Truck Unload +#define SE_TRACK_DOOR 52 // Moving Truck Door #define SE_MOTER 53 #define SE_CARD 54 -#define SE_SAVE 55 -#define SE_KON 56 -#define SE_KON2 57 -#define SE_KON3 58 -#define SE_KON4 59 -#define SE_SUIKOMU 60 -#define SE_NAGERU 61 -#define SE_TOY_C 62 -#define SE_TOY_D 63 -#define SE_TOY_E 64 -#define SE_TOY_F 65 -#define SE_TOY_G 66 -#define SE_TOY_A 67 -#define SE_TOY_B 68 -#define SE_TOY_C1 69 -#define SE_MIZU 70 -#define SE_HASHI 71 -#define SE_DAUGI 72 -#define SE_PINPON 73 -#define SE_FUUSEN1 74 -#define SE_FUUSEN2 75 -#define SE_FUUSEN3 76 -#define SE_TOY_KABE 77 -#define SE_TOY_DANGO 78 -#define SE_DOKU 79 -#define SE_ESUKA 80 -#define SE_T_AME 81 -#define SE_T_AME_E 82 -#define SE_T_OOAME 83 -#define SE_T_OOAME_E 84 -#define SE_T_KOAME 85 -#define SE_T_KOAME_E 86 -#define SE_T_KAMI 87 -#define SE_T_KAMI2 88 -#define SE_ELEBETA 89 -#define SE_HINSI 90 -#define SE_EXPMAX 91 -#define SE_TAMAKORO 92 -#define SE_TAMAKORO_E 93 +#define SE_SAVE 55 // Save +#define SE_KON 56 // Poké Ball Bounce 1 +#define SE_KON2 57 // Poké Ball Bounce 2 +#define SE_KON3 58 // Poké Ball Bounce 3 +#define SE_KON4 59 // Poké Ball Bounce 4 +#define SE_SUIKOMU 60 // Poké Ball Trade +#define SE_NAGERU 61 // Poké Ball Throw +#define SE_TOY_C 62 // Note C +#define SE_TOY_D 63 // Note D +#define SE_TOY_E 64 // Note E +#define SE_TOY_F 65 // Note F +#define SE_TOY_G 66 // Note G +#define SE_TOY_A 67 // Note A +#define SE_TOY_B 68 // Note B +#define SE_TOY_C1 69 // Note High C +#define SE_MIZU 70 // Puddle +#define SE_HASHI 71 // Boardwalk +#define SE_DAUGI 72 // Slots Credits +#define SE_PINPON 73 // Ding-dong! +#define SE_FUUSEN1 74 // Red Balloon +#define SE_FUUSEN2 75 // Blue Balloon +#define SE_FUUSEN3 76 // Yellow Balloon +#define SE_TOY_KABE 77 // Brealable Door +#define SE_TOY_DANGO 78 // Mud Ball +#define SE_DOKU 79 // Overworld Poison Damage +#define SE_ESUKA 80 // Escalator +#define SE_T_AME 81 // Rain +#define SE_T_AME_E 82 // Rain stop +#define SE_T_OOAME 83 // Heavy Rain +#define SE_T_OOAME_E 84 // Heavy Rain Stop +#define SE_T_KOAME 85 // Light Rain +#define SE_T_KOAME_E 86 // Light Rain Stop +#define SE_T_KAMI 87 // Thunder +#define SE_T_KAMI2 88 // Thunder 2 +#define SE_ELEBETA 89 // Elevator +#define SE_HINSI 90 // Low Health +#define SE_EXPMAX 91 // Exp. Max +#define SE_TAMAKORO 92 // Roulette Ball +#define SE_TAMAKORO_E 93 // Roulette Ball 2 #define SE_BASABASA 94 -#define SE_REGI 95 -#define SE_C_GAJI 96 -#define SE_C_MAKU_U 97 -#define SE_C_MAKU_D 98 +#define SE_REGI 95 // Cash Register +#define SE_C_GAJI 96 // Contest Hearts +#define SE_C_MAKU_U 97 // Contest Curtain rise +#define SE_C_MAKU_D 98 // Contest Curtain fall #define SE_C_PASI 99 #define SE_C_SYU 100 -#define SE_C_PIKON 101 -#define SE_REAPOKE 102 -#define SE_OP_BASYU 103 -#define SE_BT_START 104 -#define SE_DENDOU 105 -#define SE_JIHANKI 106 -#define SE_TAMA 107 -#define SE_Z_SCROLL 108 -#define SE_Z_PAGE 109 -#define SE_PN_ON 110 -#define SE_PN_OFF 111 -#define SE_Z_SEARCH 112 -#define SE_TAMAGO 113 -#define SE_TB_START 114 -#define SE_TB_KON 115 -#define SE_TB_KARA 116 +#define SE_C_PIKON 101 // Pokémon Appears in Contest +#define SE_REAPOKE 102 // Shiny Pokémon +#define SE_OP_BASYU 103 // Opening Movie -> Title Screen whoosh +#define SE_BT_START 104 // Battle Mugshot whoosh +#define SE_DENDOU 105 // Audience Cheering +#define SE_JIHANKI 106 // Vending Machine +#define SE_TAMA 107 // Orb Used +#define SE_Z_SCROLL 108 // Pokédex Scrolling +#define SE_Z_PAGE 109 // Pokédex Page +#define SE_PN_ON 110 // PokéNav On +#define SE_PN_OFF 111 // PokéNav Off +#define SE_Z_SEARCH 112 // Pokédex Search +#define SE_TAMAGO 113 // Egg hatch +#define SE_TB_START 114 // Battle - Poké Ball Tray slide in +#define SE_TB_KON 115 // Battle - Poké Ball Tray ball sound +#define SE_TB_KARA 116 // Battle - Poké Ball Tray slide out #define SE_BIDORO 117 -#define SE_W085 118 -#define SE_W085B 119 -#define SE_W231 120 -#define SE_W171 121 -#define SE_W233 122 -#define SE_W233B 123 -#define SE_W145 124 -#define SE_W145B 125 -#define SE_W145C 126 -#define SE_W240 127 -#define SE_W015 128 -#define SE_W081 129 -#define SE_W081B 130 -#define SE_W088 131 -#define SE_W016 132 -#define SE_W016B 133 -#define SE_W003 134 -#define SE_W104 135 -#define SE_W013 136 -#define SE_W196 137 -#define SE_W086 138 -#define SE_W004 139 -#define SE_W025 140 -#define SE_W025B 141 -#define SE_W152 142 -#define SE_W026 143 -#define SE_W172 144 -#define SE_W172B 145 -#define SE_W053 146 -#define SE_W007 147 -#define SE_W092 148 -#define SE_W221 149 -#define SE_W221B 150 -#define SE_W052 151 -#define SE_W036 152 -#define SE_W059 153 -#define SE_W059B 154 -#define SE_W010 155 -#define SE_W011 156 -#define SE_W017 157 -#define SE_W019 158 -#define SE_W028 159 -#define SE_W013B 160 -#define SE_W044 161 -#define SE_W029 162 -#define SE_W057 163 -#define SE_W056 164 -#define SE_W250 165 -#define SE_W030 166 -#define SE_W039 167 -#define SE_W054 168 -#define SE_W077 169 -#define SE_W020 170 -#define SE_W082 171 -#define SE_W047 172 -#define SE_W195 173 -#define SE_W006 174 -#define SE_W091 175 -#define SE_W146 176 -#define SE_W120 177 -#define SE_W153 178 -#define SE_W071B 179 -#define SE_W071 180 -#define SE_W103 181 -#define SE_W062 182 -#define SE_W062B 183 -#define SE_W048 184 -#define SE_W187 185 -#define SE_W118 186 -#define SE_W155 187 -#define SE_W122 188 -#define SE_W060 189 -#define SE_W185 190 -#define SE_W014 191 -#define SE_W043 192 -#define SE_W207 193 -#define SE_W207B 194 -#define SE_W215 195 -#define SE_W109 196 -#define SE_W173 197 -#define SE_W280 198 -#define SE_W202 199 -#define SE_W060B 200 -#define SE_W076 201 -#define SE_W080 202 -#define SE_W100 203 -#define SE_W107 204 -#define SE_W166 205 -#define SE_W129 206 -#define SE_W115 207 -#define SE_W112 208 -#define SE_W197 209 -#define SE_W199 210 -#define SE_W236 211 -#define SE_W204 212 -#define SE_W268 213 -#define SE_W070 214 -#define SE_W063 215 -#define SE_W127 216 -#define SE_W179 217 -#define SE_W151 218 -#define SE_W201 219 -#define SE_W161 220 -#define SE_W161B 221 -#define SE_W227 222 -#define SE_W227B 223 -#define SE_W226 224 -#define SE_W208 225 -#define SE_W213 226 -#define SE_W213B 227 -#define SE_W234 228 -#define SE_W260 229 -#define SE_W328 230 -#define SE_W320 231 -#define SE_W255 232 -#define SE_W291 233 -#define SE_W089 234 -#define SE_W239 235 -#define SE_W230 236 -#define SE_W281 237 -#define SE_W327 238 -#define SE_W287 239 -#define SE_W257 240 -#define SE_W253 241 -#define SE_W258 242 -#define SE_W322 243 -#define SE_W298 244 -#define SE_W287B 245 -#define SE_W114 246 -#define SE_W063B 247 -#define SE_RG_W_DOOR 248 -#define SE_RG_CARD1 249 -#define SE_RG_CARD2 250 -#define SE_RG_CARD3 251 -#define SE_RG_BAG1 252 -#define SE_RG_BAG2 253 +#define SE_W085 118 // Thunderbolt +#define SE_W085B 119 // Thunderbolt 2 +#define SE_W231 120 // Harden +#define SE_W171 121 // Nightmare +#define SE_W233 122 // Vital Throw +#define SE_W233B 123 // Vital Throw +#define SE_W145 124 // Bubble +#define SE_W145B 125 // Bubble 2 +#define SE_W145C 126 // Bubble 3 +#define SE_W240 127 // Rain Dance +#define SE_W015 128 // Cut +#define SE_W081 129 // String Shot +#define SE_W081B 130 // String Shot 2 +#define SE_W088 131 // Rock Throw +#define SE_W016 132 // Gust +#define SE_W016B 133 // Gust 2 +#define SE_W003 134 // DoubleSlap +#define SE_W104 135 // Double Team +#define SE_W013 136 // Razor Wind +#define SE_W196 137 // Icy Wind +#define SE_W086 138 // Thunder Wave +#define SE_W004 139 // Comet Punch +#define SE_W025 140 // Mega Kick +#define SE_W025B 141 // Mega Kick 2 +#define SE_W152 142 // Crabhammer +#define SE_W026 143 // Jump Kick +#define SE_W172 144 // Flame Wheel +#define SE_W172B 145 // Flame Wheel 2 +#define SE_W053 146 // Flamethrower +#define SE_W007 147 // Fire Punch +#define SE_W092 148 // Toxic +#define SE_W221 149 // Sacred Fire +#define SE_W221B 150 // Sacred Fire 2 +#define SE_W052 151 // Ember +#define SE_W036 152 // Take Down +#define SE_W059 153 // Blizzard +#define SE_W059B 154 // Blizzard 2 +#define SE_W010 155 // Scratch +#define SE_W011 156 // Vicegrip +#define SE_W017 157 // Wing Attack +#define SE_W019 158 // Fly +#define SE_W028 159 // Sand-Attack +#define SE_W013B 160 // Razor Wind 2 +#define SE_W044 161 // Bite +#define SE_W029 162 // Headbutt +#define SE_W057 163 // Surf +#define SE_W056 164 // Hydro Pump +#define SE_W250 165 // Whirlpool +#define SE_W030 166 // Horn Attack +#define SE_W039 167 // Tail Whip +#define SE_W054 168 // Mist +#define SE_W077 169 // PoisonPowder +#define SE_W020 170 // Bind +#define SE_W082 171 // Dragon Rage +#define SE_W047 172 // Sing +#define SE_W195 173 // Perish Song +#define SE_W006 174 // Pay Day +#define SE_W091 175 // Dig +#define SE_W146 176 // Dizzy Punch +#define SE_W120 177 // Self-Destruct +#define SE_W153 178 // Explosion +#define SE_W071B 179 // Absorb 2 +#define SE_W071 180 // Absorb +#define SE_W103 181 // Screech +#define SE_W062 182 // BubbleBeam +#define SE_W062B 183 // BubbleBeam 2 +#define SE_W048 184 // Supersonic +#define SE_W187 185 // Belly Drum +#define SE_W118 186 // Metronome +#define SE_W155 187 // Bonemerang +#define SE_W122 188 // Lick +#define SE_W060 189 // Psybeam +#define SE_W185 190 // Faint Attack +#define SE_W014 191 // Swords Dance +#define SE_W043 192 // Leer +#define SE_W207 193 // Swagger +#define SE_W207B 194 // Swagger 2 +#define SE_W215 195 // Heal Bell +#define SE_W109 196 // Confuse Ray +#define SE_W173 197 // Snore +#define SE_W280 198 // Brick Break +#define SE_W202 199 // Giga Drain +#define SE_W060B 200 // Psybeam 2 +#define SE_W076 201 // SolarBeam +#define SE_W080 202 // Petal Dance +#define SE_W100 203 // Teleport +#define SE_W107 204 // Minimize +#define SE_W166 205 // Sketch +#define SE_W129 206 // Swift +#define SE_W115 207 // Reflect +#define SE_W112 208 // Barrier +#define SE_W197 209 // Detect +#define SE_W199 210 // Lock-On +#define SE_W236 211 // Moonlight +#define SE_W204 212 // Charm +#define SE_W268 213 // Charge +#define SE_W070 214 // Strength +#define SE_W063 215 // Hyper Beam +#define SE_W127 216 // Waterfall +#define SE_W179 217 // Reversal +#define SE_W151 218 // Acid Armor +#define SE_W201 219 // Sandstorm +#define SE_W161 220 // Tri-Attack +#define SE_W161B 221 // Tri-Attack 2 +#define SE_W227 222 // Encore +#define SE_W227B 223 // Encore 2 +#define SE_W226 224 // Baton Pass +#define SE_W208 225 // Milk Drink +#define SE_W213 226 // Attract +#define SE_W213B 227 // Attract 2 +#define SE_W234 228 // Morning Sun +#define SE_W260 229 // Flatter +#define SE_W328 230 // Sand Tomb +#define SE_W320 231 // GrassWhistle +#define SE_W255 232 // Spit Up +#define SE_W291 233 // Dive +#define SE_W089 234 // Earthquake +#define SE_W239 235 // Twister +#define SE_W230 236 // Sweet Scent +#define SE_W281 237 // Yawn +#define SE_W327 238 // Sky Uppercut +#define SE_W287 239 // Stat Increased +#define SE_W257 240 // Heat Wave +#define SE_W253 241 // Uproar +#define SE_W258 242 // Hail +#define SE_W322 243 // Cosmic Power +#define SE_W298 244 // Teeter Dance +#define SE_W287B 245 // Stat Decreased +#define SE_W114 246 // Haze +#define SE_W063B 247 // Hyper Beam 2 +// FRLG SFX below +#define SE_RG_W_DOOR 248 // Door +#define SE_RG_CARD1 249 // Trainer Card 1 +#define SE_RG_CARD2 250 // Trainer Card 2 +#define SE_RG_CARD3 251 // Trainer Card 3 +#define SE_RG_BAG1 252 // Bag Scroll +#define SE_RG_BAG2 253 // Bag Pocket Change #define SE_RG_GETTING 254 -#define SE_RG_SHOP 255 -#define SE_RG_KITEKI 256 -#define SE_RG_HELP_OP 257 -#define SE_RG_HELP_CL 258 -#define SE_RG_HELP_NG 259 -#define SE_RG_DEOMOV 260 +#define SE_RG_SHOP 255 // Cash Register +#define SE_RG_KITEKI 256 // S.S. Anne Horn +#define SE_RG_HELP_OP 257 // Help Menu Open +#define SE_RG_HELP_CL 258 // Help Menu Close +#define SE_RG_HELP_NG 259 // Help Menu Error? +#define SE_RG_DEOMOV 260 // Deoxys Moves #define SE_RG_EXCELLENT 261 #define SE_RG_NAWAMISS 262 -#define SE_TOREEYE 263 -#define SE_TOREOFF 264 -#define SE_HANTEI1 265 -#define SE_HANTEI2 266 -#define SE_CURTAIN 267 -#define SE_CURTAIN1 268 -#define SE_USSOKI 269 +// end FRLG SFX +#define SE_TOREEYE 263 // Trainer's Eye Call +#define SE_TOREOFF 264 // Trainer's Eye Hang Up +#define SE_HANTEI1 265 // Battle Arena Time's Up 1 +#define SE_HANTEI2 266 // Battle Arena Time's Up 2 +#define SE_CURTAIN 267 // Battle Pike Curtain Open +#define SE_CURTAIN1 268 // Battle Pike Curtain Close +#define SE_USSOKI 269 // Sudowoodo -#define MUS_TETSUJI 350 -#define MUS_FIELD13 351 -#define MUS_KACHI22 352 -#define MUS_KACHI2 353 -#define MUS_KACHI3 354 -#define MUS_KACHI5 355 -#define MUS_PCC 356 -#define MUS_NIBI 357 -#define MUS_SUIKUN 358 -#define MUS_DOORO1 359 -#define MUS_DOORO_X1 360 -#define MUS_DOORO_X3 361 -#define MUS_MACHI_S2 362 -#define MUS_MACHI_S4 363 -#define MUS_GIM 364 -#define MUS_NAMINORI 365 -#define MUS_DAN01 366 -#define MUS_FANFA1 367 -#define MUS_ME_ASA 368 -#define MUS_ME_BACHI 369 -#define MUS_FANFA4 370 -#define MUS_FANFA5 371 -#define MUS_ME_WAZA 372 -#define MUS_BIJYUTU 373 -#define MUS_DOORO_X4 374 -#define MUS_FUNE_KAN 375 -#define MUS_ME_SHINKA 376 -#define MUS_SHINKA 377 -#define MUS_ME_WASURE 378 -#define MUS_SYOUJOEYE 379 -#define MUS_BOYEYE 380 -#define MUS_DAN02 381 -#define MUS_MACHI_S3 382 -#define MUS_ODAMAKI 383 -#define MUS_B_TOWER 384 -#define MUS_SWIMEYE 385 -#define MUS_DAN03 386 -#define MUS_ME_KINOMI 387 -#define MUS_ME_TAMA 388 -#define MUS_ME_B_BIG 389 -#define MUS_ME_B_SMALL 390 -#define MUS_ME_ZANNEN 391 -#define MUS_BD_TIME 392 -#define MUS_TEST1 393 -#define MUS_TEST2 394 -#define MUS_TEST3 395 -#define MUS_TEST4 396 -#define MUS_TEST 397 -#define MUS_GOMACHI0 398 -#define MUS_GOTOWN 399 -#define MUS_POKECEN 400 -#define MUS_NEXTROAD 401 -#define MUS_GRANROAD 402 -#define MUS_CYCLING 403 -#define MUS_FRIENDLY 404 -#define MUS_MISHIRO 405 -#define MUS_TOZAN 406 -#define MUS_GIRLEYE 407 -#define MUS_MINAMO 408 -#define MUS_ASHROAD 409 -#define MUS_EVENT0 410 -#define MUS_DEEPDEEP 411 -#define MUS_KACHI1 412 -#define MUS_TITLE3 413 -#define MUS_DEMO1 414 -#define MUS_GIRL_SUP 415 -#define MUS_HAGESHII 416 -#define MUS_KAKKOII 417 -#define MUS_KAZANBAI 418 -#define MUS_AQA_0 419 -#define MUS_TSURETEK 420 -#define MUS_BOY_SUP 421 -#define MUS_RAINBOW 422 -#define MUS_AYASII 423 -#define MUS_KACHI4 424 -#define MUS_ROPEWAY 425 -#define MUS_CASINO 426 -#define MUS_HIGHTOWN 427 -#define MUS_SAFARI 428 -#define MUS_C_ROAD 429 -#define MUS_AJITO 430 -#define MUS_M_BOAT 431 -#define MUS_M_DUNGON 432 -#define MUS_FINECITY 433 -#define MUS_MACHUPI 434 -#define MUS_P_SCHOOL 435 -#define MUS_DENDOU 436 -#define MUS_TONEKUSA 437 -#define MUS_MABOROSI 438 -#define MUS_CON_FAN 439 -#define MUS_CONTEST0 440 -#define MUS_MGM0 441 -#define MUS_T_BATTLE 442 -#define MUS_OOAME 443 -#define MUS_HIDERI 444 -#define MUS_RUNECITY 445 -#define MUS_CON_K 446 -#define MUS_EIKOU_R 447 -#define MUS_KARAKURI 448 -#define MUS_HUTAGO 449 -#define MUS_SITENNOU 450 -#define MUS_YAMA_EYE 451 -#define MUS_CONLOBBY 452 -#define MUS_INTER_V 453 -#define MUS_DAIGO 454 -#define MUS_THANKFOR 455 -#define MUS_END 456 -#define MUS_B_FRONTIER 457 -#define MUS_B_ARENA 458 -#define MUS_ME_POINTGET 459 -#define MUS_ME_TORE_EYE 460 -#define MUS_PYRAMID 461 -#define MUS_PYRAMID_TOP 462 -#define MUS_B_PALACE 463 -#define MUS_REKKUU_KOURIN 464 -#define MUS_SATTOWER 465 -#define MUS_ME_SYMBOLGET 466 -#define MUS_B_DOME 467 -#define MUS_B_TUBE 468 -#define MUS_B_FACTORY 469 -#define MUS_VS_REKKU 470 -#define MUS_VS_FRONT 471 -#define MUS_VS_MEW 472 -#define MUS_B_DOME1 473 -#define MUS_BATTLE27 474 -#define MUS_BATTLE31 475 -#define MUS_BATTLE20 476 -#define MUS_BATTLE32 477 -#define MUS_BATTLE33 478 -#define MUS_BATTLE36 479 -#define MUS_BATTLE34 480 -#define MUS_BATTLE35 481 -#define MUS_BATTLE38 482 -#define MUS_BATTLE30 483 -#define MUS_RG_ANNAI 484 -#define MUS_RG_SLOT 485 -#define MUS_RG_AJITO 486 -#define MUS_RG_GYM 487 -#define MUS_RG_PURIN 488 -#define MUS_RG_DEMO 489 -#define MUS_RG_TITLE 490 -#define MUS_RG_GUREN 491 -#define MUS_RG_SHION 492 -#define MUS_RG_KAIHUKU 493 -#define MUS_RG_CYCLING 494 -#define MUS_RG_ROCKET 495 -#define MUS_RG_SHOUJO 496 -#define MUS_RG_SHOUNEN 497 -#define MUS_RG_DENDOU 498 -#define MUS_RG_T_MORI 499 -#define MUS_RG_OTSUKIMI 500 -#define MUS_RG_POKEYASHI 501 -#define MUS_RG_ENDING 502 -#define MUS_RG_LOAD01 503 -#define MUS_RG_OPENING 504 -#define MUS_RG_LOAD02 505 -#define MUS_RG_LOAD03 506 -#define MUS_RG_CHAMP_R 507 -#define MUS_RG_VS_GYM 508 -#define MUS_RG_VS_TORE 509 -#define MUS_RG_VS_YASEI 510 -#define MUS_RG_VS_LAST 511 -#define MUS_RG_MASARA 512 -#define MUS_RG_KENKYU 513 -#define MUS_RG_OHKIDO 514 -#define MUS_RG_POKECEN 515 -#define MUS_RG_SANTOAN 516 -#define MUS_RG_NAMINORI 517 -#define MUS_RG_P_TOWER 518 -#define MUS_RG_SHIRUHU 519 -#define MUS_RG_HANADA 520 -#define MUS_RG_TAMAMUSI 521 -#define MUS_RG_WIN_TRE 522 -#define MUS_RG_WIN_YASEI 523 -#define MUS_RG_WIN_GYM 524 -#define MUS_RG_KUCHIBA 525 -#define MUS_RG_NIBI 526 -#define MUS_RG_RIVAL1 527 -#define MUS_RG_RIVAL2 528 -#define MUS_RG_FAN2 529 -#define MUS_RG_FAN5 530 -#define MUS_RG_FAN6 531 -#define MUS_ME_RG_PHOTO 532 -#define MUS_RG_TITLEROG 533 -#define MUS_RG_GET_YASEI 534 -#define MUS_RG_SOUSA 535 -#define MUS_RG_SEKAIKAN 536 -#define MUS_RG_SEIBETU 537 -#define MUS_RG_JUMP 538 -#define MUS_RG_UNION 539 -#define MUS_RG_NETWORK 540 -#define MUS_RG_OKURIMONO 541 +#define MUS_TETSUJI 350 // Littleroot Town Test 'TETSUJI' +#define MUS_FIELD13 351 // GSC - Route 38 +#define MUS_KACHI22 352 // Wild Pokémon Defeated +#define MUS_KACHI2 353 // Wild Pokémon Defeated with Intro +#define MUS_KACHI3 354 // Gym Leader Defeated +#define MUS_KACHI5 355 // Victory! Elite Four +#define MUS_PCC 356 // Crystal - Pokémon Communication Center +#define MUS_NIBI 357 // GSC - Viridian/Saffron/Pewter/etc +#define MUS_SUIKUN 358 // Crystal - Battle! Legendary Beasts +#define MUS_DOORO1 359 // Route 101 +#define MUS_DOORO_X1 360 // Route 110 +#define MUS_DOORO_X3 361 // Route 120 +#define MUS_MACHI_S2 362 // Petalburg City +#define MUS_MACHI_S4 363 // Oldale Town +#define MUS_GIM 364 // Gym +#define MUS_NAMINORI 365 // Surfing +#define MUS_DAN01 366 // Caves and Darkness +#define MUS_FANFA1 367 // Level Up! +#define MUS_ME_ASA 368 // Pokémon Healed +#define MUS_ME_BACHI 369 // Obtained a Badge! +#define MUS_FANFA4 370 // Obtained an Item! +#define MUS_FANFA5 371 // Your Pokémon Just Evolved! +#define MUS_ME_WAZA 372 // Obtained a TM/HM! +#define MUS_BIJYUTU 373 // Lilycove Musseum +#define MUS_DOORO_X4 374 // Route 122/Intro +#define MUS_FUNE_KAN 375 // Slateport Museum +#define MUS_ME_SHINKA 376 // Evolution Intro +#define MUS_SHINKA 377 // Evolution +#define MUS_ME_WASURE 378 // Move Deleted +#define MUS_SYOUJOEYE 379 // Encounter! Tuber +#define MUS_BOYEYE 380 // Encounter! Boy +#define MUS_DAN02 381 // Abandoned Ship +#define MUS_MACHI_S3 382 // Fortree City +#define MUS_ODAMAKI 383 // Professor Birch's Lab +#define MUS_B_TOWER 384 // Battle Tower (RS) +#define MUS_SWIMEYE 385 // Encounter! Swimmer +#define MUS_DAN03 386 // Meteor Falls +#define MUS_ME_KINOMI 387 // Obtained a Berry! +#define MUS_ME_TAMA 388 // Awakening the Super-Ancient Pokémon +#define MUS_ME_B_BIG 389 // Slots Jackpot! +#define MUS_ME_B_SMALL 390 // Slots Victory! +#define MUS_ME_ZANNEN 391 // Too bad! +#define MUS_BD_TIME 392 // Roulette! +#define MUS_TEST1 393 // Contest Test 1 +#define MUS_TEST2 394 // Contest Test 2 +#define MUS_TEST3 395 // Contest Test 3 +#define MUS_TEST4 396 // Contest Test 4 +#define MUS_TEST 397 // Encounter! Gentleman (Test?) +#define MUS_GOMACHI0 398 // Verdanturf Town +#define MUS_GOTOWN 399 // Rustboro City +#define MUS_POKECEN 400 // Pokémon Center +#define MUS_NEXTROAD 401 // Route 104 +#define MUS_GRANROAD 402 // Route 119 +#define MUS_CYCLING 403 // Cycling +#define MUS_FRIENDLY 404 // Pokémart +#define MUS_MISHIRO 405 // Littleroot Town +#define MUS_TOZAN 406 // Sky Pillar +#define MUS_GIRLEYE 407 // Encounter! Girl +#define MUS_MINAMO 408 // Lilycove City +#define MUS_ASHROAD 409 // Route 111 +#define MUS_EVENT0 410 // Help me! +#define MUS_DEEPDEEP 411 // Underwater +#define MUS_KACHI1 412 // Victory! Trainer +#define MUS_TITLE3 413 // Title Screen +#define MUS_DEMO1 414 // Opening Movie +#define MUS_GIRL_SUP 415 // Encounter! May +#define MUS_HAGESHII 416 // Encounter! Biker +#define MUS_KAKKOII 417 // Encounter! Electric Trainer +#define MUS_KAZANBAI 418 // Route 113 +#define MUS_AQA_0 419 // Encounter! Team Aqua +#define MUS_TSURETEK 420 // Follow Me! +#define MUS_BOY_SUP 421 // Encounter! Brendan +#define MUS_RAINBOW 422 // Ever Grande City +#define MUS_AYASII 423 // Encounter! Psychic +#define MUS_KACHI4 424 // Victory! Aqua/Magma Grunt +#define MUS_ROPEWAY 425 // Cable Car +#define MUS_CASINO 426 // Game Corner +#define MUS_HIGHTOWN 427 // Dewford Town +#define MUS_SAFARI 428 // Safari Zone +#define MUS_C_ROAD 429 // Victory Toad +#define MUS_AJITO 430 // Aqua/Magma Hideout +#define MUS_M_BOAT 431 // Sailing +#define MUS_M_DUNGON 432 // Mt. Pyre (Inside) +#define MUS_FINECITY 433 // Slateport City +#define MUS_MACHUPI 434 // Mt. Pyre (Outside) +#define MUS_P_SCHOOL 435 // Pokémon Trainer's School +#define MUS_DENDOU 436 // Hall of Fame +#define MUS_TONEKUSA 437 // Lavaridge Town +#define MUS_MABOROSI 438 // Sealed Chamber +#define MUS_CON_FAN 439 // You are the Champion! +#define MUS_CONTEST0 440 // Pokémon Contest +#define MUS_MGM0 441 // Encounter! Team Magma +#define MUS_T_BATTLE 442 // Opening Battle +#define MUS_OOAME 443 // The Flood +#define MUS_HIDERI 444 // The Drought +#define MUS_RUNECITY 445 // Sootopolis City +#define MUS_CON_K 446 // Berry Blending Results +#define MUS_EIKOU_R 447 // Hall of Fame +#define MUS_KARAKURI 448 // Trick House +#define MUS_HUTAGO 449 // Encounter! Kid +#define MUS_SITENNOU 450 // Encounter! Elite Four +#define MUS_YAMA_EYE 451 // Encounter! Hiker +#define MUS_CONLOBBY 452 // Contest Lobby +#define MUS_INTER_V 453 // Encounter! Gabby and Ty +#define MUS_DAIGO 454 // Encounter! Wallace +#define MUS_THANKFOR 455 // Credits +#define MUS_END 456 // The End +#define MUS_B_FRONTIER 457 // Battle Frontier +#define MUS_B_ARENA 458 // Battle Arena +#define MUS_ME_POINTGET 459 // Obtained Battle Points! +#define MUS_ME_TORE_EYE 460 // Registered Trainer! +#define MUS_PYRAMID 461 // Battle Pyramid +#define MUS_PYRAMID_TOP 462 // Top of the Battle Pyramid +#define MUS_B_PALACE 463 // Battle Palace +#define MUS_REKKUU_KOURIN 464 // Rayquaza Enters +#define MUS_SATTOWER 465 // Battle Tower (Emerald) +#define MUS_ME_SYMBOLGET 466 // Obtained a Frontier Symbol! +#define MUS_B_DOME 467 // Battle Dome +#define MUS_B_TUBE 468 // Battle Pike +#define MUS_B_FACTORY 469 // Battle Factory +#define MUS_VS_REKKU 470 // Battle! Legendary Pokémon +#define MUS_VS_FRONT 471 // Battle! Frontier Brain +#define MUS_VS_MEW 472 // Battle! Mew +#define MUS_B_DOME1 473 // Battle Dome Lobby +#define MUS_BATTLE27 474 // Battle! Wild Pokémon +#define MUS_BATTLE31 475 // Battle! Team Aqua/Magma +#define MUS_BATTLE20 476 // Battle! Trainer +#define MUS_BATTLE32 477 // Battle! Gym Leader +#define MUS_BATTLE33 478 // Battle! Champion +#define MUS_BATTLE36 479 // Battle! Regi Trio +#define MUS_BATTLE34 480 // Battle! Legendary Pokémon (dupe) +#define MUS_BATTLE35 481 // Battle! Rival +#define MUS_BATTLE38 482 // Battle! Elite Four +#define MUS_BATTLE30 483 // Battle! Archie/Maxie +// FRLG Music Below +#define MUS_RG_ANNAI 484 // Follow Me +#define MUS_RG_SLOT 485 // Game Corner +#define MUS_RG_AJITO 486 // Rocket Hideout +#define MUS_RG_GYM 487 // Gym +#define MUS_RG_PURIN 488 // Jigglypuff's Song +#define MUS_RG_DEMO 489 // Opening Movie +#define MUS_RG_TITLE 490 // Title Screen +#define MUS_RG_GUREN 491 // Cinnabar Island +#define MUS_RG_SHION 492 // Lavendar Town +#define MUS_RG_KAIHUKU 493 // RBY Pokémon Center Healing +#define MUS_RG_CYCLING 494 // Cycling +#define MUS_RG_ROCKET 495 // Encounter! Team Rocket +#define MUS_RG_SHOUJO 496 // Encounter! Girl +#define MUS_RG_SHOUNEN 497 // Encounter! Boy +#define MUS_RG_DENDOU 498 // You're the Champion! +#define MUS_RG_T_MORI 499 // Viridian Forest +#define MUS_RG_OTSUKIMI 500 // Mt. Moon +#define MUS_RG_POKEYASHI 501 // Pokémon Mansion +#define MUS_RG_ENDING 502 // Credits +#define MUS_RG_LOAD01 503 // Route 1 +#define MUS_RG_OPENING 504 // Route 24/Intro +#define MUS_RG_LOAD02 505 // Route 2 +#define MUS_RG_LOAD03 506 // Route 11 +#define MUS_RG_CHAMP_R 507 // Victory Road +#define MUS_RG_VS_GYM 508 // Battle! Gym Leader/Elite Four +#define MUS_RG_VS_TORE 509 // Battle! Trainer +#define MUS_RG_VS_YASEI 510 // Battle! Wild Pokémon +#define MUS_RG_VS_LAST 511 // Battle! Champion +#define MUS_RG_MASARA 512 // Pallet Town +#define MUS_RG_KENKYU 513 // Professor Oak's Lab +#define MUS_RG_OHKIDO 514 // Professor Oak's Theme +#define MUS_RG_POKECEN 515 // Pokémon Center +#define MUS_RG_SANTOAN 516 // S.S. Anne +#define MUS_RG_NAMINORI 517 // Surfing +#define MUS_RG_P_TOWER 518 // Pokémon Tower +#define MUS_RG_SHIRUHU 519 // Silph Co. +#define MUS_RG_HANADA 520 // Cerulean City +#define MUS_RG_TAMAMUSI 521 // Celadon City +#define MUS_RG_WIN_TRE 522 // Victory! Trainer +#define MUS_RG_WIN_YASEI 523 // Victory! Wild Pokémon +#define MUS_RG_WIN_GYM 524 // Victory! Gym Leader +#define MUS_RG_KUCHIBA 525 // Vermillion City +#define MUS_RG_NIBI 526 // Viridian/Saffron/Pewter City +#define MUS_RG_RIVAL1 527 // Encounter! Rival +#define MUS_RG_RIVAL2 528 // Rival's Exit +#define MUS_RG_FAN2 529 // Fanfare 2 +#define MUS_RG_FAN5 530 // Obtained a Starter! +#define MUS_RG_FAN6 531 // Pokémon Caught! (Used in Emerald) +#define MUS_ME_RG_PHOTO 532 // Trainer Photo +#define MUS_RG_TITLEROG 533 // Game Freak +#define MUS_RG_GET_YASEI 534 // Pokémon Caught Victory Theme +#define MUS_RG_SOUSA 535 // Starting Tutorial +#define MUS_RG_SEKAIKAN 536 // Starting Tutorial 2 +#define MUS_RG_SEIBETU 537 // Starting Tutorial 3 +#define MUS_RG_JUMP 538 // Jumping Minigame +#define MUS_RG_UNION 539 // Union Room +#define MUS_RG_NETWORK 540 // Network Center +#define MUS_RG_OKURIMONO 541 // Mystery Gift #define MUS_RG_KINOMIKUI 542 -#define MUS_RG_NANADUNGEON 543 -#define MUS_RG_OSHIE_TV 544 -#define MUS_RG_NANASHIMA 545 -#define MUS_RG_NANAISEKI 546 -#define MUS_RG_NANA123 547 -#define MUS_RG_NANA45 548 -#define MUS_RG_NANA67 549 -#define MUS_RG_POKEFUE 550 -#define MUS_RG_VS_DEO 551 -#define MUS_RG_VS_MYU2 552 -#define MUS_RG_VS_DEN 553 -#define MUS_RG_EXEYE 554 -#define MUS_RG_DEOEYE 555 -#define MUS_RG_T_TOWER 556 -#define MUS_RG_SLOWMASARA 557 -#define MUS_RG_TVNOIZE 558 +#define MUS_RG_NANADUNGEON 543 // Sevii Islands Cave (Mt. Moon) +#define MUS_RG_OSHIE_TV 544 // Follow Me +#define MUS_RG_NANASHIMA 545 // Sevii Islands Routes (Lake of Rage) +#define MUS_RG_NANAISEKI 546 // Sevii Islands Forests (Viridian Forest) +#define MUS_RG_NANA123 547 // Sevii Islands 1-3 (Viridian/Saffron/Pewter) +#define MUS_RG_NANA45 548 // Sevii Islands 4-5 (Azalea Town) +#define MUS_RG_NANA67 549 // Sevii Islands 6-7 (Violet City) +#define MUS_RG_POKEFUE 550 // PokéFlute +#define MUS_RG_VS_DEO 551 // Battle! Deoxys +#define MUS_RG_VS_MYU2 552 // Battle! Mewtwo +#define MUS_RG_VS_DEN 553 // Battle! Legendary Birds +#define MUS_RG_EXEYE 554 // Encounter! Gym Leader +#define MUS_RG_DEOEYE 555 // Encounter! Deoxys +#define MUS_RG_T_TOWER 556 // Trainer Tower (Gym) +#define MUS_RG_SLOWMASARA 557 // Pallet Town (Hall of Fame remix) +#define MUS_RG_TVNOIZE 558 // Teachy TV #define PH_TRAP_BLEND 559 #define PH_TRAP_HELD 560 #define PH_TRAP_SOLO 561 diff --git a/sound/song_table.inc b/sound/song_table.inc index 1120174b6d..04150f3819 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -1,275 +1,279 @@ .align 2 + gSongTable:: @ 86B49F0 song mus_dummy, 0, 0 - song se_kaifuku, 1, 1 - song se_pc_login, 1, 1 - song se_pc_off, 1, 1 - song se_pc_on, 1, 1 - song se_select, 2, 2 - song se_win_open, 1, 1 - song se_wall_hit, 2, 2 - song se_door, 1, 1 - song se_kaidan, 1, 1 - song se_dansa, 1, 1 - song se_jitensya, 1, 1 - song se_kouka_l, 1, 1 - song se_kouka_m, 1, 1 - song se_kouka_h, 1, 1 - song se_bowa2, 1, 1 - song se_poke_dead, 1, 1 - song se_nigeru, 1, 1 - song se_jido_doa, 1, 1 - song se_naminori, 1, 1 - song se_ban, 1, 1 - song se_pin, 1, 1 - song se_boo, 1, 1 - song se_bowa, 1, 1 - song se_jyuni, 2, 2 - song se_a, 1, 1 - song se_i, 1, 1 - song se_u, 1, 1 - song se_e, 1, 1 - song se_o, 1, 1 - song se_n, 1, 1 - song se_seikai, 1, 1 - song se_hazure, 1, 1 - song se_exp, 1, 1 - song se_jite_pyoko, 1, 1 + song se_kaifuku, 1, 1 @ Healing Item + song se_pc_login, 1, 1 @ PC Logon + song se_pc_off, 1, 1 @ PC Shutdown + song se_pc_on, 1, 1 @ PC Startup + song se_select, 2, 2 @ Cursor Selection + song se_win_open, 1, 1 @ Start Menu + song se_wall_hit, 2, 2 @ Wall Bump + song se_door, 1, 1 @ Opening Door + song se_kaidan, 1, 1 @ Stairs + song se_dansa, 1, 1 @ Ledge + song se_jitensya, 1, 1 @ Bicycle Bell + song se_kouka_l, 1, 1 @ Not Very Effective + song se_kouka_m, 1, 1 @ Normal Effectiveness + song se_kouka_h, 1, 1 @ Super Effective + song se_bowa2, 1, 1 @ Pokémon Withdrawl + song se_poke_dead, 1, 1 @ Pokémon Fainted + song se_nigeru, 1, 1 @ Flee from Wild Battle + song se_jido_doa, 1, 1 @ Pokémon Center Door + song se_naminori, 1, 1 @ Briney's Ship + song se_ban, 1, 1 @ Bang + song se_pin, 1, 1 @ Exclamation Bubble + song se_boo, 1, 1 @ Contest Jam + song se_bowa, 1, 1 @ Giving Poké Ball to Nurse, Poké Ball wiggle + song se_jyuni, 2, 2 @ Places in Contest Appearing + song se_a, 1, 1 @ Bard A + song se_i, 1, 1 @ Bard I + song se_u, 1, 1 @ Bard U + song se_e, 1, 1 @ Bard E + song se_o, 1, 1 @ Bard O + song se_n, 1, 1 @ Bard N + song se_seikai, 1, 1 @ Success + song se_hazure, 1, 1 @ Failure + song se_exp, 1, 1 @ Exp. Bar + song se_jite_pyoko, 1, 1 @ Bunny Hop song se_mu_pachi, 1, 1 - song se_tk_kasya, 1, 1 + song se_tk_kasya, 1, 1 @ Mossdeep Gym/Trick House Switch song se_fu_zaku, 1, 1 song se_fu_zaku2, 1, 1 - song se_fu_zuzuzu, 1, 1 - song se_ru_gashin, 1, 1 - song se_ru_gasyan, 1, 1 - song se_ru_bari, 1, 1 - song se_ru_hyuu, 1, 1 + song se_fu_zuzuzu, 1, 1 @ Lavaridge Gym Warp + song se_ru_gashin, 1, 1 @ Sootopolis Gym - Stairs Appear + song se_ru_gasyan, 1, 1 @ Sootopolis Gym - Ice Breaking + song se_ru_bari, 1, 1 @ Sootopolis Gym - Walking on Ice + song se_ru_hyuu, 1, 1 @ Falling Down song se_ki_gasyan, 2, 2 - song se_tk_warpin, 1, 1 - song se_tk_warpout, 1, 1 - song se_tu_saa, 1, 1 - song se_hi_turun, 1, 1 - song se_track_move, 1, 1 - song se_track_stop, 1, 1 - song se_track_haiki, 2, 2 - song se_track_door, 1, 1 + song se_tk_warpin, 1, 1 @ Warp In + song se_tk_warpout, 1, 1 @ Warp Out + song se_tu_saa, 1, 1 @ Repel + song se_hi_turun, 1, 1 @ Moving Obstacle in Fortree Gym + song se_track_move, 1, 1 @ Moving Truck + song se_track_stop, 1, 1 @ Moving Truck Stop + song se_track_haiki, 2, 2 @ Moving Truck Unload + song se_track_door, 1, 1 @ Moving Truck Door song se_moter, 2, 2 song se_card, 1, 1 - song se_save, 1, 1 - song se_kon, 1, 1 - song se_kon2, 1, 1 - song se_kon3, 1, 1 - song se_kon4, 1, 1 - song se_suikomu, 2, 2 - song se_nageru, 1, 1 - song se_toy_c, 2, 2 - song se_toy_d, 2, 2 - song se_toy_e, 2, 2 - song se_toy_f, 2, 2 - song se_toy_g, 2, 2 - song se_toy_a, 2, 2 - song se_toy_b, 2, 2 - song se_toy_c1, 2, 2 - song se_mizu, 2, 2 - song se_hashi, 2, 2 - song se_daugi, 1, 1 - song se_pinpon, 1, 1 - song se_fuusen1, 2, 2 - song se_fuusen2, 2, 2 - song se_fuusen3, 2, 2 - song se_toy_kabe, 2, 2 - song se_toy_dango, 2, 2 - song se_doku, 1, 1 - song se_esuka, 1, 1 - song se_t_ame, 3, 3 - song se_t_ame_e, 3, 3 - song se_t_ooame, 3, 3 - song se_t_ooame_e, 3, 3 - song se_t_koame, 3, 3 - song se_t_koame_e, 3, 3 - song se_t_kami, 1, 1 - song se_t_kami2, 1, 1 - song se_elebeta, 1, 1 - song se_hinsi, 3, 3 - song se_expmax, 1, 1 - song se_tamakoro, 2, 2 - song se_tamakoro_e, 2, 2 + song se_save, 1, 1 @ Save + song se_kon, 1, 1 @ Poke Ball Bounce 1 + song se_kon2, 1, 1 @ Poké Ball Bounce 2 + song se_kon3, 1, 1 @ Poké Ball Bounce 3 + song se_kon4, 1, 1 @ Poké Ball Bounce 4 + song se_suikomu, 2, 2 @ Poké Ball Trade + song se_nageru, 1, 1 @ Poké Ball Throw + song se_toy_c, 2, 2 @ Note C + song se_toy_d, 2, 2 @ Note D + song se_toy_e, 2, 2 @ Note E + song se_toy_f, 2, 2 @ Note F + song se_toy_g, 2, 2 @ Note G + song se_toy_a, 2, 2 @ Note A + song se_toy_b, 2, 2 @ Note B + song se_toy_c1, 2, 2 @ Note High C + song se_mizu, 2, 2 @ Puddle + song se_hashi, 2, 2 @ Boardwalk + song se_daugi, 1, 1 @ Slots Credits + song se_pinpon, 1, 1 @ Ding-dong! + song se_fuusen1, 2, 2 @ Red Balloon + song se_fuusen2, 2, 2 @ Blue Balloon + song se_fuusen3, 2, 2 @ Yellow Balloon + song se_toy_kabe, 2, 2 @ Breakable Door + song se_toy_dango, 2, 2 @ Mud Ball + song se_doku, 1, 1 @ Overworld Poison damage + song se_esuka, 1, 1 @ Escalator + song se_t_ame, 3, 3 @ Rain + song se_t_ame_e, 3, 3 @ Rain stop + song se_t_ooame, 3, 3 @ Heavy Rain + song se_t_ooame_e, 3, 3 @ Heavy Rain stop + song se_t_koame, 3, 3 @ Light Rain + song se_t_koame_e, 3, 3 @ Light Rain stop + song se_t_kami, 1, 1 @ Thunder + song se_t_kami2, 1, 1 @ Thunder 2 + song se_elebeta, 1, 1 @ Elevator + song se_hinsi, 3, 3 @ Low Health + song se_expmax, 1, 1 @ Exp. Max + song se_tamakoro, 2, 2 @ Roulette Ball + song se_tamakoro_e, 2, 2 @ Roulette Ball 2 song se_basabasa, 1, 1 - song se_regi, 1, 1 - song se_c_gaji, 1, 1 - song se_c_maku_u, 1, 1 - song se_c_maku_d, 1, 1 + song se_regi, 1, 1 @ Cash Register + song se_c_gaji, 1, 1 @ Contest Hearts + song se_c_maku_u, 1, 1 @ Contest Curtain rise + song se_c_maku_d, 1, 1 @ Contest Curtain fall song se_c_pasi, 1, 1 song se_c_syu, 1, 1 - song se_c_pikon, 1, 1 - song se_reapoke, 1, 1 - song se_op_basyu, 1, 1 - song se_bt_start, 1, 1 - song se_dendou, 1, 1 - song se_jihanki, 1, 1 - song se_tama, 1, 1 - song se_z_scroll, 1, 1 - song se_z_page, 1, 1 - song se_pn_on, 1, 1 - song se_pn_off, 1, 1 - song se_z_search, 1, 1 - song se_tamago, 1, 1 - song se_tb_start, 1, 1 - song se_tb_kon, 1, 1 - song se_tb_kara, 2, 2 + song se_c_pikon, 1, 1 @ Pokémon Appears in Contest + song se_reapoke, 1, 1 @ Shiny Pokémon + song se_op_basyu, 1, 1 @ Opening Movie -> Title Screen whoosh + song se_bt_start, 1, 1 @ Battle Mugshot whoosh + song se_dendou, 1, 1 @ Audience Cheering + song se_jihanki, 1, 1 @ Vending Machine + song se_tama, 1, 1 @ Orb Used + song se_z_scroll, 1, 1 @ Pokédex Scrolling + song se_z_page, 1, 1 @ Pokédex Page + song se_pn_on, 1, 1 @ PokéNav On + song se_pn_off, 1, 1 @ PokéNav Off + song se_z_search, 1, 1 @ Pokédex Search + song se_tamago, 1, 1 @ Egg hatch + song se_tb_start, 1, 1 @ Battle - Poké Ball Tray slide in + song se_tb_kon, 1, 1 @ Battle - Poké Ball Tray ball sound + song se_tb_kara, 2, 2 @ Battle - Poké Ball Tray slide out song se_bidoro, 1, 1 - song se_w085, 2, 2 - song se_w085b, 1, 1 - song se_w231, 1, 1 - song se_w171, 1, 1 - song se_w233, 1, 1 - song se_w233b, 1, 1 - song se_w145, 1, 1 - song se_w145b, 1, 1 - song se_w145c, 1, 1 - song se_w240, 1, 1 - song se_w015, 1, 1 - song se_w081, 1, 1 - song se_w081b, 1, 1 - song se_w088, 1, 1 - song se_w016, 2, 2 - song se_w016b, 2, 2 - song se_w003, 1, 1 - song se_w104, 1, 1 - song se_w013, 1, 1 - song se_w196, 1, 1 - song se_w086, 1, 1 - song se_w004, 1, 1 - song se_w025, 1, 1 - song se_w025b, 1, 1 - song se_w152, 1, 1 - song se_w026, 1, 1 - song se_w172, 1, 1 - song se_w172b, 1, 1 - song se_w053, 1, 1 - song se_w007, 1, 1 - song se_w092, 1, 1 - song se_w221, 1, 1 - song se_w221b, 2, 2 - song se_w052, 1, 1 - song se_w036, 2, 2 - song se_w059, 1, 1 - song se_w059b, 1, 1 - song se_w010, 1, 1 - song se_w011, 1, 1 - song se_w017, 1, 1 - song se_w019, 1, 1 - song se_w028, 1, 1 - song se_w013b, 1, 1 - song se_w044, 1, 1 - song se_w029, 1, 1 - song se_w057, 1, 1 - song se_w056, 1, 1 - song se_w250, 1, 1 - song se_w030, 1, 1 - song se_w039, 2, 2 - song se_w054, 1, 1 - song se_w077, 1, 1 - song se_w020, 2, 2 - song se_w082, 1, 1 - song se_w047, 1, 1 - song se_w195, 1, 1 - song se_w006, 1, 1 - song se_w091, 1, 1 - song se_w146, 1, 1 - song se_w120, 1, 1 - song se_w153, 1, 1 - song se_w071b, 1, 1 - song se_w071, 1, 1 - song se_w103, 1, 1 - song se_w062, 1, 1 - song se_w062b, 1, 1 - song se_w048, 1, 1 - song se_w187, 1, 1 - song se_w118, 1, 1 - song se_w155, 1, 1 - song se_w122, 1, 1 - song se_w060, 1, 1 - song se_w185, 1, 1 - song se_w014, 1, 1 - song se_w043, 1, 1 - song se_w207, 1, 1 - song se_w207b, 1, 1 - song se_w215, 1, 1 - song se_w109, 1, 1 - song se_w173, 1, 1 - song se_w280, 1, 1 - song se_w202, 1, 1 - song se_w060b, 1, 1 - song se_w076, 2, 2 - song se_w080, 1, 1 - song se_w100, 1, 1 - song se_w107, 1, 1 - song se_w166, 1, 1 - song se_w129, 1, 1 - song se_w115, 1, 1 - song se_w112, 1, 1 - song se_w197, 2, 2 - song se_w199, 1, 1 - song se_w236, 1, 1 - song se_w204, 1, 1 - song se_w268, 1, 1 - song se_w070, 1, 1 - song se_w063, 1, 1 - song se_w127, 1, 1 - song se_w179, 1, 1 - song se_w151, 1, 1 - song se_w201, 1, 1 - song se_w161, 1, 1 - song se_w161b, 1, 1 - song se_w227, 1, 1 - song se_w227b, 2, 2 - song se_w226, 1, 1 - song se_w208, 1, 1 - song se_w213, 1, 1 - song se_w213b, 1, 1 - song se_w234, 1, 1 - song se_w260, 1, 1 - song se_w328, 1, 1 - song se_w320, 1, 1 - song se_w255, 1, 1 - song se_w291, 1, 1 - song se_w089, 2, 2 - song se_w239, 2, 2 - song se_w230, 1, 1 - song se_w281, 1, 1 - song se_w327, 2, 2 - song se_w287, 1, 1 - song se_w257, 1, 1 - song se_w253, 1, 1 - song se_w258, 1, 1 - song se_w322, 2, 2 - song se_w298, 1, 1 - song se_w287b, 1, 1 - song se_w114, 1, 1 - song se_w063b, 1, 1 - song se_rg_w_door, 1, 1 - song se_rg_card1, 1, 1 - song se_rg_card2, 1, 1 - song se_rg_card3, 1, 1 - song se_rg_bag1, 1, 1 - song se_rg_bag2, 1, 1 - song se_rg_getting, 1, 1 - song se_rg_shop, 1, 1 - song se_rg_kiteki, 1, 1 - song se_rg_help_op, 1, 1 - song se_rg_help_cl, 1, 1 - song se_rg_help_ng, 1, 1 - song se_rg_deomov, 1, 1 + song se_w085, 2, 2 @ Thunderbolt + song se_w085b, 1, 1 @ Thunderbolt 2 + song se_w231, 1, 1 @ Harden + song se_w171, 1, 1 @ Nightmare + song se_w233, 1, 1 @ Vital Throw + song se_w233b, 1, 1 @ Vital Throw 2 + song se_w145, 1, 1 @ Bubble + song se_w145b, 1, 1 @ Bubble 2 + song se_w145c, 1, 1 @ Bubble 3 + song se_w240, 1, 1 @ Rain Dance + song se_w015, 1, 1 @ Cut + song se_w081, 1, 1 @ String Shot + song se_w081b, 1, 1 @ String Shot 2 + song se_w088, 1, 1 @ Rock Throw + song se_w016, 2, 2 @ Gust + song se_w016b, 2, 2 @ Gust 2 + song se_w003, 1, 1 @ DoubleSlap + song se_w104, 1, 1 @ Double Team + song se_w013, 1, 1 @ Razor Wind + song se_w196, 1, 1 @ Icy Wind + song se_w086, 1, 1 @ Thunder Wave + song se_w004, 1, 1 @ Comet Punch + song se_w025, 1, 1 @ Mega Kick + song se_w025b, 1, 1 @ Mega Kick 2 + song se_w152, 1, 1 @ Crabhammer + song se_w026, 1, 1 @ Jump Kick + song se_w172, 1, 1 @ Flame Wheel + song se_w172b, 1, 1 @ Flame Wheel 2 + song se_w053, 1, 1 @ Flamethrower + song se_w007, 1, 1 @ Fire Punch + song se_w092, 1, 1 @ Toxic + song se_w221, 1, 1 @ Sacred Fire + song se_w221b, 2, 2 @ Sacred Fire 2 + song se_w052, 1, 1 @ Ember + song se_w036, 2, 2 @ Take Down + song se_w059, 1, 1 @ Blizzard + song se_w059b, 1, 1 @ Blizzard 2 + song se_w010, 1, 1 @ Scratch + song se_w011, 1, 1 @ Vicegrip + song se_w017, 1, 1 @ Wing Attack + song se_w019, 1, 1 @ Fly + song se_w028, 1, 1 @ Sand-Attack + song se_w013b, 1, 1 @ Razor Wind 2 + song se_w044, 1, 1 @ Bite + song se_w029, 1, 1 @ Headbutt + song se_w057, 1, 1 @ Surf + song se_w056, 1, 1 @ Hydro Pump + song se_w250, 1, 1 @ Whirlpool + song se_w030, 1, 1 @ Horn Attack + song se_w039, 2, 2 @ Tail Whip + song se_w054, 1, 1 @ Mist + song se_w077, 1, 1 @ PoisonPowder + song se_w020, 2, 2 @ Bind + song se_w082, 1, 1 @ Dragon Rage + song se_w047, 1, 1 @ Sing + song se_w195, 1, 1 @ Perish Song + song se_w006, 1, 1 @ Pay Day + song se_w091, 1, 1 @ Dig + song se_w146, 1, 1 @ Dizzy Punch + song se_w120, 1, 1 @ Self-Destruct + song se_w153, 1, 1 @ Explosion + song se_w071b, 1, 1 @ Absorb 2 + song se_w071, 1, 1 @ Absorb + song se_w103, 1, 1 @ Screech + song se_w062, 1, 1 @ BubbleBeam + song se_w062b, 1, 1 @ BubbleBeam 2 + song se_w048, 1, 1 @ Supersonic + song se_w187, 1, 1 @ Belly Drum + song se_w118, 1, 1 @ Metronome + song se_w155, 1, 1 @ Bonemerang + song se_w122, 1, 1 @ Lick + song se_w060, 1, 1 @ Psybeam + song se_w185, 1, 1 @ Faint Attack + song se_w014, 1, 1 @ Swords Dance + song se_w043, 1, 1 @ Leer + song se_w207, 1, 1 @ Swagger + song se_w207b, 1, 1 @ Swagger 2 + song se_w215, 1, 1 @ Heal Bell + song se_w109, 1, 1 @ Confuse Ray + song se_w173, 1, 1 @ Snore + song se_w280, 1, 1 @ Brick Break + song se_w202, 1, 1 @ Giga Drain + song se_w060b, 1, 1 @ Psybeam 2 + song se_w076, 2, 2 @ SolarBeam + song se_w080, 1, 1 @ Petal Dance + song se_w100, 1, 1 @ Teleport + song se_w107, 1, 1 @ Minimize + song se_w166, 1, 1 @ Sketch + song se_w129, 1, 1 @ Swift + song se_w115, 1, 1 @ Reflect + song se_w112, 1, 1 @ Barrier + song se_w197, 2, 2 @ Detect + song se_w199, 1, 1 @ Lock-On + song se_w236, 1, 1 @ Moonlight + song se_w204, 1, 1 @ Charm + song se_w268, 1, 1 @ Charge + song se_w070, 1, 1 @ Strength + song se_w063, 1, 1 @ Hyper Beam + song se_w127, 1, 1 @ Waterfall + song se_w179, 1, 1 @ Reversal + song se_w151, 1, 1 @ Acid Armor + song se_w201, 1, 1 @ Sandstorm + song se_w161, 1, 1 @ Tri-Attack + song se_w161b, 1, 1 @ Tri-Attack 2 + song se_w227, 1, 1 @ Encore + song se_w227b, 2, 2 @ Encore 2 + song se_w226, 1, 1 @ Baton Pass + song se_w208, 1, 1 @ Milk Drink + song se_w213, 1, 1 @ Attract + song se_w213b, 1, 1 @ Attract 2 + song se_w234, 1, 1 @ Morning Sun + song se_w260, 1, 1 @ Flatter + song se_w328, 1, 1 @ Sand Tomb + song se_w320, 1, 1 @ GrassWhistle + song se_w255, 1, 1 @ Spit Up + song se_w291, 1, 1 @ Dive + song se_w089, 2, 2 @ Earthquake + song se_w239, 2, 2 @ Twister + song se_w230, 1, 1 @ Sweet Scent + song se_w281, 1, 1 @ Yawn + song se_w327, 2, 2 @ Sky Uppercut + song se_w287, 1, 1 @ Stat Increased + song se_w257, 1, 1 @ Heat Wave + song se_w253, 1, 1 @ Uproar + song se_w258, 1, 1 @ Hail + song se_w322, 2, 2 @ Cosmic Power + song se_w298, 1, 1 @ Teeter Dance + song se_w287b, 1, 1 @ Stat Decreased + song se_w114, 1, 1 @ Haze + song se_w063b, 1, 1 @ Hyper Beam 2 + @ FRLG SFX below + song se_rg_w_door, 1, 1 @ Door + song se_rg_card1, 1, 1 @ Trainer Card 1 + song se_rg_card2, 1, 1 @ Trainer Card 2 + song se_rg_card3, 1, 1 @ Trainer Card 3 + song se_rg_bag1, 1, 1 @ Bag Scroll + song se_rg_bag2, 1, 1 @ Bag Pocket Change + song se_rg_getting, 1, 1 + song se_rg_shop, 1, 1 @ Cash Register + song se_rg_kiteki, 1, 1 @ S.S. Anne Horn + song se_rg_help_op, 1, 1 @ Help Menu Open + song se_rg_help_cl, 1, 1 @ Help Menu Close + song se_rg_help_ng, 1, 1 @ Help Menu Error? + song se_rg_deomov, 1, 1 @ Deoxys Moves song se_rg_excellent, 1, 1 song se_rg_nawamiss, 1, 1 - song se_toreeye, 1, 1 - song se_toreoff, 1, 1 - song se_hantei1, 1, 1 - song se_hantei2, 1, 1 - song se_curtain, 1, 1 - song se_curtain1, 1, 1 - song se_ussoki, 1, 1 + @ end FRLG SFX + song se_toreeye, 1, 1 @ Trainer's Eye Call + song se_toreoff, 1, 1 @ Trainer's Eye Hang Up + song se_hantei1, 1, 1 @ Battle Arena Time's Up 1 + song se_hantei2, 1, 1 @ Battle Arena Time's Up 2 + song se_curtain, 1, 1 @ Battle Pike Curtain Open + song se_curtain1, 1, 1 @ Battle Pike Curtain Close + song se_ussoki, 1, 1 @ Sudowoodo + song dummy_song_header, 0, 0 song dummy_song_header, 0, 0 song dummy_song_header, 0, 0 @@ -350,215 +354,216 @@ gSongTable:: @ 86B49F0 song dummy_song_header, 0, 0 song dummy_song_header, 0, 0 song dummy_song_header, 0, 0 - song mus_tetsuji, 0, 0 - song mus_field13, 0, 0 - song mus_kachi22, 0, 0 - song mus_kachi2, 0, 0 - song mus_kachi3, 0, 0 - song mus_kachi5, 0, 0 - song mus_pcc, 0, 0 - song mus_nibi, 0, 0 - song mus_suikun, 0, 0 - song mus_dooro1, 0, 0 - song mus_dooro_x1, 0, 0 - song mus_dooro_x3, 0, 0 - song mus_machi_s2, 0, 0 - song mus_machi_s4, 0, 0 - song mus_gim, 0, 0 - song mus_naminori, 0, 0 - song mus_dan01, 0, 0 - song mus_fanfa1, 2, 2 - song mus_me_asa, 2, 2 - song mus_me_bachi, 2, 2 - song mus_fanfa4, 2, 2 - song mus_fanfa5, 2, 2 - song mus_me_waza, 2, 2 - song mus_bijyutu, 0, 0 - song mus_dooro_x4, 0, 0 - song mus_fune_kan, 0, 0 - song mus_me_shinka, 2, 2 - song mus_shinka, 0, 0 - song mus_me_wasure, 2, 2 - song mus_syoujoeye, 0, 0 - song mus_boyeye, 0, 0 - song mus_dan02, 0, 0 - song mus_machi_s3, 0, 0 - song mus_odamaki, 0, 0 - song mus_b_tower, 0, 0 - song mus_swimeye, 0, 0 - song mus_dan03, 0, 0 - song mus_me_kinomi, 2, 2 - song mus_me_tama, 2, 2 - song mus_me_b_big, 2, 2 - song mus_me_b_small, 2, 2 - song mus_me_zannen, 2, 2 - song mus_bd_time, 0, 0 - song mus_test1, 0, 0 - song mus_test2, 0, 0 - song mus_test3, 0, 0 - song mus_test4, 0, 0 - song mus_test, 0, 0 - song mus_gomachi0, 0, 0 - song mus_gotown, 0, 0 - song mus_pokecen, 0, 0 - song mus_nextroad, 0, 0 - song mus_granroad, 0, 0 - song mus_cycling, 0, 0 - song mus_friendly, 0, 0 - song mus_mishiro, 0, 0 - song mus_tozan, 0, 0 - song mus_girleye, 0, 0 - song mus_minamo, 0, 0 - song mus_ashroad, 0, 0 - song mus_event0, 0, 0 - song mus_deepdeep, 0, 0 - song mus_kachi1, 0, 0 - song mus_title3, 0, 0 - song mus_demo1, 0, 0 - song mus_girl_sup, 0, 0 - song mus_hageshii, 0, 0 - song mus_kakkoii, 0, 0 - song mus_kazanbai, 0, 0 - song mus_aqa_0, 0, 0 - song mus_tsuretek, 0, 0 - song mus_boy_sup, 0, 0 - song mus_rainbow, 0, 0 - song mus_ayasii, 0, 0 - song mus_kachi4, 0, 0 - song mus_ropeway, 0, 0 - song mus_casino, 0, 0 - song mus_hightown, 0, 0 - song mus_safari, 0, 0 - song mus_c_road, 0, 0 - song mus_ajito, 0, 0 - song mus_m_boat, 0, 0 - song mus_m_dungon, 0, 0 - song mus_finecity, 0, 0 - song mus_machupi, 0, 0 - song mus_p_school, 0, 0 - song mus_dendou, 0, 0 - song mus_tonekusa, 0, 0 - song mus_maborosi, 0, 0 - song mus_con_fan, 0, 0 - song mus_contest0, 0, 0 - song mus_mgm0, 0, 0 - song mus_t_battle, 0, 0 - song mus_ooame, 0, 0 - song mus_hideri, 0, 0 - song mus_runecity, 0, 0 - song mus_con_k, 0, 0 - song mus_eikou_r, 0, 0 - song mus_karakuri, 0, 0 - song mus_hutago, 0, 0 - song mus_sitennou, 0, 0 - song mus_yama_eye, 0, 0 - song mus_conlobby, 0, 0 - song mus_inter_v, 0, 0 - song mus_daigo, 0, 0 - song mus_thankfor, 0, 0 - song mus_end, 0, 0 - song mus_b_frontier, 0, 0 - song mus_b_arena, 0, 0 - song mus_me_pointget, 2, 2 - song mus_me_tore_eye, 2, 2 - song mus_pyramid, 0, 0 - song mus_pyramid_top, 0, 0 - song mus_b_palace, 0, 0 - song mus_rekkuu_kourin, 0, 0 - song mus_sattower, 0, 0 - song mus_me_symbolget, 2, 2 - song mus_b_dome, 0, 0 - song mus_b_tube, 0, 0 - song mus_b_factory, 0, 0 - song mus_vs_rekku, 0, 0 - song mus_vs_front, 0, 0 - song mus_vs_mew, 0, 0 - song mus_b_dome1, 0, 0 - song mus_battle27, 0, 0 - song mus_battle31, 0, 0 - song mus_battle20, 0, 0 - song mus_battle32, 0, 0 - song mus_battle33, 0, 0 - song mus_battle36, 0, 0 - song mus_battle34, 0, 0 - song mus_battle35, 0, 0 - song mus_battle38, 0, 0 - song mus_battle30, 0, 0 - song mus_rg_annai, 0, 0 - song mus_rg_slot, 0, 0 - song mus_rg_ajito, 0, 0 - song mus_rg_gym, 0, 0 - song mus_rg_purin, 2, 2 - song mus_rg_demo, 0, 0 - song mus_rg_title, 0, 0 - song mus_rg_guren, 0, 0 - song mus_rg_shion, 0, 0 - song mus_rg_kaihuku, 0, 0 - song mus_rg_cycling, 0, 0 - song mus_rg_rocket, 0, 0 - song mus_rg_shoujo, 0, 0 - song mus_rg_shounen, 0, 0 - song mus_rg_dendou, 0, 0 - song mus_rg_t_mori, 0, 0 - song mus_rg_otsukimi, 0, 0 - song mus_rg_pokeyashi, 0, 0 - song mus_rg_ending, 0, 0 - song mus_rg_load01, 0, 0 - song mus_rg_opening, 0, 0 - song mus_rg_load02, 0, 0 - song mus_rg_load03, 0, 0 - song mus_rg_champ_r, 0, 0 - song mus_rg_vs_gym, 0, 0 - song mus_rg_vs_tore, 0, 0 - song mus_rg_vs_yasei, 0, 0 - song mus_rg_vs_last, 0, 0 - song mus_rg_masara, 0, 0 - song mus_rg_kenkyu, 0, 0 - song mus_rg_ohkido, 0, 0 - song mus_rg_pokecen, 0, 0 - song mus_rg_santoan, 0, 0 - song mus_rg_naminori, 0, 0 - song mus_rg_p_tower, 0, 0 - song mus_rg_shiruhu, 0, 0 - song mus_rg_hanada, 0, 0 - song mus_rg_tamamusi, 0, 0 - song mus_rg_win_tre, 0, 0 - song mus_rg_win_yasei, 0, 0 - song mus_rg_win_gym, 0, 0 - song mus_rg_kuchiba, 0, 0 - song mus_rg_nibi, 0, 0 - song mus_rg_rival1, 0, 0 - song mus_rg_rival2, 0, 0 - song mus_rg_fan2, 2, 2 - song mus_rg_fan5, 2, 2 - song mus_rg_fan6, 2, 2 - song mus_me_rg_photo, 2, 2 - song mus_rg_titlerog, 0, 0 - song mus_rg_get_yasei, 0, 0 - song mus_rg_sousa, 0, 0 - song mus_rg_sekaikan, 0, 0 - song mus_rg_seibetu, 0, 0 - song mus_rg_jump, 0, 0 - song mus_rg_union, 0, 0 - song mus_rg_network, 0, 0 - song mus_rg_okurimono, 0, 0 + song mus_tetsuji, 0, 0 @ Littleroot Town Test 'TETSUJI' + song mus_field13, 0, 0 @ GSC - Route 38 + song mus_kachi22, 0, 0 @ Wild Pokémon Defeated + song mus_kachi2, 0, 0 @ Wild Pokémon Defeated with Intro + song mus_kachi3, 0, 0 @ Gym Leader Defeated + song mus_kachi5, 0, 0 @ Victory! Elite Four + song mus_pcc, 0, 0 @ Crystal - Pokémon Communication Center + song mus_nibi, 0, 0 @ GSC - Viridian/Saffron/Pewter/etc + song mus_suikun, 0, 0 @ Crystal - Battle! Legendary Beasts + song mus_dooro1, 0, 0 @ Route 101 + song mus_dooro_x1, 0, 0 @ Route 110 + song mus_dooro_x3, 0, 0 @ Route 120 + song mus_machi_s2, 0, 0 @ Petalburg City + song mus_machi_s4, 0, 0 @ Oldale Town + song mus_gim, 0, 0 @ Gym + song mus_naminori, 0, 0 @ Surfing + song mus_dan01, 0, 0 @ Caves and Darkness + song mus_fanfa1, 2, 2 @ Level Up! + song mus_me_asa, 2, 2 @ Pokémon Healed + song mus_me_bachi, 2, 2 @ Obtained a Badge! + song mus_fanfa4, 2, 2 @ Obtained an Item! + song mus_fanfa5, 2, 2 @ Your Pokémon Just Evolved! + song mus_me_waza, 2, 2 @ Obtained a TM/HM! + song mus_bijyutu, 0, 0 @ Lilycove Museum + song mus_dooro_x4, 0, 0 @ Route 122/Intro + song mus_fune_kan, 0, 0 @ Slateport Museum + song mus_me_shinka, 2, 2 @ Evolution Intro + song mus_shinka, 0, 0 @ Evolution + song mus_me_wasure, 2, 2 @ Move Deleted + song mus_syoujoeye, 0, 0 @ Encounter! Tuber + song mus_boyeye, 0, 0 @ Encounter! Boy + song mus_dan02, 0, 0 @ Abandoned Ship + song mus_machi_s3, 0, 0 @ Fortree City + song mus_odamaki, 0, 0 @ Professor Birch's Lab + song mus_b_tower, 0, 0 @ Battle Tower (RS) + song mus_swimeye, 0, 0 @ Encounter! Swimmer + song mus_dan03, 0, 0 @ Meteor Falls + song mus_me_kinomi, 2, 2 @ Obtained a Berry! + song mus_me_tama, 2, 2 @ Awakening the Super-Ancient Pokémon + song mus_me_b_big, 2, 2 @ Slots Jackpot! + song mus_me_b_small, 2, 2 @ Slots Victory! + song mus_me_zannen, 2, 2 @ Too bad! + song mus_bd_time, 0, 0 @ Roulette! + song mus_test1, 0, 0 @ Contest Test 1 + song mus_test2, 0, 0 @ Contest Test 2 + song mus_test3, 0, 0 @ Contest Test 3 + song mus_test4, 0, 0 @ Contest Test 4 + song mus_test, 0, 0 @ Encounter! Gentleman (Test?) + song mus_gomachi0, 0, 0 @ Verdanturf Town + song mus_gotown, 0, 0 @ Rustboro City + song mus_pokecen, 0, 0 @ Pokémon Center + song mus_nextroad, 0, 0 @ Route 104 + song mus_granroad, 0, 0 @ Route 119 + song mus_cycling, 0, 0 @ Cycling + song mus_friendly, 0, 0 @ Pokémart + song mus_mishiro, 0, 0 @ Littleroot Town + song mus_tozan, 0, 0 @ Sky Pillar + song mus_girleye, 0, 0 @ Encounter! Girl + song mus_minamo, 0, 0 @ Lilycove City + song mus_ashroad, 0, 0 @ Route 111 + song mus_event0, 0, 0 @ Help me! + song mus_deepdeep, 0, 0 @ Underwater + song mus_kachi1, 0, 0 @ Victory! Trainer + song mus_title3, 0, 0 @ Title Screen + song mus_demo1, 0, 0 @ Opening Movie + song mus_girl_sup, 0, 0 @ Encounter! May + song mus_hageshii, 0, 0 @ Encounter! Biker + song mus_kakkoii, 0, 0 @ Encounter! Electric Trainer + song mus_kazanbai, 0, 0 @ Route 113 + song mus_aqa_0, 0, 0 @ Encounter! Team Aqua + song mus_tsuretek, 0, 0 @ Follow Me! + song mus_boy_sup, 0, 0 @ Encounter! Brendan + song mus_rainbow, 0, 0 @ Ever Grande City + song mus_ayasii, 0, 0 @ Encounter! Psychic + song mus_kachi4, 0, 0 @ Victory! Aqua/Magma Grunt + song mus_ropeway, 0, 0 @ Cable Car + song mus_casino, 0, 0 @ Game Corner + song mus_hightown, 0, 0 @ Dewford Town + song mus_safari, 0, 0 @ Safari Zone + song mus_c_road, 0, 0 @ Victory Road + song mus_ajito, 0, 0 @ Aqua/Magma Hideout + song mus_m_boat, 0, 0 @ Sailing + song mus_m_dungon, 0, 0 @ Mt. Pyre (Inside) + song mus_finecity, 0, 0 @ Slateport City + song mus_machupi, 0, 0 @ Mt. Pyte (Outside) + song mus_p_school, 0, 0 @ Pokémon Trainer's School + song mus_dendou, 0, 0 @ Hall of Fame + song mus_tonekusa, 0, 0 @ Lavaridge Town + song mus_maborosi, 0, 0 @ Sealed Chamber + song mus_con_fan, 0, 0 @ You are the Champion! + song mus_contest0, 0, 0 @ Pokémon Contest + song mus_mgm0, 0, 0 @ Encounter! Team Magma + song mus_t_battle, 0, 0 @ Opening Battle + song mus_ooame, 0, 0 @ The Flood + song mus_hideri, 0, 0 @ The Drought + song mus_runecity, 0, 0 @ Sootopolis City + song mus_con_k, 0, 0 @ Berry Blending Results + song mus_eikou_r, 0, 0 @ Hall of Fame + song mus_karakuri, 0, 0 @ Trick House + song mus_hutago, 0, 0 @ Encounter! Kid + song mus_sitennou, 0, 0 @ Encounter! Elite Four + song mus_yama_eye, 0, 0 @ Encounter! Hiker + song mus_conlobby, 0, 0 @ Contest Lobby + song mus_inter_v, 0, 0 @ Encounter! Gabby and Ty + song mus_daigo, 0, 0 @ Encounter! Wallace + song mus_thankfor, 0, 0 @ Credits + song mus_end, 0, 0 @ The End + song mus_b_frontier, 0, 0 @ Battle Frontier + song mus_b_arena, 0, 0 @ Battle Arena + song mus_me_pointget, 2, 2 @ Obtained Battle Points! + song mus_me_tore_eye, 2, 2 @ Registered Trainer! + song mus_pyramid, 0, 0 @ Battle Pyramid + song mus_pyramid_top, 0, 0 @ Top of the Battle Pyramid + song mus_b_palace, 0, 0 @ Battle Palace + song mus_rekkuu_kourin, 0, 0 @ Rayquaza Enters + song mus_sattower, 0, 0 @ Battle Tower (Emerald) + song mus_me_symbolget, 2, 2 @ Obtained a Frontier Symbol! + song mus_b_dome, 0, 0 @ Battle Dome + song mus_b_tube, 0, 0 @ Battle Pike + song mus_b_factory, 0, 0 @ Battle Factory + song mus_vs_rekku, 0, 0 @ Battle! Legendary Pokémon + song mus_vs_front, 0, 0 @ Battle! Frontier Brain + song mus_vs_mew, 0, 0 @ Battle! Mew + song mus_b_dome1, 0, 0 @ Battle Dome Lobby + song mus_battle27, 0, 0 @ Battle! Wild Pokémon + song mus_battle31, 0, 0 @ Battle! Team Aqua/Magma + song mus_battle20, 0, 0 @ Battle! Trainer + song mus_battle32, 0, 0 @ Battle! Gym Leader + song mus_battle33, 0, 0 @ Battle! Champion + song mus_battle36, 0, 0 @ Battle! Regi Trio + song mus_battle34, 0, 0 @ Battle! Legendary Pokémon (dupe) + song mus_battle35, 0, 0 @ Battle! Rival + song mus_battle38, 0, 0 @ Battle! Elite Four + song mus_battle30, 0, 0 @ Battle! Archie/Maxie + @ FRLG Music below + song mus_rg_annai, 0, 0 @ Follow Me + song mus_rg_slot, 0, 0 @ Game Corner + song mus_rg_ajito, 0, 0 @ Rocket Hideout + song mus_rg_gym, 0, 0 @ Gym + song mus_rg_purin, 2, 2 @ Jigglypuff's Song + song mus_rg_demo, 0, 0 @ Opening Movie + song mus_rg_title, 0, 0 @ Title Screen + song mus_rg_guren, 0, 0 @ Cinnabar Island + song mus_rg_shion, 0, 0 @ Lavender Town + song mus_rg_kaihuku, 0, 0 @ RBY Pokémon Center Healing + song mus_rg_cycling, 0, 0 @ Cycling + song mus_rg_rocket, 0, 0 @ Encounter! Team Rocket + song mus_rg_shoujo, 0, 0 @ Encounter! Girl + song mus_rg_shounen, 0, 0 @ Encounter! Boy + song mus_rg_dendou, 0, 0 @ You're the Champion + song mus_rg_t_mori, 0, 0 @ Viridian Forest + song mus_rg_otsukimi, 0, 0 @ Mt. Moon + song mus_rg_pokeyashi, 0, 0 @ Pokémon Mansion + song mus_rg_ending, 0, 0 @ Credits + song mus_rg_load01, 0, 0 @ Route 1 + song mus_rg_opening, 0, 0 @ Route 24/Intro + song mus_rg_load02, 0, 0 @ Route 2 + song mus_rg_load03, 0, 0 @ Route 11 + song mus_rg_champ_r, 0, 0 @ Victory Road + song mus_rg_vs_gym, 0, 0 @ Battle! Gym Leader/Elite Four + song mus_rg_vs_tore, 0, 0 @ Battle! Trainer + song mus_rg_vs_yasei, 0, 0 @ Battle! Wild Pokémon + song mus_rg_vs_last, 0, 0 @ Battle! Champion + song mus_rg_masara, 0, 0 @ Pallet Town + song mus_rg_kenkyu, 0, 0 @ Professor Oak's Lab + song mus_rg_ohkido, 0, 0 @ Professor Oak's Theme + song mus_rg_pokecen, 0, 0 @ Pokémon Center + song mus_rg_santoan, 0, 0 @ S.S. Anne + song mus_rg_naminori, 0, 0 @ Surfing + song mus_rg_p_tower, 0, 0 @ Pokémon Tower + song mus_rg_shiruhu, 0, 0 @ Silph Co. + song mus_rg_hanada, 0, 0 @ Cerulean City + song mus_rg_tamamusi, 0, 0 @ Celadon City + song mus_rg_win_tre, 0, 0 @ Victory! Trainer + song mus_rg_win_yasei, 0, 0 @ Victory! Wild Pokémon + song mus_rg_win_gym, 0, 0 @ Victory! Gym Leader + song mus_rg_kuchiba, 0, 0 @ Vermillion City + song mus_rg_nibi, 0, 0 @ Viridian/Saffron/Pewter City + song mus_rg_rival1, 0, 0 @ Encounter! Rival + song mus_rg_rival2, 0, 0 @ Rival's Exit + song mus_rg_fan2, 2, 2 @ Fanfare 2 + song mus_rg_fan5, 2, 2 @ Obtained a Starter! + song mus_rg_fan6, 2, 2 @ Pokémon Caught! (Used in Emerald) + song mus_me_rg_photo, 2, 2 @ Trainer Photo + song mus_rg_titlerog, 0, 0 @ Game Freak + song mus_rg_get_yasei, 0, 0 @ Pokémon Caught Victory Theme + song mus_rg_sousa, 0, 0 @ Starting Tutorial + song mus_rg_sekaikan, 0, 0 @ Starting Tutorial 2 + song mus_rg_seibetu, 0, 0 @ Starting Tutorial 3 + song mus_rg_jump, 0, 0 @ Jumping Minigame + song mus_rg_union, 0, 0 @ Union Room + song mus_rg_network, 0, 0 @ Network Center + song mus_rg_okurimono, 0, 0 @ Mystery Gift song mus_rg_kinomikui, 0, 0 - song mus_rg_nanadungeon, 0, 0 - song mus_rg_oshie_tv, 0, 0 - song mus_rg_nanashima, 0, 0 - song mus_rg_nanaiseki, 0, 0 - song mus_rg_nana123, 0, 0 - song mus_rg_nana45, 0, 0 - song mus_rg_nana67, 0, 0 - song mus_rg_pokefue, 2, 2 - song mus_rg_vs_deo, 0, 0 - song mus_rg_vs_myu2, 0, 0 - song mus_rg_vs_den, 0, 0 - song mus_rg_exeye, 0, 0 - song mus_rg_deoeye, 0, 0 - song mus_rg_t_tower, 0, 0 - song mus_rg_slowmasara, 0, 0 - song mus_rg_tvnoize, 0, 0 + song mus_rg_nanadungeon, 0, 0 @ Sevii Islands Cave (Mt. Moon) + song mus_rg_oshie_tv, 0, 0 @ Follow Me! + song mus_rg_nanashima, 0, 0 @ Sevii Islands Routes (Lake of Rage) + song mus_rg_nanaiseki, 0, 0 @ Sevii Islands Forest (Viridian Forest) + song mus_rg_nana123, 0, 0 @ Sevii Islands 1-3 (Viridian/Saffron/Pewter) + song mus_rg_nana45, 0, 0 @ Sevii Islands 4-5 (Azalea Town) + song mus_rg_nana67, 0, 0 @ Sevii Islands 6-7 (Violet City) + song mus_rg_pokefue, 2, 2 @ Poké Flute + song mus_rg_vs_deo, 0, 0 @ Battle! Deoxys + song mus_rg_vs_myu2, 0, 0 @ Battle! Mewtwo + song mus_rg_vs_den, 0, 0 @ Battle! Legendary Birds + song mus_rg_exeye, 0, 0 @ Encounter! Gym Leader + song mus_rg_deoeye, 0, 0 @ Encounter! Deoxys! + song mus_rg_t_tower, 0, 0 @ Trainer Tower (Gym) + song mus_rg_slowmasara, 0, 0 @ Pallet Town (Hall of Fame remix) + song mus_rg_tvnoize, 0, 0 @ Teachy TV song ph_trap_blend, 2, 2 song ph_trap_held, 2, 2 song ph_trap_solo, 2, 2 From 200aea1b09b575a476bebd73601ad372dcc66296 Mon Sep 17 00:00:00 2001 From: Devin Date: Mon, 15 Jan 2018 14:10:07 -0500 Subject: [PATCH 15/64] Fixed typos --- include/constants/songs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/constants/songs.h b/include/constants/songs.h index fe964cb2d9..26ab1da35b 100644 --- a/include/constants/songs.h +++ b/include/constants/songs.h @@ -124,7 +124,7 @@ #define SE_W231 120 // Harden #define SE_W171 121 // Nightmare #define SE_W233 122 // Vital Throw -#define SE_W233B 123 // Vital Throw +#define SE_W233B 123 // Vital Throw 2 #define SE_W145 124 // Bubble #define SE_W145B 125 // Bubble 2 #define SE_W145C 126 // Bubble 3 @@ -417,7 +417,7 @@ #define MUS_RG_DEMO 489 // Opening Movie #define MUS_RG_TITLE 490 // Title Screen #define MUS_RG_GUREN 491 // Cinnabar Island -#define MUS_RG_SHION 492 // Lavendar Town +#define MUS_RG_SHION 492 // Lavender Town #define MUS_RG_KAIHUKU 493 // RBY Pokémon Center Healing #define MUS_RG_CYCLING 494 // Cycling #define MUS_RG_ROCKET 495 // Encounter! Team Rocket From 5a5eb4ff59b11d87125c65ee9a236dd243087ea8 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Mon, 15 Jan 2018 23:38:10 -0500 Subject: [PATCH 16/64] dumped most of pokenav.s --- asm/pokenav.s | 6 +- data/event_scripts.s | 107 ++ data/pokenav.s | 1586 ++++++++++++++++-- graphics/pokenav/86226E0.pal | 19 + graphics/pokenav/8622700.pal | 19 + graphics/pokenav/8622720.pal | 35 + graphics/pokenav/8622868.pal | 19 + graphics/pokenav/8623228.png | Bin 0 -> 134 bytes graphics/pokenav/862323C.bin | 1 + graphics/pokenav/8625660.png | Bin 0 -> 88 bytes graphics/pokenav/arrow2.png | Bin 0 -> 153 bytes graphics/pokenav/arrows_matchcall.png | Bin 0 -> 197 bytes graphics/pokenav/bg.bin | 1 + graphics/pokenav/bg.png | Bin 0 -> 141 bytes graphics/pokenav/blue_light.png | Bin 0 -> 194 bytes graphics/pokenav/city_maps/dewford_0.bin | 1 + graphics/pokenav/city_maps/ever_grande_0.bin | 4 + graphics/pokenav/city_maps/ever_grande_1.bin | 3 + graphics/pokenav/city_maps/fallarbor_0.bin | 2 + graphics/pokenav/city_maps/fortree_0.bin | 1 + graphics/pokenav/city_maps/lavaridge_0.bin | 3 + graphics/pokenav/city_maps/lilycove_0.bin | 1 + graphics/pokenav/city_maps/lilycove_1.bin | 3 + graphics/pokenav/city_maps/littleroot_0.bin | 1 + graphics/pokenav/city_maps/mauville_0.bin | 3 + graphics/pokenav/city_maps/mauville_1.bin | 3 + graphics/pokenav/city_maps/mossdeep_0.bin | 1 + graphics/pokenav/city_maps/mossdeep_1.bin | 3 + graphics/pokenav/city_maps/oldale_0.bin | 1 + graphics/pokenav/city_maps/pacifidlog_0.bin | 3 + graphics/pokenav/city_maps/petalburg_0.bin | 4 + graphics/pokenav/city_maps/rustboro_0.bin | 5 + graphics/pokenav/city_maps/rustboro_1.bin | 6 + graphics/pokenav/city_maps/slateport_0.bin | 5 + graphics/pokenav/city_maps/slateport_1.bin | 7 + graphics/pokenav/city_maps/sootopolis_0.bin | 1 + graphics/pokenav/city_maps/verdanturf_0.bin | 1 + graphics/pokenav/condition_search2.bin | Bin 0 -> 1280 bytes graphics/pokenav/condition_search2.png | Bin 0 -> 257 bytes graphics/pokenav/icon2.png | Bin 0 -> 630 bytes graphics/pokenav/icon2_unused.png | Bin 0 -> 194 bytes graphics/pokenav/outline.png | Bin 0 -> 596 bytes graphics/pokenav/outline_map.bin | Bin 0 -> 1280 bytes graphics/pokenav/pokeball.png | Bin 0 -> 260 bytes graphics/pokenav/pokeball_matchcall.pal | 35 + graphics/pokenav/pokeball_matchcall.png | Bin 0 -> 164 bytes graphics/pokenav/ribbons_icon.png | Bin 0 -> 486 bytes graphics/pokenav/ribbons_icon1.pal | 19 + graphics/pokenav/ribbons_icon2.pal | 19 + graphics/pokenav/ribbons_icon3.pal | 19 + graphics/pokenav/ribbons_icon4.pal | 19 + graphics/pokenav/ribbons_icon5.pal | 19 + graphics/pokenav/ribbons_icon_big.png | Bin 0 -> 1677 bytes graphics/pokenav/sparkle.png | Bin 0 -> 256 bytes graphics/pokenav/ui_matchcall.bin | Bin 0 -> 1280 bytes graphics/pokenav/ui_matchcall.png | Bin 0 -> 251 bytes graphics/pokenav/ui_ribbons.bin | Bin 0 -> 1280 bytes graphics/pokenav/ui_ribbons.png | Bin 0 -> 257 bytes graphics/pokenav/zoom_tiles.png | Bin 0 -> 431 bytes graphics_file_rules.mk | 10 +- tools/gbagfx/convert_png.c | 48 +- 61 files changed, 1861 insertions(+), 182 deletions(-) create mode 100755 graphics/pokenav/86226E0.pal create mode 100755 graphics/pokenav/8622700.pal create mode 100755 graphics/pokenav/8622720.pal create mode 100755 graphics/pokenav/8622868.pal create mode 100755 graphics/pokenav/8623228.png create mode 100755 graphics/pokenav/862323C.bin create mode 100755 graphics/pokenav/8625660.png create mode 100755 graphics/pokenav/arrow2.png create mode 100755 graphics/pokenav/arrows_matchcall.png create mode 100755 graphics/pokenav/bg.bin create mode 100755 graphics/pokenav/bg.png create mode 100755 graphics/pokenav/blue_light.png create mode 100755 graphics/pokenav/city_maps/dewford_0.bin create mode 100755 graphics/pokenav/city_maps/ever_grande_0.bin create mode 100755 graphics/pokenav/city_maps/ever_grande_1.bin create mode 100755 graphics/pokenav/city_maps/fallarbor_0.bin create mode 100755 graphics/pokenav/city_maps/fortree_0.bin create mode 100755 graphics/pokenav/city_maps/lavaridge_0.bin create mode 100755 graphics/pokenav/city_maps/lilycove_0.bin create mode 100755 graphics/pokenav/city_maps/lilycove_1.bin create mode 100755 graphics/pokenav/city_maps/littleroot_0.bin create mode 100755 graphics/pokenav/city_maps/mauville_0.bin create mode 100755 graphics/pokenav/city_maps/mauville_1.bin create mode 100755 graphics/pokenav/city_maps/mossdeep_0.bin create mode 100755 graphics/pokenav/city_maps/mossdeep_1.bin create mode 100755 graphics/pokenav/city_maps/oldale_0.bin create mode 100755 graphics/pokenav/city_maps/pacifidlog_0.bin create mode 100755 graphics/pokenav/city_maps/petalburg_0.bin create mode 100755 graphics/pokenav/city_maps/rustboro_0.bin create mode 100755 graphics/pokenav/city_maps/rustboro_1.bin create mode 100755 graphics/pokenav/city_maps/slateport_0.bin create mode 100755 graphics/pokenav/city_maps/slateport_1.bin create mode 100755 graphics/pokenav/city_maps/sootopolis_0.bin create mode 100755 graphics/pokenav/city_maps/verdanturf_0.bin create mode 100755 graphics/pokenav/condition_search2.bin create mode 100755 graphics/pokenav/condition_search2.png create mode 100755 graphics/pokenav/icon2.png create mode 100755 graphics/pokenav/icon2_unused.png create mode 100755 graphics/pokenav/outline.png create mode 100755 graphics/pokenav/outline_map.bin create mode 100755 graphics/pokenav/pokeball.png create mode 100755 graphics/pokenav/pokeball_matchcall.pal create mode 100755 graphics/pokenav/pokeball_matchcall.png create mode 100755 graphics/pokenav/ribbons_icon.png create mode 100755 graphics/pokenav/ribbons_icon1.pal create mode 100755 graphics/pokenav/ribbons_icon2.pal create mode 100755 graphics/pokenav/ribbons_icon3.pal create mode 100755 graphics/pokenav/ribbons_icon4.pal create mode 100755 graphics/pokenav/ribbons_icon5.pal create mode 100755 graphics/pokenav/ribbons_icon_big.png create mode 100755 graphics/pokenav/sparkle.png create mode 100755 graphics/pokenav/ui_matchcall.bin create mode 100755 graphics/pokenav/ui_matchcall.png create mode 100755 graphics/pokenav/ui_ribbons.bin create mode 100755 graphics/pokenav/ui_ribbons.png create mode 100755 graphics/pokenav/zoom_tiles.png diff --git a/asm/pokenav.s b/asm/pokenav.s index b52715cb42..40b6e74ab2 100755 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -6948,7 +6948,7 @@ sub_81CA818: @ 81CA818 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, =gUnknown_0861FC7A + ldr r5, =gUnknown_0861FC78 + 2 adds r0, r4, 0 movs r1, 0x1 adds r2, r5, 0 @@ -6967,7 +6967,7 @@ sub_81CA818: @ 81CA818 thumb_func_start sub_81CA850 sub_81CA850: @ 81CA850 push {lr} - ldr r0, =gUnknown_0861FC86 + ldr r0, =gUnknown_0861FC78 + 0xE movs r1, 0x31 movs r2, 0x4 bl sub_81C7944 @@ -6985,7 +6985,7 @@ sub_81CA864: @ 81CA864 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, =gUnknown_0861FC86 + ldr r5, =gUnknown_0861FC78 + 0xE adds r0, r4, 0 movs r1, 0x1 adds r2, r5, 0 diff --git a/data/event_scripts.s b/data/event_scripts.s index d0f286848b..839235589e 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -8912,6 +8912,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC .string "You’re an inspiration!\n" .string "See you again!$" +gText_Mom_Pokenav_2B227B:: @ 82B227B .string "MOM: Your father and you…\n" .string "Everyone is captivated by POKéMON.\p" .string "What is the charm of POKéMON?\p" @@ -8919,6 +8920,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC .string "I adore POKéMON that help me with\l" .string "my everyday chores.$" +gText_Mom_Pokenav_2B2310:: @ 82B2310 .string "MOM: Hi, {PLAYER}!\n" .string "Your father keeps himself locked\l" .string "away in the PETALBURG GYM.\p" @@ -8928,11 +8930,13 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC .string "I’m guessing that losing to you\n" .string "was a big blow to his pride!$" +gText_Mom_Pokenav_2B23F3:: @ 82B23F3 .string "MOM: {PLAYER}…\n" .string "Don’t worry about me or the house.\p" .string "Wear those RUNNING SHOES until\n" .string "they fall apart, honey!$" +gText_Roxanne_Pokenav_2B2456:: @ 82B2456 .string "ROXANNE: Oh, hello, {PLAYER}!\p" .string "I’ve been hard at work retraining\n" .string "since we met.\p" @@ -8941,6 +8945,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC .string "But when I do, please visit my GYM\n" .string "for a rematch!$" +gText_Roxanne_Pokenav_2B250E:: @ 82B250E .string "ROXANNE: Is this {PLAYER}?\n" .string "Congratulations!\l" .string "I’ve been hearing about you!\p" @@ -8949,15 +8954,18 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC .string "But when I do, please visit my GYM\n" .string "for a rematch!$" +gText_Roxanne_Pokenav_2B25C1:: @ 82B25C1 .string "ROXANNE: {PLAYER}!\n" .string "My GYM is ready!\p" .string "Please visit RUSTBORO whenever\n" .string "you can!$" +gText_Roxanne_Pokenav_2B2607:: @ 82B2607 .string "ROXANNE: At the RUSTBORO GYM,\n" .string "the fact that we battled, {PLAYER},\l" .string "is a matter of pride.$" +gText_Brawly_Pokenav_2B2659:: @ 82B2659 .string "BRAWLY: Hey, there, {PLAYER}{STRING 5}!\p" .string "I learned a lot from the battle we\n" .string "had together.\p" @@ -8968,6 +8976,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC .string "But if I can reopen the GYM,\n" .string "I want you to challenge us again.$" +gText_Brawly_Pokenav_2B275D:: @ 82B275D .string "BRAWLY: Hey, {PLAYER}{STRING 5}!\n" .string "Congratulations!\p" .string "Word about your exploits arrived\n" @@ -8979,14 +8988,17 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC .string "But if I can reopen the GYM,\n" .string "I want you to challenge us again.$" +gText_Brawly_Pokenav_2B286F:: @ 82B286F .string "BRAWLY: Hey, {PLAYER}{STRING 5}!\n" .string "My GYM’s ready for action!\p" .string "Come back to DEWFORD anytime\n" .string "for another challenge!$" +gText_Brawly_Pokenav_2B28D1:: @ 82B28D1 .string "BRAWLY: {PLAYER}{STRING 5}, I don’t think\n" .string "I’ll ever get bored of battling you!$" +gText_Wattson_Pokenav_2B2912:: @ 82B2912 .string "WATTSON: Oh, it’s you!\p" .string "After you left, I’ve been redoing\n" .string "my training from scratch.\p" @@ -8995,6 +9007,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC .string "You’ll have to wait till then!\n" .string "Wahahahaha!$" +gText_Wattson_Pokenav_2B29CA:: @ 82B29CA .string "WATTSON: Wahahahaha!\p" .string "You’ve really done it, haven’t you?\n" .string "I’ve been getting word about you!\p" @@ -9005,15 +9018,18 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC .string "You’ll have to wait till then!\n" .string "Wahahahaha!$" +gText_Wattson_Pokenav_2B2AB6:: @ 82B2AB6 .string "WATTSON: Oh, it’s you!\n" .string "My GYM’s ready!\p" .string "Visit MAUVILLE anytime!\n" .string "Wahahahaha!$" +gText_Wattson_Pokenav_2B2B01:: @ 82B2B01 .string "WATTSON: Wahahaha!\p" .string "A battle with you is always charged\n" .string "with shocking power!$" +gText_Flannery_Pokenav_2B2B4D:: @ 82B2B4D .string "FLANNERY: {PLAYER}…\p" .string "When we battled, I learned exactly\n" .string "how immature I was.\p" @@ -9023,6 +9039,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC .string "When the time comes, {PLAYER},\n" .string "please challenge us again.$" +gText_Flannery_Pokenav_2B2C0E:: @ 82B2C0E .string "FLANNERY: Hello, {PLAYER}?\n" .string "Congratulations!\p" .string "Word of your success has reached\n" @@ -9033,37 +9050,44 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC .string "appear beside my name in the\l" .string "MATCH CALL list.$" +gText_Flannery_Pokenav_2B2CF1:: @ 82B2CF1 .string "FLANNERY: Oh, {PLAYER}?\n" .string "Our GYM’s ready!\p" .string "Come to LAVARIDGE for a soak\n" .string "in the hot spring and a challenge!$" +gText_Flannery_Pokenav_2B2D54:: @ 82B2D54 .string "FLANNERY: {PLAYER}…\n" .string "I’m positive that you keep getting\l" .string "better at training every time.$" +gText_Winona_Pokenav_2B2DA4:: @ 82B2DA4 .string "WINONA: Hello, {PLAYER}!\p" .string "Thanks to our battle, I’ve come\n" .string "to understand my weak points!\p" .string "When I reopen the GYM, I won’t go\n" .string "down in defeat again!$" +gText_Winona_Pokenav_2B2E2B:: @ 82B2E2B .string "WINONA: You’ve done it, {PLAYER}!\p" .string "News about the new CHAMPION\n" .string "has reached us in FORTREE!\p" .string "But… The next time we battle,\n" .string "it’s not going to end the same way.$" +gText_Winona_Pokenav_2B2EC2:: @ 82B2EC2 .string "WINONA: Is this {PLAYER}?\n" .string "Our GYM is back in operation!\p" .string "We’re waiting for you in FORTREE!$" +gText_Winona_Pokenav_2B2F16:: @ 82B2F16 .string "WINONA: {PLAYER}…\n" .string "Though I have lost, my wings will\l" .string "never break.\p" .string "Yes, in exactly the same way that\n" .string "you never lost sight of your dream.$" +gText_TateLiza_Pokenav_2B2F97:: @ 82B2F97 .string "TATE: Oh! You’re…\n" .string "LIZA: {PLAYER}!\p" .string "TATE: We’re in training again…\n" @@ -9073,6 +9097,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC .string "TATE: A mark’ll appear by our name…\n" .string "LIZA: On the MATCH CALL list.$" +gText_TateLiza_Pokenav_2B306E:: @ 82B306E .string "TATE: {PLAYER}, congratulations!\n" .string "LIZA: {PLAYER}, congratulations!\p" .string "TATE: The two of us are…\n" @@ -9082,6 +9107,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC .string "TATE: A mark’ll appear by our name…\n" .string "LIZA: On the MATCH CALL list.$" +gText_TateLiza_Pokenav_2B3158:: @ 82B3158 .string "TATE: {PLAYER}!\n" .string "LIZA: {PLAYER}!\p" .string "TATE: Our GYM is ready!\n" @@ -9089,11 +9115,13 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC .string "TATE: Please come visit…\n" .string "LIZA: MOSSDEEP anytime!$" +gText_TateLiza_Pokenav_2B31CD:: @ 82B31CD .string "TATE: {PLAYER}, the battle we had…\n" .string "LIZA: Is an invaluable experience.\p" .string "TATE: It would be nice if…\n" .string "LIZA: We could all battle again!$" +gText_Juan_Pokenav_2B3249:: @ 82B3249 .string "JUAN: Hmm…\n" .string "{PLAYER}{STRING 5}… Was it?\p" .string "Our battle together--it brought\n" @@ -9102,6 +9130,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC .string "Perhaps you are a genius who may\n" .string "yet surpass WALLACE!$" +gText_Juan_Pokenav_2B32EC:: @ 82B32EC .string "JUAN: Fufu… {PLAYER}{STRING 5}…\n" .string "You’ve finally achieved your goal.\p" .string "My eye for appraising talent wasn’t\n" @@ -9110,12 +9139,14 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC .string "you, for you have scaled the peak\l" .string "of power and prestige.$" +gText_Juan_Pokenav_2B33AA:: @ 82B33AA .string "JUAN: Hoho… {PLAYER}{STRING 5}…\p" .string "Our SOOTOPOLIS GYM has finally\n" .string "reopened.\p" .string "If you wish to see me, you are\n" .string "welcome to visit anytime.$" +gText_Juan_Pokenav_2B341E:: @ 82B341E .string "JUAN: {PLAYER}{STRING 5}…\p" .string "Like the finest music, the battles\n" .string "we wage together strike chords\l" @@ -9123,6 +9154,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC .string "When I close my eyes, I see visions\n" .string "of you soaring with the melody…$" +gText_Sidney_Pokenav_2B34CC:: @ 82B34CC .string "SIDNEY: Yo, {PLAYER}!\p" .string "If you want to battle with me\n" .string "again, you come on back whenever\l" @@ -9130,6 +9162,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC .string "I’ll always be here!\n" .string "I’ll be waiting!$" +gText_Phoebe_Pokenav_2B3561:: @ 82B3561 .string "PHOEBE: Hi, {PLAYER}!\p" .string "How about coming back here again\n" .string "sometime?\p" @@ -9137,6 +9170,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC .string "your bond has grown with your\l" .string "POKéMON.$" +gText_Glacia_Pokenav_2B35E4:: @ 82B35E4 .string "GLACIA: Hello, {PLAYER}.\p" .string "I trust you haven’t become\n" .string "complacent with your power?\p" @@ -9144,6 +9178,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC .string "hot emotions just a little, do come\l" .string "to the POKéMON LEAGUE…$" +gText_Drake_Pokenav_2B368B:: @ 82B368B .string "DRAKE: That voice… {PLAYER}, is it?\n" .string "You sound well…\p" .string "I understand that there is now\n" @@ -9155,6 +9190,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC .string "the POKéMON LEAGUE!\p" .string "Don’t you agree, {PLAYER}?$" +gText_Wallace_Pokenav_2B3790:: @ 82B3790 .string "WALLACE: Hello, {PLAYER}{STRING 5}.\n" .string "Have you met STEVEN?\p" .string "He is…\n" @@ -9197,12 +9233,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "… … … … … …\n" .string "… … … … … Click!$" +gText_May_Pokenav_2B3AB3:: @ 2B3AB3 .string "MAY: Hi, {PLAYER}{STRING 5}!\p" .string "MR. BRINEY retired as a SAILOR,\n" .string "but I still see him out on the sea\l" .string "with his pet PEEKO sometimes.\p" .string "He must love the sea still.$" +gText_May_Pokenav_2B3B3F:: @ 2B3B3F .string "MAY: Hi, {PLAYER}{STRING 5}!\p" .string "You know how little towns like\n" .string "PETALBURG and DEWFORD have GYMS?\p" @@ -9211,6 +9249,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "When they finally build a GYM there,\n" .string "I should apply to be the LEADER.$" +gText_May_Pokenav_2B3C13:: @ 2B3C13 .string "MAY: Hi, {PLAYER}{STRING 5}!\p" .string "Do you remember a man named\n" .string "the CUTTER in RUSTBORO?\l" @@ -9222,11 +9261,13 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "… … … … … …\p" .string "The ROCK SMASH GUY!$" +gText_May_Pokenav_2B3CF3:: @ 2B3CF3 .string "MAY: {PLAYER}{STRING 5}?\p" .string "RUSTURF TUNNEL…\n" .string "They named it that because it\l" .string "joins RUSTBORO and VERDANTURF.$" +gText_May_Pokenav_2B3D4B:: @ 2B3D4B .string "MAY: {PLAYER}{STRING 5}, how are you?\p" .string "I’m out on ROUTE 111 now.\p" .string "I’m going to get a rest at an old\n" @@ -9234,6 +9275,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "She lives just north of\n" .string "the desert.$" +gText_May_Pokenav_2B3DD1:: @ 2B3DD1 .string "MAY: Hi, {PLAYER}{STRING 5}!\p" .string "Did you know about the MIRAGE\n" .string "TOWER in the desert?\p" @@ -9241,18 +9283,21 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "to mysteriously come and go.\p" .string "I wish I could see it.$" +gText_May_Pokenav_2B3E69:: @ 2B3E69 .string "MAY: {PLAYER}{STRING 5}, yahoo!\n" .string "I’m on ROUTE 119 now.\p" .string "There’s a big river here, and\n" .string "it often rains.\p" .string "I got soaked!$" +gText_May_Pokenav_2B3ECD:: @ 2B3ECD .string "MAY: {PLAYER}{STRING 5}, hi.\p" .string "MT. PYRE is a memorial to POKéMON\n" .string "whose lives have ended.\p" .string "Maybe as a result, it’s infested\n" .string "with many GHOST-type POKéMON!$" +gText_May_Pokenav_2B3F2B:: @ 2B3F2B .string "MAY: Hi, {PLAYER}{STRING 5}!\p" .string "I was thinking of going to the hot\n" .string "spring in LAVARIDGE.\p" @@ -9260,12 +9305,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "PASS, I ran into some bad-looking\l" .string "characters. The mood was ugly!$" +gText_May_Pokenav_2B3FFB:: @ 2B3FFB .string "MAY: Hi, {PLAYER}{STRING 5}!\n" .string "Did you see the news?\p" .string "They say CAPT. STERN discovered\n" .string "the SEAFLOOR CAVERN while on his\l" .string "submarine expedition.$" +gText_May_Pokenav_2B402B:: @ 2B402B .string "MAY: Hi, {PLAYER}{STRING 5}!\n" .string "Don’t you think it’s neat?\p" .string "Even if you don’t have a boat,\n" @@ -9275,6 +9322,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "There’s a POKéMON move that lets\n" .string "you go to the bottom of the sea.$" +gText_May_Pokenav_2B414B:: @ 2B414B .string "MAY: Hi, {PLAYER}{STRING 5}!\n" .string "Hope things are okay!\p" .string "Have you been on the sea and\n" @@ -9285,6 +9333,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "When you get to the other side,\n" .string "come up to the surface. Easy!$" +gText_May_Pokenav_2B4228:: @ 2B4228 .string "MAY: Hi, {PLAYER}{STRING 5}!\p" .string "How’s it going?\n" .string "Are you filling your POKéDEX?\p" @@ -9293,6 +9342,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "And there are three of them!\p" .string "I would love to see even one…$" +gText_May_Pokenav_2B42E0:: @ 2B42E0 .string "MAY: {PLAYER}{STRING 5}!\n" .string "I heard the rumors!\p" .string "You beat the SOOTOPOLIS GYM\n" @@ -9300,6 +9350,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "That means you don’t have far\n" .string "to go, do you?$" +gText_May_Pokenav_2B4350:: @ 2B4350 .string "MAY: There isn’t a single TRAINER\n" .string "left in HOENN who doesn’t know who\l" .string "you are, {PLAYER}{STRING 5}!\p" @@ -9307,6 +9358,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "with you, {PLAYER}{STRING 5}, they’re all\l" .string "surprised!$" +gText_Brendan_Pokenav_2B43EF:: @ 2B43EF .string "BRENDAN: Hey, {PLAYER}!\p" .string "MR. BRINEY retired as a SAILOR,\n" .string "but I still see him out on the sea\l" @@ -9314,6 +9366,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "I guess he must love\n" .string "the sea still.$" +gText_Brendan_Pokenav_2B4486:: @ 2B4486 .string "BRENDAN: Hey, {PLAYER}!\p" .string "I don’t get how little towns like\n" .string "PETALBURG and DEWFORD have GYMS.\p" @@ -9322,6 +9375,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "When they finally build a GYM there,\n" .string "I should apply to be the LEADER.$" +gText_Brendan_Pokenav_2B4560:: @ 2B4560 .string "BRENDAN: Yo, {PLAYER}!\p" .string "Do you remember a guy named\n" .string "the CUTTER in RUSTBORO?\l" @@ -9333,12 +9387,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "… … … … … …\p" .string "The ROCK SMASH GUY!$" +gText_Brendan_Pokenav_2B463F:: @ 2B463F .string "BRENDAN: This voice… {PLAYER}?\p" .string "They gave RUSTURF TUNNEL its name\n" .string "because it joins RUSTBORO and\l" .string "VERDANTURF.\p" .string "Did you know that?$" +gText_Brendan_Pokenav_2B46B7:: @ 2B46B7 .string "BRENDAN: {PLAYER}, what’s up?\p" .string "Hey, I’m out on ROUTE 111 now.\p" .string "I’m going to rest up at an old\n" @@ -9346,6 +9402,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "If you’re in the area, you should\n" .string "visit her, too.$" +gText_Brendan_Pokenav_2B4761:: @ 2B4761 .string "BRENDAN: Hey, {PLAYER}!\p" .string "Did you know about the MIRAGE\n" .string "TOWER in the desert?\p" @@ -9353,18 +9410,21 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "seen only sometimes.\p" .string "I’d like to see that!$" +gText_Brendan_Pokenav_2B47F4:: @ 2B47F4 .string "BRENDAN: Who’s this? Oh, {PLAYER}?\n" .string "Guess what? I’m on ROUTE 119 now.\p" .string "There’s a big river here, and\n" .string "it rains all the time.\p" .string "I got soaked to the bone!$" +gText_Brendan_Pokenav_2B4882:: @ 2B4882 .string "BRENDAN: {PLAYER}!\p" .string "MT. PYRE is a memorial to POKéMON\n" .string "whose lives have ended.\p" .string "That’s probably why it’s infested\n" .string "with many GHOST-type POKéMON!$" +gText_Brendan_Pokenav_2B4909:: @ 2B4909 .string "BRENDAN: Hey there, {PLAYER}.\p" .string "I was on my way back to the hot\n" .string "spring in LAVARIDGE.\p" @@ -9373,12 +9433,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "Those creeps…\n" .string "I think they were TEAM MAGMA.$" +gText_Brendan_Pokenav_2B49C4:: @ 2B49C4 .string "BRENDAN: Hi, {PLAYER}!\n" .string "Did you catch the news?\p" .string "They say CAPT. STERN discovered\n" .string "the SEAFLOOR CAVERN while on his\l" .string "submarine expedition.$" +gText_Brendan_Pokenav_2B4A44:: @ 2B4A44 .string "BRENDAN: Hey there, {PLAYER}!\n" .string "Don’t you think it’s awesome?\p" .string "Even if you don’t have a boat,\n" @@ -9388,6 +9450,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "travel to the bottom of the sea.\p" .string "Man, POKéMON can do anything!$" +gText_Brendan_Pokenav_2B4B28:: @ 2B4B28 .string "BRENDAN: Howdy, {PLAYER}!\n" .string "How are you holding up?\p" .string "Ever found your way to the other\n" @@ -9397,6 +9460,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "When you get to the other side,\n" .string "come up to the surface. Simple!$" +gText_Brendan_Pokenav_2B4C15:: @ 2B4C15 .string "BRENDAN: Hey there, {PLAYER}!\p" .string "How’s it going? Filling up your\n" .string "POKéDEX successfully?\p" @@ -9405,12 +9469,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "And not just one--three!\p" .string "I’d love to catch even one…$" +gText_Brendan_Pokenav_2B4CD8:: @ 2B4CD8 .string "BRENDAN: {PLAYER}!\n" .string "I heard the rumors!\p" .string "You beat the SOOTOPOLIS GYM\n" .string "LEADER? Awesome!\p" .string "You’re getting awful close now!$" +gText_Brendan_Pokenav_2B4D46:: @ 2B4D46 .string "BRENDAN: There isn’t a TRAINER in\n" .string "all of HOENN who doesn’t know who\l" .string "you are, {PLAYER}!\p" @@ -9418,16 +9484,19 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "with you, {PLAYER}, they get pretty\l" .string "envious!$" +gText_Wally_Pokenav_2B4DE2:: @ 2B4DE2 .string "WALLY: Oh, {PLAYER}!\p" .string "I’ve been getting healthier and\n" .string "more physically fit.\p" .string "I hope I can become a TRAINER like\n" .string "you soon, {PLAYER}!$" +gText_Wally_Pokenav_2B4E57:: @ 2B4E57 .string "WALLY: {PLAYER}, hello!\p" .string "After RUSTURF TUNNEL went\n" .string "through, WANDA’s been very happy!$" +gText_Wally_Pokenav_2B4EA5:: @ 2B4EA5 .string "WALLY: Oh, {PLAYER}!\p" .string "I… I left my uncle’s place in\n" .string "VERDANTURF without telling anyone.\p" @@ -9435,6 +9504,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "{PLAYER}, you understand how\n" .string "I feel, don’t you?$" +gText_Wally_Pokenav_2B4F41:: @ 2B4F41 .string "WALLY: {PLAYER}?\n" .string "It’s me, WALLY!\p" .string "The world of TRAINERS is amazing!\p" @@ -9443,6 +9513,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "It’s as if everyone’s getting\n" .string "connected through POKéMON!$" +gText_Wally_Pokenav_2B4FF3:: @ 2B4FF3 .string "WALLY: {PLAYER}? It’s awesome!\n" .string "That RALTS we caught together?\l" .string "It evolved, {PLAYER}!\p" @@ -9452,11 +9523,13 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "After all, it’s the POKéMON that\n" .string "should be praised!$" +gText_Wally_Pokenav_2B50B1:: @ 2B50B1 .string "… … … … … …\n" .string "… … … … … …\p" .string "WALLY appears to be out of\n" .string "the POKéNAV’s service area…$" +gText_Wally_Pokenav_2B5100:: @ 2B5100 .string "WALLY: Oh, {PLAYER}!\p" .string "Before I met you, I hardly ever\n" .string "left my house…\p" @@ -9465,6 +9538,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "{PLAYER}…\n" .string "Thank you…$" +gText_Scott_Pokenav_2B5184:: @ 2B5184 .string "SCOTT: Howdy, {PLAYER}{STRING 5}!\p" .string "You know how POKéMON can be found\n" .string "everywhere?\p" @@ -9475,6 +9549,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "As a result, I have to hurry\n" .string "everywhere, too. Busy, busy!$" +gText_Scott_Pokenav_2B5275:: @ 2B5275 .string "SCOTT: I’m on ROUTE 119 right now.\n" .string "It’s teeming with TRAINERS!\p" .string "It’s also overgrown with tall grass\n" @@ -9482,6 +9557,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "Walking around in shorts here\n" .string "makes me all ticklish!$" +gText_Scott_Pokenav_2B5323:: @ 2B5323 .string "SCOTT: Hi, hi, {PLAYER}{STRING 5}!\p" .string "Have you had the chance to climb\n" .string "MT. PYRE?\p" @@ -9490,6 +9566,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "It’s somewhere every TRAINER\n" .string "should climb to the top of once.$" +gText_Scott_Pokenav_2B53DB:: @ 2B53DB .string "SCOTT: Hi, {PLAYER}{STRING 5}!\p" .string "I’ve been hearing about these odd\n" .string "gangs being a nuisance.\p" @@ -9499,6 +9576,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "skilled TRAINERS among them.\p" .string "…But if they’re thugs…$" +gText_Scott_Pokenav_2B54A5:: @ 2B54A5 .string "SCOTT: Oh, hi, {PLAYER}{STRING 5}.\p" .string "Might there be tough TRAINERS\n" .string "at the bottom of the sea?\p" @@ -9506,6 +9584,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "I can’t swim, for one.\l" .string "And I don’t raise POKéMON…$" +gText_Scott_Pokenav_2B5541:: @ 2B5541 .string "SCOTT: Hi, hi, {PLAYER}{STRING 5}!\p" .string "You know that you can challenge\n" .string "the POKéMON LEAGUE when you’ve\l" @@ -9522,17 +9601,20 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "the POKéMON LEAGUE into the HALL\l" .string "OF FAME!$" +gText_Scott_Pokenav_2B56CA:: @ 2B56CA .string "… … … … … …\n" .string "… … … … … …\p" .string "SCOTT appears to be out of\n" .string "the POKéNAV’s service area…$" +gText_Norman_Pokenav_2B5719:: @ 82B5719 .string "DAD: In RUSTBORO, there’s a man\n" .string "that goes by the odd name of\l" .string "the CUTTER.\p" .string "If you’re in the area, you should\n" .string "pay him a visit.$" +gText_Norman_Pokenav_2B5795:: @ 82B5795 .string "DAD: Hm… Little by little, but also\n" .string "very surely, you’re getting\l" .string "tougher, {PLAYER}.\p" @@ -9541,6 +9623,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "and me…\p" .string "This feeling is hard to explain.$" +gText_Norman_Pokenav_2B584D:: @ 82B584D .string "DAD: I see…\n" .string "You’ve collected four GYM BADGES…\p" .string "There’s no avoiding it now.\n" @@ -9548,6 +9631,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "Come anytime.\n" .string "We’ll all be waiting for you!$" +gText_Norman_Pokenav_2B58E3:: @ 82B58E3 .string "DAD: {PLAYER}! You’d better go visit\n" .string "Mother every so often.\p" .string "I’m going to remain here and\n" @@ -9555,23 +9639,27 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "The way of battling is deep\n" .string "and unforgiving!$" +gText_Norman_Pokenav_2B5979:: @ 82B5979 .string "DAD: Oh, hi, {PLAYER}!\p" .string "What’s that? MAGMA EMBLEM?\n" .string "I don’t know what that’s about.\p" .string "But with a name like that, it may\n" .string "be somehow linked to a volcano!$" +gText_Norman_Pokenav_2B5A07:: @ 82B5A07 .string "DAD: Hiyah! Haah! Dwah!\p" .string "…Oh? {PLAYER}!\p" .string "You caught me right in the middle\n" .string "of a POKéMON training session!$" +gText_Norman_Pokenav_2B5A69:: @ 82B5A69 .string "DAD: {PLAYER}!\p" .string "Who would’ve thought you’d become\n" .string "the POKéMON LEAGUE CHAMPION…\p" .string "Okay!\n" .string "I won’t be left behind!$" +gText_Norman_Pokenav_2B5ACF:: @ 82B5ACF .string "DAD: Hm? {PLAYER}?\n" .string "What good timing!\p" .string "This time, I’m going to challenge\n" @@ -9579,9 +9667,11 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "I’m waiting in the PETALBURG GYM.\n" .string "Accept my challenge anytime!$" +gText_Norman_Pokenav_2B5B5E:: @ 82B5B5E .string "DAD: …You amaze me, {PLAYER}.\n" .string "How much higher will you soar?$" +gText_Steven_Pokenav_2B5B95:: @ 82B5B95 .string "STEVEN: Hi, {PLAYER}{STRING 5}!\p" .string "Have you been to MAUVILLE\n" .string "already?\p" @@ -9592,12 +9682,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "You may make a new discovery\n" .string "there.$" +gText_Steven_Pokenav_2B5C53:: @ 82B5C53 .string "STEVEN: Hi, {PLAYER}{STRING 5}!\p" .string "I’ve met a lot of different\n" .string "TRAINERS so far.\p" .string "But you’re one of a kind.\n" .string "You’re not like anyone else.$" +gText_Steven_Pokenav_2B5CC9:: @ 82B5CC9 .string "STEVEN: Hi, {PLAYER}{STRING 5}!\p" .string "When you’re on an adventure with\n" .string "your POKéMON, what do you think?\p" @@ -9608,6 +9700,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "Depending on how you think, your\n" .string "adventure’s significance changes.$" +gText_Steven_Pokenav_2B5DB4:: @ 82B5DB4 .string "STEVEN: Hello?\n" .string "{PLAYER}{STRING 5}?\p" .string "I’m involved in a spot of trouble\n" @@ -9615,6 +9708,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "I’m sorry, but I can’t talk now.\n" .string "Bye!$" +gText_Steven_Pokenav_2B5E26:: @ 82B5E26 .string "STEVEN: Oh!\n" .string "{PLAYER}{STRING 5}!\p" .string "There’s no need to talk.\n" @@ -9622,10 +9716,12 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "You have to believe in yourself\n" .string "and do what’s right.$" +gText_Steven_Pokenav_2B5EA2:: @ 82B5EA2 .string "… … … … … …\p" .string "STEVEN appears not to be getting\n" .string "the call…$" +gText_Steven_Pokenav_2B5ED9:: @ 82B5ED9 .string "STEVEN: {PLAYER}{STRING 5}… Congratulations\n" .string "for entering the HALL OF FAME.\p" .string "… … … … … …\n" @@ -9652,6 +9748,7 @@ Route101_Text_2B603A: @ 82B603A .string "the POKéDEX and POKéNAV, studying\l" .string "POKéMON becomes more fun, eh?$" +gText_MrStone_Pokenav_2B60C0:: @ 82B60C0 .string "MR. STONE: Oh? {PLAYER}{STRING 5}!\p" .string "Since you called me, the POKéNAV\n" .string "must be working properly!\p" @@ -9666,6 +9763,7 @@ Route101_Text_2B603A: @ 82B603A .string "Wahahaha!\n" .string "See you again!$" +gText_MrStone_Pokenav_2B61E6:: @ 82B61E6 .string "MR. STONE: Oh? {PLAYER}{STRING 5}!\p" .string "What’s wrong? Have you forgotten\n" .string "about that little errand of mine?\p" @@ -9677,6 +9775,7 @@ Route101_Text_2B603A: @ 82B603A .string "Now, since I am a busy PRESIDENT,\n" .string "I have to go! Bye-bye!$" +gText_MrStone_Pokenav_2B6302:: @ 82B6302 .string "MR. STONE: Oh! {PLAYER}{STRING 5}!\p" .string "Ah, so you’ve met STEVEN!\n" .string "I’d better reward you, then!\p" @@ -9684,6 +9783,7 @@ Route101_Text_2B603A: @ 82B603A .string "come see me at my office.\p" .string "I’ll be waiting for you!$" +gText_MrStone_Pokenav_2B63A0:: @ 82B63A0 .string "MR. STONE: Oh! {PLAYER}{STRING 5}!\p" .string "Did you know that DEVON was\n" .string "digging the RUSTURF TUNNEL?\p" @@ -9694,12 +9794,14 @@ Route101_Text_2B603A: @ 82B603A .string "live in peace than worry about our\l" .string "own convenience.$" +gText_MrStone_Pokenav_2B64A2:: @ 82B64A2 .string "MR. STONE: Hello, hello, {PLAYER}{STRING 5}!\p" .string "I heard from someone in PETALBURG\n" .string "that you’re NORMAN’s child!\p" .string "No wonder you’re such a capable\n" .string "being!$" +gText_MrStone_Pokenav_2B6526:: @ 82B6526 .string "MR. STONE: What’s that?\p" .string "You battled your own father and\n" .string "defeated him?\p" @@ -9707,6 +9809,7 @@ Route101_Text_2B603A: @ 82B603A .string "I had no idea that I befriended\n" .string "someone so special! Wahaha!$" +gText_MrStone_Pokenav_2B65BB:: @ 82B65BB .string "Hello!\n" .string "This is DEVON CORPORATI…\l" .string "Oh, hello, {PLAYER}!\p" @@ -9715,18 +9818,21 @@ Route101_Text_2B603A: @ 82B603A .string "Our PRESIDENT is busy, but you\n" .string "seem to be just as busy, {PLAYER}.$" +gText_MrStone_Pokenav_2B6664:: @ 82B6664 .string "…Huh? …What’s that?\p" .string "GROU… Yes? …DON?\p" .string "You’re breaking up…\n" .string "…can’t hear…\p" .string "BZZZZ…$" +gText_MrStone_Pokenav_2B66B1:: @ 82B66B1 .string "…Huh? …What’s that?\p" .string "Seaflo… Yes? …Caver…?\p" .string "You’re breaking up…\n" .string "…can’t hear…\p" .string "BZZZZ…$" +gText_MrStone_Pokenav_2B6703:: @ 82B6703 .string "MR. STONE: {PLAYER}{STRING 5}! It’s me!\p" .string "You were apparently involved in all\n" .string "sorts of things, but I, being busy,\l" @@ -9736,6 +9842,7 @@ Route101_Text_2B603A: @ 82B603A .string "I’ll always be in your corner!\n" .string "Take care!$" +gText_MrStone_Pokenav_2B67ED:: @ 82B67ED .string "MR. STONE: … … … … … …\n" .string "Is this maybe {PLAYER}{STRING 5}?\p" .string "Your voice is so full of confidence,\n" diff --git a/data/pokenav.s b/data/pokenav.s index 35fdafee5f..cc100bc5ba 100644 --- a/data/pokenav.s +++ b/data/pokenav.s @@ -111,16 +111,35 @@ gUnknown_0861F3EC:: @ 861F3EC .4byte sub_81CFE98 gUnknown_0861F590:: @ 861F590 - .incbin "baserom.gba", 0x61F590, 0x20 + .incbin "graphics/pokenav/icon2.gbapal" gUnknown_0861F5B0:: @ 861F5B0 - .incbin "baserom.gba", 0x61f5b0, 0x454 + .incbin "graphics/pokenav/icon2.4bpp.lz" + +gUnknown_0861F994:: @ 861F994 + .incbin "graphics/pokenav/icon2_unused.4bpp.lz" gUnknown_0861FA04:: @ 861FA04 - .incbin "baserom.gba", 0x61fa04, 0x4 + .byte 0x50 + .byte 0x0 + .byte 0x0 + .byte 0x0 gUnknown_0861FA08:: @ 861FA08 - .incbin "baserom.gba", 0x61fa08, 0x10 + .byte 0x0 + .byte 0x1 + .byte 0x16 + .byte 0x10 + .byte 0x2 + .byte 0x0 + .2byte 0x36 + .byte 0xFF + .byte 0x0 + .byte 0x0 + .byte 0x0 + .byte 0x0 + .byte 0x0 + .2byte 0x0 gUnknown_0861FA18:: @ 861FA18 .4byte gUnknown_085EBED5 @@ -137,7 +156,10 @@ gUnknown_0861FA18:: @ 861FA18 .4byte gUnknown_085EBF84 gUnknown_0861FA48:: @ 861FA48 - .incbin "baserom.gba", 0x61fa48, 0x4 + .byte 0x4 + .byte 0x1 + .byte 0x2 + .byte 0x0 gUnknown_0861FA4C:: @ 861FA4C obj_tiles gUnknown_0861F5B0, 0x1000, 0 @@ -205,82 +227,211 @@ gUnknown_0861FB2C:: @ 861FB2C spr_template 2, 1, gUnknown_0861FB1C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_0861FB44:: @ 861FB44 - .incbin "baserom.gba", 0x61fb44, 0xa0 + spr_template 2, 2, gUnknown_0861FB24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_0861FB5C:: @ 861FB5C + .incbin "graphics/pokenav/arrows_matchcall.gbapal" + +gUnknown_0861FB7C:: @ 861FB7C + .incbin "graphics/pokenav/arrows_matchcall.4bpp.lz" gUnknown_0861FBE4:: @ 861FBE4 - .incbin "baserom.gba", 0x61fbe4, 0x4 + .byte 0x0 + .byte 0x2 + .byte 0x5 + .byte 0x0 gUnknown_0861FBE8:: @ 861FBE8 - .incbin "baserom.gba", 0x61fbe8, 0xc + .4byte gUnknown_085EBEA8 + .4byte gUnknown_085EBEB1 + .4byte gUnknown_085EBEC3 gUnknown_0861FBF4:: @ 861FBF4 - .incbin "baserom.gba", 0x61fbf4, 0x3 + .byte 0x1 + .byte 0x4 + .byte 0x5 gUnknown_0861FBF7:: @ 861FBF7 - .incbin "baserom.gba", 0x61fbf7, 0x5 + .byte 0x2 + .byte 0x4 + .byte 0x6 + .byte 0x7 + .byte 0x0 gUnknown_0861FBFC:: @ 861FBFC - .incbin "baserom.gba", 0x61fbfc, 0x8 + .4byte gUnknown_0861FB7C + .2byte 0xC0 + .2byte 0xA gUnknown_0861FC04:: @ 861FC04 - .incbin "baserom.gba", 0x61fc04, 0x18 + .4byte gUnknown_0861FB5C + .4byte 0x14 + .4byte 0x0 + .4byte 0x0 + +gUnknown_0861FC14:: @ 861FC14 + .4byte 0x8000 + .4byte 0x800 gUnknown_0861FC1C:: @ 861FC1C - .incbin "baserom.gba", 0x61fc1c, 0x20 + spr_template 10, 20, gUnknown_0861FC14, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81C9080 + +gUnknown_0861FC34:: @ 861FC34 + .4byte 0x4000 + .4byte 0x800 gUnknown_0861FC3C:: @ 861FC3C - .incbin "baserom.gba", 0x61fc3c, 0x18 + spr_template 10, 20, gUnknown_0861FC34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_0861FC54:: @ 861FC54 - .incbin "baserom.gba", 0x61fc54, 0x5 + .byte 2 + .byte 3 + .byte 4 + .byte 2 + .byte 5 gUnknown_0861FC59:: @ 861FC59 - .incbin "baserom.gba", 0x61fc59, 0x1f + .byte 0, 1, 4, 4, 4, 4, 0, 1, 2, 4, 4, 4, 0, 1, 2, 3, 4, 4, 5, 6, 7, 4, 4, 4, 8, 9, 10, 11, 12, 13, 0 gUnknown_0861FC78:: @ 861FC78 - .incbin "baserom.gba", 0x61fc78, 0x2 - -gUnknown_0861FC7A:: @ 861FC7A - .incbin "baserom.gba", 0x61fc7a, 0xc - -gUnknown_0861FC86:: @ 861FC86 - .incbin "baserom.gba", 0x61fc86, 0x12 + .incbin "graphics/pokenav/bg.gbapal" gUnknown_0861FC98:: @ 861FC98 - .incbin "baserom.gba", 0x61fc98, 0x14 + .incbin "graphics/pokenav/bg.4bpp.lz" gUnknown_0861FCAC:: @ 861FCAC - .incbin "baserom.gba", 0x61fcac, 0xa0 + .incbin "graphics/pokenav/bg.bin.lz" gUnknown_0861FD4C:: @ 861FD4C - .incbin "baserom.gba", 0x61fd4c, 0x20 + .incbin "graphics/pokenav/outline.gbapal" gUnknown_0861FD6C:: @ 861FD6C - .incbin "baserom.gba", 0x61fd6c, 0x288 + .incbin "graphics/pokenav/outline.4bpp.lz" gUnknown_0861FFF4:: @ 861FFF4 - .incbin "baserom.gba", 0x61fff4, 0x1a0 + .incbin "graphics/pokenav/outline_map.bin.lz" + +gUnknown_08620104:: @ 8620104 + .incbin "graphics/pokenav/blue_light.gbapal" + +gUnknown_08620124:: @ 8620124 + .incbin "graphics/pokenav/blue_light.4bpp.lz" gUnknown_08620194:: @ 8620194 - .incbin "baserom.gba", 0x620194, 0xc + .byte 0xF5, 0x10, 0, 0, 0x7A, 0x21, 0, 0, 0xFF, 0x31, 0, 0 gUnknown_086201A0:: @ 86201A0 - .incbin "baserom.gba", 0x6201a0, 0x24 + .4byte NULL + .4byte sub_81C9C6C + .4byte sub_81C9CA8 + .4byte sub_81C9D44 + .4byte sub_81C9DD8 + .4byte sub_81C9E58 + .4byte sub_81C9EC8 + .4byte sub_81C9EF8 + .4byte sub_81C9F28 gUnknown_086201C4:: @ 86201C4 - .incbin "baserom.gba", 0x6201c4, 0x10 + .4byte gPokenavOptions_Gfx + .byte 0, 0x34, 3, 0 + .4byte gUnknown_08620124 + .byte 0, 1, 1, 0 gUnknown_086201D4:: @ 86201D4 - .incbin "baserom.gba", 0x6201d4, 0x6c + .4byte gPokenavOptions_Pal + 0x0, 4 + .4byte gPokenavOptions_Pal + 0x20, 5 + .4byte gPokenavOptions_Pal + 0x40, 6 + .4byte gPokenavOptions_Pal + 0x60, 7 + .4byte gPokenavOptions_Pal + 0x80, 8 + .4byte gUnknown_08620104, 3 + .4byte 0, 0 + +gUnknown_0862020C:: @ 862020C + .2byte 0, 0 + +gUnknown_08620210:: @ 8620210 + .2byte 0x20, 1 + +gUnknown_08620214:: @ 8620214 + .2byte 0x40, 4 + +gUnknown_08620218:: @ 8620218 + .2byte 0x60, 2 + +gUnknown_0862021C:: @ 862021C + .2byte 0x80, 3 + +gUnknown_08620220:: @ 8620220 + .2byte 0xA0, 1 + +gUnknown_08620224:: @ 8620224 + .2byte 0xC0, 1 + +gUnknown_08620228:: @ 8620228 + .2byte 0xE0, 4 + +gUnknown_0862022C:: @ 862022C + .2byte 0x100, 1 + +gUnknown_08620230:: @ 8620230 + .2byte 0x120, 2 + +gUnknown_08620234:: @ 8620234 + .2byte 0x140, 0 + +gUnknown_08620238:: @ 8620238 + .2byte 0x160, 0 + +gUnknown_0862023C:: @ 862023C + .2byte 0x180, 3 gUnknown_08620240:: @ 8620240 - .incbin "baserom.gba", 0x620240, 0x4 + .2byte 0x2A, 0x14 gUnknown_08620244:: @ 8620244 - .incbin "baserom.gba", 0x620244, 0x88 + .4byte gUnknown_0862020C + .4byte gUnknown_08620210 + .4byte gUnknown_0862021C + .4byte NULL + .4byte NULL + .4byte NULL + .2byte 0x2A, 0x14 + .4byte gUnknown_0862020C + .4byte gUnknown_08620210 + .4byte gUnknown_08620214 + .4byte gUnknown_0862021C + .4byte NULL + .4byte NULL + .2byte 0x2A, 0x14 + .4byte gUnknown_0862020C + .4byte gUnknown_08620210 + .4byte gUnknown_08620214 + .4byte gUnknown_08620218 + .4byte gUnknown_0862021C + .4byte NULL + .2byte 0x38, 0x14 + .4byte gUnknown_08620220 + .4byte gUnknown_08620224 + .4byte gUnknown_0862023C + .4byte NULL + .4byte NULL + .4byte NULL + .2byte 0x28, 0x10 + .4byte gUnknown_08620228 + .4byte gUnknown_0862022C + .4byte gUnknown_08620230 + .4byte gUnknown_08620234 + .4byte gUnknown_08620238 + .4byte gUnknown_0862023C gUnknown_086202CC:: @ 86202CC - .incbin "baserom.gba", 0x6202cc, 0x8 + .byte 1 + .byte 3 + .byte 0x11 + .byte 0x18 + .byte 2 + .byte 1 + .2byte 8 gUnknown_086202D4:: @ 86202D4 .4byte gUnknown_085EBCC5 @@ -299,19 +450,40 @@ gUnknown_086202D4:: @ 86202D4 .4byte gUnknown_085EBE41 gUnknown_0862030C:: @ 862030C - .incbin "baserom.gba", 0x62030c, 0x3 + .byte 6, 8, 7 gUnknown_0862030F:: @ 862030F - .incbin "baserom.gba", 0x62030f, 0x3d + .byte 6, 8, 7, 0, 0 + +gUnknown_08620314:: @ 8620314 + .byte 0, 0x40, 0, 0x80, 0, 8, 0, 0 + +gUnknown_0862031C:: @ 862031C + .byte 0, 1, 0, 1, 0, 0, 0, 0, 0xFF, 0x7F, 0, 0, 0, 0, 0, 0 + +gUnknown_0862032C:: @ 862032C + .byte 0, 1, 0, 1, 0, 0, 0, 0, 0x10, 0, 0x10, 0, 0, 0x12, 0, 0, 0xFF, 0x7F, 0, 0, 0, 0, 0, 0 + +gUnknown_08620344:: @ 8620344 + .4byte gUnknown_0862031C + .4byte gUnknown_0862032C gUnknown_0862034C:: @ 862034C - .incbin "baserom.gba", 0x62034c, 0x20 + spr_template 3, 4, gUnknown_08620314, gDummySpriteAnimTable, NULL, gUnknown_08620344, SpriteCallbackDummy + +gUnknown_08620364:: @ 8620364 + .2byte 0x4000 + .2byte 0x8000 + .2byte 0x800 + .2byte 0 gUnknown_0862036C:: @ 862036C - .incbin "baserom.gba", 0x62036c, 0x18 + spr_template 1, 3, gUnknown_08620364, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_08620384:: @ 8620384 - .incbin "baserom.gba", 0x620384, 0xC + .4byte 0x4000040 + .4byte 0xa2600001 + .byte 1, 0, 0, 0 gUnknown_08620390:: @ 8620390 .string "Becalm fighting emotions.$" @@ -1333,40 +1505,44 @@ gUnknown_08622028:: @ 8622028 .4byte gUnknown_08621FC9, gUnknown_08621FDE, gUnknown_08621FF9, gUnknown_0862200F gUnknown_08622508:: @ 8622508 - .incbin "baserom.gba", 0x622508, 0x2 + .byte 0, 2 gUnknown_0862250A:: @ 862250A - .incbin "baserom.gba", 0x62250a, 0x6 + .byte 0, 1, 2, 0, 0, 0 gUnknown_08622510:: @ 8622510 - .incbin "baserom.gba", 0x622510, 0x20 + .incbin "graphics/pokenav/ui_matchcall.gbapal" gUnknown_08622530:: @ 8622530 - .incbin "baserom.gba", 0x622530, 0xa4 + .incbin "graphics/pokenav/ui_matchcall.4bpp.lz" gUnknown_086225D4:: @ 86225D4 - .incbin "baserom.gba", 0x6225d4, 0xC4 + .incbin "graphics/pokenav/ui_matchcall.bin.lz" gUnknown_08622698:: @ 8622698 - .incbin "baserom.gba", 0x622698, 0x48 + .incbin "graphics/pokenav/arrow2.gbapal" + +gUnknown_086226B8:: @ 86226B8 + .incbin "graphics/pokenav/arrow2.4bpp.lz" gUnknown_086226E0:: @ 86226E0 - .incbin "baserom.gba", 0x6226e0, 0x20 + .incbin "graphics/pokenav/86226E0.gbapal" gUnknown_08622700:: @ 8622700 - .incbin "baserom.gba", 0x622700, 0x20 + .incbin "graphics/pokenav/8622700.gbapal" gUnknown_08622720:: @ 8622720 - .incbin "baserom.gba", 0x622720, 0x40 + .incbin "graphics/pokenav/pokeball_matchcall.gbapal" gUnknown_08622760:: @ 8622760 - .incbin "baserom.gba", 0x622760, 0x2c + .incbin "graphics/pokenav/pokeball_matchcall.4bpp.lz" gUnknown_0862278C:: @ 862278C - .incbin "baserom.gba", 0x62278c, 0x8 + .4byte 0x11FD + .4byte 0x20206A gUnknown_08622794:: @ 8622794 - .incbin "baserom.gba", 0x622794, 0x4 + .4byte 0x3077 gUnknown_08622798:: @ 8622798 .4byte NULL @@ -1387,10 +1563,22 @@ gUnknown_08622798:: @ 8622798 .4byte sub_81CBB74 gUnknown_086227D8:: @ 86227D8 - .incbin "baserom.gba", 0x6227d8, 0x8 + .byte 2 + .byte 0 + .byte 5 + .byte 11 + .byte 2 + .byte 2 + .2byte 16 gUnknown_086227E0:: @ 86227E0 - .incbin "baserom.gba", 0x6227e0, 0x8 + .byte 2 + .byte 0 + .byte 9 + .byte 11 + .byte 8 + .byte 2 + .2byte 0x26 gUnknown_086227E8:: @ 86227E8 .4byte gUnknown_085EC017 @@ -1398,13 +1586,21 @@ gUnknown_086227E8:: @ 86227E8 .4byte gUnknown_085EC022 gUnknown_086227F4:: @ 86227F4 - .incbin "baserom.gba", 0x6227f4, 0x14 + .string "·{PAUSE 0x04}·{PAUSE 0x04}·{PAUSE 0x04}·{PAUSE 0x04}·\p" + .string "$" + .align 2 gUnknown_08622808:: @ 8622808 - .incbin "baserom.gba", 0x622808, 0x8 + .byte 1 + .byte 1 + .byte 12 + .byte 0x1C + .byte 4 + .byte 1 + .2byte 10 gUnknown_08622810:: @ 8622810 - .incbin "baserom.gba", 0x622810, 0x8 + obj_tiles gUnknown_086226B8, 0x40, 7 gUnknown_08622818:: @ 8622818 obj_pal gUnknown_08622698, 12 @@ -1429,79 +1625,81 @@ gUnknown_08622850:: @ 8622850 spr_template 8, 13, gUnknown_08622848, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_08622868:: @ 8622868 - .incbin "baserom.gba", 0x622868, 0x20 + .incbin "graphics/pokenav/8622868.gbapal" gUnknown_08622888:: @ 8622888 - .incbin "baserom.gba", 0x622888, 0x1F4 + .incbin "graphics/pokenav/zoom_tiles.4bpp.lz" gUnknown_08622A7C:: @ 8622A7C - .incbin "baserom.gba", 0x622a7c, 0x44 + .incbin "graphics/pokenav/city_maps/lavaridge_0.bin.lz" gUnknown_08622AC0:: @ 8622AC0 - .incbin "baserom.gba", 0x622ac0, 0x48 + .incbin "graphics/pokenav/city_maps/fallarbor_0.bin.lz" gUnknown_08622B08:: @ 8622B08 - .incbin "baserom.gba", 0x622b08, 0x50 + .incbin "graphics/pokenav/city_maps/fortree_0.bin.lz" gUnknown_08622B58:: @ 8622B58 - .incbin "baserom.gba", 0x622b58, 0x60 + .incbin "graphics/pokenav/city_maps/slateport_0.bin.lz" gUnknown_08622BB8:: @ 8622BB8 - .incbin "baserom.gba", 0x622bb8, 0x4C + .incbin "graphics/pokenav/city_maps/slateport_1.bin.lz" gUnknown_08622C04:: @ 8622C04 - .incbin "baserom.gba", 0x622c04, 0x54 + .incbin "graphics/pokenav/city_maps/rustboro_0.bin.lz" gUnknown_08622C58:: @ 8622C58 - .incbin "baserom.gba", 0x622c58, 0x54 + .incbin "graphics/pokenav/city_maps/rustboro_1.bin.lz" gUnknown_08622CAC:: @ 8622CAC - .incbin "baserom.gba", 0x622cac, 0x40 + .incbin "graphics/pokenav/city_maps/pacifidlog_0.bin.lz" gUnknown_08622CEC:: @ 8622CEC - .incbin "baserom.gba", 0x622cec, 0x58 + .incbin "graphics/pokenav/city_maps/mauville_0.bin.lz" gUnknown_08622D44:: @ 8622D44 - .incbin "baserom.gba", 0x622d44, 0x54 + .incbin "graphics/pokenav/city_maps/mauville_1.bin.lz" gUnknown_08622D98:: @ 8622D98 - .incbin "baserom.gba", 0x622d98, 0x30 + .incbin "graphics/pokenav/city_maps/oldale_0.bin.lz" gUnknown_08622DC8:: @ 8622DC8 - .incbin "baserom.gba", 0x622dc8, 0x4C + .incbin "graphics/pokenav/city_maps/lilycove_0.bin.lz" gUnknown_08622E14:: @ 8622E14 - .incbin "baserom.gba", 0x622e14, 0x58 + .incbin "graphics/pokenav/city_maps/lilycove_1.bin.lz" gUnknown_08622E6C:: @ 8622E6C - .incbin "baserom.gba", 0x622e6c, 0x30 + .incbin "graphics/pokenav/city_maps/littleroot_0.bin.lz" gUnknown_08622E9C:: @ 8622E9C - .incbin "baserom.gba", 0x622e9c, 0x38 + .incbin "graphics/pokenav/city_maps/dewford_0.bin.lz" gUnknown_08622ED4:: @ 8622ED4 - .incbin "baserom.gba", 0x622ed4, 0x40 + .incbin "graphics/pokenav/city_maps/sootopolis_0.bin.lz" gUnknown_08622F14:: @ 8622F14 - .incbin "baserom.gba", 0x622f14, 0x48 + .incbin "graphics/pokenav/city_maps/ever_grande_0.bin.lz" gUnknown_08622F5C:: @ 8622F5C - .incbin "baserom.gba", 0x622f5c, 0x44 + .incbin "graphics/pokenav/city_maps/ever_grande_1.bin.lz" gUnknown_08622FA0:: @ 8622FA0 - .incbin "baserom.gba", 0x622fa0, 0x38 + .incbin "graphics/pokenav/city_maps/verdanturf_0.bin.lz" gUnknown_08622FD8:: @ 8622FD8 - .incbin "baserom.gba", 0x622fd8, 0x48 + .incbin "graphics/pokenav/city_maps/mossdeep_0.bin.lz" gUnknown_08623020:: @ 8623020 - .incbin "baserom.gba", 0x623020, 0x5C + .incbin "graphics/pokenav/city_maps/mossdeep_1.bin.lz" gUnknown_0862307C:: @ 862307C - .incbin "baserom.gba", 0x62307c, 0x5C + .incbin "graphics/pokenav/city_maps/petalburg_0.bin.lz" gUnknown_086230D8:: @ 86230D8 - .incbin "baserom.gba", 0x6230d8, 0xc + .4byte 0x11F5 + .4byte 0x206A + .4byte 0x3402 gUnknown_086230E4:: @ 86230E4 .4byte NULL @@ -1518,7 +1716,13 @@ gUnknown_08623100:: @ 8623100 null_obj_pal gUnknown_08623110:: @ 8623110 - .incbin "baserom.gba", 0x623110, 0x8 + .byte 1 + .byte 17 + .byte 4 + .byte 12 + .byte 13 + .byte 1 + .2byte 0x4C gUnknown_08623118:: @ 8623118 .4byte 0, gUnknown_08622E6C @@ -1560,28 +1764,54 @@ gUnknown_08623208:: @ 8623208 .incbin "baserom.gba", 0x623208, 0x20 gUnknown_08623228:: @ 8623228 - .incbin "baserom.gba", 0x623228, 0x14 + .incbin "graphics/pokenav/8623228.4bpp.lz" gUnknown_0862323C:: @ 862323C - .incbin "baserom.gba", 0x62323c, 0xfc + .incbin "graphics/pokenav/862323C.bin.lz" gUnknown_08623338:: @ 8623338 .incbin "baserom.gba", 0x623338, 0x20 gUnknown_08623358:: @ 8623358 - .incbin "baserom.gba", 0x623358, 0xc + .4byte 0x11F5 + .4byte 0x21DE + .4byte 0x31EB gUnknown_08623364:: @ 8623364 - .incbin "baserom.gba", 0x623364, 0x8 + .byte 1 + .byte 13 + .byte 1 + .byte 13 + .byte 4 + .byte 15 + .2byte 2 gUnknown_0862336C:: @ 862336C - .incbin "baserom.gba", 0x62336c, 0x8 + .byte 1 + .byte 1 + .byte 6 + .byte 7 + .byte 2 + .byte 15 + .2byte 0x36 gUnknown_08623374:: @ 8623374 - .incbin "baserom.gba", 0x623374, 0x8 + .byte 1 + .byte 1 + .byte 0x1C + .byte 5 + .byte 2 + .byte 15 + .2byte 0x44 gUnknown_0862337C:: @ 862337C - .incbin "baserom.gba", 0x62337c, 0x8 + .byte 1 + .byte 13 + .byte 0x1C + .byte 3 + .byte 2 + .byte 15 + .2byte 0x44 gUnknown_08623384:: @ 8623384 .4byte NULL @@ -1593,7 +1823,7 @@ gUnknown_08623384:: @ 8623384 .4byte sub_81CE700 gUnknown_086233A0:: @ 86233A0 - .incbin "baserom.gba", 0x6233a0, 0x14 + .4byte 0x16, 0x17, 0x18, 0x21, 0x2F gUnknown_086233B4:: @ 86233B4 .4byte sub_81CF134 @@ -1602,22 +1832,22 @@ gUnknown_086233B4:: @ 86233B4 .4byte sub_81CF278 gUnknown_086233C4:: @ 86233C4 - .incbin "baserom.gba", 0x6233c4, 0x20 + .incbin "graphics/pokenav/condition_search2.gbapal" gUnknown_086233E4:: @ 86233E4 - .incbin "baserom.gba", 0x6233e4, 0xc8 + .incbin "graphics/pokenav/condition_search2.4bpp.lz" gUnknown_086234AC:: @ 86234AC - .incbin "baserom.gba", 0x6234ac, 0xc4 + .incbin "graphics/pokenav/condition_search2.bin.lz" gUnknown_08623570:: @ 8623570 .incbin "baserom.gba", 0x623570, 0x20 gUnknown_08623590:: @ 8623590 - .incbin "baserom.gba", 0x623590, 0x4 + .4byte 0x2065 gUnknown_08623594:: @ 8623594 - .incbin "baserom.gba", 0x623594, 0x4 + .4byte 0x307A gUnknown_08623598:: @ 8623598 .4byte NULL @@ -1629,16 +1859,25 @@ gUnknown_08623598:: @ 8623598 .4byte sub_81CF798 gUnknown_086235B4:: @ 86235B4 - .incbin "baserom.gba", 0x6235b4, 0x8 + .byte 1 + .byte 1 + .byte 6 + .byte 7 + .byte 2 + .byte 1 + .2byte 20 gUnknown_086235BC:: @ 86235BC - .incbin "baserom.gba", 0x6235bc, 0xc + .string "{COLOR_HIGHLIGHT_SHADOW}{LIGHT_RED}{WHITE}{GREEN}♂{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}$" + .align 2 gUnknown_086235C8:: @ 86235C8 - .incbin "baserom.gba", 0x6235c8, 0xc + .string "{COLOR_HIGHLIGHT_SHADOW}{LIGHT_GREEN}{WHITE}{BLUE}♀{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}$" + .align 2 gUnknown_086235D4:: @ 86235D4 - .incbin "baserom.gba", 0x6235d4, 0x4 + .string "{0x77}$" + .align 2 gUnknown_086235D8:: @ 86235D8 .4byte sub_81CFB8C @@ -1646,22 +1885,22 @@ gUnknown_086235D8:: @ 86235D8 .4byte sub_81CFC40 gUnknown_086235E4:: @ 86235E4 - .incbin "baserom.gba", 0x6235e4, 0x20 + .incbin "graphics/pokenav/ui_ribbons.gbapal" gUnknown_08623604:: @ 8623604 - .incbin "baserom.gba", 0x623604, 0xc8 + .incbin "graphics/pokenav/ui_ribbons.4bpp.lz" gUnknown_086236CC:: @ 86236CC - .incbin "baserom.gba", 0x6236cc, 0xc4 + .incbin "graphics/pokenav/ui_ribbons.bin.lz" gUnknown_08623790:: @ 8623790 .incbin "baserom.gba", 0x623790, 0x20 gUnknown_086237B0:: @ 86237B0 - .incbin "baserom.gba", 0x6237b0, 0x4 + .4byte 0x2065 gUnknown_086237B4:: @ 86237B4 - .incbin "baserom.gba", 0x6237b4, 0x4 + .4byte 0x307A gUnknown_086237B8:: @ 86237B8 .4byte NULL @@ -1673,19 +1912,44 @@ gUnknown_086237B8:: @ 86237B8 .4byte sub_81D021C gUnknown_086237D4:: @ 86237D4 - .incbin "baserom.gba", 0x6237d4, 0x8 + .byte 1 + .byte 1 + .byte 6 + .byte 7 + .byte 2 + .byte 1 + .2byte 20 gUnknown_086237DC:: @ 86237DC - .incbin "baserom.gba", 0x6237dc, 0xc + .string "{COLOR_HIGHLIGHT_SHADOW}{LIGHT_RED}{WHITE}{GREEN}♂{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}$" + .align 2 gUnknown_086237E8:: @ 86237E8 - .incbin "baserom.gba", 0x6237e8, 0xc + .string "{COLOR_HIGHLIGHT_SHADOW}{LIGHT_GREEN}{WHITE}{BLUE}♀{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}$" + .align 2 gUnknown_086237F4:: @ 86237F4 - .incbin "baserom.gba", 0x6237f4, 0x4 + .string "{0x77}$" + .align 2 gUnknown_086237F8:: @ 86237F8 - .incbin "baserom.gba", 0x6237f8, 0x44 + .byte 1, 1, 0, 0 + .byte 3, 4, 1, 0 + .byte 3, 4, 5, 0 + .byte 3, 4, 9, 0 + .byte 3, 4, 13, 0 + .byte 3, 4, 17, 0 + .byte 1, 1, 21, 0 + .byte 1, 1, 22, 0 + .byte 1, 1, 23, 0 + .byte 1, 1, 24, 0 + .byte 1, 1, 25, 1 + .byte 1, 1, 26, 1 + .byte 1, 1, 27, 1 + .byte 1, 1, 28, 1 + .byte 1, 1, 29, 1 + .byte 1, 1, 30, 1 + .byte 1, 1, 31, 1 @ 862383C .include "data/text/ribbon_descriptions.inc" @@ -1694,31 +1958,32 @@ gUnknown_086237F8:: @ 86237F8 .include "data/text/gift_ribbon_descriptions.inc" gUnknown_08623FF8:: @ 8623FF8 - .incbin "baserom.gba", 0x623ff8, 0x20 + .incbin "graphics/pokenav/ribbons_icon1.gbapal" gUnknown_08624018:: @ 8624018 - .incbin "baserom.gba", 0x624018, 0x20 + .incbin "graphics/pokenav/ribbons_icon2.gbapal" gUnknown_08624038:: @ 8624038 - .incbin "baserom.gba", 0x624038, 0x20 + .incbin "graphics/pokenav/ribbons_icon3.gbapal" gUnknown_08624058:: @ 8624058 - .incbin "baserom.gba", 0x624058, 0x20 + .incbin "graphics/pokenav/ribbons_icon4.gbapal" gUnknown_08624078:: @ 8624078 - .incbin "baserom.gba", 0x624078, 0x20 + .incbin "graphics/pokenav/ribbons_icon5.gbapal" gUnknown_08624098:: @ 8624098 .incbin "baserom.gba", 0x624098, 0x20 gUnknown_086240B8:: @ 86240B8 - .incbin "baserom.gba", 0x6240b8, 0x1C8 + .incbin "graphics/pokenav/ribbons_icon.4bpp.lz" gUnknown_08624280:: @ 8624280 - .incbin "baserom.gba", 0x624280, 0x918 + .incbin "graphics/pokenav/ribbons_icon_big.4bpp.lz" gUnknown_08624B98:: @ 8624B98 - .incbin "baserom.gba", 0x624b98, 0x8 + .4byte 0x107D + .4byte 0x2066 gUnknown_08624BA0:: @ 8624BA0 .4byte NULL @@ -1729,28 +1994,66 @@ gUnknown_08624BA0:: @ 8624BA0 .4byte sub_81D0C54 gUnknown_08624BB8:: @ 8624BB8 - .incbin "baserom.gba", 0x624bb8, 0x8 + .byte 2 + .byte 12 + .byte 13 + .byte 16 + .byte 4 + .byte 1 + .2byte 20 gUnknown_08624BC0:: @ 8624BC0 - .incbin "baserom.gba", 0x624bc0, 0x4 + .byte 4, 2, 3, 0 gUnknown_08624BC4:: @ 8624BC4 - .incbin "baserom.gba", 0x624bc4, 0x8 + .byte 2 + .byte 14 + .byte 1 + .byte 13 + .byte 2 + .byte 10 + .2byte 0x54 gUnknown_08624BCC:: @ 8624BCC - .incbin "baserom.gba", 0x624bcc, 0xc + .string "{COLOR_HIGHLIGHT_SHADOW}{LIGHT_RED}{WHITE}{GREEN}♂{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}$" + .align 2 gUnknown_08624BD8:: @ 8624BD8 - .incbin "baserom.gba", 0x624bd8, 0xc + .string "{COLOR_HIGHLIGHT_SHADOW}{LIGHT_GREEN}{WHITE}{BLUE}♀{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}$" + .align 2 gUnknown_08624BE4:: @ 8624BE4 - .incbin "baserom.gba", 0x624be4, 0x4 + .string "{0x77}$" + .align 2 gUnknown_08624BE8:: @ 8624BE8 - .incbin "baserom.gba", 0x624be8, 0x10 + .byte 2 + .byte 1 + .byte 5 + .byte 7 + .byte 2 + .byte 1 + .2byte 0x6E + .4byte NULL + .4byte NULL gUnknown_08624BF8:: @ 8624BF8 - .incbin "baserom.gba", 0x624bf8, 0x80 + .2byte 0, 0, 1, 0 + .2byte 2, 0, 3, 0 + .2byte 4, 0, 1, 1 + .2byte 2, 1, 3, 1 + .2byte 4, 1, 1, 2 + .2byte 2, 2, 3, 2 + .2byte 4, 2, 1, 3 + .2byte 2, 3, 3, 3 + .2byte 4, 3, 1, 4 + .2byte 2, 4, 3, 4 + .2byte 4, 4, 5, 0 + .2byte 6, 0, 7, 1 + .2byte 8, 2, 9, 1 + .2byte 9, 3, 9, 4 + .2byte 10, 3, 10, 4 + .2byte 11, 0, 11, 1 gUnknown_08624C78:: @ 8624C78 obj_tiles gUnknown_08624280, 0x1800, 9 @@ -1764,73 +2067,710 @@ gUnknown_08624C80:: @ 8624C80 null_obj_pal gUnknown_08624CB0:: @ 8624CB0 - .incbin "baserom.gba", 0x624cb0, 0x54 + .2byte 0x100 + .2byte 0x8000 + .2byte 0x400 + .2byte 0x0 + +gUnknown_08624CB8:: @ 8624CB8 + .2byte 0x80 + .2byte 0x80 + .2byte 0 + .2byte 0 + .2byte 0x7FFF + .2byte 0 + .2byte 0 + .2byte 0 + +gUnknown_08624CC8:: @ 8624CC8 + .2byte 0x80 + .2byte 0x80 + .2byte 0 + .2byte 0 + .2byte 0x20 + .2byte 0x20 + .2byte 0x400 + .2byte 0 + .2byte 0x7FFF + .2byte 0 + .2byte 0 + .2byte 0 + +gUnknown_08624CE0:: @ 8624CE0 + .2byte 0x100 + .2byte 0x100 + .2byte 0 + .2byte 0 + .2byte 0xFFE0 + .2byte 0xFFE0 + .2byte 0x400 + .2byte 0 + .2byte 0x7FFF + .2byte 0 + .2byte 0 + .2byte 0 + +gUnknown_08624CF8:: @ 8624CF8 + .4byte gUnknown_08624CB8 + .4byte gUnknown_08624CC8 + .4byte gUnknown_08624CE0 gUnknown_08624D04:: @ 8624D04 - .incbin "baserom.gba", 0x624d04, 0x78 + spr_template 9, 15, gUnknown_08624CB0, gDummySpriteAnimTable, NULL, gUnknown_08624CF8, SpriteCallbackDummy + +gUnknown_08624D1C:: @ 8624D1C + .4byte gText_MrStone_Pokenav_2B60C0 + .2byte 0xFFFF + .byte 0x58 + .byte 1 + .4byte gText_MrStone_Pokenav_2B61E6 + .byte 0x58 + .byte 1 + .2byte 0xFFFF + .4byte gText_MrStone_Pokenav_2B6302 + .byte 0xBD + .byte 0 + .2byte 0xFFFF + .4byte gText_MrStone_Pokenav_2B63A0 + .byte 16 + .byte 1 + .2byte 0xFFFF + .4byte gText_MrStone_Pokenav_2B64A2 + .byte 0x6A + .byte 0 + .2byte 0xFFFF + .4byte gText_MrStone_Pokenav_2B6526 + .byte 0xF4 + .byte 4 + .2byte 0xFFFF + .4byte gText_MrStone_Pokenav_2B65BB + .byte 0x97 + .byte 0 + .2byte 0xFFFF + .4byte gText_MrStone_Pokenav_2B6664 + .byte 0x6f + .byte 0 + .2byte 0xFFFF + .4byte gText_MrStone_Pokenav_2B66B1 + .byte 0x70 + .byte 0 + .2byte 0xFFFF + .4byte gText_MrStone_Pokenav_2B6703 + .byte 0xf7 + .byte 4 + .2byte 0xFFFF + .4byte gText_MrStone_Pokenav_2B67ED + .byte 0x64 + .byte 8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_08624D7C:: @ 8624D7C - .incbin "baserom.gba", 0x624d7c, 0x60 + .byte 0 + .byte 10 + .2byte 0xFFFF + .4byte gUnknown_085EFAEF + .4byte gUnknown_085EFAFA + .4byte gUnknown_08624D1C + +gUnknown_08624D8C:: @ 8624D8C + .4byte gText_Norman_Pokenav_2B5719 + .byte 0x32 + .byte 1 + .2byte 0xFFFF + .4byte gText_Norman_Pokenav_2B5795 + .byte 0xF1 + .byte 4 + .2byte 0xFFFF + .4byte gText_Norman_Pokenav_2B584D + .byte 0xF3 + .byte 4 + .2byte 0xFFFF + .4byte gText_Norman_Pokenav_2B58E3 + .byte 0xF4 + .byte 4 + .2byte 0xFFFF + .4byte gText_Norman_Pokenav_2B5979 + .byte 0xD4 + .byte 0 + .2byte 0xFFFF + .4byte gText_Norman_Pokenav_2B5A07 + .byte 0xFE + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Norman_Pokenav_2B5A69 + .byte 0x64 + .byte 8 + .2byte 0xFFFF + .4byte gText_Norman_Pokenav_2B5ACF + .byte 0x64 + .byte 8 + .2byte 0xFFFF + .4byte gText_Norman_Pokenav_2B5B5E + .byte 0x64 + .byte 8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_08624DDC:: @ 8624DDC - .incbin "baserom.gba", 0x624ddc, 0x14 + .byte 5, 7, 0x32, 1, 0x45, 0, 0, 0 + .4byte gUnknown_085EFB25 + .4byte gUnknown_085EFB47 + .4byte gUnknown_08624D8C gUnknown_08624DF0:: @ 8624DF0 - .incbin "baserom.gba", 0x624df0, 0x2C + .byte 3, 0, 0x19, 1 + .4byte gUnknown_085EFBC9 + .4byte gUnknown_085E8270 + +gUnknown_08624DFC:: @ 8624DFC + .4byte gText_Mom_Pokenav_2B227B + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Mom_Pokenav_2B2310 + .byte 0xF4 + .byte 0x4 + .2byte 0xFFFF + .4byte gText_Mom_Pokenav_2B23F3 + .byte 0x64 + .byte 8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_08624E1C:: @ 8624E1C - .incbin "baserom.gba", 0x624e1c, 0x50 + .byte 0, 0, 0xD8, 0 + .4byte gUnknown_085EFB32 + .4byte gUnknown_085EFB4B + .4byte gUnknown_08624DFC + +gUnknown_08624E2C:: @ 8624E2C + .4byte gText_Steven_Pokenav_2B5B95 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Steven_Pokenav_2B5C53 + .byte 0xC7 + .byte 0 + .2byte 0xFFFF + .4byte gText_Steven_Pokenav_2B5CC9 + .byte 0xD4 + .byte 0 + .2byte 0xFFFF + .4byte gText_Steven_Pokenav_2B5DB4 + .byte 0x70 + .byte 0 + .2byte 0xFFFF + .4byte gText_Steven_Pokenav_2B5E26 + .byte 0xF6 + .byte 4 + .2byte 0xFFFF + .4byte gText_Steven_Pokenav_2B5EA2 + .byte 0x81 + .byte 0 + .2byte 0xFFFF + .4byte gText_Steven_Pokenav_2B5ED9 + .byte 0x64 + .byte 8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_08624E6C:: @ 8624E6C - .incbin "baserom.gba", 0x624e6c, 0x90 + .byte 0, 0xD5, 0x31, 1 + .4byte gUnknown_085EFB04 + .4byte gUnknown_085EFB11 + .4byte gUnknown_08624E2C + +gUnknown_08624E7C:: @ 8624E7C + .4byte gText_May_Pokenav_2B3AB3 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B3B3F + .byte 0xF1 + .byte 0x4 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B3C13 + .byte 0x95 + .byte 0 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B3CF3 + .byte 0x24 + .byte 0x3 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B3D4B + .byte 0x6A + .byte 0 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B3DD1 + .byte 0xF3 + .byte 0x4 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B3E69 + .byte 0xF4 + .byte 4 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B3ECD + .byte 0x97 + .byte 0 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B3F2B + .byte 0xD4 + .byte 0 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B3FFB + .byte 0x6F + .byte 0 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B402B + .byte 0x61 + .byte 0 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B414B + .byte 0x70 + .byte 0 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B4228 + .byte 0x81 + .byte 0 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B42E0 + .byte 0xF7 + .byte 4 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B4350 + .byte 0x64 + .byte 8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_08624EFC:: @ 8624EFC - .incbin "baserom.gba", 0x624efc, 0x90 + .byte 4, 0, 0xFD, 0 + .4byte gUnknown_085EFB18 + .4byte gExpandedPlaceholder_May + .4byte gUnknown_08624E7C + +gUnknown_08624F0C:: @ 8624F0C + .4byte gText_Brendan_Pokenav_2B43EF + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4486 + .byte 0xF1 + .byte 0x4 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4560 + .byte 0x95 + .byte 0 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B463F + .byte 0x24 + .byte 0x3 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B46B7 + .byte 0x6A + .byte 0 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4761 + .byte 0xF3 + .byte 0x4 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B47F4 + .byte 0xF4 + .byte 4 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4882 + .byte 0x97 + .byte 0 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4909 + .byte 0xD4 + .byte 0 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B49C4 + .byte 0x6F + .byte 0 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4A44 + .byte 0x61 + .byte 0 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4B28 + .byte 0x70 + .byte 0 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4C15 + .byte 0x81 + .byte 0 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4CD8 + .byte 0xF7 + .byte 4 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4D46 + .byte 0x64 + .byte 8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_08624F8C:: @ 8624F8C - .incbin "baserom.gba", 0x624f8c, 0x60 + .byte 4, 1, 0xFD, 0 + .4byte gUnknown_085EFB18 + .4byte gExpandedPlaceholder_Brendan + .4byte gUnknown_08624F0C + +gUnknown_08624F9C:: @ 8624F9C + .4byte gText_Wally_Pokenav_2B4DE2 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Wally_Pokenav_2B4E57 + .byte 0xC7 + .byte 0 + .2byte 0xFFFF + .4byte gText_Wally_Pokenav_2B4EA5 + .byte 0xF3 + .byte 0x4 + .2byte 0xFFFF + .4byte gText_Wally_Pokenav_2B4F41 + .byte 0x97 + .byte 0 + .2byte 0xFFFF + .4byte gText_Wally_Pokenav_2B4FF3 + .byte 0x6F + .byte 0 + .2byte 0xFFFF + .4byte gText_Wally_Pokenav_2B50B1 + .byte 0x81 + .byte 0 + .2byte 0xFFFF + .4byte gText_Wally_Pokenav_2B5100 + .byte 0x7E + .byte 0 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF +gUnknown_08624FDC:: @ 8624FDC + .byte 0x24, 3, 5, 0 + .2byte 0x6F, 0xD5 + .byte 0x5A, 3, 0x46, 0, 0xFF, 0xFF, 0xD5, 0 + gUnknown_08624FEC:: @ 8624FEC - .incbin "baserom.gba", 0x624fec, 0x54 + .byte 2, 0, 0xD6, 0 + .4byte 0x40 + .4byte gUnknown_085EFB3E + .4byte gUnknown_08624F9C + .4byte gUnknown_08624FDC + +gUnknown_08624500:: @ 8624500 + .4byte gText_Scott_Pokenav_2B5184 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Scott_Pokenav_2B5275 + .byte 0x8B + .byte 0 + .2byte 0xFFFF + .4byte gText_Scott_Pokenav_2B5323 + .byte 0x97 + .byte 0 + .2byte 0xFFFF + .4byte gText_Scott_Pokenav_2B53DB + .byte 0xD4 + .byte 0 + .2byte 0xFFFF + .4byte gText_Scott_Pokenav_2B54A5 + .byte 0x70 + .byte 0 + .2byte 0xFFFF + .4byte gText_Scott_Pokenav_2B5541 + .byte 0xF7 + .byte 4 + .2byte 0xFFFF + .4byte gText_Scott_Pokenav_2B56CA + .byte 0x64 + .byte 8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF + gUnknown_08625040:: @ 8625040 - .incbin "baserom.gba", 0x625040, 0x38 + .byte 0, 0xD5, 0xD7, 0 + .4byte gUnknown_085EFB4F + .4byte gUnknown_085EFB5C + .4byte gUnknown_08624500 + +gUnknown_08625050:: @ 8625050 + .4byte gText_Roxanne_Pokenav_2B2456 + .byte 0xFE + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Roxanne_Pokenav_2B250E + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Roxanne_Pokenav_2B25C1 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Roxanne_Pokenav_2B2607 + .byte 0x64 + .byte 0x8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_08625078:: @ 8625078 - .incbin "baserom.gba", 0x625078, 0x3C + .byte 5, 10, 0xD3, 1 + .4byte 0x41 + .4byte gUnknown_085EFB62 + .4byte NULL + .4byte gUnknown_08625050 + +gUnknown_0862508C:: @ 862508C + .4byte gText_Brawly_Pokenav_2B2659 + .byte 0xFE + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Brawly_Pokenav_2B275D + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Brawly_Pokenav_2B286F + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Brawly_Pokenav_2B28D1 + .byte 0x64 + .byte 0x8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_086250B4:: @ 86250B4 - .incbin "baserom.gba", 0x6250b4, 0x3C + .byte 5, 2, 0xD4, 1 + .4byte 0x42 + .4byte gUnknown_085EFB6F + .4byte NULL + .4byte gUnknown_0862508C + +gUnknown_086250C8:: @ 86250C8 + .4byte gText_Wattson_Pokenav_2B2912 + .byte 0xFE + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Wattson_Pokenav_2B29CA + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Wattson_Pokenav_2B2AB6 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Wattson_Pokenav_2B2B01 + .byte 0x64 + .byte 0x8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_086250F0:: @ 86250F0 - .incbin "baserom.gba", 0x6250f0, 0x3C + .byte 5, 9, 0xD5, 1 + .4byte 0x43 + .4byte gUnknown_085EFB7B + .4byte NULL + .4byte gUnknown_086250C8 + +gUnknown_08625104:: @ 8625104 + .4byte gText_Flannery_Pokenav_2B2B4D + .byte 0xFE + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Flannery_Pokenav_2B2C0E + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Flannery_Pokenav_2B2CF1 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Flannery_Pokenav_2B2D54 + .byte 0x64 + .byte 0x8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_0862512C:: @ 862512C - .incbin "baserom.gba", 0x62512c, 0x3C + .byte 5, 3, 0xD6, 1 + .4byte 0x44 + .4byte gUnknown_085EFB87 + .4byte NULL + .4byte gUnknown_08625104 + +gUnknown_08625140:: @ 8625140 + .4byte gText_Winona_Pokenav_2B2DA4 + .byte 0xFE + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Winona_Pokenav_2B2E2B + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Winona_Pokenav_2B2EC2 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Winona_Pokenav_2B2F16 + .byte 0x64 + .byte 0x8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_08625168:: @ 8625168 - .incbin "baserom.gba", 0x625168, 0x3C + .byte 5, 11, 0xD7, 1 + .4byte 0x46 + .4byte gUnknown_085EFB94 + .4byte NULL + .4byte gUnknown_08625140 + +gUnknown_0862517C:: @ 862517C + .4byte gText_TateLiza_Pokenav_2B2F97 + .byte 0xFE + .byte 0xFF + .2byte 0xFFFF + .4byte gText_TateLiza_Pokenav_2B306E + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_TateLiza_Pokenav_2B3158 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_TateLiza_Pokenav_2B31CD + .byte 0x64 + .byte 0x8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_086251A4:: @ 86251A4 - .incbin "baserom.gba", 0x6251a4, 0x3C + .byte 5, 13, 0xD8, 1 + .4byte 0x47 + .4byte gUnknown_085EFB9E + .4byte NULL + .4byte gUnknown_0862517C + +gUnknown_086251B8:: @ 86251B8 + .4byte gText_Juan_Pokenav_2B3249 + .byte 0xFE + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Juan_Pokenav_2B32EC + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Juan_Pokenav_2B33AA + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Juan_Pokenav_2B341E + .byte 0x64 + .byte 0x8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_086251E0:: @ 86251E0 - .incbin "baserom.gba", 0x6251e0, 0x24 + .byte 5, 14, 0xD9, 1 + .4byte 0x48 + .4byte gUnknown_085EFBA9 + .4byte NULL + .4byte gUnknown_086251B8 + +gUnknown_086251F4:: @ 86251F4 + .4byte gText_Sidney_Pokenav_2B34CC + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_08625204:: @ 8625204 - .incbin "baserom.gba", 0x625204, 0x24 + .byte 5, 15, 0xA5, 1 + .4byte 0x49 + .4byte gUnknown_085EFBB5 + .4byte NULL + .4byte gUnknown_086251F4 + +gUnknown_08625218:: @ 8625218 + .4byte gText_Phoebe_Pokenav_2B3561 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_08625228:: @ 8625228 - .incbin "baserom.gba", 0x625228, 0x24 + .byte 5, 15, 0xA6, 1 + .4byte 0x4A + .4byte gUnknown_085EFBB5 + .4byte NULL + .4byte gUnknown_08625218 + +gUnknown_0862523C:: @ 862523C + .4byte gText_Glacia_Pokenav_2B35E4 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_0862524C:: @ 862524C - .incbin "baserom.gba", 0x62524c, 0x24 + .byte 5, 15, 0xA7, 1 + .4byte 0x4B + .4byte gUnknown_085EFBB5 + .4byte NULL + .4byte gUnknown_0862523C + +gUnknown_08625260:: @ 8625260 + .4byte gText_Drake_Pokenav_2B368B + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_08625270:: @ 8625270 - .incbin "baserom.gba", 0x625270, 0x24 + .byte 5, 15, 0xA8, 1 + .4byte 0x4C + .4byte gUnknown_085EFBB5 + .4byte NULL + .4byte gUnknown_08625260 + +gUnknown_08625284:: @ 8625284 + .4byte gText_Wallace_Pokenav_2B3790 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_08625294:: @ 8625294 - .incbin "baserom.gba", 0x625294, 0x14 + .byte 5, 15, 0xA9, 1 + .4byte 0x4D + .4byte gUnknown_085EFBC0 + .4byte NULL + .4byte gUnknown_08625284 gUnknown_086252A8:: @ 86252A8 .4byte gUnknown_08624D7C @@ -1905,61 +2845,212 @@ gUnknown_08625374:: @ 8625374 .4byte sub_81D1B00 gUnknown_08625388:: @ 8625388 - .incbin "baserom.gba", 0x625388, 0x60 + .2byte 7, 0x4B, 0xFFFF, 0 + .4byte gUnknown_085ED453 + .4byte gUnknown_085ED46B + .4byte gUnknown_085ED483 + .4byte gUnknown_085ED49D + .2byte 7, 0x4B, 0x4F6, 0 + .4byte gUnknown_085ED453 + .4byte gUnknown_085ED46B + .4byte gUnknown_085ED4B3 + .4byte gUnknown_085ED4CE + .2byte 2, 0X3C, 0xFFFF, 0 + .4byte gUnknown_085ED4E3 + .4byte gUnknown_085ED4FA + .4byte gUnknown_085ED516 + .4byte gUnknown_085ED52F + .2byte 3, 0x3F, 0xFFFF, 0 + .4byte gUnknown_085ED547 + .4byte gUnknown_085ED563 + .4byte gUnknown_085ED579 + .4byte gUnknown_085ED58F gUnknown_086253E8:: @ 86253E8 - .incbin "baserom.gba", 0x6253e8, 0x18 + .4byte 0x8010100 + .4byte 0x80F02 + .4byte 0x8011500 + .4byte 0x180F12 + .4byte 0xB010100 + .4byte 0x180F08 gUnknown_08625400:: @ 8625400 - .incbin "baserom.gba", 0x625400, 0x3 + .byte 1, 2, 3 gUnknown_08625403:: @ 8625403 - .incbin "baserom.gba", 0x625403, 0x1 + .byte 0xFF gUnknown_08625404:: @ 8625404 - .incbin "baserom.gba", 0x625404, 0xc + .byte 0x40, 0, 0, 4, 1, 0, 0x60, 0xA6, 1, 0, 0, 0 gUnknown_08625410:: @ 8625410 - .incbin "baserom.gba", 0x625410, 0x100 + .byte 4, 5, 6, 7, 8, 9, 9, 0xA, 0xA, 0xB, 0xB, 0xC, 0xC, 0xD, 0xD, 0xD, 0xD, 0xE, 0xE, 0xE, 0xE, 0xF, 0xF, 0xF, 0xF, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x23 gUnknown_08625510:: @ 8625510 - .incbin "baserom.gba", 0x625510, 0x30 + .4byte 0x10010101 + .4byte 0xA0F0C + .4byte 0x10010101 + .4byte 0xCA0F0C + .4byte 0xA011301 + .4byte 0x18A0F0C + .4byte 0x160F0401 + .4byte 0x2020F04 + .4byte 0x5081600 + .4byte 0x25A0F04 + .4byte 0xFF + .4byte NULL gUnknown_08625540:: @ 8625540 - .incbin "baserom.gba", 0x625540, 0x8 + .4byte 0x5081600 + .4byte 0x25A0F04 gUnknown_08625548:: @ 8625548 - .incbin "baserom.gba", 0x625548, 0x500 + .4byte NULL + .4byte sub_81D2BD0 + .4byte NULL + .2byte 0 + .2byte 0 + .byte 2 + .byte 0 + .byte 8 + .byte 0 + .4byte 0x1003121 + +gUnknown_08625560:: @ 8625560 + .incbin "graphics/pokenav/pokeball.4bpp" + +gUnknown_08625660:: @ 8625660 + .incbin "graphics/pokenav/8625660.4bpp" + +gUnknown_08625680:: @ 8625680 + .incbin "graphics/pokenav/sparkle.gbapal" + +gUnknown_086256A0:: @ 86255A0 + .incbin "graphics/pokenav/sparkle.4bpp" + +gUnknown_08625A20:: @ 8625A20 + .2byte 0 + .2byte 0xC000 + .2byte 0x400 + .2byte 0 + +gUnknown_08625A28:: @ 8625A28 + .2byte 0 + .2byte 0x4000 + .2byte 0x800 + .2byte 0 + +gUnknown_08625A30:: @ 8625A30 + .2byte 0 + .2byte 5 + .2byte 0xFFFF + .2byte 0 + +gUnknown_08625A38:: @ 8625A38 + .2byte 4 + .2byte 5 + .2byte 0xFFFF + .2byte 0 + +gUnknown_08625A40:: @ 8625A40 + .4byte gUnknown_08625A30 + .4byte gUnknown_08625A38 gUnknown_08625A48:: @ 8625A48 - .incbin "baserom.gba", 0x625a48, 0x8 + .4byte NULL + .4byte 0x640800 gUnknown_08625A50:: @ 8625A50 - .incbin "baserom.gba", 0x625a50, 0x18 + spr_template 0x64, 0x64, gUnknown_08625A20, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_08625A68:: @ 8625A68 - .incbin "baserom.gba", 0x625a68, 0x8 + .4byte NULL + .4byte 0x64 gUnknown_08625A70:: @ 8625A70 - .incbin "baserom.gba", 0x625a70, 0x20 + .4byte gUnknown_08625560 + .byte 0, 1, 0x65, 0 + .4byte gUnknown_08625660 + .2byte 0x20, 0x67 + .4byte gPokenavConditionCancel_Gfx + .byte 0, 1, 0x66, 0 + .4byte NULL, NULL gUnknown_08625A90:: @ 8625A90 - .incbin "baserom.gba", 0x625a90, 0x18 + .4byte gPokenavConditionCancel_Pal + 0x0 + .byte 0x65, 0, 0, 0 + .4byte gPokenavConditionCancel_Pal + 0x20 + .byte 0x66, 0, 0, 0 + .4byte NULL, NULL gUnknown_08625AA8:: @ 8625AA8 - .incbin "baserom.gba", 0x625aa8, 0x18 + spr_template 0x65, 0x65, gUnknown_08625A28, gUnknown_08625A40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_08625AC0:: @ 8625AC0 - .incbin "baserom.gba", 0x625ac0, 0x8 + .4byte gUnknown_086256A0 + .byte 0x80, 3, 0x68, 0 gUnknown_08625AC8:: @ 8625AC8 - .incbin "baserom.gba", 0x625ac8, 0x4c + .4byte gUnknown_08625680 + .byte 0x68, 0, 0, 0 + +gUnknown_08625AD0:: @ 8625AD0 + .2byte 0 + .2byte 0x4000 + .2byte 0 + .2byte 0 + +gUnknown_08625AD8:: @ 8625AD8 + .2byte 0 + .2byte 5 + .2byte 4 + .2byte 5 + +gUnknown_08625AE0:: @ 8625AE0 + .2byte 8 + .2byte 5 + .2byte 12 + .2byte 5 + +gUnknown_08625AE8:: @ 8625AE8 + .2byte 16 + .2byte 5 + .2byte 20 + .2byte 5 + +gUnknown_08625AF0:: @ 8625AF0 + .2byte 24 + .2byte 5 + .2byte 0xFFFF + .2byte 0 + +gUnknown_08625AF8:: @ 8625AF8 + .4byte gUnknown_08625AD8 + .4byte gUnknown_08625AE0 + +gUnknown_08625B00:: @ 8625B00 + .4byte gUnknown_08625AE8 + .4byte gUnknown_08625AF0 + +gUnknown_08625B08:: @ 8625B08 + .4byte gUnknown_08625AF8 + .4byte gUnknown_08625B00 + .4byte gUnknown_08625B08 gUnknown_08625B14:: @ 8625B14 - .incbin "baserom.gba", 0x625b14, 0x18 + spr_template 0x68, 0x68, gUnknown_08625AD0, gUnknown_08625AF8, NULL gDummySpriteAffineAnimTable, sub_81D3564 gUnknown_08625B2C:: @ 8625B2C - .incbin "baserom.gba", 0x625b2c, 0x28 + .2byte 0, 0xFFDD + .2byte 20, 0xFFE4 + .2byte 33, 0xFFF6 + .2byte 33, 10 + .2byte 20, 28 + .2byte 0, 35 + .2byte 0xFFEC, 28 + .2byte 0xFFDF, 10 + .2byte 0xFFDF, 0xFFF6 + .2byte 0xFFEC, 0xFFE4 gUnknown_08625B54:: @ 8625B54 .4byte gUnknown_085EEA46 @@ -1970,28 +3061,173 @@ gUnknown_08625B54:: @ 8625B54 .4byte gUnknown_085EEA5D gUnknown_08625B6C:: @ 8625B6C - .incbin "baserom.gba", 0x625b6c, 0x520 +@ someone dump as japanese text later +.byte 0x6f, 0x57, 0x54, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x14, 0x0c, 0x0e, 0x23, 0x10, 0x47, 0x0a, 0x1f, 0x06, 0x24, 0x0e, 0x48, 0x0a, 0x0f, 0x06 +.byte 0x22, 0x27, 0x2c, 0x16, 0x07, 0x06, 0x01, 0x0c, 0x47, 0x0a, 0x06, 0x06, 0x24, 0x0e, 0x00, 0x1e, 0x19, 0x12, 0x05, 0x0c, 0x25, 0x16, 0x25, 0x10, 0x0d, 0x1c, 0x2a, 0x1c, 0x06, 0x0a, 0x06, 0x0c +.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 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 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, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 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, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff +.byte 0xff, 0xff, 0xff, 0x00, 0x70, 0x01, 0xdb, 0x00, 0xbc, 0x00, 0xf7, 0x00, 0xdc, 0x00, 0x19, 0x01, 0x00, 0x00, 0x37, 0xff, 0x64, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a +.byte 0x80, 0x00, 0x00, 0x00, 0x6f, 0x79, 0x69, 0xae, 0x71, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x26, 0x01, 0xb3, 0x00, 0x3e, 0x01, 0xbc, 0x00, 0xf7, 0x00, 0xca, 0x00, 0x00, 0x00, 0x00, 0xff +.byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x95, 0x58, 0x59, 0x52, 0x79, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7d, 0x01, 0xb7, 0x00 +.byte 0xf6, 0x00, 0x39, 0x00, 0x59, 0x00, 0x85, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x9b, 0xff, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x2f, 0x00, 0x00, 0x00, 0x8d, 0xae, 0x77, 0x7e +.byte 0x5d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x6a, 0x79, 0x6b, 0x64, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x1b, 0x01, 0x00, 0x00, 0x00, 0x54, 0x27, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a +.byte 0x20, 0x06, 0x00, 0x0c, 0x13, 0x24, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a, 0x05, 0x12, 0x00, 0x0c, 0x6b, 0x26, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a, 0x0e, 0x12, 0x00, 0x0c, 0x2c, 0x24, 0x2b, 0x0e +.byte 0xff, 0xff, 0x3b, 0x0a, 0x17, 0x12, 0x00, 0x0c, 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, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 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, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 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 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x59, 0x01, 0xb7, 0x00, 0xca, 0x00, 0xb9, 0x00, 0x09, 0x00, 0x4a, 0x00, 0x00, 0x00, 0x37, 0x00, 0x64, 0x00, 0xff, 0x64 +.byte 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x8c, 0x00, 0x00, 0x00, 0x69, 0x58, 0x60, 0x5d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x31, 0x01, 0xb3, 0x00, 0x07, 0x01, 0x4c, 0x01 +.byte 0x62, 0x00, 0x68, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x80, 0x00, 0x00, 0x00, 0x55, 0x55, 0x5d, 0x96, 0x72, 0xff, 0xff, 0xff +.byte 0xff, 0xff, 0xff, 0xff, 0x44, 0x01, 0x86, 0x00, 0x39, 0x00, 0x59, 0x00, 0x85, 0x00, 0x9c, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a +.byte 0x00, 0x00, 0x00, 0x00, 0x65, 0x6f, 0x8e, 0x7e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x72, 0x52, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x27, 0x01, 0x00, 0x00, 0x00 +.byte 0x4a, 0x04, 0x0e, 0x02, 0x35, 0x16, 0x10, 0x10, 0xda, 0x26, 0x3e, 0x10, 0x4a, 0x04, 0x0e, 0x02, 0x47, 0x0a, 0xd9, 0x26, 0x21, 0x16, 0x3e, 0x10, 0x14, 0x1e, 0x07, 0x1e, 0x30, 0x06, 0x23, 0x16 +.byte 0x24, 0x0e, 0x06, 0x0c, 0x18, 0x14, 0x2f, 0x14, 0x1a, 0x08, 0x27, 0x1c, 0x00, 0x0c, 0xff, 0xff, 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, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 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, 0xff, 0xff, 0xff, 0xff +.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 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, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x3c, 0x01, 0x8d, 0x00, 0x2f, 0x00, 0x22, 0x00, 0xf7, 0x00, 0xe7, 0x00 +.byte 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x54, 0x68, 0x5a, 0x7b, 0x7b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff +.byte 0x6b, 0x01, 0xc8, 0x00, 0xca, 0x00, 0x40, 0x01, 0x5c, 0x00, 0x49, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a, 0x06, 0x00, 0x00, 0x00 +.byte 0x7b, 0x8f, 0x78, 0x51, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x24, 0x01, 0xb3, 0x00, 0x3e, 0x01, 0x4c, 0x01, 0xd5, 0x00, 0x5e, 0x00, 0x00, 0x00, 0x64, 0xc8, 0x00, 0x00, 0xc8, 0x00 +.byte 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x51, 0x8a, 0x6a, 0x7e, 0x64, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9c, 0x54, 0xae, 0x79, 0xff, 0xff, 0xff, 0xff +.byte 0x00, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x00, 0x46, 0x0a, 0x02, 0x06, 0x20, 0x06, 0x0a, 0x0a, 0x23, 0x10, 0x00, 0x0c, 0x28, 0x0c, 0x14, 0x18, 0x32, 0x14, 0x02, 0x16, 0x05, 0x10, 0xff, 0xff +.byte 0x0c, 0x1e, 0x0a, 0x0a, 0x34, 0x12, 0x11, 0x1e, 0x1a, 0x08, 0x05, 0x0c, 0x1e, 0x0a, 0x02, 0x06, 0x20, 0x06, 0x22, 0x0a, 0x15, 0x10, 0x01, 0x0c, 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, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff +.byte 0xff, 0xff, 0xff, 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, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 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, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x63, 0x01, 0xb3, 0x00 +.byte 0xf2, 0x00, 0x35, 0x00, 0x09, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0xff, 0x9b, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a, 0x00, 0x00, 0x00, 0x00, 0x58, 0x61, 0xae, 0x64 +.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x4b, 0x01, 0xc6, 0x00, 0x39, 0x00, 0xf2, 0x00, 0x26, 0x00, 0x59, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10 +.byte 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x5b, 0x72, 0x6a, 0x91, 0xae, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7a, 0x01, 0x8d, 0x00, 0x5e, 0x00, 0xf7, 0x00, 0x55, 0x00, 0x05, 0x01 +.byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x8d, 0x85, 0x9e, 0xa0, 0x60, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff gUnknown_0862608C:: @ 862608C - .incbin "baserom.gba", 0x62608c, 0x2 + .2byte 21 gUnknown_0862608E:: @ 862608E - .incbin "baserom.gba", 0x62608e, 0x4326 + .incbin "baserom.gba", 0x62608e, 0x786 + +gUnknown_08626814:: @ 8626814 + .incbin "baserom.gba", 0x626814, 0xEE8 + +gUnknown_086276FC:: @ 86276FC + .incbin "baserom.gba", 0x6276FC, 0xEE8 + +gUnknown_086285E4:: @ 86285E4 + .incbin "baserom.gba", 0x6285E4, 0xEE8 + +gUnknown_086294CC:: @ 86294CC + .incbin "baserom.gba", 0x6294CC, 0xEE8 gUnknown_0862A3B4:: @ 862A3B4 - .incbin "baserom.gba", 0x62a3b4, 0x218 + .byte 0x03, 0x06, 0x00, 0x00, 0x0B, 0x06, 0x00, 0x00, 0x0D, 0x06, 0x00, 0x00, 0x0F, 0x01, 0x00, 0x00, 0x2B, 0x04, 0x00, 0x00, 0x2D, 0x01, 0x00, 0x00, 0x24, 0x09, 0x00, 0x00, 0x29, 0x04, 0x00, 0x00, 0x05, 0x05, 0x00, 0x00, 0x18, 0x04, 0x00, 0x00, 0x2F, 0x00, 0x00, 0x00, 0x2E, 0x09, 0x00, 0x00, 0x11, 0x0C, 0x00, 0x00, 0x10, 0x0B, 0x00, 0x00, 0x1E, 0x0D, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00, 0x17, 0x03, 0x00, 0x00, 0x0C, 0x04, 0x00, 0x00, 0x38, 0x04, 0x00, 0x00, 0x1C, 0x03, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x19, 0x0B, 0x00, 0x00, 0x09, 0x07, 0x00, 0x00, 0x31, 0x07, 0x00, 0x00, 0x35, 0x07, 0x00, 0x00, 0x36, 0x01, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x2A, 0x03, 0x00, 0x00, 0x16, 0x0D, 0x00, 0x00, 0x0E, 0x03, 0x00, 0x00, 0x15, 0x01, 0x00, 0x00, 0x14, 0x01, 0x00, 0x00, 0x2C, 0x01, 0x00, 0x00, 0x1B, 0x02, 0x00, 0x00, 0x04, 0x01, 0x00, 0x00, 0x07, 0x03, 0x00, 0x00, 0x34, 0x05, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x37, 0x02, 0x00, 0x00, 0x1D, 0x04, 0x00, 0x00, 0x22, 0x09, 0x00, 0x00, 0x1F, 0x01, 0x00, 0x00, 0x25, 0x00, 0x00, 0x00, 0x0A, 0x04, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x06, 0x05, 0x00, 0x00, 0x27, 0x0B, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x12, 0x02, 0x00, 0x00, 0x39, 0x08, 0x00, 0x00, 0x02, 0x0B, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00 +gUnknown_0862A48C:: @ 862A48C + .2byte 0x44, 0x22, 0x14, 0x18, 0x51, 0x3 + +gUnknown_0862A498:: @ 862A498 + .2byte 0xB, 0x22, 0x14, 0x18, 0x51, 3 + +gUnknown_0862A4A4:: @ 862A4A4 + .2byte 0x19, 0x22, 0x14, 0x18, 0x51, 3 + +gUnknown_0862A4B0:: @ 862A4B0 + .2byte 0x23, 0x22, 0x14, 0x18, 0x51, 0x3 + +gUnknown_0862A4BC:: @ 862A4BC + .2byte 0x24, 0x22, 0x14, 0x18, 0x51, 0x3 + +gUnknown_0862A4C8:: @ 862A4C8 + .2byte 0x125, 0x22, 0x14, 0x18, 0x51, 0x3 + +gUnknown_0862A4D4:: @ 862A4D4 + .2byte 0x144, 0x22, 0x14, 0x18, 0x51, 0x3 + +gUnknown_0862A4E0:: @ 862A4E0 + .2byte 0x126, 0x22, 0x14, 0x18, 0x51, 0x3 + +gUnknown_0862A4EC:: @ 862A4EC + .2byte 0x12B, 0x22, 0x14, 0x18, 0x51, 0x3 + +gUnknown_0862A4F8:: @ 862A4F8 + .2byte 0x13A, 0x22, 0x14, 0x18, 0x51, 0x3 + +gUnknown_0862A504:: @ 862A504 + .2byte 0x44, 0x22, 0x14, 0x18, 0x51, 0x3 + +gUnknown_0862A510:: @ 862A510 + .2byte 0xB, 0x22, 0x14, 0x18, 0x51, 0x3 + +gUnknown_0862A51C:: @ 862A51C + .2byte 0x19, 0x22, 0x14, 0x18, 0x51, 0x3 + +gUnknown_0862A528:: @ 862A528 + .2byte 0x23, 0x22, 0x14, 0x18, 0x51, 0x3 + +gUnknown_0862A534:: @ 862A534 + .2byte 0x24, 0x22, 0x14, 0x18, 0x51, 0x3 + +gUnknown_0862A540:: @ 862A540 + .2byte 0x13F, 0x22, 0x14, 0x18, 0x51, 0x3 + +gUnknown_0862A54C:: @ 862A54C + .2byte 0x149, 0x22, 0x14, 0x18, 0x51, 0x3 + +gUnknown_0862A558:: @ 862A558 + .2byte 0x150, 0x22, 0x14, 0x18, 0x51, 0x3 + +gUnknown_0862A564:: @ 862A564 + .2byte 0x133, 0x22, 0x14, 0x18, 0x51, 0x3 + +gUnknown_0862A570:: @ 862A570 + .2byte 0x14D, 0x22, 0x14, 0x18, 0x51, 0x3 + +gUnknown_0862A57C:: @ 862A57C + .4byte gUnknown_0862A48C + .4byte gUnknown_0862A498 + .4byte gUnknown_0862A4A4 + .4byte gUnknown_0862A4B0 + .4byte gUnknown_0862A4BC + .4byte gUnknown_0862A4C8 + .4byte gUnknown_0862A4D4 + .4byte gUnknown_0862A4E0 + .4byte gUnknown_0862A4EC + .4byte gUnknown_0862A4F8 + +gUnknown_0862A5A4:: @ 862A5A4 + .4byte gUnknown_0862A504 + .4byte gUnknown_0862A510 + .4byte gUnknown_0862A51C + .4byte gUnknown_0862A528 + .4byte gUnknown_0862A534 + .4byte gUnknown_0862A540 + .4byte gUnknown_0862A54C + .4byte gUnknown_0862A558 + .4byte gUnknown_0862A564 + .4byte gUnknown_0862A570 + gUnknown_0862A5CC:: @ 862A5CC - .incbin "baserom.gba", 0x62a5cc, 0x8 + .4byte gUnknown_0862A57C + .4byte gUnknown_0862A5A4 gUnknown_0862A5D4:: @ 862A5D4 .incbin "baserom.gba", 0x62a5d4, 0x20 gUnknown_0862A5F4:: @ 862A5F4 - .incbin "baserom.gba", 0x62a5f4, 0x4 + .byte 0, 2, 3, 0 gUnknown_0862A5F8:: @ 862A5F8 - .incbin "baserom.gba", 0x62a5f8, 0x20 + .4byte gUnknown_08626814 + .4byte gUnknown_086276FC + .4byte gUnknown_086285E4 + .4byte gUnknown_086294CC + .4byte gUnknown_085EF8B6 + .4byte gUnknown_085EF8B9 + .4byte gUnknown_085EF8BC + .4byte gUnknown_085EF8BF gUnknown_0862A618:: @ 862A618 .4byte sub_81D581C diff --git a/graphics/pokenav/86226E0.pal b/graphics/pokenav/86226E0.pal new file mode 100755 index 0000000000..77e8abf070 --- /dev/null +++ b/graphics/pokenav/86226E0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 255 255 +16 16 8 +222 222 230 +255 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 diff --git a/graphics/pokenav/8622700.pal b/graphics/pokenav/8622700.pal new file mode 100755 index 0000000000..f27c29bdfb --- /dev/null +++ b/graphics/pokenav/8622700.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 197 0 +246 197 123 +255 255 255 +106 115 123 +255 74 16 +65 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 diff --git a/graphics/pokenav/8622720.pal b/graphics/pokenav/8622720.pal new file mode 100755 index 0000000000..25baec5176 --- /dev/null +++ b/graphics/pokenav/8622720.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +0 197 0 +246 197 123 +255 255 255 +106 115 123 +0 0 0 +189 106 65 +49 65 74 +255 222 156 +180 131 82 +189 139 106 +197 197 197 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +255 74 16 +0 197 0 +246 197 123 +255 255 255 +106 115 123 +0 0 0 +189 106 65 +49 65 74 +255 222 156 +180 131 82 +189 139 106 +197 197 197 +197 197 197 +0 0 0 +0 0 0 +0 0 0 +189 106 65 diff --git a/graphics/pokenav/8622868.pal b/graphics/pokenav/8622868.pal new file mode 100755 index 0000000000..c7abf2b874 --- /dev/null +++ b/graphics/pokenav/8622868.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +0 0 0 +213 213 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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/pokenav/8623228.png b/graphics/pokenav/8623228.png new file mode 100755 index 0000000000000000000000000000000000000000..bf6d6178f393e7eae9b1eb62d996bc65c3e41a75 GIT binary patch literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5Z9!mNl8h?d$%0jd+*z~ z|Nontr~IFj^#AIX|KBYC|KC#ltoZ8xz5mx-{eSO&^PKKbLh*2~7Y=);0?O literal 0 HcmV?d00001 diff --git a/graphics/pokenav/862323C.bin b/graphics/pokenav/862323C.bin new file mode 100755 index 0000000000..817decbb3d --- /dev/null +++ b/graphics/pokenav/862323C.bin @@ -0,0 +1 @@ +0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 \ No newline at end of file diff --git a/graphics/pokenav/8625660.png b/graphics/pokenav/8625660.png new file mode 100755 index 0000000000000000000000000000000000000000..84c74462d64452c0b6bdb86c0e62eadb21f3738e GIT binary patch literal 88 zcmeAS@N?(olHy`uVBq!ia0vp^93adBBp6ht@Pq*=c~2L|5RRG2KloXA1Qsp+Z-2P| kAD_a<|Ljv(#h6brG1yF#(M&X`1u13lboFyt=akR{01~4WS^xk5 literal 0 HcmV?d00001 diff --git a/graphics/pokenav/arrow2.png b/graphics/pokenav/arrow2.png new file mode 100755 index 0000000000000000000000000000000000000000..963cc4a6426e6ce0222c59d495309dec23bdc2e8 GIT binary patch literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^96&6ZRaQU(D&A+A7r%F!i;j$S|pF+ldg zqgjL1sIR;_;8*0#pun=WVuJY>>DT4r?5LY1m|NsAc|GynQdiL8C zhHpm=|G!Im_w4`Gqd?KC|Mza$I|Zl&0VG!CnE`nco-U3d95a&zTA0`b6qjf$={VKk bEf~Peuv&)YWMx&|S&$A-S3j3^P6LKCWImHWsvcMIqyZi&`eEVO8UK?~o*{=OZ` i$8LVSQBga^`n7%Z*Gfgh6Q@3c?DBN=b6Mw<&;$ULGfE%; literal 0 HcmV?d00001 diff --git a/graphics/pokenav/city_maps/dewford_0.bin b/graphics/pokenav/city_maps/dewford_0.bin new file mode 100755 index 0000000000..1cfedcec7f --- /dev/null +++ b/graphics/pokenav/city_maps/dewford_0.bin @@ -0,0 +1 @@ +0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 \ No newline at end of file diff --git a/graphics/pokenav/city_maps/ever_grande_0.bin b/graphics/pokenav/city_maps/ever_grande_0.bin new file mode 100755 index 0000000000..7a8d4019d4 --- /dev/null +++ b/graphics/pokenav/city_maps/ever_grande_0.bin @@ -0,0 +1,4 @@ +00000000000000000000000000000000000 +00000000000 00000000000 +0000000000 +000000000 000000000000000000000000 \ No newline at end of file diff --git a/graphics/pokenav/city_maps/ever_grande_1.bin b/graphics/pokenav/city_maps/ever_grande_1.bin new file mode 100755 index 0000000000..7721054d06 --- /dev/null +++ b/graphics/pokenav/city_maps/ever_grande_1.bin @@ -0,0 +1,3 @@ +000000000000000000000000 +0000000000 +00000000000 000000000 0000000000000000000000000000000000000000000000 \ No newline at end of file diff --git a/graphics/pokenav/city_maps/fallarbor_0.bin b/graphics/pokenav/city_maps/fallarbor_0.bin new file mode 100755 index 0000000000..fc7126f37a --- /dev/null +++ b/graphics/pokenav/city_maps/fallarbor_0.bin @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000000000000000 0 0000 00000000 +00000000000 000000000000000000000000 \ No newline at end of file diff --git a/graphics/pokenav/city_maps/fortree_0.bin b/graphics/pokenav/city_maps/fortree_0.bin new file mode 100755 index 0000000000..223e9a4871 --- /dev/null +++ b/graphics/pokenav/city_maps/fortree_0.bin @@ -0,0 +1 @@ +00000000000000000000000000000000000 000000000 00 0 000000000000000000 0 00000000 000 00000000000000000000000 \ No newline at end of file diff --git a/graphics/pokenav/city_maps/lavaridge_0.bin b/graphics/pokenav/city_maps/lavaridge_0.bin new file mode 100755 index 0000000000..7920578ea3 --- /dev/null +++ b/graphics/pokenav/city_maps/lavaridge_0.bin @@ -0,0 +1,3 @@ +000000000000000000000000000000000000000000000 +00 +000000000 00000000000000000000000000000000000000000000 \ No newline at end of file diff --git a/graphics/pokenav/city_maps/lilycove_0.bin b/graphics/pokenav/city_maps/lilycove_0.bin new file mode 100755 index 0000000000..e8bf09eaef --- /dev/null +++ b/graphics/pokenav/city_maps/lilycove_0.bin @@ -0,0 +1 @@ +0000000000000000000000000000000 0 0000000000000000000 00000000000000000000 00000000000000000000000000000 \ No newline at end of file diff --git a/graphics/pokenav/city_maps/lilycove_1.bin b/graphics/pokenav/city_maps/lilycove_1.bin new file mode 100755 index 0000000000..99895574d1 --- /dev/null +++ b/graphics/pokenav/city_maps/lilycove_1.bin @@ -0,0 +1,3 @@ +00000000000000000000000000000000 0 0 0 0 00 000000000 +0000 0 0 0 0 0 00 000000000 +000000 0 0 0 00 0000000000000000000000 \ No newline at end of file diff --git a/graphics/pokenav/city_maps/littleroot_0.bin b/graphics/pokenav/city_maps/littleroot_0.bin new file mode 100755 index 0000000000..902ce80bb9 --- /dev/null +++ b/graphics/pokenav/city_maps/littleroot_0.bin @@ -0,0 +1 @@ +0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 \ No newline at end of file diff --git a/graphics/pokenav/city_maps/mauville_0.bin b/graphics/pokenav/city_maps/mauville_0.bin new file mode 100755 index 0000000000..103d39e54b --- /dev/null +++ b/graphics/pokenav/city_maps/mauville_0.bin @@ -0,0 +1,3 @@ +000000000000000000000000000000000000000000 00 00 0 000000 +0000000000 +00000000 0 00 00000000000000000000000000 \ No newline at end of file diff --git a/graphics/pokenav/city_maps/mauville_1.bin b/graphics/pokenav/city_maps/mauville_1.bin new file mode 100755 index 0000000000..a0662010a7 --- /dev/null +++ b/graphics/pokenav/city_maps/mauville_1.bin @@ -0,0 +1,3 @@ +000000000000000000000000000000000000 +000000 000 00 0 000000 +0000000000 0000000000000 0 00000000 00000000000000 \ No newline at end of file diff --git a/graphics/pokenav/city_maps/mossdeep_0.bin b/graphics/pokenav/city_maps/mossdeep_0.bin new file mode 100755 index 0000000000..fd03cfe023 --- /dev/null +++ b/graphics/pokenav/city_maps/mossdeep_0.bin @@ -0,0 +1 @@ +0000000000000000000000000000000000000000000000000000000000000000000000000000000000 0 00000000000000000 \ No newline at end of file diff --git a/graphics/pokenav/city_maps/mossdeep_1.bin b/graphics/pokenav/city_maps/mossdeep_1.bin new file mode 100755 index 0000000000..6c11d5624f --- /dev/null +++ b/graphics/pokenav/city_maps/mossdeep_1.bin @@ -0,0 +1,3 @@ +00000000000000000000000000 0 00000000 +0000000000 +000000000 000000000 000 0 00000000 0000000000000000000000000 \ No newline at end of file diff --git a/graphics/pokenav/city_maps/oldale_0.bin b/graphics/pokenav/city_maps/oldale_0.bin new file mode 100755 index 0000000000..297bf4c058 --- /dev/null +++ b/graphics/pokenav/city_maps/oldale_0.bin @@ -0,0 +1 @@ +0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 \ No newline at end of file diff --git a/graphics/pokenav/city_maps/pacifidlog_0.bin b/graphics/pokenav/city_maps/pacifidlog_0.bin new file mode 100755 index 0000000000..eb3f192460 --- /dev/null +++ b/graphics/pokenav/city_maps/pacifidlog_0.bin @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000000 00 0 00000000 +0000000000 +00000000000 0 000000000000000000000000 \ No newline at end of file diff --git a/graphics/pokenav/city_maps/petalburg_0.bin b/graphics/pokenav/city_maps/petalburg_0.bin new file mode 100755 index 0000000000..45124943d9 --- /dev/null +++ b/graphics/pokenav/city_maps/petalburg_0.bin @@ -0,0 +1,4 @@ +000000000000000000000000000000000 +00000000 0 00 00000000000 +00000000000 00 0000000 +00000000000 00000000000000 \ No newline at end of file diff --git a/graphics/pokenav/city_maps/rustboro_0.bin b/graphics/pokenav/city_maps/rustboro_0.bin new file mode 100755 index 0000000000..ccf5b21a2a --- /dev/null +++ b/graphics/pokenav/city_maps/rustboro_0.bin @@ -0,0 +1,5 @@ +000000000000000000000000000000000000 0 0 0000000 +0000000000 +000000000 00 0 00000000 +0000000000 +000000000000000 \ No newline at end of file diff --git a/graphics/pokenav/city_maps/rustboro_1.bin b/graphics/pokenav/city_maps/rustboro_1.bin new file mode 100755 index 0000000000..961dd0dcc2 --- /dev/null +++ b/graphics/pokenav/city_maps/rustboro_1.bin @@ -0,0 +1,6 @@ +000000000000000 +0000000000 +0000000 0 0 00000000000 +0000000000 +00000000000 0 0 000000 +0000000000 0000000000000000 \ No newline at end of file diff --git a/graphics/pokenav/city_maps/slateport_0.bin b/graphics/pokenav/city_maps/slateport_0.bin new file mode 100755 index 0000000000..bdc1391c39 --- /dev/null +++ b/graphics/pokenav/city_maps/slateport_0.bin @@ -0,0 +1,5 @@ +00000000000000000000000000000000000 +00000000 0 00 0 00000 +000000000 00 0 00000000 +000 +000000 00 0 0000000000000000 \ No newline at end of file diff --git a/graphics/pokenav/city_maps/slateport_1.bin b/graphics/pokenav/city_maps/slateport_1.bin new file mode 100755 index 0000000000..11815b2a5e --- /dev/null +++ b/graphics/pokenav/city_maps/slateport_1.bin @@ -0,0 +1,7 @@ +000000000000 +000 +0000000000 +0000000000 +0000000000 +0000000000 +000000000 00 0 00000000 0000000000000000000000000 \ No newline at end of file diff --git a/graphics/pokenav/city_maps/sootopolis_0.bin b/graphics/pokenav/city_maps/sootopolis_0.bin new file mode 100755 index 0000000000..78d069d56a --- /dev/null +++ b/graphics/pokenav/city_maps/sootopolis_0.bin @@ -0,0 +1 @@ +0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 \ No newline at end of file diff --git a/graphics/pokenav/city_maps/verdanturf_0.bin b/graphics/pokenav/city_maps/verdanturf_0.bin new file mode 100755 index 0000000000..2b651d26f8 --- /dev/null +++ b/graphics/pokenav/city_maps/verdanturf_0.bin @@ -0,0 +1 @@ +0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 \ No newline at end of file diff --git a/graphics/pokenav/condition_search2.bin b/graphics/pokenav/condition_search2.bin new file mode 100755 index 0000000000000000000000000000000000000000..4c54a20702c99f599db3c8b975dadb1c9bb06e92 GIT binary patch literal 1280 zcmZP)V8RL+1Q-cI1|Yz$n@NC8fSn*54*Hn|SWqAt<8 literal 0 HcmV?d00001 diff --git a/graphics/pokenav/condition_search2.png b/graphics/pokenav/condition_search2.png new file mode 100755 index 0000000000000000000000000000000000000000..c50985beefc07c747330820c4fc85ce986714a5a GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!VDxsPNql!DT4r?5Lbqy3`uLA{r~?ztGF5{ z7FE5((9!GYz5i3@oSn1e?9rn~fl@$mIFP=-{5g=*f`IF8r*1zX z4%s8x61veY>>P)#HJWTcJ2O7XY~NJA^XyrV|I3I-Uf-50v1$U#e#^%GxLFQ~qOV$I znZ!H%o)jJ2v8UmVQ7V(ZghjtwtiRarptyIk-Vff?Kg+`cb}&wnIn!;*dCM2%NKaQkmvv4FO#tJkUcmqW literal 0 HcmV?d00001 diff --git a/graphics/pokenav/icon2.png b/graphics/pokenav/icon2.png new file mode 100755 index 0000000000000000000000000000000000000000..83624135bafa7dbdd84c461f10a15fe68249ea4f GIT binary patch literal 630 zcmV-+0*U>JP)^~66kwQ#S@m}JDZ|t2 zEO)O(;XvNs zB}2f5m!uE9vOdQCL?6A#$S%@(DZc%rpnSx301jf+M$WLk2rt$8*%H4=OJH$NaH9pX(#dAMf=KoR>#$reyU zsW*q2LA|a!lezbqQ0n_ZYI`9KE Q^Z)<=07*qoM6N<$f|a%&KL7v# literal 0 HcmV?d00001 diff --git a/graphics/pokenav/icon2_unused.png b/graphics/pokenav/icon2_unused.png new file mode 100755 index 0000000000000000000000000000000000000000..c32a9b9be9f17feb7585d641a220838974e2e0dc GIT binary patch literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!VDx^^%AmxltF+`i0l9V|JNjGu9-4r%bGR+ zj~0KcPFk|$Y*NxUpg6~t|3Fo6aQ5ugHEZ@NEI8W&6!P_SaSV}|y0zbsiNTPCWpBgx z)t^l57x*5QeK%``v1qUkx0cB4%GQO>LKCWImHWsvcMIqyZi&`eEVO8UK?~o*{=OZ` i$8LVSQBga^`n7%Z*Gfgh6Q@3c?DBN=b6Mw<&;$ULGfE%; literal 0 HcmV?d00001 diff --git a/graphics/pokenav/outline.png b/graphics/pokenav/outline.png new file mode 100755 index 0000000000000000000000000000000000000000..5700b272ce836b32c9ad679160db1cbc4ba4a3bd GIT binary patch literal 596 zcmV-a0;~OrP)kTtu9&mm7`gkewva2YGA+f=!IZaN_Vfcgut z?O%ZLY@-hVm0!!KuhPMm&94AH0J-8WQdASq-k9keQVYJ@2Q9)UK%y*7#ITTh03tz( zwUVywOa+*_B{0U%!;!HAm{__h9tUR!q_%_84~u01a5iPC5^36>`T+$j;Bq1G`&f9g zX>b2Tv8hK#b$BJogoj|P%@}a;v{D-tXh(~oUYm80=aaNcYV15*4U~F z4!m3LWn_RMxkwPr!)cA2wh;@fn{EJ5Gqru#VP$7&njNqWIM#v0FuqKOk-7;{Z0UP0Fu_lOn|o|_=P}z0=+zdI?inV-P*5!)+Eb$ zLhmnRn>F@0AbT6%I4Een6sY=7h<(&}b+rJM*$(YCyJkVJ0kEWqXePWq{c@N@?9U#2 z82VeWFNCRfKbdxuckROg=AS)4z$_QKdNZdGb?x$!#n?xK(qFg3gH@9`9GrwAt}dzZ zw5{F05f^G6PVsO^Qt?%PC$AFmelToKXF6`tvduMpy*QSkG7oMN0000SsijGuz~gNgy}e>T~0fp)>hn#HVMchyvlh4r5XFVLb*=ZF3- zJ^I*k!l05v99%JB#Fz1qOSX!+h4NjRlooM literal 0 HcmV?d00001 diff --git a/graphics/pokenav/pokeball.png b/graphics/pokenav/pokeball.png new file mode 100755 index 0000000000000000000000000000000000000000..9eb7d91651d5c9772c34030fc6388fa2ab429378 GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!VDx|E`RzTNErn9gt-3y-wkB`-@=iVRn5S_ z@vS)Me|6NHHA}wjZT^3>``))_&;H+g_wC#N|Nj}1l7K2t_EnYxseVrv#}J9BwY?iT z4;u)$@@j4Ad)To$rE7s`%@^8z4nRwdShxyT=-nB zBNFiq#}6>c1xlXwoA%8+h^?Y7;AOVg%iL0(-Iw*Y$J^I3);zP^r~jCBGSF!Zp00i_ I>zopr02vT+mjD0& literal 0 HcmV?d00001 diff --git a/graphics/pokenav/pokeball_matchcall.pal b/graphics/pokenav/pokeball_matchcall.pal new file mode 100755 index 0000000000..25baec5176 --- /dev/null +++ b/graphics/pokenav/pokeball_matchcall.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +0 197 0 +246 197 123 +255 255 255 +106 115 123 +0 0 0 +189 106 65 +49 65 74 +255 222 156 +180 131 82 +189 139 106 +197 197 197 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +255 74 16 +0 197 0 +246 197 123 +255 255 255 +106 115 123 +0 0 0 +189 106 65 +49 65 74 +255 222 156 +180 131 82 +189 139 106 +197 197 197 +197 197 197 +0 0 0 +0 0 0 +0 0 0 +189 106 65 diff --git a/graphics/pokenav/pokeball_matchcall.png b/graphics/pokenav/pokeball_matchcall.png new file mode 100755 index 0000000000000000000000000000000000000000..456994258aa0c1170ddbbcde36a5f16c34a05822 GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^96&6ZRaQU(D&A+8KZ8NMB@{{R1fR&g~@ zY;TsMp`+LTdvmrl2kq_7I(qadPzopx0sp-OqBAsZ13CJhE{-7_Gm`~anAl8|csV3K z0oAdo+TE^C_AoOuOFnTgXK$}!_4hmt#<2EP;tU0>V$1#<@kj@mvd$@?2>|9W BHSYib literal 0 HcmV?d00001 diff --git a/graphics/pokenav/ribbons_icon.png b/graphics/pokenav/ribbons_icon.png new file mode 100755 index 0000000000000000000000000000000000000000..095891feb75e487425e649370c77d2cb12063747 GIT binary patch literal 486 zcmV@P)Yo9oZjB%|NsB?_F~1wVw{{H#X&*tT0x{@&Bbc}00000#s2^R00000hJ4{50004T zNkl4L6j8a2=qQeBq&^_p@1p{ zRZfwkAn4)$jqN1Dk%)_ztiAj8&vL%j5z7V(!v5bU^vRSH^$19k9jx>1 zdowYo9oZjB%|NsB?_F~1wVw{{H#X&*tT0x{@&Bbc}00000#s2^R00000hJ4{5000IU zNkl=blKTLH|{jSH$`5H-GEA;2xG`~bsHYF}ncavwH1$o;&M3v1b_o51%l;4V3LC3V#lqBK(N+F zlPW-GuI(exjN^Sysl{z6@9;F#i7#E2hD7%9!_puR4~}*@9d-#ggG0uT%A!0tlJ`8*i63*maqq;^F~HI>^JQrWFl0d3dIIop#C#b)0=O|| zmX0ae9H&G!Ux5Nw^5o;lrc--ySaKzo9xEP@In1GvX{ZN!*>&FcO9>Jvx3ULepk7FN4-i{vvI#tDw zPPH(ev=u+-jsOg>;s*x005F)EA1bW$qxr!A#SaH)erSL?E%;$NMN$0F!=hoJ_yJWD z)ll)n1@%4fqiXnJLR3!n-vb|s4#F=TRMdd4Tj&U*`d8Be=}YU}NS_G`MqKlD!6()&05Gg2F$-dO02Q`~^@8%Ch*3M&4MHTgpya!QA0 zF;`rmkuCm41OnRf-9jeXMKuOf>q2`<@xg1L6|!Fm_%bspkg1ZzE}){exV?9F=U!<0 zfO@ufmUXo)#JGeOrM~7Jg;Kv|(ZR+1sC7&yssxlCDRoLngNE(d5TIe$gS3Vfrc=pc zOfNZCa=#RyatO;oE~Vi^yxk~q%(2h_;Qv-Y6;YyYff(2ih4hau6|D6iil7pZuTeY} zausEW^H;DMMeA@SFCG%8x)8m78Li=?DwSIh<*#4n5p0<0v9Os(QGT&zr^jj@#c`Cc z8#}@%--x2EJTes-Y+h__UTkb$SWCZtNu9p_{c>Rbky59^3~Lv9W0=dWHr+*8J7)o* z+<#*YvktK80dcOP<$zaL<^TX6!2PA}0X6j=<)4dC)rGgv>x&x|cQH3EmI>1U=Y(BP z9iXR2{kih?R5JSNe|Y%|s3cvTuut@R|Z{TRJrQ@^Dus z_7zDLWFlo>y5l=E`e~Z;2duXg%!L# z55x+>=W1a?$t=a4aJFSKA#ccKs)B-!C0`$<>UW(%vx8nF%A$SsvwBT8^sJbB50@NbF zY7|8obV8$1t7?v|Dus3JPZjD)p=-SX(}l7#sDy<|x26g`08v$oK_{TN+f$}FYf>c( zDuhr}wU9!?90GdSAVBui1j6zg0nx;po@)1CKPZwcwV0E*L2N37LRe->MV?~IC0YIx X^`^v0OYn$A00000NkvXXu0mjfuJsmM literal 0 HcmV?d00001 diff --git a/graphics/pokenav/sparkle.png b/graphics/pokenav/sparkle.png new file mode 100755 index 0000000000000000000000000000000000000000..5949b376efe275f66b1fb1fa0c3d25fc4c7f61e9 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^0zh2A!VDyzYQE(FQU(D&A+CmomQ$uIS@NG@?|+78 z{~7-O2TI@sN6-GZpEdUoP`=yK#W6%gPETTD7L@I<;5y*4;Fiq7Aiky^z63_M8J0{>EPF-I2{@$h zuyWAl9QP(gqp#h|ODjl+rQnCL4fwlK#z&n7%x<0x!5BOzdk{2m8K##0GNF5-zP dM*?g^7#V_!1W(lJH~#@S+tbz0Wt~$(695^lPCx(v literal 0 HcmV?d00001 diff --git a/graphics/pokenav/ui_matchcall.bin b/graphics/pokenav/ui_matchcall.bin new file mode 100755 index 0000000000000000000000000000000000000000..9aec20dfe944490c1f6be265feb892ee4466eada GIT binary patch literal 1280 zcmZotXu=8`6dDP_28IR(?7Ev2S{2#|!oi@wSpgetA=>@z3fN!=-Sl@WV1qqG+mFrn p%?d-u|JXvmU4ee#Kho{TmioFCdK5Ypx(Gsi`5#xgf-FuA{Q#E=m;wL* literal 0 HcmV?d00001 diff --git a/graphics/pokenav/ui_matchcall.png b/graphics/pokenav/ui_matchcall.png new file mode 100755 index 0000000000000000000000000000000000000000..24c6c2ff6620389d4ba321b402212d2e5e26723a GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvg8-ipSB9eu-;P%Q|NlR$xEd(7 zH>=pt(d+-aB}dm(@7*%z=+UDyjfLoM~WXJle_t<8 literal 0 HcmV?d00001 diff --git a/graphics/pokenav/ui_ribbons.png b/graphics/pokenav/ui_ribbons.png new file mode 100755 index 0000000000000000000000000000000000000000..aa9d9e305c7d0f218a72909c4565e838e5977bcb GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!VDxsPNql!DT4r?5Lbqy4FBh3{r~?ztGF5{ zwl~Ys(9!Gvy*XQ&gZ6f39X)y!C|aqnckAH1o5mWKuGV4NazrrVVBmM_SWp00i_>zopr0Nj>az5oCK literal 0 HcmV?d00001 diff --git a/graphics/pokenav/zoom_tiles.png b/graphics/pokenav/zoom_tiles.png new file mode 100755 index 0000000000000000000000000000000000000000..40ae2717b690ce30cb83f70aaea8fae3090be83b GIT binary patch literal 431 zcmV;g0Z{&lP)h(#0L1{bgKFLY=A8fk=H}*eASpqEO3i~(@54q?0003x zNklW~ zZ)VoX+Qi7nZjkb{p5ITiJ0^mv0X;+10-G3@Py7AX&0=wJm(tb!dVT%>fWbAZhplDe z+qf0-8Gt(L2xz9N>pqan3LsaYb472wXilKqq^SK0JnnX{V*puER@+v#umBc~1j^C9 zYo-Ib<{Q*NACUOw{iXSYv?&?_Zda?zzXP(`G+_E0POf>@Sw9tqTQ0^x&VfK6Ap+PK zIzR}pPDe>fh&uodN<}NUXyjo6JlO=Zp*taHL0T?bIt7qEGFvy#-y!liDKS2c$V0?L zi8H{g0GeL;79ca|(Gidtp0&q`6Zj Z=r_jDFsD%WlaT-b002ovPDHLkV1j67w{-vj literal 0 HcmV?d00001 diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 250916022f..a58e64571b 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -14,7 +14,7 @@ bttransgfxdir := graphics/battle_transitions typesdir := graphics/types rayquazadir := graphics/rayquaza_scene roulettegfxdir := graphics/roulette -pknvdir := graphics/pokenav/ +pknvdir := graphics/pokenav pknvoptionsdir := graphics/pokenav/options types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark @@ -481,3 +481,11 @@ $(pknvoptionsdir)/options.4bpp: $(pknvoptionsdir)/hoenn_map.4bpp \ $(pknvdir)/header.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 53 + +$(pknvdir)/outline.4bpp: $(pknvdir)/outline.png + $(GFX) $< $@ -num_tiles 53 + +$(pknvdir)/ui_matchcall.4bpp: $(pknvdir)/ui_matchcall.png + $(GFX) $< $@ -num_tiles 13 + + \ No newline at end of file diff --git a/tools/gbagfx/convert_png.c b/tools/gbagfx/convert_png.c index 37904318c1..cdfa39a7ad 100644 --- a/tools/gbagfx/convert_png.c +++ b/tools/gbagfx/convert_png.c @@ -45,6 +45,40 @@ static FILE *PngReadOpen(char *path, png_structp *pngStruct, png_infop *pngInfo) return fp; } +static unsigned char *ConvertBitDepth(unsigned char *src, int srcBitDepth, int destBitDepth, int numPixels) +{ + // Round the number of bits up to the next 8 and divide by 8 to get the number of bytes. + int srcSize = ((numPixels * srcBitDepth + 7) & ~7) / 8; + int destSize = ((numPixels * destBitDepth + 7) & ~7) / 8; + unsigned char *output = calloc(destSize, 1); + unsigned char *dest = output; + int i; + int j; + int destBit = 8 - destBitDepth; + + for (i = 0; i < srcSize; i++) + { + unsigned char srcByte = src[i]; + + for (j = 8 - srcBitDepth; j >= 0; j -= srcBitDepth) + { + unsigned char pixel = (srcByte >> j) % (1 << srcBitDepth); + + if (pixel >= (1 << destBitDepth)) + FATAL_ERROR("Image exceeds the maximum color value for a %ibpp image.\n", destBitDepth); + *dest |= pixel << destBit; + destBit -= destBitDepth; + if (destBit < 0) + { + dest++; + destBit = 8 - destBitDepth; + } + } + } + + return output; +} + void ReadPng(char *path, struct Image *image) { png_structp png_ptr; @@ -54,9 +88,6 @@ void ReadPng(char *path, struct Image *image) int bit_depth = png_get_bit_depth(png_ptr, info_ptr); - if (bit_depth != image->bitDepth) - FATAL_ERROR("\"%s\" has a bit depth of %d, but the expected bit depth is %d.\n", path, bit_depth, image->bitDepth); - int color_type = png_get_color_type(png_ptr, info_ptr); if (color_type != PNG_COLOR_TYPE_GRAY && color_type != PNG_COLOR_TYPE_PALETTE) @@ -93,6 +124,17 @@ void ReadPng(char *path, struct Image *image) free(row_pointers); fclose(fp); + + if (bit_depth != image->bitDepth) + { + unsigned char *src = image->pixels; + + if (bit_depth != 1 && bit_depth != 2 && bit_depth != 4 && bit_depth != 8) + FATAL_ERROR("Bit depth of image must be 1, 2, 4, or 8.\n"); + image->pixels = ConvertBitDepth(image->pixels, bit_depth, image->bitDepth, image->width * image->height); + free(src); + image->bitDepth = bit_depth; + } } void ReadPngPalette(char *path, struct Palette *palette) From 63460df7fd758f9178657879e2d210016e75ac43 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Tue, 16 Jan 2018 00:40:42 -0500 Subject: [PATCH 17/64] dump shop.s --- data/shop.s | 85 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 71 insertions(+), 14 deletions(-) diff --git a/data/shop.s b/data/shop.s index 304ea12f7d..2b34d28522 100644 --- a/data/shop.s +++ b/data/shop.s @@ -24,43 +24,100 @@ gUnknown_08589A28:: @ 8589A28 .4byte HandleShopMenuQuit gUnknown_08589A38:: @ 8589A38 - .incbin "baserom.gba", 0x589a38, 0x10 + .byte 0, 2, 1, 9, 6, 15, 8, 0, 0, 2, 1, 9, 4, 15, 8, 0 gUnknown_08589A48:: @ 8589A48 - .incbin "baserom.gba", 0x589a48, 0x18 + .byte 0, 0, 0, 0, 0x3D, 0, 14, 8, 21, 1, 14, 8, 0, 0, 0, 0, 1, 0, 8, 0, 33, 48, 0, 7 gUnknown_08589A60:: @ 8589A60 - .incbin "baserom.gba", 0x589a60, 0x10 + .4byte 0x1F8 + .4byte 0x11E1 + .4byte 0x21D2 + .4byte 0x31C3 gUnknown_08589A70:: @ 8589A70 - .incbin "baserom.gba", 0x589a70, 0x38 + .byte 0 + .byte 1 + .byte 1 + .byte 10 + .byte 2 + .byte 15 + .2byte 30 + .byte 0 + .byte 14 + .byte 2 + .byte 15 + .byte 16 + .byte 15 + .2byte 50 + .byte 0 + .byte 0 + .byte 13 + .byte 14 + .byte 6 + .byte 15 + .2byte 0x122 + .byte 0 + .byte 1 + .byte 11 + .byte 12 + .byte 2 + .byte 15 + .2byte 0x176 + .byte 0 + .byte 18 + .byte 11 + .byte 10 + .byte 2 + .byte 15 + .2byte 0x18E + .byte 0 + .byte 2 + .byte 15 + .byte 27 + .byte 4 + .byte 15 + .2byte 0x1A2 + .byte 0xFF + .byte 0 + .byte 0 + .byte 0 + .byte 0 + .byte 0 + .2byte 0 gUnknown_08589AA8:: @ 8589AA8 - .incbin "baserom.gba", 0x589aa8, 0x8 + .byte 0 + .byte 21 + .byte 9 + .byte 5 + .byte 4 + .byte 15 + .2byte 0x20E gUnknown_08589AB0:: @ 8589AB0 - .incbin "baserom.gba", 0x589ab0, 0x3 + .byte 1, 2, 3 gUnknown_08589AB3:: @ 8589AB3 - .incbin "baserom.gba", 0x589ab3, 0x7 + .byte 0, 2, 3, 0, 3, 2, 0 gUnknown_08589ABA:: @ 8589ABA - .incbin "baserom.gba", 0x589aba, 0x6 + .2byte 0x284, 0x282, 0x280 gUnknown_08589AC0:: @ 8589AC0 - .incbin "baserom.gba", 0x589ac0, 0x6 + .2byte 0x285, 0x283, 0x281 gUnknown_08589AC6:: @ 8589AC6 - .incbin "baserom.gba", 0x589ac6, 0x6 + .2byte 0x28C, 0x28A, 0x288 gUnknown_08589ACC:: @ 8589ACC - .incbin "baserom.gba", 0x589acc, 0x6 + .2byte 0x28D, 0x28B, 0x289 gUnknown_08589AD2:: @ 8589AD2 - .incbin "baserom.gba", 0x589ad2, 0x6 + .2byte 0x2A0, 0x2A2, 0x2A4 gUnknown_08589AD8:: @ 8589AD8 - .incbin "baserom.gba", 0x589ad8, 0x6 + .2byte 0x2A1, 0x2A3, 0x2A5 gUnknown_08589ADE:: @ 8589ADE - .incbin "baserom.gba", 0x589ade, 0x6 + .2byte 0x2A8, 0x2AA, 0x2AC From f9d7b6a9236418677dadc0a8895d17695115d9e6 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Tue, 16 Jan 2018 00:56:12 -0500 Subject: [PATCH 18/64] fixes --- data/shop.s | 72 +++++++++++------------------------------------------ 1 file changed, 14 insertions(+), 58 deletions(-) diff --git a/data/shop.s b/data/shop.s index 2b34d28522..62af8f1068 100644 --- a/data/shop.s +++ b/data/shop.s @@ -24,10 +24,14 @@ gUnknown_08589A28:: @ 8589A28 .4byte HandleShopMenuQuit gUnknown_08589A38:: @ 8589A38 - .byte 0, 2, 1, 9, 6, 15, 8, 0, 0, 2, 1, 9, 4, 15, 8, 0 + window_template 0, 2, 1, 9, 6, 15, 8 + window_template 0, 2, 1, 9, 4, 15, 8 gUnknown_08589A48:: @ 8589A48 - .byte 0, 0, 0, 0, 0x3D, 0, 14, 8, 21, 1, 14, 8, 0, 0, 0, 0, 1, 0, 8, 0, 33, 48, 0, 7 + .byte 0, 0, 0, 0 + .4byte BuyMenuPrintItemDescriptionAndShowItemIcon + .4byte BuyMenuPrintPriceInList + .byte 0, 0, 0, 0, 1, 0, 8, 0, 33, 48, 0, 7 gUnknown_08589A60:: @ 8589A60 .4byte 0x1F8 @@ -36,64 +40,16 @@ gUnknown_08589A60:: @ 8589A60 .4byte 0x31C3 gUnknown_08589A70:: @ 8589A70 - .byte 0 - .byte 1 - .byte 1 - .byte 10 - .byte 2 - .byte 15 - .2byte 30 - .byte 0 - .byte 14 - .byte 2 - .byte 15 - .byte 16 - .byte 15 - .2byte 50 - .byte 0 - .byte 0 - .byte 13 - .byte 14 - .byte 6 - .byte 15 - .2byte 0x122 - .byte 0 - .byte 1 - .byte 11 - .byte 12 - .byte 2 - .byte 15 - .2byte 0x176 - .byte 0 - .byte 18 - .byte 11 - .byte 10 - .byte 2 - .byte 15 - .2byte 0x18E - .byte 0 - .byte 2 - .byte 15 - .byte 27 - .byte 4 - .byte 15 - .2byte 0x1A2 - .byte 0xFF - .byte 0 - .byte 0 - .byte 0 - .byte 0 - .byte 0 - .2byte 0 + window_template 0, 1, 1, 10, 2, 15, 30 + window_template 0, 14, 2, 15, 16, 15, 50 + window_template 0, 0, 13, 14, 6, 15, 0x122 + window_template 0, 1, 11, 12, 2, 15, 0x176 + window_template 0, 18, 11, 10, 2, 15, 0x18E + window_template 0, 2, 15, 27, 4, 15, 0x1A2 + window_template_terminator gUnknown_08589AA8:: @ 8589AA8 - .byte 0 - .byte 21 - .byte 9 - .byte 5 - .byte 4 - .byte 15 - .2byte 0x20E + window_template 0, 21, 9, 5, 4, 15, 0x20E gUnknown_08589AB0:: @ 8589AB0 .byte 1, 2, 3 From 29d84dabe61051238c7b7e6dd805fc2de447ba72 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Tue, 16 Jan 2018 01:01:14 -0500 Subject: [PATCH 19/64] spacing fix --- data/shop.s | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/data/shop.s b/data/shop.s index 62af8f1068..d19feff1ec 100644 --- a/data/shop.s +++ b/data/shop.s @@ -25,31 +25,31 @@ gUnknown_08589A28:: @ 8589A28 gUnknown_08589A38:: @ 8589A38 window_template 0, 2, 1, 9, 6, 15, 8 - window_template 0, 2, 1, 9, 4, 15, 8 + window_template 0, 2, 1, 9, 4, 15, 8 gUnknown_08589A48:: @ 8589A48 .byte 0, 0, 0, 0 - .4byte BuyMenuPrintItemDescriptionAndShowItemIcon - .4byte BuyMenuPrintPriceInList - .byte 0, 0, 0, 0, 1, 0, 8, 0, 33, 48, 0, 7 + .4byte BuyMenuPrintItemDescriptionAndShowItemIcon + .4byte BuyMenuPrintPriceInList + .byte 0, 0, 0, 0, 1, 0, 8, 0, 33, 48, 0, 7 gUnknown_08589A60:: @ 8589A60 .4byte 0x1F8 - .4byte 0x11E1 - .4byte 0x21D2 - .4byte 0x31C3 + .4byte 0x11E1 + .4byte 0x21D2 + .4byte 0x31C3 gUnknown_08589A70:: @ 8589A70 window_template 0, 1, 1, 10, 2, 15, 30 - window_template 0, 14, 2, 15, 16, 15, 50 - window_template 0, 0, 13, 14, 6, 15, 0x122 - window_template 0, 1, 11, 12, 2, 15, 0x176 - window_template 0, 18, 11, 10, 2, 15, 0x18E - window_template 0, 2, 15, 27, 4, 15, 0x1A2 - window_template_terminator + window_template 0, 14, 2, 15, 16, 15, 50 + window_template 0, 0, 13, 14, 6, 15, 0x122 + window_template 0, 1, 11, 12, 2, 15, 0x176 + window_template 0, 18, 11, 10, 2, 15, 0x18E + window_template 0, 2, 15, 27, 4, 15, 0x1A2 + window_template_terminator gUnknown_08589AA8:: @ 8589AA8 - window_template 0, 21, 9, 5, 4, 15, 0x20E + window_template 0, 21, 9, 5, 4, 15, 0x20E gUnknown_08589AB0:: @ 8589AB0 .byte 1, 2, 3 From 449d64593690fd95e58f09c245c7b0f034ce57df Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Tue, 16 Jan 2018 02:20:48 -0500 Subject: [PATCH 20/64] window_template usage --- data/pokenav.s | 120 +++++++------------------------------------------ 1 file changed, 15 insertions(+), 105 deletions(-) diff --git a/data/pokenav.s b/data/pokenav.s index cc100bc5ba..9507e7daed 100644 --- a/data/pokenav.s +++ b/data/pokenav.s @@ -126,20 +126,8 @@ gUnknown_0861FA04:: @ 861FA04 .byte 0x0 gUnknown_0861FA08:: @ 861FA08 - .byte 0x0 - .byte 0x1 - .byte 0x16 - .byte 0x10 - .byte 0x2 - .byte 0x0 - .2byte 0x36 - .byte 0xFF - .byte 0x0 - .byte 0x0 - .byte 0x0 - .byte 0x0 - .byte 0x0 - .2byte 0x0 + window_template 0, 1, 0x16, 0x10, 0x2, 0x0, 0x36 + window_template_terminator gUnknown_0861FA18:: @ 861FA18 .4byte gUnknown_085EBED5 @@ -425,13 +413,7 @@ gUnknown_08620244:: @ 8620244 .4byte gUnknown_0862023C gUnknown_086202CC:: @ 86202CC - .byte 1 - .byte 3 - .byte 0x11 - .byte 0x18 - .byte 2 - .byte 1 - .2byte 8 + window_template 1, 3, 17, 0x18, 2, 1, 8 gUnknown_086202D4:: @ 86202D4 .4byte gUnknown_085EBCC5 @@ -1563,22 +1545,10 @@ gUnknown_08622798:: @ 8622798 .4byte sub_81CBB74 gUnknown_086227D8:: @ 86227D8 - .byte 2 - .byte 0 - .byte 5 - .byte 11 - .byte 2 - .byte 2 - .2byte 16 + window_template 2, 0, 5, 11, 2, 2, 16 gUnknown_086227E0:: @ 86227E0 - .byte 2 - .byte 0 - .byte 9 - .byte 11 - .byte 8 - .byte 2 - .2byte 0x26 + window_template 2, 0, 9, 11, 8, 2, 0x26 gUnknown_086227E8:: @ 86227E8 .4byte gUnknown_085EC017 @@ -1591,13 +1561,7 @@ gUnknown_086227F4:: @ 86227F4 .align 2 gUnknown_08622808:: @ 8622808 - .byte 1 - .byte 1 - .byte 12 - .byte 0x1C - .byte 4 - .byte 1 - .2byte 10 + window_template 1, 1, 12, 0x1C, 4, 1, 10 gUnknown_08622810:: @ 8622810 obj_tiles gUnknown_086226B8, 0x40, 7 @@ -1778,40 +1742,16 @@ gUnknown_08623358:: @ 8623358 .4byte 0x31EB gUnknown_08623364:: @ 8623364 - .byte 1 - .byte 13 - .byte 1 - .byte 13 - .byte 4 - .byte 15 - .2byte 2 + window_template 1, 13, 1, 13, 4, 15, 2 gUnknown_0862336C:: @ 862336C - .byte 1 - .byte 1 - .byte 6 - .byte 7 - .byte 2 - .byte 15 - .2byte 0x36 + window_template 1, 1, 6, 7, 2, 15, 0x36 gUnknown_08623374:: @ 8623374 - .byte 1 - .byte 1 - .byte 0x1C - .byte 5 - .byte 2 - .byte 15 - .2byte 0x44 + window_template 1, 1, 0x1C, 5, 2, 15, 0x44 gUnknown_0862337C:: @ 862337C - .byte 1 - .byte 13 - .byte 0x1C - .byte 3 - .byte 2 - .byte 15 - .2byte 0x44 + window_template 1, 13, 0x1C, 3, 2, 15, 0x44 gUnknown_08623384:: @ 8623384 .4byte NULL @@ -1859,13 +1799,7 @@ gUnknown_08623598:: @ 8623598 .4byte sub_81CF798 gUnknown_086235B4:: @ 86235B4 - .byte 1 - .byte 1 - .byte 6 - .byte 7 - .byte 2 - .byte 1 - .2byte 20 + window_template 1, 1, 6, 7, 2, 1, 20 gUnknown_086235BC:: @ 86235BC .string "{COLOR_HIGHLIGHT_SHADOW}{LIGHT_RED}{WHITE}{GREEN}♂{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}$" @@ -1912,13 +1846,7 @@ gUnknown_086237B8:: @ 86237B8 .4byte sub_81D021C gUnknown_086237D4:: @ 86237D4 - .byte 1 - .byte 1 - .byte 6 - .byte 7 - .byte 2 - .byte 1 - .2byte 20 + window_template 1, 1, 6, 7, 2, 1, 20 gUnknown_086237DC:: @ 86237DC .string "{COLOR_HIGHLIGHT_SHADOW}{LIGHT_RED}{WHITE}{GREEN}♂{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}$" @@ -1994,25 +1922,13 @@ gUnknown_08624BA0:: @ 8624BA0 .4byte sub_81D0C54 gUnknown_08624BB8:: @ 8624BB8 - .byte 2 - .byte 12 - .byte 13 - .byte 16 - .byte 4 - .byte 1 - .2byte 20 + window_template 2, 12, 13, 16, 4, 1, 20 gUnknown_08624BC0:: @ 8624BC0 .byte 4, 2, 3, 0 gUnknown_08624BC4:: @ 8624BC4 - .byte 2 - .byte 14 - .byte 1 - .byte 13 - .byte 2 - .byte 10 - .2byte 0x54 + window_template 2, 14, 1, 13, 2, 10, 0x54 gUnknown_08624BCC:: @ 8624BCC .string "{COLOR_HIGHLIGHT_SHADOW}{LIGHT_RED}{WHITE}{GREEN}♂{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}$" @@ -2027,13 +1943,7 @@ gUnknown_08624BE4:: @ 8624BE4 .align 2 gUnknown_08624BE8:: @ 8624BE8 - .byte 2 - .byte 1 - .byte 5 - .byte 7 - .byte 2 - .byte 1 - .2byte 0x6E + window_template 2, 1, 5, 7, 2, 1, 0x6E .4byte NULL .4byte NULL From 1555a607d02228ef9d11f5de6b8addda978b3d7e Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Tue, 16 Jan 2018 04:06:58 -0500 Subject: [PATCH 21/64] dump wild_encounter --- data/wild_encounter.s | 282 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 277 insertions(+), 5 deletions(-) diff --git a/data/wild_encounter.s b/data/wild_encounter.s index 914471769b..72a3563826 100644 --- a/data/wild_encounter.s +++ b/data/wild_encounter.s @@ -8,16 +8,288 @@ @ 85507E4 .include "data/wild_mons.inc" - .incbin "baserom.gba", 0x55370c, 0x188 +gBattlePyramidPlaceholders_1:: @ 55370C + wild_mon SPECIES_BULBASAUR, 5 + wild_mon SPECIES_BULBASAUR, 5 + wild_mon SPECIES_BULBASAUR, 5 + wild_mon SPECIES_BULBASAUR, 5 + wild_mon SPECIES_IVYSAUR, 5 + wild_mon SPECIES_IVYSAUR, 5 + wild_mon SPECIES_VENUSAUR, 5 + wild_mon SPECIES_VENUSAUR, 5 + wild_mon SPECIES_VENUSAUR, 5 + wild_mon SPECIES_CHARMANDER, 5 + wild_mon SPECIES_VENUSAUR, 5 + wild_mon SPECIES_CHARMANDER, 5 + +gBattlePyramidPlaceholders_1Info:: @ 55373C + .4byte 4 + .4byte gBattlePyramidPlaceholders_1 + +gBattlePyramidPlaceholders_2:: @ 553744 + wild_mon SPECIES_IVYSAUR, 5 + wild_mon SPECIES_IVYSAUR, 5 + wild_mon SPECIES_IVYSAUR, 5 + wild_mon SPECIES_IVYSAUR, 5 + wild_mon SPECIES_VENUSAUR, 5 + wild_mon SPECIES_VENUSAUR, 5 + wild_mon SPECIES_CHARMANDER, 5 + wild_mon SPECIES_CHARMANDER, 5 + wild_mon SPECIES_CHARMANDER, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARMANDER, 5 + +gBattlePyramidPlaceholders_2Info:: @ 553774 + .4byte 4 + .4byte gBattlePyramidPlaceholders_2 + +gBattlePyramidPlaceholders_3:: @ 55377C + wild_mon SPECIES_VENUSAUR, 5 + wild_mon SPECIES_VENUSAUR, 5 + wild_mon SPECIES_VENUSAUR, 5 + wild_mon SPECIES_VENUSAUR, 5 + wild_mon SPECIES_CHARMANDER, 5 + wild_mon SPECIES_CHARMANDER, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARIZARD, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARIZARD, 5 + +gBattlePyramidPlaceholders_3Info:: @ 5537AC + .4byte 4 + .4byte gBattlePyramidPlaceholders_3 + +gBattlePyramidPlaceholders_4:: @ 5537B4 + wild_mon SPECIES_CHARMANDER, 5 + wild_mon SPECIES_CHARMANDER, 5 + wild_mon SPECIES_CHARMANDER, 5 + wild_mon SPECIES_CHARMANDER, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARIZARD, 5 + wild_mon SPECIES_CHARIZARD, 5 + wild_mon SPECIES_CHARIZARD, 5 + wild_mon SPECIES_SQUIRTLE, 5 + wild_mon SPECIES_CHARIZARD, 5 + wild_mon SPECIES_SQUIRTLE, 5 + +gBattlePyramidPlaceholders_4Info:: @ 5537E4 + .4byte 4 + .4byte gBattlePyramidPlaceholders_4 + +gBattlePyramidPlaceholders_5:: @ 5537EC + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARIZARD, 5 + wild_mon SPECIES_CHARIZARD, 5 + wild_mon SPECIES_SQUIRTLE, 5 + wild_mon SPECIES_SQUIRTLE, 5 + wild_mon SPECIES_SQUIRTLE, 5 + wild_mon SPECIES_WARTORTLE, 5 + wild_mon SPECIES_SQUIRTLE, 5 + wild_mon SPECIES_WARTORTLE, 5 + +gBattlePyramidPlaceholders_5Info:: @ 55381C + .4byte 4 + .4byte gBattlePyramidPlaceholders_5 + +gBattlePyramidPlaceholders_6:: @ 553824 + wild_mon SPECIES_CHARIZARD, 5 + wild_mon SPECIES_CHARIZARD, 5 + wild_mon SPECIES_CHARIZARD, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_SQUIRTLE, 5 + wild_mon SPECIES_SQUIRTLE, 5 + wild_mon SPECIES_WARTORTLE, 5 + wild_mon SPECIES_WARTORTLE, 5 + wild_mon SPECIES_WARTORTLE, 5 + wild_mon SPECIES_WARTORTLE, 5 + wild_mon SPECIES_WARTORTLE, 5 + wild_mon SPECIES_WARTORTLE, 5 + +gBattlePyramidPlaceholders_6Info:: @ 553854 + .4byte 4 + .4byte gBattlePyramidPlaceholders_6 + +gBattlePyramidPlaceholders_7:: @ 55385C + wild_mon SPECIES_WARTORTLE, 5 + wild_mon SPECIES_WARTORTLE, 5 + wild_mon SPECIES_SQUIRTLE, 5 + wild_mon SPECIES_SQUIRTLE, 5 + wild_mon SPECIES_SQUIRTLE, 5 + wild_mon SPECIES_CHARIZARD, 5 + wild_mon SPECIES_CHARIZARD, 5 + wild_mon SPECIES_CHARIZARD, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARMELEON, 5 + +gBattlePyramidPlaceholders_7Info:: @ 55388C + .4byte 8 + .4byte gBattlePyramidPlaceholders_7 gBattlePyramidWildMonHeaders:: @ 8553894 - .incbin "baserom.gba", 0x553894, 0x180 + .byte 0, 1 + .2byte 0 + .4byte gBattlePyramidPlaceholders_1Info + .4byte NULL + .4byte NULL + .4byte NULL + .byte 0, 2 + .2byte 0 + .4byte gBattlePyramidPlaceholders_2Info + .4byte NULL + .4byte NULL + .4byte NULL + .byte 0, 3 + .2byte 0 + .4byte gBattlePyramidPlaceholders_3Info + .4byte NULL + .4byte NULL + .4byte NULL + .byte 0, 4 + .2byte 0 + .4byte gBattlePyramidPlaceholders_4Info + .4byte NULL + .4byte NULL + .4byte NULL + .byte 0, 5 + .2byte 0 + .4byte gBattlePyramidPlaceholders_5Info + .4byte NULL + .4byte NULL + .4byte NULL + .byte 0, 6 + .2byte 0 + .4byte gBattlePyramidPlaceholders_6Info + .4byte NULL + .4byte NULL + .4byte NULL + .byte 0, 7 + .2byte 0 + .4byte gBattlePyramidPlaceholders_7Info + .4byte NULL + .4byte NULL + .4byte NULL + .2byte 0xFFFF + .2byte 0 + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + +gBattlePikeMons_1:: @ 8553934 + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + wild_mon SPECIES_DUSCLOPS, 5 + wild_mon SPECIES_DUSCLOPS, 5 + wild_mon SPECIES_DUSCLOPS, 5 + wild_mon SPECIES_DUSCLOPS, 5 + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + wild_mon SPECIES_DUSCLOPS, 5 + wild_mon SPECIES_DUSCLOPS, 5 + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + +gBattlePikeMonsInfo_1:: @ 8553964 + .4byte 10 + .4byte gBattlePikeMons_1 + +gBattlePikeMons_2:: @ 855396C + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + wild_mon SPECIES_ELECTRODE, 5 + wild_mon SPECIES_ELECTRODE, 5 + wild_mon SPECIES_ELECTRODE, 5 + wild_mon SPECIES_ELECTRODE, 5 + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + wild_mon SPECIES_ELECTRODE, 5 + wild_mon SPECIES_ELECTRODE, 5 + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + +gBattlePikeMonsInfo_2:: @ 855399C + .4byte 10 + .4byte gBattlePikeMons_2 + +gBattlePikeMons_3:: @ 85539A4 + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + wild_mon SPECIES_BRELOOM, 5 + wild_mon SPECIES_BRELOOM, 5 + wild_mon SPECIES_BRELOOM, 5 + wild_mon SPECIES_BRELOOM, 5 + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + wild_mon SPECIES_BRELOOM, 5 + wild_mon SPECIES_BRELOOM, 5 + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + +gBattlePikeMonsInfo_3:: @ 85539D4 + .4byte 10 + .4byte gBattlePikeMons_3 + +gBattlePikeMons_4:: @ 85539DC + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + wild_mon SPECIES_WOBBUFFET, 5 + wild_mon SPECIES_WOBBUFFET, 5 + wild_mon SPECIES_WOBBUFFET, 5 + wild_mon SPECIES_WOBBUFFET, 5 + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + wild_mon SPECIES_WOBBUFFET, 5 + wild_mon SPECIES_WOBBUFFET, 5 + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + +gBattlePikeMonsInfo_4:: @ 8553A0C + .4byte 10 + .4byte gBattlePikeMons_4 gBattlePikeWildMonHeaders:: @ 8553A14 - .incbin "baserom.gba", 0x553a14, 0x64 + .byte 0, 1 + .2byte 0 + .4byte gBattlePikeMonsInfo_1 + .4byte NULL + .4byte NULL + .4byte NULL + .byte 0, 2 + .2byte 0 + .4byte gBattlePikeMonsInfo_2 + .4byte NULL + .4byte NULL + .4byte NULL + .byte 0, 3 + .2byte 0 + .4byte gBattlePikeMonsInfo_3 + .4byte NULL + .4byte NULL + .4byte NULL + .byte 0, 4 + .2byte 0 + .4byte gBattlePikeMonsInfo_4 + .4byte NULL + .4byte NULL + .4byte NULL + .2byte 0xFFFF + .2byte 0 + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL gWildFeebasRoute119Data:: @ 8553A78 - .incbin "baserom.gba", 0x553a78, 0x4 + wild_mon SPECIES_FEEBAS, 20, 25 gRoute119WaterTileData:: @ 8553A7C - .incbin "baserom.gba", 0x553a7c, 0x14 + .2byte 0, 0x2D, 0, 0x2E, 0x5B, 0x83, 0x5C, 0x8B, 0x12A, 0 From 147b43cca67454344698d2b5f1b8f9ea663ff608 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Tue, 16 Jan 2018 04:13:28 -0500 Subject: [PATCH 22/64] tabs --- data/wild_encounter.s | 346 +++++++++++++++++++++--------------------- 1 file changed, 173 insertions(+), 173 deletions(-) diff --git a/data/wild_encounter.s b/data/wild_encounter.s index 72a3563826..5def2ca70a 100644 --- a/data/wild_encounter.s +++ b/data/wild_encounter.s @@ -9,7 +9,7 @@ .include "data/wild_mons.inc" gBattlePyramidPlaceholders_1:: @ 55370C - wild_mon SPECIES_BULBASAUR, 5 + wild_mon SPECIES_BULBASAUR, 5 wild_mon SPECIES_BULBASAUR, 5 wild_mon SPECIES_BULBASAUR, 5 wild_mon SPECIES_BULBASAUR, 5 @@ -21,13 +21,13 @@ gBattlePyramidPlaceholders_1:: @ 55370C wild_mon SPECIES_CHARMANDER, 5 wild_mon SPECIES_VENUSAUR, 5 wild_mon SPECIES_CHARMANDER, 5 - + gBattlePyramidPlaceholders_1Info:: @ 55373C - .4byte 4 - .4byte gBattlePyramidPlaceholders_1 - + .4byte 4 + .4byte gBattlePyramidPlaceholders_1 + gBattlePyramidPlaceholders_2:: @ 553744 - wild_mon SPECIES_IVYSAUR, 5 + wild_mon SPECIES_IVYSAUR, 5 wild_mon SPECIES_IVYSAUR, 5 wild_mon SPECIES_IVYSAUR, 5 wild_mon SPECIES_IVYSAUR, 5 @@ -39,13 +39,13 @@ gBattlePyramidPlaceholders_2:: @ 553744 wild_mon SPECIES_CHARMELEON, 5 wild_mon SPECIES_CHARMELEON, 5 wild_mon SPECIES_CHARMANDER, 5 - + gBattlePyramidPlaceholders_2Info:: @ 553774 - .4byte 4 - .4byte gBattlePyramidPlaceholders_2 - + .4byte 4 + .4byte gBattlePyramidPlaceholders_2 + gBattlePyramidPlaceholders_3:: @ 55377C - wild_mon SPECIES_VENUSAUR, 5 + wild_mon SPECIES_VENUSAUR, 5 wild_mon SPECIES_VENUSAUR, 5 wild_mon SPECIES_VENUSAUR, 5 wild_mon SPECIES_VENUSAUR, 5 @@ -57,13 +57,13 @@ gBattlePyramidPlaceholders_3:: @ 55377C wild_mon SPECIES_CHARIZARD, 5 wild_mon SPECIES_CHARMELEON, 5 wild_mon SPECIES_CHARIZARD, 5 - + gBattlePyramidPlaceholders_3Info:: @ 5537AC - .4byte 4 - .4byte gBattlePyramidPlaceholders_3 - + .4byte 4 + .4byte gBattlePyramidPlaceholders_3 + gBattlePyramidPlaceholders_4:: @ 5537B4 - wild_mon SPECIES_CHARMANDER, 5 + wild_mon SPECIES_CHARMANDER, 5 wild_mon SPECIES_CHARMANDER, 5 wild_mon SPECIES_CHARMANDER, 5 wild_mon SPECIES_CHARMANDER, 5 @@ -75,13 +75,13 @@ gBattlePyramidPlaceholders_4:: @ 5537B4 wild_mon SPECIES_SQUIRTLE, 5 wild_mon SPECIES_CHARIZARD, 5 wild_mon SPECIES_SQUIRTLE, 5 - + gBattlePyramidPlaceholders_4Info:: @ 5537E4 - .4byte 4 - .4byte gBattlePyramidPlaceholders_4 - + .4byte 4 + .4byte gBattlePyramidPlaceholders_4 + gBattlePyramidPlaceholders_5:: @ 5537EC - wild_mon SPECIES_CHARMELEON, 5 + wild_mon SPECIES_CHARMELEON, 5 wild_mon SPECIES_CHARMELEON, 5 wild_mon SPECIES_CHARMELEON, 5 wild_mon SPECIES_CHARMELEON, 5 @@ -93,13 +93,13 @@ gBattlePyramidPlaceholders_5:: @ 5537EC wild_mon SPECIES_WARTORTLE, 5 wild_mon SPECIES_SQUIRTLE, 5 wild_mon SPECIES_WARTORTLE, 5 - + gBattlePyramidPlaceholders_5Info:: @ 55381C - .4byte 4 - .4byte gBattlePyramidPlaceholders_5 - + .4byte 4 + .4byte gBattlePyramidPlaceholders_5 + gBattlePyramidPlaceholders_6:: @ 553824 - wild_mon SPECIES_CHARIZARD, 5 + wild_mon SPECIES_CHARIZARD, 5 wild_mon SPECIES_CHARIZARD, 5 wild_mon SPECIES_CHARIZARD, 5 wild_mon SPECIES_CHARMELEON, 5 @@ -111,13 +111,13 @@ gBattlePyramidPlaceholders_6:: @ 553824 wild_mon SPECIES_WARTORTLE, 5 wild_mon SPECIES_WARTORTLE, 5 wild_mon SPECIES_WARTORTLE, 5 - + gBattlePyramidPlaceholders_6Info:: @ 553854 - .4byte 4 - .4byte gBattlePyramidPlaceholders_6 + .4byte 4 + .4byte gBattlePyramidPlaceholders_6 gBattlePyramidPlaceholders_7:: @ 55385C - wild_mon SPECIES_WARTORTLE, 5 + wild_mon SPECIES_WARTORTLE, 5 wild_mon SPECIES_WARTORTLE, 5 wild_mon SPECIES_SQUIRTLE, 5 wild_mon SPECIES_SQUIRTLE, 5 @@ -129,164 +129,164 @@ gBattlePyramidPlaceholders_7:: @ 55385C wild_mon SPECIES_CHARMELEON, 5 wild_mon SPECIES_CHARMELEON, 5 wild_mon SPECIES_CHARMELEON, 5 - + gBattlePyramidPlaceholders_7Info:: @ 55388C - .4byte 8 - .4byte gBattlePyramidPlaceholders_7 + .4byte 8 + .4byte gBattlePyramidPlaceholders_7 gBattlePyramidWildMonHeaders:: @ 8553894 .byte 0, 1 - .2byte 0 - .4byte gBattlePyramidPlaceholders_1Info - .4byte NULL - .4byte NULL - .4byte NULL - .byte 0, 2 - .2byte 0 - .4byte gBattlePyramidPlaceholders_2Info - .4byte NULL - .4byte NULL - .4byte NULL - .byte 0, 3 - .2byte 0 - .4byte gBattlePyramidPlaceholders_3Info - .4byte NULL - .4byte NULL - .4byte NULL - .byte 0, 4 - .2byte 0 - .4byte gBattlePyramidPlaceholders_4Info - .4byte NULL - .4byte NULL - .4byte NULL - .byte 0, 5 - .2byte 0 - .4byte gBattlePyramidPlaceholders_5Info - .4byte NULL - .4byte NULL - .4byte NULL - .byte 0, 6 - .2byte 0 - .4byte gBattlePyramidPlaceholders_6Info - .4byte NULL - .4byte NULL - .4byte NULL - .byte 0, 7 - .2byte 0 - .4byte gBattlePyramidPlaceholders_7Info - .4byte NULL - .4byte NULL - .4byte NULL - .2byte 0xFFFF - .2byte 0 - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - + .2byte 0 + .4byte gBattlePyramidPlaceholders_1Info + .4byte NULL + .4byte NULL + .4byte NULL + .byte 0, 2 + .2byte 0 + .4byte gBattlePyramidPlaceholders_2Info + .4byte NULL + .4byte NULL + .4byte NULL + .byte 0, 3 + .2byte 0 + .4byte gBattlePyramidPlaceholders_3Info + .4byte NULL + .4byte NULL + .4byte NULL + .byte 0, 4 + .2byte 0 + .4byte gBattlePyramidPlaceholders_4Info + .4byte NULL + .4byte NULL + .4byte NULL + .byte 0, 5 + .2byte 0 + .4byte gBattlePyramidPlaceholders_5Info + .4byte NULL + .4byte NULL + .4byte NULL + .byte 0, 6 + .2byte 0 + .4byte gBattlePyramidPlaceholders_6Info + .4byte NULL + .4byte NULL + .4byte NULL + .byte 0, 7 + .2byte 0 + .4byte gBattlePyramidPlaceholders_7Info + .4byte NULL + .4byte NULL + .4byte NULL + .2byte 0xFFFF + .2byte 0 + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + gBattlePikeMons_1:: @ 8553934 - wild_mon SPECIES_SEVIPER, 5 - wild_mon SPECIES_MILOTIC, 5 - wild_mon SPECIES_DUSCLOPS, 5 - wild_mon SPECIES_DUSCLOPS, 5 - wild_mon SPECIES_DUSCLOPS, 5 - wild_mon SPECIES_DUSCLOPS, 5 - wild_mon SPECIES_SEVIPER, 5 - wild_mon SPECIES_MILOTIC, 5 - wild_mon SPECIES_DUSCLOPS, 5 - wild_mon SPECIES_DUSCLOPS, 5 - wild_mon SPECIES_SEVIPER, 5 - wild_mon SPECIES_MILOTIC, 5 - + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + wild_mon SPECIES_DUSCLOPS, 5 + wild_mon SPECIES_DUSCLOPS, 5 + wild_mon SPECIES_DUSCLOPS, 5 + wild_mon SPECIES_DUSCLOPS, 5 + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + wild_mon SPECIES_DUSCLOPS, 5 + wild_mon SPECIES_DUSCLOPS, 5 + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + gBattlePikeMonsInfo_1:: @ 8553964 - .4byte 10 - .4byte gBattlePikeMons_1 - + .4byte 10 + .4byte gBattlePikeMons_1 + gBattlePikeMons_2:: @ 855396C - wild_mon SPECIES_SEVIPER, 5 - wild_mon SPECIES_MILOTIC, 5 - wild_mon SPECIES_ELECTRODE, 5 - wild_mon SPECIES_ELECTRODE, 5 - wild_mon SPECIES_ELECTRODE, 5 - wild_mon SPECIES_ELECTRODE, 5 - wild_mon SPECIES_SEVIPER, 5 - wild_mon SPECIES_MILOTIC, 5 - wild_mon SPECIES_ELECTRODE, 5 - wild_mon SPECIES_ELECTRODE, 5 - wild_mon SPECIES_SEVIPER, 5 - wild_mon SPECIES_MILOTIC, 5 - + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + wild_mon SPECIES_ELECTRODE, 5 + wild_mon SPECIES_ELECTRODE, 5 + wild_mon SPECIES_ELECTRODE, 5 + wild_mon SPECIES_ELECTRODE, 5 + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + wild_mon SPECIES_ELECTRODE, 5 + wild_mon SPECIES_ELECTRODE, 5 + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + gBattlePikeMonsInfo_2:: @ 855399C - .4byte 10 - .4byte gBattlePikeMons_2 - + .4byte 10 + .4byte gBattlePikeMons_2 + gBattlePikeMons_3:: @ 85539A4 - wild_mon SPECIES_SEVIPER, 5 - wild_mon SPECIES_MILOTIC, 5 - wild_mon SPECIES_BRELOOM, 5 - wild_mon SPECIES_BRELOOM, 5 - wild_mon SPECIES_BRELOOM, 5 - wild_mon SPECIES_BRELOOM, 5 - wild_mon SPECIES_SEVIPER, 5 - wild_mon SPECIES_MILOTIC, 5 - wild_mon SPECIES_BRELOOM, 5 - wild_mon SPECIES_BRELOOM, 5 - wild_mon SPECIES_SEVIPER, 5 - wild_mon SPECIES_MILOTIC, 5 - + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + wild_mon SPECIES_BRELOOM, 5 + wild_mon SPECIES_BRELOOM, 5 + wild_mon SPECIES_BRELOOM, 5 + wild_mon SPECIES_BRELOOM, 5 + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + wild_mon SPECIES_BRELOOM, 5 + wild_mon SPECIES_BRELOOM, 5 + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + gBattlePikeMonsInfo_3:: @ 85539D4 - .4byte 10 - .4byte gBattlePikeMons_3 - + .4byte 10 + .4byte gBattlePikeMons_3 + gBattlePikeMons_4:: @ 85539DC - wild_mon SPECIES_SEVIPER, 5 - wild_mon SPECIES_MILOTIC, 5 - wild_mon SPECIES_WOBBUFFET, 5 - wild_mon SPECIES_WOBBUFFET, 5 - wild_mon SPECIES_WOBBUFFET, 5 - wild_mon SPECIES_WOBBUFFET, 5 - wild_mon SPECIES_SEVIPER, 5 - wild_mon SPECIES_MILOTIC, 5 - wild_mon SPECIES_WOBBUFFET, 5 - wild_mon SPECIES_WOBBUFFET, 5 - wild_mon SPECIES_SEVIPER, 5 - wild_mon SPECIES_MILOTIC, 5 - + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + wild_mon SPECIES_WOBBUFFET, 5 + wild_mon SPECIES_WOBBUFFET, 5 + wild_mon SPECIES_WOBBUFFET, 5 + wild_mon SPECIES_WOBBUFFET, 5 + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + wild_mon SPECIES_WOBBUFFET, 5 + wild_mon SPECIES_WOBBUFFET, 5 + wild_mon SPECIES_SEVIPER, 5 + wild_mon SPECIES_MILOTIC, 5 + gBattlePikeMonsInfo_4:: @ 8553A0C - .4byte 10 - .4byte gBattlePikeMons_4 + .4byte 10 + .4byte gBattlePikeMons_4 gBattlePikeWildMonHeaders:: @ 8553A14 .byte 0, 1 - .2byte 0 - .4byte gBattlePikeMonsInfo_1 - .4byte NULL - .4byte NULL - .4byte NULL - .byte 0, 2 - .2byte 0 - .4byte gBattlePikeMonsInfo_2 - .4byte NULL - .4byte NULL - .4byte NULL - .byte 0, 3 - .2byte 0 - .4byte gBattlePikeMonsInfo_3 - .4byte NULL - .4byte NULL - .4byte NULL - .byte 0, 4 - .2byte 0 - .4byte gBattlePikeMonsInfo_4 - .4byte NULL - .4byte NULL - .4byte NULL - .2byte 0xFFFF - .2byte 0 - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL + .2byte 0 + .4byte gBattlePikeMonsInfo_1 + .4byte NULL + .4byte NULL + .4byte NULL + .byte 0, 2 + .2byte 0 + .4byte gBattlePikeMonsInfo_2 + .4byte NULL + .4byte NULL + .4byte NULL + .byte 0, 3 + .2byte 0 + .4byte gBattlePikeMonsInfo_3 + .4byte NULL + .4byte NULL + .4byte NULL + .byte 0, 4 + .2byte 0 + .4byte gBattlePikeMonsInfo_4 + .4byte NULL + .4byte NULL + .4byte NULL + .2byte 0xFFFF + .2byte 0 + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL gWildFeebasRoute119Data:: @ 8553A78 wild_mon SPECIES_FEEBAS, 20, 25 From 820c11358d0832b92c82c45a6a228e0759eba03a Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Tue, 16 Jan 2018 15:31:43 -0500 Subject: [PATCH 23/64] dump learn_move.s --- data/battle_anim_815A0D4.s | 3 +- data/learn_move.s | 83 ++++++++++++++++++++++++--- graphics/interface/ui_learn_move.png | Bin 0 -> 282 bytes 3 files changed, 77 insertions(+), 9 deletions(-) create mode 100755 graphics/interface/ui_learn_move.png diff --git a/data/battle_anim_815A0D4.s b/data/battle_anim_815A0D4.s index 1b4cc5af9a..0cb95a7e12 100644 --- a/data/battle_anim_815A0D4.s +++ b/data/battle_anim_815A0D4.s @@ -505,6 +505,5 @@ gUnknown_085CE9B0:: @ 85CE9B0 .align 2 gUnknown_085CE9C8:: @ 85CE9C8 .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 + .2byte 0x0001, 0xfffb, 0x1000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 diff --git a/data/learn_move.s b/data/learn_move.s index 94805bacb4..0a2c31e581 100644 --- a/data/learn_move.s +++ b/data/learn_move.s @@ -2,23 +2,92 @@ .include "constants/constants.inc" .section .rodata + +gUnknown_085CE9F8:: @ 85CE9F8 + .incbin "graphics/interface/ui_learn_move.gbapal" + gUnknown_085CEA18:: @ 85CEA18 - .incbin "baserom.gba", 0x5ceA18, 0x198 + .incbin "graphics/interface/ui_learn_move.4bpp" + +gUnknown_085CEB98:: @ 85CEB98 + .2byte 0 + .2byte 0 + .2byte 0 + .2byte 0 + .2byte 0x8000 + .2byte 0 + .2byte 0 + .2byte 0 + .2byte 0x4000 + .2byte 0 + .2byte 0 + .2byte 0 gUnknown_085CEBB0:: @ 85CEBB0 - .incbin "baserom.gba", 0x5cebb0, 0x8 + obj_tiles gUnknown_085CEA18, 0x180, 0x1595 gUnknown_085CEBB8:: @ 85CEBB8 - .incbin "baserom.gba", 0x5cebb8, 0x8 + obj_pal gUnknown_085CE9F8, 0x1596 gUnknown_085CEBC0:: @ 85CEBC0 - .incbin "baserom.gba", 0x5cebc0, 0x10 + .byte 0 + .byte 0x1B + .byte 16 + .byte 1 + .byte 0x75 + .byte 16 + .2byte 0xFFFF + .2byte 0xFFFF + .2byte 0x14CD + .2byte 0x14CD + .byte 0, 0 gUnknown_085CEBD0:: @ 85CEBD0 - .incbin "baserom.gba", 0x5cebd0, 0x40 + .byte 2 + .byte 0xC0 + .byte 8 + .byte 3 + .byte 0xC0 + .byte 0x68 + .2byte 0 + .2byte 0 + .2byte 0x1531 + .2byte 0x1531 + .byte 0, 0 +gUnknown_085CEBE0:: @ 85CEBE0 + .2byte 8 + .2byte 5 + .2byte 0xFFFF + .2byte 0 + +gUnknown_085CEBE8:: @ 85CEBE8 + .2byte 9 + .2byte 5 + .2byte 0xFFFF + .2byte 0 + +gUnknown_085CEBF0:: @ 85CEBF0 + .2byte 10 + .2byte 5 + .2byte 0xFFFF + .2byte 0 + +gUnknown_085CEBF8:: @ 85CEBF8 + .2byte 11 + .2byte 5 + .2byte 0xFFFF + .2byte 0 + +gUnknown_085CEC00:: @ 85CEC00 + .4byte gUnknown_085CEBE0 + .4byte gUnknown_085CEBE8 + .4byte gUnknown_085CEBF0 + .4byte gUnknown_085CEBF8 + gUnknown_085CEC10:: @ 85CEC10 - .incbin "baserom.gba", 0x5cec10, 0x18 + spr_template 0x1595, 0x1596, gUnknown_085CEB98, gUnknown_085CEC00, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085CEC28:: @ 85CEC28 - .incbin "baserom.gba", 0x5cec28, 0x8 + .4byte 0x1F0 + .4byte 0x11E1 diff --git a/graphics/interface/ui_learn_move.png b/graphics/interface/ui_learn_move.png new file mode 100755 index 0000000000000000000000000000000000000000..6cb6540b51e6388b51300ab40794bbca47ec9628 GIT binary patch literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^2|&!j!VDz82tKy~QU(D&A+8Mnfso-D1H)AYhND11 z9N_3tkmUdW|K)cjgY+)-ba4!knA#iQ$#vL(N2aFiFWchkKmQlYFKBqNv-Lssr?#v@ zFJ@a8gKHI%y(tch1>R0$H$6C4d83&}SYU3O@ARjdq5Q9Y zO*(hx?r9No3pGiRwpCYlvvM#RutqJ5aICL6@!sXiKh8BhXUabO*p!j$>@>+mMKaQ8 z^VU0h&B;>7KAc)rHDS?e_Vww@uj})E+IAs-k^^52!}TRm5^JBUDT6%a>FVdQ&MBb@ E01t6zm;e9( literal 0 HcmV?d00001 From 50f9615dc9021bc811869a27b5fa400aac25aaf0 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 16 Jan 2018 21:37:46 +0100 Subject: [PATCH 24/64] battle transition review changes --- src/battle_transition.c | 60 ++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/battle_transition.c b/src/battle_transition.c index af156da12e..ca21348376 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -23,21 +23,21 @@ struct TransitionData { - vs8 VBlank_DMA; + vu8 VBlank_DMA; u16 WININ; u16 WINOUT; - u16 field_6; + u16 WIN0H; u16 WIN0V; - u16 field_A; - u16 field_C; + u16 field_A; // unused + u16 field_C; // unused u16 BLDCNT; u16 BLDALPHA; u16 BLDY; s16 field_14; s16 field_16; - s16 field_18; - s16 field_1A; - s16 field_1C; + s16 BG0HOFS_1; + s16 BG0HOFS_2; + s16 BG0VOFS; // used but not set s16 field_1E; // unused s16 field_20; s16 field_22; // unused @@ -1265,7 +1265,7 @@ static void sub_814669C(struct Task *task) task->tData5 = 0x4000; sTransitionStructPtr->WININ = 63; sTransitionStructPtr->WINOUT = 0; - sTransitionStructPtr->field_6 = 240; + sTransitionStructPtr->WIN0H = 240; sTransitionStructPtr->WIN0V = 160; sTransitionStructPtr->BLDCNT = 0x3F41; sTransitionStructPtr->BLDALPHA = (task->tData1 << 8) | (task->tData2); @@ -1745,7 +1745,7 @@ static bool8 Phase2_Clockwise_BlackFade_Func1(struct Task *task) sTransitionStructPtr->WININ = 0; sTransitionStructPtr->WINOUT = 63; - sTransitionStructPtr->field_6 = -3855; + sTransitionStructPtr->WIN0H = -3855; sTransitionStructPtr->WIN0V = 160; for (i = 0; i < 160; i++) @@ -2016,7 +2016,7 @@ static bool8 Phase2_Wave_Func1(struct Task *task) sTransitionStructPtr->WININ = 63; sTransitionStructPtr->WINOUT = 0; - sTransitionStructPtr->field_6 = 240; + sTransitionStructPtr->WIN0H = 240; sTransitionStructPtr->WIN0V = 160; for (i = 0; i < 160; i++) @@ -2210,8 +2210,8 @@ static bool8 Phase2_Mugshot_Func3(struct Task *task) if (mergedValue == 0xF0) task->tState++; - sTransitionStructPtr->field_18 -= 8; - sTransitionStructPtr->field_1A += 8; + sTransitionStructPtr->BG0HOFS_1 -= 8; + sTransitionStructPtr->BG0HOFS_2 += 8; sTransitionStructPtr->VBlank_DMA++; return FALSE; } @@ -2232,8 +2232,8 @@ static bool8 Phase2_Mugshot_Func4(struct Task *task) task->tData1 = 0; task->tData2 = 0; task->tData3 = 0; - sTransitionStructPtr->field_18 -= 8; - sTransitionStructPtr->field_1A += 8; + sTransitionStructPtr->BG0HOFS_1 -= 8; + sTransitionStructPtr->BG0HOFS_2 += 8; sub_8148484(task->tOpponentSpriteId, 0); sub_8148484(task->tPlayerSpriteId, 1); @@ -2247,8 +2247,8 @@ static bool8 Phase2_Mugshot_Func4(struct Task *task) static bool8 Phase2_Mugshot_Func5(struct Task *task) { - sTransitionStructPtr->field_18 -= 8; - sTransitionStructPtr->field_1A += 8; + sTransitionStructPtr->BG0HOFS_1 -= 8; + sTransitionStructPtr->BG0HOFS_2 += 8; if (sub_81484B8(task->tOpponentSpriteId)) { task->tState++; @@ -2259,8 +2259,8 @@ static bool8 Phase2_Mugshot_Func5(struct Task *task) static bool8 Phase2_Mugshot_Func6(struct Task *task) { - sTransitionStructPtr->field_18 -= 8; - sTransitionStructPtr->field_1A += 8; + sTransitionStructPtr->BG0HOFS_1 -= 8; + sTransitionStructPtr->BG0HOFS_2 += 8; if (sub_81484B8(task->tPlayerSpriteId)) { sTransitionStructPtr->VBlank_DMA = FALSE; @@ -2285,8 +2285,8 @@ static bool8 Phase2_Mugshot_Func7(struct Task *task) sTransitionStructPtr->VBlank_DMA = FALSE; r6 = TRUE; - sTransitionStructPtr->field_18 -= 8; - sTransitionStructPtr->field_1A += 8; + sTransitionStructPtr->BG0HOFS_1 -= 8; + sTransitionStructPtr->BG0HOFS_2 += 8; if (task->tData4 < 0x50) task->tData4 += 2; @@ -2358,7 +2358,7 @@ static void VBlankCB0_Phase2_Mugshots(void) VBlankCB_BattleTransition(); if (sTransitionStructPtr->VBlank_DMA != 0) DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320); - REG_BG0VOFS = sTransitionStructPtr->field_1C; + REG_BG0VOFS = sTransitionStructPtr->BG0VOFS; REG_WININ = sTransitionStructPtr->WININ; REG_WINOUT = sTransitionStructPtr->WINOUT; REG_WIN0V = sTransitionStructPtr->WIN0V; @@ -2378,9 +2378,9 @@ static void VBlankCB1_Phase2_Mugshots(void) static void HBlankCB_Phase2_Mugshots(void) { if (REG_VCOUNT < 80) - REG_BG0HOFS = sTransitionStructPtr->field_18; + REG_BG0HOFS = sTransitionStructPtr->BG0HOFS_1; else - REG_BG0HOFS = sTransitionStructPtr->field_1A; + REG_BG0HOFS = sTransitionStructPtr->BG0HOFS_2; } static void Mugshots_CreateOpponentPlayerSprites(struct Task *task) @@ -2541,9 +2541,9 @@ static bool8 Phase2_Slice_Func2(struct Task *task) for (i = 0; i < 160; i++) { - u16* storeLoc1 = &gUnknown_02038C28[0][i]; - u16* storeLoc2 = &gUnknown_02038C28[0][i + 160]; - if (1 & i) + u16 *storeLoc1 = &gUnknown_02038C28[0][i]; + u16 *storeLoc2 = &gUnknown_02038C28[0][i + 160]; + if (i & 1) { *storeLoc1 = sTransitionStructPtr->field_14 + task->tData1; *storeLoc2 = 0xF0 - task->tData1; @@ -2775,7 +2775,7 @@ static bool8 Phase2_Blackhole_Func1(struct Task *task) sTransitionStructPtr->WININ = 0; sTransitionStructPtr->WINOUT = 63; - sTransitionStructPtr->field_6 = 240; + sTransitionStructPtr->WIN0H = 240; sTransitionStructPtr->WIN0V = 160; for (i = 0; i < 0xA0; i++) @@ -3203,7 +3203,7 @@ static bool8 Phase2_Rayquaza_Func9(struct Task *task) sTransitionStructPtr->WININ = 0; sTransitionStructPtr->WINOUT = 63; - sTransitionStructPtr->field_6 = 240; + sTransitionStructPtr->WIN0H = 240; sTransitionStructPtr->WIN0V = 160; for (i = 0; i < 160; i++) @@ -3309,7 +3309,7 @@ static bool8 Phase2_WhiteFade_Func4(struct Task *task) SetVBlankCallback(0); SetHBlankCallback(0); - sTransitionStructPtr->field_6 = 0xF0; + sTransitionStructPtr->WIN0H = 0xF0; sTransitionStructPtr->BLDY = 0; sTransitionStructPtr->BLDCNT = 0xFF; sTransitionStructPtr->WININ = 0x3F; @@ -3350,7 +3350,7 @@ static void VBlankCB1_Phase2_WhiteFade(void) REG_BLDCNT = sTransitionStructPtr->BLDCNT; REG_WININ = sTransitionStructPtr->WININ; REG_WINOUT = sTransitionStructPtr->WINOUT; - REG_WIN0H = sTransitionStructPtr->field_6; + REG_WIN0H = sTransitionStructPtr->WIN0H; REG_WIN0V = sTransitionStructPtr->WIN0V; } From 295aa96a052d4ab7daecbc9fb5da166dd0d2a0f1 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 16 Jan 2018 23:57:26 +0100 Subject: [PATCH 25/64] decompile unk transition --- asm/unk_sprite_file.s | 607 ------------------------- asm/unk_transition.s | 985 ----------------------------------------- data/unk_sprite_file.s | 42 -- data/unk_transition.s | 60 +-- ld_script.txt | 5 +- src/unk_transition.c | 633 ++++++++++++++++++++++++++ 6 files changed, 643 insertions(+), 1689 deletions(-) delete mode 100755 asm/unk_sprite_file.s delete mode 100755 asm/unk_transition.s delete mode 100644 data/unk_sprite_file.s create mode 100644 src/unk_transition.c diff --git a/asm/unk_sprite_file.s b/asm/unk_sprite_file.s deleted file mode 100755 index 5a25b8e088..0000000000 --- a/asm/unk_sprite_file.s +++ /dev/null @@ -1,607 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_81DA700 -sub_81DA700: @ 81DA700 - push {lr} - sub sp, 0x8 - add r1, sp, 0x4 - mov r0, sp - bl sub_8149F58 - ldr r0, =gUnknown_0862AD54 - ldr r1, [sp, 0x4] - bl LZ77UnCompVram - ldr r0, =gUnknown_0862AF30 - ldr r1, [sp] - bl LZ77UnCompVram - ldr r0, =gUnknown_0862B53C - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - ldr r0, =gUnknown_0862B724 - bl LoadCompressedObjectPic - ldr r0, =gUnknown_0862B72C - bl LoadSpritePalette - add sp, 0x8 - pop {r0} - bx r0 - .pool - thumb_func_end sub_81DA700 - - thumb_func_start sub_81DA74C -sub_81DA74C: @ 81DA74C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - adds r5, r0, 0 - adds r6, r1, 0 - ldr r0, [sp, 0x24] - ldr r1, [sp, 0x28] - ldr r4, [sp, 0x2C] - lsls r2, 24 - lsrs r2, 24 - str r2, [sp] - lsls r3, 24 - lsrs r3, 24 - mov r10, r3 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - lsls r1, 24 - lsrs r1, 24 - mov r9, r1 - lsls r4, 24 - lsrs r7, r4, 24 - ldr r0, =gUnknown_0862B758 - lsls r5, 16 - asrs r5, 16 - lsls r6, 16 - asrs r6, 16 - adds r1, r5, 0 - adds r2, r6, 0 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r5, r0, 24 - cmp r7, 0x1 - beq _081DA7D0 - cmp r7, 0x1 - bgt _081DA7A8 - cmp r7, 0 - beq _081DA7B8 - b _081DA7AC - .pool -_081DA7A8: - cmp r7, 0x2 - beq _081DA7E4 -_081DA7AC: - ldr r6, =gSprites - lsls r3, r5, 4 - b _081DA7F8 - .pool -_081DA7B8: - ldr r2, =gSprites - lsls r3, r5, 4 - adds r0, r3, r5 - lsls r0, 2 - adds r0, r2 - movs r1, 0x78 - strh r1, [r0, 0x2E] - movs r1, 0x2D - b _081DA7F4 - .pool -_081DA7D0: - ldr r2, =gSprites - lsls r3, r5, 4 - adds r0, r3, r5 - lsls r0, 2 - adds r0, r2 - movs r1, 0x59 - b _081DA7F0 - .pool -_081DA7E4: - ldr r2, =gSprites - lsls r3, r5, 4 - adds r0, r3, r5 - lsls r0, 2 - adds r0, r2 - movs r1, 0x97 -_081DA7F0: - strh r1, [r0, 0x2E] - movs r1, 0x61 -_081DA7F4: - strh r1, [r0, 0x30] - adds r6, r2, 0 -_081DA7F8: - adds r4, r3, r5 - lsls r4, 2 - adds r0, r4, r6 - mov r2, r8 - lsls r1, r2, 24 - asrs r1, 24 - movs r2, 0 - strh r1, [r0, 0x32] - mov r3, r9 - lsls r1, r3, 24 - asrs r1, 24 - strh r1, [r0, 0x34] - mov r1, sp - ldrh r1, [r1] - strh r1, [r0, 0x3A] - mov r3, r10 - strh r3, [r0, 0x3C] - strh r2, [r0, 0x36] - strh r2, [r0, 0x38] - adds r1, r7, 0 - bl StartSpriteAnim - adds r0, r6, 0 - adds r0, 0x1C - adds r4, r0 - ldr r0, =sub_81DA848 - str r0, [r4] - adds r0, r5, 0 - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81DA74C - - thumb_func_start sub_81DA848 -sub_81DA848: @ 81DA848 - push {r4,r5,lr} - adds r3, r0, 0 - adds r2, r3, 0 - adds r2, 0x2E - movs r0, 0x20 - ldrsh r1, [r3, r0] - movs r4, 0x2E - ldrsh r0, [r3, r4] - cmp r1, r0 - bne _081DA874 - movs r5, 0x22 - ldrsh r1, [r3, r5] - movs r4, 0x2 - ldrsh r0, [r2, r4] - cmp r1, r0 - bne _081DA874 - ldr r0, =SpriteCallbackDummy - str r0, [r3, 0x1C] - b _081DA8B4 - .pool -_081DA874: - ldrh r4, [r2, 0x8] - movs r5, 0x8 - ldrsh r1, [r2, r5] - movs r5, 0xC - ldrsh r0, [r2, r5] - cmp r1, r0 - bne _081DA890 - ldrh r0, [r2, 0x4] - ldrh r1, [r3, 0x20] - adds r0, r1 - movs r1, 0 - strh r0, [r3, 0x20] - strh r1, [r2, 0x8] - b _081DA894 -_081DA890: - adds r0, r4, 0x1 - strh r0, [r2, 0x8] -_081DA894: - ldrh r4, [r2, 0xA] - movs r5, 0xA - ldrsh r1, [r2, r5] - movs r5, 0xE - ldrsh r0, [r2, r5] - cmp r1, r0 - bne _081DA8B0 - ldrh r0, [r2, 0x6] - ldrh r1, [r3, 0x22] - adds r0, r1 - movs r1, 0 - strh r0, [r3, 0x22] - strh r1, [r2, 0xA] - b _081DA8B4 -_081DA8B0: - adds r0, r4, 0x1 - strh r0, [r2, 0xA] -_081DA8B4: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_81DA848 - - thumb_func_start sub_81DA8BC -sub_81DA8BC: @ 81DA8BC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - adds r6, r0, 0 - mov r8, r1 - ldr r0, [sp, 0x2C] - ldr r1, [sp, 0x30] - ldr r4, [sp, 0x34] - ldr r5, [sp, 0x38] - lsls r2, 16 - lsrs r2, 16 - str r2, [sp] - lsls r3, 16 - lsrs r3, 16 - str r3, [sp, 0x4] - lsls r0, 16 - lsrs r0, 16 - mov r10, r0 - lsls r1, 16 - lsrs r1, 16 - mov r9, r1 - lsls r4, 16 - lsrs r7, r4, 16 - lsls r5, 24 - lsrs r5, 24 - ldr r0, =gUnknown_0862B758 - lsls r6, 16 - asrs r6, 16 - mov r1, r8 - lsls r1, 16 - asrs r1, 16 - mov r8, r1 - adds r1, r6, 0 - mov r2, r8 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r6, r0, 24 - cmp r5, 0x1 - beq _081DA94C - cmp r5, 0x1 - bgt _081DA924 - cmp r5, 0 - beq _081DA934 - b _081DA928 - .pool -_081DA924: - cmp r5, 0x2 - beq _081DA960 -_081DA928: - ldr r2, =gSprites - lsls r3, r6, 4 - b _081DA972 - .pool -_081DA934: - ldr r2, =gSprites - lsls r3, r6, 4 - adds r0, r3, r6 - lsls r0, 2 - adds r0, r2 - movs r1, 0x78 - strh r1, [r0, 0x2E] - movs r1, 0x2D - b _081DA970 - .pool -_081DA94C: - ldr r2, =gSprites - lsls r3, r6, 4 - adds r0, r3, r6 - lsls r0, 2 - adds r0, r2 - movs r1, 0x59 - b _081DA96C - .pool -_081DA960: - ldr r2, =gSprites - lsls r3, r6, 4 - adds r0, r3, r6 - lsls r0, 2 - adds r0, r2 - movs r1, 0x97 -_081DA96C: - strh r1, [r0, 0x2E] - movs r1, 0x61 -_081DA970: - strh r1, [r0, 0x30] -_081DA972: - adds r4, r3, r6 - lsls r4, 2 - adds r0, r4, r2 - mov r3, sp - ldrh r3, [r3] - strh r3, [r0, 0x32] - mov r1, sp - ldrh r1, [r1, 0x4] - strh r1, [r0, 0x34] - mov r3, r10 - strh r3, [r0, 0x36] - mov r1, r9 - strh r1, [r0, 0x38] - strh r7, [r0, 0x3A] - adds r1, r5, 0 - str r2, [sp, 0x8] - bl StartSpriteAnim - ldr r2, [sp, 0x8] - adds r0, r2, 0 - adds r0, 0x1C - adds r4, r0 - ldr r0, =sub_81DA9BC - str r0, [r4] - adds r0, r6, 0 - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81DA8BC - - thumb_func_start sub_81DA9BC -sub_81DA9BC: @ 81DA9BC - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x32] - bl Sin2 - lsls r0, 16 - asrs r0, 16 - movs r2, 0x36 - ldrsh r1, [r4, r2] - muls r0, r1 - asrs r0, 12 - strh r0, [r4, 0x24] - ldrh r0, [r4, 0x32] - bl Cos2 - lsls r0, 16 - asrs r0, 16 - movs r3, 0x36 - ldrsh r1, [r4, r3] - muls r0, r1 - asrs r0, 12 - strh r0, [r4, 0x26] - movs r1, 0x32 - ldrsh r0, [r4, r1] - movs r2, 0x34 - ldrsh r1, [r4, r2] - adds r0, r1 - movs r1, 0xB4 - lsls r1, 1 - bl __modsi3 - strh r0, [r4, 0x32] - ldrh r2, [r4, 0x36] - movs r3, 0x36 - ldrsh r1, [r4, r3] - movs r3, 0x38 - ldrsh r0, [r4, r3] - cmp r1, r0 - beq _081DAA12 - ldrh r0, [r4, 0x3A] - adds r0, r2, r0 - strh r0, [r4, 0x36] - b _081DAA16 -_081DAA12: - ldr r0, =SpriteCallbackDummy - str r0, [r4, 0x1C] -_081DAA16: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81DA9BC - - thumb_func_start sub_81DAA20 -sub_81DAA20: @ 81DAA20 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, =0x00002e90 - adds r0, r4, 0 - bl FreeSpriteTilesByTag - adds r0, r4, 0 - bl FreeSpritePaletteByTag - movs r0, 0x10 - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r4, =gSprites - adds r0, r4 - bl DestroySprite - movs r0, 0x12 - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - bl DestroySprite - movs r0, 0x14 - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - bl DestroySprite - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81DAA20 - - thumb_func_start sub_81DAA74 -sub_81DAA74: @ 81DAA74 - push {r4,r5,lr} - adds r3, r0, 0 - ldr r2, =gSprites - movs r0, 0x10 - ldrsh r1, [r3, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r5, r2, 0 - adds r5, 0x1C - adds r0, r5 - ldr r4, [r0] - ldr r0, =SpriteCallbackDummy - cmp r4, r0 - bne _081DAAC4 - movs r0, 0x12 - ldrsh r1, [r3, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - ldr r2, [r0] - cmp r2, r4 - bne _081DAAC4 - movs r1, 0x14 - ldrsh r0, [r3, r1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r5 - ldr r0, [r1] - cmp r0, r2 - bne _081DAAC4 - movs r0, 0x1 - b _081DAAC6 - .pool -_081DAAC4: - movs r0, 0 -_081DAAC6: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81DAA74 - - thumb_func_start sub_81DAACC -sub_81DAACC: @ 81DAACC - push {r4,lr} - adds r4, r0, 0 - movs r1, 0xA - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _081DAB20 - bl sub_81DA700 - ldr r1, =0x00003f41 - movs r0, 0x50 - bl SetGpuReg - movs r1, 0x80 - lsls r1, 5 - movs r0, 0x52 - bl SetGpuReg - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl ChangeBgX - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r1, 0xA0 - lsls r1, 3 - movs r0, 0 - movs r2, 0x2 - bl ChangeBgY - movs r0, 0 - strh r0, [r4, 0xA] - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0x1 - b _081DAB46 - .pool -_081DAB20: - movs r1, 0x80 - lsls r1, 6 - movs r0, 0 - bl ClearGpuRegBits - movs r1, 0x80 - lsls r1, 7 - movs r0, 0 - bl ClearGpuRegBits - movs r1, 0x80 - lsls r1, 1 - movs r0, 0 - bl ClearGpuRegBits - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - movs r0, 0 -_081DAB46: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81DAACC - - thumb_func_start sub_81DAB4C -sub_81DAB4C: @ 81DAB4C - push {r4,lr} - sub sp, 0x4 - adds r4, r0, 0 - movs r1, 0xC - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _081DAB64 - movs r1, 0x80 - lsls r1, 1 - movs r0, 0 - bl SetGpuRegBits -_081DAB64: - ldrh r1, [r4, 0xC] - movs r2, 0xC - ldrsh r0, [r4, r2] - cmp r0, 0x10 - bne _081DAB98 - ldrh r1, [r4, 0xE] - movs r2, 0xE - ldrsh r0, [r4, r2] - cmp r0, 0x1F - bne _081DAB92 - movs r1, 0x1 - negs r1, r1 - movs r0, 0 - str r0, [sp] - adds r0, r1, 0 - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _081DABB0 -_081DAB92: - adds r0, r1, 0x1 - strh r0, [r4, 0xE] - b _081DABB0 -_081DAB98: - adds r0, r1, 0x1 - strh r0, [r4, 0xC] - ldrh r1, [r4, 0xC] - movs r0, 0x10 - subs r0, r1 - lsls r0, 8 - orrs r1, r0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg -_081DABB0: - movs r0, 0 - add sp, 0x4 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81DAB4C - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/unk_transition.s b/asm/unk_transition.s deleted file mode 100755 index 4b96ccaf71..0000000000 --- a/asm/unk_transition.s +++ /dev/null @@ -1,985 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_81DABBC -sub_81DABBC: @ 81DABBC - push {r4,lr} - adds r4, r0, 0 - bl sub_81DAA74 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _081DABD2 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_081DABD2: - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81DABBC - - thumb_func_start Phase2Task_34 -Phase2Task_34: @ 81DABDC - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_0862B770 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_081DABEE: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _081DABEE - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_34 - - thumb_func_start sub_81DAC14 -sub_81DAC14: @ 81DAC14 - push {r4-r6,lr} - sub sp, 0xC - adds r6, r0, 0 - movs r1, 0x33 - negs r1, r1 - movs r0, 0 - str r0, [sp] - movs r5, 0x2 - str r5, [sp, 0x4] - str r0, [sp, 0x8] - movs r0, 0x78 - movs r2, 0 - movs r3, 0 - bl sub_81DA74C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r6, 0x10] - movs r0, 0x7 - negs r0, r0 - str r5, [sp] - movs r4, 0x2 - negs r4, r4 - str r4, [sp, 0x4] - movs r1, 0x1 - str r1, [sp, 0x8] - movs r1, 0xC1 - movs r2, 0 - movs r3, 0 - bl sub_81DA74C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r6, 0x12] - str r4, [sp] - str r4, [sp, 0x4] - str r5, [sp, 0x8] - movs r0, 0xF7 - movs r1, 0xC1 - movs r2, 0 - movs r3, 0 - bl sub_81DA74C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r6, 0x14] - ldrh r0, [r6, 0x8] - adds r0, 0x1 - strh r0, [r6, 0x8] - movs r0, 0 - add sp, 0xC - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_81DAC14 - - thumb_func_start sub_81DAC80 -sub_81DAC80: @ 81DAC80 - push {lr} - adds r2, r0, 0 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _081DACA4 - adds r0, r2, 0 - bl sub_81DAA20 - ldr r0, =Phase2Task_34 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_081DACA4: - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81DAC80 - - thumb_func_start Phase2Task_35 -Phase2Task_35: @ 81DACB4 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_0862B784 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_081DACC6: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _081DACC6 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_35 - - thumb_func_start sub_81DACEC -sub_81DACEC: @ 81DACEC - push {r4,r5,lr} - sub sp, 0xC - adds r5, r0, 0 - movs r0, 0 - str r0, [sp] - movs r4, 0x4 - negs r4, r4 - str r4, [sp, 0x4] - str r0, [sp, 0x8] - movs r0, 0x78 - movs r1, 0xC5 - movs r2, 0 - movs r3, 0 - bl sub_81DA74C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x10] - str r4, [sp] - movs r4, 0x2 - str r4, [sp, 0x4] - movs r0, 0x1 - str r0, [sp, 0x8] - movs r0, 0xF1 - movs r1, 0x3B - movs r2, 0 - movs r3, 0x1 - bl sub_81DA74C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x12] - movs r0, 0x1 - negs r0, r0 - movs r1, 0x4 - str r1, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - movs r1, 0x3B - movs r2, 0 - movs r3, 0x1 - bl sub_81DA74C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x14] - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] - movs r0, 0 - add sp, 0xC - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81DACEC - - thumb_func_start sub_81DAD58 -sub_81DAD58: @ 81DAD58 - push {lr} - adds r2, r0, 0 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _081DAD7C - adds r0, r2, 0 - bl sub_81DAA20 - ldr r0, =Phase2Task_35 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_081DAD7C: - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81DAD58 - - thumb_func_start Phase2Task_36 -Phase2Task_36: @ 81DAD8C - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_0862B798 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_081DAD9E: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _081DAD9E - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_36 - - thumb_func_start sub_81DADC4 -sub_81DADC4: @ 81DADC4 - push {r4-r6,lr} - mov r6, r8 - push {r6} - sub sp, 0x10 - mov r8, r0 - movs r6, 0x80 - str r6, [sp] - movs r4, 0 - str r4, [sp, 0x4] - movs r5, 0x4 - negs r5, r5 - str r5, [sp, 0x8] - str r4, [sp, 0xC] - movs r0, 0x78 - movs r1, 0x2D - movs r2, 0xC - movs r3, 0x4 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - mov r1, r8 - strh r0, [r1, 0x10] - str r6, [sp] - str r4, [sp, 0x4] - str r5, [sp, 0x8] - movs r0, 0x1 - str r0, [sp, 0xC] - movs r0, 0x59 - movs r1, 0x61 - movs r2, 0xFC - movs r3, 0x4 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - mov r1, r8 - strh r0, [r1, 0x12] - str r6, [sp] - str r4, [sp, 0x4] - str r5, [sp, 0x8] - movs r0, 0x2 - str r0, [sp, 0xC] - movs r0, 0x97 - movs r1, 0x61 - movs r2, 0x84 - movs r3, 0x4 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - mov r1, r8 - strh r0, [r1, 0x14] - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - movs r0, 0 - add sp, 0x10 - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_81DADC4 - - thumb_func_start sub_81DAE44 -sub_81DAE44: @ 81DAE44 - push {lr} - adds r2, r0, 0 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _081DAE68 - adds r0, r2, 0 - bl sub_81DAA20 - ldr r0, =Phase2Task_36 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_081DAE68: - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81DAE44 - - thumb_func_start Phase2Task_37 -Phase2Task_37: @ 81DAE78 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_0862B7AC - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_081DAE8A: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _081DAE8A - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_37 - - thumb_func_start sub_81DAEB0 -sub_81DAEB0: @ 81DAEB0 - push {r4-r6,lr} - mov r6, r8 - push {r6} - sub sp, 0x10 - mov r8, r0 - movs r2, 0x8E - lsls r2, 1 - movs r6, 0x83 - str r6, [sp] - movs r5, 0x23 - str r5, [sp, 0x4] - movs r4, 0x3 - negs r4, r4 - str r4, [sp, 0x8] - movs r0, 0 - str r0, [sp, 0xC] - movs r0, 0x78 - movs r1, 0x50 - movs r3, 0x8 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - mov r1, r8 - strh r0, [r1, 0x10] - str r6, [sp] - str r5, [sp, 0x4] - str r4, [sp, 0x8] - movs r0, 0x1 - str r0, [sp, 0xC] - movs r0, 0x78 - movs r1, 0x50 - movs r2, 0x2C - movs r3, 0x8 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - mov r1, r8 - strh r0, [r1, 0x12] - str r6, [sp] - str r5, [sp, 0x4] - str r4, [sp, 0x8] - movs r0, 0x2 - str r0, [sp, 0xC] - movs r0, 0x79 - movs r1, 0x50 - movs r2, 0xA4 - movs r3, 0x8 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - mov r1, r8 - strh r0, [r1, 0x14] - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - movs r0, 0 - add sp, 0x10 - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_81DAEB0 - - thumb_func_start sub_81DAF34 -sub_81DAF34: @ 81DAF34 - push {lr} - adds r2, r0, 0 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _081DAF58 - adds r0, r2, 0 - bl sub_81DAA20 - ldr r0, =Phase2Task_37 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_081DAF58: - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81DAF34 - - thumb_func_start Phase2Task_38 -Phase2Task_38: @ 81DAF68 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_0862B7C0 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_081DAF7A: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _081DAF7A - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_38 - - thumb_func_start sub_81DAFA0 -sub_81DAFA0: @ 81DAFA0 - push {r4,lr} - sub sp, 0xC - adds r4, r0, 0 - movs r0, 0xA - ldrsh r2, [r4, r0] - cmp r2, 0 - bne _081DAFCC - movs r1, 0x33 - negs r1, r1 - str r2, [sp] - movs r0, 0x4 - str r0, [sp, 0x4] - str r2, [sp, 0x8] - movs r0, 0x78 - movs r2, 0 - movs r3, 0 - bl sub_81DA74C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x10] - b _081DB01A -_081DAFCC: - cmp r2, 0x10 - bne _081DAFF2 - movs r0, 0x7 - negs r0, r0 - movs r1, 0x4 - str r1, [sp] - subs r1, 0x8 - str r1, [sp, 0x4] - movs r1, 0x1 - str r1, [sp, 0x8] - movs r1, 0xC1 - movs r2, 0 - movs r3, 0 - bl sub_81DA74C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x12] - b _081DB01A -_081DAFF2: - cmp r2, 0x20 - bne _081DB01A - movs r0, 0x4 - negs r0, r0 - str r0, [sp] - str r0, [sp, 0x4] - movs r0, 0x2 - str r0, [sp, 0x8] - movs r0, 0xF7 - movs r1, 0xC1 - movs r2, 0 - movs r3, 0 - bl sub_81DA74C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x14] - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_081DB01A: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - movs r0, 0 - add sp, 0xC - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81DAFA0 - - thumb_func_start sub_81DB02C -sub_81DB02C: @ 81DB02C - push {lr} - adds r2, r0, 0 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _081DB050 - adds r0, r2, 0 - bl sub_81DAA20 - ldr r0, =Phase2Task_38 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_081DB050: - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81DB02C - - thumb_func_start Phase2Task_39 -Phase2Task_39: @ 81DB060 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_0862B7D4 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_081DB072: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _081DB072 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_39 - - thumb_func_start sub_81DB098 -sub_81DB098: @ 81DB098 - push {r4,lr} - sub sp, 0xC - adds r4, r0, 0 - movs r0, 0xA - ldrsh r1, [r4, r0] - cmp r1, 0 - bne _081DB0C4 - str r1, [sp] - movs r0, 0x8 - negs r0, r0 - str r0, [sp, 0x4] - str r1, [sp, 0x8] - movs r0, 0x78 - movs r1, 0xC5 - movs r2, 0 - movs r3, 0 - bl sub_81DA74C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x10] - b _081DB112 -_081DB0C4: - cmp r1, 0x10 - bne _081DB0E8 - movs r0, 0x8 - negs r0, r0 - str r0, [sp] - movs r0, 0x1 - str r0, [sp, 0x4] - str r0, [sp, 0x8] - movs r0, 0xF1 - movs r1, 0x4E - movs r2, 0 - movs r3, 0 - bl sub_81DA74C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x12] - b _081DB112 -_081DB0E8: - cmp r1, 0x20 - bne _081DB112 - movs r0, 0x1 - negs r0, r0 - movs r1, 0x8 - str r1, [sp] - movs r1, 0x1 - str r1, [sp, 0x4] - movs r1, 0x2 - str r1, [sp, 0x8] - movs r1, 0x4E - movs r2, 0 - movs r3, 0 - bl sub_81DA74C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x14] - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_081DB112: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - movs r0, 0 - add sp, 0xC - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81DB098 - - thumb_func_start sub_81DB124 -sub_81DB124: @ 81DB124 - push {lr} - adds r2, r0, 0 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _081DB148 - adds r0, r2, 0 - bl sub_81DAA20 - ldr r0, =Phase2Task_39 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_081DB148: - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81DB124 - - thumb_func_start Phase2Task_40 -Phase2Task_40: @ 81DB158 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_0862B7E8 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_081DB16A: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _081DB16A - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_40 - - thumb_func_start sub_81DB190 -sub_81DB190: @ 81DB190 - push {r4,lr} - sub sp, 0x10 - adds r4, r0, 0 - movs r0, 0xA - ldrsh r1, [r4, r0] - cmp r1, 0 - bne _081DB1BE - movs r0, 0x80 - str r0, [sp] - str r1, [sp, 0x4] - subs r0, 0x84 - str r0, [sp, 0x8] - str r1, [sp, 0xC] - movs r0, 0x78 - movs r1, 0x2D - movs r2, 0xC - movs r3, 0x4 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x10] - b _081DB212 -_081DB1BE: - cmp r1, 0x10 - bne _081DB1E6 - movs r0, 0x80 - str r0, [sp] - movs r0, 0 - str r0, [sp, 0x4] - subs r0, 0x4 - str r0, [sp, 0x8] - movs r0, 0x1 - str r0, [sp, 0xC] - movs r0, 0x59 - movs r1, 0x61 - movs r2, 0xFC - movs r3, 0x4 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x12] - b _081DB212 -_081DB1E6: - cmp r1, 0x20 - bne _081DB212 - movs r0, 0x80 - str r0, [sp] - movs r0, 0 - str r0, [sp, 0x4] - subs r0, 0x4 - str r0, [sp, 0x8] - movs r0, 0x2 - str r0, [sp, 0xC] - movs r0, 0x97 - movs r1, 0x61 - movs r2, 0x84 - movs r3, 0x4 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x14] - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_081DB212: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - movs r0, 0 - add sp, 0x10 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81DB190 - - thumb_func_start sub_81DB224 -sub_81DB224: @ 81DB224 - push {lr} - adds r2, r0, 0 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _081DB248 - adds r0, r2, 0 - bl sub_81DAA20 - ldr r0, =Phase2Task_40 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_081DB248: - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81DB224 - - thumb_func_start Phase2Task_41 -Phase2Task_41: @ 81DB258 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_0862B7FC - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_081DB26A: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _081DB26A - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end Phase2Task_41 - - thumb_func_start sub_81DB290 -sub_81DB290: @ 81DB290 - push {r4,lr} - sub sp, 0x10 - adds r4, r0, 0 - movs r0, 0xA - ldrsh r1, [r4, r0] - cmp r1, 0 - bne _081DB2C2 - movs r2, 0x8E - lsls r2, 1 - movs r0, 0x83 - str r0, [sp] - movs r0, 0x23 - str r0, [sp, 0x4] - subs r0, 0x26 - str r0, [sp, 0x8] - str r1, [sp, 0xC] - movs r0, 0x78 - movs r1, 0x50 - movs r3, 0x8 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x10] - b _081DB316 -_081DB2C2: - cmp r1, 0x10 - bne _081DB2EA - movs r0, 0x83 - str r0, [sp] - movs r0, 0x23 - str r0, [sp, 0x4] - subs r0, 0x26 - str r0, [sp, 0x8] - movs r0, 0x1 - str r0, [sp, 0xC] - movs r0, 0x78 - movs r1, 0x50 - movs r2, 0x2C - movs r3, 0x8 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x12] - b _081DB316 -_081DB2EA: - cmp r1, 0x20 - bne _081DB316 - movs r0, 0x83 - str r0, [sp] - movs r0, 0x23 - str r0, [sp, 0x4] - subs r0, 0x26 - str r0, [sp, 0x8] - movs r0, 0x2 - str r0, [sp, 0xC] - movs r0, 0x79 - movs r1, 0x50 - movs r2, 0xA4 - movs r3, 0x8 - bl sub_81DA8BC - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x14] - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_081DB316: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - movs r0, 0 - add sp, 0x10 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81DB290 - - thumb_func_start sub_81DB328 -sub_81DB328: @ 81DB328 - push {lr} - adds r2, r0, 0 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _081DB34C - adds r0, r2, 0 - bl sub_81DAA20 - ldr r0, =Phase2Task_41 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_081DB34C: - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81DB328 - - .align 2, 0 @ Don't pad with nop. diff --git a/data/unk_sprite_file.s b/data/unk_sprite_file.s deleted file mode 100644 index 2d5c9c12a6..0000000000 --- a/data/unk_sprite_file.s +++ /dev/null @@ -1,42 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_0862AD54:: @ 862AD54 - .incbin "baserom.gba", 0x62ad54, 0x1dc - -gUnknown_0862AF30:: @ 862AF30 - .incbin "baserom.gba", 0x62af30, 0x1AC - -gUnknown_0862B0DC:: @ 862B0DC - .incbin "baserom.gba", 0x62b0dc, 0x460 - -gUnknown_0862B53C:: @ 862B53C - .incbin "baserom.gba", 0x62b53c, 0x1E0 - -gUnknown_0862B71C:: @ 862B71C - .incbin "baserom.gba", 0x62b71c, 0x8 - -gUnknown_0862B724:: @ 862B724 - obj_tiles gUnknown_0862B0DC, 0x1800, 11920 - -gUnknown_0862B72C:: @ 862B72C - obj_pal gUnknown_0862B53C, 11920 - -gUnknown_0862B734:: @ 862B734 - .incbin "baserom.gba", 0x62b734, 0x8 - -gUnknown_0862B73C:: @ 862B73C - .incbin "baserom.gba", 0x62b73c, 0x8 - -gUnknown_0862B744:: @ 862B744 - .incbin "baserom.gba", 0x62b744, 0x8 - -gUnknown_0862B74C:: @ 862B74C - .4byte gUnknown_0862B734 - .4byte gUnknown_0862B73C - .4byte gUnknown_0862B744 - -gUnknown_0862B758:: @ 862B758 - spr_template 11920, 11920, gUnknown_0862B71C, gUnknown_0862B74C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy diff --git a/data/unk_transition.s b/data/unk_transition.s index 1b9ce51711..5d0dc07af7 100644 --- a/data/unk_transition.s +++ b/data/unk_transition.s @@ -3,58 +3,14 @@ .section .rodata -gUnknown_0862B770:: @ 862B770 - .4byte sub_81DAACC - .4byte sub_81DAC14 - .4byte sub_81DABBC - .4byte sub_81DAB4C - .4byte sub_81DAC80 +gUnknown_0862AD54:: @ 862AD54 + .incbin "baserom.gba", 0x62ad54, 0x1dc -gUnknown_0862B784:: @ 862B784 - .4byte sub_81DAACC - .4byte sub_81DACEC - .4byte sub_81DABBC - .4byte sub_81DAB4C - .4byte sub_81DAD58 +gUnknown_0862AF30:: @ 862AF30 + .incbin "baserom.gba", 0x62af30, 0x1AC -gUnknown_0862B798:: @ 862B798 - .4byte sub_81DAACC - .4byte sub_81DADC4 - .4byte sub_81DABBC - .4byte sub_81DAB4C - .4byte sub_81DAE44 +gUnknown_0862B0DC:: @ 862B0DC + .incbin "baserom.gba", 0x62b0dc, 0x460 -gUnknown_0862B7AC:: @ 862B7AC - .4byte sub_81DAACC - .4byte sub_81DAEB0 - .4byte sub_81DABBC - .4byte sub_81DAB4C - .4byte sub_81DAF34 - -gUnknown_0862B7C0:: @ 862B7C0 - .4byte sub_81DAACC - .4byte sub_81DAFA0 - .4byte sub_81DABBC - .4byte sub_81DAB4C - .4byte sub_81DB02C - -gUnknown_0862B7D4:: @ 862B7D4 - .4byte sub_81DAACC - .4byte sub_81DB098 - .4byte sub_81DABBC - .4byte sub_81DAB4C - .4byte sub_81DB124 - -gUnknown_0862B7E8:: @ 862B7E8 - .4byte sub_81DAACC - .4byte sub_81DB190 - .4byte sub_81DABBC - .4byte sub_81DAB4C - .4byte sub_81DB224 - -gUnknown_0862B7FC:: @ 862B7FC - .4byte sub_81DAACC - .4byte sub_81DB290 - .4byte sub_81DABBC - .4byte sub_81DAB4C - .4byte sub_81DB328 +gUnknown_0862B53C:: @ 862B53C + .incbin "baserom.gba", 0x62b53c, 0x1E0 diff --git a/ld_script.txt b/ld_script.txt index 68365e2522..a7379d18b5 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -273,8 +273,7 @@ SECTIONS { src/walda_phrase.o(.text); asm/contest_link_81D9DE4.o(.text); asm/trainer_rematch.o(.text); - asm/unk_sprite_file.o(.text); - asm/unk_transition.o(.text); + src/unk_transition.o(.text); src/international_string_util.o(.text); asm/international_string_util.o(.text); } =0 @@ -539,8 +538,8 @@ SECTIONS { src/rayquaza_scene.o(.rodata); src/walda_phrase.o(.rodata); data/trainer_rematch.o(.rodata); - data/unk_sprite_file.o(.rodata); data/unk_transition.o(.rodata); + src/unk_transition.o(.rodata); data/link_strings.o(.rodata); data/fonts.o(.rodata); data/mystery_event_msg.o(.rodata); diff --git a/src/unk_transition.c b/src/unk_transition.c new file mode 100644 index 0000000000..feaddc8ced --- /dev/null +++ b/src/unk_transition.c @@ -0,0 +1,633 @@ +#include "global.h" +#include "sprite.h" +#include "decompress.h" +#include "unk_transition.h" +#include "battle_transition.h" +#include "task.h" +#include "palette.h" +#include "trig.h" +#include "bg.h" +#include "gpu_regs.h" + +typedef bool8 (*TransitionStateFunc)(struct Task *task); + +// this file's functions +static void sub_81DA848(struct Sprite *sprite); +static void sub_81DA9BC(struct Sprite *sprite); +static bool8 sub_81DAACC(struct Task *task); +static bool8 sub_81DAC14(struct Task *task); +static bool8 sub_81DABBC(struct Task *task); +static bool8 sub_81DAB4C(struct Task *task); +static bool8 sub_81DAC80(struct Task *task); +static bool8 sub_81DACEC(struct Task *task); +static bool8 sub_81DAD58(struct Task *task); +static bool8 sub_81DADC4(struct Task *task); +static bool8 sub_81DAE44(struct Task *task); +static bool8 sub_81DAEB0(struct Task *task); +static bool8 sub_81DAF34(struct Task *task); +static bool8 sub_81DAFA0(struct Task *task); +static bool8 sub_81DB02C(struct Task *task); +static bool8 sub_81DB098(struct Task *task); +static bool8 sub_81DB124(struct Task *task); +static bool8 sub_81DB190(struct Task *task); +static bool8 sub_81DB224(struct Task *task); +static bool8 sub_81DB290(struct Task *task); +static bool8 sub_81DB328(struct Task *task); + +// const rom data +// TODO: move those from .s file to .c +extern const u8 gUnknown_0862AD54[]; +extern const u8 gUnknown_0862AF30[]; +extern const u8 gUnknown_0862B0DC[]; +extern const u16 gUnknown_0862B53C[]; + +static const struct OamData sOamData_862B71C = +{ + .y = 0, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 1, + .paletteNum = 0, + .affineParam = 0 +}; + +static const struct CompressedSpriteSheet sUnknown_0862B724 = +{ + gUnknown_0862B0DC, 0x1800, 11920 +}; + +static const struct SpritePalette sUnknown_0862B72C = +{ + gUnknown_0862B53C, 11920 +}; + +static const union AnimCmd sSpriteAnim_862B734[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END +}; + +static const union AnimCmd sSpriteAnim_862B73C[] = +{ + ANIMCMD_FRAME(64, 1), + ANIMCMD_END +}; + +static const union AnimCmd sSpriteAnim_862B744[] = +{ + ANIMCMD_FRAME(128, 1), + ANIMCMD_END +}; + +static const union AnimCmd *const sSpriteAnimTable_862B74C[] = +{ + sSpriteAnim_862B734, + sSpriteAnim_862B73C, + sSpriteAnim_862B744 +}; + +static const struct SpriteTemplate sUnknown_0862B758 = +{ + .tileTag = 11920, + .paletteTag = 11920, + .oam = &sOamData_862B71C, + .anims = sSpriteAnimTable_862B74C, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, +}; + +static const TransitionStateFunc sPhase2_34_Funcs[] = +{ + sub_81DAACC, + sub_81DAC14, + sub_81DABBC, + sub_81DAB4C, + sub_81DAC80 +}; + +static const TransitionStateFunc sPhase2_35_Funcs[] = +{ + sub_81DAACC, + sub_81DACEC, + sub_81DABBC, + sub_81DAB4C, + sub_81DAD58 +}; + +static const TransitionStateFunc sPhase2_36_Funcs[] = +{ + sub_81DAACC, + sub_81DADC4, + sub_81DABBC, + sub_81DAB4C, + sub_81DAE44 +}; + +static const TransitionStateFunc sPhase2_37_Funcs[] = +{ + sub_81DAACC, + sub_81DAEB0, + sub_81DABBC, + sub_81DAB4C, + sub_81DAF34 +}; + +static const TransitionStateFunc sPhase2_38_Funcs[] = +{ + sub_81DAACC, + sub_81DAFA0, + sub_81DABBC, + sub_81DAB4C, + sub_81DB02C +}; + +static const TransitionStateFunc sPhase2_39_Funcs[] = +{ + sub_81DAACC, + sub_81DB098, + sub_81DABBC, + sub_81DAB4C, + sub_81DB124 +}; + +static const TransitionStateFunc sPhase2_40_Funcs[] = +{ + sub_81DAACC, + sub_81DB190, + sub_81DABBC, + sub_81DAB4C, + sub_81DB224 +}; + +static const TransitionStateFunc sPhase2_41_Funcs[] = +{ + sub_81DAACC, + sub_81DB290, + sub_81DABBC, + sub_81DAB4C, + sub_81DB328 +}; + +// code +static void sub_81DA700(void) +{ + u16 *dst1, *dst2; + + sub_8149F58(&dst1, &dst2); + LZ77UnCompVram(gUnknown_0862AD54, dst2); + LZ77UnCompVram(gUnknown_0862AF30, dst1); + LoadPalette(gUnknown_0862B53C, 0xF0, 0x20); + LoadCompressedObjectPic(&sUnknown_0862B724); + LoadSpritePalette(&sUnknown_0862B72C); +} + +static u8 sub_81DA74C(s16 x, s16 y, u8 arg2, u8 arg3, s8 arg4, s8 arg5, u8 spriteAnimNum) +{ + u8 spriteId = CreateSprite(&sUnknown_0862B758, x, y, 0); + + switch (spriteAnimNum) + { + case 0: + gSprites[spriteId].data[0] = 120; + gSprites[spriteId].data[1] = 45; + break; + case 1: + gSprites[spriteId].data[0] = 89; + gSprites[spriteId].data[1] = 97; + break; + case 2: + gSprites[spriteId].data[0] = 151; + gSprites[spriteId].data[1] = 97; + break; + } + + gSprites[spriteId].data[2] = arg4; + gSprites[spriteId].data[3] = arg5; + gSprites[spriteId].data[6] = arg2; + gSprites[spriteId].data[7] = arg3; + gSprites[spriteId].data[4] = 0; + gSprites[spriteId].data[5] = 0; + + StartSpriteAnim(&gSprites[spriteId], spriteAnimNum); + gSprites[spriteId].callback = sub_81DA848; + + return spriteId; +} + +static void sub_81DA848(struct Sprite *sprite) +{ + s16 *data = sprite->data; + + if (sprite->pos1.x == data[0] && sprite->pos1.y == data[1]) + { + sprite->callback = SpriteCallbackDummy; + } + else + { + if (data[4] == data[6]) + { + sprite->pos1.x += data[2]; + data[4] = 0; + } + else + { + data[4]++; + } + + if (data[5] == data[7]) + { + sprite->pos1.y += data[3]; + data[5] = 0; + } + else + { + data[5]++; + } + } +} + +static u8 sub_81DA8BC(s16 x, s16 y, s16 arg2, s16 arg3, s16 arg4, s16 arg5, s16 arg6, u8 spriteAnimNum) +{ + u8 spriteId = CreateSprite(&sUnknown_0862B758, x, y, 0); + + switch (spriteAnimNum) + { + case 0: + gSprites[spriteId].data[0] = 120; + gSprites[spriteId].data[1] = 45; + break; + case 1: + gSprites[spriteId].data[0] = 89; + gSprites[spriteId].data[1] = 97; + break; + case 2: + gSprites[spriteId].data[0] = 151; + gSprites[spriteId].data[1] = 97; + break; + } + + gSprites[spriteId].data[2] = arg2; + gSprites[spriteId].data[3] = arg3; + gSprites[spriteId].data[4] = arg4; + gSprites[spriteId].data[5] = arg5; + gSprites[spriteId].data[6] = arg6; + + StartSpriteAnim(&gSprites[spriteId], spriteAnimNum); + gSprites[spriteId].callback = sub_81DA9BC; + + return spriteId; +} + +static void sub_81DA9BC(struct Sprite *sprite) +{ + sprite->pos2.x = (Sin2(sprite->data[2]) * sprite->data[4]) >> 12; // div by 4096 + sprite->pos2.y = (Cos2(sprite->data[2]) * sprite->data[4]) >> 12; // div by 4096 + + sprite->data[2] = (sprite->data[2] + sprite->data[3]) % 360; + + if (sprite->data[4] != sprite->data[5]) + sprite->data[4] += sprite->data[6]; + else + sprite->callback = SpriteCallbackDummy; +} + +#define tState data[0] + +static void sub_81DAA20(struct Task *task) +{ + FreeSpriteTilesByTag(11920); + FreeSpritePaletteByTag(11920); + + DestroySprite(&gSprites[task->data[4]]); + DestroySprite(&gSprites[task->data[5]]); + DestroySprite(&gSprites[task->data[6]]); +} + +static bool8 sub_81DAA74(struct Task *task) +{ + if (gSprites[task->data[4]].callback == SpriteCallbackDummy + && gSprites[task->data[5]].callback == SpriteCallbackDummy + && gSprites[task->data[6]].callback == SpriteCallbackDummy) + return TRUE; + else + return FALSE; +} + +static bool8 sub_81DAACC(struct Task *task) +{ + if (task->data[1] == 0) + { + ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON); + ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN1_ON); + ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG0_ON); + + task->data[1]++; + return FALSE; + } + else + { + sub_81DA700(); + SetGpuReg(REG_OFFSET_BLDCNT, 0x3F41); + SetGpuReg(REG_OFFSET_BLDALPHA, 0x1000); + ChangeBgX(0, 0, 0); + ChangeBgY(0, 0, 0); + ChangeBgY(0, 0x500, 2); + + task->data[1] = 0; + task->tState++; + return TRUE; + } +} + +static bool8 sub_81DAB4C(struct Task *task) +{ + if (task->data[2] == 0) + SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG0_ON); + + if (task->data[2] == 16) + { + if (task->data[3] == 31) + { + BeginNormalPaletteFade(-1, -1, 0, 0x10, 0); + task->tState++; + } + else + { + task->data[3]++; + } + } + else + { + u16 var; + + task->data[2]++; + var = task->data[2]; + SetGpuReg(REG_OFFSET_BLDALPHA, (var) | ((16 - var) << 8)); + } + + return FALSE; +} + +static bool8 sub_81DABBC(struct Task *task) +{ + if (sub_81DAA74(task) == TRUE) + task->tState++; + + return FALSE; +} + +void Phase2Task_34(u8 taskId) +{ + while (sPhase2_34_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +static bool8 sub_81DAC14(struct Task *task) +{ + task->data[4] = sub_81DA74C(120, -51, 0, 0, 0, 2, 0); + task->data[5] = sub_81DA74C(-7, 193, 0, 0, 2, -2, 1); + task->data[6] = sub_81DA74C(247, 193, 0, 0, -2, -2, 2); + + task->tState++; + return FALSE; +} + +static bool8 sub_81DAC80(struct Task *task) +{ + if (!gPaletteFade.active) + { + sub_81DAA20(task); + DestroyTask(FindTaskIdByFunc(Phase2Task_34)); + } + + return FALSE; +} + +void Phase2Task_35(u8 taskId) +{ + while (sPhase2_35_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +static bool8 sub_81DACEC(struct Task *task) +{ + task->data[4] = sub_81DA74C(120, 197, 0, 0, 0, -4, 0); + task->data[5] = sub_81DA74C(241, 59, 0, 1, -4, 2, 1); + task->data[6] = sub_81DA74C(-1, 59, 0, 1, 4, 2, 2); + + task->tState++; + return FALSE; +} + +static bool8 sub_81DAD58(struct Task *task) +{ + if (!gPaletteFade.active) + { + sub_81DAA20(task); + DestroyTask(FindTaskIdByFunc(Phase2Task_35)); + } + + return FALSE; +} + +void Phase2Task_36(u8 taskId) +{ + while (sPhase2_36_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +static bool8 sub_81DADC4(struct Task *task) +{ + task->data[4] = sub_81DA8BC(120, 45, 12, 4, 128, 0, -4, 0); + task->data[5] = sub_81DA8BC(89, 97, 252, 4, 128, 0, -4, 1); + task->data[6] = sub_81DA8BC(151, 97, 132, 4, 128, 0, -4, 2); + + task->tState++; + return FALSE; +} + +static bool8 sub_81DAE44(struct Task *task) +{ + if (!gPaletteFade.active) + { + sub_81DAA20(task); + DestroyTask(FindTaskIdByFunc(Phase2Task_36)); + } + + return FALSE; +} + +void Phase2Task_37(u8 taskId) +{ + while (sPhase2_37_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +static bool8 sub_81DAEB0(struct Task *task) +{ + task->data[4] = sub_81DA8BC(120, 80, 284, 8, 131, 35, -3, 0); + task->data[5] = sub_81DA8BC(120, 80, 44, 8, 131, 35, -3, 1); + task->data[6] = sub_81DA8BC(121, 80, 164, 8, 131, 35, -3, 2); + + task->tState++; + return FALSE; +} + +static bool8 sub_81DAF34(struct Task *task) +{ + if (!gPaletteFade.active) + { + sub_81DAA20(task); + DestroyTask(FindTaskIdByFunc(Phase2Task_37)); + } + + return FALSE; +} + +void Phase2Task_38(u8 taskId) +{ + while (sPhase2_38_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +static bool8 sub_81DAFA0(struct Task *task) +{ + if (task->data[1] == 0) + { + task->data[4] = sub_81DA74C(120, -51, 0, 0, 0, 4, 0); + } + else if (task->data[1] == 16) + { + task->data[5] = sub_81DA74C(-7, 193, 0, 0, 4, -4, 1); + } + else if (task->data[1] == 32) + { + task->data[6] = sub_81DA74C(247, 193, 0, 0, -4, -4, 2); + task->tState++; + } + + task->data[1]++; + return FALSE; +} + +static bool8 sub_81DB02C(struct Task *task) +{ + if (!gPaletteFade.active) + { + sub_81DAA20(task); + DestroyTask(FindTaskIdByFunc(Phase2Task_38)); + } + + return FALSE; +} + +void Phase2Task_39(u8 taskId) +{ + while (sPhase2_39_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +static bool8 sub_81DB098(struct Task *task) +{ + if (task->data[1] == 0) + { + task->data[4] = sub_81DA74C(120, 197, 0, 0, 0, -8, 0); + } + else if (task->data[1] == 16) + { + task->data[5] = sub_81DA74C(241, 78, 0, 0, -8, 1, 1); + } + else if (task->data[1] == 32) + { + task->data[6] = sub_81DA74C(-1, 78, 0, 0, 8, 1, 2); + task->tState++; + } + + task->data[1]++; + return FALSE; +} + +static bool8 sub_81DB124(struct Task *task) +{ + if (!gPaletteFade.active) + { + sub_81DAA20(task); + DestroyTask(FindTaskIdByFunc(Phase2Task_39)); + } + + return FALSE; +} + +void Phase2Task_40(u8 taskId) +{ + while (sPhase2_40_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +static bool8 sub_81DB190(struct Task *task) +{ + if (task->data[1] == 0) + { + task->data[4] = sub_81DA8BC(120, 45, 12, 4, 128, 0, -4, 0); + } + else if (task->data[1] == 16) + { + task->data[5] = sub_81DA8BC(89, 97, 252, 4, 128, 0, -4, 1); + } + else if (task->data[1] == 32) + { + task->data[6] = sub_81DA8BC(151, 97, 132, 4, 128, 0, -4, 2); + task->tState++; + } + + task->data[1]++; + return FALSE; +} + +static bool8 sub_81DB224(struct Task *task) +{ + if (!gPaletteFade.active) + { + sub_81DAA20(task); + DestroyTask(FindTaskIdByFunc(Phase2Task_40)); + } + + return FALSE; +} + +void Phase2Task_41(u8 taskId) +{ + while (sPhase2_41_Funcs[gTasks[taskId].tState](&gTasks[taskId])); +} + +static bool8 sub_81DB290(struct Task *task) +{ + if (task->data[1] == 0) + { + task->data[4] = sub_81DA8BC(120, 80, 284, 8, 131, 35, -3, 0); + } + else if (task->data[1] == 16) + { + task->data[5] = sub_81DA8BC(120, 80, 44, 8, 131, 35, -3, 1); + } + else if (task->data[1] == 32) + { + task->data[6] = sub_81DA8BC(121, 80, 164, 8, 131, 35, -3, 2); + task->tState++; + } + + task->data[1]++; + return FALSE; +} + +static bool8 sub_81DB328(struct Task *task) +{ + if (!gPaletteFade.active) + { + sub_81DAA20(task); + DestroyTask(FindTaskIdByFunc(Phase2Task_41)); + } + + return FALSE; +} From 9c84e8fd565b074496a7904ae8a367822405bdbf Mon Sep 17 00:00:00 2001 From: Devin Date: Tue, 16 Jan 2018 19:36:34 -0500 Subject: [PATCH 26/64] Fix typos in songs.h and song_table.inc again, and made the comments match. I'm sorry if I sound like a brolen record. ;) --- include/constants/songs.h | 52 ++++++++++++++++----------------- sound/song_table.inc | 60 +++++++++++++++++++-------------------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/include/constants/songs.h b/include/constants/songs.h index 26ab1da35b..58a8e725cd 100644 --- a/include/constants/songs.h +++ b/include/constants/songs.h @@ -16,7 +16,7 @@ #define SE_KOUKA_L 12 // Not Very Effective #define SE_KOUKA_M 13 // Normal Effectiveness #define SE_KOUKA_H 14 // Super Effective -#define SE_BOWA2 15 // Pokémon Withdrawl +#define SE_BOWA2 15 // Pokémon Withdrawal #define SE_POKE_DEAD 16 // Pokémon Fainted #define SE_NIGERU 17 // Flee from Wild Battle #define SE_JIDO_DOA 18 // Pokémon Center Door @@ -43,7 +43,7 @@ #define SE_FU_ZUZUZU 39 // Lavaridge Gym Warp #define SE_RU_GASHIN 40 // Sootopolis Gym - Stairs Appear #define SE_RU_GASYAN 41 // Sootopolis Gym - Ice Breaking -#define SE_RU_BARI 42 // Sootopolis Gym - Stepping on Ice +#define SE_RU_BARI 42 // Sootopolis Gym - Walking on Ice #define SE_RU_HYUU 43 // Falling Down #define SE_KI_GASYAN 44 #define SE_TK_WARPIN 45 // Warp In @@ -78,12 +78,12 @@ #define SE_FUUSEN1 74 // Red Balloon #define SE_FUUSEN2 75 // Blue Balloon #define SE_FUUSEN3 76 // Yellow Balloon -#define SE_TOY_KABE 77 // Brealable Door +#define SE_TOY_KABE 77 // Breakable Door #define SE_TOY_DANGO 78 // Mud Ball #define SE_DOKU 79 // Overworld Poison Damage #define SE_ESUKA 80 // Escalator #define SE_T_AME 81 // Rain -#define SE_T_AME_E 82 // Rain stop +#define SE_T_AME_E 82 // Rain Stop #define SE_T_OOAME 83 // Heavy Rain #define SE_T_OOAME_E 84 // Heavy Rain Stop #define SE_T_KOAME 85 // Light Rain @@ -261,7 +261,7 @@ #define SE_RG_KITEKI 256 // S.S. Anne Horn #define SE_RG_HELP_OP 257 // Help Menu Open #define SE_RG_HELP_CL 258 // Help Menu Close -#define SE_RG_HELP_NG 259 // Help Menu Error? +#define SE_RG_HELP_NG 259 // Help Menu Error #define SE_RG_DEOMOV 260 // Deoxys Moves #define SE_RG_EXCELLENT 261 #define SE_RG_NAWAMISS 262 @@ -287,7 +287,7 @@ #define MUS_DOORO_X1 360 // Route 110 #define MUS_DOORO_X3 361 // Route 120 #define MUS_MACHI_S2 362 // Petalburg City -#define MUS_MACHI_S4 363 // Oldale Town +#define MUS_MACHI_S4 363 // Oldale/Lavaridge Town #define MUS_GIM 364 // Gym #define MUS_NAMINORI 365 // Surfing #define MUS_DAN01 366 // Caves and Darkness @@ -297,20 +297,20 @@ #define MUS_FANFA4 370 // Obtained an Item! #define MUS_FANFA5 371 // Your Pokémon Just Evolved! #define MUS_ME_WAZA 372 // Obtained a TM/HM! -#define MUS_BIJYUTU 373 // Lilycove Musseum +#define MUS_BIJYUTU 373 // Lilycove Museum #define MUS_DOORO_X4 374 // Route 122/Intro #define MUS_FUNE_KAN 375 // Slateport Museum #define MUS_ME_SHINKA 376 // Evolution Intro #define MUS_SHINKA 377 // Evolution -#define MUS_ME_WASURE 378 // Move Deleted +#define MUS_ME_WASURE 378 // Move Deleted/Messed Up Appeal #define MUS_SYOUJOEYE 379 // Encounter! Tuber #define MUS_BOYEYE 380 // Encounter! Boy -#define MUS_DAN02 381 // Abandoned Ship -#define MUS_MACHI_S3 382 // Fortree City +#define MUS_DAN02 381 // Abandoned Ship/Southern Island +#define MUS_MACHI_S3 382 // Fortree City/Pacifidlog Town #define MUS_ODAMAKI 383 // Professor Birch's Lab #define MUS_B_TOWER 384 // Battle Tower (RS) #define MUS_SWIMEYE 385 // Encounter! Swimmer -#define MUS_DAN03 386 // Meteor Falls +#define MUS_DAN03 386 // Meteor Falls/Cave of Origin #define MUS_ME_KINOMI 387 // Obtained a Berry! #define MUS_ME_TAMA 388 // Awakening the Super-Ancient Pokémon #define MUS_ME_B_BIG 389 // Slots Jackpot! @@ -321,9 +321,9 @@ #define MUS_TEST2 394 // Contest Test 2 #define MUS_TEST3 395 // Contest Test 3 #define MUS_TEST4 396 // Contest Test 4 -#define MUS_TEST 397 // Encounter! Gentleman (Test?) +#define MUS_TEST 397 // Encounter! Gentleman #define MUS_GOMACHI0 398 // Verdanturf Town -#define MUS_GOTOWN 399 // Rustboro City +#define MUS_GOTOWN 399 // Rustboro/Mauville/Mossdeep City #define MUS_POKECEN 400 // Pokémon Center #define MUS_NEXTROAD 401 // Route 104 #define MUS_GRANROAD 402 // Route 119 @@ -353,24 +353,24 @@ #define MUS_CASINO 426 // Game Corner #define MUS_HIGHTOWN 427 // Dewford Town #define MUS_SAFARI 428 // Safari Zone -#define MUS_C_ROAD 429 // Victory Toad +#define MUS_C_ROAD 429 // Victory Road #define MUS_AJITO 430 // Aqua/Magma Hideout #define MUS_M_BOAT 431 // Sailing #define MUS_M_DUNGON 432 // Mt. Pyre (Inside) #define MUS_FINECITY 433 // Slateport City #define MUS_MACHUPI 434 // Mt. Pyre (Outside) #define MUS_P_SCHOOL 435 // Pokémon Trainer's School -#define MUS_DENDOU 436 // Hall of Fame -#define MUS_TONEKUSA 437 // Lavaridge Town +#define MUS_DENDOU 436 // You're the Champion! +#define MUS_TONEKUSA 437 // Fallarbor Town #define MUS_MABOROSI 438 // Sealed Chamber -#define MUS_CON_FAN 439 // You are the Champion! +#define MUS_CON_FAN 439 // Obtained a Contest Ribbon! #define MUS_CONTEST0 440 // Pokémon Contest #define MUS_MGM0 441 // Encounter! Team Magma #define MUS_T_BATTLE 442 // Opening Battle #define MUS_OOAME 443 // The Flood #define MUS_HIDERI 444 // The Drought #define MUS_RUNECITY 445 // Sootopolis City -#define MUS_CON_K 446 // Berry Blending Results +#define MUS_CON_K 446 // Contest/Berry Blending Results #define MUS_EIKOU_R 447 // Hall of Fame #define MUS_KARAKURI 448 // Trick House #define MUS_HUTAGO 449 // Encounter! Kid @@ -409,7 +409,7 @@ #define MUS_BATTLE38 482 // Battle! Elite Four #define MUS_BATTLE30 483 // Battle! Archie/Maxie // FRLG Music Below -#define MUS_RG_ANNAI 484 // Follow Me +#define MUS_RG_ANNAI 484 // Follow Me! #define MUS_RG_SLOT 485 // Game Corner #define MUS_RG_AJITO 486 // Rocket Hideout #define MUS_RG_GYM 487 // Gym @@ -430,9 +430,9 @@ #define MUS_RG_ENDING 502 // Credits #define MUS_RG_LOAD01 503 // Route 1 #define MUS_RG_OPENING 504 // Route 24/Intro -#define MUS_RG_LOAD02 505 // Route 2 +#define MUS_RG_LOAD02 505 // Route 3 #define MUS_RG_LOAD03 506 // Route 11 -#define MUS_RG_CHAMP_R 507 // Victory Road +#define MUS_RG_CHAMP_R 507 // Victory Road/Indigo Plateau #define MUS_RG_VS_GYM 508 // Battle! Gym Leader/Elite Four #define MUS_RG_VS_TORE 509 // Battle! Trainer #define MUS_RG_VS_YASEI 510 // Battle! Wild Pokémon @@ -445,7 +445,7 @@ #define MUS_RG_NAMINORI 517 // Surfing #define MUS_RG_P_TOWER 518 // Pokémon Tower #define MUS_RG_SHIRUHU 519 // Silph Co. -#define MUS_RG_HANADA 520 // Cerulean City +#define MUS_RG_HANADA 520 // Cerulean/Fuschia City #define MUS_RG_TAMAMUSI 521 // Celadon City #define MUS_RG_WIN_TRE 522 // Victory! Trainer #define MUS_RG_WIN_YASEI 523 // Victory! Wild Pokémon @@ -468,14 +468,14 @@ #define MUS_RG_NETWORK 540 // Network Center #define MUS_RG_OKURIMONO 541 // Mystery Gift #define MUS_RG_KINOMIKUI 542 -#define MUS_RG_NANADUNGEON 543 // Sevii Islands Cave (Mt. Moon) -#define MUS_RG_OSHIE_TV 544 // Follow Me +#define MUS_RG_NANADUNGEON 543 // Sevii Caves/Altering Cave (Mt. Moon) +#define MUS_RG_OSHIE_TV 544 // Follow Me! #define MUS_RG_NANASHIMA 545 // Sevii Islands Routes (Lake of Rage) -#define MUS_RG_NANAISEKI 546 // Sevii Islands Forests (Viridian Forest) +#define MUS_RG_NANAISEKI 546 // Sevii Forests (Viridian Forest) #define MUS_RG_NANA123 547 // Sevii Islands 1-3 (Viridian/Saffron/Pewter) #define MUS_RG_NANA45 548 // Sevii Islands 4-5 (Azalea Town) #define MUS_RG_NANA67 549 // Sevii Islands 6-7 (Violet City) -#define MUS_RG_POKEFUE 550 // PokéFlute +#define MUS_RG_POKEFUE 550 // Poké Flute #define MUS_RG_VS_DEO 551 // Battle! Deoxys #define MUS_RG_VS_MYU2 552 // Battle! Mewtwo #define MUS_RG_VS_DEN 553 // Battle! Legendary Birds diff --git a/sound/song_table.inc b/sound/song_table.inc index 04150f3819..fd1bda9c5f 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -16,7 +16,7 @@ gSongTable:: @ 86B49F0 song se_kouka_l, 1, 1 @ Not Very Effective song se_kouka_m, 1, 1 @ Normal Effectiveness song se_kouka_h, 1, 1 @ Super Effective - song se_bowa2, 1, 1 @ Pokémon Withdrawl + song se_bowa2, 1, 1 @ Pokémon Withdrawal song se_poke_dead, 1, 1 @ Pokémon Fainted song se_nigeru, 1, 1 @ Flee from Wild Battle song se_jido_doa, 1, 1 @ Pokémon Center Door @@ -24,7 +24,7 @@ gSongTable:: @ 86B49F0 song se_ban, 1, 1 @ Bang song se_pin, 1, 1 @ Exclamation Bubble song se_boo, 1, 1 @ Contest Jam - song se_bowa, 1, 1 @ Giving Poké Ball to Nurse, Poké Ball wiggle + song se_bowa, 1, 1 @ Giving Poké Ball to Nurse, Poké Ball Wiggle song se_jyuni, 2, 2 @ Places in Contest Appearing song se_a, 1, 1 @ Bard A song se_i, 1, 1 @ Bard I @@ -57,7 +57,7 @@ gSongTable:: @ 86B49F0 song se_moter, 2, 2 song se_card, 1, 1 song se_save, 1, 1 @ Save - song se_kon, 1, 1 @ Poke Ball Bounce 1 + song se_kon, 1, 1 @ Poké Ball Bounce 1 song se_kon2, 1, 1 @ Poké Ball Bounce 2 song se_kon3, 1, 1 @ Poké Ball Bounce 3 song se_kon4, 1, 1 @ Poké Ball Bounce 4 @@ -80,14 +80,14 @@ gSongTable:: @ 86B49F0 song se_fuusen3, 2, 2 @ Yellow Balloon song se_toy_kabe, 2, 2 @ Breakable Door song se_toy_dango, 2, 2 @ Mud Ball - song se_doku, 1, 1 @ Overworld Poison damage + song se_doku, 1, 1 @ Overworld Poison Damage song se_esuka, 1, 1 @ Escalator song se_t_ame, 3, 3 @ Rain - song se_t_ame_e, 3, 3 @ Rain stop + song se_t_ame_e, 3, 3 @ Rain Stop song se_t_ooame, 3, 3 @ Heavy Rain - song se_t_ooame_e, 3, 3 @ Heavy Rain stop + song se_t_ooame_e, 3, 3 @ Heavy Rain Stop song se_t_koame, 3, 3 @ Light Rain - song se_t_koame_e, 3, 3 @ Light Rain stop + song se_t_koame_e, 3, 3 @ Light Rain Stop song se_t_kami, 1, 1 @ Thunder song se_t_kami2, 1, 1 @ Thunder 2 song se_elebeta, 1, 1 @ Elevator @@ -261,7 +261,7 @@ gSongTable:: @ 86B49F0 song se_rg_kiteki, 1, 1 @ S.S. Anne Horn song se_rg_help_op, 1, 1 @ Help Menu Open song se_rg_help_cl, 1, 1 @ Help Menu Close - song se_rg_help_ng, 1, 1 @ Help Menu Error? + song se_rg_help_ng, 1, 1 @ Help Menu Error song se_rg_deomov, 1, 1 @ Deoxys Moves song se_rg_excellent, 1, 1 song se_rg_nawamiss, 1, 1 @@ -367,7 +367,7 @@ gSongTable:: @ 86B49F0 song mus_dooro_x1, 0, 0 @ Route 110 song mus_dooro_x3, 0, 0 @ Route 120 song mus_machi_s2, 0, 0 @ Petalburg City - song mus_machi_s4, 0, 0 @ Oldale Town + song mus_machi_s4, 0, 0 @ Oldale/Lavaridge Town song mus_gim, 0, 0 @ Gym song mus_naminori, 0, 0 @ Surfing song mus_dan01, 0, 0 @ Caves and Darkness @@ -382,15 +382,15 @@ gSongTable:: @ 86B49F0 song mus_fune_kan, 0, 0 @ Slateport Museum song mus_me_shinka, 2, 2 @ Evolution Intro song mus_shinka, 0, 0 @ Evolution - song mus_me_wasure, 2, 2 @ Move Deleted + song mus_me_wasure, 2, 2 @ Move Deleted/Messed Up Appeal song mus_syoujoeye, 0, 0 @ Encounter! Tuber song mus_boyeye, 0, 0 @ Encounter! Boy - song mus_dan02, 0, 0 @ Abandoned Ship - song mus_machi_s3, 0, 0 @ Fortree City + song mus_dan02, 0, 0 @ Abandoned Ship/Southern Island + song mus_machi_s3, 0, 0 @ Fortree City/Pacifidlog Town song mus_odamaki, 0, 0 @ Professor Birch's Lab song mus_b_tower, 0, 0 @ Battle Tower (RS) song mus_swimeye, 0, 0 @ Encounter! Swimmer - song mus_dan03, 0, 0 @ Meteor Falls + song mus_dan03, 0, 0 @ Meteor Falls/Cave of Origin song mus_me_kinomi, 2, 2 @ Obtained a Berry! song mus_me_tama, 2, 2 @ Awakening the Super-Ancient Pokémon song mus_me_b_big, 2, 2 @ Slots Jackpot! @@ -401,9 +401,9 @@ gSongTable:: @ 86B49F0 song mus_test2, 0, 0 @ Contest Test 2 song mus_test3, 0, 0 @ Contest Test 3 song mus_test4, 0, 0 @ Contest Test 4 - song mus_test, 0, 0 @ Encounter! Gentleman (Test?) + song mus_test, 0, 0 @ Encounter! Gentleman song mus_gomachi0, 0, 0 @ Verdanturf Town - song mus_gotown, 0, 0 @ Rustboro City + song mus_gotown, 0, 0 @ Rustboro/Mauville/Mossdeep City song mus_pokecen, 0, 0 @ Pokémon Center song mus_nextroad, 0, 0 @ Route 104 song mus_granroad, 0, 0 @ Route 119 @@ -438,19 +438,19 @@ gSongTable:: @ 86B49F0 song mus_m_boat, 0, 0 @ Sailing song mus_m_dungon, 0, 0 @ Mt. Pyre (Inside) song mus_finecity, 0, 0 @ Slateport City - song mus_machupi, 0, 0 @ Mt. Pyte (Outside) + song mus_machupi, 0, 0 @ Mt. Pyre (Outside) song mus_p_school, 0, 0 @ Pokémon Trainer's School - song mus_dendou, 0, 0 @ Hall of Fame - song mus_tonekusa, 0, 0 @ Lavaridge Town + song mus_dendou, 0, 0 @ You're the Champion! + song mus_tonekusa, 0, 0 @ Fallarbor Town song mus_maborosi, 0, 0 @ Sealed Chamber - song mus_con_fan, 0, 0 @ You are the Champion! + song mus_con_fan, 0, 0 @ Obtained a Contest Ribbon! song mus_contest0, 0, 0 @ Pokémon Contest song mus_mgm0, 0, 0 @ Encounter! Team Magma song mus_t_battle, 0, 0 @ Opening Battle song mus_ooame, 0, 0 @ The Flood song mus_hideri, 0, 0 @ The Drought song mus_runecity, 0, 0 @ Sootopolis City - song mus_con_k, 0, 0 @ Berry Blending Results + song mus_con_k, 0, 0 @ Contest/Berry Blending Results song mus_eikou_r, 0, 0 @ Hall of Fame song mus_karakuri, 0, 0 @ Trick House song mus_hutago, 0, 0 @ Encounter! Kid @@ -488,8 +488,8 @@ gSongTable:: @ 86B49F0 song mus_battle35, 0, 0 @ Battle! Rival song mus_battle38, 0, 0 @ Battle! Elite Four song mus_battle30, 0, 0 @ Battle! Archie/Maxie - @ FRLG Music below - song mus_rg_annai, 0, 0 @ Follow Me + @ FRLG Music Below + song mus_rg_annai, 0, 0 @ Follow Me! song mus_rg_slot, 0, 0 @ Game Corner song mus_rg_ajito, 0, 0 @ Rocket Hideout song mus_rg_gym, 0, 0 @ Gym @@ -503,16 +503,16 @@ gSongTable:: @ 86B49F0 song mus_rg_rocket, 0, 0 @ Encounter! Team Rocket song mus_rg_shoujo, 0, 0 @ Encounter! Girl song mus_rg_shounen, 0, 0 @ Encounter! Boy - song mus_rg_dendou, 0, 0 @ You're the Champion + song mus_rg_dendou, 0, 0 @ You're the Champion! song mus_rg_t_mori, 0, 0 @ Viridian Forest song mus_rg_otsukimi, 0, 0 @ Mt. Moon song mus_rg_pokeyashi, 0, 0 @ Pokémon Mansion song mus_rg_ending, 0, 0 @ Credits song mus_rg_load01, 0, 0 @ Route 1 song mus_rg_opening, 0, 0 @ Route 24/Intro - song mus_rg_load02, 0, 0 @ Route 2 + song mus_rg_load02, 0, 0 @ Route 3 song mus_rg_load03, 0, 0 @ Route 11 - song mus_rg_champ_r, 0, 0 @ Victory Road + song mus_rg_champ_r, 0, 0 @ Victory Road/Indigo Plateau song mus_rg_vs_gym, 0, 0 @ Battle! Gym Leader/Elite Four song mus_rg_vs_tore, 0, 0 @ Battle! Trainer song mus_rg_vs_yasei, 0, 0 @ Battle! Wild Pokémon @@ -525,7 +525,7 @@ gSongTable:: @ 86B49F0 song mus_rg_naminori, 0, 0 @ Surfing song mus_rg_p_tower, 0, 0 @ Pokémon Tower song mus_rg_shiruhu, 0, 0 @ Silph Co. - song mus_rg_hanada, 0, 0 @ Cerulean City + song mus_rg_hanada, 0, 0 @ Cerulean/Fuschia City song mus_rg_tamamusi, 0, 0 @ Celadon City song mus_rg_win_tre, 0, 0 @ Victory! Trainer song mus_rg_win_yasei, 0, 0 @ Victory! Wild Pokémon @@ -540,7 +540,7 @@ gSongTable:: @ 86B49F0 song mus_me_rg_photo, 2, 2 @ Trainer Photo song mus_rg_titlerog, 0, 0 @ Game Freak song mus_rg_get_yasei, 0, 0 @ Pokémon Caught Victory Theme - song mus_rg_sousa, 0, 0 @ Starting Tutorial + song mus_rg_sousa, 0, 0 @ Starting Tutorial song mus_rg_sekaikan, 0, 0 @ Starting Tutorial 2 song mus_rg_seibetu, 0, 0 @ Starting Tutorial 3 song mus_rg_jump, 0, 0 @ Jumping Minigame @@ -548,10 +548,10 @@ gSongTable:: @ 86B49F0 song mus_rg_network, 0, 0 @ Network Center song mus_rg_okurimono, 0, 0 @ Mystery Gift song mus_rg_kinomikui, 0, 0 - song mus_rg_nanadungeon, 0, 0 @ Sevii Islands Cave (Mt. Moon) + song mus_rg_nanadungeon, 0, 0 @ Sevii Caves/Altering Cave (Mt. Moon) song mus_rg_oshie_tv, 0, 0 @ Follow Me! song mus_rg_nanashima, 0, 0 @ Sevii Islands Routes (Lake of Rage) - song mus_rg_nanaiseki, 0, 0 @ Sevii Islands Forest (Viridian Forest) + song mus_rg_nanaiseki, 0, 0 @ Sevii Forests (Viridian Forest) song mus_rg_nana123, 0, 0 @ Sevii Islands 1-3 (Viridian/Saffron/Pewter) song mus_rg_nana45, 0, 0 @ Sevii Islands 4-5 (Azalea Town) song mus_rg_nana67, 0, 0 @ Sevii Islands 6-7 (Violet City) @@ -560,7 +560,7 @@ gSongTable:: @ 86B49F0 song mus_rg_vs_myu2, 0, 0 @ Battle! Mewtwo song mus_rg_vs_den, 0, 0 @ Battle! Legendary Birds song mus_rg_exeye, 0, 0 @ Encounter! Gym Leader - song mus_rg_deoeye, 0, 0 @ Encounter! Deoxys! + song mus_rg_deoeye, 0, 0 @ Encounter! Deoxys song mus_rg_t_tower, 0, 0 @ Trainer Tower (Gym) song mus_rg_slowmasara, 0, 0 @ Pallet Town (Hall of Fame remix) song mus_rg_tvnoize, 0, 0 @ Teachy TV From 35f88987254544aa77ec3fb1906e4b545b5b5f2d Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Tue, 16 Jan 2018 21:52:43 -0500 Subject: [PATCH 27/64] start dumping slot_machine.s --- data/slot_machine.s | 163 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 127 insertions(+), 36 deletions(-) diff --git a/data/slot_machine.s b/data/slot_machine.s index df1f71be96..0b4b8eb139 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -5,112 +5,203 @@ .align 2, 0 gUnknown_085A7424:: @ 85A7424 - .incbin "baserom.gba", 0x5a7424, 0x10 + .4byte 0x1F8 + .4byte 0x11C5 + .4byte 0x21D6 + .4byte 0x11E7 gUnknown_085A7434:: @ 85A7434 - .incbin "baserom.gba", 0x5a7434, 0x10 + window_template 0, 2, 15, 0x1B, 4, 15, 0x194 + window_template_terminator gUnknown_085A7444:: @ 85A7444 - .incbin "baserom.gba", 0x5a7444, 0x8 + window_template 0, 1, 3, 20, 13, 13, 1 gUnknown_085A744C:: @ 85A744C - .incbin "baserom.gba", 0x5a744c, 0x4 + .byte 3, 1, 2, 0 gUnknown_085A7450:: @ 85A7450 - .incbin "baserom.gba", 0x5a7450, 0x74 + .4byte sub_812AB04 + .4byte sub_812AB38 + .4byte sub_812AB60 + .4byte sub_812ABA8 + .4byte sub_812ABC8 + .4byte sub_812ABF8 + .4byte sub_812ACF4 + .4byte sub_812AD34 + .4byte sub_812AD60 + .4byte sub_812AD80 + .4byte sub_812ADF4 + .4byte sub_812AE24 + .4byte sub_812AE4C + .4byte sub_812AE88 + .4byte sub_812AEC4 + .4byte sub_812AFFC + .4byte sub_812B01C + .4byte sub_812B094 + .4byte sub_812B0D8 + .4byte sub_812B108 + .4byte sub_812B130 + .4byte sub_812B158 + .4byte sub_812B1B0 + .4byte sub_812B214 + .4byte sub_812B254 + .4byte sub_812B280 + .4byte sub_812B2C0 + .4byte sub_812B2EC + .4byte sub_812B32C gUnknown_085A74C4:: @ 85A74C4 - .incbin "baserom.gba", 0x5a74c4, 0xc + .4byte sub_812BB34 + .4byte sub_812BB68 + .4byte sub_812BC20 gUnknown_085A74D0:: @ 85A74D0 - .incbin "baserom.gba", 0x5a74d0, 0x14 + .4byte sub_812BF64 + .4byte sub_812BF68 + .4byte sub_812BF88 + .4byte sub_812C01C + .4byte sub_812C0E0 gUnknown_085A74E4:: @ 85A74E4 - .incbin "baserom.gba", 0x5a74e4, 0xc + .4byte sub_812C138 + .4byte sub_812C3A0 + .4byte sub_812C4BC gUnknown_085A74F0:: @ 85A74F0 - .incbin "baserom.gba", 0x5a74f0, 0xc + .4byte sub_812C5DC + .4byte sub_812C628 + .4byte sub_812C8FC gUnknown_085A74FC:: @ 85A74FC - .incbin "baserom.gba", 0x5a74fc, 0xc + .2byte 2, 4, 4, 4, 8, 0 gUnknown_085A7508:: @ 85A7508 - .incbin "baserom.gba", 0x5a7508, 0xc + .4byte sub_812C238 + .4byte sub_812C290 + .4byte sub_812C290 gUnknown_085A7514:: @ 85A7514 - .incbin "baserom.gba", 0x5a7514, 0xc + .4byte sub_812C3C8 + .4byte sub_812C3C8 + .4byte sub_812C414 gUnknown_085A7520:: @ 85A7520 - .incbin "baserom.gba", 0x5a7520, 0xc + .4byte sub_812C500 + .4byte sub_812C500 + .4byte sub_812C55C gUnknown_085A752C:: @ 85A752C - .incbin "baserom.gba", 0x5a752c, 0xc + .4byte sub_812C64C + .4byte j5_08111E84 + .4byte sub_812C74C gUnknown_085A7538:: @ 85A7538 - .incbin "baserom.gba", 0x5a7538, 0xc + .4byte sub_812C920 + .4byte sub_812CA08 + .4byte sub_812CB80 gUnknown_085A7544:: @ 85A7544 - .incbin "baserom.gba", 0x5a7544, 0xc + .4byte sub_812CDA4 + .4byte sub_812CDD8 + .4byte sub_812CDF4 gUnknown_085A7550:: @ 85A7550 - .incbin "baserom.gba", 0x5a7550, 0x8 + .2byte 5, 10, 15, 0 gUnknown_085A7558:: @ 85A7558 - .incbin "baserom.gba", 0x5a7558, 0x10 + .4byte nullsub_50 + .4byte sub_812D264 + .4byte sub_812D28C + .4byte sub_812D30C gUnknown_085A7568:: @ 85A7568 - .incbin "baserom.gba", 0x5a7568, 0x2 + .2byte 0x9E gUnknown_085A756A:: @ 85A756A - .incbin "baserom.gba", 0x5a756a, 0xa + .2byte 0x6E, 0x9F, 0x6F, 0xAF, 0x7F gUnknown_085A7574:: @ 85A7574 - .incbin "baserom.gba", 0x5a7574, 0x4c + .4byte sub_812D51C + .4byte sub_812D594 + .4byte sub_812D60C + .4byte sub_812D63C + .4byte sub_812D6EC + .4byte sub_812D740 + .4byte sub_812D774 + .4byte sub_812D7E4 + .4byte sub_812D870 + .4byte sub_812D920 + .4byte sub_812D950 + .4byte sub_812D9A4 + .4byte sub_812DA20 + .4byte sub_812DA6C + .4byte sub_812DA90 + .4byte sub_812DB04 + .4byte sub_812DB8C + .4byte sub_812D950 + .4byte sub_812DBBC gUnknown_085A75C0:: @ 85A75C0 - .incbin "baserom.gba", 0x5a75c0, 0x4 + .byte 1, 1, 2, 2 gUnknown_085A75C4:: @ 85A75C4 - .incbin "baserom.gba", 0x5a75c4, 0x8 + .2byte 0x40, 0x30, 0x18, 8 gUnknown_085A75CC:: @ 85A75CC - .incbin "baserom.gba", 0x5a75cc, 0x8 + .2byte 10, 8, 6, 4 gUnknown_085A75D4:: @ 85A75D4 - .incbin "baserom.gba", 0x5a75d4, 0x3c + .4byte sub_812DD04 + .4byte sub_812DD28 + .4byte sub_812DD48 + .4byte sub_812DD28 + .4byte sub_812DD78 + .4byte sub_812DD28 + .4byte sub_812DDC4 + .4byte sub_812DD28 + .4byte sub_812DE14 + .4byte sub_812DD28 + .4byte sub_812DE30 + .4byte sub_812DD28 + .4byte sub_812DE48 + .4byte sub_812DD28 + .4byte sub_812DE7C gUnknown_085A7610:: @ 85A7610 - .incbin "baserom.gba", 0x5a7610, 0x4 + .4byte nullsub_51 gUnknown_085A7614:: @ 85A7614 - .incbin "baserom.gba", 0x5a7614, 0x2 + .2byte 16 gUnknown_085A7616:: @ 85A7616 - .incbin "baserom.gba", 0x5a7616, 0x8 + .2byte 0, 0x40, 0x80, 0xC0 gUnknown_085A761E:: @ 85A761E - .incbin "baserom.gba", 0x5a761e, 0x8 + .2byte 4, -4, 4, -4 gUnknown_085A7626:: @ 85A7626 - .incbin "baserom.gba", 0x5a7626, 0x8 + .2byte 4, 4, -4, -4 gUnknown_085A762E:: @ 85A762E - .incbin "baserom.gba", 0x5a762e, 0x10 + .2byte 0, 0xFFD8, 0, 0, 0x30, 0, 0x18, 0 gUnknown_085A763E:: @ 85A763E - .incbin "baserom.gba", 0x5a763e, 0x10 + .2byte 0xFFE0, 0, 0xFFE0, 0xFFD0, 0, 0xFFD0, 0, 0xFFD0 gUnknown_085A764E:: @ 85A764E - .incbin "baserom.gba", 0x5a764e, 0x10 + .2byte 16, 12, 16, 0, 0, 4, 8, 8 gUnknown_085A765E:: @ 85A765E - .incbin "baserom.gba", 0x5a765e, 0x10 + .2byte 0xA0, 0xC0, 0xE0, 0x68, 0x50, 0x40, 0x30, 0x18 gUnknown_085A766E:: @ 85A766E - .incbin "baserom.gba", 0x5a766e, 0x3f + .byte 0, 4, 2, 6, 5, 3, 1, 3, 4, 5, 6, 2, 0, 5, 3, 6, 2, 1, 5, 3, 6 + .byte 0, 4, 6, 3, 2, 4, 6, 5, 5, 3, 1, 3, 6, 4, 2, 3, 6, 4, 3, 6, 4 + .byte 0, 5, 1, 6, 3, 2, 6, 3, 5, 2, 6, 3, 2, 5, 6, 3, 2, 5, 6, 3, 4 gUnknown_085A76AD:: @ 85A76AD - .incbin "baserom.gba", 0x5a76ad, 0x7 + .byte 1, 0, 5, 4, 3, 2, 0 gUnknown_085A76B4:: @ 85A76B4 .incbin "baserom.gba", 0x5a76b4, 0xc From fd267b2dc3f8634e7e3ca2fa88d8fa9be35103c7 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Wed, 17 Jan 2018 00:38:18 -0600 Subject: [PATCH 28/64] Remove duplicate LIBC line from makefile --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index 26993020db..8a77772709 100644 --- a/Makefile +++ b/Makefile @@ -33,8 +33,6 @@ OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy LIBGCC := tools/agbcc/lib/libgcc.a LIBC := tools/agbcc/lib/libc.a -LIBC := tools/agbcc/lib/libc.a - SHA1 := sha1sum -c GFX := tools/gbagfx/gbagfx From 6fa557c2ec0999196b0334431573c263e93f9bd3 Mon Sep 17 00:00:00 2001 From: Thomas Winwood Date: Wed, 17 Jan 2018 19:33:23 +0000 Subject: [PATCH 29/64] Document sub_814F8F8, sub_814F950 and sUnknownMoveTable These are left over from the Japanese games, which provide more variation to the attack string than the English games. --- src/battle_message.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/src/battle_message.c b/src/battle_message.c index e37a4c30cb..3fa3d0563a 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -1324,6 +1324,8 @@ const u8 gText_BattleRecordedOnPass[] = _("{B_PLAYER_NAME}’s battle result was const u8 gText_LinkTrainerWantsToBattlePause[] = _("{B_20}\nwants to battle!{PAUSE 49}"); const u8 gText_TwoLinkTrainersWantToBattlePause[] = _("{B_20} and {B_21}\nwant to battle!{PAUSE 49}"); +// This is four lists of moves which use a different attack string in Japanese +// to the default. See the documentation for sub_814F950 for more detail. static const u16 sUnknownMoveTable[] = { MOVE_SWORDS_DANCE, MOVE_STRENGTH, MOVE_GROWTH, @@ -1338,16 +1340,16 @@ static const u16 sUnknownMoveTable[] = MOVE_TRICK, MOVE_ASSIST, MOVE_INGRAIN, MOVE_KNOCK_OFF, MOVE_CAMOUFLAGE, MOVE_ASTONISH, MOVE_ODOR_SLEUTH, MOVE_GRASS_WHISTLE, MOVE_SHEER_COLD, MOVE_MUDDY_WATER, - MOVE_IRON_DEFENSE, MOVE_BOUNCE, MOVE_NONE, + MOVE_IRON_DEFENSE, MOVE_BOUNCE, 0, MOVE_TELEPORT, MOVE_RECOVER, MOVE_BIDE, MOVE_AMNESIA, - MOVE_FLAIL, MOVE_TAUNT, MOVE_BULK_UP, MOVE_NONE, + MOVE_FLAIL, MOVE_TAUNT, MOVE_BULK_UP, 0, MOVE_MEDITATE, MOVE_AGILITY, MOVE_MIMIC, MOVE_DOUBLE_TEAM, MOVE_BARRAGE, MOVE_TRANSFORM, MOVE_STRUGGLE, MOVE_SCARY_FACE, MOVE_CHARGE, MOVE_WISH, MOVE_BRICK_BREAK, MOVE_YAWN, MOVE_FEATHER_DANCE, MOVE_TEETER_DANCE, MOVE_MUD_SPORT, - MOVE_FAKE_TEARS, MOVE_WATER_SPORT, MOVE_CALM_MIND, MOVE_NONE, + MOVE_FAKE_TEARS, MOVE_WATER_SPORT, MOVE_CALM_MIND, 0, MOVE_POUND, MOVE_SCRATCH, MOVE_VICE_GRIP, MOVE_WING_ATTACK, MOVE_FLY, MOVE_BIND, MOVE_SLAM, @@ -1361,7 +1363,7 @@ static const u16 sUnknownMoveTable[] = MOVE_FORESIGHT, MOVE_CHARM, MOVE_ATTRACT, MOVE_ROCK_SMASH, MOVE_UPROAR, MOVE_SPIT_UP, MOVE_SWALLOW, MOVE_TORMENT, MOVE_FLATTER, MOVE_ROLE_PLAY, MOVE_ENDEAVOR, MOVE_TICKLE, - MOVE_COVET, MOVE_NONE + MOVE_COVET, 0 }; static const u8 sDummyWeirdStatusString[] = {EOS, EOS, EOS, EOS, EOS, EOS, EOS, EOS, 0, 0}; @@ -2330,6 +2332,10 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst) } } +// Loads one of two text strings into the provided buffer. This is functionally +// unused, since the value loaded into the buffer is not read; it loaded one of +// two particles (either "は" or "の") which works in tandem with sub_814F950 +// below to effect changes in the meaning of the line. static void sub_814F8F8(u8* textBuff) { s32 counter = 0; @@ -2337,7 +2343,7 @@ static void sub_814F8F8(u8* textBuff) while (counter != 4) { - if (sUnknownMoveTable[i] == MOVE_NONE) + if (sUnknownMoveTable[i] == 0) counter++; if (sUnknownMoveTable[i++] == gStringInfo->currentMove) break; @@ -2352,6 +2358,24 @@ static void sub_814F8F8(u8* textBuff) } } +// Appends "!" to the text buffer `dst`. In the original Japanese this looked +// into the table of moves at sUnknownMoveTable and varied the line accordingly. +// +// gText_ExclamationMark was a plain "!", used for any attack not on the list. +// It resulted in the translation "'s !". +// +// gText_ExclamationMark2 was "を つかった！". This resulted in the translation +// " used !", which was used for all attacks in English. +// +// gText_ExclamationMark3 was "した！". This was used for those moves whose +// names were verbs, such as Recover, and resulted in translations like " +// recovered itself!". +// +// gText_ExclamationMark4 was "を した！" This resulted in a translation of +// " did an !". +// +// gText_ExclamationMark5 was " こうげき！" This resulted in a translation of +// "'s attack!". static void sub_814F950(u8* dst) { s32 counter = 0; From 84c6a97429ca125483064c25bcd0d079ada0a334 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Wed, 17 Jan 2018 14:44:38 -0500 Subject: [PATCH 30/64] dump slot_machine.s --- data/slot_machine.s | 1241 +++++++++++++++++++++++++---- graphics/slot_machine/85A843E.pal | 19 + graphics/slot_machine/85A845E.pal | 19 + graphics/slot_machine/85A847E.pal | 19 + graphics/slot_machine/85A84B0.pal | 19 + graphics/slot_machine/85A84D0.pal | 19 + graphics/slot_machine/85A84F0.pal | 19 + graphics/slot_machine/85A8524.bin | Bin 0 -> 32 bytes graphics/slot_machine/85A96E0.bin | 1 + 9 files changed, 1210 insertions(+), 146 deletions(-) create mode 100755 graphics/slot_machine/85A843E.pal create mode 100755 graphics/slot_machine/85A845E.pal create mode 100755 graphics/slot_machine/85A847E.pal create mode 100755 graphics/slot_machine/85A84B0.pal create mode 100755 graphics/slot_machine/85A84D0.pal create mode 100755 graphics/slot_machine/85A84F0.pal create mode 100644 graphics/slot_machine/85A8524.bin create mode 100644 graphics/slot_machine/85A96E0.bin diff --git a/data/slot_machine.s b/data/slot_machine.s index 0b4b8eb139..68adf50475 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -12,7 +12,7 @@ gUnknown_085A7424:: @ 85A7424 gUnknown_085A7434:: @ 85A7434 window_template 0, 2, 15, 0x1B, 4, 15, 0x194 - window_template_terminator + window_template_terminator gUnknown_085A7444:: @ 85A7444 window_template 0, 1, 3, 20, 13, 13, 1 @@ -22,98 +22,98 @@ gUnknown_085A744C:: @ 85A744C gUnknown_085A7450:: @ 85A7450 .4byte sub_812AB04 - .4byte sub_812AB38 - .4byte sub_812AB60 - .4byte sub_812ABA8 - .4byte sub_812ABC8 - .4byte sub_812ABF8 - .4byte sub_812ACF4 - .4byte sub_812AD34 - .4byte sub_812AD60 - .4byte sub_812AD80 - .4byte sub_812ADF4 - .4byte sub_812AE24 - .4byte sub_812AE4C - .4byte sub_812AE88 - .4byte sub_812AEC4 - .4byte sub_812AFFC - .4byte sub_812B01C - .4byte sub_812B094 - .4byte sub_812B0D8 - .4byte sub_812B108 - .4byte sub_812B130 - .4byte sub_812B158 - .4byte sub_812B1B0 - .4byte sub_812B214 - .4byte sub_812B254 - .4byte sub_812B280 - .4byte sub_812B2C0 - .4byte sub_812B2EC - .4byte sub_812B32C + .4byte sub_812AB38 + .4byte sub_812AB60 + .4byte sub_812ABA8 + .4byte sub_812ABC8 + .4byte sub_812ABF8 + .4byte sub_812ACF4 + .4byte sub_812AD34 + .4byte sub_812AD60 + .4byte sub_812AD80 + .4byte sub_812ADF4 + .4byte sub_812AE24 + .4byte sub_812AE4C + .4byte sub_812AE88 + .4byte sub_812AEC4 + .4byte sub_812AFFC + .4byte sub_812B01C + .4byte sub_812B094 + .4byte sub_812B0D8 + .4byte sub_812B108 + .4byte sub_812B130 + .4byte sub_812B158 + .4byte sub_812B1B0 + .4byte sub_812B214 + .4byte sub_812B254 + .4byte sub_812B280 + .4byte sub_812B2C0 + .4byte sub_812B2EC + .4byte sub_812B32C gUnknown_085A74C4:: @ 85A74C4 .4byte sub_812BB34 - .4byte sub_812BB68 - .4byte sub_812BC20 + .4byte sub_812BB68 + .4byte sub_812BC20 gUnknown_085A74D0:: @ 85A74D0 .4byte sub_812BF64 - .4byte sub_812BF68 - .4byte sub_812BF88 - .4byte sub_812C01C - .4byte sub_812C0E0 + .4byte sub_812BF68 + .4byte sub_812BF88 + .4byte sub_812C01C + .4byte sub_812C0E0 gUnknown_085A74E4:: @ 85A74E4 .4byte sub_812C138 - .4byte sub_812C3A0 - .4byte sub_812C4BC + .4byte sub_812C3A0 + .4byte sub_812C4BC gUnknown_085A74F0:: @ 85A74F0 .4byte sub_812C5DC - .4byte sub_812C628 - .4byte sub_812C8FC + .4byte sub_812C628 + .4byte sub_812C8FC gUnknown_085A74FC:: @ 85A74FC .2byte 2, 4, 4, 4, 8, 0 gUnknown_085A7508:: @ 85A7508 .4byte sub_812C238 - .4byte sub_812C290 - .4byte sub_812C290 + .4byte sub_812C290 + .4byte sub_812C290 gUnknown_085A7514:: @ 85A7514 .4byte sub_812C3C8 - .4byte sub_812C3C8 - .4byte sub_812C414 + .4byte sub_812C3C8 + .4byte sub_812C414 gUnknown_085A7520:: @ 85A7520 .4byte sub_812C500 - .4byte sub_812C500 - .4byte sub_812C55C + .4byte sub_812C500 + .4byte sub_812C55C gUnknown_085A752C:: @ 85A752C .4byte sub_812C64C - .4byte j5_08111E84 - .4byte sub_812C74C + .4byte j5_08111E84 + .4byte sub_812C74C gUnknown_085A7538:: @ 85A7538 .4byte sub_812C920 - .4byte sub_812CA08 - .4byte sub_812CB80 + .4byte sub_812CA08 + .4byte sub_812CB80 gUnknown_085A7544:: @ 85A7544 .4byte sub_812CDA4 - .4byte sub_812CDD8 - .4byte sub_812CDF4 + .4byte sub_812CDD8 + .4byte sub_812CDF4 gUnknown_085A7550:: @ 85A7550 .2byte 5, 10, 15, 0 gUnknown_085A7558:: @ 85A7558 .4byte nullsub_50 - .4byte sub_812D264 - .4byte sub_812D28C - .4byte sub_812D30C + .4byte sub_812D264 + .4byte sub_812D28C + .4byte sub_812D30C gUnknown_085A7568:: @ 85A7568 .2byte 0x9E @@ -123,24 +123,24 @@ gUnknown_085A756A:: @ 85A756A gUnknown_085A7574:: @ 85A7574 .4byte sub_812D51C - .4byte sub_812D594 - .4byte sub_812D60C - .4byte sub_812D63C - .4byte sub_812D6EC - .4byte sub_812D740 - .4byte sub_812D774 - .4byte sub_812D7E4 - .4byte sub_812D870 - .4byte sub_812D920 - .4byte sub_812D950 - .4byte sub_812D9A4 - .4byte sub_812DA20 - .4byte sub_812DA6C - .4byte sub_812DA90 - .4byte sub_812DB04 - .4byte sub_812DB8C - .4byte sub_812D950 - .4byte sub_812DBBC + .4byte sub_812D594 + .4byte sub_812D60C + .4byte sub_812D63C + .4byte sub_812D6EC + .4byte sub_812D740 + .4byte sub_812D774 + .4byte sub_812D7E4 + .4byte sub_812D870 + .4byte sub_812D920 + .4byte sub_812D950 + .4byte sub_812D9A4 + .4byte sub_812DA20 + .4byte sub_812DA6C + .4byte sub_812DA90 + .4byte sub_812DB04 + .4byte sub_812DB8C + .4byte sub_812D950 + .4byte sub_812DBBC gUnknown_085A75C0:: @ 85A75C0 .byte 1, 1, 2, 2 @@ -153,20 +153,20 @@ gUnknown_085A75CC:: @ 85A75CC gUnknown_085A75D4:: @ 85A75D4 .4byte sub_812DD04 - .4byte sub_812DD28 - .4byte sub_812DD48 - .4byte sub_812DD28 - .4byte sub_812DD78 - .4byte sub_812DD28 - .4byte sub_812DDC4 - .4byte sub_812DD28 - .4byte sub_812DE14 - .4byte sub_812DD28 - .4byte sub_812DE30 - .4byte sub_812DD28 - .4byte sub_812DE48 - .4byte sub_812DD28 - .4byte sub_812DE7C + .4byte sub_812DD28 + .4byte sub_812DD48 + .4byte sub_812DD28 + .4byte sub_812DD78 + .4byte sub_812DD28 + .4byte sub_812DDC4 + .4byte sub_812DD28 + .4byte sub_812DE14 + .4byte sub_812DD28 + .4byte sub_812DE30 + .4byte sub_812DD28 + .4byte sub_812DE48 + .4byte sub_812DD28 + .4byte sub_812DE7C gUnknown_085A7610:: @ 85A7610 .4byte nullsub_51 @@ -197,140 +197,1037 @@ gUnknown_085A765E:: @ 85A765E gUnknown_085A766E:: @ 85A766E .byte 0, 4, 2, 6, 5, 3, 1, 3, 4, 5, 6, 2, 0, 5, 3, 6, 2, 1, 5, 3, 6 - .byte 0, 4, 6, 3, 2, 4, 6, 5, 5, 3, 1, 3, 6, 4, 2, 3, 6, 4, 3, 6, 4 - .byte 0, 5, 1, 6, 3, 2, 6, 3, 5, 2, 6, 3, 2, 5, 6, 3, 2, 5, 6, 3, 4 + .byte 0, 4, 6, 3, 2, 4, 6, 5, 5, 3, 1, 3, 6, 4, 2, 3, 6, 4, 3, 6, 4 + .byte 0, 5, 1, 6, 3, 2, 6, 3, 5, 2, 6, 3, 2, 5, 6, 3, 2, 5, 6, 3, 4 gUnknown_085A76AD:: @ 85A76AD .byte 1, 0, 5, 4, 3, 2, 0 gUnknown_085A76B4:: @ 85A76B4 - .incbin "baserom.gba", 0x5a76b4, 0xc + .2byte 0, 6, 0, 10, 0, 2 gUnknown_085A76C0:: @ 85A76C0 - .incbin "baserom.gba", 0x5a76c0, 0x12 + .byte 1, 1, 12 + .byte 1, 1, 14 + .byte 2, 2, 14 + .byte 2, 2, 14 + .byte 2, 3, 16 + .byte 3, 3, 16 gUnknown_085A76D2:: @ 85A76D2 - .incbin "baserom.gba", 0x5a76d2, 0x12 + .byte 0x19, 0x19, 0x1E, 0x28, 0x28, 0x32 + .byte 0x19, 0x19, 0x1E, 0x1E, 0x23, 0x23 + .byte 0x19, 0x19, 0x1E, 0x19, 0x19, 0x1E gUnknown_085A76E4:: @ 85A76E4 - .incbin "baserom.gba", 0x5a76e4, 0x1e + .byte 0x14, 0x19, 0x19, 0x14, 0x19, 0x19 + .byte 0xC, 0xF, 0xF, 0x12, 0x13, 0x16 + .byte 0x19, 0x19, 0x19, 0x1E, 0x1E, 0x28 + .byte 0x19, 0x19, 0x14, 0x14, 0xF, 0xF + .byte 0x28, 0x28, 0x23, 0x23, 0x28, 0x28 gUnknown_085A7702:: @ 85A7702 - .incbin "baserom.gba", 0x5a7702, 0x66 + .byte 0xF3, 0xF3, 0xF3, 0x50, 0x50, 0x50, 0x50, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x5, 0x5, 0x5, 0x5 + .byte 0x5, 0x5, 0x5, 0x96, 0x96, 0x96, 0x96, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x64, 0x64, 0x64, 0x5 + .byte 0x4, 0x4, 0x4, 0x14, 0x14, 0x14, 0x14, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x64, 0x64, 0x64, 0x28 + .byte 0x2, 0x2, 0x2, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x2D, 0x2D, 0x2D, 0x64 + .byte 0x1, 0x1, 0x1, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x5, 0x5, 0x5, 0x64 + .byte 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x6 gUnknown_085A7768:: @ 85A7768 - .incbin "baserom.gba", 0x5a7768, 0x66 + .byte 0xF3, 0xF3, 0xF3, 0xC8, 0xC8, 0xC8, 0xC8, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0x46, 0x46, 0x46, 0x05 + .byte 0x05, 0x05, 0x05, 0x19, 0x19, 0x19, 0x19, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x02, 0x02, 0x02, 0x06 + .byte 0x04, 0x04, 0x04, 0x19, 0x19, 0x19, 0x19, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x28, 0x28, 0x28, 0x23 + .byte 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x64, 0x64, 0x64, 0x32 + .byte 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x28, 0x28, 0x28, 0x64 + .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x04, 0x04, 0x04, 0x3C gUnknown_085A77CE:: @ 85A77CE - .incbin "baserom.gba", 0x5a77ce, 0xa + .2byte 0x80, 0xAF, 0xC8, 0xE1, 0x100 gUnknown_085A77D8:: @ 85A77D8 - .incbin "baserom.gba", 0x5a77d8, 0x14 + .byte 10, 0, 5, 0 + .byte 10, 0, 10, 0 + .byte 10, 0, 15, 0 + .byte 10, 0, 25, 0 + .byte 10, 0, 35, 0 gUnknown_085A77EC:: @ 85A77EC - .incbin "baserom.gba", 0x5a77ec, 0xa + .byte 0, 0 + .byte 5, 0 + .byte 10, 0 + .byte 15, 0 + .byte 20, 0 gUnknown_085A77F6:: @ 85A77F6 - .incbin "baserom.gba", 0x5a77f6, 0x8 + .byte 6, 4, 3, 2, 5, 0, 0, 0 gUnknown_085A77FE:: @ 85A77FE - .incbin "baserom.gba", 0x5a77fe, 0x6 + .byte 0x80, 0 + .byte 0x20, 0 + .byte 0x40, 0 gUnknown_085A7804:: @ 85A7804 - .incbin "baserom.gba", 0x5a7804, 0xa + .byte 16, 0 + .byte 8, 0 + .byte 4, 0 + .byte 2, 0 + .byte 1, 0 gUnknown_085A780E:: @ 85A780E - .incbin "baserom.gba", 0x5a780e, 0x8 + .byte 7, 8, 4, 3, 0, 5, 2, 0 gUnknown_085A7816:: @ 85A7816 - .incbin "baserom.gba", 0x5a7816, 0x12 + .2byte 1, 2, 4, 8, 16, 32, 64, 128, 256 gUnknown_085A7828:: @ 85A7828 - .incbin "baserom.gba", 0x5a7828, 0x12 + .2byte 2, 4, 0, 6, 12, 3, 0x5A, 0x12C, 0x12C gUnknown_085A783A:: @ 85A783A - .incbin "baserom.gba", 0x5a783a, 0x8e + .2byte 0xD0, 0x38 + .2byte 0xB8, 0 + .2byte 0xC8, 8 + .2byte 0xD8, 0x10 + .2byte 0xE8, 0x18 + .2byte 0xD0, 0x48 + .2byte 0xD0, 8 + .2byte 0xD0, 0x40 + .2byte 0xD0, 0x38 + .2byte 0xC0, 0x58 + .2byte 0xE0, 0x58 + .2byte 0xC0, 0x78 + .2byte 0xE0, 0x78 + .2byte 0x90, 0x38 + .2byte 0x110, 0x58 + .2byte 0xA8, 0x70 + .2byte 0xD0, 0x54 + .2byte 0xD0, 0x70 + .2byte 0xBC, 0x34 + .2byte 0xD0, 0x34 + .2byte 0xE4, 0x34 + .2byte 0xB8, 0x48 + .2byte 0xC4, 0x48 + .2byte 0xD0, 0x48 + .2byte 0xDC, 0x48 + .2byte 0xE8, 0x48 + .2byte 0xBC, 0x34 + .2byte 0xD0, 0x34 + .2byte 0xE4, 0x34 + .2byte 0xB8, 0x48 + .2byte 0xC4, 0x48 + .2byte 0xD0, 0x48 + .2byte 0xDC, 0x48 + .2byte 0xE8, 0x48 + .2byte 0x00, 0x00 + .2byte 0 + gUnknown_085A78C8:: @ 85A78C8 - .incbin "baserom.gba", 0x5a78c8, 0x13c + .4byte sub_812F078 + .4byte sub_812F36C + .4byte sub_812F36C + .4byte sub_812F36C + .4byte sub_812F36C + .4byte sub_812F3B4 + .4byte sub_812F2CC + .4byte sub_812F078 + .4byte sub_812F078 + .4byte sub_812F080 + .4byte sub_812F104 + .4byte sub_812F11C + .4byte sub_812F134 + .4byte sub_812F150 + .4byte sub_812F1B8 + .4byte sub_812F21C + .4byte sub_812F078 + .4byte sub_812F470 + .4byte sub_812F514 + .4byte sub_812F514 + .4byte sub_812F514 + .4byte sub_812F514 + .4byte sub_812F514 + .4byte sub_812F514 + .4byte sub_812F514 + .4byte sub_812F514 + .4byte sub_812F5E0 + .4byte sub_812F5E0 + .4byte sub_812F5E0 + .4byte sub_812F5E0 + .4byte sub_812F5E0 + .4byte sub_812F5E0 + .4byte sub_812F5E0 + .4byte sub_812F5E0 + .4byte sub_812F648 + +gUnknown_085A7954:: @ 85A7954 + .byte 0x19 + .byte 0x22 + .2byte 0 + .byte 0x2 + .byte 0 + .2byte 0 + .byte 0x9 + .byte 0x10 + .2byte 0 + .byte 0xFF + .byte 0 + .2byte 0 + +gUnknown_085A7964:: @ 85A7964 + .byte 0xA + .byte 0x1 + .2byte 0 + .byte 0xB + .byte 2 + .2byte 0 + .byte 0xC + .byte 0x3 + .2byte 0 + .byte 0xD + .byte 4 + .2byte 0 + .byte 0x5 + .byte 5 + .2byte 0 + .byte 0x8 + .byte 0x6 + .2byte 0 + .byte 0xFF + .byte 0 + .2byte 0 + +gUnknown_085A7980:: @ 85A7980 + .byte 0x3 + .byte 0x7 + .2byte 0 + .byte 0x8 + .byte 0x11 + .2byte 0 + .byte 0xFF + .byte 0 + .2byte 0 + +gUnknown_085A798C:: @ 85A798C + .byte 0x4 + .byte 0x8 + .2byte 0 + .byte 0x6 + .byte 0x9 + .2byte 0 + .byte 0x6 + .byte 0xA + .2byte 1 + .byte 0x6 + .byte 0xB + .2byte 2 + .byte 0x6 + .byte 0xC + .2byte 3 + .byte 0xFF + .byte 0 + .2byte 0 + +gUnknown_085A79A4:: @ 85A79A4 + .byte 0 + .byte 0xD + .2byte 0 + .byte 1 + .byte 0xE + .2byte 0 + .byte 0x7 + .byte 0xF + .2byte 0 + .byte 0xFF + .byte 0 + .2byte 0 + +gUnknown_085A79B4:: @ 85A79B4 + .byte 0x13 + .byte 0x1A + .2byte 0 + .byte 0x14 + .byte 0x1B + .2byte 1 + .byte 0x15 + .byte 0x1C + .2byte 2 + .byte 0xE + .byte 0x1D + .2byte 3 + .byte 0xF + .byte 0x1E + .2byte 4 + .byte 0x10 + .byte 0x1F + .2byte 5 + .byte 0x11 + .byte 0x20 + .2byte 6 + .byte 0x12 + .byte 0x21 + .2byte 7 + .byte 0x8 + .byte 0x11 + .2byte 0 + .byte 0xFF + .byte 0 + .2byte 0 + +gUnknown_085A79DC:: @ 85A79DC + .byte 0x16 + .byte 0x12 + .2byte 0 + .byte 0x17 + .byte 0x13 + .2byte 1 + .byte 0x18 + .byte 0x14 + .2byte 2 + .byte 0xE + .byte 0x15 + .2byte 3 + .byte 0xF + .byte 0x16 + .2byte 4 + .byte 0x10 + .byte 0x17 + .2byte 5 + .byte 0x11 + .byte 0x18 + .2byte 6 + .byte 0x12 + .byte 0x19 + .2byte 7 + .byte 0x8 + .byte 0x11 + .2byte 0 + .byte 0xFF + .byte 0 + .2byte 0 gUnknown_085A7A04:: @ 85A7A04 - .incbin "baserom.gba", 0x5a7a04, 0x1c + .4byte gUnknown_085A7954 + .4byte gUnknown_085A7964 + .4byte gUnknown_085A7980 + .4byte gUnknown_085A798C + .4byte gUnknown_085A79A4 + .4byte gUnknown_085A79DC + .4byte gUnknown_085A79B4 gUnknown_085A7A20:: @ 85A7A20 - .incbin "baserom.gba", 0x5a7a20, 0x2c0 + .4byte sub_812F7C0 + .4byte sub_812F784 + .4byte sub_812F794 + .4byte nullsub_101 + .4byte nullsub_101 + .4byte sub_812F794 + .4byte sub_812F794 +gUnknown_085A7A3C:: @ 85A7A3C + .2byte 0 + .2byte 0 + .2byte 0 + .2byte 0 + +gUnknown_085A7A44:: @ 85A7A44 + .2byte 0x8000 + .2byte 0 + .2byte 0 + .2byte 0 + +gUnknown_085A7A4C:: @ 85A7A4C + .2byte 0 + .2byte 0x4000 + .2byte 0 + .2byte 0 + +gUnknown_085A7A54:: @ 85A7A54 + .2byte 0x8000 + .2byte 0x8000 + .2byte 0 + .2byte 0 + +gUnknown_085A7A5C:: @ 85A7A5C + .2byte 0 + .2byte 0x8000 + .2byte 0 + .2byte 0 + +gUnknown_085A7A64:: @ 85A7A64 + .2byte 0x8000 + .2byte 0xC000 + .2byte 0 + .2byte 0 + +gUnknown_085A7A6C:: @ 85A7A6C + .2byte 0x4000 + .2byte 0xC000 + .2byte 0 + .2byte 0 + +gUnknown_085A7A74:: @ 85A7A74 + .2byte 0 + .2byte 0xC000 + .2byte 0 + .2byte 0 + +gUnknown_085A7A7C:: @ 85A7A7C + .4byte gSlotMachineReelTimeNumber0 + .2byte 0x80 + .2byte 0 + .4byte gSlotMachineReelTimeNumber1 + .2byte 0x80 + .2byte 0 + .4byte gSlotMachineReelTimeNumber2 + .2byte 0x80 + .2byte 0 + .4byte gSlotMachineReelTimeNumber3 + .2byte 0x80 + .2byte 0 + .4byte gSlotMachineReelTimeNumber4 + .2byte 0x80 + .2byte 0 + .4byte gSlotMachineReelTimeNumber5 + .2byte 0x80 + .2byte 0 + +gUnknown_085A7AAC:: @ 85A7AAC + .4byte gSlotMachineReelTimeShadow + .2byte 0x200 + .2byte 0 + +gUnknown_085A7AB4:: @ 85A7AB4 + .4byte gUnknown_08DD1A18 + .2byte 0x40 + .2byte 0 + +gUnknown_085A7ABC:: @ 85A7ABC + .4byte gSlotMachineReelTimeLargeBolt0 + .2byte 0x100 + .2byte 0 + .4byte gSlotMachineReelTimeLargeBolt1 + .2byte 0x100 + .2byte 0 + +gUnknown_085A7ACC:: @ 85A7ACC + .4byte gSlotMachineReelTimePikaAura + .2byte 0x400 + .2byte 0 + +gUnknown_085A7AD4:: @ 85A7CD4 + .4byte gSlotMachineReelTimeExplosion0 + .2byte 0x200 + .2byte 0 + .4byte gSlotMachineReelTimeExplosion1 + .2byte 0x200 + .2byte 0 + +gUnknown_085A7AE4:: @ 85A7AE4 + .4byte gSlotMachineReelTimeDuck + .4byte 32 + +gUnknown_085A7AEC:: @ 85A7AEC + .4byte gSlotMachineReelTimeSmoke + .4byte 0x80 + +gUnknown_085A7AF4:: @ 85A7AF4 + .4byte gSlotMachineReelTimeBolt + .4byte 32 + +gUnknown_085A7AFC:: @ 85A7AFC + obj_image_anim_frame 0, 1 + obj_image_anim_end + +gUnknown_085A7B04:: @ 85A7B04 + obj_image_anim_frame 0, 1 + obj_image_anim_jump 0 + +gUnknown_085A7B0C:: @ 85A7B0C + obj_image_anim_frame 0, 16 + obj_image_anim_end + +gUnknown_085A7B14:: @ 85A7B14 + obj_image_anim_frame 1, 16 + obj_image_anim_frame 0, 16 + obj_image_anim_jump 0 + +gUnknown_085A7B20:: @ 85A7B20 + obj_image_anim_frame 1, 8 + obj_image_anim_frame 0, 8 + obj_image_anim_jump 0 + +gUnknown_085A7B2C:: @ 85A7B2C + obj_image_anim_frame 1, 4 + obj_image_anim_frame 0, 4 + obj_image_anim_jump 0 + +gUnknown_085A7B38:: @ 85A7B38 + obj_image_anim_frame 2, 32 + obj_image_anim_frame 3, 32 + obj_image_anim_jump 0 + +gUnknown_085A7B44:: @ 85A7B44 + obj_image_anim_frame 4, 1 + obj_image_anim_end + +gUnknown_085A7B4C:: @ 85A7B4C + obj_image_anim_frame 0, 1 + obj_image_anim_end + +gUnknown_085A7B54:: @ 85A7B54 + obj_image_anim_frame 1, 1 + obj_image_anim_end + +gUnknown_085A7B5C:: @ 85A7B5C + obj_image_anim_frame 2, 1 + obj_image_anim_end + +gUnknown_085A7B64:: @ 85A7B64 + obj_image_anim_frame 3, 1 + obj_image_anim_end + +gUnknown_085A7B6C:: @ 85A7B6C + obj_image_anim_frame 4, 1 + obj_image_anim_end + +gUnknown_085A7B74:: @ 85A7B74 + obj_image_anim_frame 5, 1 + obj_image_anim_end + +gUnknown_085A7B7C:: @ 85A7B7C + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_jump 0 + +gUnknown_085A7B88:: @ 85A7B88 + obj_image_anim_frame 0, 16 + obj_image_anim_frame 1, 16 + obj_image_anim_jump 0 + +gUnknown_085A7B94:: @ 85A7B94 + obj_image_anim_frame 0, 30 + obj_image_anim_frame 1, 30 + obj_image_anim_jump 0 + +gUnknown_085A7BA0:: @ 85A7BA0 + obj_image_anim_frame 1, 1 + obj_image_anim_end + +gUnknown_085A7BA8:: @ 85A7BA8 + obj_image_anim_frame 0, 30 + obj_image_anim_frame 1, 30 + obj_image_anim_jump 0 + +gUnknown_085A7BB4:: @ 85A7BB4 + obj_image_anim_frame 0, 16 + obj_image_anim_frame 1, 16 + obj_image_anim_frame 0, 16 + obj_image_anim_frame 1, 80 + obj_image_anim_jump 0 + +gUnknown_085A7BC8:: @ 85A7BC8 + obj_image_anim_frame 0, 1 + obj_image_anim_end + +gUnknown_085A7BD0:: @ 85A7BD0 + obj_image_anim_frame 0, 1 + obj_image_anim_end + +gUnknown_085A7BD8:: @ 85A7BD8 + obj_image_anim_frame 1, 1 + obj_image_anim_end + +gUnknown_085A7BE0:: @ 85A7BE0 + obj_image_anim_frame 2, 1 + obj_image_anim_end + +gUnknown_085A7BE8:: @ 85A7BE8 + obj_image_anim_frame 3, 1 + obj_image_anim_end + +gUnknown_085A7BF0:: @ 85A7BF0 + obj_image_anim_frame 4, 1 + obj_image_anim_end + +gUnknown_085A7BF8:: @ 85A7BF8 + .4byte gUnknown_085A7AFC + +gUnknown_085A7BFC:: @ 85A7BFC + .4byte gUnknown_085A7B04 + +gUnknown_085A7C00:: @ 85A7C00 + .4byte gUnknown_085A7B0C + .4byte gUnknown_085A7B14 + .4byte gUnknown_085A7B20 + .4byte gUnknown_085A7B2C + .4byte gUnknown_085A7B38 + .4byte gUnknown_085A7B44 + +gUnknown_085A7C18:: @ 85A7C18 + .4byte gUnknown_085A7B4C + .4byte gUnknown_085A7B54 + .4byte gUnknown_085A7B5C + .4byte gUnknown_085A7B64 + .4byte gUnknown_085A7B6C + .4byte gUnknown_085A7B74 + +gUnknown_085A7C30:: @ 85A7C30 + .4byte gUnknown_085A7B7C + +gUnknown_085A7C34:: @ 85A7C34 + .4byte gUnknown_085A7B88 + +gUnknown_085A7C38:: @ 85A7C38 + .4byte gUnknown_085A7B94 + .4byte gUnknown_085A7BA0 + +gUnknown_085A7C40:: @ 85A7C40 + .4byte gUnknown_085A7BA8 + +gUnknown_085A7C44:: @ 85A7C44 + .4byte gUnknown_085A7BB4 + .4byte gUnknown_085A7BC8 + +gUnknown_085A7C4C:: @ 85A7C4C + .4byte gUnknown_085A7BD0 + .4byte gUnknown_085A7BD8 + .4byte gUnknown_085A7BE0 + .4byte gUnknown_085A7BE8 + .4byte gUnknown_085A7BF0 + +gUnknown_085A7C60:: @ 85A7C60 + obj_rot_scal_anim_frame 16, 16, 0, 0 + obj_rot_scal_anim_loop 0 + obj_rot_scal_anim_frame 1, 1, 0, 1 + obj_rot_scal_anim_loop 0xFF + obj_rot_scal_anim_end + +gUnknown_085A7C88:: @ 85A7C88 + .4byte gUnknown_085A7C60 + +gUnknown_085A7C8C:: @ 85A7C8C + obj_rot_scal_anim_frame 0, 0, 8, 32 + obj_rot_scal_anim_frame 0, 0, 6, 32 + obj_rot_scal_anim_frame 0, 0, 4, 16 + obj_rot_scal_anim_frame 0, 0, 12, 2 + obj_rot_scal_anim_frame 0, 0, -12, 4 + obj_rot_scal_anim_frame 0, 0, 12, 2 + obj_rot_scal_anim_frame 0, 0, 12, 2 + obj_rot_scal_anim_frame 0, 0, -12, 4 + obj_rot_scal_anim_frame 0, 0, 12, 2 + obj_rot_scal_anim_end + +gUnknown_085A7CDC:: @ 85A7CDC + .4byte gUnknown_085A7C8C + gUnknown_085A7CE0:: @ 85A7CE0 - .incbin "baserom.gba", 0x5a7ce0, 0x18 + spr_template 0, 0, gUnknown_085A7A5C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_812E154 gUnknown_085A7CF8:: @ 85A7CF8 - .incbin "baserom.gba", 0x5a7cf8, 0x18 + spr_template 7, 4, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_812E2A8 gUnknown_085A7D10:: @ 85A7D10 - .incbin "baserom.gba", 0x5a7d10, 0x18 + spr_template 17, 0, gUnknown_085A7A74, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7D28:: @ 85A7D28 - .incbin "baserom.gba", 0x5a7d28, 0x18 + spr_template 0xFFFF, 1, gUnknown_085A7A74, gUnknown_085A7C00, NULL, gDummySpriteAffineAnimTable, sub_812E424 gUnknown_085A7D40:: @ 85A7D40 - .incbin "baserom.gba", 0x5a7d40, 0x18 + spr_template 0xFFFF, 2, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7D58:: @ 85A7D58 - .incbin "baserom.gba", 0x5a7d58, 0x18 + spr_template 0xFFFF, 3, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7D70:: @ 85A7D70 - .incbin "baserom.gba", 0x5a7d70, 0x18 + spr_template 0xFFFF, 3, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7D88:: @ 85A7D88 - .incbin "baserom.gba", 0x5a7d88, 0x18 + spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7C18, gUnknown_085A7A7C, gDummySpriteAffineAnimTable, sub_812E6C4 gUnknown_085A7DA0:: @ 85A7DA0 - .incbin "baserom.gba", 0x5a7da0, 0x18 + spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AAC, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7DB8:: @ 85A7DB8 - .incbin "baserom.gba", 0x5a7db8, 0x18 + spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AB4, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7DD0:: @ 85A7DD0 - .incbin "baserom.gba", 0x5a7dd0, 0x18 + spr_template 0xFFFF, 4, gUnknown_085A7A54, gUnknown_085A7C30, gUnknown_085A7ABC, gDummySpriteAffineAnimTable, sub_812E9E8 gUnknown_085A7DE8:: @ 85A7DE8 - .incbin "baserom.gba", 0x5a7de8, 0x18 + spr_template 0xFFFF, 7, gUnknown_085A7A64, gUnknown_085A7BF8, gUnknown_085A7ACC, gDummySpriteAffineAnimTable, sub_812EB48 gUnknown_085A7E00:: @ 85A7E00 - .incbin "baserom.gba", 0x5a7e00, 0x18 + spr_template 0xFFFF, 5, gUnknown_085A7A5C, gUnknown_085A7C34, gUnknown_085A7AD4, gDummySpriteAffineAnimTable, sub_812EC64 gUnknown_085A7E18:: @ 85A7E18 - .incbin "baserom.gba", 0x5a7e18, 0x18 + spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BFC, gUnknown_085A7AE4, gDummySpriteAffineAnimTable, sub_812ED20 gUnknown_085A7E30:: @ 85A7E30 - .incbin "baserom.gba", 0x5a7e30, 0x168 + spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AEC, gUnknown_085A7C88, sub_812EE14 + +gUnknown_085A7E48:: @ 85A7E48 + spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_085A7E60:: @ 85A7E60 + spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_085A7E78:: @ 85A7E78 + spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_085A7E90:: @ 85A7E90 + spr_template 18, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_085A7EA8:: @ 85A7EA8 + spr_template 0xFFFF, 6, gUnknown_085A7A6C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_085A7EC0:: @ 85A7EC0 + spr_template 0xFFFF, 6, gUnknown_085A7A6C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy +gUnknown_085A7ED8:: @ 85A7ED8 + spr_template 19, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_085A7EF0:: @ 85A7EF0 + spr_template 20, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_085A7F08:: @ 85A7F08 + spr_template 21, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_085A7F20:: @ 85A7F20 + spr_template 0xFFFF, 6, gUnknown_085A7A5C, gUnknown_085A7C38, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_085A7F38:: @ 85A7F38 + spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_085A7F50:: @ 85A7F50 + spr_template 0xFFFF, 6, gUnknown_085A7A4C, gUnknown_085A7C4C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_085A7F68:: @ 85A7F68 + spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7C44, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_085A7F80:: @ 85A7F80 + spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7C40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + gUnknown_085A7F98:: @ 85A7F98 - .incbin "baserom.gba", 0x5a7f98, 0x28 + spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BF8, gUnknown_085A7AF4, gUnknown_085A7CDC, sub_812EF54 + +gUnknown_085A7FB0:: @ 85A7FB0 + subsprite -64, -64, 3, 0, 64x64 + subsprite 0, -64, 3, 0, 64x64 + subsprite -64, 0, 3, 0, 64x64 + subsprite 0, 0, 3, 0, 64x64 gUnknown_085A7FC0:: @ 85A7FC0 - .incbin "baserom.gba", 0x5a7fc0, 0x20 + .4byte 4, gUnknown_085A7FB0 + +gUnknown_085A7FC8:: @ 85A7FC8 + subsprite -32, -12, 1, 0, 32x8 + subsprite 0, -12, 1, 4, 32x8 + subsprite -32, -4, 1, 8, 32x8 + subsprite 0, -4, 1, 12, 32x8 + subsprite -32, 4, 1, 16, 32x8 + subsprite 0, 4, 1, 20, 32x8 gUnknown_085A7FE0:: @ 85A7FE0 - .incbin "baserom.gba", 0x5a7fe0, 0x14 + .4byte 6, gUnknown_085A7FC8 +gUnknown_085A7FE8:: @ 85A7FE8 + subsprite -32, -20, 1, 0, 64x32 + subsprite -32, 12, 1, 32, 32x8 + subsprite 0, 12, 1, 36, 32x8 + gUnknown_085A7FF4:: @ 85A7FF4 - .incbin "baserom.gba", 0x5a7ff4, 0x1c + .4byte 3, gUnknown_085A7FE8 +gUnknown_085A7FFC:: @ 85A7FFC + subsprite -32, -24, 1, 0, 64x32 + subsprite -32, 8, 1, 32, 32x8 + subsprite 0, 8, 1, 36, 32x8 + subsprite -32, 16, 1, 40, 32x8 + subsprite 0, 16, 1, 44, 32x8 + gUnknown_085A8010:: @ 85A8010 - .incbin "baserom.gba", 0x5a8010, 0x18 + .4byte 5, gUnknown_085A7FFC + +gUnknown_085A8018:: @ 85A8018 + subsprite -32, -8, 1, 0, 32x8 + subsprite 0, -8, 1, 4, 32x8 + subsprite -32, 0, 1, 8, 32x8 + subsprite 0, 0, 1, 12, 32x8 gUnknown_085A8028:: @ 85A8028 - .incbin "baserom.gba", 0x5a8028, 0x14 + .4byte 4, gUnknown_085A8018 + +gUnknown_085A8030:: @ 85A8030 + subsprite -8, -12, 1, 0, 16x8 + subsprite -8, -4, 1, 0, 16x8 + subsprite -8, 4, 1, 0, 16x8 gUnknown_085A803C:: @ 85A803C - .incbin "baserom.gba", 0x5a803c, 0x228 + .4byte 3, gUnknown_085A8030 + +gUnknown_085A8044:: @ 85A8044 + subsprite -32, -24, 3, 0, 64x32 + subsprite -32, 8, 3, 32, 32x8 + subsprite 0, 8, 3, 36, 32x8 + subsprite -32, 16, 3, 40, 32x8 + subsprite 0, 16, 3, 44, 32x8 + +gUnknown_085A8058:: @ 85A8058 + .4byte 5, gUnknown_085A8044 + +gUnknown_085A8060:: @ 85A8060 + subsprite -32, -8, 3, 0, 32x8 + subsprite 0, -8, 3, 4, 32x8 + subsprite -32, 0, 3, 8, 32x8 + subsprite 0, 0, 3, 12, 32x8 + +gUnknown_085A8070:: @ 85A8070 + .4byte 4, gUnknown_085A8060 + +gUnknown_085A8078:: @ 85A8078 + subsprite -32, -8, 3, 0, 32x8 + subsprite 0, -8, 3, 4, 32x8 + subsprite -32, 0, 3, 8, 32x8 + subsprite 0, 0, 3, 12, 32x8 + +gUnknown_085A8088:: @ 85A8088 + .4byte 4, gUnknown_085A8078 + +gUnknown_085A8090:: @ 85A8090 + subsprite -32, -8, 3, 0, 32x8 + subsprite 0, -8, 3, 4, 32x8 + subsprite -32, 0, 3, 8, 32x8 + subsprite 0, 0, 3, 12, 32x8 + +gUnknown_085A80A0:: @ 85A80A0 + .4byte 4, gUnknown_085A8090 + +gUnknown_085A80A8:: @ 85A80A8 + subsprite -32, -12, 3, 0, 32x8 + subsprite 0, -12, 3, 4, 32x8 + subsprite -32, -4, 3, 8, 32x8 + subsprite 0, -4, 3, 12, 32x8 + subsprite -32, 4, 3, 16, 32x8 + subsprite 0, 4, 3, 20, 32x8 + +gUnknown_085A80C0:: @ 85A80C0 + .4byte 6, gUnknown_085A80A8 + +gUnknown_085A80C8:: @ 85A80C8 + subsprite -16, -16, 3, 0, 32x32 + +gUnknown_085A80CC:: @ 85A80CC + subsprite -8, -8, 3, 16, 16x16 + +gUnknown_085A80D0:: @ 85A80D0 + .4byte 1, gUnknown_085A80C8 + +gUnknown_085A80D8:: @ 85A80D8 + .4byte 1, gUnknown_085A80CC + +gUnknown_085A80E0:: @ 85A80E0 + subsprite -24, -24, 3, 0, 32x8 + subsprite 8, -24, 3, 4, 16x8 + subsprite -24, -16, 3, 6, 32x8 + subsprite 8, -16, 3, 10, 16x8 + subsprite -24, -8, 3, 12, 32x8 + subsprite 8, -8, 3, 16, 16x8 + subsprite -24, 0, 3, 18, 32x8 + subsprite 8, 0, 3, 22, 16x8 + subsprite -24, 8, 3, 24, 32x8 + subsprite 8, 8, 3, 28, 16x8 + subsprite -24, 16, 3, 30, 32x8 + subsprite 8, 16, 3, 34, 16x8 + +gUnknown_085A8110:: @ 85A8110 + .4byte 12, gUnknown_085A80E0 + +gUnknown_085A8118:: @ 85A8118 + subsprite -16, -12, 3, 0, 32x16 + subsprite -16, 4, 3, 8, 16x8 + subsprite 0, 4, 3, 10, 16x8 + +gUnknown_085A8124:: @ 85A8124 + .4byte 3, gUnknown_085A8118 + +gUnknown_085A812C:: @ 85A812C + subsprite -8, -8, 3, 0, 16x8 + subsprite -8, 0, 3, 8, 16x8 + +gUnknown_085A8134:: @ 85A8134 + .4byte 2, gUnknown_085A812C + +gUnknown_085A813C:: @ 85A813C + subsprite -8, -8, 3, 2, 16x8 + subsprite -8, 0, 3, 10, 16x8 + +gUnknown_085A8144:: @ 85A8144 + .4byte 2, gUnknown_085A813C + +gUnknown_085A814C:: @ 85A814C + subsprite -8, -8, 3, 4, 16x8 + subsprite -8, 0, 3, 12, 16x8 + +gUnknown_085A8154:: @ 85A8154 + .4byte 2, gUnknown_085A814C + +gUnknown_085A815C:: @ 85A815C + subsprite -8, -8, 3, 6, 16x8 + subsprite -8, 0, 3, 14, 16x8 + +gUnknown_085A8164:: @ 85A8164 + .4byte 2, gUnknown_085A815C + +gUnknown_085A816C:: @ 85A816C + subsprite -8, -8, 3, 0, 16x8 + subsprite -8, 0, 3, 8, 16x8 + +gUnknown_085A8174:: @ 85A8174 + .4byte 2, gUnknown_085A816C + +gUnknown_085A817C:: @ 85A817C + subsprite -4, -8, 3, 2, 8x8 + subsprite -4, 0, 3, 10, 8x8 + +gUnknown_085A8184:: @ 85A8184 + .4byte 2, gUnknown_085A817C + +gUnknown_085A818C:: @ 85A818C + subsprite -8, -8, 3, 3, 16x8 + subsprite -8, 0, 3, 11, 16x8 + +gUnknown_085A8194:: @ 85A8194 + .4byte 2, gUnknown_085A818C + +gUnknown_085A819C:: @ 85A819C + subsprite -4, -8, 3, 5, 8x8 + subsprite -4, 0, 3, 13, 8x8 + +gUnknown_085A81A4:: @ 85A81A4 + .4byte 2, gUnknown_085A819C + +gUnknown_085A81AC:: @ 85A81AC + subsprite -8, -8, 3, 6, 16x8 + subsprite -8, 0, 3, 14, 16x8 + +gUnknown_085A81B4:: @ 85A81B4 + .4byte 2, gUnknown_085A81AC + +gUnknown_085A81BC:: @ 85A81BC + subsprite -12, -12, 3, 0, 16x8 + subsprite 4, -12, 3, 2, 8x8 + subsprite -12, -4, 3, 8, 16x8 + subsprite 4, -4, 3, 10, 8x8 + subsprite -12, 4, 3, 16, 16x8 + subsprite 4, 4, 3, 18, 8x8 + +gUnknown_085A81D4:: @ 85A81D4 + .4byte 6, gUnknown_085A81BC + +gUnknown_085A81DC:: @ 85A81DC + subsprite -8, -12, 3, 3, 16x8 + subsprite -8, -4, 3, 11, 16x8 + subsprite -8, 4, 3, 19, 16x8 + +gUnknown_085A81E8:: @ 85A81E8 + .4byte 3, gUnknown_085A81DC + +gUnknown_085A81F0:: @ 85A81F0 + subsprite -12, -12, 3, 5, 16x8 + subsprite 4, -12, 3, 7, 8x8 + subsprite -12, -4, 3, 13, 16x8 + subsprite 4, -4, 3, 15, 8x8 + subsprite -12, 4, 3, 21, 16x8 + subsprite 4, 4, 3, 0x17, 8x8 + +gUnknown_085A8208:: @ 85A8208 + .4byte 6, gUnknown_085A81F0 + +gUnknown_085A8210:: @ 85A8210 + subsprite -12, -12, 3, 0, 16x8 + subsprite 4, -12, 3, 2, 8x8 + subsprite -12, -4, 3, 8, 16x8 + subsprite 4, -4, 3, 10, 8x8 + subsprite -12, 4, 3, 16, 16x8 + subsprite 4, 4, 3, 18, 8x8 + +gUnknown_085A8228:: @ 85A8228 + .4byte 6, gUnknown_085A8210 + +gUnknown_085A822C:: @ 85A822C + subsprite -8, -12, 3, 3, 16x8 + subsprite -8, -4, 3, 11, 16x8 + subsprite -8, 4, 3, 19, 16x8 + +gUnknown_085A823C:: @ 85A823C + .4byte 3, gUnknown_085A822C + +gUnknown_085A8244:: @ 85A8244 + subsprite -12, -12, 3, 5, 16x8 + subsprite 4, -12, 3, 7, 8x8 + subsprite -12, -4, 3, 13, 16x8 + subsprite 4, -4, 3, 15, 8x8 + subsprite -12, 4, 3, 21, 16x8 + subsprite 4, 4, 3, 23, 8x8 + +gUnknown_085A825C:: @ 85A825C + .4byte 6, gUnknown_085A8244 gUnknown_085A8264:: @ 85A8264 - .incbin "baserom.gba", 0x5a8264, 0x68 + .4byte gUnknown_085A7E48 + .4byte gUnknown_085A7E60 + .4byte gUnknown_085A7E78 + .4byte gUnknown_085A7EA8 + .4byte gUnknown_085A7EC0 + .4byte gUnknown_085A7F20 + .4byte gUnknown_085A7F38 + .4byte gUnknown_085A7F50 + .4byte gUnknown_085A7F68 + .4byte gUnknown_085A7F80 + .4byte gUnknown_085A7E90 + .4byte gUnknown_085A7E90 + .4byte gUnknown_085A7E90 + .4byte gUnknown_085A7E90 + .4byte gUnknown_085A7ED8 + .4byte gUnknown_085A7ED8 + .4byte gUnknown_085A7ED8 + .4byte gUnknown_085A7ED8 + .4byte gUnknown_085A7ED8 + .4byte gUnknown_085A7EF0 + .4byte gUnknown_085A7EF0 + .4byte gUnknown_085A7EF0 + .4byte gUnknown_085A7F08 + .4byte gUnknown_085A7F08 + .4byte gUnknown_085A7F08 + .4byte gDummySpriteTemplate gUnknown_085A82CC:: @ 85A82CC - .incbin "baserom.gba", 0x5a82cc, 0x68 + .4byte gUnknown_085A8058 + .4byte gUnknown_085A8070 + .4byte gUnknown_085A8088 + .4byte gUnknown_085A80C0 + .4byte NULL + .4byte NULL + .4byte gUnknown_085A80D0 + .4byte NULL + .4byte gUnknown_085A8110 + .4byte gUnknown_085A8124 + .4byte gUnknown_085A8134 + .4byte gUnknown_085A8144 + .4byte gUnknown_085A8154 + .4byte gUnknown_085A8164 + .4byte gUnknown_085A8174 + .4byte gUnknown_085A8184 + .4byte gUnknown_085A8194 + .4byte gUnknown_085A81A4 + .4byte gUnknown_085A81B4 + .4byte gUnknown_085A81D4 + .4byte gUnknown_085A81E8 + .4byte gUnknown_085A8208 + .4byte gUnknown_085A8228 + .4byte gUnknown_085A823C + .4byte gUnknown_085A825C + .4byte NULL .align 2 gUnknown_085A8334:: @ 85A8334 @@ -353,40 +1250,91 @@ gUnknown_085A8334:: @ 85A8334 obj_tiles gSlotMachineNumber9Tiles, 0x0040, 0x0010 .align 2 - .incbin "baserom.gba", 0x5a83bc, 0x28 + .byte 0, 0, 0, 0, 0, 2, 0x12, 0, 0, 0, 0, 0, 0, 2, 0x13, 0, 0, 0, 0, 0, 0, 3, 0x14, 0, 0, 0, 0, 0, 0, 3, 0x15, 0, 0, 0, 0, 0, 0, 0, 0, 0 gUnknown_085A83E4:: @ 85A83E4 - .incbin "baserom.gba", 0x5a83e4, 0x24 + .4byte gUnknown_08DD19F8 + @ might be a palette idk + .byte 0x7B, 0x6F, 0x68, 0x69, 0xAB, 0x36, 0xFF, 0x7F, 0x50, 0x57, 0xC0, 0x7E, 0xBA, 2, 0xBA, 2, 0xFD, 1, 0xFD, 1 + +gUnknown_085A83FC:: @ 85A83FC + .byte 0x91, 0x7F + +gUnknown_085A83FE:: @ 85A83FE + .byte 0xBF, 0x43 + +gUnknown_085A8400:: @ 85A8400 + .byte 0xBF, 0x43 + +gUnknown_085A8402:: @ 85A8402 + .byte 0xBF, 0x4A + +gUnknown_085A8404:: @ 85A8404 + .byte 0xBF, 0x4A, 0, 0 gUnknown_085A8408:: @ 85A8408 - .incbin "baserom.gba", 0x5a8408, 0x14 + .4byte gUnknown_085A83FC + .4byte gUnknown_085A83FE + .4byte gUnknown_085A8400 + .4byte gUnknown_085A8402 + .4byte gUnknown_085A8404 gUnknown_085A841C:: @ 85A841C - .incbin "baserom.gba", 0x5a841c, 0x14 + .4byte gSlotMachineMenu_Pal + 0x94 + .4byte gSlotMachineMenu_Pal + 0x96 + .4byte gSlotMachineMenu_Pal + 0x98 + .4byte gSlotMachineMenu_Pal + 0x9A + .4byte gSlotMachineMenu_Pal + 0x9C gUnknown_085A8430:: @ 85A8430 - .incbin "baserom.gba", 0x5a8430, 0x5 + .byte 0x4A, 0x4B, 0x4C, 0x4E, 0x4D gUnknown_085A8435:: @ 85A8435 - .incbin "baserom.gba", 0x5a8435, 0x6 + .byte 0, 0 + .byte 1, 2 + .byte 3, 4 gUnknown_085A843B:: @ 85A843B - .incbin "baserom.gba", 0x5a843b, 0x65 + .byte 1, 2, 2 + +gUnknown_085A843E:: @ 85A843E + .incbin "graphics/slot_machine/85A843E.gbapal" + +gUnknown_085A845E:: @ 85A845E + .incbin "graphics/slot_machine/85A845E.gbapal" + +gUnknown_085A847E:: @ 85A847E + .incbin "graphics/slot_machine/85A847E.gbapal" + .align 2 gUnknown_085A84A0:: @ 85A84A0 - .incbin "baserom.gba", 0x5a84a0, 0xc + .4byte gUnknown_085A843E + .4byte gUnknown_085A845E + .4byte gUnknown_085A847E gUnknown_085A84AC:: @ 85A84AC - .incbin "baserom.gba", 0x5a84ac, 0x64 + .4byte gSlotMachineMenu_Pal + 0x20 + +gUnknown_085A84B0:: @ 85A84B0 + .incbin "graphics/slot_machine/85A84B0.gbapal" + +gUnknown_085A84D0:: @ 85A84D0 + .incbin "graphics/slot_machine/85A84D0.gbapal" + +gUnknown_085A84F0:: @ 85A84F0 + .incbin "graphics/slot_machine/85A84F0.gbapal" gUnknown_085A8510:: @ 85A8510 - .incbin "baserom.gba", 0x5a8510, 0x10 + .4byte gUnknown_085A84B0 + .4byte gUnknown_085A84D0 + .4byte gUnknown_085A84F0 + .4byte gUnknown_08DCF230 gUnknown_085A8520:: @ 85A8520 - .incbin "baserom.gba", 0x5a8520, 0x4 + .4byte gUnknown_08DCF230 gUnknown_085A8524:: @ 85A8524 - .incbin "baserom.gba", 0x5a8524, 0x20 + .incbin "graphics/slot_machine/85A8524.bin" .align 2 gUnknown_085A8544:: @ 85A8544 @@ -401,10 +1349,11 @@ gUnknown_085A8544:: @ 85A8544 null_obj_pal gUnknown_085A858C:: @ 85A858C - .incbin "baserom.gba", 0x5a858c, 0x1154 + .incbin "graphics/slot_machine/reel_pikachu_and_machine.4bpp.lz" gUnknown_085A96E0:: @ 85A96E0 - .incbin "baserom.gba", 0x5a96e0, 0x1b8 + @if anyone knows what this tilemap is please do share + .incbin "graphics/slot_machine/85A96E0.bin" gUnknown_085A9898:: @ 85A9898 - .incbin "baserom.gba", 0x5a9898, 0x4 + .4byte NULL diff --git a/graphics/slot_machine/85A843E.pal b/graphics/slot_machine/85A843E.pal new file mode 100755 index 0000000000..e4d2436c7b --- /dev/null +++ b/graphics/slot_machine/85A843E.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +131 213 172 +255 255 131 +255 180 65 +255 255 255 +255 255 131 +255 255 131 +255 180 65 +255 180 65 +255 90 0 +255 90 0 +222 41 0 +255 0 255 +156 0 0 +0 0 0 diff --git a/graphics/slot_machine/85A845E.pal b/graphics/slot_machine/85A845E.pal new file mode 100755 index 0000000000..db8703d479 --- /dev/null +++ b/graphics/slot_machine/85A845E.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +131 213 172 +255 180 65 +255 90 0 +255 255 131 +255 180 65 +255 255 255 +255 255 131 +255 255 131 +255 180 65 +255 180 65 +255 90 0 +255 0 255 +156 0 0 +0 0 0 diff --git a/graphics/slot_machine/85A847E.pal b/graphics/slot_machine/85A847E.pal new file mode 100755 index 0000000000..4bb9a0b4d8 --- /dev/null +++ b/graphics/slot_machine/85A847E.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +131 213 172 +255 90 0 +222 41 0 +255 180 65 +255 90 0 +255 255 131 +255 180 65 +255 255 255 +255 255 131 +255 255 131 +255 180 65 +255 0 255 +156 0 0 +0 0 0 diff --git a/graphics/slot_machine/85A84B0.pal b/graphics/slot_machine/85A84B0.pal new file mode 100755 index 0000000000..3e1dbc0248 --- /dev/null +++ b/graphics/slot_machine/85A84B0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 98 90 +255 189 16 +131 0 0 +255 189 16 +197 65 16 +197 65 16 +197 65 16 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +0 0 0 diff --git a/graphics/slot_machine/85A84D0.pal b/graphics/slot_machine/85A84D0.pal new file mode 100755 index 0000000000..38b1c125da --- /dev/null +++ b/graphics/slot_machine/85A84D0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 98 90 +255 189 16 +131 0 0 +197 65 16 +255 189 16 +197 65 16 +197 65 16 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +0 0 0 diff --git a/graphics/slot_machine/85A84F0.pal b/graphics/slot_machine/85A84F0.pal new file mode 100755 index 0000000000..f4abe23f18 --- /dev/null +++ b/graphics/slot_machine/85A84F0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 98 90 +255 189 16 +131 0 0 +197 65 16 +197 65 16 +255 189 16 +197 65 16 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +0 0 0 diff --git a/graphics/slot_machine/85A8524.bin b/graphics/slot_machine/85A8524.bin new file mode 100644 index 0000000000000000000000000000000000000000..0325642780da7235dbab817783c8a807c6ba8c47 GIT binary patch literal 32 ScmZQz`2U}QfkTl22LJ#*?gA(P literal 0 HcmV?d00001 diff --git a/graphics/slot_machine/85A96E0.bin b/graphics/slot_machine/85A96E0.bin new file mode 100644 index 0000000000..3aa89e7b40 --- /dev/null +++ b/graphics/slot_machine/85A96E0.bin @@ -0,0 +1 @@ +0000000000000000000400000000000000000004000000000000000000040000000000000000000400000000000000000004000000000000000000040000000000000000000400000000000000000004000000000000000000040000000000000000000400000000000000000004 \ No newline at end of file From 442398261ee13464f4bde73142a2fd551a78dc74 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Wed, 17 Jan 2018 14:48:50 -0500 Subject: [PATCH 31/64] fix tabs and add forgotten image --- data/slot_machine.s | 948 +++++++++--------- .../slot_machine/reel_pikachu_and_machine.png | Bin 0 -> 3051 bytes 2 files changed, 474 insertions(+), 474 deletions(-) create mode 100755 graphics/slot_machine/reel_pikachu_and_machine.png diff --git a/data/slot_machine.s b/data/slot_machine.s index 68adf50475..b09ee25c0f 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -6,9 +6,9 @@ gUnknown_085A7424:: @ 85A7424 .4byte 0x1F8 - .4byte 0x11C5 - .4byte 0x21D6 - .4byte 0x11E7 + .4byte 0x11C5 + .4byte 0x21D6 + .4byte 0x11E7 gUnknown_085A7434:: @ 85A7434 window_template 0, 2, 15, 0x1B, 4, 15, 0x194 @@ -324,502 +324,502 @@ gUnknown_085A783A:: @ 85A783A gUnknown_085A78C8:: @ 85A78C8 .4byte sub_812F078 - .4byte sub_812F36C - .4byte sub_812F36C - .4byte sub_812F36C - .4byte sub_812F36C - .4byte sub_812F3B4 - .4byte sub_812F2CC - .4byte sub_812F078 - .4byte sub_812F078 - .4byte sub_812F080 - .4byte sub_812F104 - .4byte sub_812F11C - .4byte sub_812F134 - .4byte sub_812F150 - .4byte sub_812F1B8 - .4byte sub_812F21C - .4byte sub_812F078 - .4byte sub_812F470 - .4byte sub_812F514 - .4byte sub_812F514 - .4byte sub_812F514 - .4byte sub_812F514 - .4byte sub_812F514 - .4byte sub_812F514 - .4byte sub_812F514 - .4byte sub_812F514 - .4byte sub_812F5E0 - .4byte sub_812F5E0 - .4byte sub_812F5E0 - .4byte sub_812F5E0 - .4byte sub_812F5E0 - .4byte sub_812F5E0 - .4byte sub_812F5E0 - .4byte sub_812F5E0 - .4byte sub_812F648 + .4byte sub_812F36C + .4byte sub_812F36C + .4byte sub_812F36C + .4byte sub_812F36C + .4byte sub_812F3B4 + .4byte sub_812F2CC + .4byte sub_812F078 + .4byte sub_812F078 + .4byte sub_812F080 + .4byte sub_812F104 + .4byte sub_812F11C + .4byte sub_812F134 + .4byte sub_812F150 + .4byte sub_812F1B8 + .4byte sub_812F21C + .4byte sub_812F078 + .4byte sub_812F470 + .4byte sub_812F514 + .4byte sub_812F514 + .4byte sub_812F514 + .4byte sub_812F514 + .4byte sub_812F514 + .4byte sub_812F514 + .4byte sub_812F514 + .4byte sub_812F514 + .4byte sub_812F5E0 + .4byte sub_812F5E0 + .4byte sub_812F5E0 + .4byte sub_812F5E0 + .4byte sub_812F5E0 + .4byte sub_812F5E0 + .4byte sub_812F5E0 + .4byte sub_812F5E0 + .4byte sub_812F648 gUnknown_085A7954:: @ 85A7954 - .byte 0x19 - .byte 0x22 - .2byte 0 - .byte 0x2 - .byte 0 - .2byte 0 - .byte 0x9 - .byte 0x10 - .2byte 0 - .byte 0xFF - .byte 0 - .2byte 0 + .byte 0x19 + .byte 0x22 + .2byte 0 + .byte 0x2 + .byte 0 + .2byte 0 + .byte 0x9 + .byte 0x10 + .2byte 0 + .byte 0xFF + .byte 0 + .2byte 0 gUnknown_085A7964:: @ 85A7964 - .byte 0xA - .byte 0x1 - .2byte 0 - .byte 0xB - .byte 2 - .2byte 0 - .byte 0xC - .byte 0x3 - .2byte 0 - .byte 0xD - .byte 4 - .2byte 0 - .byte 0x5 - .byte 5 - .2byte 0 - .byte 0x8 - .byte 0x6 - .2byte 0 - .byte 0xFF - .byte 0 - .2byte 0 + .byte 0xA + .byte 0x1 + .2byte 0 + .byte 0xB + .byte 2 + .2byte 0 + .byte 0xC + .byte 0x3 + .2byte 0 + .byte 0xD + .byte 4 + .2byte 0 + .byte 0x5 + .byte 5 + .2byte 0 + .byte 0x8 + .byte 0x6 + .2byte 0 + .byte 0xFF + .byte 0 + .2byte 0 gUnknown_085A7980:: @ 85A7980 - .byte 0x3 - .byte 0x7 - .2byte 0 - .byte 0x8 - .byte 0x11 - .2byte 0 - .byte 0xFF - .byte 0 - .2byte 0 + .byte 0x3 + .byte 0x7 + .2byte 0 + .byte 0x8 + .byte 0x11 + .2byte 0 + .byte 0xFF + .byte 0 + .2byte 0 gUnknown_085A798C:: @ 85A798C - .byte 0x4 - .byte 0x8 - .2byte 0 - .byte 0x6 - .byte 0x9 - .2byte 0 - .byte 0x6 - .byte 0xA - .2byte 1 - .byte 0x6 - .byte 0xB - .2byte 2 - .byte 0x6 - .byte 0xC - .2byte 3 - .byte 0xFF - .byte 0 - .2byte 0 + .byte 0x4 + .byte 0x8 + .2byte 0 + .byte 0x6 + .byte 0x9 + .2byte 0 + .byte 0x6 + .byte 0xA + .2byte 1 + .byte 0x6 + .byte 0xB + .2byte 2 + .byte 0x6 + .byte 0xC + .2byte 3 + .byte 0xFF + .byte 0 + .2byte 0 gUnknown_085A79A4:: @ 85A79A4 - .byte 0 - .byte 0xD - .2byte 0 - .byte 1 - .byte 0xE - .2byte 0 - .byte 0x7 - .byte 0xF - .2byte 0 - .byte 0xFF - .byte 0 - .2byte 0 + .byte 0 + .byte 0xD + .2byte 0 + .byte 1 + .byte 0xE + .2byte 0 + .byte 0x7 + .byte 0xF + .2byte 0 + .byte 0xFF + .byte 0 + .2byte 0 -gUnknown_085A79B4:: @ 85A79B4 - .byte 0x13 - .byte 0x1A - .2byte 0 - .byte 0x14 - .byte 0x1B - .2byte 1 - .byte 0x15 - .byte 0x1C - .2byte 2 - .byte 0xE - .byte 0x1D - .2byte 3 - .byte 0xF - .byte 0x1E - .2byte 4 - .byte 0x10 - .byte 0x1F - .2byte 5 - .byte 0x11 - .byte 0x20 - .2byte 6 - .byte 0x12 - .byte 0x21 - .2byte 7 - .byte 0x8 - .byte 0x11 - .2byte 0 - .byte 0xFF - .byte 0 - .2byte 0 +gUnknown_085A79B4:: @ 85A79B4 + .byte 0x13 + .byte 0x1A + .2byte 0 + .byte 0x14 + .byte 0x1B + .2byte 1 + .byte 0x15 + .byte 0x1C + .2byte 2 + .byte 0xE + .byte 0x1D + .2byte 3 + .byte 0xF + .byte 0x1E + .2byte 4 + .byte 0x10 + .byte 0x1F + .2byte 5 + .byte 0x11 + .byte 0x20 + .2byte 6 + .byte 0x12 + .byte 0x21 + .2byte 7 + .byte 0x8 + .byte 0x11 + .2byte 0 + .byte 0xFF + .byte 0 + .2byte 0 gUnknown_085A79DC:: @ 85A79DC - .byte 0x16 - .byte 0x12 - .2byte 0 - .byte 0x17 - .byte 0x13 - .2byte 1 - .byte 0x18 - .byte 0x14 - .2byte 2 - .byte 0xE - .byte 0x15 - .2byte 3 - .byte 0xF - .byte 0x16 - .2byte 4 - .byte 0x10 - .byte 0x17 - .2byte 5 - .byte 0x11 - .byte 0x18 - .2byte 6 - .byte 0x12 - .byte 0x19 - .2byte 7 - .byte 0x8 - .byte 0x11 - .2byte 0 - .byte 0xFF - .byte 0 - .2byte 0 + .byte 0x16 + .byte 0x12 + .2byte 0 + .byte 0x17 + .byte 0x13 + .2byte 1 + .byte 0x18 + .byte 0x14 + .2byte 2 + .byte 0xE + .byte 0x15 + .2byte 3 + .byte 0xF + .byte 0x16 + .2byte 4 + .byte 0x10 + .byte 0x17 + .2byte 5 + .byte 0x11 + .byte 0x18 + .2byte 6 + .byte 0x12 + .byte 0x19 + .2byte 7 + .byte 0x8 + .byte 0x11 + .2byte 0 + .byte 0xFF + .byte 0 + .2byte 0 gUnknown_085A7A04:: @ 85A7A04 .4byte gUnknown_085A7954 - .4byte gUnknown_085A7964 - .4byte gUnknown_085A7980 - .4byte gUnknown_085A798C - .4byte gUnknown_085A79A4 - .4byte gUnknown_085A79DC - .4byte gUnknown_085A79B4 + .4byte gUnknown_085A7964 + .4byte gUnknown_085A7980 + .4byte gUnknown_085A798C + .4byte gUnknown_085A79A4 + .4byte gUnknown_085A79DC + .4byte gUnknown_085A79B4 gUnknown_085A7A20:: @ 85A7A20 .4byte sub_812F7C0 - .4byte sub_812F784 - .4byte sub_812F794 - .4byte nullsub_101 - .4byte nullsub_101 - .4byte sub_812F794 - .4byte sub_812F794 + .4byte sub_812F784 + .4byte sub_812F794 + .4byte nullsub_101 + .4byte nullsub_101 + .4byte sub_812F794 + .4byte sub_812F794 gUnknown_085A7A3C:: @ 85A7A3C - .2byte 0 - .2byte 0 - .2byte 0 - .2byte 0 - + .2byte 0 + .2byte 0 + .2byte 0 + .2byte 0 + gUnknown_085A7A44:: @ 85A7A44 - .2byte 0x8000 - .2byte 0 - .2byte 0 - .2byte 0 + .2byte 0x8000 + .2byte 0 + .2byte 0 + .2byte 0 gUnknown_085A7A4C:: @ 85A7A4C - .2byte 0 - .2byte 0x4000 - .2byte 0 - .2byte 0 - + .2byte 0 + .2byte 0x4000 + .2byte 0 + .2byte 0 + gUnknown_085A7A54:: @ 85A7A54 - .2byte 0x8000 - .2byte 0x8000 - .2byte 0 - .2byte 0 - + .2byte 0x8000 + .2byte 0x8000 + .2byte 0 + .2byte 0 + gUnknown_085A7A5C:: @ 85A7A5C - .2byte 0 - .2byte 0x8000 - .2byte 0 - .2byte 0 + .2byte 0 + .2byte 0x8000 + .2byte 0 + .2byte 0 gUnknown_085A7A64:: @ 85A7A64 - .2byte 0x8000 - .2byte 0xC000 - .2byte 0 - .2byte 0 - + .2byte 0x8000 + .2byte 0xC000 + .2byte 0 + .2byte 0 + gUnknown_085A7A6C:: @ 85A7A6C - .2byte 0x4000 - .2byte 0xC000 - .2byte 0 - .2byte 0 + .2byte 0x4000 + .2byte 0xC000 + .2byte 0 + .2byte 0 gUnknown_085A7A74:: @ 85A7A74 - .2byte 0 - .2byte 0xC000 - .2byte 0 - .2byte 0 + .2byte 0 + .2byte 0xC000 + .2byte 0 + .2byte 0 gUnknown_085A7A7C:: @ 85A7A7C - .4byte gSlotMachineReelTimeNumber0 - .2byte 0x80 - .2byte 0 - .4byte gSlotMachineReelTimeNumber1 - .2byte 0x80 - .2byte 0 - .4byte gSlotMachineReelTimeNumber2 - .2byte 0x80 - .2byte 0 - .4byte gSlotMachineReelTimeNumber3 - .2byte 0x80 - .2byte 0 - .4byte gSlotMachineReelTimeNumber4 - .2byte 0x80 - .2byte 0 - .4byte gSlotMachineReelTimeNumber5 - .2byte 0x80 - .2byte 0 + .4byte gSlotMachineReelTimeNumber0 + .2byte 0x80 + .2byte 0 + .4byte gSlotMachineReelTimeNumber1 + .2byte 0x80 + .2byte 0 + .4byte gSlotMachineReelTimeNumber2 + .2byte 0x80 + .2byte 0 + .4byte gSlotMachineReelTimeNumber3 + .2byte 0x80 + .2byte 0 + .4byte gSlotMachineReelTimeNumber4 + .2byte 0x80 + .2byte 0 + .4byte gSlotMachineReelTimeNumber5 + .2byte 0x80 + .2byte 0 gUnknown_085A7AAC:: @ 85A7AAC - .4byte gSlotMachineReelTimeShadow - .2byte 0x200 - .2byte 0 + .4byte gSlotMachineReelTimeShadow + .2byte 0x200 + .2byte 0 gUnknown_085A7AB4:: @ 85A7AB4 - .4byte gUnknown_08DD1A18 - .2byte 0x40 - .2byte 0 + .4byte gUnknown_08DD1A18 + .2byte 0x40 + .2byte 0 gUnknown_085A7ABC:: @ 85A7ABC - .4byte gSlotMachineReelTimeLargeBolt0 - .2byte 0x100 - .2byte 0 - .4byte gSlotMachineReelTimeLargeBolt1 - .2byte 0x100 - .2byte 0 + .4byte gSlotMachineReelTimeLargeBolt0 + .2byte 0x100 + .2byte 0 + .4byte gSlotMachineReelTimeLargeBolt1 + .2byte 0x100 + .2byte 0 gUnknown_085A7ACC:: @ 85A7ACC - .4byte gSlotMachineReelTimePikaAura - .2byte 0x400 - .2byte 0 - + .4byte gSlotMachineReelTimePikaAura + .2byte 0x400 + .2byte 0 + gUnknown_085A7AD4:: @ 85A7CD4 - .4byte gSlotMachineReelTimeExplosion0 - .2byte 0x200 - .2byte 0 - .4byte gSlotMachineReelTimeExplosion1 - .2byte 0x200 - .2byte 0 + .4byte gSlotMachineReelTimeExplosion0 + .2byte 0x200 + .2byte 0 + .4byte gSlotMachineReelTimeExplosion1 + .2byte 0x200 + .2byte 0 gUnknown_085A7AE4:: @ 85A7AE4 - .4byte gSlotMachineReelTimeDuck - .4byte 32 + .4byte gSlotMachineReelTimeDuck + .4byte 32 gUnknown_085A7AEC:: @ 85A7AEC - .4byte gSlotMachineReelTimeSmoke - .4byte 0x80 - + .4byte gSlotMachineReelTimeSmoke + .4byte 0x80 + gUnknown_085A7AF4:: @ 85A7AF4 - .4byte gSlotMachineReelTimeBolt - .4byte 32 + .4byte gSlotMachineReelTimeBolt + .4byte 32 gUnknown_085A7AFC:: @ 85A7AFC - obj_image_anim_frame 0, 1 - obj_image_anim_end + obj_image_anim_frame 0, 1 + obj_image_anim_end gUnknown_085A7B04:: @ 85A7B04 - obj_image_anim_frame 0, 1 - obj_image_anim_jump 0 - + obj_image_anim_frame 0, 1 + obj_image_anim_jump 0 + gUnknown_085A7B0C:: @ 85A7B0C - obj_image_anim_frame 0, 16 - obj_image_anim_end + obj_image_anim_frame 0, 16 + obj_image_anim_end gUnknown_085A7B14:: @ 85A7B14 - obj_image_anim_frame 1, 16 - obj_image_anim_frame 0, 16 - obj_image_anim_jump 0 + obj_image_anim_frame 1, 16 + obj_image_anim_frame 0, 16 + obj_image_anim_jump 0 gUnknown_085A7B20:: @ 85A7B20 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_jump 0 + obj_image_anim_frame 1, 8 + obj_image_anim_frame 0, 8 + obj_image_anim_jump 0 gUnknown_085A7B2C:: @ 85A7B2C - obj_image_anim_frame 1, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_jump 0 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 0, 4 + obj_image_anim_jump 0 gUnknown_085A7B38:: @ 85A7B38 - obj_image_anim_frame 2, 32 - obj_image_anim_frame 3, 32 - obj_image_anim_jump 0 + obj_image_anim_frame 2, 32 + obj_image_anim_frame 3, 32 + obj_image_anim_jump 0 gUnknown_085A7B44:: @ 85A7B44 - obj_image_anim_frame 4, 1 - obj_image_anim_end + obj_image_anim_frame 4, 1 + obj_image_anim_end gUnknown_085A7B4C:: @ 85A7B4C - obj_image_anim_frame 0, 1 - obj_image_anim_end + obj_image_anim_frame 0, 1 + obj_image_anim_end gUnknown_085A7B54:: @ 85A7B54 - obj_image_anim_frame 1, 1 - obj_image_anim_end + obj_image_anim_frame 1, 1 + obj_image_anim_end gUnknown_085A7B5C:: @ 85A7B5C - obj_image_anim_frame 2, 1 - obj_image_anim_end + obj_image_anim_frame 2, 1 + obj_image_anim_end gUnknown_085A7B64:: @ 85A7B64 - obj_image_anim_frame 3, 1 - obj_image_anim_end + obj_image_anim_frame 3, 1 + obj_image_anim_end gUnknown_085A7B6C:: @ 85A7B6C - obj_image_anim_frame 4, 1 - obj_image_anim_end + obj_image_anim_frame 4, 1 + obj_image_anim_end gUnknown_085A7B74:: @ 85A7B74 - obj_image_anim_frame 5, 1 - obj_image_anim_end + obj_image_anim_frame 5, 1 + obj_image_anim_end gUnknown_085A7B7C:: @ 85A7B7C - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_jump 0 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_jump 0 gUnknown_085A7B88:: @ 85A7B88 - obj_image_anim_frame 0, 16 - obj_image_anim_frame 1, 16 - obj_image_anim_jump 0 + obj_image_anim_frame 0, 16 + obj_image_anim_frame 1, 16 + obj_image_anim_jump 0 gUnknown_085A7B94:: @ 85A7B94 - obj_image_anim_frame 0, 30 - obj_image_anim_frame 1, 30 - obj_image_anim_jump 0 + obj_image_anim_frame 0, 30 + obj_image_anim_frame 1, 30 + obj_image_anim_jump 0 gUnknown_085A7BA0:: @ 85A7BA0 - obj_image_anim_frame 1, 1 - obj_image_anim_end + obj_image_anim_frame 1, 1 + obj_image_anim_end gUnknown_085A7BA8:: @ 85A7BA8 - obj_image_anim_frame 0, 30 - obj_image_anim_frame 1, 30 - obj_image_anim_jump 0 + obj_image_anim_frame 0, 30 + obj_image_anim_frame 1, 30 + obj_image_anim_jump 0 gUnknown_085A7BB4:: @ 85A7BB4 - obj_image_anim_frame 0, 16 - obj_image_anim_frame 1, 16 - obj_image_anim_frame 0, 16 - obj_image_anim_frame 1, 80 - obj_image_anim_jump 0 + obj_image_anim_frame 0, 16 + obj_image_anim_frame 1, 16 + obj_image_anim_frame 0, 16 + obj_image_anim_frame 1, 80 + obj_image_anim_jump 0 gUnknown_085A7BC8:: @ 85A7BC8 - obj_image_anim_frame 0, 1 - obj_image_anim_end + obj_image_anim_frame 0, 1 + obj_image_anim_end gUnknown_085A7BD0:: @ 85A7BD0 - obj_image_anim_frame 0, 1 - obj_image_anim_end + obj_image_anim_frame 0, 1 + obj_image_anim_end gUnknown_085A7BD8:: @ 85A7BD8 - obj_image_anim_frame 1, 1 - obj_image_anim_end + obj_image_anim_frame 1, 1 + obj_image_anim_end gUnknown_085A7BE0:: @ 85A7BE0 - obj_image_anim_frame 2, 1 - obj_image_anim_end + obj_image_anim_frame 2, 1 + obj_image_anim_end gUnknown_085A7BE8:: @ 85A7BE8 - obj_image_anim_frame 3, 1 - obj_image_anim_end + obj_image_anim_frame 3, 1 + obj_image_anim_end gUnknown_085A7BF0:: @ 85A7BF0 - obj_image_anim_frame 4, 1 - obj_image_anim_end + obj_image_anim_frame 4, 1 + obj_image_anim_end gUnknown_085A7BF8:: @ 85A7BF8 - .4byte gUnknown_085A7AFC + .4byte gUnknown_085A7AFC gUnknown_085A7BFC:: @ 85A7BFC - .4byte gUnknown_085A7B04 + .4byte gUnknown_085A7B04 gUnknown_085A7C00:: @ 85A7C00 - .4byte gUnknown_085A7B0C - .4byte gUnknown_085A7B14 - .4byte gUnknown_085A7B20 - .4byte gUnknown_085A7B2C - .4byte gUnknown_085A7B38 - .4byte gUnknown_085A7B44 + .4byte gUnknown_085A7B0C + .4byte gUnknown_085A7B14 + .4byte gUnknown_085A7B20 + .4byte gUnknown_085A7B2C + .4byte gUnknown_085A7B38 + .4byte gUnknown_085A7B44 gUnknown_085A7C18:: @ 85A7C18 - .4byte gUnknown_085A7B4C - .4byte gUnknown_085A7B54 - .4byte gUnknown_085A7B5C - .4byte gUnknown_085A7B64 - .4byte gUnknown_085A7B6C - .4byte gUnknown_085A7B74 + .4byte gUnknown_085A7B4C + .4byte gUnknown_085A7B54 + .4byte gUnknown_085A7B5C + .4byte gUnknown_085A7B64 + .4byte gUnknown_085A7B6C + .4byte gUnknown_085A7B74 gUnknown_085A7C30:: @ 85A7C30 - .4byte gUnknown_085A7B7C + .4byte gUnknown_085A7B7C gUnknown_085A7C34:: @ 85A7C34 - .4byte gUnknown_085A7B88 - + .4byte gUnknown_085A7B88 + gUnknown_085A7C38:: @ 85A7C38 - .4byte gUnknown_085A7B94 - .4byte gUnknown_085A7BA0 - + .4byte gUnknown_085A7B94 + .4byte gUnknown_085A7BA0 + gUnknown_085A7C40:: @ 85A7C40 - .4byte gUnknown_085A7BA8 - + .4byte gUnknown_085A7BA8 + gUnknown_085A7C44:: @ 85A7C44 - .4byte gUnknown_085A7BB4 - .4byte gUnknown_085A7BC8 - + .4byte gUnknown_085A7BB4 + .4byte gUnknown_085A7BC8 + gUnknown_085A7C4C:: @ 85A7C4C - .4byte gUnknown_085A7BD0 - .4byte gUnknown_085A7BD8 - .4byte gUnknown_085A7BE0 - .4byte gUnknown_085A7BE8 - .4byte gUnknown_085A7BF0 + .4byte gUnknown_085A7BD0 + .4byte gUnknown_085A7BD8 + .4byte gUnknown_085A7BE0 + .4byte gUnknown_085A7BE8 + .4byte gUnknown_085A7BF0 gUnknown_085A7C60:: @ 85A7C60 - obj_rot_scal_anim_frame 16, 16, 0, 0 - obj_rot_scal_anim_loop 0 - obj_rot_scal_anim_frame 1, 1, 0, 1 - obj_rot_scal_anim_loop 0xFF - obj_rot_scal_anim_end - + obj_rot_scal_anim_frame 16, 16, 0, 0 + obj_rot_scal_anim_loop 0 + obj_rot_scal_anim_frame 1, 1, 0, 1 + obj_rot_scal_anim_loop 0xFF + obj_rot_scal_anim_end + gUnknown_085A7C88:: @ 85A7C88 - .4byte gUnknown_085A7C60 + .4byte gUnknown_085A7C60 gUnknown_085A7C8C:: @ 85A7C8C - obj_rot_scal_anim_frame 0, 0, 8, 32 - obj_rot_scal_anim_frame 0, 0, 6, 32 - obj_rot_scal_anim_frame 0, 0, 4, 16 - obj_rot_scal_anim_frame 0, 0, 12, 2 - obj_rot_scal_anim_frame 0, 0, -12, 4 - obj_rot_scal_anim_frame 0, 0, 12, 2 - obj_rot_scal_anim_frame 0, 0, 12, 2 - obj_rot_scal_anim_frame 0, 0, -12, 4 - obj_rot_scal_anim_frame 0, 0, 12, 2 - obj_rot_scal_anim_end + obj_rot_scal_anim_frame 0, 0, 8, 32 + obj_rot_scal_anim_frame 0, 0, 6, 32 + obj_rot_scal_anim_frame 0, 0, 4, 16 + obj_rot_scal_anim_frame 0, 0, 12, 2 + obj_rot_scal_anim_frame 0, 0, -12, 4 + obj_rot_scal_anim_frame 0, 0, 12, 2 + obj_rot_scal_anim_frame 0, 0, 12, 2 + obj_rot_scal_anim_frame 0, 0, -12, 4 + obj_rot_scal_anim_frame 0, 0, 12, 2 + obj_rot_scal_anim_end gUnknown_085A7CDC:: @ 85A7CDC - .4byte gUnknown_085A7C8C - + .4byte gUnknown_085A7C8C + gUnknown_085A7CE0:: @ 85A7CE0 spr_template 0, 0, gUnknown_085A7A5C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_812E154 @@ -864,106 +864,106 @@ gUnknown_085A7E18:: @ 85A7E18 gUnknown_085A7E30:: @ 85A7E30 spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AEC, gUnknown_085A7C88, sub_812EE14 - + gUnknown_085A7E48:: @ 85A7E48 spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7E60:: @ 85A7E60 spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7E78:: @ 85A7E78 spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7E90:: @ 85A7E90 spr_template 18, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7EA8:: @ 85A7EA8 spr_template 0xFFFF, 6, gUnknown_085A7A6C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7EC0:: @ 85A7EC0 spr_template 0xFFFF, 6, gUnknown_085A7A6C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7ED8:: @ 85A7ED8 spr_template 19, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7EF0:: @ 85A7EF0 spr_template 20, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7F08:: @ 85A7F08 spr_template 21, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7F20:: @ 85A7F20 spr_template 0xFFFF, 6, gUnknown_085A7A5C, gUnknown_085A7C38, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7F38:: @ 85A7F38 spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7F50:: @ 85A7F50 spr_template 0xFFFF, 6, gUnknown_085A7A4C, gUnknown_085A7C4C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7F68:: @ 85A7F68 spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7C44, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7F80:: @ 85A7F80 spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7C40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7F98:: @ 85A7F98 spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BF8, gUnknown_085A7AF4, gUnknown_085A7CDC, sub_812EF54 - + gUnknown_085A7FB0:: @ 85A7FB0 - subsprite -64, -64, 3, 0, 64x64 - subsprite 0, -64, 3, 0, 64x64 - subsprite -64, 0, 3, 0, 64x64 - subsprite 0, 0, 3, 0, 64x64 + subsprite -64, -64, 3, 0, 64x64 + subsprite 0, -64, 3, 0, 64x64 + subsprite -64, 0, 3, 0, 64x64 + subsprite 0, 0, 3, 0, 64x64 gUnknown_085A7FC0:: @ 85A7FC0 .4byte 4, gUnknown_085A7FB0 - + gUnknown_085A7FC8:: @ 85A7FC8 - subsprite -32, -12, 1, 0, 32x8 - subsprite 0, -12, 1, 4, 32x8 - subsprite -32, -4, 1, 8, 32x8 - subsprite 0, -4, 1, 12, 32x8 - subsprite -32, 4, 1, 16, 32x8 - subsprite 0, 4, 1, 20, 32x8 + subsprite -32, -12, 1, 0, 32x8 + subsprite 0, -12, 1, 4, 32x8 + subsprite -32, -4, 1, 8, 32x8 + subsprite 0, -4, 1, 12, 32x8 + subsprite -32, 4, 1, 16, 32x8 + subsprite 0, 4, 1, 20, 32x8 gUnknown_085A7FE0:: @ 85A7FE0 .4byte 6, gUnknown_085A7FC8 gUnknown_085A7FE8:: @ 85A7FE8 - subsprite -32, -20, 1, 0, 64x32 - subsprite -32, 12, 1, 32, 32x8 - subsprite 0, 12, 1, 36, 32x8 - + subsprite -32, -20, 1, 0, 64x32 + subsprite -32, 12, 1, 32, 32x8 + subsprite 0, 12, 1, 36, 32x8 + gUnknown_085A7FF4:: @ 85A7FF4 .4byte 3, gUnknown_085A7FE8 gUnknown_085A7FFC:: @ 85A7FFC - subsprite -32, -24, 1, 0, 64x32 - subsprite -32, 8, 1, 32, 32x8 - subsprite 0, 8, 1, 36, 32x8 - subsprite -32, 16, 1, 40, 32x8 - subsprite 0, 16, 1, 44, 32x8 - + subsprite -32, -24, 1, 0, 64x32 + subsprite -32, 8, 1, 32, 32x8 + subsprite 0, 8, 1, 36, 32x8 + subsprite -32, 16, 1, 40, 32x8 + subsprite 0, 16, 1, 44, 32x8 + gUnknown_085A8010:: @ 85A8010 .4byte 5, gUnknown_085A7FFC - + gUnknown_085A8018:: @ 85A8018 - subsprite -32, -8, 1, 0, 32x8 - subsprite 0, -8, 1, 4, 32x8 - subsprite -32, 0, 1, 8, 32x8 - subsprite 0, 0, 1, 12, 32x8 + subsprite -32, -8, 1, 0, 32x8 + subsprite 0, -8, 1, 4, 32x8 + subsprite -32, 0, 1, 8, 32x8 + subsprite 0, 0, 1, 12, 32x8 gUnknown_085A8028:: @ 85A8028 .4byte 4, gUnknown_085A8018 - + gUnknown_085A8030:: @ 85A8030 - subsprite -8, -12, 1, 0, 16x8 - subsprite -8, -4, 1, 0, 16x8 - subsprite -8, 4, 1, 0, 16x8 + subsprite -8, -12, 1, 0, 16x8 + subsprite -8, -4, 1, 0, 16x8 + subsprite -8, 4, 1, 0, 16x8 gUnknown_085A803C:: @ 85A803C - .4byte 3, gUnknown_085A8030 + .4byte 3, gUnknown_085A8030 gUnknown_085A8044:: @ 85A8044 subsprite -32, -24, 3, 0, 64x32 @@ -1175,59 +1175,59 @@ gUnknown_085A825C:: @ 85A825C gUnknown_085A8264:: @ 85A8264 .4byte gUnknown_085A7E48 - .4byte gUnknown_085A7E60 - .4byte gUnknown_085A7E78 - .4byte gUnknown_085A7EA8 - .4byte gUnknown_085A7EC0 - .4byte gUnknown_085A7F20 - .4byte gUnknown_085A7F38 - .4byte gUnknown_085A7F50 - .4byte gUnknown_085A7F68 - .4byte gUnknown_085A7F80 - .4byte gUnknown_085A7E90 - .4byte gUnknown_085A7E90 - .4byte gUnknown_085A7E90 - .4byte gUnknown_085A7E90 - .4byte gUnknown_085A7ED8 - .4byte gUnknown_085A7ED8 - .4byte gUnknown_085A7ED8 - .4byte gUnknown_085A7ED8 - .4byte gUnknown_085A7ED8 - .4byte gUnknown_085A7EF0 - .4byte gUnknown_085A7EF0 - .4byte gUnknown_085A7EF0 - .4byte gUnknown_085A7F08 - .4byte gUnknown_085A7F08 - .4byte gUnknown_085A7F08 - .4byte gDummySpriteTemplate + .4byte gUnknown_085A7E60 + .4byte gUnknown_085A7E78 + .4byte gUnknown_085A7EA8 + .4byte gUnknown_085A7EC0 + .4byte gUnknown_085A7F20 + .4byte gUnknown_085A7F38 + .4byte gUnknown_085A7F50 + .4byte gUnknown_085A7F68 + .4byte gUnknown_085A7F80 + .4byte gUnknown_085A7E90 + .4byte gUnknown_085A7E90 + .4byte gUnknown_085A7E90 + .4byte gUnknown_085A7E90 + .4byte gUnknown_085A7ED8 + .4byte gUnknown_085A7ED8 + .4byte gUnknown_085A7ED8 + .4byte gUnknown_085A7ED8 + .4byte gUnknown_085A7ED8 + .4byte gUnknown_085A7EF0 + .4byte gUnknown_085A7EF0 + .4byte gUnknown_085A7EF0 + .4byte gUnknown_085A7F08 + .4byte gUnknown_085A7F08 + .4byte gUnknown_085A7F08 + .4byte gDummySpriteTemplate gUnknown_085A82CC:: @ 85A82CC .4byte gUnknown_085A8058 - .4byte gUnknown_085A8070 - .4byte gUnknown_085A8088 - .4byte gUnknown_085A80C0 - .4byte NULL - .4byte NULL - .4byte gUnknown_085A80D0 - .4byte NULL - .4byte gUnknown_085A8110 - .4byte gUnknown_085A8124 - .4byte gUnknown_085A8134 - .4byte gUnknown_085A8144 - .4byte gUnknown_085A8154 - .4byte gUnknown_085A8164 - .4byte gUnknown_085A8174 - .4byte gUnknown_085A8184 - .4byte gUnknown_085A8194 - .4byte gUnknown_085A81A4 - .4byte gUnknown_085A81B4 - .4byte gUnknown_085A81D4 - .4byte gUnknown_085A81E8 - .4byte gUnknown_085A8208 - .4byte gUnknown_085A8228 - .4byte gUnknown_085A823C - .4byte gUnknown_085A825C - .4byte NULL + .4byte gUnknown_085A8070 + .4byte gUnknown_085A8088 + .4byte gUnknown_085A80C0 + .4byte NULL + .4byte NULL + .4byte gUnknown_085A80D0 + .4byte NULL + .4byte gUnknown_085A8110 + .4byte gUnknown_085A8124 + .4byte gUnknown_085A8134 + .4byte gUnknown_085A8144 + .4byte gUnknown_085A8154 + .4byte gUnknown_085A8164 + .4byte gUnknown_085A8174 + .4byte gUnknown_085A8184 + .4byte gUnknown_085A8194 + .4byte gUnknown_085A81A4 + .4byte gUnknown_085A81B4 + .4byte gUnknown_085A81D4 + .4byte gUnknown_085A81E8 + .4byte gUnknown_085A8208 + .4byte gUnknown_085A8228 + .4byte gUnknown_085A823C + .4byte gUnknown_085A825C + .4byte NULL .align 2 gUnknown_085A8334:: @ 85A8334 diff --git a/graphics/slot_machine/reel_pikachu_and_machine.png b/graphics/slot_machine/reel_pikachu_and_machine.png new file mode 100755 index 0000000000000000000000000000000000000000..ddbd332eecd22fd2083ad3b8a161b365863a6453 GIT binary patch literal 3051 zcmV!N-@0000mP)t-stgOZV z|NsC0#rEz1y_^7IN&x?AQoTw+i#ahl?yLZ;lmKc${{a7#l$=^xYAGo}w!)-E000Yi zNklj2J*g$3*tTJeeiJV(n_X%k#>uL!_& zk-BTIO(|a)AV8=hg@FJz0s9}gCf8GBOo_!ITp1_ZNOF)i@6GJ&?#w)LWhA)-7Y)vq zkMrZ3H?yPpzM0ut?FU-yqzX8lR{<3v0N5PDo+g_^+z8m%hP|o)YJIPwjXq>Kfb@~Dn5zR;4?_R| z9gO3c03f!_0Tw$Bi`-ZT8W7uFLVe@_z+8W>1HAQ7vTQmI3l-OR z8HSFR0j#QgOf^tp5Gnz?3b3{)mtq&6S&l~m)6ZxsE$oxF|<`K6JF@Mm3b7+KV$%Skcg2Mq%OtZ&NWL5kr@m&EPxgXcm<$3 z3<G7Sb2ekU6Tj}lgU;0yH!!leubs=ste zqW>5}ShgY+-+dMe9-znfQ6O`yRj z6|)zrfAH7&2Y<8_4uo)=W&aQl+5~XxA8yO{Q*2X*RdKhc`UD(J6^~-CruP(Lcwaq9 zfqlPICWg*^%|C#mmWZL#(A|Lz%e3=h_CFSgmZz;y2rwrL(T5ckf$(9u4FH;3D9R5l zR86oKL-_>}g0Hem`4_CRz$t0q(&V0@Wa3im&Mp0r!sdd8q8#y6xNn#gjNB9l18#fH zmwpvMRm%%Jt4CyP-jJHHwXZHjmO0#k?N`~)&NAP>>l)! z1G+9+4}Ql73H}>*i29l}K4HQgJUDql>gqR>r#Olc8&6;dZ`RjF0JLJ*G*4bc>E>1)Y)CKn3sFR&T->@SIs0<15(YbUU*2mljm ziF&2GBhdCFYXYw*gbgT>}1N3;&cX2ErHJaJ!%?kK_)aMeaVnM~Zp zL909DLK&RCLWz<&WULk!mW8<|9_>hP61#VVJm5@4i1 zDoRWoL8(Bi0Ujnf+d8{4p)N`Sf;XELm_xsK zVQrhw%pNc{bi{3Ur_N7l4%9FUs2At{V6@PGSWNBl0!^p@+I(8nwUv2^CX)l`1H5>y zxfF}PDkAJLw!*wXF{IXhLjmB=La{M@adsfp*FQsnE&;>rY@rOaN&+>MXA2T&L!N*5$p^50W=+r@#>TN*_Q@=5}L))w2Ai57sEQ7+iksPAou z5-5!m57B`c6F0mt1C;4&@g|py^_hn^O)SuFS-1feS3wAD2d;L(VT%a>afaAJ*fm~| zK-&X=zkS}tL#?jib8wA?Fv%VQAp*qjpv^jVc#Z)=@H%q>aOZZoj0YhARDI3v;B``X z5XWoIY9J2_uRhk5XIQz8jAxW)AUplgT^r zuU}6lFNtyZIL*f)O{sBUt4j%ZGwNBa?oKnp`}0p{#IqQ!Quz>)**hf%u`7WHZ^XYk z5CMN`KxdW8o6BVOh5$B1sLTONJyc4XrZu(fJ5E!baIe(>j?-uqOER7Z>%d28Uf%Nk zm=2_c3rjBvpmDv*PvaYaMu20zN>E)q&^7 zUw)Yb#{_^Mvfqbd5);DMwV$YymwGz^?Dmrrf6?6F?vx;X2oZBh^O%gB7o9J z*r=~N$?RL0@*%zs0P<$Eu)hTn_;1C%Ftk@j3!q3M0+y|EzA^x>k(!mv-pXub0Ay9X$zxJB_+sV<8Fdo1SSX_8!0y4m%^9LU^tt z-UWt8NucgOzQUT1t}k-s{Zs|Qt8_X|zP(0FD2@WaT6~qxpzbGU)Y5I#15 z6xzoeFaSJxT{lw>z#j|%^=beP@b*_TTt|%nbtZue-ol<9VBZPTD;y~3$|diFIxAtm zgjcilI^ki6VSxD%K30}{LodoefZa$_71-mOL~L5<1^jKw0p=!`Vz3Y&0g!;Ct1Je**k)??Wgn3f%wz002ovPDHLkV1lN#fa3rF literal 0 HcmV?d00001 From 173c5923cbdfc23559103c43dc076322580fb435 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Wed, 17 Jan 2018 19:19:47 -0500 Subject: [PATCH 32/64] clean up reel_time_gfx --- data/slot_machine.s | 2 +- .../slot_machine/reel_pikachu_and_machine.png | Bin 3051 -> 0 bytes graphics/slot_machine/reel_time_machine.png | Bin 0 -> 954 bytes graphics/slot_machine/reel_time_pikachu.png | Bin 0 -> 2210 bytes graphics_file_rules.mk | 5 +++++ 5 files changed, 6 insertions(+), 1 deletion(-) delete mode 100755 graphics/slot_machine/reel_pikachu_and_machine.png create mode 100755 graphics/slot_machine/reel_time_machine.png create mode 100755 graphics/slot_machine/reel_time_pikachu.png diff --git a/data/slot_machine.s b/data/slot_machine.s index b09ee25c0f..a3db540fac 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -1349,7 +1349,7 @@ gUnknown_085A8544:: @ 85A8544 null_obj_pal gUnknown_085A858C:: @ 85A858C - .incbin "graphics/slot_machine/reel_pikachu_and_machine.4bpp.lz" + .incbin "graphics/slot_machine/reel_time_gfx.4bpp.lz" gUnknown_085A96E0:: @ 85A96E0 @if anyone knows what this tilemap is please do share diff --git a/graphics/slot_machine/reel_pikachu_and_machine.png b/graphics/slot_machine/reel_pikachu_and_machine.png deleted file mode 100755 index ddbd332eecd22fd2083ad3b8a161b365863a6453..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3051 zcmV!N-@0000mP)t-stgOZV z|NsC0#rEz1y_^7IN&x?AQoTw+i#ahl?yLZ;lmKc${{a7#l$=^xYAGo}w!)-E000Yi zNklj2J*g$3*tTJeeiJV(n_X%k#>uL!_& zk-BTIO(|a)AV8=hg@FJz0s9}gCf8GBOo_!ITp1_ZNOF)i@6GJ&?#w)LWhA)-7Y)vq zkMrZ3H?yPpzM0ut?FU-yqzX8lR{<3v0N5PDo+g_^+z8m%hP|o)YJIPwjXq>Kfb@~Dn5zR;4?_R| z9gO3c03f!_0Tw$Bi`-ZT8W7uFLVe@_z+8W>1HAQ7vTQmI3l-OR z8HSFR0j#QgOf^tp5Gnz?3b3{)mtq&6S&l~m)6ZxsE$oxF|<`K6JF@Mm3b7+KV$%Skcg2Mq%OtZ&NWL5kr@m&EPxgXcm<$3 z3<G7Sb2ekU6Tj}lgU;0yH!!leubs=ste zqW>5}ShgY+-+dMe9-znfQ6O`yRj z6|)zrfAH7&2Y<8_4uo)=W&aQl+5~XxA8yO{Q*2X*RdKhc`UD(J6^~-CruP(Lcwaq9 zfqlPICWg*^%|C#mmWZL#(A|Lz%e3=h_CFSgmZz;y2rwrL(T5ckf$(9u4FH;3D9R5l zR86oKL-_>}g0Hem`4_CRz$t0q(&V0@Wa3im&Mp0r!sdd8q8#y6xNn#gjNB9l18#fH zmwpvMRm%%Jt4CyP-jJHHwXZHjmO0#k?N`~)&NAP>>l)! z1G+9+4}Ql73H}>*i29l}K4HQgJUDql>gqR>r#Olc8&6;dZ`RjF0JLJ*G*4bc>E>1)Y)CKn3sFR&T->@SIs0<15(YbUU*2mljm ziF&2GBhdCFYXYw*gbgT>}1N3;&cX2ErHJaJ!%?kK_)aMeaVnM~Zp zL909DLK&RCLWz<&WULk!mW8<|9_>hP61#VVJm5@4i1 zDoRWoL8(Bi0Ujnf+d8{4p)N`Sf;XELm_xsK zVQrhw%pNc{bi{3Ur_N7l4%9FUs2At{V6@PGSWNBl0!^p@+I(8nwUv2^CX)l`1H5>y zxfF}PDkAJLw!*wXF{IXhLjmB=La{M@adsfp*FQsnE&;>rY@rOaN&+>MXA2T&L!N*5$p^50W=+r@#>TN*_Q@=5}L))w2Ai57sEQ7+iksPAou z5-5!m57B`c6F0mt1C;4&@g|py^_hn^O)SuFS-1feS3wAD2d;L(VT%a>afaAJ*fm~| zK-&X=zkS}tL#?jib8wA?Fv%VQAp*qjpv^jVc#Z)=@H%q>aOZZoj0YhARDI3v;B``X z5XWoIY9J2_uRhk5XIQz8jAxW)AUplgT^r zuU}6lFNtyZIL*f)O{sBUt4j%ZGwNBa?oKnp`}0p{#IqQ!Quz>)**hf%u`7WHZ^XYk z5CMN`KxdW8o6BVOh5$B1sLTONJyc4XrZu(fJ5E!baIe(>j?-uqOER7Z>%d28Uf%Nk zm=2_c3rjBvpmDv*PvaYaMu20zN>E)q&^7 zUw)Yb#{_^Mvfqbd5);DMwV$YymwGz^?Dmrrf6?6F?vx;X2oZBh^O%gB7o9J z*r=~N$?RL0@*%zs0P<$Eu)hTn_;1C%Ftk@j3!q3M0+y|EzA^x>k(!mv-pXub0Ay9X$zxJB_+sV<8Fdo1SSX_8!0y4m%^9LU^tt z-UWt8NucgOzQUT1t}k-s{Zs|Qt8_X|zP(0FD2@WaT6~qxpzbGU)Y5I#15 z6xzoeFaSJxT{lw>z#j|%^=beP@b*_TTt|%nbtZue-ol<9VBZPTD;y~3$|diFIxAtm zgjcilI^ki6VSxD%K30}{LodoefZa$_71-mOL~L5<1^jKw0p=!`Vz3Y&0g!;Ct1Je**k)??Wgn3f%wz002ovPDHLkV1lN#fa3rF diff --git a/graphics/slot_machine/reel_time_machine.png b/graphics/slot_machine/reel_time_machine.png new file mode 100755 index 0000000000000000000000000000000000000000..59279ccef32d1d6172c424825dba77cef8e66226 GIT binary patch literal 954 zcmV;r14aCaP)<*0000mP)t-stgOZV z|NsC0#rEz1y_^7IN&x?AQoTw+i#ahl?yLZ;lmKc${{a7#l$=^xYAGo}w!)-E0009; zNkl+}bP^43*lg@y5#9G4L1E z44uJ4{)YYmjw^Nc1!0KVqWJZl?YsDV7n=&&Cy`(8!}mSko!{4nfnhHQgU7>x!v*n( zB_6AX%>ekn2BSn%;^Oo?DbS%mQi09S#m|U7%UQXH_d^8o+84vq^QqFq=9g2ha5?m4 zg&gpG0r)y#`_exzfIHt0)E*A+f?%3|`WOTw%{pv@SO);zI@oc-fvrfl7x7A15L@4# zN1DC(5Ch)?8cn4hoGeh`CjYdD3hccC?8V>|L8BWDP@~Y;0}GQ#0RV;^JUd!EG(s=ykExV1YP04U{OAkhHrG!DPl0KN4z918_k1>6^DI1vErv8u3+#fJi02i_ZJkbH|?kpWk}Wf}oT1*~#tfSyL-X9KX?0PGIx0dL?*z#G|V1_N(! z(g1iT(u7fgV|fB80Lb^9(Sk}C|0aHatY2=$3cG1*B7-ySzlW z+0z5Y_y;rp7^=4D+Wq`2jwwxazIosf0TfRkl^Nx90d0}e8Kska##H9yfzwCVn=lE` z0;bcSvCLXJ5zf0W17rqaNUu|d<&Gl(IE!ZxVJ;OFG=Tjo497x%^c4WGKI?%A;LcZl z6EXn*m;mNwfegs%#}S*OihyZzV3JknRt0(%ff-vUyp$xn2>Ddvc_Fh1QkuzVmI2QL z=}Y5Y@ryFxvdaLFfi7{gJ?4Iauc{re-uNiSM+gBap~l3cp}L<`)$}4D-xS zvJ#y#V3r=@STC%}#DRstj*Y;(3NKWgrfDf9owGXMYp07*qoM6N<$f_Ig;6aWAK literal 0 HcmV?d00001 diff --git a/graphics/slot_machine/reel_time_pikachu.png b/graphics/slot_machine/reel_time_pikachu.png new file mode 100755 index 0000000000000000000000000000000000000000..29b004c84ca8ce20efbf5d4158ca76bd59548456 GIT binary patch literal 2210 zcmV;T2wnGyP)>+000Or zNkl3~ahr?54zBi3npgtV__~D&R z!UrbU#OKHm4=jL5oG^VN0*GB8SW^fDu!Bk|2Ef>%20%p-$XL0+3}c5C*2@S1h{e$b zbnCminnw{11Bi48OlM7gCII+@{Xm~#rgE+WfY;HD{?fExM4b5(yQUy{Q4~u86gTTm z5I+}G?f^1oVq>CtVG4~%<^dZUfFgj*nE9fv`iN?2vl{(GY19V8{J} zhcXt=W*oQxn5MXYUzm}Kg_i=BvM5YH7YO*nFbRs{{c{sR2(k8wy3_=X0|HDE+q5iJ zW)OJbe3zEO%!Uhq5UI2QxEuof*nXewW+-|kb5{V<4I%D#^%CoqqV8!g9?`Y*64Bf!g;j~NF>48kZ7jsd|N&ZUIiXF-&5z~QN9F;XtV z%b{)o-a))PRV}a{)F}hhb)+2z$>%V_rkogyG5`Jo0HqEAFgF&&UF&hBFSX>5B(IcO zxNAKLFA`eV6zaccLC8OV(!$1D5TmP#)NyVshO^2w!i#+m8js@mhXz0oB7wCaQ!D;q zt65Hn#$Z6%0SODF9WZnl7Kkrdkjet57H}L!ZN8efEyVlva4@xj(Bf^RnbCt98uix( zf>E4K{TCQu=hb)iVW~CTi-0}N%BC8JNv{0>^l{q@-+@#xB>Y}zq8%vTU=ShlW*kyZ zSi`L_>W@Us84OZ?>ylXifPJj3ONzNB>Pi!O9AZwp13;qbCTX*un^kNQLz{pk1yRMZ|(Ml;tPgt$ycKQ#XdP_$BKg(3i=Cd39; zR04{3{WcJozade67m#YAy(sM$ObEToR`wrUWsw`CK}%D7Cds6wHa-UKAw{SKjYL`M zRe0l>6pB1I2Lo|-)Jy*mAXRG)26jiIk`B=6fLI$TcYsAFh-)LWLtqMB$z}|Iz9!XT zQd@O(7Hb3~DSL|j)PSpt!R^m_knqoA&eTtW#}8oK!R?1ntgimG|45@K;c<^Uc)xzK zLm*MOY2JU5?1`4F8YRijk~`6wEMi3~^}X5($sLMK;ik}w_^&hntXTR;D8Q5@IlsERGG;zp))xx zmAgxd8QA9&u)2>)Zg)+~wcK(cc3t4z$SLe=`M;I12~i)e1GxFU4r~tBo8b4<{Qxsp zHQfNX;$H)3Uw9RGn4#nhKB>{;_EP}&Q2yocN3>FXpk2Ytr?}%TmqH)6wU4Sx5Z4xJ=md$o`W$P{4+zDhGTIf*v5?c>;q0s(}NWU}NxZ97hsUME$6phVE>*nJ={%pE45Uzz* zZPJtdK0d9I{($JBmtsj#-hPZvQc52{X|DhNT`$Q}E)fuer!H?le1!D(M*{LBL1lDS z`b;^$Cb)Cje#`cQK^O@?zKtG@zoF zq*Qsa8g>B&z#~?`Z{2J4M^jR)Aw%1 zh~1gH7&tYxmp1<9aWwU;2MJAmh8Cpa>gj$1ZH%=UY>4e8e`AwK#tvV(Q>=cGqX4k} zs4I#&f*JzJ2oSuUYP^=OE8%ejcp1A}83V!*hxG;TZ#;bgaJ7vf8U?tUkzS#fFRs7f zvGLw0(5ZFpN*;J=&vh;U^}$}xELcEa&lp?h-<>o-{n?nkDG!iUi_8U%jM-(1mhm~A z6)6O`<5{DsYt%lJ)VuYC5b&;Xi_E6nT*upYBW`~=GQ?JNZ&&PpohUC#xFzSJH1yM_ z;KqMu;TE8b%x!l*)u%M8VVD!vn{$6OTI4?h820!?Ce#3#o)%MQWv<9%YJhw|s*a9J z3G}NX#vW5EkS+#>G-m+)|YOaC^xLL%`1xIKm0LCe)g<|QwAVIbV z0de!Zq(iNx=W}R{#W3|f0R;if?_dadSUgjJ0=>?W0pep=RBBrwz|~K}oUW6Kl~NbZ kYA}z0u0Af=sQ;||139l>8&3HO#{d8T07*qoM6N<$f=8MSssI20 literal 0 HcmV?d00001 diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 250916022f..f6724f685f 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -16,6 +16,7 @@ rayquazadir := graphics/rayquaza_scene roulettegfxdir := graphics/roulette pknvdir := graphics/pokenav/ pknvoptionsdir := graphics/pokenav/options +slotmachinedir := graphics/slot_machine types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark contest_types := cool beauty cute smart tough @@ -464,6 +465,10 @@ $(bttransgfxdir)/frontier_square_4.4bpp: $(bttransgfxdir)/frontier_squares_blank $(bttransgfxdir)/frontier_squares_4.4bpp @cat $^ >$@ +$(slotmachinedir)/reel_time_gfx.4bpp: $(slotmachinedir)/reel_time_pikachu.4bpp \ + $(slotmachinedir)/reel_time_machine.4bpp + @cat $^ >$@ + $(pknvoptionsdir)/options.4bpp: $(pknvoptionsdir)/hoenn_map.4bpp \ $(pknvoptionsdir)/condition.4bpp \ $(pknvoptionsdir)/match_call.4bpp \ From 184fedc8706bf8c71b337334fbb60dcb0fe98f80 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Wed, 17 Jan 2018 20:57:19 -0600 Subject: [PATCH 33/64] Extract PC box background images --- asm/pokemon_storage_system.s | 2 +- data/pokemon_storage_system.s | 397 ++++++++++++- graphics/pokemon_storage/arrow.png | Bin 0 -> 129 bytes graphics/pokemon_storage/beach.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/beach_bg.png | Bin 0 -> 377 bytes graphics/pokemon_storage/beach_frame.png | Bin 0 -> 642 bytes graphics/pokemon_storage/box_bg1.pal | 19 + .../box_selection_popup_center.png | Bin 0 -> 107 bytes .../box_selection_popup_sides.png | Bin 0 -> 125 bytes graphics/pokemon_storage/bubbles.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/bubbles_bg.png | Bin 0 -> 170 bytes graphics/pokemon_storage/bubbles_frame.png | Bin 0 -> 572 bytes graphics/pokemon_storage/cave.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/cave_bg.png | Bin 0 -> 207 bytes graphics/pokemon_storage/cave_frame.png | Bin 0 -> 764 bytes graphics/pokemon_storage/city.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/city_bg.png | Bin 0 -> 217 bytes graphics/pokemon_storage/city_frame.png | Bin 0 -> 635 bytes graphics/pokemon_storage/crag.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/crag_bg.png | Bin 0 -> 345 bytes graphics/pokemon_storage/crag_frame.png | Bin 0 -> 601 bytes graphics/pokemon_storage/desert.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/desert_bg.png | Bin 0 -> 286 bytes graphics/pokemon_storage/desert_frame.png | Bin 0 -> 593 bytes graphics/pokemon_storage/forest.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/forest_bg.png | Bin 0 -> 201 bytes graphics/pokemon_storage/forest_frame.png | Bin 0 -> 839 bytes graphics/pokemon_storage/machine.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/machine_bg.png | Bin 0 -> 222 bytes graphics/pokemon_storage/machine_frame.png | Bin 0 -> 435 bytes graphics/pokemon_storage/plain.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/plain_bg.png | Bin 0 -> 152 bytes graphics/pokemon_storage/plain_frame.png | Bin 0 -> 288 bytes graphics/pokemon_storage/pokecenter.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/pokecenter_bg.png | Bin 0 -> 345 bytes graphics/pokemon_storage/pokecenter_frame.png | Bin 0 -> 406 bytes graphics/pokemon_storage/river.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/river_bg.png | Bin 0 -> 253 bytes graphics/pokemon_storage/river_frame.png | Bin 0 -> 733 bytes graphics/pokemon_storage/savanna.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/savanna_bg.png | Bin 0 -> 389 bytes graphics/pokemon_storage/savanna_frame.png | Bin 0 -> 609 bytes graphics/pokemon_storage/scrolling_bg.bin | Bin 0 -> 2048 bytes graphics/pokemon_storage/scrolling_bg.png | Bin 0 -> 168 bytes graphics/pokemon_storage/seafloor.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/seafloor_bg.png | Bin 0 -> 223 bytes graphics/pokemon_storage/seafloor_frame.png | Bin 0 -> 573 bytes graphics/pokemon_storage/sky.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/sky_bg.png | Bin 0 -> 273 bytes graphics/pokemon_storage/sky_frame.png | Bin 0 -> 616 bytes graphics/pokemon_storage/snow.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/snow_bg.png | Bin 0 -> 310 bytes graphics/pokemon_storage/snow_frame.png | Bin 0 -> 705 bytes graphics/pokemon_storage/volcano.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/volcano_bg.png | Bin 0 -> 459 bytes graphics/pokemon_storage/volcano_frame.png | Bin 0 -> 743 bytes graphics/pokemon_storage/waveform.png | Bin 0 -> 269 bytes graphics/unknown/unknown_57173C.pal | 19 + graphics/unknown/unknown_572280.pal | 19 + graphics/unknown/unknown_5722A0.bin | Bin 0 -> 1280 bytes graphics/unknown/unknown_5723DC.pal | 19 + graphics/unknown/unknown_5723FC.pal | 19 + graphics/unknown/unknown_57241C.pal | 19 + graphics/unknown/unknown_57243C.pal | 19 + graphics/unknown/unknown_5726F4.pal | 19 + graphics/unused/tilemap_5773C4.bin | 1 + graphics/unused/unknown_5726B4.pal | 35 ++ graphics_file_rules.mk | 527 +++++++++++------- 68 files changed, 875 insertions(+), 239 deletions(-) create mode 100644 graphics/pokemon_storage/arrow.png create mode 100644 graphics/pokemon_storage/beach.bin create mode 100644 graphics/pokemon_storage/beach_bg.png create mode 100644 graphics/pokemon_storage/beach_frame.png create mode 100644 graphics/pokemon_storage/box_bg1.pal create mode 100644 graphics/pokemon_storage/box_selection_popup_center.png create mode 100644 graphics/pokemon_storage/box_selection_popup_sides.png create mode 100644 graphics/pokemon_storage/bubbles.bin create mode 100644 graphics/pokemon_storage/bubbles_bg.png create mode 100644 graphics/pokemon_storage/bubbles_frame.png create mode 100644 graphics/pokemon_storage/cave.bin create mode 100644 graphics/pokemon_storage/cave_bg.png create mode 100644 graphics/pokemon_storage/cave_frame.png create mode 100644 graphics/pokemon_storage/city.bin create mode 100644 graphics/pokemon_storage/city_bg.png create mode 100644 graphics/pokemon_storage/city_frame.png create mode 100644 graphics/pokemon_storage/crag.bin create mode 100644 graphics/pokemon_storage/crag_bg.png create mode 100644 graphics/pokemon_storage/crag_frame.png create mode 100644 graphics/pokemon_storage/desert.bin create mode 100644 graphics/pokemon_storage/desert_bg.png create mode 100644 graphics/pokemon_storage/desert_frame.png create mode 100644 graphics/pokemon_storage/forest.bin create mode 100644 graphics/pokemon_storage/forest_bg.png create mode 100644 graphics/pokemon_storage/forest_frame.png create mode 100644 graphics/pokemon_storage/machine.bin create mode 100644 graphics/pokemon_storage/machine_bg.png create mode 100644 graphics/pokemon_storage/machine_frame.png create mode 100644 graphics/pokemon_storage/plain.bin create mode 100644 graphics/pokemon_storage/plain_bg.png create mode 100644 graphics/pokemon_storage/plain_frame.png create mode 100644 graphics/pokemon_storage/pokecenter.bin create mode 100644 graphics/pokemon_storage/pokecenter_bg.png create mode 100644 graphics/pokemon_storage/pokecenter_frame.png create mode 100644 graphics/pokemon_storage/river.bin create mode 100644 graphics/pokemon_storage/river_bg.png create mode 100644 graphics/pokemon_storage/river_frame.png create mode 100644 graphics/pokemon_storage/savanna.bin create mode 100644 graphics/pokemon_storage/savanna_bg.png create mode 100644 graphics/pokemon_storage/savanna_frame.png create mode 100644 graphics/pokemon_storage/scrolling_bg.bin create mode 100644 graphics/pokemon_storage/scrolling_bg.png create mode 100644 graphics/pokemon_storage/seafloor.bin create mode 100644 graphics/pokemon_storage/seafloor_bg.png create mode 100644 graphics/pokemon_storage/seafloor_frame.png create mode 100644 graphics/pokemon_storage/sky.bin create mode 100644 graphics/pokemon_storage/sky_bg.png create mode 100644 graphics/pokemon_storage/sky_frame.png create mode 100644 graphics/pokemon_storage/snow.bin create mode 100644 graphics/pokemon_storage/snow_bg.png create mode 100644 graphics/pokemon_storage/snow_frame.png create mode 100644 graphics/pokemon_storage/volcano.bin create mode 100644 graphics/pokemon_storage/volcano_bg.png create mode 100644 graphics/pokemon_storage/volcano_frame.png create mode 100644 graphics/pokemon_storage/waveform.png create mode 100644 graphics/unknown/unknown_57173C.pal create mode 100644 graphics/unknown/unknown_572280.pal create mode 100644 graphics/unknown/unknown_5722A0.bin create mode 100644 graphics/unknown/unknown_5723DC.pal create mode 100644 graphics/unknown/unknown_5723FC.pal create mode 100644 graphics/unknown/unknown_57241C.pal create mode 100644 graphics/unknown/unknown_57243C.pal create mode 100644 graphics/unknown/unknown_5726F4.pal create mode 100644 graphics/unused/tilemap_5773C4.bin create mode 100644 graphics/unused/unknown_5726B4.pal diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 00a8b4d92e..94879764b3 100755 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -10135,7 +10135,7 @@ _080CC7E6: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_085775B8 + ldr r1, =gWallpaperTable adds r6, r0, r1 ldr r0, [r6, 0x4] ldr r1, [r7] diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index e419db55a4..6c2c17a4a0 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -2,68 +2,102 @@ .include "constants/constants.inc" .section .rodata - .align 2, 0 + .align 2 gUnknown_0857173C:: @ 857173C - .incbin "baserom.gba", 0x57173c, 0x20 + .incbin "graphics/unknown/unknown_57173C.gbapal" + .align 2 gUnknown_0857175C:: @ 857175C - .incbin "baserom.gba", 0x57175c, 0x800 + .incbin "graphics/pokemon_storage/box_selection_popup_center.4bpp" + .align 2 gUnknown_08571F5C:: @ 8571F5C - .incbin "baserom.gba", 0x571f5c, 0x180 + .incbin "graphics/pokemon_storage/box_selection_popup_sides.4bpp" + .align 2 gUnknown_085720DC:: @ 85720DC - .incbin "baserom.gba", 0x5720dc, 0x98 + .incbin "graphics/pokemon_storage/scrolling_bg.4bpp.lz" + .align 2 gUnknown_08572174:: @ 8572174 - .incbin "baserom.gba", 0x572174, 0x12c + .incbin "graphics/pokemon_storage/scrolling_bg.bin.lz" + .align 2 +gUnknown_08572280:: @ 8572280 + .incbin "graphics/unknown/unknown_572280.gbapal" + + .align 2 gUnknown_085722A0:: @ 85722A0 - .incbin "baserom.gba", 0x5722a0, 0xfc + .incbin "graphics/unknown/unknown_5722A0.bin.lz" + .align 1 gUnknown_0857239C:: @ 857239C - .incbin "baserom.gba", 0x57239c, 0x40 + .2byte 0x0101, 0x0102, 0x0103, 0x0104, 0x0105, 0x0106, 0x0107, 0x0108, 0x0111, 0x0112, 0x0113, 0x0114, 0x0115, 0x0116, 0x0117, 0x0118 + .2byte 0x2101, 0x2102, 0x2103, 0x2104, 0x2105, 0x2106, 0x2107, 0x2108, 0x2111, 0x2112, 0x2113, 0x2114, 0x2115, 0x2116, 0x2117, 0x2118 + .align 2 gUnknown_085723DC:: @ 85723DC - .incbin "baserom.gba", 0x5723dc, 0x20 + .incbin "graphics/unknown/unknown_5723DC.gbapal" + .align 2 gUnknown_085723FC:: @ 85723FC - .incbin "baserom.gba", 0x5723fc, 0x20 + .incbin "graphics/unknown/unknown_5723FC.gbapal" + .align 2 gUnknown_0857241C:: @ 857241C - .incbin "baserom.gba", 0x57241c, 0x20 + .incbin "graphics/unknown/unknown_57241C.gbapal" + .align 2 gUnknown_0857243C:: @ 857243C - .incbin "baserom.gba", 0x57243c, 0x20 + .incbin "graphics/unknown/unknown_57243C.gbapal" + .align 1 gUnknown_0857245C:: @ 857245C - .incbin "baserom.gba", 0x57245c, 0x48 + .2byte 0x014c, 0x014d, 0x014e, 0x014f, 0x0170, 0x0171, 0x0172, 0x0173, 0x0174, 0x015c, 0x015d, 0x015e, 0x015f, 0x0180, 0x0181, 0x0182 + .2byte 0x0183, 0x0184, 0x0175, 0x0176, 0x0177, 0x0178, 0x0179, 0x017a, 0x017b, 0x017c, 0x017d, 0x0185, 0x0186, 0x0187, 0x0188, 0x0189 + .2byte 0x018a, 0x018b, 0x018c, 0x018d + .align 1 gUnknown_085724A4:: @ 85724A4 - .incbin "baserom.gba", 0x5724a4, 0x18 + .2byte 0x1140, 0x1141, 0x1141, 0x1142, 0x1150, 0x1151, 0x1151, 0x1152, 0x1160, 0x1161, 0x1161, 0x1162 + .align 1 gUnknown_085724BC:: @ 85724BC - .incbin "baserom.gba", 0x5724bc, 0x18 + .2byte 0x1143, 0x1144, 0x1144, 0x1145, 0x1153, 0x1154, 0x1154, 0x1155, 0x1163, 0x1164, 0x1164, 0x1165 + .align 2 gUnknown_085724D4:: @ 85724D4 - .incbin "baserom.gba", 0x5724d4, 0x20 + .incbin "graphics/pokemon_storage/waveform.gbapal" + .align 2 gUnknown_085724F4:: @ 85724F4 - .incbin "baserom.gba", 0x5724f4, 0x200 + .incbin "graphics/pokemon_storage/waveform.4bpp" + .align 2 +gUnknown_085726B4:: @ 85726B4 + .incbin "graphics/unused/unknown_5726B4.gbapal" + + .align 2 gUnknown_085726F4:: @ 85726F4 - .incbin "baserom.gba", 0x5726f4, 0x20 + .incbin "graphics/unknown/unknown_5726F4.gbapal" + .align 2 gUnknown_08572714:: @ 8572714 - .incbin "baserom.gba", 0x572714, 0x20 + window_template 0x01, 0x00, 0x0b, 0x09, 0x07, 0x03, 0x00c0 + window_template 0x00, 0x0b, 0x11, 0x12, 0x02, 0x0f, 0x0014 + window_template 0x00, 0x00, 0x0d, 0x15, 0x07, 0x0f, 0x0014 + window_template_terminator + .align 2 gUnknown_08572734:: @ 8572734 - .incbin "baserom.gba", 0x572734, 0x10 + .4byte 0x000001d0, 0x004011e5, 0x000023ba, 0x000031ff + .align 2 gUnknown_08572744:: @ 8572744 obj_pal gUnknown_085724D4, 0xDACA + .align 2 gUnknown_0857274C:: @ 857274C obj_tiles gUnknown_085724F4, 0x1C0, 5 @@ -104,7 +138,6 @@ gUnknown_0857276C:: @ 857276C .4byte gUnknown_085EBA38, 0 .align 2 - gUnknown_08572864:: @ 8572864 window_template 0, 0x18, 0xB, 5, 4, 0xF, 0x5C @@ -180,14 +213,326 @@ gSpriteAffineAnimTable_857291C:: @ 857291C .4byte gSpriteAffineAnim_85728F4 .4byte gSpriteAffineAnim_8572904 -gUnknown_08572924:: @ 8572924 - .incbin "baserom.gba", 0x572924, 0x4c50 + .align 2 +gWallpaperPalettes_Forest:: @ 8572924 + .incbin "graphics/pokemon_storage/forest_frame.gbapal" + .incbin "graphics/pokemon_storage/forest_bg.gbapal" + .align 2 +gWallpaperTiles_Forest: @ 8572964 + .incbin "graphics/pokemon_storage/forest.4bpp.lz" + + .align 2 +gWallpaperTilemap_Forest:: @ 8572DE8 + .incbin "graphics/pokemon_storage/forest.bin.lz" + + .align 2 +gWallpaperPalettes_City: @ 8572EC8 + .incbin "graphics/pokemon_storage/city_frame.gbapal" + .incbin "graphics/pokemon_storage/city_bg.gbapal" + + .align 2 +gWallpaperTiles_City: @ 8572F08 + .incbin "graphics/pokemon_storage/city.4bpp.lz" + + .align 2 +gWallpaperTilemap_City: @ 8573220 + .incbin "graphics/pokemon_storage/city.bin.lz" + + .align 2 +gWallpaperPalettes_Desert: @ 85732FC + .incbin "graphics/pokemon_storage/desert_frame.gbapal" + .incbin "graphics/pokemon_storage/desert_bg.gbapal" + + .align 2 +gWallpaperTiles_Desert: @ 857333C + .incbin "graphics/pokemon_storage/desert.4bpp.lz" + + .align 2 +gWallpaperTilemap_Desert: @ 85736F0 + .incbin "graphics/pokemon_storage/desert.bin.lz" + + .align 2 +gWallpaperPalettes_Savanna: @ 85737EC + .incbin "graphics/pokemon_storage/savanna_frame.gbapal" + .incbin "graphics/pokemon_storage/savanna_bg.gbapal" + + .align 2 +gWallpaperTiles_Savanna: @ 857382C + .incbin "graphics/pokemon_storage/savanna.4bpp.lz" + + .align 2 +gWallpaperTilemap_Savanna: @ 8573C40 + .incbin "graphics/pokemon_storage/savanna.bin.lz" + + .align 2 +gWallpaperPalettes_Crag: @ 8573D44 + .incbin "graphics/pokemon_storage/crag_frame.gbapal" + .incbin "graphics/pokemon_storage/crag_bg.gbapal" + + .align 2 +gWallpaperTiles_Crag: @ 8573D84 + .incbin "graphics/pokemon_storage/crag.4bpp.lz" + + .align 2 +gWallpaperTilemap_Crag: @ 8574180 + .incbin "graphics/pokemon_storage/crag.bin.lz" + + .align 2 +gWallpaperPalettes_Volcano: @ 8573D44 + .incbin "graphics/pokemon_storage/volcano_frame.gbapal" + .incbin "graphics/pokemon_storage/volcano_bg.gbapal" + + .align 2 +gWallpaperTiles_Volcano: @ 8573D84 + .incbin "graphics/pokemon_storage/volcano.4bpp.lz" + + .align 2 +gWallpaperTilemap_Volcano: @ 85747A0 + .incbin "graphics/pokemon_storage/volcano.bin.lz" + + .align 2 +gWallpaperPalettes_Snow: @ 85748DC + .incbin "graphics/pokemon_storage/snow_frame.gbapal" + .incbin "graphics/pokemon_storage/snow_bg.gbapal" + + .align 2 +gWallpaperTiles_Snow: @ 857491C + .incbin "graphics/pokemon_storage/snow.4bpp.lz" + + .align 2 +gWallpaperTilemap_Snow: @ 8574D7C + .incbin "graphics/pokemon_storage/snow.bin.lz" + + .align 2 +gWallpaperPalettes_Cave: @ 8574E88 + .incbin "graphics/pokemon_storage/cave_frame.gbapal" + .incbin "graphics/pokemon_storage/cave_bg.gbapal" + + .align 2 +gWallpaperTiles_Cave: @ 8574EC8 + .incbin "graphics/pokemon_storage/cave.4bpp.lz" + + .align 2 +gWallpaperTilemap_Cave: @ 85752A0 + .incbin "graphics/pokemon_storage/cave.bin.lz" + + .align 2 +gWallpaperPalettes_Beach: @ 8575378 + .incbin "graphics/pokemon_storage/beach_frame.gbapal" + .incbin "graphics/pokemon_storage/beach_bg.gbapal" + + .align 2 +gWallpaperTiles_Beach: @ 85753B8 + .incbin "graphics/pokemon_storage/beach.4bpp.lz" + + .align 2 +gWallpaperTilemap_Beach: @ 8575788 + .incbin "graphics/pokemon_storage/beach.bin.lz" + + .align 2 +gWallpaperPalettes_Seafloor: @ 8575888 + .incbin "graphics/pokemon_storage/seafloor_frame.gbapal" + .incbin "graphics/pokemon_storage/seafloor_bg.gbapal" + + .align 2 +gWallpaperTiles_Seafloor: @ 85758C8 + .incbin "graphics/pokemon_storage/seafloor.4bpp.lz" + + .align 2 +gWallpaperTilemap_Seafloor: @ 8575BC4 + .incbin "graphics/pokemon_storage/seafloor.bin.lz" + + .align 2 +gWallpaperPalettes_River: @ 8575CD8 + .incbin "graphics/pokemon_storage/river_frame.gbapal" + .incbin "graphics/pokemon_storage/river_bg.gbapal" + + .align 2 +gWallpaperTiles_River: @ 8575D18 + .incbin "graphics/pokemon_storage/river.4bpp.lz" + + .align 2 +gWallpaperTilemap_River: @ 8576100 + .incbin "graphics/pokemon_storage/river.bin.lz" + + .align 2 +gWallpaperPalettes_Sky: @ 85761F8 + .incbin "graphics/pokemon_storage/sky_frame.gbapal" + .incbin "graphics/pokemon_storage/sky_bg.gbapal" + + .align 2 +gWallpaperTiles_Sky: @ 8576238 + .incbin "graphics/pokemon_storage/sky.4bpp.lz" + + .align 2 +gWallpaperTilemap_Sky: @ 85765C0 + .incbin "graphics/pokemon_storage/sky.bin.lz" + + .align 2 +gWallpaperPalettes_Bubbles: @ 85766B0 + .incbin "graphics/pokemon_storage/bubbles_frame.gbapal" + .incbin "graphics/pokemon_storage/bubbles_bg.gbapal" + + .align 2 +gWallpaperTiles_Bubbles: @ 85766F0 + .incbin "graphics/pokemon_storage/bubbles.4bpp.lz" + + .align 2 +gWallpaperTilemap_Bubbles: @ 85769B8 + .incbin "graphics/pokemon_storage/bubbles.bin.lz" + + .align 2 +gWallpaperPalettes_Pokecenter: @ 8576AB8 + .incbin "graphics/pokemon_storage/pokecenter_frame.gbapal" + .incbin "graphics/pokemon_storage/pokecenter_bg.gbapal" + + .align 2 +gWallpaperTiles_Pokecenter: @ 8576AF8 + .incbin "graphics/pokemon_storage/pokecenter.4bpp.lz" + + .align 2 +gWallpaperTilemap_Pokecenter: @ 8576D74 + .incbin "graphics/pokemon_storage/pokecenter.bin.lz" + + .align 2 +gWallpaperPalettes_Machine: @ 8576E74 + .incbin "graphics/pokemon_storage/machine_frame.gbapal" + .incbin "graphics/pokemon_storage/machine_bg.gbapal" + + .align 2 +gWallpaperTiles_Machine: @ 8576EB4 + .incbin "graphics/pokemon_storage/machine.4bpp.lz" + + .align 2 +gWallpaperTilemap_Machine: @ 8577108 + .incbin "graphics/pokemon_storage/machine.bin.lz" + + .align 2 +gWallpaperPalettes_Plain: @ 85771CC + .incbin "graphics/pokemon_storage/plain_frame.gbapal" + .incbin "graphics/pokemon_storage/plain_bg.gbapal" + + .align 2 +gWallpaperTiles_Plain: @ 857720C + .incbin "graphics/pokemon_storage/plain.4bpp.lz" + + .align 2 +gWallpaperTilemap_Plain: @ 857732C + .incbin "graphics/pokemon_storage/plain.bin.lz" + +@ 12×18 tilemap + .incbin "graphics/unused/tilemap_5773C4.bin" + + .align 1 gUnknown_08577574:: @ 8577574 - .incbin "baserom.gba", 0x577574, 0x44 + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF -gUnknown_085775B8:: @ 85775B8 - .incbin "baserom.gba", 0x5775b8, 0x398c + .align 2 +gWallpaperTable:: @ 85775B8 + @ Forest + .4byte gWallpaperTiles_Forest + .4byte gWallpaperTilemap_Forest + .4byte gWallpaperPalettes_Forest + + @ City + .4byte gWallpaperTiles_City + .4byte gWallpaperTilemap_City + .4byte gWallpaperPalettes_City + + @ Desert + .4byte gWallpaperTiles_Desert + .4byte gWallpaperTilemap_Desert + .4byte gWallpaperPalettes_Desert + + @ Savanna + .4byte gWallpaperTiles_Savanna + .4byte gWallpaperTilemap_Savanna + .4byte gWallpaperPalettes_Savanna + + @ Crag + .4byte gWallpaperTiles_Crag + .4byte gWallpaperTilemap_Crag + .4byte gWallpaperPalettes_Crag + + @ Volcano + .4byte gWallpaperTiles_Volcano + .4byte gWallpaperTilemap_Volcano + .4byte gWallpaperPalettes_Volcano + + @ Snow + .4byte gWallpaperTiles_Snow + .4byte gWallpaperTilemap_Snow + .4byte gWallpaperPalettes_Snow + + @ Cave + .4byte gWallpaperTiles_Cave + .4byte gWallpaperTilemap_Cave + .4byte gWallpaperPalettes_Cave + + @ Beach + .4byte gWallpaperTiles_Beach + .4byte gWallpaperTilemap_Beach + .4byte gWallpaperPalettes_Beach + + @ Seafloor + .4byte gWallpaperTiles_Seafloor + .4byte gWallpaperTilemap_Seafloor + .4byte gWallpaperPalettes_Seafloor + + @ River + .4byte gWallpaperTiles_River + .4byte gWallpaperTilemap_River + .4byte gWallpaperPalettes_River + + @ Sky + .4byte gWallpaperTiles_Sky + .4byte gWallpaperTilemap_Sky + .4byte gWallpaperPalettes_Sky + + @ Bubbles + .4byte gWallpaperTiles_Bubbles + .4byte gWallpaperTilemap_Bubbles + .4byte gWallpaperPalettes_Bubbles + + @ Pokecenter + .4byte gWallpaperTiles_Pokecenter + .4byte gWallpaperTilemap_Pokecenter + .4byte gWallpaperPalettes_Pokecenter + + @ Machine + .4byte gWallpaperTiles_Machine + .4byte gWallpaperTilemap_Machine + .4byte gWallpaperPalettes_Machine + + @ Plain + .4byte gWallpaperTiles_Plain + .4byte gWallpaperTilemap_Plain + .4byte gWallpaperPalettes_Plain + + .align 2 +PCGfx_Arrow: @ 8577678 + .incbin "graphics/pokemon_storage/arrow.4bpp" + + .align 2 +gUnknown_085776F8:: @ 85776F8 + .incbin "baserom.gba", 0x5776F8, 0x384c gUnknown_0857AF44:: @ 857AF44 .incbin "baserom.gba", 0x57af44, 0xc0 diff --git a/graphics/pokemon_storage/arrow.png b/graphics/pokemon_storage/arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..ec1202319f9ae30d68c4f15ca049110bc427fdfe GIT binary patch literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDGyH<#}JO0zGn{dHUx0E9DK{L zq9Nh`(Vv+N;)~e$iW5Hv*z8G}5D+58ImzwOa}(1!%i5%GOzl7IdE-GZ@4hORj&IH# cMQb)`^RG*By5U}K#s@On)78&qol`;+0E#>;8vpv);U%2CgPd>!UHSf9M+XGt;IP}1XAJvO&6#xJL literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/beach_bg.png b/graphics/pokemon_storage/beach_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..49f1690849b90312e064c713b54a3170a86e6af1 GIT binary patch literal 377 zcmV-<0fzpGP)r9Zd7a)iULKa%U`=oGzJ2#obT0kexq7@uGNQzAg zU;aYIXOVlpiwtjv80}OmD&$%s=*Id5{|$Y##;;-w{r0000mP)t-s|NsA# zdojJ{_PzG@=Kudvlv0DuF~zK6_U5Gj_O$lyq*~R@gXYEm|Nl~A|1m+F=%~OR0006F zNklrkW9z(9v5WLmB^S(a0hXShD)JYunoV?WN(E5#BUO{iyGpV1C z^hQTzV4i-!wE0mNc!HR_*j!yXJ$CA0l8m@sVC2t2v?JI~D*9NCQXI+AsMdwy78`aM z?4)JdV$ePk&&BJ+B}o0ePq)}+d=g2btbEWr6eaUzn?3uuC)dchZ{@C-!pPF+A@QR- zgzD>|JP4;{O(6Z4V$zn$?TwLtdjFqUIm0ecrN&99U4in%OHlUPF`w#h+JbbGR|4f* z4RYD<3KQ^}{hqLL6aAYjj7^|}wnr#Bt53K|e;NOVcB%wT)6Lcdus2*V2~-Eu6{1-oD!M< DBo!Re literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/box_selection_popup_sides.png b/graphics/pokemon_storage/box_selection_popup_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..a0140dc87b386d4acb48b15455ab0a3e616c8c6e GIT binary patch literal 125 zcmeAS@N?(olHy`uVBq!ia0vp^96+4F0wfp?7&j&YDHl%{#}J9Bch7HRY%t(qcI;i> zXSQe|Ybx^|iIR=BZe9ETee`acb-7K3@vQHQnfH`B*Ppn&T4IB|(xIcfIW3d#vt*lE Yi!GbQxJ|hEbsorEPgg&ebxsLQ0PM;th5!Hn literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/bubbles.bin b/graphics/pokemon_storage/bubbles.bin new file mode 100644 index 0000000000000000000000000000000000000000..c31792b81af3c27fed3061acac66cccfe6805faa GIT binary patch literal 720 zcmd7O$8rKO5Jl0!fQdGj9BrB`a!$kl|CiOOf}N(uJJcn;g-$7S5Cp-Q1Ro?xk>-;O zS#mb>6zp2$3rpPirUaC!P^Ctl22EPD>CmOe&&&PNM;I_<#MsUWQ)U?EELgH~ZY`S_ zwUwP*!rE}JV@^IFd>U1wO4`+SpoHcs48ejhRecBWK WgD>^GsJ=b>>fBrR?;yt*b&@}Id2odQ literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/bubbles_bg.png b/graphics/pokemon_storage/bubbles_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..fe67c1b397b430623296401b80bbfd5fb717822d GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRm!VDxC`x5MdltF+`i0l9V|F7QrzxU{~IZKXK zH!lIAsHA2~$0VTqmS_Kg>wwaq9d*%Z92@Pisr19lVPH*mU+{ScJ;grlBHYW*&n!-wF)kl*efd(*my85}S Ib4q9e0D{^-SpWb4 literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/bubbles_frame.png b/graphics/pokemon_storage/bubbles_frame.png new file mode 100644 index 0000000000000000000000000000000000000000..4d76fbbbf3d1364eed52255676242b4c3d58f04c GIT binary patch literal 572 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!VDxecyh&nltF+`i0l9V|BKgrTXOaP(P#gk zefvM#As(Ger$qW4HV|+qW?E%&U!l^6Z-UuF zrbg}%Blj1gKc4i&{z&=#h4_~Vw;p6ivH(zr#4Bxj+wR4U7>DxOS-phQj z35{!$Nw_}in&>}6?e}yDAq=&LuEcWv2 z@69~CfvufgTf2dIwUNV@E!JP%JeKHQ%@l8Ze3RqAWGBP+GSAAB^F*YtDbCc<@Nx+f zXn6VZ=u6Er3Kx03kC}zIu3W19Xy36ZtC+&BFx@)pvQRpkDRH&j{Ri5Lu^U1zGu38? z%ZF;Mp1i6(fTLSB%ehhVg9^jc(tGQDZ~3%`E<4RI-zM1A@>YdBql&-G5*~vMA{UR% zU*%B}`_be}DC>bo5(RIk`pPr~On$H^_k|~ees6i6)$*A2svI9?{(78X7~R~(#)EfdxRdu zUI^bIr*@j3Ddxym9fsHy3PtrH7cQ?a$;c0UXVzTvLFx7!58;NJ9UimO81m#I%q}gH zY~W|KITc^ZrjUDi-8{aCCAqf_l{jqM9{QZ=RPfn)#z+HE-4e;4PeC#6>FVdQ&MBb@ E0B`E-uK)l5 literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/cave.bin b/graphics/pokemon_storage/cave.bin new file mode 100644 index 0000000000000000000000000000000000000000..112d4724d59084db9ebf02e2b0635e8b86e858df GIT binary patch literal 720 zcmeH@w-$m>6a=3EOo(H`gm}#vbK?I$j3GWiEB^xZMtQn8hH%VO?LElL zpvb|py=DUw2d}`I1B-V?U%8$#v**US@1YNQSPsT|+$~sbedv0FX5#J@s(boFkDaiY zW)}CAmIUUTH#5uCWOAy0+}}a#v_4v2B47=j2zWryhn@$( z$7A(rBLLnxxZ5L7#w$%$<>ZvsCRYk?yf&7IUJBqnui@b@fLCv|Ra2E4r!~18khoCf zz#x+VH&VkNfOq1n@0U}hv@^IQFBw>XBO-6{*1t#qzPas2fb~v&&q}--tF%WI2*bio zHIYMpM+wk#*YRY%Pn>D7Y!wRkuws-l;F0{~P5|bP!+yY0!Ke3VT%-ViB9MM|^#~A{ z+x>uC8;7J$p?y*d8s`z}^=$6O4uIGP=-;6I$gX4thP3u*oI>O!(WSv4egilG`WV-3 z6#~0BcO9!n?Lb+q%LUCBV#UWXevf+!fZNc8c8G36+j2fNF4`xwf;={qbih+tRh2Jk zyAL)|6A41n#0Z#6+hhubi*;-Ps}XL=0$^!=4WW-lN;umB0&)h%9TE!pJt|hyh8klf z76l-f%)(SvU02vu3jqx3f=nZ@SYRojVP#k?iTwp)g@rDn@Y$8WuIu{RnbMB|Eov6Q zMjL=&&YGerbWt>%XZZ>cj8Z$Yvl0gC>Z+v203HPQ@u669g9~c1%v@wzHj%+yMh8O^ zpQMvv!v9vWDw<|hU>+EQ^dRoVIE5|X=)*+xSpZ+pMU%}*`U!ygAAlUHD(d7@9RT@Y z{qA92Z+0)^`dC^5=sGEl>9E-NCouq?r{UFUOa}rUMu2Y#@H&022LaBXZbpFdnC|Zm u13Vi6&c`$iNom9Y literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/city_bg.png b/graphics/pokemon_storage/city_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..b221c2596e2c3a4072a64e02ec5c92d108b36a24 GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^5bP0l+XkKF+o#> literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/city_frame.png b/graphics/pokemon_storage/city_frame.png new file mode 100644 index 0000000000000000000000000000000000000000..82e4731efbeb059c111a303d5d1ff6d7b96d08fa GIT binary patch literal 635 zcmV->0)+jEP);2Cjd+j* zWkD?I5D6F<;SDHvKF4+XM{2?+HMTFlU#|BhcAP5u-T@f6ZkObNPXou-(z^nTFwLWM zR7JoKSAY)&24n`%SV#L)1sHV;izi~6wixifM%pL7LlGjDFF5&i(>*{e{&l3tAZ2H=dwxwtq^}s&dRs~ z1yFPKXas-{u}^>K(g4EHf;dG!`HGiOQ4ND2A5tT{5}+gvmY$QgCD~zP6 z9c92WJ*O||rqz|Pcp`rzAzs+1sL`ZAI0yJ{op<{fQ~Q_8x`BvQfN17ylg7rJQz3@g zecZfZA1*dv9TA{(xM;vyhY9I`0H6HfpG;?fMPpX!my%f5wE*u1aMZT|)sA&cLiI`j z9lWYcGt~C2QlD+A0l4V1*rpnQFV4T?&$R}?wrQ(X9k6NJR0mM1W~=>Az;>r<${+f} VCb4+VTh{;p002ovPDHLkV1mMf7TEv* literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/crag.bin b/graphics/pokemon_storage/crag.bin new file mode 100644 index 0000000000000000000000000000000000000000..5c7c44cd20f028c09716bd76bfaf4ce527dee641 GIT binary patch literal 720 zcmeH@w+;eP3O6Cp~BI0=%ZfHWDh*yPAlczZ=kl&MgqMx6$tNsBfey7cJ3yn%*aWTdf{ uT4}9~D<_V()lPdITxq|CZ>rfBnd=FxE@~|R literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/crag_bg.png b/graphics/pokemon_storage/crag_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..13b536358aab35d6b2363c9dad2e70d0ffca4265 GIT binary patch literal 345 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvg8-ip*Z=?j-@A8j@7|+x=FF+C zu1-oy^78TmNw!L{M0Gy85}Sb4q9e0Iu1Nng9R* literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/crag_frame.png b/graphics/pokemon_storage/crag_frame.png new file mode 100644 index 0000000000000000000000000000000000000000..b67c6efa1569484634489d1a51b32bb8f11bd65c GIT binary patch literal 601 zcmV-f0;c_mP)lPlZHQ0dneyJdv;xbo%Icjf#ph*$B20ZW&N`R*VIbES8N5vEY>elqFb-=2|XSqcMO0 z_$>M(A;cPZPpgtFwFk}?L&ldTL~YLquuR@FlEMP8D8oYfV35k}PSVC}mh6$~OQNF^mA;9xg55 zUHmuoj)w{9l@7lhu}Q00000NkvXXu0mjfu7&}~ literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/desert.bin b/graphics/pokemon_storage/desert.bin new file mode 100644 index 0000000000000000000000000000000000000000..98464fafff0ab9a2b659ed5d073b1c5256a60ac4 GIT binary patch literal 720 zcma)%*;WEE5JU%Y!3DjbxZqYGiwdr|ga7|ql7u7^$?-V-FrDOfRdrDm#RC;vD^wSq zJ6Bj`jdkXT{Whqv$rjt}P-mAtph1&;4rp;0xFe1^q0K30oO8h?qC=M}dh{7sZm8>j z)QxU6(YGG;r001TYo-^yhV#gB=JieQ;nvX~`qY=E_BL|qyd$Ge-87eTCd2(!$mKNLvO?U`r!ic9)6~UrxlL0S&l&wxA$2Kpse+k|IY%1n N&Q~vV{wDnI^#dprW@Z2Y literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/desert_bg.png b/graphics/pokemon_storage/desert_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..535fe9cb0105806bd5a4803324e86157383cc7cb GIT binary patch literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^7CPNQ+#wz7El!&Ea?uaPSX6K&LjvFTIuQH7$Pw>G{BLMMUmri;Aa-I z#CP6@nhhS>$;X}2*rm3jL3gXkhAGuwV^b!y&y@AOJhftihsvkj6P@q#czipuD(vaL z8IxB``pvbtMsdcj8&;YsCvwk!6=PJf@7d_=_)BNeqXn8eQ5)B*Tc<7G zopXKprl@TSxppO$zl^C`^l|H>c@HgC&Yf((c*n%xja!9x|1|hF{n06@zx)2XURYM7 cy_oL<{}Rm!CwB!)?Fae8)78&qol`;+0F<}sj3cabwnn*)Tn!;!U8KlfL7ep^hYs{$ z_+g<9#_K-NT$PX^2_ZIVrzCi(;x$9TD~e#GwZ?~1DoK)C`iTlh;DJ0WJ%;@TZNZu}K513jxNL4Ta!qWDOFoAt$Cxv4D~>Z6Nh~97Rzy z7(@{Z9=nAhmNzWnRD1q9Eds_QSSZz{I>hu?f#cIE0dhW6CnR{*+A6A|IfIn*ifT@>r>Yyh7{^9(0iQP%Q;(s4^nJbs$bP?N_z!6c&6}_Lz&ObZavApl7sKT#4>rTJiO~q)dqrUU z;PfivH?Ai>`c$*7E6MPZ096?dq_gw-$w{YeNN{L0m fR@{_ERI*uFmrPy1=%9aPKp>~%n=`c0t5*WCPI`LaS|j+ zktTzq*g%#Xc?uLMQKmwb8g&{pY0>_8qC=M+eFl~xBgRaaGGorddP}W5u+~N=opsUG bwYQFU(_IfeUHk3*_rCx9{r`5_d*GlKQ;u&6 literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/forest_bg.png b/graphics/pokemon_storage/forest_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..c8118280754fe94f5396defe877b78514e26606a GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!VDx^^%AmxltF+`i0l9V|DXL|bN2s~Ezhdw zoK0%p;*~YWFsNAqD1Y|qnl)RxfeZ*((j8Qtq{%J(aTSms;_2cTA~Ch~>_Nc;3LGwh zRZV;o_@@1fHe4rTAgn&`$>Pr`d-`hFS96NSe3#kTyz5uhM l$^0ryblTONg;4aSzKls($AvLAUH(4EK2KLamvv4FO#qgGNzniR literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/forest_frame.png b/graphics/pokemon_storage/forest_frame.png new file mode 100644 index 0000000000000000000000000000000000000000..c205e8944f7b419dadd4cf4305db5dedc00b26ea GIT binary patch literal 839 zcmV-N1GxN&P)x2-@NqivSKrj)( z(#Mel8v*&+_&b1)3WRX}j4=j5#>r%Qz@-8g6exo)3Z=k%-{?%|8#^elB!J}eB`9wI zT{w!L&*z7%ivYJq>4u{Mu(rt%u=WrDH=m660AYWzbhsdl89!M}rwa_Bj{(s*t8hX2 zJFBaF10CSXSPX!aGiL8{d9omjSrjTn4@5`usBNwuu zN{qq+oT31&H-+jHqy;F+QhFKPsSX`rA<>_Mq&S=__1fTOB?2! z$7C|T=nc09sbUj=#=w;#1sUeRtRld-YeD`NvyWPjNc8b+7TjmE8MQ(hb7`AP64GRK zMgUlKNo?BI7)9wn`ar$Fn0#?(l*g1&Jw*UW)zo!WH1!6*7`nz)aB&|{qNE(kCO6IrF}R}%PQ6QnCcA8P zP_RY?1b7l}gb1hzP+ek2a=zt{;R}w(2MMH7>u>~2JjOQz;K#!+lCK2#woitGb{9jx zqys$N#s4P(f<59YPeQBqKc;V3kTs>rFn%Dd13YKZVwuMI(x1Zscpc9(i)9)KxZMJL zkATxQly?+h|5>{Q=(GGMoRM*Wms^0Lq}SsC$=fZ!z1T(q`ttn?xUysX{{o>3qAtZp R+KK=G002ovPDHLkV1n|ZfYSf~ literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/machine.bin b/graphics/pokemon_storage/machine.bin new file mode 100644 index 0000000000000000000000000000000000000000..123dc02e04a4cf83554a9f7e2788c5ed9cd3be9a GIT binary patch literal 720 zcmd_mM-D}iIdH89e7jr6=pK5fKJY8qMANT9tzq-8rN_S=3 TR?GL!O)ZU|*587GDA13rhsfIz{P(&2_r|Y42~tnRD;007>LgYK-P00030|Nn!7luA-+`roi?0003# zNklm=6c#MitfdGO*bqgL1!x$zA>y2I`GvCkhSQMaEMxZtma}iCnyZFY3(|a;L_NGS zpgyzOaJj|z=zgg`G-y2em0;lmr%9V0?thZR{{c+%ev8K;g~|W`002ovPDHLkV1k{=#d!b# literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/plain.bin b/graphics/pokemon_storage/plain.bin new file mode 100644 index 0000000000000000000000000000000000000000..1813620a4fa47b13221e7e093ad77073117e9b87 GIT binary patch literal 720 zcmZQzU|cN8HADzNVI5utJ_UXvpnw7Zf-yc- literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/plain_bg.png b/graphics/pokemon_storage/plain_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..79218ca9df2029d6f3ce35fff61722befb3cfb64 GIT binary patch literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^3P8-k!VDy{RzH{nqznRlLR`On`}XeLyJydy-Me@1 z|NsAI&z{|~WlMK=H&7l8R5y1AMI{wVu6zoVQ1*0j4B?oWEa1ZAOiU678>FVdQ&MBb@08C3Ss{jB1 literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/plain_frame.png b/graphics/pokemon_storage/plain_frame.png new file mode 100644 index 0000000000000000000000000000000000000000..e3eea87289f6536d044488bfd86141e103ceceba GIT binary patch literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^5lA5K7t)t)YnAsQ2pUfRfe$UuNKz~A8rlZe}t zmjc2ExOyIl#w>jELM>DwBt%BKVCSFi$ITtH?jP}=_U6a!bG7Xg?mb%i;#f@N!{b+S z(u@{8*~GH++xr)%`hz|_<@j=Cru2c}drex4<3+w2YcC2)l3VPuYyCvtZy&qnIu(b# z>7NulqoJ{eciX`S0=#l!XIQ7U-dpE*GeAh-SYSb`;ObP9o>O;XCQo_!Y}S&r&$EJl ZH!?1W{?e#0nQ=bIKc23BF6*2UngHyHe?R~L literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/pokecenter.bin b/graphics/pokemon_storage/pokecenter.bin new file mode 100644 index 0000000000000000000000000000000000000000..c7b6405e1fbf66b8da63355de606fa26c89d32f8 GIT binary patch literal 720 zcmeH^*A9YE5Ja(e9edYN7X(GI(Ek6+giB&Vkc1C#&(rRlr&&$Yv?EFpWmHg2QB(Ii zB1KIDO|;NP2i+7s^f3Uw-Vh^^it&2RG23z{JZq?ui2iAz>^mWc}Y?sA`_Dm=+jyV2G2xvp!- zjkcTIsOauTxfS)Jc(|8*97o93GJA2euKviHtU398%0;mEX|dTN<5@5f8Ig0=0VHC# z#Nrhha$x}2j6OMHfWkYSRICD2lkfKn*w$6%p>AY7);eKtTF(pIs00000NkvXXu0mjfjOU>F literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/pokecenter_frame.png b/graphics/pokemon_storage/pokecenter_frame.png new file mode 100644 index 0000000000000000000000000000000000000000..3a32c4e6412cbef6f5a033af39c828c0a1d93233 GIT binary patch literal 406 zcmeAS@N?(olHy`uVBq!ia0vp^0YI$4!VDzKWgo=@DT4r?5ZC`e@a-FrhYY@Lne(kV z>;K**|EE;ntB$&Q_3YlgYnBuzRa;sfoGY%(z`&^J>Eak-(Yy4rVcsDJ0oDLN0h75$ zy*gP=@d~InXg}e27kt#n)n$7Vw}M~8ot>MFrhBd`dBQg1?#!=gXZyre{+Zmcsr|5_ z$8F^tqrZF;M0Z`N(S0^s!6$16;;1ubzRU!vhoaAe0XH^p8SwHK{g-O;g+;Ui41QPD-SSM;yZki`z z^ylMmacRfJ**UdG+@d;LAItRswM~#y^SQF)u$t5Imoa%$7JfJ#@k2!JK}hm@25Aks zThkNTOB#4{j?Q^InX6+A2lj81Ab4dbarH#a>Xjdb;|#taD0e0sz>etAhXl literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/river.bin b/graphics/pokemon_storage/river.bin new file mode 100644 index 0000000000000000000000000000000000000000..ca4d56f8aab26d18158ecef2fd108205ef33b014 GIT binary patch literal 720 zcmdUrw-UlY5XDT+AaaH!8#qj`P3Hf93m*kTb(oUXj4I75*0Lb+V8GImmYlv3=u|*nJ{I>oCP+^SGSUN2$XE(q3-IY z%yxp#SDtc}*}6N1KzAqmY+r1%b$1QHKXfNK%SFuo<$tbt;)~gO?Yi03c!j?*IRb=H{I4_PziA?(XjY|Npd^2t&COOHMl6VA3VK_;O>Q=|`j1iHIIZHj#0Wj5#OYs%8|YVcM;cJnE4U%TBFeT0=!p(hx`y&({g%&3WlNv0Gi^w=#l zPEhI&H0h6}=z_{<;E8<_W;Bfj$_p!?NvN7GDE+|?cze`={7wvq00000NkvXXu0mjf D!{=~k literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/river_frame.png b/graphics/pokemon_storage/river_frame.png new file mode 100644 index 0000000000000000000000000000000000000000..f6a87236b553626e60298566b67686841b667ce9 GIT binary patch literal 733 zcmV<30wVp1P)-hs6JPkSn_B0)^Je za(0s=1;1F3Yk@dU64As7E)Vf_#R6+Ew?YidCQh(3EinrLqI*Il?)wKEfAj*(wV|4~ zoth|$S_Gs>o&hO3LOjRp4H>*Zp+=-K(i5S_3Fe5~V!t-;`JU+hC_&T-zGJ~>%rKLw zs|E@1DvIh6;CMOaVpr;xX5s{pf|z5b@wFEyEMkC)|LK9^QxOJ9O}(t;a59;!he?Cb zQ`E`{E>LBfT95nCm2sTL6%Qns)rIxqcA~JJCd4v+l;DfCfM!tWqOTSJSy#!lD0&Kl zZ6J{cn$U<#9Bl+f_oTMg#x$6$XLM|2Q2IdDYZ}51QtN5H6&Rx}AF@mdSv*)Sa7mwMu&>7i%P<9+9tT}Ja{r#xpPo}f%C4!F2xEt^ir5&eBMus zX{BuumzG|D{eo~1NXph2%9S$en#!h9DWez4l#~{y#%}-%ZZ$WTTJTT=oMow$CIw$| zxXNxRH-a0ROD*^z4sRyRH@^A%ZO5HeLqI9ChqKFXF7krA4Z+#b0yl5Z(}v)$prXe_ z9p6T<`SDZ+4jU+yC)zZ@T6fC7LiXeb;%=t=Li zUSGk~EWuU+_Eo3F<0PxK7OZ(hf=a>HB(WO9%~N8X9-0WJ6grRNTQAC_B_CVaOBMsc z*l0=RK@ULL;h+Q!TB5M9jM!X~)>sN|g8@IqqX!(=0ipQhH)JnfPAD0rLBrW!Na_Rp j#e(i*+t8KZtO5N1J+Nz~Q(@8N00000NkvXXu0mjf`n97% literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/savanna_frame.png b/graphics/pokemon_storage/savanna_frame.png new file mode 100644 index 0000000000000000000000000000000000000000..b66494d79cabe0f34c64348ef6adfac2cd66680a GIT binary patch literal 609 zcmV-n0-pVeP);pit>5xDu3r_$o91>7K zLvKxNo$7texL_{EZz1qck|_l*xWC)IEOq^RrAN zz~}Mcd66!LK zyY6k9-h*u2O@)kV5{=eq{VxT#S(cw_gWet3gt-P5Dc22%{}2W|?Iv05^%5@}xB_As zt-NZ0m9Va!9qxH?;DrORN+|@dH56#7S=u!|748jE5QeORHem-qDH(D!)B}g53PS8c zg@xDwo6mWlDz&aoj{p|{=YmQDv_Y|f8t-WzM~PLHVz|W=-2A|KuvDQXH(TH%JYe2dCEODg`T1kn{?|wQe7iru>8Lz{NN?I4p{^aRk0O*baP*ix08W zB_%z~7=0UhAi7#^IO&CwEjaIi(_=xiF00=j_$dw8cbafEdI!=*ZGHMLo+2Y_`$S+& vimdIEgIo3pO$6q)pLD(e-cJr@`d{EH#!J2v`Kb3i00000NkvXXu0mjf+m#!P literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/scrolling_bg.bin b/graphics/pokemon_storage/scrolling_bg.bin new file mode 100644 index 0000000000000000000000000000000000000000..25b6cf240dd3403207d792d5a37a45774c79bb71 GIT binary patch literal 2048 zcmZQDU^HMdU^ZYNlV&ksHDEJfHz1d$#BPwADX|;mW^(-v(?_nqVfse>Pk!1PjsMZ~ QKbrr^FMCJJztQp^07N;?0RR91 literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/scrolling_bg.png b/graphics/pokemon_storage/scrolling_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..8be861a2670f9b9107292efd1963f4ef1ef94d86 GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et0wfrw&pzJ*r1Cvo9780gmYzQ;c));z*G(^QIV{(z!=$wy1~+YjN}J)fM@1D%bmkv*7H1XMS}wl zX>!CdC!BIdi#8qIopXUA_UQtbT+!p28~O~m<&GiujCkO2$BhxqgeRUcyzt5!?@amN zQ}@2*zGPM*b6Ln*A{$o+%4L*$X58B3#-ja5&&9r$&m<=DHTy09->uK+KP*??DVOM% qDd*}szQ5e(>N>v2sL9@=yi;E+zY-hwOu0}t5*qgm2!P6_Y|+f>W|*qpy#=T@%hSa%L}F?(2P>1f zLc>L#6-?_EDl~HJU=T2FaVse~z~a!ba4~bcLrRLusskYk4xt;1R9#xRMJnFkdnB|q zOElzw=gHLX@9yd?Ts^IcWsYymlqn$&ObTxu7?YEom>hH+j2+sXSOpkXGcbsz#WFDP SC;kK4%HZkh=d#Wzp$PyX8BbUM literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/seafloor_frame.png b/graphics/pokemon_storage/seafloor_frame.png new file mode 100644 index 0000000000000000000000000000000000000000..49414555891e3551081cf2b01a9ecd52c6171286 GIT binary patch literal 573 zcmV-D0>b@?P)6z&%foM{Rw~6g~zIo$G+}Z3HeLNU?PSOhoKEe@z&kWd2(NmWJMyk=Mszen2Nd#D98|rkB**U-5HF_i8@Ed>+GI<>e0oHFp08YfE0=<3= zCc!pui>EIxmC+Z;a{#>3J#miXZnVA-P!iyB5+Gcr{GQ+J9q8fLIej?orlUz53>HVy z2%t73YSRS3)m_wv+B5<1Mu2<%OveLcoA^I(6ksmfGzBnN`$xbxdU>ZO-C%NY00000 LNkvXXu0mjfVuJ4u literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/sky.bin b/graphics/pokemon_storage/sky.bin new file mode 100644 index 0000000000000000000000000000000000000000..1091d2a62bc81b1a978749c64eb09af7d50f419e GIT binary patch literal 720 zcmb8nMG^u*5Cze}9TI5V8h3ZO|GA)MG1!8lGvY5QUbN#l&I})Z0tCMb5hlWexGzeK zI0=%ZywYTVEIIO?GZZLNqD+MHj2dU z6^UCb5_eG~Zl~xUw=@gp=DADeEO=k}@5Gst`B>v#ycKsdS99fUaW5|`ZpH6Lc5Ek# GruGg|sbQ7? literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/sky_bg.png b/graphics/pokemon_storage/sky_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..f561cef5390569d85bf591d6e49d3810332f3987 GIT binary patch literal 273 zcmV+s0q*{ZP)Kp>yydhatEu^eJ?%@G1CDa4ERo!wWlHz$x~(u*DfAtZ~Bh#0p2; z5sw=M)#f{>&IlVEa6<}D>~Y2PMBE*Z(`-i2rqyw1H3gA62Rsmeyo4oUka{7b35vV{ X)j86gR|K!k00000NkvXXu0mjfW$AZ& literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/sky_frame.png b/graphics/pokemon_storage/sky_frame.png new file mode 100644 index 0000000000000000000000000000000000000000..83c1e9a0b4a9428ddd1a740f4e9e86c852387af9 GIT binary patch literal 616 zcmV-u0+;=XP)y{SL0005= zNklcIl2 z6d6TCll8z~3rH}A?MO5i!U6Q0e&#L#L2<|=8G!V_e0Y_P?swBb8mC<*9H6DmFmx@1 zK%bDx`*f-T|LA5k(%(o}qx+?{bjW(5e#XsIFn34bbUSug37q?XDy5qXjh z$SYzXC=hKgZ3DUSJi)K03~bf_GGDy;c*bsC9oIf9o0m7YJ18Tw+g_G+%9vi(?IC!& zV0H28ga^?3?K*HY2ZjGt?)Y#2jPY-$wcg~*X-Zav?KK`BNI_kQad)3g*+_U;_ f<|g`bTg1MBUgTx}e(T50oVUx~8)~XG$Gz7t)FpTY literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/snow_bg.png b/graphics/pokemon_storage/snow_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..5e81e49805a1f44b4d33d5d81526875990a06566 GIT binary patch literal 310 zcmV-60m=S}P)z8=&=hjc0002N zNklha$>F~(bZ?o|nUvl+y_5?ZscBot>tC^mx_GNBX; zOIpQ%dFMmA0hKz7VF$X9x%Tw>bki8GRh$?9!yF9pCk};C_kVQqxBq!D1u*?eG7P9R zSPWayh0KThOuzP44X9LE3|rAv-`f{Vze33dRLU%dt?1Is13U7cUmcwSiU0rr07*qo IM6N<$f=v>Hy8r+H literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/snow_frame.png b/graphics/pokemon_storage/snow_frame.png new file mode 100644 index 0000000000000000000000000000000000000000..529fff66ef07ae1553c9aea635701d6f89ca246a GIT binary patch literal 705 zcmV;y0zUnTP)z8=3D1Gh0006^ zNklp@a`&BW_6*rLR0yAt^;&3 znoganzCqpN9Z9nV5(9Ql5_J^szWYfD)Y;i{*l@HxoC?@6V0)~6_kg-CYiHa}@VbrN zk{{I5IDQ+WrXM_@r16r*rgfdbrZIt1CJggYlR5xmjL$2Y!da6x72YVW zY;t3^oB!(Um3!e$c-lmjv*H~A*2ZLxz}flAjaEsePyE zieg%_c^ixr=2#1ziVSmSyV~O>XTMyRvP&q;t-MIUY;r-EEC=Fr-*1Wv@K| zGUxzJC;%&a+uKXZ=Vl(9*5F(_o)eSspeQr2BBLE65T z7l>miPq(WFnU_VSjYjBCabq=O;L#Ev7 z2sb~MsQ2a<@z>G&32!LF?gaaTfQwTA56`lxr~A7u-?uxuyDfwK;{YT75u$%S3{NMW zCqIb@s0@jC(hWWeVgz2*aeAN+;B+9iPGHQ}ClXx#`c(Q~%e%vOaA!D%00000NkvXXu0mjfqJ~8& literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/volcano.bin b/graphics/pokemon_storage/volcano.bin new file mode 100644 index 0000000000000000000000000000000000000000..0dbaf03a3a5eb540af59e0f20b19a1d604473626 GIT binary patch literal 720 zcma)(2~)x_5QXcBx6k|5Cq|9;fd?%@L7;$&!2kafUlX z_hL@_wOD3lBw8XO(|*42=<(OclOBEbPSWo?Jn4j7mmfx5@x_kf0x>Xs==yw7jr^om zz8=#FCz*00042 zNklb>!3`Kdkj6Im#>HsDp?M2Z8q)57DkQ({`0;0S0^UG;HcqmW;Hl992 ziu#l&q9f#=V2D3Ldq7^HZIpmO%{m~ZG@#a@Krli@0>Sp7qKMV1k`lmF1to@JUc?dr zOaFK}LRa`z62ULIfv=sXo1!-{oT()ON;FMXcd}?yYXAtiXcqKUdG`Uhd#b4p zSGi}`=f1`+wAKij(FJQ&{3K`OLz1S9#?5TZPhR0iaRDY!@expgRl+Skg5Gr~Zlzl$ zzM^Av*FE&1(N(5U@u9f$`k2m8bk8w69EQEur|Z)k-X^)4tq=y0r|DF`Ytgvgoh z&+Fdqfcw&y^XDSHrhYpf0WEjCTo&#@D?P)z8=>hkWO0007V zNkl&P7 z@VG$yM8Fpn0q6jTxjqH>J71OnY(J8cuMcGcoSV3eI7gal+5D-V3aLI8W%)P&zWNqW zX2a6?uL}c_-ejBszb@v0*E%`&b6|Hk*OMGUsSn9jWycn5DglC&Hg&D7b)nP#Fa?lx zt=br)4y@6&R?b^voT|;67JxOam37`3WsG$-CX}(>yh^B$HdwU5P&;eAx6bMV_bvnQ z+2}CropT1;Xvf~hKFo(jL}O!>4@N8=YyTbrcV@F*47xaMQ`P%U@A7SHX^SQT@JLzz zF!>$;Kel_#+WL(EvI*ca0LX^NIVrmjyH9x&`>=oU{vT->u)~w`Hm%IHe-Lv(AEJ2P zrrQCoI)I-E@S^>>uF!VS-KGQRZqsLWJHWjTV5_@L(_$qcp0%_Cxbc3|)%zSylZSkL Zz#olaEAfsg7drp|002ovPDHLkV1k#wR^9*r literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/waveform.png b/graphics/pokemon_storage/waveform.png new file mode 100644 index 0000000000000000000000000000000000000000..12eeef86bf2ba557a79bfc5786e5eb658c1fcb6a GIT binary patch literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoR!VDzYlu|i?ltF+`h%1nuGG$FrP}Kkb|Ihya zAGP;g)RMD7%}au^s)2$)*?afCEm^V!sHV6WB(j!)OBg6R!_&nvL}F@hz;3?73Orw$ z9v;?8cp_}G;2e+Gs~L(x^}BCactwSBskg{C?cU6|PD5<&=3OUdZf%Y>>6Tc#&gXWA zqMJ{pinVaaTZM-G>VFRI{+?dn+ak~W@>Znd2Q@9Th+Gw8wXoaYQvb<3mw&eG&c>BW zvo~Gi^2q0(Ve&AnJdoScJ-_b6m%_$(70UZhR0LGcQ2V@+)#?WOie6$@ -$(monbackdir)/castform_back_pic.4bpp: $(monbackdir)/castform_normal_form_back_pic.4bpp \ - $(monbackdir)/castform_sunny_form_back_pic.4bpp \ - $(monbackdir)/castform_rainy_form_back_pic.4bpp \ - $(monbackdir)/castform_snowy_form_back_pic.4bpp +$(MONBACKGFXDIR)/castform_back_pic.4bpp: $(MONBACKGFXDIR)/castform_normal_form_back_pic.4bpp \ + $(MONBACKGFXDIR)/castform_sunny_form_back_pic.4bpp \ + $(MONBACKGFXDIR)/castform_rainy_form_back_pic.4bpp \ + $(MONBACKGFXDIR)/castform_snowy_form_back_pic.4bpp @cat $^ >$@ -$(monfrontdir)/castform_front_pic.4bpp: $(monfrontdir)/castform_normal_form_front_pic.4bpp \ - $(monfrontdir)/castform_sunny_form_front_pic.4bpp \ - $(monfrontdir)/castform_rainy_form_front_pic.4bpp \ - $(monfrontdir)/castform_snowy_form_front_pic.4bpp +$(MONFRONTGFXDIR)/castform_front_pic.4bpp: $(MONFRONTGFXDIR)/castform_normal_form_front_pic.4bpp \ + $(MONFRONTGFXDIR)/castform_sunny_form_front_pic.4bpp \ + $(MONFRONTGFXDIR)/castform_rainy_form_front_pic.4bpp \ + $(MONFRONTGFXDIR)/castform_snowy_form_front_pic.4bpp @cat $^ >$@ -$(monpaldir)/castform_palette.gbapal: $(monpaldir)/castform_normal_form_palette.gbapal \ - $(monpaldir)/castform_sunny_form_palette.gbapal \ - $(monpaldir)/castform_rainy_form_palette.gbapal \ - $(monpaldir)/castform_snowy_form_palette.gbapal +$(MONPALDIR)/castform_palette.gbapal: $(MONPALDIR)/castform_normal_form_palette.gbapal \ + $(MONPALDIR)/castform_sunny_form_palette.gbapal \ + $(MONPALDIR)/castform_rainy_form_palette.gbapal \ + $(MONPALDIR)/castform_snowy_form_palette.gbapal @cat $^ >$@ -$(monpaldir)/castform_shiny_palette.gbapal: $(monpaldir)/castform_normal_form_shiny_palette.gbapal \ - $(monpaldir)/castform_sunny_form_shiny_palette.gbapal \ - $(monpaldir)/castform_rainy_form_shiny_palette.gbapal \ - $(monpaldir)/castform_snowy_form_shiny_palette.gbapal +$(MONPALDIR)/castform_shiny_palette.gbapal: $(MONPALDIR)/castform_normal_form_shiny_palette.gbapal \ + $(MONPALDIR)/castform_sunny_form_shiny_palette.gbapal \ + $(MONPALDIR)/castform_rainy_form_shiny_palette.gbapal \ + $(MONPALDIR)/castform_snowy_form_shiny_palette.gbapal @cat $^ >$@ -$(tilesetdir)/secondary/petalburg/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/petalburg/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 159 -$(tilesetdir)/secondary/rustboro/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/rustboro/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 498 -$(tilesetdir)/secondary/dewford/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/dewford/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 503 -$(tilesetdir)/secondary/slateport/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/slateport/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 504 -$(tilesetdir)/secondary/mauville/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/mauville/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 503 -$(tilesetdir)/secondary/lavaridge/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/lavaridge/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 450 -$(tilesetdir)/secondary/fortree/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/fortree/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 493 -$(tilesetdir)/secondary/pacifidlog/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/pacifidlog/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 504 -$(tilesetdir)/secondary/sootopolis/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/sootopolis/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 328 -$(tilesetdir)/secondary/battle_frontier_outside_west/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/battle_frontier_outside_west/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 508 -$(tilesetdir)/secondary/battle_frontier_outside_east/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/battle_frontier_outside_east/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 508 -$(tilesetdir)/primary/building/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/primary/building/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 502 -$(tilesetdir)/secondary/shop/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/shop/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 502 -$(tilesetdir)/secondary/pokemon_center/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/pokemon_center/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 478 -$(tilesetdir)/secondary/cave/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/cave/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 425 -$(tilesetdir)/secondary/pokemon_school/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/pokemon_school/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 278 -$(tilesetdir)/secondary/pokemon_fan_club/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/pokemon_fan_club/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 319 -$(tilesetdir)/secondary/unused_1/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/unused_1/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 17 -$(tilesetdir)/secondary/meteor_falls/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/meteor_falls/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 460 -$(tilesetdir)/secondary/oceanic_museum/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/oceanic_museum/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 319 -$(tilesetdir)/secondary/cable_club/unknown_tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/cable_club/unknown_tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 120 -$(tilesetdir)/secondary/seashore_house/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/seashore_house/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 312 -$(tilesetdir)/secondary/pretty_petal_flower_shop/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/pretty_petal_flower_shop/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 345 -$(tilesetdir)/secondary/pokemon_day_care/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/pokemon_day_care/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 355 -$(tilesetdir)/secondary/secret_base/brown_cave/unused_tiles.4bpp: $(tilesetdir)/secondary/secret_base/brown_cave/tiles.png +$(TILESETGFXDIR)/secondary/secret_base/brown_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/brown_cave/tiles.png $(GFX) $< $@ -num_tiles 82 -$(tilesetdir)/secondary/secret_base/tree/unused_tiles.4bpp: $(tilesetdir)/secondary/secret_base/tree/tiles.png +$(TILESETGFXDIR)/secondary/secret_base/tree/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/tree/tiles.png $(GFX) $< $@ -num_tiles 82 -$(tilesetdir)/secondary/secret_base/shrub/unused_tiles.4bpp: $(tilesetdir)/secondary/secret_base/shrub/tiles.png +$(TILESETGFXDIR)/secondary/secret_base/shrub/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/shrub/tiles.png $(GFX) $< $@ -num_tiles 82 -$(tilesetdir)/secondary/secret_base/blue_cave/unused_tiles.4bpp: $(tilesetdir)/secondary/secret_base/blue_cave/tiles.png +$(TILESETGFXDIR)/secondary/secret_base/blue_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/blue_cave/tiles.png $(GFX) $< $@ -num_tiles 82 -$(tilesetdir)/secondary/secret_base/yellow_cave/unused_tiles.4bpp: $(tilesetdir)/secondary/secret_base/yellow_cave/tiles.png +$(TILESETGFXDIR)/secondary/secret_base/yellow_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/yellow_cave/tiles.png $(GFX) $< $@ -num_tiles 82 -$(tilesetdir)/secondary/secret_base/red_cave/unused_tiles.4bpp: $(tilesetdir)/secondary/secret_base/red_cave/tiles.png +$(TILESETGFXDIR)/secondary/secret_base/red_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/red_cave/tiles.png $(GFX) $< $@ -num_tiles 82 -$(tilesetdir)/secondary/secret_base/brown_cave/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/secret_base/brown_cave/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(tilesetdir)/secondary/secret_base/tree/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/secret_base/tree/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(tilesetdir)/secondary/secret_base/shrub/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/secret_base/shrub/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(tilesetdir)/secondary/secret_base/blue_cave/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/secret_base/blue_cave/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(tilesetdir)/secondary/secret_base/yellow_cave/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/secret_base/yellow_cave/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(tilesetdir)/secondary/secret_base/red_cave/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/secret_base/red_cave/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(tilesetdir)/secondary/inside_of_truck/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/inside_of_truck/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 62 -$(tilesetdir)/secondary/contest/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/contest/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 430 -$(tilesetdir)/secondary/lilycove_museum/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/lilycove_museum/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 431 -$(tilesetdir)/secondary/lab/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/lab/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 500 -$(tilesetdir)/secondary/underwater/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/underwater/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 500 -$(tilesetdir)/secondary/generic_building/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/generic_building/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 509 -$(tilesetdir)/secondary/mauville_game_corner/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/mauville_game_corner/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 469 -$(tilesetdir)/secondary/unused_2/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/unused_2/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 150 -$(tilesetdir)/secondary/rustboro_gym/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/rustboro_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 60 -$(tilesetdir)/secondary/dewford_gym/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/dewford_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 61 -$(tilesetdir)/secondary/lavaridge_gym/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/lavaridge_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 54 -$(tilesetdir)/secondary/petalburg_gym/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/petalburg_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 148 -$(tilesetdir)/secondary/fortree_gym/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/fortree_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 61 -$(tilesetdir)/secondary/mossdeep_gym/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/mossdeep_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 82 -$(tilesetdir)/secondary/sootopolis_gym/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/sootopolis_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 484 -$(tilesetdir)/secondary/trick_house_puzzle/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/trick_house_puzzle/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 294 -$(tilesetdir)/secondary/inside_ship/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/inside_ship/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 342 -$(tilesetdir)/secondary/elite_four/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/elite_four/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 505 -$(tilesetdir)/secondary/battle_frontier/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/battle_frontier/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 310 -$(tilesetdir)/secondary/battle_factory/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/battle_factory/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 424 -$(tilesetdir)/secondary/battle_pike/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/battle_pike/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 382 -$(tilesetdir)/secondary/mirage_tower/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/mirage_tower/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 420 -$(tilesetdir)/secondary/mossdeep_game_corner/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/mossdeep_game_corner/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 95 -$(tilesetdir)/secondary/island_harbor/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/island_harbor/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 503 -$(tilesetdir)/secondary/trainer_hill/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/trainer_hill/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 374 -$(tilesetdir)/secondary/navel_rock/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/navel_rock/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 420 -$(tilesetdir)/secondary/battle_frontier_ranking_hall/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/battle_frontier_ranking_hall/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 136 -$(tilesetdir)/secondary/mystery_events_house/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/mystery_events_house/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 509 -$(fontdir)/font0.latfont: $(fontdir)/font0_latin.png +$(FONTGFXDIR)/font0.latfont: $(FONTGFXDIR)/font0_latin.png $(GFX) $< $@ -$(fontdir)/font1.latfont: $(fontdir)/font1_latin.png +$(FONTGFXDIR)/font1.latfont: $(FONTGFXDIR)/font1_latin.png $(GFX) $< $@ -$(fontdir)/font2.latfont: $(fontdir)/font2_latin.png +$(FONTGFXDIR)/font2.latfont: $(FONTGFXDIR)/font2_latin.png $(GFX) $< $@ -$(fontdir)/font7.latfont: $(fontdir)/font7_latin.png +$(FONTGFXDIR)/font7.latfont: $(FONTGFXDIR)/font7_latin.png $(GFX) $< $@ -$(fontdir)/font8.latfont: $(fontdir)/font8_latin.png +$(FONTGFXDIR)/font8.latfont: $(FONTGFXDIR)/font8_latin.png $(GFX) $< $@ -$(fontdir)/font0.hwjpnfont: $(fontdir)/font0_japanese.png +$(FONTGFXDIR)/font0.hwjpnfont: $(FONTGFXDIR)/font0_japanese.png $(GFX) $< $@ -$(fontdir)/font1.hwjpnfont: $(fontdir)/font1_japanese.png +$(FONTGFXDIR)/font1.hwjpnfont: $(FONTGFXDIR)/font1_japanese.png $(GFX) $< $@ -$(fontdir)/font9.hwjpnfont: $(fontdir)/font9_japanese.png +$(FONTGFXDIR)/font9.hwjpnfont: $(FONTGFXDIR)/font9_japanese.png $(GFX) $< $@ -$(fontdir)/font2.fwjpnfont: $(fontdir)/font2_japanese.png +$(FONTGFXDIR)/font2.fwjpnfont: $(FONTGFXDIR)/font2_japanese.png $(GFX) $< $@ -$(fontdir)/font6.fwjpnfont: $(fontdir)/font6_braille.png +$(FONTGFXDIR)/font6.fwjpnfont: $(FONTGFXDIR)/font6_braille.png $(GFX) $< $@ -$(fontdir)/unused_frlg_male.fwjpnfont: $(fontdir)/unused_japanese_frlg_male_font.png +$(FONTGFXDIR)/unused_frlg_male.fwjpnfont: $(FONTGFXDIR)/unused_japanese_frlg_male_font.png $(GFX) $< $@ -$(fontdir)/unused_frlg_female.fwjpnfont: $(fontdir)/unused_japanese_frlg_female_font.png +$(FONTGFXDIR)/unused_frlg_female.fwjpnfont: $(FONTGFXDIR)/unused_japanese_frlg_female_font.png $(GFX) $< $@ -$(fontdir)/down_arrow.4bpp: %.4bpp: %.png +$(FONTGFXDIR)/down_arrow.4bpp: %.4bpp: %.png $(GFX) $< $@ -$(fontdir)/down_arrow_rs.4bpp: %.4bpp: %.png +$(FONTGFXDIR)/down_arrow_rs.4bpp: %.4bpp: %.png $(GFX) $< $@ -$(fontdir)/unused_frlg_blanked_down_arrow.4bpp: %.4bpp: %.png +$(FONTGFXDIR)/unused_frlg_blanked_down_arrow.4bpp: %.4bpp: %.png $(GFX) $< $@ -$(fontdir)/unused_frlg_down_arrow.4bpp: %.4bpp: %.png +$(FONTGFXDIR)/unused_frlg_down_arrow.4bpp: %.4bpp: %.png $(GFX) $< $@ -$(fontdir)/keypad_icons.4bpp: %.4bpp: %.png +$(FONTGFXDIR)/keypad_icons.4bpp: %.4bpp: %.png $(GFX) $< $@ graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal @@ -308,179 +309,281 @@ graphics/pokenav/region_map.8bpp: %.8bpp: %.png graphics/misc/japanese_hof.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 29 -$(menudir)/menu.gbapal: $(menudir)/menu_0.gbapal \ - $(menudir)/menu_1.gbapal +$(MENUGFXDIR)/menu.gbapal: $(MENUGFXDIR)/menu_0.gbapal \ + $(MENUGFXDIR)/menu_1.gbapal @cat $^ >$@ -$(btanimgfxdir)/010.4bpp: $(btanimgfxdir)/010_0.4bpp \ - $(btanimgfxdir)/010_1.4bpp \ - $(btanimgfxdir)/010_2.4bpp \ - $(btanimgfxdir)/010_3.4bpp +$(BTLANMSPRGFXDIR)/010.4bpp: $(BTLANMSPRGFXDIR)/010_0.4bpp \ + $(BTLANMSPRGFXDIR)/010_1.4bpp \ + $(BTLANMSPRGFXDIR)/010_2.4bpp \ + $(BTLANMSPRGFXDIR)/010_3.4bpp @cat $^ >$@ -$(unusedgfxdir)/obi_palpak1.gbapal: $(unusedgfxdir)/old_pal1.gbapal \ - $(unusedgfxdir)/old_pal2.gbapal \ - $(unusedgfxdir)/old_pal3.gbapal +$(UNUSEDGFXDIR)/obi_palpak1.gbapal: $(UNUSEDGFXDIR)/old_pal1.gbapal \ + $(UNUSEDGFXDIR)/old_pal2.gbapal \ + $(UNUSEDGFXDIR)/old_pal3.gbapal @cat $^ >$@ -$(unusedgfxdir)/obi_palpak3.gbapal: $(unusedgfxdir)/old_pal5.gbapal \ - $(unusedgfxdir)/old_pal6.gbapal \ - $(unusedgfxdir)/old_pal7.gbapal +$(UNUSEDGFXDIR)/obi_palpak3.gbapal: $(UNUSEDGFXDIR)/old_pal5.gbapal \ + $(UNUSEDGFXDIR)/old_pal6.gbapal \ + $(UNUSEDGFXDIR)/old_pal7.gbapal @cat $^ >$@ -$(unusedgfxdir)/obi1.4bpp: $(unusedgfxdir)/old_bulbasaur.4bpp \ - $(unusedgfxdir)/old_charizard.4bpp +$(UNUSEDGFXDIR)/obi1.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur.4bpp \ + $(UNUSEDGFXDIR)/old_charizard.4bpp @cat $^ >$@ -$(unusedgfxdir)/obi2.4bpp: $(unusedgfxdir)/old_bulbasaur2.4bpp \ - $(unusedgfxdir)/old_battle_interface_1.4bpp \ - $(unusedgfxdir)/old_battle_interface_2.4bpp \ - $(unusedgfxdir)/old_battle_interface_3.4bpp +$(UNUSEDGFXDIR)/obi2.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur2.4bpp \ + $(UNUSEDGFXDIR)/old_battle_interface_1.4bpp \ + $(UNUSEDGFXDIR)/old_battle_interface_2.4bpp \ + $(UNUSEDGFXDIR)/old_battle_interface_3.4bpp @cat $^ >$@ -$(menudir)/hp_numbers.4bpp: $(menudir)/hpbar_anim.4bpp \ - $(menudir)/numbers1.4bpp \ - $(menudir)/numbers2.4bpp +$(MENUGFXDIR)/hp_numbers.4bpp: $(MENUGFXDIR)/hpbar_anim.4bpp \ + $(MENUGFXDIR)/numbers1.4bpp \ + $(MENUGFXDIR)/numbers2.4bpp @cat $^ >$@ -$(unusedgfxdir)/redyellowgreen_frame.bin: $(unusedgfxdir)/red_frame.bin \ - $(unusedgfxdir)/yellow_frame.bin \ - $(unusedgfxdir)/green_frame.bin \ - $(unusedgfxdir)/blank_frame.bin +$(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin \ + $(UNUSEDGFXDIR)/yellow_frame.bin \ + $(UNUSEDGFXDIR)/green_frame.bin \ + $(UNUSEDGFXDIR)/blank_frame.bin @cat $^ >$@ -$(unusedgfxdir)/color_frames.4bpp: %.4bpp: %.png +$(UNUSEDGFXDIR)/color_frames.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 353 -$(btintgfxdir)/unused_window2bar.4bpp: %.4bpp: %.png +$(BATINTGFXDIR)/unused_window2bar.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 5 -$(unusedgfxdir)/old_contest.4bpp: $(unusedgfxdir)/old_contest_frame_1.4bpp \ - $(unusedgfxdir)/old_contest_floor.4bpp \ - $(unusedgfxdir)/old_contest_frame_2.4bpp \ - $(unusedgfxdir)/old_contest_symbols.4bpp \ - $(unusedgfxdir)/old_contest_meter.4bpp \ - $(unusedgfxdir)/old_contest_classes.4bpp \ - $(unusedgfxdir)/old_contest_numbers.4bpp +$(UNUSEDGFXDIR)/old_contest.4bpp: $(UNUSEDGFXDIR)/old_contest_frame_1.4bpp \ + $(UNUSEDGFXDIR)/old_contest_floor.4bpp \ + $(UNUSEDGFXDIR)/old_contest_frame_2.4bpp \ + $(UNUSEDGFXDIR)/old_contest_symbols.4bpp \ + $(UNUSEDGFXDIR)/old_contest_meter.4bpp \ + $(UNUSEDGFXDIR)/old_contest_classes.4bpp \ + $(UNUSEDGFXDIR)/old_contest_numbers.4bpp @cat $^ >$@ -$(unusedgfxdir)/old_contest_2.4bpp: $(unusedgfxdir)/old_contest_2_1.4bpp \ - $(unusedgfxdir)/old_contest_2_2.4bpp +$(UNUSEDGFXDIR)/old_contest_2.4bpp: $(UNUSEDGFXDIR)/old_contest_2_1.4bpp \ + $(UNUSEDGFXDIR)/old_contest_2_2.4bpp @cat $^ >$@ -$(unknowngfxdir)/unknown_C19470.4bpp: %.4bpp: %.png +$(UNKNOWNGFXDIR)/unknown_C19470.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 36 -$(btanimgfxdir)/141.4bpp: $(btanimgfxdir)/141_0.4bpp \ - $(btanimgfxdir)/141_1.4bpp \ - $(btanimgfxdir)/141_2.4bpp \ - $(btanimgfxdir)/141_3.4bpp \ - $(btanimgfxdir)/141_4.4bpp +$(BTLANMSPRGFXDIR)/141.4bpp: $(BTLANMSPRGFXDIR)/141_0.4bpp \ + $(BTLANMSPRGFXDIR)/141_1.4bpp \ + $(BTLANMSPRGFXDIR)/141_2.4bpp \ + $(BTLANMSPRGFXDIR)/141_3.4bpp \ + $(BTLANMSPRGFXDIR)/141_4.4bpp @cat $^ >$@ -$(btanimgfxdir)/074.4bpp: $(btanimgfxdir)/074_0.4bpp \ - $(btanimgfxdir)/074_1.4bpp +$(BTLANMSPRGFXDIR)/074.4bpp: $(BTLANMSPRGFXDIR)/074_0.4bpp \ + $(BTLANMSPRGFXDIR)/074_1.4bpp @cat $^ >$@ -$(btanimgfxdir)/159.4bpp: $(btanimgfxdir)/159_0.4bpp \ - $(btanimgfxdir)/159_1.4bpp +$(BTLANMSPRGFXDIR)/159.4bpp: $(BTLANMSPRGFXDIR)/159_0.4bpp \ + $(BTLANMSPRGFXDIR)/159_1.4bpp @cat $^ >$@ -$(btanimgfxdir)/001.4bpp: $(btanimgfxdir)/001_0.4bpp \ - $(btanimgfxdir)/001_1.4bpp +$(BTLANMSPRGFXDIR)/001.4bpp: $(BTLANMSPRGFXDIR)/001_0.4bpp \ + $(BTLANMSPRGFXDIR)/001_1.4bpp @cat $^ >$@ -$(masksgfxdir)/unknown_C2EA50.4bpp: %.4bpp: %.png +$(MASKSGFXDIR)/unknown_C2EA50.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 14 -$(bttransgfxdir)/vs_frame.4bpp: %.4bpp: %.png +$(BATTRANSGFXDIR)/vs_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 16 -$(menudir)/party_menu_misc.4bpp: %.4bpp: %.png +$(MENUGFXDIR)/party_menu_misc.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 62 -$(typesdir)/move_types.4bpp: $(types:%=$(typesdir)/%.4bpp) $(contest_types:%=$(typesdir)/contest_%.4bpp) +$(TYPESGFXDIR)/move_types.4bpp: $(types:%=$(TYPESGFXDIR)/%.4bpp) $(contest_types:%=$(TYPESGFXDIR)/contest_%.4bpp) @cat $^ >$@ -$(typesdir)/move_types.gbapal: $(typesdir)/move_types_1.gbapal \ - $(typesdir)/move_types_2.gbapal \ - $(typesdir)/move_types_3.gbapal +$(TYPESGFXDIR)/move_types.gbapal: $(TYPESGFXDIR)/move_types_1.gbapal \ + $(TYPESGFXDIR)/move_types_2.gbapal \ + $(TYPESGFXDIR)/move_types_3.gbapal @cat $^ >$@ -$(menudir)/bag_screen.4bpp: %.4bpp: %.png +$(MENUGFXDIR)/bag_screen.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 53 -$(rayquazadir)/rayquaza.8bpp: %.8bpp: %.png +$(RAYQUAZAGFXDIR)/rayquaza.8bpp: %.8bpp: %.png $(GFX) $< $@ -num_tiles 227 -$(rayquazadir)/overcast.4bpp: %.4bpp: %.png +$(RAYQUAZAGFXDIR)/overcast.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 313 -$(rayquazadir)/rayquaza_fly1.4bpp: %.4bpp: %.png +$(RAYQUAZAGFXDIR)/rayquaza_fly1.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 124 -$(rayquazadir)/rayquaza_tail_fix.4bpp: $(rayquazadir)/rayquaza_tail.4bpp +$(RAYQUAZAGFXDIR)/rayquaza_tail_fix.4bpp: $(RAYQUAZAGFXDIR)/rayquaza_tail.4bpp cp $< $@ head -c 12 /dev/zero >> $@ -$(rayquazadir)/chase_streaks.4bpp: %.4bpp: %.png +$(RAYQUAZAGFXDIR)/chase_streaks.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 19 -$(rayquazadir)/rayquaza_chase.4bpp: %.4bpp: %.png +$(RAYQUAZAGFXDIR)/rayquaza_chase.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 155 graphics/picture_frame/frame5.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 86 -$(roulettegfxdir)/roulette_tilt.4bpp: $(roulettegfxdir)/shroomish.4bpp \ - $(roulettegfxdir)/tailow.4bpp +$(ROULETTEGFXDIR)/roulette_tilt.4bpp: $(ROULETTEGFXDIR)/shroomish.4bpp \ + $(ROULETTEGFXDIR)/tailow.4bpp @cat $^ >$@ -$(roulettegfxdir)/poke_icons2.4bpp: $(roulettegfxdir)/wynaut.4bpp \ - $(roulettegfxdir)/azurill.4bpp \ - $(roulettegfxdir)/skitty.4bpp \ - $(roulettegfxdir)/makuhita.4bpp +$(ROULETTEGFXDIR)/poke_icons2.4bpp: $(ROULETTEGFXDIR)/wynaut.4bpp \ + $(ROULETTEGFXDIR)/azurill.4bpp \ + $(ROULETTEGFXDIR)/skitty.4bpp \ + $(ROULETTEGFXDIR)/makuhita.4bpp @cat $^ >$@ -$(bttransgfxdir)/85BBC14.4bpp: %.4bpp: %.png +$(BATTRANSGFXDIR)/85BBC14.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 53 -$(bttransgfxdir)/rayquaza.4bpp: %.4bpp: %.png +$(BATTRANSGFXDIR)/rayquaza.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 938 -$(bttransgfxdir)/frontier_square_1.4bpp: $(bttransgfxdir)/frontier_squares_blanktiles.4bpp \ - $(bttransgfxdir)/frontier_squares_1.4bpp +$(BATTRANSGFXDIR)/frontier_square_1.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ + $(BATTRANSGFXDIR)/frontier_squares_1.4bpp @cat $^ >$@ -$(bttransgfxdir)/frontier_square_2.4bpp: $(bttransgfxdir)/frontier_squares_blanktiles.4bpp \ - $(bttransgfxdir)/frontier_squares_2.4bpp +$(BATTRANSGFXDIR)/frontier_square_2.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ + $(BATTRANSGFXDIR)/frontier_squares_2.4bpp @cat $^ >$@ -$(bttransgfxdir)/frontier_square_3.4bpp: $(bttransgfxdir)/frontier_squares_blanktiles.4bpp \ - $(bttransgfxdir)/frontier_squares_3.4bpp +$(BATTRANSGFXDIR)/frontier_square_3.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ + $(BATTRANSGFXDIR)/frontier_squares_3.4bpp @cat $^ >$@ -$(bttransgfxdir)/frontier_square_4.4bpp: $(bttransgfxdir)/frontier_squares_blanktiles.4bpp \ - $(bttransgfxdir)/frontier_squares_4.4bpp +$(BATTRANSGFXDIR)/frontier_square_4.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ + $(BATTRANSGFXDIR)/frontier_squares_4.4bpp @cat $^ >$@ -$(pknvoptionsdir)/options.4bpp: $(pknvoptionsdir)/hoenn_map.4bpp \ - $(pknvoptionsdir)/condition.4bpp \ - $(pknvoptionsdir)/match_call.4bpp \ - $(pknvoptionsdir)/ribbons.4bpp \ - $(pknvoptionsdir)/switch_off.4bpp \ - $(pknvoptionsdir)/party.4bpp \ - $(pknvoptionsdir)/search.4bpp \ - $(pknvoptionsdir)/cool.4bpp \ - $(pknvoptionsdir)/beauty.4bpp \ - $(pknvoptionsdir)/cute.4bpp \ - $(pknvoptionsdir)/smart.4bpp \ - $(pknvoptionsdir)/tough.4bpp \ - $(pknvoptionsdir)/cancel.4bpp +$(PKNAVOPTIONSGFXDIR)/options.4bpp: $(PKNAVOPTIONSGFXDIR)/hoenn_map.4bpp \ + $(PKNAVOPTIONSGFXDIR)/condition.4bpp \ + $(PKNAVOPTIONSGFXDIR)/match_call.4bpp \ + $(PKNAVOPTIONSGFXDIR)/ribbons.4bpp \ + $(PKNAVOPTIONSGFXDIR)/switch_off.4bpp \ + $(PKNAVOPTIONSGFXDIR)/party.4bpp \ + $(PKNAVOPTIONSGFXDIR)/search.4bpp \ + $(PKNAVOPTIONSGFXDIR)/cool.4bpp \ + $(PKNAVOPTIONSGFXDIR)/beauty.4bpp \ + $(PKNAVOPTIONSGFXDIR)/cute.4bpp \ + $(PKNAVOPTIONSGFXDIR)/smart.4bpp \ + $(PKNAVOPTIONSGFXDIR)/tough.4bpp \ + $(PKNAVOPTIONSGFXDIR)/cancel.4bpp @cat $^ >$@ -$(pknvdir)/header.4bpp: %.4bpp: %.png +$(PKNAVGFXDIR)/header.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 53 -$(unusedgfxdir)/intro_birch_beauty.4bpp: %.4bpp: %.png +$(UNUSEDGFXDIR)/intro_birch_beauty.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 374 + +$(PSSGFXDIR)/forest_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 55 + +$(PSSGFXDIR)/forest.4bpp: $(PSSGFXDIR)/forest_frame.4bpp $(PSSGFXDIR)/forest_bg.4bpp + @cat $(PSSGFXDIR)/forest_frame.4bpp $(PSSGFXDIR)/forest_bg.4bpp >$@ + +$(PSSGFXDIR)/city_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 52 + +$(PSSGFXDIR)/city.4bpp: $(PSSGFXDIR)/city_frame.4bpp $(PSSGFXDIR)/city_bg.4bpp + @cat $(PSSGFXDIR)/city_frame.4bpp $(PSSGFXDIR)/city_bg.4bpp >$@ + +$(PSSGFXDIR)/desert.4bpp: $(PSSGFXDIR)/desert_frame.4bpp $(PSSGFXDIR)/desert_bg.4bpp + @cat $(PSSGFXDIR)/desert_frame.4bpp $(PSSGFXDIR)/desert_bg.4bpp >$@ + +$(PSSGFXDIR)/savanna_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 45 + +$(PSSGFXDIR)/savanna_bg.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 23 + +$(PSSGFXDIR)/savanna.4bpp: $(PSSGFXDIR)/savanna_frame.4bpp $(PSSGFXDIR)/savanna_bg.4bpp + @cat $(PSSGFXDIR)/savanna_frame.4bpp $(PSSGFXDIR)/savanna_bg.4bpp >$@ + +$(PSSGFXDIR)/crag_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 49 + +$(PSSGFXDIR)/crag.4bpp: $(PSSGFXDIR)/crag_frame.4bpp $(PSSGFXDIR)/crag_bg.4bpp + @cat $(PSSGFXDIR)/crag_frame.4bpp $(PSSGFXDIR)/crag_bg.4bpp >$@ + +$(PSSGFXDIR)/volcano_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 56 + +$(PSSGFXDIR)/volcano.4bpp: $(PSSGFXDIR)/volcano_frame.4bpp $(PSSGFXDIR)/volcano_bg.4bpp + @cat $(PSSGFXDIR)/volcano_frame.4bpp $(PSSGFXDIR)/volcano_bg.4bpp >$@ + +$(PSSGFXDIR)/snow_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 57 + +$(PSSGFXDIR)/snow.4bpp: $(PSSGFXDIR)/snow_frame.4bpp $(PSSGFXDIR)/snow_bg.4bpp + @cat $(PSSGFXDIR)/snow_frame.4bpp $(PSSGFXDIR)/snow_bg.4bpp >$@ + +$(PSSGFXDIR)/cave_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 55 + +$(PSSGFXDIR)/cave.4bpp: $(PSSGFXDIR)/cave_frame.4bpp $(PSSGFXDIR)/cave_bg.4bpp + @cat $(PSSGFXDIR)/cave_frame.4bpp $(PSSGFXDIR)/cave_bg.4bpp >$@ + +$(PSSGFXDIR)/beach_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 46 + +$(PSSGFXDIR)/beach_bg.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 23 + +$(PSSGFXDIR)/beach.4bpp: $(PSSGFXDIR)/beach_frame.4bpp $(PSSGFXDIR)/beach_bg.4bpp + @cat $(PSSGFXDIR)/beach_frame.4bpp $(PSSGFXDIR)/beach_bg.4bpp >$@ + +$(PSSGFXDIR)/seafloor_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 54 + +$(PSSGFXDIR)/seafloor.4bpp: $(PSSGFXDIR)/seafloor_frame.4bpp $(PSSGFXDIR)/seafloor_bg.4bpp + @cat $(PSSGFXDIR)/seafloor_frame.4bpp $(PSSGFXDIR)/seafloor_bg.4bpp >$@ + +$(PSSGFXDIR)/river_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 51 + +$(PSSGFXDIR)/river_bg.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 11 + +$(PSSGFXDIR)/river.4bpp: $(PSSGFXDIR)/river_frame.4bpp $(PSSGFXDIR)/river_bg.4bpp + @cat $(PSSGFXDIR)/river_frame.4bpp $(PSSGFXDIR)/river_bg.4bpp >$@ + +$(PSSGFXDIR)/sky_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 45 + +$(PSSGFXDIR)/sky.4bpp: $(PSSGFXDIR)/sky_frame.4bpp $(PSSGFXDIR)/sky_bg.4bpp + @cat $(PSSGFXDIR)/sky_frame.4bpp $(PSSGFXDIR)/sky_bg.4bpp >$@ + +$(PSSGFXDIR)/bubbles_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 54 + +$(PSSGFXDIR)/bubbles.4bpp: $(PSSGFXDIR)/bubbles_frame.4bpp $(PSSGFXDIR)/bubbles_bg.4bpp + @cat $(PSSGFXDIR)/bubbles_frame.4bpp $(PSSGFXDIR)/bubbles_bg.4bpp >$@ + +$(PSSGFXDIR)/pokecenter_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 35 + +$(PSSGFXDIR)/pokecenter.4bpp: $(PSSGFXDIR)/pokecenter_frame.4bpp $(PSSGFXDIR)/pokecenter_bg.4bpp + @cat $(PSSGFXDIR)/pokecenter_frame.4bpp $(PSSGFXDIR)/pokecenter_bg.4bpp >$@ + +$(PSSGFXDIR)/machine_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 33 + +$(PSSGFXDIR)/machine.4bpp: $(PSSGFXDIR)/machine_frame.4bpp $(PSSGFXDIR)/machine_bg.4bpp + @cat $(PSSGFXDIR)/machine_frame.4bpp $(PSSGFXDIR)/machine_bg.4bpp >$@ + +$(PSSGFXDIR)/plain_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 18 + +$(PSSGFXDIR)/plain.4bpp: $(PSSGFXDIR)/plain_frame.4bpp $(PSSGFXDIR)/plain_bg.4bpp + @cat $(PSSGFXDIR)/plain_frame.4bpp $(PSSGFXDIR)/plain_bg.4bpp >$@ From c9a3ef7a6e145e28ed705bab5ccc6e2f0f065b57 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Wed, 17 Jan 2018 23:01:33 -0500 Subject: [PATCH 34/64] dump pokenav.s --- asm/pokenav.s | 4 +- data/pokenav.s | 1980 +++++++++++++++++---------------- data/pokenav/unk_struct_1.bin | Bin 0 -> 3816 bytes data/pokenav/unk_struct_2.bin | Bin 0 -> 3816 bytes data/pokenav/unk_struct_3.bin | Bin 0 -> 3816 bytes data/pokenav/unk_struct_4.bin | Bin 0 -> 3816 bytes data/unknown_jp_62609C.bin | Bin 0 -> 1912 bytes graphics/pokenav/86231E8.pal | 19 + graphics/pokenav/8623208.pal | 19 + graphics/pokenav/8623338.pal | 19 + graphics/pokenav/8623570.pal | 19 + graphics/pokenav/8623790.pal | 19 + graphics/pokenav/8624098.pal | 19 + graphics/pokenav/862A5D4.pal | 19 + 14 files changed, 1129 insertions(+), 988 deletions(-) create mode 100644 data/pokenav/unk_struct_1.bin create mode 100644 data/pokenav/unk_struct_2.bin create mode 100644 data/pokenav/unk_struct_3.bin create mode 100644 data/pokenav/unk_struct_4.bin create mode 100644 data/unknown_jp_62609C.bin create mode 100755 graphics/pokenav/86231E8.pal create mode 100755 graphics/pokenav/8623208.pal create mode 100755 graphics/pokenav/8623338.pal create mode 100755 graphics/pokenav/8623570.pal create mode 100755 graphics/pokenav/8623790.pal create mode 100755 graphics/pokenav/8624098.pal create mode 100755 graphics/pokenav/862A5D4.pal diff --git a/asm/pokenav.s b/asm/pokenav.s index 40b6e74ab2..32d053222f 100755 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -26754,7 +26754,7 @@ _081D4368: b _081D449E _081D4394: movs r3, 0 - ldr r1, =gUnknown_0862608E + ldr r1, =gUnknown_0862608C + 2 adds r0, r7, r1 movs r2, 0x16 ldrsh r1, [r4, r2] @@ -26887,7 +26887,7 @@ _081D449E: mov r3, r10 adds r4, r0, r3 ldr r6, =gUnknown_0862608C - ldr r1, =gUnknown_0862608E + ldr r1, =gUnknown_0862608C + 2 adds r0, r7, r1 movs r3, 0x16 ldrsh r1, [r4, r3] diff --git a/data/pokenav.s b/data/pokenav.s index 9507e7daed..3a8be11a3e 100644 --- a/data/pokenav.s +++ b/data/pokenav.s @@ -126,7 +126,7 @@ gUnknown_0861FA04:: @ 861FA04 .byte 0x0 gUnknown_0861FA08:: @ 861FA08 - window_template 0, 1, 0x16, 0x10, 0x2, 0x0, 0x36 + window_template 0, 1, 0x16, 0x10, 0x2, 0x0, 0x36 window_template_terminator gUnknown_0861FA18:: @ 861FA18 @@ -219,7 +219,7 @@ gUnknown_0861FB44:: @ 861FB44 gUnknown_0861FB5C:: @ 861FB5C .incbin "graphics/pokenav/arrows_matchcall.gbapal" - + gUnknown_0861FB7C:: @ 861FB7C .incbin "graphics/pokenav/arrows_matchcall.4bpp.lz" @@ -241,42 +241,42 @@ gUnknown_0861FBF4:: @ 861FBF4 gUnknown_0861FBF7:: @ 861FBF7 .byte 0x2 - .byte 0x4 - .byte 0x6 - .byte 0x7 - .byte 0x0 + .byte 0x4 + .byte 0x6 + .byte 0x7 + .byte 0x0 gUnknown_0861FBFC:: @ 861FBFC .4byte gUnknown_0861FB7C - .2byte 0xC0 - .2byte 0xA + .2byte 0xC0 + .2byte 0xA gUnknown_0861FC04:: @ 861FC04 .4byte gUnknown_0861FB5C - .4byte 0x14 - .4byte 0x0 - .4byte 0x0 - + .4byte 0x14 + .4byte 0x0 + .4byte 0x0 + gUnknown_0861FC14:: @ 861FC14 - .4byte 0x8000 - .4byte 0x800 + .4byte 0x8000 + .4byte 0x800 gUnknown_0861FC1C:: @ 861FC1C spr_template 10, 20, gUnknown_0861FC14, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81C9080 - + gUnknown_0861FC34:: @ 861FC34 - .4byte 0x4000 - .4byte 0x800 + .4byte 0x4000 + .4byte 0x800 gUnknown_0861FC3C:: @ 861FC3C spr_template 10, 20, gUnknown_0861FC34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_0861FC54:: @ 861FC54 .byte 2 - .byte 3 - .byte 4 - .byte 2 - .byte 5 + .byte 3 + .byte 4 + .byte 2 + .byte 5 gUnknown_0861FC59:: @ 861FC59 .byte 0, 1, 4, 4, 4, 4, 0, 1, 2, 4, 4, 4, 0, 1, 2, 3, 4, 4, 5, 6, 7, 4, 4, 4, 8, 9, 10, 11, 12, 13, 0 @@ -300,120 +300,120 @@ gUnknown_0861FFF4:: @ 861FFF4 .incbin "graphics/pokenav/outline_map.bin.lz" gUnknown_08620104:: @ 8620104 - .incbin "graphics/pokenav/blue_light.gbapal" - + .incbin "graphics/pokenav/blue_light.gbapal" + gUnknown_08620124:: @ 8620124 - .incbin "graphics/pokenav/blue_light.4bpp.lz" + .incbin "graphics/pokenav/blue_light.4bpp.lz" gUnknown_08620194:: @ 8620194 .byte 0xF5, 0x10, 0, 0, 0x7A, 0x21, 0, 0, 0xFF, 0x31, 0, 0 gUnknown_086201A0:: @ 86201A0 .4byte NULL - .4byte sub_81C9C6C - .4byte sub_81C9CA8 - .4byte sub_81C9D44 - .4byte sub_81C9DD8 - .4byte sub_81C9E58 - .4byte sub_81C9EC8 - .4byte sub_81C9EF8 - .4byte sub_81C9F28 + .4byte sub_81C9C6C + .4byte sub_81C9CA8 + .4byte sub_81C9D44 + .4byte sub_81C9DD8 + .4byte sub_81C9E58 + .4byte sub_81C9EC8 + .4byte sub_81C9EF8 + .4byte sub_81C9F28 gUnknown_086201C4:: @ 86201C4 .4byte gPokenavOptions_Gfx - .byte 0, 0x34, 3, 0 - .4byte gUnknown_08620124 - .byte 0, 1, 1, 0 + .byte 0, 0x34, 3, 0 + .4byte gUnknown_08620124 + .byte 0, 1, 1, 0 gUnknown_086201D4:: @ 86201D4 - .4byte gPokenavOptions_Pal + 0x0, 4 - .4byte gPokenavOptions_Pal + 0x20, 5 - .4byte gPokenavOptions_Pal + 0x40, 6 - .4byte gPokenavOptions_Pal + 0x60, 7 - .4byte gPokenavOptions_Pal + 0x80, 8 - .4byte gUnknown_08620104, 3 - .4byte 0, 0 - + .4byte gPokenavOptions_Pal + 0x0, 4 + .4byte gPokenavOptions_Pal + 0x20, 5 + .4byte gPokenavOptions_Pal + 0x40, 6 + .4byte gPokenavOptions_Pal + 0x60, 7 + .4byte gPokenavOptions_Pal + 0x80, 8 + .4byte gUnknown_08620104, 3 + .4byte 0, 0 + gUnknown_0862020C:: @ 862020C .2byte 0, 0 gUnknown_08620210:: @ 8620210 .2byte 0x20, 1 - + gUnknown_08620214:: @ 8620214 - .2byte 0x40, 4 - + .2byte 0x40, 4 + gUnknown_08620218:: @ 8620218 - .2byte 0x60, 2 + .2byte 0x60, 2 gUnknown_0862021C:: @ 862021C - .2byte 0x80, 3 - + .2byte 0x80, 3 + gUnknown_08620220:: @ 8620220 - .2byte 0xA0, 1 + .2byte 0xA0, 1 gUnknown_08620224:: @ 8620224 - .2byte 0xC0, 1 + .2byte 0xC0, 1 gUnknown_08620228:: @ 8620228 - .2byte 0xE0, 4 + .2byte 0xE0, 4 gUnknown_0862022C:: @ 862022C - .2byte 0x100, 1 + .2byte 0x100, 1 gUnknown_08620230:: @ 8620230 - .2byte 0x120, 2 + .2byte 0x120, 2 gUnknown_08620234:: @ 8620234 - .2byte 0x140, 0 + .2byte 0x140, 0 gUnknown_08620238:: @ 8620238 - .2byte 0x160, 0 + .2byte 0x160, 0 gUnknown_0862023C:: @ 862023C - .2byte 0x180, 3 + .2byte 0x180, 3 gUnknown_08620240:: @ 8620240 .2byte 0x2A, 0x14 gUnknown_08620244:: @ 8620244 - .4byte gUnknown_0862020C - .4byte gUnknown_08620210 - .4byte gUnknown_0862021C - .4byte NULL - .4byte NULL - .4byte NULL - .2byte 0x2A, 0x14 - .4byte gUnknown_0862020C - .4byte gUnknown_08620210 - .4byte gUnknown_08620214 - .4byte gUnknown_0862021C - .4byte NULL - .4byte NULL - .2byte 0x2A, 0x14 - .4byte gUnknown_0862020C - .4byte gUnknown_08620210 - .4byte gUnknown_08620214 - .4byte gUnknown_08620218 - .4byte gUnknown_0862021C - .4byte NULL - .2byte 0x38, 0x14 - .4byte gUnknown_08620220 - .4byte gUnknown_08620224 - .4byte gUnknown_0862023C - .4byte NULL - .4byte NULL - .4byte NULL - .2byte 0x28, 0x10 - .4byte gUnknown_08620228 - .4byte gUnknown_0862022C - .4byte gUnknown_08620230 - .4byte gUnknown_08620234 - .4byte gUnknown_08620238 - .4byte gUnknown_0862023C + .4byte gUnknown_0862020C + .4byte gUnknown_08620210 + .4byte gUnknown_0862021C + .4byte NULL + .4byte NULL + .4byte NULL + .2byte 0x2A, 0x14 + .4byte gUnknown_0862020C + .4byte gUnknown_08620210 + .4byte gUnknown_08620214 + .4byte gUnknown_0862021C + .4byte NULL + .4byte NULL + .2byte 0x2A, 0x14 + .4byte gUnknown_0862020C + .4byte gUnknown_08620210 + .4byte gUnknown_08620214 + .4byte gUnknown_08620218 + .4byte gUnknown_0862021C + .4byte NULL + .2byte 0x38, 0x14 + .4byte gUnknown_08620220 + .4byte gUnknown_08620224 + .4byte gUnknown_0862023C + .4byte NULL + .4byte NULL + .4byte NULL + .2byte 0x28, 0x10 + .4byte gUnknown_08620228 + .4byte gUnknown_0862022C + .4byte gUnknown_08620230 + .4byte gUnknown_08620234 + .4byte gUnknown_08620238 + .4byte gUnknown_0862023C gUnknown_086202CC:: @ 86202CC - window_template 1, 3, 17, 0x18, 2, 1, 8 + window_template 1, 3, 17, 0x18, 2, 1, 8 gUnknown_086202D4:: @ 86202D4 .4byte gUnknown_085EBCC5 @@ -436,36 +436,39 @@ gUnknown_0862030C:: @ 862030C gUnknown_0862030F:: @ 862030F .byte 6, 8, 7, 0, 0 - + gUnknown_08620314:: @ 8620314 .byte 0, 0x40, 0, 0x80, 0, 8, 0, 0 - + gUnknown_0862031C:: @ 862031C - .byte 0, 1, 0, 1, 0, 0, 0, 0, 0xFF, 0x7F, 0, 0, 0, 0, 0, 0 - + obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 + obj_rot_scal_anim_end + gUnknown_0862032C:: @ 862032C - .byte 0, 1, 0, 1, 0, 0, 0, 0, 0x10, 0, 0x10, 0, 0, 0x12, 0, 0, 0xFF, 0x7F, 0, 0, 0, 0, 0, 0 + obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 + obj_rot_scal_anim_frame 0x10, 0x10, 0, 0x12 + obj_rot_scal_anim_end gUnknown_08620344:: @ 8620344 - .4byte gUnknown_0862031C - .4byte gUnknown_0862032C + .4byte gUnknown_0862031C + .4byte gUnknown_0862032C gUnknown_0862034C:: @ 862034C - spr_template 3, 4, gUnknown_08620314, gDummySpriteAnimTable, NULL, gUnknown_08620344, SpriteCallbackDummy - + spr_template 3, 4, gUnknown_08620314, gDummySpriteAnimTable, NULL, gUnknown_08620344, SpriteCallbackDummy + gUnknown_08620364:: @ 8620364 .2byte 0x4000 - .2byte 0x8000 - .2byte 0x800 - .2byte 0 + .2byte 0x8000 + .2byte 0x800 + .2byte 0 gUnknown_0862036C:: @ 862036C spr_template 1, 3, gUnknown_08620364, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_08620384:: @ 8620384 .4byte 0x4000040 - .4byte 0xa2600001 - .byte 1, 0, 0, 0 + .4byte 0xa2600001 + .byte 1, 0, 0, 0 gUnknown_08620390:: @ 8620390 .string "Becalm fighting emotions.$" @@ -1503,7 +1506,7 @@ gUnknown_086225D4:: @ 86225D4 gUnknown_08622698:: @ 8622698 .incbin "graphics/pokenav/arrow2.gbapal" - + gUnknown_086226B8:: @ 86226B8 .incbin "graphics/pokenav/arrow2.4bpp.lz" @@ -1521,7 +1524,7 @@ gUnknown_08622760:: @ 8622760 gUnknown_0862278C:: @ 862278C .4byte 0x11FD - .4byte 0x20206A + .4byte 0x20206A gUnknown_08622794:: @ 8622794 .4byte 0x3077 @@ -1545,10 +1548,10 @@ gUnknown_08622798:: @ 8622798 .4byte sub_81CBB74 gUnknown_086227D8:: @ 86227D8 - window_template 2, 0, 5, 11, 2, 2, 16 + window_template 2, 0, 5, 11, 2, 2, 16 gUnknown_086227E0:: @ 86227E0 - window_template 2, 0, 9, 11, 8, 2, 0x26 + window_template 2, 0, 9, 11, 8, 2, 0x26 gUnknown_086227E8:: @ 86227E8 .4byte gUnknown_085EC017 @@ -1556,12 +1559,12 @@ gUnknown_086227E8:: @ 86227E8 .4byte gUnknown_085EC022 gUnknown_086227F4:: @ 86227F4 - .string "·{PAUSE 0x04}·{PAUSE 0x04}·{PAUSE 0x04}·{PAUSE 0x04}·\p" - .string "$" - .align 2 + .string "·{PAUSE 0x04}·{PAUSE 0x04}·{PAUSE 0x04}·{PAUSE 0x04}·\p" + .string "$" + .align 2 gUnknown_08622808:: @ 8622808 - window_template 1, 1, 12, 0x1C, 4, 1, 10 + window_template 1, 1, 12, 0x1C, 4, 1, 10 gUnknown_08622810:: @ 8622810 obj_tiles gUnknown_086226B8, 0x40, 7 @@ -1662,8 +1665,8 @@ gUnknown_0862307C:: @ 862307C gUnknown_086230D8:: @ 86230D8 .4byte 0x11F5 - .4byte 0x206A - .4byte 0x3402 + .4byte 0x206A + .4byte 0x3402 gUnknown_086230E4:: @ 86230E4 .4byte NULL @@ -1681,12 +1684,12 @@ gUnknown_08623100:: @ 8623100 gUnknown_08623110:: @ 8623110 .byte 1 - .byte 17 - .byte 4 - .byte 12 - .byte 13 - .byte 1 - .2byte 0x4C + .byte 17 + .byte 4 + .byte 12 + .byte 13 + .byte 1 + .2byte 0x4C gUnknown_08623118:: @ 8623118 .4byte 0, gUnknown_08622E6C @@ -1722,10 +1725,10 @@ gUnknown_086231D0:: @ 86231D0 spr_template 6, 11, gUnknown_086231C8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81CCEF4 gUnknown_086231E8:: @ 86231E8 - .incbin "baserom.gba", 0x6231e8, 0x20 + .incbin "graphics/pokenav/86231E8.gbapal" gUnknown_08623208:: @ 8623208 - .incbin "baserom.gba", 0x623208, 0x20 + .incbin "graphics/pokenav/8623208.gbapal" gUnknown_08623228:: @ 8623228 .incbin "graphics/pokenav/8623228.4bpp.lz" @@ -1734,24 +1737,24 @@ gUnknown_0862323C:: @ 862323C .incbin "graphics/pokenav/862323C.bin.lz" gUnknown_08623338:: @ 8623338 - .incbin "baserom.gba", 0x623338, 0x20 + .incbin "graphics/pokenav/8623338.gbapal" gUnknown_08623358:: @ 8623358 .4byte 0x11F5 - .4byte 0x21DE - .4byte 0x31EB + .4byte 0x21DE + .4byte 0x31EB gUnknown_08623364:: @ 8623364 - window_template 1, 13, 1, 13, 4, 15, 2 + window_template 1, 13, 1, 13, 4, 15, 2 gUnknown_0862336C:: @ 862336C - window_template 1, 1, 6, 7, 2, 15, 0x36 + window_template 1, 1, 6, 7, 2, 15, 0x36 gUnknown_08623374:: @ 8623374 - window_template 1, 1, 0x1C, 5, 2, 15, 0x44 + window_template 1, 1, 0x1C, 5, 2, 15, 0x44 gUnknown_0862337C:: @ 862337C - window_template 1, 13, 0x1C, 3, 2, 15, 0x44 + window_template 1, 13, 0x1C, 3, 2, 15, 0x44 gUnknown_08623384:: @ 8623384 .4byte NULL @@ -1781,7 +1784,7 @@ gUnknown_086234AC:: @ 86234AC .incbin "graphics/pokenav/condition_search2.bin.lz" gUnknown_08623570:: @ 8623570 - .incbin "baserom.gba", 0x623570, 0x20 + .incbin "graphics/pokenav/8623570.gbapal" gUnknown_08623590:: @ 8623590 .4byte 0x2065 @@ -1799,19 +1802,19 @@ gUnknown_08623598:: @ 8623598 .4byte sub_81CF798 gUnknown_086235B4:: @ 86235B4 - window_template 1, 1, 6, 7, 2, 1, 20 + window_template 1, 1, 6, 7, 2, 1, 20 gUnknown_086235BC:: @ 86235BC .string "{COLOR_HIGHLIGHT_SHADOW}{LIGHT_RED}{WHITE}{GREEN}♂{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}$" - .align 2 + .align 2 gUnknown_086235C8:: @ 86235C8 .string "{COLOR_HIGHLIGHT_SHADOW}{LIGHT_GREEN}{WHITE}{BLUE}♀{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}$" - .align 2 + .align 2 gUnknown_086235D4:: @ 86235D4 .string "{0x77}$" - .align 2 + .align 2 gUnknown_086235D8:: @ 86235D8 .4byte sub_81CFB8C @@ -1828,7 +1831,7 @@ gUnknown_086236CC:: @ 86236CC .incbin "graphics/pokenav/ui_ribbons.bin.lz" gUnknown_08623790:: @ 8623790 - .incbin "baserom.gba", 0x623790, 0x20 + .incbin "graphics/pokenav/8623790.gbapal" gUnknown_086237B0:: @ 86237B0 .4byte 0x2065 @@ -1846,38 +1849,38 @@ gUnknown_086237B8:: @ 86237B8 .4byte sub_81D021C gUnknown_086237D4:: @ 86237D4 - window_template 1, 1, 6, 7, 2, 1, 20 + window_template 1, 1, 6, 7, 2, 1, 20 gUnknown_086237DC:: @ 86237DC .string "{COLOR_HIGHLIGHT_SHADOW}{LIGHT_RED}{WHITE}{GREEN}♂{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}$" - .align 2 + .align 2 gUnknown_086237E8:: @ 86237E8 .string "{COLOR_HIGHLIGHT_SHADOW}{LIGHT_GREEN}{WHITE}{BLUE}♀{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}$" - .align 2 + .align 2 gUnknown_086237F4:: @ 86237F4 .string "{0x77}$" - .align 2 + .align 2 gUnknown_086237F8:: @ 86237F8 .byte 1, 1, 0, 0 - .byte 3, 4, 1, 0 - .byte 3, 4, 5, 0 - .byte 3, 4, 9, 0 - .byte 3, 4, 13, 0 - .byte 3, 4, 17, 0 - .byte 1, 1, 21, 0 - .byte 1, 1, 22, 0 - .byte 1, 1, 23, 0 - .byte 1, 1, 24, 0 - .byte 1, 1, 25, 1 - .byte 1, 1, 26, 1 - .byte 1, 1, 27, 1 - .byte 1, 1, 28, 1 - .byte 1, 1, 29, 1 - .byte 1, 1, 30, 1 - .byte 1, 1, 31, 1 + .byte 3, 4, 1, 0 + .byte 3, 4, 5, 0 + .byte 3, 4, 9, 0 + .byte 3, 4, 13, 0 + .byte 3, 4, 17, 0 + .byte 1, 1, 21, 0 + .byte 1, 1, 22, 0 + .byte 1, 1, 23, 0 + .byte 1, 1, 24, 0 + .byte 1, 1, 25, 1 + .byte 1, 1, 26, 1 + .byte 1, 1, 27, 1 + .byte 1, 1, 28, 1 + .byte 1, 1, 29, 1 + .byte 1, 1, 30, 1 + .byte 1, 1, 31, 1 @ 862383C .include "data/text/ribbon_descriptions.inc" @@ -1901,7 +1904,7 @@ gUnknown_08624078:: @ 8624078 .incbin "graphics/pokenav/ribbons_icon5.gbapal" gUnknown_08624098:: @ 8624098 - .incbin "baserom.gba", 0x624098, 0x20 + .incbin "graphics/pokenav/8624098.gbapal" gUnknown_086240B8:: @ 86240B8 .incbin "graphics/pokenav/ribbons_icon.4bpp.lz" @@ -1911,7 +1914,7 @@ gUnknown_08624280:: @ 8624280 gUnknown_08624B98:: @ 8624B98 .4byte 0x107D - .4byte 0x2066 + .4byte 0x2066 gUnknown_08624BA0:: @ 8624BA0 .4byte NULL @@ -1922,48 +1925,48 @@ gUnknown_08624BA0:: @ 8624BA0 .4byte sub_81D0C54 gUnknown_08624BB8:: @ 8624BB8 - window_template 2, 12, 13, 16, 4, 1, 20 + window_template 2, 12, 13, 16, 4, 1, 20 gUnknown_08624BC0:: @ 8624BC0 .byte 4, 2, 3, 0 gUnknown_08624BC4:: @ 8624BC4 - window_template 2, 14, 1, 13, 2, 10, 0x54 + window_template 2, 14, 1, 13, 2, 10, 0x54 gUnknown_08624BCC:: @ 8624BCC .string "{COLOR_HIGHLIGHT_SHADOW}{LIGHT_RED}{WHITE}{GREEN}♂{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}$" - .align 2 + .align 2 gUnknown_08624BD8:: @ 8624BD8 .string "{COLOR_HIGHLIGHT_SHADOW}{LIGHT_GREEN}{WHITE}{BLUE}♀{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}$" - .align 2 + .align 2 gUnknown_08624BE4:: @ 8624BE4 .string "{0x77}$" - .align 2 + .align 2 gUnknown_08624BE8:: @ 8624BE8 - window_template 2, 1, 5, 7, 2, 1, 0x6E - .4byte NULL - .4byte NULL + window_template 2, 1, 5, 7, 2, 1, 0x6E + .4byte NULL + .4byte NULL gUnknown_08624BF8:: @ 8624BF8 .2byte 0, 0, 1, 0 - .2byte 2, 0, 3, 0 - .2byte 4, 0, 1, 1 - .2byte 2, 1, 3, 1 - .2byte 4, 1, 1, 2 - .2byte 2, 2, 3, 2 - .2byte 4, 2, 1, 3 - .2byte 2, 3, 3, 3 - .2byte 4, 3, 1, 4 - .2byte 2, 4, 3, 4 - .2byte 4, 4, 5, 0 - .2byte 6, 0, 7, 1 - .2byte 8, 2, 9, 1 - .2byte 9, 3, 9, 4 - .2byte 10, 3, 10, 4 - .2byte 11, 0, 11, 1 + .2byte 2, 0, 3, 0 + .2byte 4, 0, 1, 1 + .2byte 2, 1, 3, 1 + .2byte 4, 1, 1, 2 + .2byte 2, 2, 3, 2 + .2byte 4, 2, 1, 3 + .2byte 2, 3, 3, 3 + .2byte 4, 3, 1, 4 + .2byte 2, 4, 3, 4 + .2byte 4, 4, 5, 0 + .2byte 6, 0, 7, 1 + .2byte 8, 2, 9, 1 + .2byte 9, 3, 9, 4 + .2byte 10, 3, 10, 4 + .2byte 11, 0, 11, 1 gUnknown_08624C78:: @ 8624C78 obj_tiles gUnknown_08624280, 0x1800, 9 @@ -1978,709 +1981,709 @@ gUnknown_08624C80:: @ 8624C80 gUnknown_08624CB0:: @ 8624CB0 .2byte 0x100 - .2byte 0x8000 - .2byte 0x400 - .2byte 0x0 + .2byte 0x8000 + .2byte 0x400 + .2byte 0x0 gUnknown_08624CB8:: @ 8624CB8 - .2byte 0x80 - .2byte 0x80 - .2byte 0 - .2byte 0 - .2byte 0x7FFF - .2byte 0 - .2byte 0 - .2byte 0 - + .2byte 0x80 + .2byte 0x80 + .2byte 0 + .2byte 0 + .2byte 0x7FFF + .2byte 0 + .2byte 0 + .2byte 0 + gUnknown_08624CC8:: @ 8624CC8 - .2byte 0x80 - .2byte 0x80 - .2byte 0 - .2byte 0 - .2byte 0x20 - .2byte 0x20 - .2byte 0x400 - .2byte 0 - .2byte 0x7FFF - .2byte 0 - .2byte 0 - .2byte 0 - + .2byte 0x80 + .2byte 0x80 + .2byte 0 + .2byte 0 + .2byte 0x20 + .2byte 0x20 + .2byte 0x400 + .2byte 0 + .2byte 0x7FFF + .2byte 0 + .2byte 0 + .2byte 0 + gUnknown_08624CE0:: @ 8624CE0 - .2byte 0x100 - .2byte 0x100 - .2byte 0 - .2byte 0 - .2byte 0xFFE0 - .2byte 0xFFE0 - .2byte 0x400 - .2byte 0 - .2byte 0x7FFF - .2byte 0 - .2byte 0 - .2byte 0 - + .2byte 0x100 + .2byte 0x100 + .2byte 0 + .2byte 0 + .2byte 0xFFE0 + .2byte 0xFFE0 + .2byte 0x400 + .2byte 0 + .2byte 0x7FFF + .2byte 0 + .2byte 0 + .2byte 0 + gUnknown_08624CF8:: @ 8624CF8 - .4byte gUnknown_08624CB8 - .4byte gUnknown_08624CC8 - .4byte gUnknown_08624CE0 + .4byte gUnknown_08624CB8 + .4byte gUnknown_08624CC8 + .4byte gUnknown_08624CE0 gUnknown_08624D04:: @ 8624D04 - spr_template 9, 15, gUnknown_08624CB0, gDummySpriteAnimTable, NULL, gUnknown_08624CF8, SpriteCallbackDummy - + spr_template 9, 15, gUnknown_08624CB0, gDummySpriteAnimTable, NULL, gUnknown_08624CF8, SpriteCallbackDummy + gUnknown_08624D1C:: @ 8624D1C .4byte gText_MrStone_Pokenav_2B60C0 - .2byte 0xFFFF - .byte 0x58 - .byte 1 - .4byte gText_MrStone_Pokenav_2B61E6 - .byte 0x58 - .byte 1 - .2byte 0xFFFF - .4byte gText_MrStone_Pokenav_2B6302 - .byte 0xBD - .byte 0 - .2byte 0xFFFF - .4byte gText_MrStone_Pokenav_2B63A0 - .byte 16 - .byte 1 - .2byte 0xFFFF - .4byte gText_MrStone_Pokenav_2B64A2 - .byte 0x6A - .byte 0 - .2byte 0xFFFF - .4byte gText_MrStone_Pokenav_2B6526 - .byte 0xF4 - .byte 4 - .2byte 0xFFFF - .4byte gText_MrStone_Pokenav_2B65BB - .byte 0x97 - .byte 0 - .2byte 0xFFFF - .4byte gText_MrStone_Pokenav_2B6664 - .byte 0x6f - .byte 0 - .2byte 0xFFFF - .4byte gText_MrStone_Pokenav_2B66B1 - .byte 0x70 - .byte 0 - .2byte 0xFFFF - .4byte gText_MrStone_Pokenav_2B6703 - .byte 0xf7 - .byte 4 - .2byte 0xFFFF - .4byte gText_MrStone_Pokenav_2B67ED - .byte 0x64 - .byte 8 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF + .2byte 0xFFFF + .byte 0x58 + .byte 1 + .4byte gText_MrStone_Pokenav_2B61E6 + .byte 0x58 + .byte 1 + .2byte 0xFFFF + .4byte gText_MrStone_Pokenav_2B6302 + .byte 0xBD + .byte 0 + .2byte 0xFFFF + .4byte gText_MrStone_Pokenav_2B63A0 + .byte 16 + .byte 1 + .2byte 0xFFFF + .4byte gText_MrStone_Pokenav_2B64A2 + .byte 0x6A + .byte 0 + .2byte 0xFFFF + .4byte gText_MrStone_Pokenav_2B6526 + .byte 0xF4 + .byte 4 + .2byte 0xFFFF + .4byte gText_MrStone_Pokenav_2B65BB + .byte 0x97 + .byte 0 + .2byte 0xFFFF + .4byte gText_MrStone_Pokenav_2B6664 + .byte 0x6f + .byte 0 + .2byte 0xFFFF + .4byte gText_MrStone_Pokenav_2B66B1 + .byte 0x70 + .byte 0 + .2byte 0xFFFF + .4byte gText_MrStone_Pokenav_2B6703 + .byte 0xf7 + .byte 4 + .2byte 0xFFFF + .4byte gText_MrStone_Pokenav_2B67ED + .byte 0x64 + .byte 8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_08624D7C:: @ 8624D7C .byte 0 - .byte 10 - .2byte 0xFFFF - .4byte gUnknown_085EFAEF - .4byte gUnknown_085EFAFA - .4byte gUnknown_08624D1C + .byte 10 + .2byte 0xFFFF + .4byte gUnknown_085EFAEF + .4byte gUnknown_085EFAFA + .4byte gUnknown_08624D1C gUnknown_08624D8C:: @ 8624D8C - .4byte gText_Norman_Pokenav_2B5719 - .byte 0x32 - .byte 1 - .2byte 0xFFFF - .4byte gText_Norman_Pokenav_2B5795 - .byte 0xF1 - .byte 4 - .2byte 0xFFFF - .4byte gText_Norman_Pokenav_2B584D - .byte 0xF3 - .byte 4 - .2byte 0xFFFF - .4byte gText_Norman_Pokenav_2B58E3 - .byte 0xF4 - .byte 4 - .2byte 0xFFFF - .4byte gText_Norman_Pokenav_2B5979 - .byte 0xD4 - .byte 0 - .2byte 0xFFFF - .4byte gText_Norman_Pokenav_2B5A07 - .byte 0xFE - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Norman_Pokenav_2B5A69 - .byte 0x64 - .byte 8 - .2byte 0xFFFF - .4byte gText_Norman_Pokenav_2B5ACF - .byte 0x64 - .byte 8 - .2byte 0xFFFF - .4byte gText_Norman_Pokenav_2B5B5E - .byte 0x64 - .byte 8 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF + .4byte gText_Norman_Pokenav_2B5719 + .byte 0x32 + .byte 1 + .2byte 0xFFFF + .4byte gText_Norman_Pokenav_2B5795 + .byte 0xF1 + .byte 4 + .2byte 0xFFFF + .4byte gText_Norman_Pokenav_2B584D + .byte 0xF3 + .byte 4 + .2byte 0xFFFF + .4byte gText_Norman_Pokenav_2B58E3 + .byte 0xF4 + .byte 4 + .2byte 0xFFFF + .4byte gText_Norman_Pokenav_2B5979 + .byte 0xD4 + .byte 0 + .2byte 0xFFFF + .4byte gText_Norman_Pokenav_2B5A07 + .byte 0xFE + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Norman_Pokenav_2B5A69 + .byte 0x64 + .byte 8 + .2byte 0xFFFF + .4byte gText_Norman_Pokenav_2B5ACF + .byte 0x64 + .byte 8 + .2byte 0xFFFF + .4byte gText_Norman_Pokenav_2B5B5E + .byte 0x64 + .byte 8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_08624DDC:: @ 8624DDC .byte 5, 7, 0x32, 1, 0x45, 0, 0, 0 - .4byte gUnknown_085EFB25 - .4byte gUnknown_085EFB47 - .4byte gUnknown_08624D8C + .4byte gUnknown_085EFB25 + .4byte gUnknown_085EFB47 + .4byte gUnknown_08624D8C gUnknown_08624DF0:: @ 8624DF0 .byte 3, 0, 0x19, 1 - .4byte gUnknown_085EFBC9 - .4byte gUnknown_085E8270 - + .4byte gUnknown_085EFBC9 + .4byte gUnknown_085E8270 + gUnknown_08624DFC:: @ 8624DFC - .4byte gText_Mom_Pokenav_2B227B - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Mom_Pokenav_2B2310 - .byte 0xF4 - .byte 0x4 - .2byte 0xFFFF - .4byte gText_Mom_Pokenav_2B23F3 - .byte 0x64 - .byte 8 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF + .4byte gText_Mom_Pokenav_2B227B + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Mom_Pokenav_2B2310 + .byte 0xF4 + .byte 0x4 + .2byte 0xFFFF + .4byte gText_Mom_Pokenav_2B23F3 + .byte 0x64 + .byte 8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_08624E1C:: @ 8624E1C .byte 0, 0, 0xD8, 0 - .4byte gUnknown_085EFB32 - .4byte gUnknown_085EFB4B - .4byte gUnknown_08624DFC - + .4byte gUnknown_085EFB32 + .4byte gUnknown_085EFB4B + .4byte gUnknown_08624DFC + gUnknown_08624E2C:: @ 8624E2C - .4byte gText_Steven_Pokenav_2B5B95 - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Steven_Pokenav_2B5C53 - .byte 0xC7 - .byte 0 - .2byte 0xFFFF - .4byte gText_Steven_Pokenav_2B5CC9 - .byte 0xD4 - .byte 0 - .2byte 0xFFFF - .4byte gText_Steven_Pokenav_2B5DB4 - .byte 0x70 - .byte 0 - .2byte 0xFFFF - .4byte gText_Steven_Pokenav_2B5E26 - .byte 0xF6 - .byte 4 - .2byte 0xFFFF - .4byte gText_Steven_Pokenav_2B5EA2 - .byte 0x81 - .byte 0 - .2byte 0xFFFF - .4byte gText_Steven_Pokenav_2B5ED9 - .byte 0x64 - .byte 8 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF + .4byte gText_Steven_Pokenav_2B5B95 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Steven_Pokenav_2B5C53 + .byte 0xC7 + .byte 0 + .2byte 0xFFFF + .4byte gText_Steven_Pokenav_2B5CC9 + .byte 0xD4 + .byte 0 + .2byte 0xFFFF + .4byte gText_Steven_Pokenav_2B5DB4 + .byte 0x70 + .byte 0 + .2byte 0xFFFF + .4byte gText_Steven_Pokenav_2B5E26 + .byte 0xF6 + .byte 4 + .2byte 0xFFFF + .4byte gText_Steven_Pokenav_2B5EA2 + .byte 0x81 + .byte 0 + .2byte 0xFFFF + .4byte gText_Steven_Pokenav_2B5ED9 + .byte 0x64 + .byte 8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_08624E6C:: @ 8624E6C .byte 0, 0xD5, 0x31, 1 - .4byte gUnknown_085EFB04 - .4byte gUnknown_085EFB11 - .4byte gUnknown_08624E2C - + .4byte gUnknown_085EFB04 + .4byte gUnknown_085EFB11 + .4byte gUnknown_08624E2C + gUnknown_08624E7C:: @ 8624E7C - .4byte gText_May_Pokenav_2B3AB3 - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_May_Pokenav_2B3B3F - .byte 0xF1 - .byte 0x4 - .2byte 0xFFFF - .4byte gText_May_Pokenav_2B3C13 - .byte 0x95 - .byte 0 - .2byte 0xFFFF - .4byte gText_May_Pokenav_2B3CF3 - .byte 0x24 - .byte 0x3 - .2byte 0xFFFF - .4byte gText_May_Pokenav_2B3D4B - .byte 0x6A - .byte 0 - .2byte 0xFFFF - .4byte gText_May_Pokenav_2B3DD1 - .byte 0xF3 - .byte 0x4 - .2byte 0xFFFF - .4byte gText_May_Pokenav_2B3E69 - .byte 0xF4 - .byte 4 - .2byte 0xFFFF - .4byte gText_May_Pokenav_2B3ECD - .byte 0x97 - .byte 0 - .2byte 0xFFFF - .4byte gText_May_Pokenav_2B3F2B - .byte 0xD4 - .byte 0 - .2byte 0xFFFF - .4byte gText_May_Pokenav_2B3FFB - .byte 0x6F - .byte 0 - .2byte 0xFFFF - .4byte gText_May_Pokenav_2B402B - .byte 0x61 - .byte 0 - .2byte 0xFFFF - .4byte gText_May_Pokenav_2B414B - .byte 0x70 - .byte 0 - .2byte 0xFFFF - .4byte gText_May_Pokenav_2B4228 - .byte 0x81 - .byte 0 - .2byte 0xFFFF - .4byte gText_May_Pokenav_2B42E0 - .byte 0xF7 - .byte 4 - .2byte 0xFFFF - .4byte gText_May_Pokenav_2B4350 - .byte 0x64 - .byte 8 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF + .4byte gText_May_Pokenav_2B3AB3 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B3B3F + .byte 0xF1 + .byte 0x4 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B3C13 + .byte 0x95 + .byte 0 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B3CF3 + .byte 0x24 + .byte 0x3 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B3D4B + .byte 0x6A + .byte 0 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B3DD1 + .byte 0xF3 + .byte 0x4 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B3E69 + .byte 0xF4 + .byte 4 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B3ECD + .byte 0x97 + .byte 0 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B3F2B + .byte 0xD4 + .byte 0 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B3FFB + .byte 0x6F + .byte 0 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B402B + .byte 0x61 + .byte 0 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B414B + .byte 0x70 + .byte 0 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B4228 + .byte 0x81 + .byte 0 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B42E0 + .byte 0xF7 + .byte 4 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B4350 + .byte 0x64 + .byte 8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_08624EFC:: @ 8624EFC .byte 4, 0, 0xFD, 0 - .4byte gUnknown_085EFB18 - .4byte gExpandedPlaceholder_May - .4byte gUnknown_08624E7C + .4byte gUnknown_085EFB18 + .4byte gExpandedPlaceholder_May + .4byte gUnknown_08624E7C gUnknown_08624F0C:: @ 8624F0C - .4byte gText_Brendan_Pokenav_2B43EF - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Brendan_Pokenav_2B4486 - .byte 0xF1 - .byte 0x4 - .2byte 0xFFFF - .4byte gText_Brendan_Pokenav_2B4560 - .byte 0x95 - .byte 0 - .2byte 0xFFFF - .4byte gText_Brendan_Pokenav_2B463F - .byte 0x24 - .byte 0x3 - .2byte 0xFFFF - .4byte gText_Brendan_Pokenav_2B46B7 - .byte 0x6A - .byte 0 - .2byte 0xFFFF - .4byte gText_Brendan_Pokenav_2B4761 - .byte 0xF3 - .byte 0x4 - .2byte 0xFFFF - .4byte gText_Brendan_Pokenav_2B47F4 - .byte 0xF4 - .byte 4 - .2byte 0xFFFF - .4byte gText_Brendan_Pokenav_2B4882 - .byte 0x97 - .byte 0 - .2byte 0xFFFF - .4byte gText_Brendan_Pokenav_2B4909 - .byte 0xD4 - .byte 0 - .2byte 0xFFFF - .4byte gText_Brendan_Pokenav_2B49C4 - .byte 0x6F - .byte 0 - .2byte 0xFFFF - .4byte gText_Brendan_Pokenav_2B4A44 - .byte 0x61 - .byte 0 - .2byte 0xFFFF - .4byte gText_Brendan_Pokenav_2B4B28 - .byte 0x70 - .byte 0 - .2byte 0xFFFF - .4byte gText_Brendan_Pokenav_2B4C15 - .byte 0x81 - .byte 0 - .2byte 0xFFFF - .4byte gText_Brendan_Pokenav_2B4CD8 - .byte 0xF7 - .byte 4 - .2byte 0xFFFF - .4byte gText_Brendan_Pokenav_2B4D46 - .byte 0x64 - .byte 8 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF + .4byte gText_Brendan_Pokenav_2B43EF + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4486 + .byte 0xF1 + .byte 0x4 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4560 + .byte 0x95 + .byte 0 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B463F + .byte 0x24 + .byte 0x3 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B46B7 + .byte 0x6A + .byte 0 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4761 + .byte 0xF3 + .byte 0x4 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B47F4 + .byte 0xF4 + .byte 4 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4882 + .byte 0x97 + .byte 0 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4909 + .byte 0xD4 + .byte 0 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B49C4 + .byte 0x6F + .byte 0 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4A44 + .byte 0x61 + .byte 0 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4B28 + .byte 0x70 + .byte 0 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4C15 + .byte 0x81 + .byte 0 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4CD8 + .byte 0xF7 + .byte 4 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4D46 + .byte 0x64 + .byte 8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_08624F8C:: @ 8624F8C .byte 4, 1, 0xFD, 0 - .4byte gUnknown_085EFB18 - .4byte gExpandedPlaceholder_Brendan - .4byte gUnknown_08624F0C - + .4byte gUnknown_085EFB18 + .4byte gExpandedPlaceholder_Brendan + .4byte gUnknown_08624F0C + gUnknown_08624F9C:: @ 8624F9C - .4byte gText_Wally_Pokenav_2B4DE2 - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Wally_Pokenav_2B4E57 - .byte 0xC7 - .byte 0 - .2byte 0xFFFF - .4byte gText_Wally_Pokenav_2B4EA5 - .byte 0xF3 - .byte 0x4 - .2byte 0xFFFF - .4byte gText_Wally_Pokenav_2B4F41 - .byte 0x97 - .byte 0 - .2byte 0xFFFF - .4byte gText_Wally_Pokenav_2B4FF3 - .byte 0x6F - .byte 0 - .2byte 0xFFFF - .4byte gText_Wally_Pokenav_2B50B1 - .byte 0x81 - .byte 0 - .2byte 0xFFFF - .4byte gText_Wally_Pokenav_2B5100 - .byte 0x7E - .byte 0 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF + .4byte gText_Wally_Pokenav_2B4DE2 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Wally_Pokenav_2B4E57 + .byte 0xC7 + .byte 0 + .2byte 0xFFFF + .4byte gText_Wally_Pokenav_2B4EA5 + .byte 0xF3 + .byte 0x4 + .2byte 0xFFFF + .4byte gText_Wally_Pokenav_2B4F41 + .byte 0x97 + .byte 0 + .2byte 0xFFFF + .4byte gText_Wally_Pokenav_2B4FF3 + .byte 0x6F + .byte 0 + .2byte 0xFFFF + .4byte gText_Wally_Pokenav_2B50B1 + .byte 0x81 + .byte 0 + .2byte 0xFFFF + .4byte gText_Wally_Pokenav_2B5100 + .byte 0x7E + .byte 0 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_08624FDC:: @ 8624FDC - .byte 0x24, 3, 5, 0 - .2byte 0x6F, 0xD5 - .byte 0x5A, 3, 0x46, 0, 0xFF, 0xFF, 0xD5, 0 - + .byte 0x24, 3, 5, 0 + .2byte 0x6F, 0xD5 + .byte 0x5A, 3, 0x46, 0, 0xFF, 0xFF, 0xD5, 0 + gUnknown_08624FEC:: @ 8624FEC .byte 2, 0, 0xD6, 0 - .4byte 0x40 - .4byte gUnknown_085EFB3E - .4byte gUnknown_08624F9C - .4byte gUnknown_08624FDC - + .4byte 0x40 + .4byte gUnknown_085EFB3E + .4byte gUnknown_08624F9C + .4byte gUnknown_08624FDC + gUnknown_08624500:: @ 8624500 - .4byte gText_Scott_Pokenav_2B5184 - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Scott_Pokenav_2B5275 - .byte 0x8B - .byte 0 - .2byte 0xFFFF - .4byte gText_Scott_Pokenav_2B5323 - .byte 0x97 - .byte 0 - .2byte 0xFFFF - .4byte gText_Scott_Pokenav_2B53DB - .byte 0xD4 - .byte 0 - .2byte 0xFFFF - .4byte gText_Scott_Pokenav_2B54A5 - .byte 0x70 - .byte 0 - .2byte 0xFFFF - .4byte gText_Scott_Pokenav_2B5541 - .byte 0xF7 - .byte 4 - .2byte 0xFFFF - .4byte gText_Scott_Pokenav_2B56CA - .byte 0x64 - .byte 8 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF + .4byte gText_Scott_Pokenav_2B5184 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Scott_Pokenav_2B5275 + .byte 0x8B + .byte 0 + .2byte 0xFFFF + .4byte gText_Scott_Pokenav_2B5323 + .byte 0x97 + .byte 0 + .2byte 0xFFFF + .4byte gText_Scott_Pokenav_2B53DB + .byte 0xD4 + .byte 0 + .2byte 0xFFFF + .4byte gText_Scott_Pokenav_2B54A5 + .byte 0x70 + .byte 0 + .2byte 0xFFFF + .4byte gText_Scott_Pokenav_2B5541 + .byte 0xF7 + .byte 4 + .2byte 0xFFFF + .4byte gText_Scott_Pokenav_2B56CA + .byte 0x64 + .byte 8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_08625040:: @ 8625040 .byte 0, 0xD5, 0xD7, 0 - .4byte gUnknown_085EFB4F - .4byte gUnknown_085EFB5C - .4byte gUnknown_08624500 - + .4byte gUnknown_085EFB4F + .4byte gUnknown_085EFB5C + .4byte gUnknown_08624500 + gUnknown_08625050:: @ 8625050 - .4byte gText_Roxanne_Pokenav_2B2456 - .byte 0xFE - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Roxanne_Pokenav_2B250E - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Roxanne_Pokenav_2B25C1 - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Roxanne_Pokenav_2B2607 - .byte 0x64 - .byte 0x8 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF + .4byte gText_Roxanne_Pokenav_2B2456 + .byte 0xFE + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Roxanne_Pokenav_2B250E + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Roxanne_Pokenav_2B25C1 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Roxanne_Pokenav_2B2607 + .byte 0x64 + .byte 0x8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_08625078:: @ 8625078 .byte 5, 10, 0xD3, 1 - .4byte 0x41 - .4byte gUnknown_085EFB62 - .4byte NULL - .4byte gUnknown_08625050 - + .4byte 0x41 + .4byte gUnknown_085EFB62 + .4byte NULL + .4byte gUnknown_08625050 + gUnknown_0862508C:: @ 862508C - .4byte gText_Brawly_Pokenav_2B2659 - .byte 0xFE - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Brawly_Pokenav_2B275D - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Brawly_Pokenav_2B286F - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Brawly_Pokenav_2B28D1 - .byte 0x64 - .byte 0x8 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF + .4byte gText_Brawly_Pokenav_2B2659 + .byte 0xFE + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Brawly_Pokenav_2B275D + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Brawly_Pokenav_2B286F + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Brawly_Pokenav_2B28D1 + .byte 0x64 + .byte 0x8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_086250B4:: @ 86250B4 .byte 5, 2, 0xD4, 1 - .4byte 0x42 - .4byte gUnknown_085EFB6F - .4byte NULL - .4byte gUnknown_0862508C - + .4byte 0x42 + .4byte gUnknown_085EFB6F + .4byte NULL + .4byte gUnknown_0862508C + gUnknown_086250C8:: @ 86250C8 - .4byte gText_Wattson_Pokenav_2B2912 - .byte 0xFE - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Wattson_Pokenav_2B29CA - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Wattson_Pokenav_2B2AB6 - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Wattson_Pokenav_2B2B01 - .byte 0x64 - .byte 0x8 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF + .4byte gText_Wattson_Pokenav_2B2912 + .byte 0xFE + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Wattson_Pokenav_2B29CA + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Wattson_Pokenav_2B2AB6 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Wattson_Pokenav_2B2B01 + .byte 0x64 + .byte 0x8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_086250F0:: @ 86250F0 .byte 5, 9, 0xD5, 1 - .4byte 0x43 - .4byte gUnknown_085EFB7B - .4byte NULL - .4byte gUnknown_086250C8 - + .4byte 0x43 + .4byte gUnknown_085EFB7B + .4byte NULL + .4byte gUnknown_086250C8 + gUnknown_08625104:: @ 8625104 - .4byte gText_Flannery_Pokenav_2B2B4D - .byte 0xFE - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Flannery_Pokenav_2B2C0E - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Flannery_Pokenav_2B2CF1 - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Flannery_Pokenav_2B2D54 - .byte 0x64 - .byte 0x8 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF + .4byte gText_Flannery_Pokenav_2B2B4D + .byte 0xFE + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Flannery_Pokenav_2B2C0E + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Flannery_Pokenav_2B2CF1 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Flannery_Pokenav_2B2D54 + .byte 0x64 + .byte 0x8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_0862512C:: @ 862512C .byte 5, 3, 0xD6, 1 - .4byte 0x44 - .4byte gUnknown_085EFB87 - .4byte NULL - .4byte gUnknown_08625104 - + .4byte 0x44 + .4byte gUnknown_085EFB87 + .4byte NULL + .4byte gUnknown_08625104 + gUnknown_08625140:: @ 8625140 - .4byte gText_Winona_Pokenav_2B2DA4 - .byte 0xFE - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Winona_Pokenav_2B2E2B - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Winona_Pokenav_2B2EC2 - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Winona_Pokenav_2B2F16 - .byte 0x64 - .byte 0x8 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF + .4byte gText_Winona_Pokenav_2B2DA4 + .byte 0xFE + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Winona_Pokenav_2B2E2B + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Winona_Pokenav_2B2EC2 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Winona_Pokenav_2B2F16 + .byte 0x64 + .byte 0x8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_08625168:: @ 8625168 .byte 5, 11, 0xD7, 1 - .4byte 0x46 - .4byte gUnknown_085EFB94 - .4byte NULL - .4byte gUnknown_08625140 + .4byte 0x46 + .4byte gUnknown_085EFB94 + .4byte NULL + .4byte gUnknown_08625140 gUnknown_0862517C:: @ 862517C - .4byte gText_TateLiza_Pokenav_2B2F97 - .byte 0xFE - .byte 0xFF - .2byte 0xFFFF - .4byte gText_TateLiza_Pokenav_2B306E - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_TateLiza_Pokenav_2B3158 - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_TateLiza_Pokenav_2B31CD - .byte 0x64 - .byte 0x8 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF + .4byte gText_TateLiza_Pokenav_2B2F97 + .byte 0xFE + .byte 0xFF + .2byte 0xFFFF + .4byte gText_TateLiza_Pokenav_2B306E + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_TateLiza_Pokenav_2B3158 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_TateLiza_Pokenav_2B31CD + .byte 0x64 + .byte 0x8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_086251A4:: @ 86251A4 .byte 5, 13, 0xD8, 1 - .4byte 0x47 - .4byte gUnknown_085EFB9E - .4byte NULL - .4byte gUnknown_0862517C - + .4byte 0x47 + .4byte gUnknown_085EFB9E + .4byte NULL + .4byte gUnknown_0862517C + gUnknown_086251B8:: @ 86251B8 - .4byte gText_Juan_Pokenav_2B3249 - .byte 0xFE - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Juan_Pokenav_2B32EC - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Juan_Pokenav_2B33AA - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Juan_Pokenav_2B341E - .byte 0x64 - .byte 0x8 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF + .4byte gText_Juan_Pokenav_2B3249 + .byte 0xFE + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Juan_Pokenav_2B32EC + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Juan_Pokenav_2B33AA + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Juan_Pokenav_2B341E + .byte 0x64 + .byte 0x8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_086251E0:: @ 86251E0 .byte 5, 14, 0xD9, 1 - .4byte 0x48 - .4byte gUnknown_085EFBA9 - .4byte NULL - .4byte gUnknown_086251B8 - + .4byte 0x48 + .4byte gUnknown_085EFBA9 + .4byte NULL + .4byte gUnknown_086251B8 + gUnknown_086251F4:: @ 86251F4 - .4byte gText_Sidney_Pokenav_2B34CC - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF + .4byte gText_Sidney_Pokenav_2B34CC + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_08625204:: @ 8625204 .byte 5, 15, 0xA5, 1 - .4byte 0x49 - .4byte gUnknown_085EFBB5 - .4byte NULL - .4byte gUnknown_086251F4 - + .4byte 0x49 + .4byte gUnknown_085EFBB5 + .4byte NULL + .4byte gUnknown_086251F4 + gUnknown_08625218:: @ 8625218 - .4byte gText_Phoebe_Pokenav_2B3561 - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF + .4byte gText_Phoebe_Pokenav_2B3561 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_08625228:: @ 8625228 .byte 5, 15, 0xA6, 1 - .4byte 0x4A - .4byte gUnknown_085EFBB5 - .4byte NULL - .4byte gUnknown_08625218 - + .4byte 0x4A + .4byte gUnknown_085EFBB5 + .4byte NULL + .4byte gUnknown_08625218 + gUnknown_0862523C:: @ 862523C - .4byte gText_Glacia_Pokenav_2B35E4 - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF + .4byte gText_Glacia_Pokenav_2B35E4 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_0862524C:: @ 862524C .byte 5, 15, 0xA7, 1 - .4byte 0x4B - .4byte gUnknown_085EFBB5 - .4byte NULL - .4byte gUnknown_0862523C - + .4byte 0x4B + .4byte gUnknown_085EFBB5 + .4byte NULL + .4byte gUnknown_0862523C + gUnknown_08625260:: @ 8625260 - .4byte gText_Drake_Pokenav_2B368B - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF + .4byte gText_Drake_Pokenav_2B368B + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_08625270:: @ 8625270 .byte 5, 15, 0xA8, 1 - .4byte 0x4C - .4byte gUnknown_085EFBB5 - .4byte NULL - .4byte gUnknown_08625260 - + .4byte 0x4C + .4byte gUnknown_085EFBB5 + .4byte NULL + .4byte gUnknown_08625260 + gUnknown_08625284:: @ 8625284 - .4byte gText_Wallace_Pokenav_2B3790 - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF + .4byte gText_Wallace_Pokenav_2B3790 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF gUnknown_08625294:: @ 8625294 .byte 5, 15, 0xA9, 1 - .4byte 0x4D - .4byte gUnknown_085EFBC0 - .4byte NULL - .4byte gUnknown_08625284 + .4byte 0x4D + .4byte gUnknown_085EFBC0 + .4byte NULL + .4byte gUnknown_08625284 gUnknown_086252A8:: @ 86252A8 .4byte gUnknown_08624D7C @@ -2756,33 +2759,33 @@ gUnknown_08625374:: @ 8625374 gUnknown_08625388:: @ 8625388 .2byte 7, 0x4B, 0xFFFF, 0 - .4byte gUnknown_085ED453 - .4byte gUnknown_085ED46B - .4byte gUnknown_085ED483 - .4byte gUnknown_085ED49D - .2byte 7, 0x4B, 0x4F6, 0 - .4byte gUnknown_085ED453 - .4byte gUnknown_085ED46B - .4byte gUnknown_085ED4B3 - .4byte gUnknown_085ED4CE - .2byte 2, 0X3C, 0xFFFF, 0 - .4byte gUnknown_085ED4E3 - .4byte gUnknown_085ED4FA - .4byte gUnknown_085ED516 - .4byte gUnknown_085ED52F - .2byte 3, 0x3F, 0xFFFF, 0 - .4byte gUnknown_085ED547 - .4byte gUnknown_085ED563 - .4byte gUnknown_085ED579 - .4byte gUnknown_085ED58F + .4byte gUnknown_085ED453 + .4byte gUnknown_085ED46B + .4byte gUnknown_085ED483 + .4byte gUnknown_085ED49D + .2byte 7, 0x4B, 0x4F6, 0 + .4byte gUnknown_085ED453 + .4byte gUnknown_085ED46B + .4byte gUnknown_085ED4B3 + .4byte gUnknown_085ED4CE + .2byte 2, 0X3C, 0xFFFF, 0 + .4byte gUnknown_085ED4E3 + .4byte gUnknown_085ED4FA + .4byte gUnknown_085ED516 + .4byte gUnknown_085ED52F + .2byte 3, 0x3F, 0xFFFF, 0 + .4byte gUnknown_085ED547 + .4byte gUnknown_085ED563 + .4byte gUnknown_085ED579 + .4byte gUnknown_085ED58F gUnknown_086253E8:: @ 86253E8 .4byte 0x8010100 - .4byte 0x80F02 - .4byte 0x8011500 - .4byte 0x180F12 - .4byte 0xB010100 - .4byte 0x180F08 + .4byte 0x80F02 + .4byte 0x8011500 + .4byte 0x180F12 + .4byte 0xB010100 + .4byte 0x180F08 gUnknown_08625400:: @ 8625400 .byte 1, 2, 3 @@ -2798,169 +2801,169 @@ gUnknown_08625410:: @ 8625410 gUnknown_08625510:: @ 8625510 .4byte 0x10010101 - .4byte 0xA0F0C - .4byte 0x10010101 - .4byte 0xCA0F0C - .4byte 0xA011301 - .4byte 0x18A0F0C - .4byte 0x160F0401 - .4byte 0x2020F04 - .4byte 0x5081600 - .4byte 0x25A0F04 - .4byte 0xFF - .4byte NULL + .4byte 0xA0F0C + .4byte 0x10010101 + .4byte 0xCA0F0C + .4byte 0xA011301 + .4byte 0x18A0F0C + .4byte 0x160F0401 + .4byte 0x2020F04 + .4byte 0x5081600 + .4byte 0x25A0F04 + .4byte 0xFF + .4byte NULL gUnknown_08625540:: @ 8625540 .4byte 0x5081600 - .4byte 0x25A0F04 + .4byte 0x25A0F04 gUnknown_08625548:: @ 8625548 - .4byte NULL - .4byte sub_81D2BD0 - .4byte NULL - .2byte 0 - .2byte 0 - .byte 2 - .byte 0 - .byte 8 - .byte 0 - .4byte 0x1003121 - + .4byte NULL + .4byte sub_81D2BD0 + .4byte NULL + .2byte 0 + .2byte 0 + .byte 2 + .byte 0 + .byte 8 + .byte 0 + .4byte 0x1003121 + gUnknown_08625560:: @ 8625560 .incbin "graphics/pokenav/pokeball.4bpp" gUnknown_08625660:: @ 8625660 - .incbin "graphics/pokenav/8625660.4bpp" - + .incbin "graphics/pokenav/8625660.4bpp" + gUnknown_08625680:: @ 8625680 - .incbin "graphics/pokenav/sparkle.gbapal" - + .incbin "graphics/pokenav/sparkle.gbapal" + gUnknown_086256A0:: @ 86255A0 - .incbin "graphics/pokenav/sparkle.4bpp" - + .incbin "graphics/pokenav/sparkle.4bpp" + gUnknown_08625A20:: @ 8625A20 - .2byte 0 - .2byte 0xC000 - .2byte 0x400 - .2byte 0 - + .2byte 0 + .2byte 0xC000 + .2byte 0x400 + .2byte 0 + gUnknown_08625A28:: @ 8625A28 - .2byte 0 - .2byte 0x4000 - .2byte 0x800 - .2byte 0 - + .2byte 0 + .2byte 0x4000 + .2byte 0x800 + .2byte 0 + gUnknown_08625A30:: @ 8625A30 - .2byte 0 - .2byte 5 - .2byte 0xFFFF - .2byte 0 - + .2byte 0 + .2byte 5 + .2byte 0xFFFF + .2byte 0 + gUnknown_08625A38:: @ 8625A38 - .2byte 4 - .2byte 5 - .2byte 0xFFFF - .2byte 0 - + .2byte 4 + .2byte 5 + .2byte 0xFFFF + .2byte 0 + gUnknown_08625A40:: @ 8625A40 - .4byte gUnknown_08625A30 - .4byte gUnknown_08625A38 + .4byte gUnknown_08625A30 + .4byte gUnknown_08625A38 gUnknown_08625A48:: @ 8625A48 .4byte NULL - .4byte 0x640800 + .4byte 0x640800 gUnknown_08625A50:: @ 8625A50 spr_template 0x64, 0x64, gUnknown_08625A20, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_08625A68:: @ 8625A68 .4byte NULL - .4byte 0x64 + .4byte 0x64 gUnknown_08625A70:: @ 8625A70 .4byte gUnknown_08625560 - .byte 0, 1, 0x65, 0 - .4byte gUnknown_08625660 - .2byte 0x20, 0x67 - .4byte gPokenavConditionCancel_Gfx - .byte 0, 1, 0x66, 0 - .4byte NULL, NULL + .byte 0, 1, 0x65, 0 + .4byte gUnknown_08625660 + .2byte 0x20, 0x67 + .4byte gPokenavConditionCancel_Gfx + .byte 0, 1, 0x66, 0 + .4byte NULL, NULL gUnknown_08625A90:: @ 8625A90 .4byte gPokenavConditionCancel_Pal + 0x0 - .byte 0x65, 0, 0, 0 - .4byte gPokenavConditionCancel_Pal + 0x20 - .byte 0x66, 0, 0, 0 - .4byte NULL, NULL + .byte 0x65, 0, 0, 0 + .4byte gPokenavConditionCancel_Pal + 0x20 + .byte 0x66, 0, 0, 0 + .4byte NULL, NULL gUnknown_08625AA8:: @ 8625AA8 spr_template 0x65, 0x65, gUnknown_08625A28, gUnknown_08625A40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_08625AC0:: @ 8625AC0 .4byte gUnknown_086256A0 - .byte 0x80, 3, 0x68, 0 + .byte 0x80, 3, 0x68, 0 gUnknown_08625AC8:: @ 8625AC8 .4byte gUnknown_08625680 - .byte 0x68, 0, 0, 0 - + .byte 0x68, 0, 0, 0 + gUnknown_08625AD0:: @ 8625AD0 .2byte 0 - .2byte 0x4000 - .2byte 0 - .2byte 0 - + .2byte 0x4000 + .2byte 0 + .2byte 0 + gUnknown_08625AD8:: @ 8625AD8 - .2byte 0 - .2byte 5 - .2byte 4 - .2byte 5 - + .2byte 0 + .2byte 5 + .2byte 4 + .2byte 5 + gUnknown_08625AE0:: @ 8625AE0 - .2byte 8 - .2byte 5 - .2byte 12 - .2byte 5 - + .2byte 8 + .2byte 5 + .2byte 12 + .2byte 5 + gUnknown_08625AE8:: @ 8625AE8 - .2byte 16 - .2byte 5 - .2byte 20 - .2byte 5 - + .2byte 16 + .2byte 5 + .2byte 20 + .2byte 5 + gUnknown_08625AF0:: @ 8625AF0 - .2byte 24 - .2byte 5 - .2byte 0xFFFF - .2byte 0 - + .2byte 24 + .2byte 5 + .2byte 0xFFFF + .2byte 0 + gUnknown_08625AF8:: @ 8625AF8 .4byte gUnknown_08625AD8 - .4byte gUnknown_08625AE0 - + .4byte gUnknown_08625AE0 + gUnknown_08625B00:: @ 8625B00 .4byte gUnknown_08625AE8 - .4byte gUnknown_08625AF0 - + .4byte gUnknown_08625AF0 + gUnknown_08625B08:: @ 8625B08 - .4byte gUnknown_08625AF8 - .4byte gUnknown_08625B00 - .4byte gUnknown_08625B08 + .4byte gUnknown_08625AF8 + .4byte gUnknown_08625B00 + .4byte gUnknown_08625B08 gUnknown_08625B14:: @ 8625B14 spr_template 0x68, 0x68, gUnknown_08625AD0, gUnknown_08625AF8, NULL gDummySpriteAffineAnimTable, sub_81D3564 gUnknown_08625B2C:: @ 8625B2C .2byte 0, 0xFFDD - .2byte 20, 0xFFE4 - .2byte 33, 0xFFF6 - .2byte 33, 10 - .2byte 20, 28 - .2byte 0, 35 - .2byte 0xFFEC, 28 - .2byte 0xFFDF, 10 - .2byte 0xFFDF, 0xFFF6 - .2byte 0xFFEC, 0xFFE4 + .2byte 20, 0xFFE4 + .2byte 33, 0xFFF6 + .2byte 33, 10 + .2byte 20, 28 + .2byte 0, 35 + .2byte 0xFFEC, 28 + .2byte 0xFFDF, 10 + .2byte 0xFFDF, 0xFFF6 + .2byte 0xFFEC, 0xFFE4 gUnknown_08625B54:: @ 8625B54 .4byte gUnknown_085EEA46 @@ -2971,7 +2974,7 @@ gUnknown_08625B54:: @ 8625B54 .4byte gUnknown_085EEA5D gUnknown_08625B6C:: @ 8625B6C -@ someone dump as japanese text later +@ apparently e-reader trainer data? idk .byte 0x6f, 0x57, 0x54, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x14, 0x0c, 0x0e, 0x23, 0x10, 0x47, 0x0a, 0x1f, 0x06, 0x24, 0x0e, 0x48, 0x0a, 0x0f, 0x06 .byte 0x22, 0x27, 0x2c, 0x16, 0x07, 0x06, 0x01, 0x0c, 0x47, 0x0a, 0x06, 0x06, 0x24, 0x0e, 0x00, 0x1e, 0x19, 0x12, 0x05, 0x0c, 0x25, 0x16, 0x25, 0x10, 0x0d, 0x1c, 0x2a, 0x1c, 0x06, 0x0a, 0x06, 0x0c .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 @@ -3015,129 +3018,132 @@ gUnknown_08625B6C:: @ 8625B6C .byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x8d, 0x85, 0x9e, 0xa0, 0x60, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff gUnknown_0862608C:: @ 862608C - .2byte 21 - -gUnknown_0862608E:: @ 862608E - .incbin "baserom.gba", 0x62608e, 0x786 - + .2byte 21, 16 + .2byte 25, 16 + .2byte 16, 17 + .2byte 20, 20 + +gUnknown_0862609C:: @ 862609C + .incbin "data/unknown_jp_62609C.bin" + gUnknown_08626814:: @ 8626814 - .incbin "baserom.gba", 0x626814, 0xEE8 + .incbin "data/pokenav/unk_struct_1.bin" gUnknown_086276FC:: @ 86276FC - .incbin "baserom.gba", 0x6276FC, 0xEE8 + .incbin "data/pokenav/unk_struct_2.bin" gUnknown_086285E4:: @ 86285E4 - .incbin "baserom.gba", 0x6285E4, 0xEE8 + .incbin "data/pokenav/unk_struct_3.bin" gUnknown_086294CC:: @ 86294CC - .incbin "baserom.gba", 0x6294CC, 0xEE8 + .incbin "data/pokenav/unk_struct_4.bin" gUnknown_0862A3B4:: @ 862A3B4 .byte 0x03, 0x06, 0x00, 0x00, 0x0B, 0x06, 0x00, 0x00, 0x0D, 0x06, 0x00, 0x00, 0x0F, 0x01, 0x00, 0x00, 0x2B, 0x04, 0x00, 0x00, 0x2D, 0x01, 0x00, 0x00, 0x24, 0x09, 0x00, 0x00, 0x29, 0x04, 0x00, 0x00, 0x05, 0x05, 0x00, 0x00, 0x18, 0x04, 0x00, 0x00, 0x2F, 0x00, 0x00, 0x00, 0x2E, 0x09, 0x00, 0x00, 0x11, 0x0C, 0x00, 0x00, 0x10, 0x0B, 0x00, 0x00, 0x1E, 0x0D, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00, 0x17, 0x03, 0x00, 0x00, 0x0C, 0x04, 0x00, 0x00, 0x38, 0x04, 0x00, 0x00, 0x1C, 0x03, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x19, 0x0B, 0x00, 0x00, 0x09, 0x07, 0x00, 0x00, 0x31, 0x07, 0x00, 0x00, 0x35, 0x07, 0x00, 0x00, 0x36, 0x01, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x2A, 0x03, 0x00, 0x00, 0x16, 0x0D, 0x00, 0x00, 0x0E, 0x03, 0x00, 0x00, 0x15, 0x01, 0x00, 0x00, 0x14, 0x01, 0x00, 0x00, 0x2C, 0x01, 0x00, 0x00, 0x1B, 0x02, 0x00, 0x00, 0x04, 0x01, 0x00, 0x00, 0x07, 0x03, 0x00, 0x00, 0x34, 0x05, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x37, 0x02, 0x00, 0x00, 0x1D, 0x04, 0x00, 0x00, 0x22, 0x09, 0x00, 0x00, 0x1F, 0x01, 0x00, 0x00, 0x25, 0x00, 0x00, 0x00, 0x0A, 0x04, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x06, 0x05, 0x00, 0x00, 0x27, 0x0B, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x12, 0x02, 0x00, 0x00, 0x39, 0x08, 0x00, 0x00, 0x02, 0x0B, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00 gUnknown_0862A48C:: @ 862A48C - .2byte 0x44, 0x22, 0x14, 0x18, 0x51, 0x3 - + .2byte 0x44, 0x22, 0x14, 0x18, 0x51, 0x3 + gUnknown_0862A498:: @ 862A498 - .2byte 0xB, 0x22, 0x14, 0x18, 0x51, 3 - + .2byte 0xB, 0x22, 0x14, 0x18, 0x51, 3 + gUnknown_0862A4A4:: @ 862A4A4 - .2byte 0x19, 0x22, 0x14, 0x18, 0x51, 3 + .2byte 0x19, 0x22, 0x14, 0x18, 0x51, 3 gUnknown_0862A4B0:: @ 862A4B0 - .2byte 0x23, 0x22, 0x14, 0x18, 0x51, 0x3 + .2byte 0x23, 0x22, 0x14, 0x18, 0x51, 0x3 gUnknown_0862A4BC:: @ 862A4BC - .2byte 0x24, 0x22, 0x14, 0x18, 0x51, 0x3 + .2byte 0x24, 0x22, 0x14, 0x18, 0x51, 0x3 gUnknown_0862A4C8:: @ 862A4C8 - .2byte 0x125, 0x22, 0x14, 0x18, 0x51, 0x3 + .2byte 0x125, 0x22, 0x14, 0x18, 0x51, 0x3 gUnknown_0862A4D4:: @ 862A4D4 - .2byte 0x144, 0x22, 0x14, 0x18, 0x51, 0x3 + .2byte 0x144, 0x22, 0x14, 0x18, 0x51, 0x3 gUnknown_0862A4E0:: @ 862A4E0 - .2byte 0x126, 0x22, 0x14, 0x18, 0x51, 0x3 + .2byte 0x126, 0x22, 0x14, 0x18, 0x51, 0x3 gUnknown_0862A4EC:: @ 862A4EC - .2byte 0x12B, 0x22, 0x14, 0x18, 0x51, 0x3 + .2byte 0x12B, 0x22, 0x14, 0x18, 0x51, 0x3 gUnknown_0862A4F8:: @ 862A4F8 - .2byte 0x13A, 0x22, 0x14, 0x18, 0x51, 0x3 + .2byte 0x13A, 0x22, 0x14, 0x18, 0x51, 0x3 gUnknown_0862A504:: @ 862A504 - .2byte 0x44, 0x22, 0x14, 0x18, 0x51, 0x3 + .2byte 0x44, 0x22, 0x14, 0x18, 0x51, 0x3 gUnknown_0862A510:: @ 862A510 - .2byte 0xB, 0x22, 0x14, 0x18, 0x51, 0x3 + .2byte 0xB, 0x22, 0x14, 0x18, 0x51, 0x3 -gUnknown_0862A51C:: @ 862A51C - .2byte 0x19, 0x22, 0x14, 0x18, 0x51, 0x3 +gUnknown_0862A51C:: @ 862A51C + .2byte 0x19, 0x22, 0x14, 0x18, 0x51, 0x3 gUnknown_0862A528:: @ 862A528 - .2byte 0x23, 0x22, 0x14, 0x18, 0x51, 0x3 + .2byte 0x23, 0x22, 0x14, 0x18, 0x51, 0x3 gUnknown_0862A534:: @ 862A534 - .2byte 0x24, 0x22, 0x14, 0x18, 0x51, 0x3 + .2byte 0x24, 0x22, 0x14, 0x18, 0x51, 0x3 gUnknown_0862A540:: @ 862A540 - .2byte 0x13F, 0x22, 0x14, 0x18, 0x51, 0x3 + .2byte 0x13F, 0x22, 0x14, 0x18, 0x51, 0x3 gUnknown_0862A54C:: @ 862A54C - .2byte 0x149, 0x22, 0x14, 0x18, 0x51, 0x3 + .2byte 0x149, 0x22, 0x14, 0x18, 0x51, 0x3 gUnknown_0862A558:: @ 862A558 - .2byte 0x150, 0x22, 0x14, 0x18, 0x51, 0x3 + .2byte 0x150, 0x22, 0x14, 0x18, 0x51, 0x3 gUnknown_0862A564:: @ 862A564 - .2byte 0x133, 0x22, 0x14, 0x18, 0x51, 0x3 + .2byte 0x133, 0x22, 0x14, 0x18, 0x51, 0x3 gUnknown_0862A570:: @ 862A570 - .2byte 0x14D, 0x22, 0x14, 0x18, 0x51, 0x3 + .2byte 0x14D, 0x22, 0x14, 0x18, 0x51, 0x3 -gUnknown_0862A57C:: @ 862A57C - .4byte gUnknown_0862A48C - .4byte gUnknown_0862A498 - .4byte gUnknown_0862A4A4 - .4byte gUnknown_0862A4B0 - .4byte gUnknown_0862A4BC - .4byte gUnknown_0862A4C8 - .4byte gUnknown_0862A4D4 - .4byte gUnknown_0862A4E0 - .4byte gUnknown_0862A4EC - .4byte gUnknown_0862A4F8 +gUnknown_0862A57C:: @ 862A57C + .4byte gUnknown_0862A48C + .4byte gUnknown_0862A498 + .4byte gUnknown_0862A4A4 + .4byte gUnknown_0862A4B0 + .4byte gUnknown_0862A4BC + .4byte gUnknown_0862A4C8 + .4byte gUnknown_0862A4D4 + .4byte gUnknown_0862A4E0 + .4byte gUnknown_0862A4EC + .4byte gUnknown_0862A4F8 gUnknown_0862A5A4:: @ 862A5A4 - .4byte gUnknown_0862A504 - .4byte gUnknown_0862A510 - .4byte gUnknown_0862A51C - .4byte gUnknown_0862A528 - .4byte gUnknown_0862A534 - .4byte gUnknown_0862A540 - .4byte gUnknown_0862A54C - .4byte gUnknown_0862A558 - .4byte gUnknown_0862A564 - .4byte gUnknown_0862A570 - + .4byte gUnknown_0862A504 + .4byte gUnknown_0862A510 + .4byte gUnknown_0862A51C + .4byte gUnknown_0862A528 + .4byte gUnknown_0862A534 + .4byte gUnknown_0862A540 + .4byte gUnknown_0862A54C + .4byte gUnknown_0862A558 + .4byte gUnknown_0862A564 + .4byte gUnknown_0862A570 + gUnknown_0862A5CC:: @ 862A5CC .4byte gUnknown_0862A57C - .4byte gUnknown_0862A5A4 + .4byte gUnknown_0862A5A4 gUnknown_0862A5D4:: @ 862A5D4 - .incbin "baserom.gba", 0x62a5d4, 0x20 + .incbin "graphics/pokenav/862A5D4.gbapal" gUnknown_0862A5F4:: @ 862A5F4 .byte 0, 2, 3, 0 gUnknown_0862A5F8:: @ 862A5F8 .4byte gUnknown_08626814 - .4byte gUnknown_086276FC - .4byte gUnknown_086285E4 - .4byte gUnknown_086294CC - .4byte gUnknown_085EF8B6 - .4byte gUnknown_085EF8B9 - .4byte gUnknown_085EF8BC - .4byte gUnknown_085EF8BF + .4byte gUnknown_086276FC + .4byte gUnknown_086285E4 + .4byte gUnknown_086294CC + .4byte gUnknown_085EF8B6 + .4byte gUnknown_085EF8B9 + .4byte gUnknown_085EF8BC + .4byte gUnknown_085EF8BF gUnknown_0862A618:: @ 862A618 .4byte sub_81D581C @@ -3166,10 +3172,12 @@ gUnknown_0862A660:: @ 862A660 .4byte gUnknown_085EB361 gUnknown_0862A670:: @ 862A670 - .incbin "baserom.gba", 0x62a670, 0x18 + .byte 0, 0x64 + .4byte NULL + .2byte 0, 0x103, 17, 1, 0, 0, 0, 0, 0 gUnknown_0862A688:: @ 862A688 - .incbin "baserom.gba", 0x62a688, 0x10 + .2byte 0x3E, 0, 0x3F, 0, 0x40, 0, 0x41, 0 gUnknown_0862A698:: @ 862A698 - .incbin "baserom.gba", 0x62a698, 0x8 + .byte 0, 1, 2, 3, 4, 5, 0, 0 diff --git a/data/pokenav/unk_struct_1.bin b/data/pokenav/unk_struct_1.bin new file mode 100644 index 0000000000000000000000000000000000000000..18a696cf437bebef727416441b3ddc21fb603200 GIT binary patch literal 3816 zcmZ`+eQXrR6@PPgK92SISnR{+_~Xuo_^|5*{K1vjmk6I7ltLnksRD|c(i9v;RT3nF z)HYQcpmCE3lJp;>N+m_A)T(Nts!~gnw##|3*S@>;eVKxjrv8IJqEfXeY8xS0ZIGtF zH+#0R17qLLyqVwo&70YIZ{7wxKB|gV(Z*ULGh^C0QxZy$A0Dk-;}@6fl_x9aOQ z_k^Q+^`NJr>NdXd#HkR0V&Z#ecw4>z)Q zaiU0bQ#FM(iBFH=kVa4;ysPVRm-|==O)!6pH?;u+}DOoIcJufoCUDl zFa87@M#QJE8D-VlUO~r|%(Y1;r)Z^_x#HxC4h!2EEVO9tW7xqB4N`V$>qFgfL+{Ww zHS&*w>$F&Fr{1bV*84*n8Yp;3T&E;$6CaZYd&4w}SN~UfF{<{)GBcKIGW`)FIcy~VyEgm~ zjafTavz zhOvGkp~jP_SicMQsWHQVsgRkUCujAFJ}koIPzN5Jn7LAnz}j-g`?uY~_er{aJbk0h zbL!>P`tP6GxPI}JNd5OEZ$QeXZEbCJVWQHM4f;yy3vfPiW!3yk5rIrL2=HIkUhH!EXa1;+~&1HY}e_08wy;?vFhU zz};u)d1ddtc~@*mPnkI>rx8Xh*M~hk(LT)=^=O;)27Oo9qxt>Y;ic>0!;fg&>iz!e zuov+!t_y8LxK$5oeOf!cNmb%S+Db{R;|~7ZeO&U}xpHRK{1oH{D652 zzXo?!y~}Tix9HzMhQ#5|VXM$Hn<*DFjKrS*2E1e7)x@{fVlVDOPsy3IW^EUHb$)*S zqmSUXGnvx-!hGOretLRgVS0MHP$=XV@{ku6B9X`fmx??O8CvrsNrrwt ze`9`rMPA6~!MRGlOP{G%>qB0x4|dq(+LOPa$^uM)eLO9f3((0!W;0jISP#ktCYWC9 zwt+L=&rVhkRuA49IrkNFgt;|}pA*XUc~ zzGzcai#7%{-J=cQ=B=*v!f#2B)_b(-K%W*v|HHK#LwxpL#o0cAx0e#n;Jp2h@P7Ff z>$h=F@H?3^XAu?LApInn!2XPCgjb!-%7J6-#k0UpI1>fiy;JBMV)O}mh*Dx6Bdd84 zZpg`+#geIlw0wbH1@qguRm!WdeC7k_$=K-`yHw^IR~|sTHx-g2{R%Iz7tf=om~pON zF1SXt;mqHQm)GX<<{bBGCOKynoSdCz2k?M~I<=Zmt3T+AgtTa<*6MEwwMRKu>D0au zu4#6q_NWMSYLVKF0SYGJi?=C`tl{sht{fLN-jv*(N27=pl&-mF`&scmu&>ht$Ql6k z1I ze>AZeWo*u#aPnnKg{L^MNpX}eA=0Q2qu?&@hYE}97AXS9V86nCh8us|=dgT_!`6a* z-7HK1%lBD4UKifVwrzdii?Ql%c^T9Baj&MkeB2BI0f2HY3eJ&N*!Z_;+%Q;YK= z`}OUp>zb?ersxC6itCzt;kn+RM~moDy{>tOUe%bQcd13JqX6QmDpGOjzc_zTOQ8dK z_>6g7ogw)te5OUbgq(VZ3#AJxPX_iZ$NtM1yI8c;;grva4}d*_?E7tu9EWC(brdh( zDU*eAcGgz8uRJT>0ro6?ohtYKiVcc)5=X+Cb2t@~J;>`@#G~TNxP?&A!8jU$C z=VYDI6uRX!?!XrDFr6We9Vjcj8ry3XXDbnjq~=*bbxNr zf9MH}pj7PQIHmR`<2cG`G4d4F`yBOx`NzvZG?sa@W%XU6SjNO9#d(vSfZyV~MB?kD zf_(*zQo)(E@xg$F?U6I{9wJ!n<#&$6< z64)6rTp1P1>ZuY{S62M72ozj-nJ3iU)64MQjFZ@|Q+W2Q zXXgFhn>TOXo3~b&7dj8N!pJB<*(w&zeA?mw{eaZkF`$Ch=IPfi?r2wr)gIqhyEXPjS#TlIDg92-? zqwsIS)M7)|<3!rAW=*>|PuL!T-33GNSW|4lK5M446jPk!EKOi#0nd}vojfIzEGK+<@_^&EyB0Z&S;(5z3sq>vYWBWc3Rkg+q__=ta6sa zW>VaRp4#T?P@lc2#oreg(ndl|RkdKy8|v14z1MHqt8qS}ZVGG-b_N2$t-ZtO#S%OP zV?bUb50DnnKKas@jhu$Rz=eefuY!O^R*L7Yju#gglo0{a~5y$tuUb4_d@y=lkH6|5q8 zoxg~B2ibRU9Qx3YG=qTZ-UwSNo5h?h?Y(t!axxs=+|ju=Jb_&$q7xZWBJ3-XA-pkmKL5QuQsB?BFW`RGTyGrpTHhBOw?fwe@D~spfKQ;A4TLpQ7;aKAZ$}$O z*ukbY5Vl~?WGuH_b}>u;jCvp00EguF_SC>ci`Y4AdF|)(LVRa{FbQa!+|3VK7!!sz22Q3eU z>TT#9oSAc7yml#sfZqilKo}-q91b^P&$Qr7!FB98Q{MgK@FAkYSQif<=Q6wo^c8hH zB(SCVnM(RBDdtaOoqY%{VVCHNjG!u(a0amnH?0SBXy`&ehS+^*`PYNvQ zB&x%nc@<~Um6V$ouA^GyIF=>kM7^czI-!kes&}u(Fjw0`s<$-+{w+#pple`Q9opjc zGj%*TrZHb{ptbh_I1hh>S(t+dX)Uo0?5z1QXJ+zN&MxC}{AGbX1e@S6)~|Z3jzX4W zrORfja^V8!Uskb)8R@-@joc{pQfJmN&DmLc#Q}ad*3ggP1)4^x+pq9V3NI>GK+#WF zL)WqOJ{RX>=dCo|GDt`2u=RRhMgDmg^%heCEc13-Z(p_EPGcS<5+_fd{JZEV-Jkzs zl|IA1(rtFH67{a;cUKV-*Mu(^t6G}yQR_OSIiD;*41SyPSCu!l&s?W&)5Lmvyycfy z7;MyfLWB2=-2!md&ZY2mhE8LYd`vMm(KU`0;t}tNI-uO{Zh3EZfTXweSh zU59UeJGBng#kafvkf0!O{M6G{mY4Q>JOGuvJ6BB^?qXCn#lEt%pWY4Xv6ZISOUIV> zc`#aQvA45#VU&Fc53`?e>Ayi9=qqEh?exm2Qo+v8$fCj@quR_4;oCQ1k+=vKksob1 zEI5^tBXg0z#@<8hJ?x--udl_PAuPsQ$}-Dh)3fw%!!A*%j*wcW4s6jv-rg|24{z7{ z0&M}0daIA~KE;c9ysK+J`jshOyan6Ey?CuXoQ6|B)$ZZ(YwUsU%AB3AtorP+LP?_@SxKSB~LXVlvkH+{HVs<}8I1QJwZ9U)tAl)wwU!Vi6{N&X4i^ ztU+&Mz5PpMN{{J}>PL+OL`pPvBt}h-$?+4Bm@#EgljFZ4=SVCfni10#As?BF#-akH z5J$?Bjw8wwB&)|F$knkaQr^+{*Xl0S3oUF&M<(H|u^mAKg8;=U4hX>2m-8 literal 0 HcmV?d00001 diff --git a/data/pokenav/unk_struct_3.bin b/data/pokenav/unk_struct_3.bin new file mode 100644 index 0000000000000000000000000000000000000000..93273aae2861c64f79485dbf193537cc13c4edba GIT binary patch literal 3816 zcmai1e{36f6@Ox=7RX zBz@n-iUlrq1WZmdCiFBz$@Y>#PtX^sAh6M|M=822_tOAe(v5sp%Udk>ZRjvVUy}Oh zDrP`7i*R%(!yv60xx8fvxd)|psfVhmX+8ElV>6neCvsLQVUvBGF3=(RH$Au>8)mGf zrKZfh_?A7UTZU#OnW@A@l2W1W^p}OHyx!lgg7bNl&0%k#0Y3FBHR?m5R;5I#uCEE! z_`>DBz@T)I{sSADB(@>WPGniak2^51^mHl#JFrpq9(s==w2!t3EGF03J7K1i`NWj4 zx0L2+FRZLE`JVxs(Iyg_HDN-q{W;R;IDKAv zPGDE*ApB@))2XDE<+!qc3O}BvC!`10V}&0xW;$o-S)uQ>h2p}MEBBUH{CDwYu~?L^ z6^e!V`T4~wA1*Knz8H^-m-F)l!N=$3;`2q!79D2ui_ZkowCr2TuyUa+)>k)`%A5mzWjcRak|6lhMr? zQHkO6O6dYMu97R3vRuW@+smmbor{|NJpGmHu1m0&jdpdo8-qlC%rtl>fh|KlXyB0` z)0Nr$0pfn!k8B(3YiT*uq@0M6o$c-Ik^Aqhs;-N)VJL6M zt+lCkTWwP-M(y&M;rMWD_!O?#@aS+{9yuMyFXrAyWKx>MPzwyB>{{8fHG=k~_neN{ov zzVZ_K3q3^#k&ADMJz0vk$Un~Q!f{TCNzKaWY27sJsEku_FMSu4{~gTS#7L0JSRT!2 zR?f6?oa9jtWpUmX=(BVMGYASN!IrV9OSA5AOVQT^c8*@4t-#)dSRq+pS%)!gHm&R9 z9B|QJK!@K$*S+)=mMel21A+Bokg&{zX=pP5N6*2w=U~}yXb3YL#UePx8OSmJr+g}{ zT@w94R5MbuVgy;3q9#QNl`ETrL67WdfbW$0-Kd8Ys17JWU!X2r7xv)XRm#1APpRAe z6!?(drZ!ZcKT-r)cKchlZ9mL5WHY9jn9Os5Z9a^iAwoOg$9BxD#u|8|UCz5HL(L!I zT)YcigN%B)7K;~zt(i)RHi4Rdi+XSmG}uAkX6&t{Tx1;>n@H>9pBZ-8B`uhZj9jLixtHH*BBY%Z_Z>*Vc` zt`#)UB_HWJ*5BWM6xSdw=KEIw1mFKs{{Sw=F~5S2IrF@DKwy^V2V9gq(uJ(*LWSUG zyzBq+*PMkfF0H@T<(#I+#A85q=iTX|JWzb8c&vD|c%e90JYF2UL*5oocsuM~Z-;mu zf8+rF?Bi0$C*r*Q`Kz^?_U<7{qAzq@Mm~13gm~k8ZBkn*cPbsB9coo&MX=tlpugjD zBj};PcC`toZcC-4Nd7<2kLh)KQhJ8?T#T|PF4-cszk@+GpEPGoGl}NP&S3u{h|PB5 zNW=@=L5w{g!yubBXQood1m4>>5XY_bwDc6ZR6({t3%R`4x{=dUjsW{>sOKd#g(!NA zPnIRY0?WBLnaX8M0~N%u?Z4q%iy(&nj1J*8)X@PE#eH%v<+#KiL4Vgnorw4^V+OQB zhb>?)YtuL9=8YUoiO zMsAmsH)8Zv*l-X1n!ZIpT>cOSYivOIfp!0cA2aac@8C(i(+V3Ho6V;ZdDq_ek+-ele?bZRaV1vtzLRF&NSY?s4*Os5V;|+|25l2a zcQcpu&EiiFDzNw;^AoxZZ6B9*yFSNqUbDQHDA%ln=)bv-TwKI?`#w5j^vNHf>nw7s z%iS{g8{z>_K_tdfD!A@T+cp-QNza-B=_P>|Pa477y4n1?=WBdaY@RYjCau~d-< z+qH3=s;(51R#s~iXPn0>YWnENRXecb^_tlom|eUM;GlhqTB$F6aU;{FV{7`II}6@j zlHS$ax#ynmo;mm2^K(}fjWoPpp~NvF%en2@>44B0xEs7=8tVLf-Wp z>pp)Vcu09V1nfH91F1Zw5G=9$@m$s^TKOf3-Gtmj^e@OgDTr9C0z@eHA_l8o!Sb^C z48Xx@ahZmt4mZGoTrAkezKub_v6ez81vAir^<9^c-8w8;`HWRqx?|;o;Jk3?Wx;!U z2~ujYEO!l9*DctrgPqRuo7;ZwhBRTk2z#|e_A5QGU81AU=!%iPPu-_B>alpt=ro=; z`r8zv+h~a>ojK?=NeMbe`>@|UoyLR4wy|3=C^&AZvWeg>y$9@J`hl1M2X+aqF74QZ z8N0A-yLqWiaF)taZVHm?u%Xf-vgGnhjMSDoC#}2a&85_3oLb>mXk0Ccjr^KDF z##&z5zUO8E4@RZjY5G2_UZ;bUYvFvXH7f_nL4PutOeCI-wI59!!%$^9nLM13l%!Q| z$*@nV(=+M>T8TR*Mv`g@t;C($KdMfTs!N-jn;+nD)X^DrI;pOe&6$}Qv+Sw;k}iN8 z!^C=puH}!arEGb?*68@;H&_rfn~~$iX7xRv>N_ zwOtg}Jy7kN4-JeFpUV(l2UtcpD#Pe|K!@ zaKV3o{Sf)!R0S)uK}BE27C-f@d=}0Of4c_kL3rCX7VMq9F*fa485dv#Y+yOr#jM4u zQyX_e+iSGO*ovgLsH7*1m)c%5BHF?D0i#|2!=bJ?>C)CllNOD{I)6~gbai8TXD!QNx*EXrc_6lB)UCg% zUfq~C&H0UT_%hWBS*}c|A(x|Ea(40S*H_0Zk1sVmxhO`0*TqQH8xb4+g5aZnh=HLK z@Kf9K?EE4dtr>Qs0lhWeskES0M6>}ti9XR5i#O;4daw3^(V`;%2QBb5L+e%=^dMM9 ze0@P<$m)N?>i-hXmycM+?e8%txeE)cw{P1;oZnlhi$}y5-9Y5jWBL5-`^%2I8W#UQ z!Z+98Z70PKcVRI>i=Mk+K`2@<0H6OU{OvPZ09jKP?QdWvy_zX{Sy%eS8}uh?5MLlh zehv=%ri@&vZxd#0$6hRQG6Q;&?m~k#TCVtU1uU^KV5{rTqUAYmvB;6z0T%2iG(rXp z?KmVe-GNTyIksbq+Gjl57SY&_&02dS+wqsUUvRa}QXf{=+K~Gk#OmzRHY4Wy*kS5{X1D_5@Y1o%u!nkPUr8PZpn zmh2UO4hsNKOU(5=Kb!#Vq4|&SV*umP{D0zCp&9?^k?%jM&>l~$_>w&beC2x~n`sHC zu$h(#k*SZw z!0-t2qU(iKg6LJ4kTk??i}8Zd+D*D9W3{PGXnT}!9L4wu#sp6jN*pz#fHS!+E0T@X zr}=WnkMs*J;J01mg`#H{3PJD&PWd__=8}vV!ud-VkmsiZTNN|G6f(hedL6NI5}X?B z@I}Vnw=qK1Kg3s|?UEVNvbod=+>gxn!xmL&)?C2oxY_)abrj(na*8pYQ zQ|vsb>N=6J?nx%5$MDbz+)CPwuIFMJ>BptLdbPdX?Tx+KL8HBK(D;@?dY|5f>btkQ zMCU^K#KtI)M4rFycc?a?JBQcCyHQNSq zLoIjCC-bT0S!q|+&`EhdYp9LVHoLJ^_hhy?=hY_skEpk~jPa`4oJam+Y!;FUb@~$` zHlNgi^K~v;NPD(*Zxucg-jh*p!<(@>?{7WX+VaQ!ExdhG^-X`v_d)x3o4(4OKh8zd zXO_yK@xeiJaBv*t6YzazmKlO2pvS=}Z2F}Zyv>q2NF%Z8GnO+!i%Zj>~;&pqzN31Z`$4W=6&zY?0fT#hgFd)Lx#W8Aq6?xhT8SOOa<}?dgJBpCR^z z3>u@ewD=cx2Q%Bt3(s6^H`}CM%Cae%gvUN2NAeCVOt?p+m@rMNt*u3CJ)i8cEX$kF zb;~ex-RMd~9NWT-C2YrU3UTZ-@CM-U$6UWn@497NL;cx1eW#>b3tcxVD zthD!E%WC!heCB>;BJ+avWwM#GG&Rz1AO7YZb$YJN%W5Z|!? literal 0 HcmV?d00001 diff --git a/graphics/pokenav/86231E8.pal b/graphics/pokenav/86231E8.pal new file mode 100755 index 0000000000..98c309d52a --- /dev/null +++ b/graphics/pokenav/86231E8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +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 255 0 +0 255 0 diff --git a/graphics/pokenav/8623208.pal b/graphics/pokenav/8623208.pal new file mode 100755 index 0000000000..7c8a712755 --- /dev/null +++ b/graphics/pokenav/8623208.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +98 98 98 +213 213 205 +65 205 255 +0 139 189 +255 156 148 +189 90 82 +98 98 115 +246 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokenav/8623338.pal b/graphics/pokenav/8623338.pal new file mode 100755 index 0000000000..9b39ac8cf9 --- /dev/null +++ b/graphics/pokenav/8623338.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 222 246 +164 197 230 +172 205 230 +255 255 255 +230 238 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 diff --git a/graphics/pokenav/8623570.pal b/graphics/pokenav/8623570.pal new file mode 100755 index 0000000000..18eea783eb --- /dev/null +++ b/graphics/pokenav/8623570.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 197 0 +98 172 230 +255 255 255 +106 115 123 +0 0 0 +41 222 255 +0 90 172 +255 164 205 +148 24 32 +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/pokenav/8623790.pal b/graphics/pokenav/8623790.pal new file mode 100755 index 0000000000..da3be28fd1 --- /dev/null +++ b/graphics/pokenav/8623790.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 197 0 +255 156 106 +255 255 255 +106 115 123 +0 0 0 +41 222 255 +0 90 172 +255 164 205 +148 24 32 +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/pokenav/8624098.pal b/graphics/pokenav/8624098.pal new file mode 100755 index 0000000000..2fc3f3d064 --- /dev/null +++ b/graphics/pokenav/8624098.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 197 0 +255 205 222 +0 0 0 +205 205 205 +0 0 0 +41 222 255 +0 90 172 +255 164 205 +148 24 32 +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/pokenav/862A5D4.pal b/graphics/pokenav/862A5D4.pal new file mode 100755 index 0000000000..4b0812f094 --- /dev/null +++ b/graphics/pokenav/862A5D4.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 From 3c93557bcf720dcb0e3fe3cb1c4df7eb2d0369f9 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Wed, 17 Jan 2018 23:10:26 -0500 Subject: [PATCH 35/64] tab fixing --- data/slot_machine.s | 318 ++++++++++++++++++++++---------------------- 1 file changed, 159 insertions(+), 159 deletions(-) diff --git a/data/slot_machine.s b/data/slot_machine.s index a3db540fac..b25d496d94 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -12,7 +12,7 @@ gUnknown_085A7424:: @ 85A7424 gUnknown_085A7434:: @ 85A7434 window_template 0, 2, 15, 0x1B, 4, 15, 0x194 - window_template_terminator + window_template_terminator gUnknown_085A7444:: @ 85A7444 window_template 0, 1, 3, 20, 13, 13, 1 @@ -22,98 +22,98 @@ gUnknown_085A744C:: @ 85A744C gUnknown_085A7450:: @ 85A7450 .4byte sub_812AB04 - .4byte sub_812AB38 - .4byte sub_812AB60 - .4byte sub_812ABA8 - .4byte sub_812ABC8 - .4byte sub_812ABF8 - .4byte sub_812ACF4 - .4byte sub_812AD34 - .4byte sub_812AD60 - .4byte sub_812AD80 - .4byte sub_812ADF4 - .4byte sub_812AE24 - .4byte sub_812AE4C - .4byte sub_812AE88 - .4byte sub_812AEC4 - .4byte sub_812AFFC - .4byte sub_812B01C - .4byte sub_812B094 - .4byte sub_812B0D8 - .4byte sub_812B108 - .4byte sub_812B130 - .4byte sub_812B158 - .4byte sub_812B1B0 - .4byte sub_812B214 - .4byte sub_812B254 - .4byte sub_812B280 - .4byte sub_812B2C0 - .4byte sub_812B2EC - .4byte sub_812B32C + .4byte sub_812AB38 + .4byte sub_812AB60 + .4byte sub_812ABA8 + .4byte sub_812ABC8 + .4byte sub_812ABF8 + .4byte sub_812ACF4 + .4byte sub_812AD34 + .4byte sub_812AD60 + .4byte sub_812AD80 + .4byte sub_812ADF4 + .4byte sub_812AE24 + .4byte sub_812AE4C + .4byte sub_812AE88 + .4byte sub_812AEC4 + .4byte sub_812AFFC + .4byte sub_812B01C + .4byte sub_812B094 + .4byte sub_812B0D8 + .4byte sub_812B108 + .4byte sub_812B130 + .4byte sub_812B158 + .4byte sub_812B1B0 + .4byte sub_812B214 + .4byte sub_812B254 + .4byte sub_812B280 + .4byte sub_812B2C0 + .4byte sub_812B2EC + .4byte sub_812B32C gUnknown_085A74C4:: @ 85A74C4 .4byte sub_812BB34 - .4byte sub_812BB68 - .4byte sub_812BC20 + .4byte sub_812BB68 + .4byte sub_812BC20 gUnknown_085A74D0:: @ 85A74D0 .4byte sub_812BF64 - .4byte sub_812BF68 - .4byte sub_812BF88 - .4byte sub_812C01C - .4byte sub_812C0E0 + .4byte sub_812BF68 + .4byte sub_812BF88 + .4byte sub_812C01C + .4byte sub_812C0E0 gUnknown_085A74E4:: @ 85A74E4 .4byte sub_812C138 - .4byte sub_812C3A0 - .4byte sub_812C4BC + .4byte sub_812C3A0 + .4byte sub_812C4BC gUnknown_085A74F0:: @ 85A74F0 .4byte sub_812C5DC - .4byte sub_812C628 - .4byte sub_812C8FC + .4byte sub_812C628 + .4byte sub_812C8FC gUnknown_085A74FC:: @ 85A74FC .2byte 2, 4, 4, 4, 8, 0 gUnknown_085A7508:: @ 85A7508 .4byte sub_812C238 - .4byte sub_812C290 - .4byte sub_812C290 + .4byte sub_812C290 + .4byte sub_812C290 gUnknown_085A7514:: @ 85A7514 .4byte sub_812C3C8 - .4byte sub_812C3C8 - .4byte sub_812C414 + .4byte sub_812C3C8 + .4byte sub_812C414 gUnknown_085A7520:: @ 85A7520 .4byte sub_812C500 - .4byte sub_812C500 - .4byte sub_812C55C + .4byte sub_812C500 + .4byte sub_812C55C gUnknown_085A752C:: @ 85A752C .4byte sub_812C64C - .4byte j5_08111E84 - .4byte sub_812C74C + .4byte j5_08111E84 + .4byte sub_812C74C gUnknown_085A7538:: @ 85A7538 .4byte sub_812C920 - .4byte sub_812CA08 - .4byte sub_812CB80 + .4byte sub_812CA08 + .4byte sub_812CB80 gUnknown_085A7544:: @ 85A7544 .4byte sub_812CDA4 - .4byte sub_812CDD8 - .4byte sub_812CDF4 + .4byte sub_812CDD8 + .4byte sub_812CDF4 gUnknown_085A7550:: @ 85A7550 .2byte 5, 10, 15, 0 gUnknown_085A7558:: @ 85A7558 .4byte nullsub_50 - .4byte sub_812D264 - .4byte sub_812D28C - .4byte sub_812D30C + .4byte sub_812D264 + .4byte sub_812D28C + .4byte sub_812D30C gUnknown_085A7568:: @ 85A7568 .2byte 0x9E @@ -123,24 +123,24 @@ gUnknown_085A756A:: @ 85A756A gUnknown_085A7574:: @ 85A7574 .4byte sub_812D51C - .4byte sub_812D594 - .4byte sub_812D60C - .4byte sub_812D63C - .4byte sub_812D6EC - .4byte sub_812D740 - .4byte sub_812D774 - .4byte sub_812D7E4 - .4byte sub_812D870 - .4byte sub_812D920 - .4byte sub_812D950 - .4byte sub_812D9A4 - .4byte sub_812DA20 - .4byte sub_812DA6C - .4byte sub_812DA90 - .4byte sub_812DB04 - .4byte sub_812DB8C - .4byte sub_812D950 - .4byte sub_812DBBC + .4byte sub_812D594 + .4byte sub_812D60C + .4byte sub_812D63C + .4byte sub_812D6EC + .4byte sub_812D740 + .4byte sub_812D774 + .4byte sub_812D7E4 + .4byte sub_812D870 + .4byte sub_812D920 + .4byte sub_812D950 + .4byte sub_812D9A4 + .4byte sub_812DA20 + .4byte sub_812DA6C + .4byte sub_812DA90 + .4byte sub_812DB04 + .4byte sub_812DB8C + .4byte sub_812D950 + .4byte sub_812DBBC gUnknown_085A75C0:: @ 85A75C0 .byte 1, 1, 2, 2 @@ -153,20 +153,20 @@ gUnknown_085A75CC:: @ 85A75CC gUnknown_085A75D4:: @ 85A75D4 .4byte sub_812DD04 - .4byte sub_812DD28 - .4byte sub_812DD48 - .4byte sub_812DD28 - .4byte sub_812DD78 - .4byte sub_812DD28 - .4byte sub_812DDC4 - .4byte sub_812DD28 - .4byte sub_812DE14 - .4byte sub_812DD28 - .4byte sub_812DE30 - .4byte sub_812DD28 - .4byte sub_812DE48 - .4byte sub_812DD28 - .4byte sub_812DE7C + .4byte sub_812DD28 + .4byte sub_812DD48 + .4byte sub_812DD28 + .4byte sub_812DD78 + .4byte sub_812DD28 + .4byte sub_812DDC4 + .4byte sub_812DD28 + .4byte sub_812DE14 + .4byte sub_812DD28 + .4byte sub_812DE30 + .4byte sub_812DD28 + .4byte sub_812DE48 + .4byte sub_812DD28 + .4byte sub_812DE7C gUnknown_085A7610:: @ 85A7610 .4byte nullsub_51 @@ -197,8 +197,8 @@ gUnknown_085A765E:: @ 85A765E gUnknown_085A766E:: @ 85A766E .byte 0, 4, 2, 6, 5, 3, 1, 3, 4, 5, 6, 2, 0, 5, 3, 6, 2, 1, 5, 3, 6 - .byte 0, 4, 6, 3, 2, 4, 6, 5, 5, 3, 1, 3, 6, 4, 2, 3, 6, 4, 3, 6, 4 - .byte 0, 5, 1, 6, 3, 2, 6, 3, 5, 2, 6, 3, 2, 5, 6, 3, 2, 5, 6, 3, 4 + .byte 0, 4, 6, 3, 2, 4, 6, 5, 5, 3, 1, 3, 6, 4, 2, 3, 6, 4, 3, 6, 4 + .byte 0, 5, 1, 6, 3, 2, 6, 3, 5, 2, 6, 3, 2, 5, 6, 3, 2, 5, 6, 3, 4 gUnknown_085A76AD:: @ 85A76AD .byte 1, 0, 5, 4, 3, 2, 0 @@ -208,71 +208,71 @@ gUnknown_085A76B4:: @ 85A76B4 gUnknown_085A76C0:: @ 85A76C0 .byte 1, 1, 12 - .byte 1, 1, 14 - .byte 2, 2, 14 - .byte 2, 2, 14 - .byte 2, 3, 16 - .byte 3, 3, 16 + .byte 1, 1, 14 + .byte 2, 2, 14 + .byte 2, 2, 14 + .byte 2, 3, 16 + .byte 3, 3, 16 gUnknown_085A76D2:: @ 85A76D2 .byte 0x19, 0x19, 0x1E, 0x28, 0x28, 0x32 - .byte 0x19, 0x19, 0x1E, 0x1E, 0x23, 0x23 - .byte 0x19, 0x19, 0x1E, 0x19, 0x19, 0x1E + .byte 0x19, 0x19, 0x1E, 0x1E, 0x23, 0x23 + .byte 0x19, 0x19, 0x1E, 0x19, 0x19, 0x1E gUnknown_085A76E4:: @ 85A76E4 .byte 0x14, 0x19, 0x19, 0x14, 0x19, 0x19 - .byte 0xC, 0xF, 0xF, 0x12, 0x13, 0x16 - .byte 0x19, 0x19, 0x19, 0x1E, 0x1E, 0x28 - .byte 0x19, 0x19, 0x14, 0x14, 0xF, 0xF - .byte 0x28, 0x28, 0x23, 0x23, 0x28, 0x28 + .byte 0xC, 0xF, 0xF, 0x12, 0x13, 0x16 + .byte 0x19, 0x19, 0x19, 0x1E, 0x1E, 0x28 + .byte 0x19, 0x19, 0x14, 0x14, 0xF, 0xF + .byte 0x28, 0x28, 0x23, 0x23, 0x28, 0x28 gUnknown_085A7702:: @ 85A7702 .byte 0xF3, 0xF3, 0xF3, 0x50, 0x50, 0x50, 0x50, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x5, 0x5, 0x5, 0x5 - .byte 0x5, 0x5, 0x5, 0x96, 0x96, 0x96, 0x96, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x64, 0x64, 0x64, 0x5 - .byte 0x4, 0x4, 0x4, 0x14, 0x14, 0x14, 0x14, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x64, 0x64, 0x64, 0x28 - .byte 0x2, 0x2, 0x2, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x2D, 0x2D, 0x2D, 0x64 - .byte 0x1, 0x1, 0x1, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x5, 0x5, 0x5, 0x64 - .byte 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x6 + .byte 0x5, 0x5, 0x5, 0x96, 0x96, 0x96, 0x96, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x64, 0x64, 0x64, 0x5 + .byte 0x4, 0x4, 0x4, 0x14, 0x14, 0x14, 0x14, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x64, 0x64, 0x64, 0x28 + .byte 0x2, 0x2, 0x2, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x2D, 0x2D, 0x2D, 0x64 + .byte 0x1, 0x1, 0x1, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x5, 0x5, 0x5, 0x64 + .byte 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x6 gUnknown_085A7768:: @ 85A7768 .byte 0xF3, 0xF3, 0xF3, 0xC8, 0xC8, 0xC8, 0xC8, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0x46, 0x46, 0x46, 0x05 - .byte 0x05, 0x05, 0x05, 0x19, 0x19, 0x19, 0x19, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x02, 0x02, 0x02, 0x06 - .byte 0x04, 0x04, 0x04, 0x19, 0x19, 0x19, 0x19, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x28, 0x28, 0x28, 0x23 - .byte 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x64, 0x64, 0x64, 0x32 - .byte 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x28, 0x28, 0x28, 0x64 - .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x04, 0x04, 0x04, 0x3C + .byte 0x05, 0x05, 0x05, 0x19, 0x19, 0x19, 0x19, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x02, 0x02, 0x02, 0x06 + .byte 0x04, 0x04, 0x04, 0x19, 0x19, 0x19, 0x19, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x28, 0x28, 0x28, 0x23 + .byte 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x64, 0x64, 0x64, 0x32 + .byte 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x28, 0x28, 0x28, 0x64 + .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x04, 0x04, 0x04, 0x3C gUnknown_085A77CE:: @ 85A77CE .2byte 0x80, 0xAF, 0xC8, 0xE1, 0x100 gUnknown_085A77D8:: @ 85A77D8 .byte 10, 0, 5, 0 - .byte 10, 0, 10, 0 - .byte 10, 0, 15, 0 - .byte 10, 0, 25, 0 - .byte 10, 0, 35, 0 + .byte 10, 0, 10, 0 + .byte 10, 0, 15, 0 + .byte 10, 0, 25, 0 + .byte 10, 0, 35, 0 gUnknown_085A77EC:: @ 85A77EC .byte 0, 0 - .byte 5, 0 - .byte 10, 0 - .byte 15, 0 - .byte 20, 0 + .byte 5, 0 + .byte 10, 0 + .byte 15, 0 + .byte 20, 0 gUnknown_085A77F6:: @ 85A77F6 .byte 6, 4, 3, 2, 5, 0, 0, 0 gUnknown_085A77FE:: @ 85A77FE .byte 0x80, 0 - .byte 0x20, 0 - .byte 0x40, 0 + .byte 0x20, 0 + .byte 0x40, 0 gUnknown_085A7804:: @ 85A7804 .byte 16, 0 - .byte 8, 0 - .byte 4, 0 - .byte 2, 0 - .byte 1, 0 + .byte 8, 0 + .byte 4, 0 + .byte 2, 0 + .byte 1, 0 gUnknown_085A780E:: @ 85A780E .byte 7, 8, 4, 3, 0, 5, 2, 0 @@ -285,42 +285,42 @@ gUnknown_085A7828:: @ 85A7828 gUnknown_085A783A:: @ 85A783A .2byte 0xD0, 0x38 - .2byte 0xB8, 0 - .2byte 0xC8, 8 - .2byte 0xD8, 0x10 - .2byte 0xE8, 0x18 - .2byte 0xD0, 0x48 - .2byte 0xD0, 8 - .2byte 0xD0, 0x40 - .2byte 0xD0, 0x38 - .2byte 0xC0, 0x58 - .2byte 0xE0, 0x58 - .2byte 0xC0, 0x78 - .2byte 0xE0, 0x78 - .2byte 0x90, 0x38 - .2byte 0x110, 0x58 - .2byte 0xA8, 0x70 - .2byte 0xD0, 0x54 - .2byte 0xD0, 0x70 - .2byte 0xBC, 0x34 - .2byte 0xD0, 0x34 - .2byte 0xE4, 0x34 - .2byte 0xB8, 0x48 - .2byte 0xC4, 0x48 - .2byte 0xD0, 0x48 - .2byte 0xDC, 0x48 - .2byte 0xE8, 0x48 - .2byte 0xBC, 0x34 - .2byte 0xD0, 0x34 - .2byte 0xE4, 0x34 - .2byte 0xB8, 0x48 - .2byte 0xC4, 0x48 - .2byte 0xD0, 0x48 - .2byte 0xDC, 0x48 - .2byte 0xE8, 0x48 - .2byte 0x00, 0x00 - .2byte 0 - + .2byte 0xB8, 0 + .2byte 0xC8, 8 + .2byte 0xD8, 0x10 + .2byte 0xE8, 0x18 + .2byte 0xD0, 0x48 + .2byte 0xD0, 8 + .2byte 0xD0, 0x40 + .2byte 0xD0, 0x38 + .2byte 0xC0, 0x58 + .2byte 0xE0, 0x58 + .2byte 0xC0, 0x78 + .2byte 0xE0, 0x78 + .2byte 0x90, 0x38 + .2byte 0x110, 0x58 + .2byte 0xA8, 0x70 + .2byte 0xD0, 0x54 + .2byte 0xD0, 0x70 + .2byte 0xBC, 0x34 + .2byte 0xD0, 0x34 + .2byte 0xE4, 0x34 + .2byte 0xB8, 0x48 + .2byte 0xC4, 0x48 + .2byte 0xD0, 0x48 + .2byte 0xDC, 0x48 + .2byte 0xE8, 0x48 + .2byte 0xBC, 0x34 + .2byte 0xD0, 0x34 + .2byte 0xE4, 0x34 + .2byte 0xB8, 0x48 + .2byte 0xC4, 0x48 + .2byte 0xD0, 0x48 + .2byte 0xDC, 0x48 + .2byte 0xE8, 0x48 + .2byte 0x00, 0x00 + .2byte 0 + gUnknown_085A78C8:: @ 85A78C8 .4byte sub_812F078 From ec8594fd101573f9c1854a4a90f5378f1a1ea512 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Thu, 18 Jan 2018 04:06:43 -0600 Subject: [PATCH 36/64] Extract Wanda PC box wallpapers --- asm/pokemon_storage_system.s | 4 +- data/graphics.s | 38 +- data/pokemon_storage_system.s | 419 ++++++++++++++++-- data/strings.s | 60 +-- graphics/pokemon_storage/aqua_icon.png | Bin 0 -> 115 bytes graphics/pokemon_storage/asterisk_icon.png | Bin 0 -> 119 bytes graphics/pokemon_storage/azumarill.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/azumarill_bg.png | Bin 0 -> 216 bytes .../pokemon_storage/big_asterisk_icon.png | Bin 0 -> 112 bytes graphics/pokemon_storage/blank.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/blank_bg.png | Bin 0 -> 152 bytes graphics/pokemon_storage/block.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/block_bg.png | Bin 0 -> 197 bytes graphics/pokemon_storage/bolt_icon.png | Bin 0 -> 72 bytes graphics/pokemon_storage/brick_icon.png | Bin 0 -> 90 bytes graphics/pokemon_storage/circle_icon.png | Bin 0 -> 107 bytes graphics/pokemon_storage/circles.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/circles_bg.png | Bin 0 -> 262 bytes graphics/pokemon_storage/cross_icon.png | Bin 0 -> 72 bytes graphics/pokemon_storage/crystal_icon.png | Bin 0 -> 118 bytes graphics/pokemon_storage/diagonal.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/diagonal_bg.png | Bin 0 -> 221 bytes graphics/pokemon_storage/diglett_icon.png | Bin 0 -> 118 bytes graphics/pokemon_storage/dot_icon.png | Bin 0 -> 94 bytes graphics/pokemon_storage/dusclops.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/dusclops_bg.png | Bin 0 -> 284 bytes graphics/pokemon_storage/five_star_icon.png | Bin 0 -> 111 bytes graphics/pokemon_storage/footprint_icon.png | Bin 0 -> 114 bytes .../pokemon_storage/four_circles_icon.png | Bin 0 -> 110 bytes graphics/pokemon_storage/four_star_icon.png | Bin 0 -> 104 bytes graphics/pokemon_storage/frame.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/frame_bg.png | Bin 0 -> 252 bytes graphics/pokemon_storage/friends_frame1.png | Bin 0 -> 298 bytes graphics/pokemon_storage/friends_frame2.png | Bin 0 -> 297 bytes graphics/pokemon_storage/heart_icon.png | Bin 0 -> 115 bytes .../horizontal.bin} | Bin graphics/pokemon_storage/horizontal_bg.png | Bin 0 -> 196 bytes graphics/pokemon_storage/koffing_icon.png | Bin 0 -> 120 bytes graphics/pokemon_storage/latis_icon.png | Bin 0 -> 115 bytes graphics/pokemon_storage/legendary.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/legendary_bg.png | Bin 0 -> 416 bytes graphics/pokemon_storage/line_circle_icon.png | Bin 0 -> 95 bytes graphics/pokemon_storage/lotad_icon.png | Bin 0 -> 113 bytes graphics/pokemon_storage/ludicolo.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/ludicolo_bg.png | Bin 0 -> 387 bytes graphics/pokemon_storage/luvdisc_icon.png | Bin 0 -> 116 bytes graphics/pokemon_storage/magma_icon.png | Bin 0 -> 112 bytes graphics/pokemon_storage/maze_icon.png | Bin 0 -> 104 bytes graphics/pokemon_storage/minun_icon.png | Bin 0 -> 111 bytes graphics/pokemon_storage/pichu_icon.png | Bin 0 -> 110 bytes graphics/pokemon_storage/pikachu.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/pikachu_bg.png | Bin 0 -> 286 bytes graphics/pokemon_storage/plusle_icon.png | Bin 0 -> 72 bytes graphics/pokemon_storage/pokeball_icon.png | Bin 0 -> 120 bytes graphics/pokemon_storage/pokecenter2.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/pokecenter2_bg.png | Bin 0 -> 286 bytes graphics/pokemon_storage/pss_window.pal | 35 -- graphics/pokemon_storage/pss_window.png | Bin 381 -> 0 bytes graphics/pokemon_storage/pss_window2.png | Bin 392 -> 0 bytes .../{pss_window2.bin => ribbon.bin} | Bin graphics/pokemon_storage/ribbon_bg.png | Bin 0 -> 234 bytes .../{pss_window2.pal => ribbon_frame.pal} | 18 +- graphics/pokemon_storage/ribbon_icon.png | Bin 0 -> 131 bytes graphics/pokemon_storage/screen.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/screen_bg.png | Bin 0 -> 326 bytes graphics/pokemon_storage/spinda_icon.png | Bin 0 -> 125 bytes .../pokemon_storage/star_in_circle_icon.png | Bin 0 -> 117 bytes graphics/pokemon_storage/togepi_icon.png | Bin 0 -> 124 bytes graphics/pokemon_storage/whiscash.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/whiscash_bg.png | Bin 0 -> 299 bytes graphics/pokemon_storage/zigzagoon.bin | Bin 0 -> 720 bytes graphics/pokemon_storage/zigzagoon_bg.png | Bin 0 -> 218 bytes graphics/unknown/unknown_DDD908.bin | 1 - graphics/unknown/unknown_DDD920.bin | 1 - graphics/unknown/unknown_DDD938.bin | 1 - graphics_file_rules.mk | 86 +++- 76 files changed, 501 insertions(+), 162 deletions(-) create mode 100644 graphics/pokemon_storage/aqua_icon.png create mode 100644 graphics/pokemon_storage/asterisk_icon.png create mode 100644 graphics/pokemon_storage/azumarill.bin create mode 100644 graphics/pokemon_storage/azumarill_bg.png create mode 100644 graphics/pokemon_storage/big_asterisk_icon.png create mode 100644 graphics/pokemon_storage/blank.bin create mode 100644 graphics/pokemon_storage/blank_bg.png create mode 100644 graphics/pokemon_storage/block.bin create mode 100644 graphics/pokemon_storage/block_bg.png create mode 100644 graphics/pokemon_storage/bolt_icon.png create mode 100644 graphics/pokemon_storage/brick_icon.png create mode 100644 graphics/pokemon_storage/circle_icon.png create mode 100644 graphics/pokemon_storage/circles.bin create mode 100644 graphics/pokemon_storage/circles_bg.png create mode 100644 graphics/pokemon_storage/cross_icon.png create mode 100644 graphics/pokemon_storage/crystal_icon.png create mode 100644 graphics/pokemon_storage/diagonal.bin create mode 100644 graphics/pokemon_storage/diagonal_bg.png create mode 100644 graphics/pokemon_storage/diglett_icon.png create mode 100644 graphics/pokemon_storage/dot_icon.png create mode 100644 graphics/pokemon_storage/dusclops.bin create mode 100644 graphics/pokemon_storage/dusclops_bg.png create mode 100644 graphics/pokemon_storage/five_star_icon.png create mode 100644 graphics/pokemon_storage/footprint_icon.png create mode 100644 graphics/pokemon_storage/four_circles_icon.png create mode 100644 graphics/pokemon_storage/four_star_icon.png create mode 100644 graphics/pokemon_storage/frame.bin create mode 100644 graphics/pokemon_storage/frame_bg.png create mode 100644 graphics/pokemon_storage/friends_frame1.png create mode 100644 graphics/pokemon_storage/friends_frame2.png create mode 100644 graphics/pokemon_storage/heart_icon.png rename graphics/{unknown/unknown_DDDB80.bin => pokemon_storage/horizontal.bin} (100%) mode change 100755 => 100644 create mode 100644 graphics/pokemon_storage/horizontal_bg.png create mode 100644 graphics/pokemon_storage/koffing_icon.png create mode 100644 graphics/pokemon_storage/latis_icon.png create mode 100644 graphics/pokemon_storage/legendary.bin create mode 100644 graphics/pokemon_storage/legendary_bg.png create mode 100644 graphics/pokemon_storage/line_circle_icon.png create mode 100644 graphics/pokemon_storage/lotad_icon.png create mode 100644 graphics/pokemon_storage/ludicolo.bin create mode 100644 graphics/pokemon_storage/ludicolo_bg.png create mode 100644 graphics/pokemon_storage/luvdisc_icon.png create mode 100644 graphics/pokemon_storage/magma_icon.png create mode 100644 graphics/pokemon_storage/maze_icon.png create mode 100644 graphics/pokemon_storage/minun_icon.png create mode 100644 graphics/pokemon_storage/pichu_icon.png create mode 100644 graphics/pokemon_storage/pikachu.bin create mode 100644 graphics/pokemon_storage/pikachu_bg.png create mode 100644 graphics/pokemon_storage/plusle_icon.png create mode 100644 graphics/pokemon_storage/pokeball_icon.png create mode 100644 graphics/pokemon_storage/pokecenter2.bin create mode 100644 graphics/pokemon_storage/pokecenter2_bg.png delete mode 100755 graphics/pokemon_storage/pss_window.pal delete mode 100755 graphics/pokemon_storage/pss_window.png delete mode 100755 graphics/pokemon_storage/pss_window2.png rename graphics/pokemon_storage/{pss_window2.bin => ribbon.bin} (100%) mode change 100755 => 100644 create mode 100644 graphics/pokemon_storage/ribbon_bg.png rename graphics/pokemon_storage/{pss_window2.pal => ribbon_frame.pal} (52%) mode change 100755 => 100644 create mode 100644 graphics/pokemon_storage/ribbon_icon.png create mode 100644 graphics/pokemon_storage/screen.bin create mode 100644 graphics/pokemon_storage/screen_bg.png create mode 100644 graphics/pokemon_storage/spinda_icon.png create mode 100644 graphics/pokemon_storage/star_in_circle_icon.png create mode 100644 graphics/pokemon_storage/togepi_icon.png create mode 100644 graphics/pokemon_storage/whiscash.bin create mode 100644 graphics/pokemon_storage/whiscash_bg.png create mode 100644 graphics/pokemon_storage/zigzagoon.bin create mode 100644 graphics/pokemon_storage/zigzagoon_bg.png delete mode 100755 graphics/unknown/unknown_DDD908.bin delete mode 100755 graphics/unknown/unknown_DDD920.bin delete mode 100755 graphics/unknown/unknown_DDD938.bin diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 94879764b3..55b1509e0a 100755 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5393,7 +5393,7 @@ _080CA0C2: thumb_func_start sub_80CA0C8 sub_80CA0C8: @ 80CA0C8 push {lr} - ldr r0, =gUnknown_08572744 + ldr r0, =gWaveformSpritePalette bl LoadSpritePalette pop {r0} bx r0 @@ -5498,7 +5498,7 @@ sub_80CA154: @ 80CA154 sub_80CA1C4: @ 80CA1C4 push {r4,lr} sub sp, 0x8 - ldr r0, =gUnknown_0857274C + ldr r0, =gWaveformSpriteSheet ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp] diff --git a/data/graphics.s b/data/graphics.s index 414985125e..8733869b53 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -5049,40 +5049,42 @@ gUnknown_08DDD748:: @ 8DDD748 .incbin "graphics/interface/textbox.4bpp" .align 2 -gUnknown_08DDD908:: - .incbin "graphics/unknown/unknown_DDD908.bin.lz" +gWallpaperIcon_Cross:: + .incbin "graphics/pokemon_storage/cross_icon.4bpp.lz" .align 2 -gUnknown_08DDD920:: - .incbin "graphics/unknown/unknown_DDD920.bin.lz" +gWallpaperIcon_Bolt:: + .incbin "graphics/pokemon_storage/bolt_icon.4bpp.lz" .align 2 -gUnknown_08DDD938:: - .incbin "graphics/unknown/unknown_DDD938.bin.lz" +gWallpaperIcon_Plusle:: + .incbin "graphics/pokemon_storage/plusle_icon.4bpp.lz" .align 2 -gUnknown_08DDD950:: - .incbin "graphics/pokemon_storage/pss_window.gbapal" +gWallpaperPalettes_Horizontal:: @ 8DDD950 + .incbin "graphics/pokemon_storage/friends_frame2.gbapal" + .incbin "graphics/pokemon_storage/horizontal_bg.gbapal" .align 2 -gUnknown_08DDD990:: - .incbin "graphics/pokemon_storage/pss_window.4bpp.lz" +gWallpaperTiles_Horizontal:: @ 8DDD990 + .incbin "graphics/pokemon_storage/horizontal.4bpp.lz" .align 2 -gUnknown_08DDDB80:: @ 8DDDB80 - .incbin "graphics/unknown/unknown_DDDB80.bin.lz" +gWallpaperTilemap_Horizontal:: @ 8DDDB80 + .incbin "graphics/pokemon_storage/horizontal.bin.lz" .align 2 -gUnknown_08DDDC8C:: - .incbin "graphics/pokemon_storage/pss_window2.gbapal" +gWallpaperPalettes_Ribbon:: @ 8DDDC8C + .incbin "graphics/pokemon_storage/ribbon_frame.gbapal" + .incbin "graphics/pokemon_storage/ribbon_bg.gbapal" .align 2 -gUnknown_08DDDCCC:: - .incbin "graphics/pokemon_storage/pss_window2.4bpp.lz" +gWallpaperTiles_Ribbon:: @ 8DDDCCC + .incbin "graphics/pokemon_storage/ribbon.4bpp.lz" .align 2 -gUnknown_08DDDEDC:: - .incbin "graphics/pokemon_storage/pss_window2.bin.lz" +gWallpaperTilemap_Ribbon:: @ 8DDDEDC + .incbin "graphics/pokemon_storage/ribbon.bin.lz" @ pokenav diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index 6c2c17a4a0..882dc82fc3 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -67,11 +67,11 @@ gUnknown_085724BC:: @ 85724BC .2byte 0x1143, 0x1144, 0x1144, 0x1145, 0x1153, 0x1154, 0x1154, 0x1155, 0x1163, 0x1164, 0x1164, 0x1165 .align 2 -gUnknown_085724D4:: @ 85724D4 +WaveformPalette:: @ 85724D4 .incbin "graphics/pokemon_storage/waveform.gbapal" .align 2 -gUnknown_085724F4:: @ 85724F4 +WaveformTiles:: @ 85724F4 .incbin "graphics/pokemon_storage/waveform.4bpp" .align 2 @@ -94,48 +94,48 @@ gUnknown_08572734:: @ 8572734 .4byte 0x000001d0, 0x004011e5, 0x000023ba, 0x000031ff .align 2 -gUnknown_08572744:: @ 8572744 - obj_pal gUnknown_085724D4, 0xDACA +gWaveformSpritePalette:: @ 8572744 + obj_pal WaveformPalette, 0xDACA .align 2 -gUnknown_0857274C:: @ 857274C - obj_tiles gUnknown_085724F4, 0x1C0, 5 +gWaveformSpriteSheet:: @ 857274C + obj_tiles WaveformTiles, 0x1C0, 5 gUnknown_08572754:: @ 8572754 spr_template 2, 0xDAC6, gOamData_857286C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_0857276C:: @ 857276C - .4byte gUnknown_085EB7EF, 0 - .4byte gUnknown_085EB802, 0 - .4byte gUnknown_085EB81A, 0 - .4byte gUnknown_085EB82F, 0 - .4byte gUnknown_085EB843, 1 - .4byte gUnknown_085EB853, 0 - .4byte gUnknown_085EB866, 0 - .4byte gUnknown_085EB87C, 1 - .4byte gUnknown_085EB88E, 0 - .4byte gUnknown_085EB89F, 0 - .4byte gUnknown_085EB8B5, 4 - .4byte gUnknown_085EB8C6, 6 - .4byte gUnknown_085EB8D3, 0 - .4byte gUnknown_085EB8E6, 0 - .4byte gUnknown_085EB900, 0 - .4byte gUnknown_085EB913, 0 - .4byte gUnknown_085EB92D, 0 - .4byte gUnknown_085EB946, 0 - .4byte gUnknown_085EB960, 0 - .4byte gUnknown_085EB979, 1 - .4byte gUnknown_085EB987, 0 - .4byte gUnknown_085EB9A1, 0 - .4byte gUnknown_085EB9AB, 0 - .4byte gUnknown_085EB843, 7 - .4byte gUnknown_085EB9C3, 0 - .4byte gUnknown_085EB9D6, 7 - .4byte gUnknown_085EB9EE, 0 - .4byte gUnknown_085EB9FF, 0 - .4byte gUnknown_085EBA19, 7 - .4byte gUnknown_085EBA29, 7 - .4byte gUnknown_085EBA38, 0 + .4byte gText_ExitFromBox, 0 + .4byte gText_WhatDoYouWantToDo, 0 + .4byte gText_PleasePickATheme, 0 + .4byte gText_PickTheWallpaper, 0 + .4byte gText_PkmnIsSelected, 1 + .4byte gText_JumpToWhichBox, 0 + .4byte gText_DepositInWhichBox, 0 + .4byte gText_PkmnWasDeposited, 1 + .4byte gText_BoxIsFull2, 0 + .4byte gText_ReleaseThisPokemon, 0 + .4byte gText_PkmnWasReleased, 4 + .4byte gText_ByeByePkmn, 6 + .4byte gText_MarkYourPkmn, 0 + .4byte gText_ThatsYourLastPkmn, 0 + .4byte gText_YourPartysFull, 0 + .4byte gText_YoureHoldingAPkmn, 0 + .4byte gText_WhichOneWillYouTake, 0 + .4byte gText_YouCantReleaseAnEgg, 0 + .4byte gText_ContinueBoxOperations, 0 + .4byte gText_PkmnCameBack, 1 + .4byte gText_WasItWorriedAboutYou, 0 + .4byte gText_FourEllipsesExclamation, 0 + .4byte gText_PleaseRemoveTheMail, 0 + .4byte gText_PkmnIsSelected, 7 + .4byte gText_GiveToAPkmn, 0 + .4byte gText_PlacedItemInBag, 7 + .4byte gText_BagIsFull2, 0 + .4byte gText_PutItemInBag, 0 + .4byte gText_ItemIsNowHeld, 7 + .4byte gText_ChangedToNewItem, 7 + .4byte gText_MailCantBeStored, 0 .align 2 gUnknown_08572864:: @ 8572864 @@ -531,15 +531,352 @@ PCGfx_Arrow: @ 8577678 .incbin "graphics/pokemon_storage/arrow.4bpp" .align 2 -gUnknown_085776F8:: @ 85776F8 - .incbin "baserom.gba", 0x5776F8, 0x384c +gWallpaperPalettes_Zigzagoon:: @ 85776F8 + .incbin "graphics/pokemon_storage/friends_frame1.gbapal" + .incbin "graphics/pokemon_storage/zigzagoon_bg.gbapal" + .align 2 +gWallpaperTiles_Zigzagoon: @ 8577738 + .incbin "graphics/pokemon_storage/zigzagoon.4bpp.lz" + + .align 2 +gWallpaperTilemap_Zigzagoon: @ 857792C + .incbin "graphics/pokemon_storage/zigzagoon.bin.lz" + + .align 2 +gWallpaperPalettes_Screen:: @ 8577A44 + .incbin "graphics/pokemon_storage/friends_frame1.gbapal" + .incbin "graphics/pokemon_storage/screen_bg.gbapal" + + .align 2 +gWallpaperTiles_Screen: @ 8577A84 + .incbin "graphics/pokemon_storage/screen.4bpp.lz" + + .align 2 +gWallpaperTilemap_Screen: @ 8577D00 + .incbin "graphics/pokemon_storage/screen.bin.lz" + + .align 2 +gWallpaperPalettes_Diagonal:: @ 8577E2C + .incbin "graphics/pokemon_storage/friends_frame1.gbapal" + .incbin "graphics/pokemon_storage/diagonal_bg.gbapal" + + .align 2 +gWallpaperTiles_Diagonal: @ 8577E6C + .incbin "graphics/pokemon_storage/diagonal.4bpp.lz" + + .align 2 +gWallpaperTilemap_Diagonal: @ 8578058 + .incbin "graphics/pokemon_storage/diagonal.bin.lz" + + .align 2 +gWallpaperPalettes_Block:: @ 8578148 + .incbin "graphics/pokemon_storage/block_bg.gbapal" + .incbin "graphics/pokemon_storage/block_bg.gbapal" + + .align 2 +gWallpaperTiles_Block: @ 8578188 + .incbin "graphics/pokemon_storage/block.4bpp.lz" + + .align 2 +gWallpaperTilemap_Block: @ 8578358 + .incbin "graphics/pokemon_storage/block.bin.lz" + + .align 2 +gWallpaperPalettes_PokeCenter2:: @ 8578450 + .incbin "graphics/pokemon_storage/pokecenter2_bg.gbapal" + .incbin "graphics/pokemon_storage/pokecenter2_bg.gbapal" + + .align 2 +gWallpaperTiles_PokeCenter2: @ 8578490 + .incbin "graphics/pokemon_storage/pokecenter2.4bpp.lz" + + .align 2 +gWallpaperTilemap_PokeCenter2: @ 85786D0 + .incbin "graphics/pokemon_storage/pokecenter2.bin.lz" + + .align 2 +gWallpaperPalettes_Frame:: @ 85787E4 + .incbin "graphics/pokemon_storage/frame_bg.gbapal" + .incbin "graphics/pokemon_storage/frame_bg.gbapal" + + .align 2 +gWallpaperTiles_Frame: @ 8578824 + .incbin "graphics/pokemon_storage/frame.4bpp.lz" + + .align 2 +gWallpaperTilemap_Frame: @ 8578A34 + .incbin "graphics/pokemon_storage/frame.bin.lz" + + .align 2 +gWallpaperPalettes_Blank:: @ 8578B48 + .incbin "graphics/pokemon_storage/friends_frame1.gbapal" + .incbin "graphics/pokemon_storage/zigzagoon_bg.gbapal" + + .align 2 +gWallpaperTiles_Blank: @ 8578B88 + .incbin "graphics/pokemon_storage/blank.4bpp.lz" + + .align 2 +gWallpaperTilemap_Blank: @ 8578D34 + .incbin "graphics/pokemon_storage/blank.bin.lz" + + .align 2 +gWallpaperPalettes_Circles:: @ 8578E10 + .incbin "graphics/pokemon_storage/friends_frame2.gbapal" + .incbin "graphics/pokemon_storage/circles_bg.gbapal" + + .align 2 +gWallpaperTiles_Circles: @ 8578E50 + .incbin "graphics/pokemon_storage/circles.4bpp.lz" + + .align 2 +gWallpaperTilemap_Circles: @ 85790A4 + .incbin "graphics/pokemon_storage/circles.bin.lz" + + .align 2 +gWallpaperPalettes_Azumarill:: @ 85791A0 + .incbin "graphics/pokemon_storage/friends_frame2.gbapal" + .incbin "graphics/pokemon_storage/azumarill_bg.gbapal" + + .align 2 +gWallpaperTiles_Azumarill: @ 85791E0 + .incbin "graphics/pokemon_storage/azumarill.4bpp.lz" + + .align 2 +gWallpaperTilemap_Azumarill: @ 85793CC + .incbin "graphics/pokemon_storage/azumarill.bin.lz" + + .align 2 +gWallpaperPalettes_Pikachu:: @ 85794C4 + .incbin "graphics/pokemon_storage/friends_frame2.gbapal" + .incbin "graphics/pokemon_storage/pikachu_bg.gbapal" + + .align 2 +gWallpaperTiles_Pikachu: @ 8579504 + .incbin "graphics/pokemon_storage/pikachu.4bpp.lz" + + .align 2 +gWallpaperTilemap_Pikachu: @ 8579738 + .incbin "graphics/pokemon_storage/pikachu.bin.lz" + + .align 2 +gWallpaperPalettes_Legendary:: @ 8579860 + .incbin "graphics/pokemon_storage/friends_frame2.gbapal" + .incbin "graphics/pokemon_storage/legendary_bg.gbapal" + + .align 2 +gWallpaperTiles_Legendary: @ 85798A0 + .incbin "graphics/pokemon_storage/legendary.4bpp.lz" + + .align 2 +gWallpaperTilemap_Legendary: @ 8579B80 + .incbin "graphics/pokemon_storage/legendary.bin.lz" + + .align 2 +gWallpaperPalettes_Dusclops:: @ 8579CC4 + .incbin "graphics/pokemon_storage/friends_frame2.gbapal" + .incbin "graphics/pokemon_storage/dusclops_bg.gbapal" + + .align 2 +gWallpaperTiles_Dusclops: @ 8579D04 + .incbin "graphics/pokemon_storage/dusclops.4bpp.lz" + + .align 2 +gWallpaperTilemap_Dusclops: @ 8579F50 + .incbin "graphics/pokemon_storage/dusclops.bin.lz" + + .align 2 +gWallpaperPalettes_Ludicolo:: @ 857A048 + .incbin "graphics/pokemon_storage/friends_frame2.gbapal" + .incbin "graphics/pokemon_storage/ludicolo_bg.gbapal" + + .align 2 +gWallpaperTiles_Ludicolo: @ 857A088 + .incbin "graphics/pokemon_storage/ludicolo.4bpp.lz" + + .align 2 +gWallpaperTilemap_Ludicolo: @ 857A348 + .incbin "graphics/pokemon_storage/ludicolo.bin.lz" + + .align 2 +gWallpaperPalettes_Whiscash:: @ 857A468 + .incbin "graphics/pokemon_storage/friends_frame2.gbapal" + .incbin "graphics/pokemon_storage/whiscash_bg.gbapal" + + .align 2 +gWallpaperTiles_Whiscash: @ 857A4A8 + .incbin "graphics/pokemon_storage/whiscash.4bpp.lz" + + .align 2 +gWallpaperTilemap_Whiscash: @ 857A6F0 + .incbin "graphics/pokemon_storage/whiscash.bin.lz" + + .align 2 +gWallpaperIcon_Aqua: @ 857A81C + .incbin "graphics/pokemon_storage/aqua_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Heart: @ 857A860 + .incbin "graphics/pokemon_storage/heart_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_FiveStar: @ 857A89C + .incbin "graphics/pokemon_storage/five_star_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Brick: @ 857A8DC + .incbin "graphics/pokemon_storage/brick_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_FourStar: @ 857A904 + .incbin "graphics/pokemon_storage/four_star_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Asterisk: @ 857A940 + .incbin "graphics/pokemon_storage/asterisk_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Dot: @ 857A990 + .incbin "graphics/pokemon_storage/dot_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_LineCircle: @ 857A9C0 + .incbin "graphics/pokemon_storage/line_circle_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_PokeBall: @ 857A9EC + .incbin "graphics/pokemon_storage/pokeball_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Maze: @ 857AA38 + .incbin "graphics/pokemon_storage/maze_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Footprint: @ 857AA7C + .incbin "graphics/pokemon_storage/footprint_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_BigAsterisk: @ 857AAC4 + .incbin "graphics/pokemon_storage/big_asterisk_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Circle: @ 857AB08 + .incbin "graphics/pokemon_storage/circle_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Koffing: @ 857AB48 + .incbin "graphics/pokemon_storage/koffing_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Ribbon: @ 857AB98 + .incbin "graphics/pokemon_storage/ribbon_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_FourCircles: @ 857AC00 + .incbin "graphics/pokemon_storage/four_circles_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Lotad: @ 857AC30 + .incbin "graphics/pokemon_storage/lotad_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Crystal: @ 857AC74 + .incbin "graphics/pokemon_storage/crystal_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Pichu: @ 857ACBC + .incbin "graphics/pokemon_storage/pichu_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Diglett: @ 857ACF4 + .incbin "graphics/pokemon_storage/diglett_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Luvdisc: @ 857AD44 + .incbin "graphics/pokemon_storage/luvdisc_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_StarInCircle: @ 857AD88 + .incbin "graphics/pokemon_storage/star_in_circle_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Spinda: @ 857ADCC + .incbin "graphics/pokemon_storage/spinda_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Latis: @ 857AE20 + .incbin "graphics/pokemon_storage/latis_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Minun: @ 857AE64 + .incbin "graphics/pokemon_storage/minun_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Togepi: @ 857AEAC + .incbin "graphics/pokemon_storage/togepi_icon.4bpp.lz" + + .align 2 +gWallpaperIcon_Magma: @ 857AF08 + .incbin "graphics/pokemon_storage/magma_icon.4bpp.lz" + + .align 2 gUnknown_0857AF44:: @ 857AF44 - .incbin "baserom.gba", 0x57af44, 0xc0 + .4byte gWallpaperTiles_Zigzagoon, gWallpaperTilemap_Zigzagoon, gWallpaperPalettes_Zigzagoon + .4byte gWallpaperTiles_Screen, gWallpaperTilemap_Screen, gWallpaperPalettes_Screen + .4byte gWallpaperTiles_Horizontal, gWallpaperTilemap_Horizontal, gWallpaperPalettes_Horizontal + .4byte gWallpaperTiles_Diagonal, gWallpaperTilemap_Diagonal, gWallpaperPalettes_Diagonal + .4byte gWallpaperTiles_Block, gWallpaperTilemap_Block, gWallpaperPalettes_Block + .4byte gWallpaperTiles_Ribbon, gWallpaperTilemap_Ribbon, gWallpaperPalettes_Ribbon + .4byte gWallpaperTiles_PokeCenter2, gWallpaperTilemap_PokeCenter2, gWallpaperPalettes_PokeCenter2 + .4byte gWallpaperTiles_Frame, gWallpaperTilemap_Frame, gWallpaperPalettes_Frame + .4byte gWallpaperTiles_Blank, gWallpaperTilemap_Blank, gWallpaperPalettes_Blank + .4byte gWallpaperTiles_Circles, gWallpaperTilemap_Circles, gWallpaperPalettes_Circles + .4byte gWallpaperTiles_Azumarill, gWallpaperTilemap_Azumarill, gWallpaperPalettes_Azumarill + .4byte gWallpaperTiles_Pikachu, gWallpaperTilemap_Pikachu, gWallpaperPalettes_Pikachu + .4byte gWallpaperTiles_Legendary, gWallpaperTilemap_Legendary, gWallpaperPalettes_Legendary + .4byte gWallpaperTiles_Dusclops, gWallpaperTilemap_Dusclops, gWallpaperPalettes_Dusclops + .4byte gWallpaperTiles_Ludicolo, gWallpaperTilemap_Ludicolo, gWallpaperPalettes_Ludicolo + .4byte gWallpaperTiles_Whiscash, gWallpaperTilemap_Whiscash, gWallpaperPalettes_Whiscash + .align 2 gUnknown_0857B004:: @ 857B004 - .incbin "baserom.gba", 0x57b004, 0x7c + .4byte gWallpaperIcon_Aqua + .4byte gWallpaperIcon_Heart + .4byte gWallpaperIcon_FiveStar + .4byte gWallpaperIcon_Brick + .4byte gWallpaperIcon_FourStar + .4byte gWallpaperIcon_Asterisk + .4byte gWallpaperIcon_Dot + .4byte gWallpaperIcon_Cross + .4byte gWallpaperIcon_LineCircle + .4byte gWallpaperIcon_PokeBall + .4byte gWallpaperIcon_Maze + .4byte gWallpaperIcon_Footprint + .4byte gWallpaperIcon_BigAsterisk + .4byte gWallpaperIcon_Circle + .4byte gWallpaperIcon_Koffing + .4byte gWallpaperIcon_Ribbon + .4byte gWallpaperIcon_Bolt + .4byte gWallpaperIcon_FourCircles + .4byte gWallpaperIcon_Lotad + .4byte gWallpaperIcon_Crystal + .4byte gWallpaperIcon_Pichu + .4byte gWallpaperIcon_Diglett + .4byte gWallpaperIcon_Luvdisc + .4byte gWallpaperIcon_StarInCircle + .4byte gWallpaperIcon_Spinda + .4byte gWallpaperIcon_Latis + .4byte gWallpaperIcon_Plusle + .4byte gWallpaperIcon_Minun + .4byte gWallpaperIcon_Togepi + .4byte gWallpaperIcon_Magma + .align 2 +gUnknown_0857B07C:: @ 857B07C + .incbin "baserom.gba", 0x57b07C, 0x4 + + .align 2 gUnknown_0857B080:: @ 857B080 .incbin "baserom.gba", 0x57b080, 0x28 diff --git a/data/strings.s b/data/strings.s index 01bca9cd85..2fe5a7d2f6 100644 --- a/data/strings.s +++ b/data/strings.s @@ -2498,94 +2498,94 @@ gText_DontRemember:: @ 85EB7DB gText_Exit:: @ 85EB7EA .string "EXIT$" -gUnknown_085EB7EF:: @ 85EB7EF +gText_ExitFromBox:: @ 85EB7EF .string "Exit from the BOX?$" -gUnknown_085EB802:: @ 85EB802 +gText_WhatDoYouWantToDo:: @ 85EB802 .string "What do you want to do?$" -gUnknown_085EB81A:: @ 85EB81A +gText_PleasePickATheme:: @ 85EB81A .string "Please pick a theme.$" -gUnknown_085EB82F:: @ 85EB82F +gText_PickTheWallpaper:: @ 85EB82F .string "Pick the wallpaper.$" -gUnknown_085EB843:: @ 85EB843 +gText_PkmnIsSelected:: @ 85EB843 .string "{SPECIAL_F7 0x00} is selected.$" -gUnknown_085EB853:: @ 85EB853 +gText_JumpToWhichBox:: @ 85EB853 .string "Jump to which BOX?$" -gUnknown_085EB866:: @ 85EB866 +gText_DepositInWhichBox:: @ 85EB866 .string "Deposit in which BOX?$" -gUnknown_085EB87C:: @ 85EB87C +gText_PkmnWasDeposited:: @ 85EB87C .string "{SPECIAL_F7 0x00} was deposited.$" -gUnknown_085EB88E:: @ 85EB88E +gText_BoxIsFull2:: @ 85EB88E .string "The BOX is full.$" -gUnknown_085EB89F:: @ 85EB89F +gText_ReleaseThisPokemon:: @ 85EB89F .string "Release this POKéMON?$" -gUnknown_085EB8B5:: @ 85EB8B5 +gText_PkmnWasReleased:: @ 85EB8B5 .string "{SPECIAL_F7 0x00} was released.$" -gUnknown_085EB8C6:: @ 85EB8C6 +gText_ByeByePkmn:: @ 85EB8C6 .string "Bye-bye, {SPECIAL_F7 0x00}!$" -gUnknown_085EB8D3:: @ 85EB8D3 +gText_MarkYourPkmn:: @ 85EB8D3 .string "Mark your POKéMON.$" -gUnknown_085EB8E6:: @ 85EB8E6 +gText_ThatsYourLastPkmn:: @ 85EB8E6 .string "That’s your last POKéMON!$" -gUnknown_085EB900:: @ 85EB900 +gText_YourPartysFull:: @ 85EB900 .string "Your party’s full!$" -gUnknown_085EB913:: @ 85EB913 +gText_YoureHoldingAPkmn:: @ 85EB913 .string "You’re holding a POKéMON!$" -gUnknown_085EB92D:: @ 85EB92D +gText_WhichOneWillYouTake:: @ 85EB92D .string "Which one will you take?$" -gUnknown_085EB946:: @ 85EB946 +gText_YouCantReleaseAnEgg:: @ 85EB946 .string "You can’t release an EGG.$" -gUnknown_085EB960:: @ 85EB960 +gText_ContinueBoxOperations:: @ 85EB960 .string "Continue BOX operations?$" -gUnknown_085EB979:: @ 85EB979 +gText_PkmnCameBack:: @ 85EB979 .string "{SPECIAL_F7 0x00} came back!$" -gUnknown_085EB987:: @ 85EB987 +gText_WasItWorriedAboutYou:: @ 85EB987 .string "Was it worried about you?$" -gUnknown_085EB9A1:: @ 85EB9A1 +gText_FourEllipsesExclamation:: @ 85EB9A1 .string "… … … … !$" -gUnknown_085EB9AB:: @ 85EB9AB +gText_PleaseRemoveTheMail:: @ 85EB9AB .string "Please remove the MAIL.$" -gUnknown_085EB9C3:: @ 85EB9C3 +gText_GiveToAPkmn:: @ 85EB9C3 .string "GIVE to a POKéMON?$" -gUnknown_085EB9D6:: @ 85EB9D6 +gText_PlacedItemInBag:: @ 85EB9D6 .string "Placed item in the BAG.$" -gUnknown_085EB9EE:: @ 85EB9EE +gText_BagIsFull2:: @ 85EB9EE .string "The BAG is full.$" -gUnknown_085EB9FF:: @ 85EB9FF +gText_PutItemInBag:: @ 85EB9FF .string "Put this item in the BAG?$" -gUnknown_085EBA19:: @ 85EBA19 +gText_ItemIsNowHeld:: @ 85EBA19 .string "{SPECIAL_F7 0x00} is now held.$" -gUnknown_085EBA29:: @ 85EBA29 +gText_ChangedToNewItem:: @ 85EBA29 .string "Changed to {SPECIAL_F7 0x00}.$" -gUnknown_085EBA38:: @ 85EBA38 +gText_MailCantBeStored:: @ 85EBA38 .string "MAIL can’t be stored!$" gUnknown_085EBA4E:: @ 85EBA4E diff --git a/graphics/pokemon_storage/aqua_icon.png b/graphics/pokemon_storage/aqua_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..169ba5b68f8118cfb8765bb19c1746503d0c9e81 GIT binary patch literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExR-P`7AsjPfdl|VH3^>>cCrbbT literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/asterisk_icon.png b/graphics/pokemon_storage/asterisk_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e353a1c3d95657779ba52b73766081328828f4a6 GIT binary patch literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExcAhSdAsjQ4E7)0iPVlIzayWZ_ zpCr`r@x{7#OLtc#un9Csch`+v?HLxw3p zF-&mv>eV@O<^Yu~S+XQ3DCn~0+3!F_$(}BbAre!2&pUD*FyLT0P~-UC@<{dn|NZyA z>&IrdY>~Ld%6a0*5jCX*&uZ6cFBpyIG@pGZVH&pia4sL7fTkW(2vUHx3vIVCg!0A7MqHUIzs literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/big_asterisk_icon.png b/graphics/pokemon_storage/big_asterisk_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9a56b0fc6e6a8671986fcec7521cab831718a545 GIT binary patch literal 112 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fEx=AJH&AsjPfdvEhHDDW`t{@=HO z@mxZOS;)^_0&-i|Wi?eaEaGY6xMgUQc;jHpn-Yt!a%YZy-^chmvy}PsGyDA@qdZ;x KT-G@yGywqC-zHH2 literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/blank.bin b/graphics/pokemon_storage/blank.bin new file mode 100644 index 0000000000000000000000000000000000000000..b008544239c8650b25aa0dd388b929ff4d29e850 GIT binary patch literal 720 zcmeIuw-$n65QNbmbM`ZVqT-q}U;;|R`@a)NVPgTMg*#`ud$t&*lnT(ukR?Z+0!2!c zsZgaxod!)J5+Af^)1gZb9fLjtOoogYV=?(SVakj-3zn={vti4QJqM21II(l(lp<%j c$Xyz1l$;QH2?qr literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/blank_bg.png b/graphics/pokemon_storage/blank_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..7ff832672b3d7641189116776ebeee01a09c2897 GIT binary patch literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^5kSnr!VDz)O;tYtDT4r?5ZC|z|F1dw%`oYxA;T1) z7$&%S_3E5CbAZa0ELjp16tpBS1Z0r1r;B5V#MI=31I$yVOc9xAXt&iQM5lv|V}{O> fmL7Hw!(Fo(A1L#QPG34z4rHdMtDnm{r-UW|;_NJ# literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/block.bin b/graphics/pokemon_storage/block.bin new file mode 100644 index 0000000000000000000000000000000000000000..ec5df1525e43a1bb5c1ec3f553e70b6adf0fcfed GIT binary patch literal 720 zcmeIu#}dH+5P;$6onP-Pf*^X07+;3)QR#6n?fDbAwv%1O>*z3IL)AMPU8H_DRx?&&_08&>+8S&+0c&O>4v_Mt?a&NFE>=1 BaryuN literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/block_bg.png b/graphics/pokemon_storage/block_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..9147ef88139fe0af5285d3d316ab496e92a84d06 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^5kSnr!VDz)O;tYtDT4r?5ZC|z{~x{A{p|l5pa52I z_3G6*bLIe*Em^W8C@4r~V{t1`U4W;HV~E7m-U$bJ85B5e#PbV!LxV+E7}cKS{K%oVNx|**ljS^(72T%`c6Lq-GW}Y#ZoP$G`ONdo(w6(z Y%vdgO#-C!lGX>-ZPgg&ebxsLQ0I;G%CjbBd literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/bolt_icon.png b/graphics/pokemon_storage/bolt_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..674d2242458be392519a6127cad32851d082a6e4 GIT binary patch literal 72 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fEx{GKk3AsjQ4E7)0inwuFJs_M%b TAHH0X2~y(e>gTe~DWM4f=YcxAsjQ4cT|6WXDg6)AZ1T8 m(}EMXcPsR?HZEz?dd9$TsJAfp?8M$$kS0%8KbLh*2~7YR*Bn{^ literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/circle_icon.png b/graphics/pokemon_storage/circle_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..cf92abeedb354f0622e049a6b59689ffb76c3dd6 GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExMxHK?AsjQ4E7)0i9BRJnwG@8W z>p1%1oo+`V|A`&kY#u$^1&-O)@c6`XFh2}a&}n60klb4&zUKYx!yr>UUHx3vIVCg! E0HjbKasU7T literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/circles.bin b/graphics/pokemon_storage/circles.bin new file mode 100644 index 0000000000000000000000000000000000000000..d2ed6d127dcd1698190920edf9cd8aa93fc4ca0e GIT binary patch literal 720 zcmeH^NpnGA5JjIM#)Lx|B7}>?JS0evgc4&3$^ZX3-e-}`Td=UycX#X5sjhCzvaAs< z+<5SEgAYFef`kZj%N-G-*vN4pM%+$W7QU(D&A+G=b|KD=;zgN~?Lxw3p zF-&mv>eV@O<^Yu~S+XQ3C@8B`@;Ok^L{AsT5RHjjCt35cDDpV(Wcnhqf{5*?o%N*_pN3)iy=C3i^c1G=jrFP~s-P>L*0&WbBPbR%t zc&MWKz~t=xEbpa?-pDpitv{gun}Pr8)|1|$^#&nR@{cdyBmdlI#(!xGn^Tu8i%L}I taIXKvC1bOwdGYc6Ozij19Xwe6m$ANKGv^nshVvjFc)I$ztaD0e0sx`8WuO26 literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/cross_icon.png b/graphics/pokemon_storage/cross_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..674d2242458be392519a6127cad32851d082a6e4 GIT binary patch literal 72 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fEx{GKk3AsjQ4E7)0inwuFJs_M%b TAHH0X2~y(e>gTe~DWM4f=Y>Cu+xS83ZEh@TG%FPI0TtkTy#}g?cAL3we6dHTFKGPcI@}ND{pOMSjtes$}{<% PJIFv!S3j3^P6a*^vtZK1edjJ~J2?Uz1gZ_QbGnT+<+-0RuujSt`d9PfXmbFs?o NHUEVyWo1KaxdFjtbC>`C literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/diagonal_bg.png b/graphics/pokemon_storage/diagonal_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..d4fcbe06a14e486c2da7bf459831b06de971a86e GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^5kSnr!VDz)O;tYtDT4r?5ZC|z{~IP9opSV>A;T1) z7!W*r#_%kPq4_^U5D+skT)ldA&YU?wWlNSU2?`3jn0z=4D4OBv;us<^b?SL-u?7W! z*2HZeglkxs-<)wWpO_n>e7cD7jVl`$o9p|TKjvB+cgajW9KGhq0=q=r8EpFMJlZ|d zKGtX26=p`|M$HkjV87?gA+T5?cuL6SgQ>gMUTr%k$$Rb2hs*JzpQYn(gsAWSJ1_Pn O$Yq|celF{r5}E)g3{*4# literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/diglett_icon.png b/graphics/pokemon_storage/diglett_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8e485cfd44945028d54cbb265801b94023e303a1 GIT binary patch literal 118 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExww^AIAsjPfdv5bG7;rG%t#`k{ zkhbEM`>juh1@+s)4~ZEtGH@T^-Y}Q#LwoV6x`QHDi_9LrsJA@jnPzFs+*DkgRk>!( Pe2{^ju6{1-oD!M0R(SZ_W!#x$M)OesygGZid(xUz62_3rh@OY-r0L_pW zM)W7QU(D&A+G=b|9`fndrFihPyiVe zS2wTOviEFK($%Y1=ggS{RJLTvlAxd<^EI{afa;cex;TbtOq_dZBky4a0oH)91g0gg z1+&vw#UmAhrY$V~I8}1NcD-^thi%%k^|@Fcz2q)9t?2iO?V8;O2t^F=Y{-INElbxlQKXw(Q>Zkju3{Za!HuFno=+WC2F+~t?_Ij- zpylxu1%9S}2d-ORJH^`<`LIi9!m|g(j~RtE&xA02yz{vC*tUIAdj#K>pK(35`29Eb XcZ|okR!VQ-19{EU)z4*}Q$iB}_zHNH literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/five_star_icon.png b/graphics/pokemon_storage/five_star_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..29b2eb9b039bb72d97ebc1c45cec1bbcb7d668a6 GIT binary patch literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExW}YsNAsjPP&mQDuFyLTv_;z2= z?1E$z&-|!IkD2%{a>{9Fn<#Lcop00i_ I>zopr04?Prl>h($ literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/footprint_icon.png b/graphics/pokemon_storage/footprint_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..30f8c4e8a87ed47a6685de3e3ee05bb5204e744f GIT binary patch literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExmYyz-AsjPv&tBwYaNuCN@a?{# z`3XtAwey=*9yvB1^vyWPpndzGh?m1Rj&q$x6$kx)EVw;oRral^>>d?GN8{}h|9}kh MboFyt=akR{049hgp8x;= literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/four_circles_icon.png b/graphics/pokemon_storage/four_circles_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b8f8f991bc368d4dea288b012372e13dbadd3e9a GIT binary patch literal 110 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExrk*a2AsjQ4E7)0i-oLw7``yp; zrR?F`yUX9(1_fO@e7r&1Eu-DI;gCWm+XSZxY&ASPl4g`K?9+};4EAn(12V|d)z4*} HQ$iB}s!t=s literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/four_star_icon.png b/graphics/pokemon_storage/four_star_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4c61ffc0d318c45d501e8b2473ad8cacaa42ceff GIT binary patch literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fEx`kpS1AsjQ4E7)0i6duW0J$@To za_sKz?+1EzmpkgP8Sthkb}C#+xY(D;dZ-Mj`+j!G_ma+&`#?r`y85}Sb4q9e0DUGP AcK`qY literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/frame.bin b/graphics/pokemon_storage/frame.bin new file mode 100644 index 0000000000000000000000000000000000000000..490a9968d907f2ca9ba3565d38215f83e7537b94 GIT binary patch literal 720 zcmds!$xZ@M5Jg*N5#a!W0xAVOMrBY@=pDnZ|Nn!mY6U_99oD?NxJl)ta^Ee_^SmWD z#E6q1Ns2TXZpm^-j(hSHP$Ya%q(qqqDpYyoi5hhpJoCaU%{?cyXw$*brAMCuLq@#u z&X@_)kekWJ1^SdPS;<-g@sHehfm^$k+xc9%jck<)jyzCe>o!XNxpB5DQc4?VyP`PT tX`JPY;wzU=;c@^;$l|6F_dmY)l>kYCY?a-;wN literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/frame_bg.png b/graphics/pokemon_storage/frame_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..98a3d80b72ef26f217bf73a3a4eec47ebffec264 GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^6M&e5g&9abiOpULqznRlLR|m<|6iQ7=G|E@pa52I z_3G6*bLIe*Em^W8C@82Tr~EunUAw1?V~EDY){D1!4=8Z3281v8UvuN{^hAa-O@7f! zQ9C<3KNdFKP+*Jw+gms zFa&j2II>NdaHqVZps%TGC97JZ?`_c3jf#6jMu2+U2~D| eC~NVgk|sIjBA4gun6mvrPWN>6b6Mw<&;$ULTw2Be literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/friends_frame1.png b/graphics/pokemon_storage/friends_frame1.png new file mode 100644 index 0000000000000000000000000000000000000000..e76eb4e73621d128597332fa061427019f4d6ed9 GIT binary patch literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!VDxecyh&nltF+`i0l9V|EuR5J<4#@kYNf? z3=>?vdUej6IY4DgmMjSh3Np6~`wUdH)zif>#G~`=)q{M^3OsBH^Bo>DzxgZQ^pLwJ z@#wbKeH<$`PhpzR!;&jEqcL!H0N0#X3=fvw zyWhYT!pdUnu-|yk)xRodSP~rf2}*c1Je{!Y-0$5R?8?}RGvOdVv5H@OUeSt2rKT z8cL_|WoB^1r#dIG@8aR{NEK_CzVOQlhOlK77g-LZ9WY*ynA#N{%W!7Ox9H;y^S>Jv cOz~mNX_^^)`qlTl`5;evy85}Sb4q9e016y#%m4rY literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/heart_icon.png b/graphics/pokemon_storage/heart_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..928182bfdaccd5c88bb95d547017355afea124f3 GIT binary patch literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExR-P`7AsjPndk=Cl7;rFe{@+*F zY~k!Hz*TF)A;&KDg-zV$JVT^0ui;Op^zd`Ke+&*ObcaN+e3_ERmz`a_TEnn83uKz7 LtDnm{r-UW|C7~bZ literal 0 HcmV?d00001 diff --git a/graphics/unknown/unknown_DDDB80.bin b/graphics/pokemon_storage/horizontal.bin old mode 100755 new mode 100644 similarity index 100% rename from graphics/unknown/unknown_DDDB80.bin rename to graphics/pokemon_storage/horizontal.bin diff --git a/graphics/pokemon_storage/horizontal_bg.png b/graphics/pokemon_storage/horizontal_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..3c1facd74243f252d63588e578ff0fbf58d18fa0 GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^D}b1Tg&9cBuUwf4qznRlLR|m<|8Kcu%Cjv~3>l^X z#r{v3^8Z=$|GmXPHUwO~dUej6IY4DgmMjSh3Od0tXDLv^-_yl0L}OyI085jJjDrAI zi^$Xi9gMsOt}J++d?0m;cJV zH__^thlkIWWBke74@5b%MEXPp-k-K#T$gj2w}r2zxY$A= R-v1)VNKaQkmvv4FO#qGFCISEe literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/latis_icon.png b/graphics/pokemon_storage/latis_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..90fbdfa25f8347636ebf61c6565aab771ae8deb1 GIT binary patch literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExR-P`7AsjP9&tBwZP~dPr_-=pl zO^37%tip{MJ8bM-_8nwdTzG=*B};38Q4LG^UHmdKI;Vst0N9Ho7ytkO literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/legendary.bin b/graphics/pokemon_storage/legendary.bin new file mode 100644 index 0000000000000000000000000000000000000000..72444b590954a08192635d07bcef2b050722b18f GIT binary patch literal 720 zcma)&$5H}87zWpzwYALgQ%6O`i~$h5fQY0M23+<1-@=XH0$NO;rv9Funz1a)x}%SN z1{h?BVMZ8bjBzHIWQu8Ka1?LBEOQR?EU?HD%dD`<8tZJZ$yU=7+w8E5VUK+dh;hgf z$HY0|lrzse*F_Ip>Pk=lQqZ?jN;qE5A+MxKs;ELdddjza&z(G~Xo`APF7}%buaydV z(L!q%wgN9wXw_P+uy?O^?B;#0^Ox6Y`R|C@a>tp~kz#r?mqXX{J#2x(=MF=EUVe&TaM@3{AO53ZwN>*9?Plz&jlBAhc@Z*y?XUv@Li=LG$UAgvqzD{~|dA_2Z z>vloG`3oiDnS)9@7CCB9wQ}|pWDIn@wBbduF=vpA>@7Zl^eBDP;jMCC+s<@XM* zU;CI`e@O}IJKEmjpTNfY#_-KzzKb32zTUpNk7cL*SK}!*Q@mDh2L-REtDnm{r-UW| DY1^v1 literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/line_circle_icon.png b/graphics/pokemon_storage/line_circle_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0bcf9171b68b8782f7f3ee896d6949b03df44020 GIT binary patch literal 95 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExYMw5RAsjQ4E7)0i-ru{+%4EQ- rRwT|d!R4Nl%e#qcO__XRyB9DptU6la!Kza42GZ&2>gTe~DWM4f-E9~@ literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/lotad_icon.png b/graphics/pokemon_storage/lotad_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2399ea256a49092367bd860d8ed156c8beb6a5ff GIT binary patch literal 113 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fEx7M?DSAsjPH&jxZa7;rFMcvtVf zyV3fvmvqm;mIr@lY*Y(mmyi(fVAR(zX#FOi7wb{~uJ_g>$x^f6&Z7C-9++PSndRx~ K=d#Wzp$PzxQX`T8 literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/ludicolo.bin b/graphics/pokemon_storage/ludicolo.bin new file mode 100644 index 0000000000000000000000000000000000000000..6f39ea7d227971a8cd7fce82b4f6de30738ce3b3 GIT binary patch literal 720 zcmb7<*-k<+6h*HSIO5VcBf6EN;yi&UgNQ~F1j7IS4efo<`$TJ3c23f>vYRGJlDsm* zEOX4WK#n|%EV0ZAtE^FA9jBxRHrRA*vCR&2>)Yjj_g+su3&ndM>gwAuZF=uhU#T~3R#nqW1a(aS#hrK8 literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/ludicolo_bg.png b/graphics/pokemon_storage/ludicolo_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..585cb0ce1e639a53811624e9123127738423b85e GIT binary patch literal 387 zcmV-}0et?6P)b>k6b4{lfx$BpJK{7fK0vO3WvOe`_yP$-MoSjQVW~2po&olXzK5Ye z(&m?C$>{Ov2M-3K{|K&=-$dskAp-=zq?BgJSzt~<-rT2B@23=8Pcw*oJfz|@MxSs< z#YZWpf~$f@z~_o@IP)4m8WR#k5EaMj1-~rE$#3xv?-jSDQyHB351$aH-{G&J!Wlz6GEZ4-aMIwH1}tUtcV z(Ykq(R@Rf|m<9b4TIOi0FtIK06W@@Sy`jP5mfgYiLaz(|HZEU%+m?AEWAW!HwkMu~ OjPrE$b6Mw<&;$TFbS9<% literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/magma_icon.png b/graphics/pokemon_storage/magma_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..69d5f4fb7ffdd639fe913a0c391323892731704b GIT binary patch literal 112 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fEx=AJH&AsjPn&mQDtFyLT5@MeGV zCdWAomwmf9-SLA$#|rT^7i6bo7GL1pw37es65d}b4;&tZMAgY&ODT!0zIw$LWR$0? KpUXO@geCwcb|&xu literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/maze_icon.png b/graphics/pokemon_storage/maze_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..42664ecb776753cc8b0ee973a56b4ff774b513ea GIT binary patch literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fEx`kpS1AsjQ4E7)0i^4~Wdv{gA~ zJK;#Q0JBQNv5N0}rx=uFdUn6yNnw7kWSDS{fkE;~k@$rl?NdNTc)I$ztaD0e0st~T B9(w=) literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/minun_icon.png b/graphics/pokemon_storage/minun_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5a8e56d18e524e5f885e317d0591755b942f0324 GIT binary patch literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExW}YsNAsjQ4E7)0i-rw81w_5xR z!zBf=!`1?|-{pjub(p6lS5)&aVYg;p#ujXSC}l@1$8ALhhV+c$%tTqOFCddVUHx3v IIVCg!0N9)!g8%>k literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/pichu_icon.png b/graphics/pokemon_storage/pichu_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..384027dca5f2db663771aadf26e91ab6aff07512 GIT binary patch literal 110 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExrk*a2AsjQ4E7)0iX7p??cf4|Y zx5Kemf!-q(?1^`n4ILOxFl>IuxOG2k_k;8UqRkQCC+M&;%A5Jks**CXY=wi+a8+}Ah-ydZ^GlmGu5nxO`!22mc&eMqY7Dj`}*Za#$`-)7ZWnho2Gn9b8Le?*K=vfhqRRY*>ULS zP5WQ_jZ5rrl+PXR7!Ml6#=G8pgtJ~c@-3ZobA1_oiFZXVm_&laN;jmTL~M0pf{bu3 gu|cVt)TM4}>Ka_)f-Q2Ikyo0o6YcjRuM_A^y1sRED*ylh literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/pikachu_bg.png b/graphics/pokemon_storage/pikachu_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..c08494fa9190d32400401dbe9391ae7e869df490 GIT binary patch literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^8-SRDg&9b$X2>W7QU(D&A+G=b|Npk7dPeZ`r=F9;qTe4(HP*70AyV)Q^S9-cQhGa%DiT6+L;#tJlyLPeLDjxZh#n-BCKes*G z)31K(=G+&X?!9fYT+mP&onm9TM@QS|Ns;`U)(IQd6@Ar?IDCcsHpc>ki0A*BHXSzP z>YCP{@Q17V@&x1i31{s;gTe~DWM4f=Y^-d4LK{mzTr-gQYIV90P?<>*g0f!us&%2YV#f=fcG z)VQL~H8(UI*VOGCx>HM|Fj?&}_h<@T{hvM6xHrAKO1E`qV%}jhy_ht&X~L G=w5%&RCJ60 literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/pokecenter2_bg.png b/graphics/pokemon_storage/pokecenter2_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..704f96164dd44b5a2c7b5219d7f833d2a8228bf7 GIT binary patch literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^JAjyjg&D-UuF(jj3<7*YT>k?>chvuP#Xte9;Of<@ zbLPwes#>ySNl;MG?zo_vKy@oUT^vI+CQhAnP_RXT$2C)NXR!ir&i`alkpnlHzt7DP zVqvyg{g2s*uhK@C*`tX?PGyIJplZj`6b;w#?tNQTtpCfedtT*fb$IG(bCZf>VV)1J zpN`cCA8Hpp7atimt>@8CwtG6?o)_=9a!lLe+qAvr`PZWK{#qUU_(N~|dNboWQ+E4( zxT{@d5!3toTFjN3UwHd!r)b4};*merd)Zd*oK{@&-ok>yb@dnc846dY7O=g10rH%u LtDnm{r-UW|+u(3N literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/pss_window.pal b/graphics/pokemon_storage/pss_window.pal deleted file mode 100755 index bfd913069b..0000000000 --- a/graphics/pokemon_storage/pss_window.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -255 255 255 -74 205 139 -172 106 148 -49 0 148 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -213 213 213 -156 156 156 -255 255 255 -164 164 164 -82 82 82 -255 255 255 -57 164 148 -230 180 148 -49 0 148 -0 0 0 -255 148 148 -255 230 131 -255 189 115 -0 0 0 -0 0 0 -0 0 0 -213 213 213 -156 156 156 -255 255 255 -164 164 164 -82 82 82 diff --git a/graphics/pokemon_storage/pss_window.png b/graphics/pokemon_storage/pss_window.png deleted file mode 100755 index 59cc0b5d2d2572b0252efc9b98da1544b56ba2ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 381 zcmeAS@N?(olHy`uVBq!ia0vp^89;2n!VDz&-z#x|H~~H(uK)l4_d46XCTofz!xW$x zCb)X_>YO=qfXbFESrQZ!wB43Hl7WGd!_&nv#G~`-RY$%i0|C|x^BkC}#lIB93B6{` zNs8cp6?as+!^hh@d4|#4BP{hXCO5)QnJ_yQTvl!CzjZ`niuyD83n9N}wJmeHXYs<- zeczAi^ZNd*c)H;2uD}_stYM8&d{vKpI~L3F_8IYYvDQZAG_DJ>cbUB*Q1iqVpBpQf zqiT%f81HINcFq@!iZ43p@}%-FVdQ&MBb@0609BX8-^I diff --git a/graphics/pokemon_storage/pss_window2.png b/graphics/pokemon_storage/pss_window2.png deleted file mode 100755 index ae2d3b9694a7270e788406e288942336174b30be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 392 zcmeAS@N?(olHy`uVBq!ia0vp^4M42H!VDyj#J{fwQU(D&A+G=b|L@-N|K7X*Kmn}a z>eZ`r=F9;qTe4(HP*Bk9&(94R7#M{;T^vI^I^SMBDAc4Nz!0$Cf&HD#m;e6{ykIX{ z_HoXX?_B>Cnp{h+Ug5NM!3>k3`lI9|$@YFvnL_;D;Yvf)P?2kQ+xhRCYt z@&_2-a0&cl_%rwE?P_~LeufZ-8j}ev3}4k|Tiv@~94E^4?wM%f-8_qD+jsBY+G)8! zt0d-()wD~hMpyRBbzD@u$hfD$Les)z*T%!9JSD44I4U9^tV%c&%lcP(0oN1bb_;Em z1%?axdj-RU3|BTpFK}{bI(DV*)ix$a7fZ%Zvrj%}Wn$}nYkXr1gOSWlCI-bP0l+XkK!epSU diff --git a/graphics/pokemon_storage/pss_window2.bin b/graphics/pokemon_storage/ribbon.bin old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon_storage/pss_window2.bin rename to graphics/pokemon_storage/ribbon.bin diff --git a/graphics/pokemon_storage/ribbon_bg.png b/graphics/pokemon_storage/ribbon_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..f8d258d9b75200b57db4f63907e96a811dd33a73 GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^JAjyjg&D-UuF(jj3<7*YT>t<7fArq}s3q@!0$9P- zt5@gDnFCa|WXY1CprFmy&$0m3m3q23hGz(Ryra}e1^BbneIC#Cte&4a}pL#vlxjp~X=1+c|%F(A*U+n*sUD6>cd++9#r$7$% MboFyt=akR{0N}w}r~m)} literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/pss_window2.pal b/graphics/pokemon_storage/ribbon_frame.pal old mode 100755 new mode 100644 similarity index 52% rename from graphics/pokemon_storage/pss_window2.pal rename to graphics/pokemon_storage/ribbon_frame.pal index 9696184a27..8180cfb890 --- a/graphics/pokemon_storage/pss_window2.pal +++ b/graphics/pokemon_storage/ribbon_frame.pal @@ -1,6 +1,6 @@ JASC-PAL 0100 -32 +16 255 255 255 139 180 255 222 238 255 @@ -17,19 +17,3 @@ JASC-PAL 255 255 255 164 164 164 82 82 82 -255 255 255 -197 222 255 -90 164 238 -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 213 213 -156 156 156 -255 255 255 -164 164 164 -82 82 82 diff --git a/graphics/pokemon_storage/ribbon_icon.png b/graphics/pokemon_storage/ribbon_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0c3d51bab353532c65fec0896301dec9905e916c GIT binary patch literal 131 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExUY;(FAsjP9Paotw;K1Q>aqZFF zf4>`k&u5QvzQWtsaU!|EZ*TD`p`=F1<|(I>ALzxFlrV}n{rwr`dVYVNp0vS&i`(~l dK2h`ha*g@ikp%X}>{MHj>7K5BF6*2UngF34FQ5Pb literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/screen.bin b/graphics/pokemon_storage/screen.bin new file mode 100644 index 0000000000000000000000000000000000000000..05d68aad4f5bd487c3088e33efdcca4a7ad312e0 GIT binary patch literal 720 zcmb`D$5I193`Ccl;gK^mAac%N<1K=-vHAbMVP>krkG}iS>|v^crecbi!8Cs3ahNK&IX%ovCR& z!6jE*2ku63#W4Vs_Ox@HdvpKZr2qES)s$lP#fty{0M*sioSdBh|No?AYn46OT#uEggw^yep!FqaN1walB$a0#A0F2<_~>!z zh2qv8Z8zd$X>cxFzxD#RpK$7VOcB2SRXc+CvdX#Hf)~RpN=;fkI6QI19^X40dwgs1 Y217cxHAU$Ou>b%707*qoM6N<$g8X@p)c^nh literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/spinda_icon.png b/graphics/pokemon_storage/spinda_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8da7562334648960d2f25602d01ee8721c032d06 GIT binary patch literal 125 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExE}kxqAsjPZdmDKf3^|zY*1O+f zNUKj3lN2 literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/togepi_icon.png b/graphics/pokemon_storage/togepi_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f8ce1c5391e5312ff55b0c9d82ec0ebd0fcdd18a GIT binary patch literal 124 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fEx&YmugAsjP9dk+d8aNuBiyWjl< zLpH~Q+9v*Tfzof8WjBo+E;N2E7I8Re>tN;7ryR)emB*9yP4aHn%ChN|`c8lAelb*J V6-U2|yHo-)*3;F`Wt~$(699bCDGmSt literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/whiscash.bin b/graphics/pokemon_storage/whiscash.bin new file mode 100644 index 0000000000000000000000000000000000000000..0ebb4d299db170a8fb5ee299579eb9d80192c8fd GIT binary patch literal 720 zcma)%2~)x_5Ju~L>(lW*KQ(GqyzwYgKy&~F9RB~mv1!K=twWnPJK3GQ>?WS)c`uAG z${6EJFv%3t%rMIw^DMB)5|I)wSY{<+l{MDcV3RGj**?zcy>z-@ZP)V$KkKWXp164s&;3+Bc5YKGwM^3t W+pYJiMs8T|P4Br;)}x*Z@T_ltfOJd% literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/whiscash_bg.png b/graphics/pokemon_storage/whiscash_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..703278948e31991b0935a87d2eaf6426b39b85a0 GIT binary patch literal 299 zcmeAS@N?(olHy`uVBq!ia0vp^JAjyjg&D-UuF(jj3<7*YT>t<7|7=V5lqgN000b;K z`Yx+_%e|{n5bo8hSLe)`15~zT$&#R;AYNJBjX;TQo-U3d8WVdjZ4^ALz{464me64G zC9+#^f>c(7{>#!xRSp&IIRekc?fMS$M{Z*7%$}%vO)Tz*@_B)G$)c*7O{~8QW7bOC zWz*-WIsCO|lJ}F|OY^?U%k20dy1(_qj1N9r9vq183a?mJxMfa(|C6=4F7qoMa;FqG z3ukh(+6VaR@6L7F^2Kja%{#I4%v*ftYFr;#AxYOuu&T1HBVPRmvv4FO#p>YcxnIu literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/zigzagoon.bin b/graphics/pokemon_storage/zigzagoon.bin new file mode 100644 index 0000000000000000000000000000000000000000..744b2210cd5232aca516f49e858f81988329a023 GIT binary patch literal 720 zcmd_m+fD*86ougt6$J%<5jhK6tys03l+(=gLgfA5$+je3(PZxJN}84I?`kDUl59Dl z#3^T-Q|5w8Dpa}Rni_R(a3nmqrNJFd?rG7cLzf}o_I#_!kAYyZ@lw? zVZxMIaC2D{$ftaXRk_MkCb`&XUplu7SFgUK-MhV{PFnZ>M7wusf&53e^ZOaA)3EdL fe%RTX+~nG7zw`0#oxfxz(_Y5mdKI;Vst0B(d(nE(I) literal 0 HcmV?d00001 diff --git a/graphics/unknown/unknown_DDD908.bin b/graphics/unknown/unknown_DDD908.bin deleted file mode 100755 index cb0a2fda16..0000000000 --- a/graphics/unknown/unknown_DDD908.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/graphics/unknown/unknown_DDD920.bin b/graphics/unknown/unknown_DDD920.bin deleted file mode 100755 index cb0a2fda16..0000000000 --- a/graphics/unknown/unknown_DDD920.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/graphics/unknown/unknown_DDD938.bin b/graphics/unknown/unknown_DDD938.bin deleted file mode 100755 index cb0a2fda16..0000000000 --- a/graphics/unknown/unknown_DDD938.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 9fffa279fc..62067bd6ae 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -490,16 +490,16 @@ $(PSSGFXDIR)/forest_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 55 $(PSSGFXDIR)/forest.4bpp: $(PSSGFXDIR)/forest_frame.4bpp $(PSSGFXDIR)/forest_bg.4bpp - @cat $(PSSGFXDIR)/forest_frame.4bpp $(PSSGFXDIR)/forest_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/city_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 52 $(PSSGFXDIR)/city.4bpp: $(PSSGFXDIR)/city_frame.4bpp $(PSSGFXDIR)/city_bg.4bpp - @cat $(PSSGFXDIR)/city_frame.4bpp $(PSSGFXDIR)/city_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/desert.4bpp: $(PSSGFXDIR)/desert_frame.4bpp $(PSSGFXDIR)/desert_bg.4bpp - @cat $(PSSGFXDIR)/desert_frame.4bpp $(PSSGFXDIR)/desert_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/savanna_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 45 @@ -508,31 +508,31 @@ $(PSSGFXDIR)/savanna_bg.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 23 $(PSSGFXDIR)/savanna.4bpp: $(PSSGFXDIR)/savanna_frame.4bpp $(PSSGFXDIR)/savanna_bg.4bpp - @cat $(PSSGFXDIR)/savanna_frame.4bpp $(PSSGFXDIR)/savanna_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/crag_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 49 $(PSSGFXDIR)/crag.4bpp: $(PSSGFXDIR)/crag_frame.4bpp $(PSSGFXDIR)/crag_bg.4bpp - @cat $(PSSGFXDIR)/crag_frame.4bpp $(PSSGFXDIR)/crag_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/volcano_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 56 $(PSSGFXDIR)/volcano.4bpp: $(PSSGFXDIR)/volcano_frame.4bpp $(PSSGFXDIR)/volcano_bg.4bpp - @cat $(PSSGFXDIR)/volcano_frame.4bpp $(PSSGFXDIR)/volcano_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/snow_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 57 $(PSSGFXDIR)/snow.4bpp: $(PSSGFXDIR)/snow_frame.4bpp $(PSSGFXDIR)/snow_bg.4bpp - @cat $(PSSGFXDIR)/snow_frame.4bpp $(PSSGFXDIR)/snow_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/cave_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 55 $(PSSGFXDIR)/cave.4bpp: $(PSSGFXDIR)/cave_frame.4bpp $(PSSGFXDIR)/cave_bg.4bpp - @cat $(PSSGFXDIR)/cave_frame.4bpp $(PSSGFXDIR)/cave_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/beach_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 46 @@ -541,13 +541,13 @@ $(PSSGFXDIR)/beach_bg.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 23 $(PSSGFXDIR)/beach.4bpp: $(PSSGFXDIR)/beach_frame.4bpp $(PSSGFXDIR)/beach_bg.4bpp - @cat $(PSSGFXDIR)/beach_frame.4bpp $(PSSGFXDIR)/beach_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/seafloor_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 54 $(PSSGFXDIR)/seafloor.4bpp: $(PSSGFXDIR)/seafloor_frame.4bpp $(PSSGFXDIR)/seafloor_bg.4bpp - @cat $(PSSGFXDIR)/seafloor_frame.4bpp $(PSSGFXDIR)/seafloor_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/river_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 51 @@ -556,34 +556,88 @@ $(PSSGFXDIR)/river_bg.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 11 $(PSSGFXDIR)/river.4bpp: $(PSSGFXDIR)/river_frame.4bpp $(PSSGFXDIR)/river_bg.4bpp - @cat $(PSSGFXDIR)/river_frame.4bpp $(PSSGFXDIR)/river_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/sky_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 45 $(PSSGFXDIR)/sky.4bpp: $(PSSGFXDIR)/sky_frame.4bpp $(PSSGFXDIR)/sky_bg.4bpp - @cat $(PSSGFXDIR)/sky_frame.4bpp $(PSSGFXDIR)/sky_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/bubbles_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 54 $(PSSGFXDIR)/bubbles.4bpp: $(PSSGFXDIR)/bubbles_frame.4bpp $(PSSGFXDIR)/bubbles_bg.4bpp - @cat $(PSSGFXDIR)/bubbles_frame.4bpp $(PSSGFXDIR)/bubbles_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/pokecenter_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 35 $(PSSGFXDIR)/pokecenter.4bpp: $(PSSGFXDIR)/pokecenter_frame.4bpp $(PSSGFXDIR)/pokecenter_bg.4bpp - @cat $(PSSGFXDIR)/pokecenter_frame.4bpp $(PSSGFXDIR)/pokecenter_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/machine_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 33 $(PSSGFXDIR)/machine.4bpp: $(PSSGFXDIR)/machine_frame.4bpp $(PSSGFXDIR)/machine_bg.4bpp - @cat $(PSSGFXDIR)/machine_frame.4bpp $(PSSGFXDIR)/machine_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/plain_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 18 $(PSSGFXDIR)/plain.4bpp: $(PSSGFXDIR)/plain_frame.4bpp $(PSSGFXDIR)/plain_bg.4bpp - @cat $(PSSGFXDIR)/plain_frame.4bpp $(PSSGFXDIR)/plain_bg.4bpp >$@ + @cat $^ >$@ + +$(PSSGFXDIR)/friends_frame1.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 57 + +$(PSSGFXDIR)/friends_frame2.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 57 + +$(PSSGFXDIR)/zigzagoon.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/zigzagoon_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/screen.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/screen_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/horizontal.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/horizontal_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/diagonal.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/diagonal_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/block.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/block_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/ribbon.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/ribbon_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/pokecenter2.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/pokecenter2_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/frame.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/frame_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/blank.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/blank_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/circles.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/circles_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/azumarill.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/azumarill_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/pikachu.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/pikachu_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/legendary.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/legendary_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/dusclops.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/dusclops_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/ludicolo.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/ludicolo_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/whiscash.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/whiscash_bg.4bpp + @cat $^ >$@ From b806ee8bedab880066a630a3b68ba9d0c5bdd5c9 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Thu, 18 Jan 2018 12:52:37 -0600 Subject: [PATCH 37/64] Finish extracting pokemon storage system data --- asm/pokemon_storage_system.s | 16 +- data/pokemon_storage_system.s | 283 +++++++++++++++--- data/strings.s | 76 ++--- graphics/pokemon_storage/hand_cursor.png | Bin 0 -> 419 bytes .../pokemon_storage/hand_cursor_shadow.png | Bin 0 -> 155 bytes .../{bubbles.bin => polkadot.bin} | Bin .../{bubbles_bg.png => polkadot_bg.png} | Bin .../{bubbles_frame.png => polkadot_frame.png} | Bin graphics/pokemon_storage/unknown_frame.png | Bin 0 -> 170 bytes graphics_file_rules.mk | 4 +- 10 files changed, 293 insertions(+), 86 deletions(-) create mode 100644 graphics/pokemon_storage/hand_cursor.png create mode 100644 graphics/pokemon_storage/hand_cursor_shadow.png rename graphics/pokemon_storage/{bubbles.bin => polkadot.bin} (100%) rename graphics/pokemon_storage/{bubbles_bg.png => polkadot_bg.png} (100%) rename graphics/pokemon_storage/{bubbles_frame.png => polkadot_frame.png} (100%) create mode 100644 graphics/pokemon_storage/unknown_frame.png diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 55b1509e0a..4a445d5247 100755 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -10646,7 +10646,7 @@ _080CCC70: adds r1, r6, r1 lsls r1, 16 asrs r1, 16 - ldr r0, =gUnknown_0857B0A8 + ldr r0, =gSpriteTemplate_857B0A8 movs r2, 0x1C movs r3, 0x18 bl CreateSprite @@ -10720,7 +10720,7 @@ sub_80CCCFC: @ 80CCCFC ldr r0, =0x00030200 str r0, [r3, 0x4] add r1, sp, 0x4 - ldr r0, =gUnknown_0857B0A8 + ldr r0, =gSpriteTemplate_857B0A8 ldm r0!, {r5-r7} stm r1!, {r5-r7} ldm r0!, {r5-r7} @@ -16240,14 +16240,14 @@ sub_80CFC14: @ 80CFC14 push {r4-r6,lr} sub sp, 0x2C mov r1, sp - ldr r0, =gUnknown_0857B9E4 + ldr r0, =gHandCursorSpriteSheets ldm r0!, {r2-r4} stm r1!, {r2-r4} ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} add r4, sp, 0x18 adds r1, r4, 0 - ldr r0, =gUnknown_0857B9FC + ldr r0, =gHandCursorSpritePalettes ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} ldr r0, [r0] @@ -16279,7 +16279,7 @@ sub_80CFC14: @ 80CFC14 adds r2, r4, 0 adds r3, r5, 0 bl sub_80CD444 - ldr r0, =gUnknown_0857BA50 + ldr r0, =gSpriteTemplate_857BA50 movs r2, 0 ldrsh r1, [r4, r2] movs r3, 0 @@ -16353,7 +16353,7 @@ _080CFD3C: movs r3, 0x15 movs r4, 0x2 _080CFD40: - ldr r0, =gUnknown_0857BA68 + ldr r0, =gSpriteTemplate_857BA68 movs r1, 0 movs r2, 0 bl CreateSprite @@ -18324,7 +18324,7 @@ sub_80D0C60: @ 80D0C60 orrs r0, r1 str r0, [r2, 0x4] mov r1, sp - ldr r0, =gUnknown_0857BC70 + ldr r0, =gSpriteTemplate_857BC70 ldm r0!, {r4-r6} stm r1!, {r4-r6} ldm r0!, {r4-r6} @@ -21660,7 +21660,7 @@ sub_80D2644: @ 80D2644 mov r2, r9 ldr r1, [r2] adds r5, r1 - ldr r2, =gUnknown_0857BC88 + ldr r2, =gSpriteTemplate_857BC88 lsls r4, 2 lsls r1, r0, 4 adds r4, r1 diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index 882dc82fc3..f123f4fe2b 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -370,17 +370,17 @@ gWallpaperTilemap_Sky: @ 85765C0 .incbin "graphics/pokemon_storage/sky.bin.lz" .align 2 -gWallpaperPalettes_Bubbles: @ 85766B0 - .incbin "graphics/pokemon_storage/bubbles_frame.gbapal" - .incbin "graphics/pokemon_storage/bubbles_bg.gbapal" +gWallpaperPalettes_PolkaDot: @ 85766B0 + .incbin "graphics/pokemon_storage/polkadot_frame.gbapal" + .incbin "graphics/pokemon_storage/polkadot_bg.gbapal" .align 2 -gWallpaperTiles_Bubbles: @ 85766F0 - .incbin "graphics/pokemon_storage/bubbles.4bpp.lz" +gWallpaperTiles_PolkaDot: @ 85766F0 + .incbin "graphics/pokemon_storage/polkadot.4bpp.lz" .align 2 -gWallpaperTilemap_Bubbles: @ 85769B8 - .incbin "graphics/pokemon_storage/bubbles.bin.lz" +gWallpaperTilemap_PolkaDot: @ 85769B8 + .incbin "graphics/pokemon_storage/polkadot.bin.lz" .align 2 gWallpaperPalettes_Pokecenter: @ 8576AB8 @@ -506,10 +506,10 @@ gWallpaperTable:: @ 85775B8 .4byte gWallpaperTilemap_Sky .4byte gWallpaperPalettes_Sky - @ Bubbles - .4byte gWallpaperTiles_Bubbles - .4byte gWallpaperTilemap_Bubbles - .4byte gWallpaperPalettes_Bubbles + @ PolkaDot + .4byte gWallpaperTiles_PolkaDot + .4byte gWallpaperTilemap_PolkaDot + .4byte gWallpaperPalettes_PolkaDot @ Pokecenter .4byte gWallpaperTiles_Pokecenter @@ -583,16 +583,16 @@ gWallpaperTilemap_Block: @ 8578358 .incbin "graphics/pokemon_storage/block.bin.lz" .align 2 -gWallpaperPalettes_PokeCenter2:: @ 8578450 +gWallpaperPalettes_Pokecenter2:: @ 8578450 .incbin "graphics/pokemon_storage/pokecenter2_bg.gbapal" .incbin "graphics/pokemon_storage/pokecenter2_bg.gbapal" .align 2 -gWallpaperTiles_PokeCenter2: @ 8578490 +gWallpaperTiles_Pokecenter2: @ 8578490 .incbin "graphics/pokemon_storage/pokecenter2.4bpp.lz" .align 2 -gWallpaperTilemap_PokeCenter2: @ 85786D0 +gWallpaperTilemap_Pokecenter2: @ 85786D0 .incbin "graphics/pokemon_storage/pokecenter2.bin.lz" .align 2 @@ -828,7 +828,7 @@ gUnknown_0857AF44:: @ 857AF44 .4byte gWallpaperTiles_Diagonal, gWallpaperTilemap_Diagonal, gWallpaperPalettes_Diagonal .4byte gWallpaperTiles_Block, gWallpaperTilemap_Block, gWallpaperPalettes_Block .4byte gWallpaperTiles_Ribbon, gWallpaperTilemap_Ribbon, gWallpaperPalettes_Ribbon - .4byte gWallpaperTiles_PokeCenter2, gWallpaperTilemap_PokeCenter2, gWallpaperPalettes_PokeCenter2 + .4byte gWallpaperTiles_Pokecenter2, gWallpaperTilemap_Pokecenter2, gWallpaperPalettes_Pokecenter2 .4byte gWallpaperTiles_Frame, gWallpaperTilemap_Frame, gWallpaperPalettes_Frame .4byte gWallpaperTiles_Blank, gWallpaperTilemap_Blank, gWallpaperPalettes_Blank .4byte gWallpaperTiles_Circles, gWallpaperTilemap_Circles, gWallpaperPalettes_Circles @@ -874,50 +874,257 @@ gUnknown_0857B004:: @ 857B004 .align 2 gUnknown_0857B07C:: @ 857B07C - .incbin "baserom.gba", 0x57b07C, 0x4 + .4byte 0x23BA .align 2 gUnknown_0857B080:: @ 857B080 - .incbin "baserom.gba", 0x57b080, 0x28 + obj_tiles PCGfx_Arrow, 128, 0x0006 -gUnknown_0857B0A8:: @ 857B0A8 - .incbin "baserom.gba", 0x57b0a8, 0x38 + .align 2 +gOamData_857B088:: @ 857B088 + .2byte 0x4000 + .2byte 0x8000 + .2byte 0x0800 + + .align 2 +gSpriteAnim_857B090:: @ 857B090 + obj_image_anim_frame 0, 5 + obj_image_anim_end + + .align 2 +gSpriteAnim_857B098:: @ 857B098 + obj_image_anim_frame 8, 5 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_857B0A0:: @ 857B0A0 + .4byte gSpriteAnim_857B090 + .4byte gSpriteAnim_857B098 + + .align 2 +gSpriteTemplate_857B0A8:: @ 857B0A8 + spr_template 0x0003, 0xDAC9, gOamData_857B088, gSpriteAnimTable_857B0A0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gOamData_857B0C0:: @ 857B0C0 + .2byte 0x8000 + .2byte 0x0000 + .2byte 0x0800 + + .align 2 +gSpriteAnim_857B0C8:: @ 857B0C8 + obj_image_anim_frame 0, 5 + obj_image_anim_end + + .align 2 +gSpriteAnim_857B0D0:: @ 857B0D0 + obj_image_anim_frame 2, 5 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_857B0D8:: @ 857B0D8 + .4byte gSpriteAnim_857B0C8 + .4byte gSpriteAnim_857B0D0 gUnknown_0857B0E0:: @ 857B0E0 - .incbin "baserom.gba", 0x57b0e0, 0x8b8 + spr_template 0x0006, 0xDACA, gOamData_857B0C0, gSpriteAnimTable_857B0D8, NULL, gDummySpriteAffineAnimTable, sub_80CD210 + .align 2 +HandCursorPalette: @ 857B0F8 + .incbin "graphics/pokemon_storage/hand_cursor.gbapal" + + .align 2 +HandCursorTiles: @ 857B118 + .incbin "graphics/pokemon_storage/hand_cursor.4bpp" + + .align 2 +HandCursorShadowTiles: @ 857B918 + .incbin "graphics/pokemon_storage/hand_cursor_shadow.4bpp" + + .align 2 gUnknown_0857B998:: @ 857B998 - .incbin "baserom.gba", 0x57b998, 0xc + .4byte sub_80CDCCC + .4byte sub_80CDD5C + .4byte sub_80CDDD8 + .align 2 gUnknown_0857B9A4:: @ 857B9A4 - .incbin "baserom.gba", 0x57b9a4, 0x18 + .byte 0x22, 0x00 + .2byte 0x0039 + .byte 0x22, 0x00 + .2byte 0x0123 + .byte 0x10, 0x0a + .2byte 0x0046 + .byte 0x10, 0x0a + .2byte 0x00f9 + .byte 0x10, 0x0e + .2byte 0x0046 + .byte 0x10, 0x0e + .2byte 0x00f9 + .align 2 gUnknown_0857B9BC:: @ 857B9BC - .incbin "baserom.gba", 0x57b9bc, 0x28 + .4byte sub_80CF0CC, 0 + .4byte sub_80CF5C4, 1 + .4byte sub_80CF7E4, 2 + .4byte sub_80CF8D8, 3 + .4byte NULL, 0 -gUnknown_0857B9E4:: @ 857B9E4 - .incbin "baserom.gba", 0x57b9e4, 0x18 + .align 2 +gHandCursorSpriteSheets:: @ 857B9E4 + obj_tiles HandCursorTiles, 0x0800, 0x0000 + obj_tiles HandCursorShadowTiles, 0x0080, 0x0001 + null_obj_tiles -gUnknown_0857B9FC:: @ 857B9FC - .incbin "baserom.gba", 0x57b9fc, 0x54 + .align 2 +gHandCursorSpritePalettes:: @ 857B9FC + obj_pal HandCursorPalette, 0xDAC7 + null_obj_pal -gUnknown_0857BA50:: @ 857BA50 - .incbin "baserom.gba", 0x57ba50, 0x18 + .align 2 +gOamData_857BA0C:: @ 857BA0C + .2byte 0x0000 + .2byte 0x8000 + .2byte 0x0400 -gUnknown_0857BA68:: @ 857BA68 - .incbin "baserom.gba", 0x57ba68, 0x18 + .align 2 +gOamData_857BA14:: @ 857BA14 + .2byte 0x0000 + .2byte 0x4000 + .2byte 0x0400 + .align 2 +gSpriteAnim_857BA1C:: @ 857BA1C + obj_image_anim_frame 0, 30 + obj_image_anim_frame 16, 30 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnim_857BA28:: @ 857BA28 + obj_image_anim_frame 0, 5 + obj_image_anim_end + + .align 2 +gSpriteAnim_857BA30:: @ 857BA30 + obj_image_anim_frame 32, 5 + obj_image_anim_end + + .align 2 +gSpriteAnim_857BA38:: @ 857BA38 + obj_image_anim_frame 48, 5 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_857BA40:: @ 857BA40 + .4byte gSpriteAnim_857BA1C + .4byte gSpriteAnim_857BA28 + .4byte gSpriteAnim_857BA30 + .4byte gSpriteAnim_857BA38 + + .align 2 +gSpriteTemplate_857BA50:: @ 857BA50 + spr_template 0, 0xDACA, gOamData_857BA0C, gSpriteAnimTable_857BA40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gSpriteTemplate_857BA68:: @ 857BA68 + spr_template 1, 0xDACA, gOamData_857BA14, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CFBF4 + + .align 2 gUnknown_0857BA80:: @ 857BA80 - .incbin "baserom.gba", 0x57ba80, 0x9c + .4byte gPCText_Cancel + .4byte gPCText_Store + .4byte gPCText_Withdraw + .4byte gPCText_Move + .4byte gPCText_Shift + .4byte gPCText_Place + .4byte gPCText_Summary + .4byte gPCText_Release + .4byte gPCText_Mark + .4byte gPCText_Jump + .4byte gPCText_Wallpaper + .4byte gPCText_Name + .4byte gPCText_Take + .4byte gPCText_Give + .4byte gPCText_Give + .4byte gPCText_Switch + .4byte gPCText_Bag + .4byte gPCText_Info + .4byte gPCText_Scenery1 + .4byte gPCText_Scenery2 + .4byte gPCText_Scenery3 + .4byte gPCText_Etcetera + .4byte gPCText_Friends + .4byte gPCText_Forest + .4byte gPCText_City + .4byte gPCText_Desert + .4byte gPCText_Savanna + .4byte gPCText_Crag + .4byte gPCText_Volcano + .4byte gPCText_Snow + .4byte gPCText_Cave + .4byte gPCText_Beach + .4byte gPCText_Seafloor + .4byte gPCText_River + .4byte gPCText_Sky + .4byte gPCText_PolkaDot + .4byte gPCText_Pokecenter + .4byte gPCText_Machine + .4byte gPCText_Simple + .align 2 gUnknown_0857BB1C:: @ 857BB1C - .incbin "baserom.gba", 0x57bb1c, 0x8 + window_template 0x00, 0x0a, 0x03, 0x14, 0x12, 0x09, 0x000a + .align 2 gUnknown_0857BB24:: @ 857BB24 - .incbin "baserom.gba", 0x57bb24, 0x14c + .incbin "graphics/pokemon_storage/unknown_frame.4bpp" -gUnknown_0857BC70:: @ 857BC70 - .incbin "baserom.gba", 0x57bc70, 0x18 + .align 2 +gOamData_857BBA4:: @ 857BBA4 + .2byte 0x0100, 0x8000, 0x0400, 0x0000 + + .align 2 +gSpriteAffineAnim_857BBAC:: @ 857BBAC + .2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_857BBBC:: @ 857BBBC + .2byte 0x0058, 0x0058, 0x0000, 0x0000, 0x0005, 0x0005, 0x0800, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_857BBD4:: @ 857BBD4 + .2byte 0x0080, 0x0080, 0x0000, 0x0000, 0xfffb, 0xfffb, 0x0800, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_857BBEC:: @ 857BBEC + .2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x000a, 0x000a, 0x0c00, 0x0000, 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_857BC0C:: @ 857BC0C + .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0xfff6, 0xfff6, 0x0c00, 0x0000, 0x0080, 0x0080, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_857BC2C:: @ 857BC2C + .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0xfffb, 0xfffb, 0x1000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_857BC44:: @ 857BC44 + .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnimTable_857BC54:: @ 857BC54 + .4byte gSpriteAffineAnim_857BBAC + .4byte gSpriteAffineAnim_857BBBC + .4byte gSpriteAffineAnim_857BBD4 + .4byte gSpriteAffineAnim_857BBEC + .4byte gSpriteAffineAnim_857BC0C + .4byte gSpriteAffineAnim_857BC2C + .4byte gSpriteAffineAnim_857BC44 + + .align 2 +gSpriteTemplate_857BC70:: @ 857BC70 + spr_template 0x0007, 0xdacb, gOamData_857BBA4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_857BC54, SpriteCallbackDummy + +gSpriteTemplate_857BC88:: @ 857BC88 + .2byte 0x0100, 0x0100, 0x0200, 0x0100, 0x0100, 0x0200, 0x0200, 0x0200, 0x0080, 0x0080, 0x0100, 0x0100, 0x0200, 0x0200, 0x0400, 0x0400 -gUnknown_0857BC88:: @ 857BC88 - .incbin "baserom.gba", 0x57bc88, 0x20 diff --git a/data/strings.s b/data/strings.s index 2fe5a7d2f6..9ff36256d9 100644 --- a/data/strings.s +++ b/data/strings.s @@ -2588,118 +2588,118 @@ gText_ChangedToNewItem:: @ 85EBA29 gText_MailCantBeStored:: @ 85EBA38 .string "MAIL can’t be stored!$" -gUnknown_085EBA4E:: @ 85EBA4E +gPCText_Cancel:: @ 85EBA4E .string "CANCEL$" -gUnknown_085EBA55:: @ 85EBA55 +gPCText_Store:: @ 85EBA55 .string "STORE$" -gUnknown_085EBA5B:: @ 85EBA5B +gPCText_Withdraw:: @ 85EBA5B .string "WITHDRAW$" -gUnknown_085EBA64:: @ 85EBA64 +gPCText_Shift:: @ 85EBA64 .string "SHIFT$" -gUnknown_085EBA6A:: @ 85EBA6A +gPCText_Move:: @ 85EBA6A .string "MOVE$" -gUnknown_085EBA6F:: @ 85EBA6F +gPCText_Place:: @ 85EBA6F .string "PLACE$" -gUnknown_085EBA75:: @ 85EBA75 +gPCText_Summary:: @ 85EBA75 .string "SUMMARY$" -gUnknown_085EBA7D:: @ 85EBA7D +gPCText_Release:: @ 85EBA7D .string "RELEASE$" -gUnknown_085EBA85:: @ 85EBA85 +gPCText_Mark:: @ 85EBA85 .string "MARK$" -gUnknown_085EBA8A:: @ 85EBA8A +gPCText_Name:: @ 85EBA8A .string "NAME$" -gUnknown_085EBA8F:: @ 85EBA8F +gPCText_Jump:: @ 85EBA8F .string "JUMP$" -gUnknown_085EBA94:: @ 85EBA94 +gPCText_Wallpaper:: @ 85EBA94 .string "WALLPAPER$" -gUnknown_085EBA9E:: @ 85EBA9E +gPCText_Take:: @ 85EBA9E .string "TAKE$" -gUnknown_085EBAA3:: @ 85EBAA3 +gPCText_Give:: @ 85EBAA3 .string "GIVE$" -gUnknown_085EBAA8:: @ 85EBAA8 +gPCText_Switch:: @ 85EBAA8 .string "SWITCH$" -gUnknown_085EBAAF:: @ 85EBAAF +gPCText_Bag:: @ 85EBAAF .string "BAG$" -gUnknown_085EBAB3:: @ 85EBAB3 +gPCText_Info:: @ 85EBAB3 .string "INFO$" -gUnknown_085EBAB8:: @ 85EBAB8 +gPCText_Scenery1:: @ 85EBAB8 .string "SCENERY 1$" -gUnknown_085EBAC2:: @ 85EBAC2 +gPCText_Scenery2:: @ 85EBAC2 .string "SCENERY 2$" -gUnknown_085EBACC:: @ 85EBACC +gPCText_Scenery3:: @ 85EBACC .string "SCENERY 3$" -gUnknown_085EBAD6:: @ 85EBAD6 +gPCText_Etcetera:: @ 85EBAD6 .string "ETCETERA$" -gUnknown_085EBADF:: @ 85EBADF +gPCText_Friends:: @ 85EBADF .string "FRIENDS$" -gUnknown_085EBAE7:: @ 85EBAE7 +gPCText_Forest:: @ 85EBAE7 .string "FOREST$" -gUnknown_085EBAEE:: @ 85EBAEE +gPCText_City:: @ 85EBAEE .string "CITY$" -gUnknown_085EBAF3:: @ 85EBAF3 +gPCText_Desert:: @ 85EBAF3 .string "DESERT$" -gUnknown_085EBAFA:: @ 85EBAFA +gPCText_Savanna:: @ 85EBAFA .string "SAVANNA$" -gUnknown_085EBB02:: @ 85EBB02 +gPCText_Crag:: @ 85EBB02 .string "CRAG$" -gUnknown_085EBB07:: @ 85EBB07 +gPCText_Volcano:: @ 85EBB07 .string "VOLCANO$" -gUnknown_085EBB0F:: @ 85EBB0F +gPCText_Snow:: @ 85EBB0F .string "SNOW$" -gUnknown_085EBB14:: @ 85EBB14 +gPCText_Cave:: @ 85EBB14 .string "CAVE$" -gUnknown_085EBB19:: @ 85EBB19 +gPCText_Beach:: @ 85EBB19 .string "BEACH$" -gUnknown_085EBB1F:: @ 85EBB1F +gPCText_Seafloor:: @ 85EBB1F .string "SEAFLOOR$" -gUnknown_085EBB28:: @ 85EBB28 +gPCText_River:: @ 85EBB28 .string "RIVER$" -gUnknown_085EBB2E:: @ 85EBB2E +gPCText_Sky:: @ 85EBB2E .string "SKY$" -gUnknown_085EBB32:: @ 85EBB32 +gPCText_PolkaDot:: @ 85EBB32 .string "POLKA-DOT$" -gUnknown_085EBB3C:: @ 85EBB3C +gPCText_Pokecenter:: @ 85EBB3C .string "POKéCENTER$" -gUnknown_085EBB47:: @ 85EBB47 +gPCText_Machine:: @ 85EBB47 .string "MACHINE$" -gUnknown_085EBB4F:: @ 85EBB4F +gPCText_Simple:: @ 85EBB4F .string "SIMPLE$" gUnknown_085EBB56:: @ 85EBB56 diff --git a/graphics/pokemon_storage/hand_cursor.png b/graphics/pokemon_storage/hand_cursor.png new file mode 100644 index 0000000000000000000000000000000000000000..32f58ec633156640fc1a7415836d1d7ee2c8304d GIT binary patch literal 419 zcmV;U0bKrxP)$=CsXw0DDRR|NsC0|NsC0|NpdV|D*u_|Nq|J-T(jqliD`i0003l zNklb>!3`M0In7V=KQC?b(?5U-Zo|LgVRB5MaNEJnZwnG4GG9SJ`+5G+r z;a}G@)G)g;0=`;FOi0yA(n7>W6165ailjBk>;+V&pMma>0kBl|pougKww`U1Or@{g zb#0i?cI6o&1PA=9=gos)_g^ItPPd-WFbb+SOl6@5hT--uuIsj1!|VXj4m?o-umexF zbzg>5*Q2;)8fIkz7I$LZ0{HyoQs%4AW{t|8abHh z)^*<@*s$J=nt0*TXUOykA})-5j_cPsKm$qrV?sk8!G*>d^W*XQqhAg`ycx;ihi`#m zK=OW3!DRsJUb6!%A{L0C1sVp$T}gVM$mT#uy}8KQ^J2JTV0t!>d;rkocAIHvx-0+y N002ovPDHLkV1loV!_WW# literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/hand_cursor_shadow.png b/graphics/pokemon_storage/hand_cursor_shadow.png new file mode 100644 index 0000000000000000000000000000000000000000..f10b0af44f4e4789decd5fe13f41185d5db57ba8 GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDU1=3TdtO*K=`v3p`+5i8e z_P&c+ayF=WNl;cbP!K44@7}j1OSS;j6c>X;)-rGj14Y$5T^vI=W+o>n2!1hd(Cp(= uVEFu>nK7V;+2#NLMwO-j=IgE!3=ALG#Tw?hMwb9}FnGH9xvXX;)-rGj14T_eT^vI=W+va@Woc?^+ANvI z#5hBdgHgq(;h0Y2EaO`75U)*A%hJru+EPqsFkWIvW9W@wWq9MI*uJtii4|x7gQu&X J%Q~loCIC?CIKKb@ literal 0 HcmV?d00001 diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 62067bd6ae..648e3a9cbb 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -564,10 +564,10 @@ $(PSSGFXDIR)/sky_frame.4bpp: %.4bpp: %.png $(PSSGFXDIR)/sky.4bpp: $(PSSGFXDIR)/sky_frame.4bpp $(PSSGFXDIR)/sky_bg.4bpp @cat $^ >$@ -$(PSSGFXDIR)/bubbles_frame.4bpp: %.4bpp: %.png +$(PSSGFXDIR)/polkadot_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 54 -$(PSSGFXDIR)/bubbles.4bpp: $(PSSGFXDIR)/bubbles_frame.4bpp $(PSSGFXDIR)/bubbles_bg.4bpp +$(PSSGFXDIR)/polkadot.4bpp: $(PSSGFXDIR)/polkadot_frame.4bpp $(PSSGFXDIR)/polkadot_bg.4bpp @cat $^ >$@ $(PSSGFXDIR)/pokecenter_frame.4bpp: %.4bpp: %.png From 6445394929d07997eb43f476e0c47bbb2e27e34e Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Thu, 18 Jan 2018 15:38:31 -0600 Subject: [PATCH 38/64] Extract rotating_gate.s --- data/rotating_gate.s | 270 ++++++++++++++++++++++++++++-- graphics/misc/rotating_gate_1.png | Bin 0 -> 119 bytes graphics/misc/rotating_gate_2.png | Bin 0 -> 136 bytes graphics/misc/rotating_gate_3.png | Bin 0 -> 136 bytes graphics/misc/rotating_gate_4.png | Bin 0 -> 136 bytes graphics/misc/rotating_gate_5.png | Bin 0 -> 122 bytes graphics/misc/rotating_gate_6.png | Bin 0 -> 144 bytes graphics/misc/rotating_gate_7.png | Bin 0 -> 144 bytes graphics/misc/rotating_gate_8.png | Bin 0 -> 142 bytes 9 files changed, 257 insertions(+), 13 deletions(-) create mode 100644 graphics/misc/rotating_gate_1.png create mode 100644 graphics/misc/rotating_gate_2.png create mode 100644 graphics/misc/rotating_gate_3.png create mode 100644 graphics/misc/rotating_gate_4.png create mode 100644 graphics/misc/rotating_gate_5.png create mode 100644 graphics/misc/rotating_gate_6.png create mode 100644 graphics/misc/rotating_gate_7.png create mode 100644 graphics/misc/rotating_gate_8.png diff --git a/data/rotating_gate.s b/data/rotating_gate.s index 90568caa5b..595cc9917c 100644 --- a/data/rotating_gate.s +++ b/data/rotating_gate.s @@ -2,40 +2,284 @@ .include "constants/constants.inc" .section .rodata - .align 2, 0 + .align 2 gUnknown_0858E8B0:: @ 858E8B0 - .incbin "baserom.gba", 0x58e8b0, 0x40 + .2byte 0x0006, 0x0007 + .byte 0x05, 0x01 + .align 2 + .2byte 0x0009, 0x000f + .byte 0x05, 0x02 + + .align 2 + .2byte 0x0003, 0x0013 + .byte 0x05, 0x01 + + .align 2 + .2byte 0x0002, 0x0006 + .byte 0x04, 0x01 + + .align 2 + .2byte 0x0009, 0x000c + .byte 0x04, 0x00 + + .align 2 + .2byte 0x0006, 0x0017 + .byte 0x04, 0x00 + + .align 2 + .2byte 0x000c, 0x0016 + .byte 0x04, 0x00 + + .align 2 + .2byte 0x0006, 0x0003 + .byte 0x03, 0x02 + + .align 2 gUnknown_0858E8F0:: @ 858E8F0 - .incbin "baserom.gba", 0x58e8f0, 0x3468 + .2byte 0x000e, 0x0005 + .byte 0x04, 0x01 + .align 2 + .2byte 0x000a, 0x0006 + .byte 0x01, 0x02 + + .align 2 + .2byte 0x0006, 0x0006 + .byte 0x03, 0x01 + + .align 2 + .2byte 0x000e, 0x0008 + .byte 0x04, 0x01 + + .align 2 + .2byte 0x0003, 0x000a + .byte 0x02, 0x03 + + .align 2 + .2byte 0x0009, 0x000e + .byte 0x00, 0x01 + + .align 2 + .2byte 0x0003, 0x000f + .byte 0x06, 0x00 + + .align 2 + .2byte 0x0002, 0x0011 + .byte 0x01, 0x02 + + .align 2 + .2byte 0x000c, 0x0012 + .byte 0x06, 0x03 + + .align 2 + .2byte 0x0005, 0x0012 + .byte 0x03, 0x01 + + .align 2 + .2byte 0x000a, 0x0013 + .byte 0x02, 0x02 + + .align 2 +gUnknown_0858E948:: @ 858E948 + .incbin "graphics/misc/rotating_gate_1.4bpp" + + .align 2 +gUnknown_0858EB48:: @ 858EB48 + .incbin "graphics/misc/rotating_gate_2.4bpp" + + .align 2 +gUnknown_0858F348:: @ 858F348 + .incbin "graphics/misc/rotating_gate_3.4bpp" + + .align 2 +gUnknown_0858FB48:: @ 858FB48 + .incbin "graphics/misc/rotating_gate_4.4bpp" + + .align 2 +gUnknown_08590348:: @ 8590348 + .incbin "graphics/misc/rotating_gate_5.4bpp" + + .align 2 +gUnknown_08590548:: @ 8590548 + .incbin "graphics/misc/rotating_gate_6.4bpp" + + .align 2 +gUnknown_08590D48:: @ 8590D48 + .incbin "graphics/misc/rotating_gate_7.4bpp" + + .align 2 +gUnknown_08591548:: @ 8591548 + .incbin "graphics/misc/rotating_gate_8.4bpp" + + .align 2 +gOamData_8591D48:: @ 8591D48 + .2byte 0x0100, 0xc000, 0x2800 + + .align 2 +gOamData_8591D50:: @ 8591D50 + .2byte 0x0100, 0x8000, 0x2800 + + .align 2 gUnknown_08591D58:: @ 8591D58 - .incbin "baserom.gba", 0x591d58, 0x270 + obj_tiles gUnknown_0858E948, 0x0200, 0x1300 + obj_tiles gUnknown_0858EB48, 0x0800, 0x1301 + obj_tiles gUnknown_0858F348, 0x0800, 0x1302 + obj_tiles gUnknown_0858FB48, 0x0800, 0x1303 + obj_tiles gUnknown_08590348, 0x0200, 0x1304 + obj_tiles gUnknown_08590548, 0x0800, 0x1305 + obj_tiles gUnknown_08590D48, 0x0800, 0x1306 + obj_tiles gUnknown_08591548, 0x0800, 0x1307 + null_obj_tiles + .align 2 +gSpriteAnim_8591DA0:: @ 8591DA0 + .2byte 0x0000, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8591DA8:: @ 8591DA8 + .2byte 0x0000, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_8591DB0:: @ 8591DB0 + .4byte gSpriteAnim_8591DA0 + + .align 2 +gSpriteAnimTable_8591DB4:: @ 8591DB4 + .4byte gSpriteAnim_8591DA8 + + .align 2 +gSpriteAffineAnim_8591DB8:: @ 8591DB8 + .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_8591DC8:: @ 8591DC8 + .2byte 0x0100, 0x0100, 0x00c0, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_8591DD8:: @ 8591DD8 + .2byte 0x0100, 0x0100, 0x0080, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_8591DE8:: @ 8591DE8 + .2byte 0x0100, 0x0100, 0x0040, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_8591DF8:: @ 8591DF8 + .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x10fc, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_8591E10:: @ 8591E10 + .2byte 0x0100, 0x0100, 0x00c0, 0x0000, 0x0000, 0x0000, 0x10fc, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_8591E28:: @ 8591E28 + .2byte 0x0100, 0x0100, 0x0080, 0x0000, 0x0000, 0x0000, 0x10fc, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_8591E40:: @ 8591E40 + .2byte 0x0100, 0x0100, 0x0040, 0x0000, 0x0000, 0x0000, 0x10fc, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_8591E58:: @ 8591E58 + .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x1004, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_8591E70:: @ 8591E70 + .2byte 0x0100, 0x0100, 0x0040, 0x0000, 0x0000, 0x0000, 0x1004, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_8591E88:: @ 8591E88 + .2byte 0x0100, 0x0100, 0x0080, 0x0000, 0x0000, 0x0000, 0x1004, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_8591EA0:: @ 8591EA0 + .2byte 0x0100, 0x0100, 0x00c0, 0x0000, 0x0000, 0x0000, 0x1004, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_8591EB8:: @ 8591EB8 + .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x08f8, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_8591ED0:: @ 8591ED0 + .2byte 0x0100, 0x0100, 0x00c0, 0x0000, 0x0000, 0x0000, 0x08f8, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_8591EE8:: @ 8591EE8 + .2byte 0x0100, 0x0100, 0x0080, 0x0000, 0x0000, 0x0000, 0x08f8, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_8591F00:: @ 8591F00 + .2byte 0x0100, 0x0100, 0x0040, 0x0000, 0x0000, 0x0000, 0x08f8, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_8591F18:: @ 8591F18 + .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0808, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_8591F30:: @ 8591F30 + .2byte 0x0100, 0x0100, 0x0040, 0x0000, 0x0000, 0x0000, 0x0808, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_8591F48:: @ 8591F48 + .2byte 0x0100, 0x0100, 0x0080, 0x0000, 0x0000, 0x0000, 0x0808, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_8591F60:: @ 8591F60 + .2byte 0x0100, 0x0100, 0x00c0, 0x0000, 0x0000, 0x0000, 0x0808, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnimTable_8591F78:: @ 8591F78 + .4byte gSpriteAffineAnim_8591DB8 + .4byte gSpriteAffineAnim_8591DC8 + .4byte gSpriteAffineAnim_8591DD8 + .4byte gSpriteAffineAnim_8591DE8 + .4byte gSpriteAffineAnim_8591E58 + .4byte gSpriteAffineAnim_8591EA0 + .4byte gSpriteAffineAnim_8591E88 + .4byte gSpriteAffineAnim_8591E70 + .4byte gSpriteAffineAnim_8591DF8 + .4byte gSpriteAffineAnim_8591E10 + .4byte gSpriteAffineAnim_8591E28 + .4byte gSpriteAffineAnim_8591E40 + .4byte gSpriteAffineAnim_8591F18 + .4byte gSpriteAffineAnim_8591F60 + .4byte gSpriteAffineAnim_8591F48 + .4byte gSpriteAffineAnim_8591F30 + .4byte gSpriteAffineAnim_8591EB8 + .4byte gSpriteAffineAnim_8591ED0 + .4byte gSpriteAffineAnim_8591EE8 + .4byte gSpriteAffineAnim_8591F00 + + .align 2 gUnknown_08591FC8:: @ 8591FC8 - .incbin "baserom.gba", 0x591fc8, 0x18 + spr_template 0x1300, 0xffff, gOamData_8591D48, gSpriteAnimTable_8591DB0, NULL, gSpriteAffineAnimTable_8591F78, sub_80FBAE4 + .align 2 gUnknown_08591FE0:: @ 8591FE0 - .incbin "baserom.gba", 0x591fe0, 0x18 + spr_template 0x1300, 0xffff, gOamData_8591D50, gSpriteAnimTable_8591DB4, NULL, gSpriteAffineAnimTable_8591F78, sub_80FBAE4 gUnknown_08591FF8:: @ 8591FF8 - .incbin "baserom.gba", 0x591ff8, 0x10 + .byte 0xff, 0xff, 0xff, 0xff, 0x27, 0x26, 0x12, 0x13, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff gUnknown_08592008:: @ 8592008 - .incbin "baserom.gba", 0x592008, 0x10 + .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x16, 0x22, 0x23, 0xff, 0xff, 0xff, 0xff gUnknown_08592018:: @ 8592018 - .incbin "baserom.gba", 0x592018, 0x10 + .byte 0xff, 0x11, 0xff, 0xff, 0xff, 0x10, 0xff, 0xff, 0xff, 0x24, 0xff, 0xff, 0xff, 0x25, 0xff, 0xff gUnknown_08592028:: @ 8592028 - .incbin "baserom.gba", 0x592028, 0x10 + .byte 0xff, 0xff, 0x21, 0xff, 0xff, 0xff, 0x20, 0xff, 0xff, 0xff, 0x14, 0xff, 0xff, 0xff, 0x15, 0xff gUnknown_08592038:: @ 8592038 - .incbin "baserom.gba", 0x592038, 0x20 + .byte 0x00, 0xff, 0x00, 0x00, 0x01, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xfe, 0xff, 0x00, 0x00 gUnknown_08592058:: @ 8592058 - .incbin "baserom.gba", 0x592058, 0x20 + .byte 0xff, 0xff, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x01, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00 gUnknown_08592078:: @ 8592078 - .incbin "baserom.gba", 0x592078, 0x60 + .byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00 + .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00 + diff --git a/graphics/misc/rotating_gate_1.png b/graphics/misc/rotating_gate_1.png new file mode 100644 index 0000000000000000000000000000000000000000..93680dbfb0a8c63c512aca7db7d1bf4763523cf8 GIT binary patch literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk^Bp4^xl@Lo_BP|LA9vSnx%?)`U@2 z)r9fsL9K>|L2PUxjr=@3K3)n8;t7QbMr=&VwJMAoxN2jf40v1{9;z@fR9reC6!~0X PJIF*&S3j3^P6NWP@VEslNvf99YuAV<57@!a!1)QMp!!E5PSKfWrx{roJOA gi@DrHfx72#F)Z7(JcP4qvLna}Pgg&ebxsLQ0CcA(xc~qF literal 0 HcmV?d00001 diff --git a/graphics/misc/rotating_gate_4.png b/graphics/misc/rotating_gate_4.png new file mode 100644 index 0000000000000000000000000000000000000000..77c269dc53678960a8b2e18bbef202e1e1b2258b GIT binary patch literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^4j{||BpAFt9cBhn{+=$5As(H{Kl~XC7JRgSDIBn1 ziHk$yrxi_stc$rk!W|6K4HGyP6xkaX7-%Xo^RVjh`5f~&;3415BqD4eBCx4xfwJL2 dh-$XwOblOTx{tVQf9M9X!qe5yWt~$(699C>Cr$tW literal 0 HcmV?d00001 diff --git a/graphics/misc/rotating_gate_5.png b/graphics/misc/rotating_gate_5.png new file mode 100644 index 0000000000000000000000000000000000000000..d8a0889b186d544bdfec910e914c737de63a5913 GIT binary patch literal 122 zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk^Bp4|L2PUxjr=@3K3)n8;t7QbMr=&VwJMAoxN2jf40vQuF}4WaEMQ>xICG1G S%cGc9kfENgelF{r5}E+shaiOj literal 0 HcmV?d00001 diff --git a/graphics/misc/rotating_gate_6.png b/graphics/misc/rotating_gate_6.png new file mode 100644 index 0000000000000000000000000000000000000000..668feebfbbac557494c35bcedb1b67801d501f87 GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^4j{||BpAFt9cBhn;hrvzAs(H{Kl~XC7JRgSDIBn1 ziHk$yrxi_stc$rk!W|6K4HGyP6xkaX7-%*!__6Bn`5bddSkmv#c!OmQ7e}Pyg^7z< pIj)Kb@OU=0TCz!m8mwZFWMGhCoXqt;NO1zlDoNWP@VEslNvf99YuAV<57@!a!1)QMp!!E5PSKfWrx{ral>8 pgOFec0~OA+I39yl2_cL|3=Gb%CN~u{t@H+2<>~6@vd$@?2>_jDDQN%z literal 0 HcmV?d00001 diff --git a/graphics/misc/rotating_gate_8.png b/graphics/misc/rotating_gate_8.png new file mode 100644 index 0000000000000000000000000000000000000000..5e3a947c5c4eab5a0f11041dff02d4e60d2eb818 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^4j{||BpAFt9cBhnp`I>|As(H{Kl~XCdbA`$8{7}7 z*D`TUnZltFAQ$Q|hp9>NWP@VEslNvf99Y7_WFfl2!a$O_aiX0ZYl3irmO=`vqkEs) nj6l}KTp5cR63!__%t!`W_i!>-+}EX|Ad5U*{an^LB{Ts5LeMEN literal 0 HcmV?d00001 From 4c6511c8f991e583c64ac0aa8912285600161b51 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Thu, 18 Jan 2018 22:34:16 -0600 Subject: [PATCH 39/64] Extract data from field_screen.s Also move files incorrectly placed in interface dir --- asm/battle_anim_80FE840.s | 4 +- asm/field_screen.s | 26 +- data/field_screen.s | 1923 +++-------------- data/link.s | 206 +- data/unknown_serial_data.bin | Bin 0 -> 12512 bytes data/unknown_serial_data.s | 3 +- .../berrycrush_background.bin | Bin .../berrycrush_btnpress.png | Bin .../berrycrush_container_cap.bin | Bin .../berrycrush_grinder_base.pal | 0 .../berrycrush_grinder_base.png | Bin .../berrycrush_grinder_top.bin | Bin .../berrycrush_misc.pal | 0 .../berrycrush_sparkle.png | Bin .../berrycrush_timerdigits.pal | 0 .../berrycrush_timerdigits.png | Bin .../dodrioberry_berrysprites.pal | 0 .../dodrioberry_berrysprites.png | Bin .../dodrioberry_bg1.bin | Bin .../dodrioberry_bg1.pal | 0 .../dodrioberry_bg1.png | Bin .../dodrioberry_bg2.pal | 0 .../dodrioberry_bg2.png | Bin .../dodrioberry_bg2left.bin | Bin .../dodrioberry_bg2right.bin | Bin .../dodrioberry_pkmn.pal | 0 .../dodrioberry_pkmn.png | Bin .../dodrioberry_platform.pal | 0 .../dodrioberry_platform.png | Bin .../dodrioberry_shiny.pal | 0 .../dodrioberry_status.pal | 0 .../dodrioberry_status.png | Bin .../pkmnjump_321start1.pal | 0 .../pkmnjump_321start1.png | Bin .../pkmnjump_321start2.pal | 0 .../pkmnjump_321start2.png | Bin .../{interface => link_games}/pkmnjump_bg.bin | Bin .../{interface => link_games}/pkmnjump_bg.pal | 0 .../{interface => link_games}/pkmnjump_bg.png | Bin .../pkmnjump_pal1.pal | 0 .../pkmnjump_pal2.pal | 0 .../pkmnjump_pal3.pal | 0 .../pkmnjump_results.bin | Bin .../pkmnjump_results.pal | 0 .../pkmnjump_results.png | Bin .../pkmnjump_rope1.png | Bin .../pkmnjump_rope2.png | Bin .../pkmnjump_rope3.png | Bin .../pkmnjump_rope4.png | Bin .../pkmnjump_star.png | Bin .../pkmnjump_venusaur.bin | Bin .../pkmnjump_venusaur.pal | 0 .../pkmnjump_venusaur.png | Bin graphics/misc/sunny_day/0.pal | 259 +++ graphics/misc/sunny_day/1.pal | 259 +++ graphics/misc/sunny_day/10.pal | 259 +++ graphics/misc/sunny_day/11.pal | 259 +++ graphics/misc/sunny_day/12.pal | 259 +++ graphics/misc/sunny_day/13.pal | 259 +++ graphics/misc/sunny_day/14.pal | 259 +++ graphics/misc/sunny_day/15.pal | 259 +++ graphics/misc/sunny_day/16.pal | 259 +++ graphics/misc/sunny_day/17.pal | 259 +++ graphics/misc/sunny_day/18.pal | 259 +++ graphics/misc/sunny_day/19.pal | 259 +++ graphics/misc/sunny_day/2.pal | 259 +++ graphics/misc/sunny_day/20.pal | 259 +++ graphics/misc/sunny_day/21.pal | 259 +++ graphics/misc/sunny_day/22.pal | 259 +++ graphics/misc/sunny_day/23.pal | 259 +++ graphics/misc/sunny_day/24.pal | 259 +++ graphics/misc/sunny_day/25.pal | 259 +++ graphics/misc/sunny_day/26.pal | 259 +++ graphics/misc/sunny_day/27.pal | 259 +++ graphics/misc/sunny_day/28.pal | 259 +++ graphics/misc/sunny_day/29.pal | 259 +++ graphics/misc/sunny_day/3.pal | 259 +++ graphics/misc/sunny_day/30.pal | 259 +++ graphics/misc/sunny_day/31.pal | 259 +++ graphics/misc/sunny_day/32.pal | 259 +++ graphics/misc/sunny_day/33.pal | 259 +++ graphics/misc/sunny_day/34.pal | 259 +++ graphics/misc/sunny_day/35.pal | 259 +++ graphics/misc/sunny_day/36.pal | 259 +++ graphics/misc/sunny_day/37.pal | 259 +++ graphics/misc/sunny_day/38.pal | 259 +++ graphics/misc/sunny_day/39.pal | 259 +++ graphics/misc/sunny_day/4.pal | 259 +++ graphics/misc/sunny_day/40.pal | 259 +++ graphics/misc/sunny_day/41.pal | 259 +++ graphics/misc/sunny_day/42.pal | 259 +++ graphics/misc/sunny_day/43.pal | 259 +++ graphics/misc/sunny_day/44.pal | 259 +++ graphics/misc/sunny_day/45.pal | 259 +++ graphics/misc/sunny_day/46.pal | 259 +++ graphics/misc/sunny_day/47.pal | 259 +++ graphics/misc/sunny_day/48.pal | 259 +++ graphics/misc/sunny_day/49.pal | 259 +++ graphics/misc/sunny_day/5.pal | 259 +++ graphics/misc/sunny_day/50.pal | 259 +++ graphics/misc/sunny_day/51.pal | 259 +++ graphics/misc/sunny_day/52.pal | 259 +++ graphics/misc/sunny_day/53.pal | 259 +++ graphics/misc/sunny_day/54.pal | 259 +++ graphics/misc/sunny_day/55.pal | 259 +++ graphics/misc/sunny_day/56.pal | 259 +++ graphics/misc/sunny_day/57.pal | 259 +++ graphics/misc/sunny_day/58.pal | 259 +++ graphics/misc/sunny_day/59.pal | 259 +++ graphics/misc/sunny_day/6.pal | 259 +++ graphics/misc/sunny_day/60.pal | 259 +++ graphics/misc/sunny_day/61.pal | 259 +++ graphics/misc/sunny_day/62.pal | 259 +++ graphics/misc/sunny_day/63.pal | 259 +++ graphics/misc/sunny_day/64.pal | 259 +++ graphics/misc/sunny_day/65.pal | 259 +++ graphics/misc/sunny_day/66.pal | 259 +++ graphics/misc/sunny_day/67.pal | 259 +++ graphics/misc/sunny_day/68.pal | 259 +++ graphics/misc/sunny_day/69.pal | 259 +++ graphics/misc/sunny_day/7.pal | 259 +++ graphics/misc/sunny_day/70.pal | 259 +++ graphics/misc/sunny_day/71.pal | 259 +++ graphics/misc/sunny_day/72.pal | 259 +++ graphics/misc/sunny_day/73.pal | 259 +++ graphics/misc/sunny_day/74.pal | 259 +++ graphics/misc/sunny_day/75.pal | 259 +++ graphics/misc/sunny_day/76.pal | 259 +++ graphics/misc/sunny_day/77.pal | 259 +++ graphics/misc/sunny_day/78.pal | 259 +++ graphics/misc/sunny_day/79.pal | 259 +++ graphics/misc/sunny_day/8.pal | 259 +++ graphics/misc/sunny_day/80.pal | 259 +++ graphics/misc/sunny_day/81.pal | 259 +++ graphics/misc/sunny_day/82.pal | 259 +++ graphics/misc/sunny_day/83.pal | 259 +++ graphics/misc/sunny_day/84.pal | 259 +++ graphics/misc/sunny_day/85.pal | 259 +++ graphics/misc/sunny_day/86.pal | 259 +++ graphics/misc/sunny_day/87.pal | 259 +++ graphics/misc/sunny_day/88.pal | 259 +++ graphics/misc/sunny_day/89.pal | 259 +++ graphics/misc/sunny_day/9.pal | 259 +++ graphics/misc/sunny_day/90.pal | 259 +++ graphics/misc/sunny_day/91.pal | 259 +++ graphics/misc/sunny_day/92.pal | 259 +++ graphics/misc/sunny_day/93.pal | 259 +++ graphics/misc/sunny_day/94.pal | 259 +++ graphics/misc/sunny_day/95.pal | 259 +++ graphics/weather/0.pal | 19 + graphics/weather/1.pal | 19 + graphics/weather/2.pal | 19 + graphics/weather/ash.png | Bin 0 -> 353 bytes graphics/weather/bubble.png | Bin 0 -> 177 bytes graphics/weather/cloud.png | Bin 0 -> 640 bytes graphics/weather/drought0.bin | Bin 0 -> 8192 bytes graphics/weather/drought1.bin | Bin 0 -> 8192 bytes graphics/weather/drought2.bin | Bin 0 -> 8192 bytes graphics/weather/drought3.bin | Bin 0 -> 8192 bytes graphics/weather/drought4.bin | Bin 0 -> 8192 bytes graphics/weather/drought5.bin | Bin 0 -> 8192 bytes graphics/weather/fog1.png | Bin 0 -> 1018 bytes graphics/weather/fog2.png | Bin 0 -> 928 bytes graphics/weather/rain.png | Bin 0 -> 258 bytes graphics/weather/sandstorm.png | Bin 0 -> 590 bytes graphics/weather/snow0.png | Bin 0 -> 150 bytes graphics/weather/snow1.png | Bin 0 -> 145 bytes .../wonder_card_1.bin | Bin .../wonder_card_1.pal | 0 .../wonder_card_1.png | Bin .../wonder_card_2.bin | Bin .../wonder_card_2.pal | 0 .../wonder_card_2.png | Bin .../wonder_card_3.bin | Bin .../wonder_card_3.pal | 0 .../wonder_card_3.png | Bin .../wonder_card_4.pal | 0 .../wonder_card_4.png | Bin .../wonder_card_5.pal | 0 .../wonder_card_5.png | Bin .../wonder_card_6.pal | 0 .../wonder_card_6.png | Bin .../wonder_card_7.bin | Bin .../wonder_card_7.pal | 0 .../wonder_card_7.png | Bin .../wonder_card_8.bin | Bin .../wonder_card_8.pal | 0 .../wonder_card_8.png | Bin .../wonder_card_shadow.png | Bin .../wonder_card_shadow_1.pal | 0 .../wonder_card_shadow_2.pal | 0 .../wonder_card_shadow_3.pal | 0 .../wonder_card_shadow_4.pal | 0 .../wonder_card_shadow_5.pal | 0 .../wonder_card_shadow_6.pal | 0 .../wonder_card_shadow_7.pal | 0 .../wonder_card_shadow_8.pal | 0 .../wonder_news_1.bin | Bin .../wonder_news_1.pal | 0 .../wonder_news_1.png | Bin .../wonder_news_2.bin | Bin .../wonder_news_2.png | Bin .../wonder_news_3.bin | Bin .../wonder_news_3.png | Bin .../wonder_news_7.bin | Bin .../wonder_news_7.pal | 0 .../wonder_news_7.png | Bin .../wonder_news_8.bin | Bin .../wonder_news_8.pal | 0 .../wonder_news_8.png | Bin graphics_file_rules.mk | 2 +- 211 files changed, 25394 insertions(+), 1691 deletions(-) create mode 100644 data/unknown_serial_data.bin rename graphics/{interface => link_games}/berrycrush_background.bin (100%) rename graphics/{interface => link_games}/berrycrush_btnpress.png (100%) rename graphics/{interface => link_games}/berrycrush_container_cap.bin (100%) rename graphics/{interface => link_games}/berrycrush_grinder_base.pal (100%) rename graphics/{interface => link_games}/berrycrush_grinder_base.png (100%) rename graphics/{interface => link_games}/berrycrush_grinder_top.bin (100%) rename graphics/{interface => link_games}/berrycrush_misc.pal (100%) rename graphics/{interface => link_games}/berrycrush_sparkle.png (100%) rename graphics/{interface => link_games}/berrycrush_timerdigits.pal (100%) rename graphics/{interface => link_games}/berrycrush_timerdigits.png (100%) rename graphics/{interface => link_games}/dodrioberry_berrysprites.pal (100%) rename graphics/{interface => link_games}/dodrioberry_berrysprites.png (100%) rename graphics/{interface => link_games}/dodrioberry_bg1.bin (100%) rename graphics/{interface => link_games}/dodrioberry_bg1.pal (100%) rename graphics/{interface => link_games}/dodrioberry_bg1.png (100%) rename graphics/{interface => link_games}/dodrioberry_bg2.pal (100%) rename graphics/{interface => link_games}/dodrioberry_bg2.png (100%) rename graphics/{interface => link_games}/dodrioberry_bg2left.bin (100%) rename graphics/{interface => link_games}/dodrioberry_bg2right.bin (100%) rename graphics/{interface => link_games}/dodrioberry_pkmn.pal (100%) rename graphics/{interface => link_games}/dodrioberry_pkmn.png (100%) rename graphics/{interface => link_games}/dodrioberry_platform.pal (100%) rename graphics/{interface => link_games}/dodrioberry_platform.png (100%) rename graphics/{interface => link_games}/dodrioberry_shiny.pal (100%) rename graphics/{interface => link_games}/dodrioberry_status.pal (100%) rename graphics/{interface => link_games}/dodrioberry_status.png (100%) rename graphics/{interface => link_games}/pkmnjump_321start1.pal (100%) rename graphics/{interface => link_games}/pkmnjump_321start1.png (100%) rename graphics/{interface => link_games}/pkmnjump_321start2.pal (100%) rename graphics/{interface => link_games}/pkmnjump_321start2.png (100%) rename graphics/{interface => link_games}/pkmnjump_bg.bin (100%) rename graphics/{interface => link_games}/pkmnjump_bg.pal (100%) rename graphics/{interface => link_games}/pkmnjump_bg.png (100%) rename graphics/{interface => link_games}/pkmnjump_pal1.pal (100%) rename graphics/{interface => link_games}/pkmnjump_pal2.pal (100%) rename graphics/{interface => link_games}/pkmnjump_pal3.pal (100%) rename graphics/{interface => link_games}/pkmnjump_results.bin (100%) rename graphics/{interface => link_games}/pkmnjump_results.pal (100%) rename graphics/{interface => link_games}/pkmnjump_results.png (100%) rename graphics/{interface => link_games}/pkmnjump_rope1.png (100%) rename graphics/{interface => link_games}/pkmnjump_rope2.png (100%) rename graphics/{interface => link_games}/pkmnjump_rope3.png (100%) rename graphics/{interface => link_games}/pkmnjump_rope4.png (100%) rename graphics/{interface => link_games}/pkmnjump_star.png (100%) rename graphics/{interface => link_games}/pkmnjump_venusaur.bin (100%) rename graphics/{interface => link_games}/pkmnjump_venusaur.pal (100%) rename graphics/{interface => link_games}/pkmnjump_venusaur.png (100%) create mode 100644 graphics/misc/sunny_day/0.pal create mode 100644 graphics/misc/sunny_day/1.pal create mode 100644 graphics/misc/sunny_day/10.pal create mode 100644 graphics/misc/sunny_day/11.pal create mode 100644 graphics/misc/sunny_day/12.pal create mode 100644 graphics/misc/sunny_day/13.pal create mode 100644 graphics/misc/sunny_day/14.pal create mode 100644 graphics/misc/sunny_day/15.pal create mode 100644 graphics/misc/sunny_day/16.pal create mode 100644 graphics/misc/sunny_day/17.pal create mode 100644 graphics/misc/sunny_day/18.pal create mode 100644 graphics/misc/sunny_day/19.pal create mode 100644 graphics/misc/sunny_day/2.pal create mode 100644 graphics/misc/sunny_day/20.pal create mode 100644 graphics/misc/sunny_day/21.pal create mode 100644 graphics/misc/sunny_day/22.pal create mode 100644 graphics/misc/sunny_day/23.pal create mode 100644 graphics/misc/sunny_day/24.pal create mode 100644 graphics/misc/sunny_day/25.pal create mode 100644 graphics/misc/sunny_day/26.pal create mode 100644 graphics/misc/sunny_day/27.pal create mode 100644 graphics/misc/sunny_day/28.pal create mode 100644 graphics/misc/sunny_day/29.pal create mode 100644 graphics/misc/sunny_day/3.pal create mode 100644 graphics/misc/sunny_day/30.pal create mode 100644 graphics/misc/sunny_day/31.pal create mode 100644 graphics/misc/sunny_day/32.pal create mode 100644 graphics/misc/sunny_day/33.pal create mode 100644 graphics/misc/sunny_day/34.pal create mode 100644 graphics/misc/sunny_day/35.pal create mode 100644 graphics/misc/sunny_day/36.pal create mode 100644 graphics/misc/sunny_day/37.pal create mode 100644 graphics/misc/sunny_day/38.pal create mode 100644 graphics/misc/sunny_day/39.pal create mode 100644 graphics/misc/sunny_day/4.pal create mode 100644 graphics/misc/sunny_day/40.pal create mode 100644 graphics/misc/sunny_day/41.pal create mode 100644 graphics/misc/sunny_day/42.pal create mode 100644 graphics/misc/sunny_day/43.pal create mode 100644 graphics/misc/sunny_day/44.pal create mode 100644 graphics/misc/sunny_day/45.pal create mode 100644 graphics/misc/sunny_day/46.pal create mode 100644 graphics/misc/sunny_day/47.pal create mode 100644 graphics/misc/sunny_day/48.pal create mode 100644 graphics/misc/sunny_day/49.pal create mode 100644 graphics/misc/sunny_day/5.pal create mode 100644 graphics/misc/sunny_day/50.pal create mode 100644 graphics/misc/sunny_day/51.pal create mode 100644 graphics/misc/sunny_day/52.pal create mode 100644 graphics/misc/sunny_day/53.pal create mode 100644 graphics/misc/sunny_day/54.pal create mode 100644 graphics/misc/sunny_day/55.pal create mode 100644 graphics/misc/sunny_day/56.pal create mode 100644 graphics/misc/sunny_day/57.pal create mode 100644 graphics/misc/sunny_day/58.pal create mode 100644 graphics/misc/sunny_day/59.pal create mode 100644 graphics/misc/sunny_day/6.pal create mode 100644 graphics/misc/sunny_day/60.pal create mode 100644 graphics/misc/sunny_day/61.pal create mode 100644 graphics/misc/sunny_day/62.pal create mode 100644 graphics/misc/sunny_day/63.pal create mode 100644 graphics/misc/sunny_day/64.pal create mode 100644 graphics/misc/sunny_day/65.pal create mode 100644 graphics/misc/sunny_day/66.pal create mode 100644 graphics/misc/sunny_day/67.pal create mode 100644 graphics/misc/sunny_day/68.pal create mode 100644 graphics/misc/sunny_day/69.pal create mode 100644 graphics/misc/sunny_day/7.pal create mode 100644 graphics/misc/sunny_day/70.pal create mode 100644 graphics/misc/sunny_day/71.pal create mode 100644 graphics/misc/sunny_day/72.pal create mode 100644 graphics/misc/sunny_day/73.pal create mode 100644 graphics/misc/sunny_day/74.pal create mode 100644 graphics/misc/sunny_day/75.pal create mode 100644 graphics/misc/sunny_day/76.pal create mode 100644 graphics/misc/sunny_day/77.pal create mode 100644 graphics/misc/sunny_day/78.pal create mode 100644 graphics/misc/sunny_day/79.pal create mode 100644 graphics/misc/sunny_day/8.pal create mode 100644 graphics/misc/sunny_day/80.pal create mode 100644 graphics/misc/sunny_day/81.pal create mode 100644 graphics/misc/sunny_day/82.pal create mode 100644 graphics/misc/sunny_day/83.pal create mode 100644 graphics/misc/sunny_day/84.pal create mode 100644 graphics/misc/sunny_day/85.pal create mode 100644 graphics/misc/sunny_day/86.pal create mode 100644 graphics/misc/sunny_day/87.pal create mode 100644 graphics/misc/sunny_day/88.pal create mode 100644 graphics/misc/sunny_day/89.pal create mode 100644 graphics/misc/sunny_day/9.pal create mode 100644 graphics/misc/sunny_day/90.pal create mode 100644 graphics/misc/sunny_day/91.pal create mode 100644 graphics/misc/sunny_day/92.pal create mode 100644 graphics/misc/sunny_day/93.pal create mode 100644 graphics/misc/sunny_day/94.pal create mode 100644 graphics/misc/sunny_day/95.pal create mode 100644 graphics/weather/0.pal create mode 100644 graphics/weather/1.pal create mode 100644 graphics/weather/2.pal create mode 100644 graphics/weather/ash.png create mode 100644 graphics/weather/bubble.png create mode 100644 graphics/weather/cloud.png create mode 100644 graphics/weather/drought0.bin create mode 100644 graphics/weather/drought1.bin create mode 100644 graphics/weather/drought2.bin create mode 100644 graphics/weather/drought3.bin create mode 100644 graphics/weather/drought4.bin create mode 100644 graphics/weather/drought5.bin create mode 100644 graphics/weather/fog1.png create mode 100644 graphics/weather/fog2.png create mode 100644 graphics/weather/rain.png create mode 100644 graphics/weather/sandstorm.png create mode 100644 graphics/weather/snow0.png create mode 100644 graphics/weather/snow1.png rename graphics/{interface => wonder_transfers}/wonder_card_1.bin (100%) rename graphics/{interface => wonder_transfers}/wonder_card_1.pal (100%) rename graphics/{interface => wonder_transfers}/wonder_card_1.png (100%) rename graphics/{interface => wonder_transfers}/wonder_card_2.bin (100%) rename graphics/{interface => wonder_transfers}/wonder_card_2.pal (100%) rename graphics/{interface => wonder_transfers}/wonder_card_2.png (100%) rename graphics/{interface => wonder_transfers}/wonder_card_3.bin (100%) rename graphics/{interface => wonder_transfers}/wonder_card_3.pal (100%) rename graphics/{interface => wonder_transfers}/wonder_card_3.png (100%) rename graphics/{interface => wonder_transfers}/wonder_card_4.pal (100%) rename graphics/{interface => wonder_transfers}/wonder_card_4.png (100%) rename graphics/{interface => wonder_transfers}/wonder_card_5.pal (100%) rename graphics/{interface => wonder_transfers}/wonder_card_5.png (100%) rename graphics/{interface => wonder_transfers}/wonder_card_6.pal (100%) rename graphics/{interface => wonder_transfers}/wonder_card_6.png (100%) rename graphics/{interface => wonder_transfers}/wonder_card_7.bin (100%) rename graphics/{interface => wonder_transfers}/wonder_card_7.pal (100%) rename graphics/{interface => wonder_transfers}/wonder_card_7.png (100%) rename graphics/{interface => wonder_transfers}/wonder_card_8.bin (100%) rename graphics/{interface => wonder_transfers}/wonder_card_8.pal (100%) rename graphics/{interface => wonder_transfers}/wonder_card_8.png (100%) rename graphics/{interface => wonder_transfers}/wonder_card_shadow.png (100%) rename graphics/{interface => wonder_transfers}/wonder_card_shadow_1.pal (100%) rename graphics/{interface => wonder_transfers}/wonder_card_shadow_2.pal (100%) rename graphics/{interface => wonder_transfers}/wonder_card_shadow_3.pal (100%) rename graphics/{interface => wonder_transfers}/wonder_card_shadow_4.pal (100%) rename graphics/{interface => wonder_transfers}/wonder_card_shadow_5.pal (100%) rename graphics/{interface => wonder_transfers}/wonder_card_shadow_6.pal (100%) rename graphics/{interface => wonder_transfers}/wonder_card_shadow_7.pal (100%) rename graphics/{interface => wonder_transfers}/wonder_card_shadow_8.pal (100%) rename graphics/{interface => wonder_transfers}/wonder_news_1.bin (100%) rename graphics/{interface => wonder_transfers}/wonder_news_1.pal (100%) rename graphics/{interface => wonder_transfers}/wonder_news_1.png (100%) rename graphics/{interface => wonder_transfers}/wonder_news_2.bin (100%) rename graphics/{interface => wonder_transfers}/wonder_news_2.png (100%) rename graphics/{interface => wonder_transfers}/wonder_news_3.bin (100%) rename graphics/{interface => wonder_transfers}/wonder_news_3.png (100%) rename graphics/{interface => wonder_transfers}/wonder_news_7.bin (100%) rename graphics/{interface => wonder_transfers}/wonder_news_7.pal (100%) rename graphics/{interface => wonder_transfers}/wonder_news_7.png (100%) rename graphics/{interface => wonder_transfers}/wonder_news_8.bin (100%) rename graphics/{interface => wonder_transfers}/wonder_news_8.pal (100%) rename graphics/{interface => wonder_transfers}/wonder_news_8.png (100%) diff --git a/asm/battle_anim_80FE840.s b/asm/battle_anim_80FE840.s index e51dcedb70..8843835915 100644 --- a/asm/battle_anim_80FE840.s +++ b/asm/battle_anim_80FE840.s @@ -26963,7 +26963,7 @@ _0810C0E2: bl sub_80A6B30 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, =gUnknown_0854CAD0 + ldr r1, =gWeatherFog1Tiles movs r2, 0x80 lsls r2, 4 mov r3, sp @@ -27245,7 +27245,7 @@ _0810C366: bl sub_80A6B30 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, =gUnknown_0854CAD0 + ldr r1, =gWeatherFog1Tiles movs r2, 0x80 lsls r2, 4 mov r3, sp diff --git a/asm/field_screen.s b/asm/field_screen.s index c16068a15b..fc6516b0c7 100644 --- a/asm/field_screen.s +++ b/asm/field_screen.s @@ -2725,13 +2725,13 @@ sub_80AC594: @ 80AC594 ldrb r0, [r0] cmp r0, 0x1 beq _080AC650 - ldr r0, =gUnknown_0854FB5C + ldr r0, =sCloudSpriteSheet bl LoadSpriteSheet ldr r0, =gUnknown_0854C290 bl sub_80ABF4C movs r5, 0 _080AC5B2: - ldr r0, =gUnknown_0854FB78 + ldr r0, =sCloudSpriteTemplate movs r1, 0 movs r2, 0 movs r3, 0xFF @@ -3676,7 +3676,7 @@ sub_80ACD78: @ 80ACD78 b _080ACE98 _080ACD92: ldrb r7, [r2] - ldr r0, =gUnknown_0854FC2C + ldr r0, =gSpriteTemplate_854FC2C ldr r2, =gUnknown_0854FB90 lsls r6, r7, 2 adds r2, r6, r2 @@ -5461,7 +5461,7 @@ sub_80ADCAC: @ 80ADCAC bl LoadSpriteSheet movs r5, 0 _080ADCD0: - ldr r0, =gUnknown_0854FD18 + ldr r0, =gSpriteTemplate_854FD18 movs r1, 0 movs r2, 0 movs r3, 0xFF @@ -5792,7 +5792,7 @@ sub_80ADF6C: @ 80ADF6C bne _080AE008 movs r5, 0 _080ADF80: - ldr r0, =gUnknown_0854FD58 + ldr r0, =gSpriteTemplate_854FD58 movs r1, 0 movs r2, 0 movs r3, 0x4E @@ -6240,7 +6240,7 @@ _080AE314: adds r5, r0, 0 lsls r2, r5, 22 asrs r2, 16 - ldr r0, =gUnknown_0854FD8C + ldr r0, =gSpriteTemplate_854FD8C movs r1, 0 movs r3, 0xFF bl CreateSpriteAtEnd @@ -6753,7 +6753,7 @@ _080AE758: adds r6, r0, 0 lsls r2, r6, 22 asrs r2, 16 - ldr r0, =gUnknown_0854FDC4 + ldr r0, =gSpriteTemplate_854FDC4 movs r1, 0 movs r3, 0x1 bl CreateSpriteAtEnd @@ -6840,7 +6840,7 @@ _080AE818: adds r1, 0x18 lsls r1, 16 asrs r1, 16 - ldr r0, =gUnknown_0854FDC4 + ldr r0, =gSpriteTemplate_854FDC4 movs r2, 0xD0 movs r3, 0x1 bl CreateSpriteAtEnd @@ -7239,7 +7239,7 @@ sub_80AEB48: @ 80AEB48 ldrh r2, [r0] ldrh r0, [r1] subs r2, r0 - ldr r0, =gUnknown_0854FE44 + ldr r0, =gSpriteTemplate_854FE44 movs r4, 0 ldrsh r1, [r3, r4] lsls r2, 16 @@ -7306,7 +7306,7 @@ _080AEBE4: adds r0, 0x14 adds r0, r2, r0 ldr r1, [r0] - ldr r0, =gUnknown_0854FE44 + ldr r0, =gSpriteTemplate_854FE44 cmp r1, r0 bne _080AEBFE adds r0, r2, r5 @@ -7332,8 +7332,8 @@ _080AEC1A: .pool thumb_func_end sub_80AEBD0 - thumb_func_start unc_0807DAB4 -unc_0807DAB4: @ 80AEC34 + thumb_func_start sub_80AEC34 +sub_80AEC34: @ 80AEC34 push {lr} adds r1, r0, 0 ldrh r0, [r1, 0x2E] @@ -7383,7 +7383,7 @@ _080AEC74: _080AEC8E: pop {r0} bx r0 - thumb_func_end unc_0807DAB4 + thumb_func_end sub_80AEC34 thumb_func_start sub_80AEC94 sub_80AEC94: @ 80AEC94 diff --git a/data/field_screen.s b/data/field_screen.s index c3f06106c0..f95e7e0ecc 100644 --- a/data/field_screen.s +++ b/data/field_screen.s @@ -2,1549 +2,111 @@ .include "constants/constants.inc" .section .rodata - .align 2, 0 + .align 2 gUnknown_0854014C:: @ 854014C - .2byte 0x0421, 0x0423, 0x0425, 0x0427, 0x0429, 0x042b, 0x042d, 0x0011, 0x0013, 0x0015, 0x0017, 0x0019, 0x001b, 0x001d, 0x001f, 0x0c7f - .2byte 0x0461, 0x0463, 0x0465, 0x0467, 0x0469, 0x046b, 0x046d, 0x0051, 0x0053, 0x0055, 0x0057, 0x0059, 0x005b, 0x005d, 0x005f, 0x0c9f - .2byte 0x04a1, 0x04a3, 0x04a5, 0x04a7, 0x04a9, 0x04ab, 0x04ad, 0x00b1, 0x00b3, 0x0095, 0x0097, 0x0099, 0x009b, 0x009d, 0x009f, 0x0cdf - .2byte 0x04e1, 0x04e3, 0x04e5, 0x04e7, 0x04e9, 0x04eb, 0x04ed, 0x00f1, 0x00f3, 0x00f5, 0x00d7, 0x00f9, 0x00fb, 0x00dd, 0x00df, 0x0d1f - .2byte 0x0521, 0x0523, 0x0525, 0x0527, 0x0529, 0x052b, 0x052d, 0x0131, 0x0133, 0x0135, 0x0137, 0x0139, 0x011b, 0x013d, 0x013f, 0x0d5f - .2byte 0x0561, 0x0563, 0x0565, 0x0567, 0x0569, 0x056b, 0x056d, 0x0191, 0x0193, 0x0175, 0x0177, 0x0179, 0x017b, 0x017d, 0x017f, 0x0d9f - .2byte 0x05a1, 0x05a3, 0x05a5, 0x05a7, 0x05a9, 0x05ab, 0x05ad, 0x01d1, 0x01d3, 0x01d5, 0x01b7, 0x01b9, 0x01db, 0x01bd, 0x01bf, 0x0ddf - .2byte 0x0220, 0x0223, 0x0225, 0x0227, 0x022a, 0x022c, 0x022e, 0x0231, 0x0213, 0x0215, 0x0217, 0x01f9, 0x01fb, 0x021d, 0x021f, 0x0e1f - .2byte 0x0260, 0x0263, 0x0265, 0x0267, 0x0269, 0x026c, 0x026e, 0x0271, 0x0273, 0x0255, 0x0257, 0x0259, 0x025b, 0x025d, 0x025f, 0x0e5f - .2byte 0x02a0, 0x02a2, 0x02a5, 0x02a7, 0x02a9, 0x02ac, 0x02ae, 0x02b0, 0x02b3, 0x02b5, 0x0297, 0x0299, 0x029b, 0x029d, 0x029f, 0x0e9f - .2byte 0x02e0, 0x02e2, 0x02e5, 0x02e7, 0x02e9, 0x02eb, 0x02ee, 0x02f0, 0x02f2, 0x02f5, 0x02f7, 0x02f9, 0x02db, 0x02dd, 0x02df, 0x0edf - .2byte 0x0320, 0x0322, 0x0324, 0x0327, 0x0329, 0x032c, 0x032e, 0x0330, 0x0332, 0x0335, 0x0337, 0x0339, 0x033b, 0x031d, 0x033f, 0x0eff - .2byte 0x0360, 0x0362, 0x0364, 0x0367, 0x0369, 0x036b, 0x036e, 0x0370, 0x0372, 0x0374, 0x0377, 0x0379, 0x037b, 0x037d, 0x037f, 0x0f3f - .2byte 0x03a0, 0x03a2, 0x03a5, 0x03a7, 0x03a9, 0x03ab, 0x03ae, 0x03b0, 0x03b2, 0x03b5, 0x03b7, 0x03b9, 0x03bb, 0x03bd, 0x03bf, 0x0f7f - .2byte 0x03e0, 0x03e2, 0x03e5, 0x03e7, 0x03e9, 0x03eb, 0x03ed, 0x03f0, 0x03f2, 0x03f4, 0x03f6, 0x03f9, 0x03fb, 0x03fd, 0x03ff, 0x0fbf - .2byte 0x0fe3, 0x0fe5, 0x0fe7, 0x0fe9, 0x0feb, 0x0fed, 0x0fee, 0x0ff0, 0x0ff2, 0x0ff4, 0x0ff6, 0x0ff8, 0x0ffa, 0x0ffc, 0x0ffe, 0x0fff - .2byte 0x0c21, 0x0c23, 0x0c25, 0x0c27, 0x0c29, 0x0c2b, 0x0c2d, 0x0c11, 0x0c13, 0x0815, 0x0817, 0x0819, 0x081b, 0x081d, 0x081f, 0x147f - .2byte 0x0c61, 0x0c63, 0x0c65, 0x0c67, 0x0c69, 0x0c6b, 0x084e, 0x0850, 0x0853, 0x0855, 0x0857, 0x0859, 0x085b, 0x085d, 0x109e, 0x14bf - .2byte 0x0ca1, 0x0ca3, 0x0ca5, 0x0ca7, 0x0ca9, 0x0cab, 0x08ae, 0x08b0, 0x08b3, 0x0895, 0x0897, 0x0899, 0x089b, 0x089d, 0x10de, 0x14ff - .2byte 0x0ce1, 0x0ce3, 0x0ce5, 0x0ce7, 0x0ce9, 0x0ceb, 0x08ee, 0x08f0, 0x08f3, 0x08f5, 0x08f7, 0x08d9, 0x08db, 0x08dd, 0x111e, 0x153f - .2byte 0x0d21, 0x0d23, 0x0d25, 0x0d27, 0x0d29, 0x0d2b, 0x092e, 0x0930, 0x0933, 0x0935, 0x0937, 0x0919, 0x093b, 0x093d, 0x115e, 0x155f - .2byte 0x0d61, 0x0d63, 0x0d65, 0x0d67, 0x0d69, 0x0d6b, 0x098e, 0x0990, 0x0993, 0x0975, 0x0977, 0x0979, 0x097b, 0x097d, 0x119e, 0x15bf - .2byte 0x0da1, 0x09c2, 0x09c5, 0x09c7, 0x09ca, 0x09cc, 0x09ce, 0x09d0, 0x09d3, 0x09d5, 0x09d7, 0x09d9, 0x09bb, 0x09bd, 0x11de, 0x15df - .2byte 0x0a20, 0x0a02, 0x0a05, 0x0a07, 0x0a09, 0x0a0c, 0x0a0e, 0x0a10, 0x0a13, 0x0a15, 0x0a17, 0x09f9, 0x09fb, 0x0a1d, 0x121e, 0x161f - .2byte 0x0a60, 0x0a62, 0x0a65, 0x0a67, 0x0a69, 0x0a6c, 0x0a6e, 0x0a70, 0x0a73, 0x0a55, 0x0a57, 0x0a59, 0x0a5b, 0x0a3d, 0x125e, 0x165f - .2byte 0x0aa0, 0x0aa2, 0x0aa5, 0x0aa7, 0x0aa9, 0x0aab, 0x0aae, 0x0ab0, 0x0ab3, 0x0ab5, 0x0ab7, 0x0a99, 0x0a9b, 0x0a9d, 0x129e, 0x169f - .2byte 0x0ae0, 0x0ae2, 0x0ae4, 0x0ae7, 0x0ae9, 0x0aeb, 0x0aee, 0x0af0, 0x0af2, 0x0af5, 0x0af7, 0x0ad9, 0x0adb, 0x0add, 0x12de, 0x16df - .2byte 0x0b20, 0x0b22, 0x0b24, 0x0b27, 0x0b29, 0x0b2b, 0x0b2e, 0x0b30, 0x0b32, 0x0b35, 0x0b37, 0x0b39, 0x0b3b, 0x0b1d, 0x131e, 0x171f - .2byte 0x0b60, 0x0b62, 0x0b64, 0x0b67, 0x0b69, 0x0b6b, 0x0b6e, 0x0b70, 0x0b72, 0x0b75, 0x0b77, 0x0b79, 0x0b7b, 0x0b7d, 0x135e, 0x175f - .2byte 0x0ba0, 0x0ba2, 0x0ba4, 0x0ba7, 0x0ba9, 0x0bab, 0x0bad, 0x0bb0, 0x0bb2, 0x0bb4, 0x0bb6, 0x0bb9, 0x0bbb, 0x0bbd, 0x139e, 0x179f - .2byte 0x0be0, 0x13c4, 0x13c6, 0x13c8, 0x13ca, 0x13cc, 0x13ce, 0x13d0, 0x13d3, 0x13d4, 0x13d7, 0x13d8, 0x13da, 0x13dd, 0x13de, 0x17bf - .2byte 0x13e3, 0x17e5, 0x17e7, 0x17e9, 0x17eb, 0x17ed, 0x17ef, 0x17f1, 0x17f2, 0x17f4, 0x17f6, 0x17f8, 0x17fa, 0x17fc, 0x17fe, 0x17ff - .2byte 0x1421, 0x1423, 0x1425, 0x1427, 0x1429, 0x142b, 0x142d, 0x1411, 0x1413, 0x1415, 0x1417, 0x1019, 0x101b, 0x141d, 0x141f, 0x1c7f - .2byte 0x1461, 0x1463, 0x1465, 0x1467, 0x1469, 0x146b, 0x144e, 0x1450, 0x1453, 0x1455, 0x1057, 0x1059, 0x105b, 0x105d, 0x189e, 0x1cbf - .2byte 0x14a1, 0x14a3, 0x14a5, 0x14a7, 0x14a9, 0x14ac, 0x14ae, 0x14b0, 0x1092, 0x1095, 0x1097, 0x1099, 0x109b, 0x18dc, 0x18de, 0x1cff - .2byte 0x14e1, 0x14e3, 0x14e5, 0x14e7, 0x14e9, 0x14ec, 0x14ee, 0x14f0, 0x10f2, 0x10f5, 0x10d7, 0x10d9, 0x10db, 0x191c, 0x191e, 0x1d3f - .2byte 0x1521, 0x1523, 0x1525, 0x1527, 0x1529, 0x152c, 0x152e, 0x1530, 0x1132, 0x1135, 0x1137, 0x1139, 0x111b, 0x195c, 0x195e, 0x1d7f - .2byte 0x1561, 0x1563, 0x1585, 0x1587, 0x158a, 0x158c, 0x158e, 0x1570, 0x1172, 0x1175, 0x1177, 0x1179, 0x117b, 0x199c, 0x199e, 0x1d9f - .2byte 0x15a1, 0x15c2, 0x15c5, 0x15c7, 0x15c9, 0x15cc, 0x15ce, 0x15d0, 0x11d2, 0x11d5, 0x11d7, 0x11b9, 0x11bb, 0x19dc, 0x19de, 0x1ddf - .2byte 0x1620, 0x1602, 0x1605, 0x1607, 0x1609, 0x160c, 0x160e, 0x1610, 0x1212, 0x1215, 0x1217, 0x1219, 0x121b, 0x1a1c, 0x1a1e, 0x1e1f - .2byte 0x1660, 0x1662, 0x1244, 0x1247, 0x1249, 0x124b, 0x124e, 0x1250, 0x1252, 0x1255, 0x1257, 0x1259, 0x123b, 0x1a5c, 0x1a5e, 0x1e5f - .2byte 0x12a0, 0x12a2, 0x12a4, 0x12a7, 0x12a9, 0x12ab, 0x12ae, 0x12b0, 0x12b2, 0x12b5, 0x1297, 0x1299, 0x129b, 0x1a9c, 0x1a9e, 0x1e9f - .2byte 0x12e0, 0x12e2, 0x12e4, 0x12e7, 0x12e9, 0x12eb, 0x12ee, 0x12f0, 0x12f2, 0x12f5, 0x12f7, 0x12d9, 0x12db, 0x1adc, 0x1ade, 0x1edf - .2byte 0x1320, 0x1322, 0x1324, 0x1327, 0x1329, 0x132b, 0x132e, 0x1330, 0x1332, 0x1334, 0x1337, 0x1339, 0x131b, 0x1b1c, 0x1b1e, 0x1f1f - .2byte 0x1360, 0x1362, 0x1364, 0x1367, 0x1369, 0x136b, 0x136d, 0x1370, 0x1372, 0x1374, 0x1376, 0x1379, 0x137b, 0x1b5c, 0x1b5e, 0x1f3f - .2byte 0x13a0, 0x13a2, 0x1b86, 0x1b88, 0x1b8a, 0x1b8d, 0x1b8e, 0x1b91, 0x1b92, 0x1b94, 0x1b96, 0x1b98, 0x1b9a, 0x1b9c, 0x1b9e, 0x1f7f - .2byte 0x13e0, 0x1bc4, 0x1bc6, 0x1bc8, 0x1bca, 0x1bcc, 0x1bce, 0x1bd0, 0x1bd2, 0x1bd4, 0x1bd6, 0x1bd8, 0x1bda, 0x1bdc, 0x1bde, 0x1fbf - .2byte 0x1be3, 0x1fe5, 0x1fe7, 0x1fe9, 0x1feb, 0x1fed, 0x1fef, 0x1ff0, 0x1ff3, 0x1ff5, 0x1ff6, 0x1ff8, 0x1ffa, 0x1ffc, 0x1ffe, 0x1fff - .2byte 0x1c21, 0x1c23, 0x1c25, 0x1c27, 0x1c29, 0x1c2b, 0x1c2d, 0x1c11, 0x1c13, 0x1c15, 0x1c17, 0x1c19, 0x1c1b, 0x1c1d, 0x1c1f, 0x247f - .2byte 0x1c61, 0x1c63, 0x1c65, 0x1c67, 0x1c69, 0x1c6b, 0x1c4e, 0x1c50, 0x1c53, 0x1c55, 0x1c57, 0x1c59, 0x1c5b, 0x1c5d, 0x209e, 0x24bf - .2byte 0x1ca1, 0x1ca3, 0x1ca5, 0x1ca7, 0x1ca9, 0x1cac, 0x1cae, 0x1cb0, 0x1c92, 0x1c95, 0x1c97, 0x1c99, 0x1c9b, 0x20dc, 0x20de, 0x24ff - .2byte 0x1ce1, 0x1ce3, 0x1ce5, 0x1ce7, 0x1ce9, 0x1cec, 0x1cee, 0x1cf0, 0x1cf2, 0x1cf4, 0x18d7, 0x1cf9, 0x211a, 0x211c, 0x211e, 0x253f - .2byte 0x1d21, 0x1d23, 0x1d25, 0x1d27, 0x1d29, 0x1d2c, 0x1d2e, 0x1d30, 0x1d32, 0x1d34, 0x1937, 0x1d39, 0x215a, 0x215c, 0x215e, 0x257f - .2byte 0x1d61, 0x1d63, 0x1d85, 0x1d87, 0x1d89, 0x1d8c, 0x1d6e, 0x1d70, 0x1d72, 0x1d74, 0x1977, 0x1d79, 0x219a, 0x219c, 0x219e, 0x25bf - .2byte 0x1da1, 0x1dc2, 0x1dc5, 0x1dc7, 0x1dc9, 0x1dcc, 0x1dce, 0x1dd0, 0x1db2, 0x1dd4, 0x19b7, 0x1db9, 0x21da, 0x21dc, 0x21de, 0x25ff - .2byte 0x1e20, 0x1e02, 0x1e05, 0x1e07, 0x1e09, 0x1e0b, 0x1e0e, 0x1e10, 0x1e12, 0x1e14, 0x1a17, 0x1e19, 0x221a, 0x221c, 0x221e, 0x261f - .2byte 0x1e60, 0x1e62, 0x1e44, 0x1e47, 0x1e49, 0x1e4b, 0x1e4e, 0x1e50, 0x1e52, 0x1e54, 0x1a57, 0x1e59, 0x225a, 0x225c, 0x225e, 0x265f - .2byte 0x1ea0, 0x1ea2, 0x1ea4, 0x1e87, 0x1e89, 0x1e8b, 0x1e8e, 0x1e90, 0x1e92, 0x1e94, 0x1a97, 0x1e99, 0x229a, 0x229c, 0x229e, 0x269f - .2byte 0x1ae0, 0x1ee2, 0x1ae4, 0x1ae6, 0x1ae9, 0x1aeb, 0x1aed, 0x1af0, 0x1af2, 0x1af5, 0x1af7, 0x1ed9, 0x22da, 0x22dc, 0x22de, 0x26df - .2byte 0x1f20, 0x1b22, 0x1b24, 0x1f27, 0x1f29, 0x1f2b, 0x1f2d, 0x1f30, 0x1f32, 0x1f34, 0x1f37, 0x1f39, 0x231a, 0x231c, 0x231e, 0x271f - .2byte 0x1f60, 0x1b62, 0x1b64, 0x2348, 0x234a, 0x234c, 0x234e, 0x2350, 0x2352, 0x2354, 0x2356, 0x2359, 0x235a, 0x235c, 0x235e, 0x275f - .2byte 0x1ba0, 0x1ba2, 0x2386, 0x2388, 0x238a, 0x238c, 0x238e, 0x2390, 0x2392, 0x2394, 0x2396, 0x2398, 0x239a, 0x239c, 0x239e, 0x277f - .2byte 0x1be0, 0x23c4, 0x23c6, 0x23c8, 0x23cb, 0x23cc, 0x23cf, 0x23d0, 0x23d3, 0x23d4, 0x23d6, 0x23d8, 0x23da, 0x23dd, 0x23de, 0x27bf - .2byte 0x23e3, 0x27e5, 0x27e7, 0x27e9, 0x27eb, 0x27ed, 0x27ef, 0x27f1, 0x27f3, 0x27f4, 0x27f6, 0x27f8, 0x27fa, 0x27fc, 0x27fe, 0x27ff - .2byte 0x2421, 0x2423, 0x2425, 0x2427, 0x2429, 0x242b, 0x242d, 0x2811, 0x2413, 0x2415, 0x2417, 0x2419, 0x241b, 0x241d, 0x241f, 0x2c7f - .2byte 0x2461, 0x2463, 0x2465, 0x2467, 0x2469, 0x246b, 0x284e, 0x2450, 0x2453, 0x2455, 0x2457, 0x2459, 0x245b, 0x245d, 0x289e, 0x2cbf - .2byte 0x24a1, 0x24a3, 0x24a5, 0x24a7, 0x24a9, 0x28ac, 0x24ae, 0x24b0, 0x2492, 0x2495, 0x2497, 0x2499, 0x249b, 0x28dc, 0x28de, 0x2cff - .2byte 0x24e1, 0x24e3, 0x24e5, 0x24e7, 0x24e9, 0x24ec, 0x24ee, 0x24f0, 0x24f2, 0x24f4, 0x24d7, 0x24f9, 0x291a, 0x291c, 0x2d1e, 0x2d3f - .2byte 0x2521, 0x2523, 0x2525, 0x2527, 0x2529, 0x252c, 0x252e, 0x2530, 0x2532, 0x2534, 0x2536, 0x2958, 0x295a, 0x295c, 0x295e, 0x2d7f - .2byte 0x2561, 0x2563, 0x2585, 0x2587, 0x2589, 0x258c, 0x256e, 0x2570, 0x2572, 0x2574, 0x2576, 0x2998, 0x299a, 0x299c, 0x299e, 0x2dbf - .2byte 0x25a1, 0x25c2, 0x25c5, 0x25c7, 0x25c9, 0x25cb, 0x25ce, 0x25d0, 0x25d2, 0x25b4, 0x25b6, 0x29d8, 0x29da, 0x29dc, 0x29de, 0x2dff - .2byte 0x2620, 0x2602, 0x2605, 0x2607, 0x2609, 0x260b, 0x260e, 0x2610, 0x2612, 0x2614, 0x2616, 0x2a18, 0x2a1a, 0x2a1c, 0x2a1e, 0x2e3f - .2byte 0x2660, 0x2662, 0x2644, 0x2647, 0x2649, 0x264b, 0x264e, 0x2650, 0x2652, 0x2654, 0x2656, 0x2a58, 0x2a5a, 0x2a5c, 0x2a5e, 0x2e5f - .2byte 0x26a0, 0x26a2, 0x26a4, 0x2687, 0x2689, 0x268b, 0x268d, 0x2690, 0x2692, 0x2694, 0x2696, 0x2a98, 0x2a9a, 0x2a9c, 0x2a9e, 0x2e9f - .2byte 0x26e0, 0x26e2, 0x26e4, 0x26e6, 0x26c9, 0x26cb, 0x26cd, 0x26d0, 0x26d2, 0x26d4, 0x26d6, 0x2ad8, 0x2ada, 0x2adc, 0x2ade, 0x2edf - .2byte 0x2720, 0x2322, 0x2724, 0x2727, 0x2b0a, 0x2b0c, 0x2b0e, 0x2b10, 0x2b12, 0x2b14, 0x2b16, 0x2b18, 0x2b1a, 0x2b1c, 0x2b1e, 0x2f1f - .2byte 0x2360, 0x2762, 0x2364, 0x2b48, 0x2b4a, 0x2b4c, 0x2b4e, 0x2b50, 0x2b52, 0x2b54, 0x2b56, 0x2b58, 0x2b5a, 0x2b5c, 0x2b5e, 0x2f5f - .2byte 0x27a0, 0x27a2, 0x2b86, 0x2b88, 0x2b8a, 0x2b8c, 0x2b8f, 0x2b90, 0x2b92, 0x2b95, 0x2b96, 0x2b98, 0x2b9a, 0x2b9c, 0x2b9e, 0x2f7f - .2byte 0x27e0, 0x2bc4, 0x2bc6, 0x2bc8, 0x2bca, 0x2bcc, 0x2bce, 0x2bd0, 0x2bd2, 0x2bd4, 0x2bd6, 0x2bd8, 0x2bda, 0x2bdc, 0x2bde, 0x2fbf - .2byte 0x2be3, 0x2be5, 0x2fe7, 0x2fe9, 0x2feb, 0x2fed, 0x2fef, 0x2ff1, 0x2ff3, 0x2ff5, 0x2ff6, 0x2ff8, 0x2ffa, 0x2ffc, 0x2ffe, 0x2fff - .2byte 0x2c21, 0x2c23, 0x2c25, 0x2c27, 0x2c29, 0x2c2b, 0x2c2d, 0x3011, 0x3013, 0x3015, 0x2c17, 0x3019, 0x2c1b, 0x2c1d, 0x2c1f, 0x347f - .2byte 0x2c61, 0x2c63, 0x2c65, 0x2c67, 0x2c69, 0x2c6b, 0x304e, 0x3050, 0x3053, 0x2c55, 0x2c57, 0x2c59, 0x2c5b, 0x2c5d, 0x309e, 0x34bf - .2byte 0x2ca1, 0x2ca3, 0x30a5, 0x30a7, 0x30a9, 0x30ac, 0x30ae, 0x30b0, 0x2c92, 0x2c95, 0x2c97, 0x2c99, 0x2c9b, 0x34dc, 0x30de, 0x34ff - .2byte 0x2ce1, 0x2ce3, 0x30e5, 0x30e7, 0x30e9, 0x30ec, 0x30ee, 0x2cf0, 0x2cf2, 0x2cf4, 0x2cd7, 0x2cf9, 0x311a, 0x311c, 0x311e, 0x353f - .2byte 0x2d21, 0x2d23, 0x3145, 0x3127, 0x3129, 0x312c, 0x2d2e, 0x2d30, 0x2d32, 0x2d34, 0x2d36, 0x3158, 0x315a, 0x315c, 0x315e, 0x357f - .2byte 0x2d61, 0x2d63, 0x3185, 0x3187, 0x3189, 0x2d6b, 0x2d6e, 0x2d70, 0x2d72, 0x2d74, 0x3196, 0x3198, 0x319a, 0x319c, 0x35be, 0x35bf - .2byte 0x2da1, 0x31c2, 0x31c5, 0x2dc7, 0x2dc9, 0x2dcb, 0x2dce, 0x2dd0, 0x2db2, 0x2db4, 0x31d6, 0x31d8, 0x31da, 0x31dc, 0x35de, 0x35ff - .2byte 0x3220, 0x3202, 0x2e05, 0x2e07, 0x2e09, 0x2e0b, 0x2e0e, 0x2e10, 0x2e12, 0x2e14, 0x3216, 0x3218, 0x321a, 0x321c, 0x361e, 0x363f - .2byte 0x3260, 0x3262, 0x2e44, 0x2e47, 0x2e49, 0x2e4b, 0x2e4d, 0x2e50, 0x2e52, 0x2e54, 0x3256, 0x3258, 0x325a, 0x325c, 0x365e, 0x365f - .2byte 0x2ea0, 0x2ea2, 0x2ea4, 0x2e87, 0x2e89, 0x2e8b, 0x2e8d, 0x2e90, 0x2e92, 0x2e94, 0x3296, 0x3298, 0x329a, 0x329c, 0x369e, 0x369f - .2byte 0x2ee0, 0x2ee2, 0x2ee4, 0x2ee6, 0x2ec9, 0x32cc, 0x32ce, 0x32d0, 0x32d2, 0x32d4, 0x32d6, 0x32d8, 0x32da, 0x32dc, 0x36de, 0x36df - .2byte 0x2f20, 0x2f22, 0x2f24, 0x2f27, 0x330a, 0x330c, 0x330e, 0x3310, 0x3312, 0x3314, 0x3316, 0x3318, 0x331a, 0x331c, 0x371e, 0x371f - .2byte 0x2f60, 0x2f62, 0x2f64, 0x3348, 0x334a, 0x334c, 0x334e, 0x3351, 0x3352, 0x3354, 0x3356, 0x3358, 0x335a, 0x335c, 0x375e, 0x375f - .2byte 0x2fa0, 0x2fa2, 0x3386, 0x3388, 0x338a, 0x338c, 0x338f, 0x3390, 0x3393, 0x3394, 0x3396, 0x3398, 0x339a, 0x339c, 0x379e, 0x379f - .2byte 0x2fe0, 0x33c4, 0x33c6, 0x33c8, 0x33ca, 0x37cd, 0x37cf, 0x37d1, 0x37d2, 0x37d5, 0x37d7, 0x37d8, 0x37da, 0x37dc, 0x37de, 0x37bf - .2byte 0x33e3, 0x37e5, 0x33e7, 0x37e9, 0x37eb, 0x37ed, 0x37ef, 0x37f1, 0x37f3, 0x37f5, 0x37f6, 0x37f8, 0x37fa, 0x37fc, 0x37fe, 0x37ff - .2byte 0x3421, 0x3423, 0x3425, 0x3427, 0x3429, 0x342b, 0x342d, 0x3811, 0x3813, 0x3815, 0x3817, 0x3819, 0x381b, 0x381d, 0x341f, 0x387f - .2byte 0x3461, 0x3842, 0x3845, 0x3847, 0x3849, 0x384c, 0x384e, 0x3850, 0x3853, 0x3855, 0x3857, 0x3859, 0x385b, 0x345d, 0x389e, 0x3cbf - .2byte 0x34a1, 0x38a2, 0x38a5, 0x38a7, 0x38a9, 0x38ac, 0x38ae, 0x38b0, 0x3892, 0x3895, 0x3897, 0x3899, 0x349b, 0x38dc, 0x38de, 0x3cff - .2byte 0x34e1, 0x38e2, 0x38e5, 0x38e7, 0x38e9, 0x38eb, 0x38ee, 0x38f0, 0x38f2, 0x38f4, 0x34d7, 0x34f9, 0x391a, 0x391c, 0x3d1e, 0x3d3f - .2byte 0x3521, 0x3942, 0x3925, 0x3927, 0x3929, 0x392b, 0x392e, 0x3930, 0x3932, 0x3534, 0x3536, 0x3958, 0x395a, 0x3d5c, 0x395e, 0x3d7f - .2byte 0x3561, 0x3982, 0x3985, 0x3987, 0x3969, 0x396b, 0x396e, 0x3970, 0x3572, 0x3574, 0x3996, 0x3998, 0x399a, 0x3d9c, 0x3dbe, 0x3dbf - .2byte 0x35a1, 0x39c2, 0x39c5, 0x39c7, 0x39c9, 0x39cb, 0x39ce, 0x35b0, 0x35b2, 0x39d4, 0x39d6, 0x39d8, 0x39da, 0x3dfc, 0x3dfe, 0x3dff - .2byte 0x3a20, 0x3a02, 0x3a05, 0x3a07, 0x3a09, 0x3a0b, 0x360d, 0x3610, 0x3612, 0x3a14, 0x3a16, 0x3a18, 0x3a1a, 0x3e1c, 0x3e1e, 0x3e3f - .2byte 0x3a60, 0x3a62, 0x3a44, 0x3647, 0x3a49, 0x364b, 0x364d, 0x3650, 0x3652, 0x3a54, 0x3a56, 0x3a58, 0x3a5a, 0x3e5c, 0x3e7e, 0x3e7f - .2byte 0x3aa0, 0x3aa2, 0x3aa4, 0x3a87, 0x3689, 0x368b, 0x3a8e, 0x3a90, 0x3a92, 0x3a94, 0x3a96, 0x3a98, 0x3a9a, 0x3e9c, 0x3e9e, 0x3ebf - .2byte 0x36e0, 0x3ae2, 0x3ae4, 0x36e6, 0x36c9, 0x3acc, 0x3ace, 0x3ad0, 0x3ad2, 0x3ad4, 0x3ad6, 0x3ad8, 0x3ada, 0x3edc, 0x3ede, 0x3edf - .2byte 0x3720, 0x3b22, 0x3724, 0x3727, 0x3b0a, 0x3b0c, 0x3b0e, 0x3b10, 0x3b12, 0x3b14, 0x3b16, 0x3b18, 0x3b1a, 0x3f1c, 0x3f1e, 0x3f1f - .2byte 0x3b60, 0x3762, 0x3764, 0x3b48, 0x3b4a, 0x3b4c, 0x3b4e, 0x3b50, 0x3b52, 0x3b54, 0x3b56, 0x3b58, 0x3b5a, 0x3f5c, 0x3f5e, 0x3f5f - .2byte 0x37a0, 0x37a2, 0x3b86, 0x3b88, 0x3b8a, 0x3b8c, 0x3f8f, 0x3f91, 0x3f93, 0x3f94, 0x3f97, 0x3f98, 0x3f9a, 0x3f9c, 0x3f9e, 0x3f9f - .2byte 0x37e0, 0x3bc4, 0x3bc6, 0x3bc8, 0x3bca, 0x3bcd, 0x3fcf, 0x3fd1, 0x3fd3, 0x3fd5, 0x3fd6, 0x3fd8, 0x3fda, 0x3fdc, 0x3fde, 0x3fdf - .2byte 0x3be3, 0x3be5, 0x3be7, 0x3fe9, 0x3feb, 0x3fed, 0x3fef, 0x3ff1, 0x3ff3, 0x3ff5, 0x3ff7, 0x3ff9, 0x3ffa, 0x3ffc, 0x3ffe, 0x3fff - .2byte 0x4400, 0x4402, 0x4405, 0x4407, 0x4409, 0x440c, 0x440e, 0x4411, 0x4413, 0x4015, 0x4017, 0x4019, 0x401b, 0x401d, 0x401f, 0x407f - .2byte 0x4460, 0x4042, 0x4045, 0x4047, 0x4049, 0x404c, 0x404e, 0x4050, 0x4053, 0x4055, 0x4057, 0x4059, 0x405b, 0x405d, 0x409e, 0x44bf - .2byte 0x44a0, 0x40a2, 0x40a5, 0x40a7, 0x40a9, 0x40ab, 0x40ae, 0x40b0, 0x4092, 0x4095, 0x4097, 0x4099, 0x409b, 0x44dc, 0x40de, 0x40ff - .2byte 0x44e0, 0x40e2, 0x40e5, 0x40e7, 0x40e9, 0x40eb, 0x40ee, 0x40f0, 0x40f2, 0x40f4, 0x40d7, 0x40f9, 0x411a, 0x411c, 0x411e, 0x453f - .2byte 0x4540, 0x4122, 0x4125, 0x4127, 0x4129, 0x412b, 0x412e, 0x4130, 0x4132, 0x4134, 0x4136, 0x4158, 0x415a, 0x415c, 0x415e, 0x457f - .2byte 0x4580, 0x4182, 0x4185, 0x4167, 0x4169, 0x416b, 0x416e, 0x4170, 0x4172, 0x4174, 0x4196, 0x4198, 0x459a, 0x419c, 0x45be, 0x45bf - .2byte 0x45c0, 0x41c2, 0x41c5, 0x41c7, 0x41c9, 0x41cb, 0x41ad, 0x41b0, 0x41b2, 0x41d4, 0x41d6, 0x41d8, 0x41da, 0x45fc, 0x45fe, 0x45ff - .2byte 0x4620, 0x4202, 0x4205, 0x4207, 0x4209, 0x420b, 0x420d, 0x4210, 0x4212, 0x4214, 0x4636, 0x4218, 0x463a, 0x463c, 0x463e, 0x463f - .2byte 0x4260, 0x4262, 0x4244, 0x4247, 0x4249, 0x424b, 0x424d, 0x4250, 0x4252, 0x4254, 0x4656, 0x4258, 0x465a, 0x465c, 0x467e, 0x467f - .2byte 0x42a0, 0x42a2, 0x42a4, 0x4287, 0x4289, 0x428b, 0x428e, 0x4290, 0x4292, 0x4294, 0x4696, 0x4298, 0x469a, 0x469c, 0x46be, 0x46bf - .2byte 0x42e0, 0x42e2, 0x42e4, 0x42e6, 0x42c9, 0x42cc, 0x42ce, 0x46d1, 0x46d2, 0x46d4, 0x46d6, 0x42d8, 0x46da, 0x46dc, 0x46de, 0x46ff - .2byte 0x3f20, 0x3f22, 0x4324, 0x4327, 0x430a, 0x430c, 0x430e, 0x4310, 0x4312, 0x4314, 0x4316, 0x4318, 0x471a, 0x471c, 0x471e, 0x471f - .2byte 0x3f60, 0x3f62, 0x4364, 0x4348, 0x434a, 0x434c, 0x434e, 0x4751, 0x4753, 0x4754, 0x4756, 0x4758, 0x475a, 0x475c, 0x475e, 0x475f - .2byte 0x43a0, 0x43a2, 0x4386, 0x4388, 0x438a, 0x438c, 0x438f, 0x4791, 0x4793, 0x4794, 0x4796, 0x4798, 0x479a, 0x479c, 0x479e, 0x479f - .2byte 0x43e0, 0x43c4, 0x43c6, 0x43c8, 0x43ca, 0x43cd, 0x43cf, 0x47d1, 0x47d3, 0x47d5, 0x47d7, 0x47d9, 0x47da, 0x47dc, 0x47de, 0x47df - .2byte 0x43e3, 0x43e5, 0x43e7, 0x43e9, 0x47eb, 0x47ed, 0x47ef, 0x47f1, 0x47f3, 0x47f5, 0x47f7, 0x47f8, 0x47fa, 0x47fc, 0x47fe, 0x47ff - .2byte 0x4c00, 0x4c02, 0x4c05, 0x4c07, 0x4c09, 0x4c0c, 0x4c0e, 0x4c10, 0x4c13, 0x4c15, 0x4817, 0x4819, 0x481b, 0x481d, 0x481f, 0x487f - .2byte 0x4c60, 0x4c42, 0x4c45, 0x4c47, 0x4c49, 0x4c4c, 0x4c4e, 0x4c50, 0x4c53, 0x4c55, 0x4857, 0x4859, 0x485b, 0x485d, 0x4c9e, 0x48bf - .2byte 0x4ca0, 0x4ca2, 0x4884, 0x4887, 0x4889, 0x488b, 0x488e, 0x4890, 0x4892, 0x4895, 0x4897, 0x4899, 0x489b, 0x48dc, 0x48de, 0x4cff - .2byte 0x4ce0, 0x4ce2, 0x48e4, 0x48e7, 0x48e9, 0x48eb, 0x48ed, 0x48f0, 0x48f2, 0x48f4, 0x48d7, 0x48f9, 0x491a, 0x491c, 0x4d1e, 0x4d3f - .2byte 0x4d20, 0x4d22, 0x4924, 0x4927, 0x4929, 0x492b, 0x492e, 0x4930, 0x4932, 0x4934, 0x4936, 0x4958, 0x495a, 0x495c, 0x495e, 0x4d7f - .2byte 0x4d80, 0x4d82, 0x4964, 0x4967, 0x4969, 0x496b, 0x496d, 0x4970, 0x4972, 0x4974, 0x4996, 0x4998, 0x499a, 0x4d9c, 0x49be, 0x4dbf - .2byte 0x4dc0, 0x4dc2, 0x49c4, 0x49c7, 0x49c9, 0x49ab, 0x49ad, 0x49b0, 0x49b2, 0x49d4, 0x49d6, 0x49d8, 0x49da, 0x4dfc, 0x4dfe, 0x4dff - .2byte 0x4e20, 0x4e02, 0x4a04, 0x4a07, 0x4a09, 0x4a0b, 0x4a0d, 0x4a10, 0x4a12, 0x4a14, 0x4a36, 0x4a18, 0x4e3a, 0x4e3c, 0x4e3e, 0x4e3f - .2byte 0x4e60, 0x4e62, 0x4a44, 0x4a47, 0x4a49, 0x4a4b, 0x4a4d, 0x4a50, 0x4a52, 0x4a54, 0x4e76, 0x4a58, 0x4e7a, 0x4e7c, 0x4e7e, 0x56bf - .2byte 0x4aa0, 0x4aa2, 0x4aa4, 0x4a87, 0x4a89, 0x4a8b, 0x4a8e, 0x4a90, 0x4a92, 0x4a94, 0x4e96, 0x4a98, 0x4eba, 0x4e9c, 0x4ebe, 0x56df - .2byte 0x4ae0, 0x4ae2, 0x4ae4, 0x4ae6, 0x4ac9, 0x4acc, 0x4ace, 0x4ad1, 0x4ed3, 0x4ed4, 0x4ed6, 0x4ad8, 0x4eda, 0x4edc, 0x4ede, 0x571f - .2byte 0x4b20, 0x4b22, 0x4b24, 0x4b27, 0x4b0a, 0x4b0c, 0x4b0e, 0x4b10, 0x4b12, 0x4b14, 0x4b16, 0x4b18, 0x4f1a, 0x4f1c, 0x4f1e, 0x573f - .2byte 0x4b60, 0x4b62, 0x4764, 0x4b48, 0x4b4a, 0x4b4c, 0x4b4e, 0x4b51, 0x4f53, 0x4f55, 0x4f56, 0x4f58, 0x4f5a, 0x4f5c, 0x4f5e, 0x577f - .2byte 0x4ba0, 0x47a2, 0x4b86, 0x4b88, 0x4b8a, 0x4b8c, 0x4b8f, 0x4b91, 0x4f93, 0x4f95, 0x4f96, 0x4f98, 0x4f9a, 0x4f9c, 0x4f9e, 0x579f - .2byte 0x4be0, 0x4bc4, 0x4bc6, 0x4bc8, 0x4bca, 0x4bcd, 0x4fcf, 0x4fd1, 0x4fd3, 0x4fd5, 0x4fd7, 0x4fd8, 0x4fda, 0x4fdc, 0x4fde, 0x57df - .2byte 0x4be3, 0x4be5, 0x4be7, 0x4be9, 0x4beb, 0x4bed, 0x4fef, 0x4ff1, 0x57f5, 0x57f6, 0x57f8, 0x57f9, 0x57fb, 0x57fc, 0x57fe, 0x57ff - .2byte 0x5400, 0x5402, 0x5404, 0x5407, 0x5409, 0x540b, 0x540e, 0x5410, 0x5412, 0x5415, 0x5417, 0x5419, 0x501b, 0x541d, 0x501f, 0x507f - .2byte 0x5440, 0x5442, 0x5444, 0x5447, 0x5449, 0x544b, 0x544e, 0x5450, 0x5452, 0x5455, 0x5457, 0x5459, 0x545b, 0x505d, 0x509e, 0x50bf - .2byte 0x54a0, 0x54a2, 0x5484, 0x5487, 0x5489, 0x548b, 0x548e, 0x5490, 0x5492, 0x5495, 0x5497, 0x5099, 0x509b, 0x50dc, 0x50de, 0x54ff - .2byte 0x54e0, 0x54e2, 0x54e4, 0x50e7, 0x50e9, 0x50eb, 0x50ee, 0x50f0, 0x50f2, 0x50f4, 0x54d7, 0x50f9, 0x511a, 0x511c, 0x511e, 0x513f - .2byte 0x5520, 0x5522, 0x5524, 0x5127, 0x5129, 0x512b, 0x512d, 0x5130, 0x5132, 0x5134, 0x5136, 0x5158, 0x515a, 0x555c, 0x515e, 0x557f - .2byte 0x5580, 0x5562, 0x5564, 0x5167, 0x5169, 0x516b, 0x516d, 0x5170, 0x5172, 0x5174, 0x5196, 0x5198, 0x519a, 0x519c, 0x55be, 0x55bf - .2byte 0x55c0, 0x55c2, 0x55c4, 0x51c7, 0x51a9, 0x51ab, 0x51ce, 0x51d0, 0x51d2, 0x51d4, 0x51d6, 0x51d8, 0x51da, 0x51fc, 0x55fe, 0x55ff - .2byte 0x5600, 0x5602, 0x5604, 0x5207, 0x5209, 0x520b, 0x520e, 0x5210, 0x5212, 0x5214, 0x5236, 0x5218, 0x523a, 0x523c, 0x563e, 0x563f - .2byte 0x5660, 0x5662, 0x5644, 0x5247, 0x5249, 0x524b, 0x524e, 0x5250, 0x5252, 0x5254, 0x5276, 0x5258, 0x567a, 0x567c, 0x567e, 0x5abf - .2byte 0x56a0, 0x56a2, 0x56a4, 0x5287, 0x5289, 0x528b, 0x528e, 0x5290, 0x5292, 0x5294, 0x5296, 0x56b8, 0x56ba, 0x56bc, 0x5ade, 0x5eff - .2byte 0x52e0, 0x56e2, 0x52e4, 0x52e6, 0x52c9, 0x52cc, 0x52ce, 0x52d1, 0x52d3, 0x52d4, 0x52d6, 0x56d8, 0x56da, 0x56fc, 0x5b1e, 0x5f1f - .2byte 0x5320, 0x5322, 0x5324, 0x5327, 0x530a, 0x530c, 0x530e, 0x5310, 0x5312, 0x5715, 0x5716, 0x5718, 0x571a, 0x571c, 0x5b3e, 0x5f5f - .2byte 0x5360, 0x5362, 0x5364, 0x5348, 0x534a, 0x534c, 0x534e, 0x5351, 0x5753, 0x5755, 0x5757, 0x5758, 0x575a, 0x575c, 0x5b7e, 0x5f7f - .2byte 0x53a0, 0x53a2, 0x5386, 0x5388, 0x538a, 0x538c, 0x538f, 0x5391, 0x5393, 0x5795, 0x5797, 0x5798, 0x579a, 0x579c, 0x5b9e, 0x5f9f - .2byte 0x53e0, 0x53c4, 0x53c6, 0x53c8, 0x53ca, 0x53cd, 0x53cf, 0x57d1, 0x57d3, 0x5bd6, 0x5bd8, 0x5bd9, 0x5bdb, 0x5bdd, 0x5bde, 0x5fdf - .2byte 0x53e3, 0x53e5, 0x53e7, 0x53e9, 0x53eb, 0x53ed, 0x57ef, 0x57f1, 0x5bf5, 0x5ff7, 0x5ff8, 0x5ffa, 0x5ffb, 0x5ffd, 0x5ffe, 0x5fff - .2byte 0x5c00, 0x5c02, 0x5c04, 0x5c06, 0x5c09, 0x5c0b, 0x5c0d, 0x5c10, 0x5c12, 0x5c14, 0x5c17, 0x5c19, 0x5c1b, 0x5c1d, 0x581f, 0x587f - .2byte 0x5c40, 0x5c42, 0x5c44, 0x5c47, 0x5c49, 0x5c4b, 0x5c4e, 0x5c50, 0x5c52, 0x5c55, 0x5c57, 0x5c59, 0x5c5b, 0x585d, 0x5c9e, 0x58bf - .2byte 0x5ca0, 0x5c82, 0x5c84, 0x5c86, 0x5c89, 0x5c8b, 0x5c8e, 0x5c90, 0x5c92, 0x5c94, 0x5c97, 0x5c99, 0x589b, 0x58dc, 0x58de, 0x58ff - .2byte 0x5ce0, 0x5ce2, 0x5ce4, 0x5cc6, 0x5cc9, 0x5ccb, 0x5ccd, 0x5cd0, 0x5cd2, 0x5cd4, 0x5cd7, 0x5cf9, 0x591a, 0x591c, 0x591e, 0x593f - .2byte 0x5d20, 0x5d22, 0x5d24, 0x5d26, 0x5929, 0x592b, 0x592d, 0x5930, 0x5932, 0x5934, 0x5936, 0x5958, 0x595a, 0x595c, 0x595e, 0x597f - .2byte 0x5d60, 0x5d62, 0x5d64, 0x5d66, 0x5969, 0x598c, 0x598e, 0x5990, 0x5992, 0x5994, 0x5996, 0x5998, 0x599a, 0x599c, 0x5dbe, 0x59bf - .2byte 0x5dc0, 0x5dc2, 0x5dc4, 0x5da6, 0x59a9, 0x59cc, 0x59ce, 0x59d0, 0x59d2, 0x59d4, 0x59d6, 0x59d8, 0x59da, 0x5dfc, 0x59fe, 0x5dff - .2byte 0x5e00, 0x5e02, 0x5e04, 0x5e06, 0x5a09, 0x5a0c, 0x5a0e, 0x5a31, 0x5a32, 0x5a34, 0x5a36, 0x5a18, 0x5a3a, 0x5a3c, 0x5e3e, 0x5e3f - .2byte 0x5e40, 0x5e42, 0x5e44, 0x5e46, 0x5a49, 0x5a4c, 0x5a4e, 0x5a51, 0x5a73, 0x5a74, 0x5a76, 0x5a58, 0x5a7a, 0x5a7c, 0x5e7e, 0x62bf - .2byte 0x5ea0, 0x5ea2, 0x5ea4, 0x5ea6, 0x5a89, 0x5a8c, 0x5a8e, 0x5a91, 0x5a93, 0x5a94, 0x5a96, 0x5ab8, 0x5eba, 0x5ebc, 0x62de, 0x62ff - .2byte 0x5ee0, 0x5ee2, 0x5ee4, 0x5ee6, 0x5ac9, 0x5acc, 0x5ace, 0x5ad1, 0x5ad3, 0x5ad4, 0x5ad6, 0x5ef8, 0x5efa, 0x631d, 0x631e, 0x673f - .2byte 0x5f20, 0x5b22, 0x5b24, 0x5b27, 0x5b0a, 0x5b0c, 0x5b0e, 0x5b10, 0x5b12, 0x5b15, 0x5f17, 0x5f18, 0x5f1a, 0x633d, 0x635e, 0x675f - .2byte 0x5b60, 0x5b62, 0x5b64, 0x5b48, 0x5b4a, 0x5b4c, 0x5b4e, 0x5b51, 0x5b53, 0x5b55, 0x5f57, 0x5f58, 0x5f5a, 0x637d, 0x637e, 0x677f - .2byte 0x5ba0, 0x5ba2, 0x5b86, 0x5b88, 0x5b8a, 0x5b8c, 0x5b8f, 0x5b91, 0x5b93, 0x5f95, 0x63b8, 0x63b9, 0x63bb, 0x63bd, 0x63be, 0x67bf - .2byte 0x5be0, 0x5bc4, 0x5bc6, 0x5bc8, 0x5bca, 0x5bcd, 0x5bcf, 0x5bd1, 0x5bd3, 0x63d6, 0x63d8, 0x63da, 0x63db, 0x63dd, 0x63de, 0x67df - .2byte 0x5be3, 0x5be5, 0x5be7, 0x5be9, 0x5beb, 0x5bed, 0x5bef, 0x5ff1, 0x63f5, 0x63f7, 0x67f9, 0x67fa, 0x67fc, 0x67fd, 0x67fe, 0x67ff - .2byte 0x6400, 0x6402, 0x6404, 0x6407, 0x6409, 0x640b, 0x640d, 0x640f, 0x6412, 0x6414, 0x6417, 0x6419, 0x641b, 0x641d, 0x641f, 0x607f - .2byte 0x6440, 0x6442, 0x6444, 0x6446, 0x6448, 0x644b, 0x644e, 0x644f, 0x6452, 0x6454, 0x6456, 0x6459, 0x645b, 0x645d, 0x609e, 0x60bf - .2byte 0x6480, 0x6482, 0x6484, 0x6486, 0x6489, 0x648b, 0x648d, 0x6490, 0x6492, 0x6494, 0x6496, 0x6499, 0x649b, 0x60dc, 0x60de, 0x60ff - .2byte 0x64e0, 0x64e2, 0x64e4, 0x64e7, 0x64e9, 0x64eb, 0x64ed, 0x64f0, 0x64f2, 0x64f4, 0x64f6, 0x64f9, 0x651a, 0x611c, 0x611e, 0x613f - .2byte 0x6520, 0x6522, 0x6524, 0x6527, 0x614a, 0x614c, 0x614e, 0x6150, 0x6152, 0x6154, 0x6156, 0x6158, 0x615a, 0x615c, 0x615e, 0x617f - .2byte 0x6580, 0x6562, 0x6564, 0x6567, 0x618a, 0x618c, 0x618e, 0x6190, 0x6192, 0x6194, 0x6196, 0x6198, 0x619a, 0x619c, 0x61be, 0x61bf - .2byte 0x65c0, 0x65c2, 0x65c4, 0x65a7, 0x61ca, 0x61cc, 0x61ce, 0x61d0, 0x61d2, 0x61d4, 0x61d6, 0x61d8, 0x61da, 0x61fc, 0x61fe, 0x65ff - .2byte 0x6600, 0x6602, 0x6604, 0x6607, 0x620a, 0x620c, 0x620e, 0x6210, 0x6212, 0x6214, 0x6216, 0x6218, 0x623a, 0x623c, 0x663e, 0x623f - .2byte 0x6640, 0x6642, 0x6644, 0x6647, 0x624a, 0x624c, 0x624e, 0x6250, 0x6252, 0x6254, 0x6256, 0x6258, 0x627a, 0x627c, 0x627e, 0x66bf - .2byte 0x66a0, 0x66a2, 0x6684, 0x6687, 0x628a, 0x628c, 0x628e, 0x6290, 0x6292, 0x62b5, 0x62b6, 0x62b8, 0x62ba, 0x62bc, 0x66de, 0x6aff - .2byte 0x66e0, 0x66e2, 0x66e4, 0x66e7, 0x62ca, 0x62cc, 0x62ce, 0x62d0, 0x62d2, 0x62d5, 0x62f7, 0x62f8, 0x62fa, 0x671d, 0x6b1e, 0x6b3f - .2byte 0x6720, 0x6722, 0x6724, 0x6727, 0x630a, 0x630c, 0x630e, 0x6310, 0x6312, 0x6315, 0x6317, 0x6318, 0x673b, 0x6b5d, 0x6b5e, 0x6f7f - .2byte 0x6760, 0x6762, 0x6364, 0x6348, 0x634a, 0x634c, 0x634e, 0x6351, 0x6353, 0x6355, 0x6357, 0x6779, 0x677b, 0x6b7d, 0x6b7e, 0x6f9f - .2byte 0x63a0, 0x63a2, 0x6386, 0x6388, 0x638a, 0x638c, 0x638f, 0x6391, 0x6393, 0x6395, 0x67b8, 0x6bba, 0x6bbb, 0x6bbd, 0x6bbe, 0x6fbf - .2byte 0x67e0, 0x63c4, 0x63c6, 0x63c8, 0x63ca, 0x63cd, 0x63cf, 0x63d1, 0x63d3, 0x67d6, 0x6bd8, 0x6bda, 0x6bdc, 0x6bdd, 0x6bde, 0x6fdf - .2byte 0x5fe3, 0x63e5, 0x63e7, 0x63e9, 0x63eb, 0x63ed, 0x63ef, 0x63f1, 0x67f5, 0x6bf7, 0x6bf9, 0x6ffb, 0x6ffc, 0x6ffd, 0x6ffe, 0x6fff - .2byte 0x6c00, 0x6c02, 0x6c04, 0x6c07, 0x6c08, 0x6c0b, 0x6c0e, 0x6c0f, 0x6c12, 0x6c14, 0x6c16, 0x6c19, 0x6c1b, 0x6c1d, 0x6c1f, 0x687f - .2byte 0x6c40, 0x6c42, 0x6c44, 0x6c46, 0x6c49, 0x6c4b, 0x6c4d, 0x6c4f, 0x6c52, 0x6c54, 0x6c56, 0x6c59, 0x6c5b, 0x6c5d, 0x689e, 0x68bf - .2byte 0x6c80, 0x6c82, 0x6c84, 0x6c86, 0x6c88, 0x6c8b, 0x6c8d, 0x6c90, 0x6c91, 0x6c94, 0x6c96, 0x6c98, 0x6c9b, 0x68dc, 0x68de, 0x68ff - .2byte 0x6ce0, 0x6ce2, 0x6ce4, 0x6908, 0x690a, 0x690c, 0x690e, 0x6910, 0x6912, 0x6914, 0x6916, 0x6918, 0x691a, 0x691c, 0x691e, 0x693f - .2byte 0x6d20, 0x6d22, 0x6d24, 0x6948, 0x694a, 0x694c, 0x694e, 0x6950, 0x6952, 0x6954, 0x6956, 0x6958, 0x695a, 0x695c, 0x695e, 0x697f - .2byte 0x6d60, 0x6d62, 0x6d64, 0x6988, 0x698a, 0x698c, 0x698e, 0x6990, 0x6992, 0x6994, 0x6996, 0x6998, 0x699a, 0x699c, 0x69be, 0x69bf - .2byte 0x6dc0, 0x6dc2, 0x6da4, 0x69c8, 0x69ca, 0x69cc, 0x69ce, 0x69d0, 0x69d2, 0x69d4, 0x69d6, 0x69d8, 0x69da, 0x69fc, 0x69fe, 0x69ff - .2byte 0x6e00, 0x6e02, 0x6e04, 0x6a08, 0x6a0a, 0x6a2c, 0x6a0e, 0x6a31, 0x6a32, 0x6a34, 0x6a36, 0x6a38, 0x6a3a, 0x6a3c, 0x6a3e, 0x6a3f - .2byte 0x6e40, 0x6e42, 0x6e44, 0x6a48, 0x6a4a, 0x6a4c, 0x6a4e, 0x6a71, 0x6a73, 0x6a75, 0x6a76, 0x6a78, 0x6a7a, 0x6a7c, 0x6a7e, 0x6ebf - .2byte 0x6e80, 0x6ea2, 0x6e84, 0x6a88, 0x6a8a, 0x6a8c, 0x6a8e, 0x6a91, 0x6ab3, 0x6ab5, 0x6ab6, 0x6ab8, 0x6aba, 0x6abc, 0x6ede, 0x6eff - .2byte 0x6ee0, 0x6ee2, 0x6ec4, 0x6ac8, 0x6aca, 0x6acc, 0x6ace, 0x6ad1, 0x6ad3, 0x6af5, 0x6af7, 0x6af8, 0x6afa, 0x6f1d, 0x6f1e, 0x733f - .2byte 0x6f20, 0x6f22, 0x6f24, 0x6b28, 0x6b0a, 0x6b0c, 0x6b0e, 0x6b11, 0x6b13, 0x6b15, 0x6b17, 0x6f39, 0x6f3b, 0x6f5d, 0x735e, 0x737f - .2byte 0x6f60, 0x6f62, 0x6f64, 0x6b48, 0x6b4a, 0x6b4c, 0x6b4e, 0x6b51, 0x6b53, 0x6b55, 0x6b57, 0x6f79, 0x6f7b, 0x739d, 0x739e, 0x77bf - .2byte 0x6fa0, 0x6fa2, 0x6b86, 0x6b88, 0x6b8a, 0x6b8c, 0x6b8f, 0x6b91, 0x6b93, 0x6b95, 0x6fb8, 0x6fba, 0x73bc, 0x73bd, 0x73be, 0x77df - .2byte 0x6fe0, 0x6bc4, 0x6bc6, 0x6bc8, 0x6bca, 0x6bcd, 0x6bcf, 0x6bd1, 0x6bd3, 0x6fd6, 0x6fd8, 0x6fda, 0x73dc, 0x73dd, 0x73de, 0x77ff - .2byte 0x67e3, 0x6be5, 0x67e7, 0x6be9, 0x6beb, 0x6bed, 0x6bef, 0x6bf1, 0x6ff5, 0x6ff7, 0x6ff9, 0x73fb, 0x77fd, 0x77fe, 0x77ff, 0x77ff - .2byte 0x7400, 0x7402, 0x7404, 0x7406, 0x7409, 0x740b, 0x740d, 0x7410, 0x7412, 0x7414, 0x7416, 0x7418, 0x741b, 0x741d, 0x741f, 0x707f - .2byte 0x7440, 0x7442, 0x7444, 0x7446, 0x7449, 0x744b, 0x744d, 0x7450, 0x7451, 0x7454, 0x7456, 0x7458, 0x745b, 0x745d, 0x749e, 0x70bf - .2byte 0x74a0, 0x7482, 0x70c6, 0x70c8, 0x70ca, 0x70cc, 0x70ce, 0x70d0, 0x70d2, 0x70d4, 0x70d6, 0x70d8, 0x70da, 0x70dc, 0x70de, 0x70ff - .2byte 0x74e0, 0x74e2, 0x7106, 0x7108, 0x710a, 0x710c, 0x710e, 0x7110, 0x7112, 0x7114, 0x7116, 0x7118, 0x711a, 0x711c, 0x751e, 0x713f - .2byte 0x7520, 0x7522, 0x7146, 0x7148, 0x714a, 0x714c, 0x714e, 0x7150, 0x7152, 0x7154, 0x7156, 0x7158, 0x715a, 0x715c, 0x715e, 0x717f - .2byte 0x7560, 0x7562, 0x71a6, 0x7188, 0x718a, 0x718c, 0x718e, 0x7190, 0x7192, 0x7194, 0x7196, 0x7198, 0x719a, 0x719c, 0x71be, 0x71bf - .2byte 0x75c0, 0x75a2, 0x71c6, 0x71c8, 0x71ea, 0x71ec, 0x71ef, 0x71f0, 0x71f2, 0x71f4, 0x71f6, 0x71f8, 0x71fa, 0x71fc, 0x71fe, 0x71ff - .2byte 0x7600, 0x7602, 0x7226, 0x7208, 0x720a, 0x720c, 0x722f, 0x7231, 0x7232, 0x7234, 0x7236, 0x7238, 0x723a, 0x723c, 0x723e, 0x723f - .2byte 0x7640, 0x7642, 0x7246, 0x7248, 0x724a, 0x726c, 0x726f, 0x7271, 0x7273, 0x7274, 0x7276, 0x7278, 0x727a, 0x727c, 0x727e, 0x72bf - .2byte 0x76a0, 0x7682, 0x7286, 0x7288, 0x72aa, 0x728c, 0x728f, 0x7291, 0x72b3, 0x72b5, 0x72b7, 0x72b8, 0x72ba, 0x72bc, 0x76de, 0x76ff - .2byte 0x76e0, 0x76c2, 0x72c6, 0x72c8, 0x72ca, 0x72cc, 0x72ef, 0x72d1, 0x72d3, 0x72f5, 0x7718, 0x7719, 0x771b, 0x771d, 0x771e, 0x773f - .2byte 0x7720, 0x7722, 0x7306, 0x7308, 0x730a, 0x730c, 0x730f, 0x7311, 0x7313, 0x7315, 0x7738, 0x775a, 0x775b, 0x775d, 0x775e, 0x777f - .2byte 0x7760, 0x7762, 0x7346, 0x7348, 0x734a, 0x734c, 0x734f, 0x7351, 0x7353, 0x7355, 0x7778, 0x777a, 0x779c, 0x779d, 0x779e, 0x7bbf - .2byte 0x77a0, 0x77a2, 0x7386, 0x7388, 0x738a, 0x738c, 0x738f, 0x7391, 0x7393, 0x7395, 0x77b8, 0x77ba, 0x77bc, 0x77bd, 0x7bdf, 0x7fff - .2byte 0x77e0, 0x73c4, 0x73c6, 0x73c8, 0x73ca, 0x73cd, 0x73cf, 0x73d1, 0x73d3, 0x73d6, 0x77d8, 0x77da, 0x77dc, 0x7bfe, 0x7bff, 0x7fff - .2byte 0x6fe3, 0x73e5, 0x6fe7, 0x6fe9, 0x6feb, 0x73ed, 0x73ef, 0x73f1, 0x73f5, 0x73f7, 0x77f9, 0x77fb, 0x7bfd, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7c00, 0x7c02, 0x7c04, 0x7c06, 0x7c09, 0x7c0b, 0x7c0d, 0x7c10, 0x7c12, 0x7c14, 0x7c16, 0x7c19, 0x7c1b, 0x7c1d, 0x7c1f, 0x787f - .2byte 0x7c40, 0x7884, 0x7886, 0x7888, 0x788a, 0x788c, 0x788e, 0x7890, 0x7892, 0x7894, 0x7896, 0x7898, 0x789a, 0x789c, 0x789e, 0x78bf - .2byte 0x7ca0, 0x78c4, 0x78c6, 0x78c8, 0x78ca, 0x78cc, 0x78ce, 0x78d0, 0x78d2, 0x78d4, 0x78d6, 0x78d8, 0x78da, 0x78dc, 0x78de, 0x78ff - .2byte 0x7ce0, 0x7904, 0x7906, 0x7908, 0x790a, 0x790c, 0x790e, 0x7910, 0x7912, 0x7914, 0x7916, 0x7918, 0x791a, 0x791c, 0x791e, 0x793f - .2byte 0x7d20, 0x7944, 0x7946, 0x7968, 0x794a, 0x794c, 0x794e, 0x7950, 0x7952, 0x7954, 0x7956, 0x7958, 0x795a, 0x795c, 0x795e, 0x797f - .2byte 0x7d60, 0x7984, 0x7986, 0x7988, 0x798a, 0x79ad, 0x79ae, 0x79b0, 0x79b2, 0x79b4, 0x79b6, 0x79b8, 0x79ba, 0x79bc, 0x79be, 0x79bf - .2byte 0x7da0, 0x79c4, 0x79c6, 0x79e8, 0x79ca, 0x79ed, 0x79ef, 0x79f0, 0x79f3, 0x79f4, 0x79f6, 0x79f8, 0x79fa, 0x79fc, 0x79fe, 0x79ff - .2byte 0x7e00, 0x7a04, 0x7a06, 0x7a08, 0x7a0a, 0x7a2d, 0x7a2f, 0x7a31, 0x7a33, 0x7a35, 0x7a36, 0x7a38, 0x7a3a, 0x7a3c, 0x7a3e, 0x7a3f - .2byte 0x7e40, 0x7a64, 0x7a46, 0x7a68, 0x7a4a, 0x7a4d, 0x7a6f, 0x7a71, 0x7a73, 0x7a75, 0x7a76, 0x7a78, 0x7a7a, 0x7a7c, 0x7a7e, 0x7abf - .2byte 0x7e80, 0x7a84, 0x7a86, 0x7a88, 0x7a8a, 0x7aad, 0x7aaf, 0x7ab1, 0x7ab3, 0x7ad6, 0x7ad8, 0x7ad9, 0x7adb, 0x7adc, 0x7ade, 0x7aff - .2byte 0x7ec0, 0x7ae4, 0x7ac6, 0x7ac8, 0x7aca, 0x7aed, 0x7acf, 0x7af1, 0x7af3, 0x7b16, 0x7b18, 0x7b1a, 0x7b1b, 0x7b1d, 0x7b1e, 0x7b3f - .2byte 0x7f20, 0x7b04, 0x7b06, 0x7b08, 0x7b0a, 0x7b0d, 0x7b0f, 0x7b31, 0x7b13, 0x7b36, 0x7b58, 0x7b5a, 0x7b5b, 0x7b5d, 0x7b5e, 0x7b7f - .2byte 0x7f60, 0x7b44, 0x7b46, 0x7b48, 0x7b4a, 0x7b4d, 0x7b4f, 0x7b51, 0x7b53, 0x7b76, 0x7b78, 0x7b9a, 0x7b9c, 0x7b9d, 0x7b9e, 0x7fbf - .2byte 0x7fa0, 0x7ba4, 0x7b86, 0x7ba8, 0x7b8a, 0x7b8d, 0x7b8f, 0x7b91, 0x7b93, 0x7bb6, 0x7bb8, 0x7bba, 0x7bbc, 0x7fde, 0x7fdf, 0x7fff - .2byte 0x7fe0, 0x7bc4, 0x7bc6, 0x7bc8, 0x7bca, 0x7bcd, 0x7bcf, 0x7bd1, 0x7bd3, 0x7bd6, 0x7bd8, 0x7bda, 0x7bdc, 0x7ffe, 0x7fff, 0x7fff - .2byte 0x77e3, 0x77e5, 0x77e7, 0x77e9, 0x77eb, 0x77ed, 0x7bef, 0x7bf1, 0x7bf5, 0x7bf7, 0x7bf9, 0x7bfb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7c63, 0x7c64, 0x7c66, 0x7c68, 0x7c6a, 0x7c6c, 0x7c6e, 0x7c70, 0x7c72, 0x7c74, 0x7c76, 0x7c77, 0x7c79, 0x7c7b, 0x7c7d, 0x7c7f - .2byte 0x7ca3, 0x7ca5, 0x7ca7, 0x7ca9, 0x7caa, 0x7cad, 0x7cae, 0x7cb0, 0x7cb2, 0x7cb4, 0x7cb6, 0x7cb8, 0x7cba, 0x7cbc, 0x7cbd, 0x7cbf - .2byte 0x7ce3, 0x7ce5, 0x7ce7, 0x7ce9, 0x7ceb, 0x7cec, 0x7cee, 0x7cf0, 0x7cf2, 0x7cf4, 0x7cf6, 0x7cf8, 0x7cf9, 0x7cfb, 0x7cfd, 0x7cff - .2byte 0x7d23, 0x7d25, 0x7d27, 0x7d29, 0x7d2b, 0x7d2d, 0x7d2f, 0x7d30, 0x7d32, 0x7d34, 0x7d36, 0x7d38, 0x7d3a, 0x7d3b, 0x7d3d, 0x7d3f - .2byte 0x7d63, 0x7d65, 0x7d67, 0x7d69, 0x7d6b, 0x7d6d, 0x7d6f, 0x7d71, 0x7d72, 0x7d74, 0x7d76, 0x7d78, 0x7d7a, 0x7d7b, 0x7d7d, 0x7d7f - .2byte 0x7da3, 0x7da5, 0x7da7, 0x7da9, 0x7dab, 0x7dad, 0x7daf, 0x7db1, 0x7db2, 0x7db4, 0x7db6, 0x7db8, 0x7dba, 0x7dbc, 0x7dbd, 0x7dbf - .2byte 0x7dc3, 0x7de5, 0x7de7, 0x7de9, 0x7deb, 0x7ded, 0x7def, 0x7df1, 0x7df3, 0x7df5, 0x7df6, 0x7df8, 0x7dfa, 0x7dfc, 0x7dfe, 0x7dff - .2byte 0x7e03, 0x7e25, 0x7e07, 0x7e29, 0x7e2b, 0x7e2d, 0x7e2f, 0x7e31, 0x7e33, 0x7e35, 0x7e37, 0x7e38, 0x7e3a, 0x7e3c, 0x7e3e, 0x7e3f - .2byte 0x7e43, 0x7e45, 0x7e67, 0x7e69, 0x7e6b, 0x7e6d, 0x7e6f, 0x7e71, 0x7eb5, 0x7eb6, 0x7eb8, 0x7eb9, 0x7ebb, 0x7ebc, 0x7ebe, 0x7ebf - .2byte 0x7e83, 0x7e85, 0x7ea7, 0x7e89, 0x7eab, 0x7ead, 0x7eaf, 0x7eb1, 0x7ed5, 0x7ef7, 0x7ef8, 0x7efa, 0x7efb, 0x7efc, 0x7efe, 0x7eff - .2byte 0x7ec3, 0x7ec5, 0x7ec7, 0x7ec9, 0x7ecb, 0x7ecd, 0x7eef, 0x7ef1, 0x7f15, 0x7f17, 0x7f39, 0x7f3a, 0x7f3b, 0x7f3d, 0x7f3e, 0x7f3f - .2byte 0x7f03, 0x7f05, 0x7f07, 0x7f09, 0x7f0b, 0x7f0d, 0x7f2f, 0x7f11, 0x7f35, 0x7f57, 0x7f59, 0x7f7b, 0x7f7c, 0x7f7d, 0x7f7e, 0x7f7f - .2byte 0x7f43, 0x7f45, 0x7f47, 0x7f49, 0x7f4b, 0x7f4d, 0x7f4f, 0x7f51, 0x7f75, 0x7f77, 0x7f99, 0x7f9b, 0x7fbd, 0x7fbe, 0x7fbf, 0x7fbf - .2byte 0x7f83, 0x7f85, 0x7f87, 0x7f89, 0x7f8b, 0x7f8d, 0x7f8f, 0x7f91, 0x7f95, 0x7fb7, 0x7fb9, 0x7fbb, 0x7fdd, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7fc3, 0x7fc5, 0x7fc7, 0x7fc9, 0x7fcb, 0x7fcd, 0x7fcf, 0x7fd1, 0x7fd5, 0x7fd7, 0x7fd9, 0x7fdb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7fe3, 0x7fe5, 0x7fe7, 0x7fe9, 0x7feb, 0x7fed, 0x7fef, 0x7ff1, 0x7ff5, 0x7ff7, 0x7ff9, 0x7ffb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff - .2byte 0x0421, 0x0423, 0x0425, 0x0427, 0x0429, 0x042b, 0x042d, 0x0012, 0x0014, 0x0016, 0x0019, 0x001b, 0x001d, 0x001f, 0x043f, 0x109f - .2byte 0x0461, 0x0463, 0x0465, 0x0467, 0x0469, 0x046b, 0x046d, 0x0052, 0x0054, 0x0056, 0x0059, 0x005b, 0x003d, 0x005f, 0x047f, 0x10df - .2byte 0x04a1, 0x04a3, 0x04a5, 0x04a7, 0x04a9, 0x04ab, 0x04ad, 0x00b2, 0x00b4, 0x00b6, 0x0099, 0x009b, 0x009d, 0x009f, 0x04bf, 0x10ff - .2byte 0x04e1, 0x04e3, 0x04e5, 0x04e7, 0x04e9, 0x04eb, 0x04ed, 0x00f2, 0x00f4, 0x00f6, 0x00f9, 0x00fb, 0x00fd, 0x00df, 0x04ff, 0x113f - .2byte 0x0521, 0x0523, 0x0525, 0x0527, 0x0529, 0x052b, 0x052d, 0x0152, 0x0154, 0x0156, 0x0139, 0x013b, 0x013d, 0x013f, 0x055f, 0x117f - .2byte 0x0561, 0x0563, 0x0565, 0x0567, 0x0569, 0x056b, 0x056d, 0x01b2, 0x0194, 0x0196, 0x0199, 0x019b, 0x017d, 0x017f, 0x059f, 0x11bf - .2byte 0x05a1, 0x05a3, 0x05a5, 0x05a7, 0x05a9, 0x05ab, 0x05ad, 0x01f2, 0x01f4, 0x01d6, 0x01d9, 0x01db, 0x01dd, 0x01df, 0x05df, 0x11ff - .2byte 0x0240, 0x0243, 0x0245, 0x0248, 0x024b, 0x024d, 0x0250, 0x0252, 0x0254, 0x0236, 0x0239, 0x021b, 0x021d, 0x021f, 0x061f, 0x123f - .2byte 0x0280, 0x0283, 0x0285, 0x0288, 0x028a, 0x028d, 0x028f, 0x0292, 0x0294, 0x0296, 0x0279, 0x027b, 0x027d, 0x025f, 0x065f, 0x125f - .2byte 0x02c0, 0x02c2, 0x02c5, 0x02c7, 0x02ca, 0x02cd, 0x02cf, 0x02d1, 0x02d4, 0x02d6, 0x02d9, 0x02bb, 0x02bd, 0x02bf, 0x069f, 0x129f - .2byte 0x0320, 0x0322, 0x0325, 0x0327, 0x032a, 0x032c, 0x032f, 0x0331, 0x0334, 0x0336, 0x0339, 0x031b, 0x02fd, 0x02ff, 0x06df, 0x12df - .2byte 0x0360, 0x0362, 0x0365, 0x0367, 0x036a, 0x036c, 0x036e, 0x0371, 0x0373, 0x0376, 0x0378, 0x037b, 0x035d, 0x035f, 0x073f, 0x131f - .2byte 0x03a0, 0x03a2, 0x03a4, 0x03a7, 0x03a9, 0x03ac, 0x03ae, 0x03b1, 0x03b3, 0x03b5, 0x03b8, 0x03ba, 0x03bd, 0x039f, 0x077f, 0x135f - .2byte 0x03e0, 0x03e2, 0x03e5, 0x03e7, 0x03e9, 0x03ec, 0x03ee, 0x03f1, 0x03f3, 0x03f5, 0x03f8, 0x03fa, 0x03fd, 0x03ff, 0x07bf, 0x137f - .2byte 0x07e1, 0x07e3, 0x07e6, 0x07e8, 0x07ea, 0x07ec, 0x07ee, 0x07f0, 0x07f3, 0x07f5, 0x07f7, 0x07f9, 0x07fb, 0x07fd, 0x07ff, 0x13bf - .2byte 0x13e4, 0x13e6, 0x13e8, 0x13ea, 0x13ec, 0x13ed, 0x13ef, 0x13f1, 0x13f3, 0x13f5, 0x13f6, 0x13f8, 0x13fa, 0x13fc, 0x13fe, 0x13ff - .2byte 0x0c21, 0x0c23, 0x0c25, 0x0c27, 0x0c29, 0x0c2b, 0x0c2d, 0x0c12, 0x0c14, 0x0816, 0x0819, 0x081b, 0x081d, 0x081f, 0x0c3f, 0x189f - .2byte 0x0c61, 0x0c63, 0x0c65, 0x0c67, 0x0c69, 0x0c6b, 0x0c70, 0x0852, 0x0854, 0x0856, 0x0858, 0x085b, 0x085d, 0x0c7e, 0x14bf, 0x18df - .2byte 0x0ca1, 0x0ca3, 0x0ca5, 0x0ca7, 0x0ca9, 0x0cab, 0x0cb0, 0x08b2, 0x08b4, 0x08b6, 0x0898, 0x089b, 0x089d, 0x0cbe, 0x14ff, 0x191f - .2byte 0x0ce1, 0x0ce3, 0x0ce5, 0x0ce7, 0x0ce9, 0x0ceb, 0x0cf0, 0x08f2, 0x08f4, 0x08f6, 0x08f8, 0x08db, 0x08dd, 0x0cfe, 0x153f, 0x195f - .2byte 0x0d21, 0x0d23, 0x0d25, 0x0d27, 0x0d29, 0x0d2b, 0x0d50, 0x0952, 0x0954, 0x0936, 0x0938, 0x093b, 0x093d, 0x0d5e, 0x157f, 0x197f - .2byte 0x0d61, 0x0d63, 0x0d65, 0x0d67, 0x0d69, 0x0d6b, 0x0db0, 0x0992, 0x0994, 0x0996, 0x0998, 0x097b, 0x097d, 0x0d7e, 0x15bf, 0x19bf - .2byte 0x0da1, 0x0e03, 0x0e05, 0x0e08, 0x0e0a, 0x0e0d, 0x0e10, 0x09f2, 0x09f4, 0x09d6, 0x09d8, 0x09db, 0x09dd, 0x0dde, 0x15df, 0x19ff - .2byte 0x0a40, 0x0a42, 0x0a45, 0x0a47, 0x0a4a, 0x0a4d, 0x0a4f, 0x0a52, 0x0a34, 0x0a36, 0x0a38, 0x0a1b, 0x0a1d, 0x0e1e, 0x163f, 0x1a3f - .2byte 0x0a80, 0x0a82, 0x0a85, 0x0a88, 0x0a8a, 0x0a8d, 0x0a8f, 0x0a92, 0x0a94, 0x0a76, 0x0a78, 0x0a7b, 0x0a5d, 0x0e5e, 0x167f, 0x1a7f - .2byte 0x0ac0, 0x0ac2, 0x0ac5, 0x0ac7, 0x0aca, 0x0acc, 0x0acf, 0x0ad1, 0x0ad4, 0x0ad6, 0x0ad8, 0x0abb, 0x0abd, 0x0e9e, 0x169f, 0x1abf - .2byte 0x0b20, 0x0b02, 0x0b04, 0x0b07, 0x0b09, 0x0b0c, 0x0b0f, 0x0b11, 0x0b14, 0x0b16, 0x0b18, 0x0b1b, 0x0afd, 0x0efe, 0x16ff, 0x1adf - .2byte 0x0b60, 0x0b62, 0x0b64, 0x0b67, 0x0b69, 0x0b6c, 0x0b6e, 0x0b71, 0x0b73, 0x0b76, 0x0b78, 0x0b7b, 0x0b5d, 0x0f3e, 0x171f, 0x1b1f - .2byte 0x07a0, 0x0ba2, 0x0ba4, 0x0ba7, 0x0ba9, 0x0bac, 0x0bae, 0x0bb1, 0x0bb3, 0x0bb6, 0x0bb8, 0x0bba, 0x0bbd, 0x0f7e, 0x175f, 0x1b5f - .2byte 0x0be0, 0x0fc3, 0x0fc5, 0x0fc7, 0x0fca, 0x0fcc, 0x0fce, 0x0fd0, 0x0fd2, 0x0fd5, 0x0fd7, 0x0fd9, 0x0fdb, 0x0fde, 0x17bf, 0x1b9f - .2byte 0x0fe1, 0x17e5, 0x17e7, 0x17e9, 0x17eb, 0x17ed, 0x17ef, 0x17f1, 0x17f3, 0x17f5, 0x17f7, 0x17f9, 0x17fb, 0x17fd, 0x17ff, 0x1bbf - .2byte 0x1be4, 0x1be6, 0x1be8, 0x1bea, 0x1bec, 0x1bee, 0x1bf0, 0x1bf1, 0x1bf3, 0x1bf5, 0x1bf7, 0x1bf8, 0x1bfa, 0x1bfc, 0x1bfe, 0x1bff - .2byte 0x1421, 0x1423, 0x1425, 0x1427, 0x1429, 0x142b, 0x142d, 0x1412, 0x1414, 0x1416, 0x1419, 0x141b, 0x101d, 0x141f, 0x183f, 0x209f - .2byte 0x1461, 0x1463, 0x1465, 0x1467, 0x1469, 0x146b, 0x1470, 0x1452, 0x1454, 0x1456, 0x1058, 0x105b, 0x105d, 0x147e, 0x1cbf, 0x20df - .2byte 0x14a1, 0x14a3, 0x14a5, 0x14a7, 0x14a9, 0x14ad, 0x14af, 0x14b2, 0x1094, 0x1096, 0x1098, 0x109a, 0x14bb, 0x1cfd, 0x1cff, 0x211f - .2byte 0x14e1, 0x14e3, 0x14e5, 0x14e7, 0x14e9, 0x150d, 0x14ef, 0x14f2, 0x10f4, 0x10f6, 0x10f8, 0x10da, 0x14fb, 0x1d3d, 0x1d3f, 0x215f - .2byte 0x1521, 0x1523, 0x1525, 0x1527, 0x1529, 0x154d, 0x154f, 0x1552, 0x1134, 0x1136, 0x1138, 0x113a, 0x153b, 0x1d7d, 0x1d7f, 0x219f - .2byte 0x1561, 0x1563, 0x15a5, 0x15a8, 0x15aa, 0x15ad, 0x15af, 0x1592, 0x1194, 0x1196, 0x1198, 0x117a, 0x157b, 0x1dbd, 0x1dbf, 0x21bf - .2byte 0x15a1, 0x1603, 0x15e5, 0x15e7, 0x15ea, 0x15ed, 0x15ef, 0x15f2, 0x11d4, 0x11d6, 0x11d8, 0x11da, 0x15db, 0x1dfd, 0x1dff, 0x21ff - .2byte 0x1640, 0x1642, 0x1645, 0x1647, 0x164a, 0x164c, 0x164f, 0x1652, 0x1234, 0x1236, 0x1218, 0x121a, 0x161b, 0x1e3d, 0x1e3f, 0x223f - .2byte 0x1680, 0x1682, 0x1284, 0x1287, 0x128a, 0x128c, 0x128f, 0x1291, 0x1294, 0x1276, 0x1278, 0x125a, 0x165b, 0x1e7d, 0x1e7f, 0x227f - .2byte 0x16c0, 0x16c2, 0x12c4, 0x12c7, 0x12ca, 0x12cc, 0x12cf, 0x12d1, 0x12d4, 0x12d6, 0x12b8, 0x12ba, 0x169b, 0x1e9d, 0x1e9f, 0x22bf - .2byte 0x1320, 0x1302, 0x1304, 0x1307, 0x1309, 0x130c, 0x130e, 0x1311, 0x1313, 0x1316, 0x1318, 0x131a, 0x16db, 0x1efd, 0x1edf, 0x22df - .2byte 0x1360, 0x1362, 0x1344, 0x1347, 0x1349, 0x134c, 0x134e, 0x1351, 0x1353, 0x1355, 0x1358, 0x135a, 0x173b, 0x1f1d, 0x1f3f, 0x231f - .2byte 0x13a0, 0x13a2, 0x1765, 0x1767, 0x176a, 0x176c, 0x176e, 0x1770, 0x1772, 0x1775, 0x1777, 0x1779, 0x177b, 0x1f7d, 0x1f5f, 0x235f - .2byte 0x13e0, 0x17c3, 0x1fa7, 0x1fa9, 0x1fab, 0x1fad, 0x1faf, 0x1fb1, 0x1fb3, 0x1fb5, 0x1fb7, 0x1fb9, 0x1fbb, 0x1fbd, 0x1f9f, 0x239f - .2byte 0x17e1, 0x1fe5, 0x1fe7, 0x1fe9, 0x1feb, 0x1fed, 0x1fef, 0x1ff1, 0x1ff3, 0x1ff5, 0x1ff7, 0x1ff9, 0x1ffb, 0x1ffd, 0x1fff, 0x23df - .2byte 0x1fe4, 0x23e6, 0x23e8, 0x23ea, 0x23ec, 0x23ee, 0x23f0, 0x23f1, 0x23f3, 0x23f5, 0x23f7, 0x23f9, 0x23fa, 0x23fc, 0x23fe, 0x23ff - .2byte 0x1c21, 0x1c23, 0x1c25, 0x1c27, 0x1c29, 0x1c2b, 0x1c2d, 0x2012, 0x2014, 0x1c16, 0x1c19, 0x1c1b, 0x1c1d, 0x1c1f, 0x203f, 0x289f - .2byte 0x1c61, 0x1c63, 0x1c65, 0x1c67, 0x1c69, 0x1c6b, 0x2070, 0x1c52, 0x2054, 0x1c56, 0x1c58, 0x1c5b, 0x1c5d, 0x1c7e, 0x24bf, 0x28df - .2byte 0x1ca1, 0x1ca3, 0x1ca5, 0x1ca7, 0x1ca9, 0x20ad, 0x1caf, 0x1cb2, 0x1c94, 0x1c96, 0x1c98, 0x1c9a, 0x1cbb, 0x24fd, 0x24ff, 0x291f - .2byte 0x1ce1, 0x1ce3, 0x1ce5, 0x1ce7, 0x210a, 0x1ced, 0x1cef, 0x1cf1, 0x1cf3, 0x1cf6, 0x18d8, 0x1cf9, 0x253b, 0x253d, 0x253f, 0x295f - .2byte 0x1d21, 0x1d23, 0x1d25, 0x2148, 0x214a, 0x1d4d, 0x1d4f, 0x1d51, 0x1d33, 0x1d36, 0x1938, 0x1d39, 0x257b, 0x257d, 0x257f, 0x299f - .2byte 0x1d61, 0x1d63, 0x21a5, 0x1da7, 0x1daa, 0x1dad, 0x1d8f, 0x1d91, 0x1d93, 0x1d76, 0x1978, 0x1d99, 0x25bb, 0x25bd, 0x25bf, 0x29df - .2byte 0x1da1, 0x1e03, 0x1de5, 0x1de7, 0x1dea, 0x1dec, 0x1def, 0x1df1, 0x1dd3, 0x1dd6, 0x19d8, 0x1dd9, 0x25fb, 0x25fd, 0x25ff, 0x2a1f - .2byte 0x1e40, 0x1e42, 0x1e45, 0x1e27, 0x1e2a, 0x1e2c, 0x1e2f, 0x1e31, 0x1e33, 0x1e16, 0x1a18, 0x1e19, 0x263b, 0x263d, 0x263f, 0x2a3f - .2byte 0x1e80, 0x1e82, 0x1e84, 0x1e67, 0x1e69, 0x1e6c, 0x1e6e, 0x1e71, 0x1e73, 0x1e76, 0x1a78, 0x1e59, 0x267b, 0x267d, 0x267f, 0x2a7f - .2byte 0x1ec0, 0x1ec2, 0x1ec4, 0x1ec7, 0x1ec9, 0x1ecc, 0x1ece, 0x1ed1, 0x1ed3, 0x1ed6, 0x1ab8, 0x1eb9, 0x26bb, 0x26bd, 0x26bf, 0x2abf - .2byte 0x1f20, 0x1f02, 0x1f04, 0x1b06, 0x1b09, 0x1b0c, 0x1b0e, 0x1b11, 0x1b13, 0x1b16, 0x1b18, 0x1ef9, 0x26fb, 0x26dd, 0x26df, 0x2adf - .2byte 0x1f60, 0x1b62, 0x1b44, 0x1f27, 0x1f2a, 0x1f2c, 0x1f2e, 0x1f30, 0x1f33, 0x1f35, 0x1f37, 0x1f39, 0x273b, 0x271d, 0x273f, 0x2b1f - .2byte 0x1fa0, 0x1ba2, 0x1f65, 0x2769, 0x276b, 0x276d, 0x276f, 0x2771, 0x2773, 0x2775, 0x2777, 0x2779, 0x277b, 0x275d, 0x275f, 0x2b5f - .2byte 0x1be0, 0x1fc3, 0x27a7, 0x27a9, 0x27ab, 0x27ad, 0x27af, 0x27b1, 0x27b3, 0x27b5, 0x27b7, 0x27b9, 0x27bb, 0x27bd, 0x279f, 0x2b9f - .2byte 0x1fe1, 0x27e5, 0x27e7, 0x27e9, 0x27eb, 0x27ed, 0x27ef, 0x27f1, 0x27f3, 0x27f5, 0x27f7, 0x27f9, 0x27fb, 0x27fd, 0x27ff, 0x2bbf - .2byte 0x27e4, 0x2be6, 0x2be8, 0x2bea, 0x2bec, 0x2bee, 0x2bf0, 0x2bf1, 0x2bf3, 0x2bf5, 0x2bf7, 0x2bf8, 0x2bfa, 0x2bfc, 0x2bfe, 0x2bff - .2byte 0x2421, 0x2423, 0x2425, 0x2427, 0x2429, 0x242b, 0x242d, 0x2c12, 0x2814, 0x2816, 0x2819, 0x281b, 0x241d, 0x241f, 0x283f, 0x309f - .2byte 0x2461, 0x2463, 0x2465, 0x2467, 0x2469, 0x246b, 0x2870, 0x2852, 0x2854, 0x2856, 0x2458, 0x245b, 0x245d, 0x287e, 0x2cbf, 0x30df - .2byte 0x24a1, 0x24a3, 0x24a5, 0x24a7, 0x24a9, 0x28ad, 0x28af, 0x28b2, 0x2894, 0x2896, 0x2498, 0x249a, 0x28bb, 0x2cfd, 0x2cff, 0x311f - .2byte 0x24e1, 0x24e3, 0x24e5, 0x2908, 0x290a, 0x28ed, 0x28ef, 0x28f1, 0x24f3, 0x24f6, 0x24d8, 0x28f9, 0x2d3b, 0x2d3d, 0x2d3f, 0x315f - .2byte 0x2521, 0x2523, 0x2525, 0x2948, 0x294a, 0x294c, 0x294f, 0x2531, 0x2533, 0x2535, 0x2957, 0x2d79, 0x2d7b, 0x2d7d, 0x2d7f, 0x35bf - .2byte 0x2561, 0x2563, 0x29a5, 0x29a7, 0x298a, 0x298c, 0x298f, 0x2591, 0x2593, 0x2575, 0x2997, 0x2db9, 0x2dbb, 0x2dbd, 0x2dbf, 0x35df - .2byte 0x25a1, 0x2a03, 0x29e5, 0x29e7, 0x29ea, 0x29ec, 0x29ef, 0x25d1, 0x25d3, 0x25d5, 0x29d7, 0x2df9, 0x2dfb, 0x2dfd, 0x2dff, 0x361f - .2byte 0x2a40, 0x2a42, 0x2a45, 0x2a27, 0x2629, 0x262c, 0x262e, 0x2631, 0x2633, 0x2615, 0x2a17, 0x2e39, 0x2e3b, 0x2e3d, 0x2e3f, 0x365f - .2byte 0x2a80, 0x2a82, 0x2684, 0x2667, 0x2669, 0x266c, 0x266e, 0x2671, 0x2673, 0x2675, 0x2a57, 0x2e79, 0x2e7b, 0x2e7d, 0x2e7f, 0x367f - .2byte 0x2ac0, 0x26c2, 0x26c4, 0x26c7, 0x26a9, 0x26ab, 0x26ae, 0x26b0, 0x26b3, 0x26b5, 0x2a97, 0x2eb9, 0x2ebb, 0x2ebd, 0x2ebf, 0x36bf - .2byte 0x2720, 0x2702, 0x2704, 0x2706, 0x2aea, 0x2aec, 0x2aee, 0x2af0, 0x2af2, 0x2af5, 0x2af7, 0x2ef9, 0x2efb, 0x2efd, 0x2eff, 0x36ff - .2byte 0x2760, 0x2762, 0x2744, 0x2727, 0x2f2b, 0x2f2d, 0x2f2f, 0x2f31, 0x2f33, 0x2f35, 0x2f37, 0x2f39, 0x2f3b, 0x2f3d, 0x2f1f, 0x371f - .2byte 0x27a0, 0x27a2, 0x2765, 0x2f69, 0x2f6b, 0x2f6d, 0x2f6f, 0x2f71, 0x2f73, 0x2f75, 0x2f77, 0x2f79, 0x2f7b, 0x2f7d, 0x2f5f, 0x375f - .2byte 0x27e0, 0x2bc3, 0x2fa7, 0x2fa9, 0x2fab, 0x2fad, 0x2faf, 0x2fb1, 0x2fb3, 0x2fb5, 0x2fb7, 0x2fb9, 0x2fbb, 0x2fbd, 0x2f9f, 0x379f - .2byte 0x2be1, 0x2fe5, 0x2fe7, 0x2fe9, 0x2feb, 0x2fed, 0x2fef, 0x2ff1, 0x2ff3, 0x2ff5, 0x2ff7, 0x2ff9, 0x2ffb, 0x2ffd, 0x2fff, 0x37df - .2byte 0x2fe4, 0x2fe6, 0x33e8, 0x33ea, 0x37ed, 0x37ee, 0x37f0, 0x37f2, 0x37f3, 0x37f5, 0x37f7, 0x37f9, 0x37fa, 0x37fc, 0x37fe, 0x37ff - .2byte 0x2c21, 0x2c23, 0x2c25, 0x2c27, 0x2c29, 0x2c2b, 0x2c2d, 0x3412, 0x3414, 0x3416, 0x3019, 0x301b, 0x301d, 0x301f, 0x303f, 0x349f - .2byte 0x2c61, 0x2c63, 0x2c65, 0x2c67, 0x2c69, 0x2c6b, 0x3470, 0x3452, 0x3454, 0x3056, 0x3058, 0x305b, 0x305d, 0x307e, 0x34bf, 0x38df - .2byte 0x2ca1, 0x2ca3, 0x34a5, 0x34a8, 0x34aa, 0x34ad, 0x34af, 0x30b2, 0x3094, 0x3096, 0x3098, 0x309a, 0x30bb, 0x34fd, 0x34ff, 0x391f - .2byte 0x2ce1, 0x2ce3, 0x3505, 0x34e7, 0x34ea, 0x34ed, 0x30ef, 0x30f1, 0x30f3, 0x30f6, 0x30d8, 0x30f9, 0x353b, 0x353d, 0x353f, 0x395f - .2byte 0x2d21, 0x2d23, 0x3545, 0x3547, 0x314a, 0x314c, 0x314f, 0x3131, 0x3133, 0x2d35, 0x3157, 0x3579, 0x357b, 0x357d, 0x357f, 0x39bf - .2byte 0x2d61, 0x2d63, 0x35a5, 0x35a7, 0x318a, 0x318c, 0x318f, 0x3191, 0x3193, 0x3195, 0x35b7, 0x35b9, 0x35bb, 0x35bd, 0x39df, 0x3dff - .2byte 0x2da1, 0x3603, 0x35e5, 0x31e7, 0x31ea, 0x31ec, 0x31ef, 0x31d1, 0x31d3, 0x31d5, 0x35f7, 0x35f9, 0x35fb, 0x35fd, 0x39ff, 0x3e1f - .2byte 0x3640, 0x3242, 0x3245, 0x3227, 0x3229, 0x322c, 0x322e, 0x3231, 0x3213, 0x3215, 0x3637, 0x3639, 0x363b, 0x363d, 0x3a3f, 0x3e5f - .2byte 0x3280, 0x3282, 0x3284, 0x3267, 0x3269, 0x326c, 0x326e, 0x3270, 0x3273, 0x3275, 0x3677, 0x3679, 0x367b, 0x367d, 0x3a7f, 0x3e7f - .2byte 0x32c0, 0x32c2, 0x32c4, 0x2ec7, 0x2ea9, 0x32ac, 0x32ae, 0x32b0, 0x32b3, 0x32b5, 0x36b7, 0x36b9, 0x36bb, 0x36bd, 0x3abf, 0x3ebf - .2byte 0x3320, 0x3302, 0x3304, 0x2f06, 0x32ea, 0x36ed, 0x36ef, 0x36f1, 0x36f3, 0x36f5, 0x36f7, 0x36f9, 0x36fb, 0x36fd, 0x3aff, 0x3eff - .2byte 0x3360, 0x2f62, 0x2f44, 0x3327, 0x372b, 0x372d, 0x372f, 0x3731, 0x3733, 0x3735, 0x3737, 0x3739, 0x373b, 0x373d, 0x3b3f, 0x3f1f - .2byte 0x2fa0, 0x2fa2, 0x2f65, 0x3769, 0x376b, 0x376d, 0x376f, 0x3771, 0x3773, 0x3775, 0x3777, 0x3779, 0x377b, 0x377d, 0x3b7f, 0x3f5f - .2byte 0x2fe0, 0x2fc3, 0x37a7, 0x37a9, 0x37ab, 0x37ad, 0x37af, 0x37b1, 0x37b3, 0x37b5, 0x37b7, 0x37b9, 0x37bb, 0x37bd, 0x3bbf, 0x3f9f - .2byte 0x33e1, 0x37e5, 0x37e7, 0x37e9, 0x37eb, 0x3bee, 0x3bef, 0x3bf1, 0x3bf3, 0x3bf5, 0x3bf7, 0x3bf9, 0x3bfb, 0x3bfd, 0x3bff, 0x3fdf - .2byte 0x37e4, 0x37e6, 0x37e8, 0x3bea, 0x3bed, 0x3fef, 0x3ff0, 0x3ff2, 0x3ff4, 0x3ff5, 0x3ff7, 0x3ff9, 0x3ffa, 0x3ffc, 0x3ffe, 0x3fff - .2byte 0x3421, 0x3423, 0x3425, 0x3427, 0x3429, 0x342b, 0x342d, 0x4012, 0x3c14, 0x3c16, 0x3c19, 0x381b, 0x381d, 0x381f, 0x383f, 0x3c9f - .2byte 0x3461, 0x4063, 0x4065, 0x4067, 0x406a, 0x406d, 0x4070, 0x3c52, 0x3c54, 0x3c56, 0x3c58, 0x385b, 0x385d, 0x387e, 0x3cbf, 0x40df - .2byte 0x34a1, 0x40a3, 0x3ca5, 0x3ca7, 0x3caa, 0x3cad, 0x3caf, 0x3cb2, 0x3c94, 0x3c96, 0x3898, 0x389a, 0x38bb, 0x3cfd, 0x3cff, 0x411f - .2byte 0x34e1, 0x4103, 0x3ce5, 0x3ce7, 0x3cea, 0x3cec, 0x3cef, 0x3cf1, 0x38f3, 0x38f6, 0x38d8, 0x38f9, 0x3d3b, 0x3d3d, 0x3d3f, 0x415f - .2byte 0x3521, 0x4143, 0x3d45, 0x3d47, 0x3d4a, 0x3d4c, 0x3d4f, 0x3931, 0x3933, 0x3935, 0x3957, 0x3d79, 0x3d7b, 0x3d7d, 0x3d7f, 0x41bf - .2byte 0x3561, 0x41a3, 0x3da5, 0x3d87, 0x3d8a, 0x3d8c, 0x3d8f, 0x3991, 0x3993, 0x3995, 0x3db7, 0x3db9, 0x3dbb, 0x3dbd, 0x3ddf, 0x41ff - .2byte 0x35a1, 0x4203, 0x3de5, 0x3de7, 0x3dea, 0x3dec, 0x39ce, 0x39d1, 0x39d3, 0x3df5, 0x3df7, 0x3df9, 0x3dfb, 0x3dfd, 0x421e, 0x463f - .2byte 0x3e40, 0x3e42, 0x3e45, 0x3e27, 0x3a29, 0x3a2c, 0x3a2e, 0x3a31, 0x3a13, 0x3e35, 0x3e37, 0x3e39, 0x3e3b, 0x3e3d, 0x423e, 0x465f - .2byte 0x3e80, 0x3e82, 0x3a84, 0x3a67, 0x3a69, 0x3a6c, 0x3a6e, 0x3a70, 0x3a73, 0x3e75, 0x3e77, 0x3e79, 0x3e7b, 0x3e7d, 0x427e, 0x469f - .2byte 0x3ac0, 0x3ac2, 0x3ac4, 0x3ac7, 0x3aa9, 0x3aac, 0x3eaf, 0x3eb1, 0x3eb3, 0x3eb5, 0x3eb7, 0x3eb9, 0x3ebb, 0x3ebd, 0x42be, 0x46bf - .2byte 0x3b20, 0x3b02, 0x3b04, 0x3b06, 0x3aea, 0x3eed, 0x3eef, 0x3ef1, 0x3ef3, 0x3ef5, 0x3ef7, 0x3ef9, 0x3efb, 0x3efd, 0x42fe, 0x46ff - .2byte 0x3b60, 0x3b62, 0x3b44, 0x3b27, 0x3f2b, 0x3f2d, 0x3f2f, 0x3f31, 0x3f33, 0x3f35, 0x3f37, 0x3f39, 0x3f3b, 0x3f3d, 0x433e, 0x473f - .2byte 0x3ba0, 0x3ba2, 0x3b65, 0x3f69, 0x3f6b, 0x3f6d, 0x3f6f, 0x3f71, 0x3f73, 0x3f75, 0x3f77, 0x3f79, 0x3f7b, 0x3f7d, 0x437e, 0x475f - .2byte 0x3be0, 0x3bc3, 0x3fa7, 0x3fa9, 0x3fab, 0x3fad, 0x3faf, 0x3fb1, 0x3fb3, 0x3fb5, 0x3fb7, 0x3fb9, 0x3fbb, 0x3fbd, 0x439e, 0x479f - .2byte 0x3be1, 0x3be5, 0x3fe7, 0x3fe9, 0x3feb, 0x3fee, 0x43d0, 0x43d2, 0x43d3, 0x43d5, 0x43d7, 0x43d9, 0x43db, 0x43dd, 0x43de, 0x47df - .2byte 0x3fe4, 0x3fe6, 0x3fe8, 0x43ea, 0x43ed, 0x43ef, 0x47f1, 0x47f2, 0x47f4, 0x47f6, 0x47f7, 0x47f9, 0x47fb, 0x47fc, 0x47fe, 0x47ff - .2byte 0x4800, 0x4802, 0x4805, 0x4807, 0x480a, 0x480d, 0x480f, 0x4812, 0x4814, 0x4416, 0x4419, 0x441b, 0x441d, 0x441f, 0x403f, 0x449f - .2byte 0x4860, 0x4842, 0x4845, 0x4847, 0x484a, 0x484c, 0x484f, 0x4852, 0x4854, 0x4456, 0x4458, 0x445b, 0x445d, 0x407e, 0x44bf, 0x44df - .2byte 0x48a0, 0x48a2, 0x48a5, 0x48a7, 0x48aa, 0x48ac, 0x48af, 0x48b2, 0x4494, 0x4496, 0x4498, 0x449a, 0x40bb, 0x44fd, 0x44ff, 0x451f - .2byte 0x4900, 0x48e2, 0x48e5, 0x44e7, 0x44ea, 0x44ec, 0x44ef, 0x44f1, 0x44f3, 0x44f6, 0x44d8, 0x40f9, 0x453b, 0x453d, 0x453f, 0x455f - .2byte 0x4960, 0x4942, 0x4945, 0x4547, 0x4529, 0x452c, 0x452e, 0x4531, 0x4533, 0x4135, 0x4157, 0x4579, 0x457b, 0x457d, 0x457f, 0x49bf - .2byte 0x49a0, 0x49a2, 0x4985, 0x4587, 0x4589, 0x458c, 0x458e, 0x4591, 0x4193, 0x4195, 0x45b7, 0x45b9, 0x45bb, 0x45bd, 0x45df, 0x49ff - .2byte 0x4a00, 0x49e2, 0x49e5, 0x45e7, 0x45c9, 0x45cc, 0x45ce, 0x45d1, 0x41d3, 0x45f5, 0x45f7, 0x45f9, 0x45fb, 0x45fd, 0x4a1e, 0x4a3f - .2byte 0x4a40, 0x4a42, 0x4a45, 0x4627, 0x4629, 0x462c, 0x462e, 0x4211, 0x4633, 0x4635, 0x4637, 0x4639, 0x463b, 0x463d, 0x4a5e, 0x4e7f - .2byte 0x4a80, 0x4682, 0x4684, 0x4667, 0x4669, 0x426c, 0x426e, 0x4671, 0x4673, 0x4675, 0x4677, 0x4679, 0x467b, 0x467d, 0x4a7e, 0x4e9f - .2byte 0x46c0, 0x46c2, 0x46c4, 0x42c7, 0x42a9, 0x42ac, 0x46af, 0x46b1, 0x46b3, 0x46b5, 0x46b7, 0x46b9, 0x46bb, 0x46bd, 0x4abe, 0x4edf - .2byte 0x4720, 0x4702, 0x4304, 0x4306, 0x42ea, 0x46ed, 0x46ef, 0x46f1, 0x46f3, 0x46f5, 0x46f7, 0x46f9, 0x46fb, 0x46fd, 0x4afe, 0x4eff - .2byte 0x4360, 0x4362, 0x4344, 0x4327, 0x472b, 0x472d, 0x472f, 0x4731, 0x4733, 0x4735, 0x4737, 0x4739, 0x473b, 0x473d, 0x4b3e, 0x4f3f - .2byte 0x43a0, 0x43a2, 0x4365, 0x4769, 0x476b, 0x476d, 0x476f, 0x4771, 0x4773, 0x4775, 0x4777, 0x4779, 0x477b, 0x477d, 0x4b7e, 0x4f7f - .2byte 0x43e0, 0x43c3, 0x47a7, 0x47a9, 0x47ab, 0x47ad, 0x47af, 0x47b1, 0x47b3, 0x47b5, 0x47b7, 0x47b9, 0x47bb, 0x47bd, 0x4bbe, 0x4f9f - .2byte 0x43e1, 0x47e5, 0x47e7, 0x47e9, 0x47eb, 0x47ee, 0x47d0, 0x4bd2, 0x4bd4, 0x4bd6, 0x4bd7, 0x4bd9, 0x4bdb, 0x4bdd, 0x4bde, 0x4fdf - .2byte 0x47e4, 0x47e6, 0x47e8, 0x47ea, 0x4bed, 0x4bef, 0x4bf1, 0x4ff3, 0x4ff4, 0x4ff6, 0x4ff8, 0x4ff9, 0x4ffb, 0x4ffc, 0x4ffe, 0x4fff - .2byte 0x5000, 0x5002, 0x5005, 0x5007, 0x500a, 0x500c, 0x500f, 0x5012, 0x5014, 0x5016, 0x5019, 0x4c1b, 0x4c1d, 0x4c1f, 0x4c3f, 0x4c9f - .2byte 0x5060, 0x5042, 0x5045, 0x5047, 0x504a, 0x504c, 0x504f, 0x5051, 0x5054, 0x5056, 0x5058, 0x4c5b, 0x4c5d, 0x487e, 0x4cbf, 0x4cdf - .2byte 0x50a0, 0x50a2, 0x5084, 0x5087, 0x5089, 0x508c, 0x508e, 0x5091, 0x5094, 0x5096, 0x4c98, 0x4c9a, 0x48bb, 0x4cfd, 0x4cff, 0x4d1f - .2byte 0x5100, 0x5102, 0x50e4, 0x4ce7, 0x4ce9, 0x4cec, 0x4cee, 0x4cf1, 0x4cf3, 0x4cf6, 0x4cd8, 0x4cf9, 0x4d3b, 0x4d3d, 0x4d3f, 0x4d5f - .2byte 0x5140, 0x5142, 0x5144, 0x4d27, 0x4d29, 0x4d2c, 0x4d2e, 0x4d31, 0x4d33, 0x4d35, 0x4957, 0x4d79, 0x4d7b, 0x4d7d, 0x4d7f, 0x4dbf - .2byte 0x51a0, 0x51a2, 0x5184, 0x4d87, 0x4d89, 0x4d8c, 0x4d8e, 0x4d90, 0x4d93, 0x4d95, 0x4db7, 0x4db9, 0x4dbb, 0x4dbd, 0x4ddf, 0x51ff - .2byte 0x51e0, 0x51e2, 0x51e4, 0x4dc7, 0x4dc9, 0x4dcc, 0x4dce, 0x4dd0, 0x4dd3, 0x4df5, 0x4df7, 0x4df9, 0x4dfb, 0x4dfd, 0x4e1e, 0x523f - .2byte 0x5240, 0x5242, 0x5224, 0x4e27, 0x4e29, 0x4e0c, 0x4e0e, 0x4e31, 0x4e33, 0x4e35, 0x4e37, 0x4e39, 0x4e3b, 0x4e3d, 0x525e, 0x527f - .2byte 0x5280, 0x5282, 0x5284, 0x4e67, 0x4e69, 0x4e6c, 0x4e6e, 0x4e71, 0x4e73, 0x4e75, 0x4e77, 0x4e79, 0x4e7b, 0x529d, 0x529e, 0x5adf - .2byte 0x52c0, 0x4ec2, 0x4ec4, 0x4ec7, 0x4ea9, 0x4eac, 0x4eaf, 0x4eb1, 0x4eb3, 0x4eb5, 0x4eb7, 0x4eb9, 0x4ebb, 0x52bd, 0x52be, 0x5aff - .2byte 0x4f20, 0x4f02, 0x4f04, 0x4f06, 0x4aea, 0x4eed, 0x4eef, 0x4ef1, 0x4ef3, 0x4ef5, 0x4ef7, 0x4ef9, 0x4efb, 0x52fd, 0x52fe, 0x5b3f - .2byte 0x4f60, 0x4f62, 0x4b44, 0x4b27, 0x4f2b, 0x4f2d, 0x4f2f, 0x4f31, 0x4f33, 0x4f35, 0x4f37, 0x4f39, 0x4f3b, 0x533d, 0x533e, 0x5b5f - .2byte 0x4fa0, 0x4ba2, 0x4b65, 0x4f69, 0x4f6b, 0x4f6d, 0x4f6f, 0x4f71, 0x4f73, 0x4f75, 0x4f77, 0x4f79, 0x4f7b, 0x537d, 0x537e, 0x5b7f - .2byte 0x4be0, 0x4bc3, 0x4fa7, 0x4fa9, 0x4fab, 0x4fad, 0x4faf, 0x4fb1, 0x53b4, 0x53b5, 0x53b7, 0x53b9, 0x53bb, 0x53bd, 0x539e, 0x5bbf - .2byte 0x4be1, 0x4fe5, 0x4fe7, 0x4fe9, 0x4feb, 0x4fee, 0x4fd0, 0x4fd2, 0x53d4, 0x53d6, 0x53d7, 0x53d9, 0x53db, 0x53dd, 0x53de, 0x5bdf - .2byte 0x4be4, 0x4fe6, 0x4fe8, 0x4fea, 0x4fed, 0x4fef, 0x53f1, 0x53f3, 0x5bf6, 0x5bf7, 0x5bf9, 0x5bfa, 0x5bfc, 0x5bfd, 0x5bfe, 0x5bff - .2byte 0x5800, 0x5802, 0x5805, 0x5807, 0x580a, 0x580c, 0x580e, 0x5811, 0x5814, 0x5816, 0x5819, 0x581b, 0x541d, 0x541f, 0x543f, 0x549f - .2byte 0x5840, 0x5842, 0x5845, 0x5847, 0x5849, 0x584c, 0x584e, 0x5851, 0x5853, 0x5856, 0x5858, 0x585b, 0x585d, 0x547e, 0x54bf, 0x54df - .2byte 0x58a0, 0x58a2, 0x5884, 0x5887, 0x5889, 0x588c, 0x588e, 0x5891, 0x5893, 0x5896, 0x5898, 0x549a, 0x54bb, 0x54fd, 0x54ff, 0x551f - .2byte 0x58e0, 0x58e2, 0x58e4, 0x58e7, 0x58e9, 0x58eb, 0x58ee, 0x58f0, 0x58f3, 0x58f6, 0x58d8, 0x54f9, 0x553b, 0x553d, 0x553f, 0x555f - .2byte 0x5940, 0x5942, 0x5944, 0x5927, 0x5529, 0x552b, 0x552e, 0x5530, 0x5533, 0x5535, 0x5557, 0x5579, 0x557b, 0x557d, 0x557f, 0x55bf - .2byte 0x59a0, 0x5982, 0x5984, 0x5987, 0x5569, 0x558c, 0x558e, 0x5590, 0x5593, 0x5595, 0x55b7, 0x55b9, 0x55bb, 0x55bd, 0x55df, 0x55ff - .2byte 0x59e0, 0x59e2, 0x59e4, 0x59c7, 0x55c9, 0x55cc, 0x55ef, 0x55f1, 0x55f3, 0x55f5, 0x55f7, 0x55f9, 0x55fb, 0x55fd, 0x561e, 0x5a3f - .2byte 0x5a20, 0x5a22, 0x5a24, 0x5a27, 0x5609, 0x560c, 0x562f, 0x5631, 0x5633, 0x5635, 0x5637, 0x5639, 0x563b, 0x563d, 0x5a5e, 0x5a7f - .2byte 0x5a80, 0x5a82, 0x5a84, 0x5a67, 0x5669, 0x566c, 0x566f, 0x5671, 0x5673, 0x5675, 0x5677, 0x5679, 0x567b, 0x569d, 0x5a9e, 0x5edf - .2byte 0x5ac0, 0x5ac2, 0x5ac4, 0x5ac7, 0x56a9, 0x56ac, 0x56af, 0x56b1, 0x56b3, 0x56b5, 0x56b7, 0x56b9, 0x56bb, 0x5add, 0x5efe, 0x631f - .2byte 0x5b20, 0x5b02, 0x5704, 0x5706, 0x52ea, 0x56ed, 0x56ef, 0x56f1, 0x56f3, 0x56f5, 0x56f7, 0x56f9, 0x56fb, 0x5afd, 0x5f1e, 0x633f - .2byte 0x5760, 0x5762, 0x5744, 0x5727, 0x572b, 0x572d, 0x572f, 0x5731, 0x5733, 0x5735, 0x5737, 0x5739, 0x573b, 0x5b3d, 0x5f5e, 0x635f - .2byte 0x57a0, 0x57a2, 0x5365, 0x5769, 0x576b, 0x576d, 0x576f, 0x5771, 0x5773, 0x5775, 0x5777, 0x5779, 0x577b, 0x5b7d, 0x5f7e, 0x639f - .2byte 0x57e0, 0x53c3, 0x53a7, 0x57a9, 0x57ab, 0x57ad, 0x57af, 0x57b1, 0x57b4, 0x5bb6, 0x5bb7, 0x5bb9, 0x5bbb, 0x5bbd, 0x5fbe, 0x63bf - .2byte 0x53e1, 0x53e5, 0x53e7, 0x57e9, 0x57eb, 0x57ee, 0x57d0, 0x57d2, 0x57d4, 0x5fd7, 0x5fd9, 0x5fda, 0x5fdc, 0x5fdd, 0x5fde, 0x63df - .2byte 0x53e4, 0x57e6, 0x57e8, 0x57ea, 0x57ed, 0x57ef, 0x57f1, 0x5bf3, 0x5ff6, 0x63f8, 0x63f9, 0x63fb, 0x63fc, 0x63fd, 0x63fe, 0x63ff - .2byte 0x6400, 0x6402, 0x6404, 0x6407, 0x6409, 0x640c, 0x640e, 0x6411, 0x6413, 0x6416, 0x6419, 0x601b, 0x601d, 0x601f, 0x5c3f, 0x589f - .2byte 0x6440, 0x6042, 0x6044, 0x6047, 0x6049, 0x604c, 0x604e, 0x6051, 0x6053, 0x6056, 0x6058, 0x605b, 0x605d, 0x5c7e, 0x5cbf, 0x5cdf - .2byte 0x64a0, 0x6082, 0x6084, 0x6087, 0x6089, 0x608c, 0x608e, 0x6090, 0x6093, 0x6095, 0x6098, 0x609a, 0x5cbb, 0x5cfd, 0x5cff, 0x5d1f - .2byte 0x64e0, 0x60e2, 0x60e4, 0x60c6, 0x60c9, 0x60cb, 0x60ce, 0x60d0, 0x60d3, 0x60d5, 0x60d8, 0x5cf9, 0x5d3b, 0x5d3d, 0x5d3f, 0x5d5f - .2byte 0x6540, 0x6122, 0x6124, 0x6126, 0x5d4a, 0x5d4c, 0x5d4e, 0x5d50, 0x5d52, 0x5d54, 0x5d57, 0x5d79, 0x5d7b, 0x5d7d, 0x5d7f, 0x5dbf - .2byte 0x6580, 0x6182, 0x6184, 0x6186, 0x5d8a, 0x5dad, 0x5daf, 0x5db1, 0x5db3, 0x5db5, 0x5db7, 0x5db9, 0x5dbb, 0x5dbd, 0x5ddf, 0x5dff - .2byte 0x65e0, 0x61e2, 0x61c4, 0x61c6, 0x5dca, 0x5ded, 0x5def, 0x5df1, 0x5df3, 0x5df5, 0x5df7, 0x5df9, 0x5dfb, 0x5dfd, 0x5e1e, 0x5e3f - .2byte 0x6620, 0x6222, 0x6224, 0x6226, 0x5e0a, 0x5e2d, 0x5e2f, 0x5e31, 0x5e33, 0x5e35, 0x5e37, 0x5e39, 0x5e3b, 0x5e3d, 0x5e5e, 0x627f - .2byte 0x6680, 0x6282, 0x6264, 0x6266, 0x5e4a, 0x5e6d, 0x5e6f, 0x5e71, 0x5e73, 0x5e75, 0x5e77, 0x5e79, 0x5e7b, 0x5e9d, 0x5e9e, 0x66df - .2byte 0x66c0, 0x62c2, 0x62c4, 0x62c6, 0x5eaa, 0x5ead, 0x5eaf, 0x5eb1, 0x5eb3, 0x5eb5, 0x5eb7, 0x5eb9, 0x5ebb, 0x5edd, 0x66fe, 0x671f - .2byte 0x6720, 0x6302, 0x6304, 0x6306, 0x5eea, 0x5eed, 0x5eef, 0x5ef1, 0x5ef3, 0x5ef5, 0x5ef7, 0x5ef9, 0x5efb, 0x673d, 0x673e, 0x6b5f - .2byte 0x6360, 0x6362, 0x6344, 0x5f27, 0x5f2b, 0x5f2d, 0x5f2f, 0x5f31, 0x5f33, 0x5f35, 0x5f37, 0x5f39, 0x5f3b, 0x675d, 0x675e, 0x6b7f - .2byte 0x5fa0, 0x5fa2, 0x5b65, 0x5f69, 0x5f6b, 0x5f6d, 0x5f6f, 0x5f71, 0x5f73, 0x5f75, 0x5f77, 0x5f79, 0x5f7b, 0x677d, 0x679e, 0x6b9f - .2byte 0x5fe0, 0x5fc3, 0x5fa7, 0x5ba9, 0x5fab, 0x5fad, 0x5faf, 0x5fb1, 0x5fb4, 0x5fb6, 0x67b9, 0x67ba, 0x67bc, 0x67bd, 0x67be, 0x6bbf - .2byte 0x5be1, 0x5fe5, 0x5be7, 0x5be9, 0x5feb, 0x5fee, 0x5fd0, 0x5fd2, 0x5fd4, 0x63d7, 0x67d9, 0x67da, 0x67dc, 0x67dd, 0x67de, 0x6bdf - .2byte 0x5be4, 0x5be6, 0x5be8, 0x5bea, 0x5fed, 0x5fef, 0x5ff1, 0x5ff3, 0x67f6, 0x67f8, 0x6bfa, 0x6bfb, 0x6bfc, 0x6bfd, 0x6bfe, 0x6bff - .2byte 0x6c00, 0x6c02, 0x6c04, 0x6c07, 0x6c09, 0x6c0c, 0x6c0e, 0x6c10, 0x6c13, 0x6c15, 0x6c18, 0x6c1b, 0x681d, 0x681f, 0x643f, 0x609f - .2byte 0x6c40, 0x6c42, 0x6c44, 0x6c46, 0x6c49, 0x6c4b, 0x6c4e, 0x6c50, 0x6c53, 0x6c55, 0x6c58, 0x6c5b, 0x685d, 0x647e, 0x64bf, 0x60df - .2byte 0x6ca0, 0x6c82, 0x6884, 0x6886, 0x6889, 0x688b, 0x688e, 0x6890, 0x6892, 0x6895, 0x6898, 0x689a, 0x64bb, 0x64fd, 0x64ff, 0x651f - .2byte 0x6ce0, 0x6ce2, 0x68e4, 0x64e7, 0x64e9, 0x64ec, 0x64ee, 0x64f0, 0x64f2, 0x64f5, 0x64f7, 0x64f9, 0x653b, 0x653d, 0x653f, 0x615f - .2byte 0x6d40, 0x6d22, 0x6924, 0x6547, 0x656b, 0x656d, 0x656f, 0x6571, 0x6573, 0x6575, 0x6577, 0x6579, 0x657b, 0x657d, 0x657f, 0x65bf - .2byte 0x6d80, 0x6d82, 0x6984, 0x6587, 0x65ab, 0x65ad, 0x65af, 0x65b1, 0x65b3, 0x65b5, 0x65b7, 0x65b9, 0x65bb, 0x65bd, 0x65df, 0x65ff - .2byte 0x6dc0, 0x6dc2, 0x69c4, 0x65c7, 0x65eb, 0x65ed, 0x65ef, 0x65f1, 0x65f3, 0x65f5, 0x65f7, 0x65f9, 0x65fb, 0x65fd, 0x661e, 0x663f - .2byte 0x6e20, 0x6e22, 0x6a24, 0x6607, 0x662b, 0x662d, 0x662f, 0x6631, 0x6633, 0x6635, 0x6637, 0x6639, 0x663b, 0x663d, 0x665e, 0x667f - .2byte 0x6e60, 0x6e62, 0x6a64, 0x6667, 0x666b, 0x666d, 0x666f, 0x6671, 0x6673, 0x6675, 0x6677, 0x6679, 0x667b, 0x669d, 0x669e, 0x6adf - .2byte 0x6ec0, 0x6ec2, 0x6aa4, 0x66a7, 0x66ab, 0x66ad, 0x66af, 0x66b1, 0x66b3, 0x66b5, 0x66b7, 0x66b9, 0x66bb, 0x66dd, 0x6afe, 0x6f1f - .2byte 0x6f00, 0x6f02, 0x6b04, 0x66e7, 0x66eb, 0x66ed, 0x66ef, 0x66f1, 0x66f3, 0x66f5, 0x66f7, 0x66f9, 0x66fb, 0x6b3d, 0x6b3e, 0x6f5f - .2byte 0x6f60, 0x6f62, 0x6b44, 0x6727, 0x672b, 0x672d, 0x672f, 0x6731, 0x6733, 0x6735, 0x6737, 0x6739, 0x6b5c, 0x6b5d, 0x6f7f, 0x739f - .2byte 0x6ba0, 0x6ba2, 0x6765, 0x6769, 0x676b, 0x676d, 0x676f, 0x6771, 0x6773, 0x6775, 0x6777, 0x6b9a, 0x6b9c, 0x6b9d, 0x6f9f, 0x73bf - .2byte 0x6be0, 0x67c3, 0x63a7, 0x63a9, 0x67ab, 0x67ad, 0x67af, 0x67b1, 0x67b4, 0x67b6, 0x6bb9, 0x6bba, 0x6bbc, 0x6bbd, 0x6fbf, 0x73df - .2byte 0x67e1, 0x63e5, 0x67e7, 0x67e9, 0x63eb, 0x67ee, 0x67d0, 0x67d2, 0x67d4, 0x6bd7, 0x6bd9, 0x6ffb, 0x6ffc, 0x6ffd, 0x6fff, 0x73ff - .2byte 0x63e4, 0x63e6, 0x63e8, 0x63ea, 0x63ed, 0x63ef, 0x67f1, 0x67f3, 0x6bf6, 0x6bf8, 0x6ffa, 0x73fc, 0x73fd, 0x73fe, 0x73ff, 0x73ff - .2byte 0x7400, 0x7401, 0x7404, 0x7407, 0x7409, 0x740b, 0x740e, 0x7410, 0x7413, 0x7415, 0x7417, 0x741a, 0x741d, 0x741f, 0x6c3f, 0x689f - .2byte 0x7440, 0x7442, 0x7444, 0x7446, 0x7449, 0x744b, 0x744e, 0x7450, 0x7452, 0x7455, 0x7457, 0x745a, 0x745d, 0x6c7e, 0x6cbf, 0x68df - .2byte 0x7480, 0x7482, 0x6ca5, 0x6ca7, 0x6ca9, 0x6cab, 0x6cae, 0x6cb0, 0x6cb2, 0x6cb4, 0x6cb6, 0x6cb9, 0x6cbb, 0x6cfd, 0x6cff, 0x691f - .2byte 0x74e0, 0x74e2, 0x6ce5, 0x6d29, 0x6d2b, 0x6d2d, 0x6d2f, 0x6d31, 0x6d33, 0x6d35, 0x6d37, 0x6d39, 0x6d3b, 0x6d3d, 0x6d3f, 0x695f - .2byte 0x7520, 0x7522, 0x6d45, 0x6d69, 0x6d6b, 0x6d6d, 0x6d6f, 0x6d71, 0x6d73, 0x6d75, 0x6d77, 0x6d79, 0x6d7b, 0x6d7d, 0x6d7f, 0x69bf - .2byte 0x7580, 0x7582, 0x6d85, 0x6da9, 0x6dab, 0x6dad, 0x6daf, 0x6db1, 0x6db3, 0x6db5, 0x6db7, 0x6db9, 0x6dbb, 0x6dbd, 0x6ddf, 0x69ff - .2byte 0x75c0, 0x75c2, 0x6dc5, 0x6de9, 0x6deb, 0x6ded, 0x6def, 0x6df1, 0x6df3, 0x6df5, 0x6df7, 0x6df9, 0x6dfb, 0x6dfd, 0x6e1e, 0x6e3f - .2byte 0x7620, 0x7622, 0x6e05, 0x6e29, 0x6e2b, 0x6e2d, 0x6e2f, 0x6e31, 0x6e33, 0x6e35, 0x6e37, 0x6e39, 0x6e3b, 0x6e3d, 0x6e5e, 0x6e7f - .2byte 0x7660, 0x7662, 0x6e45, 0x6e69, 0x6e6b, 0x6e6d, 0x6e6f, 0x6e71, 0x6e73, 0x6e75, 0x6e77, 0x6e79, 0x6e7b, 0x6e9d, 0x6e9e, 0x72df - .2byte 0x76a0, 0x76c2, 0x6ea5, 0x6ea9, 0x6eab, 0x6ead, 0x6eaf, 0x6eb1, 0x6eb3, 0x6eb5, 0x6eb7, 0x6eb9, 0x6ebb, 0x6edd, 0x72fe, 0x731f - .2byte 0x7700, 0x7702, 0x6ee5, 0x6ee9, 0x6eeb, 0x6eed, 0x6eef, 0x6ef1, 0x6ef3, 0x6ef5, 0x6ef7, 0x6ef9, 0x6efb, 0x733d, 0x733e, 0x735f - .2byte 0x7740, 0x7742, 0x6f25, 0x6f29, 0x6f2b, 0x6f2d, 0x6f2f, 0x6f31, 0x6f33, 0x6f35, 0x6f37, 0x735a, 0x735c, 0x735d, 0x737f, 0x779f - .2byte 0x77a0, 0x77a2, 0x6f65, 0x6f69, 0x6f6b, 0x6f6d, 0x6f6f, 0x6f71, 0x6f73, 0x6f75, 0x6f77, 0x739a, 0x739c, 0x739d, 0x77bf, 0x7bdf - .2byte 0x73e0, 0x6fc3, 0x6fa7, 0x6ba9, 0x6fab, 0x6fad, 0x6faf, 0x6fb1, 0x6fb4, 0x6fb6, 0x6fb9, 0x73ba, 0x73bc, 0x73bd, 0x77df, 0x7bff - .2byte 0x6fe1, 0x6be5, 0x6be7, 0x6be9, 0x6beb, 0x6fee, 0x6fd0, 0x6fd2, 0x6fd4, 0x6fd7, 0x73d9, 0x73fb, 0x77fd, 0x77fe, 0x77ff, 0x7bff - .2byte 0x6be4, 0x6be6, 0x6be8, 0x6bea, 0x6bed, 0x6bef, 0x6bf1, 0x6ff3, 0x6ff6, 0x73f8, 0x73fa, 0x77fc, 0x7bfe, 0x7bff, 0x7bff, 0x7bff - .2byte 0x7c00, 0x7c02, 0x7c04, 0x7c06, 0x7c09, 0x7c0b, 0x7c0e, 0x7c10, 0x7c12, 0x7c15, 0x7c17, 0x7c1a, 0x7c1c, 0x7c1f, 0x743f, 0x709f - .2byte 0x7c40, 0x7863, 0x7865, 0x7867, 0x786a, 0x786b, 0x786e, 0x7870, 0x7872, 0x7874, 0x7877, 0x7879, 0x787b, 0x787e, 0x74bf, 0x70df - .2byte 0x7ca0, 0x78a3, 0x74e7, 0x74e9, 0x74eb, 0x74ed, 0x74ef, 0x74f1, 0x74f3, 0x74f4, 0x74f7, 0x74f8, 0x74fb, 0x74fd, 0x74ff, 0x711f - .2byte 0x7ce0, 0x78e3, 0x7527, 0x7529, 0x752b, 0x752d, 0x752f, 0x7531, 0x7533, 0x7535, 0x7536, 0x7538, 0x753a, 0x753d, 0x753f, 0x715f - .2byte 0x7d20, 0x7943, 0x7567, 0x7569, 0x756b, 0x756d, 0x756f, 0x7571, 0x7573, 0x7575, 0x7577, 0x7579, 0x757b, 0x757d, 0x757f, 0x71bf - .2byte 0x7d80, 0x7983, 0x75a7, 0x75a9, 0x75ab, 0x75ad, 0x75af, 0x75b1, 0x75b3, 0x75b5, 0x75b7, 0x75b9, 0x75bb, 0x75bd, 0x75df, 0x71ff - .2byte 0x7dc0, 0x79c3, 0x75e7, 0x75e9, 0x75eb, 0x75ed, 0x75ef, 0x75f1, 0x75f3, 0x75f5, 0x75f7, 0x75f9, 0x75fb, 0x75fd, 0x761e, 0x723f - .2byte 0x7e20, 0x7a03, 0x7627, 0x7629, 0x762b, 0x762d, 0x762f, 0x7631, 0x7633, 0x7635, 0x7637, 0x7639, 0x763b, 0x763d, 0x765e, 0x727f - .2byte 0x7e60, 0x7a43, 0x7667, 0x7669, 0x766b, 0x766d, 0x766f, 0x7671, 0x7694, 0x7695, 0x7697, 0x7699, 0x769b, 0x769d, 0x769e, 0x76df - .2byte 0x7ea0, 0x7aa3, 0x76a7, 0x76a9, 0x76ab, 0x76ad, 0x76af, 0x76b1, 0x76b4, 0x76d6, 0x76d7, 0x76d9, 0x76db, 0x76dd, 0x76fe, 0x771f - .2byte 0x7f00, 0x7ae3, 0x76e7, 0x76e9, 0x76eb, 0x76ed, 0x76ef, 0x76f1, 0x76f4, 0x76f6, 0x7739, 0x773a, 0x773b, 0x773d, 0x773e, 0x775f - .2byte 0x7f40, 0x7b23, 0x7727, 0x7729, 0x772b, 0x772d, 0x772f, 0x7731, 0x7734, 0x7736, 0x7759, 0x775a, 0x775c, 0x775d, 0x777f, 0x7b9f - .2byte 0x7fa0, 0x7b63, 0x7767, 0x7769, 0x776b, 0x776d, 0x776f, 0x7771, 0x7774, 0x7776, 0x7799, 0x779a, 0x779c, 0x779d, 0x7bbf, 0x7fdf - .2byte 0x7fe0, 0x7bc3, 0x77a7, 0x77a9, 0x77ab, 0x77ad, 0x77af, 0x77b1, 0x77b4, 0x77b6, 0x77b9, 0x77ba, 0x77bc, 0x7bde, 0x7fff, 0x7fff - .2byte 0x77e1, 0x77e5, 0x73e7, 0x73e9, 0x73eb, 0x77ee, 0x73d0, 0x77d2, 0x73d4, 0x77d7, 0x77d9, 0x77fb, 0x7bfd, 0x7fff, 0x7fff, 0x7fff - .2byte 0x6fe4, 0x73e6, 0x73e8, 0x73ea, 0x73ed, 0x73ef, 0x73f1, 0x73f3, 0x77f6, 0x77f8, 0x77fa, 0x7bfc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7c21, 0x7c23, 0x7c25, 0x7c27, 0x7c2a, 0x7c2c, 0x7c2e, 0x7c30, 0x7c32, 0x7c34, 0x7c36, 0x7c39, 0x7c3b, 0x7c3d, 0x7c3f, 0x789f - .2byte 0x7c61, 0x7ca5, 0x7ca7, 0x7ca9, 0x7cab, 0x7cad, 0x7cae, 0x7cb1, 0x7cb3, 0x7cb4, 0x7cb7, 0x7cb8, 0x7cba, 0x7cbd, 0x7cbf, 0x78df - .2byte 0x7cc1, 0x7ce5, 0x7ce7, 0x7ce9, 0x7ceb, 0x7ced, 0x7cef, 0x7cf1, 0x7cf3, 0x7cf4, 0x7cf6, 0x7cf9, 0x7cfa, 0x7cfc, 0x7cff, 0x791f - .2byte 0x7d01, 0x7d25, 0x7d27, 0x7d29, 0x7d2b, 0x7d2d, 0x7d2f, 0x7d31, 0x7d33, 0x7d35, 0x7d36, 0x7d39, 0x7d3a, 0x7d3c, 0x7d3f, 0x795f - .2byte 0x7d41, 0x7d65, 0x7d67, 0x7d69, 0x7d6b, 0x7d6d, 0x7d6f, 0x7d71, 0x7d73, 0x7d75, 0x7d77, 0x7d78, 0x7d7a, 0x7d7c, 0x7d7f, 0x79bf - .2byte 0x7d81, 0x7da5, 0x7da7, 0x7da9, 0x7dab, 0x7dce, 0x7dcf, 0x7dd1, 0x7dd3, 0x7dd5, 0x7dd7, 0x7dd9, 0x7ddb, 0x7ddd, 0x7ddf, 0x79ff - .2byte 0x7dc1, 0x7de5, 0x7de7, 0x7de9, 0x7deb, 0x7dee, 0x7a10, 0x7a11, 0x7a13, 0x7a15, 0x7a17, 0x7a19, 0x7a1b, 0x7a1c, 0x7a1e, 0x7a3f - .2byte 0x7e01, 0x7e25, 0x7e27, 0x7e29, 0x7e2b, 0x7e2e, 0x7a50, 0x7a52, 0x7a53, 0x7a55, 0x7a57, 0x7a59, 0x7a5b, 0x7a5d, 0x7a5e, 0x7a7f - .2byte 0x7e61, 0x7e65, 0x7e67, 0x7e69, 0x7e6b, 0x7e6e, 0x7a70, 0x7a92, 0x7a94, 0x7a95, 0x7a97, 0x7a99, 0x7a9b, 0x7a9c, 0x7a9e, 0x7adf - .2byte 0x7ea1, 0x7ea5, 0x7ea7, 0x7ea9, 0x7eab, 0x7eae, 0x7ab0, 0x7ad2, 0x7ad4, 0x7af7, 0x7af8, 0x7afa, 0x7afb, 0x7afd, 0x7afe, 0x7b1f - .2byte 0x7ee1, 0x7ee5, 0x7ee7, 0x7ee9, 0x7eeb, 0x7eee, 0x7af0, 0x7af2, 0x7af4, 0x7b37, 0x7b39, 0x7b3a, 0x7b3c, 0x7b3d, 0x7b3e, 0x7b5f - .2byte 0x7f21, 0x7f25, 0x7f27, 0x7f29, 0x7f2b, 0x7f2e, 0x7b30, 0x7b32, 0x7b34, 0x7b57, 0x7b59, 0x7f7b, 0x7f7c, 0x7f7d, 0x7f7f, 0x7f9f - .2byte 0x7f61, 0x7f65, 0x7f67, 0x7f69, 0x7f6b, 0x7f6e, 0x7b70, 0x7b72, 0x7b74, 0x7b97, 0x7b99, 0x7f9b, 0x7fbd, 0x7fbe, 0x7fbf, 0x7fdf - .2byte 0x7fa1, 0x7fa5, 0x7fa7, 0x7fa9, 0x7fab, 0x7fae, 0x7bb0, 0x7bb2, 0x7bb4, 0x7bb7, 0x7bb9, 0x7fbb, 0x7fdd, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7fe1, 0x7fe5, 0x7fe7, 0x7fe9, 0x7feb, 0x7fee, 0x7bd0, 0x7bd2, 0x7bd4, 0x7bd7, 0x7bd9, 0x7ffb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff - .2byte 0x77e4, 0x77e6, 0x7be8, 0x77ea, 0x7bed, 0x7bef, 0x7bf1, 0x7bf3, 0x7bf6, 0x7bf8, 0x7bfa, 0x7ffc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7c84, 0x7c86, 0x7c87, 0x7c89, 0x7c8b, 0x7c8d, 0x7c8f, 0x7c91, 0x7c92, 0x7c94, 0x7c96, 0x7c98, 0x7c9a, 0x7c9b, 0x7c9d, 0x7c9f - .2byte 0x7cc4, 0x7cc6, 0x7cc8, 0x7cca, 0x7ccb, 0x7ccd, 0x7ccf, 0x7cd1, 0x7cd3, 0x7cd5, 0x7cd6, 0x7cd8, 0x7cda, 0x7cdc, 0x7cdd, 0x7cdf - .2byte 0x7d04, 0x7d06, 0x7d08, 0x7d0a, 0x7d0c, 0x7d0d, 0x7d0f, 0x7d11, 0x7d13, 0x7d15, 0x7d16, 0x7d18, 0x7d1a, 0x7d1c, 0x7d1e, 0x7d1f - .2byte 0x7d44, 0x7d46, 0x7d48, 0x7d4a, 0x7d4c, 0x7d4e, 0x7d50, 0x7d51, 0x7d53, 0x7d55, 0x7d56, 0x7d58, 0x7d5a, 0x7d5c, 0x7d5d, 0x7d5f - .2byte 0x7d84, 0x7d86, 0x7d88, 0x7d8a, 0x7dad, 0x7dae, 0x7db0, 0x7db2, 0x7db3, 0x7db5, 0x7db7, 0x7db8, 0x7dba, 0x7dbc, 0x7dbe, 0x7dbf - .2byte 0x7da4, 0x7dc6, 0x7dc8, 0x7dca, 0x7dcd, 0x7def, 0x7df0, 0x7df2, 0x7df3, 0x7df5, 0x7df7, 0x7df8, 0x7dfa, 0x7dfc, 0x7dfe, 0x7dff - .2byte 0x7de4, 0x7e06, 0x7e08, 0x7e0a, 0x7e0d, 0x7e0f, 0x7e31, 0x7e32, 0x7e34, 0x7e35, 0x7e37, 0x7e39, 0x7e3a, 0x7e3c, 0x7e3e, 0x7e3f - .2byte 0x7e24, 0x7e26, 0x7e28, 0x7e2a, 0x7e4d, 0x7e4f, 0x7e51, 0x7e73, 0x7e74, 0x7e76, 0x7e77, 0x7e79, 0x7e7b, 0x7e7c, 0x7e7e, 0x7e7f - .2byte 0x7e64, 0x7e66, 0x7e68, 0x7e6a, 0x7e6d, 0x7e8f, 0x7e91, 0x7e93, 0x7ed6, 0x7ed7, 0x7ed9, 0x7eda, 0x7edb, 0x7edd, 0x7ede, 0x7edf - .2byte 0x7ea4, 0x7ea6, 0x7ea8, 0x7eaa, 0x7ead, 0x7eaf, 0x7ed1, 0x7ed3, 0x7ef6, 0x7f18, 0x7f19, 0x7f1a, 0x7f1c, 0x7f1d, 0x7f1e, 0x7f1f - .2byte 0x7ec4, 0x7ee6, 0x7ee8, 0x7eea, 0x7eed, 0x7eef, 0x7ef1, 0x7f13, 0x7f36, 0x7f38, 0x7f5a, 0x7f5b, 0x7f5c, 0x7f5d, 0x7f5e, 0x7f5f - .2byte 0x7f04, 0x7f06, 0x7f28, 0x7f0a, 0x7f2d, 0x7f2f, 0x7f31, 0x7f33, 0x7f56, 0x7f78, 0x7f7a, 0x7f9c, 0x7f9d, 0x7f9e, 0x7f9f, 0x7f9f - .2byte 0x7f44, 0x7f46, 0x7f48, 0x7f4a, 0x7f4d, 0x7f4f, 0x7f71, 0x7f73, 0x7f96, 0x7f98, 0x7f9a, 0x7fbc, 0x7fde, 0x7fdf, 0x7fdf, 0x7fdf - .2byte 0x7f84, 0x7f86, 0x7f88, 0x7f8a, 0x7f8d, 0x7f8f, 0x7f91, 0x7f93, 0x7fb6, 0x7fb8, 0x7fba, 0x7fdc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7fc4, 0x7fc6, 0x7fc8, 0x7fca, 0x7fcd, 0x7fcf, 0x7fd1, 0x7fd3, 0x7fd6, 0x7fd8, 0x7fda, 0x7ffc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7fe4, 0x7fe6, 0x7fe8, 0x7fea, 0x7fed, 0x7fef, 0x7ff1, 0x7ff3, 0x7ff6, 0x7ff8, 0x7ffa, 0x7ffc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff - .2byte 0x0421, 0x0423, 0x0425, 0x0427, 0x0429, 0x042b, 0x042d, 0x0013, 0x0016, 0x0018, 0x001a, 0x001c, 0x001e, 0x001f, 0x085f, 0x18df - .2byte 0x0461, 0x0463, 0x0465, 0x0467, 0x0469, 0x046b, 0x046d, 0x0053, 0x0056, 0x0058, 0x005a, 0x005c, 0x005e, 0x005f, 0x089f, 0x18ff - .2byte 0x04a1, 0x04a3, 0x04a5, 0x04a7, 0x04a9, 0x04ab, 0x04ad, 0x00b3, 0x00b6, 0x00b8, 0x009a, 0x009c, 0x009e, 0x00bf, 0x08df, 0x193f - .2byte 0x04e1, 0x04e3, 0x04e5, 0x04e7, 0x04e9, 0x04eb, 0x04ed, 0x0113, 0x0116, 0x00f8, 0x00fa, 0x00fc, 0x00fe, 0x00ff, 0x091f, 0x195f - .2byte 0x0521, 0x0523, 0x0525, 0x0527, 0x0529, 0x052b, 0x052d, 0x0173, 0x0176, 0x0158, 0x015a, 0x013c, 0x013e, 0x015f, 0x097f, 0x199f - .2byte 0x0561, 0x0563, 0x0565, 0x0567, 0x0569, 0x056b, 0x056d, 0x01d3, 0x01b6, 0x01b8, 0x01ba, 0x019c, 0x019e, 0x019f, 0x099f, 0x19df - .2byte 0x05a1, 0x05a3, 0x05a5, 0x05a7, 0x05a9, 0x05ab, 0x05ad, 0x0233, 0x0216, 0x01f8, 0x01fa, 0x01fc, 0x01fe, 0x01df, 0x09df, 0x19ff - .2byte 0x0260, 0x0263, 0x0266, 0x0268, 0x026b, 0x026e, 0x0271, 0x0273, 0x0276, 0x0258, 0x025a, 0x023c, 0x023e, 0x023f, 0x0a3f, 0x1a3f - .2byte 0x02c0, 0x02c3, 0x02c5, 0x02c8, 0x02cb, 0x02ce, 0x02d0, 0x02d3, 0x02d6, 0x02b8, 0x029a, 0x029c, 0x027e, 0x027f, 0x0a7f, 0x1a7f - .2byte 0x0300, 0x0302, 0x0305, 0x0308, 0x030a, 0x030d, 0x0310, 0x0313, 0x0315, 0x0318, 0x02fa, 0x02dc, 0x02de, 0x02df, 0x0abf, 0x1abf - .2byte 0x0340, 0x0342, 0x0345, 0x0347, 0x034a, 0x034d, 0x034f, 0x0352, 0x0355, 0x0357, 0x035a, 0x033c, 0x031e, 0x031f, 0x0aff, 0x1adf - .2byte 0x0380, 0x0382, 0x0385, 0x0388, 0x038a, 0x038d, 0x038f, 0x0392, 0x0394, 0x0397, 0x039a, 0x039c, 0x037e, 0x035f, 0x0b3f, 0x1b1f - .2byte 0x03c0, 0x03c2, 0x03c5, 0x03c7, 0x03ca, 0x03cc, 0x03cf, 0x03d1, 0x03d4, 0x03d6, 0x03d9, 0x03dc, 0x03de, 0x03bf, 0x0b7f, 0x1b5f - .2byte 0x03e0, 0x03e3, 0x03e5, 0x03e7, 0x03ea, 0x03ec, 0x03ef, 0x03f1, 0x03f3, 0x03f6, 0x03f8, 0x03fb, 0x03fd, 0x03ff, 0x0bbf, 0x1b9f - .2byte 0x0be2, 0x0be5, 0x0be7, 0x0be9, 0x0beb, 0x0bed, 0x0bef, 0x0bf1, 0x0bf3, 0x0bf5, 0x0bf7, 0x0bfa, 0x0bfc, 0x0bfe, 0x0bff, 0x1bbf - .2byte 0x1be6, 0x1be7, 0x1be9, 0x1beb, 0x1bec, 0x1bee, 0x1bf0, 0x1bf2, 0x1bf3, 0x1bf5, 0x1bf7, 0x1bf9, 0x1bfa, 0x1bfc, 0x1bfe, 0x1bff - .2byte 0x0c21, 0x0c23, 0x0c25, 0x0c27, 0x0c29, 0x0c2b, 0x0c2d, 0x0c13, 0x0c16, 0x0818, 0x081a, 0x081c, 0x081e, 0x0c1f, 0x145f, 0x1cdf - .2byte 0x0c61, 0x0c63, 0x0c65, 0x0c67, 0x0c69, 0x0c6b, 0x0c71, 0x0853, 0x0855, 0x0857, 0x085a, 0x085c, 0x085e, 0x109e, 0x18df, 0x211f - .2byte 0x0ca1, 0x0ca3, 0x0ca5, 0x0ca7, 0x0ca9, 0x0cab, 0x0cb1, 0x08b3, 0x08b5, 0x08b7, 0x089a, 0x089c, 0x089e, 0x10be, 0x191f, 0x213f - .2byte 0x0ce1, 0x0ce3, 0x0ce5, 0x0ce7, 0x0ce9, 0x0ceb, 0x0d11, 0x0913, 0x0915, 0x08f7, 0x08fa, 0x08dc, 0x08fe, 0x111e, 0x195f, 0x217f - .2byte 0x0d21, 0x0d23, 0x0d25, 0x0d27, 0x0d29, 0x0d2b, 0x0d71, 0x0973, 0x0955, 0x0957, 0x093a, 0x093c, 0x093e, 0x115e, 0x197f, 0x219f - .2byte 0x0d61, 0x0d63, 0x0d65, 0x0d67, 0x0d69, 0x0d6b, 0x0dd1, 0x09b3, 0x09b5, 0x09b7, 0x099a, 0x099c, 0x099e, 0x119e, 0x19df, 0x21df - .2byte 0x0da1, 0x0e23, 0x0e25, 0x0e28, 0x0e2b, 0x0e2e, 0x0e31, 0x0a13, 0x09f5, 0x09f7, 0x09fa, 0x09fc, 0x09de, 0x11de, 0x19ff, 0x221f - .2byte 0x0a60, 0x0a62, 0x0a65, 0x0a68, 0x0a6b, 0x0a6d, 0x0a70, 0x0a73, 0x0a55, 0x0a57, 0x0a3a, 0x0a3c, 0x0a3e, 0x123e, 0x1a3f, 0x225f - .2byte 0x0ac0, 0x0aa2, 0x0aa5, 0x0aa8, 0x0aaa, 0x0aad, 0x0ab0, 0x0ab3, 0x0ab5, 0x0ab7, 0x0a9a, 0x0a9c, 0x0a7e, 0x127e, 0x1a7f, 0x229f - .2byte 0x0b00, 0x0ae2, 0x0ae5, 0x0ae7, 0x0aea, 0x0aed, 0x0af0, 0x0af2, 0x0af5, 0x0af7, 0x0afa, 0x0adc, 0x0ade, 0x12be, 0x1abf, 0x22bf - .2byte 0x0b40, 0x0b42, 0x0b44, 0x0b47, 0x0b4a, 0x0b4d, 0x0b4f, 0x0b52, 0x0b55, 0x0b57, 0x0b5a, 0x0b3c, 0x0b1e, 0x12fe, 0x1aff, 0x22ff - .2byte 0x0b80, 0x0b82, 0x0b84, 0x0b87, 0x0b89, 0x0b8c, 0x0b8f, 0x0b91, 0x0b94, 0x0b97, 0x0b99, 0x0b9c, 0x0b7e, 0x133e, 0x1b3f, 0x231f - .2byte 0x0bc0, 0x0bc2, 0x0bc5, 0x0bc7, 0x0bca, 0x0bcc, 0x0bcf, 0x0bd1, 0x0bd4, 0x0bd6, 0x0bd9, 0x0bdb, 0x0bde, 0x137e, 0x1b7f, 0x235f - .2byte 0x0be0, 0x13c4, 0x13c6, 0x13c8, 0x13ca, 0x13cc, 0x13cf, 0x13d1, 0x13d3, 0x13d5, 0x13d7, 0x13da, 0x13dc, 0x13de, 0x1bbf, 0x239f - .2byte 0x13e2, 0x1be6, 0x1be8, 0x1bea, 0x1bec, 0x1bee, 0x1bf0, 0x1bf2, 0x1bf4, 0x1bf5, 0x1bf8, 0x1bf9, 0x1bfb, 0x1bfd, 0x1bff, 0x23df - .2byte 0x1fe6, 0x23e8, 0x23ea, 0x23eb, 0x23ed, 0x23ef, 0x23f0, 0x23f2, 0x23f4, 0x23f6, 0x23f7, 0x23f9, 0x23fb, 0x23fc, 0x23fe, 0x23ff - .2byte 0x1421, 0x1423, 0x1425, 0x1427, 0x1429, 0x142b, 0x142d, 0x1813, 0x1416, 0x1418, 0x141a, 0x141c, 0x141e, 0x141f, 0x1c5f, 0x24df - .2byte 0x1461, 0x1463, 0x1465, 0x1467, 0x1469, 0x146b, 0x1471, 0x1453, 0x1455, 0x1457, 0x105a, 0x105c, 0x145e, 0x189e, 0x20df, 0x291f - .2byte 0x14a1, 0x14a3, 0x14a5, 0x14a7, 0x14a9, 0x14ae, 0x14b0, 0x14b3, 0x1095, 0x1097, 0x1099, 0x14bb, 0x18dc, 0x211d, 0x211f, 0x295f - .2byte 0x14e1, 0x14e3, 0x14e5, 0x14e7, 0x14e9, 0x150e, 0x1510, 0x14f3, 0x10f5, 0x10f7, 0x10f9, 0x14fb, 0x191c, 0x215d, 0x215f, 0x297f - .2byte 0x1521, 0x1523, 0x1525, 0x1527, 0x1529, 0x156e, 0x1570, 0x1553, 0x1155, 0x1157, 0x1139, 0x153b, 0x195c, 0x217d, 0x219f, 0x29bf - .2byte 0x1561, 0x1563, 0x15c5, 0x15c8, 0x15cb, 0x15ce, 0x15b0, 0x15b3, 0x11b5, 0x1197, 0x1199, 0x159b, 0x199c, 0x21dd, 0x21df, 0x29df - .2byte 0x15a1, 0x1623, 0x1605, 0x1608, 0x160b, 0x160d, 0x1610, 0x1613, 0x11f5, 0x11f7, 0x11f9, 0x15db, 0x19dc, 0x21fd, 0x21ff, 0x2a1f - .2byte 0x1660, 0x1662, 0x1665, 0x1667, 0x166a, 0x166d, 0x1670, 0x1673, 0x1255, 0x1257, 0x1239, 0x163b, 0x1a3c, 0x223d, 0x223f, 0x2a5f - .2byte 0x16c0, 0x16a2, 0x12a4, 0x12a7, 0x12aa, 0x12ad, 0x12af, 0x12b2, 0x12b5, 0x1297, 0x1299, 0x167b, 0x1a7c, 0x227d, 0x229f, 0x2a7f - .2byte 0x1700, 0x16e2, 0x12e4, 0x12e7, 0x12ea, 0x12ec, 0x12ef, 0x12f2, 0x12f5, 0x12f7, 0x12f9, 0x16db, 0x1abc, 0x22bd, 0x22bf, 0x2abf - .2byte 0x1340, 0x1342, 0x1324, 0x1327, 0x1329, 0x132c, 0x132f, 0x1332, 0x1334, 0x1337, 0x1339, 0x171b, 0x1afc, 0x22fd, 0x22ff, 0x2aff - .2byte 0x1380, 0x1382, 0x1765, 0x1767, 0x176a, 0x176c, 0x176f, 0x1771, 0x1774, 0x1776, 0x1779, 0x177b, 0x1b3c, 0x233d, 0x233f, 0x2b3f - .2byte 0x13c0, 0x13c2, 0x1b86, 0x1b88, 0x1b8a, 0x1b8c, 0x1b8f, 0x1b91, 0x1b93, 0x1b95, 0x1b97, 0x1b9a, 0x1b9c, 0x237d, 0x237f, 0x2b5f - .2byte 0x17e0, 0x17c4, 0x23a8, 0x23aa, 0x23ac, 0x23ae, 0x23b0, 0x23b2, 0x23b4, 0x23b5, 0x23b7, 0x23b9, 0x23bb, 0x23bd, 0x23bf, 0x2b9f - .2byte 0x1be2, 0x23e6, 0x23e8, 0x23ea, 0x23ec, 0x23ee, 0x23f0, 0x23f2, 0x23f4, 0x23f5, 0x23f7, 0x23f9, 0x23fb, 0x23fd, 0x23ff, 0x2bdf - .2byte 0x27e6, 0x27e8, 0x2bea, 0x2beb, 0x2bed, 0x2bef, 0x2bf1, 0x2bf2, 0x2bf4, 0x2bf6, 0x2bf7, 0x2bf9, 0x2bfa, 0x2bfc, 0x2bfe, 0x2bff - .2byte 0x1c21, 0x1c23, 0x1c25, 0x1c27, 0x1c29, 0x1c2b, 0x1c2d, 0x2013, 0x2016, 0x2018, 0x1c1a, 0x201c, 0x1c1e, 0x1c1f, 0x245f, 0x2cdf - .2byte 0x1c61, 0x1c63, 0x1c65, 0x1c67, 0x1c69, 0x1c6b, 0x2071, 0x2053, 0x2055, 0x1c57, 0x1c5a, 0x1c5c, 0x1c5e, 0x209e, 0x28df, 0x2d1f - .2byte 0x1ca1, 0x1ca3, 0x1ca5, 0x1ca7, 0x1ca9, 0x20ae, 0x20b0, 0x1cb3, 0x1c95, 0x1c97, 0x1c99, 0x1cbb, 0x20dc, 0x291d, 0x291f, 0x2d5f - .2byte 0x1ce1, 0x1ce3, 0x1ce5, 0x1ce7, 0x210b, 0x210e, 0x1cf0, 0x1cf2, 0x1cf5, 0x1cf7, 0x1cf9, 0x211a, 0x295b, 0x295d, 0x295f, 0x319f - .2byte 0x1d21, 0x1d23, 0x1d25, 0x2168, 0x216b, 0x216e, 0x1d50, 0x1d52, 0x1d35, 0x1d37, 0x1d39, 0x215a, 0x297b, 0x299d, 0x299f, 0x31bf - .2byte 0x1d61, 0x1d63, 0x21c5, 0x21c8, 0x21cb, 0x21ce, 0x1db0, 0x1db2, 0x1d95, 0x1d97, 0x1d99, 0x219a, 0x29db, 0x29dd, 0x29df, 0x31ff - .2byte 0x1da1, 0x2223, 0x2205, 0x1e07, 0x1e0a, 0x1e0d, 0x1e10, 0x1e12, 0x1df5, 0x1df7, 0x1dd9, 0x21da, 0x29fb, 0x29fd, 0x2a1f, 0x323f - .2byte 0x2260, 0x2262, 0x1e65, 0x1e47, 0x1e4a, 0x1e4d, 0x1e50, 0x1e52, 0x1e55, 0x1e37, 0x1e39, 0x223a, 0x2a3b, 0x2a3d, 0x2a3f, 0x325f - .2byte 0x22c0, 0x22a2, 0x1ea4, 0x1ea7, 0x1eaa, 0x1eac, 0x1eaf, 0x1eb2, 0x1eb5, 0x1e97, 0x1e79, 0x227a, 0x2a7b, 0x2a9d, 0x2a9f, 0x329f - .2byte 0x1f00, 0x1ee2, 0x1ee4, 0x1ee7, 0x1ee9, 0x1eec, 0x1eef, 0x1ef1, 0x1ef4, 0x1ef7, 0x1ed9, 0x22ba, 0x2abb, 0x2abd, 0x2abf, 0x32df - .2byte 0x1f40, 0x1f42, 0x1f24, 0x1f27, 0x1f29, 0x1f2c, 0x1f2f, 0x1f31, 0x1f34, 0x1f36, 0x1f39, 0x22fa, 0x2afb, 0x2afd, 0x2aff, 0x32ff - .2byte 0x1f80, 0x1b82, 0x1f65, 0x2348, 0x234a, 0x234c, 0x234f, 0x2351, 0x2353, 0x2355, 0x2358, 0x235a, 0x2b3b, 0x2b3d, 0x2b3f, 0x333f - .2byte 0x1fc0, 0x1fc2, 0x2386, 0x2b6a, 0x2b6c, 0x2b6e, 0x2b70, 0x2b72, 0x2b74, 0x2b75, 0x2b77, 0x2b7a, 0x2b7b, 0x2b7d, 0x2b7f, 0x337f - .2byte 0x1fe0, 0x23c4, 0x2ba8, 0x2baa, 0x2bac, 0x2bae, 0x2bb0, 0x2bb2, 0x2bb4, 0x2bb5, 0x2bb7, 0x2bb9, 0x2bbb, 0x2bbd, 0x2bbf, 0x339f - .2byte 0x23e2, 0x2be6, 0x2be8, 0x2bea, 0x2bec, 0x2bee, 0x2bf0, 0x2bf2, 0x2bf4, 0x2bf6, 0x2bf7, 0x2bf9, 0x2bfb, 0x2bfd, 0x2bff, 0x33df - .2byte 0x2be6, 0x2fe8, 0x2fea, 0x33ec, 0x33ed, 0x33ef, 0x33f1, 0x33f2, 0x33f4, 0x33f6, 0x33f7, 0x33f9, 0x33fb, 0x33fc, 0x33fe, 0x33ff - .2byte 0x2421, 0x2423, 0x2425, 0x2427, 0x2429, 0x242b, 0x242d, 0x2c13, 0x2c16, 0x2818, 0x281a, 0x281c, 0x281e, 0x281f, 0x2c5f, 0x30df - .2byte 0x2461, 0x2463, 0x2465, 0x2467, 0x2469, 0x246b, 0x2c71, 0x2c53, 0x2855, 0x2857, 0x285a, 0x245c, 0x285e, 0x289e, 0x30df, 0x351f - .2byte 0x24a1, 0x24a3, 0x24a5, 0x24a7, 0x24a9, 0x2cae, 0x2cb0, 0x28b3, 0x2895, 0x2897, 0x2499, 0x28bb, 0x28dc, 0x311d, 0x311f, 0x355f - .2byte 0x24e1, 0x24e3, 0x24e5, 0x2d08, 0x2d0b, 0x2d0e, 0x28f0, 0x28f2, 0x28f5, 0x24f7, 0x24f9, 0x291a, 0x315b, 0x315d, 0x315f, 0x359f - .2byte 0x2521, 0x2523, 0x2525, 0x2d68, 0x294b, 0x294d, 0x2950, 0x2532, 0x2534, 0x2536, 0x2958, 0x3199, 0x319b, 0x319d, 0x319f, 0x39df - .2byte 0x2561, 0x2563, 0x2dc5, 0x2dc8, 0x29aa, 0x29ad, 0x29b0, 0x2592, 0x2594, 0x2596, 0x2998, 0x31d9, 0x31db, 0x31dd, 0x31df, 0x39ff - .2byte 0x25a1, 0x2e23, 0x2e05, 0x2a07, 0x2a0a, 0x2a0d, 0x2a10, 0x25f2, 0x25f4, 0x25d6, 0x29d8, 0x3219, 0x321b, 0x321d, 0x321f, 0x3a3f - .2byte 0x2e60, 0x2e62, 0x2a65, 0x2a47, 0x2649, 0x264c, 0x264f, 0x2652, 0x2654, 0x2636, 0x2a38, 0x3239, 0x323b, 0x323d, 0x325f, 0x3a7f - .2byte 0x2ec0, 0x2aa2, 0x2aa4, 0x26a7, 0x2689, 0x268c, 0x268f, 0x2692, 0x2694, 0x2696, 0x2a78, 0x3279, 0x329b, 0x327d, 0x327f, 0x3a9f - .2byte 0x2b00, 0x2ae2, 0x2ae4, 0x26e7, 0x26c9, 0x26cc, 0x26cf, 0x26d1, 0x26d4, 0x26d6, 0x2ab8, 0x32b9, 0x32bb, 0x32bd, 0x32df, 0x3adf - .2byte 0x2b40, 0x2742, 0x2724, 0x2727, 0x2b0a, 0x2b0c, 0x2b0f, 0x2b11, 0x2b13, 0x2b15, 0x2b18, 0x32f9, 0x32fb, 0x32fd, 0x32ff, 0x3aff - .2byte 0x2780, 0x2782, 0x2765, 0x2b48, 0x332c, 0x332e, 0x3330, 0x3332, 0x3334, 0x3335, 0x3338, 0x3339, 0x333b, 0x333d, 0x333f, 0x3b3f - .2byte 0x27c0, 0x27c2, 0x2b86, 0x2f6a, 0x336c, 0x336e, 0x3370, 0x3372, 0x3374, 0x3376, 0x3377, 0x3379, 0x337b, 0x337d, 0x337f, 0x3b5f - .2byte 0x2be0, 0x2bc4, 0x2fa8, 0x33aa, 0x33ac, 0x33ae, 0x33b0, 0x33b2, 0x33b4, 0x33b6, 0x33b7, 0x33b9, 0x33bb, 0x33bd, 0x33bf, 0x3b9f - .2byte 0x2fe2, 0x2fe6, 0x33e8, 0x33ea, 0x33ec, 0x33ee, 0x33f0, 0x33f2, 0x33f4, 0x33f6, 0x33f7, 0x33f9, 0x33fb, 0x33fd, 0x33ff, 0x3bdf - .2byte 0x33e6, 0x33e8, 0x37ea, 0x37ec, 0x3bee, 0x3bf0, 0x3bf1, 0x3bf3, 0x3bf4, 0x3bf6, 0x3bf8, 0x3bf9, 0x3bfb, 0x3bfc, 0x3bfe, 0x3bff - .2byte 0x2c21, 0x2c23, 0x2c25, 0x2c27, 0x2c29, 0x2c2b, 0x2c2d, 0x3813, 0x3816, 0x3418, 0x341a, 0x341c, 0x301e, 0x301f, 0x345f, 0x38df - .2byte 0x2c61, 0x2c63, 0x2c65, 0x2c67, 0x2c69, 0x2c6b, 0x3871, 0x3453, 0x3455, 0x3457, 0x345a, 0x305c, 0x305e, 0x309e, 0x38df, 0x3d1f - .2byte 0x2ca1, 0x2ca3, 0x38a5, 0x38a8, 0x38ab, 0x38ae, 0x34b0, 0x34b3, 0x3495, 0x3097, 0x3099, 0x30bb, 0x30dc, 0x391d, 0x391f, 0x3d5f - .2byte 0x2ce1, 0x2ce3, 0x3905, 0x3908, 0x390b, 0x390e, 0x34f0, 0x34f2, 0x30f5, 0x30f7, 0x30f9, 0x311a, 0x395b, 0x395d, 0x395f, 0x3d9f - .2byte 0x2d21, 0x2d23, 0x3965, 0x3968, 0x354a, 0x354d, 0x3550, 0x3132, 0x3134, 0x3136, 0x3158, 0x3999, 0x399b, 0x399d, 0x399f, 0x41df - .2byte 0x2d61, 0x2d63, 0x39c5, 0x39c8, 0x35aa, 0x318d, 0x3190, 0x3192, 0x3194, 0x3196, 0x35b8, 0x39d9, 0x39db, 0x39dd, 0x3dff, 0x421f - .2byte 0x2da1, 0x3a23, 0x3605, 0x3607, 0x360a, 0x320c, 0x3210, 0x31f2, 0x31d4, 0x31d6, 0x35f8, 0x39f9, 0x3a1b, 0x3a1d, 0x3e1f, 0x423f - .2byte 0x3a60, 0x3662, 0x3665, 0x3647, 0x3249, 0x324c, 0x324f, 0x3252, 0x3234, 0x3236, 0x3638, 0x3a39, 0x3a5b, 0x3a5d, 0x3e5f, 0x427f - .2byte 0x36c0, 0x36a2, 0x36a4, 0x32a7, 0x3289, 0x328c, 0x328e, 0x3291, 0x3294, 0x3276, 0x3678, 0x3a99, 0x3a7b, 0x3a9d, 0x3e9f, 0x429f - .2byte 0x3700, 0x36e2, 0x32e4, 0x32e7, 0x32c9, 0x32cc, 0x32ce, 0x32d1, 0x32d3, 0x32d6, 0x36b8, 0x3ab9, 0x3abb, 0x3add, 0x3edf, 0x42df - .2byte 0x3740, 0x3342, 0x3324, 0x3327, 0x330a, 0x370d, 0x370f, 0x3711, 0x3714, 0x3716, 0x3718, 0x3af9, 0x3afb, 0x3afd, 0x3eff, 0x431f - .2byte 0x3380, 0x3382, 0x3365, 0x3348, 0x3b2c, 0x3b2e, 0x3b30, 0x3b32, 0x3b34, 0x3b35, 0x3b37, 0x3b39, 0x3b3b, 0x3b3d, 0x3f3f, 0x433f - .2byte 0x33c0, 0x33c2, 0x3386, 0x3b6a, 0x3b6c, 0x3b6e, 0x3b70, 0x3b72, 0x3b74, 0x3b76, 0x3b77, 0x3b7a, 0x3b7b, 0x3b7d, 0x3f7f, 0x437f - .2byte 0x33e0, 0x33c4, 0x3ba8, 0x3baa, 0x3bac, 0x3bae, 0x3bb0, 0x3bb2, 0x3bb4, 0x3bb6, 0x3bb8, 0x3bb9, 0x3bbb, 0x3bbd, 0x3fbf, 0x439f - .2byte 0x33e2, 0x3be6, 0x3be8, 0x3bea, 0x3bec, 0x3fef, 0x3ff0, 0x3ff2, 0x3ff4, 0x3ff6, 0x3ff8, 0x3ff9, 0x3ffb, 0x3ffd, 0x3fff, 0x43df - .2byte 0x3be6, 0x3be8, 0x3bea, 0x3fec, 0x3fee, 0x43f0, 0x43f1, 0x43f3, 0x43f5, 0x43f6, 0x43f8, 0x43f9, 0x43fb, 0x43fc, 0x43fe, 0x43ff - .2byte 0x3421, 0x3423, 0x3425, 0x3427, 0x3429, 0x342b, 0x342d, 0x4413, 0x4016, 0x4018, 0x3c1a, 0x3c1c, 0x3c1e, 0x3c1f, 0x3c5f, 0x40df - .2byte 0x3461, 0x4463, 0x4465, 0x4468, 0x446b, 0x446e, 0x4471, 0x4053, 0x4055, 0x4057, 0x3c5a, 0x3c5c, 0x3c5e, 0x3c9e, 0x40df, 0x411f - .2byte 0x34a1, 0x44a3, 0x40a5, 0x40a8, 0x40ab, 0x40ad, 0x40b0, 0x40b3, 0x3c95, 0x3c97, 0x3c99, 0x3cbb, 0x3cdc, 0x411d, 0x411f, 0x455f - .2byte 0x34e1, 0x4503, 0x4105, 0x40e7, 0x40ea, 0x40ed, 0x40f0, 0x40f2, 0x3cf5, 0x3cf7, 0x3cf9, 0x3d1a, 0x415b, 0x415d, 0x415f, 0x459f - .2byte 0x3521, 0x4563, 0x4165, 0x4147, 0x414a, 0x414d, 0x4150, 0x3d32, 0x3d34, 0x3d36, 0x3d58, 0x4199, 0x419b, 0x419d, 0x419f, 0x45df - .2byte 0x3561, 0x45c3, 0x41a5, 0x41a7, 0x41aa, 0x418c, 0x4190, 0x3d92, 0x3994, 0x3996, 0x3db8, 0x41d9, 0x41db, 0x41dd, 0x41ff, 0x461f - .2byte 0x35a1, 0x4623, 0x4205, 0x4207, 0x420a, 0x420c, 0x39cf, 0x39d2, 0x39d3, 0x3df6, 0x3df8, 0x4219, 0x421b, 0x421d, 0x463f, 0x4a5f - .2byte 0x4660, 0x4262, 0x4265, 0x4247, 0x3e49, 0x3e4c, 0x3a4e, 0x3a52, 0x3a33, 0x3e36, 0x3e38, 0x4259, 0x425b, 0x425d, 0x465f, 0x4a7f - .2byte 0x42c0, 0x3ea2, 0x3ea4, 0x3ea7, 0x3e89, 0x3a8c, 0x3a6e, 0x3a71, 0x3a73, 0x3e76, 0x3e98, 0x4279, 0x429b, 0x429d, 0x469f, 0x4abf - .2byte 0x3f00, 0x3ee2, 0x3ee4, 0x3ee7, 0x3ac9, 0x3acc, 0x3ecf, 0x3ed1, 0x3ed4, 0x3ed6, 0x3ed8, 0x42b9, 0x42db, 0x42dd, 0x46df, 0x4adf - .2byte 0x3f40, 0x3f42, 0x3f24, 0x3b27, 0x3b0a, 0x3f0d, 0x3f0f, 0x3f11, 0x3f14, 0x3f16, 0x3f18, 0x42f9, 0x42fb, 0x42fd, 0x471f, 0x4b1f - .2byte 0x3f80, 0x3f82, 0x3b65, 0x3b48, 0x432c, 0x3f2e, 0x4330, 0x4332, 0x4334, 0x4336, 0x4337, 0x4339, 0x433b, 0x433d, 0x473f, 0x4b3f - .2byte 0x3fc0, 0x3bc2, 0x3b86, 0x3f6a, 0x436c, 0x436e, 0x4370, 0x4372, 0x4374, 0x4376, 0x4378, 0x4379, 0x437b, 0x437d, 0x477f, 0x4b7f - .2byte 0x3be0, 0x3bc4, 0x3fa8, 0x3faa, 0x43ac, 0x43ae, 0x43b0, 0x43b2, 0x43b4, 0x43b6, 0x43b8, 0x43b9, 0x43bb, 0x43bd, 0x47bf, 0x4b9f - .2byte 0x3be2, 0x3fe6, 0x3fe8, 0x43ea, 0x43ec, 0x43ef, 0x47f1, 0x47f3, 0x47f4, 0x47f6, 0x47f8, 0x47fa, 0x47fb, 0x47fd, 0x47ff, 0x4bdf - .2byte 0x3fe6, 0x43e8, 0x43ea, 0x47ec, 0x47ee, 0x47f0, 0x4bf2, 0x4bf3, 0x4bf5, 0x4bf6, 0x4bf8, 0x4bfa, 0x4bfb, 0x4bfd, 0x4bfe, 0x4bff - .2byte 0x4c00, 0x4c02, 0x4c05, 0x4c08, 0x4c0b, 0x4c0e, 0x4c11, 0x4c13, 0x4c16, 0x4c18, 0x481a, 0x481c, 0x441e, 0x441f, 0x445f, 0x48df - .2byte 0x4c60, 0x4c42, 0x4c45, 0x4c48, 0x4c4b, 0x4c4d, 0x4c50, 0x4c53, 0x4c55, 0x4857, 0x485a, 0x445c, 0x445e, 0x449e, 0x48df, 0x491f - .2byte 0x4cc0, 0x4ca2, 0x4ca5, 0x4ca7, 0x4caa, 0x4cad, 0x4cb0, 0x4cb3, 0x4895, 0x4897, 0x4899, 0x44bb, 0x44dc, 0x491d, 0x491f, 0x495f - .2byte 0x4d00, 0x4d02, 0x4ce5, 0x48e7, 0x48ea, 0x48ed, 0x48f0, 0x48f2, 0x48f5, 0x44f7, 0x44f9, 0x451a, 0x495b, 0x495d, 0x495f, 0x499f - .2byte 0x4d60, 0x4d62, 0x4d45, 0x4947, 0x4929, 0x492c, 0x492f, 0x4932, 0x4934, 0x4536, 0x4558, 0x4999, 0x499b, 0x499d, 0x499f, 0x4ddf - .2byte 0x4dc0, 0x4da2, 0x4da5, 0x49a7, 0x4989, 0x498c, 0x498f, 0x4992, 0x4594, 0x4596, 0x45b8, 0x49d9, 0x49db, 0x49dd, 0x49ff, 0x4e1f - .2byte 0x4e20, 0x4e02, 0x4e05, 0x4a07, 0x49e9, 0x49ec, 0x49ce, 0x49d2, 0x45d3, 0x45f6, 0x45f8, 0x4a19, 0x4a1b, 0x4a1d, 0x4e3f, 0x4e5f - .2byte 0x4e60, 0x4e62, 0x4e65, 0x4a47, 0x4a49, 0x4a4c, 0x4a4e, 0x4211, 0x4634, 0x4636, 0x4a58, 0x4a59, 0x4a5b, 0x4a5d, 0x4e7f, 0x529f - .2byte 0x4ec0, 0x4aa2, 0x4aa4, 0x4aa7, 0x4a89, 0x468c, 0x466e, 0x4691, 0x4694, 0x4696, 0x4a78, 0x4a99, 0x4a9b, 0x4a9d, 0x4e9f, 0x52bf - .2byte 0x4b00, 0x4ae2, 0x4ae4, 0x46e7, 0x46c9, 0x46cc, 0x46cf, 0x46d1, 0x46d4, 0x46d6, 0x4ab8, 0x4ad9, 0x4adb, 0x4add, 0x4edf, 0x52ff - .2byte 0x4b40, 0x4742, 0x4724, 0x4727, 0x470a, 0x470d, 0x470f, 0x4b12, 0x4b14, 0x4b16, 0x4b18, 0x4b19, 0x4afb, 0x4b1d, 0x4f1f, 0x531f - .2byte 0x4780, 0x4782, 0x4765, 0x4748, 0x472c, 0x472e, 0x4b30, 0x4b32, 0x4b34, 0x4b36, 0x4b38, 0x4b39, 0x4b3b, 0x4b3d, 0x4f3f, 0x535f - .2byte 0x47c0, 0x47c2, 0x4786, 0x476a, 0x476c, 0x4b6e, 0x4b70, 0x4b72, 0x4b74, 0x4b76, 0x4b78, 0x4b79, 0x4b7b, 0x4b7d, 0x4f7f, 0x537f - .2byte 0x47e0, 0x47c4, 0x47a8, 0x47aa, 0x47ac, 0x4bae, 0x4bb0, 0x4bb2, 0x4bb4, 0x4bb6, 0x4bb8, 0x4bb9, 0x4bbb, 0x4bbd, 0x4fbf, 0x53bf - .2byte 0x47e2, 0x47e6, 0x47e8, 0x47ea, 0x4bec, 0x4bef, 0x4bf1, 0x4ff3, 0x4ff5, 0x4ff6, 0x4ff8, 0x4ffa, 0x4ffb, 0x4ffd, 0x4fff, 0x53df - .2byte 0x47e6, 0x4be8, 0x4bea, 0x4bec, 0x4fee, 0x4ff0, 0x4ff2, 0x53f4, 0x53f6, 0x53f7, 0x53f8, 0x53fa, 0x53fb, 0x53fd, 0x53fe, 0x53ff - .2byte 0x5800, 0x5802, 0x5805, 0x5808, 0x580b, 0x580d, 0x5810, 0x5813, 0x5816, 0x5418, 0x541a, 0x501c, 0x501e, 0x4c1f, 0x4c5f, 0x4cdf - .2byte 0x5860, 0x5442, 0x5445, 0x5448, 0x544a, 0x544d, 0x544f, 0x5452, 0x5455, 0x5457, 0x545a, 0x505c, 0x505e, 0x4c9e, 0x50df, 0x511f - .2byte 0x58a0, 0x54a2, 0x5484, 0x5487, 0x548a, 0x548d, 0x548f, 0x5492, 0x5495, 0x5497, 0x5099, 0x50bb, 0x4cdc, 0x511d, 0x511f, 0x515f - .2byte 0x5900, 0x5502, 0x54e4, 0x54e7, 0x54e9, 0x54ec, 0x54ef, 0x54f2, 0x54f5, 0x50f7, 0x50f9, 0x4d1a, 0x515b, 0x515d, 0x515f, 0x519f - .2byte 0x5960, 0x5542, 0x5544, 0x5547, 0x5129, 0x512c, 0x512f, 0x5132, 0x5134, 0x5136, 0x4d58, 0x5199, 0x519b, 0x519d, 0x519f, 0x51df - .2byte 0x59c0, 0x55a2, 0x55a4, 0x5587, 0x5189, 0x518c, 0x518e, 0x5191, 0x5194, 0x4d96, 0x51b8, 0x51d9, 0x51db, 0x51dd, 0x51ff, 0x561f - .2byte 0x5a00, 0x5602, 0x55e4, 0x55e7, 0x51e9, 0x51cc, 0x4dce, 0x4dd1, 0x4dd3, 0x51f6, 0x51f8, 0x5219, 0x521b, 0x521d, 0x523f, 0x565f - .2byte 0x5a60, 0x5662, 0x5644, 0x5647, 0x5249, 0x522c, 0x4e2e, 0x5231, 0x5234, 0x5236, 0x5258, 0x5259, 0x525b, 0x525d, 0x567f, 0x5a9f - .2byte 0x5ac0, 0x56a2, 0x56a4, 0x56a7, 0x5289, 0x528c, 0x4e6e, 0x5291, 0x4e74, 0x4e76, 0x5298, 0x529a, 0x529b, 0x529d, 0x56bf, 0x5eff - .2byte 0x5700, 0x56e2, 0x52e4, 0x52e7, 0x52c9, 0x4ecc, 0x4ecf, 0x52d1, 0x4ed3, 0x4ed6, 0x52d8, 0x52da, 0x52db, 0x52dd, 0x56df, 0x5f1f - .2byte 0x5340, 0x5342, 0x5324, 0x4f27, 0x4f0a, 0x4f0d, 0x530f, 0x4f12, 0x5314, 0x5316, 0x5318, 0x531a, 0x531b, 0x531d, 0x571f, 0x5f5f - .2byte 0x5380, 0x5382, 0x4f65, 0x4f48, 0x4f2c, 0x532e, 0x4f30, 0x5332, 0x5354, 0x5356, 0x5358, 0x535a, 0x533b, 0x533d, 0x575f, 0x5f7f - .2byte 0x4fc0, 0x4fc2, 0x4f86, 0x4f6a, 0x536c, 0x4f6e, 0x5370, 0x5372, 0x5374, 0x5376, 0x5378, 0x5379, 0x537b, 0x537d, 0x577f, 0x5f9f - .2byte 0x4fe0, 0x4fc4, 0x4fa8, 0x53aa, 0x4fac, 0x53ae, 0x53b0, 0x53b2, 0x53b4, 0x53b6, 0x53b8, 0x53ba, 0x53bb, 0x53bd, 0x57bf, 0x5fbf - .2byte 0x4fe2, 0x4fe6, 0x53e8, 0x53ea, 0x4fec, 0x53ef, 0x53f1, 0x53f3, 0x57f5, 0x57f6, 0x57f8, 0x57fa, 0x57fb, 0x57fd, 0x57ff, 0x5fdf - .2byte 0x4fe6, 0x53e8, 0x4fea, 0x53ec, 0x53ee, 0x53f0, 0x57f2, 0x57f4, 0x5ff7, 0x5ff9, 0x5ffa, 0x5ffb, 0x5ffc, 0x5ffd, 0x5ffe, 0x5fff - .2byte 0x6000, 0x6002, 0x6005, 0x6007, 0x600a, 0x600d, 0x600f, 0x6012, 0x6015, 0x6018, 0x5c1a, 0x5c1c, 0x581e, 0x581f, 0x545f, 0x54df - .2byte 0x6040, 0x5c42, 0x5c45, 0x5c47, 0x5c4a, 0x5c4d, 0x5c4f, 0x5c52, 0x5c55, 0x5c57, 0x5c5a, 0x5c5c, 0x585e, 0x549e, 0x54df, 0x591f - .2byte 0x60a0, 0x5ca2, 0x5c84, 0x5c87, 0x5c8a, 0x5c8c, 0x5c8f, 0x5c92, 0x5c94, 0x5c97, 0x5c99, 0x58bb, 0x54dc, 0x551d, 0x551f, 0x595f - .2byte 0x6100, 0x5ce2, 0x5ce4, 0x5ce7, 0x5ce9, 0x5cec, 0x5cef, 0x5cf1, 0x5cf4, 0x5cf7, 0x58f9, 0x551a, 0x555b, 0x555d, 0x595f, 0x599f - .2byte 0x6140, 0x5d42, 0x5d44, 0x5d27, 0x5929, 0x592c, 0x592e, 0x5931, 0x5934, 0x5936, 0x5558, 0x5599, 0x599b, 0x599d, 0x599f, 0x59df - .2byte 0x61a0, 0x5da2, 0x5d84, 0x5d87, 0x5989, 0x598c, 0x598e, 0x5991, 0x5993, 0x5996, 0x59b8, 0x55d9, 0x59db, 0x59dd, 0x59ff, 0x5a1f - .2byte 0x6200, 0x5e02, 0x5de4, 0x5de7, 0x59e9, 0x59cc, 0x59ef, 0x59f1, 0x59f3, 0x59f6, 0x59f8, 0x5a19, 0x5a1b, 0x5a1d, 0x5a3f, 0x5a5f - .2byte 0x6260, 0x5e42, 0x5e44, 0x5e27, 0x5a29, 0x5a2c, 0x5a2f, 0x5a31, 0x5a34, 0x5a36, 0x5a58, 0x5a59, 0x5a5b, 0x5a5d, 0x5a7f, 0x5e9f - .2byte 0x62a0, 0x5ea2, 0x5ea4, 0x5e87, 0x5a89, 0x5a6c, 0x5a8f, 0x5a91, 0x5a73, 0x5a76, 0x5a98, 0x5a9a, 0x5a9b, 0x5a9d, 0x5abf, 0x66ff - .2byte 0x6300, 0x5ee2, 0x5ee4, 0x5ee7, 0x5ac9, 0x5acc, 0x5acf, 0x5ad1, 0x5ad3, 0x56b6, 0x56b8, 0x5ada, 0x5adb, 0x5add, 0x631f, 0x673f - .2byte 0x5f40, 0x5f42, 0x5f24, 0x5b27, 0x570a, 0x570d, 0x5b0f, 0x5712, 0x5b14, 0x5715, 0x5718, 0x5b1a, 0x5b1b, 0x5b1d, 0x633f, 0x675f - .2byte 0x5b80, 0x5b82, 0x5b65, 0x5748, 0x572c, 0x572e, 0x5730, 0x5b32, 0x5b54, 0x5b56, 0x5b58, 0x5b5a, 0x5b3b, 0x5b5d, 0x637f, 0x677f - .2byte 0x5bc0, 0x5bc2, 0x5786, 0x576a, 0x576c, 0x576e, 0x5b70, 0x5b72, 0x5b74, 0x5b76, 0x5b78, 0x5b7a, 0x5b7b, 0x5b7d, 0x639f, 0x679f - .2byte 0x5be0, 0x57c4, 0x57a8, 0x57aa, 0x57ac, 0x5bae, 0x5bb0, 0x5bb2, 0x5bb4, 0x5bb6, 0x5bb8, 0x5bba, 0x5bbb, 0x5bbd, 0x63bf, 0x67bf - .2byte 0x57e2, 0x57e6, 0x57e8, 0x57ea, 0x5bec, 0x5bef, 0x5bf1, 0x5bf3, 0x5bf5, 0x63f8, 0x63f9, 0x63fb, 0x63fc, 0x63fd, 0x63ff, 0x67df - .2byte 0x57e6, 0x57e8, 0x57ea, 0x5bec, 0x5bee, 0x5bf0, 0x5bf2, 0x5ff4, 0x63f7, 0x67f9, 0x67fa, 0x67fb, 0x67fc, 0x67fd, 0x67fe, 0x67ff - .2byte 0x6800, 0x6802, 0x6804, 0x6807, 0x680a, 0x680d, 0x680f, 0x6812, 0x6814, 0x6817, 0x681a, 0x681c, 0x641e, 0x601f, 0x5c5f, 0x5cdf - .2byte 0x6840, 0x6842, 0x6844, 0x6847, 0x6849, 0x684c, 0x684f, 0x6851, 0x6854, 0x6857, 0x685a, 0x645c, 0x645e, 0x5c9e, 0x60df, 0x5d1f - .2byte 0x68a0, 0x6882, 0x6484, 0x6487, 0x6489, 0x648c, 0x648f, 0x6491, 0x6494, 0x6497, 0x6499, 0x64bb, 0x5cdc, 0x5d1d, 0x5d1f, 0x5d5f - .2byte 0x68e0, 0x68e2, 0x64e4, 0x64e7, 0x64e9, 0x64ec, 0x64ee, 0x64f1, 0x64f3, 0x64f6, 0x64f9, 0x611a, 0x5d5b, 0x5d5d, 0x5d5f, 0x5d9f - .2byte 0x6940, 0x6942, 0x6524, 0x6527, 0x614a, 0x614c, 0x614e, 0x6151, 0x6153, 0x6155, 0x6158, 0x6199, 0x5d9b, 0x5d9d, 0x5d9f, 0x61df - .2byte 0x69a0, 0x69a2, 0x6584, 0x6587, 0x618a, 0x61ad, 0x61af, 0x61b1, 0x61b3, 0x61b5, 0x61b8, 0x5dd9, 0x5ddb, 0x61dd, 0x61ff, 0x621f - .2byte 0x69e0, 0x69e2, 0x65e4, 0x65e7, 0x61ea, 0x61ed, 0x61ef, 0x61f1, 0x61f4, 0x61f6, 0x61f8, 0x5e19, 0x621b, 0x621d, 0x623f, 0x625f - .2byte 0x6a40, 0x6a42, 0x6644, 0x6627, 0x622a, 0x622d, 0x622f, 0x6252, 0x6253, 0x6255, 0x6258, 0x6259, 0x625b, 0x625d, 0x627f, 0x629f - .2byte 0x6aa0, 0x6aa2, 0x6684, 0x6687, 0x626a, 0x628d, 0x628f, 0x6292, 0x6294, 0x6296, 0x6298, 0x629a, 0x629b, 0x629d, 0x62bf, 0x6aff - .2byte 0x6ae0, 0x6ae2, 0x66e4, 0x66c7, 0x62aa, 0x62cd, 0x62cf, 0x62d2, 0x62d4, 0x62b5, 0x62b8, 0x62da, 0x62db, 0x62dd, 0x671f, 0x6b3f - .2byte 0x6b40, 0x6b42, 0x6724, 0x6727, 0x630a, 0x630d, 0x630f, 0x6312, 0x6314, 0x6315, 0x5ef8, 0x631a, 0x631c, 0x673d, 0x6b5f, 0x6f7f - .2byte 0x6780, 0x6782, 0x6365, 0x5f48, 0x5f2c, 0x5f2e, 0x5f30, 0x6332, 0x6354, 0x6356, 0x6358, 0x635a, 0x635c, 0x677d, 0x6b7f, 0x6f9f - .2byte 0x63c0, 0x63c2, 0x5f86, 0x5f6a, 0x5f6c, 0x5f6e, 0x5f70, 0x5f72, 0x6374, 0x6376, 0x6398, 0x639a, 0x639c, 0x679d, 0x6b9f, 0x6fbf - .2byte 0x63e0, 0x5fc4, 0x5fa8, 0x5faa, 0x5fac, 0x5fae, 0x5fb0, 0x63b2, 0x63b4, 0x63b6, 0x67b9, 0x67bb, 0x67bc, 0x67bd, 0x6bdf, 0x6fdf - .2byte 0x5fe2, 0x5fe6, 0x5fe8, 0x5fea, 0x5fec, 0x5fef, 0x63f1, 0x63f3, 0x63f5, 0x67f8, 0x6bfa, 0x6bfb, 0x6bfc, 0x6bfe, 0x6bff, 0x6fff - .2byte 0x5be6, 0x5fe8, 0x5fea, 0x5fec, 0x5fee, 0x63f0, 0x63f2, 0x63f4, 0x6bf7, 0x6bf9, 0x6ffb, 0x6ffc, 0x6ffd, 0x6ffe, 0x6fff, 0x6fff - .2byte 0x7000, 0x7002, 0x7004, 0x7007, 0x7009, 0x700c, 0x700f, 0x7011, 0x7014, 0x7016, 0x7019, 0x701c, 0x701e, 0x6c1f, 0x685f, 0x64df - .2byte 0x7040, 0x7042, 0x7044, 0x7046, 0x7049, 0x704c, 0x704f, 0x7051, 0x7054, 0x7056, 0x7059, 0x705c, 0x6c5e, 0x689e, 0x64df, 0x651f - .2byte 0x70a0, 0x7082, 0x6ca5, 0x6ca7, 0x6ca9, 0x6cac, 0x6cae, 0x6cb1, 0x6cb3, 0x6cb6, 0x6cb8, 0x6cbb, 0x68dc, 0x651d, 0x651f, 0x655f - .2byte 0x7100, 0x70e2, 0x6ce5, 0x6908, 0x690a, 0x690c, 0x690e, 0x6911, 0x6913, 0x6915, 0x6917, 0x691a, 0x695b, 0x655d, 0x655f, 0x659f - .2byte 0x7140, 0x7122, 0x6d45, 0x6948, 0x658c, 0x658e, 0x6590, 0x6591, 0x6593, 0x6595, 0x6597, 0x6599, 0x659b, 0x659d, 0x659f, 0x65df - .2byte 0x71a0, 0x7182, 0x6d85, 0x6988, 0x65cc, 0x65ce, 0x65cf, 0x65d1, 0x65d4, 0x65d5, 0x65d7, 0x65d9, 0x69db, 0x65dd, 0x65ff, 0x661f - .2byte 0x71e0, 0x71e2, 0x6de5, 0x69e8, 0x660c, 0x660e, 0x6610, 0x6612, 0x6613, 0x6615, 0x6617, 0x6619, 0x661b, 0x661d, 0x6a3f, 0x6a5f - .2byte 0x7240, 0x7222, 0x6e25, 0x6a28, 0x664c, 0x664e, 0x6650, 0x6652, 0x6654, 0x6656, 0x6658, 0x6659, 0x665b, 0x665d, 0x6a7f, 0x6a9f - .2byte 0x7280, 0x7282, 0x6e85, 0x6a68, 0x668c, 0x668e, 0x6690, 0x6692, 0x6a94, 0x6a96, 0x6a98, 0x6a9a, 0x669b, 0x6a9d, 0x6abf, 0x6eff - .2byte 0x72e0, 0x72e2, 0x6ec5, 0x6aa8, 0x66ac, 0x66ae, 0x66d0, 0x66d2, 0x6ad4, 0x6ad6, 0x6ad8, 0x6ada, 0x6adb, 0x6add, 0x6f1f, 0x6f3f - .2byte 0x7340, 0x7322, 0x6f25, 0x6b08, 0x670c, 0x66ee, 0x66f0, 0x6712, 0x6b14, 0x6b16, 0x6b18, 0x6b1a, 0x6b1c, 0x6f3d, 0x6f5f, 0x737f - .2byte 0x7380, 0x7382, 0x6f65, 0x6b48, 0x672c, 0x672e, 0x6730, 0x6732, 0x6b54, 0x6b56, 0x6b58, 0x6b5a, 0x6f7c, 0x6f7e, 0x739f, 0x77bf - .2byte 0x6fc0, 0x6fc2, 0x6786, 0x676a, 0x676c, 0x676e, 0x6770, 0x6772, 0x6774, 0x6776, 0x6b98, 0x6f9b, 0x6f9c, 0x6f9e, 0x73bf, 0x77df - .2byte 0x6be0, 0x67c4, 0x67a8, 0x67aa, 0x67ac, 0x67ae, 0x67b0, 0x67b2, 0x67b4, 0x6bb6, 0x6fb9, 0x6fdb, 0x6fdc, 0x6fde, 0x73df, 0x77df - .2byte 0x67e2, 0x67e6, 0x67e8, 0x67ea, 0x67ec, 0x67ef, 0x67f1, 0x67f3, 0x6bf5, 0x6ff8, 0x6ffa, 0x73fc, 0x73fd, 0x73fe, 0x73ff, 0x77ff - .2byte 0x63e6, 0x63e8, 0x67ea, 0x67ec, 0x67ee, 0x67f0, 0x67f2, 0x6bf4, 0x6ff7, 0x6ff9, 0x73fb, 0x77fd, 0x77fe, 0x77fe, 0x77ff, 0x77ff - .2byte 0x7800, 0x7802, 0x7804, 0x7807, 0x7809, 0x780c, 0x780f, 0x7811, 0x7813, 0x7816, 0x7818, 0x781b, 0x781e, 0x741f, 0x705f, 0x68df - .2byte 0x7840, 0x7842, 0x7844, 0x7847, 0x7849, 0x784c, 0x784e, 0x7851, 0x7853, 0x7856, 0x7858, 0x785b, 0x785e, 0x709e, 0x6cdf, 0x6d1f - .2byte 0x78a0, 0x78a2, 0x70c6, 0x70c8, 0x70ca, 0x70cc, 0x70ce, 0x70d1, 0x70d3, 0x70d5, 0x70d7, 0x70d9, 0x70dc, 0x6d1d, 0x6d1f, 0x695f - .2byte 0x78e0, 0x78e2, 0x7106, 0x6d4a, 0x6d4b, 0x6d4e, 0x6d4f, 0x6d51, 0x6d53, 0x6d55, 0x6d57, 0x6d59, 0x6d5b, 0x6d5d, 0x6d5f, 0x6d9f - .2byte 0x7940, 0x7942, 0x7146, 0x6d8a, 0x6d8c, 0x6d8e, 0x6d90, 0x6d91, 0x6d94, 0x6d95, 0x6d97, 0x6d99, 0x6d9b, 0x6d9d, 0x6d9f, 0x6ddf - .2byte 0x7980, 0x7982, 0x7186, 0x6dca, 0x6dcc, 0x6dce, 0x6dd0, 0x6dd2, 0x6dd3, 0x6dd5, 0x6dd7, 0x6dd9, 0x6ddb, 0x6ddd, 0x6dff, 0x6e1f - .2byte 0x79e0, 0x79e2, 0x71e6, 0x6e0a, 0x6e0c, 0x6e0e, 0x6e10, 0x6e12, 0x6e14, 0x6e16, 0x6e17, 0x6e19, 0x6e1b, 0x6e1d, 0x6e3f, 0x6e5f - .2byte 0x7a20, 0x7a22, 0x7226, 0x6e4a, 0x6e4c, 0x6e4e, 0x6e50, 0x6e52, 0x6e54, 0x6e56, 0x6e57, 0x6e59, 0x6e5b, 0x6e5d, 0x6e7f, 0x6e9f - .2byte 0x7a80, 0x7a82, 0x7266, 0x6e8a, 0x6e8c, 0x6e8e, 0x6e90, 0x6e92, 0x6e94, 0x6e96, 0x6e98, 0x6e99, 0x6e9b, 0x6e9d, 0x6ebf, 0x72ff - .2byte 0x7ac0, 0x7ac2, 0x72a6, 0x6eaa, 0x6ecc, 0x6ece, 0x6ed0, 0x6ed2, 0x6ed4, 0x6ed6, 0x6ed8, 0x6ed9, 0x6edb, 0x6edd, 0x731f, 0x733f - .2byte 0x7b20, 0x7b22, 0x72e6, 0x6eea, 0x6eec, 0x6eee, 0x6f10, 0x6f12, 0x6f14, 0x6f16, 0x7318, 0x731a, 0x731c, 0x733d, 0x735f, 0x777f - .2byte 0x7b80, 0x7b62, 0x7346, 0x6f4a, 0x6f2c, 0x6f4e, 0x6f30, 0x6f32, 0x6f34, 0x6f56, 0x7358, 0x737b, 0x737c, 0x737e, 0x779f, 0x7bbf - .2byte 0x7bc0, 0x7bc2, 0x7386, 0x6f6a, 0x6f6c, 0x6f6e, 0x6f70, 0x6f72, 0x6f74, 0x6f76, 0x7398, 0x739b, 0x739d, 0x77be, 0x7bdf, 0x7fff - .2byte 0x77e0, 0x6fc4, 0x6fa8, 0x6faa, 0x6fac, 0x6fae, 0x6fb0, 0x6fb2, 0x6fb4, 0x6fb6, 0x73b9, 0x73db, 0x77dd, 0x77de, 0x7bdf, 0x7fff - .2byte 0x6fe2, 0x6fe6, 0x6fe8, 0x6fea, 0x6fec, 0x6fef, 0x6ff1, 0x6ff3, 0x6ff5, 0x73f8, 0x73fa, 0x77fc, 0x7bfe, 0x7bfe, 0x7bff, 0x7fff - .2byte 0x6be6, 0x6be8, 0x6bea, 0x6fec, 0x6bee, 0x6ff0, 0x6ff2, 0x6ff4, 0x73f7, 0x73f9, 0x77fb, 0x7bfd, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7c00, 0x7c02, 0x7c05, 0x7c07, 0x7c0a, 0x7c0c, 0x7c0e, 0x7c11, 0x7c13, 0x7c16, 0x7c18, 0x7c1a, 0x7c1d, 0x7c1f, 0x785f, 0x70df - .2byte 0x7c60, 0x7884, 0x7885, 0x7888, 0x788a, 0x788c, 0x788e, 0x7891, 0x7893, 0x7895, 0x7897, 0x7899, 0x789b, 0x789e, 0x74df, 0x711f - .2byte 0x7ca0, 0x78c4, 0x7508, 0x750a, 0x750b, 0x750e, 0x750f, 0x7511, 0x7513, 0x7515, 0x7517, 0x7519, 0x751b, 0x751d, 0x751f, 0x715f - .2byte 0x7ce0, 0x7904, 0x7548, 0x754a, 0x754c, 0x754e, 0x754f, 0x7551, 0x7554, 0x7555, 0x7557, 0x7559, 0x755b, 0x755d, 0x755f, 0x719f - .2byte 0x7d40, 0x7944, 0x7588, 0x758a, 0x758c, 0x758e, 0x7590, 0x7591, 0x7593, 0x7595, 0x7597, 0x7599, 0x759b, 0x759d, 0x759f, 0x71df - .2byte 0x7d80, 0x7984, 0x75c8, 0x75ca, 0x75cc, 0x75ce, 0x75d0, 0x75d2, 0x75d4, 0x75d6, 0x75d7, 0x75d9, 0x75db, 0x75dd, 0x75ff, 0x721f - .2byte 0x7de0, 0x79e4, 0x7608, 0x760a, 0x760c, 0x760e, 0x7610, 0x7612, 0x7614, 0x7616, 0x7617, 0x7619, 0x761b, 0x761d, 0x763f, 0x765f - .2byte 0x7e20, 0x7a24, 0x7648, 0x764a, 0x764c, 0x764e, 0x7650, 0x7652, 0x7654, 0x7656, 0x7658, 0x7659, 0x765b, 0x765d, 0x767f, 0x769f - .2byte 0x7e60, 0x7a64, 0x7688, 0x768a, 0x768c, 0x768e, 0x7690, 0x7692, 0x7694, 0x7696, 0x7698, 0x7699, 0x769b, 0x769d, 0x76bf, 0x76ff - .2byte 0x7ec0, 0x7aa4, 0x76a8, 0x76aa, 0x76cc, 0x76ce, 0x76d0, 0x76d2, 0x76d4, 0x76d6, 0x76d8, 0x76da, 0x76db, 0x76dd, 0x771f, 0x773f - .2byte 0x7f00, 0x7ae4, 0x76e8, 0x76ea, 0x76ec, 0x770e, 0x7710, 0x7712, 0x7714, 0x7716, 0x7739, 0x773b, 0x773c, 0x773d, 0x7b5f, 0x7b7f - .2byte 0x7f60, 0x7b44, 0x7728, 0x772a, 0x772c, 0x772e, 0x7730, 0x7732, 0x7754, 0x7756, 0x7779, 0x7b7b, 0x7b7c, 0x7b7e, 0x7b9f, 0x7bbf - .2byte 0x7fa0, 0x7b84, 0x7768, 0x776a, 0x776c, 0x776e, 0x7770, 0x7772, 0x7774, 0x7776, 0x7799, 0x7b9b, 0x7bbd, 0x7bbe, 0x7bdf, 0x7fff - .2byte 0x7fe0, 0x7bc4, 0x77a8, 0x77aa, 0x77ac, 0x77ae, 0x77b0, 0x77b2, 0x77b4, 0x77b6, 0x77b9, 0x7bdb, 0x7bdd, 0x7bdf, 0x7fff, 0x7fff - .2byte 0x77e2, 0x77e6, 0x77e8, 0x77ea, 0x77ec, 0x77ef, 0x77f1, 0x77f3, 0x77f5, 0x77f8, 0x7bfa, 0x7bfc, 0x7bfe, 0x7fff, 0x7fff, 0x7fff - .2byte 0x73e6, 0x73e8, 0x73ea, 0x73ec, 0x73ee, 0x73f0, 0x73f2, 0x77f4, 0x77f7, 0x77f9, 0x7bfb, 0x7bfd, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7c42, 0x7c44, 0x7c46, 0x7c48, 0x7c4b, 0x7c4c, 0x7c4e, 0x7c51, 0x7c53, 0x7c55, 0x7c57, 0x7c59, 0x7c5b, 0x7c5d, 0x7c5f, 0x78df - .2byte 0x7ca2, 0x7cc6, 0x7cc8, 0x7cca, 0x7ccb, 0x7cce, 0x7ccf, 0x7cd1, 0x7cd3, 0x7cd5, 0x7cd7, 0x7cd9, 0x7cdb, 0x7cdd, 0x7cdf, 0x791f - .2byte 0x7ce2, 0x7d06, 0x7d08, 0x7d0a, 0x7d0c, 0x7d0e, 0x7d0f, 0x7d11, 0x7d14, 0x7d15, 0x7d17, 0x7d19, 0x7d1b, 0x7d1d, 0x7d1f, 0x795f - .2byte 0x7d22, 0x7d46, 0x7d48, 0x7d4a, 0x7d4c, 0x7d4e, 0x7d50, 0x7d51, 0x7d54, 0x7d55, 0x7d57, 0x7d59, 0x7d5b, 0x7d5d, 0x7d5f, 0x799f - .2byte 0x7d62, 0x7d86, 0x7d88, 0x7d8a, 0x7d8c, 0x7d8e, 0x7d90, 0x7d92, 0x7d93, 0x7d96, 0x7d97, 0x7d99, 0x7d9b, 0x7d9d, 0x7d9f, 0x79df - .2byte 0x7da2, 0x7dc6, 0x7dc8, 0x7dca, 0x7dcc, 0x7def, 0x7df0, 0x7df2, 0x7df4, 0x7df6, 0x7df7, 0x7df9, 0x7dfb, 0x7dfd, 0x7dff, 0x7a1f - .2byte 0x7de2, 0x7e06, 0x7e08, 0x7e0a, 0x7e0c, 0x7e0f, 0x7e31, 0x7e32, 0x7e34, 0x7e36, 0x7e38, 0x7e39, 0x7e3b, 0x7e3d, 0x7e3f, 0x7a5f - .2byte 0x7e22, 0x7e46, 0x7e48, 0x7e4a, 0x7e4c, 0x7e4f, 0x7e71, 0x7e73, 0x7e74, 0x7e76, 0x7e78, 0x7e79, 0x7e7b, 0x7e7d, 0x7e7f, 0x7a9f - .2byte 0x7e62, 0x7e86, 0x7e88, 0x7e8a, 0x7e8c, 0x7e8f, 0x7e91, 0x7eb3, 0x7eb5, 0x7eb6, 0x7eb8, 0x7eba, 0x7ebb, 0x7ebd, 0x7ebf, 0x7aff - .2byte 0x7ea2, 0x7ea6, 0x7ea8, 0x7eca, 0x7ecc, 0x7ecf, 0x7ed1, 0x7ed3, 0x7ed5, 0x7f18, 0x7f19, 0x7f1b, 0x7f1c, 0x7f1d, 0x7f1f, 0x7b3f - .2byte 0x7ee2, 0x7f06, 0x7ee8, 0x7eea, 0x7eec, 0x7f0f, 0x7f11, 0x7f13, 0x7f15, 0x7f38, 0x7f5a, 0x7f5b, 0x7f5c, 0x7f5e, 0x7f5f, 0x7f7f - .2byte 0x7f42, 0x7f26, 0x7f28, 0x7f2a, 0x7f2c, 0x7f2f, 0x7f51, 0x7f53, 0x7f55, 0x7f78, 0x7f7a, 0x7f9c, 0x7f9d, 0x7f9e, 0x7f9f, 0x7fbf - .2byte 0x7f82, 0x7f66, 0x7f68, 0x7f6a, 0x7f6c, 0x7f6f, 0x7f71, 0x7f73, 0x7f75, 0x7f98, 0x7f9a, 0x7fbc, 0x7fde, 0x7fde, 0x7fdf, 0x7fff - .2byte 0x7fc2, 0x7fa6, 0x7fa8, 0x7faa, 0x7fac, 0x7faf, 0x7fb1, 0x7fb3, 0x7fb5, 0x7fb8, 0x7fda, 0x7fdc, 0x7fde, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7fe2, 0x7fe6, 0x7fe8, 0x7fea, 0x7fec, 0x7fef, 0x7ff1, 0x7ff3, 0x7ff5, 0x7ff8, 0x7ffa, 0x7ffc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff - .2byte 0x77e6, 0x7be8, 0x7bea, 0x7bec, 0x7bee, 0x7bf0, 0x7bf2, 0x7bf4, 0x7bf7, 0x7bf9, 0x7ffb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7cc6, 0x7cc7, 0x7cc9, 0x7cca, 0x7ccc, 0x7cce, 0x7ccf, 0x7cd1, 0x7cd3, 0x7cd5, 0x7cd6, 0x7cd8, 0x7cda, 0x7cdc, 0x7cdd, 0x7cdf - .2byte 0x7ce6, 0x7d08, 0x7d09, 0x7d0b, 0x7d0c, 0x7d0e, 0x7d10, 0x7d12, 0x7d14, 0x7d15, 0x7d17, 0x7d18, 0x7d1a, 0x7d1c, 0x7d1e, 0x7d1f - .2byte 0x7d26, 0x7d48, 0x7d4a, 0x7d4b, 0x7d4d, 0x7d4e, 0x7d50, 0x7d52, 0x7d53, 0x7d55, 0x7d57, 0x7d59, 0x7d5a, 0x7d5c, 0x7d5e, 0x7d5f - .2byte 0x7d66, 0x7d68, 0x7d6a, 0x7d8c, 0x7d8d, 0x7d8f, 0x7d91, 0x7d92, 0x7d94, 0x7d96, 0x7d97, 0x7d99, 0x7d9b, 0x7d9c, 0x7d9e, 0x7d9f - .2byte 0x7d86, 0x7da8, 0x7daa, 0x7dac, 0x7dce, 0x7dcf, 0x7dd1, 0x7dd3, 0x7dd4, 0x7dd6, 0x7dd7, 0x7dd9, 0x7dda, 0x7ddc, 0x7dde, 0x7ddf - .2byte 0x7dc6, 0x7de8, 0x7dea, 0x7dec, 0x7e0e, 0x7e10, 0x7e11, 0x7e13, 0x7e14, 0x7e16, 0x7e18, 0x7e19, 0x7e1b, 0x7e1c, 0x7e1e, 0x7e1f - .2byte 0x7e06, 0x7e08, 0x7e2a, 0x7e2c, 0x7e2e, 0x7e30, 0x7e52, 0x7e53, 0x7e55, 0x7e56, 0x7e58, 0x7e59, 0x7e5b, 0x7e5c, 0x7e5e, 0x7e5f - .2byte 0x7e46, 0x7e48, 0x7e4a, 0x7e4c, 0x7e6e, 0x7e70, 0x7e72, 0x7e94, 0x7e95, 0x7e97, 0x7e98, 0x7e9a, 0x7e9b, 0x7e9d, 0x7e9e, 0x7e9f - .2byte 0x7e66, 0x7e88, 0x7e8a, 0x7e8c, 0x7e8e, 0x7eb0, 0x7eb2, 0x7ed4, 0x7ef7, 0x7ef8, 0x7efa, 0x7efb, 0x7efc, 0x7efd, 0x7efe, 0x7eff - .2byte 0x7ea6, 0x7ec8, 0x7eca, 0x7ecc, 0x7ece, 0x7ed0, 0x7ed2, 0x7ef4, 0x7f37, 0x7f39, 0x7f3a, 0x7f3b, 0x7f3c, 0x7f3d, 0x7f3e, 0x7f3f - .2byte 0x7ee6, 0x7ee8, 0x7eea, 0x7eec, 0x7f0e, 0x7f10, 0x7f12, 0x7f14, 0x7f57, 0x7f59, 0x7f7b, 0x7f7c, 0x7f7d, 0x7f7e, 0x7f7f, 0x7f7f - .2byte 0x7f26, 0x7f28, 0x7f2a, 0x7f2c, 0x7f2e, 0x7f30, 0x7f52, 0x7f54, 0x7f77, 0x7f79, 0x7f9b, 0x7fbd, 0x7fbe, 0x7fbe, 0x7fbf, 0x7fbf - .2byte 0x7f46, 0x7f68, 0x7f4a, 0x7f6c, 0x7f6e, 0x7f70, 0x7f72, 0x7f74, 0x7f97, 0x7f99, 0x7fbb, 0x7fdd, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7f86, 0x7f88, 0x7f8a, 0x7f8c, 0x7f8e, 0x7f90, 0x7fb2, 0x7fb4, 0x7fb7, 0x7fb9, 0x7fdb, 0x7fdd, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7fc6, 0x7fc8, 0x7fca, 0x7fcc, 0x7fce, 0x7fd0, 0x7fd2, 0x7fd4, 0x7fd7, 0x7fd9, 0x7ffb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7fe6, 0x7fe8, 0x7fea, 0x7fec, 0x7fee, 0x7ff0, 0x7ff2, 0x7ff4, 0x7ff7, 0x7ff9, 0x7ffb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x0421, 0x0423, 0x0425, 0x0427, 0x0429, 0x042b, 0x042d, 0x0015, 0x0017, 0x0019, 0x001b, 0x001d, 0x001f, 0x043f, 0x0c7f, 0x1cff - .2byte 0x0461, 0x0463, 0x0465, 0x0467, 0x0469, 0x046b, 0x046d, 0x0055, 0x0057, 0x0059, 0x005b, 0x005d, 0x005f, 0x047f, 0x0cbf, 0x1d1f - .2byte 0x04a1, 0x04a3, 0x04a5, 0x04a7, 0x04a9, 0x04ab, 0x04ad, 0x00d5, 0x00b7, 0x00b9, 0x00bb, 0x009d, 0x009f, 0x04df, 0x0cff, 0x1d5f - .2byte 0x04e1, 0x04e3, 0x04e5, 0x04e7, 0x04e9, 0x04eb, 0x04ed, 0x0115, 0x0117, 0x0119, 0x00fb, 0x00fd, 0x00ff, 0x051f, 0x0d3f, 0x1d7f - .2byte 0x0521, 0x0523, 0x0525, 0x0527, 0x0529, 0x052b, 0x052d, 0x0195, 0x0177, 0x0179, 0x015b, 0x015d, 0x015f, 0x055f, 0x0d7f, 0x1dbf - .2byte 0x0561, 0x0563, 0x0565, 0x0567, 0x0569, 0x056b, 0x056d, 0x01f5, 0x01d7, 0x01d9, 0x01bb, 0x01bd, 0x019f, 0x059f, 0x0dbf, 0x1dff - .2byte 0x05a1, 0x05a3, 0x05a5, 0x05a7, 0x05a9, 0x05ab, 0x05ad, 0x0255, 0x0237, 0x0219, 0x021b, 0x01fd, 0x01ff, 0x05ff, 0x0dff, 0x1e1f - .2byte 0x02a0, 0x02a3, 0x02a6, 0x02a9, 0x02ac, 0x02af, 0x02b2, 0x02b5, 0x0297, 0x0279, 0x025b, 0x025d, 0x025f, 0x063f, 0x0e3f, 0x1e5f - .2byte 0x02e0, 0x02e3, 0x02e5, 0x02e9, 0x02eb, 0x02ee, 0x02f1, 0x02f4, 0x02f7, 0x02d9, 0x02bb, 0x02bd, 0x029f, 0x067f, 0x0e7f, 0x1e9f - .2byte 0x0320, 0x0322, 0x0325, 0x0328, 0x032b, 0x032e, 0x0331, 0x0334, 0x0337, 0x0339, 0x031b, 0x02fd, 0x02ff, 0x06df, 0x0ebf, 0x1ebf - .2byte 0x0360, 0x0362, 0x0365, 0x0368, 0x036b, 0x036d, 0x0370, 0x0373, 0x0376, 0x0378, 0x037b, 0x035d, 0x033f, 0x071f, 0x0eff, 0x1eff - .2byte 0x03a0, 0x03a2, 0x03a5, 0x03a8, 0x03aa, 0x03ad, 0x03b0, 0x03b2, 0x03b5, 0x03b8, 0x03bb, 0x03bd, 0x039f, 0x075f, 0x0f3f, 0x1f1f - .2byte 0x03e0, 0x03e2, 0x03e5, 0x03e7, 0x03ea, 0x03ed, 0x03ef, 0x03f2, 0x03f5, 0x03f7, 0x03fa, 0x03fd, 0x03ff, 0x07bf, 0x0f7f, 0x1f5f - .2byte 0x07e1, 0x07e4, 0x07e6, 0x07e8, 0x07eb, 0x07ed, 0x07ef, 0x07f2, 0x07f4, 0x07f6, 0x07f8, 0x07fb, 0x07fd, 0x07ff, 0x0fbf, 0x1f9f - .2byte 0x0fe3, 0x0fe6, 0x0fe8, 0x0fea, 0x0fec, 0x0fee, 0x0ff0, 0x0ff1, 0x0ff4, 0x0ff6, 0x0ff8, 0x0ffa, 0x0ffc, 0x0ffe, 0x0fff, 0x1fbf - .2byte 0x1fe7, 0x1fe8, 0x1fea, 0x1fec, 0x1fed, 0x1fef, 0x1ff1, 0x1ff2, 0x1ff4, 0x1ff6, 0x1ff7, 0x1ff9, 0x1ffb, 0x1ffc, 0x1ffe, 0x1fff - .2byte 0x0c21, 0x0c23, 0x0c25, 0x0c27, 0x0c29, 0x0c2b, 0x0c2d, 0x0c15, 0x0c17, 0x0819, 0x081b, 0x081d, 0x081f, 0x103f, 0x187f, 0x20ff - .2byte 0x0c61, 0x0c63, 0x0c65, 0x0c67, 0x0c69, 0x0c6b, 0x0852, 0x0854, 0x0857, 0x0859, 0x043b, 0x043e, 0x0c7e, 0x14be, 0x1cff, 0x253f - .2byte 0x0ca1, 0x0ca3, 0x0ca5, 0x0ca7, 0x0ca9, 0x0cab, 0x08b2, 0x08b4, 0x08b7, 0x08b9, 0x049b, 0x049e, 0x0cbe, 0x14de, 0x1d3f, 0x255f - .2byte 0x0ce1, 0x0ce3, 0x0ce5, 0x0ce7, 0x0ce9, 0x0ceb, 0x0912, 0x0914, 0x0917, 0x0919, 0x04fb, 0x04de, 0x0cfe, 0x151e, 0x1d7f, 0x259f - .2byte 0x0d21, 0x0d23, 0x0d25, 0x0d27, 0x0d29, 0x0d2b, 0x0992, 0x0974, 0x0977, 0x0959, 0x055b, 0x053e, 0x0d5e, 0x157e, 0x1d9f, 0x25bf - .2byte 0x0d61, 0x0d63, 0x0d65, 0x0d67, 0x0d69, 0x0d6b, 0x09f2, 0x09d4, 0x09d7, 0x09b9, 0x05bb, 0x059e, 0x0d9e, 0x15be, 0x1ddf, 0x25ff - .2byte 0x0da1, 0x0a42, 0x0a46, 0x0a49, 0x0a4c, 0x0a4f, 0x0a52, 0x0a34, 0x0a17, 0x0a19, 0x061b, 0x05fe, 0x0dfe, 0x15fe, 0x1e1f, 0x263f - .2byte 0x0aa0, 0x0a82, 0x0a85, 0x0a88, 0x0a8b, 0x0a8e, 0x0a91, 0x0a94, 0x0a77, 0x0a79, 0x065b, 0x065e, 0x0e3e, 0x163e, 0x1e5f, 0x265f - .2byte 0x0ae0, 0x0ae2, 0x0ae5, 0x0ae8, 0x0aeb, 0x0aee, 0x0af1, 0x0af4, 0x0af7, 0x0ad9, 0x06bb, 0x06be, 0x0e9e, 0x167e, 0x1e9f, 0x269f - .2byte 0x0b20, 0x0b22, 0x0b25, 0x0b28, 0x0b2b, 0x0b2d, 0x0b30, 0x0b33, 0x0b36, 0x0b39, 0x071b, 0x06fe, 0x0ede, 0x16be, 0x1edf, 0x26df - .2byte 0x0b60, 0x0761, 0x0764, 0x0767, 0x076a, 0x076d, 0x0770, 0x0773, 0x0776, 0x0779, 0x077b, 0x075e, 0x0f3e, 0x171e, 0x1f1f, 0x26ff - .2byte 0x0ba0, 0x07c1, 0x07c4, 0x07c7, 0x07ca, 0x07cd, 0x07cf, 0x07d2, 0x07d5, 0x07d8, 0x07db, 0x07de, 0x0f7e, 0x175e, 0x1f3f, 0x273f - .2byte 0x0be0, 0x0fc3, 0x0fc6, 0x0fc8, 0x0fcb, 0x0fcd, 0x0fd0, 0x0fd2, 0x0fd4, 0x0fd7, 0x0fd9, 0x0fdc, 0x0fde, 0x179e, 0x1f7f, 0x277f - .2byte 0x0fe1, 0x17c5, 0x17c7, 0x17c9, 0x17cb, 0x17cd, 0x17cf, 0x17d1, 0x17d4, 0x17d6, 0x17d8, 0x17da, 0x17dc, 0x17de, 0x1fbf, 0x279f - .2byte 0x17e3, 0x1fe7, 0x1fe9, 0x1feb, 0x1fed, 0x1fef, 0x1ff0, 0x1ff2, 0x1ff4, 0x1ff6, 0x1ff8, 0x1ffa, 0x1ffc, 0x1ffe, 0x1fff, 0x27df - .2byte 0x23e7, 0x27e9, 0x27eb, 0x27ec, 0x27ee, 0x27f0, 0x27f1, 0x27f3, 0x27f4, 0x27f6, 0x27f8, 0x27f9, 0x27fb, 0x27fc, 0x27fe, 0x27ff - .2byte 0x1421, 0x1423, 0x1425, 0x1427, 0x1429, 0x142b, 0x142d, 0x1815, 0x1417, 0x1419, 0x141b, 0x141d, 0x141f, 0x183f, 0x207f, 0x28ff - .2byte 0x1461, 0x1463, 0x1465, 0x1467, 0x1469, 0x146b, 0x1852, 0x1454, 0x1457, 0x1459, 0x103b, 0x103e, 0x187e, 0x1cbe, 0x24ff, 0x2d3f - .2byte 0x14a1, 0x14a3, 0x14a5, 0x14a7, 0x14a9, 0x14af, 0x14b1, 0x14b4, 0x1096, 0x1099, 0x109b, 0x14bc, 0x1cfc, 0x253d, 0x253f, 0x2d7f - .2byte 0x14e1, 0x14e3, 0x14e5, 0x14e7, 0x14e9, 0x150f, 0x1511, 0x14f4, 0x10f6, 0x10f9, 0x10fb, 0x151c, 0x1d3c, 0x257d, 0x257f, 0x2d9f - .2byte 0x1521, 0x1523, 0x1525, 0x1527, 0x1529, 0x158f, 0x1571, 0x1574, 0x1156, 0x1159, 0x115b, 0x155c, 0x1d7c, 0x259d, 0x259f, 0x2ddf - .2byte 0x1561, 0x1563, 0x15e5, 0x15e9, 0x15ec, 0x15ef, 0x15d1, 0x15d4, 0x11b6, 0x11b9, 0x119b, 0x159c, 0x1dbc, 0x25dd, 0x25ff, 0x2dff - .2byte 0x15a1, 0x1642, 0x1625, 0x1628, 0x162b, 0x162e, 0x1631, 0x1634, 0x1216, 0x1219, 0x11fb, 0x15fc, 0x1dfc, 0x261d, 0x261f, 0x2e3f - .2byte 0x1aa0, 0x1682, 0x1685, 0x1688, 0x168b, 0x168e, 0x1691, 0x1694, 0x1276, 0x1259, 0x125b, 0x165c, 0x1e3c, 0x265d, 0x265f, 0x2e5f - .2byte 0x16e0, 0x16e2, 0x12c4, 0x12c7, 0x12ca, 0x12cd, 0x12d0, 0x12d3, 0x12d6, 0x12b9, 0x12bb, 0x169c, 0x1e7c, 0x269d, 0x269f, 0x2e9f - .2byte 0x1720, 0x1722, 0x1324, 0x1327, 0x132a, 0x132d, 0x1330, 0x1333, 0x1336, 0x1339, 0x131b, 0x16dc, 0x1ebc, 0x26dd, 0x26df, 0x2edf - .2byte 0x1760, 0x1361, 0x1364, 0x1367, 0x136a, 0x136d, 0x136f, 0x1372, 0x1375, 0x1378, 0x137b, 0x173c, 0x1f1c, 0x271d, 0x26ff, 0x2eff - .2byte 0x13a0, 0x13c1, 0x1785, 0x1788, 0x178a, 0x178d, 0x178f, 0x1792, 0x1794, 0x1797, 0x1799, 0x179c, 0x1f5c, 0x273d, 0x275f, 0x2f3f - .2byte 0x13e0, 0x17c3, 0x1f87, 0x1f89, 0x1f8b, 0x1f8d, 0x1f8f, 0x1f91, 0x1f94, 0x1f96, 0x1f98, 0x1f9a, 0x1f9c, 0x277d, 0x277f, 0x2f5f - .2byte 0x1be1, 0x1bc5, 0x27a9, 0x27ab, 0x27ad, 0x27af, 0x27b0, 0x27b2, 0x27b4, 0x27b6, 0x27b8, 0x27ba, 0x27bc, 0x27bd, 0x27bf, 0x2f9f - .2byte 0x1fe3, 0x27e7, 0x27e9, 0x27eb, 0x27ed, 0x27ef, 0x27f0, 0x27f2, 0x27f4, 0x27f6, 0x27f8, 0x27fa, 0x27fc, 0x27fd, 0x27ff, 0x2fdf - .2byte 0x2be7, 0x2be9, 0x2feb, 0x2fed, 0x2fee, 0x2ff0, 0x2ff1, 0x2ff3, 0x2ff5, 0x2ff6, 0x2ff8, 0x2ff9, 0x2ffb, 0x2ffc, 0x2ffe, 0x2fff - .2byte 0x1c21, 0x1c23, 0x1c25, 0x1c27, 0x1c29, 0x1c2b, 0x1c2d, 0x2415, 0x2417, 0x2019, 0x201b, 0x201d, 0x1c1f, 0x203f, 0x287f, 0x30ff - .2byte 0x1c61, 0x1c63, 0x1c65, 0x1c67, 0x1c69, 0x1c6b, 0x2452, 0x2054, 0x2057, 0x2059, 0x1c3b, 0x1c3e, 0x207e, 0x24be, 0x2cff, 0x313f - .2byte 0x1ca1, 0x1ca3, 0x1ca5, 0x1ca7, 0x1ca9, 0x24af, 0x20b1, 0x20b4, 0x1c96, 0x1c99, 0x1c9b, 0x20bc, 0x24fc, 0x2d3d, 0x2d3f, 0x357f - .2byte 0x1ce1, 0x1ce3, 0x1ce5, 0x1ce7, 0x210c, 0x210f, 0x1cf1, 0x1cf3, 0x1cf6, 0x1cf8, 0x1cf9, 0x253a, 0x2d7c, 0x2d7d, 0x2d7f, 0x35bf - .2byte 0x1d21, 0x1d23, 0x1d25, 0x2188, 0x218c, 0x216f, 0x1d71, 0x1d53, 0x1d56, 0x1d38, 0x1d59, 0x257a, 0x2d9c, 0x2dbd, 0x2dbf, 0x35df - .2byte 0x1d61, 0x1d63, 0x21e5, 0x21e8, 0x21eb, 0x21ef, 0x1dd1, 0x1db3, 0x1db6, 0x1d98, 0x1db9, 0x25ba, 0x2ddc, 0x2ddd, 0x2dff, 0x361f - .2byte 0x1da1, 0x2242, 0x2225, 0x1e27, 0x1e2b, 0x1e2e, 0x1e31, 0x1e13, 0x1e16, 0x1df8, 0x1df9, 0x25fa, 0x2e1c, 0x2e1d, 0x2e3f, 0x365f - .2byte 0x22a0, 0x2282, 0x1e85, 0x1e67, 0x1e6a, 0x1e6d, 0x1e70, 0x1e73, 0x1e76, 0x1e58, 0x1e59, 0x263a, 0x2e5c, 0x2e5d, 0x2e5f, 0x367f - .2byte 0x22e0, 0x22e2, 0x1ec4, 0x1ec7, 0x1eca, 0x1ecd, 0x1ed0, 0x1ed3, 0x1ed6, 0x1eb8, 0x1e99, 0x269a, 0x2e9c, 0x2e9d, 0x2e9f, 0x369f - .2byte 0x2320, 0x2322, 0x1f24, 0x1f07, 0x1f0a, 0x1f0d, 0x1f0f, 0x1f12, 0x1f15, 0x1f18, 0x1ef9, 0x26da, 0x2edc, 0x2edd, 0x2edf, 0x36df - .2byte 0x1f60, 0x1f61, 0x1f64, 0x1f27, 0x1f2a, 0x1f2d, 0x1f2f, 0x1f32, 0x1f34, 0x1f37, 0x1f39, 0x271a, 0x2f1c, 0x2f1d, 0x2f1f, 0x36ff - .2byte 0x1fa0, 0x1bc1, 0x2385, 0x2749, 0x274b, 0x274d, 0x274f, 0x2751, 0x2754, 0x2756, 0x2758, 0x275a, 0x2f5c, 0x2f3d, 0x2f3f, 0x373f - .2byte 0x1fe0, 0x1fc3, 0x2787, 0x2f8b, 0x2f8d, 0x2f8f, 0x2f90, 0x2f92, 0x2f94, 0x2f96, 0x2f98, 0x2f9a, 0x2f9c, 0x2f7d, 0x2f7f, 0x377f - .2byte 0x23e1, 0x23c5, 0x2fa9, 0x2fab, 0x2fad, 0x2faf, 0x2fb0, 0x2fb2, 0x2fb4, 0x2fb6, 0x2fb8, 0x2fba, 0x2fbc, 0x2fbd, 0x2fbf, 0x379f - .2byte 0x27e3, 0x2fe7, 0x2fe9, 0x2feb, 0x2fed, 0x2fef, 0x2ff1, 0x2ff3, 0x2ff5, 0x2ff6, 0x2ff8, 0x2ffa, 0x2ffb, 0x2ffd, 0x2fff, 0x37df - .2byte 0x2fe7, 0x33e9, 0x33eb, 0x37ed, 0x37ef, 0x37f0, 0x37f2, 0x37f3, 0x37f5, 0x37f6, 0x37f8, 0x37f9, 0x37fb, 0x37fc, 0x37fe, 0x37ff - .2byte 0x2421, 0x2423, 0x2425, 0x2427, 0x2429, 0x242b, 0x242d, 0x3015, 0x2c17, 0x2c19, 0x2c1b, 0x281d, 0x281f, 0x2c3f, 0x307f, 0x34ff - .2byte 0x2461, 0x2463, 0x2465, 0x2467, 0x2469, 0x246b, 0x3052, 0x2c54, 0x2c57, 0x2c59, 0x283b, 0x283e, 0x2c7e, 0x2cbe, 0x34ff, 0x393f - .2byte 0x24a1, 0x24a3, 0x24a5, 0x24a7, 0x24a9, 0x30af, 0x2cb1, 0x2cb4, 0x2896, 0x2899, 0x289b, 0x28bc, 0x2cfc, 0x353d, 0x353f, 0x397f - .2byte 0x24e1, 0x24e3, 0x24e5, 0x3108, 0x310c, 0x2d0f, 0x2cf1, 0x28f3, 0x28f6, 0x28f8, 0x28f9, 0x2d3a, 0x357c, 0x357d, 0x357f, 0x3dbf - .2byte 0x2521, 0x2523, 0x2525, 0x3188, 0x2d6c, 0x294e, 0x2951, 0x2533, 0x2536, 0x2957, 0x2d78, 0x319a, 0x35bc, 0x35bd, 0x35bf, 0x3dff - .2byte 0x2561, 0x2563, 0x31e5, 0x2de8, 0x29ca, 0x29ce, 0x29b1, 0x25b3, 0x2596, 0x2997, 0x2db8, 0x31da, 0x35dc, 0x35fd, 0x35ff, 0x3e1f - .2byte 0x25a1, 0x3242, 0x2e25, 0x2e27, 0x2a2a, 0x2a2d, 0x2a31, 0x2613, 0x25f6, 0x29f7, 0x2df8, 0x321a, 0x361c, 0x363d, 0x363f, 0x3e5f - .2byte 0x32a0, 0x2e82, 0x2e85, 0x2a67, 0x2669, 0x266d, 0x2670, 0x2673, 0x2656, 0x2a57, 0x2e38, 0x325a, 0x365c, 0x365d, 0x365f, 0x3e7f - .2byte 0x2ee0, 0x2ee2, 0x2ac4, 0x2ac7, 0x26c9, 0x26cc, 0x26cf, 0x26d2, 0x26d6, 0x2a97, 0x2e78, 0x329a, 0x369c, 0x369d, 0x369f, 0x3ebf - .2byte 0x2f20, 0x2b22, 0x2b24, 0x2707, 0x2aea, 0x2aed, 0x2aef, 0x2af2, 0x2af4, 0x2af7, 0x2ed8, 0x32da, 0x36dc, 0x36dd, 0x36df, 0x3edf - .2byte 0x2b60, 0x2b61, 0x2b64, 0x2b27, 0x2f0b, 0x2f0d, 0x2f0f, 0x2f11, 0x2f14, 0x2f16, 0x2f18, 0x331a, 0x371c, 0x371d, 0x371f, 0x3f1f - .2byte 0x2ba0, 0x27c1, 0x2b85, 0x2f49, 0x334c, 0x334e, 0x3350, 0x3352, 0x3354, 0x3356, 0x3358, 0x335a, 0x375c, 0x375d, 0x373f, 0x3f3f - .2byte 0x2be0, 0x2bc3, 0x2f87, 0x338b, 0x378d, 0x378f, 0x3790, 0x3792, 0x3794, 0x3796, 0x3798, 0x379a, 0x379c, 0x377d, 0x377f, 0x3f7f - .2byte 0x2be1, 0x2fc5, 0x33a9, 0x37ab, 0x37ad, 0x37af, 0x37b1, 0x37b2, 0x37b4, 0x37b6, 0x37b8, 0x37ba, 0x37bc, 0x37bd, 0x37bf, 0x3f9f - .2byte 0x2fe3, 0x33e7, 0x33e9, 0x37eb, 0x37ed, 0x37ef, 0x37f1, 0x37f3, 0x37f4, 0x37f6, 0x37f8, 0x37fa, 0x37fc, 0x37fd, 0x37ff, 0x3fdf - .2byte 0x37e7, 0x37e9, 0x3beb, 0x3bed, 0x3fef, 0x3ff1, 0x3ff2, 0x3ff4, 0x3ff5, 0x3ff7, 0x3ff8, 0x3ff9, 0x3ffb, 0x3ffc, 0x3ffe, 0x3fff - .2byte 0x2c21, 0x2c23, 0x2c25, 0x2c27, 0x2c29, 0x2c2b, 0x2c2d, 0x3c15, 0x3817, 0x3819, 0x341b, 0x341d, 0x341f, 0x343f, 0x387f, 0x3cff - .2byte 0x2c61, 0x2c63, 0x2c65, 0x2c67, 0x2c69, 0x2c6b, 0x3c52, 0x3854, 0x3857, 0x3459, 0x343b, 0x343e, 0x347e, 0x34be, 0x3cff, 0x413f - .2byte 0x2ca1, 0x2ca3, 0x3ca5, 0x3ca8, 0x3cac, 0x3caf, 0x38b1, 0x38b4, 0x3496, 0x3499, 0x349b, 0x34bc, 0x34fc, 0x3d3d, 0x3d3f, 0x417f - .2byte 0x2ce1, 0x2ce3, 0x3d25, 0x3d08, 0x3d0b, 0x3d0f, 0x38f1, 0x34f3, 0x34f6, 0x34f8, 0x34f9, 0x353a, 0x3d7c, 0x3d7d, 0x3d7f, 0x41bf - .2byte 0x2d21, 0x2d23, 0x3d85, 0x3d68, 0x394a, 0x394e, 0x3551, 0x3533, 0x3136, 0x3557, 0x3578, 0x399a, 0x3dbc, 0x3dbd, 0x3dbf, 0x45ff - .2byte 0x2d61, 0x2d63, 0x3de5, 0x3de8, 0x39ca, 0x35ae, 0x3190, 0x3193, 0x3195, 0x35b6, 0x39d8, 0x39da, 0x3dfc, 0x3dfd, 0x421f, 0x463f - .2byte 0x2da1, 0x3e42, 0x3a25, 0x3a27, 0x362a, 0x320c, 0x3210, 0x31f3, 0x31f5, 0x35f6, 0x3a18, 0x3a1a, 0x3e1c, 0x3e3d, 0x423f, 0x465f - .2byte 0x3ea0, 0x3a82, 0x3a85, 0x3667, 0x3669, 0x326c, 0x326f, 0x3273, 0x3255, 0x3636, 0x3a58, 0x3a5a, 0x3e5c, 0x3e7d, 0x427f, 0x469f - .2byte 0x3ae0, 0x3ae2, 0x36c4, 0x36c7, 0x32c9, 0x32ac, 0x32af, 0x32b2, 0x32b5, 0x3696, 0x3a98, 0x3a9a, 0x3e9c, 0x3e9d, 0x429f, 0x46bf - .2byte 0x3b20, 0x3722, 0x3724, 0x3307, 0x32ea, 0x36cd, 0x36cf, 0x36d1, 0x36d4, 0x36d6, 0x3ad8, 0x3ada, 0x3edc, 0x3edd, 0x42df, 0x46ff - .2byte 0x3760, 0x3761, 0x3364, 0x3727, 0x370b, 0x3b0e, 0x3b10, 0x3b12, 0x3b14, 0x3b16, 0x3b18, 0x3b1a, 0x3f1c, 0x3f1d, 0x431f, 0x471f - .2byte 0x37a0, 0x33c1, 0x3385, 0x3749, 0x3b4c, 0x3b4e, 0x3b50, 0x3b52, 0x3b54, 0x3b56, 0x3b58, 0x3b5a, 0x3f5c, 0x3f5d, 0x435f, 0x473f - .2byte 0x33e0, 0x33c3, 0x3787, 0x3b8b, 0x3b8d, 0x3f8f, 0x3f91, 0x3f93, 0x3f94, 0x3f96, 0x3f98, 0x3f9a, 0x3f9c, 0x3f7d, 0x437f, 0x477f - .2byte 0x33e1, 0x37c5, 0x3ba9, 0x3bab, 0x3fad, 0x3faf, 0x3fb1, 0x3fb3, 0x3fb5, 0x3fb6, 0x3fb8, 0x3fba, 0x3fbc, 0x3fbd, 0x43bf, 0x479f - .2byte 0x37e3, 0x3be7, 0x3fe9, 0x3feb, 0x3fed, 0x43f0, 0x43f1, 0x43f3, 0x43f5, 0x43f6, 0x43f8, 0x43fa, 0x43fc, 0x43fd, 0x43ff, 0x47df - .2byte 0x3fe7, 0x3fe9, 0x3feb, 0x43ed, 0x43ef, 0x47f1, 0x47f3, 0x47f4, 0x47f5, 0x47f7, 0x47f8, 0x47fa, 0x47fb, 0x47fd, 0x47fe, 0x47ff - .2byte 0x3421, 0x3423, 0x3425, 0x3427, 0x3429, 0x342b, 0x342d, 0x4815, 0x4417, 0x4419, 0x401b, 0x401d, 0x3c1f, 0x3c3f, 0x407f, 0x44ff - .2byte 0x3461, 0x4842, 0x4845, 0x4848, 0x484c, 0x484f, 0x4852, 0x4454, 0x4457, 0x4059, 0x403b, 0x3c3e, 0x407e, 0x3cbe, 0x40ff, 0x453f - .2byte 0x34a1, 0x48c2, 0x44a5, 0x44a8, 0x44ab, 0x44ae, 0x44b1, 0x44b4, 0x4096, 0x4099, 0x3c9b, 0x3cbc, 0x3cfc, 0x413d, 0x413f, 0x457f - .2byte 0x34e1, 0x4922, 0x4505, 0x44e7, 0x44eb, 0x44ee, 0x44f1, 0x40f3, 0x40f6, 0x3cf8, 0x3cf9, 0x3d3a, 0x417c, 0x417d, 0x457f, 0x49bf - .2byte 0x3521, 0x4982, 0x4565, 0x4567, 0x454a, 0x454d, 0x4551, 0x4133, 0x3d36, 0x3d57, 0x3d78, 0x419a, 0x41bc, 0x45bd, 0x45bf, 0x49ff - .2byte 0x3561, 0x49e2, 0x45c5, 0x45c7, 0x45aa, 0x418c, 0x4190, 0x3d93, 0x3d95, 0x3db6, 0x41d8, 0x41da, 0x45fc, 0x45fd, 0x461f, 0x4e3f - .2byte 0x35a1, 0x4a42, 0x4625, 0x4627, 0x462a, 0x420c, 0x39d0, 0x39d2, 0x3df4, 0x4216, 0x4218, 0x421a, 0x463c, 0x463d, 0x4a5f, 0x4e7f - .2byte 0x4aa0, 0x4682, 0x4685, 0x4267, 0x4269, 0x3e6c, 0x3a4e, 0x3a52, 0x3e34, 0x4256, 0x4258, 0x425a, 0x465c, 0x467d, 0x4a7f, 0x4e9f - .2byte 0x46e0, 0x42e2, 0x42c4, 0x42c7, 0x3ec9, 0x3eac, 0x3e8f, 0x3e91, 0x3e94, 0x4296, 0x4298, 0x429a, 0x469c, 0x46bd, 0x4abf, 0x4edf - .2byte 0x4320, 0x4322, 0x4324, 0x3f07, 0x3eea, 0x3ecd, 0x42d0, 0x42d2, 0x42d4, 0x42d6, 0x42d8, 0x42da, 0x46dc, 0x46dd, 0x4aff, 0x4eff - .2byte 0x4360, 0x4361, 0x3f64, 0x3f27, 0x3f0b, 0x430e, 0x4310, 0x4312, 0x4314, 0x4316, 0x4318, 0x431a, 0x471c, 0x471d, 0x4b1f, 0x4f3f - .2byte 0x3fa0, 0x3fc1, 0x3f85, 0x3f49, 0x434c, 0x434e, 0x4350, 0x4352, 0x4354, 0x4356, 0x4358, 0x435a, 0x475c, 0x475d, 0x4b5f, 0x4f5f - .2byte 0x3fe0, 0x3fc3, 0x3f87, 0x438b, 0x438d, 0x438f, 0x4791, 0x4793, 0x4794, 0x4796, 0x4798, 0x479a, 0x479c, 0x477d, 0x4b9f, 0x4f7f - .2byte 0x3fe1, 0x3fc5, 0x43a9, 0x43ab, 0x47ad, 0x47af, 0x47b1, 0x47b3, 0x47b5, 0x47b6, 0x47b8, 0x47ba, 0x47bc, 0x47bd, 0x4bbf, 0x4fbf - .2byte 0x3fe3, 0x43e7, 0x43e9, 0x47eb, 0x47ed, 0x47f0, 0x4bf2, 0x4bf3, 0x4bf5, 0x4bf7, 0x4bf8, 0x4bfa, 0x4bfc, 0x4bfd, 0x4bff, 0x4fdf - .2byte 0x43e7, 0x47e9, 0x47eb, 0x4bed, 0x4bef, 0x4bf1, 0x4ff3, 0x4ff5, 0x4ff6, 0x4ff7, 0x4ff9, 0x4ffa, 0x4ffb, 0x4ffd, 0x4ffe, 0x4fff - .2byte 0x5400, 0x5402, 0x5406, 0x5408, 0x540c, 0x540f, 0x5412, 0x5415, 0x5017, 0x5019, 0x4c1b, 0x481d, 0x481f, 0x483f, 0x447f, 0x48ff - .2byte 0x5460, 0x5042, 0x5045, 0x5048, 0x504b, 0x504e, 0x5051, 0x5054, 0x5057, 0x4c59, 0x4c3b, 0x483e, 0x487e, 0x44be, 0x48ff, 0x4d3f - .2byte 0x54c0, 0x50a2, 0x50a5, 0x50a7, 0x50ab, 0x50ae, 0x50b1, 0x50b4, 0x4c96, 0x4c99, 0x489b, 0x48bc, 0x44fc, 0x493d, 0x493f, 0x4d7f - .2byte 0x5520, 0x5102, 0x5105, 0x4ce7, 0x4cea, 0x4ced, 0x4cf0, 0x4cf3, 0x4cf6, 0x48f8, 0x48f9, 0x453a, 0x497c, 0x497d, 0x4d7f, 0x4dbf - .2byte 0x5580, 0x5162, 0x5165, 0x4d47, 0x4d29, 0x4d2d, 0x4d30, 0x4d33, 0x4936, 0x4957, 0x4578, 0x499a, 0x49bc, 0x49bd, 0x4dbf, 0x51ff - .2byte 0x55e0, 0x51c2, 0x51c5, 0x4da7, 0x4da9, 0x4d8c, 0x4d8f, 0x4d93, 0x4995, 0x45b6, 0x49d8, 0x49da, 0x4dfc, 0x4dfd, 0x4e1f, 0x523f - .2byte 0x5640, 0x5222, 0x5225, 0x4e07, 0x4e09, 0x4dec, 0x49ce, 0x49d2, 0x45f4, 0x4a16, 0x4a18, 0x4a1a, 0x4e3c, 0x4e3d, 0x4e5f, 0x567f - .2byte 0x56a0, 0x5282, 0x5285, 0x4e67, 0x4e69, 0x4e6c, 0x4a4e, 0x4632, 0x4a55, 0x4a56, 0x4a58, 0x4a5a, 0x4e7c, 0x4e7d, 0x529f, 0x56bf - .2byte 0x52e0, 0x4ee2, 0x4ec4, 0x4ec7, 0x4ac9, 0x4aac, 0x468f, 0x4ab2, 0x4ab5, 0x4a96, 0x4a98, 0x4a9a, 0x4e9c, 0x4ebd, 0x52bf, 0x56df - .2byte 0x4f20, 0x4f22, 0x4b24, 0x4b07, 0x4aea, 0x46cd, 0x4ad0, 0x4ad2, 0x4ad4, 0x4ad6, 0x4ad8, 0x4ada, 0x4edc, 0x4edd, 0x52ff, 0x571f - .2byte 0x4b60, 0x4b61, 0x4b64, 0x4b27, 0x470b, 0x4b0e, 0x4b10, 0x4b12, 0x4b14, 0x4b16, 0x4b18, 0x4b1a, 0x4f1c, 0x4f1d, 0x531f, 0x573f - .2byte 0x4ba0, 0x4bc1, 0x4b85, 0x4749, 0x4b4c, 0x4b4e, 0x4b50, 0x4b52, 0x4b54, 0x4b56, 0x4b58, 0x4b5a, 0x4f5c, 0x4f5d, 0x535f, 0x575f - .2byte 0x4be0, 0x47c3, 0x4787, 0x4b8b, 0x4b8d, 0x4b8f, 0x4b91, 0x4f93, 0x4f95, 0x4f96, 0x4f98, 0x4f9a, 0x4f9c, 0x4f7d, 0x539f, 0x579f - .2byte 0x47e1, 0x47c5, 0x4ba9, 0x4bab, 0x4bad, 0x4faf, 0x4fb1, 0x4fb3, 0x4fb5, 0x4fb7, 0x4fb8, 0x4fba, 0x4fbc, 0x4fbd, 0x53bf, 0x57bf - .2byte 0x47e3, 0x4be7, 0x4be9, 0x4beb, 0x4bed, 0x4ff0, 0x4ff2, 0x53f4, 0x53f5, 0x53f7, 0x53f9, 0x53fa, 0x53fc, 0x53fd, 0x53ff, 0x57df - .2byte 0x4be7, 0x4be9, 0x4beb, 0x4fed, 0x4fef, 0x53f1, 0x53f3, 0x57f5, 0x57f7, 0x57f8, 0x57f9, 0x57fa, 0x57fc, 0x57fd, 0x57fe, 0x57ff - .2byte 0x5c00, 0x5c02, 0x5c05, 0x5c08, 0x5c0b, 0x5c0e, 0x5c11, 0x5c14, 0x5c17, 0x5c19, 0x581b, 0x541d, 0x541f, 0x503f, 0x507f, 0x50ff - .2byte 0x5c60, 0x5c42, 0x5c45, 0x5c48, 0x5c4b, 0x5c4e, 0x5c50, 0x5c53, 0x5c57, 0x5859, 0x583b, 0x543e, 0x507e, 0x50be, 0x50ff, 0x513f - .2byte 0x5ca0, 0x5ca2, 0x5884, 0x5887, 0x588a, 0x588d, 0x5890, 0x5893, 0x5896, 0x5899, 0x549b, 0x50bc, 0x50fc, 0x513d, 0x513f, 0x557f - .2byte 0x5d20, 0x5d02, 0x58e4, 0x58e7, 0x58ea, 0x58ed, 0x58f0, 0x58f3, 0x58f6, 0x54f8, 0x50f9, 0x513a, 0x517c, 0x517d, 0x557f, 0x55bf - .2byte 0x5d60, 0x5d62, 0x5944, 0x5947, 0x5929, 0x592c, 0x592f, 0x5932, 0x5936, 0x5157, 0x5178, 0x519a, 0x51bc, 0x51bd, 0x51bf, 0x55ff - .2byte 0x5dc0, 0x5dc2, 0x59a4, 0x59a7, 0x5989, 0x558c, 0x558f, 0x5592, 0x5595, 0x51b6, 0x51d8, 0x51da, 0x51fc, 0x55fd, 0x561f, 0x563f - .2byte 0x5e20, 0x5e22, 0x5a04, 0x5a07, 0x59e9, 0x55ec, 0x51ef, 0x51f1, 0x51f4, 0x5216, 0x5218, 0x521a, 0x523c, 0x563d, 0x565f, 0x5a7f - .2byte 0x5e80, 0x5e82, 0x5a64, 0x5a67, 0x5a49, 0x564c, 0x522f, 0x5652, 0x5655, 0x5256, 0x5258, 0x525a, 0x567c, 0x567d, 0x569f, 0x5ebf - .2byte 0x5ee0, 0x5ee2, 0x5ac4, 0x5ac7, 0x5ac9, 0x56ac, 0x528f, 0x56b2, 0x5295, 0x5297, 0x5298, 0x529a, 0x56bc, 0x56bd, 0x5adf, 0x673f - .2byte 0x5b20, 0x5b22, 0x5724, 0x5707, 0x52ea, 0x52cd, 0x52d0, 0x52d2, 0x52f4, 0x52f7, 0x52d8, 0x52da, 0x56fc, 0x56fd, 0x5aff, 0x673f - .2byte 0x5760, 0x5761, 0x5764, 0x5327, 0x4f0b, 0x530e, 0x5310, 0x5312, 0x5314, 0x5316, 0x5318, 0x531a, 0x571c, 0x571d, 0x5b3f, 0x677f - .2byte 0x57a0, 0x57c1, 0x5385, 0x5349, 0x534c, 0x534e, 0x5350, 0x5352, 0x5354, 0x5356, 0x5358, 0x535a, 0x575c, 0x575d, 0x5b5f, 0x677f - .2byte 0x53e0, 0x53c3, 0x4f87, 0x538b, 0x538d, 0x538f, 0x5391, 0x5393, 0x5795, 0x5797, 0x5798, 0x579a, 0x579c, 0x579d, 0x5b9f, 0x679f - .2byte 0x4fe1, 0x4fc5, 0x53a9, 0x53ab, 0x53ad, 0x53af, 0x57b1, 0x57b3, 0x57b5, 0x57b7, 0x57b9, 0x57ba, 0x57bc, 0x57bd, 0x5bbf, 0x67bf - .2byte 0x4fe3, 0x53e7, 0x53e9, 0x53eb, 0x53ed, 0x53f0, 0x57f2, 0x57f4, 0x5bf6, 0x5bf7, 0x5bf9, 0x5bfa, 0x5bfc, 0x5bfd, 0x5bff, 0x67df - .2byte 0x53e7, 0x53e9, 0x53eb, 0x53ed, 0x57ef, 0x57f1, 0x5bf3, 0x5bf5, 0x67f9, 0x67fa, 0x67fb, 0x67fc, 0x67fd, 0x67fe, 0x67ff, 0x67ff - .2byte 0x6400, 0x6402, 0x6405, 0x6408, 0x640b, 0x640e, 0x6410, 0x6413, 0x6416, 0x6419, 0x601b, 0x601d, 0x5c1f, 0x583f, 0x587f, 0x58ff - .2byte 0x6440, 0x6442, 0x6445, 0x6448, 0x644a, 0x644d, 0x6450, 0x6453, 0x6456, 0x6459, 0x643b, 0x603e, 0x5c7e, 0x58be, 0x58ff, 0x593f - .2byte 0x64a0, 0x64a2, 0x6484, 0x6487, 0x648a, 0x648d, 0x6490, 0x6492, 0x6495, 0x6499, 0x609b, 0x5cbc, 0x58fc, 0x593d, 0x593f, 0x597f - .2byte 0x6500, 0x6502, 0x64e4, 0x60e7, 0x60e9, 0x60ec, 0x60ef, 0x60f2, 0x60f5, 0x60f8, 0x5cf9, 0x593a, 0x597c, 0x597d, 0x597f, 0x59bf - .2byte 0x6560, 0x6562, 0x6544, 0x6147, 0x5d4a, 0x5d4c, 0x5d4f, 0x5d52, 0x5d54, 0x5d57, 0x5978, 0x599a, 0x59bc, 0x59bd, 0x59bf, 0x5dff - .2byte 0x65c0, 0x65a2, 0x65a4, 0x61a7, 0x5daa, 0x59ad, 0x59af, 0x59b1, 0x59b4, 0x59b6, 0x59d8, 0x59da, 0x59fc, 0x59fd, 0x5a1f, 0x5e3f - .2byte 0x6620, 0x6602, 0x6604, 0x61e7, 0x5dea, 0x59ed, 0x5a10, 0x5a12, 0x5a14, 0x5a16, 0x5a18, 0x5a1a, 0x5a3c, 0x5a3d, 0x5e5f, 0x5e7f - .2byte 0x6680, 0x6662, 0x6664, 0x6247, 0x5e4a, 0x5a2d, 0x5a50, 0x5a52, 0x5a54, 0x5a56, 0x5a58, 0x5a5a, 0x5a7c, 0x5e7d, 0x5e9f, 0x62bf - .2byte 0x66e0, 0x66c2, 0x66c4, 0x62a7, 0x5e8a, 0x5a8d, 0x5a90, 0x5a92, 0x5e94, 0x5e97, 0x5a98, 0x5a9a, 0x5ebc, 0x5ebd, 0x5edf, 0x6b3f - .2byte 0x6720, 0x6722, 0x6724, 0x6307, 0x5eea, 0x5acd, 0x5ad0, 0x5ad2, 0x5ef4, 0x5ad7, 0x5ad8, 0x5ada, 0x5efc, 0x5efd, 0x673f, 0x6f7f - .2byte 0x6360, 0x6361, 0x6364, 0x5f27, 0x5b0b, 0x5b0e, 0x5b10, 0x5b12, 0x5b14, 0x5b16, 0x5b18, 0x5b1a, 0x5f1c, 0x5f3d, 0x675f, 0x6f7f - .2byte 0x5fa0, 0x5fc1, 0x5b85, 0x5b49, 0x5b4c, 0x5b4e, 0x5b50, 0x5b52, 0x5b54, 0x5b56, 0x5b58, 0x5b5a, 0x5f5c, 0x5f5d, 0x677f, 0x6f9f - .2byte 0x5fe0, 0x5bc3, 0x5787, 0x5b8b, 0x5b8d, 0x5b8f, 0x5b91, 0x5b93, 0x5f95, 0x5f97, 0x5f98, 0x5f9a, 0x5f9c, 0x5f9d, 0x679f, 0x6fbf - .2byte 0x5be1, 0x57c5, 0x5ba9, 0x5bab, 0x5bad, 0x5baf, 0x5bb1, 0x5bb3, 0x5fb5, 0x5fb7, 0x5fb9, 0x5fba, 0x5fbc, 0x5fbd, 0x67df, 0x6fdf - .2byte 0x57e3, 0x5be7, 0x5be9, 0x5beb, 0x5bed, 0x5bf0, 0x5ff2, 0x5ff4, 0x5ff6, 0x67f9, 0x67fa, 0x67fb, 0x67fd, 0x67fe, 0x67ff, 0x6fff - .2byte 0x57e7, 0x5be9, 0x5beb, 0x5bed, 0x5bef, 0x5ff1, 0x5ff3, 0x63f5, 0x67f9, 0x6ffb, 0x6ffb, 0x6ffc, 0x6ffd, 0x6ffe, 0x6fff, 0x6fff - .2byte 0x6c00, 0x6c02, 0x6c05, 0x6c07, 0x6c0a, 0x6c0d, 0x6c10, 0x6c12, 0x6c15, 0x6c18, 0x6c1b, 0x6c1d, 0x681f, 0x603f, 0x607f, 0x5cff - .2byte 0x6c40, 0x6c21, 0x6c24, 0x6c27, 0x6c2a, 0x6c2d, 0x6c30, 0x6c32, 0x6c35, 0x6c38, 0x6c3b, 0x6c3e, 0x647e, 0x60be, 0x60ff, 0x613f - .2byte 0x6ca0, 0x6c81, 0x6c84, 0x6c87, 0x6c8a, 0x6c8c, 0x6c8f, 0x6c92, 0x6c95, 0x6c98, 0x6c9b, 0x64bc, 0x60fc, 0x613d, 0x613f, 0x617f - .2byte 0x6d00, 0x6ce1, 0x6ce4, 0x64e7, 0x64ea, 0x64ed, 0x64ef, 0x64f2, 0x64f4, 0x64f7, 0x64f9, 0x613a, 0x617c, 0x617d, 0x617f, 0x61bf - .2byte 0x6d60, 0x6d41, 0x6d44, 0x6547, 0x616b, 0x616d, 0x616f, 0x6171, 0x6173, 0x6176, 0x6178, 0x619a, 0x61bc, 0x61bd, 0x61bf, 0x61ff - .2byte 0x6da0, 0x6da1, 0x6da4, 0x65a7, 0x61ab, 0x61ce, 0x61d0, 0x61d2, 0x61d4, 0x61d6, 0x61d8, 0x61da, 0x61fc, 0x61fd, 0x621f, 0x623f - .2byte 0x6e00, 0x6e01, 0x6de4, 0x65e7, 0x61eb, 0x620e, 0x6210, 0x6212, 0x6214, 0x6216, 0x6218, 0x621a, 0x623c, 0x623d, 0x625f, 0x667f - .2byte 0x6e60, 0x6e61, 0x6e44, 0x6647, 0x622b, 0x624e, 0x6250, 0x6252, 0x6254, 0x6256, 0x6258, 0x625a, 0x627c, 0x627d, 0x669f, 0x66bf - .2byte 0x6ec0, 0x6ec1, 0x6ea4, 0x6687, 0x628b, 0x628e, 0x6290, 0x6292, 0x6294, 0x6296, 0x6298, 0x629a, 0x62bc, 0x66bd, 0x66df, 0x6f3f - .2byte 0x6f00, 0x6f21, 0x6f04, 0x66e7, 0x62cb, 0x62ce, 0x62d0, 0x62d2, 0x62d4, 0x62d6, 0x62d8, 0x62da, 0x62fc, 0x66fd, 0x6b3f, 0x6f7f - .2byte 0x6f60, 0x6f61, 0x6f64, 0x6727, 0x630b, 0x630e, 0x6310, 0x6312, 0x6314, 0x6316, 0x6319, 0x631a, 0x673c, 0x6b5e, 0x6f7f, 0x77bf - .2byte 0x6ba0, 0x6bc1, 0x6785, 0x6349, 0x634c, 0x634e, 0x6350, 0x6352, 0x6354, 0x6356, 0x6358, 0x635a, 0x675c, 0x6b7e, 0x6f9f, 0x77bf - .2byte 0x67e0, 0x67c3, 0x6387, 0x638b, 0x638d, 0x638f, 0x6391, 0x6393, 0x6395, 0x6397, 0x6799, 0x679a, 0x679c, 0x6bbe, 0x6fbf, 0x77df - .2byte 0x63e1, 0x63c5, 0x63a9, 0x63ab, 0x63ad, 0x63af, 0x63b1, 0x63b3, 0x63b5, 0x67b7, 0x6bda, 0x6bdb, 0x6bdd, 0x6bde, 0x6fdf, 0x77df - .2byte 0x5fe3, 0x63e7, 0x5fe9, 0x63eb, 0x63ed, 0x63f0, 0x63f2, 0x63f4, 0x67f6, 0x6bf9, 0x6ffb, 0x6ffc, 0x6ffd, 0x6ffe, 0x6fff, 0x77ff - .2byte 0x5fe7, 0x5fe9, 0x5feb, 0x5fed, 0x63ef, 0x63f1, 0x67f3, 0x67f5, 0x6ff9, 0x6ffb, 0x77fd, 0x77fd, 0x77fe, 0x77fe, 0x77ff, 0x77ff - .2byte 0x7400, 0x7402, 0x7404, 0x7407, 0x740a, 0x740d, 0x740f, 0x7412, 0x7415, 0x7417, 0x741a, 0x741d, 0x741f, 0x6c3f, 0x687f, 0x64ff - .2byte 0x7440, 0x7821, 0x7824, 0x7826, 0x7829, 0x782c, 0x782f, 0x7832, 0x7835, 0x7837, 0x783a, 0x783e, 0x707e, 0x68be, 0x68ff, 0x653f - .2byte 0x74a0, 0x7881, 0x70a5, 0x70a8, 0x70aa, 0x70ac, 0x70af, 0x70b2, 0x70b4, 0x70b6, 0x70b9, 0x70bc, 0x68fc, 0x693d, 0x693f, 0x657f - .2byte 0x7500, 0x78e1, 0x7105, 0x6929, 0x692b, 0x692d, 0x692f, 0x6931, 0x6934, 0x6936, 0x6938, 0x693a, 0x697c, 0x697d, 0x697f, 0x65bf - .2byte 0x7540, 0x7941, 0x7145, 0x6969, 0x698c, 0x698e, 0x6990, 0x6992, 0x6994, 0x6996, 0x6998, 0x699a, 0x69bc, 0x69bd, 0x69bf, 0x65ff - .2byte 0x75a0, 0x79a1, 0x71a5, 0x69a9, 0x69cc, 0x69ce, 0x69d0, 0x69d2, 0x69d4, 0x69d6, 0x69d8, 0x69da, 0x69fc, 0x69fd, 0x6a1f, 0x6a3f - .2byte 0x7600, 0x79e1, 0x71e5, 0x69e9, 0x6a0c, 0x6a0e, 0x6a10, 0x6a12, 0x6a14, 0x6a16, 0x6a18, 0x6a1a, 0x6a3c, 0x6a3d, 0x6a5f, 0x6a7f - .2byte 0x7640, 0x7a41, 0x7245, 0x6a29, 0x6a4c, 0x6a4e, 0x6a50, 0x6a52, 0x6a54, 0x6a56, 0x6a58, 0x6a5a, 0x6a7c, 0x6a7d, 0x6a9f, 0x6abf - .2byte 0x76a0, 0x7aa1, 0x7285, 0x6a89, 0x6a8c, 0x6a8e, 0x6a90, 0x6a92, 0x6a94, 0x6a96, 0x6a98, 0x6a9a, 0x6abc, 0x6abd, 0x6adf, 0x733f - .2byte 0x7700, 0x7b01, 0x72e5, 0x6ac9, 0x6acc, 0x6ace, 0x6ad0, 0x6ad2, 0x6ad4, 0x6ad6, 0x6ad8, 0x6ada, 0x6afc, 0x6afd, 0x6f3f, 0x737f - .2byte 0x7760, 0x7b61, 0x7325, 0x6b09, 0x6b0c, 0x6b0e, 0x6b10, 0x6b12, 0x6b14, 0x6b16, 0x6b18, 0x6b1a, 0x6b3c, 0x6f5e, 0x737f, 0x77bf - .2byte 0x77a0, 0x7bc1, 0x7385, 0x6b49, 0x6b4c, 0x6b4e, 0x6b50, 0x6b52, 0x6b54, 0x6b56, 0x6b58, 0x6b5b, 0x6f7d, 0x739e, 0x77bf, 0x7fff - .2byte 0x73e0, 0x6fc3, 0x6b87, 0x6b8b, 0x6b8d, 0x6b8f, 0x6b91, 0x6b93, 0x6b95, 0x6b97, 0x6b99, 0x6fbb, 0x6fbd, 0x73be, 0x77df, 0x7fff - .2byte 0x6be1, 0x6bc5, 0x67a9, 0x67ab, 0x6bad, 0x6baf, 0x6bb1, 0x6bb3, 0x6bb5, 0x6bb7, 0x6fda, 0x73dc, 0x73dd, 0x73de, 0x77df, 0x7fff - .2byte 0x67e3, 0x67e7, 0x6be9, 0x67eb, 0x67ed, 0x6bf0, 0x6bf2, 0x6bf4, 0x6bf6, 0x6ff9, 0x73fb, 0x77fd, 0x77fe, 0x77fe, 0x77ff, 0x7fff - .2byte 0x63e7, 0x67e9, 0x67eb, 0x67ed, 0x67ef, 0x67f1, 0x6bf3, 0x6bf5, 0x6ff9, 0x73fb, 0x77fd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7c00, 0x7c02, 0x7c04, 0x7c07, 0x7c0a, 0x7c0c, 0x7c0f, 0x7c12, 0x7c14, 0x7c17, 0x7c19, 0x7c1c, 0x7c1f, 0x743f, 0x707f, 0x6cff - .2byte 0x7c40, 0x7863, 0x7865, 0x7867, 0x786a, 0x786c, 0x786f, 0x7871, 0x7874, 0x7876, 0x7879, 0x787b, 0x787e, 0x70be, 0x70ff, 0x6d3f - .2byte 0x7ca0, 0x78c3, 0x70e7, 0x70e9, 0x70eb, 0x70ed, 0x70ef, 0x70f1, 0x70f3, 0x70f5, 0x70f8, 0x70fa, 0x70fc, 0x713d, 0x713f, 0x6d7f - .2byte 0x7ce0, 0x7903, 0x7127, 0x716b, 0x716c, 0x716e, 0x7170, 0x7172, 0x7174, 0x7176, 0x7178, 0x717a, 0x717c, 0x717d, 0x6d7f, 0x6dbf - .2byte 0x7d40, 0x7963, 0x7167, 0x71ab, 0x71ad, 0x71ae, 0x71b0, 0x71b2, 0x71b4, 0x71b6, 0x71b8, 0x71ba, 0x71bc, 0x71bd, 0x71bf, 0x6dff - .2byte 0x7da0, 0x79a3, 0x71a7, 0x71eb, 0x71ed, 0x71ef, 0x71f0, 0x71f2, 0x71f4, 0x71f6, 0x71f8, 0x71fa, 0x71fc, 0x71fd, 0x721f, 0x6e3f - .2byte 0x7de0, 0x7a03, 0x71e7, 0x720b, 0x720d, 0x722f, 0x7231, 0x7232, 0x7234, 0x7236, 0x7238, 0x723a, 0x723c, 0x723d, 0x725f, 0x6e7f - .2byte 0x7e40, 0x7a43, 0x7227, 0x724b, 0x724d, 0x726f, 0x7271, 0x7273, 0x7274, 0x7276, 0x7278, 0x727a, 0x727c, 0x727d, 0x729f, 0x72bf - .2byte 0x7ea0, 0x7a83, 0x7287, 0x728b, 0x728d, 0x728f, 0x7291, 0x72b3, 0x72b5, 0x72b7, 0x72b8, 0x72ba, 0x72bc, 0x72bd, 0x72df, 0x773f - .2byte 0x7ee0, 0x7ae3, 0x72c7, 0x72cb, 0x72cd, 0x72cf, 0x72d1, 0x72d3, 0x72f5, 0x72f7, 0x72f8, 0x72fa, 0x72fc, 0x72fd, 0x773f, 0x777f - .2byte 0x7f40, 0x7b23, 0x7307, 0x730b, 0x730d, 0x730f, 0x7311, 0x7313, 0x7315, 0x7317, 0x7339, 0x733a, 0x733c, 0x775e, 0x777f, 0x7bbf - .2byte 0x7fa0, 0x7b83, 0x7347, 0x734b, 0x734d, 0x734f, 0x7351, 0x7353, 0x7355, 0x7357, 0x7359, 0x777b, 0x777d, 0x779e, 0x7bbf, 0x7fff - .2byte 0x7fe0, 0x7bc3, 0x7387, 0x738b, 0x738d, 0x738f, 0x7391, 0x7393, 0x7395, 0x7397, 0x7399, 0x77bb, 0x77bd, 0x7bde, 0x7fff, 0x7fff - .2byte 0x77e1, 0x73c5, 0x6fa9, 0x6fab, 0x6fad, 0x6faf, 0x6fb1, 0x6fb3, 0x73b5, 0x73b7, 0x77da, 0x77dc, 0x7bde, 0x7bde, 0x7fff, 0x7fff - .2byte 0x6fe3, 0x6fe7, 0x6fe9, 0x6feb, 0x6fed, 0x6ff0, 0x73f2, 0x73f4, 0x73f6, 0x73f9, 0x77fb, 0x7bfd, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x6be7, 0x6fe9, 0x6beb, 0x6fed, 0x6fef, 0x6ff1, 0x6ff3, 0x73f5, 0x73f9, 0x77fb, 0x7bfd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7c21, 0x7c23, 0x7c26, 0x7c28, 0x7c2a, 0x7c2c, 0x7c2f, 0x7c31, 0x7c33, 0x7c36, 0x7c38, 0x7c3a, 0x7c3d, 0x7c3f, 0x787f, 0x70ff - .2byte 0x7c81, 0x78a5, 0x78a6, 0x78a8, 0x78ab, 0x78ad, 0x78af, 0x78b1, 0x78b3, 0x78b5, 0x78b8, 0x78ba, 0x78bc, 0x78be, 0x78ff, 0x713f - .2byte 0x7cc1, 0x78e5, 0x7529, 0x752b, 0x752c, 0x752e, 0x7530, 0x7532, 0x7534, 0x7536, 0x7538, 0x7539, 0x753b, 0x753d, 0x753f, 0x717f - .2byte 0x7d01, 0x7925, 0x7569, 0x756b, 0x756d, 0x756e, 0x7570, 0x7572, 0x7574, 0x7576, 0x7578, 0x7579, 0x757b, 0x757d, 0x757f, 0x71bf - .2byte 0x7d61, 0x7965, 0x75a9, 0x75ab, 0x75ad, 0x75af, 0x75b1, 0x75b2, 0x75b4, 0x75b6, 0x75b8, 0x75ba, 0x75bb, 0x75bd, 0x75bf, 0x71ff - .2byte 0x7da1, 0x79a5, 0x75e9, 0x75eb, 0x75ed, 0x75ef, 0x75f1, 0x75f3, 0x75f4, 0x75f6, 0x75f8, 0x75fa, 0x75fb, 0x75fd, 0x761f, 0x763f - .2byte 0x7de1, 0x79e5, 0x7609, 0x760b, 0x762d, 0x762f, 0x7631, 0x7633, 0x7635, 0x7636, 0x7638, 0x763a, 0x763b, 0x763d, 0x765f, 0x767f - .2byte 0x7e41, 0x7a25, 0x7649, 0x764b, 0x764d, 0x766f, 0x7671, 0x7673, 0x7675, 0x7676, 0x7678, 0x767a, 0x767b, 0x767d, 0x769f, 0x76bf - .2byte 0x7e81, 0x7a85, 0x7689, 0x768b, 0x768d, 0x76af, 0x76b1, 0x76b3, 0x76b5, 0x76b7, 0x76b8, 0x76ba, 0x76bc, 0x76bd, 0x76df, 0x7b3f - .2byte 0x7ec1, 0x7ac5, 0x76c9, 0x76cb, 0x76cd, 0x76cf, 0x76d1, 0x76f3, 0x76f5, 0x76f7, 0x76f9, 0x76fa, 0x76fc, 0x76fd, 0x7b3f, 0x7b7f - .2byte 0x7f01, 0x7b05, 0x7709, 0x770b, 0x770d, 0x770f, 0x7711, 0x7713, 0x7735, 0x7737, 0x7b5a, 0x7b5b, 0x7b5d, 0x7b5e, 0x7b7f, 0x7bbf - .2byte 0x7f61, 0x7b45, 0x7749, 0x774b, 0x774d, 0x774f, 0x7751, 0x7753, 0x7755, 0x7757, 0x7b7a, 0x7b9c, 0x7b9d, 0x7b9e, 0x7bbf, 0x7fff - .2byte 0x7fa1, 0x7b85, 0x7789, 0x778b, 0x778d, 0x778f, 0x7791, 0x7793, 0x7795, 0x7797, 0x7bba, 0x7bbc, 0x7bde, 0x7bde, 0x7fff, 0x7fff - .2byte 0x7fe1, 0x7bc5, 0x77a9, 0x77ab, 0x77ad, 0x77af, 0x77b1, 0x77b3, 0x77b5, 0x77b7, 0x7bda, 0x7bdc, 0x7bde, 0x7fff, 0x7fff, 0x7fff - .2byte 0x77e3, 0x77e7, 0x77e9, 0x77eb, 0x77ed, 0x77f0, 0x77f2, 0x77f4, 0x77f6, 0x7bf9, 0x7bfb, 0x7bfd, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x73e7, 0x73e9, 0x73eb, 0x73ed, 0x73ef, 0x73f1, 0x77f3, 0x77f5, 0x77f9, 0x7bfb, 0x7bfd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7c63, 0x7c65, 0x7c67, 0x7c69, 0x7c6b, 0x7c6d, 0x7c6f, 0x7c71, 0x7c73, 0x7c75, 0x7c77, 0x7c79, 0x7c7b, 0x7c7d, 0x7c7f, 0x78ff - .2byte 0x7cc3, 0x7ce7, 0x7ce9, 0x7ceb, 0x7cec, 0x7cee, 0x7cf0, 0x7cf2, 0x7cf4, 0x7cf6, 0x7cf8, 0x7cf9, 0x7cfb, 0x7cfd, 0x7cff, 0x793f - .2byte 0x7d03, 0x7d27, 0x7d29, 0x7d2b, 0x7d2c, 0x7d2f, 0x7d30, 0x7d32, 0x7d34, 0x7d36, 0x7d37, 0x7d3a, 0x7d3b, 0x7d3d, 0x7d3f, 0x797f - .2byte 0x7d43, 0x7d67, 0x7d69, 0x7d6b, 0x7d6d, 0x7d6f, 0x7d71, 0x7d72, 0x7d74, 0x7d76, 0x7d78, 0x7d79, 0x7d7b, 0x7d7d, 0x7d7f, 0x79bf - .2byte 0x7d83, 0x7da7, 0x7da9, 0x7dab, 0x7dad, 0x7daf, 0x7db1, 0x7db2, 0x7db4, 0x7db6, 0x7db8, 0x7db9, 0x7dbb, 0x7dbd, 0x7dbf, 0x79ff - .2byte 0x7dc3, 0x7de7, 0x7de9, 0x7deb, 0x7ded, 0x7e10, 0x7e11, 0x7e13, 0x7e14, 0x7e16, 0x7e18, 0x7e1a, 0x7e1b, 0x7e1d, 0x7e1f, 0x7a3f - .2byte 0x7e03, 0x7e07, 0x7e09, 0x7e2b, 0x7e2d, 0x7e30, 0x7e52, 0x7e53, 0x7e55, 0x7e57, 0x7e58, 0x7e5a, 0x7e5c, 0x7e5d, 0x7e5f, 0x7a7f - .2byte 0x7e23, 0x7e47, 0x7e49, 0x7e6b, 0x7e6d, 0x7e70, 0x7e72, 0x7e94, 0x7e95, 0x7e97, 0x7e98, 0x7e9a, 0x7e9c, 0x7e9d, 0x7e9f, 0x7abf - .2byte 0x7e83, 0x7e87, 0x7e89, 0x7eab, 0x7e8d, 0x7eb0, 0x7eb2, 0x7eb4, 0x7ed6, 0x7ed7, 0x7ed9, 0x7eda, 0x7edc, 0x7edd, 0x7edf, 0x7f3f - .2byte 0x7ec3, 0x7ec7, 0x7ec9, 0x7ecb, 0x7ecd, 0x7ed0, 0x7ef2, 0x7ef4, 0x7ef6, 0x7f39, 0x7f3a, 0x7f3b, 0x7f3c, 0x7f3e, 0x7f3f, 0x7f7f - .2byte 0x7f03, 0x7f07, 0x7f09, 0x7f0b, 0x7f0d, 0x7f10, 0x7f12, 0x7f34, 0x7f36, 0x7f59, 0x7f7b, 0x7f7c, 0x7f7d, 0x7f7e, 0x7f7f, 0x7fbf - .2byte 0x7f43, 0x7f47, 0x7f49, 0x7f4b, 0x7f4d, 0x7f50, 0x7f52, 0x7f54, 0x7f56, 0x7f79, 0x7f9b, 0x7fbd, 0x7fbe, 0x7fbe, 0x7fbf, 0x7fff - .2byte 0x7f83, 0x7f87, 0x7f89, 0x7f6b, 0x7f8d, 0x7f90, 0x7f92, 0x7f94, 0x7f96, 0x7fb9, 0x7fbb, 0x7fdd, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7fc3, 0x7fc7, 0x7fa9, 0x7fab, 0x7fad, 0x7fb0, 0x7fb2, 0x7fb4, 0x7fb6, 0x7fd9, 0x7fdb, 0x7fdd, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7fe3, 0x7fe7, 0x7fe9, 0x7feb, 0x7fed, 0x7ff0, 0x7ff2, 0x7ff4, 0x7ff6, 0x7ff9, 0x7ffb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x77e7, 0x7be9, 0x7beb, 0x7bed, 0x7bef, 0x7bf1, 0x7bf3, 0x7bf5, 0x7bf9, 0x7ffb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7ce7, 0x7ce8, 0x7cea, 0x7ceb, 0x7ced, 0x7cef, 0x7cf0, 0x7cf2, 0x7cf4, 0x7cf5, 0x7cf7, 0x7cf8, 0x7cfa, 0x7cfc, 0x7cfd, 0x7cff - .2byte 0x7d07, 0x7d29, 0x7d2a, 0x7d2c, 0x7d2d, 0x7d2f, 0x7d31, 0x7d32, 0x7d34, 0x7d36, 0x7d37, 0x7d39, 0x7d3b, 0x7d3c, 0x7d3e, 0x7d3f - .2byte 0x7d47, 0x7d69, 0x7d6b, 0x7d6c, 0x7d6e, 0x7d6f, 0x7d71, 0x7d72, 0x7d74, 0x7d76, 0x7d77, 0x7d79, 0x7d7a, 0x7d7c, 0x7d7e, 0x7d7f - .2byte 0x7d87, 0x7d89, 0x7dab, 0x7dad, 0x7dae, 0x7db0, 0x7db2, 0x7db3, 0x7db4, 0x7db6, 0x7db7, 0x7db9, 0x7dbb, 0x7dbc, 0x7dbe, 0x7dbf - .2byte 0x7da7, 0x7dc9, 0x7dcb, 0x7ded, 0x7def, 0x7df0, 0x7df2, 0x7df3, 0x7df5, 0x7df6, 0x7df8, 0x7df9, 0x7dfb, 0x7dfc, 0x7dfe, 0x7dff - .2byte 0x7de7, 0x7e09, 0x7e0b, 0x7e0d, 0x7e2f, 0x7e31, 0x7e32, 0x7e34, 0x7e35, 0x7e37, 0x7e38, 0x7e39, 0x7e3b, 0x7e3c, 0x7e3e, 0x7e3f - .2byte 0x7e27, 0x7e29, 0x7e2b, 0x7e4d, 0x7e4f, 0x7e71, 0x7e73, 0x7e74, 0x7e76, 0x7e77, 0x7e79, 0x7e7a, 0x7e7b, 0x7e7d, 0x7e7e, 0x7e7f - .2byte 0x7e47, 0x7e69, 0x7e6b, 0x7e6d, 0x7e8f, 0x7e91, 0x7eb3, 0x7eb5, 0x7eb6, 0x7eb8, 0x7eb9, 0x7eba, 0x7ebc, 0x7ebd, 0x7ebe, 0x7ebf - .2byte 0x7e87, 0x7e89, 0x7eab, 0x7ead, 0x7eaf, 0x7eb1, 0x7ed3, 0x7ef5, 0x7f39, 0x7f39, 0x7f3b, 0x7f3b, 0x7f3c, 0x7f3d, 0x7f3e, 0x7f3f - .2byte 0x7ec7, 0x7ec9, 0x7ecb, 0x7ecd, 0x7eef, 0x7ef1, 0x7ef3, 0x7f15, 0x7f59, 0x7f7b, 0x7f7b, 0x7f7c, 0x7f7d, 0x7f7e, 0x7f7f, 0x7f7f - .2byte 0x7ee7, 0x7f09, 0x7f0b, 0x7f0d, 0x7f0f, 0x7f11, 0x7f33, 0x7f35, 0x7f79, 0x7f7b, 0x7fbd, 0x7fbd, 0x7fbe, 0x7fbe, 0x7fbf, 0x7fbf - .2byte 0x7f27, 0x7f29, 0x7f2b, 0x7f2d, 0x7f2f, 0x7f51, 0x7f53, 0x7f55, 0x7f99, 0x7f9b, 0x7fbd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7f67, 0x7f69, 0x7f6b, 0x7f6d, 0x7f6f, 0x7f71, 0x7f73, 0x7f95, 0x7fb9, 0x7fbb, 0x7fdd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7f87, 0x7f89, 0x7f8b, 0x7f8d, 0x7f8f, 0x7fb1, 0x7fb3, 0x7fb5, 0x7fd9, 0x7fdb, 0x7fdd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7fc7, 0x7fc9, 0x7fcb, 0x7fcd, 0x7fcf, 0x7fd1, 0x7fd3, 0x7fd5, 0x7ff9, 0x7ffb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7fe7, 0x7fe9, 0x7feb, 0x7fed, 0x7fef, 0x7ff1, 0x7ff3, 0x7ff5, 0x7ff9, 0x7ffb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x0421, 0x0423, 0x0425, 0x0427, 0x0429, 0x042b, 0x042d, 0x0016, 0x0018, 0x001a, 0x001c, 0x001f, 0x043f, 0x0c7f, 0x14bf, 0x211f - .2byte 0x0461, 0x0463, 0x0465, 0x0467, 0x0469, 0x046b, 0x046d, 0x0076, 0x0058, 0x005a, 0x005c, 0x005f, 0x047f, 0x0cbf, 0x14df, 0x213f - .2byte 0x04a1, 0x04a3, 0x04a5, 0x04a7, 0x04a9, 0x04ab, 0x04ad, 0x00d6, 0x00d8, 0x00ba, 0x00bc, 0x00bf, 0x04bf, 0x0cff, 0x151f, 0x217f - .2byte 0x04e1, 0x04e3, 0x04e5, 0x04e7, 0x04e9, 0x04eb, 0x04ed, 0x0136, 0x0138, 0x011a, 0x011c, 0x011f, 0x051f, 0x0d3f, 0x155f, 0x219f - .2byte 0x0521, 0x0523, 0x0525, 0x0527, 0x0529, 0x052b, 0x052d, 0x0196, 0x0198, 0x017a, 0x017c, 0x015f, 0x055f, 0x0d7f, 0x159f, 0x21df - .2byte 0x0561, 0x0563, 0x0565, 0x0567, 0x0569, 0x056b, 0x056d, 0x01f6, 0x01f8, 0x01da, 0x01dc, 0x01bf, 0x05bf, 0x0dbf, 0x15df, 0x21ff - .2byte 0x05a1, 0x05a3, 0x05a5, 0x05a7, 0x05a9, 0x05ab, 0x05ad, 0x0276, 0x0258, 0x023a, 0x021c, 0x021f, 0x061f, 0x0e1f, 0x161f, 0x223f - .2byte 0x02c0, 0x02c3, 0x02c6, 0x02c9, 0x02cd, 0x02d0, 0x02d3, 0x02d6, 0x02b8, 0x029a, 0x027c, 0x027f, 0x065f, 0x0e5f, 0x165f, 0x227f - .2byte 0x0300, 0x0303, 0x0306, 0x0309, 0x030c, 0x030f, 0x0312, 0x0315, 0x0318, 0x02fa, 0x02dc, 0x02df, 0x06bf, 0x0e9f, 0x169f, 0x229f - .2byte 0x0340, 0x0343, 0x0346, 0x0348, 0x034c, 0x034f, 0x0351, 0x0355, 0x0358, 0x035a, 0x033c, 0x031f, 0x071f, 0x0edf, 0x16df, 0x22df - .2byte 0x0380, 0x0382, 0x0385, 0x0388, 0x038b, 0x038e, 0x0391, 0x0394, 0x0397, 0x039a, 0x039c, 0x037f, 0x075f, 0x0f1f, 0x16ff, 0x22ff - .2byte 0x03e0, 0x03e3, 0x03e5, 0x03e8, 0x03eb, 0x03ee, 0x03f1, 0x03f3, 0x03f6, 0x03f9, 0x03fc, 0x03ff, 0x079f, 0x0f7f, 0x175f, 0x233f - .2byte 0x07e1, 0x07e3, 0x07e6, 0x07e8, 0x07eb, 0x07ed, 0x07f0, 0x07f3, 0x07f5, 0x07f8, 0x07fa, 0x07fd, 0x07ff, 0x0fbf, 0x177f, 0x235f - .2byte 0x0fe3, 0x0fe5, 0x0fe7, 0x0fe9, 0x0fec, 0x0fee, 0x0ff0, 0x0ff3, 0x0ff4, 0x0ff7, 0x0ff9, 0x0ffb, 0x0ffe, 0x0fff, 0x17bf, 0x239f - .2byte 0x17e5, 0x17e7, 0x17e9, 0x17eb, 0x17ed, 0x17ef, 0x17f0, 0x17f2, 0x17f4, 0x17f6, 0x17f8, 0x17fa, 0x17fc, 0x17fe, 0x17ff, 0x23df - .2byte 0x23e8, 0x23ea, 0x23eb, 0x23ed, 0x23ee, 0x23f0, 0x23f1, 0x23f3, 0x23f5, 0x23f6, 0x23f8, 0x23f9, 0x23fb, 0x23fc, 0x23fe, 0x23ff - .2byte 0x0c21, 0x0c23, 0x0c25, 0x0c27, 0x0c29, 0x0c2b, 0x0c2d, 0x0c16, 0x0c18, 0x0c1a, 0x081c, 0x0c1f, 0x0c3f, 0x147f, 0x1cbf, 0x291f - .2byte 0x0c61, 0x0c63, 0x0c65, 0x0c67, 0x0c69, 0x0c6b, 0x0853, 0x0856, 0x0858, 0x085a, 0x043d, 0x085e, 0x109e, 0x18df, 0x211f, 0x295f - .2byte 0x0ca1, 0x0ca3, 0x0ca5, 0x0ca7, 0x0ca9, 0x0cab, 0x08d3, 0x08b6, 0x08b8, 0x08ba, 0x049d, 0x089e, 0x10de, 0x18ff, 0x215f, 0x299f - .2byte 0x0ce1, 0x0ce3, 0x0ce5, 0x0ce7, 0x0ce9, 0x0ceb, 0x0933, 0x0916, 0x0918, 0x091a, 0x04fd, 0x08fe, 0x111e, 0x193f, 0x219f, 0x29bf - .2byte 0x0d21, 0x0d23, 0x0d25, 0x0d27, 0x0d29, 0x0d2b, 0x0993, 0x0996, 0x0978, 0x097a, 0x055d, 0x095e, 0x117e, 0x199f, 0x21bf, 0x29df - .2byte 0x0d61, 0x0d63, 0x0d65, 0x0d67, 0x0d69, 0x0d6b, 0x0a13, 0x09f6, 0x09d8, 0x09da, 0x05bd, 0x09be, 0x11be, 0x19bf, 0x21ff, 0x2a1f - .2byte 0x0da1, 0x0a62, 0x0a66, 0x0a69, 0x0a6d, 0x0a70, 0x0a73, 0x0a56, 0x0a38, 0x0a3a, 0x061d, 0x0a1e, 0x121e, 0x1a1f, 0x223f, 0x2a5f - .2byte 0x0ec0, 0x0ac2, 0x0ac5, 0x0ac9, 0x0acc, 0x0acf, 0x0ad2, 0x0ad6, 0x0ab8, 0x0a9a, 0x067d, 0x0a5e, 0x125e, 0x1a5f, 0x227f, 0x2a7f - .2byte 0x0b00, 0x0b02, 0x0b05, 0x0b09, 0x0b0b, 0x0b0f, 0x0b12, 0x0b15, 0x0b18, 0x0afa, 0x06dd, 0x0abe, 0x129e, 0x1a9f, 0x22bf, 0x2abf - .2byte 0x0b40, 0x0b42, 0x0b45, 0x0b48, 0x0b4b, 0x0b4e, 0x0b51, 0x0b54, 0x0b57, 0x0b5a, 0x075d, 0x0b1e, 0x12fe, 0x1adf, 0x22df, 0x2adf - .2byte 0x0b80, 0x07a1, 0x07a4, 0x07a8, 0x07aa, 0x07ae, 0x07b1, 0x07b4, 0x07b7, 0x07ba, 0x07bd, 0x0b7e, 0x133e, 0x1b1f, 0x231f, 0x2b1f - .2byte 0x0be0, 0x0bc2, 0x0bc5, 0x0bc8, 0x0bca, 0x0bcd, 0x0bd0, 0x0bd3, 0x0bd6, 0x0bd8, 0x0bdb, 0x0bde, 0x139e, 0x1b5f, 0x235f, 0x2b3f - .2byte 0x0fe1, 0x13c4, 0x13c6, 0x13c9, 0x13cb, 0x13ce, 0x13d0, 0x13d2, 0x13d5, 0x13d7, 0x13d9, 0x13dc, 0x13de, 0x1b9f, 0x239f, 0x2b7f - .2byte 0x17e3, 0x1be6, 0x1be8, 0x1bea, 0x1bec, 0x1bee, 0x1bf0, 0x1bf2, 0x1bf4, 0x1bf6, 0x1bf8, 0x1bfa, 0x1bfd, 0x1bff, 0x23df, 0x2b9f - .2byte 0x1be5, 0x23e8, 0x23ea, 0x23ec, 0x23ee, 0x23ef, 0x23f1, 0x23f3, 0x23f5, 0x23f7, 0x23f8, 0x23fa, 0x23fc, 0x23fe, 0x23ff, 0x2bdf - .2byte 0x27e8, 0x2bea, 0x2bec, 0x2bed, 0x2bef, 0x2bf1, 0x2bf2, 0x2bf3, 0x2bf5, 0x2bf7, 0x2bf8, 0x2bf9, 0x2bfb, 0x2bfd, 0x2bfe, 0x2bff - .2byte 0x1421, 0x1423, 0x1425, 0x1427, 0x1429, 0x142b, 0x142d, 0x1816, 0x1818, 0x181a, 0x141c, 0x141f, 0x183f, 0x1c7f, 0x24bf, 0x2d1f - .2byte 0x1461, 0x1463, 0x1465, 0x1467, 0x1469, 0x146b, 0x1853, 0x1456, 0x1458, 0x145a, 0x103d, 0x145e, 0x189e, 0x20df, 0x291f, 0x315f - .2byte 0x14a1, 0x14a3, 0x14a5, 0x14a7, 0x14a9, 0x18d0, 0x14b3, 0x14b5, 0x1098, 0x109a, 0x14bb, 0x18dc, 0x211d, 0x295e, 0x295f, 0x319f - .2byte 0x14e1, 0x14e3, 0x14e5, 0x14e7, 0x14e9, 0x1930, 0x1533, 0x1515, 0x10f8, 0x10fa, 0x14fb, 0x191c, 0x213d, 0x297e, 0x299f, 0x31bf - .2byte 0x1521, 0x1523, 0x1525, 0x1527, 0x1529, 0x1990, 0x1593, 0x1575, 0x1158, 0x115a, 0x155b, 0x197c, 0x217d, 0x29be, 0x29bf, 0x31ff - .2byte 0x1561, 0x1563, 0x1a06, 0x1a09, 0x1a0d, 0x1a10, 0x15f3, 0x15d5, 0x11d8, 0x11ba, 0x15bb, 0x19bc, 0x21dd, 0x29fe, 0x29ff, 0x321f - .2byte 0x15a1, 0x1a62, 0x1665, 0x1669, 0x166c, 0x166f, 0x1673, 0x1655, 0x1238, 0x121a, 0x161b, 0x1a1c, 0x221d, 0x2a3e, 0x2a3f, 0x325f - .2byte 0x1ac0, 0x16c2, 0x16a5, 0x16a8, 0x16ab, 0x16af, 0x16b2, 0x16b5, 0x1298, 0x127a, 0x167b, 0x1a5c, 0x225d, 0x2a7e, 0x2a7f, 0x327f - .2byte 0x1b00, 0x1702, 0x1304, 0x1308, 0x130b, 0x130e, 0x1311, 0x1314, 0x1318, 0x12fa, 0x16db, 0x1a9c, 0x229d, 0x2a9e, 0x2abf, 0x32bf - .2byte 0x1740, 0x1742, 0x1344, 0x1347, 0x134b, 0x134e, 0x1351, 0x1354, 0x1357, 0x135a, 0x171b, 0x1afc, 0x22dd, 0x2ade, 0x2adf, 0x32df - .2byte 0x1780, 0x13a1, 0x1765, 0x1768, 0x176a, 0x176d, 0x1770, 0x1773, 0x1776, 0x1779, 0x177b, 0x1b3c, 0x231d, 0x2b1e, 0x2b1f, 0x331f - .2byte 0x17e0, 0x13c2, 0x1b86, 0x1b89, 0x1b8b, 0x1b8d, 0x1b90, 0x1b93, 0x1b95, 0x1b97, 0x1b9a, 0x1b9c, 0x235d, 0x2b5e, 0x2b5f, 0x333f - .2byte 0x17e1, 0x1bc4, 0x23a8, 0x23aa, 0x23ac, 0x23ae, 0x23b0, 0x23b2, 0x23b4, 0x23b6, 0x23b8, 0x23bb, 0x23bd, 0x2b9e, 0x2b9f, 0x337f - .2byte 0x1fe3, 0x1fe6, 0x2bca, 0x2bcc, 0x2bcd, 0x2bcf, 0x2bd1, 0x2bd3, 0x2bd5, 0x2bd6, 0x2bd8, 0x2bda, 0x2bdc, 0x2bde, 0x2bbf, 0x339f - .2byte 0x23e5, 0x2be8, 0x2bea, 0x2bec, 0x2bee, 0x2bef, 0x2bf1, 0x2bf3, 0x2bf5, 0x2bf7, 0x2bf8, 0x2bfa, 0x2bfc, 0x2bfe, 0x2bff, 0x33df - .2byte 0x2fe8, 0x33ea, 0x33ec, 0x33ee, 0x33ef, 0x33f1, 0x33f2, 0x33f4, 0x33f5, 0x33f7, 0x33f8, 0x33fa, 0x33fb, 0x33fd, 0x33fe, 0x33ff - .2byte 0x1c21, 0x1c23, 0x1c25, 0x1c27, 0x1c29, 0x1c2b, 0x1c2d, 0x2416, 0x2418, 0x201a, 0x201c, 0x201f, 0x203f, 0x247f, 0x2cbf, 0x351f - .2byte 0x1c61, 0x1c63, 0x1c65, 0x1c67, 0x1c69, 0x1c6b, 0x2453, 0x2456, 0x2458, 0x205a, 0x203d, 0x205e, 0x249e, 0x28df, 0x311f, 0x355f - .2byte 0x1ca1, 0x1ca3, 0x1ca5, 0x1ca7, 0x1ca9, 0x24d0, 0x24b3, 0x20b5, 0x2098, 0x1c9a, 0x20bb, 0x24dc, 0x291d, 0x315e, 0x315f, 0x399f - .2byte 0x1ce1, 0x1ce3, 0x1ce5, 0x1ce7, 0x252d, 0x2110, 0x2112, 0x1cf5, 0x1cf7, 0x1cf9, 0x211a, 0x253b, 0x2d7c, 0x319e, 0x319f, 0x39df - .2byte 0x1d21, 0x1d23, 0x1d25, 0x25a9, 0x25ad, 0x2190, 0x2172, 0x1d75, 0x1d57, 0x1d59, 0x217a, 0x257b, 0x2dbc, 0x31be, 0x31df, 0x39ff - .2byte 0x1d61, 0x1d63, 0x2606, 0x2208, 0x220c, 0x2210, 0x21f2, 0x1dd5, 0x1db7, 0x1db9, 0x21ba, 0x25db, 0x2dfc, 0x31fe, 0x31ff, 0x3a3f - .2byte 0x1da1, 0x2662, 0x2665, 0x2248, 0x224b, 0x224f, 0x2252, 0x1e35, 0x1e17, 0x1e19, 0x221a, 0x261b, 0x2e3c, 0x323e, 0x323f, 0x3a7f - .2byte 0x26c0, 0x22c2, 0x22a5, 0x1ea7, 0x1eab, 0x1eae, 0x1eb1, 0x1eb5, 0x1e97, 0x1e79, 0x225a, 0x265b, 0x2e7c, 0x327e, 0x327f, 0x3a9f - .2byte 0x2700, 0x2302, 0x1f04, 0x1ee7, 0x1eea, 0x1eed, 0x1ef1, 0x1ef4, 0x1ef7, 0x1ed9, 0x22ba, 0x269b, 0x2ebc, 0x32be, 0x32bf, 0x3abf - .2byte 0x2340, 0x2342, 0x1f44, 0x1f27, 0x1f2a, 0x1f2d, 0x1f30, 0x1f33, 0x1f36, 0x1f39, 0x22fa, 0x26db, 0x2edc, 0x32de, 0x32df, 0x3aff - .2byte 0x2380, 0x1fa1, 0x1f65, 0x2348, 0x234b, 0x234e, 0x2350, 0x2353, 0x2355, 0x2358, 0x235a, 0x271b, 0x2f1c, 0x331e, 0x331f, 0x3b1f - .2byte 0x23e0, 0x1fc2, 0x2386, 0x2769, 0x276c, 0x276e, 0x2770, 0x2772, 0x2774, 0x2776, 0x2779, 0x277b, 0x2f5c, 0x335e, 0x335f, 0x3b3f - .2byte 0x23e1, 0x23c4, 0x27a8, 0x2f8b, 0x2f8d, 0x2f8f, 0x2f91, 0x2f93, 0x2f95, 0x2f97, 0x2f99, 0x2f9a, 0x2f9c, 0x339e, 0x339f, 0x3b7f - .2byte 0x27e3, 0x27e6, 0x2fca, 0x33cc, 0x33ce, 0x33cf, 0x33d1, 0x33d3, 0x33d5, 0x33d7, 0x33d8, 0x33da, 0x33dc, 0x33de, 0x33bf, 0x3b9f - .2byte 0x2be5, 0x33e8, 0x33ea, 0x33ec, 0x33ee, 0x33f0, 0x33f2, 0x33f3, 0x33f5, 0x33f7, 0x33f8, 0x33fa, 0x33fc, 0x33fe, 0x33ff, 0x3bdf - .2byte 0x33e8, 0x37ea, 0x37ec, 0x3bee, 0x3bf0, 0x3bf1, 0x3bf3, 0x3bf4, 0x3bf5, 0x3bf7, 0x3bf8, 0x3bfa, 0x3bfb, 0x3bfd, 0x3bfe, 0x3bff - .2byte 0x2421, 0x2423, 0x2425, 0x2427, 0x2429, 0x242b, 0x242d, 0x3416, 0x3018, 0x301a, 0x2c1c, 0x2c1f, 0x2c3f, 0x307f, 0x34bf, 0x391f - .2byte 0x2461, 0x2463, 0x2465, 0x2467, 0x2469, 0x246b, 0x3453, 0x3056, 0x2c58, 0x2c5a, 0x283d, 0x285e, 0x2c9e, 0x30df, 0x391f, 0x3d5f - .2byte 0x24a1, 0x24a3, 0x24a5, 0x24a7, 0x24a9, 0x34d0, 0x30b3, 0x2cb5, 0x2c98, 0x2c9a, 0x28bb, 0x2cdc, 0x311d, 0x355e, 0x395f, 0x3d9f - .2byte 0x24e1, 0x24e3, 0x24e5, 0x3529, 0x352d, 0x3110, 0x2d12, 0x2cf5, 0x28f7, 0x28f9, 0x2d1a, 0x313b, 0x357c, 0x399e, 0x399f, 0x41df - .2byte 0x2521, 0x2523, 0x2525, 0x35a9, 0x2d6d, 0x2d6f, 0x2952, 0x2954, 0x2956, 0x2d78, 0x2d79, 0x35ba, 0x35bc, 0x39de, 0x39df, 0x421f - .2byte 0x2561, 0x2563, 0x3206, 0x3208, 0x2deb, 0x2def, 0x29d2, 0x29b4, 0x29b6, 0x2db8, 0x2db9, 0x35fa, 0x35fc, 0x3a1e, 0x3a1f, 0x425f - .2byte 0x25a1, 0x3262, 0x3265, 0x2e48, 0x2a4a, 0x2a4e, 0x2a52, 0x2a34, 0x2a16, 0x2e18, 0x2e19, 0x363a, 0x363c, 0x3a3e, 0x3a5f, 0x427f - .2byte 0x32c0, 0x32c2, 0x2ea5, 0x2ea7, 0x2a8a, 0x2a8d, 0x2a91, 0x2a94, 0x2a76, 0x2e58, 0x2e59, 0x367a, 0x367c, 0x3a7e, 0x3a7f, 0x429f - .2byte 0x3300, 0x2f02, 0x2b04, 0x2ae7, 0x2aca, 0x2acd, 0x2ad0, 0x2ad3, 0x2ad6, 0x2eb8, 0x2e99, 0x36ba, 0x36bc, 0x3abe, 0x3abf, 0x42df - .2byte 0x2f40, 0x2f42, 0x2b44, 0x2b27, 0x2f0b, 0x2f0d, 0x2f10, 0x2f12, 0x2f15, 0x2f18, 0x2ed9, 0x36da, 0x36fc, 0x3afe, 0x3aff, 0x42ff - .2byte 0x2f80, 0x2ba1, 0x2b65, 0x2f48, 0x2f2b, 0x2f2e, 0x2f30, 0x2f32, 0x2f34, 0x2f37, 0x2f39, 0x371a, 0x371c, 0x3b1e, 0x3b1f, 0x431f - .2byte 0x2be0, 0x2bc2, 0x2f86, 0x2f69, 0x374d, 0x374f, 0x3751, 0x3753, 0x3755, 0x3757, 0x3759, 0x375a, 0x375c, 0x3b5e, 0x3b5f, 0x435f - .2byte 0x2be1, 0x2fc4, 0x2fa8, 0x378b, 0x378d, 0x378f, 0x3791, 0x3793, 0x3795, 0x3797, 0x3798, 0x379a, 0x379c, 0x3b9e, 0x3b9f, 0x437f - .2byte 0x2fe3, 0x33e6, 0x37ca, 0x37cc, 0x3bce, 0x3bd0, 0x3bd2, 0x3bd3, 0x3bd5, 0x3bd7, 0x3bd8, 0x3bda, 0x3bdc, 0x3bde, 0x3bbf, 0x439f - .2byte 0x33e5, 0x37e8, 0x37ea, 0x3bec, 0x3bee, 0x3bf0, 0x3bf2, 0x3bf4, 0x3bf5, 0x3bf7, 0x3bf9, 0x3bfa, 0x3bfc, 0x3bfe, 0x3bff, 0x43df - .2byte 0x3be8, 0x3bea, 0x3fec, 0x3fee, 0x43f0, 0x43f2, 0x43f3, 0x43f5, 0x43f6, 0x43f7, 0x43f9, 0x43fa, 0x43fb, 0x43fd, 0x43fe, 0x43ff - .2byte 0x2c21, 0x2c23, 0x2c25, 0x2c27, 0x2c29, 0x2c2b, 0x2c2d, 0x4016, 0x3c18, 0x3c1a, 0x381c, 0x381f, 0x343f, 0x387f, 0x3cbf, 0x411f - .2byte 0x2c61, 0x2c63, 0x2c65, 0x2c67, 0x2c69, 0x2c6b, 0x4053, 0x3c56, 0x3c58, 0x385a, 0x383d, 0x345e, 0x389e, 0x38df, 0x3d1f, 0x455f - .2byte 0x2ca1, 0x2ca3, 0x40c6, 0x40c9, 0x40cc, 0x40d0, 0x3cb3, 0x3cb5, 0x3898, 0x389a, 0x34bb, 0x34dc, 0x391d, 0x3d5e, 0x3d5f, 0x459f - .2byte 0x2ce1, 0x2ce3, 0x4126, 0x4108, 0x410c, 0x4110, 0x3d12, 0x38f5, 0x34f7, 0x34f9, 0x391a, 0x393b, 0x3d7c, 0x3d9e, 0x419f, 0x45df - .2byte 0x2d21, 0x2d23, 0x41a6, 0x4188, 0x3d6b, 0x3d6f, 0x3952, 0x3554, 0x3556, 0x3578, 0x3979, 0x3dba, 0x3dbc, 0x41de, 0x41df, 0x4a1f - .2byte 0x2d61, 0x2d63, 0x4206, 0x4208, 0x3deb, 0x35af, 0x35b2, 0x3194, 0x35b5, 0x35b7, 0x3df9, 0x3dfa, 0x3dfc, 0x421e, 0x463f, 0x4a5f - .2byte 0x2da1, 0x4262, 0x3e65, 0x3e48, 0x3a4a, 0x364d, 0x3652, 0x3214, 0x3615, 0x3617, 0x3e39, 0x3e3a, 0x3e3c, 0x425e, 0x465f, 0x4a7f - .2byte 0x3ec0, 0x3ec2, 0x3aa5, 0x3aa7, 0x368a, 0x328c, 0x3290, 0x3294, 0x3655, 0x3657, 0x3e79, 0x3e7a, 0x3e7c, 0x427e, 0x469f, 0x4abf - .2byte 0x3f00, 0x3b02, 0x3b04, 0x36e7, 0x36ca, 0x36ad, 0x36b0, 0x36b2, 0x36b5, 0x36b7, 0x3eb9, 0x3eba, 0x3ebc, 0x42be, 0x46bf, 0x4adf - .2byte 0x3b40, 0x3b42, 0x3744, 0x3727, 0x370b, 0x36ed, 0x36f0, 0x36f2, 0x36f5, 0x36f7, 0x3ef9, 0x3eda, 0x3efc, 0x42fe, 0x46ff, 0x4aff - .2byte 0x3b80, 0x37a1, 0x3765, 0x3748, 0x372b, 0x3f2f, 0x3f31, 0x3f33, 0x3f35, 0x3f37, 0x3f39, 0x3f1a, 0x3f1c, 0x431e, 0x473f, 0x4b3f - .2byte 0x37e0, 0x37c2, 0x3786, 0x3b69, 0x3f4d, 0x3f4f, 0x3f51, 0x3f53, 0x3f55, 0x3f57, 0x3f59, 0x3f5a, 0x3f5c, 0x435e, 0x475f, 0x4b5f - .2byte 0x37e1, 0x37c4, 0x3ba8, 0x3f8b, 0x3f8d, 0x3f8f, 0x3f91, 0x3f93, 0x3f95, 0x3f97, 0x3f99, 0x3f9a, 0x3f9c, 0x439e, 0x479f, 0x4b7f - .2byte 0x37e3, 0x37e6, 0x3fca, 0x3fcc, 0x43ce, 0x43d0, 0x43d2, 0x43d3, 0x43d5, 0x43d7, 0x43d9, 0x43da, 0x43dc, 0x43de, 0x47bf, 0x4bbf - .2byte 0x3be5, 0x3fe8, 0x3fea, 0x3fec, 0x43ee, 0x47f1, 0x47f2, 0x47f4, 0x47f5, 0x47f7, 0x47f9, 0x47fa, 0x47fc, 0x47fe, 0x47ff, 0x4bdf - .2byte 0x3fe8, 0x43ea, 0x43ec, 0x47ee, 0x4bf0, 0x4bf2, 0x4bf4, 0x4bf5, 0x4bf6, 0x4bf8, 0x4bf9, 0x4bfa, 0x4bfc, 0x4bfd, 0x4bfe, 0x4bff - .2byte 0x3421, 0x3423, 0x3425, 0x3427, 0x3429, 0x342b, 0x342d, 0x4c16, 0x4818, 0x441a, 0x441c, 0x441f, 0x403f, 0x407f, 0x40bf, 0x451f - .2byte 0x3461, 0x4c42, 0x4c46, 0x4c49, 0x4c4c, 0x4c50, 0x4c53, 0x4856, 0x4858, 0x445a, 0x443d, 0x405e, 0x409e, 0x40df, 0x451f, 0x495f - .2byte 0x34a1, 0x4cc2, 0x4ca5, 0x4ca9, 0x4cac, 0x4caf, 0x4cb3, 0x48b5, 0x4498, 0x449a, 0x40bb, 0x40dc, 0x411d, 0x455e, 0x455f, 0x499f - .2byte 0x34e1, 0x4d22, 0x4d25, 0x4908, 0x490b, 0x490f, 0x4912, 0x44f5, 0x44f7, 0x40f9, 0x411a, 0x413b, 0x457c, 0x459e, 0x499f, 0x4ddf - .2byte 0x3521, 0x4da2, 0x4d85, 0x4968, 0x494a, 0x494e, 0x4952, 0x4554, 0x4156, 0x4178, 0x4179, 0x45ba, 0x45bc, 0x49de, 0x49df, 0x4e1f - .2byte 0x3561, 0x4e02, 0x4de5, 0x49e8, 0x49ca, 0x49ad, 0x49b2, 0x4194, 0x41b5, 0x41b7, 0x45f9, 0x45fa, 0x45fc, 0x4a1e, 0x4a3f, 0x525f - .2byte 0x35a1, 0x4e62, 0x4e65, 0x4a48, 0x4a4a, 0x4a4d, 0x3df1, 0x3df3, 0x3df5, 0x4637, 0x4639, 0x463a, 0x4a5c, 0x4a5e, 0x4e7f, 0x529f - .2byte 0x4ec0, 0x4ac2, 0x4aa5, 0x46a7, 0x468a, 0x428c, 0x3e6f, 0x3e73, 0x3e55, 0x4677, 0x4679, 0x467a, 0x4a7c, 0x4a9e, 0x4e9f, 0x52df - .2byte 0x4b00, 0x4702, 0x4704, 0x42e7, 0x42ca, 0x42ad, 0x3eaf, 0x3eb2, 0x3eb5, 0x46b7, 0x46b9, 0x46ba, 0x4abc, 0x4abe, 0x4edf, 0x52ff - .2byte 0x4740, 0x4742, 0x4344, 0x4327, 0x430b, 0x42ed, 0x46f1, 0x46f3, 0x46f5, 0x46f7, 0x46f9, 0x46fa, 0x4afc, 0x4afe, 0x4eff, 0x531f - .2byte 0x4380, 0x43a1, 0x4365, 0x4348, 0x432b, 0x472f, 0x4731, 0x4733, 0x4735, 0x4737, 0x4739, 0x471a, 0x4b1c, 0x4b3e, 0x4f3f, 0x533f - .2byte 0x43e0, 0x43c2, 0x4386, 0x4369, 0x474d, 0x474f, 0x4751, 0x4753, 0x4755, 0x4757, 0x4759, 0x475a, 0x4b5c, 0x4b5e, 0x4f5f, 0x537f - .2byte 0x43e1, 0x43c4, 0x43a8, 0x478b, 0x478d, 0x478f, 0x4b92, 0x4b93, 0x4b95, 0x4b97, 0x4b99, 0x4b9a, 0x4b9c, 0x4b9e, 0x4f9f, 0x539f - .2byte 0x43e3, 0x43e6, 0x47ca, 0x47cc, 0x47ce, 0x4bd0, 0x4bd2, 0x4bd4, 0x4bd6, 0x4bd7, 0x4bd9, 0x4bda, 0x4bdc, 0x4bde, 0x4fbf, 0x53bf - .2byte 0x43e5, 0x47e8, 0x47ea, 0x47ec, 0x4bee, 0x4bf1, 0x4ff3, 0x4ff4, 0x4ff6, 0x4ff7, 0x4ff9, 0x4ffb, 0x4ffc, 0x4ffe, 0x4fff, 0x53df - .2byte 0x47e8, 0x4bea, 0x4bec, 0x4fee, 0x4ff0, 0x4ff2, 0x53f4, 0x53f6, 0x53f7, 0x53f8, 0x53f9, 0x53fb, 0x53fc, 0x53fd, 0x53fe, 0x53ff - .2byte 0x5800, 0x5803, 0x5806, 0x5809, 0x580c, 0x580f, 0x5813, 0x5816, 0x5418, 0x541a, 0x501c, 0x4c1f, 0x4c3f, 0x4c7f, 0x48bf, 0x4d1f - .2byte 0x5860, 0x5842, 0x5845, 0x5848, 0x584c, 0x584f, 0x5852, 0x5856, 0x5458, 0x505a, 0x503d, 0x4c5e, 0x489e, 0x48df, 0x4d1f, 0x4d5f - .2byte 0x58c0, 0x58a2, 0x54a5, 0x54a8, 0x54ab, 0x54ae, 0x54b2, 0x54b5, 0x5098, 0x509a, 0x4cbb, 0x4cdc, 0x491d, 0x4d5e, 0x4d5f, 0x519f - .2byte 0x5920, 0x5922, 0x5505, 0x54e7, 0x54eb, 0x54ee, 0x54f1, 0x54f5, 0x50f7, 0x4cf9, 0x4d1a, 0x493b, 0x4d7c, 0x4d9e, 0x4d9f, 0x51df - .2byte 0x59a0, 0x5982, 0x5565, 0x5567, 0x514a, 0x514d, 0x5151, 0x5154, 0x4d56, 0x4978, 0x4979, 0x4dba, 0x4dbc, 0x4dde, 0x51df, 0x561f - .2byte 0x5a00, 0x59e2, 0x55e5, 0x55c7, 0x51aa, 0x518c, 0x5190, 0x5194, 0x49b5, 0x49b7, 0x4df9, 0x4dfa, 0x4dfc, 0x4e1e, 0x523f, 0x565f - .2byte 0x5a60, 0x5a42, 0x5645, 0x5627, 0x522a, 0x520c, 0x4def, 0x4df3, 0x49f5, 0x4e37, 0x4e39, 0x4e3a, 0x4e5c, 0x525e, 0x527f, 0x5a9f - .2byte 0x5ac0, 0x5ac2, 0x56a5, 0x56a7, 0x528a, 0x528c, 0x4e6f, 0x4633, 0x4a55, 0x4a57, 0x4e79, 0x4e7b, 0x529c, 0x529e, 0x56bf, 0x5adf - .2byte 0x5700, 0x5702, 0x5304, 0x52e7, 0x4eca, 0x4aad, 0x4aaf, 0x4ab2, 0x4ab5, 0x4ab7, 0x4eb9, 0x4ebb, 0x52bc, 0x52de, 0x56df, 0x5b1f - .2byte 0x5340, 0x5342, 0x4f44, 0x4f27, 0x4b0b, 0x4aed, 0x4ef1, 0x4af2, 0x4af5, 0x4af7, 0x4ef9, 0x4efb, 0x52fc, 0x52fe, 0x571f, 0x5b3f - .2byte 0x4f80, 0x4fa1, 0x4f65, 0x4b48, 0x4b2b, 0x4f2f, 0x4f31, 0x4f33, 0x4f35, 0x4f37, 0x4f39, 0x4f3b, 0x533c, 0x533e, 0x573f, 0x5b5f - .2byte 0x4fe0, 0x4bc2, 0x4b86, 0x4b69, 0x4f4d, 0x4f4f, 0x4f51, 0x4f73, 0x4f75, 0x4f77, 0x4f79, 0x4f7b, 0x535c, 0x535e, 0x577f, 0x5b7f - .2byte 0x4be1, 0x4bc4, 0x4ba8, 0x4f8b, 0x4f8d, 0x4f8f, 0x4f92, 0x5394, 0x5395, 0x5397, 0x5399, 0x539a, 0x539c, 0x539e, 0x579f, 0x5b9f - .2byte 0x4be3, 0x4be6, 0x4fca, 0x4fcc, 0x4fce, 0x4fd0, 0x53d2, 0x53d4, 0x53d6, 0x53d7, 0x53d9, 0x53da, 0x53dc, 0x53de, 0x57df, 0x5bbf - .2byte 0x4be5, 0x4fe8, 0x4fea, 0x4fec, 0x4fee, 0x53f1, 0x53f3, 0x57f5, 0x57f6, 0x57f8, 0x57f9, 0x57fb, 0x57fc, 0x57fe, 0x57ff, 0x5bdf - .2byte 0x4fe8, 0x4fea, 0x4fec, 0x53ee, 0x53f0, 0x57f2, 0x5bf4, 0x5bf6, 0x5bf8, 0x5bf9, 0x5bfa, 0x5bfb, 0x5bfc, 0x5bfd, 0x5bfe, 0x5bff - .2byte 0x6000, 0x6002, 0x6006, 0x6009, 0x600c, 0x600f, 0x6012, 0x6015, 0x6018, 0x601a, 0x5c1c, 0x581f, 0x543f, 0x507f, 0x50bf, 0x551f - .2byte 0x6060, 0x6042, 0x6045, 0x6048, 0x604b, 0x604e, 0x6051, 0x6055, 0x6058, 0x5c5a, 0x5c3d, 0x585e, 0x549e, 0x50df, 0x551f, 0x555f - .2byte 0x60c0, 0x60a2, 0x6084, 0x6087, 0x608a, 0x608e, 0x6091, 0x6094, 0x6098, 0x5c9a, 0x58bb, 0x54dc, 0x511d, 0x555e, 0x555f, 0x559f - .2byte 0x6120, 0x6122, 0x6104, 0x5ce7, 0x5cea, 0x5ced, 0x5cf0, 0x5cf4, 0x5cf7, 0x58f9, 0x551a, 0x513b, 0x557c, 0x559e, 0x559f, 0x55df - .2byte 0x6180, 0x6162, 0x6164, 0x5d47, 0x594a, 0x594d, 0x5950, 0x5953, 0x5956, 0x5578, 0x5179, 0x55ba, 0x55bc, 0x55de, 0x55df, 0x5a1f - .2byte 0x61e0, 0x61e2, 0x61c4, 0x5da7, 0x59aa, 0x55ad, 0x55b0, 0x55b2, 0x55b5, 0x55b7, 0x55f9, 0x55fa, 0x55fc, 0x561e, 0x563f, 0x5a5f - .2byte 0x6240, 0x6242, 0x6224, 0x5e27, 0x5a0a, 0x560d, 0x55ef, 0x55f2, 0x55f5, 0x5637, 0x5639, 0x563a, 0x565c, 0x5a5e, 0x5a7f, 0x5e9f - .2byte 0x62a0, 0x62a2, 0x6284, 0x5e87, 0x5a6a, 0x564d, 0x564f, 0x5652, 0x5655, 0x5657, 0x5679, 0x567b, 0x569c, 0x5a9e, 0x5abf, 0x62df - .2byte 0x6300, 0x6302, 0x6304, 0x5ee7, 0x5aca, 0x56ad, 0x56af, 0x56b2, 0x5296, 0x5297, 0x56b9, 0x56bb, 0x5adc, 0x5ade, 0x5eff, 0x6b5f - .2byte 0x5f40, 0x5f42, 0x5f44, 0x5b27, 0x570b, 0x56ed, 0x56f1, 0x56f2, 0x52f4, 0x52f7, 0x56f9, 0x56fb, 0x5afc, 0x5b1e, 0x5f1f, 0x6b7f - .2byte 0x5b80, 0x5ba1, 0x5b65, 0x5748, 0x532b, 0x572f, 0x5731, 0x5733, 0x5735, 0x5737, 0x5739, 0x573b, 0x5b3c, 0x5b3e, 0x5f5f, 0x6b7f - .2byte 0x5be0, 0x57c2, 0x5386, 0x5369, 0x574d, 0x574f, 0x5751, 0x5773, 0x5775, 0x5777, 0x5779, 0x577b, 0x5b7c, 0x5b7e, 0x5f7f, 0x6b9f - .2byte 0x57e1, 0x53c4, 0x53a8, 0x578b, 0x578d, 0x578f, 0x5792, 0x5794, 0x5b96, 0x5b97, 0x5b99, 0x5b9b, 0x5b9c, 0x5b9e, 0x5f9f, 0x6bbf - .2byte 0x53e3, 0x53e6, 0x53ca, 0x57cc, 0x57ce, 0x57d0, 0x57d2, 0x5bd4, 0x5bd6, 0x5bd8, 0x5bd9, 0x5bdb, 0x5bdc, 0x5bde, 0x5fdf, 0x6bdf - .2byte 0x53e5, 0x57e8, 0x57ea, 0x57ec, 0x57ee, 0x57f1, 0x5bf3, 0x5bf5, 0x5ff7, 0x5ff8, 0x5ffa, 0x5ffb, 0x5ffc, 0x5ffe, 0x5fff, 0x6bff - .2byte 0x53e8, 0x57ea, 0x57ec, 0x57ee, 0x5bf0, 0x5bf2, 0x5ff4, 0x63f6, 0x6bfa, 0x6bfb, 0x6bfc, 0x6bfc, 0x6bfd, 0x6bfe, 0x6bff, 0x6bff - .2byte 0x6800, 0x6802, 0x6805, 0x6808, 0x680b, 0x680e, 0x6811, 0x6814, 0x6817, 0x681a, 0x681c, 0x641f, 0x603f, 0x5c7f, 0x58bf, 0x591f - .2byte 0x6860, 0x6842, 0x6845, 0x6848, 0x684b, 0x684e, 0x6851, 0x6854, 0x6857, 0x685a, 0x683d, 0x605e, 0x5c9e, 0x58df, 0x5d1f, 0x5d5f - .2byte 0x68c0, 0x68a2, 0x6884, 0x6887, 0x688a, 0x688d, 0x6890, 0x6893, 0x6897, 0x689a, 0x64bb, 0x5cdc, 0x591d, 0x595e, 0x5d5f, 0x5d9f - .2byte 0x6900, 0x6902, 0x68e4, 0x64e7, 0x64ea, 0x64ed, 0x64f0, 0x64f3, 0x64f6, 0x64f9, 0x611a, 0x593b, 0x5d7c, 0x5d9e, 0x5d9f, 0x5ddf - .2byte 0x6980, 0x6962, 0x6964, 0x6547, 0x616b, 0x616d, 0x6170, 0x6172, 0x6175, 0x6178, 0x5d79, 0x5dba, 0x5dbc, 0x5dde, 0x5ddf, 0x5e1f - .2byte 0x69e0, 0x69c2, 0x69c4, 0x65a7, 0x61ab, 0x5dad, 0x5db0, 0x5db2, 0x5db5, 0x5db7, 0x5df9, 0x5dfa, 0x5dfc, 0x5e1e, 0x5e3f, 0x625f - .2byte 0x6a20, 0x6a22, 0x6a24, 0x6607, 0x620b, 0x5e0d, 0x5e31, 0x5e33, 0x5e35, 0x5e37, 0x5e39, 0x5e3a, 0x5e5c, 0x5e5e, 0x5e7f, 0x629f - .2byte 0x6aa0, 0x6a82, 0x6a84, 0x6667, 0x624b, 0x5e4d, 0x5e71, 0x5e52, 0x5e55, 0x5e57, 0x5e79, 0x5e7b, 0x5e9c, 0x5e9e, 0x62bf, 0x66df - .2byte 0x6b00, 0x6ae2, 0x6ae4, 0x66c7, 0x62ab, 0x5ead, 0x5eb1, 0x5eb2, 0x5e94, 0x5e97, 0x5eb9, 0x5ebb, 0x5edc, 0x62de, 0x62ff, 0x6f5f - .2byte 0x6b40, 0x6b42, 0x6b44, 0x6727, 0x630b, 0x5eed, 0x5ef1, 0x5ef2, 0x5ef4, 0x5ad8, 0x5ef9, 0x5efb, 0x631c, 0x631e, 0x6b5f, 0x739f - .2byte 0x6780, 0x6ba1, 0x6365, 0x5f48, 0x5b2b, 0x5f2f, 0x5f31, 0x5f33, 0x5f35, 0x5f37, 0x5f39, 0x5f3b, 0x633c, 0x635e, 0x6b7f, 0x739f - .2byte 0x63e0, 0x63c2, 0x5f86, 0x5b69, 0x5b4d, 0x5b4f, 0x5f51, 0x5f73, 0x5f75, 0x5f77, 0x5f79, 0x5f7b, 0x637c, 0x637e, 0x6b9f, 0x73bf - .2byte 0x63e1, 0x5fc4, 0x5ba8, 0x5b8b, 0x5f8d, 0x5f8f, 0x5f92, 0x5f94, 0x5f96, 0x6398, 0x6399, 0x639b, 0x639c, 0x639e, 0x6bbf, 0x73df - .2byte 0x5be3, 0x5be6, 0x5bca, 0x5bcc, 0x5fce, 0x5fd0, 0x5fd2, 0x5fd4, 0x63d6, 0x63d8, 0x63da, 0x63db, 0x63dc, 0x63de, 0x6bdf, 0x73df - .2byte 0x5be5, 0x5be8, 0x5bea, 0x5bec, 0x5fee, 0x5ff1, 0x5ff3, 0x63f5, 0x63f7, 0x6bfa, 0x6bfb, 0x6bfc, 0x6bfd, 0x6bfe, 0x6bff, 0x73ff - .2byte 0x5be8, 0x5bea, 0x5bec, 0x5fee, 0x5ff0, 0x5ff2, 0x63f4, 0x67f6, 0x6ffa, 0x73fc, 0x73fc, 0x73fd, 0x73fe, 0x73fe, 0x73ff, 0x73ff - .2byte 0x7000, 0x7002, 0x7005, 0x7008, 0x700b, 0x700e, 0x7010, 0x7013, 0x7016, 0x7019, 0x701c, 0x701f, 0x683f, 0x647f, 0x60bf, 0x611f - .2byte 0x7040, 0x7421, 0x7424, 0x7427, 0x742a, 0x742d, 0x7430, 0x7433, 0x7436, 0x743a, 0x743d, 0x6c5e, 0x649e, 0x60df, 0x611f, 0x615f - .2byte 0x70a0, 0x7481, 0x6ca5, 0x6ca7, 0x6caa, 0x6cad, 0x6cb0, 0x6cb3, 0x6cb6, 0x6cb8, 0x6cbb, 0x68dc, 0x611d, 0x615e, 0x615f, 0x619f - .2byte 0x7100, 0x7501, 0x6d05, 0x6908, 0x690b, 0x690d, 0x6910, 0x6912, 0x6915, 0x6917, 0x691a, 0x653b, 0x657c, 0x619e, 0x619f, 0x61df - .2byte 0x7160, 0x7541, 0x6d45, 0x6968, 0x656b, 0x656d, 0x6570, 0x6572, 0x6574, 0x6576, 0x6579, 0x65ba, 0x61bc, 0x61de, 0x65df, 0x661f - .2byte 0x71c0, 0x75c1, 0x6da5, 0x69c8, 0x65cb, 0x65ef, 0x65f1, 0x65f3, 0x65f5, 0x65f7, 0x65f9, 0x65fa, 0x65fc, 0x661e, 0x663f, 0x665f - .2byte 0x7220, 0x7621, 0x6e05, 0x6a08, 0x660b, 0x662f, 0x6631, 0x6633, 0x6635, 0x6637, 0x6639, 0x663a, 0x665c, 0x665e, 0x667f, 0x669f - .2byte 0x7280, 0x7681, 0x6e65, 0x6a68, 0x664b, 0x666f, 0x6671, 0x6673, 0x6675, 0x6677, 0x6679, 0x667b, 0x669c, 0x669e, 0x66bf, 0x6adf - .2byte 0x72e0, 0x76e1, 0x6ec5, 0x6aa8, 0x668b, 0x66af, 0x66b1, 0x66b3, 0x66b5, 0x66b7, 0x66b9, 0x66bb, 0x66dc, 0x66de, 0x6aff, 0x735f - .2byte 0x7340, 0x7741, 0x6f25, 0x6b08, 0x66eb, 0x66ef, 0x66f1, 0x66f3, 0x66f5, 0x66f7, 0x66f9, 0x66fb, 0x671c, 0x6b1e, 0x6f5f, 0x739f - .2byte 0x7380, 0x77a1, 0x6f65, 0x6b48, 0x672b, 0x672f, 0x6731, 0x6733, 0x6735, 0x6737, 0x6319, 0x673b, 0x673d, 0x6f7e, 0x739f, 0x7bdf - .2byte 0x6fe0, 0x6fc2, 0x6786, 0x6369, 0x634d, 0x634f, 0x6351, 0x6773, 0x6775, 0x6777, 0x6779, 0x677b, 0x677d, 0x6f9e, 0x73bf, 0x7bdf - .2byte 0x6be1, 0x67c4, 0x63a8, 0x638b, 0x638d, 0x638f, 0x6392, 0x6794, 0x6796, 0x6798, 0x67b9, 0x67bb, 0x67bd, 0x6fbe, 0x73df, 0x7bff - .2byte 0x63e3, 0x63e6, 0x63ca, 0x63cc, 0x63ce, 0x63d0, 0x67d2, 0x67d4, 0x67d6, 0x6bd8, 0x6fdb, 0x6fdc, 0x6fdd, 0x6fde, 0x73df, 0x7bff - .2byte 0x5fe5, 0x63e8, 0x63ea, 0x63ec, 0x63ee, 0x67f1, 0x67f3, 0x67f5, 0x6bf7, 0x6ffa, 0x73fc, 0x73fd, 0x73fe, 0x73fe, 0x73ff, 0x7bff - .2byte 0x5fe8, 0x63ea, 0x63ec, 0x63ee, 0x63f0, 0x67f2, 0x67f4, 0x6bf6, 0x6ffa, 0x73fc, 0x7bfe, 0x7bfe, 0x7bff, 0x7bff, 0x7bff, 0x7bff - .2byte 0x7c00, 0x7c02, 0x7c05, 0x7c08, 0x7c0a, 0x7c0d, 0x7c10, 0x7c13, 0x7c16, 0x7c18, 0x7c1b, 0x7c1f, 0x743f, 0x6c7f, 0x68bf, 0x651f - .2byte 0x7c60, 0x7842, 0x7844, 0x7847, 0x784a, 0x784d, 0x7850, 0x7852, 0x7855, 0x7858, 0x785b, 0x785e, 0x709e, 0x68df, 0x691f, 0x655f - .2byte 0x7ca0, 0x78a2, 0x70c6, 0x70c8, 0x70cb, 0x70cd, 0x70d0, 0x70d2, 0x70d4, 0x70d7, 0x70d9, 0x70dc, 0x6d1d, 0x695e, 0x695f, 0x699f - .2byte 0x7d00, 0x7902, 0x7126, 0x6d29, 0x6d2b, 0x6d2e, 0x6d30, 0x6d32, 0x6d34, 0x6d36, 0x6d38, 0x6d3b, 0x697c, 0x699e, 0x699f, 0x69df - .2byte 0x7d60, 0x7942, 0x7166, 0x6d89, 0x69ad, 0x69af, 0x69b1, 0x69b3, 0x69b5, 0x69b6, 0x69b8, 0x69ba, 0x69bc, 0x69de, 0x69df, 0x6a1f - .2byte 0x7dc0, 0x79a2, 0x71a6, 0x6dc9, 0x69ed, 0x69ef, 0x69f1, 0x69f3, 0x69f5, 0x69f6, 0x69f8, 0x69fa, 0x69fc, 0x6a1e, 0x6a3f, 0x6a5f - .2byte 0x7e20, 0x7a02, 0x7206, 0x6e09, 0x6a2d, 0x6a2f, 0x6a31, 0x6a33, 0x6a35, 0x6a37, 0x6a38, 0x6a3a, 0x6a5c, 0x6a5e, 0x6e7f, 0x6e9f - .2byte 0x7e60, 0x7a62, 0x7266, 0x6e49, 0x6a6d, 0x6a6f, 0x6a71, 0x6e73, 0x6e75, 0x6e77, 0x6e79, 0x6e7b, 0x6a9c, 0x6a9e, 0x6ebf, 0x6edf - .2byte 0x7ec0, 0x7ac2, 0x72a6, 0x6e89, 0x6aad, 0x6aaf, 0x6ab1, 0x6eb3, 0x6eb5, 0x6eb7, 0x6eb9, 0x6ebb, 0x6edc, 0x6ede, 0x6eff, 0x735f - .2byte 0x7f20, 0x7b02, 0x72e6, 0x6ec9, 0x6aed, 0x6aef, 0x6af1, 0x6ef3, 0x6ef5, 0x6ef7, 0x6ef9, 0x6efb, 0x6f1c, 0x6f1e, 0x735f, 0x779f - .2byte 0x7f80, 0x7b62, 0x7346, 0x6f29, 0x6b2d, 0x6b2f, 0x6b31, 0x6f33, 0x6f35, 0x6f37, 0x6f39, 0x6f3b, 0x6f3d, 0x737e, 0x779f, 0x7bdf - .2byte 0x7fe0, 0x7bc2, 0x7386, 0x6f69, 0x6b4d, 0x6b4f, 0x6b51, 0x6f73, 0x6f75, 0x6f77, 0x6f79, 0x6f7b, 0x739d, 0x77be, 0x7bdf, 0x7fff - .2byte 0x73e1, 0x73c4, 0x6ba8, 0x6b8b, 0x6b8d, 0x6b8f, 0x6b92, 0x6b94, 0x6f96, 0x6f98, 0x6fb9, 0x73bc, 0x73bd, 0x77de, 0x7bdf, 0x7fff - .2byte 0x6fe3, 0x6be6, 0x6bca, 0x6bcc, 0x6bce, 0x6bd0, 0x6bd2, 0x6bd4, 0x6fd6, 0x6fd8, 0x73db, 0x77dd, 0x77de, 0x77de, 0x7bff, 0x7fff - .2byte 0x6be5, 0x6be8, 0x6bea, 0x6bec, 0x6bee, 0x6bf1, 0x6bf3, 0x6ff5, 0x6ff7, 0x73fa, 0x77fc, 0x7bfe, 0x7bff, 0x7bff, 0x7bff, 0x7fff - .2byte 0x67e8, 0x67ea, 0x67ec, 0x67ee, 0x6bf0, 0x6bf2, 0x6ff4, 0x6ff6, 0x73fa, 0x77fc, 0x7bfe, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7c21, 0x7c23, 0x7c25, 0x7c28, 0x7c2a, 0x7c2d, 0x7c30, 0x7c32, 0x7c35, 0x7c38, 0x7c3a, 0x7c3c, 0x7c3f, 0x787f, 0x70bf, 0x6d1f - .2byte 0x7c61, 0x7884, 0x7886, 0x7888, 0x788b, 0x788d, 0x7890, 0x7892, 0x7894, 0x7897, 0x7899, 0x789c, 0x789e, 0x74df, 0x711f, 0x6d5f - .2byte 0x7cc1, 0x78c4, 0x7508, 0x7509, 0x750b, 0x750e, 0x7510, 0x7512, 0x7514, 0x7516, 0x7518, 0x751a, 0x751d, 0x715e, 0x715f, 0x6d9f - .2byte 0x7d01, 0x7924, 0x7548, 0x716b, 0x716d, 0x716f, 0x7171, 0x7173, 0x7175, 0x7176, 0x7178, 0x717a, 0x717c, 0x719e, 0x719f, 0x6ddf - .2byte 0x7d61, 0x7964, 0x7588, 0x71ab, 0x71ad, 0x71af, 0x71b1, 0x71b3, 0x71b5, 0x71b7, 0x71b8, 0x71ba, 0x71bc, 0x71de, 0x71df, 0x6e1f - .2byte 0x7da1, 0x79c4, 0x75c8, 0x71eb, 0x71ed, 0x71ef, 0x71f1, 0x71f3, 0x71f5, 0x71f7, 0x71f8, 0x71fa, 0x71fc, 0x721e, 0x723f, 0x725f - .2byte 0x7e01, 0x7a04, 0x7608, 0x722b, 0x722d, 0x722f, 0x7252, 0x7253, 0x7255, 0x7257, 0x7258, 0x725a, 0x725c, 0x725e, 0x727f, 0x729f - .2byte 0x7e61, 0x7a44, 0x7648, 0x726b, 0x726d, 0x726f, 0x7272, 0x7294, 0x7295, 0x7297, 0x7299, 0x729a, 0x729c, 0x729e, 0x72bf, 0x72df - .2byte 0x7ea1, 0x7aa4, 0x7688, 0x72ab, 0x72ad, 0x72af, 0x72b2, 0x72b4, 0x72d6, 0x72d7, 0x72d9, 0x72db, 0x72dc, 0x72de, 0x72ff, 0x775f - .2byte 0x7f01, 0x7ae4, 0x76c8, 0x72eb, 0x72ed, 0x72ef, 0x72f2, 0x72f4, 0x72f6, 0x7318, 0x7319, 0x731b, 0x731c, 0x731e, 0x775f, 0x7b9f - .2byte 0x7f41, 0x7b24, 0x7708, 0x732b, 0x730d, 0x732f, 0x7332, 0x7334, 0x7336, 0x7338, 0x7739, 0x773b, 0x773d, 0x777e, 0x7b9f, 0x7fdf - .2byte 0x7fa1, 0x7b84, 0x7768, 0x734b, 0x734d, 0x734f, 0x7352, 0x7354, 0x7376, 0x7378, 0x7779, 0x779c, 0x779d, 0x7bbe, 0x7fdf, 0x7fff - .2byte 0x7fe1, 0x7bc4, 0x77a8, 0x738b, 0x738d, 0x738f, 0x7392, 0x7394, 0x7396, 0x7398, 0x77b9, 0x77bc, 0x7bde, 0x7bdf, 0x7fff, 0x7fff - .2byte 0x77e3, 0x73e6, 0x73ca, 0x73cc, 0x73ce, 0x73d0, 0x73d2, 0x73d4, 0x73d6, 0x73d8, 0x77db, 0x7bdd, 0x7bfe, 0x7bff, 0x7fff, 0x7fff - .2byte 0x6fe5, 0x73e8, 0x73ea, 0x73ec, 0x73ee, 0x73f1, 0x73f3, 0x73f5, 0x73f7, 0x77fa, 0x7bfc, 0x7bfe, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x6be8, 0x6fea, 0x6fec, 0x6fee, 0x6ff0, 0x6ff2, 0x73f4, 0x73f6, 0x77fa, 0x7bfc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7c63, 0x7c65, 0x7c67, 0x7c69, 0x7c6b, 0x7c6d, 0x7c70, 0x7c72, 0x7c74, 0x7c76, 0x7c78, 0x7c7b, 0x7c7d, 0x7c7f, 0x78bf, 0x711f - .2byte 0x7ca3, 0x7cc6, 0x7cc7, 0x7cc9, 0x7ccc, 0x7ccd, 0x7cd0, 0x7cd2, 0x7cd4, 0x7cd6, 0x7cd8, 0x7cda, 0x7cdc, 0x7cdf, 0x791f, 0x755f - .2byte 0x7ce3, 0x7d06, 0x794a, 0x794b, 0x794d, 0x794f, 0x7951, 0x7953, 0x7954, 0x7956, 0x7958, 0x795a, 0x795c, 0x795e, 0x795f, 0x759f - .2byte 0x7d23, 0x7d46, 0x798a, 0x798c, 0x798d, 0x798f, 0x7991, 0x7993, 0x7995, 0x7996, 0x7998, 0x799a, 0x799c, 0x799e, 0x799f, 0x75df - .2byte 0x7d83, 0x7d86, 0x79aa, 0x79cc, 0x79ce, 0x79d0, 0x79d1, 0x79d3, 0x79d5, 0x79d7, 0x79d8, 0x79da, 0x79dc, 0x79de, 0x79df, 0x761f - .2byte 0x7dc3, 0x7dc6, 0x79ea, 0x79ec, 0x7a0e, 0x7a10, 0x7a12, 0x7a13, 0x7a15, 0x7a17, 0x7a18, 0x7a1a, 0x7a1c, 0x7a1e, 0x7a3f, 0x765f - .2byte 0x7e03, 0x7e06, 0x7a2a, 0x7a2c, 0x7a4e, 0x7a50, 0x7a52, 0x7a54, 0x7a55, 0x7a57, 0x7a59, 0x7a5a, 0x7a5c, 0x7a5e, 0x7a7f, 0x769f - .2byte 0x7e63, 0x7e46, 0x7a6a, 0x7a6c, 0x7a6e, 0x7a70, 0x7a92, 0x7a94, 0x7a96, 0x7a97, 0x7a99, 0x7a9a, 0x7a9c, 0x7a9e, 0x7abf, 0x76df - .2byte 0x7e83, 0x7e86, 0x7aaa, 0x7aac, 0x7aae, 0x7ab0, 0x7ad2, 0x7ad4, 0x7ad6, 0x7ad8, 0x7ad9, 0x7adb, 0x7adc, 0x7ade, 0x7aff, 0x7b5f - .2byte 0x7ee3, 0x7ec6, 0x7aca, 0x7aec, 0x7aee, 0x7af0, 0x7af2, 0x7af4, 0x7b16, 0x7b18, 0x7b1a, 0x7b1b, 0x7b1c, 0x7b1e, 0x7b5f, 0x7b9f - .2byte 0x7f23, 0x7f06, 0x7b0a, 0x7b0c, 0x7b0e, 0x7b30, 0x7b32, 0x7b34, 0x7b36, 0x7b58, 0x7b7b, 0x7b7c, 0x7b7d, 0x7b7e, 0x7b9f, 0x7fdf - .2byte 0x7f63, 0x7f46, 0x7b4a, 0x7b4c, 0x7b4e, 0x7b50, 0x7b52, 0x7b54, 0x7b76, 0x7b78, 0x7b9b, 0x7bbd, 0x7bbe, 0x7bbe, 0x7fdf, 0x7fff - .2byte 0x7fc3, 0x7fa6, 0x7b8a, 0x7b8c, 0x7b8e, 0x7b90, 0x7b92, 0x7b94, 0x7b96, 0x7b98, 0x7bbb, 0x7bdd, 0x7fde, 0x7fdf, 0x7fff, 0x7fff - .2byte 0x7fe3, 0x7fe6, 0x7bca, 0x7bcc, 0x7bce, 0x7bd0, 0x7bd2, 0x7bd4, 0x7bd6, 0x7bd8, 0x7bdb, 0x7bdd, 0x7ffe, 0x7fff, 0x7fff, 0x7fff - .2byte 0x77e5, 0x7be8, 0x77ea, 0x77ec, 0x77ee, 0x77f1, 0x77f3, 0x7bf5, 0x7bf7, 0x7bfa, 0x7bfc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x73e8, 0x73ea, 0x73ec, 0x73ee, 0x73f0, 0x77f2, 0x77f4, 0x77f6, 0x7bfa, 0x7bfc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7ca5, 0x7ca6, 0x7ca8, 0x7caa, 0x7cac, 0x7cae, 0x7cb0, 0x7cb2, 0x7cb4, 0x7cb6, 0x7cb7, 0x7cba, 0x7cbb, 0x7cbd, 0x7cbf, 0x791f - .2byte 0x7ce5, 0x7d08, 0x7d0a, 0x7d0c, 0x7d0d, 0x7d0f, 0x7d11, 0x7d13, 0x7d15, 0x7d16, 0x7d18, 0x7d1a, 0x7d1c, 0x7d1e, 0x7d1f, 0x795f - .2byte 0x7d25, 0x7d48, 0x7d4a, 0x7d4c, 0x7d4d, 0x7d4f, 0x7d51, 0x7d53, 0x7d55, 0x7d56, 0x7d58, 0x7d5a, 0x7d5c, 0x7d5d, 0x7d5f, 0x799f - .2byte 0x7d65, 0x7d88, 0x7d8a, 0x7d8c, 0x7d8e, 0x7d8f, 0x7d91, 0x7d93, 0x7d95, 0x7d96, 0x7d98, 0x7d9a, 0x7d9c, 0x7d9d, 0x7d9f, 0x79df - .2byte 0x7da5, 0x7dc8, 0x7dca, 0x7dcc, 0x7dce, 0x7dd0, 0x7dd2, 0x7dd3, 0x7dd5, 0x7dd7, 0x7dd8, 0x7dda, 0x7ddc, 0x7ddd, 0x7ddf, 0x7a1f - .2byte 0x7de5, 0x7de8, 0x7dea, 0x7e0c, 0x7e0e, 0x7e31, 0x7e32, 0x7e34, 0x7e35, 0x7e37, 0x7e39, 0x7e3a, 0x7e3c, 0x7e3d, 0x7e3f, 0x7a5f - .2byte 0x7e05, 0x7e28, 0x7e2a, 0x7e4c, 0x7e4e, 0x7e51, 0x7e73, 0x7e74, 0x7e76, 0x7e77, 0x7e79, 0x7e7a, 0x7e7c, 0x7e7d, 0x7e7f, 0x7a9f - .2byte 0x7e45, 0x7e68, 0x7e6a, 0x7e6c, 0x7e8e, 0x7e91, 0x7e93, 0x7eb5, 0x7eb6, 0x7eb8, 0x7eb9, 0x7ebb, 0x7ebc, 0x7ebe, 0x7ebf, 0x7adf - .2byte 0x7e85, 0x7ea8, 0x7eaa, 0x7eac, 0x7eae, 0x7eb1, 0x7ed3, 0x7ed5, 0x7ef7, 0x7ef8, 0x7efa, 0x7efb, 0x7efc, 0x7efe, 0x7eff, 0x7f5f - .2byte 0x7ec5, 0x7ee8, 0x7eea, 0x7eec, 0x7eee, 0x7ef1, 0x7ef3, 0x7f15, 0x7f17, 0x7f5a, 0x7f5b, 0x7f5c, 0x7f5d, 0x7f5e, 0x7f5f, 0x7f9f - .2byte 0x7f05, 0x7f08, 0x7f0a, 0x7f0c, 0x7f2e, 0x7f31, 0x7f33, 0x7f35, 0x7f57, 0x7f7a, 0x7f9c, 0x7f9d, 0x7f9e, 0x7f9e, 0x7f9f, 0x7fdf - .2byte 0x7f45, 0x7f48, 0x7f4a, 0x7f4c, 0x7f4e, 0x7f51, 0x7f73, 0x7f75, 0x7f77, 0x7f9a, 0x7fbc, 0x7fde, 0x7fde, 0x7fdf, 0x7fdf, 0x7fff - .2byte 0x7f85, 0x7f88, 0x7f8a, 0x7f8c, 0x7f8e, 0x7f91, 0x7f93, 0x7f95, 0x7f97, 0x7fba, 0x7fdc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7fc5, 0x7fc8, 0x7fca, 0x7fcc, 0x7fce, 0x7fd1, 0x7fd3, 0x7fd5, 0x7fd7, 0x7fda, 0x7fdc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7fe5, 0x7fe8, 0x7fea, 0x7fec, 0x7fee, 0x7ff1, 0x7ff3, 0x7ff5, 0x7ff7, 0x7ffa, 0x7ffc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7be8, 0x7bea, 0x7bec, 0x7bee, 0x7bf0, 0x7bf2, 0x7bf4, 0x7bf6, 0x7ffa, 0x7ffc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7d08, 0x7d09, 0x7d0b, 0x7d0c, 0x7d0e, 0x7d0f, 0x7d11, 0x7d13, 0x7d14, 0x7d16, 0x7d17, 0x7d19, 0x7d1a, 0x7d1c, 0x7d1e, 0x7d1f - .2byte 0x7d48, 0x7d4a, 0x7d4c, 0x7d4d, 0x7d4e, 0x7d50, 0x7d52, 0x7d53, 0x7d55, 0x7d56, 0x7d58, 0x7d59, 0x7d5b, 0x7d5c, 0x7d5e, 0x7d5f - .2byte 0x7d68, 0x7d8a, 0x7d8c, 0x7d8d, 0x7d8f, 0x7d90, 0x7d92, 0x7d93, 0x7d95, 0x7d96, 0x7d98, 0x7d99, 0x7d9b, 0x7d9c, 0x7d9e, 0x7d9f - .2byte 0x7da8, 0x7daa, 0x7dcc, 0x7dce, 0x7dcf, 0x7dd1, 0x7dd3, 0x7dd4, 0x7dd5, 0x7dd7, 0x7dd8, 0x7dd9, 0x7ddb, 0x7ddc, 0x7dde, 0x7ddf - .2byte 0x7dc8, 0x7dea, 0x7dec, 0x7e0e, 0x7e10, 0x7e12, 0x7e13, 0x7e14, 0x7e16, 0x7e17, 0x7e18, 0x7e1a, 0x7e1b, 0x7e1c, 0x7e1e, 0x7e1f - .2byte 0x7e08, 0x7e2a, 0x7e2c, 0x7e2e, 0x7e50, 0x7e52, 0x7e53, 0x7e55, 0x7e56, 0x7e57, 0x7e59, 0x7e5a, 0x7e5b, 0x7e5d, 0x7e5e, 0x7e5f - .2byte 0x7e28, 0x7e4a, 0x7e4c, 0x7e6e, 0x7e70, 0x7e92, 0x7e94, 0x7e96, 0x7e97, 0x7e98, 0x7e99, 0x7e9b, 0x7e9c, 0x7e9d, 0x7e9e, 0x7e9f - .2byte 0x7e68, 0x7e6a, 0x7e8c, 0x7e8e, 0x7eb0, 0x7eb2, 0x7ed4, 0x7ed6, 0x7ed8, 0x7ed9, 0x7eda, 0x7edb, 0x7edc, 0x7edd, 0x7ede, 0x7edf - .2byte 0x7ea8, 0x7eaa, 0x7eac, 0x7eae, 0x7ed0, 0x7ed2, 0x7ef4, 0x7f16, 0x7f5a, 0x7f5b, 0x7f5b, 0x7f5c, 0x7f5d, 0x7f5e, 0x7f5f, 0x7f5f - .2byte 0x7ec8, 0x7eea, 0x7eec, 0x7eee, 0x7ef0, 0x7f12, 0x7f14, 0x7f36, 0x7f7a, 0x7f9c, 0x7f9c, 0x7f9d, 0x7f9e, 0x7f9e, 0x7f9f, 0x7f9f - .2byte 0x7f08, 0x7f0a, 0x7f0c, 0x7f0e, 0x7f30, 0x7f32, 0x7f34, 0x7f56, 0x7f9a, 0x7f9c, 0x7fde, 0x7fde, 0x7fdf, 0x7fdf, 0x7fdf, 0x7fdf - .2byte 0x7f28, 0x7f2a, 0x7f4c, 0x7f4e, 0x7f50, 0x7f52, 0x7f74, 0x7f76, 0x7f9a, 0x7fbc, 0x7fde, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7f68, 0x7f6a, 0x7f6c, 0x7f6e, 0x7f70, 0x7f92, 0x7f94, 0x7f96, 0x7fba, 0x7fdc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7f88, 0x7faa, 0x7fac, 0x7fae, 0x7fb0, 0x7fb2, 0x7fb4, 0x7fb6, 0x7fda, 0x7fdc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7fc8, 0x7fca, 0x7fcc, 0x7fce, 0x7fd0, 0x7fd2, 0x7fd4, 0x7fd6, 0x7ffa, 0x7ffc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7fe8, 0x7fea, 0x7fec, 0x7fee, 0x7ff0, 0x7ff2, 0x7ff4, 0x7ff6, 0x7ffa, 0x7ffc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x0421, 0x0423, 0x0425, 0x0427, 0x0429, 0x042b, 0x042d, 0x0018, 0x001a, 0x001c, 0x001e, 0x001f, 0x085f, 0x109f, 0x18df, 0x253f - .2byte 0x0461, 0x0463, 0x0465, 0x0467, 0x0469, 0x046b, 0x046d, 0x0078, 0x007a, 0x005c, 0x005e, 0x005f, 0x089f, 0x10df, 0x191f, 0x255f - .2byte 0x04a1, 0x04a3, 0x04a5, 0x04a7, 0x04a9, 0x04ab, 0x04ad, 0x00d8, 0x00da, 0x00dc, 0x00be, 0x00bf, 0x08df, 0x111f, 0x193f, 0x259f - .2byte 0x04e1, 0x04e3, 0x04e5, 0x04e7, 0x04e9, 0x04eb, 0x04ed, 0x0158, 0x013a, 0x011c, 0x011e, 0x011f, 0x093f, 0x115f, 0x197f, 0x25bf - .2byte 0x0521, 0x0523, 0x0525, 0x0527, 0x0529, 0x052b, 0x052d, 0x01b8, 0x01ba, 0x019c, 0x017e, 0x017f, 0x097f, 0x119f, 0x19bf, 0x25ff - .2byte 0x0561, 0x0563, 0x0565, 0x0567, 0x0569, 0x056b, 0x056d, 0x0218, 0x021a, 0x01fc, 0x01fe, 0x01df, 0x09df, 0x11df, 0x19ff, 0x261f - .2byte 0x05a1, 0x05a3, 0x05a5, 0x05a7, 0x05a9, 0x05ab, 0x05ad, 0x0298, 0x027a, 0x025c, 0x023e, 0x023f, 0x0a3f, 0x121f, 0x1a3f, 0x265f - .2byte 0x0300, 0x0303, 0x0307, 0x030a, 0x030e, 0x0311, 0x0314, 0x0318, 0x02da, 0x02bc, 0x029e, 0x027f, 0x0a7f, 0x127f, 0x1a7f, 0x267f - .2byte 0x0340, 0x0343, 0x0346, 0x0349, 0x034d, 0x0350, 0x0353, 0x0357, 0x035a, 0x031c, 0x02fe, 0x02ff, 0x0abf, 0x129f, 0x1a9f, 0x26bf - .2byte 0x0380, 0x0383, 0x0386, 0x0389, 0x038c, 0x038f, 0x0392, 0x0396, 0x0399, 0x039c, 0x035e, 0x033f, 0x0b1f, 0x12ff, 0x1adf, 0x26df - .2byte 0x03c0, 0x03c3, 0x03c6, 0x03c9, 0x03cc, 0x03cf, 0x03d2, 0x03d5, 0x03d8, 0x03db, 0x03de, 0x039f, 0x0b5f, 0x133f, 0x1b1f, 0x271f - .2byte 0x03e0, 0x03e3, 0x03e6, 0x03e9, 0x03eb, 0x03ef, 0x03f1, 0x03f4, 0x03f7, 0x03fa, 0x03fd, 0x03ff, 0x0bbf, 0x137f, 0x1b5f, 0x273f - .2byte 0x0be2, 0x0be4, 0x0be7, 0x0be9, 0x0bec, 0x0bee, 0x0bf1, 0x0bf3, 0x0bf6, 0x0bf8, 0x0bfb, 0x0bfd, 0x0bff, 0x13bf, 0x1b9f, 0x277f - .2byte 0x13e4, 0x13e6, 0x13e8, 0x13ea, 0x13ed, 0x13ee, 0x13f1, 0x13f3, 0x13f5, 0x13f7, 0x13f9, 0x13fb, 0x13fe, 0x13ff, 0x1bbf, 0x279f - .2byte 0x1be6, 0x1be8, 0x1bea, 0x1beb, 0x1bee, 0x1bef, 0x1bf1, 0x1bf3, 0x1bf5, 0x1bf7, 0x1bf8, 0x1bfa, 0x1bfc, 0x1bfe, 0x1bff, 0x27df - .2byte 0x27e9, 0x27eb, 0x27ec, 0x27ee, 0x27ef, 0x27f1, 0x27f2, 0x27f4, 0x27f5, 0x27f7, 0x27f8, 0x27fa, 0x27fb, 0x27fd, 0x27fe, 0x27ff - .2byte 0x0c21, 0x0c23, 0x0c25, 0x0c27, 0x0c29, 0x0c2b, 0x0c2d, 0x0c18, 0x0c1a, 0x0c1c, 0x0c1e, 0x0c1f, 0x105f, 0x189f, 0x20df, 0x2d3f - .2byte 0x0c61, 0x0c63, 0x0c65, 0x0c67, 0x0c69, 0x0c6b, 0x0855, 0x0857, 0x0859, 0x085c, 0x043e, 0x0c7e, 0x14bf, 0x1cff, 0x253f, 0x2d7f - .2byte 0x0ca1, 0x0ca3, 0x0ca5, 0x0ca7, 0x0ca9, 0x0cab, 0x08d5, 0x08b7, 0x08b9, 0x08bc, 0x049e, 0x0cbe, 0x14ff, 0x1d1f, 0x257f, 0x2dbf - .2byte 0x0ce1, 0x0ce3, 0x0ce5, 0x0ce7, 0x0ce9, 0x0ceb, 0x0935, 0x0937, 0x0919, 0x091c, 0x04fe, 0x0d1e, 0x153f, 0x1d5f, 0x25bf, 0x2ddf - .2byte 0x0d21, 0x0d23, 0x0d25, 0x0d27, 0x0d29, 0x0d2b, 0x09b5, 0x09b7, 0x0999, 0x097c, 0x055e, 0x0d7e, 0x159f, 0x1dbf, 0x25df, 0x2dff - .2byte 0x0d61, 0x0d63, 0x0d65, 0x0d67, 0x0d69, 0x0d6b, 0x0a35, 0x0a17, 0x09f9, 0x09fc, 0x05de, 0x0dbe, 0x15df, 0x1ddf, 0x261f, 0x2e3f - .2byte 0x0da1, 0x0aa2, 0x0aa6, 0x0aaa, 0x0aad, 0x0ab1, 0x0ab5, 0x0a77, 0x0a59, 0x0a5c, 0x063e, 0x0e3e, 0x161f, 0x1e1f, 0x263f, 0x2e5f - .2byte 0x0f00, 0x0ae2, 0x0ae6, 0x0ae9, 0x0aed, 0x0af0, 0x0af4, 0x0af7, 0x0ad9, 0x0abc, 0x069e, 0x0e7e, 0x167f, 0x1e7f, 0x267f, 0x2e9f - .2byte 0x0f40, 0x0b22, 0x0b25, 0x0b29, 0x0b2c, 0x0b30, 0x0b33, 0x0b36, 0x0b39, 0x0b1c, 0x06fe, 0x0ede, 0x16bf, 0x1e9f, 0x26bf, 0x2ebf - .2byte 0x0b80, 0x0b82, 0x0b85, 0x0b88, 0x0b8c, 0x0b8f, 0x0b92, 0x0b95, 0x0b99, 0x0b9c, 0x077e, 0x0f1e, 0x16ff, 0x1edf, 0x26ff, 0x2eff - .2byte 0x0bc0, 0x07c1, 0x07c5, 0x07c8, 0x07cb, 0x07ce, 0x07d2, 0x07d4, 0x07d8, 0x07db, 0x07de, 0x0f7e, 0x173f, 0x1f3f, 0x271f, 0x2f1f - .2byte 0x0be0, 0x0fc3, 0x0fc6, 0x0fc8, 0x0fcb, 0x0fce, 0x0fd1, 0x0fd3, 0x0fd6, 0x0fd9, 0x0fdc, 0x0fde, 0x179f, 0x1f5f, 0x275f, 0x2f3f - .2byte 0x13e2, 0x17e5, 0x17e7, 0x17e9, 0x17ec, 0x17ee, 0x17f1, 0x17f3, 0x17f5, 0x17f8, 0x17fa, 0x17fd, 0x17ff, 0x1f9f, 0x279f, 0x2f7f - .2byte 0x1be4, 0x1fe7, 0x1fe9, 0x1feb, 0x1fed, 0x1fef, 0x1ff1, 0x1ff3, 0x1ff5, 0x1ff7, 0x1ff9, 0x1ffb, 0x1ffd, 0x1fff, 0x27df, 0x2f9f - .2byte 0x23e6, 0x27e9, 0x27eb, 0x27ed, 0x27ee, 0x27f0, 0x27f2, 0x27f4, 0x27f6, 0x27f7, 0x27f9, 0x27fa, 0x27fc, 0x27fe, 0x27ff, 0x2fdf - .2byte 0x2be9, 0x2feb, 0x2fed, 0x2fee, 0x2ff0, 0x2ff1, 0x2ff3, 0x2ff4, 0x2ff5, 0x2ff7, 0x2ff8, 0x2ffa, 0x2ffb, 0x2ffd, 0x2ffe, 0x2fff - .2byte 0x1421, 0x1423, 0x1425, 0x1427, 0x1429, 0x142b, 0x142d, 0x1c18, 0x181a, 0x181c, 0x181e, 0x181f, 0x1c5f, 0x209f, 0x28df, 0x313f - .2byte 0x1461, 0x1463, 0x1465, 0x1467, 0x1469, 0x146b, 0x1855, 0x1857, 0x1459, 0x145c, 0x143e, 0x187e, 0x1cbf, 0x24ff, 0x2d3f, 0x357f - .2byte 0x14a1, 0x14a3, 0x14a5, 0x14a7, 0x14a9, 0x18d1, 0x14b4, 0x14b7, 0x1099, 0x109b, 0x18dc, 0x1cfc, 0x211d, 0x2d7e, 0x2d7f, 0x35bf - .2byte 0x14e1, 0x14e3, 0x14e5, 0x14e7, 0x14e9, 0x1931, 0x1534, 0x1517, 0x10f9, 0x10fb, 0x191c, 0x1d3c, 0x215d, 0x2d9e, 0x2dbf, 0x35ff - .2byte 0x1521, 0x1523, 0x1525, 0x1527, 0x1529, 0x19b1, 0x15b4, 0x1577, 0x1179, 0x117b, 0x197c, 0x1d9c, 0x219d, 0x2dde, 0x2ddf, 0x361f - .2byte 0x1561, 0x1563, 0x1a26, 0x1a2a, 0x1a2d, 0x1a31, 0x1614, 0x15f7, 0x11f9, 0x11db, 0x19dc, 0x1ddc, 0x21dd, 0x2e1e, 0x2e1f, 0x363f - .2byte 0x15a1, 0x1aa2, 0x1685, 0x1689, 0x168d, 0x1690, 0x1694, 0x1677, 0x1259, 0x123b, 0x1a3c, 0x1e1c, 0x221d, 0x2e3e, 0x2e5f, 0x367f - .2byte 0x1b00, 0x16e2, 0x16e5, 0x16e8, 0x16ec, 0x16ef, 0x16f3, 0x16f7, 0x12b9, 0x129b, 0x1a7c, 0x1e7c, 0x227d, 0x2e7e, 0x2e7f, 0x369f - .2byte 0x1b40, 0x1722, 0x1324, 0x1328, 0x132b, 0x132f, 0x1332, 0x1335, 0x1339, 0x131b, 0x1adc, 0x1ebc, 0x229d, 0x2ebe, 0x2ebf, 0x36df - .2byte 0x1b80, 0x1782, 0x1364, 0x1368, 0x136b, 0x136e, 0x1372, 0x1375, 0x1378, 0x137b, 0x1b3c, 0x1efc, 0x22dd, 0x2efe, 0x2eff, 0x36ff - .2byte 0x17c0, 0x13c1, 0x1b86, 0x1b88, 0x1b8b, 0x1b8e, 0x1b91, 0x1b94, 0x1b96, 0x1b99, 0x1b9c, 0x1f5c, 0x233d, 0x2f3e, 0x2f1f, 0x371f - .2byte 0x17e0, 0x17c3, 0x1f87, 0x1f89, 0x1f8c, 0x1f8e, 0x1f91, 0x1f93, 0x1f95, 0x1f98, 0x1f9a, 0x1f9c, 0x237d, 0x2f5e, 0x2f5f, 0x375f - .2byte 0x1be2, 0x1fe5, 0x23a8, 0x23ab, 0x23ad, 0x23af, 0x23b1, 0x23b3, 0x23b5, 0x23b7, 0x23b9, 0x23bb, 0x23bd, 0x2f9e, 0x2f9f, 0x377f - .2byte 0x23e4, 0x23e7, 0x2fcb, 0x2fcd, 0x2fce, 0x2fd0, 0x2fd2, 0x2fd4, 0x2fd5, 0x2fd7, 0x2fd9, 0x2fdb, 0x2fdc, 0x2fde, 0x2fbf, 0x379f - .2byte 0x27e6, 0x2fe9, 0x2feb, 0x2fed, 0x2fef, 0x2ff0, 0x2ff2, 0x2ff4, 0x2ff5, 0x2ff7, 0x2ff9, 0x2ffa, 0x2ffc, 0x2ffe, 0x2fff, 0x37df - .2byte 0x33e9, 0x37eb, 0x37ed, 0x37ef, 0x37f0, 0x37f2, 0x37f3, 0x37f4, 0x37f6, 0x37f7, 0x37f9, 0x37fa, 0x37fb, 0x37fd, 0x37fe, 0x37ff - .2byte 0x1c21, 0x1c23, 0x1c25, 0x1c27, 0x1c29, 0x1c2b, 0x1c2d, 0x2818, 0x241a, 0x241c, 0x241e, 0x241f, 0x245f, 0x289f, 0x2cdf, 0x393f - .2byte 0x1c61, 0x1c63, 0x1c65, 0x1c67, 0x1c69, 0x1c6b, 0x2855, 0x2457, 0x2459, 0x205c, 0x203e, 0x207e, 0x24bf, 0x2cff, 0x353f, 0x397f - .2byte 0x1ca1, 0x1ca3, 0x1ca5, 0x1ca7, 0x1ca9, 0x28d1, 0x24b4, 0x20b7, 0x2099, 0x209b, 0x20dc, 0x24fc, 0x2d1d, 0x357e, 0x357f, 0x3dbf - .2byte 0x1ce1, 0x1ce3, 0x1ce5, 0x1ce7, 0x252e, 0x2111, 0x2113, 0x1cf6, 0x1cf8, 0x2119, 0x253a, 0x295b, 0x319d, 0x35be, 0x35bf, 0x3dff - .2byte 0x1d21, 0x1d23, 0x1d25, 0x25c9, 0x25ce, 0x21b1, 0x2173, 0x1d76, 0x1d58, 0x2179, 0x257a, 0x299b, 0x31dd, 0x35de, 0x35ff, 0x3e3f - .2byte 0x1d61, 0x1d63, 0x2626, 0x2228, 0x222d, 0x2231, 0x21f3, 0x1df6, 0x1dd8, 0x21d9, 0x25da, 0x29db, 0x321d, 0x361e, 0x361f, 0x3e5f - .2byte 0x1da1, 0x26a2, 0x2685, 0x2268, 0x226c, 0x2270, 0x2273, 0x1e56, 0x1e38, 0x2239, 0x261a, 0x2a1b, 0x323d, 0x365e, 0x365f, 0x3e7f - .2byte 0x2b00, 0x26e2, 0x22e5, 0x1ec7, 0x1ecb, 0x1ecf, 0x1ed2, 0x1ed6, 0x1e98, 0x2279, 0x267a, 0x2a7b, 0x327d, 0x367e, 0x369f, 0x3ebf - .2byte 0x2740, 0x2322, 0x1f24, 0x1f07, 0x1f0b, 0x1f0e, 0x1f11, 0x1f15, 0x1f18, 0x22d9, 0x26ba, 0x2abb, 0x32bd, 0x36be, 0x36df, 0x3edf - .2byte 0x2380, 0x2382, 0x1f64, 0x2328, 0x232b, 0x232e, 0x2331, 0x2334, 0x2336, 0x2339, 0x271a, 0x2afb, 0x32fd, 0x36fe, 0x36ff, 0x3eff - .2byte 0x23c0, 0x1fc1, 0x2386, 0x2749, 0x274c, 0x274e, 0x2751, 0x2753, 0x2756, 0x2758, 0x275a, 0x2b3b, 0x333d, 0x373e, 0x373f, 0x3f3f - .2byte 0x23e0, 0x23c3, 0x2787, 0x2b6a, 0x2b6c, 0x2b6e, 0x2b71, 0x2b73, 0x2b75, 0x2b77, 0x2b79, 0x2b7b, 0x337d, 0x375e, 0x375f, 0x3f5f - .2byte 0x27e2, 0x27e5, 0x2ba8, 0x33ac, 0x33ae, 0x33b0, 0x33b2, 0x33b4, 0x33b5, 0x33b7, 0x33b9, 0x33bb, 0x33bd, 0x379e, 0x379f, 0x3f7f - .2byte 0x2be4, 0x2be7, 0x33cb, 0x37cd, 0x37cf, 0x37d0, 0x37d2, 0x37d4, 0x37d5, 0x37d7, 0x37d9, 0x37db, 0x37dc, 0x37de, 0x37df, 0x3fbf - .2byte 0x2fe6, 0x37e9, 0x37eb, 0x37ed, 0x37ef, 0x37f1, 0x37f3, 0x37f4, 0x37f6, 0x37f7, 0x37f9, 0x37fb, 0x37fc, 0x37fe, 0x37ff, 0x3fdf - .2byte 0x37e9, 0x3beb, 0x3fed, 0x3fef, 0x3ff1, 0x3ff2, 0x3ff3, 0x3ff5, 0x3ff6, 0x3ff7, 0x3ff9, 0x3ffa, 0x3ffb, 0x3ffd, 0x3ffe, 0x3fff - .2byte 0x2421, 0x2423, 0x2425, 0x2427, 0x2429, 0x242b, 0x242d, 0x3818, 0x341a, 0x301c, 0x301e, 0x2c1f, 0x305f, 0x349f, 0x38df, 0x3d3f - .2byte 0x2461, 0x2463, 0x2465, 0x2467, 0x2469, 0x246b, 0x3455, 0x3457, 0x3059, 0x305c, 0x2c3e, 0x2c7e, 0x30bf, 0x34ff, 0x393f, 0x417f - .2byte 0x24a1, 0x24a3, 0x24a5, 0x24a7, 0x24a9, 0x34d1, 0x34b4, 0x30b7, 0x2c99, 0x2c9b, 0x2cdc, 0x30fc, 0x351d, 0x397e, 0x3d7f, 0x41bf - .2byte 0x24e1, 0x24e3, 0x24e5, 0x3929, 0x392e, 0x3511, 0x3113, 0x2cf6, 0x2cf8, 0x2d19, 0x313a, 0x315b, 0x399d, 0x3dbe, 0x3dbf, 0x45ff - .2byte 0x2521, 0x2523, 0x2525, 0x39c9, 0x2d6e, 0x2d70, 0x2953, 0x2955, 0x2957, 0x2d78, 0x3199, 0x39db, 0x39dd, 0x3dfe, 0x421f, 0x4a5f - .2byte 0x2561, 0x2563, 0x3626, 0x3628, 0x2e0b, 0x2e10, 0x29f3, 0x29b5, 0x29d7, 0x2dd8, 0x31d9, 0x3a1b, 0x3a1d, 0x3e1e, 0x423f, 0x4a7f - .2byte 0x25a1, 0x36a2, 0x3685, 0x2e68, 0x2a6a, 0x2a6f, 0x2a73, 0x2a35, 0x2a37, 0x2e18, 0x3219, 0x3a5b, 0x3a5d, 0x3e5e, 0x425f, 0x4a9f - .2byte 0x3700, 0x36e2, 0x2ee5, 0x2ec7, 0x2aaa, 0x2aae, 0x2ab2, 0x2ab5, 0x2a97, 0x2e78, 0x3279, 0x3a7b, 0x3a9d, 0x3e9e, 0x429f, 0x4abf - .2byte 0x3740, 0x3322, 0x2f24, 0x2b07, 0x2aea, 0x2aee, 0x2af1, 0x2af4, 0x2af7, 0x2eb8, 0x32b9, 0x3abb, 0x3abd, 0x3ebe, 0x42df, 0x4adf - .2byte 0x3380, 0x2f82, 0x2f64, 0x2f28, 0x2f0b, 0x2f0e, 0x2f10, 0x2f13, 0x2f16, 0x2f18, 0x32f9, 0x3afb, 0x3afd, 0x3efe, 0x42ff, 0x4b1f - .2byte 0x2fc0, 0x2bc1, 0x2f86, 0x2f49, 0x332c, 0x332e, 0x3331, 0x3333, 0x3335, 0x3337, 0x3339, 0x3b3b, 0x3b3d, 0x3f3e, 0x433f, 0x4b3f - .2byte 0x2fe0, 0x2fc3, 0x3387, 0x336a, 0x3b6e, 0x3b70, 0x3b72, 0x3b74, 0x3b75, 0x3b77, 0x3b79, 0x3b7b, 0x3b7d, 0x3f5e, 0x435f, 0x4b5f - .2byte 0x2fe2, 0x33e5, 0x33a8, 0x3bac, 0x3bae, 0x3bb0, 0x3bb2, 0x3bb4, 0x3bb5, 0x3bb7, 0x3bb9, 0x3bbb, 0x3bbd, 0x3f9e, 0x439f, 0x4b9f - .2byte 0x33e4, 0x37e7, 0x3bcb, 0x3bcd, 0x3fcf, 0x3fd1, 0x3fd2, 0x3fd4, 0x3fd6, 0x3fd7, 0x3fd9, 0x3fdb, 0x3fdc, 0x3fde, 0x43df, 0x4bbf - .2byte 0x37e6, 0x3be9, 0x3beb, 0x3fed, 0x43f0, 0x43f1, 0x43f3, 0x43f4, 0x43f6, 0x43f7, 0x43f9, 0x43fb, 0x43fc, 0x43fe, 0x43ff, 0x4bdf - .2byte 0x3fe9, 0x3feb, 0x43ed, 0x47ef, 0x4bf2, 0x4bf3, 0x4bf4, 0x4bf5, 0x4bf7, 0x4bf8, 0x4bf9, 0x4bfa, 0x4bfc, 0x4bfd, 0x4bfe, 0x4bff - .2byte 0x2c21, 0x2c23, 0x2c25, 0x2c27, 0x2c29, 0x2c2b, 0x2c2d, 0x4418, 0x401a, 0x3c1c, 0x3c1e, 0x3c1f, 0x385f, 0x389f, 0x3cdf, 0x453f - .2byte 0x2c61, 0x2c63, 0x2c65, 0x2c67, 0x2c69, 0x2c6b, 0x4455, 0x4057, 0x4059, 0x3c5c, 0x383e, 0x387e, 0x38bf, 0x3cff, 0x413f, 0x457f - .2byte 0x2ca1, 0x2ca3, 0x44c6, 0x44c9, 0x44cd, 0x44d1, 0x40b4, 0x3cb7, 0x3c99, 0x389b, 0x38dc, 0x38fc, 0x3d1d, 0x417e, 0x417f, 0x49bf - .2byte 0x2ce1, 0x2ce3, 0x4546, 0x4508, 0x450d, 0x4511, 0x4113, 0x3cf6, 0x38f8, 0x3919, 0x393a, 0x395b, 0x419d, 0x41be, 0x45bf, 0x49ff - .2byte 0x2d21, 0x2d23, 0x45a6, 0x45a8, 0x416b, 0x4170, 0x3d53, 0x3955, 0x3957, 0x3978, 0x3999, 0x41db, 0x41dd, 0x45fe, 0x461f, 0x4e5f - .2byte 0x2d61, 0x2d63, 0x4626, 0x4628, 0x420b, 0x35b0, 0x35b3, 0x35b4, 0x35b6, 0x39d8, 0x3df9, 0x421b, 0x421d, 0x463e, 0x4a5f, 0x529f - .2byte 0x2da1, 0x46a2, 0x4285, 0x3e68, 0x3e6a, 0x366d, 0x3673, 0x3634, 0x3616, 0x3a18, 0x3e39, 0x425b, 0x425d, 0x467e, 0x4a7f, 0x52bf - .2byte 0x4300, 0x42e2, 0x3ee5, 0x3ec7, 0x36aa, 0x368d, 0x3691, 0x3694, 0x3676, 0x3a78, 0x3e79, 0x427b, 0x429d, 0x469e, 0x4abf, 0x52df - .2byte 0x4340, 0x3f22, 0x3f24, 0x3b07, 0x3aea, 0x36cd, 0x36d0, 0x36d3, 0x36d6, 0x3ab8, 0x3eb9, 0x42bb, 0x42bd, 0x46de, 0x4adf, 0x52ff - .2byte 0x3f80, 0x3f82, 0x3b64, 0x3b28, 0x3b0b, 0x3b0e, 0x3b10, 0x3b13, 0x3b15, 0x3b18, 0x3ef9, 0x42fb, 0x42fd, 0x46fe, 0x4b1f, 0x531f - .2byte 0x3fc0, 0x3bc1, 0x3b86, 0x3b49, 0x3b2c, 0x3f2f, 0x3f31, 0x3f33, 0x3f35, 0x3f37, 0x3f39, 0x433b, 0x433d, 0x473e, 0x4b3f, 0x535f - .2byte 0x3be0, 0x37c3, 0x3b87, 0x3b6a, 0x436e, 0x4370, 0x4372, 0x4374, 0x4375, 0x4377, 0x4379, 0x437b, 0x437d, 0x477e, 0x4b7f, 0x537f - .2byte 0x3be2, 0x3be5, 0x3ba8, 0x43ac, 0x43ae, 0x43b0, 0x43b2, 0x43b4, 0x43b6, 0x43b7, 0x43b9, 0x43bb, 0x43bd, 0x479e, 0x4b9f, 0x539f - .2byte 0x3be4, 0x3be7, 0x43cb, 0x43cd, 0x43cf, 0x47d1, 0x47d3, 0x47d4, 0x47d6, 0x47d7, 0x47d9, 0x47db, 0x47dc, 0x47de, 0x4bdf, 0x53bf - .2byte 0x3fe6, 0x43e9, 0x43eb, 0x43ed, 0x47f0, 0x4bf2, 0x4bf3, 0x4bf5, 0x4bf6, 0x4bf8, 0x4bf9, 0x4bfb, 0x4bfc, 0x4bfe, 0x4bff, 0x53df - .2byte 0x43e9, 0x47eb, 0x47ed, 0x4bef, 0x4ff2, 0x53f4, 0x53f5, 0x53f6, 0x53f7, 0x53f8, 0x53fa, 0x53fb, 0x53fc, 0x53fd, 0x53fe, 0x53ff - .2byte 0x3421, 0x3423, 0x3425, 0x3427, 0x3429, 0x342b, 0x342d, 0x5018, 0x4c1a, 0x481c, 0x481e, 0x441f, 0x445f, 0x449f, 0x44df, 0x493f - .2byte 0x3461, 0x5442, 0x5446, 0x5449, 0x544d, 0x5451, 0x5455, 0x5057, 0x4c59, 0x485c, 0x483e, 0x447e, 0x44bf, 0x44ff, 0x493f, 0x4d7f - .2byte 0x34a1, 0x54c2, 0x50a5, 0x50a9, 0x50ad, 0x50b0, 0x50b4, 0x4cb7, 0x4899, 0x489b, 0x44dc, 0x44fc, 0x451d, 0x497e, 0x497f, 0x4dbf - .2byte 0x34e1, 0x5542, 0x5125, 0x4d08, 0x4d0b, 0x4d0f, 0x4d13, 0x48f6, 0x44f8, 0x4519, 0x453a, 0x455b, 0x499d, 0x49be, 0x4dbf, 0x4dff - .2byte 0x3521, 0x55a2, 0x51a5, 0x4d88, 0x4d4a, 0x4d4f, 0x4d53, 0x4955, 0x4557, 0x4178, 0x4599, 0x49db, 0x49dd, 0x49fe, 0x4e1f, 0x525f - .2byte 0x3561, 0x5622, 0x5205, 0x4e08, 0x4dea, 0x4dad, 0x4db3, 0x45b4, 0x41b6, 0x41d8, 0x45f9, 0x4a1b, 0x4a1d, 0x4e3e, 0x4e5f, 0x569f - .2byte 0x35a1, 0x56a2, 0x5285, 0x4e68, 0x4e6a, 0x4e6d, 0x3df2, 0x3df4, 0x4216, 0x4638, 0x4639, 0x4a5b, 0x4a5d, 0x4e7e, 0x529f, 0x5adf - .2byte 0x5300, 0x4ee2, 0x4ee5, 0x4ac7, 0x46aa, 0x468d, 0x3e8f, 0x3e94, 0x4276, 0x4678, 0x4679, 0x4a9b, 0x4a9d, 0x4ebe, 0x52bf, 0x5aff - .2byte 0x4f40, 0x4b22, 0x4b24, 0x4707, 0x46ea, 0x42cd, 0x42d0, 0x42d3, 0x42d6, 0x46b8, 0x46b9, 0x4abb, 0x4add, 0x4ede, 0x52ff, 0x5b1f - .2byte 0x4b80, 0x4b82, 0x4764, 0x4728, 0x430b, 0x430e, 0x4711, 0x4713, 0x4715, 0x4718, 0x46f9, 0x4afb, 0x4afd, 0x4f1e, 0x531f, 0x5b3f - .2byte 0x47c0, 0x47c1, 0x4786, 0x4349, 0x432c, 0x472f, 0x4731, 0x4733, 0x4735, 0x4737, 0x4739, 0x4b3b, 0x4b3d, 0x4f3e, 0x535f, 0x5b5f - .2byte 0x47e0, 0x47c3, 0x4387, 0x436a, 0x4b6e, 0x4b70, 0x4b72, 0x4b74, 0x4b76, 0x4b77, 0x4b79, 0x4b7b, 0x4b7d, 0x4f7e, 0x537f, 0x5b7f - .2byte 0x47e2, 0x43e5, 0x43a8, 0x47ac, 0x4bae, 0x4bb0, 0x4bb2, 0x4bb4, 0x4bb6, 0x4bb7, 0x4bb9, 0x4bbb, 0x4bbd, 0x4f9e, 0x539f, 0x5b9f - .2byte 0x43e4, 0x43e7, 0x47cb, 0x4bcd, 0x4bcf, 0x4fd1, 0x4fd3, 0x4fd5, 0x4fd6, 0x4fd8, 0x4fd9, 0x4fdb, 0x4fdc, 0x4fde, 0x53df, 0x5bbf - .2byte 0x47e6, 0x47e9, 0x4beb, 0x4bed, 0x4bf0, 0x4ff2, 0x53f4, 0x53f5, 0x53f7, 0x53f8, 0x53fa, 0x53fb, 0x53fc, 0x53fe, 0x53ff, 0x5bdf - .2byte 0x4be9, 0x4beb, 0x4fed, 0x4fef, 0x53f2, 0x57f4, 0x5bf6, 0x5bf7, 0x5bf8, 0x5bf9, 0x5bfa, 0x5bfb, 0x5bfc, 0x5bfd, 0x5bff, 0x5bff - .2byte 0x6000, 0x6003, 0x6006, 0x600a, 0x600d, 0x6010, 0x6014, 0x6018, 0x5c1a, 0x581c, 0x541e, 0x501f, 0x4c5f, 0x4c9f, 0x4cdf, 0x513f - .2byte 0x6060, 0x5c42, 0x5c45, 0x5c49, 0x5c4d, 0x5c50, 0x5c53, 0x5c57, 0x5859, 0x545c, 0x503e, 0x4c7e, 0x4cbf, 0x4cff, 0x513f, 0x517f - .2byte 0x60e0, 0x5cc2, 0x5ca5, 0x5ca8, 0x5cab, 0x5caf, 0x5cb3, 0x5cb7, 0x5499, 0x549b, 0x50dc, 0x4cfc, 0x4d1d, 0x517e, 0x517f, 0x51bf - .2byte 0x6140, 0x5d22, 0x5d05, 0x58e7, 0x58eb, 0x58ef, 0x58f2, 0x58f6, 0x54f8, 0x5119, 0x4d3a, 0x4d5b, 0x519d, 0x51be, 0x51bf, 0x55ff - .2byte 0x61c0, 0x5da2, 0x5d85, 0x5967, 0x554a, 0x554d, 0x5551, 0x5555, 0x5157, 0x4d78, 0x4d99, 0x51db, 0x51dd, 0x51fe, 0x521f, 0x565f - .2byte 0x6220, 0x5e02, 0x5de5, 0x59e7, 0x55ca, 0x51ad, 0x51b1, 0x51b4, 0x4db6, 0x4dd8, 0x4df9, 0x521b, 0x521d, 0x523e, 0x565f, 0x5a9f - .2byte 0x6280, 0x5e82, 0x5e65, 0x5a47, 0x564a, 0x522d, 0x51ef, 0x51f4, 0x4e16, 0x4e38, 0x4e39, 0x525b, 0x525d, 0x567e, 0x569f, 0x5edf - .2byte 0x6300, 0x5ee2, 0x5ee5, 0x5ac7, 0x56aa, 0x528d, 0x528f, 0x4634, 0x4e76, 0x4e78, 0x4e79, 0x529b, 0x56bd, 0x56be, 0x5adf, 0x631f - .2byte 0x5b40, 0x5b22, 0x5724, 0x5307, 0x52ea, 0x4ecd, 0x4ed0, 0x4ed3, 0x4ed6, 0x4eb8, 0x4eb9, 0x52db, 0x56dd, 0x56de, 0x5aff, 0x633f - .2byte 0x5780, 0x5782, 0x5364, 0x4f28, 0x4f0b, 0x4f0e, 0x4f11, 0x4f13, 0x4f15, 0x4f18, 0x4ef9, 0x52fb, 0x571d, 0x571e, 0x5b3f, 0x635f - .2byte 0x53c0, 0x53c1, 0x4f86, 0x4f49, 0x4f2c, 0x4f2f, 0x4f31, 0x4f33, 0x4f35, 0x4f37, 0x4f39, 0x533b, 0x573d, 0x575e, 0x5b5f, 0x637f - .2byte 0x4fe0, 0x4fc3, 0x4f87, 0x4f6a, 0x4f6e, 0x4f70, 0x5372, 0x5374, 0x5376, 0x5377, 0x5379, 0x537b, 0x577d, 0x577e, 0x5b7f, 0x639f - .2byte 0x4fe2, 0x4fe5, 0x4fa8, 0x4fac, 0x53ae, 0x53b0, 0x53b2, 0x57b5, 0x57b6, 0x57b8, 0x57b9, 0x57bb, 0x57bd, 0x579e, 0x5b9f, 0x63bf - .2byte 0x4fe4, 0x4fe7, 0x4fcb, 0x4fcd, 0x53cf, 0x53d1, 0x57d3, 0x57d5, 0x57d7, 0x57d8, 0x57da, 0x57db, 0x57dc, 0x57de, 0x5bdf, 0x63df - .2byte 0x4fe6, 0x4fe9, 0x4feb, 0x53ed, 0x53f0, 0x57f2, 0x57f4, 0x5bf6, 0x5bf7, 0x5bf9, 0x5bfa, 0x5bfb, 0x5bfd, 0x5bfe, 0x5bff, 0x63df - .2byte 0x4fe9, 0x53eb, 0x53ed, 0x57ef, 0x57f2, 0x5bf4, 0x5ff6, 0x63f8, 0x63f9, 0x63fa, 0x63fb, 0x63fc, 0x63fd, 0x63fe, 0x63ff, 0x63ff - .2byte 0x6800, 0x6803, 0x6806, 0x6809, 0x680d, 0x6810, 0x6813, 0x6816, 0x681a, 0x641c, 0x601e, 0x5c1f, 0x585f, 0x549f, 0x54df, 0x553f - .2byte 0x6860, 0x6442, 0x6445, 0x6448, 0x644c, 0x644f, 0x6452, 0x6456, 0x6459, 0x645c, 0x603e, 0x587e, 0x54bf, 0x54ff, 0x593f, 0x557f - .2byte 0x68c0, 0x64a2, 0x6484, 0x6487, 0x648b, 0x648f, 0x6492, 0x6495, 0x6499, 0x609b, 0x58dc, 0x54fc, 0x551d, 0x557e, 0x557f, 0x59bf - .2byte 0x6920, 0x6522, 0x6504, 0x60e7, 0x60ea, 0x60ee, 0x60f1, 0x60f4, 0x60f8, 0x5919, 0x593a, 0x555b, 0x559d, 0x55be, 0x59bf, 0x59ff - .2byte 0x69a0, 0x6582, 0x6564, 0x6167, 0x5d4a, 0x5d4e, 0x5d51, 0x5d54, 0x5d57, 0x5978, 0x5599, 0x55db, 0x55dd, 0x59fe, 0x5a1f, 0x5e5f - .2byte 0x6a00, 0x6602, 0x65e4, 0x61c7, 0x5dca, 0x59ad, 0x59b0, 0x59b3, 0x59b6, 0x55d8, 0x55f9, 0x561b, 0x5a1d, 0x5a3e, 0x5a5f, 0x5e9f - .2byte 0x6a60, 0x6662, 0x6644, 0x6227, 0x5e2a, 0x5a0d, 0x5a10, 0x5a13, 0x5a16, 0x5638, 0x5639, 0x5a5b, 0x5a5d, 0x5a7e, 0x5e9f, 0x62df - .2byte 0x6ae0, 0x66c2, 0x66a4, 0x62a7, 0x5e8a, 0x5a6d, 0x5a70, 0x5a73, 0x5a76, 0x5678, 0x5679, 0x5a9b, 0x5abd, 0x5ebe, 0x5edf, 0x671f - .2byte 0x6b40, 0x6722, 0x6724, 0x6307, 0x5eea, 0x5acd, 0x5ad0, 0x5ad3, 0x5296, 0x56b8, 0x56ba, 0x5adb, 0x5add, 0x5efe, 0x631f, 0x6f7f - .2byte 0x6380, 0x6382, 0x6364, 0x5b28, 0x570b, 0x570e, 0x5711, 0x5713, 0x5715, 0x5718, 0x56fa, 0x5b1b, 0x5b1d, 0x5f1e, 0x633f, 0x6f9f - .2byte 0x5fc0, 0x5fc1, 0x5b86, 0x5749, 0x572c, 0x572f, 0x5731, 0x5733, 0x5755, 0x5757, 0x575a, 0x5b3b, 0x5b5d, 0x5f5e, 0x635f, 0x6f9f - .2byte 0x5fe0, 0x5bc3, 0x5787, 0x576a, 0x576e, 0x5770, 0x5772, 0x5b74, 0x5b76, 0x5b78, 0x5b79, 0x5b7b, 0x5b7d, 0x5f7e, 0x639f, 0x6fbf - .2byte 0x57e2, 0x57e5, 0x53a8, 0x57ac, 0x57ae, 0x57b0, 0x5bb2, 0x5bb5, 0x5bb6, 0x5bb8, 0x5bba, 0x5bbb, 0x5bbd, 0x5fbe, 0x63bf, 0x6fdf - .2byte 0x53e4, 0x53e7, 0x57cb, 0x57cd, 0x57cf, 0x5bd1, 0x5bd3, 0x5bd5, 0x5fd7, 0x5fd9, 0x5fda, 0x5fdb, 0x5fdd, 0x5fde, 0x63df, 0x6fdf - .2byte 0x53e6, 0x57e9, 0x57eb, 0x5bed, 0x5bf0, 0x5bf2, 0x5ff4, 0x5ff6, 0x63f8, 0x63f9, 0x63fa, 0x63fc, 0x63fd, 0x63fe, 0x63ff, 0x6fff - .2byte 0x57e9, 0x57eb, 0x5bed, 0x5bef, 0x5bf2, 0x5ff4, 0x63f6, 0x67f8, 0x6ffb, 0x6ffc, 0x6ffc, 0x6ffd, 0x6ffe, 0x6ffe, 0x6fff, 0x6fff - .2byte 0x7000, 0x7002, 0x7006, 0x7008, 0x700c, 0x700f, 0x7012, 0x7015, 0x7018, 0x701c, 0x6c1e, 0x681f, 0x605f, 0x5c9f, 0x5cdf, 0x5d3f - .2byte 0x7060, 0x7042, 0x7045, 0x7048, 0x704b, 0x704f, 0x7052, 0x7055, 0x7058, 0x705c, 0x6c3e, 0x647e, 0x60bf, 0x5cff, 0x5d3f, 0x5d7f - .2byte 0x70c0, 0x70a2, 0x6c84, 0x6c87, 0x6c8b, 0x6c8e, 0x6c91, 0x6c94, 0x6c98, 0x6c9b, 0x64dc, 0x60fc, 0x5d1d, 0x5d7e, 0x5d7f, 0x5dbf - .2byte 0x7120, 0x7102, 0x6d04, 0x6508, 0x650b, 0x650e, 0x6511, 0x6513, 0x6516, 0x6519, 0x613a, 0x5d5b, 0x5d9d, 0x5dbe, 0x5dbf, 0x5dff - .2byte 0x7180, 0x7182, 0x6d64, 0x6568, 0x616b, 0x616e, 0x6170, 0x6173, 0x6175, 0x6178, 0x5d99, 0x5ddb, 0x5ddd, 0x5dfe, 0x5e1f, 0x625f - .2byte 0x71e0, 0x71e2, 0x6dc4, 0x65c8, 0x61cb, 0x61ce, 0x61d0, 0x61d3, 0x61d5, 0x61d8, 0x5df9, 0x5e1b, 0x5e1d, 0x5e3e, 0x625f, 0x629f - .2byte 0x7240, 0x7242, 0x6e44, 0x6628, 0x620b, 0x620e, 0x6231, 0x6233, 0x6235, 0x6238, 0x5e39, 0x5e5b, 0x5e5d, 0x627e, 0x629f, 0x66df - .2byte 0x72c0, 0x72a2, 0x6ea4, 0x6688, 0x626b, 0x626e, 0x6271, 0x6273, 0x6275, 0x6278, 0x5e79, 0x5e9b, 0x62bd, 0x62be, 0x66df, 0x6b1f - .2byte 0x7320, 0x7322, 0x6f04, 0x66c8, 0x62cb, 0x62ae, 0x62b1, 0x62b3, 0x62b5, 0x62b8, 0x5eba, 0x62db, 0x62dd, 0x66fe, 0x671f, 0x737f - .2byte 0x7380, 0x7382, 0x6f64, 0x6728, 0x630b, 0x630e, 0x6311, 0x6313, 0x6315, 0x5ef8, 0x5efa, 0x631b, 0x631d, 0x673e, 0x6f7f, 0x77bf - .2byte 0x6bc0, 0x6fc1, 0x6786, 0x6349, 0x5f2c, 0x5f2f, 0x5f31, 0x5f33, 0x5f55, 0x5f57, 0x5f5a, 0x635b, 0x635d, 0x675e, 0x6f9f, 0x77bf - .2byte 0x67e0, 0x63c3, 0x5f87, 0x5f6a, 0x5f6e, 0x5f70, 0x5f72, 0x5f74, 0x6376, 0x6378, 0x637a, 0x637b, 0x637d, 0x679e, 0x6fbf, 0x77df - .2byte 0x63e2, 0x5fe5, 0x5ba8, 0x5fac, 0x5fae, 0x5fb0, 0x5fb2, 0x63b5, 0x63b6, 0x63b8, 0x63ba, 0x63bb, 0x63bd, 0x67be, 0x6fdf, 0x77df - .2byte 0x5fe4, 0x5be7, 0x5fcb, 0x5fcd, 0x5fcf, 0x5fd1, 0x63d3, 0x63d5, 0x63d7, 0x67d9, 0x67da, 0x67dc, 0x67dd, 0x67de, 0x6fdf, 0x77ff - .2byte 0x5be6, 0x5fe9, 0x5feb, 0x5fed, 0x5ff0, 0x63f2, 0x63f4, 0x67f6, 0x67f8, 0x6ffb, 0x6ffc, 0x6ffd, 0x6ffe, 0x6ffe, 0x6fff, 0x77ff - .2byte 0x5be9, 0x5feb, 0x5fed, 0x5fef, 0x63f2, 0x63f4, 0x67f6, 0x6bf8, 0x73fb, 0x77fd, 0x77fe, 0x77fe, 0x77fe, 0x77ff, 0x77ff, 0x77ff - .2byte 0x7800, 0x7802, 0x7805, 0x7808, 0x780b, 0x780f, 0x7811, 0x7814, 0x7817, 0x781a, 0x781e, 0x741f, 0x6c5f, 0x649f, 0x60df, 0x613f - .2byte 0x7860, 0x7821, 0x7824, 0x7827, 0x782a, 0x782e, 0x7831, 0x7834, 0x7837, 0x783b, 0x783e, 0x707e, 0x68bf, 0x64ff, 0x653f, 0x617f - .2byte 0x78c0, 0x78a1, 0x70c6, 0x70c8, 0x70cb, 0x70ce, 0x70d1, 0x70d3, 0x70d6, 0x70d9, 0x70dc, 0x68fc, 0x651d, 0x657e, 0x657f, 0x65bf - .2byte 0x7920, 0x7901, 0x7106, 0x6929, 0x692b, 0x692e, 0x6930, 0x6933, 0x6935, 0x6938, 0x693a, 0x655b, 0x659d, 0x65be, 0x65bf, 0x65ff - .2byte 0x7980, 0x7961, 0x7166, 0x6989, 0x658c, 0x658e, 0x6590, 0x6593, 0x6595, 0x6597, 0x6599, 0x65db, 0x65dd, 0x65fe, 0x661f, 0x665f - .2byte 0x79e0, 0x79c1, 0x71c6, 0x69c9, 0x65cc, 0x65ef, 0x65f1, 0x65f3, 0x65f5, 0x65f7, 0x65f9, 0x661b, 0x661d, 0x663e, 0x665f, 0x6a9f - .2byte 0x7a40, 0x7a41, 0x7226, 0x6a29, 0x662c, 0x662f, 0x6631, 0x6633, 0x6635, 0x6637, 0x6639, 0x665b, 0x665d, 0x667e, 0x6a9f, 0x6adf - .2byte 0x7aa0, 0x7a81, 0x7286, 0x6a69, 0x666c, 0x666f, 0x6671, 0x6673, 0x6675, 0x6677, 0x6679, 0x669b, 0x66bd, 0x6abe, 0x6adf, 0x6f1f - .2byte 0x7b00, 0x7b01, 0x72c6, 0x6ac9, 0x66ac, 0x66af, 0x66b1, 0x66b3, 0x6ab5, 0x6ab7, 0x6aba, 0x66db, 0x6add, 0x6afe, 0x6b1f, 0x737f - .2byte 0x7b60, 0x7b61, 0x7326, 0x6b09, 0x66ec, 0x66ef, 0x66f1, 0x66f3, 0x6af5, 0x6af7, 0x6afa, 0x6b1b, 0x6b1d, 0x6b3e, 0x737f, 0x7bbf - .2byte 0x7bc0, 0x7bc1, 0x7386, 0x6b49, 0x672c, 0x672f, 0x6731, 0x6733, 0x6b55, 0x6b57, 0x673a, 0x6b5c, 0x6b5d, 0x739e, 0x77bf, 0x7fff - .2byte 0x73e0, 0x6fc3, 0x6b87, 0x676a, 0x676e, 0x6770, 0x6772, 0x6774, 0x6776, 0x6b78, 0x6b9a, 0x6b9c, 0x6b9d, 0x73be, 0x77df, 0x7fff - .2byte 0x6be2, 0x67e5, 0x67a8, 0x67ac, 0x67ae, 0x67b0, 0x67b2, 0x67b5, 0x6bb6, 0x6bb8, 0x6bba, 0x6bbc, 0x6bbd, 0x73de, 0x77df, 0x7fff - .2byte 0x67e4, 0x67e7, 0x67cb, 0x67cd, 0x67cf, 0x67d1, 0x67d3, 0x6bd5, 0x6bd7, 0x6bd9, 0x73dc, 0x73dd, 0x73de, 0x73de, 0x77ff, 0x7fff - .2byte 0x63e6, 0x63e9, 0x63eb, 0x67ed, 0x67f0, 0x67f2, 0x6bf4, 0x6bf6, 0x6bf8, 0x73fb, 0x77fd, 0x77fe, 0x77fe, 0x77ff, 0x77ff, 0x7fff - .2byte 0x63e9, 0x63eb, 0x63ed, 0x67ef, 0x67f2, 0x6bf4, 0x6bf6, 0x6ff8, 0x73fb, 0x77fd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7c00, 0x7c02, 0x7c05, 0x7c08, 0x7c0b, 0x7c0e, 0x7c11, 0x7c13, 0x7c17, 0x7c19, 0x7c1c, 0x7c1f, 0x745f, 0x6c9f, 0x68df, 0x693f - .2byte 0x7c60, 0x7863, 0x7865, 0x7868, 0x786b, 0x786d, 0x7871, 0x7873, 0x7876, 0x7878, 0x787b, 0x787e, 0x74bf, 0x6cff, 0x693f, 0x697f - .2byte 0x7cc0, 0x78c3, 0x70e7, 0x70e9, 0x70ec, 0x70ee, 0x70f0, 0x70f3, 0x70f5, 0x70f7, 0x70fa, 0x70fc, 0x6d1d, 0x6d7e, 0x697f, 0x69bf - .2byte 0x7d20, 0x7903, 0x7127, 0x6d4a, 0x6d4c, 0x6d4e, 0x6d50, 0x6d53, 0x6d55, 0x6d57, 0x6d59, 0x6d5b, 0x6d9d, 0x6dbe, 0x6dbf, 0x69ff - .2byte 0x7d60, 0x7963, 0x7187, 0x6d8a, 0x6dce, 0x6dd0, 0x6dd2, 0x6dd3, 0x6dd5, 0x6dd7, 0x6dd9, 0x6ddb, 0x6ddd, 0x6dfe, 0x6e1f, 0x6a5f - .2byte 0x7de0, 0x79c3, 0x71c7, 0x6dca, 0x6e0e, 0x6e10, 0x6e12, 0x6e13, 0x6e15, 0x6e17, 0x6e19, 0x6e1b, 0x6e1d, 0x6e3e, 0x6e5f, 0x6e9f - .2byte 0x7e20, 0x7a23, 0x7227, 0x6e2a, 0x6e4e, 0x6e50, 0x6e52, 0x6e54, 0x6e55, 0x6e57, 0x6e59, 0x6e5b, 0x6e5d, 0x6e7e, 0x6e9f, 0x6edf - .2byte 0x7e80, 0x7a63, 0x7267, 0x6e6a, 0x6e8e, 0x6e90, 0x6e92, 0x6e94, 0x6e96, 0x6e97, 0x6e99, 0x6e9b, 0x6ebd, 0x6ebe, 0x6edf, 0x731f - .2byte 0x7ee0, 0x7ac3, 0x72a7, 0x6eaa, 0x6eae, 0x6eb0, 0x6ed2, 0x6ed4, 0x6ed6, 0x6ed8, 0x6ed9, 0x6edb, 0x6edd, 0x6efe, 0x731f, 0x777f - .2byte 0x7f40, 0x7b23, 0x7307, 0x6eea, 0x6eee, 0x6ef0, 0x6ef2, 0x6ef4, 0x6f16, 0x6f18, 0x6f1a, 0x6f1b, 0x6f1d, 0x733e, 0x777f, 0x7bbf - .2byte 0x7fa0, 0x7b83, 0x7347, 0x6f2a, 0x6f2e, 0x6f30, 0x6f32, 0x6f34, 0x6f36, 0x6f58, 0x735a, 0x735c, 0x735d, 0x779e, 0x7bbf, 0x7fff - .2byte 0x7fe0, 0x7bc3, 0x7387, 0x6f6a, 0x6f6e, 0x6f70, 0x6f72, 0x6f74, 0x6f76, 0x6f78, 0x739a, 0x6f7c, 0x77be, 0x7bdf, 0x7fff, 0x7fff - .2byte 0x77e2, 0x73e5, 0x6fa8, 0x6fac, 0x6fae, 0x6fb0, 0x6fb2, 0x6fb5, 0x6fb6, 0x6fb8, 0x73ba, 0x77dd, 0x77de, 0x7bdf, 0x7fff, 0x7fff - .2byte 0x6fe4, 0x6be7, 0x6bcb, 0x6bcd, 0x6bcf, 0x6fd1, 0x6fd3, 0x6fd5, 0x6fd7, 0x73d9, 0x77dc, 0x7bfe, 0x7bfe, 0x7bff, 0x7fff, 0x7fff - .2byte 0x6be6, 0x6be9, 0x6beb, 0x6bed, 0x6bf0, 0x6ff2, 0x6ff4, 0x6ff6, 0x73f8, 0x77fb, 0x7bfd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x67e9, 0x67eb, 0x6bed, 0x6bef, 0x6bf2, 0x6ff4, 0x6ff6, 0x73f8, 0x77fb, 0x7bfd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7c42, 0x7c44, 0x7c46, 0x7c49, 0x7c4b, 0x7c4e, 0x7c51, 0x7c53, 0x7c55, 0x7c58, 0x7c5a, 0x7c5d, 0x7c5f, 0x789f, 0x70df, 0x6d3f - .2byte 0x7c82, 0x7ca5, 0x7ca7, 0x7ca9, 0x7cac, 0x7cae, 0x7cb0, 0x7cb3, 0x7cb5, 0x7cb7, 0x7cb9, 0x7cbc, 0x7cbf, 0x74ff, 0x713f, 0x6d7f - .2byte 0x7ce2, 0x7ce5, 0x7508, 0x750a, 0x750c, 0x750e, 0x7510, 0x7513, 0x7514, 0x7516, 0x7519, 0x751b, 0x751d, 0x717e, 0x717f, 0x6dbf - .2byte 0x7d22, 0x7d25, 0x7568, 0x758c, 0x758e, 0x7590, 0x7591, 0x7593, 0x7595, 0x7597, 0x7599, 0x759b, 0x759d, 0x71be, 0x71bf, 0x6dff - .2byte 0x7d82, 0x7d85, 0x75a8, 0x75cc, 0x75ce, 0x75d0, 0x75d2, 0x75d4, 0x75d5, 0x75d7, 0x75d9, 0x75db, 0x75dd, 0x71fe, 0x721f, 0x725f - .2byte 0x7dc2, 0x7dc5, 0x75e8, 0x760c, 0x760e, 0x7610, 0x7612, 0x7614, 0x7615, 0x7617, 0x7619, 0x761b, 0x761d, 0x723e, 0x725f, 0x729f - .2byte 0x7e22, 0x7e25, 0x7628, 0x764c, 0x764e, 0x7650, 0x7652, 0x7654, 0x7656, 0x7657, 0x7659, 0x765b, 0x765d, 0x727e, 0x729f, 0x72df - .2byte 0x7e62, 0x7e65, 0x7668, 0x768c, 0x768e, 0x7690, 0x7692, 0x76b5, 0x76b6, 0x76b8, 0x76b9, 0x76bb, 0x76bd, 0x72be, 0x76df, 0x771f - .2byte 0x7ec2, 0x7ea5, 0x76a8, 0x76ac, 0x76ae, 0x76d0, 0x76d2, 0x76d5, 0x76d6, 0x76d8, 0x76da, 0x76db, 0x76dd, 0x76fe, 0x771f, 0x7b7f - .2byte 0x7f02, 0x7f05, 0x76e8, 0x76ec, 0x76ee, 0x76f0, 0x76f2, 0x7715, 0x7716, 0x7718, 0x771a, 0x771b, 0x771d, 0x773e, 0x7b7f, 0x7bbf - .2byte 0x7f62, 0x7f45, 0x7728, 0x772c, 0x772e, 0x7730, 0x7732, 0x7735, 0x7756, 0x7758, 0x775a, 0x775c, 0x775d, 0x7b9e, 0x7bbf, 0x7fff - .2byte 0x7fa2, 0x7fa5, 0x7768, 0x776c, 0x776e, 0x7770, 0x7772, 0x7775, 0x7776, 0x7778, 0x779a, 0x7bbd, 0x7bbe, 0x7bdf, 0x7fff, 0x7fff - .2byte 0x7fe2, 0x7fe5, 0x77a8, 0x77ac, 0x77ae, 0x77b0, 0x77b2, 0x77b5, 0x77b6, 0x77b8, 0x77ba, 0x7bdd, 0x7bde, 0x7fff, 0x7fff, 0x7fff - .2byte 0x77e4, 0x73e7, 0x73cb, 0x73cd, 0x73cf, 0x73d1, 0x73d3, 0x73d5, 0x77d7, 0x77d9, 0x7bdc, 0x7bfe, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x73e6, 0x73e9, 0x73eb, 0x73ed, 0x73f0, 0x73f2, 0x73f4, 0x73f6, 0x77f8, 0x7bfb, 0x7bfd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x6fe9, 0x6feb, 0x6fed, 0x6fef, 0x73f2, 0x73f4, 0x73f6, 0x77f8, 0x7bfb, 0x7bfd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7c84, 0x7c86, 0x7c88, 0x7c8a, 0x7c8c, 0x7c8e, 0x7c90, 0x7c93, 0x7c94, 0x7c97, 0x7c99, 0x7c9b, 0x7c9d, 0x7c9f, 0x78df, 0x753f - .2byte 0x7cc4, 0x7ce7, 0x7ce8, 0x7cea, 0x7ced, 0x7cee, 0x7cf0, 0x7cf3, 0x7cf4, 0x7cf6, 0x7cf9, 0x7cfa, 0x7cfc, 0x7cff, 0x793f, 0x757f - .2byte 0x7d04, 0x7d27, 0x796b, 0x796c, 0x796e, 0x7970, 0x7971, 0x7973, 0x7975, 0x7977, 0x7979, 0x797a, 0x797c, 0x797e, 0x797f, 0x75bf - .2byte 0x7d44, 0x7d67, 0x79ab, 0x79ad, 0x79ae, 0x79b0, 0x79b2, 0x79b3, 0x79b5, 0x79b7, 0x79b9, 0x79ba, 0x79bc, 0x79be, 0x79bf, 0x75ff - .2byte 0x7da4, 0x7da7, 0x79cb, 0x79ed, 0x79ef, 0x79f0, 0x79f2, 0x79f4, 0x79f5, 0x79f7, 0x79f9, 0x79fa, 0x79fc, 0x79fe, 0x7a1f, 0x765f - .2byte 0x7dc4, 0x7de7, 0x7a0b, 0x7a0d, 0x7a2f, 0x7a31, 0x7a33, 0x7a34, 0x7a36, 0x7a37, 0x7a39, 0x7a3b, 0x7a3c, 0x7a3e, 0x7a5f, 0x769f - .2byte 0x7e24, 0x7e27, 0x7a4b, 0x7a4d, 0x7a4f, 0x7a71, 0x7a73, 0x7a75, 0x7a76, 0x7a78, 0x7a79, 0x7a7b, 0x7a7c, 0x7a7e, 0x7a9f, 0x76df - .2byte 0x7e64, 0x7e67, 0x7a8b, 0x7a8d, 0x7a8f, 0x7a91, 0x7ab3, 0x7ab5, 0x7ab6, 0x7ab8, 0x7aba, 0x7abb, 0x7abc, 0x7abe, 0x7adf, 0x7b1f - .2byte 0x7ea4, 0x7ea7, 0x7aab, 0x7aad, 0x7acf, 0x7ad1, 0x7ad3, 0x7af5, 0x7af7, 0x7af8, 0x7afa, 0x7afb, 0x7afd, 0x7afe, 0x7b1f, 0x7b7f - .2byte 0x7ee4, 0x7ee7, 0x7aeb, 0x7aed, 0x7aef, 0x7af1, 0x7b13, 0x7b15, 0x7b37, 0x7b39, 0x7b3a, 0x7b3c, 0x7b3d, 0x7b3e, 0x7b7f, 0x7fbf - .2byte 0x7f24, 0x7f27, 0x7b2b, 0x7b2d, 0x7b2f, 0x7b31, 0x7b33, 0x7b55, 0x7b57, 0x7b59, 0x7b9c, 0x7b9d, 0x7b9e, 0x7b9e, 0x7fbf, 0x7fff - .2byte 0x7f64, 0x7f67, 0x7b6b, 0x7b6d, 0x7b6f, 0x7b71, 0x7b73, 0x7b75, 0x7b77, 0x7b99, 0x7bbc, 0x7fde, 0x7fde, 0x7fdf, 0x7fff, 0x7fff - .2byte 0x7fc4, 0x7fa7, 0x7b8b, 0x7b8d, 0x7b8f, 0x7b91, 0x7b93, 0x7b95, 0x7bb7, 0x7bb9, 0x7bdc, 0x7fde, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7fe4, 0x7fe7, 0x7bcb, 0x7bcd, 0x7bcf, 0x7bd1, 0x7bd3, 0x7bd5, 0x7bd7, 0x7bd9, 0x7bdc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x77e6, 0x7be9, 0x77eb, 0x7bed, 0x7bf0, 0x7bf2, 0x7bf4, 0x7bf6, 0x7bf8, 0x7bfb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x73e9, 0x73eb, 0x73ed, 0x77ef, 0x77f2, 0x77f4, 0x77f6, 0x7bf8, 0x7bfb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7cc6, 0x7cc8, 0x7cc9, 0x7ccb, 0x7ccd, 0x7ccf, 0x7cd1, 0x7cd3, 0x7cd4, 0x7cd6, 0x7cd8, 0x7cda, 0x7cdc, 0x7cdd, 0x7cdf, 0x793f - .2byte 0x7d06, 0x7d29, 0x7d2b, 0x7d2d, 0x7d2e, 0x7d30, 0x7d31, 0x7d33, 0x7d35, 0x7d37, 0x7d38, 0x7d3a, 0x7d3c, 0x7d3e, 0x7d3f, 0x797f - .2byte 0x7d46, 0x7d69, 0x7d6b, 0x7d6d, 0x7d6e, 0x7d70, 0x7d72, 0x7d73, 0x7d75, 0x7d77, 0x7d78, 0x7d7a, 0x7d7c, 0x7d7d, 0x7d7f, 0x79bf - .2byte 0x7d66, 0x7da9, 0x7dab, 0x7dad, 0x7daf, 0x7db0, 0x7db2, 0x7db4, 0x7db6, 0x7db7, 0x7db9, 0x7dba, 0x7dbc, 0x7dbe, 0x7dbf, 0x79ff - .2byte 0x7dc6, 0x7dc9, 0x7deb, 0x7ded, 0x7e10, 0x7e11, 0x7e12, 0x7e14, 0x7e16, 0x7e17, 0x7e19, 0x7e1a, 0x7e1c, 0x7e1e, 0x7e1f, 0x7a5f - .2byte 0x7de6, 0x7e09, 0x7e0b, 0x7e2d, 0x7e30, 0x7e52, 0x7e53, 0x7e55, 0x7e56, 0x7e58, 0x7e59, 0x7e5b, 0x7e5c, 0x7e5e, 0x7e5f, 0x7a9f - .2byte 0x7e26, 0x7e49, 0x7e4b, 0x7e6d, 0x7e70, 0x7e72, 0x7e94, 0x7e95, 0x7e97, 0x7e98, 0x7e9a, 0x7e9b, 0x7e9c, 0x7e9e, 0x7e9f, 0x7edf - .2byte 0x7e66, 0x7e89, 0x7e8b, 0x7e8d, 0x7e90, 0x7eb2, 0x7eb4, 0x7ed6, 0x7ed7, 0x7ed9, 0x7eda, 0x7edb, 0x7edc, 0x7ede, 0x7edf, 0x7f1f - .2byte 0x7ea6, 0x7ec9, 0x7eab, 0x7ecd, 0x7ed0, 0x7ed2, 0x7ef4, 0x7ef6, 0x7f18, 0x7f19, 0x7f1a, 0x7f1c, 0x7f1d, 0x7f1e, 0x7f1f, 0x7f7f - .2byte 0x7ee6, 0x7ee9, 0x7eeb, 0x7eed, 0x7ef0, 0x7f12, 0x7f14, 0x7f36, 0x7f38, 0x7f7b, 0x7f7c, 0x7f7d, 0x7f7e, 0x7f7e, 0x7f7f, 0x7fbf - .2byte 0x7f06, 0x7f29, 0x7f2b, 0x7f2d, 0x7f30, 0x7f32, 0x7f54, 0x7f56, 0x7f58, 0x7f9b, 0x7fbd, 0x7fbe, 0x7fbe, 0x7fbf, 0x7fbf, 0x7fff - .2byte 0x7f46, 0x7f49, 0x7f4b, 0x7f6d, 0x7f70, 0x7f72, 0x7f74, 0x7f76, 0x7f98, 0x7fbb, 0x7fdd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7f86, 0x7f89, 0x7f8b, 0x7f8d, 0x7f90, 0x7f92, 0x7f94, 0x7fb6, 0x7fb8, 0x7fdb, 0x7fdd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7fc6, 0x7fc9, 0x7fcb, 0x7fcd, 0x7fd0, 0x7fd2, 0x7fd4, 0x7fd6, 0x7fd8, 0x7fdb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7fe6, 0x7fe9, 0x7feb, 0x7fed, 0x7ff0, 0x7ff2, 0x7ff4, 0x7ff6, 0x7ff8, 0x7ffb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7be9, 0x7beb, 0x7bed, 0x7bef, 0x7bf2, 0x7bf4, 0x7bf6, 0x7bf8, 0x7ffb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7d29, 0x7d2a, 0x7d2c, 0x7d2d, 0x7d2f, 0x7d30, 0x7d32, 0x7d33, 0x7d35, 0x7d36, 0x7d38, 0x7d39, 0x7d3b, 0x7d3c, 0x7d3e, 0x7d3f - .2byte 0x7d69, 0x7d6b, 0x7d6d, 0x7d6e, 0x7d6f, 0x7d71, 0x7d72, 0x7d74, 0x7d75, 0x7d77, 0x7d78, 0x7d79, 0x7d7b, 0x7d7c, 0x7d7e, 0x7d7f - .2byte 0x7d89, 0x7dab, 0x7dad, 0x7daf, 0x7db0, 0x7db1, 0x7db3, 0x7db4, 0x7db6, 0x7db7, 0x7db8, 0x7dba, 0x7dbb, 0x7dbc, 0x7dbe, 0x7dbf - .2byte 0x7dc9, 0x7dcb, 0x7ded, 0x7def, 0x7df1, 0x7df2, 0x7df3, 0x7df5, 0x7df6, 0x7df7, 0x7df9, 0x7dfa, 0x7dfb, 0x7dfd, 0x7dfe, 0x7dff - .2byte 0x7de9, 0x7e0b, 0x7e0d, 0x7e2f, 0x7e52, 0x7e53, 0x7e54, 0x7e55, 0x7e56, 0x7e58, 0x7e59, 0x7e5a, 0x7e5c, 0x7e5d, 0x7e5e, 0x7e5f - .2byte 0x7e29, 0x7e2b, 0x7e4d, 0x7e4f, 0x7e72, 0x7e94, 0x7e95, 0x7e96, 0x7e97, 0x7e98, 0x7e9a, 0x7e9b, 0x7e9c, 0x7e9d, 0x7e9e, 0x7e9f - .2byte 0x7e49, 0x7e6b, 0x7e6d, 0x7e6f, 0x7e92, 0x7eb4, 0x7ed6, 0x7ed7, 0x7ed8, 0x7ed9, 0x7eda, 0x7edb, 0x7edc, 0x7edd, 0x7ede, 0x7edf - .2byte 0x7e89, 0x7e8b, 0x7e8d, 0x7eaf, 0x7eb2, 0x7ed4, 0x7ef6, 0x7f18, 0x7f19, 0x7f1a, 0x7f1b, 0x7f1c, 0x7f1d, 0x7f1e, 0x7f1e, 0x7f1f - .2byte 0x7ea9, 0x7eab, 0x7ecd, 0x7ecf, 0x7ef2, 0x7ef4, 0x7f16, 0x7f38, 0x7f7b, 0x7f7c, 0x7f7c, 0x7f7d, 0x7f7e, 0x7f7e, 0x7f7f, 0x7f7f - .2byte 0x7ee9, 0x7eeb, 0x7eed, 0x7eef, 0x7f12, 0x7f14, 0x7f36, 0x7f58, 0x7f9b, 0x7fbd, 0x7fbd, 0x7fbe, 0x7fbe, 0x7fbf, 0x7fbf, 0x7fbf - .2byte 0x7f09, 0x7f0b, 0x7f2d, 0x7f2f, 0x7f32, 0x7f54, 0x7f56, 0x7f78, 0x7f9b, 0x7fdd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7f49, 0x7f4b, 0x7f4d, 0x7f4f, 0x7f52, 0x7f74, 0x7f76, 0x7f98, 0x7fbb, 0x7fdd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7f69, 0x7f6b, 0x7f6d, 0x7f6f, 0x7f92, 0x7f94, 0x7f96, 0x7fb8, 0x7fdb, 0x7fdd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7fa9, 0x7fab, 0x7fad, 0x7faf, 0x7fb2, 0x7fb4, 0x7fb6, 0x7fd8, 0x7fdb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7fc9, 0x7fcb, 0x7fcd, 0x7fcf, 0x7fd2, 0x7fd4, 0x7ff6, 0x7ff8, 0x7ffb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff - .2byte 0x7fe9, 0x7feb, 0x7fed, 0x7fef, 0x7ff2, 0x7ff4, 0x7ff6, 0x7ff8, 0x7ffb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff + .incbin "graphics/misc/sunny_day/0.gbapal" + .incbin "graphics/misc/sunny_day/1.gbapal" + .incbin "graphics/misc/sunny_day/2.gbapal" + .incbin "graphics/misc/sunny_day/3.gbapal" + .incbin "graphics/misc/sunny_day/4.gbapal" + .incbin "graphics/misc/sunny_day/5.gbapal" + .incbin "graphics/misc/sunny_day/6.gbapal" + .incbin "graphics/misc/sunny_day/7.gbapal" + .incbin "graphics/misc/sunny_day/8.gbapal" + .incbin "graphics/misc/sunny_day/9.gbapal" + .incbin "graphics/misc/sunny_day/10.gbapal" + .incbin "graphics/misc/sunny_day/11.gbapal" + .incbin "graphics/misc/sunny_day/12.gbapal" + .incbin "graphics/misc/sunny_day/13.gbapal" + .incbin "graphics/misc/sunny_day/14.gbapal" + .incbin "graphics/misc/sunny_day/15.gbapal" + .incbin "graphics/misc/sunny_day/16.gbapal" + .incbin "graphics/misc/sunny_day/17.gbapal" + .incbin "graphics/misc/sunny_day/18.gbapal" + .incbin "graphics/misc/sunny_day/19.gbapal" + .incbin "graphics/misc/sunny_day/20.gbapal" + .incbin "graphics/misc/sunny_day/21.gbapal" + .incbin "graphics/misc/sunny_day/22.gbapal" + .incbin "graphics/misc/sunny_day/23.gbapal" + .incbin "graphics/misc/sunny_day/24.gbapal" + .incbin "graphics/misc/sunny_day/25.gbapal" + .incbin "graphics/misc/sunny_day/26.gbapal" + .incbin "graphics/misc/sunny_day/27.gbapal" + .incbin "graphics/misc/sunny_day/28.gbapal" + .incbin "graphics/misc/sunny_day/29.gbapal" + .incbin "graphics/misc/sunny_day/30.gbapal" + .incbin "graphics/misc/sunny_day/31.gbapal" + .incbin "graphics/misc/sunny_day/32.gbapal" + .incbin "graphics/misc/sunny_day/33.gbapal" + .incbin "graphics/misc/sunny_day/34.gbapal" + .incbin "graphics/misc/sunny_day/35.gbapal" + .incbin "graphics/misc/sunny_day/36.gbapal" + .incbin "graphics/misc/sunny_day/37.gbapal" + .incbin "graphics/misc/sunny_day/38.gbapal" + .incbin "graphics/misc/sunny_day/39.gbapal" + .incbin "graphics/misc/sunny_day/40.gbapal" + .incbin "graphics/misc/sunny_day/41.gbapal" + .incbin "graphics/misc/sunny_day/42.gbapal" + .incbin "graphics/misc/sunny_day/43.gbapal" + .incbin "graphics/misc/sunny_day/44.gbapal" + .incbin "graphics/misc/sunny_day/45.gbapal" + .incbin "graphics/misc/sunny_day/46.gbapal" + .incbin "graphics/misc/sunny_day/47.gbapal" + .incbin "graphics/misc/sunny_day/48.gbapal" + .incbin "graphics/misc/sunny_day/49.gbapal" + .incbin "graphics/misc/sunny_day/50.gbapal" + .incbin "graphics/misc/sunny_day/51.gbapal" + .incbin "graphics/misc/sunny_day/52.gbapal" + .incbin "graphics/misc/sunny_day/53.gbapal" + .incbin "graphics/misc/sunny_day/54.gbapal" + .incbin "graphics/misc/sunny_day/55.gbapal" + .incbin "graphics/misc/sunny_day/56.gbapal" + .incbin "graphics/misc/sunny_day/57.gbapal" + .incbin "graphics/misc/sunny_day/58.gbapal" + .incbin "graphics/misc/sunny_day/59.gbapal" + .incbin "graphics/misc/sunny_day/60.gbapal" + .incbin "graphics/misc/sunny_day/61.gbapal" + .incbin "graphics/misc/sunny_day/62.gbapal" + .incbin "graphics/misc/sunny_day/63.gbapal" + .incbin "graphics/misc/sunny_day/64.gbapal" + .incbin "graphics/misc/sunny_day/65.gbapal" + .incbin "graphics/misc/sunny_day/66.gbapal" + .incbin "graphics/misc/sunny_day/67.gbapal" + .incbin "graphics/misc/sunny_day/68.gbapal" + .incbin "graphics/misc/sunny_day/69.gbapal" + .incbin "graphics/misc/sunny_day/70.gbapal" + .incbin "graphics/misc/sunny_day/71.gbapal" + .incbin "graphics/misc/sunny_day/72.gbapal" + .incbin "graphics/misc/sunny_day/73.gbapal" + .incbin "graphics/misc/sunny_day/74.gbapal" + .incbin "graphics/misc/sunny_day/75.gbapal" + .incbin "graphics/misc/sunny_day/76.gbapal" + .incbin "graphics/misc/sunny_day/77.gbapal" + .incbin "graphics/misc/sunny_day/78.gbapal" + .incbin "graphics/misc/sunny_day/79.gbapal" + .incbin "graphics/misc/sunny_day/80.gbapal" + .incbin "graphics/misc/sunny_day/81.gbapal" + .incbin "graphics/misc/sunny_day/82.gbapal" + .incbin "graphics/misc/sunny_day/83.gbapal" + .incbin "graphics/misc/sunny_day/84.gbapal" + .incbin "graphics/misc/sunny_day/85.gbapal" + .incbin "graphics/misc/sunny_day/86.gbapal" + .incbin "graphics/misc/sunny_day/87.gbapal" + .incbin "graphics/misc/sunny_day/88.gbapal" + .incbin "graphics/misc/sunny_day/89.gbapal" + .incbin "graphics/misc/sunny_day/90.gbapal" + .incbin "graphics/misc/sunny_day/91.gbapal" + .incbin "graphics/misc/sunny_day/92.gbapal" + .incbin "graphics/misc/sunny_day/93.gbapal" + .incbin "graphics/misc/sunny_day/94.gbapal" + .incbin "graphics/misc/sunny_day/95.gbapal" + .align 2 gUnknown_0854C14C:: @ 854C14C .4byte gUnknown_02038454 + .align 2 gUnknown_0854C150:: @ 854C150 .4byte sub_80AB26C .4byte nullsub_36 @@ -1607,92 +169,308 @@ gUnknown_0854C150:: @ 854C150 .4byte sub_80AEA88 .4byte sub_80AEB2C + .align 2 gUnknown_0854C240:: @ 854C240 .4byte sub_80AB3A8 .4byte sub_80AB434 .4byte nullsub_94 .4byte nullsub_94 + .align 2 gUnknown_0854C250:: @ 854C250 - .incbin "baserom.gba", 0x54c250, 0x20 + .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x02, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01 + .align 2 gUnknown_0854C270:: @ 854C270 - .incbin "baserom.gba", 0x54c270, 0x20 + .incbin "graphics/weather/0.gbapal" + .align 2 gUnknown_0854C290:: @ 854C290 - .incbin "baserom.gba", 0x54c290, 0x20 + .incbin "graphics/weather/1.gbapal" + .align 2 gUnknown_0854C2B0:: @ 854C2B0 - .incbin "baserom.gba", 0x54c2b0, 0x820 + .incbin "graphics/weather/2.gbapal" -gUnknown_0854CAD0:: @ 854CAD0 - .incbin "baserom.gba", 0x54cad0, 0x3080 + .align 2 +gWeatherFog2Tiles:: @ 854C2D0 + .incbin "graphics/weather/fog2.4bpp" + .align 2 +gWeatherFog1Tiles:: @ 854CAD0 + .incbin "graphics/weather/fog1.4bpp" + + .align 2 +gWeatherCloudTiles:: @ 854D2D0 + .incbin "graphics/weather/cloud.4bpp" + + .align 2 +gWeatherSnow1Tiles:: @ 854DAD0 + .incbin "graphics/weather/snow0.4bpp" + + .align 2 +gWeatherSnow2Tiles:: @ 854DAF0 + .incbin "graphics/weather/snow1.4bpp" + + .align 2 +gWeatherBubbleTiles:: @ 854DB10 + .incbin "graphics/weather/bubble.4bpp" + + .align 2 +gWeatherAshTiles:: @ 854DB50 + .incbin "graphics/weather/ash.4bpp" + + .align 2 +gWeatherRainTiles:: @ 854EB50 + .incbin "graphics/weather/rain.4bpp" + + .align 2 +gWeatherSandstormTiles:: @ 854F150 + .incbin "graphics/weather/sandstorm.4bpp" + + .align 1 gUnknown_0854FB50:: @ 854FB50 .2byte 0x0000, 0x0042, 0x0005, 0x0049, 0x000a, 0x004e -gUnknown_0854FB5C:: @ 854FB5C - .incbin "baserom.gba", 0x54fb5c, 0x1c + .align 2 +sCloudSpriteSheet:: @ 854FB5C + obj_tiles gWeatherCloudTiles, 0x0800, 0x1200 -gUnknown_0854FB78:: @ 854FB78 - .incbin "baserom.gba", 0x54fb78, 0x18 + .align 2 +gOamData_854FB64:: @ 854FB64 + .2byte 0x0400, 0xc000, 0x0c00, 0x0000 + .align 2 +gSpriteAnim_854FB6C:: @ 854FB6C + .2byte 0x0000, 0x0010, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_854FB74:: @ 854FB74 + .4byte gSpriteAnim_854FB6C + + .align 2 +sCloudSpriteTemplate:: @ 854FB78 + spr_template 0x1200, 0x1201, gOamData_854FB64, gSpriteAnimTable_854FB74, NULL, gDummySpriteAffineAnimTable, sub_80AC6B4 + + .align 2 gUnknown_0854FB90:: @ 854FB90 - .incbin "baserom.gba", 0x54fb90, 0x9c + .2byte 0x0000, 0x0000, 0x0000, 0x00a0, 0x0000, 0x0040, 0x0090, 0x00e0, 0x0090, 0x0080, 0x0020, 0x0020, 0x0020, 0x00c0, 0x0020, 0x0060 + .2byte 0x0048, 0x0080, 0x0048, 0x0020, 0x0048, 0x00c0, 0x00d8, 0x0060, 0x00d8, 0x0000, 0x0068, 0x00a0, 0x0068, 0x0040, 0x0068, 0x00e0 + .2byte 0x0090, 0x0000, 0x0090, 0x00a0, 0x0090, 0x0040, 0x0020, 0x00e0, 0x0020, 0x0080, 0x0048, 0x0020, 0x0048, 0x00c0, 0x0030, 0x0060 -gUnknown_0854FC2C:: @ 854FC2C - .incbin "baserom.gba", 0x54fc2c, 0x18 + .align 2 +gOamData_854FBF0:: @ 854FBF0 + .2byte 0x8000, 0x8000, 0x2400, 0x0000 + .align 2 +gSpriteAnim_854FBF8:: @ 854FBF8 + .2byte 0x0000, 0x0010, 0xfffe, 0x0000 + + .align 2 +gSpriteAnim_854FC00:: @ 854FC00 + .2byte 0x0008, 0x0003, 0x0020, 0x0002, 0x0028, 0x0002, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_854FC10:: @ 854FC10 + .2byte 0x0008, 0x0003, 0x0010, 0x0003, 0x0018, 0x0004, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_854FC20:: @ 854FC20 + .4byte gSpriteAnim_854FBF8 + .4byte gSpriteAnim_854FC00 + .4byte gSpriteAnim_854FC10 + + .align 2 +gSpriteTemplate_854FC2C:: @ 854FC2C + spr_template 0x1206, 0x1200, gOamData_854FBF0, gSpriteAnimTable_854FC20, NULL, gDummySpriteAffineAnimTable, sub_80ACB84 + + .align 1 gUnknown_0854FC44:: @ 854FC44 - .incbin "baserom.gba", 0x54fc44, 0x8 + .2byte 0xff98, 0x00d0, 0xff60, 0x0140 + .align 1 gUnknown_0854FC4C:: @ 854FC4C - .incbin "baserom.gba", 0x54fc4c, 0x8 + .2byte 0x0012, 0x0007, 0x000c, 0x000a + .align 2 gUnknown_0854FC54:: @ 854FC54 - .incbin "baserom.gba", 0x54fc54, 0x38 + obj_tiles gWeatherRainTiles, 0x0600, 0x1206 + .align 2 +gOamData_854FC5C:: @ 854FC5C + .2byte 0x0000, 0x0000, 0x0400, 0x0000 + + .align 2 +gUnknown_0854FC64:: @ 854FC64 + obj_frame_tiles gWeatherSnow1Tiles, 0x0020 + obj_frame_tiles gWeatherSnow2Tiles, 0x0020 + + .align 2 +gSpriteAnim_854FC74:: @ 854FC74 + .2byte 0x0000, 0x0010, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_854FC7C:: @ 854FC7C + .2byte 0x0001, 0x0010, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_854FC84:: @ 854FC84 + .4byte gSpriteAnim_854FC74 + .4byte gSpriteAnim_854FC7C + + .align 2 gUnknown_0854FC8C:: @ 854FC8C - .incbin "baserom.gba", 0x54fc8c, 0x8c + spr_template 0xffff, 0x1200, gOamData_854FC5C, gSpriteAnimTable_854FC84, gUnknown_0854FC64, gDummySpriteAffineAnimTable, sub_80AD30C -gUnknown_0854FD18:: @ 854FD18 - .incbin "baserom.gba", 0x54fd18, 0x18 + .align 2 +gUnknown_0854FCA4:: @ 854FCA4 + .2byte 0x0000, 0x0006, 0x0006, 0x000c, 0x0012, 0x002a, 0x012c, 0x012c + .align 2 +gOamData_854FCB4:: @ 854FCB4 + .2byte 0x0400, 0xc000, 0x0800, 0x0000 + + .align 2 +gSpriteAnim_854FCBC:: @ 854FCBC + .2byte 0x0000, 0x0010, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_854FCC4:: @ 854FCC4 + .2byte 0x0020, 0x0010, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_854FCCC:: @ 854FCCC + .2byte 0x0040, 0x0010, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_854FCD4:: @ 854FCD4 + .2byte 0x0060, 0x0010, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_854FCDC:: @ 854FCDC + .2byte 0x0080, 0x0010, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_854FCE4:: @ 854FCE4 + .2byte 0x00a0, 0x0010, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_854FCEC:: @ 854FCEC + .4byte gSpriteAnim_854FCBC + .4byte gSpriteAnim_854FCC4 + .4byte gSpriteAnim_854FCCC + .4byte gSpriteAnim_854FCD4 + .4byte gSpriteAnim_854FCDC + .4byte gSpriteAnim_854FCE4 + + .align 2 +gSpriteAffineAnim_854FD04:: @ 854FD04 + .2byte 0x0200, 0x0200, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnimTable_854FD14:: @ 854FD14 + .4byte gSpriteAffineAnim_854FD04 + + .align 2 +gSpriteTemplate_854FD18:: @ 854FD18 + spr_template 0x1201, 0x1200, gOamData_854FCB4, gSpriteAnimTable_854FCEC, NULL, gSpriteAffineAnimTable_854FD14, sub_80ADC4C + + .align 2 gUnknown_0854FD30:: @ 854FD30 - .incbin "baserom.gba", 0x54fd30, 0x8 + obj_tiles gWeatherFog1Tiles, 0x0800, 0x1201 + .align 2 gUnknown_0854FD38:: @ 854FD38 - .incbin "baserom.gba", 0x54fd38, 0x20 + obj_tiles gWeatherAshTiles, 0x1000, 0x1202 -gUnknown_0854FD58:: @ 854FD58 - .incbin "baserom.gba", 0x54fd58, 0x18 + .align 2 +gOamData_854FD40:: @ 854FD40 + .2byte 0x0400, 0xc000, 0xf400, 0x0000 + .align 2 +gSpriteAnim_854FD48:: @ 854FD48 + .2byte 0x0000, 0x003c, 0x0040, 0x003c, 0xfffe, 0x0000 + + .align 2 +gSpriteAnimTable_854FD54:: @ 854FD54 + .4byte gSpriteAnim_854FD48 + + .align 2 +gSpriteTemplate_854FD58:: @ 854FD58 + spr_template 0x1202, 0x1200, gOamData_854FD40, gSpriteAnimTable_854FD54, NULL, gDummySpriteAffineAnimTable, sub_80AE068 + + .align 2 gUnknown_0854FD70:: @ 854FD70 - .incbin "baserom.gba", 0x54fd70, 0x1c + obj_tiles gWeatherFog2Tiles, 0x0800, 0x1203 -gUnknown_0854FD8C:: @ 854FD8C - .incbin "baserom.gba", 0x54fd8c, 0x38 + .align 2 +gOamData_854FD78:: @ 854FD78 + .2byte 0x0400, 0xc000, 0x0800, 0x0000 -gUnknown_0854FDC4:: @ 854FDC4 - .incbin "baserom.gba", 0x54fdc4, 0x18 + .align 2 +gSpriteAnim_854FD80:: @ 854FD80 + .2byte 0x0000, 0x0010, 0xffff, 0x0000 + .align 2 +gSpriteAnimTable_854FD88:: @ 854FD88 + .4byte gSpriteAnim_854FD80 + + .align 2 +gSpriteTemplate_854FD8C:: @ 854FD8C + spr_template 0x1203, 0x1200, gOamData_854FD78, gSpriteAnimTable_854FD88, NULL, gDummySpriteAffineAnimTable, sub_80AE3FC + + .align 2 +gOamData_854FDA4:: @ 854FDA4 + .2byte 0x0400, 0xc000, 0x0400, 0x0000 + + .align 2 +gSpriteAnim_854FDAC:: @ 854FDAC + .2byte 0x0000, 0x0003, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_854FDB4:: @ 854FDB4 + .2byte 0x0040, 0x0003, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_854FDBC:: @ 854FDBC + .4byte gSpriteAnim_854FDAC + .4byte gSpriteAnim_854FDB4 + + .align 2 +gSpriteTemplate_854FDC4:: @ 854FDC4 + spr_template 0x1204, 0x1201, gOamData_854FDA4, gSpriteAnimTable_854FDBC, NULL, gDummySpriteAffineAnimTable, sub_80AE8F8 + + .align 2 gUnknown_0854FDDC:: @ 854FDDC - .incbin "baserom.gba", 0x54fddc, 0x8 + obj_tiles gWeatherSandstormTiles, 0x0a00, 0x1204 + .align 1 gUnknown_0854FDE4:: @ 854FDE4 .2byte 0x0000, 0x0078, 0x0050, 0x00a0, 0x0028, 0x0000 gUnknown_0854FDF0:: @ 854FDF0 .byte 0x28, 0x5a, 0x3c, 0x5a, 0x02, 0x3c, 0x28, 0x1e + .align 2 gUnknown_0854FDF8:: @ 854FDF8 - .incbin "baserom.gba", 0x54fdf8, 0x8 + obj_tiles gWeatherBubbleTiles, 0x0040, 0x1205 + .align 1 gUnknown_0854FE00:: @ 854FE00 - .incbin "baserom.gba", 0x54fe00, 0x44 + .2byte 0x0078, 0x00a0, 0x0178, 0x00a0, 0x0028, 0x008c, 0x0128, 0x008c, 0x00b4, 0x0082, 0x01b4, 0x0082, 0x003c, 0x00a0, 0x01b4, 0x00a0 + .2byte 0x00dc, 0x00b4, 0x01dc, 0x00b4, 0x000a, 0x005a, 0x010a, 0x005a, 0x0100, 0x00a0 -gUnknown_0854FE44:: @ 854FE44 - .incbin "baserom.gba", 0x54fe44, 0x18 + .align 2 +gSpriteAnim_854FE34:: @ 854FE34 + .2byte 0x0000, 0x0010, 0x0001, 0x0010, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_854FE40:: @ 854FE40 + .4byte gSpriteAnim_854FE34 + + .align 2 +gSpriteTemplate_854FE44:: @ 854FE44 + spr_template 0x1205, 0x1200, gUnknown_08524904, gSpriteAnimTable_854FE40, NULL, gDummySpriteAffineAnimTable, sub_80AEC34 gUnknown_0854FE5C:: @ 854FE5C .byte 0x02, 0x03, 0x05, 0x03 @@ -1700,12 +478,15 @@ gUnknown_0854FE5C:: @ 854FE5C gUnknown_0854FE60:: @ 854FE60 .byte 0x02, 0x02, 0x03, 0x02 + .align 1 gUnknown_0854FE64:: @ 854FE64 - .incbin "baserom.gba", 0x54fe64, 0x14 + .2byte 0x00c8, 0x0048, 0x0040, 0x0038, 0x0030, 0x0028, 0x0020, 0x0018, 0x0000, 0x0000 + .align 2 gUnknown_0854FE78:: @ 854FE78 .4byte 0x00000008 + .align 2 gUnknown_0854FE7C:: @ 854FE7C .4byte 0x04000040, 0xa2600001, 0x00000001 diff --git a/data/link.s b/data/link.s index 8cd19ba5c1..f1f84c5b8e 100644 --- a/data/link.s +++ b/data/link.s @@ -2132,111 +2132,111 @@ gUnknown_082F0E1C:: @ 82F0E1C .align 2 gWonderCardBgPal1:: @ 82F0E34 - .incbin "graphics/interface/wonder_card_1.gbapal" + .incbin "graphics/wonder_transfers/wonder_card_1.gbapal" .align 2 gWonderCardBgPal2:: @ 82F0E54 - .incbin "graphics/interface/wonder_card_2.gbapal" + .incbin "graphics/wonder_transfers/wonder_card_2.gbapal" .align 2 gWonderCardBgPal3:: @ 82F0E74 - .incbin "graphics/interface/wonder_card_3.gbapal" + .incbin "graphics/wonder_transfers/wonder_card_3.gbapal" .align 2 gWonderCardBgPal4:: @ 82F0E94 - .incbin "graphics/interface/wonder_card_4.gbapal" + .incbin "graphics/wonder_transfers/wonder_card_4.gbapal" .align 2 gWonderCardBgPal5:: @ 82F0EB4 - .incbin "graphics/interface/wonder_card_5.gbapal" + .incbin "graphics/wonder_transfers/wonder_card_5.gbapal" .align 2 gWonderCardBgPal6:: @ 82F0ED4 - .incbin "graphics/interface/wonder_card_6.gbapal" + .incbin "graphics/wonder_transfers/wonder_card_6.gbapal" .align 2 gWonderCardBgPal7:: @ 82F0EF4 - .incbin "graphics/interface/wonder_card_7.gbapal" + .incbin "graphics/wonder_transfers/wonder_card_7.gbapal" .align 2 gWonderCardBgPal8:: @ 82F0F14 - .incbin "graphics/interface/wonder_card_8.gbapal" + .incbin "graphics/wonder_transfers/wonder_card_8.gbapal" .align 2 gWonderCardBgGfx1:: @ 82F0F34 - .incbin "graphics/interface/wonder_card_1.4bpp.lz" + .incbin "graphics/wonder_transfers/wonder_card_1.4bpp.lz" .align 2 gWonderCardBgTilemap1:: @ 82F1030 - .incbin "graphics/interface/wonder_card_1.bin.lz" + .incbin "graphics/wonder_transfers/wonder_card_1.bin.lz" .align 2 gWonderCardBgGfx2:: @ 82F1124 - .incbin "graphics/interface/wonder_card_2.4bpp.lz" + .incbin "graphics/wonder_transfers/wonder_card_2.4bpp.lz" .align 2 gWonderCardBgTilemap2:: @ 82F1218 - .incbin "graphics/interface/wonder_card_2.bin.lz" + .incbin "graphics/wonder_transfers/wonder_card_2.bin.lz" .align 2 gWonderCardBgGfx3:: @ 82F1300 - .incbin "graphics/interface/wonder_card_3.4bpp.lz" + .incbin "graphics/wonder_transfers/wonder_card_3.4bpp.lz" .align 2 gWonderCardBgTilemap3:: @ 82F13D4 - .incbin "graphics/interface/wonder_card_3.bin.lz" + .incbin "graphics/wonder_transfers/wonder_card_3.bin.lz" .align 2 gWonderCardBgGfx7:: @ 82F14A8 - .incbin "graphics/interface/wonder_card_7.4bpp.lz" + .incbin "graphics/wonder_transfers/wonder_card_7.4bpp.lz" .align 2 gWonderCardBgTilemap7:: @ 82F16DC - .incbin "graphics/interface/wonder_card_7.bin.lz" + .incbin "graphics/wonder_transfers/wonder_card_7.bin.lz" .align 2 gWonderCardBgGfx8:: @ 82F1824 - .incbin "graphics/interface/wonder_card_8.4bpp.lz" + .incbin "graphics/wonder_transfers/wonder_card_8.4bpp.lz" .align 2 gWonderCardBgTilemap8:: @ 82F1A54 - .incbin "graphics/interface/wonder_card_8.bin.lz" + .incbin "graphics/wonder_transfers/wonder_card_8.bin.lz" .align 2 gWonderCardShadowPal1:: @ 82F1B9C - .incbin "graphics/interface/wonder_card_shadow_1.gbapal" + .incbin "graphics/wonder_transfers/wonder_card_shadow_1.gbapal" .align 2 gWonderCardShadowPal2:: @ 82F1BBC - .incbin "graphics/interface/wonder_card_shadow_2.gbapal" + .incbin "graphics/wonder_transfers/wonder_card_shadow_2.gbapal" .align 2 gWonderCardShadowPal3:: @ 82F1BDC - .incbin "graphics/interface/wonder_card_shadow_3.gbapal" + .incbin "graphics/wonder_transfers/wonder_card_shadow_3.gbapal" .align 2 gWonderCardShadowPal4:: @ 82F1BFC - .incbin "graphics/interface/wonder_card_shadow_4.gbapal" + .incbin "graphics/wonder_transfers/wonder_card_shadow_4.gbapal" .align 2 gWonderCardShadowPal5:: @ 82F1C1C - .incbin "graphics/interface/wonder_card_shadow_5.gbapal" + .incbin "graphics/wonder_transfers/wonder_card_shadow_5.gbapal" .align 2 gWonderCardShadowPal6:: @ 82F1C3C - .incbin "graphics/interface/wonder_card_shadow_6.gbapal" + .incbin "graphics/wonder_transfers/wonder_card_shadow_6.gbapal" .align 2 gWonderCardShadowPal7:: @ 82F1C5C - .incbin "graphics/interface/wonder_card_shadow_7.gbapal" + .incbin "graphics/wonder_transfers/wonder_card_shadow_7.gbapal" .align 2 gWonderCardShadowPal8:: @ 82F1C7C - .incbin "graphics/interface/wonder_card_shadow_8.gbapal" + .incbin "graphics/wonder_transfers/wonder_card_shadow_8.gbapal" .align 2 gWonderCardShadowGfx:: @ 82F1C9C - .incbin "graphics/interface/wonder_card_shadow.4bpp.lz" + .incbin "graphics/wonder_transfers/wonder_card_shadow.4bpp.lz" .align 2 gUnknown_082F1D00:: @ 82F1D00 struct CompressedSpriteSheet @@ -2304,55 +2304,55 @@ gUnknown_082F1DF8:: @ 82F1DF8 .align 2 gWonderNewsPal1:: @ 82F1E08 - .incbin "graphics/interface/wonder_news_1.gbapal" + .incbin "graphics/wonder_transfers/wonder_news_1.gbapal" .align 2 gWonderNewsPal7:: @ 82F1E28 - .incbin "graphics/interface/wonder_news_7.gbapal" + .incbin "graphics/wonder_transfers/wonder_news_7.gbapal" .align 2 gWonderNewsPal8:: @ 82F1E48 - .incbin "graphics/interface/wonder_news_8.gbapal" + .incbin "graphics/wonder_transfers/wonder_news_8.gbapal" .align 2 gWonderNewsGfx1:: @ 82F1E68 - .incbin "graphics/interface/wonder_news_1.4bpp.lz" + .incbin "graphics/wonder_transfers/wonder_news_1.4bpp.lz" .align 2 gWonderNewsTilemap1:: @ 82F1EE8 - .incbin "graphics/interface/wonder_news_1.bin.lz" + .incbin "graphics/wonder_transfers/wonder_news_1.bin.lz" .align 2 gWonderNewsGfx2:: @ 82F1FC4 - .incbin "graphics/interface/wonder_news_2.4bpp.lz" + .incbin "graphics/wonder_transfers/wonder_news_2.4bpp.lz" .align 2 gWonderNewsTilemap2:: @ 82F1FF4 - .incbin "graphics/interface/wonder_news_2.bin.lz" + .incbin "graphics/wonder_transfers/wonder_news_2.bin.lz" .align 2 gWonderNewsGfx3:: @ 82F20B4 - .incbin "graphics/interface/wonder_news_3.4bpp.lz" + .incbin "graphics/wonder_transfers/wonder_news_3.4bpp.lz" .align 2 gWonderNewsTilemap3:: @ 82F2124 - .incbin "graphics/interface/wonder_news_3.bin.lz" + .incbin "graphics/wonder_transfers/wonder_news_3.bin.lz" .align 2 gWonderNewsGfx7:: @ 82F21F0 - .incbin "graphics/interface/wonder_news_7.4bpp.lz" + .incbin "graphics/wonder_transfers/wonder_news_7.4bpp.lz" .align 2 gWonderNewsTilemap7:: @ 82F2280 - .incbin "graphics/interface/wonder_news_7.bin.lz" + .incbin "graphics/wonder_transfers/wonder_news_7.bin.lz" .align 2 gWonderNewsGfx8:: @ 82F235C - .incbin "graphics/interface/wonder_news_8.4bpp.lz" + .incbin "graphics/wonder_transfers/wonder_news_8.4bpp.lz" .align 2 gWonderNewsTilemap8:: @ 82F23EC - .incbin "graphics/interface/wonder_news_8.bin.lz" + .incbin "graphics/wonder_transfers/wonder_news_8.bin.lz" .align 2 gUnknown_082F24C8:: @ 82F24C8 @@ -3043,43 +3043,43 @@ gUnknown_082F334C:: @ 82F334C .align 2 gBerryCrushGrinderBasePal:: @ 82F336C - .incbin "graphics/interface/berrycrush_grinder_base.gbapal" + .incbin "graphics/link_games/berrycrush_grinder_base.gbapal" .align 2 gBerryCrushMiscSpritesPal:: @ 82F338C - .incbin "graphics/interface/berrycrush_misc.gbapal" + .incbin "graphics/link_games/berrycrush_misc.gbapal" .align 2 gBerryCrushTimerDigitsPal:: @ 82F33AC - .incbin "graphics/interface/berrycrush_timerdigits.gbapal" + .incbin "graphics/link_games/berrycrush_timerdigits.gbapal" .align 2 gBerryCrushGrinderBaseGfx:: @ 82F33CC - .incbin "graphics/interface/berrycrush_grinder_base.4bpp.lz" + .incbin "graphics/link_games/berrycrush_grinder_base.4bpp.lz" .align 2 gBerryCrushBtnPressGfx:: @ 82F36F8 - .incbin "graphics/interface/berrycrush_btnpress.4bpp.lz" + .incbin "graphics/link_games/berrycrush_btnpress.4bpp.lz" .align 2 gBerryCrushSparkleGfx:: @ 82F3A74 - .incbin "graphics/interface/berrycrush_sparkle.4bpp.lz" + .incbin "graphics/link_games/berrycrush_sparkle.4bpp.lz" .align 2 gBerryCrushTimerDigitsGfx:: @ 82F3BC0 - .incbin "graphics/interface/berrycrush_timerdigits.4bpp.lz" + .incbin "graphics/link_games/berrycrush_timerdigits.4bpp.lz" .align 2 gBerryCrushGrinderTopTilemap:: @ 82F3C8C - .incbin "graphics/interface/berrycrush_grinder_top.bin.lz" + .incbin "graphics/link_games/berrycrush_grinder_top.bin.lz" .align 2 gBerryCrushContainerCapTilemap:: @ 82F3DBC - .incbin "graphics/interface/berrycrush_container_cap.bin.lz" + .incbin "graphics/link_games/berrycrush_container_cap.bin.lz" .align 2 gBerryCrushBackgroundTilemap:: @ 82F3F54 - .incbin "graphics/interface/berrycrush_background.bin.lz" + .incbin "graphics/link_games/berrycrush_background.bin.lz" .align 2 gUnknown_082F417C:: @ 82F417C @@ -3399,66 +3399,66 @@ gUnknown_082F449C:: @ 82F449C .align 2 gUnknown_082F7DF0_UnrefDupe:: @ 82F4698 - .incbin "graphics/interface/dodrioberry_bg1.gbapal" + .incbin "graphics/link_games/dodrioberry_bg1.gbapal" .align 2 - .incbin "graphics/interface/dodrioberry_bg2.gbapal" + .incbin "graphics/link_games/dodrioberry_bg2.gbapal" .align 2 gUnknown_082F7E30_UnrefDupe:: @ 82F46B8 - .incbin "graphics/interface/dodrioberry_pkmn.gbapal" + .incbin "graphics/link_games/dodrioberry_pkmn.gbapal" .align 2 gUnknown_082F7E50_UnrefDupe:: @ 82F46D8 - .incbin "graphics/interface/dodrioberry_shiny.gbapal" + .incbin "graphics/link_games/dodrioberry_shiny.gbapal" .align 2 gUnknown_082F7E70_UnrefDupe:: @ 82F46F8 - .incbin "graphics/interface/dodrioberry_status.gbapal" + .incbin "graphics/link_games/dodrioberry_status.gbapal" .align 2 gUnknown_082F7E90_UnrefDupe:: @ 82F4718 - .incbin "graphics/interface/dodrioberry_berrysprites.gbapal" + .incbin "graphics/link_games/dodrioberry_berrysprites.gbapal" .align 2 gUnknown_082F7EB0_UnrefDupe:: @ 82F4738 - .incbin "graphics/interface/dodrioberry_berrysprites.4bpp.lz" + .incbin "graphics/link_games/dodrioberry_berrysprites.4bpp.lz" .align 2 gUnknown_082F8064_UnrefDupe:: @ 82F490C - .incbin "graphics/interface/dodrioberry_platform.gbapal" + .incbin "graphics/link_games/dodrioberry_platform.gbapal" .align 2 gUnknown_082F8084_UnrefDupe:: @ 82F492C - .incbin "graphics/interface/dodrioberry_bg1.4bpp.lz" + .incbin "graphics/link_games/dodrioberry_bg1.4bpp.lz" .align 2 gUnknown_082F8914_UnrefDupe:: @ 82F51BC - .incbin "graphics/interface/dodrioberry_bg2.4bpp.lz" + .incbin "graphics/link_games/dodrioberry_bg2.4bpp.lz" .align 2 gUnknown_082F96E0_UnrefDupe:: @ 82F5F88 - .incbin "graphics/interface/dodrioberry_status.4bpp.lz" + .incbin "graphics/link_games/dodrioberry_status.4bpp.lz" .align 2 gUnknown_082F9774_UnrefDupe:: @ 82F601C - .incbin "graphics/interface/dodrioberry_platform.4bpp.lz" + .incbin "graphics/link_games/dodrioberry_platform.4bpp.lz" .align 2 gUnknown_082F98BC_UnrefDupe:: @ 82F6164 - .incbin "graphics/interface/dodrioberry_pkmn.4bpp.lz" + .incbin "graphics/link_games/dodrioberry_pkmn.4bpp.lz" .align 2 gUnknown_082FAAD8_UnrefDupe:: @ 82F7380 - .incbin "graphics/interface/dodrioberry_bg1.bin.lz" + .incbin "graphics/link_games/dodrioberry_bg1.bin.lz" .align 2 gUnknown_082FAD44_UnrefDupe:: @ 82F75EC - .incbin "graphics/interface/dodrioberry_bg2right.bin.lz" + .incbin "graphics/link_games/dodrioberry_bg2right.bin.lz" .align 2 gUnknown_082FAF94_UnrefDupe:: @ 82F783C - .incbin "graphics/interface/dodrioberry_bg2left.bin.lz" + .incbin "graphics/link_games/dodrioberry_bg2left.bin.lz" .align 2 gUnknown_082F7A88:: @ 82F7A88 @@ -3661,66 +3661,66 @@ gUnknown_082F449C_UnrefDupe:: @ 82F7BF4 .align 2 gDodrioBerryBgPal1:: @ 82F7DF0 - .incbin "graphics/interface/dodrioberry_bg1.gbapal" + .incbin "graphics/link_games/dodrioberry_bg1.gbapal" .align 2 - .incbin "graphics/interface/dodrioberry_bg2.gbapal" + .incbin "graphics/link_games/dodrioberry_bg2.gbapal" .align 2 gDodrioBerryPkmnPal:: @ 82F7E30 - .incbin "graphics/interface/dodrioberry_pkmn.gbapal" + .incbin "graphics/link_games/dodrioberry_pkmn.gbapal" .align 2 gDodrioBerryShinyPal:: @ 82F7E50 - .incbin "graphics/interface/dodrioberry_shiny.gbapal" + .incbin "graphics/link_games/dodrioberry_shiny.gbapal" .align 2 gDodrioBerryStatusPal:: @ 82F7E70 - .incbin "graphics/interface/dodrioberry_status.gbapal" + .incbin "graphics/link_games/dodrioberry_status.gbapal" .align 2 gDodrioBerrySpritesPal:: @ 82F7E90 - .incbin "graphics/interface/dodrioberry_berrysprites.gbapal" + .incbin "graphics/link_games/dodrioberry_berrysprites.gbapal" .align 2 gDodrioBerrySpritesGfx:: @ 82F7EB0 - .incbin "graphics/interface/dodrioberry_berrysprites.4bpp.lz" + .incbin "graphics/link_games/dodrioberry_berrysprites.4bpp.lz" .align 2 gDodrioBerryPlatformPal:: @ 82F8064 - .incbin "graphics/interface/dodrioberry_platform.gbapal" + .incbin "graphics/link_games/dodrioberry_platform.gbapal" .align 2 gDodrioBerryBgGfx1:: @ 82F8084 - .incbin "graphics/interface/dodrioberry_bg1.4bpp.lz" + .incbin "graphics/link_games/dodrioberry_bg1.4bpp.lz" .align 2 gDodrioBerryBgGfx2:: @ 82F8914 - .incbin "graphics/interface/dodrioberry_bg2.4bpp.lz" + .incbin "graphics/link_games/dodrioberry_bg2.4bpp.lz" .align 2 gDodrioBerryStatusGfx:: @ 82F96E0 - .incbin "graphics/interface/dodrioberry_status.4bpp.lz" + .incbin "graphics/link_games/dodrioberry_status.4bpp.lz" .align 2 gDodrioBerryPlatformGfx:: @ 82F9774 - .incbin "graphics/interface/dodrioberry_platform.4bpp.lz" + .incbin "graphics/link_games/dodrioberry_platform.4bpp.lz" .align 2 gDodrioBerryPkmnGfx:: @ 82F98BC - .incbin "graphics/interface/dodrioberry_pkmn.4bpp.lz" + .incbin "graphics/link_games/dodrioberry_pkmn.4bpp.lz" .align 2 gDodrioBerryBgTilemap1:: @ 82FAAD8 - .incbin "graphics/interface/dodrioberry_bg1.bin.lz" + .incbin "graphics/link_games/dodrioberry_bg1.bin.lz" .align 2 gDodrioBerryBgTilemap2Right:: @ 82FAD44 - .incbin "graphics/interface/dodrioberry_bg2right.bin.lz" + .incbin "graphics/link_games/dodrioberry_bg2right.bin.lz" .align 2 gDodrioBerryBgTilemap2Left:: @ 82FAF94 - .incbin "graphics/interface/dodrioberry_bg2left.bin.lz" + .incbin "graphics/link_games/dodrioberry_bg2left.bin.lz" .align 2 gUnknown_082FB1E0:: @ 82FB1E0 @@ -4166,31 +4166,31 @@ gUnknown_082FB714:: @ 82FB714 .align 2 gPkmnJumpPal1:: @ 82FB73C - .incbin "graphics/interface/pkmnjump_pal1.gbapal" + .incbin "graphics/link_games/pkmnjump_pal1.gbapal" .align 2 gPkmnJumpPal2:: @ 82FB75C - .incbin "graphics/interface/pkmnjump_pal2.gbapal" + .incbin "graphics/link_games/pkmnjump_pal2.gbapal" .align 2 gPkmnJumpRopeGfx1:: @ 82FB77C - .incbin "graphics/interface/pkmnjump_rope1.4bpp.lz" + .incbin "graphics/link_games/pkmnjump_rope1.4bpp.lz" .align 2 gPkmnJumpRopeGfx2:: @ 82FB89C - .incbin "graphics/interface/pkmnjump_rope2.4bpp.lz" + .incbin "graphics/link_games/pkmnjump_rope2.4bpp.lz" .align 2 gPkmnJumpRopeGfx3:: @ 82FBA70 - .incbin "graphics/interface/pkmnjump_rope3.4bpp.lz" + .incbin "graphics/link_games/pkmnjump_rope3.4bpp.lz" .align 2 gPkmnJumpRopeGfx4:: @ 82FBBA0 - .incbin "graphics/interface/pkmnjump_rope4.4bpp.lz" + .incbin "graphics/link_games/pkmnjump_rope4.4bpp.lz" .align 2 gPkmnJumpStarGfx:: @ 82FBC9C - .incbin "graphics/interface/pkmnjump_star.4bpp.lz" + .incbin "graphics/link_games/pkmnjump_star.4bpp.lz" .align 2 gUnknown_082FBE08:: @ 82FBE08 @@ -4376,43 +4376,43 @@ gUnknown_082FC00C:: @ 82FC00C .align 2 gPkmnJumpPal3:: @ 82FC024 - .incbin "graphics/interface/pkmnjump_pal3.gbapal" + .incbin "graphics/link_games/pkmnjump_pal3.gbapal" .align 2 gPkmnJumpBgPal:: @ 82FC044 - .incbin "graphics/interface/pkmnjump_bg.gbapal" + .incbin "graphics/link_games/pkmnjump_bg.gbapal" .align 2 gPkmnJumpBgGfx:: @ 82FC064 - .incbin "graphics/interface/pkmnjump_bg.4bpp.lz" + .incbin "graphics/link_games/pkmnjump_bg.4bpp.lz" .align 2 gPkmnJumpBgTilemap:: @ 82FC290 - .incbin "graphics/interface/pkmnjump_bg.bin.lz" + .incbin "graphics/link_games/pkmnjump_bg.bin.lz" .align 2 gPkmnJumpVenusaurPal:: @ 82FC440 - .incbin "graphics/interface/pkmnjump_venusaur.gbapal" + .incbin "graphics/link_games/pkmnjump_venusaur.gbapal" .align 2 gPkmnJumpVenusaurGfx:: @ 82FC460 - .incbin "graphics/interface/pkmnjump_venusaur.4bpp.lz" + .incbin "graphics/link_games/pkmnjump_venusaur.4bpp.lz" .align 2 gPkmnJumpVenusaurTilemap:: @ 82FCDB0 - .incbin "graphics/interface/pkmnjump_venusaur.bin.lz" + .incbin "graphics/link_games/pkmnjump_venusaur.bin.lz" .align 2 gPkmnJumpResultsPal:: @ 82FD168 - .incbin "graphics/interface/pkmnjump_results.gbapal" + .incbin "graphics/link_games/pkmnjump_results.gbapal" .align 2 gPkmnJumpResultsGfx:: @ 82FD188 - .incbin "graphics/interface/pkmnjump_results.4bpp.lz" + .incbin "graphics/link_games/pkmnjump_results.4bpp.lz" .align 2 gPkmnJumpResultsTilemap:: @ 82FDC38 - .incbin "graphics/interface/pkmnjump_results.bin.lz" + .incbin "graphics/link_games/pkmnjump_results.bin.lz" .align 2 gUnknown_082FE164:: @ 82FE164 struct BgTemplate @@ -4509,11 +4509,11 @@ gUnknown_082FE278:: @ 82FE278 .align 2 gPkmnJump321StartPal1:: @ 82FE284 - .incbin "graphics/interface/pkmnjump_321start1.gbapal" + .incbin "graphics/link_games/pkmnjump_321start1.gbapal" .align 2 gPkmnJump321StartGfx1:: @ 82FE2A4 - .incbin "graphics/interface/pkmnjump_321start1.4bpp.lz" + .incbin "graphics/link_games/pkmnjump_321start1.4bpp.lz" .align 2 gUnknown_082FE6C8:: @ 82FE6C8 @@ -4577,11 +4577,11 @@ gUnknown_082FE748:: @ 82FE748 .align 2 gPkmnJump321StartPal2:: @ 82FE758 - .incbin "graphics/interface/pkmnjump_321start2.gbapal" + .incbin "graphics/link_games/pkmnjump_321start2.gbapal" .align 2 gPkmnJump321StartGfx2:: @ 82FE778 - .incbin "graphics/interface/pkmnjump_321start2.4bpp.lz" + .incbin "graphics/link_games/pkmnjump_321start2.4bpp.lz" .align 2 gUnknown_082FEBCC:: @ 82FEBCC diff --git a/data/unknown_serial_data.bin b/data/unknown_serial_data.bin new file mode 100644 index 0000000000000000000000000000000000000000..85057cf4e2bd657da5d632ac12d1ea24aeaa4499 GIT binary patch literal 12512 zcmbVyX;{)(`1bkzSVc5MG{7YUG*m1=GBu}A5mB*ROIuOY&}mV#vSum}HB>ZkDKu+v zP0h;6%C;HYNX<%ZotYL(Giz*L#+sJb|NDM_Km4Ch=Q`(H=eo~x&h?!8dG3=owZcjD zt13d3qbgGctCXq&Rgp@r6sSU#t5ouwJmoLo{~Bx!Kr83}wKbe==|9i32lx;K8MJYW zjEab0fV6%UQS^1~W3&PQr<~hxn{^pdr1YU>JAq4xWy4&iP;N~G^TE*%k}zT~A=L>B zgitnWPHlhyqB--OdawY%tZslc&Ii#S{DZ~ll61re?+{`YB3A*_38cv1*C{Y6=dU1p z(K;GN_3aZN07nbVbet~A-FV@LAO=n6W9h$p{r6TG6qY;mD7BbL~ zfB~>ENi=t{feaiG2?}g)K)|o<-Ss&Xgy9$eE(?RX;o;Tk_$?+zZ zX7Vd21jUNWA6{iQXx{yIQJcoLh9{*-51=gMA07`Tvtbk6P==QlEoW*cdd;LwH6a`LFR`{OzYR&|+$m&JV z2H7rruL50g`8wYg@uY|2N;9){Qa@4z2z*cRqg_s=HIpRO(ax++--suDNuHl^&wAdw z9?e^@IA~Kk&M3VE&4-Zb06Z?0S(F9lDkJNdebc-03!qctrXeWX?}?f-%#M@yd-~0h zXYlSp>M^mo1p4QD&MrY3#lkz{?D8R>!g^RL;tDkew{hlyF(~x`dY9; z0WS`0UZTUS8ux$aK*3AYH2*ZDrOePHzLZ5(IpBFgGDA0H%v~MIS*bEBh`VBy(@!fC zu*;qKLF$6L_gGapO&(c2#Igiy%`o@qh2_yx&gEC=iRrg1I(7f3n2{oZz9$|VVd`B!2wwb~;icD2(XRZKu$RvuVAb zxO`+{p)PvLF}#5|A8k1jObSHLNyvL5)zmOV^QeFMpSiT1xQ-y~feyRyIJjFiT<@jf z)@3MUO}s&1F9^E7dHayj=**;vyW;Ac?|)(HlxT>w%0#bg==(w&HrYAi!{Ny~{2MxR zC3eC-Xm_H$e)LYC|g`7+vC&6;Zpj^Yfw(>Gt>l}L3imYf6x=7g* znMnSrGr>tUcV9B2b3vlC^200_Bs&;$FW>Pbn_`oAjw*$~=qRv;Lj(}c$br10B$(NY z?dIdv;i(6@{A>+R#I%_>pbC*f)&>sjO?4fERf;EfyOV%3(veW_R3|1ZLmmcn;12)` z!v{SL0x6u01Y)Qbkg221wQYf>U+|Hn()?Ux4jJGPn8=U_r*sJ*0V>*wqb_YSCGN9; zVS(J+Q**)&_1@+tCWO11;n4_)`L9#~+B^%|us2)093YiSGee3TPXxM3M$GR*7p2bN zp+-ao5oF@t%-k`Xfy2LQ>Q;*OX+o*XSt?C9EwPZlD``}I)aLlj>{QCj+#ViY5%;zA znoE+Ey6U#f-qrxI{0YszW<2FoI4=SdM6`vyy(AtW5Ifh*%M%c1Pq>$nAznO<2R zD_Mn~VTzk?C)6{#OFBBC@cLAp=`bbRevPE46<8K>i`UFcyBrnUu^mn!7>()ate4vx<*eV(>f#OseyFl<6mnpnG+Zve@!3Iqs7xnfEem;EOx^sz@b z5oy**ln)MBF=;|4^6wUd(-8_YC#}E2XkXkyvyXebL4j1{q|>SlS4TAGhNQDqA#X|L zet*x!8#e9KrM3oVdxVb5M|j@0>W17++Ri?h!^E3mV4@R^BepjSK^t#CSSF4_gZ*pT zc5FcMnCNbNTW6aFSV1-o03dlrJg@?}P=LD(LMWabIhqV;G=NYlSEuO*02(U=l)^9t z9O0cu5?Q4hjc{-}?V){o4$8kvNk$5?0fmMXOBG}qus{lkG=V)!r$oX4*gGNfl|q7+ z$mK|BN`S-zT+T*7ZlVt{trQt$GMer@RQv`j$x%7c2+lk)UZKv)L8PMCiE#WeU5`xB z`Q(mg5~OkhbMAO!AD1mLA;Y8Y1uj_!XF7Ui^2s&JX~L7100^=nM>#QjO%cBC_d^o-hRVTGUAk?2p??z!CFo z8mzRCD}-44tMe3ARuwX!FaqQ@zJ=4FF>p@=2==Q1vkyes%K`m3=c-`)0T}@+Tb}=h zv*e0MA9XC4_pS|(&ABC=%l{+~IW89Ai!-pZ5Kv27c?YaD5{$#D5Nyqk*HnD2U zV;~5B+D`#ty-K{gr?=MD5rX8>>0=g1Q9H}>2i<3?egI}RdNtH<+);dvTQ}JanU>Gv z5%izx13F<58UxoDbEIX5l7+flMFP!xCE8Y{l1lG+!)2N_ni-7_ff0W&YRE^5fsmEM zf#?y=sAB9zY(G;+^&h+y>+#3q@I^8gU+^T{Ha$eN#7eUiL_N2X z=^*iTY~mlC##Pa*6hdABIWsWGO3_|Z_@cm7r%2zwO23iKW()dGZY?RUKt z`cnI{V5aU)8a~zDAf`J#5ZUdq=;sDSM1JKLhR`(&fttnue$c*Ajuw<_R+Dq>>9eqp zUZ<z6TbYcuNo2To}5XJ&Hh>}5liw3`zofy9(+F~eM|C+Bc#U48N_po%fkdU@xE z1l3zs#vp%3di8tS;wnydqLwo+qtfAM0RjWj1Y#~hWCp>b##BC4jIl<}RjyuBxMR1< z47N75OnH`lm)fRHo5PU{6_zjo^SXyKRsVknyPZi#{_wcb27`j|Z zdS@ z{=)((B^a>^Br$7n-}+Ik-X{Gg%Ibe?l4*51d8bhTFo$$xg%+Sc9bvo)zQ&TqJzKc~ z@xCe^FpXiV%FjLxo^woJC&~lQa9Rfv_CuDbAy^Lqv-7pr7WEFAZuIQ#pLKb~*q*oV zLdf9;?6Z;;|2;BT0s8F!9u(b3H*8Y?fopo=4v!w|EgfX4KK+-k2#K3XKNGo-G+YN< zUX$}Yc+VfTBlYHQ0yW*hZ`Nj`<$63rN_}Y{+-H1nah4yA+CkQcq#g^})G){UH)>Oz z^&91}G0S%U$hbuzUw{0f{B8cf7b1U9)k{~@$yN6SP6E4HT4#y-pDp8iF5lXxyvv2g zhOzUFC)sR?g(D30I+5K%_7s9^kd+bk1jTes@N~_aVWh|jzj9~~7Ks7aA^WgGAE;+2 z!?#i#k&Qfzg=(jt=>7HSw9zX>@Omslc5-kRjM>NJ52Kw5m4SY$&}sP}|1daK$3;F% zPPpw{Y(yFtsT@|n*fsVU#JyPI`FhUF1uC80WcQ*Hu z`Ld4ZYuEqxpz0e?6Oik}s*Y=JF|erLL^PSe7@+WrHo@bLk^fDF6`Sf>)Bdv<9zc@d z$uX!msrKAGtQP+~C+kEA5eIvahohpz4!e|z#w^tb$QC+kf2;ea3rh$QupBzyW+9w7 zt+fp0J3?;{1|k(f7zJPw$=GVfF0A!5^~f&_za&-=DHafg)$Kh#dpSw`UU$_3wY@G2q|Vl&Z?@+}I70nm0cftdv? zpq&yhIp)l{$RO6znnvGQ8oGGR2oF*?~_hGO7#hI6P0b*Q1QFtoX_qeSwNY%VHv zl#iS7zfs`2y2)UNNX-5e@5QH(%2ENNO3(>o{=0wsaF95NoickUPEYe&@^F0i;09?g z5Gj_?v|kC1fB`{9a!B7Pco{Z_02!WSKI&UmnB8~75X<@Jz$ow^`f&e1xUOes*2kZ! z_m5Ct_N?rE)3xwUH+l37uC(g{EuvNK!ObgA>>K)|3ZXsOAiw6Xk?#yjF#e(neAo9( zytT=Ge?WgiZf2Ymzn`_|-#0Q2M}zLoebX_K12$LFs6pdynEL=CE)%+^Al1)#6 zpT%aKWMib{gcfVC{L_YNyZT382=Ft1t)C=#PY^kmjneR))R)_Tn~=R@&}jg?_#!y6 zs&sq+dqWFOZl2v~63o;`{&^vI%<&ZyuFxUPBR1sL4mtc(w3K}Q9l6jaXqLW?7Wz5v zwut2X4{L-TEuaN#(;Ow|y|XHe4>+N}x&XP3dtn0gx9Pn+m>vji?A~^T|0Fn$@wfP& zGsVT+rr9%$)mH8GD55l{Ul$X7@{QBPwx1MsV>>l6xqADk6r@3$HCF>dTaTjza+dK$*ry(DCC9K$hX zwT6bDM}vxb@4&8)C||^z#MW&cOicvrJaQ8?;yAG$SpqC zOBVL!V~i|q4S)l=^_2vK=JB`pC8vgYa%=@JAyiQ9hnX}C`3p}f|-WP zRl9J7CXW7!H3gP2CCO%*lU%)vr_hwHHxlSe9=-lom3rYp_M$b{pC8J8v+Z=wd`#Lj zgIV^+-)&A84Z&-S`BqBD@^r-33&$}1v@O&Q$E*6TdHuzAj$>~1FVeE}?#A$^Vl6g0 zUpipbso9L$*&K_`H12igujofqE8#;!qsTca_3cY{K`5otR3fB`A>$>dye;a;~0vA~t$2yF!q81&p zd?vdGqjp_{kKf#MF1XH1|6x7zbgPT^&B#`l?3>EtcQ>5LdAaSrzVqh}tI93ZcOtJ< z9{Rzx3+;~GNsg%KLAZD&nXc9nD4wV3Ny?O?=5%Sy-3+liFId~olepGV#jk4GiN!e@0X_jT`FPr>#%)W zj{n&@1i$RKCY|@ZJEu9>(R8trE!z~jwD@AgBCn>x7Ddo!%y zlWg`r?0+>~KDq~_gXD?eEfxEI(=tBQ>LnUWF*ah{ypyChg-c#!_Z>Ve1=h0tKDC>rP;Pg+VeV>wWUl|{* zv>G9=7)`#8+?CVk%*?O6=dLdAaGVKSxF8BNr9Xo3(RXD%zf$Nc*-*{D$B{#Vxu6vdoy8iDk zzsEyP_RqI7bY}W>`qZ;@MlxXlUn{PqCey9wfvnkms@LPIX-AQTxrGHn-zs|h(%Xk zWlH2(UD7w(tE@e#X|lr5lqAVro5lS<{yr*zkbqe^Fpj*f zlgOVWyZE@XKWW$Whd%UACmjD6nj7U5(Gp9qkOuy_pOT<09K6(c^S43$pMxgZA8Ybo zZ945xszda-jC=eZ5dUzoomM;aHMd3f{Y)~;rcV+hh2|QcGcg^OMixYCtdf|oW4Qka3nSzkzi92!O6%QAB|2 z+q@;2`w@$(0Z}Id_T0Ud>4_Z=EjnH%amKF|veVt~X7?-@+mU@~`It@eZmuPTXz|xo zlbgOP=;4CmowH0%IgM%ep3Ab`X=<-uO#_uBPYsZ9a5JC`5a;XwYLucYM{^Q!YSUh9M2F&Y~$IZQ7wx=~6znDUjvLEQxK*q^)t{|suAXxv zgMwVJ%|98H>o21nw~0i>1k9$jPtIJ-fvs)pGuw$90=%{Vm|w27$C;#%eqhCwgmLjF zTD77&#V<%B|1~?lJML0A%prFQCfNR!}kAVI@RHVjbWM=pl9=KF+O$)T!V~-S&G1 zktaZ>LLx;7_adW|F`(8MD@jAJoGVhbPz-2li{-m%01CrR%m=2#mP!e(*&;lOCFQu_ zDTU4TLy1V=41u$v*$}fF*O(WOrV9iJVGLS<00;r(Ozu=caRXHg(DdJZIMr@?8ys__ z3@Oftq)DMDzI6dnq6=N_)>sjwz)A6BM4X0RvB0YiYkR1@T@pmN8vp7zS0#szxg!c@-9!zc7?5e3w?X0}0m zDc-plYAy6pxEV+WcDDeQbT(bC0Td3p#s(A0jtQ}0#1xkYy0zGN(t*2eLS><;BC0Ub zncli{+meX0n()H#i<-8ID^H!vI}Ka|(a_)l65L%X0yI^T`oWdqZmj-jmx#{Np)}3W z&%A;H8Am=S=Qok!Nlksaf(YBBN)=ib&>SX;Nbo1$3Gr%a5ExS>B zA>G6FqJZk1QTl=Wp_JDY&mGDdj==(ZscWQs z2sfyE#w!-d;AS_)usc8TS?16{G)I2s&{ez(BSwttt5=rW%3)2r%C&}Nu)+Nh8>N!8cUz~1i-dh=3hSIq%@uQ&U)J8T0Rg?N7QLjA zo0@`flb+J^pS&}=DJ(Zz#?RFZlEXLfCc6=~r^}NQo10_w_maC>@C)4hd?THg1h);; zS;g3}aTUb=Vizf{3DGW+r1&Cm$MVCy58|&{ouxo3U@(HgZk%=GI&%_=cR2>mU)Z!^0k%zJl!o4}X!|oSw4^(QtPwOH%{WjX z^q4`?cP~k1wT*gs;q2MPH~@NqpJ^6@IlMZyVQ&CGGo;G zqka;AugLAM3yP;p;Uu>d8#lMBg%QR9X@6~NcCE&ka@0MeX@ghI@s+z)MHIsuGFRD0 z;+MNMSIh`looNJ1vbKl|g2=t0$sW_pPb<>Q>#oEj4cT!3#+ zVfroOrj(#&Ixj1OYg%RRrneAfmPhu*+aJ!S4i4Wb)!T&4Eq}KyC5d*-)z3!@ElsG6 zr~amkoT*8qUn7M2ZFqrL>AT_k%G!BJH(Z28C&TVMd$6=+h&gcT!g9W{cBm%O;(bhW zPnV*B8JoD3s!il3<+N-aX@PqT_}Y6{1x@pv{eQdB9FgNw*cqR+mUA+0q%kt;x(x?+ z?ovi;cZu*tfrSvQ*(GR#NTqt8j0M1kjXw988{(>>ls1(FUehGoyGOz%vh>|QJ=dNG=ZC^#ETi+4)a_h_;W{T^#8S^w$EEQS#GJyM`qx?dwGdgHN zB)S{t8g8DsGASv{H4qXlz_;QGc`*a!%LBdG&K`i}VWAni`}X9(0hB?_`R$pItDOvA^hPpT8t)R%Sx@ zscWzvik&OtGIocxT^%3an7_j5$rSIixm`jT%Hg_&o`!-H=U zDg-|#Xr<<&<;3XZ)rKa8OrNl2hhQU_d}MaH9Kqt@ihc4FZc-ajN_Qr?`q$eu86iX? zzLy;AowLEywfA1~yUcmr^X-b;2A=y(d|rs_N_IUn^|r?q+OW{=Q<5;P0rj# zt7^RviNBqEvk)zeEgN7-ZTMNRM_g4yV8R)T%v)}M?G=b#MSeCCZ7M1G>2AQf|9MQE zDTSyR#Ys^&CP!{@PF*cOw6LVfB5+ye6cJno1tM0OkKgICOtzSBmMW^FwK+@Rqarqx zDCENuVE;ESj%{mhTXP*xQT2HlY;Vr}AV{|XsG*z}Wo%T0+*;zWq|yxO_hh5bH(W^V zH4t@Zslfmyt)DMzjwnjN+dds`qFJyk8?IfsKxkrvsvL%KMk{u%t!6PJN`?;>W+ zPZasq@?Pr7-6rAmdB-%-Lm}j;2H@huXyIwAjr&qg$*qHVB$Er-qGBlFSO@DgjjdejP74U^$W3^e-XQ)x2PCSrLra05J+17HWHY!s?|p4zuuuk%_m9-_=rw=jPO8I-;+* z`SeWo!0-;MMNX9!F^qQg$ls*F7MgyzV&J58MYLyi-ljD{b@uM|wPD(r^J|VU@>wNe z{kY*nnw~oAm;<7Ddw3e{ZCCxv0922N=DDr)UFNyNF|N0LPWYk*f`8%W?Qkd#Rlp`j ztNGp0)VP86ydqRwgN28~;V7t%Fw{K!QS`Ek!t}oOSG=?O(a8RyRr01+A2>HQCF>(l z<;}^ww{MFzdP>_{rSiLta=QFfmXqynPU+!7*crCW?@MID4J5@M7n_D)QDM;I7F9X)WB!q zad4NyU|_PaI5Z4t6>^##76U^=ifq~(EI9y8QYcH*)hczE(o|7|VXk)qKa5*_zgMsCZ zwG2QQ6jL-m?5qI9sNyS4iKXRWeTzxtNF+&+hk5M(CSoVa5rs+cABxB%*`sDOJh7mh z;GAn#`Z_^VO_-ZYbV6$V=SJ3+;g~rEgc?8AQk-=_uCa#A3dIovauqcZAQo$rgGyIQ zY4N?)<)@Hr6z*|ATSN=V4Zsh z$!m*}a)FZqtAJUcc;0R8(?=)leR+YztEKn3Kh5TXp3`j_ak2s0q`p^Cm<-{?DF&z& z>;#UJ1%#gFkxHSny^5?I&Ty)&O|B)&h(|&b=k3qLhb{6Jo^D5my|&-~=-I#1-*zK* zEA|4q0{zqSz*#*tgD0u&X#vPz{DsP0b!J=tEO30Hm{^E3Ezl31n)K5M>GZIpMy~yJ z&jTyeZ464`!;6)8gPegcKxXzv5bwJX;WB`}}>37zNNhHnBC z?O^GqzLzrA3bd5cG=6`H>!@s*F6LLjE)K9Ru*p;Qm0b*t|g`vZfn&; z&m8HkOm0hlJ-2GA(TmbLsx7Uy6?xjlAw!I(BU1Xf#wo|KS@~)`{ipF%(N&iI6t6sf7u-;ZY z)=1vq=@vpt38pC2LaqYa%eY zR07083IXrQt&pg=2le)zxmx>yz!~{5Ns!g>DPKgN`Fr!c*eE=Za7*9iOY8eH!V_`v z?#}wyEfkG$YKQB^yE%=U+;mt422*u7ID@z*j1(%|XKU`#wdiE}(@^gR#?*!DclXBI zTfB}Q-!w5*nr3&DF|Ps`VfkP_s>1xX#!?C?3U9M4&>IDqllx-q!KRBT-o5mT2Osvi zK6v<>ZZzD*v;u#T^~vjl>6LyEu|el#C$35vaZ6g5K9n++zOTIiy^&srtm}{2D6TC& zicGkeRK9Rqkp}O{gW3z`-8)_Upm;7O)wXeL^Q`*5HT2WSy63Zh)UW%l%c`6RM(?vQ zKCDzwUMVoAmlrI1JPC{j^mBeA*q1&om2cCEWO;K&?%TrU3xI5SU6#=^^_-}i=U6k> zuYca}_okA!sSG1`(b|}gU&^TDa3^NH;68GL)*BqF4?(071}_MCbC_=F5iUAQURFv} zyH!4aJTGi9?q!8HKU$oG!T0S9@SM+d{>AZDR?#x9_R4+j32&2XlXwQ+o-aW|9WLJk zkN>;8@71S;*cAO$L(2QC6xsGbr;Lkx&rfk*pR!pgLFR`b^IXqOj1y`q(51sZ^YDWY zw&|(I?#l0_Jh+i?#`D%jAFadGhjps!L9VMgXf5H8uJ;`Na{b&&9I+;lSDC+4$UUr! zrKVcZ>pfXF#F6#kIgw5bOg*CS@p*vo7I8KAF9ht+nqMml9^rfQixC?c%Un)n1~zs( zX!jmB>pvlyW*bm59r1sJFAitQ3Z5uhjoM!k+G|7qQltHi$&hVmrUN z8TVw~HYZ1~qka*qJ>lnIV5iV~p=BgCHL+Ot+2X~KIf49M9O*0b^ppTSF~(9qHb3~y#x`)4aWqU06mpz_E!MU z0E{uU#n@(u$u?WHXeE@cDx&ncwZU}&aDy||% zR?R2LVF0V83kXvHMQ_WYo+OW&)gM*|$|M)OB(($EIK*MbW zLuTJ$2y&WSPkqUkF0lfrl&|*RV9~@>siXDfVbfxR&dU6;W22uQU34cNAp(G?if0gaF)|9SnCnVLf)i%J5TOrO$50j*{sDgqOs%lTY~$G6~c3YT-c z7nWB>fgZ1UC`@jXg0ck7Yu%v7pGS#cwp??Vn=Rl7WvHCPOxVR;Bp+&1cBipe51W!V zTY@5Ga9l{!2nc4ZRaQU(D&A+A7r&9nc-Xa9R``9EdK zl%q$FUcGwt-o1NEmMrhv zzpZ)q4Jd;LgkCgQ#lXPC?djqe;?cQws&COD1D@7q=kF(s-y~0db8^PJ%oB`UviJXM zO?`6z2H)KfV-}%W8(YbnC9$$eOIPnS3zDgd(K|Nd>&EHv&Ua>2Efde~c zl-33aDrYgsB=YR#Z(hf!=44_c<8W(w*zX1=hXb#9)~Zcme$sbfk?FIElit>tSNHRn zXelT-v!AzTu-I>;@UNtO3ByU}e(vX;^K3nq`Mvxt638^0p;eo8<$>iVRnJ{nG9}(~ z!S5eGJwF>a?`2x?Rw-ikv(@dw`%*40(%p4e{zQG}jgM-Vq8=VGllfw^%w%QWqW7u~ z%nu)4(s_Q<@lxUB#s_|qpZ{#qdHCw8sr|$Dl85uFWR4r?HN6Wvd`tQ1vZP>+`gXRv z?I+!wc5tOeco(0&-E`{8fs}YZmyU%i4{&gA@SVEMgn13GSb@1S>jYluHn{} zTi$uP;fA-~hKzWb$1+tXS#~|>YDj-$IQ!*>D;kRDc^?Q&m-=)yhp}SKiR}y@E{0sS z2)eJ&UeTFZ%{TeC=9Ys(!XlR#`_>A$b;;`J!k^=BDVMc9o#||R^Y4Z?wT*l$#E+pOHGRv?XISYN^Hmv1sAxG}$z3(l@_&Uo6q!EjahYpq7cnP?hD!{sYn>|So}FWf)f%5CH? z3q{cS9^+nvpW}z&{E7L~)+6_yj=z4Qg^p<$VNIraK2O*&voL z;w}F|gtz=t8?^==@*nXZ@E_s^w4l2S>*LybPtk z)R9xv%k_~gpTa+ScZG|8RhPT7;CuWd_w2vy@LzD(hxpeF_qZ(b8X~^=Lv7P=HNN55 z9M)e@w?_>7{IB8b+!ltdKfDWVBm158|GZjRlxM&W|I7~=yAJO7=N^deU-56N^|h;) z0zDqK*xv;=->dkK{hwxXR!1)UQ6GL+A`4CP2>mRmuII!IYWC3uhGl~yBV*4H>kD=q zhfjWHg+<24f&D@3X8!MRT4;}}%A8035BSfxIIOuX{x#ZIn14nstG2_RZ`S|GXQjJe z@-N%%WxjlzC$CC~_;pe>nfqH)zE(_G^qu&3^?A->OQ0fPH!r$MxD>N%WQ8ND(LT}B{^WQ7L_;22htOlVF?Eek? z<_dd#{EYsOc}yS1py%vZ<{$kT`pLLFJN|QgF_64MbJ|9)w<#>1Az3?Q*!b@h%IJ7Y zjQTH#)hn>*V?Cb#Vdm}oANl7q3o1U2_I{uFN1d&KlVcYF8P!IAZf-DUjmDrChx z!9U;FaVLJSQ$lCpi2DNxMad!&#r)PEP`MU26c(}naW&y7e;7{m$_K2xKN!yO5}n*( z1UU1+{%`Ut`dH_){UXL+K8inQ=6%Aq4CsU1K>Ht~tS!c%GUPYAK5G7Rk1&77dk!sz z`BNVi8nGQm{`h{{pqQ6W3CFp+@A#j&YAFB~P365ps?#s|xBXvwv;6E6>L~oG!zzA? z=c@Q8gLQ=y*ID@!KgF0MJfpto0K6iDJr0i4A7C+Ak2pnT3ja~bz$feZjF&juEdIf- zJ*AjGJ%Ey7_AgV$9S-zFb5ljUe(w0Uc{vCD$9a!`B3!lO4gVOO@ViCk zx8)x*&#YG{0RF+h^FlvfmAjYC_rD{2?{Lh|D|WH)dfX%M$t8Xjv3xG*A2oh5{y9&5 zEU19@^*uaU1!#Z0-Qx-4@q9qmuCEfCDC!XUd4S^`hR-LexA;p##((q&@Ebbd+L@Q} zm-W%&Wal(Py{-@T|9Cp6KG3eQg#LHG|KXb%oR@d~CNE#?e|obvSpWRD-*JQo_>b6z zXa31-&o6%e%lzl)7RB#s{-vCvkeYvd3yJyLPwC_T;jA*T2Abyp3>X+y6ivA9njc?VRDB|5hO@x;VZc+`jHqpE0z* zpC94z{`e4&{_!=c=P}FK`FHk{|9X4m$jaCTF8 zmIy1JZ@s@%L@Pf3=+Ag$pAm>Nli+u%`SCnywU2uoR~d5S^8xBpenb`D`F(=E>iEQ| zQXaEfiq<6UR0G{@BWD-H+!orvE?eD=RDEwU01<7Q7xU*DYR0@f;rGZac@0 zWJDb$dwl-|9&d9QFS8K$YRmU)Fyl7k@TcwQ65$!~7@zF$Ok79874xNqY+4+>%JOv! kTGcq?xW8fycevJ@5Ql%gKi9*9x$y6`%8%p1dCk9n0pRj}0ssI2 literal 0 HcmV?d00001 diff --git a/graphics/weather/drought1.bin b/graphics/weather/drought1.bin new file mode 100644 index 0000000000000000000000000000000000000000..932da7b46f916a66504f4e9f785fb34660012ab6 GIT binary patch literal 8192 zcmai(4Q}f;5QHhiKz$4;CsA_$Q}i4K+WBUUa?|NZZy?a%WDKmOPL>sS9rLx_*gXZ%AM9Kzz^4o4&Sm+kk4#P65x-`yS$P4%sK zw7zX0TpG4757GGP8tvJhXN!ExGxFmv8GOlq@Nenx>u)Qs59_;TB`415O%PC=b!k;3z7yl>IahVWe5T9O#-(CLF zmE84c{OI`h!6DOE_V1j|=aqjf>KhH7!Zn^EAM9WF?fgIW9{=t9$B%lbE;}N%%zXcq-*O(=fAvZMV!uGacjHyP_D{6xUSJqrOZg@ zaWVi}AeT-BM^{n%K;h#*YVR|wDz3X!V{=mQIC8xiB{vR)O;dMy9 zUW5NO&%b7>_!YO-P({fB{*MJ0zp@1Zz_$I4tA-_~ zRj>P>aUDr@xE9@8_#ahsdbF2Ql=VFSaC3PF`1G5b)dnB1h$tTZ`a6U7hCOr*xL~pi zXR01!Leg(_Ao$3spZ}gS5tuIGkUP1g(tQ)=`+PvbAseOJ>NKo)Ae$J1$NZ&+eZ4m`=h??R8H31T1d=7#`iv`G!UFugZfi?7)!mULhJc6QVj&4?Zq$ zfaU$KYU!>R9vP6YJoiqk@5Z^>U*9(_trN7{zvG*{gX?P+?b-I5uAP6|&-t)l^Fd$Z zn=5{T`6>*&bp(y%tW~)4GyCxS3;#lm&o>@Ba{~0#GF`eao*O>6Qf$=h?BBbcF1 z80#mx-rv~+w+?y|u4wdGaqkNUi&l9f>Tdh1m-tSWem|h&3E}E@h<1`Q6(KbtiO}m& zWu1RBoOm6Jz2D2RpIs@9O}#w3e9k)xv{_OA36$$}lm@6Xp>xj2?-14KT5av$;>m+g?#a09qwPvlZ@-?(&kWexJx=^P`;G3wKNIp{ zPpABT_{IO`?8U$bK4%DiKK(12c@QR!^V`Q7A1f+h4}MQ+S7r9tacaU|Sm(Da)n|24 zU*TKF=%?A|YD=OBXC5T}A00EJr=cmnUjP0DNAq8XlVjyS_>T@+g%dHjRubjgzkNk~ z+mp||4Eta3)BF+XUQYYJ$LY>#eiDC^k1$j9UvVO+A47-kNyPv354Yvx9-kVvcK&oc z`Fl@Z6HEQ_d?Y{iF1T6L`KNk!02D28?-PZ-Y)gvO5v|t?-{GJ4|CRma{I4^>@A(h^ z+ov&qmdq0|dG^)wQFz@;&sySV>-L3Lm3qFlpL+iJulS!HN(cV4hSOq(HKOjS|E!`j zxx3=!0X*wm>G$-Xytk^IyYkm`44dYzNJESmGmb^1_&Zw8ue8Mf9j=E7F?bxD$ z$fo1E^Mr->(uFGyipZA*d)ECqSl>J39e$(9Rk~gB1jF7D;@|1vf9!xZdF21Qr|iy} z=eY_>t+fiqwf5Hg-2WX1nR$C@7=I6HUYjWc_41}qaf8-d_oJ86CA8PyS21v^BY^_nIWH#On%AUy>`|B8AlEX5_`MSS% zbZEcvOThU$|B4^u{9u2LKhr<>yM6FWabo`o|1-cZ`5(XRf8-w=(d#w76-D=1*Aoi;7BYvpz z_@|C1|J}ha=`8zGo$9`2GU%T3m;FMQPTS-Ew)N7w#4z^wf8rgT8S41(%VaPcKeaL? z;K@Ip+yBY|ToJy{7klsT*n_LFyKH#ttX?*9Gnq}$rkUjkge!4#!I{kw;y7!h&(1GT^b?|PnfAHJ( z!8Z>Te{A^j@iXIxe~^XZf93CeRYE`VruIwuoijf^t5)x?J7ov|FLms}F?B`2pIF!3 z8k~P7AkTna<#ow^z=zL&B5MBw|6p}K$@t#p!+8ot)B{(vaP3Xou6NCkJ3sM5ouGP& zzh8u=H}dPV>+Ut~tNKshb2hsR*f+Z4cuR+P!b!s?H)oi$yT`xheBhzH)N~Ec7aGl4 zbIkO~uW``E*A-lEo=-x_xP{D?eV_V9L0aVD1OE>V*hd}{@c0IJ=U-0%b4Yft`-zgH zP<`X5M`V8Q{1=LbDi*ro!meoxPoN7wjXAEP2W2GzcU3l*G1eXTeKS)!3vcw?G%i1z zM`a*Hb-v?@Tpef+#BTwMeQdAIo*4;l9U-!!Hzi?r+Jn2FjW7OAM{!rCHCpW*T%X^b z4+}@H_?O=PJ7MMUAXuKHAAj!qz47aBqCqtCPsPoD^5{&YL!and*^7IG+?lRM8;4(4 zk}1&Yp2JVhzwk2{@g);ie!9_^JL2 z`wQ+uJ@KTg_{^2;>mlyvM>|ch5 ze=ov-P}Oq}{ZicYgJhb>{q`@^XavjJ8BBaeVY-ACLpM)&`OmsMq%U5DpU)`j#EuK) zca&Dx)mym-cNcR0>vv#gEZs3b-?x#hs@UC3_QNxL+qeCxAG$ID>F=Czc{0Kk?1_gD z^QYVzCtK$s%ZsRayYt12>vYB&+Rpii2` z{HJgDz}g<@#<(|TmX50|Jj@bnWxyH2dY>QgsbkDNm;cjwW^Ela5tfakOALfKu~mOZ zG3%X1C;zaP$*_IAID3CqmNg&omzDE|hvJVX$hSShB#5fZXRp!}AF{D*{7X+5a(U{6 zZ#`13!aL*Gg0s&jUfm7t+ZNstJjSp2A3Otg-}YkP_>Vks&4S{XUl=ao{|uOtOvnj; zeEa(Z<0U?br7Yl(=ZEpmDOcw>aVDfQ>MWGKarbA#J6EHw5&x;TF?^6)cL9dA<2s2y z_vuniK=wge(63$FkFva6Cx~!IVZwHMMH6$d>l z(kPrcS@w!x{MhUpm3?7Lhx2eGdoXw@9noH%v6mKTbW)$=+d`j?CIR z*PSEL%p^GfpX=v;^x}z(-C1eq)p4J9!~BO4I*~Uuo>OjFr|RG!;JlHAw_VWwbW7)u zc1x`Gm7E&w>y8uaT^he&?-z=8G(O?!fy&Y=dg)HbIJM6XFYtU~CmMKe4Kt|yc*qK_ zoW*QVyzID)vG)X_x%@{9R5qR&?!0S0l|kl0SLP)z{d>+6P%$z`UW0dC)S|pfxJURu z(d-3_&bq&+1zJIKm-UIGvEJOh<2%Yd`oD$!mIvyt(VIHedItR+Hv{9?HKu*|(JCA% zFYYt`6C?Pwbi98|)Lsg;m$H<#J)W*F5xj;+t>B>K{~O2tD1JB8Qz1;kZt>64pWlB^ zKNHViH1oI5+kEqPtlY8w@!vdyx7Mx!j*ph75A2a$V`<{&t2C;^)t9dREcDNu!=-n+ zKYz-@+E4G=L*nNzcDoLp#ltiHk9J$)f5#7Dtr3*`a=v1P#xBVpAM`&+UzdMyu;wUw VjmLl6=gK4c0P7Z(e33A|{~h)@*N6dceO29@k!@DBnV292f!T+1z_rIGa z;56R<{`pJqAN#+31m8YRA3x*bSU5R6+TUdVD*v}1>~9~p1IOCm@$#Yb7U5!OvER*4 z`b+PFzgB#C@O-Qjg8i%VuL#Hd>@`Pk#ykJ3;$KUW#jA3`9>M>wk6rRxlJ)n;o20x8 z|H@F z?89MunRlE-a#rjfr2PpmB?Hl{zw* z5Uw=|2QK~*C#rMflfS)CH1ZS=olKnPTgdT@#~%OWBrEur1{P#q*-w0kf4xs!ol)$X ze?0L1S3ipVeg`Fg;i_muUmg)6vL?R#64yFwgyb^2)>xnSKJ(%PUQ$8t@^JS-qlA2w z#~A;4`bY9^DgK}Q`)>{X{>mrPmQ2WYRNHua)vkziq5Wg8IORe73sL_aUFY)eJe(=r z;7+)A-XF!ka6ISyz+o4`n=5Vm>|nb!c4=VCcRb98G~_oGkZ15=JN^Fu$iFrC{g-Vr z&?*tvoxjfUE9QMhbc9L3dUiF@S&82}o>!Sj^d9Y--&EoCGA^6HoA%SCyrs{|bzE9E z2v7I>li&Z;a&CNPVg9MtxEOLB@e(bas9LNg2VVZ^%n*MEj+QKry0H_EEplNU{z962932tDSd)?EEA;i{R2jc>Z--sAnwxhqKc2FRd-L zrYBl&6(1k6bX=Wz$7}N+boRFU$BzGwt9#E8r@;=~{wEF^t=P{sh}N0`S4Rv@2Qv~m zU5bAyQYFTnNh13Vk$Q_kSyxsaVbIS;JpmnMXaa@E-ng#Rp-hO@*b~>dyRW-UfL1uw zSDp_Xode(8SLF=e*5^zJD_wWzrD5Ed_{VShYlZ|Dj_-wkx=|l`oY>~Sqcv=Ms#dL3 z%k#gy1IR+w!kG><>RUaa7qSix`ZNAut0#PsaMPVle|x>cuw(KB$mygwg*|Aqf! zLeODCHfJw;;o{E|K)&&0_y-3qMx0-FkSK}(o~}+k-KW!K@61|HZ|5)kJ7e3#E*`IRNENNW|L^s8 zz@O)!O8dUcGLOEB@!x#9K>jDL0FrKSdt0 zu;f&Dp*){M{)3~pi2?4em81TCko~QYgCC>2@)v*3FP3PkE3Cr6_53@2MrA=C-x?{mulymjo{ovRK(y zcJ83~fBxr?_veWC2dAF%=kvXF?u-_$Y*iHkyS-OG&M(U0CO@48nWV<}e^HNuuQ|$B z_0;jpepcY_Dc+F(Yo1I;=s1mwza_rV`Uscxt{90=G}|^VH25#xK8jNsg;Qzf=pO53$wNKo8M-b-Uv%4MsV)rkF)j4*-rat4E^iO{RC83GIQm_o~VzS z55CCh_y)bI?l79wr_w>Q>J5I(?5tF{w94MNcvg>E!}juG&pzd(QS;~dQa4;XNMc53 z+D|+h3oeUI*>>HHw6C3r)RW$74YK0cbHC_Nz29K5CqC$*rK&gQ3NEzlgG;k|r|zdV z))xEOv<}(keYRpkj%qXk)829P*ID?Vb58b>D;ay`YD%NMN3Sf@|D5N3y>1Wd+0<%u zwV#^Ni_ZON=XqqBs>b#ukB)E?7HLl)hrR9Yaj?!{m;cz^>y!t*{~N!pQJ5Nu-VZ*F zhsBR)iafBN9uB?6ANlPVwu1c!{(~FUeE5^RYZYStH3LCMRkzkmUQ>>osw=twil=As zQ{AzbY2TLYU+pKlTDRBf1{pQl(stQ%e=7p-vGpzr>j~Gze_4+s+ZmbekXvM)bHy2JU*~G- ztjM(gZT)Dq-`;cD8tpxMqD5m}+qUt|{@X`1+e5INO^rs`TO<3M|EGAbe+}M^)3;m6 z>xf4FN15k4NbB&wN2?FcBRB8hs|Ke*(8~W$qR}5tBRB70r*H9S1wXawNBL zYyF0wANVmmzQh;$fp_D*{e_3$+oQE#`3q0{_EBFltoUb(F~96<#s}>_7rN?G6=v-t ze#CEHU&W6{u)^D`J+JoNF4_0ZerEpTS=M~Vs8wMv_>b3dv*stpPkhb>(|9V{KN>$U+^~87o0H}7=On4)jjbOe^(ehI+8v5;=At1PyLyTZ*-sP z5B%}!s$`iewlM?$U0rgJtE_fc))TCoK%?lRN*}O z6Lr9;jXd~GSed^DziIyP`ht^*c;K8BAHSxj>iv)6?>K&^^f`ydXh#iV&HCc8-cEK% z@YEOXu6`f8C;cOS_0+vnSmqcbD#C0ABSef3G)zh$9v+5&z=Z=${*#MYPq5} zeKn4M?H^Ek1kp$x;P~3C|Dk!TDgF(&FInp(f7|%cU-4|YN(bxT#^*oP>=vBt>ZkJY zEXFYIo9jbg)gup&xgT|RtF4ayVv6UrFuq&n3Qw*Y%U5r>`gSQ(AzZD$;(@vw8kwgy zo~eaXD03Qv(^VqdLu>517mLmgK5S;0i^^I5j_b4EI|DxRj9l3T+8g$I*d!=k_D%b52rVE2eiuEMysQGZi*dP>#1fwSh!$3HXi3LkvD z|F>O`m4%g#PL&;%7>UOCX_+NQ)q(%+JM>q6&HKNJrEqq~(BJCsxu_@INtIfI{)^dn z2;Cx|aI`hPc8L0@ev&tQaL%kq$mq884}0Kv(|Mws>Gy~Dm-yKsLbV-hhphOQywoMd z6U-iP1aOcT*)#*X;b0dzjlwIlcTivUPB8s^CQnVb609Z->}4;?`_Z9PZ!;he5xLn;qQw6qES$m)VR9cU1I`N9waDJ48B=Rik!*xo`XtQLypU zcWL%=PV()R{0)@I%38I>tLoFN;_cnZDj1uhTYqO1Z(PGoeZT2XrsA`|HXA!2`QFFr z_gbI->WOV)ipK8XO>l1qUS8w<7aF{B?EJ1ZH}{wbtdb{;l?fd)LT8SwC{ge$K5VSG z6~{A!4Ngq@OoWkXLyNDtrN4Te$a{Qn^h&lM*Gn_>!*Od&#Ow~`77HZ`UHsIeq@%Xd zi%N)u46RxMiiT{o#8Wt-Q;id`XApFSpQpo)h;bk-KDkazFGfW#esu%$0s(B{?wQ?EnMpBS+;Q930HiS`xAe!fASBj zr}y9dlitfJzB9`sns=?1!#>hR-s+Q3;q&`{>T`tB7rsCLqcQxUYee9O5lf&=-)?4_gNO_EJ%7SDM7-JYS>+0GjtlzTv#d9~_`)|Mfm#Wn7r6ap~ zIq%rN(pf7E{)yp>SMl#2iB$M85@EyB}OEJr5%m z_XFMEszP?OeW=e)c++3i>~?BhdFD>_&!?L0_5i)(^=7T>j#r$p8N+8i3)^#mt3Pi> z^l-xmKi+)s;4D7)-RF)IML$t@dhP+@Z|#r%89-~mRDj}+<}KtWBhk~=hl7U zx7|T5?~g*8swktPKI-C{3coeCG+rLy@hN^?!%Kw3EM#4az2hrOBK$9Y)j9q?sK!`g zBx>=GiQ-dPssiTd8Q0jCSDyP7|Co6Bt@y=%_raquvcSx^`VSrp`iV1NSb6@&uQ*)S KvCppih5rLBnPu<* literal 0 HcmV?d00001 diff --git a/graphics/weather/drought5.bin b/graphics/weather/drought5.bin new file mode 100644 index 0000000000000000000000000000000000000000..9e13c930b182af93d0d24d4d6fc9f3a68ce9a31c GIT binary patch literal 8192 zcmbW6ZF1eX4n!%}{o!RuUWt7gTL(t^J^Y6<(aW5DWvua~-To9*Y~LB} z49V5#8todIb$aXqkFS?kfO0c8Y=@=H%lc{jPyJcfXm<>-Q7dT0Kk?J}z46ogFDqc~ zEq--23O@PoO~1x9JMYlw^S(k3W+r^-o@iB*%)WvTLZ?dP%KJTZyb*w z`m_#uua(*P4@Ir-0zJZfkj1Ozse9`U`U&q0pYUMRGcCF5YW-i@|8$6*q1x8*CH14R z6|v7kYi(%0mwHkRGrnhbRNv?smiY8GJ{r?_@Y}fRh%UZ5s&L|Op~16%iD#biyLI0^ zj;f3v;1MkGxe|R^rQmoh1%h^cBdfzI?Y(VWwNz|sTG~nV%EMFEPOl%LgTwi>=1DYl zzFT6z+xPj6NS%!@{dki8d;wH7bH{ev`(GaP*7`iwhtvZbwf~>-U8Q`?>piphH4nwb z$em8y-}g89D?;jv8?~!H=l3c6hOt%vxQ>b+!a;9hgv5wHQh(tq9*<$%>*ISUUeWSr zk7l2OUyQuW4>Q&4Jxb8oQj+>=l#v=$MLZEd^!4T`SmSvM|E_Mh`Z`|BzwxhcsSKaa zzJ}i(-wS{9pkMQt`d3fSr~aM`8fykR>6?!^_xyxlZKygMIB#92^>@z}j_>l&n>q@I zdhh)4WOba%t$r0QkEK6R#-+rD-{uj6_n|uN_{01f_4)|^NmVl9sn(uEelu<>A1193BB=s`Z8!S6%y`?|;-K!?2fEml^i`-?%Fxd#Ye=RELR4J&3u!Vy^j<{@Z@5dU?1H z+S#|`i%A|*LJDpA3cnqX4=d!-75s3X+xpy8A{DG};aBQ-=%4-*fAsoZ`YSIh1P-r{ zEuL(LM%N*x{G7@DcU@u6yuqm$ec;o&)0|!3NDks<-!RKocl6ZyCO&As&F$yd#8aD2 z?dD@7IfGN@Rr(&zuN5SWlhwgVdVg`~C+l z57v(({AJe~Xr*&stDwiH{+S=UUu^KTi9`L87I=KXH6!Vy+P#80J`C< z;Eisf?yU}-sbp4hslD`z@y3Uq(F8ldRV|u|VaAI!CYfBN1&^X>F z|L4NqH?A>NlQaENJinU>ho5~$U#SHAaP>Fq$2jrIV-9C%_4GUDsUGoVAvP;WBgU1X zaB(`8E8O8{g;ACJsTyEbCgG~c4B}KR;iandiP6)z^jDO!66G9@=S{f$h|jg}8P$~x z&G`KOyB>RVbnSmv$|``_{rW>+R)A|)J+j*WuEf!BGiTTD?=wA%F~-wbv)8-g56y1Q zikamt45;JT$EW(>PUQPPgliTwcOLQ53i0!uoO9?B-e4?D>05ymd7PKSry(1+(~a|J99JqFBwE`06(L|gs&Q_C#sQQtK?Y<`zV4Qwnl^W^%RqFMZwr{-1A%=kRR^{ zJD|FfC-B?W@mXl1@;>8d>>B6k6TUJxF8#;x#sIb$?uqVxtHM9y6AcT7{_16A2}h#aBV*|; zzF0WSFuw@zEO@a365o+{`Ppmjlnh~B*Lb2Z=%08zFXhcqk@cHhzco7Jqdxk3#Z<6v z{a2B$P*rOzXPz5jw9!1hcu)2n zCr^B$FYjN|Gia)7{hwVR_L{RzPoMD%KZ=+A$7sJNKl)?g&l6tQDVzGJzJ>DC2hZ5t z-+I1u_VEd4tdE6j_fM8ahb!rdsA)e>zkfnOVnLtX@44^scrd ze|hV_u*UP2ck&;?@n{?*1`fm5n@2OyAAE?%c#csW72^Sa7#4aN@A#lU^8Dra(`aUl k4>)JySO3Ev{@{$P;O>8xZE>& z5BCn&@0ZJ^0O19IYr!6B-S+{wFbP5UY1{Mx?CymDjJRHzr{CoFarU|va44Jy0GGQ` zu_Ish)oFhFy>J|0_HmoDTMIml3yKi@zJfDb*~8Z*+pk4};PwdSkiF36Fjug)bFy)u zZCRlzb(Oj@j+5rvIW?kwK5Bx1-0#8DW_f)+pEuJ!x>LWLsRBM9F&pCfbf+`1n@#MWAAk`7JaAD_@An&@r+Z1L)|RE8 zzh3sJYh)uOyeQQw|#RmfhjGT=W!g5ew+vx9o^=XXOypXEB2Xg?-YUyk%CV- zLo`J2vsl8YPKzQKglBU~B+?u9-tsH}Gz^{dld3Jm2!VmIbZw3?pxra6vKin*KwKY^ z`B}1?MP{%~+r&bSQFV@3!pO0G8lw+bRqPg^q&&~$SYI|7f5*^^Cz@rC$YgD7hhBAv ziwq{{#sQG65|)4DbtcNWkEUt>y*rToQGHEHt69 zKy(2BLskVY+$4L-=`K+O4^*^*j8)~ZkJx?^+q`}$zc|2R+_qo$xej97zU;RV!ZwrB z6?Kx6qJN*G6p9mUMCZ05dzMGXdXnx#n!x2b4Z9bps2Wv-vTu25ylyBAUo1ao^S-Fc zh(updZ%Zm&Cz}D%;cuuk?+!{b0nc+bF%0NJQt^3K?BlyEoOsO|629sE`3es$~-uVOL)=nEUcyw`ngfT o!bSc6U>$P#!wz1rr>*DqKNy`4q#^ip>i_@%07*qoM6N<$f_cH}<^TWy literal 0 HcmV?d00001 diff --git a/graphics/weather/fog2.png b/graphics/weather/fog2.png new file mode 100644 index 0000000000000000000000000000000000000000..198c6f494d1e0675a2355b9b359b6e12659667f9 GIT binary patch literal 928 zcmV;R17G}!P);=e*Eu|{0Sh-8VLf7JZDp*^Ud;=>th<646C3%ZwUJ}_D z4t@j3`Tv{&$0a@`KJq`Gl3L}v4p6WjA5yw}blz720-pIhq;A>v*FzZ^5m8ygar3_K z`!)eE_}H3}gm5Cp4Tx1-w563Mh>uwA+qP;9t&~|vj(7uk@;x&oVJNq`sWFN-_4B0w zqzwx7QGIKz`x(b9X%2>%Yt)1Z$oZ@T>`?%?Y}vrW_L{_;yrbWxd>0yJX_>Q~R!s2*bF)_8oW-%O*fv|4)*R94}i z1;EG)%i9P-y`gh>=pmcs=pWEk90Jn|Qg;RS&3oE2TYRE|h@L6tTDq_al{C{D5f z$9hoJfxF^$pN0+sM6z69R~KK;ACs^`7MVlTVa5j+Y#lwDCc|=fc~7S-Z%R42g8LDPSDeOm; z)oB$|A9Jib?~lR37LB$ggDvYphSKpu6fGR|M@dtV_eH1Zrw_Jp$tpgB=45sT1NN6% zZ-9Cj$HR{c{__m~oGXI`FkZ|_$N%V}Mwr!w~+yk?Qm(9y#7QeF3OAdb2VL3@_zyT(Z1A?(mnS80000!4f30`Prx;ZEpdi~l$I7xf`;}nftH2Kg<2ES zGFI5k);pc>VuOsHme1zvfA>t&xi0hU@pc~e=I{xvIU;H0&lX>O%HH%?`M&M1xYwt+ z41K2t+%tH#{%YCv8n4rPAEZ2azx-kRkNXSaF79e){ou>vyJF@EKA^)GJYD@<);T3K F0RZ3RctijI literal 0 HcmV?d00001 diff --git a/graphics/weather/sandstorm.png b/graphics/weather/sandstorm.png new file mode 100644 index 0000000000000000000000000000000000000000..aeb03f59f2c76ce89dc5aa47fc041b7f9e91023b GIT binary patch literal 590 zcmeAS@N?(olHy`uVBq!ia0vp^4nQ2h!VDy%C+3v_DT4r?5LY1m|5^9mX0LZgtFJCe zT9Re>|J#y#XO{rQu>zMrf)f}R7;k#IIEHw1&J8^~^N0cmt9$V_7OxE~-X}88zue#T zm3?YLlF{Mqo24pj1OgfN3A!*CHGFNZ-~OO{ndCD?hku`6r#Q)aywj{5-_n_@er|9O6MFpN!zG`Ri)&Klt=6OnU7lvFmmAP?HbLy9 z*2=R-WtN_Net`F(dzf5$aXkB4?uAS(rEUJZMP@vR{TNT zTZN>O5;(rR?74NCr&`HFSMW0b`InO%4&0m~x%~I4`L$be?`aA&t(!7;J=2>ERq=2u zr##OXd#Nkh&+Bje$ZW0qB{Hk1@s!Y`o1ImUVmq@|zwCB*sE~|hIQ-D&#VrNvC#xTS ze(9zE=7t2*ofETzepP>;zUigsomk22-VWVqrN<0sNM&e$<0#+=V}B>&YVykLM8q*o z&&dLn`-+3+ga>cuXLtXq9N2V5{@CLk*A;UDu20$TKJE7%*1Zx1GRzev`pQ<%{nt!9 zYsqz0|ECi-3&*W5Q5Ns6`)t`cM`3BA_&e+4tzoHd#;wxr_rp#f?KNZ)+g5Sy8pr=# XTvB%~E8YM`G6RFBtDnm{r-UW|@`U~) literal 0 HcmV?d00001 diff --git a/graphics/weather/snow0.png b/graphics/weather/snow0.png new file mode 100644 index 0000000000000000000000000000000000000000..1e35531720e7f12dd5e0599a2a1e1ed40476e06e GIT binary patch literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^93afX3?$7I7w-U41_3@Hu0VRtv;W0s|9fruKV{04 zqeqWky?XWDy?aZREcwsyAA+`Q+4Ah!vv1$N{r~^J@Ld8oP>-Ugi(?4K%;W@y=5JhV tY<;_)^YW~D|DV-?!(jSCQ>H}>45znoS+DLrnh8|Q;OXk;vd$@?2>`RPJsto6 literal 0 HcmV?d00001 diff --git a/graphics/weather/snow1.png b/graphics/weather/snow1.png new file mode 100644 index 0000000000000000000000000000000000000000..7277d51d41a4b5cd7201d76a39e2be239325504c GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^93afX3?$7I7w-U41_3@Hu0VRtv;W0s|9fruKV{04 zqeqWky?XWDy?aZREcwsyAA+`Q+4Ah!vv1$N{r~^J@Ld8oP>+nKi(?4K%;W?IhCV5U ni{H05HZJ_GJK=$*>m+7|q}#0AJqD{l7BYCc`njxgN@xNAmjyd& literal 0 HcmV?d00001 diff --git a/graphics/interface/wonder_card_1.bin b/graphics/wonder_transfers/wonder_card_1.bin similarity index 100% rename from graphics/interface/wonder_card_1.bin rename to graphics/wonder_transfers/wonder_card_1.bin diff --git a/graphics/interface/wonder_card_1.pal b/graphics/wonder_transfers/wonder_card_1.pal similarity index 100% rename from graphics/interface/wonder_card_1.pal rename to graphics/wonder_transfers/wonder_card_1.pal diff --git a/graphics/interface/wonder_card_1.png b/graphics/wonder_transfers/wonder_card_1.png similarity index 100% rename from graphics/interface/wonder_card_1.png rename to graphics/wonder_transfers/wonder_card_1.png diff --git a/graphics/interface/wonder_card_2.bin b/graphics/wonder_transfers/wonder_card_2.bin similarity index 100% rename from graphics/interface/wonder_card_2.bin rename to graphics/wonder_transfers/wonder_card_2.bin diff --git a/graphics/interface/wonder_card_2.pal b/graphics/wonder_transfers/wonder_card_2.pal similarity index 100% rename from graphics/interface/wonder_card_2.pal rename to graphics/wonder_transfers/wonder_card_2.pal diff --git a/graphics/interface/wonder_card_2.png b/graphics/wonder_transfers/wonder_card_2.png similarity index 100% rename from graphics/interface/wonder_card_2.png rename to graphics/wonder_transfers/wonder_card_2.png diff --git a/graphics/interface/wonder_card_3.bin b/graphics/wonder_transfers/wonder_card_3.bin similarity index 100% rename from graphics/interface/wonder_card_3.bin rename to graphics/wonder_transfers/wonder_card_3.bin diff --git a/graphics/interface/wonder_card_3.pal b/graphics/wonder_transfers/wonder_card_3.pal similarity index 100% rename from graphics/interface/wonder_card_3.pal rename to graphics/wonder_transfers/wonder_card_3.pal diff --git a/graphics/interface/wonder_card_3.png b/graphics/wonder_transfers/wonder_card_3.png similarity index 100% rename from graphics/interface/wonder_card_3.png rename to graphics/wonder_transfers/wonder_card_3.png diff --git a/graphics/interface/wonder_card_4.pal b/graphics/wonder_transfers/wonder_card_4.pal similarity index 100% rename from graphics/interface/wonder_card_4.pal rename to graphics/wonder_transfers/wonder_card_4.pal diff --git a/graphics/interface/wonder_card_4.png b/graphics/wonder_transfers/wonder_card_4.png similarity index 100% rename from graphics/interface/wonder_card_4.png rename to graphics/wonder_transfers/wonder_card_4.png diff --git a/graphics/interface/wonder_card_5.pal b/graphics/wonder_transfers/wonder_card_5.pal similarity index 100% rename from graphics/interface/wonder_card_5.pal rename to graphics/wonder_transfers/wonder_card_5.pal diff --git a/graphics/interface/wonder_card_5.png b/graphics/wonder_transfers/wonder_card_5.png similarity index 100% rename from graphics/interface/wonder_card_5.png rename to graphics/wonder_transfers/wonder_card_5.png diff --git a/graphics/interface/wonder_card_6.pal b/graphics/wonder_transfers/wonder_card_6.pal similarity index 100% rename from graphics/interface/wonder_card_6.pal rename to graphics/wonder_transfers/wonder_card_6.pal diff --git a/graphics/interface/wonder_card_6.png b/graphics/wonder_transfers/wonder_card_6.png similarity index 100% rename from graphics/interface/wonder_card_6.png rename to graphics/wonder_transfers/wonder_card_6.png diff --git a/graphics/interface/wonder_card_7.bin b/graphics/wonder_transfers/wonder_card_7.bin similarity index 100% rename from graphics/interface/wonder_card_7.bin rename to graphics/wonder_transfers/wonder_card_7.bin diff --git a/graphics/interface/wonder_card_7.pal b/graphics/wonder_transfers/wonder_card_7.pal similarity index 100% rename from graphics/interface/wonder_card_7.pal rename to graphics/wonder_transfers/wonder_card_7.pal diff --git a/graphics/interface/wonder_card_7.png b/graphics/wonder_transfers/wonder_card_7.png similarity index 100% rename from graphics/interface/wonder_card_7.png rename to graphics/wonder_transfers/wonder_card_7.png diff --git a/graphics/interface/wonder_card_8.bin b/graphics/wonder_transfers/wonder_card_8.bin similarity index 100% rename from graphics/interface/wonder_card_8.bin rename to graphics/wonder_transfers/wonder_card_8.bin diff --git a/graphics/interface/wonder_card_8.pal b/graphics/wonder_transfers/wonder_card_8.pal similarity index 100% rename from graphics/interface/wonder_card_8.pal rename to graphics/wonder_transfers/wonder_card_8.pal diff --git a/graphics/interface/wonder_card_8.png b/graphics/wonder_transfers/wonder_card_8.png similarity index 100% rename from graphics/interface/wonder_card_8.png rename to graphics/wonder_transfers/wonder_card_8.png diff --git a/graphics/interface/wonder_card_shadow.png b/graphics/wonder_transfers/wonder_card_shadow.png similarity index 100% rename from graphics/interface/wonder_card_shadow.png rename to graphics/wonder_transfers/wonder_card_shadow.png diff --git a/graphics/interface/wonder_card_shadow_1.pal b/graphics/wonder_transfers/wonder_card_shadow_1.pal similarity index 100% rename from graphics/interface/wonder_card_shadow_1.pal rename to graphics/wonder_transfers/wonder_card_shadow_1.pal diff --git a/graphics/interface/wonder_card_shadow_2.pal b/graphics/wonder_transfers/wonder_card_shadow_2.pal similarity index 100% rename from graphics/interface/wonder_card_shadow_2.pal rename to graphics/wonder_transfers/wonder_card_shadow_2.pal diff --git a/graphics/interface/wonder_card_shadow_3.pal b/graphics/wonder_transfers/wonder_card_shadow_3.pal similarity index 100% rename from graphics/interface/wonder_card_shadow_3.pal rename to graphics/wonder_transfers/wonder_card_shadow_3.pal diff --git a/graphics/interface/wonder_card_shadow_4.pal b/graphics/wonder_transfers/wonder_card_shadow_4.pal similarity index 100% rename from graphics/interface/wonder_card_shadow_4.pal rename to graphics/wonder_transfers/wonder_card_shadow_4.pal diff --git a/graphics/interface/wonder_card_shadow_5.pal b/graphics/wonder_transfers/wonder_card_shadow_5.pal similarity index 100% rename from graphics/interface/wonder_card_shadow_5.pal rename to graphics/wonder_transfers/wonder_card_shadow_5.pal diff --git a/graphics/interface/wonder_card_shadow_6.pal b/graphics/wonder_transfers/wonder_card_shadow_6.pal similarity index 100% rename from graphics/interface/wonder_card_shadow_6.pal rename to graphics/wonder_transfers/wonder_card_shadow_6.pal diff --git a/graphics/interface/wonder_card_shadow_7.pal b/graphics/wonder_transfers/wonder_card_shadow_7.pal similarity index 100% rename from graphics/interface/wonder_card_shadow_7.pal rename to graphics/wonder_transfers/wonder_card_shadow_7.pal diff --git a/graphics/interface/wonder_card_shadow_8.pal b/graphics/wonder_transfers/wonder_card_shadow_8.pal similarity index 100% rename from graphics/interface/wonder_card_shadow_8.pal rename to graphics/wonder_transfers/wonder_card_shadow_8.pal diff --git a/graphics/interface/wonder_news_1.bin b/graphics/wonder_transfers/wonder_news_1.bin similarity index 100% rename from graphics/interface/wonder_news_1.bin rename to graphics/wonder_transfers/wonder_news_1.bin diff --git a/graphics/interface/wonder_news_1.pal b/graphics/wonder_transfers/wonder_news_1.pal similarity index 100% rename from graphics/interface/wonder_news_1.pal rename to graphics/wonder_transfers/wonder_news_1.pal diff --git a/graphics/interface/wonder_news_1.png b/graphics/wonder_transfers/wonder_news_1.png similarity index 100% rename from graphics/interface/wonder_news_1.png rename to graphics/wonder_transfers/wonder_news_1.png diff --git a/graphics/interface/wonder_news_2.bin b/graphics/wonder_transfers/wonder_news_2.bin similarity index 100% rename from graphics/interface/wonder_news_2.bin rename to graphics/wonder_transfers/wonder_news_2.bin diff --git a/graphics/interface/wonder_news_2.png b/graphics/wonder_transfers/wonder_news_2.png similarity index 100% rename from graphics/interface/wonder_news_2.png rename to graphics/wonder_transfers/wonder_news_2.png diff --git a/graphics/interface/wonder_news_3.bin b/graphics/wonder_transfers/wonder_news_3.bin similarity index 100% rename from graphics/interface/wonder_news_3.bin rename to graphics/wonder_transfers/wonder_news_3.bin diff --git a/graphics/interface/wonder_news_3.png b/graphics/wonder_transfers/wonder_news_3.png similarity index 100% rename from graphics/interface/wonder_news_3.png rename to graphics/wonder_transfers/wonder_news_3.png diff --git a/graphics/interface/wonder_news_7.bin b/graphics/wonder_transfers/wonder_news_7.bin similarity index 100% rename from graphics/interface/wonder_news_7.bin rename to graphics/wonder_transfers/wonder_news_7.bin diff --git a/graphics/interface/wonder_news_7.pal b/graphics/wonder_transfers/wonder_news_7.pal similarity index 100% rename from graphics/interface/wonder_news_7.pal rename to graphics/wonder_transfers/wonder_news_7.pal diff --git a/graphics/interface/wonder_news_7.png b/graphics/wonder_transfers/wonder_news_7.png similarity index 100% rename from graphics/interface/wonder_news_7.png rename to graphics/wonder_transfers/wonder_news_7.png diff --git a/graphics/interface/wonder_news_8.bin b/graphics/wonder_transfers/wonder_news_8.bin similarity index 100% rename from graphics/interface/wonder_news_8.bin rename to graphics/wonder_transfers/wonder_news_8.bin diff --git a/graphics/interface/wonder_news_8.pal b/graphics/wonder_transfers/wonder_news_8.pal similarity index 100% rename from graphics/interface/wonder_news_8.pal rename to graphics/wonder_transfers/wonder_news_8.pal diff --git a/graphics/interface/wonder_news_8.png b/graphics/wonder_transfers/wonder_news_8.png similarity index 100% rename from graphics/interface/wonder_news_8.png rename to graphics/wonder_transfers/wonder_news_8.png diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 2af8259447..3bebeae126 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -301,7 +301,7 @@ graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal graphics/intro/copyright.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 39 -graphics/interface/pkmnjump_bg.4bpp: %.4bpp: %.png +graphics/link_games/pkmnjump_bg.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 63 graphics/pokenav/region_map.8bpp: %.8bpp: %.png From fd544ba438c5545fb2e462c61c00d8f87798cb6d Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Fri, 19 Jan 2018 12:38:09 -0600 Subject: [PATCH 40/64] Start extracting data from trade.s --- asm/trade.s | 32 +++---- data/trade.s | 149 ++++++++++++++++++++++++----- graphics/trade/moves_box_map.bin | Bin 0 -> 510 bytes graphics/trade/party_box_map.bin | Bin 0 -> 510 bytes graphics/trade/stripes_bg2_map.bin | 1 + graphics/trade/stripes_bg3_map.bin | 1 + graphics/trade/text.pal | 19 ++++ 7 files changed, 164 insertions(+), 38 deletions(-) create mode 100644 graphics/trade/moves_box_map.bin create mode 100644 graphics/trade/party_box_map.bin create mode 100644 graphics/trade/stripes_bg2_map.bin create mode 100644 graphics/trade/stripes_bg3_map.bin create mode 100644 graphics/trade/text.pal diff --git a/asm/trade.s b/asm/trade.s index bfca20a704..50e6b71e2e 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -826,7 +826,7 @@ _080778CA: adds r4, 0x10 _080778DE: add r1, sp, 0x10 - ldr r0, =gUnknown_0832DCAC + ldr r0, =gSpriteTemplate_832DCAC ldm r0!, {r2,r3,r7} stm r1!, {r2,r3,r7} ldm r0!, {r2,r3,r7} @@ -863,7 +863,7 @@ _080778DE: adds r4, 0x88 _0807792C: add r1, sp, 0x10 - ldr r0, =gUnknown_0832DCAC + ldr r0, =gSpriteTemplate_832DCAC ldm r0!, {r2,r3,r7} stm r1!, {r2,r3,r7} ldm r0!, {r2,r3,r7} @@ -889,7 +889,7 @@ _0807792C: b _08077B22 .pool _08077970: - ldr r4, =gUnknown_0832DCAC + ldr r4, =gSpriteTemplate_832DCAC add r1, sp, 0x10 adds r0, r4, 0 ldm r0!, {r2,r3,r7} @@ -927,7 +927,7 @@ _08077970: lsls r5, 13 _080779BC: add r1, sp, 0x10 - ldr r0, =gUnknown_0832DCAC + ldr r0, =gSpriteTemplate_832DCAC ldm r0!, {r2,r3,r7} stm r1!, {r2,r3,r7} ldm r0!, {r2,r3,r7} @@ -948,7 +948,7 @@ _080779BC: adds r6, 0x1 cmp r6, 0x5 ble _080779BC - ldr r0, =gUnknown_0832DC94 + ldr r0, =gSpriteTemplate_832DC94 ldr r2, =gUnknown_0832DE24 ldrb r1, [r2] lsls r1, 19 @@ -1450,7 +1450,7 @@ _08077EA0: adds r4, 0x10 _08077EB4: add r1, sp, 0xC - ldr r0, =gUnknown_0832DCAC + ldr r0, =gSpriteTemplate_832DCAC ldm r0!, {r2,r3,r7} stm r1!, {r2,r3,r7} ldm r0!, {r2,r3,r7} @@ -1487,7 +1487,7 @@ _08077EB4: adds r4, 0x88 _08077F02: add r1, sp, 0xC - ldr r0, =gUnknown_0832DCAC + ldr r0, =gSpriteTemplate_832DCAC ldm r0!, {r2,r3,r7} stm r1!, {r2,r3,r7} ldm r0!, {r2,r3,r7} @@ -1513,7 +1513,7 @@ _08077F02: b _080780D8 .pool _08077F48: - ldr r4, =gUnknown_0832DCAC + ldr r4, =gSpriteTemplate_832DCAC add r1, sp, 0xC adds r0, r4, 0 ldm r0!, {r2,r3,r7} @@ -1551,7 +1551,7 @@ _08077F48: lsls r5, 13 _08077F94: add r1, sp, 0xC - ldr r0, =gUnknown_0832DCAC + ldr r0, =gSpriteTemplate_832DCAC ldm r0!, {r2,r3,r7} stm r1!, {r2,r3,r7} ldm r0!, {r2,r3,r7} @@ -1590,7 +1590,7 @@ _08077FE4: adds r0, 0x6 _08077FEA: strb r0, [r2] - ldr r0, =gUnknown_0832DC94 + ldr r0, =gSpriteTemplate_832DC94 ldr r3, =gUnknown_0832DE24 ldr r1, [r4] adds r1, 0x35 @@ -1931,7 +1931,7 @@ _080782D4: movs r2, 0 movs r3, 0 bl CopyToBgTilemapBufferRect_ChangePalette - ldr r1, =gUnknown_0832CABC + ldr r1, =gTradeStripesBG2Tilemap movs r2, 0x80 lsls r2, 4 movs r0, 0x2 @@ -1940,7 +1940,7 @@ _080782D4: b _0807837E .pool _08078324: - ldr r1, =gUnknown_0832D2BC + ldr r1, =gTradeStripesBG3Tilemap movs r2, 0x80 lsls r2, 4 movs r0, 0x3 @@ -4438,7 +4438,7 @@ _08079772: lsls r0, 2 add r0, r8 bl sub_80A6DEC - ldr r1, =gUnknown_0832C8BE + ldr r1, =gTradePartyBoxTilemap ldr r0, [sp, 0x64] subs r2, r0, r7 lsls r2, 24 @@ -4491,7 +4491,7 @@ _080798AC: b _08079A24 .pool _080798BC: - ldr r1, =gUnknown_0832C6C0 + ldr r1, =gTradeMovesBoxTilemap ldr r0, [sp, 0x60] lsls r2, r0, 4 subs r2, r0 @@ -5326,7 +5326,7 @@ sub_8079F88: @ 8079F88 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, =gUnknown_0832C8BE + ldr r1, =gTradePartyBoxTilemap lsls r2, r4, 4 subs r2, r4 lsls r2, 24 @@ -5698,7 +5698,7 @@ _0807A2B8: mov r0, sp b _0807A2D6 _0807A2BC: - ldr r0, =gUnknown_0832DCE4 + ldr r0, =gSpritePalette_TradeScreenText bl LoadSpritePalette b _0807A2DA .pool diff --git a/data/trade.s b/data/trade.s index 7308b92a3a..2674f3b650 100644 --- a/data/trade.s +++ b/data/trade.s @@ -2,25 +2,31 @@ .include "constants/constants.inc" .section .rodata - .align 2, 0 + .align 2 gUnknown_0832C6A8:: @ 832C6A8 - .incbin "baserom.gba", 0x32C6A8, 0x18 + .4byte 0x00000f2c, 0x00003d88, 0x0000001c, 0x00000024, 0x00000064, 0x00000528 -gUnknown_0832C6C0:: @ 832C6C0 - .incbin "baserom.gba", 0x32c6c0, 0x1fe + .align 1 +gTradeMovesBoxTilemap:: @ 832C6C0 + .incbin "graphics/trade/moves_box_map.bin" -gUnknown_0832C8BE:: @ 832C8BE - .incbin "baserom.gba", 0x32c8be, 0x1fe + .align 1 +gTradePartyBoxTilemap:: @ 832C8BE + .incbin "graphics/trade/party_box_map.bin" -gUnknown_0832CABC:: @ 832CABC - .incbin "baserom.gba", 0x32cabc, 0x800 + .align 1 +gTradeStripesBG2Tilemap:: @ 832CABC + .incbin "graphics/trade/stripes_bg2_map.bin" -gUnknown_0832D2BC:: @ 832D2BC - .incbin "baserom.gba", 0x32d2bc, 0x800 + .align 1 +gTradeStripesBG3Tilemap:: @ 832D2BC + .incbin "graphics/trade/stripes_bg3_map.bin" gUnknown_0832DABC:: @ 832DABC - .incbin "baserom.gba", 0x32dabc, 0xb + .string "$" + + .string "{COLOR WHITE}{HIGHLIGHT TRANSPARENT}{SHADOW DARK_GREY}$" gText_MaleSymbol4:: @ 832DAC7 .string "♂$" @@ -29,30 +35,128 @@ gText_FemaleSymbol4:: @ 832DAC9 .string "♀$" gText_GenderlessSymbol:: @ 832DACB - .incbin "baserom.gba", 0x32dacb, 0x7 + .string "$" + + .string " MOVE$" gUnknown_0832DAD2:: @ 832DAD2 - .incbin "baserom.gba", 0x32dad2, 0xd + .string "\n$" + + .string "/$" + + .string "Lv. $" + + .string "---$" gUnknown_0832DADF:: @ 832DADF - .incbin "baserom.gba", 0x32dadf, 0x6 + .string "????$" + + .string "$" gUnknown_0832DAE5:: @ 832DAE5 - .incbin "baserom.gba", 0x32dae5, 0x157 + .string "Is this trade okay?$" + .string "CANCEL$" + + .string "Choose a POKéMON.$" + + .string "SUMMARY$" + + .string "TRADE$" + + .string "Cancel trade?$" + + .string "Bボタン　で　もどります$" + + .string "SUMMARY$" + + .string "TRADE$" + + .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}Communication standby…\nPlease wait.$" + + .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}The trade has\nbeen canceled.$" + + .string "That’s your only\nPOKéMON for battle.$" + + .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}Waiting for your friend\nto finish…$" + + .string "Your friend wants\nto trade POKéMON.$" + + .align 2 +gOamData_832DC14:: @ 832DC14 + .2byte 0x4000, 0x8000, 0x0400, 0x0000 + + .align 2 +gOamData_832DC1C:: @ 832DC1C + .2byte 0x4000, 0xc000, 0x0400, 0x0000 + + .align 2 +gSpriteAnim_832DC24:: @ 832DC24 + .2byte 0x0000, 0x0005, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_832DC2C:: @ 832DC2C + .2byte 0x0020, 0x0005, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_832DC34:: @ 832DC34 + .4byte gSpriteAnim_832DC24 + .4byte gSpriteAnim_832DC2C + + .align 2 gUnknown_0832DC3C:: @ 832DC3C - .incbin "baserom.gba", 0x32dc3c, 0x8 + obj_tiles gUnknown_08DDC6E4, 0x0800, 0x012c + .align 2 gUnknown_0832DC44:: @ 832DC44 - .incbin "baserom.gba", 0x32dc44, 0x50 + obj_pal gUnknown_08DDB444, 0x0929 -gUnknown_0832DC94:: @ 832DC94 - .incbin "baserom.gba", 0x32dc94, 0x18 + .align 2 +gSpriteAnim_832DC4C:: @ 832DC4C + .2byte 0x0000, 0x0005, 0xffff, 0x0000 -gUnknown_0832DCAC:: @ 832DCAC - .incbin "baserom.gba", 0x32dcac, 0x38 + .align 2 +gSpriteAnim_832DC54:: @ 832DC54 + .2byte 0x0008, 0x0005, 0xffff, 0x0000 -gUnknown_0832DCE4:: @ 832DCE4 + .align 2 +gSpriteAnim_832DC5C:: @ 832DC5C + .2byte 0x0010, 0x0005, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_832DC64:: @ 832DC64 + .2byte 0x0018, 0x0005, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_832DC6C:: @ 832DC6C + .2byte 0x0020, 0x0005, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_832DC74:: @ 832DC74 + .2byte 0x0028, 0x0005, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_832DC7C:: @ 832DC7C + .4byte gSpriteAnim_832DC4C + .4byte gSpriteAnim_832DC54 + .4byte gSpriteAnim_832DC5C + .4byte gSpriteAnim_832DC64 + .4byte gSpriteAnim_832DC6C + .4byte gSpriteAnim_832DC74 + + .align 2 +gSpriteTemplate_832DC94:: @ 832DC94 + spr_template 0x012c, 0x0929, gOamData_832DC1C, gSpriteAnimTable_832DC34, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gSpriteTemplate_832DCAC:: @ 832DCAC + .incbin "baserom.gba", 0x32dcac, 0x18 + + .align 2 +TradeScreenTextPalette:: @ 832DCC4 + .incbin "graphics/trade/text.gbapal" + +gSpritePalette_TradeScreenText:: @ 832DCE4 .incbin "baserom.gba", 0x32dce4, 0x8 gUnknown_0832DCEC:: @ 832DCEC @@ -67,6 +171,7 @@ gUnknown_0832DE3E:: @ 832DE3E gUnknown_0832DE56:: @ 832DE56 .incbin "baserom.gba", 0x32de56, 0x3e + .align 2 gUnknown_0832DE94:: @ 832DE94 .incbin "baserom.gba", 0x32de94, 0x18 diff --git a/graphics/trade/moves_box_map.bin b/graphics/trade/moves_box_map.bin new file mode 100644 index 0000000000000000000000000000000000000000..123abf716f473d747bf466e067a1273eff68cd3c GIT binary patch literal 510 zcmZQz00B-0E)>WM7G+>yVqgYB9tLg{$Ojf>Vqsxm1wwWP4iv}+7G;6Tf>dBaTFWXh kC}Kb*pgSP;8Za1QKm(qkEUUz$hyfMgKEe!thzJV{02>As;Q#;t literal 0 HcmV?d00001 diff --git a/graphics/trade/party_box_map.bin b/graphics/trade/party_box_map.bin new file mode 100644 index 0000000000000000000000000000000000000000..69304c5cb4c030ee29b16716bf443524c53edd9e GIT binary patch literal 510 zcmZQz00B-0E)>WM7G+>yVqgYB9tLg{$Ojf>Vqsxm1wwWP4iv}+7G;6Tf>dC_QCZ|L I8Mx2@0JRMTa{vGU literal 0 HcmV?d00001 diff --git a/graphics/trade/stripes_bg2_map.bin b/graphics/trade/stripes_bg2_map.bin new file mode 100644 index 0000000000..22f8f3b710 --- /dev/null +++ b/graphics/trade/stripes_bg2_map.bin @@ -0,0 +1 @@ +@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@ \ No newline at end of file diff --git a/graphics/trade/stripes_bg3_map.bin b/graphics/trade/stripes_bg3_map.bin new file mode 100644 index 0000000000..e4168474ae --- /dev/null +++ b/graphics/trade/stripes_bg3_map.bin @@ -0,0 +1 @@ +P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P \ No newline at end of file diff --git a/graphics/trade/text.pal b/graphics/trade/text.pal new file mode 100644 index 0000000000..40426b71f7 --- /dev/null +++ b/graphics/trade/text.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 +0 0 0 +255 255 255 +0 0 0 +115 115 115 +255 255 255 From c74334c26a1565b3cae586efd2f8a07a8bb0f912 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Fri, 19 Jan 2018 12:49:08 -0600 Subject: [PATCH 41/64] Fix address of berry struct in item.c --- data/contest.s | 6 +----- src/item.c | 6 +++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/data/contest.s b/data/contest.s index 4bb54bd00d..0db64b13aa 100644 --- a/data/contest.s +++ b/data/contest.s @@ -303,11 +303,7 @@ gUnknown_08587FA4:: @ 8587FA4 .align 2 gUnknown_085880A4:: @ 85880A4 - .incbin "baserom.gba", 0x5880a4, 0x1740 - - .align 2 -gUnknown_085897E4:: @ 85897E4 - .incbin "baserom.gba", 0x5897e4, 0xc0 + .incbin "baserom.gba", 0x5880a4, 0x1800 gUnknown_085898A4:: @ 85898A4 .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 diff --git a/src/item.c b/src/item.c index 931027e254..a17599db91 100644 --- a/src/item.c +++ b/src/item.c @@ -1,5 +1,6 @@ #include "global.h" #include "item.h" +#include "berry.h" #include "constants/items.h" #include "string_util.h" #include "text.h" @@ -11,7 +12,6 @@ extern bool8 InBattlePyramid(void); extern const u8 gText_PokeBalls[]; extern const u8 gText_Berries[]; extern const u8 gText_Berry[]; -extern const u8 gUnknown_085897E4[][28]; // not sure what this one is bool8 CheckPyramidBagHasItem(u16 itemId, u16 count); bool8 CheckPyramidBagHasSpace(u16 itemId, u16 count); @@ -96,8 +96,8 @@ void CopyItemNameHandlePlural(u16 itemId, u8 *string, u32 quantity) } else { - if (itemId >= 0x85 && itemId <= 0xAF) - GetBerryCountString(string, gUnknown_085897E4[itemId], quantity); + if (itemId >= ITEM_CHERI_BERRY && itemId <= ITEM_ENIGMA_BERRY) + GetBerryCountString(string, gBerries[itemId - ITEM_CHERI_BERRY].name, quantity); else StringCopy(string, ItemId_GetItem(itemId)->name); } From b22a80058104eca7f04ef608b01e96982a276216 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Fri, 19 Jan 2018 19:52:46 -0600 Subject: [PATCH 42/64] Extract data from trade.s Also rename window_template_terminator to null_window_template, in keeping with naming conventions --- asm/macros/window.inc | 2 +- asm/trade.s | 56 +-- data/battle_frontier_1.s | 2 +- data/battle_frontier_2.s | 4 +- data/battle_records.s | 2 +- data/berry_tag_screen.s | 2 +- data/contest.s | 2 +- data/contest_link_80F57C4.s | 2 +- data/credits.s | 2 +- data/data2b.s | 4 +- data/easy_chat.s | 2 +- data/link.s | 16 +- data/main_menu.s | 4 +- data/pokemon_storage_system.s | 2 +- data/pokenav.s | 2 +- data/reset_rtc_screen.s | 2 +- data/shop.s | 2 +- data/slot_machine.s | 2 +- data/strings.s | 23 +- data/trade.s | 464 ++++++++++++++++++--- data/use_pokeblock.s | 2 +- graphics/trade/ball.png | Bin 0 -> 464 bytes graphics/trade/black.pal | 19 + graphics/trade/cable_closeup_map.bin | Bin 0 -> 2048 bytes graphics/trade/cable_end.png | Bin 0 -> 194 bytes graphics/trade/gba.pal | 19 + graphics/trade/gba_affine.png | Bin 0 -> 1897 bytes graphics/trade/gba_affine_map_cable.bin | Bin 0 -> 256 bytes graphics/trade/gba_affine_map_wireless.bin | Bin 0 -> 256 bytes graphics/trade/gba_map_cable.bin | Bin 0 -> 4096 bytes graphics/trade/gba_map_wireless.bin | Bin 0 -> 4096 bytes graphics/trade/gba_screen.png | Bin 0 -> 170 bytes graphics/trade/glow1.png | Bin 0 -> 195 bytes graphics/trade/glow2.png | Bin 0 -> 190 bytes graphics/trade/misc.pal | 19 + graphics/trade/pokeball_symbol.png | Bin 0 -> 1569 bytes graphics/trade/pokeball_symbol_map.bin | Bin 0 -> 256 bytes graphics/trade/shadow.pal | 19 + graphics/trade/shadow_map.bin | Bin 0 -> 4096 bytes graphics/trade/unknown_3308C0.pal | 19 + graphics/trade/unknown_3379A0.bin | Bin 0 -> 2048 bytes graphics/trade/unknown_338EA4.pal | 15 + graphics/trade/wireless_signal.bin | Bin 0 -> 2048 bytes graphics/trade/wireless_signal.png | Bin 0 -> 1307 bytes graphics/trade/wireless_signal_receive.pal | 259 ++++++++++++ graphics/trade/wireless_signal_send.pal | 259 ++++++++++++ 46 files changed, 1086 insertions(+), 141 deletions(-) create mode 100644 graphics/trade/ball.png create mode 100644 graphics/trade/black.pal create mode 100644 graphics/trade/cable_closeup_map.bin create mode 100644 graphics/trade/cable_end.png create mode 100644 graphics/trade/gba.pal create mode 100644 graphics/trade/gba_affine.png create mode 100644 graphics/trade/gba_affine_map_cable.bin create mode 100644 graphics/trade/gba_affine_map_wireless.bin create mode 100644 graphics/trade/gba_map_cable.bin create mode 100644 graphics/trade/gba_map_wireless.bin create mode 100644 graphics/trade/gba_screen.png create mode 100644 graphics/trade/glow1.png create mode 100644 graphics/trade/glow2.png create mode 100644 graphics/trade/misc.pal create mode 100644 graphics/trade/pokeball_symbol.png create mode 100644 graphics/trade/pokeball_symbol_map.bin create mode 100644 graphics/trade/shadow.pal create mode 100644 graphics/trade/shadow_map.bin create mode 100644 graphics/trade/unknown_3308C0.pal create mode 100644 graphics/trade/unknown_3379A0.bin create mode 100644 graphics/trade/unknown_338EA4.pal create mode 100644 graphics/trade/wireless_signal.bin create mode 100644 graphics/trade/wireless_signal.png create mode 100644 graphics/trade/wireless_signal_receive.pal create mode 100644 graphics/trade/wireless_signal_send.pal diff --git a/asm/macros/window.inc b/asm/macros/window.inc index b7291138b8..a91782bbf8 100644 --- a/asm/macros/window.inc +++ b/asm/macros/window.inc @@ -8,7 +8,7 @@ .2byte \vram_tile_offset .endm - .macro window_template_terminator + .macro null_window_template window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 .endm diff --git a/asm/trade.s b/asm/trade.s index 50e6b71e2e..cfc5307d39 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -2394,7 +2394,7 @@ _08078726: mov r2, sp bl GetMonData mov r0, sp - ldr r1, =gUnknown_0832DF94 + ldr r1, =gJPText_Shedinja bl StringCompareWithoutExtCtrlCodes cmp r0, 0 bne _08078766 @@ -2444,7 +2444,7 @@ _080787AC: thumb_func_start sub_80787B8 sub_80787B8: @ 80787B8 push {lr} - ldr r0, =gUnknown_0832DAE5 + ldr r0, =gText_IsThisTradeOkay ldr r1, =gUnknown_0203229C ldr r1, [r1] adds r1, 0x72 @@ -4769,7 +4769,7 @@ _08079AFE: lsrs r4, r0, 16 cmp r4, 0x3 bls _08079ADE - ldr r1, =gUnknown_0832DABC + ldr r1, =gText_EmptyString7 adds r0, r6, 0 bl StringCopy movs r4, 0 @@ -4789,7 +4789,7 @@ _08079B20: bl StringAppend _08079B3C: adds r0, r6, 0 - ldr r1, =gUnknown_0832DAD2 + ldr r1, =gText_NewLine3 bl StringAppend adds r0, r4, 0x1 lsls r0, 16 @@ -4799,10 +4799,10 @@ _08079B3C: b _08079B6C .pool _08079B5C: - ldr r1, =gUnknown_0832DABC + ldr r1, =gText_EmptyString7 adds r0, r6, 0 bl StringCopy - ldr r1, =gUnknown_0832DADF + ldr r1, =gText_FourQuestionMarks adds r0, r6, 0 bl StringAppend _08079B6C: @@ -8571,7 +8571,7 @@ _0807BB68: lsls r4, r0, 4 subs r4, r0 lsls r4, 2 - ldr r0, =gUnknown_08338ED0 + ldr r0, =gIngameTrades adds r4, r0 ldr r0, =gStringVar1 adds r1, r4, 0 @@ -9098,7 +9098,7 @@ _0807C1DC: beq _0807C1FC bl _0807CFB4 _0807C1FC: - ldr r0, =gUnknown_08338D28 + ldr r0, =gSpriteTemplate_8338D28 movs r1, 0x78 movs r2, 0x20 movs r3, 0 @@ -9228,7 +9228,7 @@ _0807C318: bl _0807CFB4 _0807C328: bl sub_807AB28 - ldr r0, =gUnknown_08338E74 + ldr r0, =gSpriteTemplate_8338E74 movs r1, 0x78 movs r2, 0x50 movs r3, 0 @@ -9296,7 +9296,7 @@ _0807C3B0: beq _0807C3C4 bl _0807CFB4 _0807C3C4: - ldr r0, =gUnknown_08338DFC + ldr r0, =gSpriteTemplate_8338DFC movs r1, 0x80 movs r2, 0x41 movs r3, 0 @@ -9316,7 +9316,7 @@ _0807C3E0: ldr r1, [r4] adds r1, 0x90 strb r0, [r1] - ldr r0, =gUnknown_08338DC8 + ldr r0, =gSpriteTemplate_8338DC8 movs r1, 0x80 movs r2, 0x50 movs r3, 0 @@ -9455,7 +9455,7 @@ _0807C528: movs r2, 0x10 movs r3, 0 bl BeginNormalPaletteFade - ldr r5, =gUnknown_08338DC8 + ldr r5, =gSpriteTemplate_8338DC8 adds r0, r5, 0 movs r1, 0x6F movs r2, 0xAA @@ -9604,7 +9604,7 @@ _0807C66C: adds r1, r4, 0 adds r1, 0x10 adds r0, r1 - ldr r1, =gUnknown_08338ECC + ldr r1, =gSpriteAffineAnimTable_8338ECC str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -9915,7 +9915,7 @@ _0807C8FA: ldr r1, [r7] adds r1, 0x90 strb r0, [r1] - ldr r0, =gUnknown_08338DC8 + ldr r0, =gSpriteTemplate_8338DC8 movs r1, 0x80 adds r2, r4, 0 movs r3, 0 @@ -10091,7 +10091,7 @@ _0807CA86: bne _0807CA92 b _0807CFB4 _0807CA92: - ldr r0, =gUnknown_08338DFC + ldr r0, =gSpriteTemplate_8338DFC movs r1, 0x80 movs r2, 0x41 movs r3, 0 @@ -10113,7 +10113,7 @@ _0807CA92: b _0807CFB4 .pool _0807CAC8: - ldr r0, =gUnknown_08338E74 + ldr r0, =gSpriteTemplate_8338E74 movs r1, 0x78 movs r2, 0x50 movs r3, 0 @@ -10255,7 +10255,7 @@ _0807CBEC: b _0807CF48 .pool _0807CBF4: - ldr r0, =gUnknown_08338D28 + ldr r0, =gSpriteTemplate_8338D28 movs r2, 0x8 negs r2, r2 movs r1, 0x78 @@ -11160,7 +11160,7 @@ _0807D5B8: beq _0807D5D8 bl _0807E400 _0807D5D8: - ldr r0, =gUnknown_08338D28 + ldr r0, =gSpriteTemplate_8338D28 movs r1, 0x78 movs r2, 0x20 movs r3, 0 @@ -11290,7 +11290,7 @@ _0807D6F4: _0807D704: movs r0, 0x3 bl sub_807B62C - ldr r0, =gUnknown_08338E8C + ldr r0, =gSpriteTemplate_8338E8C movs r1, 0x78 movs r2, 0x50 movs r3, 0 @@ -11386,7 +11386,7 @@ _0807D7C4: adds r0, r1 ldr r1, =sub_807AA4C str r1, [r0] - ldr r0, =gUnknown_08338DC8 + ldr r0, =gSpriteTemplate_8338DC8 movs r1, 0x78 movs r2, 0x50 movs r3, 0 @@ -11524,7 +11524,7 @@ _0807D924: movs r2, 0x10 movs r3, 0 bl BeginNormalPaletteFade - ldr r5, =gUnknown_08338DC8 + ldr r5, =gSpriteTemplate_8338DC8 adds r0, r5, 0 movs r1, 0x6F movs r2, 0xAA @@ -11678,7 +11678,7 @@ _0807DA74: adds r1, r4, 0 adds r1, 0x10 adds r0, r1 - ldr r1, =gUnknown_08338ECC + ldr r1, =gSpriteAffineAnimTable_8338ECC str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -12008,7 +12008,7 @@ _0807DD02: adds r0, r1 ldr r1, =sub_807AA4C str r1, [r0] - ldr r0, =gUnknown_08338DC8 + ldr r0, =gSpriteTemplate_8338DC8 movs r1, 0x78 adds r2, r4, 0 movs r3, 0 @@ -12218,7 +12218,7 @@ _0807DF12: strh r6, [r5] b _0807E398 _0807DF16: - ldr r0, =gUnknown_08338E74 + ldr r0, =gSpriteTemplate_8338E74 movs r1, 0x78 movs r2, 0x50 movs r3, 0 @@ -12360,7 +12360,7 @@ _0807E038: b _0807E394 .pool _0807E040: - ldr r0, =gUnknown_08338D28 + ldr r0, =gSpriteTemplate_8338D28 movs r2, 0x8 negs r2, r2 movs r1, 0x78 @@ -13184,7 +13184,7 @@ sub_807E73C: @ 807E73C lsls r4, r0, 4 subs r4, r0 lsls r4, 2 - ldr r0, =gUnknown_08338ED0 + ldr r0, =gIngameTrades adds r4, r0 ldr r0, =gStringVar1 ldrh r1, [r4, 0x38] @@ -13214,7 +13214,7 @@ sub_807E784: @ 807E784 lsls r4, r0, 4 subs r4, r0 lsls r4, 2 - ldr r0, =gUnknown_08338ED0 + ldr r0, =gIngameTrades adds r4, r0 ldr r0, =gSpecialVar_0x8005 ldrh r1, [r0] @@ -13253,7 +13253,7 @@ sub_807E7E8: @ 807E7E8 lsls r2, r1, 4 subs r2, r1 lsls r2, 2 - ldr r1, =gUnknown_08338ED0 + ldr r1, =gIngameTrades adds r5, r2, r1 movs r1, 0x64 muls r0, r1 diff --git a/data/battle_frontier_1.s b/data/battle_frontier_1.s index 177d8adfc0..34e8df6d2e 100644 --- a/data/battle_frontier_1.s +++ b/data/battle_frontier_1.s @@ -243,7 +243,7 @@ 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 + null_window_template .align 2 gUnknown_0860CEB4:: @ 860CEB4 diff --git a/data/battle_frontier_2.s b/data/battle_frontier_2.s index bfb99f97dc..c9bab5a641 100644 --- a/data/battle_frontier_2.s +++ b/data/battle_frontier_2.s @@ -108,7 +108,7 @@ gUnknown_08610434:: @ 8610434 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 + null_window_template .align 1 gUnknown_0861046C:: @ 861046C @@ -345,7 +345,7 @@ gUnknown_086108C8:: @ 86108C8 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 + null_window_template gUnknown_08610918:: @ 8610918 .byte 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x1f, 0x00 diff --git a/data/battle_records.s b/data/battle_records.s index 22c487e4c1..86dc9d8b96 100644 --- a/data/battle_records.s +++ b/data/battle_records.s @@ -23,7 +23,7 @@ gUnknown_085B3D64:: @ 85B3D64 .align 2 gUnknown_085B3D6C:: @ 85B3D6C window_template 0x00, 0x02, 0x01, 0x1a, 0x12, 0x0f, 0x0014 - window_template_terminator + null_window_template .align 2 gUnknown_085B3D7C:: @ 85B3D7C diff --git a/data/berry_tag_screen.s b/data/berry_tag_screen.s index 01a44bb14f..13078e8e52 100644 --- a/data/berry_tag_screen.s +++ b/data/berry_tag_screen.s @@ -23,7 +23,7 @@ gUnknown_085EFD28:: @ 85EFD28 window_template 0x01, 0x0b, 0x07, 0x12, 0x04, 0x0f, 0x0055 window_template 0x01, 0x04, 0x0e, 0x19, 0x04, 0x0f, 0x009d window_template 0x00, 0x02, 0x00, 0x08, 0x02, 0x0f, 0x0101 - window_template_terminator + null_window_template .align 2 gBerryFirmnessStringPointers:: @ 85EFD50 diff --git a/data/contest.s b/data/contest.s index 4bb54bd00d..4491d5fda8 100644 --- a/data/contest.s +++ b/data/contest.s @@ -295,7 +295,7 @@ gUnknown_08587F44:: @ 8587F44 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 + null_window_template .align 2 gUnknown_08587FA4:: @ 8587FA4 diff --git a/data/contest_link_80F57C4.s b/data/contest_link_80F57C4.s index 6bf51d1748..a434eee281 100644 --- a/data/contest_link_80F57C4.s +++ b/data/contest_link_80F57C4.s @@ -68,7 +68,7 @@ gUnknown_0858D898:: @ 858D898 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 + null_window_template .align 2 gUnknown_0858D8C0:: @ 858D8C0 diff --git a/data/credits.s b/data/credits.s index cc75915a0a..a5c0837d1e 100644 --- a/data/credits.s +++ b/data/credits.s @@ -1493,7 +1493,7 @@ gUnknown_085E6F68:: @ 85E6F68 struct BgTemplate .align 2 gUnknown_085E6F6C:: @ 85E6F6C window_template 0x00, 0x00, 0x09, 0x1e, 0x0c, 0x08, 0x0001 - window_template_terminator + null_window_template .align 2 gUnknown_085E6F7C:: @ 85E6F7C diff --git a/data/data2b.s b/data/data2b.s index 1400b31d3f..6c24060a00 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -4711,7 +4711,7 @@ gUnknown_0831AA18:: @ 831AA18 window_template 0x00, 0x0c, 0x02, 0x06, 0x02, 0x00, 0x00a0 window_template 0x00, 0x04, 0x02, 0x07, 0x02, 0x00, 0x00a0 window_template 0x00, 0x13, 0x02, 0x07, 0x02, 0x00, 0x00b0 - window_template_terminator + null_window_template .align 2 gUnknown_0831AAE0:: @ 831AAE0 @@ -4738,7 +4738,7 @@ gUnknown_0831AAE0:: @ 831AAE0 window_template 0x00, 0x0c, 0x08, 0x06, 0x02, 0x05, 0x013c window_template 0x00, 0x08, 0x0b, 0x0e, 0x02, 0x05, 0x0148 window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x07, 0x0090 - window_template_terminator + null_window_template .align 2 gUnknown_0831ABA0:: @ 831ABA0 diff --git a/data/easy_chat.s b/data/easy_chat.s index edbb77f599..ce416dfbc9 100644 --- a/data/easy_chat.s +++ b/data/easy_chat.s @@ -273,7 +273,7 @@ gUnknown_08597C64:: @ 8597C64 window_template 0x01, 0x06, 0x00, 0x12, 0x02, 0x0a, 0x0010 window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0f, 0x000a window_template 0x02, 0x01, 0x00, 0x1c, 0x20, 0x03, 0x0000 - window_template_terminator + null_window_template .align 2 gUnknown_08597C84:: @ 8597C84 diff --git a/data/link.s b/data/link.s index f1f84c5b8e..e458ad5de3 100644 --- a/data/link.s +++ b/data/link.s @@ -60,7 +60,7 @@ gUnknown_082ED204:: @ 82ED204 window_template 0x00, 0x00, 0x00, 0x1E, 0x05, 0x0F, 0x0002 window_template 0x00, 0x00, 0x06, 0x1E, 0x07, 0x0F, 0x0098 window_template 0x00, 0x00, 0x0D, 0x1E, 0x07, 0x0F, 0x016A - window_template_terminator + null_window_template .align 2 gUnknown_082ED224:: @ 82ED224 @@ -1887,7 +1887,7 @@ gUnknown_082F05A8:: @ 82F05A8 window_template 0x00, 0x00, 0x00, 0x1e, 0x02, 0x0c, 0x0013 window_template 0x00, 0x01, 0x0f, 0x1c, 0x04, 0x0c, 0x004f window_template 0x00, 0x00, 0x0f, 0x1e, 0x05, 0x0d, 0x004f - window_template_terminator + null_window_template .align 2 gUnknown_082F05C8:: @ 82F05C8 @@ -2071,7 +2071,7 @@ gUnknown_082F0D3C:: @ 82F0D3C window_template 0x00, 0x03, 0x00, 0x18, 0x03, 0x0f, 0x0001 window_template 0x00, 0x03, 0x04, 0x15, 0x0f, 0x0f, 0x0049 window_template 0x00, 0x18, 0x04, 0x03, 0x0f, 0x0f, 0x0184 - window_template_terminator + null_window_template .align 2 gUnknown_082F0D5C:: @ 82F0D5C @@ -2103,7 +2103,7 @@ gUnknown_082F0DD0:: @ 82F0DD0 .align 2 gUnknown_082F0DD4:: @ 82F0DD4 window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0e, 0x0014 - window_template_terminator + null_window_template .align 2 gUnknown_082F0DE4:: @ 82F0DE4 @@ -2756,7 +2756,7 @@ gUnknown_082F2C70:: @ 82F2C70 window_template 0x01, 0x09, 0x12, 0x0f, 0x02, 0x0c, 0x007a window_template 0x01, 0x00, 0x02, 0x06, 0x0f, 0x07, 0x0020 window_template 0x00, 0x01, 0x02, 0x07, 0x09, 0x0e, 0x0013 - window_template_terminator + null_window_template .align 2 gUnknown_082F2C98:: @ 82F2C98 @@ -3023,12 +3023,12 @@ gUnknown_082F32F4:: @ 82F32F4 window_template 0x00, 0x00, 0x06, 0x09, 0x02, 0x08, 0x03c9 window_template 0x00, 0x15, 0x03, 0x09, 0x02, 0x08, 0x03b7 window_template 0x00, 0x15, 0x06, 0x09, 0x02, 0x08, 0x03a5 - window_template_terminator + null_window_template window_template 0x00, 0x05, 0x02, 0x14, 0x10, 0x0f, 0x0001 window_template 0x00, 0x05, 0x02, 0x14, 0x10, 0x0f, 0x0001 window_template 0x00, 0x04, 0x02, 0x16, 0x10, 0x0f, 0x0001 - window_template_terminator + null_window_template .align 2 gUnknown_082F3344:: @ 82F3344 @@ -4422,7 +4422,7 @@ gUnknown_082FE164:: @ 82FE164 struct BgTemplate gUnknown_082FE174:: @ 82FE174 window_template 0x00, 0x13, 0x00, 0x06, 0x02, 0x02, 0x0013 window_template 0x00, 0x08, 0x00, 0x06, 0x02, 0x02, 0x001f - window_template_terminator + null_window_template .align 2 gUnknown_082FE18C:: @ 82FE18C diff --git a/data/main_menu.s b/data/main_menu.s index fba0e7ddb0..019fdfab8d 100644 --- a/data/main_menu.s +++ b/data/main_menu.s @@ -42,7 +42,7 @@ gUnknown_082FF048:: @ 82FF048 .align 2 gUnknown_082FF070:: @ 82FF070 window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x0f, 0x016d - window_template_terminator + null_window_template .align 2 gUnknown_082FF080:: @ 82FF080 @@ -52,7 +52,7 @@ gUnknown_082FF080:: @ 82FF080 gUnknown_082FF088:: @ 82FF088 window_template 0x00, 0x03, 0x05, 0x06, 0x04, 0x0f, 0x006d window_template 0x00, 0x03, 0x02, 0x09, 0x0a, 0x0f, 0x0085 - window_template_terminator + null_window_template .align 2 gMainMenuBgPal:: @ 82FF0A0 diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index f123f4fe2b..f05613b005 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -87,7 +87,7 @@ gUnknown_08572714:: @ 8572714 window_template 0x01, 0x00, 0x0b, 0x09, 0x07, 0x03, 0x00c0 window_template 0x00, 0x0b, 0x11, 0x12, 0x02, 0x0f, 0x0014 window_template 0x00, 0x00, 0x0d, 0x15, 0x07, 0x0f, 0x0014 - window_template_terminator + null_window_template .align 2 gUnknown_08572734:: @ 8572734 diff --git a/data/pokenav.s b/data/pokenav.s index 3a8be11a3e..03c0d4b8a6 100644 --- a/data/pokenav.s +++ b/data/pokenav.s @@ -127,7 +127,7 @@ gUnknown_0861FA04:: @ 861FA04 gUnknown_0861FA08:: @ 861FA08 window_template 0, 1, 0x16, 0x10, 0x2, 0x0, 0x36 - window_template_terminator + null_window_template gUnknown_0861FA18:: @ 861FA18 .4byte gUnknown_085EBED5 diff --git a/data/reset_rtc_screen.s b/data/reset_rtc_screen.s index 37c532497e..6d3964da82 100644 --- a/data/reset_rtc_screen.s +++ b/data/reset_rtc_screen.s @@ -11,7 +11,7 @@ gUnknown_08510404:: @ 8510404 struct BgTemplate gUnknown_08510408:: @ 8510408 window_template 0x00, 0x01, 0x01, 0x13, 0x09, 0x0f, 0x0155 window_template 0x00, 0x02, 0x0f, 0x1b, 0x04, 0x0f, 0x00e9 - window_template_terminator + null_window_template .align 2 gUnknown_08510420:: @ 8510420 diff --git a/data/shop.s b/data/shop.s index d19feff1ec..58f294e6bb 100644 --- a/data/shop.s +++ b/data/shop.s @@ -46,7 +46,7 @@ gUnknown_08589A70:: @ 8589A70 window_template 0, 1, 11, 12, 2, 15, 0x176 window_template 0, 18, 11, 10, 2, 15, 0x18E window_template 0, 2, 15, 27, 4, 15, 0x1A2 - window_template_terminator + null_window_template gUnknown_08589AA8:: @ 8589AA8 window_template 0, 21, 9, 5, 4, 15, 0x20E diff --git a/data/slot_machine.s b/data/slot_machine.s index b25d496d94..b704cdb7a2 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -12,7 +12,7 @@ gUnknown_085A7424:: @ 85A7424 gUnknown_085A7434:: @ 85A7434 window_template 0, 2, 15, 0x1B, 4, 15, 0x194 - window_template_terminator + null_window_template gUnknown_085A7444:: @ 85A7444 window_template 0, 1, 3, 20, 13, 13, 1 diff --git a/data/strings.s b/data/strings.s index 9ff36256d9..30969e452c 100644 --- a/data/strings.s +++ b/data/strings.s @@ -139,17 +139,14 @@ gUnknown_085E852C:: @ 85E852C .string "CONTROLS$" .align 2 - gUnknown_085E8538:: @ 85E8538 .string "{UNK_CTRL_F80A}PICK {UNK_CTRL_F800}OK$" .align 2 - gUnknown_085E8544:: @ 85E8544 .string "{UNK_CTRL_F800}NEXT$" .align 2 - gUnknown_085E854C:: @ 85E854C .string "{UNK_CTRL_F800}NEXT {UNK_CTRL_F801}BACK$" @@ -1340,27 +1337,22 @@ gText_EggCantBeTradedNow:: @ 85EA234 .string "An EGG can’t be traded now.$" .align 2 - -gUnknown_085EA250:: @ 85EA250 +gText_OtherTrainersPkmnCantBeTraded:: @ 85EA250 .string "The other TRAINER’s POKéMON\ncan’t be traded now.$" .align 2 - gUnknown_085EA284:: @ 85EA284 .string "The other TRAINER can’t accept\nthat POKéMON now.$" .align 2 - gUnknown_085EA2B8:: @ 85EA2B8 .string "You can’t trade with that\nTRAINER now.$" .align 2 - gUnknown_085EA2E0:: @ 85EA2E0 .string "That isn’t the type of POKéMON\nthat the other TRAINER wants.$" .align 2 - gUnknown_085EA320:: @ 85EA320 .string "That isn’t an EGG.$" @@ -3585,27 +3577,22 @@ gText_BattlePyramid:: @ 85ED153 .string "BATTLE PYRAMID$" .align 2 - gUnknown_085ED164:: @ 85ED164 .string "{STR_VAR_1} SINGLE$" .align 2 - gUnknown_085ED170:: @ 85ED170 .string "{STR_VAR_1} DOUBLE$" .align 2 - gUnknown_085ED17C:: @ 85ED17C .string "{STR_VAR_1} MULTI$" .align 2 - gUnknown_085ED188:: @ 85ED188 .string "{STR_VAR_1} LINK$" .align 2 - gUnknown_085ED190:: @ 85ED190 .string "{STR_VAR_1}$" @@ -4319,37 +4306,30 @@ gText_FloorsCleared:: @ 85EE39C .string "Floors cleared: {STR_VAR_1}$" .align 2 - gUnknown_085EE3B0:: @ 85EE3B0 .string "LV. 50$" .align 2 - gUnknown_085EE3B8:: @ 85EE3B8 .string "OPEN LEVEL$" .align 2 - gUnknown_085EE3C4:: @ 85EE3C4 .string "Win streak: {STR_VAR_2}$" .align 2 - gUnknown_085EE3D4:: @ 85EE3D4 .string "Clear streak: {STR_VAR_2}$" .align 2 - gUnknown_085EE3E8:: @ 85EE3E8 .string "Rooms cleared: {STR_VAR_2}$" .align 2 - gUnknown_085EE3FC:: @ 85EE3FC .string "KOs in a row: {STR_VAR_2}$" .align 2 - gUnknown_085EE410:: @ 85EE410 .string "Floors cleared: {STR_VAR_2}$" @@ -4931,7 +4911,6 @@ gText_WhereShouldNewsBeAccessed:: @ 85EEF94 .string "Where should the WONDER NEWS\nbe accessed?$" .align 2 - gUnknown_085EEFC0:: @ 85EEFC0 .string "Communication standby…\nB Button: Cancel$" diff --git a/data/trade.s b/data/trade.s index 2674f3b650..4958d5717e 100644 --- a/data/trade.s +++ b/data/trade.s @@ -1,3 +1,5 @@ +#include "constants/species.h" +#include "constants/items.h" .include "asm/macros.inc" .include "constants/constants.inc" @@ -23,9 +25,10 @@ gTradeStripesBG2Tilemap:: @ 832CABC gTradeStripesBG3Tilemap:: @ 832D2BC .incbin "graphics/trade/stripes_bg3_map.bin" -gUnknown_0832DABC:: @ 832DABC +gText_EmptyString7:: @ 832DABC .string "$" +gText_ClrWhtHltTrspntShdwDrkGry:: @ 832DABD .string "{COLOR WHITE}{HIGHLIGHT TRANSPARENT}{SHADOW DARK_GREY}$" gText_MaleSymbol4:: @ 832DAC7 @@ -37,49 +40,67 @@ gText_FemaleSymbol4:: @ 832DAC9 gText_GenderlessSymbol:: @ 832DACB .string "$" +gText_SpaceMove:: @ 832DACC .string " MOVE$" -gUnknown_0832DAD2:: @ 832DAD2 +gText_NewLine3:: @ 832DAD2 .string "\n$" +gText_Slash2:: @ 832DAD4 .string "/$" +gText_Lv2:: @ 832DAD6 .string "Lv. $" +gText_ThreeDashes2:: @ 832DADB .string "---$" -gUnknown_0832DADF:: @ 832DADF +gText_FourQuestionMarks:: @ 832DADF .string "????$" +gText_832DAE4:: @ 832DAE4 .string "$" -gUnknown_0832DAE5:: @ 832DAE5 +gText_IsThisTradeOkay:: @ 832DAE5 .string "Is this trade okay?$" +gText_Cancel6:: @ 832DAF9 .string "CANCEL$" +gText_ChooseAPkmn:: @ 832DB00 .string "Choose a POKéMON.$" +gText_Summary3:: @ 832DB12 .string "SUMMARY$" +gText_Trade2:: @ 832DB1A .string "TRADE$" +gText_CancelTrade:: @ 832DB20 .string "Cancel trade?$" +gJPText_832DB2E:: @ 832DB2E .string "Bボタン　で　もどります$" +gText_Summary4:: @ 832DB3B .string "SUMMARY$" +gText_Trade3:: @ 832DB43 .string "TRADE$" +gText_CommunicationStandby6:: @ 832DB49 .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}Communication standby…\nPlease wait.$" +gText_TheTradeHasBeenCanceled:: @ 832DB76 .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}The trade has\nbeen canceled.$" +gText_YourOnlyPkmnForBattle:: @ 832DB9C .string "That’s your only\nPOKéMON for battle.$" +gText_WaitingForYourFriend:: @ 832DBC1 .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}Waiting for your friend\nto finish…$" +gText_YourFriendWantsToTrade:: @ 832DBED .string "Your friend wants\nto trade POKéMON.$" .align 2 @@ -150,159 +171,476 @@ gSpriteTemplate_832DC94:: @ 832DC94 .align 2 gSpriteTemplate_832DCAC:: @ 832DCAC - .incbin "baserom.gba", 0x32dcac, 0x18 + spr_template 0x00c8, 0x133d, gOamData_832DC14, gSpriteAnimTable_832DC7C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy .align 2 TradeScreenTextPalette:: @ 832DCC4 .incbin "graphics/trade/text.gbapal" + .align 2 gSpritePalette_TradeScreenText:: @ 832DCE4 - .incbin "baserom.gba", 0x32dce4, 0x8 + obj_pal TradeScreenTextPalette, 0x133d gUnknown_0832DCEC:: @ 832DCEC - .incbin "baserom.gba", 0x32dcec, 0x138 + .byte 0x04, 0x02, 0x0c, 0x0c, 0x00, 0x00, 0x02, 0x04, 0x0c, 0x0c, 0x00, 0x00, 0x07, 0x06, 0x01, 0x00, 0x00, 0x00, 0x01, 0x06, 0x07, 0x00, 0x00, 0x00, 0x05, 0x03, 0x0c, 0x0c, 0x00, 0x00, 0x03, 0x05 + .byte 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x07, 0x06, 0x01, 0x00, 0x00, 0x06, 0x07, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x08, 0x07, 0x06 + .byte 0x00, 0x00, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x05, 0x01, 0x01, 0x01, 0x00, 0x00, 0x02, 0x09, 0x08, 0x07, 0x00, 0x00, 0x08, 0x09, 0x06, 0x06, 0x00, 0x00 + .byte 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x0a, 0x09, 0x08, 0x07, 0x06, 0x05, 0x03, 0x01, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x01, 0x01 + .byte 0x01, 0x01, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x0a, 0x08, 0x06, 0x00, 0x00, 0x00, 0x0a, 0x08, 0x0c, 0x00, 0x00, 0x00, 0x08, 0x0a, 0x0c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x09, 0x07, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x0c + .byte 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x04, 0x03, 0x02 + .byte 0x01, 0x00, 0x0b, 0x09, 0x07, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x00, 0x00, 0x00, 0x00 + .byte 0x0b, 0x09, 0x07, 0x06, 0x00, 0x00, 0x07, 0x06, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00 gUnknown_0832DE24:: @ 832DE24 - .incbin "baserom.gba", 0x32de24, 0x1a + .byte 0x01, 0x05, 0x08, 0x05, 0x01, 0x0a, 0x08, 0x0a, 0x01, 0x0f, 0x08, 0x0f, 0x10, 0x05, 0x17, 0x05, 0x10, 0x0a, 0x17, 0x0a, 0x10, 0x0f, 0x17, 0x0f, 0x17, 0x12 gUnknown_0832DE3E:: @ 832DE3E - .incbin "baserom.gba", 0x32de3e, 0x18 + .byte 0x05, 0x04, 0x0c, 0x04, 0x05, 0x09, 0x0c, 0x09, 0x05, 0x0e, 0x0c, 0x0e, 0x14, 0x04, 0x1b, 0x04, 0x14, 0x09, 0x1b, 0x09, 0x14, 0x0e, 0x1b, 0x0e gUnknown_0832DE56:: @ 832DE56 - .incbin "baserom.gba", 0x32de56, 0x3e + .byte 0x01, 0x03, 0x08, 0x03, 0x01, 0x08, 0x08, 0x08, 0x01, 0x0d, 0x08, 0x0d, 0x10, 0x03, 0x17, 0x03, 0x10, 0x08, 0x17, 0x08, 0x10, 0x0d, 0x17, 0x0d, 0x00, 0x0e, 0x0f, 0x1d, 0x03, 0x05, 0x03, 0x07 + .byte 0x12, 0x05, 0x12, 0x07, 0x08, 0x07, 0x16, 0x0c, 0x08, 0x07, 0x16, 0x0c, 0x06, 0x07, 0x18, 0x0c, 0x06, 0x07, 0x18, 0x0c, 0x08, 0x07, 0x16, 0x0c, 0x07, 0x07, 0x17, 0x0c, 0x00, 0x00 .align 2 gUnknown_0832DE94:: @ 832DE94 - .incbin "baserom.gba", 0x32de94, 0x18 + .4byte gText_Cancel6 + .4byte gText_ChooseAPkmn + .4byte gText_Summary3 + .4byte gText_Trade2 + .4byte gText_CancelTrade + .4byte gJPText_832DB2E + .align 2 gUnknown_0832DEAC:: @ 832DEAC - .incbin "baserom.gba", 0x32deac, 0x10 + .4byte gText_Summary4, sub_807A000 + .4byte gText_Trade3, sub_807A024 + .align 2 gUnknown_0832DEBC:: @ 832DEBC - .incbin "baserom.gba", 0x32debc, 0x24 + .4byte gText_CommunicationStandby6 + .4byte gText_TheTradeHasBeenCanceled + .4byte gText_YourOnlyPkmnForBattle + .4byte gText_OnlyPkmnForBattle + .4byte gText_WaitingForYourFriend + .4byte gText_YourFriendWantsToTrade + .4byte gText_PkmnCantBeTradedNow + .4byte gText_EggCantBeTradedNow + .4byte gText_OtherTrainersPkmnCantBeTraded gUnknown_0832DEE0:: @ 832DEE0 - .incbin "baserom.gba", 0x32dee0, 0x4 + .byte 0x00, 0x01, 0x02, 0x00 + .align 2 gUnknown_0832DEE4:: @ 832DEE4 - .incbin "baserom.gba", 0x32dee4, 0x10 + .4byte 0x000001f8, 0x00001051, 0x00002062, 0x00003073 + .align 2 gUnknown_0832DEF4:: @ 832DEF4 - .incbin "baserom.gba", 0x32def4, 0x98 + window_template 0x00, 0x04, 0x07, 0x16, 0x04, 0x0f, 0x001e + window_template 0x00, 0x13, 0x0f, 0x0a, 0x04, 0x0f, 0x0076 + window_template 0x00, 0x00, 0x05, 0x08, 0x02, 0x0d, 0x009e + window_template 0x00, 0x07, 0x05, 0x08, 0x02, 0x0d, 0x00ae + window_template 0x00, 0x00, 0x0a, 0x08, 0x02, 0x0d, 0x00be + window_template 0x00, 0x07, 0x0a, 0x08, 0x02, 0x0d, 0x00ce + window_template 0x00, 0x00, 0x0f, 0x08, 0x02, 0x0d, 0x00de + window_template 0x00, 0x07, 0x0f, 0x08, 0x02, 0x0d, 0x00ee + window_template 0x00, 0x0f, 0x05, 0x08, 0x02, 0x0d, 0x00fe + window_template 0x00, 0x16, 0x05, 0x08, 0x02, 0x0d, 0x010e + window_template 0x00, 0x0f, 0x0a, 0x08, 0x02, 0x0d, 0x011e + window_template 0x00, 0x16, 0x0a, 0x08, 0x02, 0x0d, 0x012e + window_template 0x00, 0x0f, 0x0f, 0x08, 0x02, 0x0d, 0x013e + window_template 0x00, 0x16, 0x0f, 0x08, 0x02, 0x0d, 0x014e + window_template 0x00, 0x02, 0x05, 0x0e, 0x02, 0x0d, 0x015e + window_template 0x00, 0x03, 0x08, 0x0b, 0x08, 0x0f, 0x017a + window_template 0x00, 0x11, 0x05, 0x0e, 0x02, 0x0f, 0x01d2 + window_template 0x00, 0x12, 0x08, 0x0b, 0x08, 0x0f, 0x01ee + null_window_template + .align 2 gUnknown_0832DF8C:: @ 832DF8C - .incbin "baserom.gba", 0x32df8c, 0x8 + window_template 0x00, 0x17, 0x0d, 0x05, 0x04, 0x0f, 0x0246 -gUnknown_0832DF94:: @ 832DF94 - .incbin "baserom.gba", 0x32df94, 0x5 +gJPText_Shedinja:: @ 832DF94 + .string "ヌケニン$" gUnknown_0832DF99:: @ 832DF99 - .incbin "baserom.gba", 0x32df99, 0x2027 + .incbin "baserom.gba", 0x32df99, 0x7 + .align 2 +gTradeBallPalette:: @ 832DFA0 + .incbin "graphics/trade/ball.gbapal" + + .align 2 +gTradeBallTiles:: @ 832DFC0 + .incbin "graphics/trade/ball.4bpp" + + .align 2 +gUnknown_832E5C0:: @ 832E5C0 + .incbin "graphics/trade/pokeball_symbol.8bpp" + + .align 2 gUnknown_0832FFC0:: @ 832FFC0 - .incbin "baserom.gba", 0x32ffc0, 0x1fa0 + .incbin "graphics/trade/cable_closeup_map.bin" + .align 2 +gUnknown_083307C0:: @ 83307C0 + .incbin "graphics/trade/pokeball_symbol_map.bin" + + .align 2 +gUnknown_083308C0:: @ 83308C0 + .incbin "graphics/trade/unknown_3308C0.gbapal" + + .align 2 +gUnknown_083308E0:: @ 83308E0 + .incbin "graphics/trade/gba.gbapal" + .incbin "graphics/trade/shadow.gbapal" + .incbin "graphics/trade/black.gbapal" + + .align 2 +gUnknown_08330940:: @ 8330940 + .incbin "graphics/trade/misc.gbapal" + + .align 2 +gTradeGlow1Tiles:: @ 8330960 + .incbin "graphics/trade/glow1.4bpp" + + .align 2 +gTradeGlow2Tiles:: @ 8330B60 + .incbin "graphics/trade/glow2.4bpp" + + .align 2 +gTradeCableEndTiles:: @ 8330D60 + .incbin "graphics/trade/cable_end.4bpp" + + .align 2 +gTradeGBAScreenTiles:: @ 8330F60 + .incbin "graphics/trade/gba_screen.4bpp" + + .align 2 gUnknown_08331F60:: @ 8331F60 - .incbin "baserom.gba", 0x331f60, 0x1000 + .incbin "graphics/trade/shadow_map.bin" + .align 2 gUnknown_08332F60:: @ 8332F60 - .incbin "baserom.gba", 0x332f60, 0x2840 + .incbin "graphics/trade/gba_affine.8bpp" + .space 0x40 + + .align 2 gUnknown_083357A0:: @ 83357A0 - .incbin "baserom.gba", 0x3357a0, 0x100 + .incbin "graphics/trade/gba_affine_map_cable.bin" + .align 2 gUnknown_083358A0:: @ 83358A0 - .incbin "baserom.gba", 0x3358a0, 0x100 + .incbin "graphics/trade/gba_affine_map_wireless.bin" + .align 2 gUnknown_083359A0:: @ 83359A0 - .incbin "baserom.gba", 0x3359a0, 0x1000 + .incbin "graphics/trade/gba_map_wireless.bin" + .align 2 gUnknown_083369A0:: @ 83369A0 - .incbin "baserom.gba", 0x3369a0, 0x1000 + .incbin "graphics/trade/gba_map_cable.bin" + .align 2 gUnknown_083379A0:: @ 83379A0 - .incbin "baserom.gba", 0x3379a0, 0x100 + .incbin "graphics/trade/unknown_3379A0.bin.lz" + .align 2 gUnknown_08337AA0:: @ 8337AA0 - .incbin "baserom.gba", 0x337aa0, 0x200 + .incbin "graphics/trade/wireless_signal_send.gbapal" + .align 2 gUnknown_08337CA0:: @ 8337CA0 - .incbin "baserom.gba", 0x337ca0, 0x200 + .incbin "graphics/trade/wireless_signal_receive.gbapal" + .align 2 gUnknown_08337EA0:: @ 8337EA0 - .incbin "baserom.gba", 0x337ea0, 0x20 + .incbin "graphics/trade/black.gbapal" + .align 2 gUnknown_08337EC0:: @ 8337EC0 - .incbin "baserom.gba", 0x337ec0, 0x690 + .incbin "graphics/trade/wireless_signal.4bpp.lz" + .align 2 gUnknown_08338550:: @ 8338550 - .incbin "baserom.gba", 0x338550, 0x7c8 + .incbin "graphics/trade/wireless_signal.bin.lz" + .align 2 +gOamData_8338C44:: @ 8338C44 + .2byte 0x0100, 0x4000, 0x0000, 0x0000 + + .align 2 +gSpriteAnim_8338C4C:: @ 8338C4C + .2byte 0x0000, 0x0003, 0x0004, 0x0003, 0x0008, 0x0003, 0x000c, 0x0003, 0x0010, 0x0003, 0x0014, 0x0003, 0x0018, 0x0003, 0x001c, 0x0003 + .2byte 0x0020, 0x0003, 0x0024, 0x0003, 0x0028, 0x0003, 0x002c, 0x0003, 0xfffd, 0x0001, 0x0000, 0x0003, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8338C88:: @ 8338C88 + .2byte 0x0000, 0x0003, 0x0004, 0x0003, 0x0008, 0x0003, 0x000c, 0x0003, 0x0010, 0x0003, 0x0014, 0x0003, 0x0018, 0x0003, 0x001c, 0x0003 + .2byte 0x0020, 0x0003, 0x0024, 0x0003, 0x0028, 0x0003, 0x002c, 0x0003, 0xfffd, 0x0002, 0x0000, 0x0003, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_8338C88:: @ 8338CC4 + .4byte gSpriteAnim_8338C4C + .4byte gSpriteAnim_8338C88 + + .align 2 +gSpriteAffineAnim_8338CCC:: @ 8338CCC + .2byte 0x0000, 0x0000, 0x0100, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_8338CDC:: @ 8338CDC + .2byte 0xfff8, 0x0000, 0x1400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_8338CEC:: @ 8338CEC + .2byte 0x0060, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0500, 0x0000, 0x0008, 0x0000, 0x1400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnimTable_8338D0C:: @ 8338D0C + .4byte gSpriteAffineAnim_8338CCC + .4byte gSpriteAffineAnim_8338CDC + .4byte gSpriteAffineAnim_8338CEC + + .align 2 gUnknown_08338D18:: @ 8338D18 - .incbin "baserom.gba", 0x338d18, 0x8 + obj_tiles gTradeBallTiles, 0x0600, 0x15b5 + .align 2 gUnknown_08338D20:: @ 8338D20 - .incbin "baserom.gba", 0x338d20, 0x8 + obj_pal gTradeBallPalette, 0x15b6 -gUnknown_08338D28:: @ 8338D28 - .incbin "baserom.gba", 0x338d28, 0x48 + .align 2 +gSpriteTemplate_8338D28:: @ 8338D28 + spr_template 0x15b5, 0x15b6, gOamData_8338C44, gSpriteAnimTable_8338C88, NULL, gSpriteAffineAnimTable_8338D0C, sub_807E55C + .align 2 +gOamData_8338D40:: @ 8338D40 + .2byte 0x0500, 0x8000, 0x0400, 0x0000 + + .align 2 +gSpriteAnim_8338D48:: @ 8338D48 + .2byte 0x0000, 0x00c5, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_8338D50:: @ 8338D50 + .4byte gSpriteAnim_8338D48 + + .align 2 +gSpriteAffineAnim_8338D54:: @ 8338D54 + .2byte 0xfff6, 0xfff6, 0x0500, 0x0000, 0x000a, 0x000a, 0x0500, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnimTable_8338D6C:: @ 8338D6C + .4byte gSpriteAffineAnim_8338D54 + + .align 2 gUnknown_08338D70:: @ 8338D70 - .incbin "baserom.gba", 0x338d70, 0x8 + obj_tiles gTradeGlow1Tiles, 0x0200, 0x15ae + .align 2 gUnknown_08338D78:: @ 8338D78 - .incbin "baserom.gba", 0x338d78, 0x8 + obj_pal gUnknown_08330940, 0x15af + .align 2 gUnknown_08338D80:: @ 8338D80 - .incbin "baserom.gba", 0x338d80, 0x8 + obj_pal gUnknown_083308E0, 0x15b3 + .align 2 gUnknown_08338D88:: @ 8338D88 - .incbin "baserom.gba", 0x338d88, 0x38 + spr_template 0x15ae, 0x15af, gOamData_8338D40, gSpriteAnimTable_8338D50, NULL, gSpriteAffineAnimTable_8338D6C, sub_807AA28 + .align 2 +gOamData_8338DA0:: @ 8338DA0 + .2byte 0x8000, 0x8000, 0x0400, 0x0000 + + .align 2 +gSpriteAnim_8338DA8:: @ 8338DA8 + .2byte 0x0000, 0x00c5, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8338DB0:: @ 8338DB0 + .2byte 0x0008, 0x00c5, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_8338DB8:: @ 8338DB8 + .4byte gSpriteAnim_8338DA8 + .4byte gSpriteAnim_8338DB0 + + .align 2 gUnknown_08338DC0:: @ 8338DC0 - .incbin "baserom.gba", 0x338dc0, 0x8 + obj_tiles gTradeGlow2Tiles, 0x0300, 0x15b0 -gUnknown_08338DC8:: @ 8338DC8 - .incbin "baserom.gba", 0x338dc8, 0x2c + .align 2 +gSpriteTemplate_8338DC8:: @ 8338DC8 + spr_template 0x15b0, 0x15af, gOamData_8338DA0, gSpriteAnimTable_8338DB8, NULL, gDummySpriteAffineAnimTable, sub_807AA7C + .align 2 +gOamData_8338DE0:: @ 8338DE0 + .2byte 0x8000, 0x8000, 0x0400, 0x0000 + + .align 2 +gSpriteAnim_8338DE8:: @ 8338DE8 + .2byte 0x0000, 0x000a, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_8338DF0:: @ 8338DF0 + .4byte gSpriteAnim_8338DE8 + + .align 2 gUnknown_08338DF4:: @ 8338DF4 - .incbin "baserom.gba", 0x338df4, 0x8 + obj_tiles gTradeCableEndTiles, 0x0100, 0x15b2 -gUnknown_08338DFC:: @ 8338DFC - .incbin "baserom.gba", 0x338dfc, 0x70 + .align 2 +gSpriteTemplate_8338DFC:: @ 8338DFC + spr_template 0x15b2, 0x15b3, gOamData_8338DE0, gSpriteAnimTable_8338DF0, NULL, gDummySpriteAffineAnimTable, sub_807AABC + + .align 2 +gOamData_8338E14:: @ 8338E14 + .2byte 0x4000, 0xc000, 0x0400, 0x0000 + + .align 2 +gSpriteAnim_8338E1C:: @ 8338E1C + .2byte 0x0000, 0x00c2, 0x0020, 0x00c2, 0x0040, 0x00c2, 0x0060, 0x00c2, 0x0040, 0x00c2, 0x0020, 0x00c2, 0x0000, 0x00c2, 0xfffd, 0x0008 + .2byte 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8338E40:: @ 8338E40 + .2byte 0x0000, 0x00c2, 0x0020, 0x00c2, 0x0040, 0x00c2, 0x0060, 0x00c2, 0x0040, 0x00c2, 0x0020, 0x00c2, 0x0000, 0x00c2, 0xfffd, 0x0002 + .2byte 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_8338E64:: @ 8338E64 + .4byte gSpriteAnim_8338E1C + + .align 2 +gSpriteAnimTable_8338E68:: @ 8338E68 + .4byte gSpriteAnim_8338E40 gUnknown_08338E6C:: @ 8338E6C - .incbin "baserom.gba", 0x338e6c, 0x8 + obj_tiles gTradeGBAScreenTiles, 0x1000, 0x15b4 -gUnknown_08338E74:: @ 8338E74 - .incbin "baserom.gba", 0x338e74, 0x18 + .align 2 +gSpriteTemplate_8338E74:: @ 8338E74 + spr_template 0x15b4, 0x15b3, gOamData_8338E14, gSpriteAnimTable_8338E64, NULL, gDummySpriteAffineAnimTable, sub_807AB04 -gUnknown_08338E8C:: @ 8338E8C - .incbin "baserom.gba", 0x338e8c, 0x18 + .align 2 +gSpriteTemplate_8338E8C:: @ 8338E8C + spr_template 0x15b4, 0x15b3, gOamData_8338E14, gSpriteAnimTable_8338E68, NULL, gDummySpriteAffineAnimTable, sub_807AB04 + .align 1 gUnknown_08338EA4:: @ 8338EA4 - .incbin "baserom.gba", 0x338ea4, 0x28 + .incbin "graphics/trade/unknown_338EA4.gbapal" -gUnknown_08338ECC:: @ 8338ECC - .incbin "baserom.gba", 0x338ecc, 0x4 + .align 2 +gSpriteAffineAnim_8338EBC:: @ 8338EBC + .2byte 0xff00, 0x0100, 0x0000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 -gUnknown_08338ED0:: @ 8338ED0 - .incbin "baserom.gba", 0x338ed0, 0xf0 + .align 2 +gSpriteAffineAnimTable_8338ECC:: @ 8338ECC + .4byte gSpriteAffineAnim_8338EBC + .align 2 +gIngameTrades:: @ 8338ED0 + .string "DOTS$", 11 + .align 1 + .2byte SPECIES_SEEDOT + .byte 5, 4, 5, 4, 4, 4 + .byte 1 + .align 2 + .4byte 0x9746 + .byte 30, 5, 5, 5, 5 + .align 2 + .4byte 0x84 + .2byte ITEM_CHESTO_BERRY + .byte -1 + .string "KOBE$", 11 + .byte 0 + .byte 10 + .2byte SPECIES_RALTS + + .align 2 + .string "PLUSES$", 11 + .align 1 + .2byte SPECIES_PLUSLE + .byte 4, 4, 4, 5, 5, 4 + .byte 0 + .align 2 + .4byte 0x1210c + .byte 5, 5, 30, 5, 5 + .align 2 + .4byte 0x6f + .2byte ITEM_WOOD_MAIL + .byte 0 + .string "ROMAN$", 11 + .byte 0 + .byte 10 + .2byte SPECIES_VOLBEAT + + .align 2 + .string "SEASOR$", 11 + .align 1 + .2byte SPECIES_HORSEA + .byte 5, 4, 4, 4, 5, 4 + .byte 0 + .align 2 + .4byte 0xb4cd + .byte 5, 5, 5, 5, 30 + .align 2 + .4byte 0x7f + .2byte ITEM_WAVE_MAIL + .byte 1 + .string "SKYLAR$", 11 + .byte 0 + .byte 10 + .2byte SPECIES_BAGON + + .align 2 + .string "MEOWOW$", 11 + .align 1 + .2byte SPECIES_MEOWTH + .byte 4, 5, 4, 5, 4, 4 + .byte 0 + .align 2 + .4byte 0x16559 + .byte 5, 5, 5, 30, 5 + .align 2 + .4byte 0x8b + .2byte ITEM_RETRO_MAIL + .byte 2 + .string "ISIS$", 11 + .byte 1 + .byte 10 + .2byte SPECIES_SKITTY + + .align 2 gUnknown_08338FC0:: @ 8338FC0 - .incbin "baserom.gba", 0x338fc0, 0x3c + .2byte 0x1006, 0x1232, 0x102f, 0x0161, 0x0c00, 0x0182, 0x1000, 0x1006, 0x0e3b, 0x0000, 0x0a01, 0x1000, 0x161e, 0x018b, 0x0433, 0x1611 + .2byte 0x180f, 0x0074, 0x1440, 0x0000, 0x0811, 0x102b, 0x013b, 0x2a34, 0x0c16, 0x1037, 0x1020, 0x0418, 0x0c23, 0x0000 + .align 2 gUnknown_08338FFC:: @ 8338FFC - .incbin "baserom.gba", 0x338ffc, 0x10 + window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0040 + null_window_template + .align 2 gUnknown_0833900C:: @ 833900C - .incbin "baserom.gba", 0x33900c, 0x8 + window_template 0x00, 0x15, 0x09, 0x05, 0x04, 0x0f, 0x00bc + .align 2 gUnknown_08339014:: @ 8339014 - .incbin "baserom.gba", 0x339014, 0x10 + .4byte 0x000001fc, 0x00002051, 0x00002326, 0x00003063 gUnknown_08339024:: @ 8339024 - .incbin "baserom.gba", 0x339024, 0x6c + .byte 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0xfc, 0xfc, 0xfc, 0xfd, 0xfd, 0xfd, 0xfd, 0xfe, 0xfe, 0xfe + .byte 0xfe, 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04 + .byte 0x04, 0x04, 0xfc, 0xfd, 0xfd, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0xfc, 0xfd, 0xfe, 0xff + .byte 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x02, 0x03 gUnknown_08339090:: @ 8339090 - .incbin "baserom.gba", 0x339090, 0x44 + .byte 0x00, 0x01, 0x01, 0x01, 0x02, 0x01, 0x03, 0x01, 0x04, 0x01, 0x05, 0x02, 0x06, 0x02, 0x07, 0x02, 0x08, 0x02, 0x09, 0x02, 0x0a, 0x03, 0x0b, 0x03, 0x0c, 0x03, 0x0d, 0x04, 0x0e, 0x05, 0x0f, 0x02 + .byte 0x00, 0x01, 0x01, 0x01, 0x02, 0x01, 0x03, 0x01, 0x04, 0x01, 0x05, 0x02, 0x06, 0x02, 0x07, 0x02, 0x08, 0x02, 0x09, 0x02, 0x0a, 0x03, 0x0b, 0x03, 0x0c, 0x03, 0x0d, 0x04, 0x0e, 0x05, 0x10, 0x01 + .byte 0x10, 0xff, 0x00, 0x00 diff --git a/data/use_pokeblock.s b/data/use_pokeblock.s index ffb7802d90..0e99cf2238 100644 --- a/data/use_pokeblock.s +++ b/data/use_pokeblock.s @@ -34,7 +34,7 @@ gUnknown_085DFCDC:: @ 85DFCDC window_template 0, 0xD, 1, 0xD, 4, 0xF, 1 window_template 0, 0, 0xE, 0xB, 2, 0xF, 0x35 window_template 0, 1, 0x11, 0x1C, 2, 0xF, 0x4B - window_template_terminator + null_window_template sUsePokeblockYesNoWinTemplate:: @ 85DFCFC window_template 0, 0x18, 0xB, 5, 4, 0xF, 0x83 diff --git a/graphics/trade/ball.png b/graphics/trade/ball.png new file mode 100644 index 0000000000000000000000000000000000000000..97cc86a6f79c9d20b0cbb2f5de67003c0aa9d97c GIT binary patch literal 464 zcmeAS@N?(olHy`uVBq!ia0vp^0ziC#g&9cxfBdf&NErn9gt-3y|G$}mVGRSrRZY$R zbE<*dDO096Iyy>7NC4TGAggAYHvw5N+>h(+(-s|WL%4S3iR@+>!Vryo*zwsK1qY?9f&>fg7{zriTB3Jve^PzFVKGByk~(*-;Hq;kVwV2So@=|Z^n8WD5#wLI|9%|$aZh8eZIy=H-LB>9=6~|2 zp6XgqKKJfNzYUMZ(n#=IfA>?CjaITefVOGiT1#Em>#h1R4I%62IBb4%Fl8>EaloG4XAe zAyzv`1XZa3yonTz9@>`*t*(X>gCVFF7Q-@IT s{$P!J1{Z!^`@Q?d)zm7tr|F#hUvEa1FXr=q2sD_%)78&qol`;+0D$jMo&W#< literal 0 HcmV?d00001 diff --git a/graphics/trade/gba.pal b/graphics/trade/gba.pal new file mode 100644 index 0000000000..64a4422935 --- /dev/null +++ b/graphics/trade/gba.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +222 230 238 +189 205 230 +156 180 222 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +230 230 230 +205 205 205 +180 180 180 +156 156 156 +213 180 106 +205 156 82 +49 255 106 diff --git a/graphics/trade/gba_affine.png b/graphics/trade/gba_affine.png new file mode 100644 index 0000000000000000000000000000000000000000..b8c2623c4ffce1da5f1ed3ad18e6a08246d3422e GIT binary patch literal 1897 zcmeHHTToM16y149?v0RKmEoZXQBstrfdYyG4azG-X>bG)l!ppptRMzOpkRc+Xh8@X zus{r}O}XW}nB}d!4oCoR4#i z7aU+jT}TB0BTk_2M*S+(4<16&&)UbwdjUwmTffOqPya1&4+M`u@EinJAoxQB$Mune ze+2jd2ry7EK1}a7pRZ5;V|>2t|H}X33!HS$%>p1ZIlexd5{`_PZP~A28Tw_|j?(Gjo8s&r;e456 znq|Gw*z-)^GCS8H%V?CO)me%n3PQZ^-fks#WJX)ZHJW{Cu@2T(HI&xAGJar@&Phf! zO1B-scsMm6rtqLK7eb`Ya7AHh#uTdW=L~^-m36Z9;mwsuwR+x?c#ur>hi&T}o6LGW z*+e^GhGp+|Ghj{oc-m)mmzai}V0ExD9+m=u1F2c!YY+B{cOvB2r!jkDVJq|%jysYH+fP1vjBQ$V!cNkRZg=rjKE;wwp~Wyr;lx@op6~uzZ%;745030 za9O!i9@PYVMWj61Hx!tfvshS}3@uGyMCqR%2of*Y**8WfRu_|C)GiBUD8aq;9_f!a zYv_EqG-z6MXAS6l#Uy4$Bxn;HHD>@@3gI6hrZMM&%2C*C5FhE^J!j(m^(c5bq`!8| z*qizjF5+m(hxT3w{%pM=vn9p=cgD-wHwNAPxYEGRP|X3 z)((n(-E&~UQ|EV+_2`bpwtY-+e^T1h-Pa;J=0B;jf#~-h!ktT9$!%60FT6mSzeIZ* zeY@rsf=!Y8fKDhB+feG!lA}c~ZfwH?rkYpTGn5IO#H^dN2Qg~|kY`&6t47Wmx&z!m zR+>|`(r+|$(%62& z+(6yvO2J_wNBG7*+t_opW~Ru#B)k3fR((xzKNIrY=x{Vv?VMH?T*pBN-tU67xtp< z%DE_$0w{0L3_J8lLK_ZpGihLcF3%yP>F1D^vUHk;80*rMq=+Y!?`m&O#~TJcRRdl( z9QH(CbKOb|KV!y!LOyD|SKNJEP?kuPFgS`Y4pApOXF*%@^bXO!?rSHJDucJA%b_j4 zb+o7B{Rgk3^V#=b@3C?;h|{_CEKdoGMTd4=q-lQ1bQ=72vcQ1V)ju7m@oqFxfP5yc zCiPFG*gBjvgGEl4s?3?az-!5Rz!tT^cZJ@egzMofy1e|YXy3V%m9r>3?7N(cRT<8c z*IJ=91j*`?#cqh`QLE!*@}=#bYIaXdX7rf8p;kDj cATr_%NloVn_Ev>7eEjD)e!;%y*T!W31#1^ZM*si- literal 0 HcmV?d00001 diff --git a/graphics/trade/gba_affine_map_cable.bin b/graphics/trade/gba_affine_map_cable.bin new file mode 100644 index 0000000000000000000000000000000000000000..19bab962b945523bb6ecca2d5178c7a8a3b15357 GIT binary patch literal 256 zcmZQzfB-&zD1%CTIeAp`^z>2rcJ?qnBNHqPshPQjrIodfEdzstqm#3XtDC!rrnF9SnB yU{G*KXjpheWK?uaECWMAVp4KSYFc_mW>$7iE(1eBVNr2OX<2ziWmR=eEdv0p104YX literal 0 HcmV?d00001 diff --git a/graphics/trade/gba_affine_map_wireless.bin b/graphics/trade/gba_affine_map_wireless.bin new file mode 100644 index 0000000000000000000000000000000000000000..53a511321009e872ee7b2cd8ac4fff3d92ab2ca9 GIT binary patch literal 256 zcmZQzpaE!TY-(<4MHoC`;-tw_rXu)l?H!$6-B3Ow6Eh1d8#@Ol7dHp61A~L3le3Gfo4bdn zm$#2E14BSyP;f|SSa?KaRCG)%14BY$QgTXaT6#uiR(4J<14BV!QE^FWS$RceRdr1* F0{~T`B?vANe`_+kXO|&lv=NasLkWb1?Oj z_MEZ)%pdVyt~n(BZuc4Z-T5u{68vR15PSMh>Zjg?y%}ZCKFYj%>GuxT_Qm&l_|JTS zLk=r+#8E|#Ij-0VB}&tO$`#6#t5B)RY1L|+QLD~b=bTT(bI~OY8Z~LwqE(xAmtAo+ z5r5qcH+AaL?Uvi_xa*!C_dQ6$M~^)AM4x_7Ju_g?kYOW6J?EoFo9}-3 z!r9LRho1cU2@qK8LrBd6?7+Cj%%*FA=gcL^4)UV9d{K3_1sgaNU;+4J@8Pe zGUX~%2K7~{J@QzMT2It@s$PRe&ol+~&04f-^V|#VI&|vNtw*nyLH#SQz0s%NfI&ls zjTkj%+(b}6Y09)2v*x@t@0|sUmMmKd>Q}8zopr09&Cy(*OVf literal 0 HcmV?d00001 diff --git a/graphics/trade/glow1.png b/graphics/trade/glow1.png new file mode 100644 index 0000000000000000000000000000000000000000..e223d97ce3583d2bc7b7d6872a24cb3627cef418 GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvg8-ipS0Md=PW6)NqniJV8M^=f z|L+CFSy@>?L99qmZLt$jkDsTDV~EDYA>?CjaITefVOGiT1#Em>#h1R4I%62IBb4%Fl6>EaloF)=ye z09%C2f-T+LEl-(PG^cRML-3!(^ oSTL722p>IQ!k)+4Ys0}%lWxp-e)GS@KtmZkUHx3vIVCg!0Co~eGynhq literal 0 HcmV?d00001 diff --git a/graphics/trade/misc.pal b/graphics/trade/misc.pal new file mode 100644 index 0000000000..32fafddfc0 --- /dev/null +++ b/graphics/trade/misc.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 156 123 +164 123 197 +41 255 115 +0 139 255 +255 255 74 +255 255 255 +106 106 106 +255 156 123 +255 156 123 +255 156 123 +255 156 123 +255 156 123 +255 156 123 +255 156 123 +255 156 123 diff --git a/graphics/trade/pokeball_symbol.png b/graphics/trade/pokeball_symbol.png new file mode 100644 index 0000000000000000000000000000000000000000..3b4a30f4f90b67922bda3cdc7fa8c3a01425d44c GIT binary patch literal 1569 zcmeAS@N?(olHy`uVBq!ia0vp^4nUm2!3-qJJlM7~FfcO&_=LCuxuk;smK^`1IQ}7-|3K9I9|Ra285oKM7}h8-JhSA08w-@U_w3!?v(M&ix!2s>os?AV=#`~u z81?Mgv$JQ53#bcOJ%hj+1%)gDfhYzBumAt|K6|$0?Aa-M zw-k4GM|pW!DkvzxZ6TiVe@^w1>Z6+fiy69sRsoIupOuvb6vT>%H+EFzPz-^|hOKoB z3`}=CT^vIqT9?j@EMivVak1nRHz@u;TlKNzg=@Mlhul}mc%P4Q;K{nf?+JOLj%&KtB`=s0-j z*_TS54SQK%^Z!Y>7Hx0z*Xtj1V%@&8_gC7x{kRi;Ry}V|!@s$IGs0Z*l-Oik$|5(e zJ8IK-#I^gbo`#|O3dWu(iWiP_Tv_k2IjC!bN}1=~2FHEB%^lj)c-2c!U+~!b^|Ry} zk9!I$^hN(jifflW{-ozq8vXBgbY5c)3r|q3LDH5*R<0HYmVIlSb#u9W><9SF#fnDQng0)3`3dX8aeO3 z%i6X`gJpXv{$_eaxMpqlXM7~{CW?n4XZ_d{hE1HrR4z$F2ZvM4l*K^mY%wDOsYX1wGJ9paOezfnf-m=ZU-+mw0d%ijM zpP|E&vw~^fJ9d`_`1eK4W$StsxS93zFVEfVt9Pwutdt2j$Iz&haLF-n8OIF63)%rJ z-$X(~n>3hD1a>fZ7_zl*Z2S82;7xhDzna47Fqg>Z&eR>PB3Ju?{emntw>H@@G!K+u3^2iqfV zZ;=yA`q+L@rt;B^W86>ZqwuatzDF9JWcc1xjQ_? zmicG4KRk6$;z&Z(LmoM;2h6Tzx8Kb7dLVrA-7^pSYX`nhjfquwQ}~SCX<}Z}pVc-h Pp#16S>gTe~DWM4fbpg^= literal 0 HcmV?d00001 diff --git a/graphics/trade/pokeball_symbol_map.bin b/graphics/trade/pokeball_symbol_map.bin new file mode 100644 index 0000000000000000000000000000000000000000..8355c2f5ca1a903c8e07632380710eab6a819712 GIT binary patch literal 256 zcmXAi*Fr);3`9p+1YM;{Q<{b1VnLcTrGo_#vC$O~{Qo~7>rNS@t26IHWCYin9LBV@d-{t2uDbxXG*CU&Mz*n z5GTFn7m1{lsWdAib0cLo$C?*H6i~dqE1^tUsnU^J9gQYh_oNSxPsH|f=cW5f(tE=@ jg_Iwk9A7|xz{VJk=;nAb)i&QhGwtQ?{7r5SlBo?vSrDXAzj*CK05~|7dH=&Ze2QcXxFAU^*sY46Eh1ds}{|gG-^

AYHnKAtl+4W1frAblGRw@KWk)1YA~U;bWrvK2tSBV@yC-*q9xt!& zFV_#(`*WVx_X;5JufxE<&tGg1ozNLw&=p|_V^?-zXLe%n@0||58@i(hdZHJ4qYuIn z&OYqTUhK&p?9OigZ~Wo=q96KW00v?ZA`povL@|;P9K?Yf!2ayVz8wqgK8R=x#t_6H z7DEw-VHl1P7{TEj#yAdTEMqu?gBktjm;CTSjKnC6Mm)w~EXH9xCSW2GkidzY!0{Z% zu^hvAj^-$i{JrqQC${QINCGe!Q!o|8G)zY_k~y8zNKWMxP9~VdNv(y%UtbaO!VJvB zEEuzqf;pIrd6x zd_fDo;v2s4D_i)5&HT(y{KzIY@&n(qf$#XX&Fh^S^j;s-s3v{XCw*44zNkfC^-bUW z)h+(wW`Fi4e{_=@{lV|u;CFuOfCH$}BR$p=Jyorq>AC9kLN8UXS9+~CdgIrA<$AyL z3)lI%pSjjg{lt&`$TcB@x~1E?qr1ANYTefZJ=8-#@O@YNp6~jOZ~K;S z`i84~-Pe3ILV`nVHY^xheAH6o!X@= z?baS;Yp?bxNBfnl1Ip7u9dw=#IM@4~<9*)iZ13@IXL*-*IvDZ+t<^fM*9L9WCT&)R zGPOlpwN2Z#Lp!|P+q~6Voaqd2_9k!i2Cw%zul=rD??0earD>5CYl)U>nU*VEE3{Ip zv|4Ml#;d)`E4{+$UhZXH>Lp(6MNV^SyAMd3p_!T`YqnA}M{_k#^R++=wa^PZ-}5}z zbDZMYwr6>!XIO1IG(Vt#5;aPblq6`frf90DX_~HNC40K3nV#w?o@_YDlRV0aKXtng zYGi9+wBj{JV>M3WH9-@Vpaf6!1dsPPkM$VGdvvQF*>-ck?f-p)prSQcLlmP}4ON_m zX}Cscgok^W<2=-{j`0u=cJ%MMeg5}CKz-Fu{WU-XHAoSPRFt9|=?D+Y<+MrQYhJaD}^%d%Kr=x`(^FTSwhtep@4`PU@^K>Z&k>xvRUlvpfB{ R^{-Cr|NrOt_2%E7@E`BJ12|nVs7H4&FL4 zej8wVSmTpit&J;g)pzgV2##ACJe0HP;=pfPeBiBvO&15g$}UeQMF97N=d-eC&_tfI z#BMg5y9wl{6)Xa>W9z){d$#0T;CIZ<-RKDae0J91cL0X~H9z2kfbnP^n~Pn-K#bAOoD?};?F_= zgL{VrtpS;ptdjHYcuNosNPuBfdJdK3dORio1HAn(%u0p9kypd2ox@<|WNYz<{1vZ` za~Z70%X+!`P__Y2@P`rSXaM*@;1Y19v)uQR0ICxMm&}V%;a?)I6=b>olpq)oUf;%- z3a=Bm0clYA*Q9)oD<%K~+@KVYU$2wIulPDaF|c1i0Ohak7s~MOYl+lzuFdIQpJX%% zaP-#s0gXHVZMjT_SJBNmSBK3Rzg&`l(Goo-km@cyfbJf~F9+fkaH(LL`TlbPuTBHp z==hI?xR%eHAZ0wfSRoq#o=3uXtsqMUmH-WiUml<9@5-S9O3)gJd`?tFj84v}Iv9Kt zxtv$46@^}^fJKkaaqu_ekE<06q_ni|EP8bA28<{CmJ_7Vokx!e*nsq&WjF|UcTz!} zKn!4bUh-u;yZ}^zB|rlog}==%Ffjpp0lb1}Kmr6l2-FpD0y7{D9s^$ly7ApT53kv~ zyE|!a%6~WU)x8WC^Ny1M1-Je%KDc)S%D)Zty$8qsJbsk`11KH@w7*zEOyIosR|#l` zu>wnQT#5gCKLDyf!6B3mtpZDc27qUQDGAsigbFkP7Uhk0nk3~<>It&$10x_VxUI9W=Jb)0N+|%&keug3)F1g$@b&+hNt{D42^R)DU69)R^%;(G$&AFKQ#kl`)B{7GF;RBLotOdwD z@qZzZ{SK8Ad=LS0KhAdqay)>apHBt&gTPt^zW%E~<_^F7m%#AnM1ubp_zhwpp|T}) R_pbl|002ovPDHLkV1l#qW#a$< literal 0 HcmV?d00001 diff --git a/graphics/trade/wireless_signal_receive.pal b/graphics/trade/wireless_signal_receive.pal new file mode 100644 index 0000000000..218390aa2f --- /dev/null +++ b/graphics/trade/wireless_signal_receive.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 +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 +255 255 255 +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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 diff --git a/graphics/trade/wireless_signal_send.pal b/graphics/trade/wireless_signal_send.pal new file mode 100644 index 0000000000..a5da8a543e --- /dev/null +++ b/graphics/trade/wireless_signal_send.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 0 0 +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 +172 172 172 +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 +172 172 172 +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 +172 172 172 +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 +172 172 172 +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 +172 172 172 +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 +172 172 172 +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 +172 172 172 +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 +172 172 172 +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 +172 172 172 +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 +172 172 172 +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 +172 172 172 +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 +172 172 172 +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 +172 172 172 +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 +172 172 172 +255 255 255 +0 0 0 +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 +172 172 172 From c45db79b5da23cb6c298617679f4709bcc3a35b1 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Fri, 19 Jan 2018 21:03:17 -0500 Subject: [PATCH 43/64] dump contest.s --- data/contest.s | 54 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/data/contest.s b/data/contest.s index 0db64b13aa..e54a7b2904 100644 --- a/data/contest.s +++ b/data/contest.s @@ -1,5 +1,7 @@ .include "asm/macros.inc" .include "constants/constants.inc" + .include "constants/species_constants.inc" + .include "include/constants/moves.h" .section .rodata .align 2, 0 @@ -299,11 +301,59 @@ gUnknown_08587F44:: @ 8587F44 .align 2 gUnknown_08587FA4:: @ 8587FA4 - .incbin "baserom.gba", 0x587fa4, 0x100 + .4byte NULL, 0xFFFF + .2byte SPECIES_ELECTRIKE + .byte 2 + .string "ELECTER$", 11 + .string "EZRA$", 8 + .2byte 0 + .4byte NULL, 0xFFFF + .2byte SPECIES_TROPIUS + .byte 0 + .string "TROPO$", 11 + .string "ALLAN$", 8 + .2byte 2 + .4byte NULL, 0xFFFF + .2byte SPECIES_XATU + .byte 1 + .string "TUXA$", 11 + .string "JULIET$", 8 + .2byte 0 + .4byte NULL, 0xFFFF + .2byte SPECIES_PLUSLE + .byte 4 + .string "PULSE$", 11 + .string "BAILY$", 8 + .2byte 3 + .4byte NULL, 0xFFFF + .2byte SPECIES_SHUPPET + .byte 3 + .string "SHUPUP$", 11 + .string "MELANY$", 8 + .2byte 1 + .4byte NULL, 0xFFFF + .2byte SPECIES_ZANGOOSE + .byte 0 + .string "GOOZAN$", 11 + .string "HANA$", 8 + .2byte 2 + .4byte NULL, 0xFFFF + .2byte SPECIES_LOUDRED + .byte 1 + .string "LOUDED$", 11 + .string "BRYANT$", 8 + .2byte 2 + .4byte NULL, 0xFFFF + .2byte SPECIES_DELCATTY + .byte 2 + .string "KITSY$", 11 + .string "OMAR$", 8 + .2byte 3 + .align 2 gUnknown_085880A4:: @ 85880A4 - .incbin "baserom.gba", 0x5880a4, 0x1800 + .include "data/contest_opponents.inc" gUnknown_085898A4:: @ 85898A4 .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 From e5ba5ccdbbfaeaf49d4fe9182c94d4e11011ad9e Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Fri, 19 Jan 2018 21:04:43 -0500 Subject: [PATCH 44/64] dump battle_frontier_2.s --- data/battle_frontier_2.s | 161 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 160 insertions(+), 1 deletion(-) diff --git a/data/battle_frontier_2.s b/data/battle_frontier_2.s index bfb99f97dc..52c6d016fd 100644 --- a/data/battle_frontier_2.s +++ b/data/battle_frontier_2.s @@ -373,7 +373,166 @@ gUnknown_08610948:: @ 8610948 .align 2 @ struct, eight bytes x6 for names in different languages, then 0x28 more bytes of data gUnknown_08610970:: @ 8610970 - .incbin "baserom.gba", 0x610970, 0x580 + .string "サダヒロ$", 8 + .string "ALANN$", 8 + .string "ALAIN$", 8 + .string "ADELFO$", 8 + .string "CLAUS$", 8 + .string "TEO$", 8 + .byte 0xC9, 0xBD + .2byte 0x43 + .2byte SPECIES_BEAUTIFLY, SPECIES_DUSTOX, SPECIES_ILLUMISE, SPECIES_SHIFTRY, SPECIES_BRELOOM, SPECIES_NINJASK, SPECIES_SHEDINJA, SPECIES_PINSIR, SPECIES_HERACROSS, SPECIES_VOLBEAT, 0 + .byte 0x1D, 8, 0x3e, 20, 0, 12, 1, 10, 0x30, 6, 0x44, 20, 0, 0 + .string "ヒロオ$", 8 + .string "LIONEL$", 8 + .string "LIONEL$", 8 + .string "CAIO$", 8 + .string "LUDWIG$", 8 + .string "LEO$", 8 + .byte 0x9, 0xCF + .2byte 0x2B + .2byte SPECIES_SWELLOW, SPECIES_SWALOT, SPECIES_SHUCKLE, SPECIES_MANECTRIC, SPECIES_TORKOAL, SPECIES_HARIYAMA, SPECIES_MIGHTYENA, SPECIES_LUDICOLO, SPECIES_CRAWDAUNT, SPECIES_WHISCASH, 1 + .byte 0x38, 12, 1, 10, 0x30, 6, 6, 10, 0x20, 0x10, 0x13, 0x22, 0, 0 + .string "ケイジ$", 8 + .string "SONNY$", 8 + .string "HERVE$", 8 + .string "FEDRO$", 8 + .string "WENZEL$", 8 + .string "SANTI$", 8 + .byte 0x34, 0x2E + .2byte 0x26 + .2byte SPECIES_LINOONE, SPECIES_MIGHTYENA, SPECIES_WHISCASH, SPECIES_ZANGOOSE, SPECIES_SEVIPER, SPECIES_NINETALES, SPECIES_KECLEON, SPECIES_SHUCKLE, SPECIES_MANECTRIC, SPECIES_MACHAMP, 2 + .byte 1, 10, 10, 0x16, 0x15, 14, 0x30, 6, 0x3b, 12, 0x4, 12, 0, 0 + .string "ユラ$", 8 + .string "LAYLA$", 8 + .string "LAYLA$", 8 + .string "ASTRID$", 8 + .string "SONJA$", 8 + .string "LOLA$", 8 + .byte 0xEF, 0x84 + .2byte 0x47 + .2byte SPECIES_SWALOT, SPECIES_XATU, SPECIES_ALTARIA, SPECIES_GOLDUCK, SPECIES_FLYGON, SPECIES_ALAKAZAM, SPECIES_GARDEVOIR, SPECIES_WAILORD, SPECIES_GRUMPIG, SPECIES_MIGHTYENA, 3 + .byte 11, 16, 15, 0x1e, 0x39, 16, 0x21, 0x14, 0x3, 12, 0xff, 0xff, 0, 0 + .string "ヨウカ$", 8 + .string "MACY$", 8 + .string "AMELIE$", 8 + .string "CLEO$", 8 + .string "MARIA$", 8 + .string "ELISA$", 8 + .byte 0x43, 0x1E + .2byte 0x27 + .2byte SPECIES_WIGGLYTUFF, SPECIES_LINOONE, SPECIES_KINGDRA, SPECIES_DELCATTY, SPECIES_RAICHU, SPECIES_FEAROW, SPECIES_STARMIE, SPECIES_MEDICHAM, SPECIES_SHIFTRY, SPECIES_BEAUTIFLY, 4 + .byte 15, 0x1e, 0x14, 16, 6, 16, 15, 0x28, 0x1c, 0x1c, 0x13, 0x1c, 0, 0 + .string "ヤスシ$", 8 + .string "DONTE$", 8 + .string "BRAHIM$", 8 + .string "GLAUCO$", 8 + .string "JOSEF$", 8 + .string "ROQUE$", 8 + .byte 0x9F, 0x37 + .2byte 0x30 + .2byte SPECIES_STARMIE, SPECIES_DODRIO, SPECIES_AGGRON, SPECIES_MAGNETON, SPECIES_MACHAMP, SPECIES_ARMALDO, SPECIES_HERACROSS, SPECIES_NOSEPASS, SPECIES_EXPLOUD, SPECIES_MIGHTYENA, 5 + .byte 0x29, 0x0A, 0x08, 0x14, 0x2F, 0x10, 0x38, 0x16, 0x20, 0x08, 0x00, 0x0C, 0x00, 0 + .string "ミサオ$", 8 + .string "AMIRA$", 8 + .string "LAURE$", 8 + .string "DAFNE$", 8 + .string "AMELIE$", 8 + .string "LARA$", 8 + .byte 0x55, 0xF5 + .2byte 0x31 + .2byte SPECIES_STARMIE, SPECIES_DODRIO, SPECIES_MAGNETON, SPECIES_MEDICHAM, SPECIES_MIGHTYENA, SPECIES_GLALIE, SPECIES_GOLEM, SPECIES_ELECTRODE, SPECIES_PELIPPER, SPECIES_SHARPEDO, 6 + .byte 0x0B, 0x0C, 0x3E, 0x12, 0x00, 0x0C, 0x31, 0x0A, 0x30, 0x14, 0x00, 0x0C, 0x00, 0x00 + .string "カズサ$", 8 + .string "KALI$", 8 + .string "JODIE$", 8 + .string "ILENIA$", 8 + .string "KARO$", 8 + .string "ELSA$", 8 + .byte 0x26, 0x8D + .2byte 0x14 + .2byte SPECIES_NINETALES, SPECIES_ALAKAZAM, SPECIES_SCEPTILE, SPECIES_SALAMENCE, SPECIES_GOLDUCK, SPECIES_MAWILE, SPECIES_WEEZING, SPECIES_LANTURN, SPECIES_GARDEVOIR, SPECIES_MILOTIC, 7 + .byte 0x06, 0x0A, 0x20, 0x06, 0x1F, 0x0A, 0x02, 0x0A, 0x03, 0x0C, 0xFF, 0xFF, 0x00, 0x00 + .string "スミレ$", 8 + .string "ANNIE$", 8 + .string "ANNIE$", 8 + .string "IMELDA$", 8 + .string "INES$", 8 + .string "ROSA$", 8 + .byte 0xC, 0x80 + .2byte 0xD + .2byte SPECIES_SCEPTILE, SPECIES_VILEPLUME, SPECIES_BELLOSSOM, SPECIES_ROSELIA, SPECIES_CORSOLA, SPECIES_FLYGON, SPECIES_BRELOOM, SPECIES_MILOTIC, SPECIES_ALTARIA, SPECIES_CRADILY, 8 + .byte 0x22, 0x1E, 0x33, 0x04, 0x0E, 0x02, 0x02, 0x0A, 0x1E, 0x10, 0x00, 0x0C, 0x00, 0x00 + .string "アキノリ$", 8 + .string "DILLEN$", 8 + .string "RENE$", 8 + .string "INDRO$", 8 + .string "DETLEF$", 8 + .string "PEDRO$", 8 + .byte 0x9f, 0x46 + .2byte 0 + .2byte SPECIES_SKARMORY, SPECIES_GOLEM, SPECIES_BLAZIKEN, SPECIES_CAMERUPT, SPECIES_DONPHAN, SPECIES_MUK, SPECIES_SALAMENCE, SPECIES_TROPIUS, SPECIES_SOLROCK, SPECIES_RHYDON, 9 + .byte 0x3D, 0x0A, 0x11, 0x10, 0x1E, 0x0E, 0x1C, 0x20, 0x04, 0x0C, 0xFF, 0xFF, 0x00, 0x00 + .string "トウゾウ$", 8 + .string "DALLAS$", 8 + .string "BRUNO$", 8 + .string "LEARCO$", 8 + .string "ANSGAR$", 8 + .string "MANOLO$", 8 + .byte 0xFC, 0x71 + .2byte 0x2D + .2byte SPECIES_SEAKING, SPECIES_STARMIE, SPECIES_GOLDUCK, SPECIES_TENTACRUEL, SPECIES_OCTILLERY, SPECIES_GOREBYSS, SPECIES_GLALIE, SPECIES_WAILORD, SPECIES_SHARPEDO, SPECIES_KINGDRA, 10 + .byte 0x05, 0x0A, 0x06, 0x06, 0x0E, 0x16, 0x14, 0x0A, 0x00, 0x0C, 0xFF, 0xFF, 0x00, 0x00 + .string "セイヤ$", 8 + .string "FRANK$", 8 + .string "FRANK$", 8 + .string "OLINDO$", 8 + .string "FRANK$", 8 + .string "MAURO$", 8 + .byte 0x9E, 0xA3 + .2byte 0x3A + .2byte SPECIES_QUAGSIRE, SPECIES_STARMIE, SPECIES_PELIPPER, SPECIES_CRAWDAUNT, SPECIES_WAILORD, SPECIES_GYARADOS, SPECIES_SWAMPERT, SPECIES_LANTURN, SPECIES_WHISCASH, SPECIES_SHUCKLE, 11 + .byte 0x0E, 0x28, 0x3D, 0x10, 0x0F, 0x24, 0x14, 0x0A, 0x23, 0x1E, 0x24, 0x10, 0x00, 0x00 + .string "リュウジ$", 8 + .string "LAMONT$", 8 + .string "XAV$", 8 + .string "ORFEO$", 8 + .string "J{0xf3}RGEN$", 8 @accent? + .string "JORGE$", 8 + .byte 0x90, 0xE5 + .2byte 0x19 + .2byte SPECIES_ABSOL, SPECIES_CROBAT, SPECIES_EXPLOUD, SPECIES_MAGNETON, SPECIES_SHARPEDO, SPECIES_MANECTRIC, SPECIES_METAGROSS, SPECIES_ELECTRODE, SPECIES_NOSEPASS, SPECIES_WEEZING, 12 + .byte 0x20, 0x10, 0x2E, 0x06, 0x0B, 0x10, 0x22, 0x1E, 0x0F, 0x1E, 0x0B, 0x10, 0x00, 0x00 + .string "カツアキ$", 8 + .string "TYRESE$", 8 + .string "ANDY$", 8 + .string "PARIDE$", 8 + .string "DAVID$", 8 + .string "CHICHO$", 8 + .byte 0x18, 0xD0 + .2byte 10 + .2byte SPECIES_BLAZIKEN, SPECIES_GOLEM, SPECIES_MACHAMP, SPECIES_RHYDON, SPECIES_HARIYAMA, SPECIES_AGGRON, SPECIES_MEDICHAM, SPECIES_ZANGOOSE, SPECIES_VIGOROTH, SPECIES_SLAKING, 13 + .byte 0x29, 0x0A, 0x3A, 0x06, 0x15, 0x0E, 0x35, 0x14, 0x34, 0x10, 0x1E, 0x06, 0x00, 0x00 + .string "トシミツ$", 8 + .string "DANTE$", 8 + .string "DANTE$", 8 + .string "RAOUL$", 8 + .string "LOTHAR$", 8 + .string "PABLO$", 8 + .byte 0x75, 0xBC + .2byte 14 + .2byte SPECIES_SCEPTILE, SPECIES_SANDSLASH, SPECIES_FLYGON, SPECIES_CLAYDOL, SPECIES_ARMALDO, SPECIES_CROBAT, SPECIES_CRADILY, SPECIES_SOLROCK, SPECIES_LUNATONE, SPECIES_GOLEM, 14 + .byte 0x01, 0x0A, 0x17, 0x10, 0x43, 0x12, 0x22, 0x1E, 0x0B, 0x10, 0x0F, 0x28, 0x00, 0x00 + .string "ローウェン$", 8 + .string "ARTURO$", 8 + .string "ARTURO$", 8 + .string "ROMOLO$", 8 + .string "BRIAN$", 8 + .string "ARTURO$", 8 + .byte 0x2, 0xFA + .2byte 0x20 + .2byte SPECIES_ABSOL, SPECIES_MIGHTYENA, SPECIES_ALAKAZAM, SPECIES_BANETTE, SPECIES_NINETALES, SPECIES_CLAYDOL, SPECIES_MUK, SPECIES_SALAMENCE, SPECIES_WALREIN, SPECIES_DUSCLOPS, 15 + .byte 0x0F, 0x1E, 0x04, 0x14, 0x2F, 0x10, 0x06, 0x10, 0x20, 0x10, 0x03, 0x0E, 0x00, 0x00 .align 2 gUnknown_08610EF0:: @ 8610EF0 From 4be109e60e963c7d1f74788d54232c3194000c63 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Fri, 19 Jan 2018 20:07:59 -0600 Subject: [PATCH 45/64] Extract forgotten baserom in trade.s --- data/trade.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/trade.s b/data/trade.s index 4958d5717e..d9708d0e61 100644 --- a/data/trade.s +++ b/data/trade.s @@ -266,7 +266,7 @@ gJPText_Shedinja:: @ 832DF94 .string "ヌケニン$" gUnknown_0832DF99:: @ 832DF99 - .incbin "baserom.gba", 0x32df99, 0x7 + .byte 0x04, 0x03, 0x13, 0x03, 0x00, 0x00, 0x00 .align 2 gTradeBallPalette:: @ 832DFA0 From fbb51bc24bc749366efaf802459aa8e98f90eb1e Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Fri, 19 Jan 2018 21:38:57 -0600 Subject: [PATCH 46/64] Extract baseroms from party_menu.s --- asm/party_menu.s | 18 +- data/party_menu.s | 521 ++++++++++++++++++++++---- data/strings.s | 34 +- graphics/interface/hold_icons.png | Bin 0 -> 177 bytes graphics/interface/unknown_6157C4.bin | 1 + graphics/interface/unknown_6157E0.bin | 2 + 6 files changed, 476 insertions(+), 100 deletions(-) create mode 100644 graphics/interface/hold_icons.png create mode 100644 graphics/interface/unknown_6157C4.bin create mode 100644 graphics/interface/unknown_6157E0.bin diff --git a/asm/party_menu.s b/asm/party_menu.s index 844043a95d..27ec779e7c 100755 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -10645,7 +10645,7 @@ party_menu_held_item_object: @ 81B5C14 bl GetMonData cmp r0, 0 beq _081B5C3C - ldr r0, =gUnknown_08615EC0 + ldr r0, =gSpriteTemplate_8615EC0 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x2] ldrb r2, [r2, 0x3] @@ -10671,7 +10671,7 @@ party_menu_link_mon_held_item_object: @ 81B5C48 lsrs r5, r1, 16 cmp r0, 0 beq _081B5C84 - ldr r0, =gUnknown_08615EC0 + ldr r0, =gSpriteTemplate_8615EC0 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x2] ldrb r2, [r2, 0x3] @@ -10896,7 +10896,7 @@ sub_81B5DF0: @ 81B5DF0 add r0, r8 adds r0, 0x43 ldrb r3, [r0] - ldr r0, =gUnknown_08615EC0 + ldr r0, =gSpriteTemplate_8615EC0 subs r3, 0x1 lsls r3, 24 lsrs r3, 24 @@ -10991,7 +10991,7 @@ party_menu_pokeball_object: @ 81B5ECC bl GetMonData cmp r0, 0 beq _081B5EEA - ldr r0, =gUnknown_08615F08 + ldr r0, =gSpriteTemplate_8615F08 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x6] ldrb r2, [r2, 0x7] @@ -11012,7 +11012,7 @@ party_menu_link_mon_pokeball_object: @ 81B5EF4 lsls r0, 16 cmp r0, 0 beq _081B5F24 - ldr r0, =gUnknown_08615F08 + ldr r0, =gSpriteTemplate_8615F08 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x6] ldrb r2, [r2, 0x7] @@ -11046,7 +11046,7 @@ sub_81B5F34: @ 81B5F34 lsrs r3, 24 lsls r2, 24 lsrs r2, 24 - ldr r0, =gUnknown_08615F08 + ldr r0, =gSpriteTemplate_8615F08 adds r1, r3, 0 movs r3, 0x8 bl CreateSprite @@ -11078,7 +11078,7 @@ sub_81B5F74: @ 81B5F74 lsrs r3, 24 lsls r2, 24 lsrs r2, 24 - ldr r0, =gUnknown_08615F78 + ldr r0, =gSpriteTemplate_8615F78 adds r1, r3, 0 movs r3, 0x8 bl CreateSprite @@ -11194,7 +11194,7 @@ party_menu_status_condition_object: @ 81B6064 bl GetMonData cmp r0, 0 beq _081B608C - ldr r0, =gUnknown_08616008 + ldr r0, =gSpriteTemplate_8616008 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x4] ldrb r2, [r2, 0x5] @@ -11220,7 +11220,7 @@ party_menu_link_mon_status_condition_object: @ 81B6098 lsrs r5, r1, 24 cmp r0, 0 beq _081B60D4 - ldr r0, =gUnknown_08616008 + ldr r0, =gSpriteTemplate_8616008 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x4] ldrb r2, [r2, 0x5] diff --git a/data/party_menu.s b/data/party_menu.s index 8013e5614b..1319ce5d80 100644 --- a/data/party_menu.s +++ b/data/party_menu.s @@ -3,168 +3,294 @@ .section .rodata + .align 1 gUnknown_0861500C:: @ 861500C - .incbin "baserom.gba", 0x61500c, 0x3c + .2byte 0x0005, 0x000e, 0x0019, 0x0022, 0x0026, 0x0044, 0x0045, 0x0066, 0x0076, 0x0087, 0x008a, 0x0056, 0x0099, 0x009d, 0x00a4, 0x00df + .2byte 0x00cd, 0x00f4, 0x00ad, 0x00c4, 0x00cb, 0x00bd, 0x0008, 0x00cf, 0x00d6, 0x0081, 0x006f, 0x0009, 0x0007, 0x00d2 + .align 2 gUnknown_08615048:: @ 8615048 - .incbin "baserom.gba", 0x615048, 0x670 + .4byte 0x00000000, 0x25b4409a, 0x25b4409a, 0x25b4409a, 0x37b4e0ff, 0x37b4e0ff, 0x37b4e0ff, 0x05fdc0fd + .4byte 0x05fdc0fd, 0x05fdc0fd, 0x00000000, 0x00000000, 0x03944490, 0x00000000, 0x00000000, 0x23944092 + .4byte 0x03b44090, 0x03b44090, 0x03b44090, 0x07bc48b8, 0x07bc48b8, 0x03b44090, 0x03b44090, 0x01946098 + .4byte 0x01946098, 0x0fb5c8fd, 0x0fb5c8fd, 0x27b5e0fa, 0x27b5e0fa, 0x05b440b8, 0x05b440b8, 0x3dfce0fd + .4byte 0x05b440b8, 0x05b440b8, 0x3dfce0fd, 0x1df7cffd, 0x1df7cffd, 0x03944098, 0x03944098, 0x1df7ccfd + .4byte 0x1df7ccfd, 0x03944090, 0x03944090, 0x01944092, 0x01944092, 0x0194409a, 0x219440ba, 0x219440ba + .4byte 0x03944090, 0x03944090, 0x01b46098, 0x01b46098, 0x07be4498, 0x07be4498, 0x03fec0fd, 0x23fec0fd + .4byte 0x1ff6e1fd, 0x1ff6e1fd, 0x03944098, 0x03944098, 0x059c4098, 0x05fc41fd, 0x05fcc1fd, 0x19d6cdfd + .4byte 0x19d6cdfd, 0x19d6cdfd, 0x19f4e1fd, 0x19f4e1fd, 0x19f4e1fd, 0x01944092, 0x01944092, 0x0194409a + .4byte 0x019c4092, 0x019c4092, 0x15b5f1f9, 0x15b5f1f9, 0x35b5f1fd, 0x03944098, 0x03944098, 0x03be4c98 + .4byte 0x23feccfd, 0x03954890, 0x03954890, 0x03b6409a, 0x03b44098, 0x03b44098, 0x019c4098, 0x019c4098 + .4byte 0x19f4d088, 0x19f4d088, 0x039c5090, 0x039c5090, 0x01965480, 0x01965480, 0x19d6d5fd, 0x01b67098 + .4byte 0x19d6cdfd, 0x19d6cdfd, 0x21bc409a, 0x21bc409a, 0x03955880, 0x03955880, 0x01975490, 0x01975490 + .4byte 0x19bce0ff, 0x19bce0ff, 0x03b4e1fd, 0x1bf4e1fd, 0x1dffe4ff, 0x01955080, 0x01955080, 0x01bd60ba + .4byte 0x39bde0ff, 0x05bfcffd, 0x0196409a, 0x39fce0fd, 0x039c4090, 0x039c4090, 0x039c4090, 0x039c4090 + .4byte 0x039e4890, 0x039e4c90, 0x19f64dfd, 0x239440b2, 0x01fec5fd, 0x1bf4c8fd, 0x19b4c0fd, 0x219460da + .4byte 0x019c4098, 0x00000000, 0x019c4898, 0x019c4498, 0x00000000, 0x03b44098, 0x03bc4098, 0x03b44898 + .4byte 0x03b44098, 0x039e4c90, 0x019d6098, 0x019d60d8, 0x019d6098, 0x219d60de, 0x03946090, 0x1dffe1fd + .4byte 0x03bc4090, 0x03b44890, 0x03b44090, 0x039c4898, 0x039c4898, 0x3bfcc898, 0x1bfecdfd, 0x3fffffff + .4byte 0x01b440ba, 0x21b440ba, 0x21b440ba, 0x07b54098, 0x27b54098, 0x3fb5e0fd, 0x01fce0ff, 0x21fce0ff + .4byte 0x21fce0ff, 0x3ff5c098, 0x3ff5c098, 0x03b44490, 0x03b44490, 0x0bd5c093, 0x0bd5c093, 0x01944098 + .4byte 0x01944098, 0x03944090, 0x01944890, 0x01944890, 0x07b548fd, 0x05bf4ffd, 0x05bf4cfd, 0x07b74ffd + .4byte 0x07b74ffd, 0x03964c90, 0x03964c90, 0x07944898, 0x1f94c8fd, 0x1f94c8fd, 0x01944092, 0x07fdc0dd + .4byte 0x07fdc0dd, 0x1df7f0fd, 0x05bcc1fd, 0x05944092, 0x05944092, 0x05944092, 0x3ff4cdfd, 0x01944092 + .4byte 0x01944092, 0x03944490, 0x05f5c098, 0x05f5c0fd, 0x03b64498, 0x03b64498, 0x03be4c90, 0x23feccfd + .4byte 0x07964c90, 0x00000000, 0x00000000, 0x03b64c98, 0x059570b8, 0x059570b8, 0x05b76cb8, 0x239464b2 + .4byte 0x05b57098, 0x1df4c9fd, 0x1df4e9fd, 0x079d4892, 0x239440b2, 0x05b56098, 0x219460fa, 0x27fec4b2 + .4byte 0x3ff5c1ff, 0x3ff5e1ff, 0x05b56098, 0x05b56098, 0x05bc6098, 0x05bc6098, 0x05b57098, 0x07b44890 + .4byte 0x07b448d0, 0x03bc40fd, 0x03bc4098, 0x03b460b0, 0x03b444b8, 0x03b444b8, 0x039c4098, 0x05b540b8 + .4byte 0x05b560b8, 0x079e4c90, 0x03b64c98, 0x00000000, 0x03b460fc, 0x03b460fc, 0x01fec5fd, 0x1bf4c8fd + .4byte 0x19b4c0fd, 0x1dffe9fd, 0x05bdcffd, 0x03b64898, 0x03b64098, 0x03be4098, 0x01b46098, 0x01b46098 + .4byte 0x31b4e8fd, 0x03be4c98, 0x03b64c90, 0x07b64592, 0x00000000, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x2bb4c0ff, 0x2bb4c0ff, 0x2bb4c0ff + .4byte 0x03b460ff, 0x3bb4e0ff, 0x3bb4e0ff, 0x05bd4098, 0x05fde0fd, 0x05fde0fd, 0x01b640b8, 0x01b640b8 + .4byte 0x27bd4898, 0x27bd4898, 0x00000000, 0x00000000, 0x03944090, 0x00000000, 0x03944090, 0x019c409a + .4byte 0x19fcc09a, 0x19fcc1ff, 0x0595509a, 0x27b7509e, 0x27b7509e, 0x21b44090, 0x23b44092, 0x21b44490 + .4byte 0x03b440b0, 0x03b440b0, 0x0194409a, 0x29b4c0ff, 0x1fffe5fd, 0x03bc4090, 0x03bc4090, 0x039e4090 + .4byte 0x039e4090, 0x059d4098, 0x059d4098, 0x07bf4c98, 0x07bf4c98, 0x3fffe9fd, 0x01b67490, 0x01b67490 + .4byte 0x1df5f898, 0x01b47098, 0x39f6c5fd, 0x01bc4090, 0x01bc6090, 0x039e4090, 0x21bc40ba, 0x23bc40ba + .4byte 0x039c4090, 0x03be4098, 0x23bc4090, 0x23bc4090, 0x01b46098, 0x03b46098, 0x33b46098, 0x19f4e1fd + .4byte 0x19f4e1fd, 0x03b44898, 0x03b44898, 0x05b56098, 0x05b57098, 0x05bd6098, 0x05bd6098, 0x05bd6098 + .4byte 0x29b4c0fb, 0x29b4c0ff, 0x019c4098, 0x059d5098, 0x07977498, 0x07977498, 0x07bd4098, 0x039e4498 + .4byte 0x1bfec4fd, 0x0fb5c9fd, 0x0fb5c9fd, 0x09fee0ff, 0x1bf6c5fd, 0x1bf6e5fd, 0x03b64498, 0x03b64498 + .4byte 0x00000000, 0x019e4498, 0x19fee5fd, 0x23b6409a, 0x39fce0fd, 0x39fce0fd, 0x39fce0fd, 0x1df5d4b8 + .4byte 0x1df5d4b8, 0x21b4409a, 0x1dffc0fd, 0x1dffe0fd, 0x1dffe0fd, 0x019c4098, 0x03bc4098, 0x03bc4098 + .4byte 0x23be6cba, 0x019e4c98, 0x01be4d98, 0x23b44098, 0x3ffde8ff, 0x01be6098, 0x25b56098, 0x25b56098 + .4byte 0x3dfde8fd, 0x079e4898, 0x0bf6c9fd, 0x0bf6c9fd, 0x01b66098, 0x01b66098, 0x21b4609a, 0x21b460da + .4byte 0x1dfe4c98, 0x1dfe4c98, 0x1dfe4c98, 0x21b46098, 0x25b56098, 0x27b56098, 0x00000000, 0x2ffff098 + .4byte 0x2ffff098, 0x1df7f8fd, 0x0dfff8fd, 0x0df7f8fd, 0x07be6898, 0x3fb7e8ff, 0x23be6898, 0x23be4c98 + .4byte 0x23be4c98, 0x1ffecd98, 0x1bfeecfd, 0x059f4490 + .align 2 gUnknown_086156B8:: @ 86156B8 - .incbin "baserom.gba", 0x6156b8, 0x2c + .4byte 0x000011f0, 0x000021e1, 0x000003c2 + .align 2 +gUnknown_086156C4:: @ 86156C4 + .4byte sub_81B2658, 0x0d280b18, 0x08201420, 0x08081440, 0x08182526, 0x08182535, 0x03302318, 0x1040220c + + .align 2 gUnknown_086156E4:: @ 86156E4 - .incbin "baserom.gba", 0x6156e4, 0x20 + .4byte sub_81B26BC, 0x0d280316, 0x08200c1e, 0x08080c3e, 0x08180c66, 0x08180c75, 0x03300a58, 0x1040044d + .align 2 gUnknown_08615704:: @ 8615704 - .incbin "baserom.gba", 0x615704, 0xc0 + .4byte 0x32142810, 0x22103432, 0x1c6c1268, 0x19661b88, 0x346c2a68, 0x31663388, 0x4c6c4268, 0x49664b88 + .4byte 0x646c5a68, 0x61666388, 0x7c6c7268, 0x79667b88, 0x22141810, 0x12102432, 0x5a145010, 0x4a105c32 + .4byte 0x1c6c1268, 0x19661b88, 0x3c6c3268, 0x39663b88, 0x5c6c5268, 0x59665b88, 0x7c6c7268, 0x79667b88 + .4byte 0x22141810, 0x12102432, 0x5a145010, 0x4a105c32, 0x246a1a68, 0x21662388, 0x3c6a3268, 0x39663b88 + .4byte 0x5c6a5268, 0x59665b88, 0x746a6a68, 0x71667388, 0x2a142010, 0x1a102c32, 0x2c6a2268, 0x29662b88 + .4byte 0x446a3a68, 0x41664388, 0x72146810, 0x62107432, 0x746a6a68, 0x71667388, 0x8c6a8268, 0x89668b88 + .align 1 gUnknown_086157C4:: @ 86157C4 - .incbin "baserom.gba", 0x6157c4, 0x1c + .incbin "graphics/interface/unknown_6157C4.bin" + .align 1 gUnknown_086157E0:: @ 86157E0 - .incbin "baserom.gba", 0x6157e0, 0x1c + .incbin "graphics/interface/unknown_6157E0.bin" gUnknown_086157FC:: @ 86157FC - .incbin "baserom.gba", 0x6157fc, 0x14 + .byte 0x00, 0x03, 0x02, 0x00 +gUnknown_08615800:: @ 8615800 + .byte 0x01, 0x06, 0x00, 0x0b, 0x0c, 0x01, 0x02, 0x03, 0x01, 0x08, 0x09, 0x00, 0x01, 0x02, 0x00, 0x00 + + .align 2 gUnknown_08615810:: @ 8615810 - .incbin "baserom.gba", 0x615810, 0x40 + window_template 0x00, 0x01, 0x03, 0x0a, 0x07, 0x03, 0x0063 + window_template 0x00, 0x0c, 0x01, 0x12, 0x03, 0x04, 0x00a9 + window_template 0x00, 0x0c, 0x04, 0x12, 0x03, 0x05, 0x00df + window_template 0x00, 0x0c, 0x07, 0x12, 0x03, 0x06, 0x0115 + window_template 0x00, 0x0c, 0x0a, 0x12, 0x03, 0x07, 0x014b + window_template 0x00, 0x0c, 0x0d, 0x12, 0x03, 0x08, 0x0181 + window_template 0x02, 0x01, 0x0f, 0x1c, 0x04, 0x0e, 0x01df + null_window_template + .align 2 gUnknown_08615850:: @ 8615850 - .incbin "baserom.gba", 0x615850, 0x40 + window_template 0x00, 0x01, 0x01, 0x0a, 0x07, 0x03, 0x0063 + window_template 0x00, 0x01, 0x08, 0x0a, 0x07, 0x04, 0x00a9 + window_template 0x00, 0x0c, 0x01, 0x12, 0x03, 0x05, 0x00ef + window_template 0x00, 0x0c, 0x05, 0x12, 0x03, 0x06, 0x0125 + window_template 0x00, 0x0c, 0x09, 0x12, 0x03, 0x07, 0x015b + window_template 0x00, 0x0c, 0x0d, 0x12, 0x03, 0x08, 0x0191 + window_template 0x02, 0x01, 0x0f, 0x1c, 0x04, 0x0e, 0x01df + null_window_template + .align 2 gUnknown_08615890:: @ 8615890 - .incbin "baserom.gba", 0x615890, 0x40 + window_template 0x00, 0x01, 0x01, 0x0a, 0x07, 0x03, 0x0063 + window_template 0x00, 0x01, 0x08, 0x0a, 0x07, 0x04, 0x00a9 + window_template 0x00, 0x0c, 0x02, 0x12, 0x03, 0x05, 0x00ef + window_template 0x00, 0x0c, 0x05, 0x12, 0x03, 0x06, 0x0125 + window_template 0x00, 0x0c, 0x09, 0x12, 0x03, 0x07, 0x015b + window_template 0x00, 0x0c, 0x0c, 0x12, 0x03, 0x08, 0x0191 + window_template 0x02, 0x01, 0x0f, 0x1c, 0x04, 0x0e, 0x01df + null_window_template + .align 2 gUnknown_086158D0:: @ 86158D0 - .incbin "baserom.gba", 0x6158d0, 0x38 + window_template 0x00, 0x01, 0x02, 0x0a, 0x07, 0x03, 0x0063 + window_template 0x00, 0x0c, 0x03, 0x12, 0x03, 0x05, 0x00a9 + window_template 0x00, 0x0c, 0x06, 0x12, 0x03, 0x06, 0x00df + window_template 0x02, 0x01, 0x0b, 0x0a, 0x07, 0x04, 0x0115 + window_template 0x02, 0x0c, 0x0c, 0x12, 0x03, 0x07, 0x016b + window_template 0x02, 0x0c, 0x0f, 0x12, 0x03, 0x08, 0x01a1 + null_window_template + .align 2 gUnknown_08615908:: @ 8615908 - .incbin "baserom.gba", 0x615908, 0x8 + window_template 0x00, 0x18, 0x11, 0x06, 0x02, 0x03, 0x01c7 + .align 2 gUnknown_08615910:: @ 8615910 - .incbin "baserom.gba", 0x615910, 0x8 + window_template 0x00, 0x18, 0x12, 0x06, 0x02, 0x03, 0x01c7 + .align 2 gUnknown_08615918:: @ 8615918 - .incbin "baserom.gba", 0x615918, 0x8 + window_template 0x00, 0x18, 0x10, 0x06, 0x02, 0x03, 0x01d3 + .align 2 gUnknown_08615920:: @ 8615920 - .incbin "baserom.gba", 0x615920, 0x8 + window_template 0x02, 0x01, 0x11, 0x15, 0x02, 0x0f, 0x024f + .align 2 gUnknown_08615928:: @ 8615928 - .incbin "baserom.gba", 0x615928, 0x8 + window_template 0x02, 0x01, 0x11, 0x10, 0x02, 0x0f, 0x0279 + .align 2 gUnknown_08615930:: @ 8615930 - .incbin "baserom.gba", 0x615930, 0x8 + window_template 0x02, 0x01, 0x11, 0x14, 0x02, 0x0f, 0x0299 + .align 2 gUnknown_08615938:: @ 8615938 - .incbin "baserom.gba", 0x615938, 0x8 + window_template 0x02, 0x01, 0x11, 0x12, 0x02, 0x0f, 0x0299 + .align 2 gUnknown_08615940:: @ 8615940 - .incbin "baserom.gba", 0x615940, 0x8 + window_template 0x02, 0x01, 0x11, 0x10, 0x02, 0x0f, 0x0299 + .align 2 gUnknown_08615948:: @ 8615948 - .incbin "baserom.gba", 0x615948, 0x8 + window_template 0x02, 0x01, 0x0f, 0x14, 0x04, 0x0f, 0x0299 + .align 2 gUnknown_08615950:: @ 8615950 - .incbin "baserom.gba", 0x615950, 0x8 + window_template 0x02, 0x17, 0x0d, 0x06, 0x06, 0x0e, 0x039d + .align 2 gUnknown_08615958:: @ 8615958 - .incbin "baserom.gba", 0x615958, 0x8 + window_template 0x02, 0x15, 0x0d, 0x08, 0x06, 0x0e, 0x039d + .align 2 gUnknown_08615960:: @ 8615960 - .incbin "baserom.gba", 0x615960, 0x8 + window_template 0x02, 0x13, 0x0b, 0x0a, 0x08, 0x0e, 0x02e9 + .align 2 gUnknown_08615968:: @ 8615968 - .incbin "baserom.gba", 0x615968, 0x8 + window_template 0x02, 0x15, 0x09, 0x05, 0x04, 0x0e, 0x02e9 + .align 2 gUnknown_08615970:: @ 8615970 - .incbin "baserom.gba", 0x615970, 0x18 + window_template 0x02, 0x13, 0x01, 0x0a, 0x0b, 0x0e, 0x02e9 + window_template 0x02, 0x02, 0x0f, 0x1b, 0x04, 0x0e, 0x01df + window_template 0x02, 0x00, 0x0d, 0x12, 0x03, 0x0c, 0x039d gUnknown_08615988:: @ 8615988 - .incbin "baserom.gba", 0x615988, 0x46 + .byte 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1a, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x20, 0x21 + .byte 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x28, 0x3b, 0x3c, 0x3a, 0x3a, 0x3a, 0x3a, 0x3a, 0x3a, 0x3d, 0x0f, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x2e, 0x2f, 0x2f, 0x2f + .byte 0x2f, 0x2f, 0x2f, 0x2f, 0x2f, 0x30 gUnknown_086159CE:: @ 86159CE - .incbin "baserom.gba", 0x6159ce, 0x46 + .byte 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1a, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x20, 0x21 + .byte 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x28, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x2a, 0x0f, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x2e, 0x2f, 0x2f, 0x2f + .byte 0x2f, 0x2f, 0x2f, 0x2f, 0x2f, 0x30 gUnknown_08615A14:: @ 8615A14 - .incbin "baserom.gba", 0x615a14, 0x36 + .byte 0x2b, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2d, 0x31, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x34, 0x35, 0x33, 0x33, 0x33 + .byte 0x33, 0x33, 0x33, 0x36, 0x37, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x39 gUnknown_08615A4A:: @ 8615A4A - .incbin "baserom.gba", 0x615a4a, 0x36 + .byte 0x2b, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2d, 0x31, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21 + .byte 0x21, 0x21, 0x21, 0x32, 0x37, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x39 gUnknown_08615A80:: @ 8615A80 - .incbin "baserom.gba", 0x615a80, 0x36 + .byte 0x15, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x17, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x1f, 0x25, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x27 gUnknown_08615AB6:: @ 8615AB6 - .incbin "baserom.gba", 0x615ab6, 0x2 + .byte 0x0b, 0x0c gUnknown_08615AB8:: @ 8615AB8 - .incbin "baserom.gba", 0x615ab8, 0x2 + .byte 0x09, 0x0a gUnknown_08615ABA:: @ 8615ABA - .incbin "baserom.gba", 0x615aba, 0x3 + .byte 0x04, 0x05, 0x06 gUnknown_08615ABD:: @ 8615ABD - .incbin "baserom.gba", 0x615abd, 0x3 + .byte 0x01, 0x07, 0x08 gUnknown_08615AC0:: @ 8615AC0 - .incbin "baserom.gba", 0x615ac0, 0x3 + .byte 0x01, 0x0b, 0x0c gUnknown_08615AC3:: @ 8615AC3 - .incbin "baserom.gba", 0x615ac3, 0x2 + .byte 0x3b, 0x3c gUnknown_08615AC5:: @ 8615AC5 - .incbin "baserom.gba", 0x615ac5, 0x2 + .byte 0x4b, 0x4c gUnknown_08615AC7:: @ 8615AC7 - .incbin "baserom.gba", 0x615ac7, 0x2 + .byte 0x39, 0x3a gUnknown_08615AC9:: @ 8615AC9 - .incbin "baserom.gba", 0x615ac9, 0x2 + .byte 0x49, 0x4a gUnknown_08615ACB:: @ 8615ACB - .incbin "baserom.gba", 0x615acb, 0x2 + .byte 0x59, 0x5a gUnknown_08615ACD:: @ 8615ACD - .incbin "baserom.gba", 0x615acd, 0x3 + .byte 0x34, 0x35, 0x36 gUnknown_08615AD0:: @ 8615AD0 - .incbin "baserom.gba", 0x615ad0, 0x3 + .byte 0x44, 0x45, 0x46 gUnknown_08615AD3:: @ 8615AD3 - .incbin "baserom.gba", 0x615ad3, 0x3 + .byte 0x54, 0x55, 0x56 gUnknown_08615AD6:: @ 8615AD6 - .incbin "baserom.gba", 0x615ad6, 0x3 + .byte 0x74, 0x75, 0x76 gUnknown_08615AD9:: @ 8615AD9 - .incbin "baserom.gba", 0x615ad9, 0x3 + .byte 0x84, 0x85, 0x86 gUnknown_08615ADC:: @ 8615ADC - .incbin "baserom.gba", 0x615adc, 0x3 + .byte 0x94, 0x95, 0x96 gUnknown_08615ADF:: @ 8615ADF - .incbin "baserom.gba", 0x615adf, 0x3 + .byte 0x64, 0x65, 0x66 gUnknown_08615AE2:: @ 8615AE2 - .incbin "baserom.gba", 0x615ae2, 0x3 + .byte 0x31, 0x37, 0x38 gUnknown_08615AE5:: @ 8615AE5 - .incbin "baserom.gba", 0x615ae5, 0x3 + .byte 0x41, 0x47, 0x48 gUnknown_08615AE8:: @ 8615AE8 - .incbin "baserom.gba", 0x615ae8, 0x3 + .byte 0x51, 0x57, 0x58 gUnknown_08615AEB:: @ 8615AEB - .incbin "baserom.gba", 0x615aeb, 0x3 + .byte 0x61, 0x67, 0x68 gUnknown_08615AEE:: @ 8615AEE - .incbin "baserom.gba", 0x615aee, 0x3 + .byte 0xa1, 0xa7, 0xa8 gUnknown_08615AF1:: @ 8615AF1 - .incbin "baserom.gba", 0x615af1, 0x3 + .byte 0x11, 0x1b, 0x1c + .align 2 gUnknown_08615AF4:: @ 8615AF4 .4byte gUnknown_085E9E43 .4byte gUnknown_085EA010 @@ -209,68 +335,315 @@ gUnknown_08615B60:: @ 8615B60 .4byte gUnknown_085EA0D7 .4byte gUnknown_085EA0DC + .align 1 gUnknown_08615B94:: @ 8615B94 - .incbin "baserom.gba", 0x615b94, 0x74 + .2byte 0x0108, 0x0151, 0x0160, 0x015b, 0x002e, 0x005c, 0x0102, 0x0153, 0x014b, 0x00ed, 0x00f1, 0x010d, 0x003a, 0x003b, 0x003f, 0x0071 + .2byte 0x00b6, 0x00f0, 0x00ca, 0x00db, 0x00da, 0x004c, 0x00e7, 0x0055, 0x0057, 0x0059, 0x00d8, 0x005b, 0x005e, 0x00f7, 0x0118, 0x0068 + .2byte 0x0073, 0x015f, 0x0035, 0x00bc, 0x00c9, 0x007e, 0x013d, 0x014c, 0x0103, 0x0107, 0x0122, 0x009c, 0x00d5, 0x00a8, 0x00d3, 0x011d + .2byte 0x0121, 0x013b, 0x000f, 0x0013, 0x0039, 0x0046, 0x0094, 0x00f9, 0x007f, 0x0123 + .align 2 gUnknown_08615C08:: @ 8615C08 - .incbin "baserom.gba", 0x615c08, 0x130 + .4byte gText_Summary5, sub_81B37FC + .4byte gText_Switch2, brm_switch + .4byte gText_Cancel2, brm_cancel_1 + .4byte gText_Item, sub_81B4134 + .4byte gMenuText_Give, sub_81B4198 + .4byte gText_Take, sub_81B4724 + .4byte gText_Mail, sub_81B4A08 + .4byte gText_Take2, brm_take_2 + .4byte gText_Read2, sub_81B4A6C + .4byte gText_Cancel2, sub_81B4D78 + .4byte gText_Shift, brm_shift_sendout + .4byte gText_SendOut, brm_shift_sendout + .4byte gText_Enter, sub_81B4E8C + .4byte gText_NoEntry, sub_81B4FA8 + .4byte gText_Store, sub_81B50AC + .4byte gText_Register, sub_81B50C8 + .4byte gText_Trade4, brm_trade_1 + .4byte gText_Trade4, sub_81B52E4 + .4byte gMenuText_Toss, sub_81B47E0 + .4byte gMoveNames+195, sub_81B5470 + .4byte gMoveNames+1924, sub_81B5470 + .4byte gMoveNames+3237, sub_81B5470 + .4byte gMoveNames+910, sub_81B5470 + .4byte gMoveNames+741, sub_81B5470 + .4byte gMoveNames+247, sub_81B5470 + .4byte gMoveNames+3783, sub_81B5470 + .4byte gMoveNames+1651, sub_81B5470 + .4byte gMoveNames+1300, sub_81B5470 + .4byte gMoveNames+1183, sub_81B5470 + .4byte gMoveNames+3770, sub_81B5470 + .4byte gMoveNames+2704, sub_81B5470 + .4byte gMoveNames+1755, sub_81B5470 + .4byte gMoveNames+2990, sub_81B5470 +gUnknown_08615D10:: @ 8615D10 + .byte 0x00, 0x01, 0x02 + +gUnknown_08615D13:: @ 8615D13 + .byte 0x0a, 0x00, 0x02 + +gUnknown_08615D16:: @ 8615D16 + .byte 0x0b, 0x00, 0x02 + +gUnknown_08615D19:: @ 8615D19 + .byte 0x00, 0x02 + +gUnknown_08615D1B:: @ 8615D1B + .byte 0x0c, 0x00, 0x02 + +gUnknown_08615D1E:: @ 8615D1E + .byte 0x0d, 0x00, 0x02 + +gUnknown_08615D21:: @ 8615D21 + .byte 0x0e, 0x00, 0x02 + +gUnknown_08615D24:: @ 8615D24 + .byte 0x04, 0x05, 0x09 + +gUnknown_08615D27:: @ 8615D27 + .byte 0x08, 0x07, 0x09 + +gUnknown_08615D2A:: @ 8615D2A + .byte 0x0f, 0x00, 0x02 + +gUnknown_08615D2D:: @ 8615D2D + .byte 0x10, 0x00, 0x02 + +gUnknown_08615D30:: @ 8615D30 + .byte 0x11, 0x00, 0x02 + +gUnknown_08615D33:: @ 8615D33 + .byte 0x05, 0x12, 0x02 + + .align 2 gUnknown_08615D38:: @ 8615D38 - .incbin "baserom.gba", 0x615d38, 0x38 + .4byte NULL, gUnknown_08615D10, gUnknown_08615D13, gUnknown_08615D16, gUnknown_08615D1B, gUnknown_08615D1E, gUnknown_08615D21, gUnknown_08615D19 + .4byte gUnknown_08615D24, gUnknown_08615D27, gUnknown_08615D2A, gUnknown_08615D2D, gUnknown_08615D30, gUnknown_08615D33 gUnknown_08615D70:: @ 8615D70 - .incbin "baserom.gba", 0x615d70, 0xe + .byte 0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x02, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03 + .align 1 gUnknown_08615D7E:: @ 8615D7E - .incbin "baserom.gba", 0x615d7e, 0x1e + .2byte 0x000f, 0x0094, 0x00f9, 0x0046, 0x0039, 0x0013, 0x0123, 0x007f, 0x0064, 0x005b, 0x0122, 0x00d0, 0x0087, 0x00e6, 0x000e + .align 2 gUnknown_08615D9C:: @ 8615D9C - .incbin "baserom.gba", 0x615d9c, 0x70 + .4byte sub_80D3718, 0x00000007 + .4byte SetUpFieldMove_Flash, 0x0000000d + .4byte sub_8135654, 0x0000000d + .4byte hm_prepare_rocksmash, 0x0000000d + .4byte sub_81B5820, 0x00000008 + .4byte sub_81B5884, 0x0000000d + .4byte sub_81B5974, 0x0000000d + .4byte hm_prepare_waterfall, 0x0000000d + .4byte SetUpFieldMove_Teleport, 0x0000000d + .4byte sub_813572C, 0x0000000d + .4byte sub_80FA004, 0x0000000d + .4byte hm_prepare_dive_probably, 0x00000010 + .4byte hm_prepare_dive_probably, 0x00000010 + .4byte SetUpFieldMove_SweetScent, 0x0000000d + .align 2 gUnknown_08615E0C:: @ 8615E0C - .incbin "baserom.gba", 0x615e0c, 0x24 + .4byte gText_NotPkmnOtherTrainerWants + .4byte gText_ThatIsntAnEgg + .4byte gText_PkmnCantBeTradedNow + .4byte gText_PkmnCantBeTradedNow + .4byte gText_OtherTrainersPkmnCantBeTraded + .4byte gText_EggCantBeTradedNow + .4byte gText_OtherTrainerCantAcceptPkmn + .4byte gText_CantTradeWithTrainer + .4byte gText_CantTradeWithTrainer + .align 2 gUnknown_08615E30:: @ 8615E30 - .incbin "baserom.gba", 0x615e30, 0x40 + .incbin "graphics/interface/hold_icons.4bpp" + .align 2 gUnknown_08615E70:: @ 8615E70 - .incbin "baserom.gba", 0x615e70, 0x40 + .incbin "graphics/interface/hold_icons.gbapal" + .align 2 +gOamData_8615E90:: @ 8615E90 + .2byte 0x0000, 0x0000, 0x0400, 0x0000 + + .align 2 +gSpriteAnim_8615E98:: @ 8615E98 + .2byte 0x0000, 0x0001, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8615EA0:: @ 8615EA0 + .2byte 0x0001, 0x0001, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_8615EA8:: @ 8615EA8 + .4byte gSpriteAnim_8615E98 + .4byte gSpriteAnim_8615EA0 + + .align 2 gUnknown_08615EB0:: @ 8615EB0 obj_tiles gUnknown_08615E30, 0x40, 55120 + .align 2 gUnknown_08615EB8:: @ 8615EB8 obj_pal gUnknown_08615E70, 55120 -gUnknown_08615EC0:: @ 8615EC0 - .incbin "baserom.gba", 0x615ec0, 0x38 + .align 2 +gSpriteTemplate_8615EC0:: @ 8615EC0 + spr_template 0xd750, 0xd750, gOamData_8615E90, gSpriteAnimTable_8615EA8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 +gOamData_8615ED8:: @ 8615ED8 + .2byte 0x0000, 0x8000, 0x0400, 0x0000 + + .align 2 +gSpriteAnim_8615EE0:: @ 8615EE0 + .2byte 0x0000, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8615EE8:: @ 8615EE8 + .2byte 0x0010, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_8615EF0:: @ 8615EF0 + .4byte gSpriteAnim_8615EE0 + .4byte gSpriteAnim_8615EE8 + + .align 2 gUnknown_08615EF8:: @ 8615EF8 obj_tiles gPartyMenuPokeball_Gfx, 0x400, 1200 + .align 2 gUnknown_08615F00:: @ 8615F00 obj_pal gPartyMenuPokeball_Pal, 1200 -gUnknown_08615F08:: @ 8615F08 - .incbin "baserom.gba", 0x615f08, 0x68 + .align 2 +gSpriteTemplate_8615F08:: @ 8615F08 + spr_template 0x04b0, 0x04b0, gOamData_8615ED8, gSpriteAnimTable_8615EF0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 +gOamData_8615F20:: @ 8615F20 + .2byte 0x0000, 0x4000, 0x0800, 0x0000 + + .align 2 +gSpriteAnim_8615F28:: @ 8615F28 + .2byte 0x0000, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8615F30:: @ 8615F30 + .2byte 0x0004, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8615F38:: @ 8615F38 + .2byte 0x0008, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8615F40:: @ 8615F40 + .2byte 0x000c, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8615F48:: @ 8615F48 + .2byte 0x0010, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8615F50:: @ 8615F50 + .2byte 0x0014, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_8615F58:: @ 8615F58 + .4byte gSpriteAnim_8615F28 + .4byte gSpriteAnim_8615F30 + .4byte gSpriteAnim_8615F38 + .4byte gSpriteAnim_8615F40 + .4byte gSpriteAnim_8615F48 + .4byte gSpriteAnim_8615F50 + + .align 2 gUnknown_08615F70:: @ 8615F70 - .incbin "baserom.gba", 0x615f70, 0x8 + obj_tiles gPartyMenuPokeballSmall_Gfx, 0x0300, 0x04b1 -gUnknown_08615F78:: @ 8615F78 - .incbin "baserom.gba", 0x615f78, 0x80 + .align 2 +gSpriteTemplate_8615F78:: @ 8615F78 + spr_template 0x04b1, 0x04b0, gOamData_8615F20, gSpriteAnimTable_8615F58, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 +gOamData_8615F90:: @ 8615F90 + .2byte 0x4000, 0x4000, 0x0400, 0x0000 + + .align 2 +gSpriteAnim_8615F98:: @ 8615F98 + .2byte 0x0000, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8615FA0:: @ 8615FA0 + .2byte 0x0004, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8615FA8:: @ 8615FA8 + .2byte 0x0008, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8615FB0:: @ 8615FB0 + .2byte 0x000c, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8615FB8:: @ 8615FB8 + .2byte 0x0010, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8615FC0:: @ 8615FC0 + .2byte 0x0014, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8615FC8:: @ 8615FC8 + .2byte 0x0018, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8615FD0:: @ 8615FD0 + .2byte 0x001c, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_8615FD8:: @ 8615FD8 + .4byte gSpriteAnim_8615F98 + .4byte gSpriteAnim_8615FA0 + .4byte gSpriteAnim_8615FA8 + .4byte gSpriteAnim_8615FB0 + .4byte gSpriteAnim_8615FB8 + .4byte gSpriteAnim_8615FC0 + .4byte gSpriteAnim_8615FC8 + .4byte gSpriteAnim_8615FD0 + + .align 2 gUnknown_08615FF8:: @ 8615FF8 obj_tiles gStatusGfx_Icons, 0x400, 1202 + .align 2 gUnknown_08616000:: @ 8616000 obj_pal gStatusPal_Icons, 1202 -gUnknown_08616008:: @ 8616008 - .incbin "baserom.gba", 0x616008, 0x18 + .align 2 +gSpriteTemplate_8616008:: @ 8616008 + spr_template 0x04b2, 0x04b2, gOamData_8615F90, gSpriteAnimTable_8615FD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_08616020:: @ 8616020 - .incbin "baserom.gba", 0x616020, 0x20 + .byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00 + .align 2 +gUnknown_08616028:: @ 8616028 + .4byte gText_HP4 + .4byte gText_Attack3 + .4byte gText_Defense3 + .4byte gText_SpAtk4 + .4byte gText_SpDef4 + .4byte gText_Speed2 + + .align 1 gUnknown_08616040:: @ 8616040 - .incbin "baserom.gba", 0x616040, 0x74 + .2byte 0x0108, 0x0151, 0x0160, 0x015b, 0x002e, 0x005c, 0x0102, 0x0153, 0x014b, 0x00ed, 0x00f1, 0x010d, 0x003a, 0x003b, 0x003f, 0x0071 + .2byte 0x00b6, 0x00f0, 0x00ca, 0x00db, 0x00da, 0x004c, 0x00e7, 0x0055, 0x0057, 0x0059, 0x00d8, 0x005b, 0x005e, 0x00f7, 0x0118, 0x0068 + .2byte 0x0073, 0x015f, 0x0035, 0x00bc, 0x00c9, 0x007e, 0x013d, 0x014c, 0x0103, 0x0107, 0x0122, 0x009c, 0x00d5, 0x00a8, 0x00d3, 0x011d + .2byte 0x0121, 0x013b, 0x000f, 0x0013, 0x0039, 0x0046, 0x0094, 0x00f9, 0x007f, 0x0123 + diff --git a/data/strings.s b/data/strings.s index 30969e452c..96011f05c7 100644 --- a/data/strings.s +++ b/data/strings.s @@ -567,16 +567,16 @@ gText_EmptyString2:: @ 85E8D03 gUnknown_085E8D04:: @ 85E8D04 .string "CANCEL$" -gUnknown_085E8D0B:: @ 85E8D0B +gText_Item:: @ 85E8D0B .string "ITEM$" -gUnknown_085E8D10:: @ 85E8D10 +gText_Mail:: @ 85E8D10 .string "MAIL$" -gUnknown_085E8D15:: @ 85E8D15 +gText_Take:: @ 85E8D15 .string "TAKE$" -gUnknown_085E8D1A:: @ 85E8D1A +gText_Store:: @ 85E8D1A .string "STORE$" gMenuText_Check:: @ 85E8D20 @@ -985,34 +985,34 @@ gText_TurnedOverVar1ForVar2:: @ 85E9677 gText_PokedollarVar1:: @ 85E969C .string "¥{STR_VAR_1}$" -gUnknown_085E96A0:: @ 85E96A0 +gText_Shift:: @ 85E96A0 .string "SHIFT$" -gUnknown_085E96A6:: @ 85E96A6 +gText_SendOut:: @ 85E96A6 .string "SEND OUT$" -gUnknown_085E96AF:: @ 85E96AF +gText_Switch2:: @ 85E96AF .string "SWITCH$" -gUnknown_085E96B6:: @ 85E96B6 +gText_Summary5:: @ 85E96B6 .string "SUMMARY$" gUnknown_085E96BE:: @ 85E96BE .string "MOVES$" -gUnknown_085E96C4:: @ 85E96C4 +gText_Enter:: @ 85E96C4 .string "ENTER$" -gUnknown_085E96CA:: @ 85E96CA +gText_NoEntry:: @ 85E96CA .string "NO ENTRY$" -gUnknown_085E96D3:: @ 85E96D3 +gText_Take2:: @ 85E96D3 .string "TAKE$" -gUnknown_085E96D8:: @ 85E96D8 +gText_Read2:: @ 85E96D8 .string "READ$" -gUnknown_085E96DD:: @ 85E96DD +gText_Trade4:: @ 85E96DD .string "TRADE$" gText_HP3:: @ 85E96E3 @@ -1341,19 +1341,19 @@ gText_OtherTrainersPkmnCantBeTraded:: @ 85EA250 .string "The other TRAINER’s POKéMON\ncan’t be traded now.$" .align 2 -gUnknown_085EA284:: @ 85EA284 +gText_OtherTrainerCantAcceptPkmn:: @ 85EA284 .string "The other TRAINER can’t accept\nthat POKéMON now.$" .align 2 -gUnknown_085EA2B8:: @ 85EA2B8 +gText_CantTradeWithTrainer:: @ 85EA2B8 .string "You can’t trade with that\nTRAINER now.$" .align 2 -gUnknown_085EA2E0:: @ 85EA2E0 +gText_NotPkmnOtherTrainerWants:: @ 85EA2E0 .string "That isn’t the type of POKéMON\nthat the other TRAINER wants.$" .align 2 -gUnknown_085EA320:: @ 85EA320 +gText_ThatIsntAnEgg:: @ 85EA320 .string "That isn’t an EGG.$" gText_Register:: @ 85EA333 diff --git a/graphics/interface/hold_icons.png b/graphics/interface/hold_icons.png new file mode 100644 index 0000000000000000000000000000000000000000..53eeedde38e217c9bb54ae6cb8d4f8185110cfcb GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^96&6ZRaQU(D&A+DBZv;P18fA#ABDO0xm z|2F5|z2a{{noFWU8ZbdpQc{ugZcU(sji-xa2*=Fi1O~=1@#zc#g8Yg%E?;`3$TH*f zhyVZUHyE+GIXW`3r8zoQv$;7ZR4k{o)G90#8>zmvv4F FO#m@_G)({i literal 0 HcmV?d00001 diff --git a/graphics/interface/unknown_6157C4.bin b/graphics/interface/unknown_6157C4.bin new file mode 100644 index 0000000000..8c3c1be3d1 --- /dev/null +++ b/graphics/interface/unknown_6157C4.bin @@ -0,0 +1 @@ +#$ \ No newline at end of file diff --git a/graphics/interface/unknown_6157E0.bin b/graphics/interface/unknown_6157E0.bin new file mode 100644 index 0000000000..7f11aaf4e5 --- /dev/null +++ b/graphics/interface/unknown_6157E0.bin @@ -0,0 +1,2 @@ + +            \ No newline at end of file From 7abfc6a9899365acf39c256dc14fea378f6ef370 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Fri, 19 Jan 2018 23:42:30 -0600 Subject: [PATCH 47/64] Extract data from trainer card --- data/graphics.s | 2 +- data/trainer_card.s | 295 +++++++++++------- graphics/frontier_pass/map_heads.png | Bin 0 -> 319 bytes graphics/frontier_pass/map_heads_female.pal | 19 ++ graphics/frontier_pass/map_screen.bin | Bin 0 -> 1280 bytes graphics/frontier_pass/map_screen.png | Bin 0 -> 3333 bytes graphics/frontier_pass/record_frame.bin | Bin 0 -> 144 bytes graphics/frontier_pass/small_map_and_card.bin | Bin 0 -> 672 bytes .../small_map_and_card_affine.bin | 2 + graphics/frontier_pass/unknown_571298.bin | 1 + graphics/trainer_card/badges.png | Bin 0 -> 563 bytes graphics/trainer_card/badges_fr.png | Bin 0 -> 587 bytes graphics/trainer_card/female_bg.pal | 19 ++ graphics/trainer_card/female_bg_fr.pal | 19 ++ graphics/trainer_card/four_stars.pal | 51 +++ graphics/trainer_card/four_stars_fr.pal | 51 +++ graphics/trainer_card/gold.pal | 19 ++ graphics/trainer_card/one_star.pal | 51 +++ graphics/trainer_card/one_star_fr.pal | 51 +++ graphics/trainer_card/stickers_fr.png | Bin 0 -> 387 bytes graphics/trainer_card/stickers_fr1.pal | 19 ++ graphics/trainer_card/stickers_fr2.pal | 19 ++ graphics/trainer_card/stickers_fr3.pal | 19 ++ graphics/trainer_card/stickers_fr4.pal | 19 ++ graphics/trainer_card/three_stars.pal | 51 +++ graphics/trainer_card/three_stars_fr.pal | 51 +++ graphics/trainer_card/two_stars.pal | 51 +++ graphics/trainer_card/two_stars_fr.pal | 51 +++ graphics/trainer_card/unknown_56F18C.pal | 19 ++ 29 files changed, 771 insertions(+), 108 deletions(-) create mode 100644 graphics/frontier_pass/map_heads.png create mode 100644 graphics/frontier_pass/map_heads_female.pal create mode 100644 graphics/frontier_pass/map_screen.bin create mode 100644 graphics/frontier_pass/map_screen.png create mode 100644 graphics/frontier_pass/record_frame.bin create mode 100644 graphics/frontier_pass/small_map_and_card.bin create mode 100644 graphics/frontier_pass/small_map_and_card_affine.bin create mode 100644 graphics/frontier_pass/unknown_571298.bin create mode 100644 graphics/trainer_card/badges.png create mode 100644 graphics/trainer_card/badges_fr.png create mode 100644 graphics/trainer_card/female_bg.pal create mode 100644 graphics/trainer_card/female_bg_fr.pal create mode 100644 graphics/trainer_card/four_stars.pal create mode 100644 graphics/trainer_card/four_stars_fr.pal create mode 100644 graphics/trainer_card/gold.pal create mode 100644 graphics/trainer_card/one_star.pal create mode 100644 graphics/trainer_card/one_star_fr.pal create mode 100644 graphics/trainer_card/stickers_fr.png create mode 100644 graphics/trainer_card/stickers_fr1.pal create mode 100644 graphics/trainer_card/stickers_fr2.pal create mode 100644 graphics/trainer_card/stickers_fr3.pal create mode 100644 graphics/trainer_card/stickers_fr4.pal create mode 100644 graphics/trainer_card/three_stars.pal create mode 100644 graphics/trainer_card/three_stars_fr.pal create mode 100644 graphics/trainer_card/two_stars.pal create mode 100644 graphics/trainer_card/two_stars_fr.pal create mode 100644 graphics/trainer_card/unknown_56F18C.pal diff --git a/data/graphics.s b/data/graphics.s index 8733869b53..c1ca770358 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -5142,7 +5142,7 @@ gUnknown_08DE0644:: @ 8DE0644 .align 2 gUnknown_08DE07C8:: @ 8DE07C8 - .incbin "graphics/frontier_pass/tiles.gbapal" @ size in LoadPalette calls is reported as 0xD0 << 1, which is 0x1A0, but this is wrong? todo, investigate? (frontier pass pal) + .incbin "graphics/frontier_pass/tiles.gbapal" @ size in LoadPalette calls is reported as 0xD0 << 1, which is 0x1A0, but palette is only 0x100 bytes long so it loads garbage as well .align 2 gUnknown_08DE08C8:: @ 8DE08C8 diff --git a/data/trainer_card.s b/data/trainer_card.s index 08bf4d8fa1..f57973200b 100644 --- a/data/trainer_card.s +++ b/data/trainer_card.s @@ -2,7 +2,6 @@ .include "constants/constants.inc" .section .rodata - .align 2, 0 .macro unk_trainer_card_struct text1, text2, short1, short2, short3, short4 .4byte \text1 @@ -13,71 +12,100 @@ .2byte \short4 .endm + .align 2 gUnknown_0856F018:: @ 856F018 - .incbin "baserom.gba", 0x56f018, 0x194 + .incbin "graphics/trainer_card/stickers_fr.4bpp.lz" + .align 2 +gUnknown_0856F18C:: @ 856F18C + .incbin "graphics/trainer_card/unknown_56F18C.gbapal" + + .align 2 gEmeraldTrainerCard1Star_Pal:: @ 856F1AC - .incbin "baserom.gba", 0x56f1ac, 0x60 + .incbin "graphics/trainer_card/one_star.gbapal" + .align 2 gFireRedTrainerCard1Star_Pal:: @ 856F20C - .incbin "baserom.gba", 0x56f20c, 0x60 + .incbin "graphics/trainer_card/one_star_fr.gbapal" + .align 2 gEmeraldTrainerCard2Star_Pal:: @ 856F26C - .incbin "baserom.gba", 0x56f26c, 0x60 + .incbin "graphics/trainer_card/two_stars.gbapal" + .align 2 gFireRedTrainerCard2Star_Pal:: @ 856F2CC - .incbin "baserom.gba", 0x56f2cc, 0x60 + .incbin "graphics/trainer_card/two_stars_fr.gbapal" + .align 2 gEmeraldTrainerCard3Star_Pal:: @ 856F32C - .incbin "baserom.gba", 0x56f32c, 0x60 + .incbin "graphics/trainer_card/three_stars.gbapal" + .align 2 gFireRedTrainerCard3Star_Pal:: @ 856F38C - .incbin "baserom.gba", 0x56f38c, 0x60 + .incbin "graphics/trainer_card/three_stars_fr.gbapal" + .align 2 gEmeraldTrainerCard4Star_Pal:: @ 856F3EC - .incbin "baserom.gba", 0x56f3ec, 0x60 + .incbin "graphics/trainer_card/four_stars.gbapal" + .align 2 gFireRedTrainerCard4Star_Pal:: @ 856F44C - .incbin "baserom.gba", 0x56f44c, 0x60 + .incbin "graphics/trainer_card/four_stars_fr.gbapal" + .align 2 gUnknown_0856F4AC:: @ 856F4AC - .incbin "baserom.gba", 0x56f4ac, 0x20 + .incbin "graphics/trainer_card/female_bg.gbapal" + .align 2 gUnknown_0856F4CC:: @ 856F4CC - .incbin "baserom.gba", 0x56f4cc, 0x20 + .incbin "graphics/trainer_card/female_bg_fr.gbapal" + .align 2 gUnknown_0856F4EC:: @ 856F4EC - .incbin "baserom.gba", 0x56f4ec, 0x20 + .incbin "graphics/trainer_card/badges.gbapal" + .align 2 gUnknown_0856F50C:: @ 856F50C - .incbin "baserom.gba", 0x56f50c, 0x20 + .incbin "graphics/trainer_card/badges_fr.gbapal" + .align 2 gUnknown_0856F52C:: @ 856F52C - .incbin "baserom.gba", 0x56f52c, 0x20 + .incbin "graphics/trainer_card/gold.gbapal" + .align 2 gUnknown_0856F54C:: @ 856F54C - .incbin "baserom.gba", 0x56f54c, 0x20 + .incbin "graphics/trainer_card/stickers_fr1.gbapal" + .align 2 gUnknown_0856F56C:: @ 856F56C - .incbin "baserom.gba", 0x56f56c, 0x20 + .incbin "graphics/trainer_card/stickers_fr2.gbapal" + .align 2 gUnknown_0856F58C:: @ 856F58C - .incbin "baserom.gba", 0x56f58c, 0x20 + .incbin "graphics/trainer_card/stickers_fr3.gbapal" + .align 2 gUnknown_0856F5AC:: @ 856F5AC - .incbin "baserom.gba", 0x56f5ac, 0x20 + .incbin "graphics/trainer_card/stickers_fr4.gbapal" + .align 2 gUnknown_0856F5CC:: @ 856F5CC - .incbin "baserom.gba", 0x56f5cc, 0x248 + .incbin "graphics/trainer_card/badges.4bpp.lz" + .align 2 gUnknown_0856F814:: @ 856F814 - .incbin "baserom.gba", 0x56f814, 0x2a0 + .incbin "graphics/trainer_card/badges_fr.4bpp.lz" + .align 2 gUnknown_0856FAB4:: @ 856FAB4 - .incbin "baserom.gba", 0x56fab4, 0x10 + .4byte 0x000025b0, 0x000001d9, 0x000031e2, 0x003011f3 + .align 2 gUnknown_0856FAC4:: @ 856FAC4 - .incbin "baserom.gba", 0x56fac4, 0x20 + window_template 0x01, 0x02, 0x0f, 0x1b, 0x04, 0x0f, 0x0253 + window_template 0x01, 0x01, 0x01, 0x1c, 0x12, 0x0f, 0x0001 + window_template 0x03, 0x13, 0x05, 0x09, 0x0a, 0x08, 0x0150 + null_window_template .align 2 gEmeraldTrainerCardStarPals:: @ 856FAE4 @@ -96,20 +124,21 @@ gFireRedTrainerCardStarPals:: @ 856FAF8 .4byte gFireRedTrainerCard4Star_Pal gUnknown_0856FB0C:: @ 856FB0C - .incbin "baserom.gba", 0x56fb0c, 0x3 + .byte 0x00, 0x02, 0x03 gUnknown_0856FB0F:: @ 856FB0F - .incbin "baserom.gba", 0x56fb0f, 0x3 + .byte 0x00, 0x04, 0x05 gUnknown_0856FB12:: @ 856FB12 - .incbin "baserom.gba", 0x56fb12, 0x6 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 gUnknown_0856FB18:: @ 856FB18 - .incbin "baserom.gba", 0x56fb18, 0x8 + .byte 0x0d, 0x04, 0x0d, 0x04, 0x01, 0x00, 0x01, 0x00 gUnknown_0856FB20:: @ 856FB20 - .incbin "baserom.gba", 0x56fb20, 0x8 + .byte 0x4e, 0x4f, 0x50, 0x51, 0x3c, 0x3f + .align 2 gUnknown_0856FB28:: @ 856FB28 .4byte sub_80C4998 .4byte sub_80C49D8 @@ -118,182 +147,233 @@ gUnknown_0856FB28:: @ 856FB28 .4byte sub_80C4C84 .4byte sub_80C4DB0 + .align 2 gUnknown_0856FB40:: @ 856FB40 .4byte gUnknown_0856FB0C .4byte gUnknown_0856FB12 gUnknown_0856FB48:: @ 856FB48 - .incbin "baserom.gba", 0x56fb48, 0x2 + .byte 0x71, 0x68 gUnknown_0856FB4A:: @ 856FB4A - .incbin "baserom.gba", 0x56fb4a, 0x2 + .byte 0x81, 0x78 gUnknown_0856FB4C:: @ 856FB4C - .incbin "baserom.gba", 0x56fb4c, 0x9 + .byte 0xfd, 0x02, 0xf0, 0xfd, 0x03, 0xf0, 0xfd, 0x04, 0xff gUnknown_0856FB55:: @ 856FB55 - .incbin "baserom.gba", 0x56fb55, 0x2 + .byte 0x08, 0x10 gUnknown_0856FB57:: @ 856FB57 - .incbin "baserom.gba", 0x56fb57, 0x5 + .byte 0xd8, 0xd8 + .align 2 gUnknown_0856FB5C:: @ 856FB5C .4byte gText_LinkBattles .4byte gText_LinkCableBattles .4byte gText_LinkBattles gUnknown_0856FB68:: @ 856FB68 - .incbin "baserom.gba", 0x56fb68, 0x6 + .byte 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a gUnknown_0856FB6E:: @ 856FB6E - .incbin "baserom.gba", 0x56fb6e, 0x6 + .byte 0x00, 0x04, 0x08, 0x0c, 0x10, 0x14 gUnknown_0856FB74:: @ 856FB74 - .incbin "baserom.gba", 0x56fb74, 0x4 + .byte 0x0b, 0x0c, 0x0d, 0x0e gUnknown_0856FB78:: @ 856FB78 - .incbin "baserom.gba", 0x56fb78, 0x4 + .byte 0x07, 0x07 + .align 2 gUnknown_0856FB7C:: @ 856FB7C - .incbin "baserom.gba", 0x56fb7c, 0x20 + .incbin "graphics/frontier_pass/map_heads.gbapal" + .align 2 gUnknown_0856FB9C:: @ 856FB9C - .incbin "baserom.gba", 0x56fb9c, 0x20 + .incbin "graphics/frontier_pass/map_heads_female.gbapal" + .align 2 gUnknown_0856FBBC:: @ 856FBBC - .incbin "baserom.gba", 0x56fbbc, 0xFEC + .incbin "graphics/frontier_pass/map_screen.4bpp.lz" - .align 2 + .align 2 gFrontierPassCursor_Gfx:: @ 8570BA8 - .incbin "graphics/frontier_pass/cursor.4bpp.lz" + .incbin "graphics/frontier_pass/cursor.4bpp.lz" + .align 2 gUnknown_08570C44:: @ 8570C44 - .incbin "baserom.gba", 0x570c44, 0xBC + .incbin "graphics/frontier_pass/map_heads.4bpp.lz" - .align 2 + .align 2 gFrontierPassMapCursor_Gfx:: @ 8570D00 - .incbin "graphics/frontier_pass/map_cursor.4bpp.lz" + .incbin "graphics/frontier_pass/map_cursor.4bpp.lz" + .align 2 gUnknown_08570E00:: @ 8570E00 - .incbin "baserom.gba", 0x570e00, 0x260 + .incbin "graphics/frontier_pass/map_screen.bin.lz" + .align 2 gUnknown_08571060:: @ 8571060 - .incbin "baserom.gba", 0x571060, 0x260 + .incbin "graphics/frontier_pass/small_map_and_card.bin.lz" + .align 2 +gUnknown_08571298:: @ 8571298 + .incbin "graphics/frontier_pass/unknown_571298.bin" + + .align 2 gUnknown_085712C0:: @ 85712C0 - .incbin "baserom.gba", 0x5712c0, 0x38 + .incbin "graphics/frontier_pass/record_frame.bin.lz" + .align 2 gUnknown_085712F8:: @ 85712F8 - .incbin "baserom.gba", 0x5712f8, 0xe8 + .incbin "graphics/frontier_pass/small_map_and_card_affine.bin.lz" gUnknown_085713E0:: @ 85713E0 - .incbin "baserom.gba", 0x5713e0, 0x8 + .2byte 0x00d8, 0x0020, 0x00d8, 0x0080 + .align 2 gUnknown_085713E8:: @ 85713E8 - .incbin "baserom.gba", 0x5713e8, 0xc + .4byte 0x000011f8, 0x000021e1, 0x00000bd6 + .align 2 gUnknown_085713F4:: @ 85713F4 - .incbin "baserom.gba", 0x5713f4, 0xc + .4byte 0x000001f8, 0x000011e1, 0x000021d2 + .align 2 gUnknown_08571400:: @ 8571400 - .incbin "baserom.gba", 0x571400, 0x28 + window_template 0x00, 0x02, 0x03, 0x0c, 0x03, 0x0f, 0x0001 + window_template 0x00, 0x02, 0x0a, 0x0c, 0x03, 0x0f, 0x0026 + window_template 0x00, 0x02, 0x0d, 0x0c, 0x04, 0x0f, 0x004b + window_template 0x00, 0x00, 0x12, 0x1e, 0x03, 0x0f, 0x007c + window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 + .align 2 gUnknown_08571428:: @ 8571428 - .incbin "baserom.gba", 0x571428, 0x20 + window_template 0x00, 0x00, 0x01, 0x0f, 0x05, 0x0f, 0x0001 + window_template 0x00, 0x14, 0x01, 0x0a, 0x0e, 0x0f, 0x004d + window_template 0x00, 0x02, 0x10, 0x1a, 0x04, 0x0f, 0x00da + window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 gUnknown_08571448:: @ 8571448 - .incbin "baserom.gba", 0x571448, 0x3 + .byte 0x00, 0x02, 0x03 gUnknown_0857144B:: @ 857144B - .incbin "baserom.gba", 0x57144b, 0x3 + .byte 0x00, 0x01, 0x09 gUnknown_0857144E:: @ 857144E - .incbin "baserom.gba", 0x57144e, 0x6 + .byte 0x00, 0x04, 0x05 + .align 2 gUnknown_08571454:: @ 8571454 - .incbin "baserom.gba", 0x571454, 0x68 + .2byte 0x001c, 0x004c, 0x0084, 0x00dc, 0x0054, 0x0084, 0x0084, 0x00dc, 0x0050, 0x0066, 0x0014, 0x006c, 0x0000, 0x0010, 0x0098, 0x00f0 + .2byte 0x006c, 0x0086, 0x0014, 0x006c, 0x0018, 0x0030, 0x0014, 0x006c, 0x0032, 0x0042, 0x0014, 0x0024, 0x0042, 0x0052, 0x0020, 0x0030 + .2byte 0x0032, 0x0042, 0x002c, 0x003c, 0x0042, 0x0052, 0x0038, 0x0048, 0x0032, 0x0042, 0x0044, 0x0054, 0x0042, 0x0052, 0x0050, 0x0060 + .2byte 0x0032, 0x0042, 0x005c, 0x006c + .align 2 gUnknown_085714BC:: @ 85714BC obj_tiles gFrontierPassCursor_Gfx, 0x100, 0 obj_tiles gFrontierPassMapCursor_Gfx, 0x400, 1 obj_tiles gFrontierPassMedals_Gfx, 0x380, 2 + .align 2 gUnknown_085714D4:: @ 85714D4 obj_tiles gUnknown_08570C44, 0x100, 4 null_obj_tiles + .align 2 gUnknown_085714E4:: @ 85714E4 - obj_pal gFrontierPassCursor_Pal, 0 - obj_pal gFrontierPassMapCursor_Pal, 1 - obj_pal gFrontierPassMedalsSilver_Pal, 2 - obj_pal gFrontierPassMedalsGold_Pal, 3 - obj_pal gUnknown_0856FB7C, 4 - obj_pal gUnknown_0856FB9C, 5 - null_obj_pal + obj_pal gFrontierPassCursor_Pal, 0 + obj_pal gFrontierPassMapCursor_Pal, 1 + obj_pal gFrontierPassMedalsSilver_Pal, 2 + obj_pal gFrontierPassMedalsGold_Pal, 3 + obj_pal gUnknown_0856FB7C, 4 + obj_pal gUnknown_0856FB9C, 5 + null_obj_pal - @ this doesnt look like its part of the same table. - .4byte 0x0, 0xFFFF + .align 2 +gSpriteAnim_857151C:: @ 857151C + .2byte 0x0000, 0x0000, 0xffff, 0x0000 -gUnknown_08571524:: @ 8571524 - .incbin "baserom.gba", 0x571524, 0x8 + .align 2 +gSpriteAnim_8571524:: @ 8571524 + .2byte 0x0000, 0x0000, 0xffff, 0x0000 -gUnknown_0857152C:: @ 857152C - .incbin "baserom.gba", 0x57152c, 0x8 + .align 2 +gSpriteAnim_857152C:: @ 857152C + .2byte 0x0004, 0x0000, 0xffff, 0x0000 -gUnknown_08571534:: @ 8571534 - .incbin "baserom.gba", 0x571534, 0x8 + .align 2 +gSpriteAnim_8571534:: @ 8571534 + .2byte 0x0008, 0x0000, 0xffff, 0x0000 -gUnknown_0857153C:: @ 857153C - .incbin "baserom.gba", 0x57153c, 0x8 + .align 2 +gSpriteAnim_857153C:: @ 857153C + .2byte 0x000c, 0x0000, 0xffff, 0x0000 -gUnknown_08571544:: @ 8571544 - .incbin "baserom.gba", 0x571544, 0x8 + .align 2 +gSpriteAnim_8571544:: @ 8571544 + .2byte 0x0010, 0x0000, 0xffff, 0x0000 -gUnknown_0857154C:: @ 857154C - .incbin "baserom.gba", 0x57154c, 0x8 + .align 2 +gSpriteAnim_857154C:: @ 857154C + .2byte 0x0014, 0x0000, 0xffff, 0x0000 -gUnknown_08571554:: @ 8571554 - .incbin "baserom.gba", 0x571554, 0x8 + .align 2 +gSpriteAnim_8571554:: @ 8571554 + .2byte 0x0018, 0x0000, 0xffff, 0x0000 -gUnknown_0857155C:: @ 857155C - .incbin "baserom.gba", 0x57155c, 0xC + .align 2 +gSpriteAnim_857155C:: @ 857155C + .2byte 0x0000, 0x002d, 0x0008, 0x002d, 0xfffe, 0x0000 -gUnknown_08571568:: @ 8571568 - .incbin "baserom.gba", 0x571568, 0xC + .align 2 +gSpriteAnim_8571568:: @ 8571568 + .2byte 0x0010, 0x002d, 0x0018, 0x002d, 0xfffe, 0x0000 -gUnknown_08571574:: @ 8571574 - .4byte gUnknown_08571524 - .4byte gUnknown_0857152C + .align 2 +gSpriteAnimTable_08571574:: @ 8571574 + .4byte gSpriteAnim_8571524 + .4byte gSpriteAnim_857152C -gUnknown_0857157C:: @ 857157C - .4byte gUnknown_08571524 - .4byte gUnknown_0857152C - .4byte gUnknown_08571534 - .4byte gUnknown_0857153C - .4byte gUnknown_08571544 - .4byte gUnknown_0857154C - .4byte gUnknown_08571554 + .align 2 +gSpriteAnimTable_0857157C:: @ 857157C + .4byte gSpriteAnim_8571524 + .4byte gSpriteAnim_857152C + .4byte gSpriteAnim_8571534 + .4byte gSpriteAnim_857153C + .4byte gSpriteAnim_8571544 + .4byte gSpriteAnim_857154C + .4byte gSpriteAnim_8571554 -gUnknown_08571598:: @ 8571598 - .4byte gUnknown_0857155C - .4byte gUnknown_08571568 + .align 2 +gSpriteAnimTable_08571598:: @ 8571598 + .4byte gSpriteAnim_857155C + .4byte gSpriteAnim_8571568 -gUnknown_085715A0:: @ 85715A0 - .incbin "baserom.gba", 0x5715a0, 0x10 + .align 2 +gSpriteAffineAnim_085715A0:: @ 85715A0 + .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 -gUnknown_085715B0:: @ 85715B0 - .4byte gUnknown_085715A0 + .align 2 +gSpriteAffineAnimTable_085715B0:: @ 85715B0 + .4byte gSpriteAffineAnim_085715A0 + .align 2 gUnknown_085715B4:: @ 85715B4 - spr_template 0, 0, gUnknown_0852490C, gUnknown_08571574, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - spr_template 1, 1, gUnknown_08524934, gUnknown_08571598, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0, 0, gUnknown_0852490C, gSpriteAnimTable_08571574, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 1, 1, gUnknown_08524934, gSpriteAnimTable_08571598, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_085715E4:: @ 85715E4 - spr_template 2, 2, gUnknown_0852490C, gUnknown_0857157C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 2, 2, gUnknown_0852490C, gSpriteAnimTable_0857157C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_085715FC:: @ 85715FC - spr_template 4, 4, gUnknown_0852490C, gUnknown_08571574, NULL, gDummySpriteAffineAnimTable, nullsub_39 + spr_template 4, 4, gUnknown_0852490C, gSpriteAnimTable_08571574, NULL, gDummySpriteAffineAnimTable, nullsub_39 + .align 2 gUnknown_08571614:: @ 8571614 .4byte gUnknown_085EDA96 .4byte gUnknown_085ED932 @@ -311,6 +391,7 @@ gUnknown_08571614:: @ 8571614 .4byte gUnknown_085EDA78 .4byte gUnknown_085ED931 + .align 2 gUnknown_08571650:: @ 8571650 unk_trainer_card_struct gUnknown_085EDAB1, gUnknown_085EDB0F, 0x59, 0x28, 1, 0 unk_trainer_card_struct gUnknown_085EDABE, gUnknown_085EDB4E, 0x21, 0x2A, 1, 0 diff --git a/graphics/frontier_pass/map_heads.png b/graphics/frontier_pass/map_heads.png new file mode 100644 index 0000000000000000000000000000000000000000..82ef1cd2ed8178e2dc1d8a46b5d61f65f132138c GIT binary patch literal 319 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!VDx|E`RzTNHG=%xjQkeJ16rJ$YDu$^mSxl z*x1kgCy^D%Hwf?vaVE@JSGJE zNQgM#;PB(e51^(yF{?s>6lZ})WHAE+-(e7DJf6QI1t>Vf)5S4F<9zY~z8?ua%ik+} z*}dZedqU@h6Eh11I;VeB5Zrfv^R>6^#*41+y~UMe6PPna;0tr7g?Z+ThEiLzpl!`F zZvTJGc;!Gjk4tlT0?U=VAK%5Yd;IUdE4X&|ZwDp8-C^6Ca^J_9=CjTCcz5X{xg!5lOA&2D*{K M)78&qol`;+0E;++8^X(#5u2X@_i?hsjN7aRvAU8tjejpB2_^Z6{Tp!sFGsUT5VLyPh%yxkpDDP zBUMpVRa14RzD*Z^KKLZ#@I)fO@5QZ|0;f%nRPu+tM@L?pQ7|j^QGLG>~U?P*4%oL_Fjp>f> zu1_?&e}7vun8_?=lR+kPn9Drovw(#xVlhit>iGZex3!GrtY9TstYS55Sj#%rvw>_j zvWd-(AF6)~Icz1DZER-;dE~Q`UF>ELd)dc+#}CzifP)<3Fh@AbF^+SBlbqr-XE@6_ z&O3gn{tH~>5|_EcRjzTJ8{Fg;x4FYz?s4C<{{atq#ABZDlxIBW1qHn16@?V>nm3;P zZ+XXiKJbxGeC7*Z`NnsC@RMKs=8s2z2YKUD6E$^V-oKZ6tB(hr)LHG6ggijTk04lR)m=u@WZvu{r~A(k>PG&MF-~p1)Ztl2><{9 literal 0 HcmV?d00001 diff --git a/graphics/frontier_pass/map_screen.png b/graphics/frontier_pass/map_screen.png new file mode 100644 index 0000000000000000000000000000000000000000..5d2b4467f9b6104ca53f28af43c733ddf488f001 GIT binary patch literal 3333 zcmV+g4f^tlP)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMF0Q*Xn^R5pwPI;$k4!m@YtZJfPj!-XmDtd zXn4TD;NXb3fM}RVkl48Bn1JZ;_>P1B_W%F@32;bRa{vGi!vFvd!vV){sAK>D3|>h@ zK~z}7t(gCB6XzYr{VzQ3q~Wa%io0&W)<(m8DTOH7uwyiuL|Wra-9)MmbB9Qph?U+2 zu~LQ7;Itc)Gb!ant7>IJovUy^poNgLhqh@T)ech&q14x_<&LBkZJ(%wbi=86_W3;b z+!qIvO5Hwo?DO3{ujl=FKA+F?JeL3({U7ZA2q+Um;0r$SsDa=?13%qhpT<)SctG*S zvbdub(7-=y0Q@ZVPT2yX4Nq~kN03%azMEO ztJNz)yyz(Kns~T6fWK0Duc&+>uf_%9T8#_D1&A1m_ICiv9-yHvK!l1qH!g9Z^tlIE zS@pT#0Z@XN%jy6a@foWN5Ju{|K>Yw(*9BqNpdP?EzZAe5`xh0wfH&83!MW~t!38)4 zA!fd!@&ILf!e4F-{2_L1DWJh0Z^sbePbLB2b4I{1;ewkm-vDyi=Yl_-g$oS7 zmjKEQ%K+ShS`I+`09xyUThhz9Pz#{7fWoo>G0)cmY!fcHfvxL8*;yz=xatE$%X)yN zvD9vtH6}F?MgV-Jp&(I000HLm0=mHq(kFMrNXR2 z!S>}8{iNh5xU8xQymuy=rxVsRw4Ln}fVWuHDpfLi6$7+c1WH(H(NzEd2_p4$Vuuar zp6#2l0XbF)&jH|e7<|~C^8*%b09RlR7_xfsBPIFRx}7_$Sb|CtO>_zc4>16+4_yT! z8gSNh6^tLS_R+c9bnA%|$%GZ_o|UA&nNFcV06@VuK2p2Eq|`4#L)KL=u9$yG%-v30 zAJe0W=@>--briI7z%@`1S3PS30OrA=)S>55fq79%wo2D43;^vEJEGSRFvThWU;rqx zitM$Q+H?+Bbx0dYA;8Fg-cVjS$rZHEN`3IYW{0s#8G1}Dc2bdjfFc40QrrNLHRd<$ zY?-tbNC=QP;4P~{Z$s(K(IS&&>DQui6sgVB0ibG|BAYh741j`xvU8~5a=V1pHj9Aw zr;62wc$z{KWJPfR=cOM*mS;=9dhpVgh!uX$000_SV71zLnFK&2VpSga7(^cZDJqcn zYiO?kKvjE~Y38ibBC||m{6K!pHUz{HeIQ_6v@0O1`-;^yy!>AW1=2wJJK+z*;Sc}{ z=X+SyFs%~IAci6L6f4}S0N7z!-LcM@X~@KbG-*{HJamYzTJ;VnkcNZV(?=sl<16QT z5x`8InwBxH9I!kEiGlRyqB==-nY`_6s->9lQtDwD-OmsaH zk0C&>B*#2J908Hk^KaS!2&9qA!62C9&lW9dAay7V28OoYI^T ztYk3W2)MM3e!N`(re?a?Og9g4@yy;)0f-NdBA|;;s@4gvfFm*)69#ee4f?U8U}{#1 zN_`cWZgf4qcSrzQ_m4_3bRimz2dpzZu3IB^yaAAFR}Z=hO0WT{j*S(;01)f%k9PF$ zYTY|3?QCvtUZ+UO08aLN!u|;oz=a{>)WL(O0MG9!MWjd-wQ&V8Njf|vAwaE6U)J-m3=(0B`~GW#<)$>{DF9C0oJa-=Tt+lYG{{ID0*yjihz< zhmqAs6a=)&gDZNk9!+f?2;r*$N`?B;9x=pMU(GnryhR`(96N;DRYs>=S507NT+m8`NR(*)^tq#pqTWJT{( z>P7hGfT!Hu$rWWdeMA|T_Cao{4j`W^2G%mxO`l*lexw0~X&M09tak@A5=`3wQN%aZ zL81-i+pIV9XSB2cOcpbN_E~7&Jxk-{0XUT=jVshP>#9ab2mz4hP>q+PE$oW{_&ro8 zX5K8waFGM5=Q5c<$2=;SXYnUdK{}*`j%~HxBe0VJdl@1DWBcj(IRL=#!?0?OnHOAu zQ7oc@4z57vfJQ=ACerMOwae0UIF80&smEOKGG08hqM2r%RW7 z+bD>_DT+6t6~4%vTyz1CLbe8yEg3k}H^^K8q?~0zb8mO*n=nB$0=_&g$`=5z;Z!>S zztA67IDp|c_R@*ElrN6NSsow<%8$&=E0PIeiWH&1JRI2Ttw2T=O>Ek);a%-{;Mk6#X z!$WqB3zap@4`}HCz-hKPb(1Z!#kI|)F&Kj5xkRS~%aS=k#(S~@8UXlq55rP?{f6$u zS!b}~=@ASg9&HA?&c;jt7_F_lx{^s$&|BC`LIHe;Q1C}luoZVCo~hzNdzA}LlO!w&OsF6Ykb>bNs4*~L(XnK3O7R(&W64Z zIq=azD2j=YWfbz#FaUyDs)s)z!XSdI^NB>O@2NpKvpom%FOU&HAP1e$kT<0)YQPP}4^2SNc^eEA=8kv;PATB;ixnqV$#qf`aK#qYLmgSCt-(;0yXo z|2`6lL$K^Y5PqN}m1QE5M P00000NkvXXu0mjfh_36A literal 0 HcmV?d00001 diff --git a/graphics/frontier_pass/record_frame.bin b/graphics/frontier_pass/record_frame.bin new file mode 100644 index 0000000000000000000000000000000000000000..ded0f8165a7829475155547d92e7f8f91d6e3f13 GIT binary patch literal 144 ucmZw9w+#Rw5Cp+(6Py2o$g#E4z-jUcL?L0g(3mV?lPN-_i^UlnuJHIo8Xg}2 literal 0 HcmV?d00001 diff --git a/graphics/frontier_pass/small_map_and_card.bin b/graphics/frontier_pass/small_map_and_card.bin new file mode 100644 index 0000000000000000000000000000000000000000..4578d7d7e6cf8b4d6b7c2fa8b6d4e550c1d44919 GIT binary patch literal 672 zcmZwB!-5b{06@`f-E2&@jcKNuY}@9|wr$(C+hlGsH<_EvO+WC?7o1qeHjZ(PXM7Ww z&_pISiAhZ*rZ$afO=o&Dn9)pTHj6pUWrVrSV_x%_-vSo2kcBN_NlRJUGM2TR<*i^v zD_Pm3LY-a~M*~M=5u$O%t<_JeQ#&J$?l2e@K3}-pVc`k5~OI+p(SGmS@Zg7)Z+~y8< zxyOAT@Q_D5<_S-E#&cfql2^Ru4R3kJdp_`yPgDs$tI{C&Y)FUTvm*n7&w-2&J}2;* UFMQ=2-}%8$e({?>{N*420TZL{NdN!< literal 0 HcmV?d00001 diff --git a/graphics/frontier_pass/small_map_and_card_affine.bin b/graphics/frontier_pass/small_map_and_card_affine.bin new file mode 100644 index 0000000000..25cb407ae9 --- /dev/null +++ b/graphics/frontier_pass/small_map_and_card_affine.bin @@ -0,0 +1,2 @@ + + $%&'()*+,-./456789:;<=>?DEFGHIJKLMNOTUVWXYZ[\]^_defghijklmnotuvwxyz{|}~tuvwxyz{|}~ !"#0123@ABCPQRS \ No newline at end of file diff --git a/graphics/frontier_pass/unknown_571298.bin b/graphics/frontier_pass/unknown_571298.bin new file mode 100644 index 0000000000..a781f0b391 --- /dev/null +++ b/graphics/frontier_pass/unknown_571298.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/graphics/trainer_card/badges.png b/graphics/trainer_card/badges.png new file mode 100644 index 0000000000000000000000000000000000000000..d06cfbe8a8c5e76c53d4c1845cb6f587a50f53a1 GIT binary patch literal 563 zcmV-30?hr1P)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMTlT<`1ttH(9p23uy}ZQ_=q^zI0$IC_&|uj z_|RbJusFbYz>r9oXt?;u$jATy0P;{M7XSbN32;bRa{vGi!vFvd!vV){sAK>D0gOpR zK~y-)g;UFJ#4rf-A0Vf_uS9aU6z3i(n|uHNFJh;63WM|LuBt{_Ee6j30}lUu5=3B- z$o3MW?cF*(2Rc!Vi0c2t4JCB0@;I+QJkoeHXEjrza4H?oh<3~gu((kKpr&vXha`La za(s-Ekdv9W!i`{E^#r21a1X2ZjO96X2@yCf)oDmL2|8Y_1U-L!!*>u+eC9>DHNvxY zL9DqDsSJ02w&3Ssqs0gg>Y@Y_CmJ zf&xJDG3hRlR2N}45oaHw{YV=(T&N2VHxUb;1i^QK1Oz6Q7GN{*IcNzJ#HgHZV^p#^nRw&w!C>hN0r{N!fJn+raX@B@p8Px#1ZP1_K>z@;j|==^1poj5Fi=cXMTlT<`1ttH(9p23uy}ZQ_=q^zI0$IC_&|uj z_|RbJusFbYz>r9oXt?;u$jATy0P;{M7XSbN32;bRa{vGi!vFvd!vV){sAK>D0i;Pp zK~y-)b(6ues~`-9d4mkleaFu2itqI``X<4>*9)h33$5sueJH@5UYEj5abZB8Bku3b)@oYmPd>ipjbO~ z0H9qzJhpPbC4P(d8rgyiA!L>ZZiQs_7!zFrteyZ~k$^<9Km5AS3K&KKln`TBIh@>D zlOYDg+yo%v^ajvmEsHc|zHR=_2P4MFp>;w0Wq@-yxFjh=1%P$diZ(t%p5P1ON(R!r z-TaX+0Qe{3xX6CQ2dA*aCw>563qh1BV9v*O_&MFuH-J+bapZ71(9#FMM^<<$n5PS1 zssNJd0P#7B)NvR}?f_*O9+CqI;3r=xnEeDit`x=?QL3^GPU~GU1ij_O`bCIS2$f!! zXy6C+w)XQ9@dR*Rm7%p11LO`_fdanD$P%I&DPxiYTM8;(ZPm*&@OxScYu`u)o~>N$ zZwH_XPz~DjpylIjOec6UT`M!H#dGUWANOwFYe=r~s`+D>UQ_uUXWn!7xn5KGpKhIki;?w{D002ovPDHLkV1mZx1sVVV literal 0 HcmV?d00001 diff --git a/graphics/trainer_card/female_bg.pal b/graphics/trainer_card/female_bg.pal new file mode 100644 index 0000000000..9df82c665b --- /dev/null +++ b/graphics/trainer_card/female_bg.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 +230 123 139 +164 49 115 +0 0 0 +0 0 0 diff --git a/graphics/trainer_card/female_bg_fr.pal b/graphics/trainer_card/female_bg_fr.pal new file mode 100644 index 0000000000..3e8a3ab52b --- /dev/null +++ b/graphics/trainer_card/female_bg_fr.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 98 115 +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 +189 148 16 +255 213 82 +230 148 82 +213 98 41 +197 197 197 +90 90 90 diff --git a/graphics/trainer_card/four_stars.pal b/graphics/trainer_card/four_stars.pal new file mode 100644 index 0000000000..4e1d56b549 --- /dev/null +++ b/graphics/trainer_card/four_stars.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +139 98 115 +246 246 222 +246 238 172 +164 164 164 +123 123 123 +98 98 115 +41 57 65 +57 106 139 +65 139 197 +246 230 139 +230 213 49 +213 197 57 +156 115 57 +106 189 255 +205 205 205 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +106 180 213 +41 123 164 +0 0 0 +0 0 0 +98 98 115 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +106 189 255 +205 205 205 +0 0 0 diff --git a/graphics/trainer_card/four_stars_fr.pal b/graphics/trainer_card/four_stars_fr.pal new file mode 100644 index 0000000000..79027f0d8f --- /dev/null +++ b/graphics/trainer_card/four_stars_fr.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +139 98 115 +255 246 230 +246 238 213 +246 246 197 +246 238 180 +246 222 106 +164 164 164 +98 98 115 +255 255 148 +246 222 49 +246 205 8 +238 189 0 +189 148 57 +255 255 197 +255 255 255 +246 230 82 +139 98 115 +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 +189 148 16 +255 213 82 +82 205 180 +65 172 164 +197 197 197 +90 90 90 +0 0 0 +32 65 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 diff --git a/graphics/trainer_card/gold.pal b/graphics/trainer_card/gold.pal new file mode 100644 index 0000000000..ebd175e974 --- /dev/null +++ b/graphics/trainer_card/gold.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 98 115 +246 197 0 +205 164 0 +246 197 0 +246 197 0 +246 197 0 +246 197 0 +246 197 0 +0 0 0 +0 0 0 +189 148 16 +255 213 82 +0 0 0 +0 0 0 +189 148 16 +246 197 0 diff --git a/graphics/trainer_card/one_star.pal b/graphics/trainer_card/one_star.pal new file mode 100644 index 0000000000..62c51c91f6 --- /dev/null +++ b/graphics/trainer_card/one_star.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +139 98 115 +238 255 246 +213 238 230 +164 164 164 +123 123 123 +98 98 115 +41 57 65 +57 106 139 +65 139 197 +189 213 205 +148 180 164 +106 148 123 +65 115 90 +106 189 255 +205 205 205 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +106 180 213 +41 123 164 +0 0 0 +0 0 0 +98 98 115 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +106 189 255 +205 205 205 +0 0 0 diff --git a/graphics/trainer_card/one_star_fr.pal b/graphics/trainer_card/one_star_fr.pal new file mode 100644 index 0000000000..9215c75920 --- /dev/null +++ b/graphics/trainer_card/one_star_fr.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +139 98 115 +222 255 230 +205 246 222 +197 238 213 +189 230 205 +246 205 148 +164 164 164 +98 98 115 +246 213 139 +180 205 148 +131 180 172 +115 156 156 +82 131 123 +255 246 189 +255 255 255 +156 205 197 +139 98 115 +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 +189 148 16 +255 213 82 +82 205 180 +65 172 164 +197 197 197 +90 90 90 +0 0 0 +32 65 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 diff --git a/graphics/trainer_card/stickers_fr.png b/graphics/trainer_card/stickers_fr.png new file mode 100644 index 0000000000000000000000000000000000000000..12a67a30fbb315c852a4b9939cd22584410bc045 GIT binary patch literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^0zmA*!VDxI2ESSgq!^2X+?^QKos)S98wB`-xc>OC;|CBNSn%S*hZ{E@0EO`b`N>l@166PqctjR6Fz_7)VaDV6 zD^h@hcRXDjLp09!PPoW>$biSC_Y{N5T!n8;N2fDtP5qmGXx{`b&Iu>{{mQDp7bz8K zK2@t+&#+Bk^)W}D1xq!)39Q{FwOe#;s4M@%wP9TAf+{rK5?9GFt!s#y?s_$*bULdg zr?Vx`2f4`WC*D*aie$%pb&yK4fGva-EqT^(^2v#x$=sNFK+N|FT3LZ~aKbLh*2~7YF{fV~# literal 0 HcmV?d00001 diff --git a/graphics/trainer_card/stickers_fr1.pal b/graphics/trainer_card/stickers_fr1.pal new file mode 100644 index 0000000000..774dbb4869 --- /dev/null +++ b/graphics/trainer_card/stickers_fr1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 246 189 +255 255 255 +255 197 164 +238 246 246 +222 222 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 diff --git a/graphics/trainer_card/stickers_fr2.pal b/graphics/trainer_card/stickers_fr2.pal new file mode 100644 index 0000000000..9244e4a03e --- /dev/null +++ b/graphics/trainer_card/stickers_fr2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 246 189 +255 255 255 +98 197 238 +238 246 246 +222 222 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 diff --git a/graphics/trainer_card/stickers_fr3.pal b/graphics/trainer_card/stickers_fr3.pal new file mode 100644 index 0000000000..abe9e9206e --- /dev/null +++ b/graphics/trainer_card/stickers_fr3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 246 189 +255 255 255 +246 230 74 +238 246 246 +222 222 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 diff --git a/graphics/trainer_card/stickers_fr4.pal b/graphics/trainer_card/stickers_fr4.pal new file mode 100644 index 0000000000..422e986b19 --- /dev/null +++ b/graphics/trainer_card/stickers_fr4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 246 189 +255 255 255 +106 131 148 +238 246 246 +222 222 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 diff --git a/graphics/trainer_card/three_stars.pal b/graphics/trainer_card/three_stars.pal new file mode 100644 index 0000000000..21f3d83eb4 --- /dev/null +++ b/graphics/trainer_card/three_stars.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +139 98 115 +246 246 255 +230 230 238 +189 189 197 +156 156 156 +156 106 41 +41 57 65 +57 106 139 +65 139 197 +230 230 238 +189 189 197 +156 156 156 +123 123 123 +106 189 255 +205 205 205 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +106 180 213 +41 123 164 +0 0 0 +0 0 0 +98 98 115 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +106 189 255 +205 205 205 +0 0 0 diff --git a/graphics/trainer_card/three_stars_fr.pal b/graphics/trainer_card/three_stars_fr.pal new file mode 100644 index 0000000000..e984eab422 --- /dev/null +++ b/graphics/trainer_card/three_stars_fr.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +139 98 115 +238 246 246 +238 246 246 +238 238 238 +230 230 230 +246 205 148 +164 164 164 +98 98 115 +255 238 131 +205 205 164 +197 205 205 +172 180 172 +131 139 156 +246 246 197 +255 255 255 +213 222 222 +139 98 115 +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 +189 148 16 +255 213 82 +82 205 180 +65 172 164 +197 197 197 +90 90 90 +0 0 0 +32 65 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 diff --git a/graphics/trainer_card/two_stars.pal b/graphics/trainer_card/two_stars.pal new file mode 100644 index 0000000000..bacce54f52 --- /dev/null +++ b/graphics/trainer_card/two_stars.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +139 98 115 +255 246 230 +246 230 213 +205 156 90 +180 131 65 +98 98 115 +41 57 65 +57 106 139 +65 139 197 +230 189 139 +205 156 115 +180 131 82 +156 106 41 +106 189 255 +205 205 205 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +106 180 213 +41 123 164 +0 0 0 +0 0 0 +98 98 115 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +106 189 255 +205 205 205 +0 0 0 diff --git a/graphics/trainer_card/two_stars_fr.pal b/graphics/trainer_card/two_stars_fr.pal new file mode 100644 index 0000000000..748e17aa89 --- /dev/null +++ b/graphics/trainer_card/two_stars_fr.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +139 98 115 +246 246 205 +246 238 197 +238 230 189 +230 222 156 +246 205 148 +164 164 164 +98 98 115 +246 238 139 +222 197 139 +213 189 139 +197 180 123 +164 123 82 +255 255 205 +255 255 255 +230 205 156 +139 98 115 +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 +189 148 16 +255 213 82 +82 205 180 +65 172 164 +197 197 197 +90 90 90 +0 0 0 +32 65 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 diff --git a/graphics/trainer_card/unknown_56F18C.pal b/graphics/trainer_card/unknown_56F18C.pal new file mode 100644 index 0000000000..25a3ac1d21 --- /dev/null +++ b/graphics/trainer_card/unknown_56F18C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +255 255 255 +98 98 98 +213 213 205 +230 8 8 +255 189 115 +32 156 8 +148 246 148 +49 82 205 +164 197 246 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 From 098671750b2ccc4be5815da7cab6d78c8b7eccc4 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sat, 20 Jan 2018 00:49:21 -0600 Subject: [PATCH 48/64] Extract data from text window --- data/graphics.s | 6 +- data/text_window.s | 270 +++++++++++++++------------ graphics/interface/textbox.png | Bin 198 -> 0 bytes graphics/text_window/1.png | Bin 0 -> 199 bytes graphics/text_window/10.png | Bin 0 -> 316 bytes graphics/text_window/11.png | Bin 0 -> 285 bytes graphics/text_window/12.png | Bin 0 -> 354 bytes graphics/text_window/13.png | Bin 0 -> 276 bytes graphics/text_window/14.png | Bin 0 -> 320 bytes graphics/text_window/15.png | Bin 0 -> 327 bytes graphics/text_window/16.png | Bin 0 -> 292 bytes graphics/text_window/17.png | Bin 0 -> 385 bytes graphics/text_window/18.png | Bin 0 -> 284 bytes graphics/text_window/19.png | Bin 0 -> 346 bytes graphics/text_window/2.png | Bin 0 -> 183 bytes graphics/text_window/20.png | Bin 0 -> 314 bytes graphics/text_window/3.png | Bin 0 -> 272 bytes graphics/text_window/4.png | Bin 0 -> 242 bytes graphics/text_window/5.png | Bin 0 -> 323 bytes graphics/text_window/6.png | Bin 0 -> 268 bytes graphics/text_window/7.png | Bin 0 -> 394 bytes graphics/text_window/8.png | Bin 0 -> 241 bytes graphics/text_window/9.png | Bin 0 -> 325 bytes graphics/text_window/message_box.png | Bin 0 -> 241 bytes graphics/text_window/text_pal1.pal | 19 ++ graphics/text_window/text_pal2.pal | 19 ++ graphics/text_window/text_pal3.pal | 19 ++ graphics/text_window/text_pal4.pal | 19 ++ src/save_failed_screen.c | 8 +- src/text_window.c | 4 +- 30 files changed, 233 insertions(+), 131 deletions(-) delete mode 100755 graphics/interface/textbox.png create mode 100644 graphics/text_window/1.png create mode 100644 graphics/text_window/10.png create mode 100644 graphics/text_window/11.png create mode 100644 graphics/text_window/12.png create mode 100644 graphics/text_window/13.png create mode 100644 graphics/text_window/14.png create mode 100644 graphics/text_window/15.png create mode 100644 graphics/text_window/16.png create mode 100644 graphics/text_window/17.png create mode 100644 graphics/text_window/18.png create mode 100644 graphics/text_window/19.png create mode 100644 graphics/text_window/2.png create mode 100644 graphics/text_window/20.png create mode 100644 graphics/text_window/3.png create mode 100644 graphics/text_window/4.png create mode 100644 graphics/text_window/5.png create mode 100644 graphics/text_window/6.png create mode 100644 graphics/text_window/7.png create mode 100644 graphics/text_window/8.png create mode 100644 graphics/text_window/9.png create mode 100644 graphics/text_window/message_box.png create mode 100644 graphics/text_window/text_pal1.pal create mode 100644 graphics/text_window/text_pal2.pal create mode 100644 graphics/text_window/text_pal3.pal create mode 100644 graphics/text_window/text_pal4.pal diff --git a/data/graphics.s b/data/graphics.s index c1ca770358..ce7c2c3ba6 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -5042,11 +5042,11 @@ gUnknown_08DDD704:: @ 8DDD704 .align 2 gUnknown_08DDD728:: @ 8DDD728 - .incbin "graphics/interface/textbox.gbapal" @ textbox palette? + .incbin "graphics/text_window/message_box.gbapal" .align 2 -gUnknown_08DDD748:: @ 8DDD748 - .incbin "graphics/interface/textbox.4bpp" +gMessageBox_Gfx:: @ 8DDD748 + .incbin "graphics/text_window/message_box.4bpp" .align 2 gWallpaperIcon_Cross:: diff --git a/data/text_window.s b/data/text_window.s index 716425100a..8acbe5a251 100644 --- a/data/text_window.s +++ b/data/text_window.s @@ -2,169 +2,195 @@ .include "constants/constants.inc" .section .rodata - .align 2, 0 -gUnknown_0850E87C:: @ 850E87C - .incbin "baserom.gba", 0x50e87c, 0x120 + .align 2 +gTextWindowFrame1_Gfx:: @ 850E87C + .incbin "graphics/text_window/1.4bpp" -gUnknown_0850E99C:: @ 850E99C - .incbin "baserom.gba", 0x50e99c, 0x120 + .align 2 +gTextWindowFrame2_Gfx:: @ 850E99C + .incbin "graphics/text_window/2.4bpp" -gUnknown_0850EABC:: @ 850EABC - .incbin "baserom.gba", 0x50eabc, 0x120 + .align 2 +gTextWindowFrame3_Gfx:: @ 850EABC + .incbin "graphics/text_window/3.4bpp" -gUnknown_0850EBDC:: @ 850EBDC - .incbin "baserom.gba", 0x50ebdc, 0x120 + .align 2 +gTextWindowFrame4_Gfx:: @ 850EBDC + .incbin "graphics/text_window/4.4bpp" -gUnknown_0850ECFC:: @ 850ECFC - .incbin "baserom.gba", 0x50ecfc, 0x120 + .align 2 +gTextWindowFrame5_Gfx:: @ 850ECFC + .incbin "graphics/text_window/5.4bpp" -gUnknown_0850EE1C:: @ 850EE1C - .incbin "baserom.gba", 0x50ee1c, 0x120 + .align 2 +gTextWindowFrame6_Gfx:: @ 850EE1C + .incbin "graphics/text_window/6.4bpp" -gUnknown_0850EF3C:: @ 850EF3C - .incbin "baserom.gba", 0x50ef3c, 0x120 + .align 2 +gTextWindowFrame7_Gfx:: @ 850EF3C + .incbin "graphics/text_window/7.4bpp" -gUnknown_0850F05C:: @ 850F05C - .incbin "baserom.gba", 0x50f05c, 0x120 + .align 2 +gTextWindowFrame8_Gfx:: @ 850F05C + .incbin "graphics/text_window/8.4bpp" -gUnknown_0850F17C:: @ 850F17C - .incbin "baserom.gba", 0x50f17c, 0x120 + .align 2 +gTextWindowFrame9_Gfx:: @ 850F17C + .incbin "graphics/text_window/9.4bpp" -gUnknown_0850F29C:: @ 850F29C - .incbin "baserom.gba", 0x50f29c, 0x120 + .align 2 +gTextWindowFrame10_Gfx:: @ 850F29C + .incbin "graphics/text_window/10.4bpp" -gUnknown_0850F3BC:: @ 850F3BC - .incbin "baserom.gba", 0x50f3bc, 0x120 + .align 2 +gTextWindowFrame11_Gfx:: @ 850F3BC + .incbin "graphics/text_window/11.4bpp" -gUnknown_0850F4DC:: @ 850F4DC - .incbin "baserom.gba", 0x50f4dc, 0x120 + .align 2 +gTextWindowFrame12_Gfx:: @ 850F4DC + .incbin "graphics/text_window/12.4bpp" -gUnknown_0850F5FC:: @ 850F5FC - .incbin "baserom.gba", 0x50f5fc, 0x120 + .align 2 +gTextWindowFrame13_Gfx:: @ 850F5FC + .incbin "graphics/text_window/13.4bpp" -gUnknown_0850F71C:: @ 850F71C - .incbin "baserom.gba", 0x50f71c, 0x120 + .align 2 +gTextWindowFrame14_Gfx:: @ 850F71C + .incbin "graphics/text_window/14.4bpp" -gUnknown_0850F83C:: @ 850F83C - .incbin "baserom.gba", 0x50f83c, 0x120 + .align 2 +gTextWindowFrame15_Gfx:: @ 850F83C + .incbin "graphics/text_window/15.4bpp" -gUnknown_0850F95C:: @ 850F95C - .incbin "baserom.gba", 0x50f95c, 0x120 + .align 2 +gTextWindowFrame16_Gfx:: @ 850F95C + .incbin "graphics/text_window/16.4bpp" -gUnknown_0850FA7C:: @ 850FA7C - .incbin "baserom.gba", 0x50fa7c, 0x120 + .align 2 +gTextWindowFrame17_Gfx:: @ 850FA7C + .incbin "graphics/text_window/17.4bpp" -gUnknown_0850FB9C:: @ 850FB9C - .incbin "baserom.gba", 0x50fb9c, 0x120 + .align 2 +gTextWindowFrame18_Gfx:: @ 850FB9C + .incbin "graphics/text_window/18.4bpp" -gUnknown_0850FCBC:: @ 850FCBC - .incbin "baserom.gba", 0x50fcbc, 0x120 + .align 2 +gTextWindowFrame19_Gfx:: @ 850FCBC + .incbin "graphics/text_window/19.4bpp" -gUnknown_0850FDDC:: @ 850FDDC - .incbin "baserom.gba", 0x50fddc, 0x120 + .align 2 +gTextWindowFrame20_Gfx:: @ 850FDDC + .incbin "graphics/text_window/20.4bpp" -gUnknown_0850FEFC:: @ 850FEFC - .incbin "baserom.gba", 0x50fefc, 0x20 + .align 2 +gTextWindowFrame1_Pal:: @ 850FEFC + .incbin "graphics/text_window/1.gbapal" -gUnknown_0850FF1C:: @ 850FF1C - .incbin "baserom.gba", 0x50ff1c, 0x20 + .align 2 +gTextWindowFrame2_Pal:: @ 850FF1C + .incbin "graphics/text_window/2.gbapal" -gUnknown_0850FF3C:: @ 850FF3C - .incbin "baserom.gba", 0x50ff3c, 0x20 + .align 2 +gTextWindowFrame3_Pal:: @ 850FF3C + .incbin "graphics/text_window/3.gbapal" -gUnknown_0850FF5C:: @ 850FF5C - .incbin "baserom.gba", 0x50ff5c, 0x20 + .align 2 +gTextWindowFrame4_Pal:: @ 850FF5C + .incbin "graphics/text_window/4.gbapal" -gUnknown_0850FF7C:: @ 850FF7C - .incbin "baserom.gba", 0x50ff7c, 0x20 + .align 2 +gTextWindowFrame5_Pal:: @ 850FF7C + .incbin "graphics/text_window/5.gbapal" -gUnknown_0850FF9C:: @ 850FF9C - .incbin "baserom.gba", 0x50ff9c, 0x20 + .align 2 +gTextWindowFrame6_Pal:: @ 850FF9C + .incbin "graphics/text_window/6.gbapal" -gUnknown_0850FFBC:: @ 850FFBC - .incbin "baserom.gba", 0x50ffbc, 0x20 + .align 2 +gTextWindowFrame7_Pal:: @ 850FFBC + .incbin "graphics/text_window/7.gbapal" -gUnknown_0850FFDC:: @ 850FFDC - .incbin "baserom.gba", 0x50ffdc, 0x20 + .align 2 +gTextWindowFrame8_Pal:: @ 850FFDC + .incbin "graphics/text_window/8.gbapal" -gUnknown_0850FFFC:: @ 850FFFC - .incbin "baserom.gba", 0x50fffc, 0x20 + .align 2 +gTextWindowFrame9_Pal:: @ 850FFFC + .incbin "graphics/text_window/9.gbapal" -gUnknown_0851001C:: @ 851001C - .incbin "baserom.gba", 0x51001c, 0x20 + .align 2 +gTextWindowFrame10_Pal:: @ 851001C + .incbin "graphics/text_window/10.gbapal" -gUnknown_0851003C:: @ 851003C - .incbin "baserom.gba", 0x51003c, 0x20 + .align 2 +gTextWindowFrame11_Pal:: @ 851003C + .incbin "graphics/text_window/11.gbapal" -gUnknown_0851005C:: @ 851005C - .incbin "baserom.gba", 0x51005c, 0x20 + .align 2 +gTextWindowFrame12_Pal:: @ 851005C + .incbin "graphics/text_window/12.gbapal" -gUnknown_0851007C:: @ 851007C - .incbin "baserom.gba", 0x51007c, 0x20 + .align 2 +gTextWindowFrame13_Pal:: @ 851007C + .incbin "graphics/text_window/13.gbapal" -gUnknown_0851009C:: @ 851009C - .incbin "baserom.gba", 0x51009c, 0x20 + .align 2 +gTextWindowFrame14_Pal:: @ 851009C + .incbin "graphics/text_window/14.gbapal" -gUnknown_085100BC:: @ 85100BC - .incbin "baserom.gba", 0x5100bc, 0x20 + .align 2 +gTextWindowFrame15_Pal:: @ 85100BC + .incbin "graphics/text_window/15.gbapal" -gUnknown_085100DC:: @ 85100DC - .incbin "baserom.gba", 0x5100dc, 0x20 + .align 2 +gTextWindowFrame16_Pal:: @ 85100DC + .incbin "graphics/text_window/16.gbapal" -gUnknown_085100FC:: @ 85100FC - .incbin "baserom.gba", 0x5100fc, 0x20 + .align 2 +gTextWindowFrame17_Pal:: @ 85100FC + .incbin "graphics/text_window/17.gbapal" -gUnknown_0851011C:: @ 851011C - .incbin "baserom.gba", 0x51011c, 0x20 + .align 2 +gTextWindowFrame18_Pal:: @ 851011C + .incbin "graphics/text_window/18.gbapal" -gUnknown_0851013C:: @ 851013C - .incbin "baserom.gba", 0x51013c, 0x20 + .align 2 +gTextWindowFrame19_Pal:: @ 851013C + .incbin "graphics/text_window/19.gbapal" -gUnknown_0851015C:: @ 851015C - .incbin "baserom.gba", 0x51015c, 0x20 + .align 2 +gTextWindowFrame20_Pal:: @ 851015C + .incbin "graphics/text_window/20.gbapal" + .align 2 gUnknown_0851017C:: @ 851017C - .incbin "baserom.gba", 0x51017c, 0xA0 + .incbin "graphics/text_window/message_box.gbapal" + .incbin "graphics/text_window/text_pal1.gbapal" + .incbin "graphics/text_window/text_pal2.gbapal" + .incbin "graphics/text_window/text_pal3.gbapal" + .incbin "graphics/text_window/text_pal4.gbapal" + + .align 2 gUnknown_0851021C:: @ 851021C - .4byte gUnknown_0850E87C - .4byte gUnknown_0850FEFC - .4byte gUnknown_0850E99C - .4byte gUnknown_0850FF1C - .4byte gUnknown_0850EABC - .4byte gUnknown_0850FF3C - .4byte gUnknown_0850EBDC - .4byte gUnknown_0850FF5C - .4byte gUnknown_0850ECFC - .4byte gUnknown_0850FF7C - .4byte gUnknown_0850EE1C - .4byte gUnknown_0850FF9C - .4byte gUnknown_0850EF3C - .4byte gUnknown_0850FFBC - .4byte gUnknown_0850F05C - .4byte gUnknown_0850FFDC - .4byte gUnknown_0850F17C - .4byte gUnknown_0850FFFC - .4byte gUnknown_0850F29C - .4byte gUnknown_0851001C - .4byte gUnknown_0850F3BC - .4byte gUnknown_0851003C - .4byte gUnknown_0850F4DC - .4byte gUnknown_0851005C - .4byte gUnknown_0850F5FC - .4byte gUnknown_0851007C - .4byte gUnknown_0850F71C - .4byte gUnknown_0851009C - .4byte gUnknown_0850F83C - .4byte gUnknown_085100BC - .4byte gUnknown_0850F95C - .4byte gUnknown_085100DC - .4byte gUnknown_0850FA7C - .4byte gUnknown_085100FC - .4byte gUnknown_0850FB9C - .4byte gUnknown_0851011C - .4byte gUnknown_0850FCBC - .4byte gUnknown_0851013C - .4byte gUnknown_0850FDDC - .4byte gUnknown_0851015C + .4byte gTextWindowFrame1_Gfx, gTextWindowFrame1_Pal + .4byte gTextWindowFrame2_Gfx, gTextWindowFrame2_Pal + .4byte gTextWindowFrame3_Gfx, gTextWindowFrame3_Pal + .4byte gTextWindowFrame4_Gfx, gTextWindowFrame4_Pal + .4byte gTextWindowFrame5_Gfx, gTextWindowFrame5_Pal + .4byte gTextWindowFrame6_Gfx, gTextWindowFrame6_Pal + .4byte gTextWindowFrame7_Gfx, gTextWindowFrame7_Pal + .4byte gTextWindowFrame8_Gfx, gTextWindowFrame8_Pal + .4byte gTextWindowFrame9_Gfx, gTextWindowFrame9_Pal + .4byte gTextWindowFrame10_Gfx, gTextWindowFrame10_Pal + .4byte gTextWindowFrame11_Gfx, gTextWindowFrame11_Pal + .4byte gTextWindowFrame12_Gfx, gTextWindowFrame12_Pal + .4byte gTextWindowFrame13_Gfx, gTextWindowFrame13_Pal + .4byte gTextWindowFrame14_Gfx, gTextWindowFrame14_Pal + .4byte gTextWindowFrame15_Gfx, gTextWindowFrame15_Pal + .4byte gTextWindowFrame16_Gfx, gTextWindowFrame16_Pal + .4byte gTextWindowFrame17_Gfx, gTextWindowFrame17_Pal + .4byte gTextWindowFrame18_Gfx, gTextWindowFrame18_Pal + .4byte gTextWindowFrame19_Gfx, gTextWindowFrame19_Pal + .4byte gTextWindowFrame20_Gfx, gTextWindowFrame20_Pal diff --git a/graphics/interface/textbox.png b/graphics/interface/textbox.png deleted file mode 100755 index ed8cd92ee2007a7de1f8e2a1f5981fb7275cda00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^1whQf!VDxY?@zk|qznRlLR^c_F8Tlee^OG?)vITp zad7J9XCaSV}|nw)Te zx#IoaYTiZX84m6%&)0tt>}}s$evrjT!S8XbPj7kW#S_)vWjm_MtIb8;)P8^Wj#bIz vUM>5zAHR5H-Y~yXiF+*9a_n-82@`|tu?ds9PGx@u8qVP9>gTe~DWM4f@P}70 diff --git a/graphics/text_window/1.png b/graphics/text_window/1.png new file mode 100644 index 0000000000000000000000000000000000000000..5d8020eff5ac26935dca94e946ad345c28ef53fd GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wg8-ip*QBFKnudm6URlLi%}Gg9 zii_8Dcb{Fecg?-4_kc=}!T{an^LB{Ts5z(GP@ literal 0 HcmV?d00001 diff --git a/graphics/text_window/10.png b/graphics/text_window/10.png new file mode 100644 index 0000000000000000000000000000000000000000..b01a75c6a606eb9d08500b886b033d7ae487aac5 GIT binary patch literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6-A0X`wF6DA~R7#RH6(D1{6;YUNji2{ZN6$T9n5-U0!ek|bFv7zF|g&7-m zY`AgZ#*ZIAJRAbDCT$J{>g6o(h%9Dc;5!V$jK}j=qyPn{db&7ys?MT0J_&`)g%`xomuU=lS+4+kp;b@O1Ta JS?83{1OSNsdm;b; literal 0 HcmV?d00001 diff --git a/graphics/text_window/11.png b/graphics/text_window/11.png new file mode 100644 index 0000000000000000000000000000000000000000..a0e576fce49c041bc2f9a579c5477e5aecc55083 GIT binary patch literal 285 zcmV+&0pk9NP)$I0001} zNklg$R literal 0 HcmV?d00001 diff --git a/graphics/text_window/12.png b/graphics/text_window/12.png new file mode 100644 index 0000000000000000000000000000000000000000..8bff592bacb5f52f6e7b0df2cdc83e5f68869321 GIT binary patch literal 354 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6-A0X`wF6DA~R7#MhXWK4)yP|)BoV~4_t4-79Zc>H)U;l~7vgo28S867iD z%s63S@#Du24~Kx`C0CaK^>P+?L>4nJ@ErzW#^d=bQh!1nrXyw|jhgrn50A@7et6 z%+gt>e|S$TzF9NTx^w>NBPMhH3C$O;v6C&h!n*drYQ8tyxR!RFs#i3V xR?n$opW)xU`usbe&dq&x!oh;wdg@{yc^M4S=kR*A{RVo2!PC{xWt~$(69A`}j>P}~ literal 0 HcmV?d00001 diff --git a/graphics/text_window/13.png b/graphics/text_window/13.png new file mode 100644 index 0000000000000000000000000000000000000000..706d134514e033743e70b96b373c6f0fb739f805 GIT binary patch literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6-A0X`wF6DA~R7#M8WvEjyr8$TF+08vFj#EBIJFHUqQc&vyxalxbD07U%9 zj~^Zm0lwTBVL-i{1s;*b3=DjSL74G){)!Z!V6LZ&V~EE2WCzxsrT_(oCmtnl*qZy? z7PwSbUDr~G2n1c znSb~=)?}V!lvI6-A0X`wF6DA~NcnECRvEjyr8$dBQm{DPIVnxP-4FwN&6udam@Z-UPA3uJ0 zI0UR_H*5ha;w6(}-O;qU+iSu9+ zT;wApDr5CbC|^fe_WGGk*F7z5XUe`*nf2s@{#Di1`L-FhTGF-)7M;3Q9kb@S)>7@g z=Oo^LYPc2czffnRoR7<#@70rBzP+)2e&?M16Yc}tri-QsNhm1-eb2z)>FVdQ&MBb@ E0CZe-VE_OC literal 0 HcmV?d00001 diff --git a/graphics/text_window/15.png b/graphics/text_window/15.png new file mode 100644 index 0000000000000000000000000000000000000000..b5d2dbfcd9c7ac5e7aa8815fc216af105026db42 GIT binary patch literal 327 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6-A0X`wF6DA~R7#OUmn2`}t5Rfoq$BYXnHr%*z;=zjtFMvvr!H*w5JRAa6 zpZd`W6y+@Nh%9Dc;5!V$jK}j=qyPmMc)B=-Xq-sdz#~%US*Y;xWDD1?IWm)W z^VK%+*EY!C6tG-g>HKtwo~dl}1%qowO7Hbk8c#%W%-Gw1^S7Kf>p_u_I4)Br$F9ou zS(jEnXgKA=C*b?7Vd9-7D>-(*h?v5qe0`RE_o8&YWjxouI&}3LePND`HhL13d|xK( zZ2jx|3-6b1+ZelLv!}I+yCdge^!`oX$E=A)78&q Iol`;+0J+tGWdHyG literal 0 HcmV?d00001 diff --git a/graphics/text_window/16.png b/graphics/text_window/16.png new file mode 100644 index 0000000000000000000000000000000000000000..eb8ed2ceaedcfffb7ce2461f250fba76e6eb2a3a GIT binary patch literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6-A0X`wF6DA}8naIGv;(&ri!G{k96%__QJRD|dC~VlV;l_mTY|3g7r~bH!*XZ z+7!O9&?0@>_5bWmGdDZV>D%;Yw}ZiA=~I>LED3zoKmY$%IQRekQwP6W_sbIsYP>m V_G*E5KeR!9@pScbS?83{1OP<@YEl3I literal 0 HcmV?d00001 diff --git a/graphics/text_window/17.png b/graphics/text_window/17.png new file mode 100644 index 0000000000000000000000000000000000000000..62211b43105043adc18f882e6c939a4ca2702e35 GIT binary patch literal 385 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6-A0X`wF6DA~R7#L&}6l~bAAs}JKfekB89N2N=!i5(P9srdfgC9RWcsK+s z6i|2u6y+@Nh%9Dc;5!V$jK}j=qyPnPdAc};Xq?xb;F!m($m4oZ)lH$HnG;HznPs S`C9`hKs;UjT-G@yGywp*0G*}) literal 0 HcmV?d00001 diff --git a/graphics/text_window/18.png b/graphics/text_window/18.png new file mode 100644 index 0000000000000000000000000000000000000000..c03fd75f5f3501222af0b9a9401df09fc8025493 GIT binary patch literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6-A0X`wF6DA~R7#IL~$l%A11v@5i{Mf*jUPXLcsK;` zoOrttsFbt7BeIx*f$uN~Gak=hkpdJf^>lFz(Kw&%z}i%B;J^Wm@PF&xRo?wvzFV4A zLSl9Lx>;L`uAK@s4rj0oJu&C{>az9swpLw#7ixWAj%|741CtrSrl0RvD^xIFE#^N` z$$gdip~F{&!hk6gm$RP?5_!JBLgXm-=7c$X3hs-Txf<@daSE^`Bmg~sX6ltA+_M5e O9`JPab6Mw<&;$VHI%T*3 literal 0 HcmV?d00001 diff --git a/graphics/text_window/19.png b/graphics/text_window/19.png new file mode 100644 index 0000000000000000000000000000000000000000..e60d8d579d3bbfd680838aaca0a6e088d1319aa0 GIT binary patch literal 346 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6-A0X`wF6DA~R7#M8WvEjyr8wm{-KPm!lBp56(5P0!p!HWwGKNx--_))Ro zLO{a~haW$FcsK;`lxA!M>g6o(h%9Dc;5!V$jK}j=qyPmsd%8G=Xq*qdu#vCHfrstE zzDEAV*3GgW?>O|27Vx!PW#740Vp`t3#6p9MN6ZaW3}Tp`tx@dwo`3(+Ki!-|`mzmdKI;Vst05If=LjV8( literal 0 HcmV?d00001 diff --git a/graphics/text_window/2.png b/graphics/text_window/2.png new file mode 100644 index 0000000000000000000000000000000000000000..5e89b4116b0fd30a30c812c7142ececfa836f7ac GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wg8-ip*C|tyGz|@bJc8i=|NmZ& zK_TWdO@K!lvI6-A0X`wF6DA}8nGo>f!jB&tZZrf){Ag%+;ovai!iU#DXmF37HUU>&eWS%ky+RpY5T2a&(|z3B-L-v6lorYA7x|2=-Qhxe=% zDwvizhEF*`GDc{k!)+{|U?T1OI*rF_vc92iz^c{wY9# zxz`pDX@EauJrARl_V`njxgN@xNAzq5V< literal 0 HcmV?d00001 diff --git a/graphics/text_window/3.png b/graphics/text_window/3.png new file mode 100644 index 0000000000000000000000000000000000000000..b7af18de73f9e1b9443ca572e22c0d300d605f02 GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wg8-ip*C|tyfJ{t~H0Rs@>f(D| zj#-A9TlQ|bclF-?|Np%lg9LkbX8~2u_H=O!k(fGn!d|XJ1|qHJ?=3ukx9QwfrFE_! z(t8iuwM$G|S9an&cT2@&@Aj_A@+lStlkU7{`qbv6`tr?s50)dE4kwCpb}bA3TiYa& ze5K`;ZR_IBzJT2?0xk24&i3gsXwHh+9K1+E)GGT|H;b znzQ%rZP~l!-qm~m|Nr-L4C;^;jRUH#^>lFzk(j!5!fxIM10L4BjM=m2XK)HFQr*Dd zC6>UV5y2QZ>C_$;MZv0d8|TN|NLLb66!2Q~im!J^i0qR!Gj&e5-=1i^OWxsHkDY<` zfu4d_N!(|ATRnHOi}|$7Kj74v`F_K!$L9rfd(Zup`4#k`=-!uU&D+d*Z(Vf0w|*Bx Xi|>`KB6qJG06E*!)z4*}Q$iB}%pq5i literal 0 HcmV?d00001 diff --git a/graphics/text_window/5.png b/graphics/text_window/5.png new file mode 100644 index 0000000000000000000000000000000000000000..94a0bcdd9b5446ed1331596fb22af6c9fc1b299e GIT binary patch literal 323 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6-A0X`wF6DB0wxNw8v#*YdMh6fc4KYnO1WH2zSU?}*Z(ZRrQ!hqq&4xrKv z3>g=G{P^MF5b)$`(q*6kXMsm#F#`kNVGw3Kp1&dmC^*N{#W6(Ve6j_X`Kh9TawEe`A?dG(q>NeetshDFGE}>H36(GG4>?3{A7Vcd<*% zaE`G()wm$`yHH2+E5@K}>#AQc#6(JZNH%Z$Xg{k zx59CqEujV`At6d8k|zvL76_IU3X0}%vlZTAX>|jg8N;bUmB!|zS(zGo)jBSdyH1_%KIJk?k&l;$m$${@ zii)#=z>~ZU;%8!{m|bIJln>0yHruwv#Eeae+a{5j!DvP3MagZEU`Knp`njxgN@xNA DdS_H5 literal 0 HcmV?d00001 diff --git a/graphics/text_window/7.png b/graphics/text_window/7.png new file mode 100644 index 0000000000000000000000000000000000000000..514f8b554fb0b8efd87220d3c385d763ba60d7bb GIT binary patch literal 394 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6-A0X`wF6DA~d7#OUuusGr1@W8|4M?k=ijEo-*4GU(>xNzXWiw6>(|&K z3j{xY{P1uHuwuTh2;^`UctjR6Fz_7)VaDV6D^h@hk3C%+Lp08ZPB7#;X9yC6?>^?XDC?9h~#~LCSTmC0`ESQnjB@)A0XLEl1cN zGl_+~Vav2{ym;_G*edi+D8msIZknSE?dpfJZEJ}xZ4boSu@P|<1)IO+FVtQ iwT|dUD_QSO-^cLWqkK#HNb6Mw<&;$UMO`59! literal 0 HcmV?d00001 diff --git a/graphics/text_window/8.png b/graphics/text_window/8.png new file mode 100644 index 0000000000000000000000000000000000000000..480751a02b2e1ab03fb4e292c35936c25e19fb07 GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wg8-ip*C|tyGz|@bJRk_#%h3Hz zb55~lbCSfGZpUv)&Hv|Y`Tvb!%ib;buHO6q|G$@G5ZlG;20*1Xo-U3d5>t}}QbYt& z7?=!nwYFXmJR&$TO5(%;4a-1=BaD}WHka#(urLYmKATd$WNNdeL#E*bA0-b-kH@hJ z4ALqyG_-&4aj@ujF|HMuUdzrV&MkStLdd{R*~*>gn5WD02PV8ngC-O^$ZRNX;G4?2 j^Q{u+KSxf1CkvPuuD>o}F!lvI6-A0X`wF6DA~R7#IL~$l$?;9}x{Z3T9lGap1>+7e6-a*l^>*jUPXLcsK+Y za$NZhRLWW45n0T@z;_sg8IR|$NC67Y^K@|x(KsI(u#xw$0ncW8kFe(fVxkwAbC%er ztZMX|nWEBPaq^De&V?mR;)V|$S$qR0X>Qp2)_3ilN7L55_lVFGxm>---~{)P*ynvr zE)1aoQVk{1*997GT6oCRo|$KsY}y|!Fi!R+%kg*J1xSV%y-(|k4*oBenB6r)K_#blY4}+gP z{oH>NS%G|m0G|-of)fjV{P>ZOkZ|F`i3c1UKXw!-%;1>tVS+)xi3JBf0Hq$hcmO0B ze#~GvvBRTaLHZJ@`#`;%1s;*b3=DjSL74G){)!Z!pqHnMV~EE2mdKI;Vst0MqwiQUCw| literal 0 HcmV?d00001 diff --git a/graphics/text_window/text_pal1.pal b/graphics/text_window/text_pal1.pal new file mode 100644 index 0000000000..df5d3c3377 --- /dev/null +++ b/graphics/text_window/text_pal1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 255 255 +98 98 98 +213 213 205 +230 8 8 +255 189 115 +32 156 8 +148 246 148 +49 82 205 +164 197 246 +255 255 255 +205 205 222 +205 205 222 +230 246 255 +205 205 222 +106 115 123 diff --git a/graphics/text_window/text_pal2.pal b/graphics/text_window/text_pal2.pal new file mode 100644 index 0000000000..25f63978aa --- /dev/null +++ b/graphics/text_window/text_pal2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 255 255 +98 98 98 +213 213 205 +230 8 8 +255 189 115 +32 156 8 +148 246 148 +49 82 205 +164 197 246 +255 255 255 +74 205 238 +49 164 238 +0 90 131 +24 98 197 +16 115 230 diff --git a/graphics/text_window/text_pal3.pal b/graphics/text_window/text_pal3.pal new file mode 100644 index 0000000000..9cbcdad4ca --- /dev/null +++ b/graphics/text_window/text_pal3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 255 255 +98 98 98 +213 213 205 +230 8 8 +255 189 115 +32 156 8 +148 246 148 +49 82 205 +164 197 246 +255 0 255 +205 213 213 +156 205 222 +98 115 123 +65 172 230 +131 164 180 diff --git a/graphics/text_window/text_pal4.pal b/graphics/text_window/text_pal4.pal new file mode 100644 index 0000000000..a004a081a9 --- /dev/null +++ b/graphics/text_window/text_pal4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 255 255 +98 98 98 +213 213 205 +230 8 8 +255 189 115 +32 156 8 +148 246 148 +49 82 205 +164 197 246 +57 98 115 +131 131 131 +164 164 164 +197 197 205 +230 230 238 +65 90 106 diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index 218ef68d75..efe38fbae8 100755 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -21,9 +21,9 @@ extern const u8 gBirchHelpGfx[]; extern const u8 gBirchBagTilemap[]; extern const u8 gBirchGrassTilemap[]; extern const u16 gBirchBagGrassPal[]; -extern const u16 gUnknown_0850FEFC[]; +extern const u16 gTextWindowFrame1_Pal[]; extern const u16 gUnknown_0860F074[]; -extern const u32 gUnknown_0850E87C[]; +extern const u32 gTextWindowFrame1_Gfx[]; extern struct SaveSection gSaveDataBuffer; extern u8 gText_SaveFailedCheckingBackup[]; @@ -226,7 +226,7 @@ static void CB2_SaveFailedScreen(void) InitBgsFromTemplates(0, gUnknown_085EFD88, 3); SetBgTilemapBuffer(0, (void *)&gDecompressionBuffer[0x2000]); CpuFill32(0, &gDecompressionBuffer[0x2000], 0x800); - LoadBgTiles(0, gUnknown_0850E87C, 0x120, 0x214); + LoadBgTiles(0, gTextWindowFrame1_Gfx, 0x120, 0x214); InitWindows(gUnknown_085EFD94); // AddWindowWithoutTileMap returns a u16/integer, but the info is clobbered into a u8 here resulting in lost info. Bug? gSaveFailedWindowIds[TEXT_WIN_ID] = AddWindowWithoutTileMap(gUnknown_085EFD9C); @@ -239,7 +239,7 @@ static void CB2_SaveFailedScreen(void) ResetPaletteFade(); LoadPalette(gBirchBagGrassPal, 0, 0x40); LoadPalette(sSaveFailedClockPal, 0x100, 0x20); - LoadPalette(gUnknown_0850FEFC, 0xE0, 0x20); + LoadPalette(gTextWindowFrame1_Pal, 0xE0, 0x20); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); SetWindowBorderStyle(gSaveFailedWindowIds[TEXT_WIN_ID], FALSE, 0x214, 0xE); SetWindowBorderStyle(gSaveFailedWindowIds[CLOCK_WIN_ID], FALSE, 0x214, 0xE); diff --git a/src/text_window.c b/src/text_window.c index 336536c046..c5334b11e6 100644 --- a/src/text_window.c +++ b/src/text_window.c @@ -8,7 +8,7 @@ extern u8 LoadBgTiles(u8 bg, const void *src, u16 size, u16 destOffset); extern void FillBgTilemapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette); extern const struct TilesPal gUnknown_0851021C[]; -extern const u32 gUnknown_08DDD748[]; +extern const u32 gMessageBox_Gfx[]; extern const u16 gUnknown_0851017C[]; extern const u16 gUnknown_08DDD728[]; @@ -22,7 +22,7 @@ const struct TilesPal* sub_8098758(u8 id) void copy_textbox_border_tile_patterns_to_vram(u8 windowId, u16 destOffset, u8 palOffset) { - LoadBgTiles(GetWindowAttribute(windowId, WINDOW_PRIORITY), gUnknown_08DDD748, 0x1C0, destOffset); + LoadBgTiles(GetWindowAttribute(windowId, WINDOW_PRIORITY), gMessageBox_Gfx, 0x1C0, destOffset); LoadPalette(GetOverworldTextboxPalettePtr(), palOffset, 0x20); } From 2ef74679512e2d5e64fea98e3f85ab3dc8e8f0c0 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sat, 20 Jan 2018 02:37:28 -0600 Subject: [PATCH 49/64] Extract data from pokemon_summary_screen --- data/pokemon_summary_screen.s | 422 ++++++++++++++++++++--- graphics/interface/region_map.bin | Bin 0 -> 2048 bytes graphics/interface/region_map.pal | 51 +++ graphics/interface/region_map.png | Bin 0 -> 18404 bytes graphics/interface/region_map_affine.bin | Bin 0 -> 4096 bytes graphics/interface/region_map_affine.png | Bin 0 -> 18412 bytes graphics/interface/summary_a_button.png | Bin 0 -> 225 bytes graphics/interface/summary_b_button.png | Bin 0 -> 225 bytes graphics/interface/summary_markings.pal | 19 + graphics/interface/test.bin | Bin 1152 -> 0 bytes graphics/interface/unk_tilemap2.bin | Bin 0 -> 40 bytes graphics_file_rules.mk | 22 +- 12 files changed, 461 insertions(+), 53 deletions(-) create mode 100644 graphics/interface/region_map.bin create mode 100644 graphics/interface/region_map.pal create mode 100644 graphics/interface/region_map.png create mode 100644 graphics/interface/region_map_affine.bin create mode 100644 graphics/interface/region_map_affine.png create mode 100644 graphics/interface/summary_a_button.png create mode 100644 graphics/interface/summary_b_button.png create mode 100644 graphics/interface/summary_markings.pal delete mode 100644 graphics/interface/test.bin create mode 100644 graphics/interface/unk_tilemap2.bin diff --git a/data/pokemon_summary_screen.s b/data/pokemon_summary_screen.s index 6594987435..2f5bbeb3d4 100644 --- a/data/pokemon_summary_screen.s +++ b/data/pokemon_summary_screen.s @@ -9,14 +9,23 @@ @ 861CAAC .include "data/text/nature_names.inc" + .align 2 gUnknown_0861CBB4:: @ 861CBB4 - .incbin "baserom.gba", 0x61cbb4, 0x38 + .4byte 0x000001f0, 0x000013b9, 0x0000239a, 0x000033db + .align 2 +gUnknown_0861CBC4:: @ 861CBC4 + .incbin "graphics/interface/unk_tilemap2.bin" + + .align 2 gUnknown_0861CBEC:: @ 861CBEC - .incbin "baserom.gba", 0x61cbec, 0xc + .4byte gUnknown_0861CBC4 + .byte 0x01, 0x00, 0x0a, 0x02, 0x00, 0x12 + .align 2 gUnknown_0861CBF8:: @ 861CBF8 - .incbin "baserom.gba", 0x61cbf8, 0xc + .4byte gUnknown_0861CBC4 + .byte 0x01, 0x00, 0x0a, 0x02, 0x00, 0x32 .align 2 gUnknown_0861CC04:: @ 861CC04 @@ -40,101 +49,385 @@ gUnknown_0861CC10:: @ 861CC10 .align 2 gUnknown_0861CC1C:: @ 861CC1C - .incbin "baserom.gba", 0x61cc1c, 0x8 + .byte 0x00, 0x02, 0x03, 0x01, 0x04, 0x05, 0x00, 0x00 + .align 2 gUnknown_0861CC24:: @ 861CC24 - .incbin "baserom.gba", 0x61cc24, 0xa8 + window_template 0x00, 0x00, 0x00, 0x0b, 0x02, 0x06, 0x0001 + window_template 0x00, 0x00, 0x00, 0x0b, 0x02, 0x06, 0x0017 + window_template 0x00, 0x00, 0x00, 0x0b, 0x02, 0x06, 0x002d + window_template 0x00, 0x00, 0x00, 0x0b, 0x02, 0x06, 0x0043 + window_template 0x00, 0x16, 0x00, 0x08, 0x02, 0x07, 0x0059 + window_template 0x00, 0x16, 0x00, 0x08, 0x02, 0x07, 0x0069 + window_template 0x00, 0x16, 0x00, 0x08, 0x02, 0x07, 0x0079 + window_template 0x00, 0x0b, 0x04, 0x00, 0x02, 0x06, 0x0089 + window_template 0x00, 0x0b, 0x04, 0x12, 0x02, 0x06, 0x0089 + window_template 0x00, 0x0b, 0x06, 0x12, 0x02, 0x06, 0x00ad + window_template 0x00, 0x0a, 0x07, 0x06, 0x06, 0x06, 0x00d1 + window_template 0x00, 0x16, 0x07, 0x05, 0x06, 0x06, 0x00f5 + window_template 0x00, 0x0a, 0x0e, 0x0b, 0x04, 0x06, 0x0113 + window_template 0x00, 0x00, 0x12, 0x06, 0x02, 0x06, 0x013f + window_template 0x00, 0x01, 0x0f, 0x09, 0x04, 0x06, 0x014b + window_template 0x00, 0x01, 0x0f, 0x05, 0x04, 0x06, 0x016f + window_template 0x00, 0x16, 0x04, 0x00, 0x02, 0x06, 0x0183 + window_template 0x00, 0x01, 0x02, 0x04, 0x02, 0x07, 0x0183 + window_template 0x00, 0x01, 0x0c, 0x09, 0x02, 0x06, 0x018b + window_template 0x00, 0x01, 0x0e, 0x09, 0x04, 0x06, 0x019d + null_window_template + .align 2 gUnknown_0861CCCC:: @ 861CCCC - .incbin "baserom.gba", 0x61cccc, 0x20 + window_template 0x00, 0x0b, 0x04, 0x0b, 0x02, 0x06, 0x01c1 + window_template 0x00, 0x16, 0x04, 0x07, 0x02, 0x06, 0x01d7 + window_template 0x00, 0x0b, 0x09, 0x12, 0x04, 0x06, 0x01e5 + window_template 0x00, 0x0b, 0x0e, 0x12, 0x06, 0x06, 0x022d + .align 2 gUnknown_0861CCEC:: @ 861CCEC - .incbin "baserom.gba", 0x61ccec, 0x28 + window_template 0x00, 0x0a, 0x04, 0x0a, 0x02, 0x06, 0x01c1 + window_template 0x00, 0x14, 0x04, 0x0a, 0x02, 0x06, 0x01d5 + window_template 0x00, 0x10, 0x07, 0x06, 0x06, 0x06, 0x01e9 + window_template 0x00, 0x1b, 0x07, 0x03, 0x06, 0x06, 0x020d + window_template 0x00, 0x18, 0x0e, 0x06, 0x04, 0x06, 0x021f + .align 2 gUnknown_0861CD14:: @ 861CD14 - .incbin "baserom.gba", 0x61cd14, 0x18 + window_template 0x00, 0x0f, 0x04, 0x09, 0x0a, 0x06, 0x01c1 + window_template 0x00, 0x18, 0x04, 0x06, 0x0a, 0x08, 0x021b + window_template 0x00, 0x0a, 0x0f, 0x14, 0x04, 0x06, 0x0257 gUnknown_0861CD2C:: @ 861CD2C - .incbin "baserom.gba", 0x61cd2c, 0x27 + .byte 0x00, 0x01, 0x02, 0x00, 0x03, 0x04, 0x00, 0x05, 0x06, 0x00, 0x07, 0x08, 0x00, 0x09, 0x0a, 0x00, 0x0b, 0x0c, 0x00, 0x0d, 0x0e, 0x00, 0x07, 0x08, 0x0d, 0x0f, 0x0e, 0x00, 0x01, 0x02, 0x00, 0x03 + .byte 0x04, 0x00, 0x05, 0x06, 0x00, 0x07, 0x08 gUnknown_0861CD53:: @ 861CD53 - .incbin "baserom.gba", 0x61cd53, 0x80 + .incbin "graphics/interface/summary_a_button.4bpp" gUnknown_0861CDD3:: @ 861CDD3 - .incbin "baserom.gba", 0x61cdd3, 0x81 + .incbin "graphics/interface/summary_b_button.4bpp" + .align 2 gUnknown_0861CE54:: @ 861CE54 - .incbin "baserom.gba", 0x61ce54, 0x10 + .4byte sub_81C2E00 + .4byte sub_81C3530 + .4byte sub_81C3984 + .4byte sub_81C3D08 + .align 2 gUnknown_0861CE64:: @ 861CE64 - .incbin "baserom.gba", 0x61ce64, 0x10 + .4byte sub_81C2E40 + .4byte sub_81C3554 + .4byte sub_81C39F0 + .4byte sub_81C3D54 gUnknown_0861CE74:: @ 861CE74 - .incbin "baserom.gba", 0x61ce74, 0x7 + .string "{COLOR LIGHT_RED}{SHADOW GREEN}$" gUnknown_0861CE7B:: @ 861CE7B - .incbin "baserom.gba", 0x61ce7b, 0x7 + .string "{COLOR WHITE}{SHADOW DARK_GREY}$" gUnknown_0861CE82:: @ 861CE82 - .incbin "baserom.gba", 0x61ce82, 0xc + .string "{SPECIAL_F7 0x00}/{SPECIAL_F7 0x01}\n" + .string "{SPECIAL_F7 0x02}\n" + .string "{SPECIAL_F7 0x03}$" gUnknown_0861CE8E:: @ 861CE8E - .incbin "baserom.gba", 0x61ce8e, 0x9 + .string "{SPECIAL_F7 0x00}\n" + .string "{SPECIAL_F7 0x01}\n" + .string "{SPECIAL_F7 0x02}$" gUnknown_0861CE97:: @ 861CE97 - .incbin "baserom.gba", 0x61ce97, 0x125 + .string "{UNK_CTRL_F9 0x06}{SPECIAL_F7 0x00}/{SPECIAL_F7 0x01}$" + .align 2 +gOamData_861CEA0:: @ 861CEA0 + .2byte 0x4000, 0x8000, 0x0400, 0x0000 + + .align 2 +gSpriteAnim_861CEA8:: @ 861CEA8 + .2byte 0x0000, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861CEB0:: @ 861CEB0 + .2byte 0x0008, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861CEB8:: @ 861CEB8 + .2byte 0x0010, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861CEC0:: @ 861CEC0 + .2byte 0x0018, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861CEC8:: @ 861CEC8 + .2byte 0x0020, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861CED0:: @ 861CED0 + .2byte 0x0028, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861CED8:: @ 861CED8 + .2byte 0x0030, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861CEE0:: @ 861CEE0 + .2byte 0x0038, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861CEE8:: @ 861CEE8 + .2byte 0x0040, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861CEF0:: @ 861CEF0 + .2byte 0x0048, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861CEF8:: @ 861CEF8 + .2byte 0x0050, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861CF00:: @ 861CF00 + .2byte 0x0058, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861CF08:: @ 861CF08 + .2byte 0x0060, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861CF10:: @ 861CF10 + .2byte 0x0068, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861CF18:: @ 861CF18 + .2byte 0x0070, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861CF20:: @ 861CF20 + .2byte 0x0078, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861CF28:: @ 861CF28 + .2byte 0x0080, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861CF30:: @ 861CF30 + .2byte 0x0088, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861CF38:: @ 861CF38 + .2byte 0x0090, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861CF40:: @ 861CF40 + .2byte 0x0098, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861CF48:: @ 861CF48 + .2byte 0x00a0, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861CF50:: @ 861CF50 + .2byte 0x00a8, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861CF58:: @ 861CF58 + .2byte 0x00b0, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_861CF60:: @ 861CF60 + .4byte gSpriteAnim_861CEA8 + .4byte gSpriteAnim_861CEB0 + .4byte gSpriteAnim_861CEB8 + .4byte gSpriteAnim_861CEC0 + .4byte gSpriteAnim_861CEC8 + .4byte gSpriteAnim_861CED0 + .4byte gSpriteAnim_861CED8 + .4byte gSpriteAnim_861CEE0 + .4byte gSpriteAnim_861CEE8 + .4byte gSpriteAnim_861CEF0 + .4byte gSpriteAnim_861CEF8 + .4byte gSpriteAnim_861CF00 + .4byte gSpriteAnim_861CF08 + .4byte gSpriteAnim_861CF10 + .4byte gSpriteAnim_861CF18 + .4byte gSpriteAnim_861CF20 + .4byte gSpriteAnim_861CF28 + .4byte gSpriteAnim_861CF30 + .4byte gSpriteAnim_861CF38 + .4byte gSpriteAnim_861CF40 + .4byte gSpriteAnim_861CF48 + .4byte gSpriteAnim_861CF50 + .4byte gSpriteAnim_861CF58 + + .align 2 gUnknown_0861CFBC:: @ 861CFBC - .incbin "baserom.gba", 0x61cfbc, 0x8 + obj_tiles 0x08d971b0, 0x1700, 0x7532 + .align 2 gUnknown_0861CFC4:: @ 861CFC4 - .incbin "baserom.gba", 0x61cfc4, 0x18 + spr_template 0x7532, 0x7532, gOamData_861CEA0, gSpriteAnimTable_861CF60, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_0861CFDC:: @ 861CFDC - .incbin "baserom.gba", 0x61cfdc, 0x98 + .byte 0x0d, 0x0d, 0x0e, 0x0e, 0x0d, 0x0d, 0x0f, 0x0e, 0x0d, 0x0f, 0x0d, 0x0e, 0x0f, 0x0d, 0x0e, 0x0e, 0x0f, 0x0d, 0x0d, 0x0e, 0x0e, 0x0f, 0x0d, 0x00 + .align 2 +gOamData_861CFF4:: @ 861CFF4 + .2byte 0x0000, 0x4000, 0x0400, 0x0000 + + .align 2 +gSpriteAnim_861CFFC:: @ 861CFFC + .2byte 0x0000, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861D004:: @ 861D004 + .2byte 0x0004, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861D00C:: @ 861D00C + .2byte 0x0008, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861D014:: @ 861D014 + .2byte 0x000c, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861D01C:: @ 861D01C + .2byte 0x0010, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861D024:: @ 861D024 + .2byte 0x0010, 0x0040, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861D02C:: @ 861D02C + .2byte 0x0014, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861D034:: @ 861D034 + .2byte 0x0018, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861D03C:: @ 861D03C + .2byte 0x0018, 0x0040, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861D044:: @ 861D044 + .2byte 0x001c, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_861D04C:: @ 861D04C + .4byte gSpriteAnim_861CFFC + .4byte gSpriteAnim_861D004 + .4byte gSpriteAnim_861D00C + .4byte gSpriteAnim_861D014 + .4byte gSpriteAnim_861D01C + .4byte gSpriteAnim_861D024 + .4byte gSpriteAnim_861D02C + .4byte gSpriteAnim_861D034 + .4byte gSpriteAnim_861D03C + .4byte gSpriteAnim_861D044 + + .align 2 gUnknown_0861D074:: @ 861D074 - .incbin "baserom.gba", 0x61d074, 0x8 + obj_tiles gUnknown_08D97BEC, 0x0400, 0x7530 + .align 2 gUnknown_0861D07C:: @ 861D07C - .incbin "baserom.gba", 0x61d07c, 0x8 + obj_pal gUnknown_08D97CF4, 0x7530 + .align 2 gUnknown_0861D084:: @ 861D084 - .incbin "baserom.gba", 0x61d084, 0x74 + spr_template 0x7530, 0x7530, gOamData_861CFF4, gSpriteAnimTable_861D04C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 +gOamData_861D09C:: @ 861D09C + .2byte 0x4000, 0x4000, 0x0c00, 0x0000 + + .align 2 +gSpriteAnim_861D0A4:: @ 861D0A4 + .2byte 0x0000, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861D0AC:: @ 861D0AC + .2byte 0x0004, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861D0B4:: @ 861D0B4 + .2byte 0x0008, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861D0BC:: @ 861D0BC + .2byte 0x000c, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861D0C4:: @ 861D0C4 + .2byte 0x0010, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861D0CC:: @ 861D0CC + .2byte 0x0014, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_861D0D4:: @ 861D0D4 + .2byte 0x0018, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_861D0DC:: @ 861D0DC + .4byte gSpriteAnim_861D0A4 + .4byte gSpriteAnim_861D0AC + .4byte gSpriteAnim_861D0B4 + .4byte gSpriteAnim_861D0BC + .4byte gSpriteAnim_861D0C4 + .4byte gSpriteAnim_861D0CC + .4byte gSpriteAnim_861D0D4 + + .align 2 gUnknown_0861D0F8:: @ 861D0F8 - .incbin "baserom.gba", 0x61d0f8, 0x8 + obj_tiles gStatusGfx_Icons, 0x0380, 0x7531 + .align 2 gUnknown_0861D100:: @ 861D100 - .incbin "baserom.gba", 0x61d100, 0x8 + obj_pal gStatusPal_Icons, 0x7531 + .align 2 gUnknown_0861D108:: @ 861D108 - .incbin "baserom.gba", 0x61d108, 0x18 + spr_template 0x7531, 0x7531, gOamData_861D09C, gSpriteAnimTable_861D0DC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_0861D120:: @ 861D120 - .incbin "baserom.gba", 0x61d120, 0x20 + .incbin "graphics/interface/summary_markings.gbapal" + .align 2 gUnknown_0861D140:: @ 861D140 - .incbin "baserom.gba", 0x61d140, 0x60 + .incbin "graphics/interface/region_map.gbapal" + .align 2 gUnknown_0861D1A0:: @ 861D1A0 - .incbin "baserom.gba", 0x61d1a0, 0xd54 + .incbin "graphics/interface/region_map.8bpp.lz" + .align 2 gUnknown_0861DEF4:: @ 861DEF4 - .incbin "baserom.gba", 0x61def4, 0x314 + .incbin "graphics/interface/region_map.bin.lz" + .align 2 gUnknown_0861E208:: @ 861E208 - .incbin "baserom.gba", 0x61e208, 0xd5c + .incbin "graphics/interface/region_map_affine.8bpp.lz" + .align 2 gUnknown_0861EF64:: @ 861EF64 - .incbin "baserom.gba", 0x61ef64, 0x350 + .incbin "graphics/interface/region_map_affine.bin.lz" + .align 2 gUnknown_0861F2B4:: @ 861F2B4 - .incbin "baserom.gba", 0x61f2b4, 0xc + .4byte 0x000011f0, 0x000001e1, 0x000021de + .align 2 gUnknown_0861F2C0:: @ 861F2C0 - .incbin "baserom.gba", 0x61f2c0, 0x18 + .4byte 0x00000000, sub_81C5460, sub_81C5518, 0x00000000, 0x00080000, 0x07003021 + .align 2 gUnknown_0861F2D8:: @ 861F2D8 .4byte gMenuText_Use, sub_81C61E0 .4byte gMenuText_Toss, sub_81C62C4 @@ -144,35 +437,74 @@ gUnknown_0861F2D8:: @ 861F2D8 .4byte gText_EmptyString2, NULL gUnknown_0861F308:: @ 861F308 - .incbin "baserom.gba", 0x61f308, 0x4 + .byte 0x00, 0x02, 0x01, 0x03 gUnknown_0861F30C:: @ 861F30C - .incbin "baserom.gba", 0x61f30c, 0x2 + .byte 0x01, 0x03 gUnknown_0861F30E:: @ 861F30E - .incbin "baserom.gba", 0x61f30e, 0x2 + .byte 0x04, 0x03 gUnknown_0861F310:: @ 861F310 - .incbin "baserom.gba", 0x61f310, 0x4 + .byte 0x03, 0x00, 0x00, 0x00 gUnknown_0861F314:: @ 861F314 .4byte sub_81C654C .4byte sub_81C63D0 gUnknown_0861F31C:: @ 861F31C - .incbin "baserom.gba", 0x61f31c, 0xc + .byte 0x00, 0x02, 0x03, 0x00, 0x03, 0x01, 0x01, 0x02, 0x03, 0x00, 0x00, 0x00 + .align 2 gUnknown_0861F328:: @ 861F328 - .incbin "baserom.gba", 0x61f328, 0x28 + window_template 0x00, 0x0e, 0x02, 0x0f, 0x10, 0x0f, 0x001e + window_template 0x00, 0x00, 0x0d, 0x0e, 0x06, 0x0f, 0x010e + window_template 0x01, 0x02, 0x0f, 0x1b, 0x04, 0x0f, 0x0162 + window_template 0x01, 0x18, 0x11, 0x05, 0x02, 0x0f, 0x01ce + null_window_template + .align 2 gUnknown_0861F350:: @ 861F350 - .incbin "baserom.gba", 0x61f350, 0x20 + window_template 0x01, 0x16, 0x11, 0x07, 0x02, 0x0f, 0x01d8 + window_template 0x01, 0x16, 0x0f, 0x07, 0x04, 0x0f, 0x01d8 + window_template 0x01, 0x0f, 0x0f, 0x0e, 0x04, 0x0f, 0x01d8 + window_template 0x01, 0x0f, 0x0d, 0x0e, 0x06, 0x0f, 0x01d8 + .align 2 gUnknown_0861F370:: @ 861F370 - .incbin "baserom.gba", 0x61f370, 0x5c + window_template 0x01, 0x18, 0x0f, 0x05, 0x04, 0x0f, 0x01d8 + .align 2 +gOamData_861F378:: @ 861F378 + .2byte 0x0100, 0xc000, 0x0400, 0x0000 + + .align 2 +gSpriteAnim_861F380:: @ 861F380 + .2byte 0x0000, 0x0004, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_861F388:: @ 861F388 + .4byte gSpriteAnim_861F380 + + .align 2 +gSpriteAffineAnim_861F38C:: @ 861F38C + .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_861F39C:: @ 861F39C + .2byte 0x0000, 0x0000, 0x02fe, 0x0000, 0x0000, 0x0000, 0x0402, 0x0000, 0x0000, 0x0000, 0x04fe, 0x0000, 0x0000, 0x0000, 0x0202, 0x0000 + .2byte 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnimTable_861F3C4:: @ 861F3C4 + .4byte gSpriteAffineAnim_861F38C + .4byte gSpriteAffineAnim_861F39C + + .align 2 gUnknown_0861F3CC:: @ 861F3CC - .incbin "baserom.gba", 0x61f3cc, 0x8 + obj_tiles gBattleFrontierGfx_PyramidBag, 0x0800, 0x1024 + .align 2 gUnknown_0861F3D4:: @ 861F3D4 - .incbin "baserom.gba", 0x61f3d4, 0x18 + spr_template 0x1024, 0x1024, gOamData_861F378, gSpriteAnimTable_861F388, NULL, gSpriteAffineAnimTable_861F3C4, SpriteCallbackDummy + diff --git a/graphics/interface/region_map.bin b/graphics/interface/region_map.bin new file mode 100644 index 0000000000000000000000000000000000000000..dee8ac5252f229cd6a13997f7304971e580e6cf9 GIT binary patch literal 2048 zcmeH`<#!Z85X658!Eyw5cXxujySuv++}&O7aCdiicXxt^;Qt17bGz?0Sm5RB^}L22qB(5`Oncse1g>ykdQ2ijO3&sC8@-cS}SSw1+$lZ zu~4KVJsHSICNh(StYjlQImjuFT;w)U?dQN>IP#E}eB`G91t~;ficpkd6epAtl;j|D zImBW1{E?v);gqHfWtBrY%2R=gRHCx*RjA4lj&h7{bjR&zPO@rLrv^2tMQ!R(mwMEv z0S#$HW14W9Gi>B6=QwZhm$=Lo2Rw+TQmq-yX+cX`(V8~8Ih3}vqrI}f$~CUDf*aQD zw@oa5f+cjIBc151=(|Yqu4canJ?TYn`f!K4gooS{;64v{$U4L0$M>Zl{TaYO1}WMI z1~Y`A3}ZMW6w64hJYoSm1bD29KC$o@xM)#~Vl-nI%Q(g}fr(6FGE=4)dii&$(QAkug*P4A2Um9liSlbAPK%=Qp%J2A#6-kZ4>?-6nfTiK?l zz4Ms%g|B=wOCQun{`5!qBHC`L%x~}z#b=|!N8vxociK*N5ynkNj=tUR&O^WWJ~h3| g$2q}CPI1dR6RqmU#XRP<#DyV%4JZ&$;NKMZ0T;BD7XSbN literal 0 HcmV?d00001 diff --git a/graphics/interface/region_map.pal b/graphics/interface/region_map.pal new file mode 100644 index 0000000000..64ca5e82cc --- /dev/null +++ b/graphics/interface/region_map.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +156 213 255 +0 115 0 +164 180 255 +57 172 8 +189 0 49 +255 106 139 +164 0 8 +246 0 0 +255 189 205 +255 164 49 +238 230 172 +230 164 0 +238 189 57 +205 205 148 +98 213 0 +0 0 0 +172 238 49 +213 255 123 +238 230 115 +74 156 230 +41 131 230 +24 65 197 +57 131 197 +246 213 82 +32 74 197 +65 106 205 +0 0 0 +255 230 131 +255 156 0 +180 0 0 +255 255 255 +0 0 0 +205 238 255 +197 213 255 +98 98 98 +205 205 205 +189 123 0 +0 0 0 +123 180 213 +0 115 172 +0 57 139 +255 172 16 +255 57 16 +148 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/interface/region_map.png b/graphics/interface/region_map.png new file mode 100644 index 0000000000000000000000000000000000000000..17c6ffd03947989154b0c3433dfbc19cfa2794ba GIT binary patch literal 18404 zcmeI3c|6qH|Hsc5TOw%VoV`aT&+knV+~ zz9nheF3DE3h)@bqA-lHU4Bh(FtvmPod)zUEi_tMeW3Xr)eH2Cqhr!}7I*5-K5--7xOc?GS zxXl*pK9=KtGDUi^Sacj39TXI#9i*pCV|b!qXn=`kw{*lPuIu$@}++&t-}KSFXe=7ji}sz8pSr(Wm^&x7wx4Q$bG*L3-z?2! zSq5?ud_?+9Cv$5Eor2y>VbTH^WQt`V_f}NDb@wc)$LGoUA``FYyJM#WQ@>;5^~~93 zm%`i(nQ-qFXU?FISTx2~8qEhkx617QLWnRo=dCIugt`OO&z%;;)G$GRZTURkpR-Xc zNGuAT>on%BM3gROD|bEWV{rxsD2yQvgMlQOQ+}1hmgY|N2>C`114Env7McU1{5l7B z|G1M_q<@tKs)ginC*wS53||rpPxU2vQqXiiPZRX#Mu_s$s=}Gmd}s{ru(-Exg8o)B z#5KFpa5jES7RirHv9Z8&8?>oZcbtcw0mjI{!w98ggw;b)4E1$UZu&ZIC<8Y=Lw!S% zKFQ6HG7Hhx7Ha=nY6}`UfVW#drgr}yQ$y^3OZ^jr%01~wJ`fFW^#5y#Z>0HKDQhZ| zyFNo8>z2EEXV0=N6#p+<|LX9e&Ynqh5`#(M?Ko59Ut8|eA@=Ev;(2CwE{;Uzoo0A4 zZ$nVrP0(Moeje5*=SLg$|2u(m`62f2*9h{W`2Ev{noBjS`hF57&4U$0Vo=t2a@WMa z+3RyzzqEaw-UQ7%{e7rkPQ+a6m-F-2iv9b1n(z)a9Cs~n$3>c*1056e-`YM`p3^(> z=F}%(R*yBra4)nD@9#$|wEJtT(?46G-CtWjJGc2!S-f37JJ7G1Auis@J9jK>;r>XV z;0+B7^bAbUUpIg4u%`x7d>k#P-2Kbstx6qTxmNDa1@12u^rxRHUrzIT(V*xI{h@b)iE+`GYu>coeL{NbM z7nBCySb&Q!BB(%s3rd4;EWpJV5mX?+1*O3^7U1HG2r3ZZg3{m{3vls81QiHyL22-f z1-SSkf(it5laPdV16$o%aY4D8&xcDN13Iw>I zH2B8XMp|+UWVX;Wt7L=b{<9mAgN_z zv1V)V!*kBJ{CX{urzfvoz-{wVv+xSGha4G0Ib98AvUFQ(RNo)J%lvMo# zFx|}CNsoUKix-W+-%g^vsU9lFmV3K;ooSOE4fitg2=ni{W}+m?HakV_n23vOYI+l! zFVyYzuF7J1QO29);Z2;Ph!<~a`tGOY!$rYWp?$CF-UV7(m}C;`ISk2e;z-f;K%Mg7 zDEI;)_-K(mcF;f#}LY(!*Pph;x2-{1zy!4&U73=Pu+|djR#xHN`8*H3xXDWgn zz%trFuC5$R(bhJ@gYl=(^AX1uSlG0b%p_W89p6C>hqJR9LfQ?lmTS%TF8cBD;CSdG z+Ob23enLvt_Q>Dw)ybEe{RxV?9UVN>i?wr=4Of>1E{7GIRR*>zU#>(dipa!z%!@pW zPph}pQ?V&+-JN-SURP&l&M8cthGp?4>E=wgT?~927^ZDFTiRd(gH@#CLP$gTDuUFZs3lo>Y zvL!PV!&9V1^f!?S)|jFakRxIrQ+EO8SnliMKwDC}a!evjoUNBaaZ0GNP`m!5HQr{S zr{lo-(}xah7m|4!H5s`(s*Z5v;knHG4JwfieVSnE?2n*oaxt8sAX?R$!{52M!<1fH^K>PlPF!R`tdL zeQBxVokKUh!|JIb?428iYu63h_U@8cEgU|tAx;XYgCir6(+0H(h_z1Q(d-wUo5@2d zJ7Lk_7D1YjxZ9E_qj1wN4iEunRJFm(gF|Uu7Zy9>9sUSTe|RNOLo#Vt5)_y%kNXp3 zb@jinbnV-C1*pps3ZxsC==;@a!T|9@SI@|v>WLNUznUP!Y~udtv>QkZ@&*iPjx1q;g`{gA?HTv0 zKv@O6$iL6q7=_+D4TP}>YwSTng9NO#XDRH#dW``DtlJKV#_AmlK;J6T;*P6o1yxK~ zcm*rm$O5E12tkRApKQN0F5NMfY4)44f6TSBLyg%kHPu?E_U<)#=J>n{2`DbRT4ZPoizi;a|x zrET7jyMip~ z!LNOIYP;}qpj?{~S*6uM@(j@EbkUbtnYmi%Ocx#ZhoXtsj5wlPA?#?0`m-_#Uaq@XU&|U z3B``ru=u^Cfk~;-T>B@z@hO=4RxwT2+GmUlJL{8^E>n{;H5!V$-sx_0L>=VFkCfNj zU2dKTGW#$dddW4vOl3p3dwO4pU4y&VPx0HS^-6Ci9t8h#{W{VS$&QifE*M!Yf7_}^ zRz*d56OniXq~?};w8_Ua8$(=_2`K?~@+wKGXSNk6nIws2T(GzeZWq6qZ- zgmrt8skt@w9DQTc9`sT+K5miP-5btQjt-d_PQ4~sWki_Q=+ zocLCEWJmP=f>>Nrl~B9uLvccf|1wz8`SWr>mo3V^bcz{OR6uppiF&_zB0X(VYeV!! z-?5+DjNG4>)8t~DkI2+ldgGf$>qB1vpQ~*D0}aghswRJ$iwt`e&L0r1XLc78zK9W-S(d>p2UDJ1G~}bH-_l@sT!+c@swk+@ViI)p3S>?1IoE5-59Tg`c$?L+ghWVYlrztx5H0o#VfMia>E;Mb#x+d$xw}n~`(UctoyX*xJj_p@y&8UnJ*v3H8Y=`B z-SuDtetl4c2O>SMaPS8`g7{?^NEX>r`!))e58I>`CFzA@t7_7%2@5|si&iongw@;j z?cANbJzUB$4t;JuiBzEOt)3zxs71IH;$*h+VN{1YB#5z;je|kOH zZSh3Mylk)IdJU?*-NoX_PNo%ZX3K$V$D(>g;Td}>SGc5|S*Whk?s;>iNYV40r59iP z^z260K!~}hy?hqo_k`b$28d~2Iz~hoj@4`lDIR%4Y+CYqUW`JHTj5LESjWL!`@QnH z5mu4p73tm^8ehdSPsaU%I<&{RJBt~eIg>y(kwh)^I@WX<|#4ee2S`u%B>MU+`a15pz7jN`%+#m3!!AV z&%0geL}DjCUTiLUbGX%iXvx0$SMah=cg~Z|opB;%$O*M47wyey1lI>H*{h*aOFGN; zF@(UmQnzd)IZBHd*qUjEeLq-=QuOGOVPRJ#>}Yn_89h23Ii2`CvF8r!mE5C@1|v{# zZ~NlWz1BN7DJ^siZ(ysP9v`nvKh$8PC2~$#!$bGU<#s>Y`>PAp*n31d!MZ1@!DdP> zE{Kzt^0JTbmkC>yC)C~4I{j3;xiU{P;zJ*iaPBaRBDW;_n2r>su6!yICkrPguXOQu z&#-OL<7j%X4;U}>Nxz$S<)&`xMwe-$@GEs-u#pXWby#0Dp`)c@znz%&BKnMXsP&qs zYkwX)bRnIo2`4(CpD@!RF1nt!8l6yG@1+!P+^gKYHGA6Et~AkmP@<$FYk8dc&N21~ z=G?9V8g;d(TYh3s|L+DQ4NKGIHQjlU4EoZk9|yCj2Zcxkn4wqi8qZ=MXwb46EuC zHO;GH1TFFVk0VSYA1oY*xz#)1BvzpD_{|97>G>V$#Pr%VuF2l|)pw2`#>b`a321YZ zdQMR7Z!$Waf2fUYSmUMFnLYo>`qe@e4korm0oP9~m(y6mxwcv3-AkFBm7=J-Dd+l5 zu2zZM*q;xxUa%y`>1k}N&3I?x;gY`5`;x!{*6`wF>)RXHeWL-xXeF=wAqnExdAZY# zIr<`xhmKd9_+B&*=`UYHvM(aA( zZ&-3iSSo zgha4ugyhMv5=BdYRCG)%Uz})sLSj;KN^084Q>V``oIQ7b_Jj#wb%f+m3?qY+o{^cA zo#U6AmtRm=R2*88d!c(N!$q-6K>PRZ1DZ!jo(wBdw3L>WS5#J2*VNY4H?TK0HG?Iu zUcLgf|C&FLLr5OQFmgC8Vy$g_?H!$63_ZPlAOo&5Fx+5Z0NQ^u>K2eoNS+)!k@ZZN zIBD{fsne$W&zLz2ob7laxo^UR+js7+U|=95k8Bn>>7I9 z_7jjts3wm!fnnmjg^L#VL6SSrjHl0@GcY`0xDKrd2+5OYD?%4Aw3h&rJkXyoaR145 zhDQvKpFsG8Q<;6 zQlf4ZcZE=tic}6EBw7i-jqdu?UH9(q?{WXR&*Q-^@AvDvuJ`A8UGMik{`l;1c3L)7 zPE`&7FxA1{)Jdk8UMp;_OnQ`%g05l4Rh~(0O=xjXK95oRaFR+Ef7!-0s!U;4-SqT#&-5s5g zHVhU8X`o|>Ch6)KBaKXSbPY_5ar)Xw99Gv5gEhhE>Z7r`c&rH?tBd@6p)BMCmKlre zhj+1E`Z=B8FLP7?hr`5UFrlHLI-zWrT3dQ7B=eFW2Y$qA|ZDqO(7<6Hvr(iA;>H4i@txCo<`a z4>N=nG_f=?2}22@&?s~cTi~brLqBE!gTr74Fn*Hq%k)nZ3u@x%_$Bub*Gr@QFg2TF zw^@MTGtwV=vR%WN6pRan%?M$UD0Z6#x1#lHw6WlA_hD9NA7%W!?BgkU1%bfp0h_ta0c9juwp&OM>W`wdAnPI+n`C9L<(I~b= z4#h&?X)NeOG!E;E#o=}J@i;v+))0@yLV`>xzl-6>AXELqeiXw1uaASqfGEF@A=p1; zB8T{|qCmBfIAjvukHMl5ITlnJ(Vv20(*4aaUk4$|FI|PVVFWQ)f@KMA-wgAkVTjj6 zr{NvwYz~o5qBz)E2nKYhR5D)QfM`O(5slIMSS$r?XsB<5HZe9ZKvS?rIA24OpFYl) zI04bo5$gW8(6$Uxh;X-j4o&_aLqpvE7J3znDmdwgK@g2__5W*%AB6c^Dtjth(4S$D zz7=%u#96k668!DxUlT#pi8F~wWU(p29cPaEYs-B(#J-$SLZ6A9izkwVr=Lij;(En*eO@^9K{X7Vp;l~LjvM5&mf}Z#{dwnwM zw{G8uH^T@|{~+qOg_s=uwmyG#?BDBYCOp*ef?g1;i#SmOT{Fzz#=d5r)Vm978Wb|2 zH!;KtE{v}5_h(n=^!KhF|Lh8#{@(Sg=UO_IBi!W^3;k{w;w3zJCy#|Sf`(hzBjafw6(6^L;`X^6DNxI`j?3dFdeG(_5BTp|%c1!7!K8X|2mE|G|!0x>Qq z4Ux7OmqRnB@z)-AjSoyA<`D(5{U>Z5aWW<5NZD- zF1fES|550IH~vBeulAjF{%9|FEf7hvcX0$De4gMH!yN#87#DnY0T6-(;I$6`_+$Wn zWgPUrxfB3N;Jnh+PWUdN`1(%?B-io*6J+J_jk9Hn0hS*SlLch@0pJ%`^0Tm=t=X+v zptIPxvNFM^R+u=u6I;vYcD6F@lUo<^T2%<;#=P?WT4$tvIU%4@AmF$1_{ktoVDR~Z zKPx-=<+XetAD_y~%3`iC0ynP~FtdSi3_n|*Z!Di691~yviogf2ek1@0eFs}BSMK8+ zuPXWrtl}%o@2?WQR}oiGD2+8(KOYk~Gmq=xdnMV+><^f9WMr5} zQc)4bW4IrK!S)0gdf73^Mqwc{HM|Md$K{i=b7SrLr~CTf64KY(4*h%X5|u zJ1si-(6ce5nN@A_=!21J3#_;|{`O#4nJ)EHpe?A_kKzpeW(Ws8?{*^NVLkENwwrl} z9u6kmMd!Er^!JV{fpw|#Iw&3}o=fK@#vN~SU{ux^HLZMbfNS9$daWhnBB+&Excurt z=W9~s+m)g;$_GDe^#Cax>dHw}5;!tdF}_vY(F5$9MF>l%?{b z&3M}@mh93w(Y3R$ulHupO}ANT=M()Nx7l90bt#(BwimWcW^YcD)0MZoXKN5>%Cs%x=c=KD9~^CRKeRPH5<$f zwx<}%om3!f7&z30L*?t=il)-KO^-rqg74k>5ciIv*GtT6{cRbIt z?hjjadDT}8z-8%H8Kg7{o;z5?+6s7a@?f~J zdnmm0O_RZS)hKoO6Y92Ee$n7{@O}_z zsiAm|Jy(;WKHlwp_EDN1UY}VTSA6q%L#Thld6IY1N0^*Xv!Q{!g#G9ade>YRsoJ-1 z8rpEvsXmWCg~YPd3g{mRyXd|7H>*wjOAIob;yUbPPB4nc;K1J{V&nL#eQAjF-6ux# z`>vphn-!lFZbI?SFPmF$TCl9Jz4&JN$#z|yol589qB|F~>$EOdlqI)oCqE>w1;Ltg zdRHxxn9f6xYppiUe3N&vM7d8#RYs|PHmr`p-LeABt$n9Jpf4JhiF_ly5X6Bvh2m`s zyNuGEx|U|_XfF!^QGG>-m4$BVjeQDPPosUisS&N4jb0>e!)SNdTb;`7*)QYf+R}?I zekF+ITk5iYF`$ge_ingSujS9GSroM2i)9E$2F18U(=lqutlH8cmhf*(` zMoRd&C9pRNzV(WZA6hhE?38K{{UUj)-aCZ41ahiBBO8IJY3ICG%&nCuup_=Xrdb@t z58559>82Vf6*s0eAUE6TVvD|nkDA16oohjTmXs(I4 z!+VgV!a_@GDJt`15i!wf5|OakyI}t3A~X;PmEeJlbgrSAs^g5|U*PFQ$<}`=s9^aw zHoje5GNLCrz}dH9JQ-%qp9*TVldap05ZtLTi*?C_dYHOLq>aQ`ehaSl$Q2Z!YNoRK z@7HUYFRS*$KlPi;WK?DBKa@q&C-zj`@|W#eJ$~7e*0Hy7%CkS5uezA`KYJ2!uuOV^ zV*IQNy??kYci6#td}Q{!4AZ*%nTypk^!1HYz^nRsU9ab!Bgj6oSYfy*!O`ti6J`5i z%-FgbH5@P1SW2+~aX816*>z-!Wd2dhj6c)%wMcJymaxkGg!7D8+VxgPIDhM zRaMs-SntK!%t*hp)huZB%Vr77BP;YD6sf-;20SMmdZ$xL?ww`TsBHagZ$Ze~kt8#8 zoZh*L#u=<&cmTMJX39l+?AtjTKmxN-^A!+fdF6w43mHShBgPlEa?mq^ZA z5%ch#oa9wRqYBP`*XjLRT4dJC4DUg9ERS)2P$MUKSib3DV(*#|IC5QI^kVAs6GMel z6P19^xfwR42NtGTfGpf-)quASEgw6wE9;I)enZr?w&m$Hns>`qmZ^7~Vs~`HY1d%9 zg2KAwKAX0^H?qs$2Ew&xoy%<;at*phT;y}lUiXl~_|wgSCC~PtVK4Q-twUAB)1(rO zIAy(AwKER8$ouwHtOcJ^@R?7f1W!F7pgnAijSYv-t=0;`ojSVm!_4i@3yy&teE(ip zgfGwSVdCpH(j&9qH|#h>F-|G@Se=h0WR_8Qrds!6=DpWHpH&|@I4gauJzaM$+!{=$ zAj5OuDY3o-m#fP*=-fXZHnInlW05zgh=9cnpA1hwzH>4}%Ja#Z_}g=I!pq-agJLSI zdH1UY=elElm2=*Om!?YRx@i##6RMRm zYQXEILC5UQy_{($GhRVG419P9$3oh^TdJDgel4)nw2c`@V`pA{Z>8H%AnQe}OQ@5` z-_sT@l{kKZS)eQ(TYp?xJBumP7TtTEC|a3+BSd0)m^8 zOy54$_E4|@zE;JE@n2Lc-Z;CFJ>k4(Gk)uZ&ta?`oHA&;|Lv3YCk9eZao&A+$En~k zhdR>kyWQ?FN!xKLh0!1teCAf}@W`&Z%H-mMixytSY9y`fV(hN!vA;=~>UqJ)qed^( z7C!5~w`6jTRdZs}xnv{b`46^uV@-P_9!T{Z76ciK;3=A9`90CFY5)u*$3JMw;8YWDbuwcQ04I4HbIB?*? zg$oZJJoxb8!*@Z=HlQBP0*}aI1_r*vAk26?e?76ciK;3=A9`90CFY5)u*$3JMw;8YWDbuwcQ04I4HbIB?*? zg$oZJJoxb8!*@Z=HlQBP0*}aI1_r*vAk26?e?$Wh4{NY>l=}iqOG9>f|7W z&Jv`%1nS^c+%v`VVj_`tc}_Ib4KCszVi-h2E1sF=)=ILHZc_Tsv`8? zv@p8qP2XaH(P<1Ej5(|q{^F5$P}kwdW5iE7o>!;(@8tp0phAV{Cn$@ $(BTLANMSPRGFXDIR)/010.4bpp: $(BTLANMSPRGFXDIR)/010_0.4bpp \ @@ -340,9 +340,9 @@ $(UNUSEDGFXDIR)/obi2.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur2.4bpp \ $(UNUSEDGFXDIR)/old_battle_interface_3.4bpp @cat $^ >$@ -$(MENUGFXDIR)/hp_numbers.4bpp: $(MENUGFXDIR)/hpbar_anim.4bpp \ - $(MENUGFXDIR)/numbers1.4bpp \ - $(MENUGFXDIR)/numbers2.4bpp +$(INTERFACEGFXDIR)/hp_numbers.4bpp: $(INTERFACEGFXDIR)/hpbar_anim.4bpp \ + $(INTERFACEGFXDIR)/numbers1.4bpp \ + $(INTERFACEGFXDIR)/numbers2.4bpp @cat $^ >$@ $(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin \ @@ -398,7 +398,7 @@ $(MASKSGFXDIR)/unknown_C2EA50.4bpp: %.4bpp: %.png $(BATTRANSGFXDIR)/vs_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 16 -$(MENUGFXDIR)/party_menu_misc.4bpp: %.4bpp: %.png +$(INTERFACEGFXDIR)/party_menu_misc.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 62 $(TYPESGFXDIR)/move_types.4bpp: $(types:%=$(TYPESGFXDIR)/%.4bpp) $(contest_types:%=$(TYPESGFXDIR)/contest_%.4bpp) @@ -409,7 +409,7 @@ $(TYPESGFXDIR)/move_types.gbapal: $(TYPESGFXDIR)/move_types_1.gbapal \ $(TYPESGFXDIR)/move_types_3.gbapal @cat $^ >$@ -$(MENUGFXDIR)/bag_screen.4bpp: %.4bpp: %.png +$(INTERFACEGFXDIR)/bag_screen.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 53 $(RAYQUAZAGFXDIR)/rayquaza.8bpp: %.8bpp: %.png @@ -652,3 +652,9 @@ $(PKNAVGFXDIR)/outline.4bpp: %.4bpp: %.png $(PKNAVGFXDIR)/ui_matchcall.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 13 + +$(INTERFACEGFXDIR)/region_map.8bpp: %.8bpp: %.png + $(GFX) $< $@ -num_tiles 232 + +$(INTERFACEGFXDIR)/region_map_affine.8bpp: %.8bpp: %.png + $(GFX) $< $@ -num_tiles 233 From 971b47755dbdb1b7eaa77603ee4d20c4bc707865 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sat, 20 Jan 2018 14:16:01 -0600 Subject: [PATCH 50/64] Extract data from naming screen --- data/graphics.s | 12 +- data/naming_screen.s | 206 ++++++++++++++++++++++----- data/script_menu.s | 2 +- data/strings.s | 8 +- graphics/naming_screen/0.pal | 19 +++ graphics/naming_screen/1.pal | 19 +++ graphics/naming_screen/pc_icon/0.png | Bin 0 -> 192 bytes graphics/naming_screen/pc_icon/1.png | Bin 0 -> 203 bytes 8 files changed, 216 insertions(+), 50 deletions(-) create mode 100644 graphics/naming_screen/0.pal create mode 100644 graphics/naming_screen/1.pal create mode 100644 graphics/naming_screen/pc_icon/0.png create mode 100644 graphics/naming_screen/pc_icon/1.png diff --git a/data/graphics.s b/data/graphics.s index ce7c2c3ba6..11244eb995 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -4824,27 +4824,27 @@ gNamingScreenMenu_Gfx:: @ 8DD3838 .incbin "graphics/naming_screen/menu.4bpp.lz" .align 2 -gNamingScreenRWindow_Gfx:: +gNamingScreenRWindow_Gfx:: @ 8DD3A04 .incbin "graphics/naming_screen/rwindow.4bpp" .align 2 -gNamingScreenROptions_Gfx:: +gNamingScreenROptions_Gfx:: @ 8DD4044 .incbin "graphics/naming_screen/roptions.4bpp" .align 2 -gNamingScreenCursor_Gfx:: +gNamingScreenCursor_Gfx:: @ 8DD4224 .incbin "graphics/naming_screen/cursor.4bpp" .align 2 -gNamingScreenKeyboardButton_Gfx:: +gNamingScreenKeyboardButton_Gfx:: @ 8DD43E4 .incbin "graphics/naming_screen/keyboard_button.4bpp" .align 2 -gNamingScreenRightPointingTriangleTiles:: +gNamingScreenRightPointingTriangleTiles:: @ 8DD4504 .incbin "graphics/naming_screen/right_pointing_triangle.4bpp" .align 2 -gNamingScreenUnderscoreTiles:: +gNamingScreenUnderscoreTiles:: @ 8DD4524 .incbin "graphics/naming_screen/underscore.4bpp" .align 2 diff --git a/data/naming_screen.s b/data/naming_screen.s index 607842f584..a23fb96fbb 100644 --- a/data/naming_screen.s +++ b/data/naming_screen.s @@ -3,9 +3,20 @@ .section .rodata -gUnknown_0858BD78:: @ 858BD78 - .incbin "baserom.gba", 0x58bd78, 0x40 + .align 2 +gUnknown_0858BBF8:: @ 858BBF8 + .incbin "graphics/naming_screen/pc_icon/0.4bpp" + .align 2 +gUnknown_0858BCB8:: @ 858BCB8 + .incbin "graphics/naming_screen/pc_icon/1.4bpp" + + .align 2 +gUnknown_0858BD78:: @ 858BD78 + .incbin "graphics/naming_screen/0.gbapal" + .incbin "graphics/naming_screen/1.gbapal" + + .align 2 gUnknown_0858BDB8:: @ 858BDB8 .4byte gText_PkmnTransferredSomeonesPC .4byte gText_PkmnTransferredLanettesPC @@ -14,13 +25,19 @@ gUnknown_0858BDB8:: @ 858BDB8 gUnknown_0858BDC8:: @ 858BDC8 .string "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!$" + .align 2 - gUnknown_0858BE00:: @ 858BE00 - .incbin "baserom.gba", 0x58be00, 0x10 + .4byte 0x000001e0, 0x000011d9, 0x000021ca, 0x000031ff + .align 2 gUnknown_0858BE10:: @ 858BE10 - .incbin "baserom.gba", 0x58be10, 0x30 + window_template 0x01, 0x03, 0x0a, 0x13, 0x08, 0x0a, 0x0030 + window_template 0x02, 0x03, 0x0a, 0x13, 0x08, 0x0a, 0x00c8 + window_template 0x03, 0x08, 0x06, 0x11, 0x02, 0x0a, 0x0030 + window_template 0x03, 0x08, 0x04, 0x11, 0x02, 0x0a, 0x0052 + window_template 0x00, 0x00, 0x00, 0x1e, 0x02, 0x0b, 0x0074 + null_window_template gUnknown_0858BE40:: @ 858BE40 .string "abcdef .ghijkl ,mnopqrs tuvwxyz ABCDEF .GHIJKL ,MNOPQRS TUVWXYZ 01234 56789 !?♂♀/- …“”‘’ " @@ -86,17 +103,18 @@ gUnknown_0858BF28:: @ 858BF28 .4byte sub_80E46E8 gUnknown_0858BF34:: @ 858BF34 - .incbin "baserom.gba", 0x58bf34, 0xa + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00 gUnknown_0858BF3E:: @ 858BF3E - .incbin "baserom.gba", 0x58bf3e, 0xa + .byte 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 gUnknown_0858BF48:: @ 858BF48 - .incbin "baserom.gba", 0x58bf48, 0x8 + .byte 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00 gUnknown_0858BF50:: @ 858BF50 - .incbin "baserom.gba", 0x58bf50, 0x8 + .byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 + .align 2 gUnknown_0858BF58:: @ 858BF58 .4byte sub_80E4894 .4byte sub_80E4894 @@ -104,13 +122,15 @@ gUnknown_0858BF58:: @ 858BF58 .4byte sub_80E48E8 .4byte sub_80E4894 + .align 2 gUnknown_0858BF6C:: @ 858BF6C .4byte TaskDummy3 .4byte sub_80E49BC + .align 2 gUnknown_0858BF74:: @ 858BF74 - .incbin "baserom.gba", 0x58bf74, 0x8 - + window_template 0x00, 0x09, 0x08, 0x00, 0x05, 0x04, 0x0000 + gUnknown_0858BF7C:: @ 858BF7C .4byte 0x0002010D @@ -134,20 +154,29 @@ gUnknown_0858BF98:: @ 858BF98 .4byte gUnknown_08DD47A0 gUnknown_0858BFA4:: @ 858BFA4 - .incbin "baserom.gba", 0x58bfa4, 0x4 - + .byte 0x0f, 0x01, 0x02 + + .align 2 gUnknown_0858BFA8:: @ 858BFA8 - .incbin "baserom.gba", 0x58bfa8, 0xc + .byte 0x00, 0x07, 0x01, 0x00, 0x01, 0x23, 0x00, 0x00 + .4byte gText_YourName + .align 2 gUnknown_0858BFB4:: @ 858BFB4 - .incbin "baserom.gba", 0x58bfb4, 0xc - -gUnknown_0858BFC0:: @ 858BFC0 - .incbin "baserom.gba", 0x58bfc0, 0xc - -gUnknown_0858BFCC:: @ 858BFCC - .incbin "baserom.gba", 0x58bfcc, 0xc + .byte 0x00, 0x08, 0x02, 0x00, 0x01, 0x13, 0x00, 0x00 + .4byte gText_BoxName + .align 2 +gUnknown_0858BFC0:: @ 858BFC0 + .byte 0x00, 0x0a, 0x03, 0x01, 0x01, 0x23, 0x00, 0x00 + .4byte gText_PkmnsNickname + + .align 2 +gUnknown_0858BFCC:: @ 858BFCC + .byte 0x01, 0x0f, 0x04, 0x00, 0x01, 0x0b, 0x00, 0x00 + .4byte gText_TellHimTheWords + + .align 2 gUnknown_0858BFD8:: @ 858BFD8 .4byte gUnknown_0858BFA8 .4byte gUnknown_0858BFB4 @@ -155,48 +184,125 @@ gUnknown_0858BFD8:: @ 858BFD8 .4byte gUnknown_0858BFC0 .4byte gUnknown_0858BFCC -gUnknown_0858BFEC:: @ 858BFEC - .incbin "baserom.gba", 0x58bfec, 0x64 - + .align 2 +gOamData_858BFEC:: @ 858BFEC + .2byte 0x0000, 0x0000, 0x0000, 0x0000 + + .align 2 +gOamData_858BFF4:: @ 858BFF4 + .2byte 0x0000, 0x4000, 0x0000, 0x0000 + + .align 2 +gOamData_858BFFC:: @ 858BFFC + .2byte 0x4000, 0x8000, 0x0000, 0x0000 + + .align 2 +gUnknown_0858C004:: @ 858C004 + .byte 0xec, 0xf0, 0x05, 0x40, 0x0c, 0xf0, 0x40, 0x40, 0xec, 0xf8, 0x55, 0x40, 0x0c, 0xf8, 0x90, 0x40, 0xec, 0x00, 0xa5, 0x40, 0x0c, 0x00, 0xe0, 0x40, 0xec, 0x08, 0xf5, 0x40, 0x0c, 0x08, 0x30, 0x41 + + .align 2 +gUnknown_0858C024:: @ 858C024 + .byte 0xf4, 0xfc, 0x01, 0x40, 0x04, 0xfc, 0x20, 0x40 + + .align 2 +gUnknown_0858C02C:: @ 858C02C + .byte 0xec, 0xf4, 0x05, 0x40, 0x0c, 0xf4, 0x40, 0x40, 0xec, 0xfc, 0x55, 0x40, 0x0c, 0xfc, 0x90, 0x40, 0xec, 0x04, 0xa5, 0x40, 0x0c, 0x04, 0xe0, 0x40 + + .align 2 +gUnknown_0858C044:: @ 858C044 + .byte 0xf8, 0xf4, 0x01, 0xc0, 0xf8, 0xfc, 0x21, 0xc0, 0xf8, 0x04, 0x41, 0xc0 + + .align 2 gUnknown_0858C050:: @ 858C050 - .incbin "baserom.gba", 0x58c050, 0x8 + .byte 0x08, 0x00, 0x00, 0x00 + .4byte gUnknown_0858C004 + .align 2 gUnknown_0858C058:: @ 858C058 - .incbin "baserom.gba", 0x58c058, 0x18 + .4byte 0x02 + .4byte gUnknown_0858C024 + .4byte 0x02 + .4byte gUnknown_0858C024 + .4byte 0x02 + .4byte gUnknown_0858C024 + .align 2 gUnknown_0858C070:: @ 858C070 - .incbin "baserom.gba", 0x58c070, 0x8 + .4byte 0x06 + .4byte gUnknown_0858C02C + .align 2 gUnknown_0858C078:: @ 858C078 - .incbin "baserom.gba", 0x58c078, 0x48 + .4byte 0x03 + .4byte gUnknown_0858C044 + .align 2 +gUnknown_0858C080:: @ 858C080 + obj_frame_tiles gUnknown_0858BBF8, 0x00c0 + obj_frame_tiles gUnknown_0858BCB8, 0x00c0 + + .align 2 +gSpriteAnim_858C090:: @ 858C090 + .2byte 0x0000, 0x0001, 0xfffe, 0x0000 + + .align 2 +gSpriteAnim_858C098:: @ 858C098 + .2byte 0x0004, 0x0008, 0x0008, 0x0008, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_858C0A4:: @ 858C0A4 + .2byte 0x0000, 0x0002, 0x0001, 0x0002, 0xfffe, 0x0000 + + .align 2 +gSpriteAnimTable_858C0B0:: @ 858C0B0 + .4byte gSpriteAnim_858C090 + + .align 2 +gSpriteAnimTable_858C0B4:: @ 858C0B4 + .4byte gSpriteAnim_858C090 + .4byte gSpriteAnim_858C098 + + .align 2 +gSpriteAnimTable_858C0BC:: @ 858C0BC + .4byte gSpriteAnim_858C0A4 + + .align 2 gUnknown_0858C0C0:: @ 858C0C0 - .incbin "baserom.gba", 0x58c0c0, 0x18 + spr_template 0x0002, 0x0004, gOamData_858BFEC, gSpriteAnimTable_858C0B0, NULL, gDummySpriteAffineAnimTable, sub_80E4084 + .align 2 gUnknown_0858C0D8:: @ 858C0D8 - .incbin "baserom.gba", 0x58c0d8, 0x18 + spr_template 0x0003, 0x0001, gOamData_858BFFC, gSpriteAnimTable_858C0B0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_0858C0F0:: @ 858C0F0 - .incbin "baserom.gba", 0x58c0f0, 0x18 + spr_template 0x0004, 0x0004, gOamData_858BFEC, gSpriteAnimTable_858C0B0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_0858C108:: @ 858C108 - .incbin "baserom.gba", 0x58c108, 0x18 + spr_template 0x0000, 0x0006, gOamData_858BFEC, gSpriteAnimTable_858C0B0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_0858C120:: @ 858C120 - .incbin "baserom.gba", 0x58c120, 0x18 + spr_template 0x0001, 0x0007, gOamData_858BFEC, gSpriteAnimTable_858C0B0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_0858C138:: @ 858C138 - .incbin "baserom.gba", 0x58c138, 0x18 + spr_template 0x0007, 0x0005, gOamData_858BFF4, gSpriteAnimTable_858C0B4, NULL, gDummySpriteAffineAnimTable, sub_80E3B30 + .align 2 gUnknown_0858C150:: @ 858C150 - .incbin "baserom.gba", 0x58c150, 0x18 + spr_template 0x000a, 0x0003, gOamData_858BFEC, gSpriteAnimTable_858C0B0, NULL, gDummySpriteAffineAnimTable, sub_80E3C20 + .align 2 gUnknown_0858C168:: @ 858C168 - .incbin "baserom.gba", 0x58c168, 0x18 + spr_template 0x000b, 0x0003, gOamData_858BFEC, gSpriteAnimTable_858C0B0, NULL, gDummySpriteAffineAnimTable, sub_80E3C6C + .align 2 gUnknown_0858C180:: @ 858C180 - .incbin "baserom.gba", 0x58c180, 0x18 + spr_template 0xffff, 0x0000, gOamData_858BFEC, gSpriteAnimTable_858C0BC, gUnknown_0858C080, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_0858C198:: @ 858C198 .4byte gUnknown_0862B88D .4byte gUnknown_0862B8AE @@ -211,8 +317,30 @@ gUnknown_0858C198:: @ 858C198 .4byte gUnknown_0862B9C7 .4byte gUnknown_0862B9E0 + .align 2 gUnknown_0858C1C8:: @ 858C1C8 - .incbin "baserom.gba", 0x58c1c8, 0x68 + obj_tiles gNamingScreenRWindow_Gfx+0x280, 0x01e0, 0x0000 + obj_tiles gNamingScreenRWindow_Gfx+0x460, 0x01e0, 0x0001 + obj_tiles gNamingScreenRWindow_Gfx, 0x0280, 0x0002 + obj_tiles gNamingScreenKeyboardButton_Gfx+0x20, 0x0100, 0x0003 + obj_tiles gNamingScreenROptions_Gfx, 0x0060, 0x0004 + obj_tiles gNamingScreenROptions_Gfx+0xA0, 0x0060, 0x0005 + obj_tiles gNamingScreenROptions_Gfx+0x140, 0x0060, 0x0006 + obj_tiles gNamingScreenCursor_Gfx, 0x0080, 0x0007 + obj_tiles gNamingScreenCursor_Gfx+0xA0, 0x0080, 0x0008 + obj_tiles gNamingScreenCursor_Gfx+0x140, 0x0080, 0x0009 + obj_tiles gNamingScreenRightPointingTriangleTiles, 0x0020, 0x000a + obj_tiles gNamingScreenUnderscoreTiles, 0x0020, 0x000b + null_obj_tiles + .align 2 gUnknown_0858C230:: @ 858C230 - .incbin "baserom.gba", 0x58c230, 0x48 + obj_pal gNamingScreenMenu_Pal, 0x0000 + obj_pal gNamingScreenMenu_Pal+0x20, 0x0001 + obj_pal gNamingScreenMenu_Pal+0x40, 0x0002 + obj_pal gNamingScreenMenu_Pal+0x60, 0x0003 + obj_pal gNamingScreenMenu_Pal+0x80, 0x0004 + obj_pal gNamingScreenMenu_Pal+0xA0, 0x0005 + obj_pal gNamingScreenMenu_Pal+0x80, 0x0006 + obj_pal gNamingScreenMenu_Pal+0x80, 0x0007 + null_obj_pal diff --git a/data/script_menu.s b/data/script_menu.s index 6cd7bf3816..ff9fc38710 100644 --- a/data/script_menu.s +++ b/data/script_menu.s @@ -760,4 +760,4 @@ gUnknown_0858BBE0:: @ 858BBE0 .incbin "baserom.gba", 0x58bbe0, 0xc gUnknown_0858BBEC:: @ 858BBEC - .incbin "baserom.gba", 0x58bbec, 0x18c + .incbin "baserom.gba", 0x58bbec, 0xc diff --git a/data/strings.s b/data/strings.s index 96011f05c7..360f267113 100644 --- a/data/strings.s +++ b/data/strings.s @@ -4645,16 +4645,16 @@ gText_MixingRecords:: @ 85EEA7E gText_RecordMixingComplete:: @ 85EEA8E .string "Record mixing completed.\nThank you for waiting.$" -gUnknown_085EEABE:: @ 85EEABE +gText_YourName:: @ 85EEABE .string "YOUR NAME?$" -gUnknown_085EEAC9:: @ 85EEAC9 +gText_BoxName:: @ 85EEAC9 .string "BOX NAME?$" -gUnknown_085EEAD3:: @ 85EEAD3 +gText_PkmnsNickname:: @ 85EEAD3 .string "{STR_VAR_1}’s nickname?$" -gUnknown_085EEAE2:: @ 85EEAE2 +gText_TellHimTheWords:: @ 85EEAE2 .string "Tell him the words.$" gText_MoveOkBack:: @ 85EEAF6 diff --git a/graphics/naming_screen/0.pal b/graphics/naming_screen/0.pal new file mode 100644 index 0000000000..e38b79fcf7 --- /dev/null +++ b/graphics/naming_screen/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +255 255 255 +98 98 98 +213 213 205 +230 8 8 +255 189 115 +32 156 8 +148 246 148 +49 82 205 +164 197 246 +0 0 0 +0 0 0 +0 0 0 +123 172 197 +213 156 115 +148 189 106 diff --git a/graphics/naming_screen/1.pal b/graphics/naming_screen/1.pal new file mode 100644 index 0000000000..c3158adbfa --- /dev/null +++ b/graphics/naming_screen/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 213 180 +255 197 148 +222 148 115 +123 65 65 +213 172 65 +156 106 32 +106 74 32 +115 189 0 +65 123 0 +32 65 16 +213 115 164 +164 65 115 +82 32 65 +230 230 49 +0 0 0 diff --git a/graphics/naming_screen/pc_icon/0.png b/graphics/naming_screen/pc_icon/0.png new file mode 100644 index 0000000000000000000000000000000000000000..bafd5c32dae100b1b0fa6bfa978b3858176424fc GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRm!VDxC`x5MdltF+`h%1l|a!g7JDo#pDDlRVW z?(R;q3@SEsyn1!-90i3f3KHF#hTqd~YB|Nq}3w$Kl#$J^7zF@$4ga)JWC zL^C5Zb1}Pwgn_~KHYP`wjzUq613eK63Mx#OS&f!*XYk!gVPlI+e$1^=_V@pP=A`g& mclXbCr5)TfBo@4AVqj2V(L4TNipD>nu?(KBelF{r5}E++KRty2 literal 0 HcmV?d00001 diff --git a/graphics/naming_screen/pc_icon/1.png b/graphics/naming_screen/pc_icon/1.png new file mode 100644 index 0000000000000000000000000000000000000000..e2f9d604c0ca7d2d3ae8b85096c9fcc6a4a102af GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRm!VDxC`x5MdltF+`h%1l|a!g7JDo#pDDlRVW z?(R;q3@SEsyn1!-90i3f3KHF#hTqd~YB|Nq}3w$Kl#C(P5uF@$4ga)JWC zL^C5Zb1}Pwgn_~LMuv`yALTjX8eANBHk{xVVCekQ-1+Cne>o+l>#QuX4s3T)*x2Hd yA9HJz{r&%+IVn8c-Tm`jX$LnAi3Km37#LppTCOasxBm^afx*+&&t;ucLK6V3d_{l& literal 0 HcmV?d00001 From d10c91f1b0101034613aed8a3f8d50c3b6f709b6 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sat, 20 Jan 2018 15:37:37 -0600 Subject: [PATCH 51/64] Extract data from item_menu_icons.s --- data/item_menu_icons.s | 200 +++++++++++++++++++++++++---- data/map_name_popup.s | 6 + graphics/interface/bag_spinner.png | Bin 0 -> 212 bytes graphics/unused/cherry.png | Bin 0 -> 343 bytes 4 files changed, 179 insertions(+), 27 deletions(-) create mode 100644 graphics/interface/bag_spinner.png create mode 100644 graphics/unused/cherry.png diff --git a/data/item_menu_icons.s b/data/item_menu_icons.s index c79b59e439..ff86fc54dd 100644 --- a/data/item_menu_icons.s +++ b/data/item_menu_icons.s @@ -1,75 +1,221 @@ #include "constants/items.h" - .include "asm/macros.inc" - .include "constants/constants.inc" + .include "asm/macros.inc" + .include "constants/constants.inc" - .section .rodata - .align 2, 0 + .section .rodata -gUnknown_0857F464:: @ 857F464 - .incbin "baserom.gba", 0x57f464, 0xe0 + .align 2 +gUnknown_0857F564:: @ 857F564 + .incbin "graphics/interface/bag_spinner.gbapal" -gUnknown_0857F544:: @ 857F544 - .incbin "baserom.gba", 0x57f544, 0x5f0 + .align 2 +gUnknown_0857F584:: @ 857F584 + .incbin "graphics/interface/bag_spinner.4bpp" + .align 2 +gUnknown_0857F604:: @ 857F604 + .incbin "graphics/unused/cherry.4bpp" + + .align 2 +gUnknown_0857FA84:: @ 857FA84 + .incbin "graphics/unused/cherry.gbapal" + + .align 2 +gOamData_857FAA4:: @ 857FAA4 + .2byte 0x0100, 0xc000, 0x0400, 0x0000 + + .align 2 +gSpriteAnim_857FAAC:: @ 857FAAC + .2byte 0x0000, 0x0004, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_857FAB4:: @ 857FAB4 + .2byte 0x0040, 0x0004, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_857FABC:: @ 857FABC + .2byte 0x0080, 0x0004, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_857FAC4:: @ 857FAC4 + .2byte 0x00c0, 0x0004, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_857FACC:: @ 857FACC + .2byte 0x0100, 0x0004, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_857FAD4:: @ 857FAD4 + .2byte 0x0140, 0x0004, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_857FADC:: @ 857FADC + .4byte gSpriteAnim_857FAAC + .4byte gSpriteAnim_857FAB4 + .4byte gSpriteAnim_857FAC4 + .4byte gSpriteAnim_857FACC + .4byte gSpriteAnim_857FAD4 + .4byte gSpriteAnim_857FABC + + .align 2 +gSpriteAffineAnim_857FAF4:: @ 857FAF4 + .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_857FB04:: @ 857FB04 + .2byte 0x0000, 0x0000, 0x02fe, 0x0000, 0x0000, 0x0000, 0x0402, 0x0000, 0x0000, 0x0000, 0x04fe, 0x0000, 0x0000, 0x0000, 0x0202, 0x0000 + .2byte 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnimTable_857FB2C:: @ 857FB2C + .4byte gSpriteAffineAnim_857FAF4 + .4byte gSpriteAffineAnim_857FB04 + + .align 2 gUnknown_0857FB34:: @ 857FB34 - .incbin "baserom.gba", 0x57fb34, 0x8 + obj_tiles gBagMaleTiles, 0x3000, 0x0064 + .align 2 gUnknown_0857FB3C:: @ 857FB3C - .incbin "baserom.gba", 0x57fb3c, 0x8 + obj_tiles gBagFemaleTiles, 0x3000, 0x0064 + .align 2 gUnknown_0857FB44:: @ 857FB44 - .incbin "baserom.gba", 0x57fb44, 0x8 + obj_pal gBagPalette, 0x0064 + .align 2 gUnknown_0857FB4C:: @ 857FB4C - .incbin "baserom.gba", 0x57fb4c, 0x4c + spr_template 0x0064, 0x0064, gOamData_857FAA4, gSpriteAnimTable_857FADC, NULL, gSpriteAffineAnimTable_857FB2C, SpriteCallbackDummy + .align 2 +gOamData_857FB64:: @ 857FB64 + .2byte 0x0000, 0x4800, 0x0800, 0x0000 + + .align 2 +gSpriteAnim_857FB6C:: @ 857FB6C + .2byte 0x0000, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_857FB74:: @ 857FB74 + .4byte gSpriteAnim_857FB6C + + .align 2 +gSpriteAffineAnim_857FB78:: @ 857FB78 + .2byte 0x0000, 0x0000, 0x1008, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_857FB88:: @ 857FB88 + .2byte 0x0000, 0x0000, 0x10f8, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 gUnknown_0857FB98:: @ 857FB98 - .incbin "baserom.gba", 0x57fb98, 0x4 + .4byte gSpriteAffineAnim_857FB78 + .align 2 gUnknown_0857FB9C:: @ 857FB9C - .incbin "baserom.gba", 0x57fb9c, 0x4 + .4byte gSpriteAffineAnim_857FB88 + .align 2 gUnknown_0857FBA0:: @ 857FBA0 - .incbin "baserom.gba", 0x57fba0, 0x8 + obj_tiles gUnknown_0857F584, 0x0080, 0x0065 + .align 2 gUnknown_0857FBA8:: @ 857FBA8 - .incbin "baserom.gba", 0x57fba8, 0x8 + obj_pal gUnknown_0857F564, 0x0065 + .align 2 gUnknown_0857FBB0:: @ 857FBB0 - .incbin "baserom.gba", 0x57fbb0, 0x3c + spr_template 0x0065, 0x0065, gOamData_857FB64, gSpriteAnimTable_857FB74, NULL, gUnknown_0857FB98, ObjectCB_SwitchPocketRotatingBallInit + .align 2 +gOamData_857FBC8:: @ 857FBC8 + .2byte 0x0000, 0xc000, 0x7400, 0x0000 + + .align 2 +gOamData_857FBD0:: @ 857FBD0 + .2byte 0x0300, 0xc000, 0x7000, 0x0000 + + .align 2 +gSpriteAnim_857FBD8:: @ 857FBD8 + .2byte 0x0000, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_857FBE0:: @ 857FBE0 + .4byte gSpriteAnim_857FBD8 + + .align 2 +gOamData_857FBE4:: @ 857FBE4 + .2byte 0xc000, 0x0201, 0x0800, 0x0000 + + .align 2 gUnknown_0857FBEC:: @ 857FBEC - .incbin "baserom.gba", 0x57fbec, 0x90 + spr_template 0xffff, 0x7544, gOamData_857FBC8, gSpriteAnimTable_857FBE0, gOamData_857FBE4, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 +gSpriteAffineAnim_857FC04:: @ 857FC04 + .2byte 0xffff, 0xffff, 0x60fd, 0x0000, 0x0000, 0x0000, 0x1000, 0x0000, 0xfffe, 0xfffe, 0x40ff, 0x0000, 0xfff8, 0x0000, 0x1000, 0x0000 + .2byte 0x0000, 0xfff8, 0x1000, 0x0000, 0x0100, 0x0100, 0x0000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_857FC3C:: @ 857FC3C + .2byte 0xffff, 0xffff, 0x6003, 0x0000, 0x0000, 0x0000, 0x1000, 0x0000, 0xfffe, 0xfffe, 0x4001, 0x0000, 0xfff8, 0x0000, 0x1000, 0x0000 + .2byte 0x0000, 0xfff8, 0x1000, 0x0000, 0x0100, 0x0100, 0x0000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnimTable_857FC74:: @ 857FC74 + .4byte gSpriteAffineAnim_857FC04 + .4byte gSpriteAffineAnim_857FC3C + + .align 2 gUnknown_0857FC7C:: @ 857FC7C - .incbin "baserom.gba", 0x57fc7c, 0x18 + spr_template 0xffff, 0x7544, gOamData_857FBD0, gSpriteAnimTable_857FBE0, gOamData_857FBE4, gSpriteAffineAnimTable_857FC74, SpriteCallbackDummy @ 857FC94 .include "data/graphics/berries/berry_pic_table.inc" + .align 2 gUnknown_0857FDEC:: @ 857FDEC - .incbin "baserom.gba", 0x57fdec, 0x8 + obj_tiles gBerryCheckCircle_Gfx, 0x0800, 0x2710 + .align 2 gUnknown_0857FDF4:: @ 857FDF4 - .incbin "baserom.gba", 0x57fdf4, 0x1c + obj_pal gUnknown_08D9BEF0, 0x2710 + .align 2 +gOamData_857FDFC:: @ 857FDFC + .2byte 0x0000, 0xc000, 0x0400, 0x0000 + + .align 2 +gSpriteAnim_857FE04:: @ 857FE04 + .2byte 0x0000, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_857FE0C:: @ 857FE0C + .4byte gSpriteAnim_857FE04 + + .align 2 gUnknown_0857FE10:: @ 857FE10 - .incbin "baserom.gba", 0x57fe10, 0x18 + spr_template 0x2710, 0x2710, gOamData_857FDFC, gSpriteAnimTable_857FE0C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_0857FE28:: @ 857FE28 - .incbin "baserom.gba", 0x57fe28, 0x18 + spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D5860 + .align 2 gUnknown_0857FE40:: @ 857FE40 - .incbin "baserom.gba", 0x57fe40, 0x18 + spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D58F8 + .align 2 gUnknown_0857FE58:: @ 857FE58 - .incbin "baserom.gba", 0x57fe58, 0x18 + spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D5968 + .align 2 gUnknown_0857FE70:: @ 857FE70 - .incbin "baserom.gba", 0x57fe70, 0x18 + spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D5A94 + .align 2 gUnknown_0857FE88:: @ 857FE88 - .incbin "baserom.gba", 0x57fe88, 0x18 + spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D5B48 @ 857FEA0 .include "data/text/item_descriptions.inc" diff --git a/data/map_name_popup.s b/data/map_name_popup.s index ff7c3ea4e1..f13886e1de 100644 --- a/data/map_name_popup.s +++ b/data/map_name_popup.s @@ -15,3 +15,9 @@ gUnknown_0857F384:: @ 857F384 gUnknown_0857F444:: @ 857F444 .incbin "baserom.gba", 0x57f444, 0x20 + +gUnknown_0857F464:: @ 857F464 + .incbin "baserom.gba", 0x57f464, 0xe0 + +gUnknown_0857F544:: @ 857F544 + .incbin "baserom.gba", 0x57f544, 0x20 diff --git a/graphics/interface/bag_spinner.png b/graphics/interface/bag_spinner.png new file mode 100644 index 0000000000000000000000000000000000000000..4302bd77aac3c0177e0594eb813a17f14a0676ac GIT binary patch literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFyPApikprWDz$kniLu*m4p2mp$o`0=3Qhl0X|j2|8i zKX%NB0GT+qq7g`O7I;J!GcfQS24TkI`72U@g1VkAjv*44lMnFU+uM9GK&|cWNxuL9 literal 0 HcmV?d00001 diff --git a/graphics/unused/cherry.png b/graphics/unused/cherry.png new file mode 100644 index 0000000000000000000000000000000000000000..d79fe62d1eff432e0bcd9209c165a145ce32dfdc GIT binary patch literal 343 zcmV-d0jU0oP)50002u zNkl@6WmHaPV+?&GiS4Qv!?gqV+CA>ASuvt$b6Lf&{yuzBL|y>+ZZzZ=2R% pqrG=T7r-cJ1i;XvUhvoN^aebuLJ~HC2_*mk002ovPDHLkV1hQKk*xp# literal 0 HcmV?d00001 From b47b9e57589cbe0334a5a370d35bd44592c806e3 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sat, 20 Jan 2018 16:22:16 -0600 Subject: [PATCH 52/64] Extract data from starter_choose --- data/starter_choose.s | 130 +++++++++++++++++++++++++----- graphics/misc/birch_bag.png | Bin 0 -> 1304 bytes graphics/misc/birch_bag_map.bin | Bin 0 -> 1280 bytes graphics/misc/birch_ballarrow.png | Bin 0 -> 635 bytes graphics/misc/birch_circle.png | Bin 0 -> 349 bytes graphics/misc/birch_grass.png | Bin 0 -> 691 bytes graphics/misc/birch_grass_map.bin | Bin 0 -> 2048 bytes graphics_file_rules.mk | 6 +- src/starter_choose.c | 8 +- 9 files changed, 118 insertions(+), 26 deletions(-) create mode 100644 graphics/misc/birch_bag.png create mode 100644 graphics/misc/birch_bag_map.bin create mode 100644 graphics/misc/birch_ballarrow.png create mode 100644 graphics/misc/birch_circle.png create mode 100644 graphics/misc/birch_grass.png create mode 100644 graphics/misc/birch_grass_map.bin diff --git a/data/starter_choose.s b/data/starter_choose.s index 160046d4c9..92b95d80cf 100644 --- a/data/starter_choose.s +++ b/data/starter_choose.s @@ -4,68 +4,156 @@ .section .rodata + .align 2 gBirchBagGrassPal:: @ 85B0A00 - .incbin "baserom.gba", 0x5b0a00, 0x80 + .incbin "graphics/misc/birch_bag.gbapal" + .incbin "graphics/misc/birch_grass.gbapal" + .align 2 +gBirchBallarrow_Pal:: @ 85B0A40 + .incbin "graphics/misc/birch_ballarrow.gbapal" + + .align 2 +gBirchCircle_Pal:: @ 85B0A60 + .incbin "graphics/misc/birch_circle.gbapal" + + .align 2 gBirchBagTilemap:: @ 85B0A80 - .incbin "baserom.gba", 0x5b0a80, 0x18c + .incbin "graphics/misc/birch_bag_map.bin.lz" + .align 2 gBirchGrassTilemap:: @ 85B0C0C - .incbin "baserom.gba", 0x5b0c0c, 0x1f8 + .incbin "graphics/misc/birch_grass_map.bin.lz" + .align 2 gBirchHelpGfx:: @ 85B0E04 - .incbin "baserom.gba", 0x5b0e04, 0xaa8 + .incbin "graphics/misc/birch_help.4bpp.lz" + .align 2 gUnknown_085B18AC:: @ 85B18AC - .incbin "baserom.gba", 0x5b18AC, 0x520 + .incbin "graphics/misc/birch_ballarrow.4bpp.lz" + .align 2 +gUnknown_085B1BCC:: @ 85B1BCC + .incbin "graphics/misc/birch_circle.4bpp.lz" + + .align 2 gUnknown_085B1DCC:: @ 85B1DCC - .incbin "baserom.gba", 0x5b1dcc, 0x10 + window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0e, 0x0200 + null_window_template + .align 2 gUnknown_085B1DDC:: @ 85B1DDC - .incbin "baserom.gba", 0x5b1ddc, 0x8 + window_template 0x00, 0x18, 0x09, 0x05, 0x04, 0x0e, 0x0260 + .align 2 gUnknown_085B1DE4:: @ 85B1DE4 - .incbin "baserom.gba", 0x5b1de4, 0x8 + window_template 0x00, 0x00, 0x00, 0x0d, 0x04, 0x0e, 0x0274 sPokeballCoords:: @ 85B1DEC - .incbin "baserom.gba", 0x5b1dec, 0x6 + .byte 0x3c, 0x40, 0x78, 0x58, 0xb4, 0x40 gStarterChoose_LabelCoords:: @ 85B1DF2 - .incbin "baserom.gba", 0x5b1df2, 0x6 + .byte 0x00, 0x09, 0x10, 0x0a, 0x08, 0x04 sStarterMon:: @ 85B1DF8 .2byte SPECIES_TREECKO .2byte SPECIES_TORCHIC .2byte SPECIES_MUDKIP -.align 2 + .align 2 gUnknown_085B1E00:: @ 85B1E00 - .incbin "baserom.gba", 0x5b1e00, 0xc + .4byte 0x000001f8, 0x00003072, 0x00001063 gUnknown_085B1E0C:: @ 85B1E0C - .incbin "baserom.gba", 0x5b1e0c, 0x1c + .byte 0x00, 0x01, 0x03 + + .align 2 +gOamData_85B1E10:: @ 85B1E10 + .2byte 0x00a0, 0x8000, 0x0400, 0x0000 + + .align 2 +gOamData_85B1E18:: @ 85B1E18 + .2byte 0x00a0, 0x8000, 0x0400, 0x0000 + + .align 2 +gOamData_85B1E20:: @ 85B1E20 + .2byte 0x03a0, 0xc000, 0x0400, 0x0000 gUnknown_085B1E28:: @ 85B1E28 - .incbin "baserom.gba", 0x5b1e28, 0xa8 + .byte 0x3c, 0x20, 0x78, 0x38, 0xb4, 0x20, 0x00, 0x00 + .align 2 +gSpriteAnim_85B1E30:: @ 85B1E30 + .2byte 0x0030, 0x001e, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_85B1E38:: @ 85B1E38 + .2byte 0x0000, 0x001e, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_85B1E40:: @ 85B1E40 + .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, 0xfffe, 0x0000 + + .align 2 +gSpriteAnim_85B1E88:: @ 85B1E88 + .2byte 0x0000, 0x0008, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_85B1E90:: @ 85B1E90 + .4byte gSpriteAnim_85B1E30 + + .align 2 +gSpriteAnimTable_85B1E94:: @ 85B1E94 + .4byte gSpriteAnim_85B1E38 + .4byte gSpriteAnim_85B1E40 + + .align 2 +gSpriteAnimTable_85B1E9C:: @ 85B1E9C + .4byte gSpriteAnim_85B1E88 + + .align 2 +gSpriteAffineAnim_85B1EA0:: @ 85B1EA0 + .2byte 0x0010, 0x0010, 0x0000, 0x0000, 0x0010, 0x0010, 0x0f00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gSpriteAffineAnim_85B1EB8:: @ 85B1EB8 + .2byte 0x0014, 0x0014, 0x0000, 0x0000, 0x0014, 0x0014, 0x0f00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 gUnknown_085B1ED0:: @ 85B1ED0 - .incbin "baserom.gba", 0x5b1ed0, 0x8 + .4byte gSpriteAffineAnim_85B1EA0 + .align 2 +gSpriteAffineAnimTable_85B1ED4:: @ 85B1ED4 + .4byte gSpriteAffineAnim_85B1EB8 + + .align 2 gUnknown_085B1ED8:: @ 85B1ED8 - .incbin "baserom.gba", 0x5b1ed8, 0x10 + obj_tiles gUnknown_085B18AC, 0x0800, 0x1000 + null_obj_tiles + .align 2 gUnknown_085B1EE8:: @ 85B1EE8 - .incbin "baserom.gba", 0x5b1ee8, 0x10 + obj_tiles gUnknown_085B1BCC, 0x0800, 0x1001 + null_obj_tiles + .align 2 gUnknown_085B1EF8:: @ 85B1EF8 - .incbin "baserom.gba", 0x5b1ef8, 0x18 + obj_pal gBirchBallarrow_Pal, 0x1000 + obj_pal gBirchCircle_Pal, 0x1001 + null_obj_pal + .align 2 sSpriteTemplate_Hand:: @ 85B1F10 - .incbin "baserom.gba", 0x5b1f10, 0x18 + spr_template 0x1000, 0x1000, gOamData_85B1E10, gSpriteAnimTable_85B1E90, NULL, gDummySpriteAffineAnimTable, sub_81346DC + .align 2 sSpriteTemplate_PokeBall:: @ 85B1F28 - .incbin "baserom.gba", 0x5b1f28, 0x18 + spr_template 0x1000, 0x1000, gOamData_85B1E18, gSpriteAnimTable_85B1E94, NULL, gDummySpriteAffineAnimTable, sub_813473C + .align 2 gUnknown_085B1F40:: @ 85B1F40 - .incbin "baserom.gba", 0x5b1f40, 0x18 + spr_template 0x1001, 0x1001, gOamData_85B1E20, gSpriteAnimTable_85B1E9C, NULL, gSpriteAffineAnimTable_85B1ED4, StarterPokemonSpriteCallback diff --git a/graphics/misc/birch_bag.png b/graphics/misc/birch_bag.png new file mode 100644 index 0000000000000000000000000000000000000000..86bfbbbc0a3aae8d4bf4b8ba8f716030c82606fe GIT binary patch literal 1304 zcmV+z1?T#SP)3j1-8jW1bWru}qWPLyLd2gPSq|>oimo_f_ zuhl(v!`GjaKXP5S{}~d;u2>C;9_N4UlaE}rED64%bliq;QoeGlWk~cmWl0jZAd;BH zM+Tsj=)v}hSi2Aohnpg|zEA?=EYWL9Uh(bu6*^jZmkenwE)nTAK#ZRqTlv20j>3AJ zbN=@>f`hl&1-M6UKk$dtjN`otY4!mH8U^$b;rqUpNOkqes|H{NdAk7b2oW9-q(s$! zXWCF$HyZ%E1400VgxUP*56u=(GT2gp27pBEe!GSqi(M}oSOR_V)mJOr3BUq88Z-qe zfJtyds|h`E0^TTS3RD39^$vjSpf@VZCL^NU3e5`(e; z!yv2x5v67qPkdSSL7wN}kY8K{ZaEW!K`Bs%oUjJy`o6fm|6QJ6=J^dEuBxFb4UAB? z4mg2N#l7Fc=Hg$T-|C?nXaf)^LsMDO{D zrhpDjsRal%;lNOkz4Wv}ScPKzzj2HXi6Tu{nhMxUUl|Ai35W?CqB%%T7!pbX*~x{e z0A)ng5hy@RXb9h#@6~BULmCA_;y@~tgbQ(92>`%>d=%9Wp)*CIB=}gw!YCr2$9Vl4 zk%xC{MBr;!9|L$9h>s<~U*wlJMiF-e2t!8Yj}#)difH{&=$)B_Lotq8VIKG-##bsK zQz9E73~CQ!Z}XrCco_cD=;I|`c@a?t;aJ6mLG6XqW12vTEJ7dU#hs8Ml)>gDfLa2b z9<37&ONBe4&X7?PUcxsKmY~$d&<|wajNGyML^17^BsBkRTKc%u*uKAnFM@}ITVrN<~#G9-Z`b$pn3Xa z5<+Y*rHRTn`)>d?oZdsJr%xpzkOFHwy0$n1GLH4Xdk+NNN+AGOQDA3U0y2((84w<; zx#ep{#~`rn^y_Prog?AhtVS5~n9;P=Up0XP;dEva7<7Qq=RGRuh`&jI@Xt&Ueh~$5 zco4>ueJap|%}f#=vjj&Mj)48NpMW9=z*CkL#XWq-afn-5h$s9tEJfJN-alq%1*`{| zr{fj@695yv!OaT=z&r}w`J$N5F`i{=AbDF0ZNPF_6d$v!e1T2cTG%wmvR@}$ zO%fK+a)uV*t1Rn$`R8QvHdb%2mJT!kaslEkj=(-cycGbeDEMA~F8>SG>pV$S634y( O0000CJLBbPy_)LDN>DsAk`?SfP#@~p+u3YKuDx1Nc`9J$jd$4ft*Jl z*z+=3S-+hk?H=jS>9H=|di3hk?}<+d_-6(T zdhUgnh723=%4?&>ys@2tA2(srlxZ{GdGCXdX3d$m;CBN4vqfJlS+-);nsr}&vtiTL z-)!P(MFGZ@lT5$cv1`x113&z9=*Ta}L2o)A^*gW9z0p0Y)7pue*(KBWzw)6;!&>w5hNb?e7nhur|*C literal 0 HcmV?d00001 diff --git a/graphics/misc/birch_ballarrow.png b/graphics/misc/birch_ballarrow.png new file mode 100644 index 0000000000000000000000000000000000000000..d2f0a3d972292e27ebe1cf8c54d3b6f3aa697697 GIT binary patch literal 635 zcmV->0)+jEP)0Q=@SO5EKfW zR}j=i1o7R2>SJ7mllR+rfB3FaW(B6VSbr)tI7`y~;x@Z8ptnzoI$MTYWjid zrSYHy;o8j@oB-1BPJwe^>;faQgx*i&vv^qrnCe-Qd3LSS6P;LTIarw7L$I8UZny8b}K^40p|pBQAL45H5*Z>Wz4J^sxp*eZhZgj}a*xl6I;3p$jXp8HOKwvjPaBfU7w7KLHa9!T@HdU5QO{g&;5_#0Z8!OL_Gm`0L23!tSJphX*=Ju`#O`%Y}wtxxph@d z*S#*TR8?bBl_*zR>Irz35#bre22U9KEpB#>@OMfW*NjA9Ba#t_MQ(Y*M>&XG9P_x@ zLn|yA1&cqMMTJ?Ts4#03dhj)ZgkXy$Nt+24aNM_e|i(B)MF00000NkvXXu0mjfQA(GG literal 0 HcmV?d00001 diff --git a/graphics/misc/birch_grass.png b/graphics/misc/birch_grass.png new file mode 100644 index 0000000000000000000000000000000000000000..838fa5f4c792c496fee5439a410bf0ab70660622 GIT binary patch literal 691 zcmV;k0!;mhP)3>oKi}AK{;A6AUPoa{{a900RR60|Nj90{{a9008(>7qZZ)T0006$ zNklPzh`p7x#jll-CY4tT=+^YL1v@9 z?E<2_`^Yr`4pYD>_iwoX`me46V2rCT$pN@hh7AB6l6#h?Vpqa`0LEUjFOLHr%`w3J zRHl!BPZP3{%_f7NsvZOnYHFt2T*n0<1$gz9R+WVA^>Xj4c5 z-M${8McP_vnZd65XTa!O+2s{r9LP({VkiJyzpsw~LJIJNfHd2=0{qtfUjU3mibopQ zv`fDLD1LLKp8!mNjGC=p0Z@o|V89#DDyA2El<`TT8h%N~>u>>(QypN46-S$G&<(rC zgC5;~1B^~Ndl*x9D}e4k-VgON0PQOQ0(i(NPzR4={R|KvFx5j@h&Dukf%`ImWR3E{ zDqy3&AWbQl`_&A@7(e(H(CV+sQ~+)RpqN=tn( zTS;}mcB3!{d3(9aLngZc!j6G4<_Gx=pahX?1Xz_%k2=770%nM0VlarA`UD_vdyk|A zP%UAM`6sUc5G#;1J2{2T4ghulAsRvQ@cWYhO2-)bXHe$=69t3(->L$xxZ;W{uDD_q Z{{ZqzPeUcM&X@oI002ovPDHLkV1hGXF^~WN literal 0 HcmV?d00001 diff --git a/graphics/misc/birch_grass_map.bin b/graphics/misc/birch_grass_map.bin new file mode 100644 index 0000000000000000000000000000000000000000..b7332940c441ab0334b651b4b249898f70e056ec GIT binary patch literal 2048 zcmeH{M~=ck5Jl$*fAJ4$Za_{3L|TyqEXg^o$l+GgZDY5vriY+ejqH-#web5@UH#n# z3=zSP;!8Y|{u};B6$U+FQ1$AqA3_)rL=i(A2_%t1ib*CIXN*xs7-mSQseT{%JPIhH zgfapu7`R87B^Fs=UduPpLR*n`=JHaf%@&(leuOd1UwM;bjOpFMWj(elz46HGC~91AS5!WwI?xa5L!&N$`7_LA%M$Mcu`9tRw8!WkD_al?&Q rUU=q-M;^F;$}4ZalBxRkU-a(V=biiK-O1VC`}6bX_nCA4kAJ=aQZxg* literal 0 HcmV?d00001 diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 9711b5195b..47cc5ad7fb 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -18,6 +18,7 @@ SLOTMACHINEGFXDIR := graphics/slot_machine PKNAVGFXDIR := graphics/pokenav PKNAVOPTIONSGFXDIR := graphics/pokenav/options PSSGFXDIR := graphics/pokemon_storage +MISCGFXDIR := graphics/misc types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark contest_types := cool beauty cute smart tough @@ -307,7 +308,7 @@ graphics/link_games/pkmnjump_bg.4bpp: %.4bpp: %.png graphics/pokenav/region_map.8bpp: %.8bpp: %.png $(GFX) $< $@ -num_tiles 233 -graphics/misc/japanese_hof.4bpp: %.4bpp: %.png +$(MISCGFXDIR)/japanese_hof.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 29 $(INTERFACEGFXDIR)/menu.gbapal: $(INTERFACEGFXDIR)/menu_0.gbapal \ @@ -658,3 +659,6 @@ $(INTERFACEGFXDIR)/region_map.8bpp: %.8bpp: %.png $(INTERFACEGFXDIR)/region_map_affine.8bpp: %.8bpp: %.png $(GFX) $< $@ -num_tiles 233 + +$(MISCGFXDIR)/birch_help.4bpp: $(MISCGFXDIR)/birch_bag.4bpp $(MISCGFXDIR)/birch_grass.4bpp + @cat $^ >$@ diff --git a/src/starter_choose.c b/src/starter_choose.c index 2d78af8fb1..c2c553d46f 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -74,7 +74,7 @@ static void Task_MoveStarterChooseCursor(u8 taskId); static void sub_8134668(u8 taskId); static void CreateStarterPokemonLabel(u8 selection); static u8 CreatePokemonFrontSprite(u16 species, u8 x, u8 y); -static void StarterPokemonSpriteCallback(struct Sprite *sprite); +void StarterPokemonSpriteCallback(struct Sprite *sprite); static IWRAM_DATA u16 sStarterChooseWindowId; @@ -361,7 +361,7 @@ static u8 CreatePokemonFrontSprite(u16 species, u8 x, u8 y) return spriteId; } -static void sub_81346DC(struct Sprite *sprite) +void sub_81346DC(struct Sprite *sprite) { sprite->pos1.x = gUnknown_085B1E28[gTasks[sprite->data[0]].tStarterSelection][0]; sprite->pos1.y = gUnknown_085B1E28[gTasks[sprite->data[0]].tStarterSelection][1]; @@ -369,7 +369,7 @@ static void sub_81346DC(struct Sprite *sprite) sprite->data[1] = (u8)(sprite->data[1]) + 4; } -static void sub_813473C(struct Sprite *sprite) +void sub_813473C(struct Sprite *sprite) { if (gTasks[sprite->data[0]].tStarterSelection == sprite->data[1]) StartSpriteAnimIfDifferent(sprite, 1); @@ -377,7 +377,7 @@ static void sub_813473C(struct Sprite *sprite) StartSpriteAnimIfDifferent(sprite, 0); } -static void StarterPokemonSpriteCallback(struct Sprite *sprite) +void StarterPokemonSpriteCallback(struct Sprite *sprite) { //Move sprite to upper center of screen if (sprite->pos1.x > STARTER_PKMN_POS_X) From 59e1aacd26207f6bcbd1d0107886627c53950a7c Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Sat, 20 Jan 2018 17:26:30 -0500 Subject: [PATCH 53/64] DIEGO SEND HELP --- asm/fldeff_cut.s | 2 +- asm/map_name_popup.s | 6 +- data/contest_opponents.inc | 2114 +++++++++++++++++ data/event_scripts.s | 1 + data/field_effect_helpers.s | 11 +- data/field_ground_effect.s | 3 +- data/field_player_avatar.s | 17 +- data/field_special_scene.s | 6 +- data/field_tasks.s | 88 +- data/fldeff_cut.s | 24 +- .../field_objects/field_object_graphics.inc | 18 +- data/item_icon.s | 16 +- data/item_menu.s | 23 +- data/librfu_rodata.s | 5 +- data/map_name_popup.s | 29 +- data/mauville_old_man.s | 24 +- data/menu_helpers.s | 29 +- data/menu_indicators.s | 57 +- data/mon_markings.s | 144 +- data/mystery_event_menu.s | 6 +- data/mystery_event_msg.s | 28 +- data/scripts/mauville_man.inc | 111 +- data/specials.inc | 3 + graphics/interface/map_popup/857F444.pal | 19 + graphics/interface/map_popup/brick.png | Bin 0 -> 412 bytes .../interface/map_popup/brick_outline.png | Bin 0 -> 461 bytes graphics/interface/map_popup/marble.png | Bin 0 -> 509 bytes .../interface/map_popup/marble_outline.png | Bin 0 -> 494 bytes graphics/interface/map_popup/stone.png | Bin 0 -> 201 bytes graphics/interface/map_popup/stone2.png | Bin 0 -> 201 bytes .../interface/map_popup/stone2_outline.png | Bin 0 -> 407 bytes .../interface/map_popup/stone_outline.png | Bin 0 -> 407 bytes graphics/interface/map_popup/underwater.png | Bin 0 -> 304 bytes .../map_popup/underwater_outline.png | Bin 0 -> 485 bytes graphics/interface/map_popup/wood.png | Bin 0 -> 338 bytes graphics/interface/map_popup/wood_outline.png | Bin 0 -> 391 bytes graphics/interface/red_arrow.png | Bin 0 -> 167 bytes graphics/interface/red_arrow_other.png | Bin 0 -> 197 bytes graphics/interface/select_button.png | Bin 0 -> 135 bytes graphics/interface/selector_outline.png | Bin 0 -> 156 bytes .../pics/effects/unknown_4F6D38/0.png | Bin 0 -> 130 bytes .../pics/effects/unknown_4F7E38/0.png | Bin 0 -> 175 bytes .../pics/effects/unused_grass/0.png | Bin 0 -> 231 bytes .../pics/effects/unused_grass/1.png | Bin 0 -> 228 bytes .../pics/effects/unused_grass/2.png | Bin 0 -> 230 bytes .../pics/effects/unused_grass/3.png | Bin 0 -> 232 bytes graphics/misc/mon_markings.png | Bin 0 -> 489 bytes graphics/slot_machine/85A8524.pal | 19 + graphics_file_rules.mk | 7 + src/mail.c | 24 - 50 files changed, 2734 insertions(+), 100 deletions(-) create mode 100644 data/contest_opponents.inc create mode 100755 graphics/interface/map_popup/857F444.pal create mode 100755 graphics/interface/map_popup/brick.png create mode 100755 graphics/interface/map_popup/brick_outline.png create mode 100755 graphics/interface/map_popup/marble.png create mode 100755 graphics/interface/map_popup/marble_outline.png create mode 100755 graphics/interface/map_popup/stone.png create mode 100755 graphics/interface/map_popup/stone2.png create mode 100755 graphics/interface/map_popup/stone2_outline.png create mode 100755 graphics/interface/map_popup/stone_outline.png create mode 100755 graphics/interface/map_popup/underwater.png create mode 100755 graphics/interface/map_popup/underwater_outline.png create mode 100755 graphics/interface/map_popup/wood.png create mode 100755 graphics/interface/map_popup/wood_outline.png create mode 100755 graphics/interface/red_arrow.png create mode 100755 graphics/interface/red_arrow_other.png create mode 100755 graphics/interface/select_button.png create mode 100755 graphics/interface/selector_outline.png create mode 100755 graphics/map_objects/pics/effects/unknown_4F6D38/0.png create mode 100755 graphics/map_objects/pics/effects/unknown_4F7E38/0.png create mode 100755 graphics/map_objects/pics/effects/unused_grass/0.png create mode 100755 graphics/map_objects/pics/effects/unused_grass/1.png create mode 100755 graphics/map_objects/pics/effects/unused_grass/2.png create mode 100755 graphics/map_objects/pics/effects/unused_grass/3.png create mode 100755 graphics/misc/mon_markings.png create mode 100755 graphics/slot_machine/85A8524.pal diff --git a/asm/fldeff_cut.s b/asm/fldeff_cut.s index 20380e4787..19a29d729c 100755 --- a/asm/fldeff_cut.s +++ b/asm/fldeff_cut.s @@ -244,7 +244,7 @@ _080D38F8: lsrs r4, r0, 16 movs r7, 0x1 movs r5, 0 - ldr r3, =gUnknown_0857C60A + ldr r3, =gUnknown_0857C608 + 2 adds r0, r2, r3 ldrb r0, [r0] adds r6, 0x1 diff --git a/asm/map_name_popup.s b/asm/map_name_popup.s index f10dff9464..9802c31511 100755 --- a/asm/map_name_popup.s +++ b/asm/map_name_popup.s @@ -518,7 +518,7 @@ _080D4C0A: lsls r1, r4, 4 subs r1, r4 lsls r1, 6 - ldr r2, =gUnknown_0857DD04 + ldr r2, =gMapPopUp_Outline_Table adds r1, r2 movs r2, 0x80 lsls r2, 3 @@ -541,7 +541,7 @@ _080D4C0A: .pool _080D4C6C: lsls r0, r4, 5 - ldr r1, =gUnknown_0857F384 + ldr r1, =gMapPopUp_Palette_Table adds r0, r1 movs r1, 0xE0 movs r2, 0x20 @@ -550,7 +550,7 @@ _080D4C7A: lsls r1, r4, 4 subs r1, r4 lsls r1, 6 - ldr r0, =gUnknown_0857C684 + ldr r0, =gMapPopUp_Table adds r1, r0 movs r0, 0x50 str r0, [sp] diff --git a/data/contest_opponents.inc b/data/contest_opponents.inc new file mode 100644 index 0000000000..d8ccfbb5b5 --- /dev/null +++ b/data/contest_opponents.inc @@ -0,0 +1,2114 @@ +@todo: cleanup + .2byte SPECIES_POOCHYENA + .string "POOCHY$ " + .string "JIMMY$ " + .byte 7 + .2byte 0 + .4byte 0xc000fff + .2byte 68 + .2byte 46 + .2byte 44 + .2byte 36 + .2byte 336 + .byte 10 + .byte 4 + .byte 10 + .byte 3 + .byte 4 + .byte 50 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_ILLUMISE + .string "MUSILLE$ " + .string "EDITH$ " + .byte 8 + .2byte 0 + .4byte 0x82000fff + .2byte 16 + .2byte 156 + .2byte 263 + .2byte 33 + .2byte 343 + .byte 10 + .byte 10 + .byte 6 + .byte 1 + .byte 2 + .byte 60 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_DUSTOX + .string "DUSTER$ " + .string "EVAN$ " + .byte 11 + .2byte 0 + .4byte 0x21000fff + .2byte 8 + .2byte 318 + .2byte 236 + .2byte 113 + .2byte 16 + .byte 2 + .byte 10 + .byte 10 + .byte 12 + .byte 4 + .byte 70 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_SEEDOT + .string "DOTS$ " + .string "KELSEY$ " + .byte 16 + .2byte 0 + .4byte 0x20800fff + .2byte 96 + .2byte 117 + .2byte 235 + .2byte 331 + .2byte 74 + .byte 3 + .byte 3 + .byte 5 + .byte 2 + .byte 7 + .byte 80 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_TAILLOW + .string "TATAY$ " + .string "MADISON$" + .byte 18 + .2byte 0 + .4byte 0x80400fff + .2byte 4 + .2byte 17 + .2byte 97 + .2byte 332 + .2byte 45 + .byte 1 + .byte 3 + .byte 3 + .byte 5 + .byte 4 + .byte 90 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_NINCADA + .string "NINDA$ " + .string "RAYMOND$" + .byte 44 + .2byte 0 + .4byte 0x10200fff + .2byte 32 + .2byte 141 + .2byte 206 + .2byte 154 + .2byte 170 + .byte 5 + .byte 2 + .byte 10 + .byte 7 + .byte 8 + .byte 100 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_SHROOMISH + .string "SMISH$ " + .string "GRANT$ " + .byte 35 + .2byte 0 + .4byte 0x20100fff + .2byte 32 + .2byte 78 + .2byte 73 + .2byte 72 + .2byte 213 + .byte 3 + .byte 3 + .byte 10 + .byte 2 + .byte 2 + .byte 50 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_SPHEAL + .string "SLEAL$ " + .string "PAIGE$ " + .byte 26 + .2byte 0 + .4byte 0x8080fff + .2byte 24 + .2byte 62 + .2byte 55 + .2byte 45 + .2byte 317 + .byte 3 + .byte 5 + .byte 1 + .byte 10 + .byte 10 + .byte 60 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_SLAKOTH + .string "SLOKTH$ " + .string "ALEC$ " + .byte 31 + .2byte 0 + .4byte 0x40040fff + .2byte 88 + .2byte 70 + .2byte 68 + .2byte 281 + .2byte 227 + .byte 10 + .byte 4 + .byte 4 + .byte 5 + .byte 18 + .byte 70 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_WHISMUR + .string "WHIRIS$ " + .string "SYDNEY$ " + .byte 47 + .2byte 0 + .4byte 0x80020fff + .2byte 36 + .2byte 310 + .2byte 103 + .2byte 253 + .2byte 304 + .byte 2 + .byte 2 + .byte 7 + .byte 2 + .byte 7 + .byte 80 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_MAKUHITA + .string "MAHITA$ " + .string "MORRIS$ " + .byte 38 + .2byte 0 + .4byte 0x8010fff + .2byte 68 + .2byte 69 + .2byte 233 + .2byte 33 + .2byte 179 + .byte 9 + .byte 1 + .byte 1 + .byte 8 + .byte 1 + .byte 90 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_ARON + .string "RONAR$ " + .string "MARIAH$ " + .byte 10 + .2byte 0 + .4byte 0x8008fff + .2byte 68 + .2byte 232 + .2byte 334 + .2byte 29 + .2byte 36 + .byte 5 + .byte 10 + .byte 2 + .byte 10 + .byte 2 + .byte 100 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_CROBAT + .string "BATRO$ " + .string "RUSSELL$" + .byte 33 + .2byte 0 + .4byte 0x90004fff + .2byte 56 + .2byte 114 + .2byte 212 + .2byte 109 + .2byte 141 + .byte 4 + .byte 2 + .byte 2 + .byte 2 + .byte 10 + .byte 50 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_GULPIN + .string "GULIN$ " + .string "MELANIE$" + .byte 6 + .2byte 0 + .4byte 0x40002fff + .2byte 16 + .2byte 124 + .2byte 133 + .2byte 92 + .2byte 281 + .byte 1 + .byte 10 + .byte 1 + .byte 10 + .byte 5 + .byte 60 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_MANECTRIC + .string "RIKELEC$ " + .string "CHANCE$ " + .byte 15 + .2byte 0 + .4byte 0x80001fff + .2byte 12 + .2byte 209 + .2byte 86 + .2byte 87 + .2byte 46 + .byte 20 + .byte 10 + .byte 1 + .byte 1 + .byte 1 + .byte 70 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_BULBASAUR + .string "BULBY$ " + .string "AGATHA$ " + .byte 20 + .2byte 0 + .4byte 0xc000fff + .2byte 48 + .2byte 45 + .2byte 73 + .2byte 33 + .2byte 230 + .byte 5 + .byte 3 + .byte 10 + .byte 10 + .byte 4 + .byte 50 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_BUTTERFREE + .string "FUTTERBE$ " + .string "BEAU$ " + .byte 40 + .2byte 0 + .4byte 0x82000fff + .2byte 40 + .2byte 48 + .2byte 18 + .2byte 318 + .2byte 219 + .byte 3 + .byte 10 + .byte 2 + .byte 10 + .byte 4 + .byte 60 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_PIDGEOTTO + .string "PIDEOT$ " + .string "KAY$ " + .byte 34 + .2byte 0 + .4byte 0x21000fff + .2byte 12 + .2byte 119 + .2byte 98 + .2byte 332 + .2byte 297 + .byte 10 + .byte 8 + .byte 4 + .byte 2 + .byte 3 + .byte 70 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_DIGLETT + .string "DIGLE$ " + .string "CALE$ " + .byte 55 + .2byte 0 + .4byte 0x20800fff + .2byte 96 + .2byte 91 + .2byte 89 + .2byte 90 + .2byte 222 + .byte 4 + .byte 2 + .byte 3 + .byte 5 + .byte 10 + .byte 80 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_POLIWAG + .string "WAGIL$ " + .string "CAITLIN$" + .byte 53 + .2byte 0 + .4byte 0x80400fff + .2byte 72 + .2byte 56 + .2byte 240 + .2byte 34 + .2byte 58 + .byte 2 + .byte 10 + .byte 5 + .byte 3 + .byte 10 + .byte 90 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_TOTODILE + .string "TOTDIL$ " + .string "COLBY$ " + .byte 5 + .2byte 0 + .4byte 0x10200fff + .2byte 12 + .2byte 99 + .2byte 103 + .2byte 57 + .2byte 59 + .byte 6 + .byte 10 + .byte 2 + .byte 1 + .byte 5 + .byte 100 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_LEDYBA + .string "BALEDY$ " + .string "KYLIE$ " + .byte 45 + .2byte 0 + .4byte 0x20100fff + .2byte 20 + .2byte 226 + .2byte 97 + .2byte 129 + .2byte 213 + .byte 8 + .byte 6 + .byte 8 + .byte 6 + .byte 2 + .byte 90 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_DELIBIRD + .string "BIRDLY$ " + .string "LIAM$ " + .byte 66 + .2byte 0 + .4byte 0x8080fff + .2byte 112 + .2byte 217 + .2byte 263 + .2byte 264 + .2byte 216 + .byte 4 + .byte 3 + .byte 10 + .byte 5 + .byte 3 + .byte 80 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_LARVITAR + .string "TARVITAR$ " + .string "MILO$ " + .byte 39 + .2byte 0 + .4byte 0x40040fff + .2byte 64 + .2byte 37 + .2byte 259 + .2byte 242 + .2byte 91 + .byte 8 + .byte 5 + .byte 5 + .byte 8 + .byte 10 + .byte 70 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_ROSELIA + .string "RELIA$ " + .string "KARINA$ " + .byte 32 + .2byte 0 + .4byte 0x24000fff + .2byte 41 + .2byte 80 + .2byte 345 + .2byte 320 + .2byte 275 + .byte 50 + .byte 15 + .byte 75 + .byte 10 + .byte 20 + .byte 100 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_DODRIO + .string "DUODO$ " + .string "BOBBY$ " + .byte 51 + .2byte 0 + .4byte 0x82000fff + .2byte 125 + .2byte 64 + .2byte 31 + .2byte 216 + .2byte 45 + .byte 15 + .byte 21 + .byte 15 + .byte 85 + .byte 35 + .byte 110 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_TRAPINCH + .string "PINCHIN$ " + .string "CLAIRE$ " + .byte 8 + .2byte 0 + .4byte 0x81000fff + .2byte 113 + .2byte 44 + .2byte 28 + .2byte 91 + .2byte 185 + .byte 75 + .byte 25 + .byte 25 + .byte 10 + .byte 25 + .byte 120 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_CACNEA + .string "NACAC$ " + .string "WILLIE$ " + .byte 11 + .2byte 0 + .4byte 0x80800fff + .2byte 37 + .2byte 191 + .2byte 43 + .2byte 40 + .2byte 28 + .byte 10 + .byte 30 + .byte 25 + .byte 65 + .byte 25 + .byte 130 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_SANDSLASH + .string "SHRAND$ " + .string "CASSIDY$" + .byte 18 + .2byte 0 + .4byte 0x10400fff + .2byte 69 + .2byte 163 + .2byte 111 + .2byte 129 + .2byte 154 + .byte 30 + .byte 90 + .byte 30 + .byte 10 + .byte 100 + .byte 140 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_BALTOY + .string "TOYBAL$ " + .string "MORGAN$ " + .byte 44 + .2byte 0 + .4byte 0x8200fff + .2byte 41 + .2byte 120 + .2byte 317 + .2byte 60 + .2byte 93 + .byte 50 + .byte 40 + .byte 10 + .byte 35 + .byte 35 + .byte 150 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_MEDICHAM + .string "CHAMCHAM$ " + .string "SUMMER$ " + .byte 26 + .2byte 0 + .4byte 0x10100fff + .2byte 77 + .2byte 179 + .2byte 9 + .2byte 7 + .2byte 8 + .byte 40 + .byte 20 + .byte 40 + .byte 40 + .byte 40 + .byte 100 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_SPINDA + .string "SPININ$ " + .string "MILES$ " + .byte 31 + .2byte 0 + .4byte 0x80080fff + .2byte 49 + .2byte 298 + .2byte 244 + .2byte 95 + .2byte 253 + .byte 25 + .byte 75 + .byte 25 + .byte 10 + .byte 25 + .byte 110 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_SWABLU + .string "SWABY$ " + .string "AUDREY$ " + .byte 47 + .2byte 0 + .4byte 0xa0040fff + .2byte 41 + .2byte 119 + .2byte 195 + .2byte 219 + .2byte 54 + .byte 30 + .byte 30 + .byte 40 + .byte 30 + .byte 25 + .byte 120 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_SPOINK + .string "POINKER$ " + .string "AVERY$ " + .byte 38 + .2byte 0 + .4byte 0x80020fff + .2byte 49 + .2byte 150 + .2byte 109 + .2byte 173 + .2byte 156 + .byte 40 + .byte 10 + .byte 30 + .byte 40 + .byte 30 + .byte 130 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_KECLEON + .string "KECON$ " + .string "ARIANA$ " + .byte 10 + .2byte 0 + .4byte 0x80010fff + .2byte 97 + .2byte 168 + .2byte 103 + .2byte 246 + .2byte 20 + .byte 10 + .byte 10 + .byte 40 + .byte 75 + .byte 35 + .byte 140 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_GOLDEEN + .string "GOLDEN$ " + .string "ASHTON$ " + .byte 33 + .2byte 0 + .4byte 0x80008fff + .2byte 13 + .2byte 30 + .2byte 31 + .2byte 32 + .2byte 39 + .byte 70 + .byte 30 + .byte 5 + .byte 30 + .byte 25 + .byte 150 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_BARBOACH + .string "BOBOACH$ " + .string "SANDRA$ " + .byte 6 + .2byte 0 + .4byte 0x80004fff + .2byte 113 + .2byte 300 + .2byte 346 + .2byte 89 + .2byte 248 + .byte 45 + .byte 45 + .byte 60 + .byte 25 + .byte 15 + .byte 100 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_SKARMORY + .string "CORPY$ " + .string "CARSON$ " + .byte 35 + .2byte 0 + .4byte 0x8002fff + .2byte 77 + .2byte 129 + .2byte 104 + .2byte 97 + .2byte 15 + .byte 40 + .byte 30 + .byte 25 + .byte 60 + .byte 20 + .byte 110 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_LOTAD + .string "TADO$ " + .string "KATRINA$" + .byte 16 + .2byte 0 + .4byte 0x8001fff + .2byte 57 + .2byte 310 + .2byte 45 + .2byte 240 + .2byte 352 + .byte 15 + .byte 15 + .byte 30 + .byte 15 + .byte 75 + .byte 120 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_SLOWBRO + .string "BROWLO$ " + .string "LUKE$ " + .byte 17 + .2byte 0 + .4byte 0xc000fff + .2byte 49 + .2byte 281 + .2byte 50 + .2byte 45 + .2byte 93 + .byte 20 + .byte 40 + .byte 40 + .byte 30 + .byte 20 + .byte 100 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_FARFETCH_D + .string "FETCHIN$ " + .string "RAUL$ " + .byte 66 + .2byte 0 + .4byte 0x82000fff + .2byte 21 + .2byte 263 + .2byte 210 + .2byte 19 + .2byte 216 + .byte 40 + .byte 10 + .byte 40 + .byte 20 + .byte 20 + .byte 110 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_SEEL + .string "SEELEY$ " + .string "JADA$ " + .byte 20 + .2byte 0 + .4byte 0x21000fff + .2byte 25 + .2byte 213 + .2byte 58 + .2byte 219 + .2byte 45 + .byte 10 + .byte 30 + .byte 40 + .byte 20 + .byte 20 + .byte 120 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_DROWZEE + .string "DROWZIN$ " + .string "ZEEK$ " + .byte 37 + .2byte 0 + .4byte 0x20800fff + .2byte 121 + .2byte 50 + .2byte 248 + .2byte 237 + .2byte 216 + .byte 10 + .byte 40 + .byte 50 + .byte 30 + .byte 45 + .byte 130 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_HITMONCHAN + .string "HITEMON$ " + .string "DIEGO$ " + .byte 21 + .2byte 0 + .4byte 0x80400fff + .2byte 69 + .2byte 327 + .2byte 197 + .2byte 279 + .2byte 5 + .byte 45 + .byte 20 + .byte 10 + .byte 20 + .byte 45 + .byte 140 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_BLISSEY + .string "BLISS$ " + .string "ALIYAH$ " + .byte 85 + .2byte 0 + .4byte 0x10200fff + .2byte 89 + .2byte 47 + .2byte 135 + .2byte 121 + .2byte 38 + .byte 20 + .byte 35 + .byte 40 + .byte 20 + .byte 20 + .byte 150 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_ELEKID + .string "KIDLEK$ " + .string "NATALIA$" + .byte 18 + .2byte 0 + .4byte 0x20100fff + .2byte 21 + .2byte 351 + .2byte 98 + .2byte 103 + .2byte 213 + .byte 40 + .byte 10 + .byte 40 + .byte 25 + .byte 25 + .byte 140 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_SNUBBULL + .string "SNUBBINS$ " + .string "DEVIN$ " + .byte 48 + .2byte 0 + .4byte 0x8080fff + .2byte 81 + .2byte 184 + .2byte 269 + .2byte 39 + .2byte 44 + .byte 20 + .byte 20 + .byte 20 + .byte 20 + .byte 20 + .byte 130 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_MISDREAVUS + .string "DREAVIS$ " + .string "TYLOR$ " + .byte 40 + .2byte 0 + .4byte 0x40040fff + .2byte 41 + .2byte 195 + .2byte 212 + .2byte 109 + .2byte 220 + .byte 10 + .byte 35 + .byte 10 + .byte 45 + .byte 20 + .byte 120 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_LAIRON + .string "LAIRN$ " + .string "RONNIE$ " + .byte 55 + .2byte 0 + .4byte 0x84000fff + .2byte 98 + .2byte 319 + .2byte 232 + .2byte 106 + .2byte 36 + .byte 30 + .byte 50 + .byte 35 + .byte 100 + .byte 90 + .byte 200 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_SHIFTRY + .string "SHIFTY$ " + .string "CLAUDIA$" + .byte 8 + .2byte 0 + .4byte 0x82000fff + .2byte 14 + .2byte 74 + .2byte 13 + .2byte 153 + .2byte 326 + .byte 75 + .byte 75 + .byte 65 + .byte 35 + .byte 70 + .byte 210 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_NINJASK + .string "NINAS$ " + .string "ELIAS$ " + .byte 11 + .2byte 0 + .4byte 0x81000fff + .2byte 114 + .2byte 103 + .2byte 154 + .2byte 28 + .2byte 226 + .byte 30 + .byte 50 + .byte 95 + .byte 70 + .byte 70 + .byte 220 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_SWELLOW + .string "WELOW$ " + .string "JADE$ " + .byte 18 + .2byte 0 + .4byte 0x80800fff + .2byte 14 + .2byte 97 + .2byte 332 + .2byte 17 + .2byte 19 + .byte 65 + .byte 85 + .byte 35 + .byte 75 + .byte 40 + .byte 230 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_MIGHTYENA + .string "YENA$ " + .string "FRANCIS$" + .byte 44 + .2byte 0 + .4byte 0x80400fff + .2byte 98 + .2byte 269 + .2byte 168 + .2byte 316 + .2byte 36 + .byte 40 + .byte 80 + .byte 35 + .byte 70 + .byte 70 + .byte 240 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_BEAUTIFLY + .string "TIFLY$ " + .string "ALISHA$ " + .byte 26 + .2byte 0 + .4byte 0x80200fff + .2byte 42 + .2byte 234 + .2byte 318 + .2byte 78 + .2byte 290 + .byte 40 + .byte 70 + .byte 25 + .byte 80 + .byte 100 + .byte 250 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_SEAKING + .string "KINGSEA$ " + .string "SAUL$ " + .byte 31 + .2byte 0 + .4byte 0x80100fff + .2byte 118 + .2byte 175 + .2byte 48 + .2byte 30 + .2byte 31 + .byte 80 + .byte 60 + .byte 30 + .byte 70 + .byte 90 + .byte 200 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_CASTFORM + .string "CASTER$ " + .string "FELICIA$" + .byte 47 + .2byte 0 + .4byte 0x80080fff + .2byte 126 + .2byte 241 + .2byte 311 + .2byte 201 + .2byte 216 + .byte 70 + .byte 80 + .byte 80 + .byte 50 + .byte 65 + .byte 210 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_MACHOKE + .string "CHOKEM$ " + .string "EMILIO$ " + .byte 38 + .2byte 0 + .4byte 0x80040fff + .2byte 70 + .2byte 69 + .2byte 116 + .2byte 2 + .2byte 184 + .byte 70 + .byte 85 + .byte 25 + .byte 60 + .byte 50 + .byte 220 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_LOMBRE + .string "LOMBE$ " + .string "KARLA$ " + .byte 10 + .2byte 0 + .4byte 0x80020fff + .2byte 58 + .2byte 213 + .2byte 148 + .2byte 253 + .2byte 45 + .byte 40 + .byte 60 + .byte 90 + .byte 45 + .byte 70 + .byte 230 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_SEVIPER + .string "VIPES$ " + .string "DARRYL$ " + .byte 33 + .2byte 0 + .4byte 0x80010fff + .2byte 98 + .2byte 305 + .2byte 137 + .2byte 35 + .2byte 103 + .byte 35 + .byte 50 + .byte 90 + .byte 40 + .byte 100 + .byte 240 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_WAILMER + .string "MERAIL$ " + .string "SELENA$ " + .byte 22 + .2byte 0 + .4byte 0x80008fff + .2byte 26 + .2byte 352 + .2byte 156 + .2byte 323 + .2byte 150 + .byte 30 + .byte 100 + .byte 100 + .byte 50 + .byte 30 + .byte 250 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_MAGIKARP + .string "KARPAG$ " + .string "NOEL$ " + .byte 35 + .2byte 0 + .4byte 0x80004fff + .2byte 82 + .2byte 33 + .2byte 150 + .2byte 175 + .2byte 33 + .byte 30 + .byte 30 + .byte 160 + .byte 50 + .byte 160 + .byte 255 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_LUNATONE + .string "LUNONE$ " + .string "LACEY$ " + .byte 16 + .2byte 0 + .4byte 0x80002fff + .2byte 42 + .2byte 153 + .2byte 248 + .2byte 94 + .2byte 93 + .byte 50 + .byte 70 + .byte 60 + .byte 70 + .byte 50 + .byte 210 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_ABSOL + .string "ABSO$ " + .string "CORBIN$ " + .byte 39 + .2byte 0 + .4byte 0x80001fff + .2byte 14 + .2byte 195 + .2byte 258 + .2byte 63 + .2byte 163 + .byte 95 + .byte 80 + .byte 85 + .byte 35 + .byte 35 + .byte 220 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_EXEGGUTOR + .string "EGGSOR$ " + .string "GRACIE$ " + .byte 32 + .2byte 0 + .4byte 0xc000fff + .2byte 98 + .2byte 23 + .2byte 95 + .2byte 121 + .2byte 285 + .byte 40 + .byte 50 + .byte 60 + .byte 100 + .byte 80 + .byte 200 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_CUBONE + .string "CUBIN$ " + .string "COLTIN$ " + .byte 65 + .2byte 0 + .4byte 0x82000fff + .2byte 82 + .2byte 125 + .2byte 155 + .2byte 198 + .2byte 45 + .byte 40 + .byte 35 + .byte 85 + .byte 35 + .byte 100 + .byte 210 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_HITMONLEE + .string "HITMON$ " + .string "ELLIE$ " + .byte 22 + .2byte 0 + .4byte 0x21000fff + .2byte 70 + .2byte 179 + .2byte 279 + .2byte 116 + .2byte 25 + .byte 85 + .byte 30 + .byte 25 + .byte 50 + .byte 100 + .byte 220 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_SQUIRTLE + .string "SURTLE$ " + .string "MARCUS$ " + .byte 49 + .2byte 0 + .4byte 0x20800fff + .2byte 82 + .2byte 39 + .2byte 145 + .2byte 264 + .2byte 110 + .byte 30 + .byte 35 + .byte 100 + .byte 40 + .byte 95 + .byte 230 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_KANGASKHAN + .string "KHANKAN$ " + .string "KIARA$ " + .byte 14 + .2byte 0 + .4byte 0x80400fff + .2byte 70 + .2byte 5 + .2byte 99 + .2byte 264 + .2byte 39 + .byte 100 + .byte 50 + .byte 30 + .byte 50 + .byte 100 + .byte 240 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_PINECO + .string "PINOC$ " + .string "BRYCE$ " + .byte 36 + .2byte 0 + .4byte 0x10200fff + .2byte 42 + .2byte 153 + .2byte 191 + .2byte 113 + .2byte 202 + .byte 80 + .byte 80 + .byte 80 + .byte 80 + .byte 80 + .byte 250 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_DUNSPARCE + .string "DILTOT$ " + .string "JAMIE$ " + .byte 34 + .2byte 0 + .4byte 0x20100fff + .2byte 82 + .2byte 180 + .2byte 281 + .2byte 111 + .2byte 36 + .byte 40 + .byte 35 + .byte 100 + .byte 40 + .byte 110 + .byte 240 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_HOUNDOOM + .string "DOOMOND$ " + .string "JORGE$ " + .byte 48 + .2byte 0 + .4byte 0x8080fff + .2byte 14 + .2byte 46 + .2byte 53 + .2byte 185 + .2byte 241 + .byte 100 + .byte 100 + .byte 30 + .byte 25 + .byte 80 + .byte 230 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_MILTANK + .string "MILKAN$ " + .string "DEVON$ " + .byte 25 + .2byte 0 + .4byte 0x40040fff + .2byte 26 + .2byte 208 + .2byte 215 + .2byte 111 + .2byte 59 + .byte 50 + .byte 110 + .byte 100 + .byte 35 + .byte 40 + .byte 220 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_GYARADOS + .string "RADOS$ " + .string "JUSTINA$" + .byte 32 + .2byte 0 + .4byte 0x84000fff + .2byte 79 + .2byte 63 + .2byte 56 + .2byte 240 + .2byte 44 + .byte 160 + .byte 200 + .byte 20 + .byte 40 + .byte 160 + .byte 255 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_LOUDRED + .string "LOUDERD$ " + .string "RALPH$ " + .byte 21 + .2byte 0 + .4byte 0x82000fff + .2byte 71 + .2byte 304 + .2byte 23 + .2byte 46 + .2byte 336 + .byte 170 + .byte 50 + .byte 55 + .byte 150 + .byte 160 + .byte 255 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_SKITTY + .string "SITTY$ " + .string "ROSA$ " + .byte 8 + .2byte 0 + .4byte 0x81000fff + .2byte 59 + .2byte 213 + .2byte 274 + .2byte 185 + .2byte 39 + .byte 40 + .byte 200 + .byte 150 + .byte 185 + .byte 60 + .byte 255 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_SLAKING + .string "SLING$ " + .string "KEATON$ " + .byte 11 + .2byte 0 + .4byte 0x80800fff + .2byte 115 + .2byte 343 + .2byte 68 + .2byte 227 + .2byte 303 + .byte 85 + .byte 85 + .byte 170 + .byte 110 + .byte 150 + .byte 255 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_ALTARIA + .string "TARIA$ " + .string "MAYRA$ " + .byte 18 + .2byte 0 + .4byte 0x80400fff + .2byte 15 + .2byte 349 + .2byte 63 + .2byte 195 + .2byte 219 + .byte 170 + .byte 150 + .byte 30 + .byte 30 + .byte 90 + .byte 255 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_KIRLIA + .string "LIRKI$ " + .string "LAMAR$ " + .byte 15 + .2byte 0 + .4byte 0x80200fff + .2byte 39 + .2byte 351 + .2byte 247 + .2byte 285 + .2byte 216 + .byte 230 + .byte 60 + .byte 60 + .byte 230 + .byte 80 + .byte 255 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_BELLOSSOM + .string "BLOSSOM$ " + .string "AUBREY$ " + .byte 26 + .2byte 0 + .4byte 0x80100fff + .2byte 59 + .2byte 80 + .2byte 230 + .2byte 78 + .2byte 148 + .byte 35 + .byte 200 + .byte 150 + .byte 130 + .byte 40 + .byte 255 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_SABLEYE + .string "EYESAB$ " + .string "NIGEL$ " + .byte 31 + .2byte 0 + .4byte 0x80080fff + .2byte 115 + .2byte 212 + .2byte 185 + .2byte 282 + .2byte 109 + .byte 25 + .byte 35 + .byte 230 + .byte 150 + .byte 160 + .byte 255 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_NATU + .string "UTAN$ " + .string "CAMILLE$" + .byte 47 + .2byte 0 + .4byte 0x80040fff + .2byte 115 + .2byte 101 + .2byte 248 + .2byte 109 + .2byte 94 + .byte 35 + .byte 35 + .byte 150 + .byte 130 + .byte 170 + .byte 255 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_SHARPEDO + .string "PEDOS$ " + .string "DEON$ " + .byte 38 + .2byte 0 + .4byte 0x80020fff + .2byte 87 + .2byte 97 + .2byte 207 + .2byte 269 + .2byte 36 + .byte 140 + .byte 70 + .byte 140 + .byte 75 + .byte 100 + .byte 255 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_LUVDISC + .string "LUVIS$ " + .string "JANELLE$" + .byte 10 + .2byte 0 + .4byte 0x80010fff + .2byte 83 + .2byte 186 + .2byte 213 + .2byte 36 + .2byte 204 + .byte 50 + .byte 100 + .byte 220 + .byte 40 + .byte 190 + .byte 255 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_HERACROSS + .string "HEROSS$ " + .string "HEATH$ " + .byte 33 + .2byte 0 + .4byte 0x80008fff + .2byte 71 + .2byte 70 + .2byte 203 + .2byte 179 + .2byte 317 + .byte 170 + .byte 70 + .byte 110 + .byte 240 + .byte 140 + .byte 255 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_ELECTRODE + .string "RODLECT$ " + .string "SASHA$ " + .byte 6 + .2byte 0 + .4byte 0x80004fff + .2byte 15 + .2byte 153 + .2byte 113 + .2byte 129 + .2byte 148 + .byte 200 + .byte 200 + .byte 30 + .byte 35 + .byte 50 + .byte 255 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_PICHU + .string "CHUPY$ " + .string "FRANKIE$" + .byte 35 + .2byte 0 + .4byte 0x80002fff + .2byte 59 + .2byte 186 + .2byte 213 + .2byte 156 + .2byte 39 + .byte 25 + .byte 150 + .byte 180 + .byte 115 + .byte 120 + .byte 255 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_WOBBUFFET + .string "WOBET$ " + .string "HELEN$ " + .byte 16 + .2byte 0 + .4byte 0x80001fff + .2byte 111 + .2byte 68 + .2byte 243 + .2byte 219 + .2byte 194 + .byte 60 + .byte 230 + .byte 50 + .byte 220 + .byte 210 + .byte 255 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_GENGAR + .string "GAREN$ " + .string "CAMILE$ " + .byte 40 + .2byte 0 + .4byte 0xc000fff + .2byte 71 + .2byte 194 + .2byte 109 + .2byte 122 + .2byte 188 + .byte 200 + .byte 100 + .byte 50 + .byte 80 + .byte 180 + .byte 255 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_PORYGON + .string "GONPOR$ " + .string "MARTIN$ " + .byte 46 + .2byte 0 + .4byte 0x82000fff + .2byte 127 + .2byte 176 + .2byte 160 + .2byte 216 + .2byte 278 + .byte 130 + .byte 130 + .byte 130 + .byte 130 + .byte 130 + .byte 255 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_DRAGONITE + .string "DRITE$ " + .string "SERGIO$ " + .byte 7 + .2byte 0 + .4byte 0x21000fff + .2byte 71 + .2byte 200 + .2byte 21 + .2byte 239 + .2byte 89 + .byte 150 + .byte 140 + .byte 50 + .byte 120 + .byte 150 + .byte 255 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_MEOWTH + .string "MEOWY$ " + .string "KAILEY$ " + .byte 6 + .2byte 0 + .4byte 0x20800fff + .2byte 51 + .2byte 45 + .2byte 269 + .2byte 6 + .2byte 44 + .byte 125 + .byte 110 + .byte 180 + .byte 170 + .byte 80 + .byte 255 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_JYNX + .string "NYX$ " + .string "PERLA$ " + .byte 45 + .2byte 0 + .4byte 0x80400fff + .2byte 43 + .2byte 195 + .2byte 212 + .2byte 142 + .2byte 313 + .byte 100 + .byte 150 + .byte 100 + .byte 150 + .byte 120 + .byte 255 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_TOGEPI + .string "GEPITO$ " + .string "CLARA$ " + .byte 20 + .2byte 0 + .4byte 0x10200fff + .2byte 19 + .2byte 45 + .2byte 281 + .2byte 227 + .2byte 266 + .byte 80 + .byte 120 + .byte 200 + .byte 120 + .byte 80 + .byte 255 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_ESPEON + .string "SPEON$ " + .string "JAKOB$ " + .byte 37 + .2byte 0 + .4byte 0x20100fff + .2byte 15 + .2byte 129 + .2byte 98 + .2byte 234 + .2byte 39 + .byte 180 + .byte 150 + .byte 100 + .byte 80 + .byte 150 + .byte 255 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_SLOWKING + .string "SLOWGO$ " + .string "TREY$ " + .byte 49 + .2byte 0 + .4byte 0x8080fff + .2byte 83 + .2byte 263 + .2byte 174 + .2byte 281 + .2byte 264 + .byte 100 + .byte 80 + .byte 200 + .byte 110 + .byte 170 + .byte 255 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + .2byte SPECIES_URSARING + .string "URSING$ " + .string "LANE$ " + .byte 44 + .2byte 0 + .4byte 0x40040fff + .2byte 71 + .2byte 37 + .2byte 332 + .2byte 313 + .2byte 43 + .byte 180 + .byte 140 + .byte 30 + .byte 80 + .byte 190 + .byte 255 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0x0 + .4byte 0xffff + diff --git a/data/event_scripts.s b/data/event_scripts.s index 839235589e..f4048124d7 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -7,6 +7,7 @@ .include "asm/macros.inc" .include "asm/macros/event.inc" .include "constants/constants.inc" + .section script_data, "aw", %progbits diff --git a/data/field_effect_helpers.s b/data/field_effect_helpers.s index 6d0b0b3bb0..63fc1580ea 100644 --- a/data/field_effect_helpers.s +++ b/data/field_effect_helpers.s @@ -4,7 +4,7 @@ .section .rodata gUnknown_085CDC38:: @ 85CDC38 - .incbin "baserom.gba", 0x5cdc38, 0x6 + .2byte 12, 28, 44 gUnknown_085CDC3E:: @ 85CDC3E .byte 0x00, 0x01, 0x02, 0x03 @@ -22,8 +22,11 @@ gUnknown_085CDC54:: @ 85CDC54 .4byte sub_815550C gUnknown_085CDC60:: @ 85CDC60 - .incbin "baserom.gba", 0x5cdc60, 0xa - + .byte 0, 0, 1, 2, 3, 0, 0, 1, 1 + .byte 0 + gUnknown_085CDC6A:: @ 85CDC6A - .incbin "baserom.gba", 0x5cdc6a, 0x96 + .2byte 3, 7 + @the following might be unref, not sure + .byte 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0x00, 0x00 diff --git a/data/field_ground_effect.s b/data/field_ground_effect.s index be5639406d..550fed44c5 100644 --- a/data/field_ground_effect.s +++ b/data/field_ground_effect.s @@ -39,7 +39,8 @@ gUnknown_0850E654:: @ 850E654 .4byte DoTracksGroundEffect_BikeTireTracks gUnknown_0850E660:: @ 850E660 - .incbin "baserom.gba", 0x50e660, 0x4 + .byte 13, 0 + .byte 24, 0 gUnknown_0850E664:: @ 850E664 .byte 0x01, 0x02, 0x07, 0x08, 0x01, 0x02, 0x06, 0x05, 0x05, 0x08, 0x03, 0x04, 0x06, 0x07, 0x03, 0x04 diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s index efb2f34cb2..c2e0d729de 100644 --- a/data/field_player_avatar.s +++ b/data/field_player_avatar.s @@ -115,11 +115,12 @@ gUnknown_08497540:: @ 8497540 .4byte sub_808C6FC gUnknown_08497550:: @ 8497550 - .incbin "baserom.gba", 0x497550, 0x4 + .byte 3, 4, 2, 1 gUnknown_08497554:: @ 8497554 - .incbin "baserom.gba", 0x497554, 0x8 + .byte 16, 16, 17, 18, 19 + .align 2 gUnknown_0849755C:: @ 849755C .4byte fish0 .4byte fish1 @@ -139,19 +140,21 @@ gUnknown_0849755C:: @ 849755C .4byte fishF gUnknown_0849759C:: @ 849759C - .incbin "baserom.gba", 0x49759c, 0x6 + .2byte 1, 1, 1 gUnknown_084975A2:: @ 84975A2 - .incbin "baserom.gba", 0x4975a2, 0x6 + .2byte 1, 3, 6 gUnknown_084975A8:: @ 84975A8 - .incbin "baserom.gba", 0x4975a8, 0x2 + .string "·$" gUnknown_084975AA:: @ 84975AA - .incbin "baserom.gba", 0x4975aa, 0x6 + .2byte 36, 33, 30 gUnknown_084975B0:: @ 84975B0 - .incbin "baserom.gba", 0x4975b0, 0xc + .2byte 0, 0 + .2byte 0x28, 10 + .2byte 0x46, 30 gUnknown_084975BC:: @ 84975BC .byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00 diff --git a/data/field_special_scene.s b/data/field_special_scene.s index fe8ef16226..16e5a366df 100644 --- a/data/field_special_scene.s +++ b/data/field_special_scene.s @@ -6,10 +6,10 @@ .align 2, 0 gTruckCamera_HorizontalTable:: @ 858E898 - .incbin "baserom.gba", 0x58e898, 0x13 + .byte 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, -1, -1, -1, 0 gUnknown_0858E8AB:: @ 858E8AB - .incbin "baserom.gba", 0x58e8ab, 0x2 + .byte 0x18, 0xFE gUnknown_0858E8AD:: @ 858E8AD - .incbin "baserom.gba", 0x58e8ad, 0x3 + .byte 0x17, 0xFE diff --git a/data/field_tasks.s b/data/field_tasks.s index 8405c64d5d..310fd0e2ab 100644 --- a/data/field_tasks.s +++ b/data/field_tasks.s @@ -5,19 +5,95 @@ .align 2, 0 gUnknown_08510348:: @ 8510348 - .incbin "baserom.gba", 0x510348, 0x20 + .4byte nullsub_34 + .4byte sub_809E3B4 + .4byte sub_809DEF0 + .4byte sub_809DCB4 + .4byte sub_809E224 + .4byte EndTruckSequence + .4byte sub_80EA3E4 + .4byte sub_809E4CC gUnknown_08510368:: @ 8510368 - .incbin "baserom.gba", 0x510368, 0x20 + .byte 0 + .byte 0 + .2byte 0x259 + .byte 0 + .byte 1 + .2byte 0x261 + .byte 0 + .byte 0xFF + .2byte 0x259 + .byte 0 + .byte 0 + .2byte 0x261 + .byte 0 + .byte 0 + .2byte 0x252 + .byte 1 + .byte 0 + .2byte 0x253 + .byte 0xFF + .byte 0 + .2byte 0x252 + .byte 0 + .byte 0 + .2byte 0x253 gUnknown_08510388:: @ 8510388 - .incbin "baserom.gba", 0x510388, 0x20 + .byte 0 + .byte 0 + .2byte 0x25A + .byte 0 + .byte 1 + .2byte 0x262 + .byte 0 + .byte 0xFF + .2byte 0x25A + .byte 0 + .byte 0 + .2byte 0x262 + .byte 0 + .byte 0 + .2byte 0x254 + .byte 1 + .byte 0 + .2byte 0x255 + .byte 0xFF + .byte 0 + .2byte 0x254 + .byte 0 + .byte 0 + .2byte 0x255 gUnknown_085103A8:: @ 85103A8 - .incbin "baserom.gba", 0x5103a8, 0x20 + .byte 0 + .byte 0 + .2byte 0x258 + .byte 0 + .byte 1 + .2byte 0x260 + .byte 0 + .byte 0xFF + .2byte 0x258 + .byte 0 + .byte 0 + .2byte 0x260 + .byte 0 + .byte 0 + .2byte 0x250 + .byte 1 + .byte 0 + .2byte 0x251 + .byte 0xFF + .byte 0 + .2byte 0x250 + .byte 0 + .byte 0 + .2byte 0x251 gUnknown_085103C8:: @ 85103C8 - .incbin "baserom.gba", 0x5103c8, 0x34 + .2byte 0, 0, 0, 0, 0, 0, 0x4001, 0x4002, 0x4003, 0x4004, 0, 0, 0x4005, 0x4006, 0x4007, 0, 0, 0x4008, 0x4009, 0x400a, 0, 0, 0, 0, 0, 0 gUnknown_085103FC:: @ 85103FC - .incbin "baserom.gba", 0x5103fc, 0x8 + .2byte 0xE8, 0xeb, 0xea, 0xe9 diff --git a/data/fldeff_cut.s b/data/fldeff_cut.s index f9d72e0881..9fea73f9ab 100644 --- a/data/fldeff_cut.s +++ b/data/fldeff_cut.s @@ -5,16 +5,28 @@ .align 2, 0 gUnknown_0857C608:: @ 857C608 - .incbin "baserom.gba", 0x57c608, 0x2 + .byte 0xfe, 0xfe, 0x01, 0x00, 0xff, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x01, 0xfe, 0x03, 0x00, 0x02, 0xfe, 0x03, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x02, 0xff, 0x03, 0x00, 0xfe, 0x00, 0x04, 0x00, 0x02, 0x00 + .byte 0x06, 0x00, 0xfe, 0x01, 0x07, 0x00, 0x02, 0x01, 0x09, 0x00, 0xfe, 0x02, 0x07, 0x00, 0xff, 0x02, 0x07, 0x00, 0x00, 0x02, 0x08, 0x00, 0x01, 0x02, 0x09, 0x00, 0x02, 0x02, 0x09, + +gUnknown_0857C648:: @ 857C648 + .2byte 0 + .2byte 0 + .2byte 0x1401 + .2byte 0 -gUnknown_0857C60A:: @ 857C60A - .byte 0x01, 0x00, 0xff, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x01, 0xfe, 0x03, 0x00, 0x02, 0xfe, 0x03, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x02, 0xff, 0x03, 0x00, 0xfe, 0x00, 0x04, 0x00, 0x02, 0x00 - .byte 0x06, 0x00, 0xfe, 0x01, 0x07, 0x00, 0x02, 0x01, 0x09, 0x00, 0xfe, 0x02, 0x07, 0x00, 0xff, 0x02, 0x07, 0x00, 0x00, 0x02, 0x08, 0x00, 0x01, 0x02, 0x09, 0x00, 0x02, 0x02, 0x09, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x01, 0x14, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0xfe, 0xff, 0x00, 0x00, 0x50, 0xc6, 0x57, 0x08, 0x58, 0x6e, 0x4f, 0x08, 0x20, 0x00, 0x00, 0x00 +gUnknown_0857C650:: @ 857C650 + obj_image_anim_frame 0, 0x1E + obj_image_anim_jump 0 + +gUnknown_0857C658:: @ 857C658 + .4byte gUnknown_0857C650 + +gUnknown_0857C65C:: @ 857C65C + obj_frame_tiles gFieldEffectObjectPic_ShadowExtraLarge + 0x520, 32 .align 2 gFieldEffectObjectPaletteInfo6:: @ 857C664 obj_pal gFieldEffectObjectPalette6, 0x1000 gUnknown_0857C66C:: @ 857C66C - .incbin "baserom.gba", 0x57c66c, 0x18 + spr_template -1, 0x1000, gUnknown_0857C648, gUnknown_0857C658, gUnknown_0857C65C, gDummySpriteAffineAnimTable, objc_8097BA8 diff --git a/data/graphics/field_objects/field_object_graphics.inc b/data/graphics/field_objects/field_object_graphics.inc index 0e55eb1468..59333b9a43 100644 --- a/data/graphics/field_objects/field_object_graphics.inc +++ b/data/graphics/field_objects/field_object_graphics.inc @@ -5386,7 +5386,8 @@ gFieldEffectObjectPic_ShadowLarge:: @ 84F68B8 gFieldEffectObjectPic_ShadowExtraLarge:: @ 84F6938 .incbin "graphics/map_objects/pics/effects/shadow_extra_large.4bpp" - .incbin "baserom.gba", 0x4f6d38, 0x160 +gUnknown_084F6D38:: @ 84F6D38 + .incbin "graphics/map_objects/pics/effects/unknown_4F6D38/0.4bpp" .align 2 gFieldEffectObjectPalette6:: @ 84F6E98 @@ -5500,7 +5501,17 @@ gFieldEffectObjectPic_BikeHopTallGrass_2:: @ 84F7938 gFieldEffectObjectPic_BikeHopTallGrass_3:: @ 84F7978 .incbin "graphics/map_objects/pics/effects/bike_hop_tall_grass/3.4bpp" - .incbin "baserom.gba", 0x4f79b8, 0x200 +gUnusedGrass_0:: @4F79B8 + .incbin "graphics/map_objects/pics/effects/unused_grass/0.4bpp" + +gUnusedGrass_1:: @4F7A38 + .incbin "graphics/map_objects/pics/effects/unused_grass/1.4bpp" + +gUnusedGrass_2:: @4F7AB8 + .incbin "graphics/map_objects/pics/effects/unused_grass/2.4bpp" + +gUnusedGrass_3:: @4F7B38 + .incbin "graphics/map_objects/pics/effects/unused_grass/3.4bpp" .align 2 gFieldEffectObjectPic_Unknown16_0:: @ 84F7BB8 @@ -5522,7 +5533,8 @@ gFieldEffectObjectPic_Unknown16_3:: @ 84F7D38 gFieldEffectObjectPic_Unknown16_4:: @ 84F7DB8 .incbin "graphics/map_objects/pics/effects/unknown_16/4.4bpp" - .incbin "baserom.gba", 0x4f7e38, 0x80 +gUnknown_084F7E38:: @ 84F7E38 + .incbin "graphics/map_objects/pics/effects/unknown_4F7E38/0.4bpp" .align 2 gFieldEffectObjectPic_Unknown16_5:: @ 84F7EB8 diff --git a/data/item_icon.s b/data/item_icon.s index dac00dc6ca..41fb7d9a1e 100644 --- a/data/item_icon.s +++ b/data/item_icon.s @@ -6,8 +6,18 @@ @ 8614410 .include "data/graphics/items/item_icon_table.inc" -@ 8614FE0 - .incbin "baserom.gba", 0x614fe0, 0x14 +gUnknown_08614FE0:: @ 8614FE0 + .2byte 0 + .2byte 0x8000 + .2byte 0x2400 + .2byte 0 + +gUnknown_08614FE8:: @ 8614FE8 + obj_image_anim_frame 0, 0 + obj_image_anim_end + +gUnknown_08614FF0:: @ 8614FF0 + .4byte gUnknown_08614FE8 gUnknown_08614FF4:: @ 8614FF4 - .incbin "baserom.gba", 0x614ff4, 0x18 + spr_template 0, 0, gUnknown_08614FE0, gUnknown_08614FF0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy diff --git a/data/item_menu.s b/data/item_menu.s index b160200e8f..1b11c5e597 100644 --- a/data/item_menu.s +++ b/data/item_menu.s @@ -100,13 +100,28 @@ gUnknown_08614094:: @ 8614094 .4byte 0x6F gUnknown_086140A4:: @ 86140A4 - .incbin "baserom.gba", 0x6140a4, 0xc0 + .incbin "graphics/interface/select_button.4bpp" gUnknown_08614164:: @ 8614164 - .incbin "baserom.gba", 0x614164, 0x10 + .byte 0, 1, 3, 0, 1, 4, 0, 3, 6, 2, 1, 3, 0, 14, 10, 0 gUnknown_08614174:: @ 8614174 - .incbin "baserom.gba", 0x614174, 0x38 + window_template 0, 14, 2, 15, 16, 1, 0x27 + window_template 0, 0, 13, 14, 6, 1, 0x117 + window_template 0, 4, 1, 8, 2, 1, 0x1A1 + window_template 0, 1, 13, 5, 6, 12, 0x16B + window_template 0, 7, 13, 4, 6, 12, 0x189 + window_template 1, 2, 15, 27, 4, 15, 0x1B1 + null_window_template gUnknown_086141AC:: @ 86141AC - .incbin "baserom.gba", 0x6141ac, 0x50 + window_template 1, 22, 17, 7, 2, 15, 0x21D + window_template 1, 22, 15, 7, 4, 15, 0x21D + window_template 1, 15, 15, 14, 4, 15, 0x21D + window_template 1, 15, 13, 14, 6, 15, 0x21D + window_template 1, 2, 15, 27, 4, 15, 0x1B1 + window_template 1, 24, 15, 5, 4, 15, 0x21D + window_template 1, 21, 9, 5, 4, 15, 0x21D + window_template 1, 24, 17, 5, 2, 15, 0x21D + window_template 1, 18, 11, 10, 2, 15, 0x245 + window_template 1, 1, 1, 10, 2, 15, 0x231 diff --git a/data/librfu_rodata.s b/data/librfu_rodata.s index 672053e892..aa8f5170d3 100644 --- a/data/librfu_rodata.s +++ b/data/librfu_rodata.s @@ -1,7 +1,10 @@ .section .rodata gUnknown_089A3220:: @ 89A3220 - .incbin "baserom.gba", 0x9a3220, 0x20 + .byte 2, 14, 0, 10, 9, 5, 7, 2 + .byte 0, 15, 1, 3, 3, 0, 31, 0 + .byte 3, 22, 18, 14, 13, 9, 11, 3 + .byte 15, 15, 1, 3, 3, 0, 0x7f, 0 .asciz "RFU_V1026" diff --git a/data/map_name_popup.s b/data/map_name_popup.s index ff7c3ea4e1..b69855de08 100644 --- a/data/map_name_popup.s +++ b/data/map_name_popup.s @@ -4,14 +4,29 @@ .section .rodata .align 2, 0 -gUnknown_0857C684:: @ 857C684 - .incbin "baserom.gba", 0x57c684, 0x1680 +gMapPopUp_Table:: @ 857C684 + .incbin "graphics/interface/map_popup/wood.4bpp" + .incbin "graphics/interface/map_popup/marble.4bpp" + .incbin "graphics/interface/map_popup/stone.4bpp" + .incbin "graphics/interface/map_popup/brick.4bpp" + .incbin "graphics/interface/map_popup/underwater.4bpp" + .incbin "graphics/interface/map_popup/stone2.4bpp" -gUnknown_0857DD04:: @ 857DD04 - .incbin "baserom.gba", 0x57dd04, 0x1680 +gMapPopUp_Outline_Table:: @ 857DD04 + .incbin "graphics/interface/map_popup/wood_outline.4bpp" + .incbin "graphics/interface/map_popup/marble_outline.4bpp" + .incbin "graphics/interface/map_popup/stone_outline.4bpp" + .incbin "graphics/interface/map_popup/brick_outline.4bpp" + .incbin "graphics/interface/map_popup/underwater_outline.4bpp" + .incbin "graphics/interface/map_popup/stone2_outline.4bpp" -gUnknown_0857F384:: @ 857F384 - .incbin "baserom.gba", 0x57f384, 0xc0 +gMapPopUp_Palette_Table:: @ 857F384 + .incbin "graphics/interface/map_popup/wood.gbapal" + .incbin "graphics/interface/map_popup/marble.gbapal" + .incbin "graphics/interface/map_popup/stone.gbapal" + .incbin "graphics/interface/map_popup/brick.gbapal" + .incbin "graphics/interface/map_popup/underwater.gbapal" + .incbin "graphics/interface/map_popup/stone2.gbapal" gUnknown_0857F444:: @ 857F444 - .incbin "baserom.gba", 0x57f444, 0x20 + .incbin "graphics/interface/map_popup/857F444.gbapal" diff --git a/data/mauville_old_man.s b/data/mauville_old_man.s index d7832b761c..c1b4dd1be8 100644 --- a/data/mauville_old_man.s +++ b/data/mauville_old_man.s @@ -28,13 +28,31 @@ gUnknown_0859F010:: @ 859F010 .4byte gUnknown_082944D5 gUnknown_0859F030:: @ 859F030 - .incbin "baserom.gba", 0x59f030, 0x18 + .4byte 0, 12, 13, 18, 19, 21 gUnknown_0859F048:: @ 859F048 - .incbin "baserom.gba", 0x59f048, 0x230 + .4byte 0x00000132, MauvilleCity_PokemonCenter_1F_Text_28E930, MauvilleCity_PokemonCenter_1F_Text_28E947, MauvilleCity_PokemonCenter_1F_Text_28E956, 0x00000102, MauvilleCity_PokemonCenter_1F_Text_28E9D7, MauvilleCity_PokemonCenter_1F_Text_28E9EF, MauvilleCity_PokemonCenter_1F_Text_28E9FE + .4byte 0x00000103, MauvilleCity_PokemonCenter_1F_Text_28EA7D, MauvilleCity_PokemonCenter_1F_Text_28EA98, MauvilleCity_PokemonCenter_1F_Text_28EAA8, 0x00000104, MauvilleCity_PokemonCenter_1F_Text_28EB19, MauvilleCity_PokemonCenter_1F_Text_28EB31, MauvilleCity_PokemonCenter_1F_Text_28EB3E + .4byte 0x00000106, MauvilleCity_PokemonCenter_1F_Text_28EBB5, MauvilleCity_PokemonCenter_1F_Text_28EBCD, MauvilleCity_PokemonCenter_1F_Text_28EBDD, 0x00000109, MauvilleCity_PokemonCenter_1F_Text_28EC60, MauvilleCity_PokemonCenter_1F_Text_28EC79, MauvilleCity_PokemonCenter_1F_Text_28EC81 + .4byte 0x0000010b, MauvilleCity_PokemonCenter_1F_Text_28ED04, MauvilleCity_PokemonCenter_1F_Text_28ED21, MauvilleCity_PokemonCenter_1F_Text_28ED30, 0x0000010c, MauvilleCity_PokemonCenter_1F_Text_28EDA1, MauvilleCity_PokemonCenter_1F_Text_28EDB5, MauvilleCity_PokemonCenter_1F_Text_28EDCF + .4byte 0x0000010d, MauvilleCity_PokemonCenter_1F_Text_28EE45, MauvilleCity_PokemonCenter_1F_Text_28EE5D, MauvilleCity_PokemonCenter_1F_Text_28EE6A, 0x0000010e, MauvilleCity_PokemonCenter_1F_Text_28EEDD, MauvilleCity_PokemonCenter_1F_Text_28EEF1, MauvilleCity_PokemonCenter_1F_Text_28EF01 + .4byte 0x0000010f, MauvilleCity_PokemonCenter_1F_Text_28EF73, MauvilleCity_PokemonCenter_1F_Text_28EF95, MauvilleCity_PokemonCenter_1F_Text_28EFAA, 0x00000110, MauvilleCity_PokemonCenter_1F_Text_28F045, MauvilleCity_PokemonCenter_1F_Text_28F05A, MauvilleCity_PokemonCenter_1F_Text_28F071 + .4byte 0x00000111, MauvilleCity_PokemonCenter_1F_Text_28F0F3, MauvilleCity_PokemonCenter_1F_Text_28F10D, MauvilleCity_PokemonCenter_1F_Text_28F125, 0x00000112, MauvilleCity_PokemonCenter_1F_Text_28F1BE, MauvilleCity_PokemonCenter_1F_Text_28F1D5, MauvilleCity_PokemonCenter_1F_Text_28F1DE + .4byte 0x00000113, MauvilleCity_PokemonCenter_1F_Text_28F24F, MauvilleCity_PokemonCenter_1F_Text_28F269, MauvilleCity_PokemonCenter_1F_Text_28F277, 0x00000114, MauvilleCity_PokemonCenter_1F_Text_28F2FC, MauvilleCity_PokemonCenter_1F_Text_28F314, MauvilleCity_PokemonCenter_1F_Text_28F32A + .4byte 0x0000011a, MauvilleCity_PokemonCenter_1F_Text_28F3AD, MauvilleCity_PokemonCenter_1F_Text_28F3C6, MauvilleCity_PokemonCenter_1F_Text_28F3D2, 0x0000011b, MauvilleCity_PokemonCenter_1F_Text_28F44B, MauvilleCity_PokemonCenter_1F_Text_28F461, MauvilleCity_PokemonCenter_1F_Text_28F47C + .4byte 0x0000011c, MauvilleCity_PokemonCenter_1F_Text_28F50C, MauvilleCity_PokemonCenter_1F_Text_28F51B, MauvilleCity_PokemonCenter_1F_Text_28F538, 0x0000021d, MauvilleCity_PokemonCenter_1F_Text_28F5BE, MauvilleCity_PokemonCenter_1F_Text_28F5D1, MauvilleCity_PokemonCenter_1F_Text_28F5F2 + .4byte 0x0000011e, MauvilleCity_PokemonCenter_1F_Text_28F678, MauvilleCity_PokemonCenter_1F_Text_28F694, MauvilleCity_PokemonCenter_1F_Text_28F6B4, 0x00000121, MauvilleCity_PokemonCenter_1F_Text_28F751, MauvilleCity_PokemonCenter_1F_Text_28F76A, MauvilleCity_PokemonCenter_1F_Text_28F776 + .4byte 0x00000124, MauvilleCity_PokemonCenter_1F_Text_28F7F6, MauvilleCity_PokemonCenter_1F_Text_28F811, MauvilleCity_PokemonCenter_1F_Text_28F822, 0x00000125, MauvilleCity_PokemonCenter_1F_Text_28F89C, MauvilleCity_PokemonCenter_1F_Text_28F8AF, MauvilleCity_PokemonCenter_1F_Text_28F8BC + .4byte 0x00000126, MauvilleCity_PokemonCenter_1F_Text_28F92F, MauvilleCity_PokemonCenter_1F_Text_28F941, MauvilleCity_PokemonCenter_1F_Text_28F949, 0x00000127, MauvilleCity_PokemonCenter_1F_Text_28F9D1, MauvilleCity_PokemonCenter_1F_Text_28F9EA, MauvilleCity_PokemonCenter_1F_Text_28F9FD + .4byte 0x00000128, MauvilleCity_PokemonCenter_1F_Text_28FA81, MauvilleCity_PokemonCenter_1F_Text_28FA99, MauvilleCity_PokemonCenter_1F_Text_28FAA7, 0x00000129, MauvilleCity_PokemonCenter_1F_Text_28FB1D, MauvilleCity_PokemonCenter_1F_Text_28FB35, MauvilleCity_PokemonCenter_1F_Text_28FB47 + .4byte 0x0000012a, MauvilleCity_PokemonCenter_1F_Text_28FBC4, MauvilleCity_PokemonCenter_1F_Text_28FBD9, MauvilleCity_PokemonCenter_1F_Text_28FBEA, 0x0000012b, MauvilleCity_PokemonCenter_1F_Text_28FC6B, MauvilleCity_PokemonCenter_1F_Text_28FC85, MauvilleCity_PokemonCenter_1F_Text_28FC98 + .4byte 0x0000012c, MauvilleCity_PokemonCenter_1F_Text_28FD1D, MauvilleCity_PokemonCenter_1F_Text_28FD35, MauvilleCity_PokemonCenter_1F_Text_28FD40, 0x0000012d, MauvilleCity_PokemonCenter_1F_Text_28FDA2, MauvilleCity_PokemonCenter_1F_Text_28FDBD, MauvilleCity_PokemonCenter_1F_Text_28FDCE + .4byte 0x0000012e, MauvilleCity_PokemonCenter_1F_Text_28FE57, MauvilleCity_PokemonCenter_1F_Text_28FE72, MauvilleCity_PokemonCenter_1F_Text_28FE88, 0x0000012f, MauvilleCity_PokemonCenter_1F_Text_28FF0C, MauvilleCity_PokemonCenter_1F_Text_28FF27, MauvilleCity_PokemonCenter_1F_Text_28FF44 + .4byte 0x00000130, MauvilleCity_PokemonCenter_1F_Text_28FFDD, MauvilleCity_PokemonCenter_1F_Text_28FFFA, MauvilleCity_PokemonCenter_1F_Text_29000D + gUnknown_0859F278:: @ 859F278 - .incbin "baserom.gba", 0x59f278, 0x10 + .4byte 0x00000131, MauvilleCity_PokemonCenter_1F_Text_290097, MauvilleCity_PokemonCenter_1F_Text_2900B5, MauvilleCity_PokemonCenter_1F_Text_2900CB gUnknown_0859F288:: @ 859F288 .4byte 0x00000024, 0x00000008 diff --git a/data/menu_helpers.s b/data/menu_helpers.s index 8d0e129395..25ca664859 100644 --- a/data/menu_helpers.s +++ b/data/menu_helpers.s @@ -4,11 +4,34 @@ .section .rodata .align 2, 0 +gUnknown_0859F4E8:: @ 859F4E8 + .2byte 0x00 + .2byte 0x4000 + .2byte 0x00 + .2byte 0x00 + +gUnknown_0859F4F0:: @ 859F4F0 + obj_image_anim_frame 0x00, 0x00 + obj_image_anim_end + +gUnknown_0859F4F8:: @ 859F4F8 + obj_image_anim_frame 0x04, 0x00 + obj_image_anim_end + +gUnknown_0859F500:: @ 859F500 + obj_image_anim_frame 0x00, 0x40 + obj_image_anim_end + +gUnknown_0859F508:: @ 859F508 + .4byte gUnknown_0859F4F0 + .4byte gUnknown_0859F4F8 + .4byte gUnknown_0859F500 + gUnknown_0859F514:: @ 859F514 - .incbin "baserom.gba", 0x59f514, 0x8 + .4byte gBagSwapLineGfx, 0x6D0100 gUnknown_0859F51C:: @ 859F51C - .incbin "baserom.gba", 0x59f51c, 0x8 + .4byte gBagSwapLinePal, 0x6D gUnknown_0859F524:: @ 859F524 - .incbin "baserom.gba", 0x59f524, 0x18 + spr_template 0x6D, 0x6D, gUnknown_0859F4E8, gUnknown_0859F508, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy diff --git a/data/menu_indicators.s b/data/menu_indicators.s index 43fc0e1398..24353b157f 100644 --- a/data/menu_indicators.s +++ b/data/menu_indicators.s @@ -4,10 +4,41 @@ .section .rodata gUnknown_086141FC:: @ 86141FC - .incbin "baserom.gba", 0x6141fc, 0x48 + .byte 0, 2, 8, 0 + .byte 1, 2, -8, -1 + .byte 18, 2, 8, 0 + .byte 19, 2, -8, -1 + +gUnknown_0861420C:: @ 861420C + .2byte 0 + .2byte 0x4000 + .2byte 0 + .2byte 0 + +gUnknown_08614214:: @ 8614214 + obj_image_anim_frame 0, 30 + obj_image_anim_end + +gUnknown_0861421C:: @ 861421C + obj_image_anim_frame 0, 0x5e + obj_image_anim_end + +gUnknown_08614224:: @ 8614224 + obj_image_anim_frame 4, 30 + obj_image_anim_end + +gUnknown_0861422C:: @ 861422C + obj_image_anim_frame 4, 0x9e + obj_image_anim_end + +gUnknown_08614234:: @ 8614234 + .4byte gUnknown_08614214 + .4byte gUnknown_0861421C + .4byte gUnknown_08614224 + .4byte gUnknown_0861422C gUnknown_08614244:: @ 8614244 - .incbin "baserom.gba", 0x614244, 0x18 + spr_template 0, 0, gUnknown_0861420C, gUnknown_08614234, NULL, gDummySpriteAffineAnimTable, sub_81AF264 gUnknown_0861425C:: @ 861425C .4byte 0x00000000 @@ -34,19 +65,29 @@ gUnknown_08614278:: @ 8614278 .4byte 0x00700000 gUnknown_0861427C:: @ 861427C - .incbin "baserom.gba", 0x61427C, 0x14 + .2byte 0 + .2byte 0x4000 + .2byte 0 + .2byte 0 + +gUnknown_08614284:: @ 8614284 + obj_image_anim_frame 0, 30 + obj_image_anim_end + +gUnknown_0861428C:: @ 861428C + .4byte gUnknown_08614284 gUnknown_08614290:: @ 8614290 - .incbin "baserom.gba", 0x614290, 0x18 + spr_template 0, 0, gUnknown_0861427C, gUnknown_0861428C, NULL, gDummySpriteAffineAnimTable, ObjectCB_RedArrowCursor gUnknown_086142A8:: @ 86142A8 - .incbin "baserom.gba", 0x6142a8, 0x20 + .incbin "graphics/interface/red_arrow.gbapal" gUnknown_086142C8:: @ 86142C8 - .incbin "baserom.gba", 0x6142c8, 0x70 + .incbin "graphics/interface/red_arrow_other.4bpp.lz" gUnknown_08614338:: @ 8614338 - .incbin "baserom.gba", 0x614338, 0x40 + .incbin "graphics/interface/selector_outline.4bpp.lz" gUnknown_08614378:: @ 8614378 - .incbin "baserom.gba", 0x614378, 0x44 + .incbin "graphics/interface/red_arrow.4bpp.lz" diff --git a/data/mon_markings.s b/data/mon_markings.s index 795b8d8a68..7d30c0012c 100644 --- a/data/mon_markings.s +++ b/data/mon_markings.s @@ -5,25 +5,153 @@ .align 2, 0 gUnknown_0859E65C:: @ 859E65C - .incbin "baserom.gba", 0x59e65c, 0x20 + .incbin "graphics/misc/mon_markings.gbapal" gUnknown_0859E67C:: @ 859E67C - .incbin "baserom.gba", 0x59e67c, 0x800 + .incbin "graphics/misc/mon_markings.4bpp" gUnknown_0859EE7C:: @ 859EE7C - .incbin "baserom.gba", 0x59ee7c, 0x8 + .2byte 0, 0xC000, 0, 0 gUnknown_0859EE84:: @ 859EE84 - .incbin "baserom.gba", 0x59ee84, 0x58 + .2byte 0, 0, 0, 0 + +gUnknown_0859EE8C:: @ 859EE8C + .2byte 0, 5, -1, 0 + +gUnknown_0859EE94:: @ 859EE94 + .2byte 1, 5, -1, 0 + +gUnknown_0859EE9C:: @ 859EE9C + .2byte 2, 5, -1, 0 + +gUnknown_0859EEA4:: @ 859EEA4 + .2byte 3, 5, -1, 0 + +gUnknown_0859EEAC:: @ 859EEAC + .2byte 4, 5, -1, 0 + +gUnknown_0859EEB4:: @ 859EEB4 + .2byte 5, 5, -1, 0 + +gUnknown_0859EEBC:: @ 859EEBC + .2byte 6, 5, -1, 0 + +gUnknown_0859EEC4:: @ 859EEC4 + .2byte 7, 5, -1, 0 + +gUnknown_0859EECC:: @ 859EECC + .2byte 8, 5, -1, 0 + +gUnknown_0859EED4:: @ 859EED4 + .2byte 9, 5, -1, 0 gUnknown_0859EEDC:: @ 859EEDC - .incbin "baserom.gba", 0x59eedc, 0x38 + .4byte gUnknown_0859EE8C + .4byte gUnknown_0859EE94 + .4byte gUnknown_0859EE9C + .4byte gUnknown_0859EEA4 + .4byte gUnknown_0859EEAC + .4byte gUnknown_0859EEB4 + .4byte gUnknown_0859EEBC + .4byte gUnknown_0859EEC4 + .4byte gUnknown_0859EECC + .4byte gUnknown_0859EED4 +gUnknown_0859EF04:: @ 859EF04 + .2byte 0, 5, -1, 0 + +gUnknown_0859EF0C:: @ 859EF0C + .2byte 64, 5, -1, 0 + gUnknown_0859EF14:: @ 859EF14 - .incbin "baserom.gba", 0x59ef14, 0x8 + .4byte gUnknown_0859EF04 + .4byte gUnknown_0859EF0C gUnknown_0859EF1C:: @ 859EF1C - .incbin "baserom.gba", 0x59ef1c, 0x88 + .2byte 0x4000 + .2byte 0x4000 + .2byte 0 + .2byte 0 + +gUnknown_0859EF24:: @ 859EF24 + obj_image_anim_frame 0, 5 + obj_image_anim_end + +gUnknown_0859EF2C:: @ 859EF2C + obj_image_anim_frame 4, 5 + obj_image_anim_end + +gUnknown_0859EF34:: @ 859EF34 + obj_image_anim_frame 8, 5 + obj_image_anim_end + +gUnknown_0859EF3C:: @ 859EF3C + obj_image_anim_frame 12, 5 + obj_image_anim_end + +gUnknown_0859EF44:: @ 859EF44 + obj_image_anim_frame 16, 5 + obj_image_anim_end + +gUnknown_0859EF4C:: @ 859EF4C + obj_image_anim_frame 20, 5 + obj_image_anim_end + +gUnknown_0859EF54:: @ 859EF54 + obj_image_anim_frame 24, 5 + obj_image_anim_end + +gUnknown_0859EF5C:: @ 859EF5C + obj_image_anim_frame 28, 5 + obj_image_anim_end + +gUnknown_0859EF64:: @ 859EF64 + obj_image_anim_frame 32, 5 + obj_image_anim_end + +gUnknown_0859EF6C:: @ 859EF6C + obj_image_anim_frame 36, 5 + obj_image_anim_end + +gUnknown_0859EF74:: @ 859EF74 + obj_image_anim_frame 40, 5 + obj_image_anim_end + +gUnknown_0859EF7C:: @ 859EF7C + obj_image_anim_frame 44, 5 + obj_image_anim_end + +gUnknown_0859EF84:: @ 859EF84 + obj_image_anim_frame 48, 5 + obj_image_anim_end + +gUnknown_0859EF8C:: @ 859EF8C + obj_image_anim_frame 52, 5 + obj_image_anim_end + +gUnknown_0859EF94:: @ 859EF94 + obj_image_anim_frame 56, 5 + obj_image_anim_end + +gUnknown_0859EF9C:: @ 859EF9C + obj_image_anim_frame 60, 5 + obj_image_anim_end gUnknown_0859EFA4:: @ 859EFA4 - .incbin "baserom.gba", 0x59efa4, 0x40 + .4byte gUnknown_0859EF24 + .4byte gUnknown_0859EF2C + .4byte gUnknown_0859EF34 + .4byte gUnknown_0859EF3C + .4byte gUnknown_0859EF44 + .4byte gUnknown_0859EF4C + .4byte gUnknown_0859EF54 + .4byte gUnknown_0859EF5C + .4byte gUnknown_0859EF64 + .4byte gUnknown_0859EF6C + .4byte gUnknown_0859EF74 + .4byte gUnknown_0859EF7C + .4byte gUnknown_0859EF84 + .4byte gUnknown_0859EF8C + .4byte gUnknown_0859EF94 + .4byte gUnknown_0859EF9C diff --git a/data/mystery_event_menu.s b/data/mystery_event_menu.s index 1dbe2d5801..bb8330497a 100644 --- a/data/mystery_event_menu.s +++ b/data/mystery_event_menu.s @@ -4,7 +4,9 @@ .section .rodata gUnknown_085EFD64:: @ 85EFD64 - .incbin "baserom.gba", 0x5efd64, 0x4 + .4byte 0x1F8 gUnknown_085EFD68:: @ 85EFD68 - .incbin "baserom.gba", 0x5efd68, 0x18 + window_template 0, 4, 15, 22, 4, 14, 20 + window_template 0, 7, 6, 16, 4, 14, 0x6C + null_window_template diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index e5525477dc..5d4d038efb 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -1,6 +1,16 @@ +#include "constants/flags.h" +#include "constants/items.h" +#include "constants/moves.h" +#include "constants/songs.h" +#include "constants/species.h" +#include "constants/vars.h" .include "asm/macros.inc" + .include "asm/macros/event.inc" .include "constants/constants.inc" + .include "data/specials.inc" + + .section .rodata gText_MysteryGiftBerry:: @ 8674AE4 @@ -34,8 +44,22 @@ gText_MysteryGiftNewTrainer:: @ 8674C31 gText_MysteryGiftCantBeUsed:: @ 8674C86 .string "This data can’t be used in\nthis version.$" -gUnknown_08674CAF:: @ 8674CAF - .incbin "baserom.gba", 0x00674caf, 0x2e + .align 2 +gUnknown_08674CB0:: @ 8674CB0 + setvaddress gUnknown_08674CB0 + setorcopyvar 0x800D, 1 + specialvar 0x8008, sub_813986C + setorcopyvar 0x800D, 0 + specialvar 0x8009, sub_813986C + subvar 0x8008, 32777 + buffernumberstring 0, 0x8008 + lock + faceplayer + vmessage gText_MysteryGiftStampCard + waitmessage + waitbuttonpress + release + end gText_MysteryGiftStampCard:: .string "Thank you for using the STAMP CARD\nSystem.\pYou have {STR_VAR_1} more to collect to\nfill your STAMP CARD.$" diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 327c0cbc68..2e00ee702d 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -300,10 +300,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "in hearing my epic tales of legendary\l" .string "TRAINERS.$" +MauvilleCity_PokemonCenter_1F_Text_28E930:: @ 828E930 .string "The Save-Happy TRAINER$" +MauvilleCity_PokemonCenter_1F_Text_28E947:: @ 828E947 .string "Saved the game$" +MauvilleCity_PokemonCenter_1F_Text_28E956:: @ 828E956 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER saved the game\n" @@ -311,10 +314,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "A more cautious TRAINER than\n" .string "{STR_VAR_3} one will never find!$" +MauvilleCity_PokemonCenter_1F_Text_28E9D7:: @ 828E9D7 .string "The Trendsetter TRAINER$" +MauvilleCity_PokemonCenter_1F_Text_28E9EF:: @ 828E9EF .string "Started trends$" +MauvilleCity_PokemonCenter_1F_Text_28E9FE:: @ 828E9FE .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER started new trends\n" @@ -322,10 +328,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3} is setting trends for all\n" .string "the HOENN region!$" - .string "The BERRY-Planting TRAINER$" +MauvilleCity_PokemonCenter_1F_Text_28EA7D:: @ 828EA7D + .string "The BERRY-Planting TRAINER$" +MauvilleCity_PokemonCenter_1F_Text_28EA98:: @ 828EA98 .string "Planted BERRIES$" +MauvilleCity_PokemonCenter_1F_Text_28EAA8:: @ 828EAA8 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER planted BERRIES\n" @@ -333,10 +342,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3} is a legendary lover of\n" .string "BERRIES!$" +MauvilleCity_PokemonCenter_1F_Text_28EB19:: @ 828EB19 .string "The BIKE-Loving TRAINER$" +MauvilleCity_PokemonCenter_1F_Text_28EB31:: @ 828EB31 .string "Traded BIKES$" +MauvilleCity_PokemonCenter_1F_Text_28EB3E:: @ 828EB3E .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER swapped BIKES\n" @@ -344,10 +356,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3} must love BIKES deeply\n" .string "and passionately!$" +MauvilleCity_PokemonCenter_1F_Text_28EBB5:: @ 828EBB5 .string "The Interviewed TRAINER$" +MauvilleCity_PokemonCenter_1F_Text_28EBCD:: @ 828EBCD .string "Got interviewed$" +MauvilleCity_PokemonCenter_1F_Text_28EBDD:: @ 828EBDD .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER got interviewed\n" @@ -355,20 +370,26 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3} must be a TRAINER who’s\n" .string "attracting much attention!$" +MauvilleCity_PokemonCenter_1F_Text_28EC60:: @ 828EC60 .string "The Battle-Happy TRAINER$" +MauvilleCity_PokemonCenter_1F_Text_28EC79:: @ 828EC79 .string "Battled$" +MauvilleCity_PokemonCenter_1F_Text_28EC81:: @ 828EC81 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER battled {STR_VAR_1} times!\p" .string "{STR_VAR_3} must be a TRAINER who can\n" .string "never refuse a chance to battle!$" +MauvilleCity_PokemonCenter_1F_Text_28ED04:: @ 828ED04 .string "The POKéMON-Catching TRAINER$" +MauvilleCity_PokemonCenter_1F_Text_28ED21:: @ 828ED21 .string "Caught POKéMON$" +MauvilleCity_PokemonCenter_1F_Text_28ED30:: @ 828ED30 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER caught\n" @@ -376,10 +397,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3} is a legendary catcher of\n" .string "wild POKéMON!$" +MauvilleCity_PokemonCenter_1F_Text_28EDA1:: @ 828EDA1 .string "The Fishing TRAINER$" +MauvilleCity_PokemonCenter_1F_Text_28EDB5:: @ 828EDB5 .string "Caught POKéMON with a ROD$" +MauvilleCity_PokemonCenter_1F_Text_28EDCF:: @ 828EDCF .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER caught\n" @@ -387,10 +411,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3} is a legendary fishing\n" .string "expert!$" +MauvilleCity_PokemonCenter_1F_Text_28EE45:: @ 828EE45 .string "The EGG-Warming TRAINER$" +MauvilleCity_PokemonCenter_1F_Text_28EE5D:: @ 828EE5D .string "Hatched EGGS$" +MauvilleCity_PokemonCenter_1F_Text_28EE6A:: @ 828EE6A .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER hatched {STR_VAR_1} POKéMON\n" @@ -398,10 +425,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3} is a legendary warmer\n" .string "of EGGS!$" +MauvilleCity_PokemonCenter_1F_Text_28EEDD:: @ 828EEDD .string "The Evolver TRAINER$" +MauvilleCity_PokemonCenter_1F_Text_28EEF1:: @ 828EEF1 .string "Evolved POKéMON$" +MauvilleCity_PokemonCenter_1F_Text_28EF01:: @ 828EF01 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER made {STR_VAR_1} POKéMON\n" @@ -409,10 +439,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3} is the ultimate evolver\n" .string "of POKéMON!$" +MauvilleCity_PokemonCenter_1F_Text_28EF73:: @ 828EF73 .string "The POKéMON CENTER-Loving TRAINER$" +MauvilleCity_PokemonCenter_1F_Text_28EF95:: @ 828EF95 .string "Used POKéMON CENTERS$" +MauvilleCity_PokemonCenter_1F_Text_28EFAA:: @ 828EFAA .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER healed POKéMON\n" @@ -420,10 +453,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "There could be no greater lover of\n" .string "POKéMON CENTERS than {STR_VAR_3}!$" +MauvilleCity_PokemonCenter_1F_Text_28F045:: @ 828F045 .string "The Homebody TRAINER$" +MauvilleCity_PokemonCenter_1F_Text_28F05A:: @ 828F05A .string "Rested POKéMON at home$" +MauvilleCity_PokemonCenter_1F_Text_28F071:: @ 828F071 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER healed POKéMON\n" @@ -431,10 +467,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "There could be no more of a homebody\n" .string "than {STR_VAR_3}!$" +MauvilleCity_PokemonCenter_1F_Text_28F0F3:: @ 828F0F3 .string "The SAFARI-Loving TRAINER$" +MauvilleCity_PokemonCenter_1F_Text_28F10D:: @ 828F10D .string "Entered the SAFARI ZONE$" +MauvilleCity_PokemonCenter_1F_Text_28F125:: @ 828F125 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER went into the SAFARI ZONE\n" @@ -442,10 +481,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3} is a TRAINER whose wild side\n" .string "must come out in the SAFARI ZONE!$" +MauvilleCity_PokemonCenter_1F_Text_28F1BE:: @ 828F1BE .string "The CUT-Frenzy TRAINER$" +MauvilleCity_PokemonCenter_1F_Text_28F1D5:: @ 828F1D5 .string "Used CUT$" +MauvilleCity_PokemonCenter_1F_Text_28F1DE:: @ 828F1DE .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER used CUT\n" @@ -453,10 +495,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3} is a TRAINER who just must\n" .string "love to CUT!$" +MauvilleCity_PokemonCenter_1F_Text_28F24F:: @ 828F24F .string "The ROCK-SMASHING TRAINER$" +MauvilleCity_PokemonCenter_1F_Text_28F269:: @ 828F269 .string "Smashed rocks$" +MauvilleCity_PokemonCenter_1F_Text_28F277:: @ 828F277 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER used ROCK SMASH\n" @@ -464,10 +509,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3} must be a TRAINER who\n" .string "can’t leave a stone unsmashed!$" +MauvilleCity_PokemonCenter_1F_Text_28F2FC:: @ 828F2FC .string "The Move-Loving TRAINER$" +MauvilleCity_PokemonCenter_1F_Text_28F314:: @ 828F314 .string "Moved the SECRET BASE$" +MauvilleCity_PokemonCenter_1F_Text_28F32A:: @ 828F32A .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER moved the SECRET BASE\n" @@ -475,10 +523,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3} is a TRAINER who loves\n" .string "to move houses often!$" +MauvilleCity_PokemonCenter_1F_Text_28F3AD:: @ 828F3AD .string "The SPLASH-Happy TRAINER$" +MauvilleCity_PokemonCenter_1F_Text_28F3C6:: @ 828F3C6 .string "Used SPLASH$" +MauvilleCity_PokemonCenter_1F_Text_28F3D2:: @ 828F3D2 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER used SPLASH\n" @@ -486,10 +537,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3} is a TRAINER who must love\n" .string "SPLASHING around!$" +MauvilleCity_PokemonCenter_1F_Text_28F44B:: @ 828F44B .string "The Tenacious TRAINER$" +MauvilleCity_PokemonCenter_1F_Text_28F461:: @ 828F461 .string "Resorted to using STRUGGLE$" +MauvilleCity_PokemonCenter_1F_Text_28F47C:: @ 828F47C .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER had to rely on STRUGGLE\n" @@ -497,10 +551,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3} is a tenacious TRAINER\n" .string "who never gives in to adversity!$" +MauvilleCity_PokemonCenter_1F_Text_28F50C:: @ 828F50C .string "The SLOT Champ$" +MauvilleCity_PokemonCenter_1F_Text_28F51B:: @ 828F51B .string "Won the jackpot on the SLOTS$" +MauvilleCity_PokemonCenter_1F_Text_28F538:: @ 828F538 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER won the jackpot on\n" @@ -508,10 +565,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3} is a TRAINER who was lucky\n" .string "on the SLOTS!$" +MauvilleCity_PokemonCenter_1F_Text_28F5BE:: @ 828F5BE .string "The ROULETTE Champ$" +MauvilleCity_PokemonCenter_1F_Text_28F5D1:: @ 828F5D1 .string "Had consecutive ROULETTE wins of$" +MauvilleCity_PokemonCenter_1F_Text_28F5F2:: @ 828F5F2 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER won in ROULETTE\n" @@ -519,10 +579,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3} was lucky when the ball\n" .string "bounced in ROULETTE!$" +MauvilleCity_PokemonCenter_1F_Text_28F678:: @ 828F678 .string "The BATTLE TOWER Challenger$" +MauvilleCity_PokemonCenter_1F_Text_28F694:: @ 828F694 .string "Took the BATTLE TOWER challenge$" +MauvilleCity_PokemonCenter_1F_Text_28F6B4:: @ 828F6B4 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER took the BATTLE TOWER\n" @@ -530,10 +593,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3} is a TRAINER who aspires\n" .string "for excellence in the BATTLE TOWER!$" +MauvilleCity_PokemonCenter_1F_Text_28F751:: @ 828F751 .string "The Blend-Loving TRAINER$" +MauvilleCity_PokemonCenter_1F_Text_28F76A:: @ 828F76A .string "Made {POKEBLOCK}S$" +MauvilleCity_PokemonCenter_1F_Text_28F776:: @ 828F776 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER made {POKEBLOCK}S\n" @@ -541,10 +607,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "There is none better at using a BERRY\n" .string "BLENDER than {STR_VAR_3}!$" +MauvilleCity_PokemonCenter_1F_Text_28F7F6:: @ 828F7F6 .string "The CONTEST-Loving TRAINER$" +MauvilleCity_PokemonCenter_1F_Text_28F811:: @ 828F811 .string "Entered CONTESTS$" +MauvilleCity_PokemonCenter_1F_Text_28F822:: @ 828F822 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER entered CONTESTS\n" @@ -552,10 +621,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3} must love showing off\n" .string "POKéMON to others!$" +MauvilleCity_PokemonCenter_1F_Text_28F89C:: @ 828F89C .string "The CONTEST Master$" +MauvilleCity_PokemonCenter_1F_Text_28F8AF:: @ 828F8AF .string "Won CONTESTS$" +MauvilleCity_PokemonCenter_1F_Text_28F8BC:: @ 828F8BC .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER won CONTESTS\n" @@ -563,10 +635,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3} must be an incredible\n" .string "CONTEST master!$" +MauvilleCity_PokemonCenter_1F_Text_28F92F:: @ 828F92F .string "The Happy Shopper$" +MauvilleCity_PokemonCenter_1F_Text_28F941:: @ 828F941 .string "Shopped$" +MauvilleCity_PokemonCenter_1F_Text_28F949:: @ 828F949 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER bought items in shops\n" @@ -574,10 +649,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3} must be one of those\n" .string "people who are born to shop.$" +MauvilleCity_PokemonCenter_1F_Text_28F9D1:: @ 828F9D1 .string "The Item-Finding TRAINER$" +MauvilleCity_PokemonCenter_1F_Text_28F9EA:: @ 828F9EA .string "Used an ITEMFINDER$" +MauvilleCity_PokemonCenter_1F_Text_28F9FD:: @ 828F9FD .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER used an ITEMFINDER\n" @@ -585,10 +663,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3} must enjoy scouring the\n" .string "ground for hidden items!$" +MauvilleCity_PokemonCenter_1F_Text_28FA81:: @ 828FA81 .string "The Rain-Soaked TRAINER$" +MauvilleCity_PokemonCenter_1F_Text_28FA99:: @ 828FA99 .string "Got rained on$" +MauvilleCity_PokemonCenter_1F_Text_28FAA7:: @ 828FAA7 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER got soaked by rain\n" @@ -596,10 +677,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3}’s charisma must even\n" .string "attract rain!$" +MauvilleCity_PokemonCenter_1F_Text_28FB1D:: @ 828FB1D .string "The Avid POKéDEX Reader$" +MauvilleCity_PokemonCenter_1F_Text_28FB35:: @ 828FB35 .string "Checked a POKéDEX$" +MauvilleCity_PokemonCenter_1F_Text_28FB47:: @ 828FB47 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER checked a POKéDEX\n" @@ -607,10 +691,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3} must love inspecting\n" .string "POKéMON in a POKéDEX!$" +MauvilleCity_PokemonCenter_1F_Text_28FBC4:: @ 828FBC4 .string "The RIBBON Collector$" +MauvilleCity_PokemonCenter_1F_Text_28FBD9:: @ 828FBD9 .string "Received RIBBONS$" +MauvilleCity_PokemonCenter_1F_Text_28FBEA:: @ 828FBEA .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER received RIBBONS\n" @@ -618,10 +705,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3} must be a TRAINER who\n" .string "loves to collect RIBBONS!$" +MauvilleCity_PokemonCenter_1F_Text_28FC6B:: @ 828FC6B .string "The Ledge-Jumping TRAINER$" +MauvilleCity_PokemonCenter_1F_Text_28FC85:: @ 828FC85 .string "Jumped down ledges$" +MauvilleCity_PokemonCenter_1F_Text_28FC98:: @ 828FC98 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER jumped down ledges\n" @@ -629,20 +719,26 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "If there’s a ledge to be jumped,\n" .string "{STR_VAR_3} can’t ignore it!$" +MauvilleCity_PokemonCenter_1F_Text_28FD1D:: @ 828FD1D .string "The Legendary TV Viewer$" +MauvilleCity_PokemonCenter_1F_Text_28FD35:: @ 828FD35 .string "Watched TV$" +MauvilleCity_PokemonCenter_1F_Text_28FD40:: @ 828FD40 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER watched TV\n" .string "{STR_VAR_1} times!\p" .string "{STR_VAR_3} must love watching TV!$" +MauvilleCity_PokemonCenter_1F_Text_28FDA2:: @ 828FDA2 .string "The Time-Conscious TRAINER$" +MauvilleCity_PokemonCenter_1F_Text_28FDBD:: @ 828FDBD .string "Checked the time$" +MauvilleCity_PokemonCenter_1F_Text_28FDCE:: @ 828FDCE .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER checked the time\n" @@ -650,10 +746,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3} must be a punctual TRAINER\n" .string "who’s conscious of the time.$" +MauvilleCity_PokemonCenter_1F_Text_28FE57:: @ 828FE57 .string "The POKéMON LOTTERY Wizard$" +MauvilleCity_PokemonCenter_1F_Text_28FE72:: @ 828FE72 .string "Won POKéMON LOTTERIES$" +MauvilleCity_PokemonCenter_1F_Text_28FE88:: @ 828FE88 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER won POKéMON LOTTERIES\n" @@ -661,10 +760,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3} must have many friends\n" .string "to trade POKéMON with!$" +MauvilleCity_PokemonCenter_1F_Text_28FF0C:: @ 828FF0C .string "The DAY CARE-Using Trainer$" +MauvilleCity_PokemonCenter_1F_Text_28FF27:: @ 828FF27 .string "Left POKéMON at the DAY CARE$" +MauvilleCity_PokemonCenter_1F_Text_28FF44:: @ 828FF44 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER left POKéMON with the\n" @@ -672,10 +774,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3} must be a real go-getter\n" .string "who raises POKéMON aggressively!$" +MauvilleCity_PokemonCenter_1F_Text_28FFDD:: @ 828FFDD .string "The CABLE CAR-Loving TRAINER$" +MauvilleCity_PokemonCenter_1F_Text_28FFFA:: @ 828FFFA .string "Rode the CABLE CAR$" +MauvilleCity_PokemonCenter_1F_Text_29000D:: @ 829000D .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER rode the CABLE CAR\n" @@ -683,10 +788,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3} must be a busy TRAINER\n" .string "who’s up and down all the time!$" +MauvilleCity_PokemonCenter_1F_Text_290097:: @ 8290097 .string "The Hot Spring-Loving TRAINER$" +MauvilleCity_PokemonCenter_1F_Text_2900B5:: @ 82900B5 .string "Bathed in hot springs$" +MauvilleCity_PokemonCenter_1F_Text_2900CB:: @ 82900CB .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER bathed in hot springs\n" @@ -694,6 +802,7 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 .string "{STR_VAR_3} must be a TRAINER with\n" .string "baby-smooth skin!$" + MauvilleCity_PokemonCenter_1F_EventScript_29014A:: @ 829014A lock faceplayer diff --git a/data/specials.inc b/data/specials.inc index f0c1fa1140..e1a53242db 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -1,3 +1,5 @@ +#ifndef GUARD_SPECIALS_H +#define GUARD_SPECIALS_H .macro def_special ptr .set SPECIAL_\ptr, __special__ .set __special__, __special__ + 1 @@ -534,3 +536,4 @@ gSpecials:: @ 81DBA64 def_special sub_813C5A0 def_special sub_8139C10 def_special sub_80B3BC4 +#endif \ No newline at end of file diff --git a/graphics/interface/map_popup/857F444.pal b/graphics/interface/map_popup/857F444.pal new file mode 100755 index 0000000000..19b8cf9c43 --- /dev/null +++ b/graphics/interface/map_popup/857F444.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +0 0 0 +238 255 255 +65 65 123 +255 255 255 +180 222 255 +139 172 213 +98 123 172 +57 74 131 +16 24 90 +180 222 255 +139 172 213 +98 123 172 +57 74 131 +16 24 90 +255 255 255 diff --git a/graphics/interface/map_popup/brick.png b/graphics/interface/map_popup/brick.png new file mode 100755 index 0000000000000000000000000000000000000000..8fef0a1c2de6ddbc4aad0483fe619157b3d895e6 GIT binary patch literal 412 zcmV;N0b~A&P)bYc+0003e zNklTrR425$^)D7MD22`R4K=OG;L^5>xH-s>LR&g%2UzYAe*uxygkyfUTL7l?{d>n*@0H_~#u_?m6=TLe zCyvD;rmtj<#~~$q3AHmJ&Dq1LTBXubYc+00044 zNklxvTp)6#+VtL)USL75#W$vQrEoQ1U-Q%9k$q9 zZh^*t@^ixA=5O5N8uTdRq8WiAbYGI)wV}%an!V_(ibw;`rCNdYmZH9bTI*Kphci4U zkUI1N9tkApzyrd(sx|U(22i62xVw^TTk9@ljpPR){t zN)VBNzk&Yr>0zrEEvhl96TVHnBuO=F#M6J9aKJX*;?vb-!X)8Y2&GOY??;7}K9DZ- z&?Ke`tYGj)2nVig(WMgsEEDKDA`u!$ZjMg6{aC6E-jKc_MZQjnY^0AK?Fq+K1%idG4jz$e;}9QE4(Q`it0^VVEM1=$(k2Y%KXBHIHILbqf?Duu zdq>h-d7W);)2;FO4;lOP*ivW(Prgt24S9_jmyh-p*s!Lyzakx5Z2nPiM&BZS-jJ@Q z1>38zXIZ~DI?pXWShY4IaZlzZAoa|0Q?~LCvp50lH|zr!00000NkvXXu0mjf12^qt literal 0 HcmV?d00001 diff --git a/graphics/interface/map_popup/marble_outline.png b/graphics/interface/map_popup/marble_outline.png new file mode 100755 index 0000000000000000000000000000000000000000..54f3021ea53398f20d22fa703e7ce22a84d12a13 GIT binary patch literal 494 zcmViYgq6iC}JrS!Wr7C6FnhP!YeQ|Qjsdb$^*2+MP>95r%WhI z(zT)k50E$LR_<&Ent?wnUld)O`}r>ZE<#NHCUFonI=u|`q|}L&@?6RzUP&pEize0L zJb3&CjyuLFFU_6+07)~%l$RMcU`1D(i!ukIeSsqBX?mM`jvjrWNKjuXUs5C?Z8om0 zhEc%;a}gzHs!~L9s$`I(<4Bqi9ofR5s30jcIf0E$NyzMS!yP~k>Lh$$YltaE1!qJM zyz=?)_)sZ>J!6U?fvciQHG#J~D-oPov#$u$8G*b3U{Fu{FhUd8hdU2af7^200hrI@ z+JW2>DokH$@#G}XRAuSDEy8ODt{qq)64;1r%3VbRIA7S-qfhX84@5R+xtSJFb&)HQ zORF~q%NCef=c#qSf?;>z?1A{6qHclyf6#Cf+37^a%}m?jn3N_?!=VlK><@HrcR$I4 kTMvJ)$Hu1LB>saw09ZWHJZ+F#TmS$707*qoM6N<$f{B~gE~$M vQw>ig<=Ky%oa9%L!rxu7??TUp?E?HBKFxEZG9O+7n$O_r>gTe~DWM4fplMK= literal 0 HcmV?d00001 diff --git a/graphics/interface/map_popup/stone2.png b/graphics/interface/map_popup/stone2.png new file mode 100755 index 0000000000000000000000000000000000000000..261c3184ab5ff28081ce8decd1887878abe87079 GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^0YEIl!VDzmo21VNQU(D&A+E(omjIdX{{MG$tp5N1 z|CW3IyVqPzs$OI1)hr+p_5bRUXKSkO%_%+_Wx2&r0;pj3tOZYj8bUl>978lFzCClA z_kaNhbHFlQ=>)R_$6Hz{3+RMv2Z5QD2N(y4nVLLNgU8W9TwF46W8Vf?`Q=*UM|^;poXMd+T`dOIFYuJq znNWJcZ=kmD4n_voC(5|hg(OqgjUS6=c?Tt6Hz{3+RMv2Z5QD2N(y4nVLLNgU8W9TwF46W8Vf?`Q=*UM|^;poXMd+T`dOIFYuJq znNWJcZ=kmD4n_voC(5|hg(OqgjUS6=c?Tt2FZgLA*fWwYbYcvc8OK46==2BV&NK90~YZEQYI@{|lr_c)FrGI2&RH zvD!55w&I;n2`4q%s9qPdWn1n?Ae|q(*+hvNSHe%dR@UBPZ!2a10000X~5h3Lmt3D%N!y|*PTLtM+SEcUc_?%KBQ8L zrU~Gl!CnY$zks5y-}*%WQ&9ov#wUC%(|rRU!)+U03nqbhmhujRXRy^8dt$Z5YL;Lwe{ b|A#&RV;h-sJE+XH00000NkvXXu0mjfAnM?x literal 0 HcmV?d00001 diff --git a/graphics/interface/map_popup/wood.png b/graphics/interface/map_popup/wood.png new file mode 100755 index 0000000000000000000000000000000000000000..e846a6bcd5fd0774b094dc9d57e0d23aa9a4c0e6 GIT binary patch literal 338 zcmV-Y0j>UtP)A>$?Z&zZ;SX>$NM!N!11Gme`?XFJDcK`qY07*qoM6N<$f~{4PJ^%m! literal 0 HcmV?d00001 diff --git a/graphics/interface/map_popup/wood_outline.png b/graphics/interface/map_popup/wood_outline.png new file mode 100755 index 0000000000000000000000000000000000000000..d143dbc2f82ca3e536a6836db37c092dcca20268 GIT binary patch literal 391 zcmV;20eJq2P)8We)eA6EipPhlJ z6!nqfKMgmh;0@oQ&*Ixm15Z5V+ZQQ-qSSBfD2j1IM8A%4sr$cY>!TOF?f zZ>Q9r>5)-}GeUKoMUXsYrK#0%{VVL#f{RgiX|HL5P z#ZT3MdW}3?978x}CMN_XH88k3s?%eJJ|pL literal 0 HcmV?d00001 diff --git a/graphics/interface/red_arrow_other.png b/graphics/interface/red_arrow_other.png new file mode 100755 index 0000000000000000000000000000000000000000..33fcf44b9c34c49b1c141a0802bcb648f250eb7a GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!VDx|E`RzTNErn9gt!(jIr=|{p;>|9Kf`}w z5bxrrYCydKo-U3d5>tD71NjaZa5zclFHoOx=l_Jc+DFyAr+rkeT+vg=HRsuNBhO?x zX%@!GHIlAT?}}~Ta80c{@h$IF;&!%!PLXPI3?fGRxdSBYw#}XObS~S5t!G&+fMzpz My85}Sb4q9e0Gl&U*#H0l literal 0 HcmV?d00001 diff --git a/graphics/interface/select_button.png b/graphics/interface/select_button.png new file mode 100755 index 0000000000000000000000000000000000000000..bded587fd1d071464de8d5b9032433a760c183cf GIT binary patch literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^5mo}~d literal 0 HcmV?d00001 diff --git a/graphics/map_objects/pics/effects/unknown_4F6D38/0.png b/graphics/map_objects/pics/effects/unknown_4F6D38/0.png new file mode 100755 index 0000000000000000000000000000000000000000..3ee87e1cdee0683fb6edf9fbe7f117f1d34f3bc8 GIT binary patch literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ0wfrI9P#J^Ql6eJjv*3L-}YP-JfOgF^hUke zMb-zqI^te)|0`!a?9aF3M)d~m|3=>xYQHpAq@3)ru)pWE>1Xqr6Srn8P|Vfg+c{c@($`Y^~Pp00i_>zopr0DC1yyZ`_I literal 0 HcmV?d00001 diff --git a/graphics/map_objects/pics/effects/unused_grass/0.png b/graphics/map_objects/pics/effects/unused_grass/0.png new file mode 100755 index 0000000000000000000000000000000000000000..2e16f15cb67647653412cbb7a47534694f22bef4 GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDUE#CWX%m3!)qe+(ChF(z| zhK>wLYu+WTIof^p+mvVjr!*&RSuLR*(T}!?*C$r1`L_C8+85~h*(UJ6P>^i)%Rr|+YveS;G>iN z#+h_Ci|G}|Jel<3hh?hS;<%{P;^WJwx9&V*qvN~2^l-$PqqCLQZc6?-cgbP0l+XkK*ehWA literal 0 HcmV?d00001 diff --git a/graphics/map_objects/pics/effects/unused_grass/1.png b/graphics/map_objects/pics/effects/unused_grass/1.png new file mode 100755 index 0000000000000000000000000000000000000000..dd33b0d8833891263c183a35cb719fa1d546be71 GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDUE#CWX%m3!)qe+(ChF(z| zhK>wLYu+WTIof^p+mvVjr!*&RSu4h3AKdw5>J|j2bopfJ# z$Z3fWZ%WxXjjl-ka4UMbs5?$lGa%}$SYx)>`Etn(drjnCclMVr)J@Q~mant-EKJUN b`jeUAqU5a5m5aTARx^0I`njxgN@xNA9OPUS literal 0 HcmV?d00001 diff --git a/graphics/map_objects/pics/effects/unused_grass/2.png b/graphics/map_objects/pics/effects/unused_grass/2.png new file mode 100755 index 0000000000000000000000000000000000000000..345d454cdd55248f64e886bd76051e11efd0638e GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDUE#CWX%m3!)qe+(ChF(z| zhK>wLYu+WTIof^p+mvVjr!*&RSuzp;?&+a>Cj8%tb)VOzbuWrXTO_&t?awMo_kNKd9CcouRgzf@hkgS eU$ZdZ@A6t3WL0lGo7M!hoWax8&t;ucLK6Vs4PvGM literal 0 HcmV?d00001 diff --git a/graphics/map_objects/pics/effects/unused_grass/3.png b/graphics/map_objects/pics/effects/unused_grass/3.png new file mode 100755 index 0000000000000000000000000000000000000000..087676102697427479e0f68801493a8e93bd8c4c GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDUE#CWX%m3!)qe+(ChF(z| zhK>wLYu+WTIof^p+mvVjr!*&RSu#UFqGTvg~a@>lr*<{an^LB{Ts5%}ZR* literal 0 HcmV?d00001 diff --git a/graphics/misc/mon_markings.png b/graphics/misc/mon_markings.png new file mode 100755 index 0000000000000000000000000000000000000000..013173292d9a646b407146782cb23beebe79b607 GIT binary patch literal 489 zcmeAS@N?(olHy`uVBq!ia0vp^3P9Yz!VDy5c$8@ZDT4r?5Z5(p)R?)J!Bx@;_JbfuEim%Fq28?V!i+L*mO1HJGD0^ z3M6%|oj(2JluysA>`tw{Hh)vj(j0G1@3qlO_h;pVD{GQE50n*m;C+4jhZJ8wGedVK+S}*JMD!>4okZKG2r97 z(q24gw%@N8v){)5+_8V(r$+M=j@k42A8f37P{~#+!Ty<%&ragq69$=xqQW`b&lM=h zzfxw0A+~4D`T0ijuMS)6Soq6;PsdPxv&=2|->?2|+-JZ0tNZZPd4ltAX1fQI?F#Z$@ +$(MAPOBJGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 11 + +$(MENUGFXDIR)/selector_outline.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 8 + $(PKNAVOPTIONSGFXDIR)/options.4bpp: $(PKNAVOPTIONSGFXDIR)/hoenn_map.4bpp \ $(PKNAVOPTIONSGFXDIR)/condition.4bpp \ $(PKNAVOPTIONSGFXDIR)/match_call.4bpp \ diff --git a/src/mail.c b/src/mail.c index 68a55e2420..ca3531786c 100644 --- a/src/mail.c +++ b/src/mail.c @@ -240,30 +240,6 @@ static const struct MailLayout sUnknown_0859F458[] = { { 0x05, 0x09, 0x60, 0x05, 0x1e, Unknown_0859F444 } }; -// What the heck are these meant to be? Call them u16 for now. - -static const u16 Unknown_0859F4E8[] = { - 0x00, 0x4000, 0x00, 0x00 -}; - -static const u16 Unknown_0859F4F0[] = { - 0x00, 0x00, -1, 0x00 -}; - -static const u16 Unknown_0859F4F8[] = { - 0x04, 0x00, -1, 0x00 -}; - -static const u16 Unknown_0859F500[] = { - 0x00, 0x40, -1, 0x00 -}; - -static const u16 *const sUnknown_0859F508[] = { - Unknown_0859F4F0, - Unknown_0859F4F8, - Unknown_0859F500 -}; - // .text void ReadMail(struct MailStruct *mail, void (*callback)(void), bool8 flag) From ed8269889bff04d8bb4c05298b062df2c2232f40 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sat, 20 Jan 2018 17:17:51 -0600 Subject: [PATCH 54/64] Extract data from pokedex.s --- asm/pokedex.s | 2 +- data/pokedex.s | 64 +++++++++++++++++++++---------- graphics/pokedex/black.pal | 19 +++++++++ graphics/pokedex/caught_ball.png | Bin 0 -> 210 bytes 4 files changed, 63 insertions(+), 22 deletions(-) create mode 100644 graphics/pokedex/black.pal create mode 100644 graphics/pokedex/caught_ball.png diff --git a/asm/pokedex.s b/asm/pokedex.s index 6ebeb0792b..92130e0513 100644 --- a/asm/pokedex.s +++ b/asm/pokedex.s @@ -8940,7 +8940,7 @@ _080C0250: b _080C028E .pool _080C028C: - ldr r0, =gUnknown_0856E688 + ldr r0, =sText_TenDashes2 _080C028E: movs r1, 0x84 movs r2, 0x19 diff --git a/data/pokedex.s b/data/pokedex.s index 3b783be34e..7fdecaf5f7 100644 --- a/data/pokedex.s +++ b/data/pokedex.s @@ -23,16 +23,15 @@ .endm gUnknown_0855D2B8:: @ 855D2B8 - .incbin "baserom.gba", 0x55d2b8, 0x6 + .string "{UNK_CTRL_F9 8}000$" gUnknown_0855D2BE:: @ 855D2BE - .incbin "baserom.gba", 0x55d2be, 0x40 + .incbin "graphics/pokedex/caught_ball.4bpp" sText_TenDashes:: @ 855D2FE .string "----------$" -.align 2 - + .align 2 gUnknown_0855D30C:: @ 855D30C .string "$" @@ -42,29 +41,41 @@ gUnknown_0855D30C:: @ 855D30C @ 856B5B0 .include "data/pokedex_entries.inc" + .align 2 gUnknown_0856E610:: @ 856E610 - .incbin "baserom.gba", 0x56e610, 0x20 + .incbin "graphics/pokedex/black.gbapal" + .align 2 gUnknown_0856E630:: @ 856E630 - .incbin "baserom.gba", 0x56e630, 0x10 + .4byte 0x000030c8, 0x000000d1, 0x000010ea, 0x000020f3 + .align 2 gUnknown_0856E640:: @ 856E640 - .incbin "baserom.gba", 0x56e640, 0x28 + window_template 0x02, 0x00, 0x00, 0x20, 0x14, 0x00, 0x0001 + window_template 0x02, 0x19, 0x08, 0x02, 0x02, 0x0f, 0x0281 + window_template 0x00, 0x00, 0x0c, 0x20, 0x07, 0x08, 0x0285 + window_template 0x02, 0x12, 0x03, 0x0a, 0x08, 0x09, 0x0365 + window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 + .align 2 gUnknown_0856E668:: @ 856E668 - .incbin "baserom.gba", 0x56e668, 0x8 + .4byte 0x000020ea, 0x000030f7 + .align 2 gUnknown_0856E670:: @ 856E670 - .incbin "baserom.gba", 0x56e670, 0x18 + window_template 0x02, 0x00, 0x00, 0x20, 0x14, 0x00, 0x0001 + window_template 0x02, 0x19, 0x08, 0x02, 0x02, 0x0f, 0x0281 + window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 -gUnknown_0856E688:: @ 856E688 - .incbin "baserom.gba", 0x56e688, 0xc +sText_TenDashes2:: @ 856E688 + .string "----------$" @ 856E694 .include "data/graphics/pokemon/footprint_table.inc" gUnknown_0856ED08:: @ 856ED08 - .incbin "baserom.gba", 0x56ed08, 0x28 + .byte 0x00, 0x00, 0x00, 0x00, 0xbb, 0x03, 0xd5, 0x03, 0xbe, 0x03, 0xd8, 0x03, 0xc1, 0x03, 0xdb, 0x03, 0xc4, 0x03, 0xde, 0x03, 0xc7, 0x03, 0xe1, 0x03, 0xca, 0x03, 0xe4, 0x03, 0xcd, 0x03, 0xe7, 0x03 + .byte 0xd0, 0x03, 0xea, 0x03, 0xd3, 0x02, 0xed, 0x02 gUnknown_0856ED30:: @ 856ED30 unk_dex_struct_3 gUnknown_085E87A5, 0, 0, 5 @@ -80,18 +91,23 @@ gUnknown_0856ED48:: @ 856ED48 unk_dex_struct_2 gUnknown_085E8806, 0, 10, 5, 5, 10, 12 unk_dex_struct_2 gUnknown_085E88C8, 0, 12, 5, 0, 0, 0 + .align 1 gUnknown_0856ED9C:: @ 856ED9C - .incbin "baserom.gba", 0x56ed9c, 0x1c + .2byte 0xffff, 0x01ff, 0xffff, 0x0200, 0x03ff, 0x0401, 0xff02, 0x0401, 0xffff, 0x0502, 0xffff, 0x0604, 0xffff, 0xff05 + .align 1 gUnknown_0856EDB8:: @ 856EDB8 - .incbin "baserom.gba", 0x56edb8, 0x1c + .2byte 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x05ff, 0xffff, 0x0604, 0xffff, 0xff05 + .align 1 gUnknown_0856EDD4:: @ 856EDD4 - .incbin "baserom.gba", 0x56edd4, 0x1c + .2byte 0xffff, 0x01ff, 0xffff, 0x0200, 0x03ff, 0x0401, 0xff02, 0x0401, 0xffff, 0x0602, 0xffff, 0xffff, 0xffff, 0xff04 + .align 1 gUnknown_0856EDF0:: @ 856EDF0 - .incbin "baserom.gba", 0x56edf0, 0x1c + .2byte 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x06ff, 0xffff, 0xffff, 0xffff, 0xff04 + .align 2 gUnknown_0856EE0C:: @ 856EE0C .4byte gUnknown_085E89A4 .4byte gUnknown_085E88DF @@ -100,6 +116,7 @@ gUnknown_0856EE0C:: @ 856EE0C .4byte NULL .4byte NULL + .align 2 gUnknown_0856EE24:: @ 856EE24 .4byte gUnknown_085E89D4 .4byte gUnknown_085E88F6 @@ -208,14 +225,15 @@ gUnknown_0856EF14:: @ 856EF14 .4byte 0 gUnknown_0856EFAC:: @ 856EFAC - .incbin "baserom.gba", 0x56efac, 0x2 + .byte 0x00, 0x01 gUnknown_0856EFAE:: @ 856EFAE - .incbin "baserom.gba", 0x56efae, 0x6 + .byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x05 gUnknown_0856EFB4:: @ 856EFB4 - .incbin "baserom.gba", 0x56efb4, 0x14 + .byte 0xff, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x00, 0x00 + .align 2 gUnknown_0856EFC8:: @ 856EFC8 unk_dex_struct gUnknown_0856EE5C, 6, 7, 10 unk_dex_struct gUnknown_0856EEB4, 8, 9, 11 @@ -224,8 +242,12 @@ gUnknown_0856EFC8:: @ 856EFC8 unk_dex_struct gUnknown_0856EE24, 4, 5, 6 unk_dex_struct gUnknown_0856EE0C, 2, 3, 2 + .align 2 gUnknown_0856EFF8:: @ 856EFF8 - .incbin "baserom.gba", 0x56eff8, 0x10 + .4byte 0x000000c8, 0x000010d1, 0x000020ea, 0x000030f3 + .align 2 gUnknown_0856F008:: @ 856F008 - .incbin "baserom.gba", 0x56f008, 0x10 + window_template 0x02, 0x00, 0x00, 0x20, 0x14, 0x00, 0x0001 + null_window_template + diff --git a/graphics/pokedex/black.pal b/graphics/pokedex/black.pal new file mode 100644 index 0000000000..4b0812f094 --- /dev/null +++ b/graphics/pokedex/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/pokedex/caught_ball.png b/graphics/pokedex/caught_ball.png new file mode 100644 index 0000000000000000000000000000000000000000..b4e518f22c87e00a437b9d1a81df29fc8e5ab5a6 GIT binary patch literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^96&6ZRaQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`4FY^ZTq_zFe*E}x;w Date: Sat, 20 Jan 2018 17:45:45 -0600 Subject: [PATCH 55/64] Extract data from map_obj_8097404 --- data/field_ground_effect.s | 36 ------------ data/map_obj_8097404.s | 115 ++++++++++++++++++++++++++++++++----- 2 files changed, 100 insertions(+), 51 deletions(-) diff --git a/data/field_ground_effect.s b/data/field_ground_effect.s index be5639406d..113814721e 100644 --- a/data/field_ground_effect.s +++ b/data/field_ground_effect.s @@ -65,40 +65,4 @@ gUnknown_0850E674:: @ 850E674 .4byte GroundEffect_ShortGrass .4byte GroundEffect_HotSprings .4byte GroundEffect_Seaweed - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte triple_little_steps - .4byte triple_little_steps - .4byte double_little_steps - .4byte triple_little_steps - .4byte triple_little_steps - .4byte quad_little_steps - .4byte quad_little_steps - .4byte quad_little_steps - .4byte quad_little_steps - .4byte oct_little_steps - .4byte oct_little_steps diff --git a/data/map_obj_8097404.s b/data/map_obj_8097404.s index 161796765e..719a782662 100644 --- a/data/map_obj_8097404.s +++ b/data/map_obj_8097404.s @@ -2,44 +2,129 @@ .include "constants/constants.inc" .section .rodata - .align 2, 0 + .align 2 +gUnknown_0850E6C4:: @ 850E6C4 + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .align 2 +gUnknown_0850E704:: @ 850E704 + .4byte double_little_steps + .4byte double_little_steps + .4byte double_little_steps + .4byte double_little_steps + .4byte double_little_steps + .4byte double_little_steps + .4byte double_little_steps + .4byte double_little_steps + + .align 2 +gUnknown_0850E724:: @ 850E724 + .4byte double_little_steps + .4byte triple_little_steps + .4byte triple_little_steps + .4byte double_little_steps + .4byte triple_little_steps + .4byte triple_little_steps + + .align 2 +gUnknown_0850E73C:: @ 850E73C + .4byte quad_little_steps + .4byte quad_little_steps + .4byte quad_little_steps + .4byte quad_little_steps + + .align 2 +gUnknown_0850E74C:: @ 850E74C + .4byte oct_little_steps + .4byte oct_little_steps + + .align 2 gUnknown_0850E754:: @ 850E754 - .incbin "baserom.gba", 0x50e754, 0x14 + .4byte gUnknown_0850E6C4 + .4byte gUnknown_0850E704 + .4byte gUnknown_0850E724 + .4byte gUnknown_0850E73C + .4byte gUnknown_0850E74C + .align 1 gUnknown_0850E768:: @ 850E768 - .incbin "baserom.gba", 0x50e768, 0xa + .2byte 0x0010, 0x0008, 0x0006, 0x0004, 0x0002 gUnknown_0850E772:: @ 850E772 - .incbin "baserom.gba", 0x50e772, 0x48 + .byte 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01 + .byte 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00 + .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 gUnknown_0850E7BA:: @ 850E7BA - .incbin "baserom.gba", 0x50e7ba, 0x7a + .byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00 + .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe +gUnknown_0850E802:: @ 850E802 + .byte 0xfc, 0xfa, 0xf8, 0xf6, 0xf5, 0xf4, 0xf4, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xfa, 0xfc, 0x00, 0x00 + +gUnknown_0850E812:: @ 850E812 + .byte 0x00, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xfa, 0xfa, 0xfb, 0xfb, 0xfc, 0xfd, 0xfe, 0x00, 0x00, 0x00 + +gUnknown_0850E822:: @ 850E822 + .byte 0xfe, 0xfc, 0xfa, 0xf8, 0xf7, 0xf6, 0xf6, 0xf6, 0xf7, 0xf8, 0xfa, 0xfb, 0xfd, 0xfe, 0x00, 0x00 + + .align 2 gUnknown_0850E834:: @ 850E834 - .incbin "baserom.gba", 0x50e834, 0xc + .4byte gUnknown_0850E802 + .4byte gUnknown_0850E812 + .4byte gUnknown_0850E822 + .align 1 gUnknown_0850E840:: @ 850E840 - .incbin "baserom.gba", 0x50e840, 0x6 + .byte 0x10, 0x00, 0x10, 0x00, 0x20, 0x00 + .align 1 gUnknown_0850E846:: @ 850E846 - .incbin "baserom.gba", 0x50e846, 0x4 + .byte 0x00, 0x00, 0x01, 0x00 + .align 1 gUnknown_0850E84A:: @ 850E84A - .incbin "baserom.gba", 0x50e84a, 0x6 + .byte 0x20, 0x00, 0x20, 0x00, 0x40, 0x00 + .align 1 gUnknown_0850E850:: @ 850E850 - .incbin "baserom.gba", 0x50e850, 0x4 + .byte 0x01, 0x01, 0x02, 0x00 -// referenced in src/field_map_obj.o +// referenced in data/field_map_obj.s + .align 2 gUnknown_0850E854:: - .incbin "baserom.gba", 0x50e854, 0x8 + .4byte sub_8097E50 + .4byte sub_80964B8 + .align 2 gUnknown_0850E85C:: - .incbin "baserom.gba", 0x50e85C, 0x8 + .4byte sub_8097EF0 + .4byte sub_80964B8 + .align 2 gUnknown_0850E864:: - .incbin "baserom.gba", 0x50e864, 0xc + .4byte sub_80980C0 + .4byte sub_80980D0 + .4byte sub_8098124 + .align 2 gUnknown_0850E870:: - .incbin "baserom.gba", 0x50e870, 0xc + .4byte sub_80980F4 + .4byte sub_8098108 + .4byte sub_8098124 From 8d7a8301514700d11c83ecdb69c5f52088672365 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sat, 20 Jan 2018 18:30:33 -0600 Subject: [PATCH 56/64] Extract data from field_effect_misc --- data/field_effect_misc.s | 211 ++++++++++++++++++++++++++-- graphics/unknown/858E588/0.png | Bin 0 -> 145 bytes graphics/unknown/858E588/1.png | Bin 0 -> 149 bytes graphics/unknown/858E588/2.png | Bin 0 -> 138 bytes graphics/unknown/858E588/3.png | Bin 0 -> 133 bytes graphics/unknown/858E588/4.png | Bin 0 -> 114 bytes graphics/unknown/858E5B0/0.png | Bin 0 -> 89 bytes graphics/unknown/858E5B0/1.png | Bin 0 -> 109 bytes graphics/unknown/858E5B0/2.png | Bin 0 -> 119 bytes graphics/unknown/858E5B0/3.png | Bin 0 -> 123 bytes graphics/unknown/858E5B0/4.png | Bin 0 -> 129 bytes graphics/unknown/858E5B0/5.png | Bin 0 -> 126 bytes graphics/unknown/858E5D8/0.png | Bin 0 -> 87 bytes graphics/unknown/858E5D8/1.png | Bin 0 -> 116 bytes graphics/unknown/858E5D8/2.png | Bin 0 -> 131 bytes graphics/unknown/858E5D8/3.png | Bin 0 -> 115 bytes graphics/unknown/858E5D8/4.png | Bin 0 -> 92 bytes graphics/unknown/858E674/0.png | Bin 0 -> 272 bytes graphics/unknown/858E674/1.png | Bin 0 -> 255 bytes graphics/unknown/858E674/2.png | Bin 0 -> 256 bytes graphics/unknown/858E84C/0.png | Bin 0 -> 103 bytes graphics/unknown/858E84C/1.png | Bin 0 -> 107 bytes graphics/unknown/858E84C/2.png | Bin 0 -> 107 bytes graphics/unknown/unknown_58E82C.pal | 19 +++ 24 files changed, 219 insertions(+), 11 deletions(-) create mode 100644 graphics/unknown/858E588/0.png create mode 100644 graphics/unknown/858E588/1.png create mode 100644 graphics/unknown/858E588/2.png create mode 100644 graphics/unknown/858E588/3.png create mode 100644 graphics/unknown/858E588/4.png create mode 100644 graphics/unknown/858E5B0/0.png create mode 100644 graphics/unknown/858E5B0/1.png create mode 100644 graphics/unknown/858E5B0/2.png create mode 100644 graphics/unknown/858E5B0/3.png create mode 100644 graphics/unknown/858E5B0/4.png create mode 100644 graphics/unknown/858E5B0/5.png create mode 100644 graphics/unknown/858E5D8/0.png create mode 100644 graphics/unknown/858E5D8/1.png create mode 100644 graphics/unknown/858E5D8/2.png create mode 100644 graphics/unknown/858E5D8/3.png create mode 100644 graphics/unknown/858E5D8/4.png create mode 100644 graphics/unknown/858E674/0.png create mode 100644 graphics/unknown/858E674/1.png create mode 100644 graphics/unknown/858E674/2.png create mode 100644 graphics/unknown/858E84C/0.png create mode 100644 graphics/unknown/858E84C/1.png create mode 100644 graphics/unknown/858E84C/2.png create mode 100644 graphics/unknown/unknown_58E82C.pal diff --git a/data/field_effect_misc.s b/data/field_effect_misc.s index 88f9f1c946..ef73c32635 100644 --- a/data/field_effect_misc.s +++ b/data/field_effect_misc.s @@ -4,28 +4,169 @@ .section .rodata .align 2 - .incbin "baserom.gba", 0x58d978, 0x2a0 +gSpriteImage_858D978:: @ 858D978 + .incbin "graphics/unknown/858E588/0.4bpp" + + .align 2 +gSpriteImage_858D9F8:: @ 858D9F8 + .incbin "graphics/unknown/858E588/1.4bpp" + + .align 2 +gSpriteImage_858DA78:: @ 858DA78 + .incbin "graphics/unknown/858E588/2.4bpp" + + .align 2 +gSpriteImage_858DAF8:: @ 858DAF8 + .incbin "graphics/unknown/858E588/3.4bpp" + + .align 2 +gSpriteImage_858DB78:: @ 858DB78 + .incbin "graphics/unknown/858E588/4.4bpp" + + .space 32 .align 2 gFieldEffectObjectPalette7:: @ 858DC18 .incbin "graphics/map_objects/palettes/field_effect_object_palette_07.gbapal" - .incbin "baserom.gba", 0x58dc38, 0x580 + .align 2 +gSpriteImage_858DC38:: @ 858DC38 + .incbin "graphics/unknown/858E5D8/0.4bpp" + + .align 2 +gSpriteImage_858DCB8:: @ 858DCB8 + .incbin "graphics/unknown/858E5D8/1.4bpp" + + .align 2 +gSpriteImage_858DD38:: @ 858DD38 + .incbin "graphics/unknown/858E5D8/2.4bpp" + + .align 2 +gSpriteImage_858DDB8:: @ 858DDB8 + .incbin "graphics/unknown/858E5D8/3.4bpp" + + .align 2 +gSpriteImage_858DE38:: @ 858DE38 + .incbin "graphics/unknown/858E5D8/4.4bpp" + + .align 2 +gSpriteImage_858DEB8:: @ 858DEB8 + .incbin "graphics/unknown/858E5B0/0.4bpp" + + .align 2 +gSpriteImage_858DF38:: @ 858DF38 + .incbin "graphics/unknown/858E5B0/1.4bpp" + + .align 2 +gSpriteImage_858DFB8:: @ 858DFB8 + .incbin "graphics/unknown/858E5B0/2.4bpp" + + .align 2 +gSpriteImage_858E038:: @ 858E038 + .incbin "graphics/unknown/858E5B0/3.4bpp" + + .align 2 +gSpriteImage_858E0B8:: @ 858E0B8 + .incbin "graphics/unknown/858E5B0/4.4bpp" + + .align 2 +gSpriteImage_858E138:: @ 858E138 + .incbin "graphics/unknown/858E5B0/5.4bpp" .align 2 gFieldEffectObjectPalette8:: @ 858E1B8 .incbin "graphics/map_objects/palettes/field_effect_object_palette_08.gbapal" - .incbin "baserom.gba", 0x58e1d8, 0x428 + .align 2 +gSpriteImage_858E1D8:: @ 858E1D8 + .incbin "graphics/unknown/858E674/0.4bpp" + .align 2 +gSpriteImage_858E2D8:: @ 858E2D8 + .incbin "graphics/unknown/858E674/1.4bpp" + + .align 2 +gSpriteImage_858E3D8:: @ 858E3D8 + .incbin "graphics/unknown/858E674/2.4bpp" + + .align 2 +gOamData_858E4D8:: @ 858E4D8 + .2byte 0x0000, 0x4000, 0x0800, 0x0000 + + .align 2 +gSpriteAnim_858E4E0:: @ 858E4E0 + .2byte 0x0000, 0x0008, 0x0001, 0x0008, 0x0002, 0x0008, 0x0003, 0x0008, 0x0004, 0x0008, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_858E4F8:: @ 858E4F8 + .2byte 0x0000, 0x0008, 0x0001, 0x0008, 0x0002, 0x0008, 0x0003, 0x0008, 0x0004, 0x0008, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_858E510:: @ 858E510 + .2byte 0x0004, 0x0008, 0x0003, 0x0008, 0x0002, 0x0008, 0x0001, 0x0008, 0x0000, 0x0008, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_858E528:: @ 858E528 + .2byte 0x0000, 0x0048, 0x0001, 0x0048, 0x0002, 0x0048, 0x0003, 0x0048, 0x0004, 0x0048, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_858E540:: @ 858E540 + .2byte 0x0004, 0x0048, 0x0003, 0x0048, 0x0002, 0x0048, 0x0001, 0x0048, 0x0000, 0x0048, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_858E558:: @ 858E558 + .2byte 0x0000, 0x0008, 0x0001, 0x0008, 0x0002, 0x0008, 0x0003, 0x0008, 0x0004, 0x0008, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_858E570:: @ 858E570 + .4byte gSpriteAnim_858E4E0 + + .align 2 +gSpriteAnimTable_858E574:: @ 858E574 + .4byte gSpriteAnim_858E4F8 + .4byte gSpriteAnim_858E510 + .4byte gSpriteAnim_858E528 + .4byte gSpriteAnim_858E540 + + .align 2 +gSpriteAnimTable_858E584:: @ 858E584 + .4byte gSpriteAnim_858E558 + + .align 2 +gUnknown_858E588:: @ 858E588 + obj_frame_tiles gSpriteImage_858D978, 0x0080 + obj_frame_tiles gSpriteImage_858D9F8, 0x0080 + obj_frame_tiles gSpriteImage_858DA78, 0x0080 + obj_frame_tiles gSpriteImage_858DAF8, 0x0080 + obj_frame_tiles gSpriteImage_858DB78, 0x0080 + + .align 2 +gUnknown_858E5B0:: @ 858E5B0 + obj_frame_tiles gSpriteImage_858DEB8, 0x0080 + obj_frame_tiles gSpriteImage_858DF38, 0x0080 + obj_frame_tiles gSpriteImage_858DFB8, 0x0080 + obj_frame_tiles gSpriteImage_858E038, 0x0080 + obj_frame_tiles gSpriteImage_858E0B8, 0x0080 + + .align 2 +gUnknown_858E5D8:: @ 858E5D8 + obj_frame_tiles gSpriteImage_858DC38, 0x0080 + obj_frame_tiles gSpriteImage_858DCB8, 0x0080 + obj_frame_tiles gSpriteImage_858DD38, 0x0080 + obj_frame_tiles gSpriteImage_858DDB8, 0x0080 + obj_frame_tiles gSpriteImage_858DE38, 0x0080 + + .align 2 gUnknown_0858E600:: @ 858E600 - .incbin "baserom.gba", 0x58e600, 0x18 + spr_template 0xffff, 0x1003, gOamData_858E4D8, gSpriteAnimTable_858E570, gUnknown_858E588, gDummySpriteAffineAnimTable, sub_80FA18C + .align 2 gUnknown_0858E618:: @ 858E618 - .incbin "baserom.gba", 0x58e618, 0x18 + spr_template 0xffff, 0x1008, gOamData_858E4D8, gSpriteAnimTable_858E574, gUnknown_858E5B0, gDummySpriteAffineAnimTable, sub_80FA2D8 + .align 2 gUnknown_0858E630:: @ 858E630 - .incbin "baserom.gba", 0x58e630, 0x18 + spr_template 0xffff, 0x1008, gOamData_858E4D8, gSpriteAnimTable_858E584, gUnknown_858E5D8, gDummySpriteAffineAnimTable, sub_80FA3FC .align 2 gFieldEffectObjectPaletteInfo7:: @ 858E648 @@ -35,10 +176,27 @@ gFieldEffectObjectPaletteInfo7:: @ 858E648 gFieldEffectObjectPaletteInfo8:: @ 858E650 obj_pal gFieldEffectObjectPalette8, 0x1008 - .incbin "baserom.gba", 0x58e658, 0x34 + .align 2 +gOamData_858E658:: @ 858E658 + .2byte 0x8000, 0x8000, 0x0800, 0x0000 + .align 2 +gSpriteAnim_858E660:: @ 858E660 + .2byte 0x0000, 0x0006, 0x0001, 0x0006, 0x0002, 0x0006, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_858E670:: @ 858E670 + .4byte gSpriteAnim_858E660 + + .align 2 +gUnknown_0858E674:: @ 858E674 + obj_frame_tiles gSpriteImage_858E1D8, 0x0100 + obj_frame_tiles gSpriteImage_858E2D8, 0x0100 + obj_frame_tiles gSpriteImage_858E3D8, 0x0100 + + .align 2 gUnknown_0858E68C:: @ 858E68C - .incbin "baserom.gba", 0x58e68c, 0x18 + spr_template 0xffff, 0x100e, gOamData_858E658, gSpriteAnimTable_858E670, gUnknown_0858E674, gDummySpriteAffineAnimTable, door_restore_tilemap .align 2 @ This uses one of the secret base palettes, so there is no @@ -46,10 +204,41 @@ gUnknown_0858E68C:: @ 858E68C gFieldEffectObjectPaletteInfo9:: @ 858E6A4 obj_pal gTilesetPalettes_SecretBase + 5 * 0x20, 0x100E - .incbin "baserom.gba", 0x58e6ac, 0x1b8 + .align 2 +gSpriteImage_858E6AC:: @ 858E6AC + .incbin "graphics/unknown/858E84C/0.4bpp" + .align 2 +gSpriteImage_858E72C:: @ 858E72C + .incbin "graphics/unknown/858E84C/1.4bpp" + + .align 2 +gSpriteImage_858E7AC:: @ 858E7AC + .incbin "graphics/unknown/858E84C/2.4bpp" + + .align 2 +gUnknown_0858E82C:: @ 858E82C + .incbin "graphics/unknown/unknown_58E82C.gbapal" + + .align 2 +gUnknown_0858E84C:: @ 858E84C + obj_frame_tiles gSpriteImage_858E6AC, 0x0080 + obj_frame_tiles gSpriteImage_858E72C, 0x0080 + obj_frame_tiles gSpriteImage_858E7AC, 0x0080 + + .align 2 gUnknown_0858E864:: @ 858E864 - .incbin "baserom.gba", 0x58e864, 0x1c + obj_pal gUnknown_0858E82C, 0x1000 + .align 2 +gSpriteAnim_858E86C:: @ 858E86C + .2byte 0x0000, 0x001e, 0x0001, 0x001e, 0x0002, 0x001e, 0xfffe, 0x0000 + + .align 2 +gSpriteAnimTable_858E87C:: @ 858E87C + .4byte gSpriteAnim_858E86C + + .align 2 gUnknown_0858E880:: @ 858E880 - .incbin "baserom.gba", 0x58e880, 0x18 + spr_template 0xffff, 0x1000, gFieldObjectBaseOam_32x8, gSpriteAnimTable_858E87C, gUnknown_0858E84C, gDummySpriteAffineAnimTable, SpriteCallbackDummy + diff --git a/graphics/unknown/858E588/0.png b/graphics/unknown/858E588/0.png new file mode 100644 index 0000000000000000000000000000000000000000..70b0774b0d546f6ca73eb346aa66f0a2315f8c24 GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fEx5uPrNAsjPX&u-*BV8FrRVAlCb z?!Y9^_e{Uu>}T8YKf!gSbLpe63Mb23PM_HN(C(#q>dwqKzmrZTYdLaRxQq*g_L?0D s+^Tt1F+<=oZ!6E6-8WT#eQ(-d!N9pE=5V`D#6^%@p00i_>zopr0DJg08vpW6usqBG_N?~Pd@tEzHP xA}O(*tNf$Ej>5%86DPZv;6;cBD>&=$T=H6+yPn2;OXk;vd$@?2>`ffIQ;+s literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E588/2.png b/graphics/unknown/858E588/2.png new file mode 100644 index 0000000000000000000000000000000000000000..c006bb660962272d5b22f42aaf35aa9157e5ed8d GIT binary patch literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExfu1goAsjPnPZ{zx81OJ3_`@>M zZh=tZ`3rA;{x_fWW|@Pzip|^{;jkC-eV4AL)K8qh*=_~n6<*_3%N02u^Vm*xW*DjG lxo=SM{1A7iRcO!7<#9Z-lQyN~%l-yg;_2$=vd$@?2>^v&F$e$v literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E588/3.png b/graphics/unknown/858E588/3.png new file mode 100644 index 0000000000000000000000000000000000000000..67a3cf76900d5b9e3969ee2e94e7bc197a356a74 GIT binary patch literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExKAtX)AsjQ4fAF*NEHQdxxYX`{ zd0VH%-}DcA`KRux{{CL{|NifdJ=WFlE$;8Fp8xR7JLBcK@8<12{NeYRyLXqLe`k62 i!_8kk-`?Fl^^GBPX5oRhO&8XK%=dKlb6Mw<&;$UcMLY@s literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E588/4.png b/graphics/unknown/858E588/4.png new file mode 100644 index 0000000000000000000000000000000000000000..e2a5aec4fbc57c3fa1c826d5ba60d8d4b1af9856 GIT binary patch literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExmYyz-AsjQ;c3k9SP~v4-nZ!(IX@j%n97R5#--8VE MboFyt=akR{01b^LMF0Q* literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E5B0/0.png b/graphics/unknown/858E5B0/0.png new file mode 100644 index 0000000000000000000000000000000000000000..afd104d7ca67c876327122032566e81dfd84e429 GIT binary patch literal 89 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fEx3Z5>GAsjQ4fAF*H{{H{}d4?tR l?|1X2zG*dj5R~A+&c^VqtajP_^v4b$J)W+9F6*2Ung9T}8?68U literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E5B0/1.png b/graphics/unknown/858E5B0/1.png new file mode 100644 index 0000000000000000000000000000000000000000..026b9b7afe1b01bd05528f1e44a04cf054c50148 GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExCY~;iAsjQ4fBgUd|NVW3CdQ8P z_iYAs^KbGezOno(f9l46dEY1Btyj#tU;h2@7U!i34K{2H758hnO5PV}gUs=C^>bP0 Hl+XkKa49HV literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E5B0/2.png b/graphics/unknown/858E5B0/2.png new file mode 100644 index 0000000000000000000000000000000000000000..360e2ab63e655b5c4e37d564eca2f5b58dc37dd3 GIT binary patch literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExcAhSdAsjQ4fBgUd|NVW3CdQ8P z_w5FC^Z)gqvtXY3Yd`xjhSQA_|G&R;PyVxyJM~R9Z|LUlW R`TQD?iJq>0F6*2UngCA@E}8%U literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E5B0/3.png b/graphics/unknown/858E5B0/3.png new file mode 100644 index 0000000000000000000000000000000000000000..88672c182463cab3c4f460b6a28e713ee5e5f9ce GIT binary patch literal 123 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExPM$7~AsjPpPoLyvP~>5D_?54@ zCWs+`@s?PI0)O$%CyBi|s*D{G6U}@w{6x%t9@JkXbgfWe?t$k`oX+v~jK1IH)ZC_3 UNq&;ZNdTGZ>FVdQ&MBb@0E0{Kb)%E-UJ*m;Ea6{vytzVwS0)s<68T@ Yj1vFKtVI7${sS`D)78&qol`;+0QOKSs{jB1 literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E5D8/0.png b/graphics/unknown/858E5D8/0.png new file mode 100644 index 0000000000000000000000000000000000000000..110b1dd0a50dd8335d7b088e22c7641a824a2945 GIT binary patch literal 87 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExa-J@ZAsjQ4fAF*Nv`Fk<(3Af& j!0lF*hH|&WTNfh+?H#qLmmRGHK{`BL{an^LB{Ts5Q!*D0 literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E5D8/1.png b/graphics/unknown/858E5D8/1.png new file mode 100644 index 0000000000000000000000000000000000000000..f50079de7f4ea6efe4bf84cac1e8ce51e9cfd692 GIT binary patch literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fEx)}AhoAsjQ4fAF*N{E(=>?<`sW z?%reLu37T+ z|NXZ7X*H+qnWtI()_VK@|8|FC^Q%w)`@fs{>euHs9gLTl!+0(+r!{<;Q_FAq^SteZ eS=KMI6c`vf{i<#qH}^^bneOT8=d#Wzp$Py2XE5^s literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E5D8/3.png b/graphics/unknown/858E5D8/3.png new file mode 100644 index 0000000000000000000000000000000000000000..0ea6e43c96ecf571dcd7d06edad1637404b02236 GIT binary patch literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExR-P`7AsjQ4fAF*N+>reL&RH`5 zyt8Ebf}q!lS^FA88kb&bSS8`GC-rB#Ls0(t|EJhjTQY~W9_A8ZV>tPw+U@^;``;kb NJYD@<);T3K0RU#NCp-WE literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E5D8/4.png b/graphics/unknown/858E5D8/4.png new file mode 100644 index 0000000000000000000000000000000000000000..4b4e300bb70c593b700504e5e6c1aa568f6c7092 GIT binary patch literal 92 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fEx%APKcAsjQ4fAF*Nm?Zw$&78W& owqL3Ao9&d3&*dTnUAR_oFdUYs^VeEhXAjcm>FVdQ&MBb@0MtAf@Bjb+ literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E674/0.png b/graphics/unknown/858E674/0.png new file mode 100644 index 0000000000000000000000000000000000000000..64b61050f629c42546831427d3352481a6207ae5 GIT binary patch literal 272 zcmV+r0q_2aP)8IuY0000mP)t-sQnXUl z#f!A0Vw8hHdtxB})mm!3|Nnceq~3FbtWt};i(-^wQc_ZLb924D#qRF^H4WU=0001+ zNkl|ep=n*BO4eR@b!psj+cih>k$?89|kH!Br1G-EAngh^Sjgxx+@oWcgBOLN9Y5E W<2r|;K@1`Q00008IuY0000mP)t-sQnXUl z#f!A0Vw8hHdtxB})mm!3|Nnceq~3FbtWt};i(-^wQc_ZLb924D#qRF^H4WU=0001r zNklT`O9p8#iKHB2Lj9a69(AP}U%bszH{9dsrcdA~@Bw}uB;JS1mf-*Z002ovPDHLk FV1n<}Z&UyP literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E674/2.png b/graphics/unknown/858E674/2.png new file mode 100644 index 0000000000000000000000000000000000000000..d5dd69078b6059e6fc4d728a16acd9dbc9c22b9d GIT binary patch literal 256 zcmV+b0ssDqP)8IuY0000mP)t-sQnXUl z#f!A0Vw8hHdtxB})mm!3|Nnceq~3FbtWt};i(-^wQc_ZLb924D#qRF^H4WU=0001s zNklZYgTMd(|31I}fA?J;CnkpO=(@nk8a){x6Fgo0T-G@yGywoa CVI}JT literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E84C/1.png b/graphics/unknown/858E84C/1.png new file mode 100644 index 0000000000000000000000000000000000000000..c55f2146d54f5e0f5b8a1c6aa12b914a0fd92f77 GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^3P8-k0wfqJ4V+hC0B8&@i*FfbHJ)V^C@CtwaT#naW#Wt~$( F699bhE2;nh literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E84C/2.png b/graphics/unknown/858E84C/2.png new file mode 100644 index 0000000000000000000000000000000000000000..4f03b50ae96a69b3c5fe1401e33c4f7edd93aad3 GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^3P8-k0wfqJ4V+hC0 Date: Sat, 20 Jan 2018 19:18:03 -0600 Subject: [PATCH 57/64] Extract data from fossil_special_fldeff_groundshake --- asm/fossil_specials.s | 2 +- data/fossil_special_fldeff_groundshake.s | 86 ++++++++++++++++++++--- graphics/misc/fossil.png | Bin 0 -> 298 bytes graphics/misc/mirage_tower.bin | 2 + graphics/misc/mirage_tower.png | Bin 0 -> 847 bytes graphics/misc/mirage_tower_crumbles.png | Bin 0 -> 201 bytes 6 files changed, 78 insertions(+), 12 deletions(-) create mode 100644 graphics/misc/fossil.png create mode 100644 graphics/misc/mirage_tower.bin create mode 100644 graphics/misc/mirage_tower.png create mode 100644 graphics/misc/mirage_tower_crumbles.png diff --git a/asm/fossil_specials.s b/asm/fossil_specials.s index 6883743ec5..7956f814a4 100755 --- a/asm/fossil_specials.s +++ b/asm/fossil_specials.s @@ -657,7 +657,7 @@ _081BF0B4: ldr r0, [r0] ldr r1, [r0] movs r5, 0 - ldr r2, =gUnknown_08617C44 + ldr r2, =gRootFossil_Gfx _081BF0BE: adds r0, r5, r2 ldrb r0, [r0] diff --git a/data/fossil_special_fldeff_groundshake.s b/data/fossil_special_fldeff_groundshake.s index 8f968d4094..8fa546ce83 100644 --- a/data/fossil_special_fldeff_groundshake.s +++ b/data/fossil_special_fldeff_groundshake.s @@ -3,32 +3,96 @@ .section .rodata + .align 2 gUnknown_08617274:: @ 8617274 - .incbin "baserom.gba", 0x617274, 0x920 + .space 0x20 + .incbin "graphics/misc/mirage_tower.4bpp" + .align 2 gUnknown_08617B94:: @ 8617B94 - .incbin "baserom.gba", 0x617b94, 0xb0 + .incbin "graphics/misc/mirage_tower.bin" -gUnknown_08617C44:: @ 8617C44 - .incbin "baserom.gba", 0x617c44, 0x120 + .align 2 +gRootFossil_Pal:: @ 8617C24 + .incbin "graphics/misc/fossil.gbapal" + .align 2 +gRootFossil_Gfx:: @ 8617C44 + .incbin "graphics/misc/fossil.4bpp" + + .align 2 +gMirageTowerCrumbles_Gfx:: @ 8617CC4 + .incbin "graphics/misc/mirage_tower_crumbles.4bpp" + + .align 2 +gMirageTowerCrumbles_Palette:: @ 8617D44 + .incbin "graphics/misc/mirage_tower_crumbles.gbapal" + + .align 1 gUnknown_08617D64:: @ 8617D64 - .incbin "baserom.gba", 0x617d64, 0x30 + .2byte 0x0000, 0x000a, 0x0041, 0x0011, 0x0003, 0x0032, 0xfff4, 0x0000, 0x004b, 0x000a, 0x000f, 0x005a, 0x0007, 0x0008, 0x0041, 0xffee + .2byte 0x0005, 0x004b, 0x0016, 0xfff6, 0x0037, 0xffe8, 0xfffc, 0x0041 + .align 2 gUnknown_08617D94:: @ 8617D94 - .incbin "baserom.gba", 0x617d94, 0x10 + obj_tiles gMirageTowerCrumbles_Gfx, 0x0080, 0x0fa0 + null_obj_tiles + .align 2 gUnknown_08617DA4:: @ 8617DA4 - .incbin "baserom.gba", 0x617da4, 0x5c + .byte 0x12, 0x35, 0x51, 0x02, 0x13, 0x35, 0x51, 0x02, 0x14, 0x35, 0x51, 0x02, 0x12, 0x36, 0x51, 0x02, 0x13, 0x36, 0x51, 0x02, 0x14, 0x36, 0x51, 0x02, 0x12, 0x37, 0x51, 0x02, 0x13, 0x37, 0x51, 0x02 + .byte 0x14, 0x37, 0x51, 0x02, 0x12, 0x38, 0x51, 0x02, 0x13, 0x38, 0x51, 0x02, 0x14, 0x38, 0x51, 0x02, 0x12, 0x39, 0x59, 0x02, 0x13, 0x39, 0x59, 0x02, 0x14, 0x39, 0x59, 0x02, 0x12, 0x3a, 0x21, 0x01 + .byte 0x13, 0x3a, 0x21, 0x01, 0x14, 0x3a, 0x21, 0x01 + .align 2 +gSpriteAnim_8617DEC:: @ 8617DEC + .2byte 0x0000, 0x0001, 0xffff, 0x0000 + + .align 2 +gOamData_8617DF4:: @ 8617DF4 + .2byte 0x0000, 0x4000, 0x3000, 0x0000 + + .align 2 +gSpriteAnimTable_8617DFC:: @ 8617DFC + .4byte gSpriteAnim_8617DEC + + .align 2 gUnknown_08617E00:: @ 8617E00 - .incbin "baserom.gba", 0x617e00, 0x18 + spr_template 0xffff, 0xffff, gOamData_8617DF4, gSpriteAnimTable_8617DFC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_08617E18:: @ 8617E18 - .incbin "baserom.gba", 0x617e18, 0x1c + .byte 0x3b, 0x43, 0x61, 0x00, 0x0f, 0x05, 0xff, 0x9b + .align 2 +gSpriteAnim_8617E20:: @ 8617E20 + .2byte 0x0000, 0x000c, 0xfffe, 0x0000 + + .align 2 +gSpriteAnimTable_8617E28:: @ 8617E28 + .4byte gSpriteAnim_8617E20 + + .align 2 +gUnknown_08617E2C:: @ 8617E2C + .2byte 0x0000, 0x0000, 0x0000, 0x0000 + + .align 2 gUnknown_08617E34:: @ 8617E34 - .incbin "baserom.gba", 0x617e34, 0x2c + spr_template 0x0fa0, 0xffff, gUnknown_08617E2C, gSpriteAnimTable_8617E28, NULL, gDummySpriteAffineAnimTable, sub_81BEAD8 + .align 2 +gSpriteAnim_8617E4C:: @ 8617E4C + .2byte 0x0000, 0x000c, 0xfffe, 0x0000 + + .align 2 +gSpriteAnim_8617E54:: @ 8617E54 + .4byte gSpriteAnim_8617E4C + + .align 2 +gOamData_8617E58:: @ 8617E58 + .2byte 0x0000, 0x4000, 0x0000, 0x0000 + + .align 2 gUnknown_08617E60:: @ 8617E60 - .incbin "baserom.gba", 0x617e60, 0x18 + spr_template 0x0fa0, 0xffff, gOamData_8617E58, gSpriteAnim_8617E54, NULL, gDummySpriteAffineAnimTable, sub_81BEAD8 + diff --git a/graphics/misc/fossil.png b/graphics/misc/fossil.png new file mode 100644 index 0000000000000000000000000000000000000000..f92649e9876ad6c5464836302778b5293b6c40c8 GIT binary patch literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF(2kqHWpB>svm0U%cCQ_9T#r9F%zRAPa4ExPVb)~~e&R`*O;_$aKeubj)X2Af6;N}{;_Rf0$6i}TU+jN$ oWL@ONO*;FTR)iY;JH@cC_Oc`MBb%7 literal 0 HcmV?d00001 diff --git a/graphics/misc/mirage_tower.bin b/graphics/misc/mirage_tower.bin new file mode 100644 index 0000000000..85f2883876 --- /dev/null +++ b/graphics/misc/mirage_tower.bin @@ -0,0 +1,2 @@ +```````` ` +` ` ` ``````````````````` `!`"`#`$`%`&`'`(`)`*`+`,`-`.`/`0`1`2`3`4`5`6`7`8`9`:`;`<`=`>`?`@`A`B`C`D`E`F`G`H` \ No newline at end of file diff --git a/graphics/misc/mirage_tower.png b/graphics/misc/mirage_tower.png new file mode 100644 index 0000000000000000000000000000000000000000..69ac6a51e0a489816dee46c4be43ea508f6edb89 GIT binary patch literal 847 zcmV-V1F-ywP)sQS?8hl)>uokXDDB!bWI27lm~8K3k%PX1ucBNz>?nSEdL>- zO<(UlY{x$fopc9e@XT?tbsXv&13uXuD8SH=+b&p0O<^$70>HL#0=&n7FE})?OS@q5 z7R+ThrF|$4H5}m#HZ_!nGNpv*1z<7{ZUjB;Mj2=zO?yzhHlq0N5iXwC$upV#IV z)PU}7VxbyP{VloiuuS{g4x<_tQ1oHwM?ji(=V(ThP!t_d?Iyk}QfL6u4>cUi)Zi>P zw7@G|CN6N};5+VBsIjFm6sQF2@sZ$Y7LbGzw3bpSkVyzbvvE)koBbVSG;e5DZq z-iiP!gqTLWZ$Nku9VkNvAsCX(LlVdkG~SIABr*;gz)3?$@M(7npam%_5lLB}T1aoY za8IjUjz3PelfML?Rpp+_ z1tnX#$!oCuyxV#N+W@sw3)El)$AH?2Dqcmd>eyhh```#E_A7$@nqalY8w4ee->)d0 z{hCr*(UBJ@qCQl@FEFxh@z!l2UN;M*{P%0B93683-FkGPR}VLVJNkMo5c~vuL>LkT z4kB)k%0WzU5<%oQm$$cy1y@j`R6reD@*EjmgC1oFQsOee z1HN)hw}l1IG3)`o@v08)t2Y6^)jy2*`Ps#nH^BB1jI+TqzXZF{A3)icU^Rl|&qo(5 zb_0R}%HIQB59J@5$-*-TS9O>c)AP^gXepO zHGe1V8LqKQo@$s(?k1DTCx!?5jhZ|7ap!_z&Odi^`lD1zX{|H5p8Nk~C{e{-qUoCM Z{Ra6)HqO_BxvBsF002ovPDHLkV1mOFa<~8h literal 0 HcmV?d00001 diff --git a/graphics/misc/mirage_tower_crumbles.png b/graphics/misc/mirage_tower_crumbles.png new file mode 100644 index 0000000000000000000000000000000000000000..27e5daed07b4921c461fe5e0edca543e06f791ca GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF;OkH}&M2EM}}%y>M1MG8<*$ Date: Sat, 20 Jan 2018 22:41:02 -0500 Subject: [PATCH 58/64] REMOVE BASEROM --- data/map_name_popup.s | 39 ++- data/mystery_event_msg.s | 273 +++++++++++++++++- data/new_menu_helpers.s | 40 ++- data/option_menu.s | 20 +- data/overworld.s | 41 ++- data/record_mixing.s | 27 +- data/script_menu.s | 29 +- data/scripts/cable_club.inc | 16 +- data/specials.inc | 1 + data/unk_transition.s | 9 +- data/use_pokeblock.s | 61 +++- .../frontier_transition.bin | Bin 0 -> 428 bytes .../frontier_transition.png | Bin 0 -> 448 bytes .../frontier_transition_circles.png | Bin 0 -> 733 bytes graphics/interface/855C604.pal | 19 ++ graphics/interface/855C624.bin | 1 + graphics/interface/85DFA60.bin | Bin 0 -> 32 bytes graphics/interface/85DFA80.png | Bin 0 -> 212 bytes graphics/interface/85DFB60.bin | Bin 0 -> 172 bytes graphics/interface/85DFC0C.bin | Bin 0 -> 164 bytes graphics/interface/860F074.pal | 19 ++ graphics/interface/860F0B0.pal | 19 ++ graphics_file_rules.mk | 5 +- 23 files changed, 553 insertions(+), 66 deletions(-) create mode 100644 graphics/battle_transitions/frontier_transition.bin create mode 100755 graphics/battle_transitions/frontier_transition.png create mode 100755 graphics/battle_transitions/frontier_transition_circles.png create mode 100755 graphics/interface/855C604.pal create mode 100644 graphics/interface/855C624.bin create mode 100644 graphics/interface/85DFA60.bin create mode 100755 graphics/interface/85DFA80.png create mode 100644 graphics/interface/85DFB60.bin create mode 100644 graphics/interface/85DFC0C.bin create mode 100755 graphics/interface/860F074.pal create mode 100755 graphics/interface/860F0B0.pal diff --git a/data/map_name_popup.s b/data/map_name_popup.s index c9859ed8f7..7dc1da8083 100644 --- a/data/map_name_popup.s +++ b/data/map_name_popup.s @@ -29,14 +29,41 @@ gMapPopUp_Palette_Table:: @ 857F384 .incbin "graphics/interface/map_popup/stone2.gbapal" gUnknown_0857F444:: @ 857F444 -<<<<<<< HEAD .incbin "graphics/interface/map_popup/857F444.gbapal" -======= - .incbin "baserom.gba", 0x57f444, 0x20 gUnknown_0857F464:: @ 857F464 - .incbin "baserom.gba", 0x57f464, 0xe0 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x01, 0x01, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x05, 0x02, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x05, 0x02, 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 0x02, 0x05, 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x01, 0x02, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x05, 0x02, 0x05, 0x05, 0x05, 0x02, 0x02, 0x02, 0x01 + +gUnknown_0857F4CC:: @ 857F4CC + .string "PYRAMID FLOOR 1$" + +gUnknown_0857F4DC:: @ 857F4DC + .string "PYRAMID FLOOR 2$" + +gUnknown_0857F4EC:: @ 857F4EC + .string "PYRAMID FLOOR 3$" + +gUnknown_0857F4FC:: @ 857F4FC + .string "PYRAMID FLOOR 4$" + +gUnknown_0857F50C:: @ 857F50C + .string "PYRAMID FLOOR 5$" + +gUnknown_0857F51C:: @ 857F51C + .string "PYRAMID FLOOR 6$" + +gUnknown_0857F52C:: @ 857F52C + .string "PYRAMID FLOOR 7$" + +gUnknown_0857F53C:: @ 857F53C + .string "PYRAMID$" gUnknown_0857F544:: @ 857F544 - .incbin "baserom.gba", 0x57f544, 0x20 ->>>>>>> aca539d5dd97b55d149ca59c0561a721544d3298 + .4byte gUnknown_0857F4CC + .4byte gUnknown_0857F4DC + .4byte gUnknown_0857F4EC + .4byte gUnknown_0857F4FC + .4byte gUnknown_0857F50C + .4byte gUnknown_0857F51C + .4byte gUnknown_0857F52C + .4byte gUnknown_0857F53C diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index 5d4d038efb..c89f96506c 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -8,8 +8,6 @@ .include "asm/macros/event.inc" .include "constants/constants.inc" - .include "data/specials.inc" - .section .rodata @@ -65,56 +63,313 @@ gText_MysteryGiftStampCard:: .string "Thank you for using the STAMP CARD\nSystem.\pYou have {STR_VAR_1} more to collect to\nfill your STAMP CARD.$" gUnknown_08674D3D:: @ 8674D3D - .incbin "baserom.gba", 0x00674d3d, 0xa1 + setvaddress gUnknown_08674D3D + checkflag 0x1E4 + vgoto_if 0, EventScript_674D4C + gotoram + +EventScript_674D4C:: @ 8674D4C + specialvar 0x40DD, CalculatePlayerPartyCount + compare_var_to_value 0x40DD, 6 + vgoto_if 1, EventScript_674D73 + setflag 0x1E4 + vcall EventScript_674D7E + lock + faceplayer + vmessage gText_MysteryGiftEgg + waitmessage + waitbuttonpress + playfanfare 370 + waitfanfare + release + end + +EventScript_674D73:: @ 8674D73 + lock + faceplayer + vmessage gText_MysteryGiftEgg_2 + waitmessage + waitbuttonpress + release + end + +EventScript_674D7E:: @ 8674D7E + giveegg SPECIES_PICHU + setmonobedient 0x40DD + setmonmetlocation 0x40DD, 255 + compare_var_to_value 0x40DD, 1 + vgoto_if 1, EventScript_674DC0 + compare_var_to_value 0x40DD, 2 + vgoto_if 1, EventScript_674DC6 + compare_var_to_value 0x40DD, 3 + vgoto_if 1, EventScript_674DCC + compare_var_to_value 0x40DD, 4 + vgoto_if 1, EventScript_674DD2 + compare_var_to_value 0x40DD, 5 + vgoto_if 1, EventScript_674DD8 + return + +EventScript_674DC0:: @ 8674DC0 + setmonmove 1, 2, 57 + return + +EventScript_674DC6:: @ 8674DC6 + setmonmove 2, 2, 57 + return + +EventScript_674DCC:: @ 8674DCC + setmonmove 3, 2, 57 + return + +EventScript_674DD2:: @ 8674DD2 + setmonmove 4, 2, 57 + return + +EventScript_674DD8:: @ 8674DD8 + setmonmove 5, 2, 57 + return gText_MysteryGiftEgg:: .string "Thank you for using the MYSTERY\nGIFT System.\pFrom the POKéMON CENTER we\nhave a gift--a POKéMON EGG!\pPlease raise it with love and\nkindness.$" + +gText_MysteryGiftEgg_2:: .string "Oh, your party appears to be full.\pPlease come see me after storing\na POKéMON on a PC.$" gUnknown_08674EC1:: @ 8674EC1 - .incbin "baserom.gba", 0x00674ec1, 0x29 + setvaddress gUnknown_08674EC1 + special sub_81652B4 + compare_var_to_value 0x800D, 0 + vgoto_if 1, EventScript_674EDF + lock + faceplayer + vmessage gText_MysteryGiftVisitingTrainer + waitmessage + waitbuttonpress + release + end + +EventScript_674EDF:: @ 8674EDF + lock + faceplayer + vmessage gText_MysteryGiftVisitingTrainer_2 + waitmessage + waitbuttonpress + release + end gText_MysteryGiftVisitingTrainer:: .string "Thank you for using the MYSTERY\nGIFT System.\pBy holding this WONDER CARD, you\nmay take part in a survey at a\lPOKéMON MART.\pUse these surveys to invite\nTRAINERS to SOOTOPOLIS CITY.\p…Let me give you a secret\npassword for a survey:\p“GIVE ME\nAWESOME TRAINER”\pWrite that in on a survey and send\nit to the WIRELESS\lCOMMUNICATION SYSTEM.$" + +gText_MysteryGiftVisitingTrainer_2:: .string "Thank you for using the MYSTERY\nGIFT System.\pA TRAINER has arrived in\nSOOTOPOLIS CITY looking for you.\pWe hope you will enjoy\nbattling the visiting TRAINER.\pYou may invite other TRAINERS by\nentering other passwords.\pTry looking for other passwords\nthat may work.$" gUnknown_0867513C:: @ 867513C - .incbin "baserom.gba", 0x0067513c, 0x48 + setvaddress gUnknown_0867513C + checkflag 0x1E4 + vgoto_if 1, EventScript_675179 + setorcopyvar 0x800D, 2 + specialvar 0x8008, sub_813986C + compare_var_to_value 0x8008, 3 + vgoto_if 0, EventScript_675179 + lock + faceplayer + vmessage gText_MysteryGiftBattleCountCard_2 + waitmessage + waitbuttonpress + giveitem_std 13 + release + setflag 0x1E4 + end + +EventScript_675179:: @ 8675179 + lock + faceplayer + vmessage gText_MysteryGiftBattleCountCard + waitmessage + waitbuttonpress + release + end gText_MysteryGiftBattleCountCard:: .string "Thank you for using the MYSTERY\nGIFT System.\pYour BATTLE COUNT CARD keeps\ntrack of your battle record against\lTRAINERS with the same CARD.\pLook for and battle TRAINERS who\nhave the same CARD as you.\pYou may check the overall rankings\nby reading the NEWS.\pPlease do give it a try!$" + +gText_MysteryGiftBattleCountCard_2:: .string "Thank you for using the MYSTERY\nGIFT System.\pCongratulations!\pYou have won a prize for winning\nthree battles!\pWe hope you will be inspired to\nbattle some more.$" gUnknown_0867533C:: @ 867533C - .incbin "baserom.gba", 0x0067533c, 0x6d + setvaddress gUnknown_0867533C + lock + faceplayer + checkflag 0x13A + vgoto_if 1, EventScript_6753A0 + checkflag 0x1AD + vgoto_if 1, EventScript_6753A0 + checkitem 371, 1 + compare_var_to_value 0x800D, 1 + vgoto_if 1, EventScript_6753A0 + vmessage gText_MysteryGiftTicket1 + waitmessage + waitbuttonpress + checkitemspace 371, 1 + compare_var_to_value 0x800D, 0 + vgoto_if 1, EventScript_675397 + giveitem_std 371 + setflag 0x8D5 + setflag 0x13A + vmessage gText_MysteryGiftTicket1_1 + waitmessage + waitbuttonpress + release + end + +EventScript_675397:: @ 8675397 + vmessage gText_MysteryGiftTicket1_3 + waitmessage + waitbuttonpress + release + end + +EventScript_6753A0:: @ 86753A0 + vmessage gText_MysteryGiftTicket1_2 + waitmessage + waitbuttonpress + release + end gText_MysteryGiftTicket1:: .string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" + +gText_MysteryGiftTicket1_1:: .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" + +gText_MysteryGiftTicket1_2:: .string "Thank you for using the MYSTERY\nGIFT System.$" + +gText_MysteryGiftTicket1_3:: .string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" gUnknown_0867550B:: @ 867550B - .incbin "baserom.gba", 0x0067550b, 0x76 + setvaddress gUnknown_0867550B + lock + faceplayer + checkflag 0x13B + vgoto_if 1, EventScript_675578 + checkflag 0x91 + vgoto_if 1, EventScript_675578 + checkflag 0x92 + vgoto_if 1, EventScript_675578 + checkitem 370, 1 + compare_var_to_value 0x800D, 1 + vgoto_if 1, EventScript_675578 + vmessage gText_MysteryGiftTicket2 + waitmessage + waitbuttonpress + checkitemspace 370, 1 + compare_var_to_value 0x800D, 0 + vgoto_if 1, EventScript_67556F + giveitem_std 370 + setflag 0x8E0 + setflag 0x13B + vmessage gText_MysteryGiftTicket2_1 + waitmessage + waitbuttonpress + release + end + +EventScript_67556F:: @ 867556F + vmessage gText_MysteryGiftTicket2_3 + waitmessage + waitbuttonpress + release + end + +EventScript_675578:: @ 8675578 + vmessage gText_MysteryGiftTicket2_2 + waitmessage + waitbuttonpress + release + end gText_MysteryGiftTicket2:: .string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" + +gText_MysteryGiftTicket2_1:: .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" + +gText_MysteryGiftTicket2_2:: .string "Thank you for using the MYSTERY\nGIFT System.$" + +gText_MysteryGiftTicket2_3:: .string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" gUnknown_086756E3:: @ 86756E3 - .incbin "baserom.gba", 0x006756e3, 0x25 + setvaddress gUnknown_086756E3 + addvar 0x403E, 1 + compare_var_to_value 0x403E, 10 + vgoto_if 0, EventScript_6756FD + setvar 0x403E, 0 + +EventScript_6756FD:: @ 86756FD + lock + faceplayer + vmessage gText_MysteryGiftAlteringCave + waitmessage + waitbuttonpress + release + end gText_MysteryGiftAlteringCave:: .string "Thank you for using the MYSTERY\nGIFT System.\pThere appears to be a rumor about\nrare POKéMON sightings.\pThe sightings reportedly came from\nthe ALTERING CAVE on ROUTE 103.\pPerhaps it would be worthwhile for\nyou to investigate this rumor.$" gUnknown_086757F4:: @ 86757F4 - .incbin "baserom.gba", 0x006757f4, 0x6d + setvaddress gUnknown_086757F4 + lock + faceplayer + checkflag 0x13C + vgoto_if 1, EventScript_675858 + checkflag 0x1CA + vgoto_if 1, EventScript_675858 + checkitem 376, 1 + compare_var_to_value 0x800D, 1 + vgoto_if 1, EventScript_675858 + vmessage gText_MysteryGiftOldSeaMap + waitmessage + waitbuttonpress + checkitemspace 376, 1 + compare_var_to_value 0x800D, 0 + vgoto_if 1, EventScript_67584F + giveitem_std 376 + setflag 0x8D6 + setflag 0x13C + vmessage gText_MysteryGiftOldSeaMap_1 + waitmessage + waitbuttonpress + release + end + +EventScript_67584F:: @ 867584F + vmessage gText_MysteryGiftOldSeaMap_3 + waitmessage + waitbuttonpress + release + end + +EventScript_675858:: @ 8675858 + vmessage gText_MysteryGiftOldSeaMap_2 + waitmessage + waitbuttonpress + release + end gText_MysteryGiftOldSeaMap:: .string "Thank you for using the MYSTERY\nGIFT System.\pLet me confirm--you are {PLAYER}?\pWe received this OLD SEA MAP\naddressed to you.$" + +gText_MysteryGiftOldSeaMap_1:: .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" + +gText_MysteryGiftOldSeaMap_2:: .string "Thank you for using the MYSTERY\nGIFT System.$" + +gText_MysteryGiftOldSeaMap_3:: .string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" .align 2 diff --git a/data/new_menu_helpers.s b/data/new_menu_helpers.s index 8d4e43b15e..c11d73d7c3 100644 --- a/data/new_menu_helpers.s +++ b/data/new_menu_helpers.s @@ -4,24 +4,50 @@ .section .rodata gUnknown_0860F074:: @ 860F074 - .incbin "baserom.gba", 0x60f074, 0x20 + .incbin "graphics/interface/860F074.gbapal" gUnknown_0860F094:: @ 860F094 - .incbin "baserom.gba", 0x60f094, 0x4 + .byte 8, 4, 1, 0 gUnknown_0860F098:: @ 860F098 - .incbin "baserom.gba", 0x60f098, 0x10 + window_template 0, 2, 15, 27, 4, 15, 0x194 + null_window_template gUnknown_0860F0A8:: @ 860F0A8 - .incbin "baserom.gba", 0x60f0a8, 0x8 + window_template 0, 21, 9, 5, 4, 15, 0x125 @ These are not referenced in src/new_menu_helpers.c; rather, they are in src/menu.c. Regardless, they were plopped here. gUnknown_0860F0B0:: @ 860F0B0 - .incbin "baserom.gba", 0x60f0b0, 0x20 + .incbin "graphics/interface/860F0B0.gbapal" gUnknown_0860F0D0:: @ 860F0D0 - .incbin "baserom.gba", 0x60f0d0, 0x4 + .byte 15, 1, 2, 0 gUnknown_0860F0D4:: @ 860F0D4 - .incbin "baserom.gba", 0x60f0d4, 0x68 + .2byte 0xC0C, 0 + .2byte 0xC20, 32 + .2byte 0xC20, 100 + .2byte 0xC20, 0x60 + .2byte 0xC20, 0x80 + .2byte 0xC20, 0x48 + .2byte 0xC20, 0x44 + .2byte 0xC20, 0x6C + .2byte 0xC20, 0x68 + .2byte 0xC20, 0x88 + .2byte 0xC20, 0xA4 + .2byte 0xC20, 0x24 + .2byte 0xC20, 0x28 + .2byte 0xC20, 0x2C + .2byte 0xC20, 0x40 + .2byte 0xC20, 0x84 + .2byte 0xC20, 0x4C + .2byte 0xC20, 0xA0 + .2byte 0xC20, 0x8C + .2byte 0xC2A, 0xA8 + .2byte 0xC2A, 0xC0 + .2byte 0xC2A, 0xC8 + .2byte 0xC2A, 0xE0 + .2byte 0xC2A, 0xE8 + .2byte 0x808, 0xAE + .2byte 0x808, 0xAF diff --git a/data/option_menu.s b/data/option_menu.s index 05db7fddf6..0f8608f4b3 100644 --- a/data/option_menu.s +++ b/data/option_menu.s @@ -5,16 +5,26 @@ .align 2, 0 gUnknown_0855C604:: @ 855C604 - .incbin "baserom.gba", 0x55c604, 0x60 + .incbin "graphics/interface/855C604.gbapal" + .incbin "graphics/interface/855C624.bin" gUnknown_0855C664:: @ 855C664 - .incbin "baserom.gba", 0x55c664, 0x1c + .4byte gUnknown_085EE590 + .4byte gUnknown_085EE59B + .4byte gUnknown_085EE5A8 + .4byte gUnknown_085EE5B5 + .4byte gUnknown_085EE5C8 + .4byte gUnknown_085EE5BB + .4byte gUnknown_085EE5C1 gUnknown_0855C680:: @ 855C680 - .incbin "baserom.gba", 0x55c680, 0x18 + window_template 1, 2, 1, 0x1A, 2, 1, 2 + window_template 0, 2, 5, 0x1A, 14, 1, 0x36 + null_window_template gUnknown_0855C698:: @ 855C698 - .incbin "baserom.gba", 0x55c698, 0x8 + .4byte 0x1E5 + .4byte 0x11F4 gUnknown_0855C6A0:: @ 855C6A0 - .incbin "baserom.gba", 0x55c6a0, 0x4 + .2byte 0x7E51, 0 diff --git a/data/overworld.s b/data/overworld.s index 890829cd97..186af6f441 100644 --- a/data/overworld.s +++ b/data/overworld.s @@ -4,22 +4,49 @@ .section .rodata .align 2, 0 gUnknown_08339D3C:: @ 8339D3C - .incbin "baserom.gba", 0x339d3c, 0x28 + .4byte 0xFFFFFF, 0xFFFFFFFF, 0x4B0, 0xE10, 0x4B0, 0x960, 0x32, 0x50, 0xFFFFFFD4, 0x2C gUnknown_08339D64:: @ 8339D64 - .incbin "baserom.gba", 0x339d64, 0x48 + .4byte 0, 0 + .4byte 0, 1 + .4byte 0, -1 + .4byte -1, 0 + .4byte 1, 0 + .4byte -1, 1 + .4byte 1, 1 + .4byte -1, -1 + .4byte 1, -1 gUnknown_08339DAC:: @ 8339DAC - .incbin "baserom.gba", 0x339dac, 0x10 + .4byte 0x1F8 + .4byte 0x11D1 + .4byte 0x21C2 + .4byte 0x31E3 gUnknown_08339DBC:: @ 8339DBC - .incbin "baserom.gba", 0x339dbc, 0xc + .4byte REG_WIN0H + .4byte 0xa2600001 + .byte 1, 0 + .align 2 gUnknown_08339DC8:: @ 8339DC8 - .incbin "baserom.gba", 0x339dc8, 0xc + .4byte sub_80879D8 + .4byte sub_80879F8 + .4byte sub_80879FC gUnknown_08339DD4:: @ 8339DD4 - .incbin "baserom.gba", 0x339dd4, 0x2c + .4byte sub_8087A1C + .4byte sub_8087A20 + .4byte sub_8087A20 + .4byte sub_8087A20 + .4byte sub_8087A20 + .4byte sub_8087A1C + .4byte sub_8087A1C + .4byte sub_8087A88 + .4byte sub_8087A88 + .4byte sub_8087A88 + .4byte sub_8087A88 gUnknown_08339E00:: @ 8339E00 - .incbin "baserom.gba", 0x339e00, 0x8 + .4byte sub_8087AA0 + .4byte sub_8087AA8 diff --git a/data/record_mixing.s b/data/record_mixing.s index 0ef0a776a9..20a37145c7 100644 --- a/data/record_mixing.s +++ b/data/record_mixing.s @@ -5,16 +5,33 @@ .align 2, 0 gUnknown_0858CF8C:: @ 858CF8C - .incbin "baserom.gba", 0x58cf8c, 0x2 + .byte 1, 0 gUnknown_0858CF8E:: @ 858CF8E - .incbin "baserom.gba", 0x58cf8e, 0x6 + .byte 1, 2, 0 + .byte 2, 0, 1 gUnknown_0858CF94:: @ 858CF94 - .incbin "baserom.gba", 0x58cf94, 0x24 + .byte 1, 0, 3 + .byte 2, 3, 0 + .byte 1, 2, 2 + .byte 0, 3, 1 + .byte 1, 3, 0 + .byte 2, 2, 3 + .byte 0, 1, 3 + .byte 2, 0, 1 + .byte 1, 2, 3 + .byte 0, 2, 3 + .byte 1, 0, 3 + .byte 2, 1, 0 gUnknown_0858CFB8:: @ 858CFB8 - .incbin "baserom.gba", 0x58cfb8, 0x6 + .byte 0, 1 + .byte 1, 2 + .byte 2, 0 gUnknown_0858CFBE:: @ 858CFBE - .incbin "baserom.gba", 0x58cfbe, 0xe + .byte 0, 1, 2, 3 + .byte 0, 2, 1, 3 + .byte 0, 3, 2, 1 + .byte 0, 0 diff --git a/data/script_menu.s b/data/script_menu.s index ff9fc38710..d74731f5f8 100644 --- a/data/script_menu.s +++ b/data/script_menu.s @@ -745,19 +745,36 @@ gUnknown_0858BB80:: @ 858BB80 .4byte gText_Exit gUnknown_0858BB9C:: @ 858BB9C - .incbin "baserom.gba", 0x58bb9c, 0x10 + .4byte OldaleTown_PokemonCenter_2F_Text_277F1B + .4byte OldaleTown_PokemonCenter_2F_Text_277F5A + .4byte OldaleTown_PokemonCenter_2F_Text_277F96 + .4byte OldaleTown_PokemonCenter_2F_Text_27889C gUnknown_0858BBAC:: @ 858BBAC - .incbin "baserom.gba", 0x58bbac, 0x10 + .4byte OldaleTown_PokemonCenter_2F_Text_27879F + .4byte OldaleTown_PokemonCenter_2F_Text_2787D5 + .4byte OldaleTown_PokemonCenter_2F_Text_278831 + .4byte OldaleTown_PokemonCenter_2F_Text_27889C gUnknown_0858BBBC:: @ 858BBBC - .incbin "baserom.gba", 0x58bbbc, 0x10 + .4byte OldaleTown_PokemonCenter_2F_Text_27879F + .4byte OldaleTown_PokemonCenter_2F_Text_2787D5 + .4byte OldaleTown_PokemonCenter_2F_Text_2787FC + .4byte OldaleTown_PokemonCenter_2F_Text_27889C gUnknown_0858BBCC:: @ 858BBCC - .incbin "baserom.gba", 0x58bbcc, 0x14 + .4byte OldaleTown_PokemonCenter_2F_Text_27879F + .4byte OldaleTown_PokemonCenter_2F_Text_2787D5 + .4byte OldaleTown_PokemonCenter_2F_Text_278831 + .4byte OldaleTown_PokemonCenter_2F_Text_2787FC + .4byte OldaleTown_PokemonCenter_2F_Text_27889C gUnknown_0858BBE0:: @ 858BBE0 - .incbin "baserom.gba", 0x58bbe0, 0xc + .4byte OldaleTown_PokemonCenter_2F_Text_277F1B + .4byte OldaleTown_PokemonCenter_2F_Text_277F5A + .4byte OldaleTown_PokemonCenter_2F_Text_27889C gUnknown_0858BBEC:: @ 858BBEC - .incbin "baserom.gba", 0x58bbec, 0xc + .4byte OldaleTown_PokemonCenter_2F_Text_27879F + .4byte OldaleTown_PokemonCenter_2F_Text_2787D5 + .4byte OldaleTown_PokemonCenter_2F_Text_27889C diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 5418e6e4ed..bcd92d1c2c 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -1648,15 +1648,15 @@ OldaleTown_PokemonCenter_2F_Text_277EF1: @ 8277EF1 .string "Which of our services do you wish\n" .string "to use?$" -OldaleTown_PokemonCenter_2F_Text_277F1B: @ 8277F1B +OldaleTown_PokemonCenter_2F_Text_277F1B:: @ 8277F1B .string "Trade POKéMON with another player\n" .string "using a GBA Game Link cable.$" -OldaleTown_PokemonCenter_2F_Text_277F5A: @ 8277F5A +OldaleTown_PokemonCenter_2F_Text_277F5A:: @ 8277F5A .string "You may battle another TRAINER\n" .string "using a GBA Game Link cable.$" -OldaleTown_PokemonCenter_2F_Text_277F96: @ 8277F96 +OldaleTown_PokemonCenter_2F_Text_277F96:: @ 8277F96 .string "You can use the RECORD CORNER with\n" .string "others using a GBA Game Link cable.$" @@ -1826,19 +1826,19 @@ OldaleTown_PokemonCenter_2F_Text_27878B: @ 827878B OldaleTown_PokemonCenter_2F_Text_278792: @ 8278792 .string "Please wait.$" -OldaleTown_PokemonCenter_2F_Text_27879F: @ 827879F +OldaleTown_PokemonCenter_2F_Text_27879F:: @ 827879F .string "You may trade your POKéMON here\n" .string "with another TRAINER.$" -OldaleTown_PokemonCenter_2F_Text_2787D5: @ 82787D5 +OldaleTown_PokemonCenter_2F_Text_2787D5:: @ 82787D5 .string "You may battle with your friends\n" .string "here.$" -OldaleTown_PokemonCenter_2F_Text_2787FC: @ 82787FC +OldaleTown_PokemonCenter_2F_Text_2787FC:: @ 82787FC .string "Two to five TRAINERS can make\n" .string "BERRY POWDER together.$" -OldaleTown_PokemonCenter_2F_Text_278831: @ 8278831 +OldaleTown_PokemonCenter_2F_Text_278831:: @ 8278831 .string "The records of two to four players\n" .string "can be mixed together.$" @@ -1846,7 +1846,7 @@ OldaleTown_PokemonCenter_2F_Text_27886B: @ 827886B .string "A guide to the WIRELESS CLUB’s\n" .string "various services.$" -OldaleTown_PokemonCenter_2F_Text_27889C: @ 827889C +OldaleTown_PokemonCenter_2F_Text_27889C:: @ 827889C .string "Cancels the selected MENU item.$" OldaleTown_PokemonCenter_2F_Text_2788BC: @ 82788BC diff --git a/data/specials.inc b/data/specials.inc index e1a53242db..0b42fed246 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -1,6 +1,7 @@ #ifndef GUARD_SPECIALS_H #define GUARD_SPECIALS_H .macro def_special ptr +.global SPECIAL_\ptr .set SPECIAL_\ptr, __special__ .set __special__, __special__ + 1 .4byte \ptr diff --git a/data/unk_transition.s b/data/unk_transition.s index 5d0dc07af7..2dc54e22d4 100644 --- a/data/unk_transition.s +++ b/data/unk_transition.s @@ -4,13 +4,14 @@ .section .rodata gUnknown_0862AD54:: @ 862AD54 - .incbin "baserom.gba", 0x62ad54, 0x1dc + .incbin "graphics/battle_transitions/frontier_transition.4bpp.lz" gUnknown_0862AF30:: @ 862AF30 - .incbin "baserom.gba", 0x62af30, 0x1AC + .incbin "graphics/battle_transitions/frontier_transition.bin" gUnknown_0862B0DC:: @ 862B0DC - .incbin "baserom.gba", 0x62b0dc, 0x460 + .incbin "graphics/battle_transitions/frontier_transition_circles.4bpp.lz" gUnknown_0862B53C:: @ 862B53C - .incbin "baserom.gba", 0x62b53c, 0x1E0 + .incbin "graphics/battle_transitions/frontier_transition.gbapal" + .space 0x1c0 diff --git a/data/use_pokeblock.s b/data/use_pokeblock.s index 0e99cf2238..8497f59ad0 100644 --- a/data/use_pokeblock.s +++ b/data/use_pokeblock.s @@ -4,19 +4,19 @@ .section .rodata gUnknown_085DFA60:: @ 85DFA60 - .incbin "baserom.gba", 0x5dfa60, 0x20 + .incbin "graphics/interface/85DFA60.bin" gUnknown_085DFA80:: @ 85DFA80 - .incbin "baserom.gba", 0x5dfa80, 0xe0 + .incbin "graphics/interface/85DFA80.4bpp" gUnknown_085DFB60:: @ 85DFB60 - .incbin "baserom.gba", 0x5dfb60, 0xac + .incbin "graphics/interface/85DFB60.bin" gUnknown_085DFC0C:: @ 85DFC0C - .incbin "baserom.gba", 0x5dfc0c, 0xa4 + .incbin "graphics/interface/85DFC0C.bin" gUnknown_085DFCB0:: @ 85DFCB0 - .incbin "baserom.gba", 0x5dfcb0, 0x14 + .4byte 22, 47, 33, 24, 23 gUnknown_085DFCC4:: @ 85DFCC4 .byte 0, 4, 3, 2, 1 @@ -53,13 +53,58 @@ gUnknown_085DFD20:: @ 85DFD20 obj_pal gUsePokeblockUpDown_Pal, 0 gUnknown_085DFD28:: @ 85DFD28 - .incbin "baserom.gba", 0x5dfd28, 0x34 + .2byte 0x9c, 0x24 + .2byte 0x75, 0x3b + .2byte 0x75, 0x76 + .2byte 0xc5, 0x76 + .2byte 0xc5, 0x3b + +gUnknown_085DFD3C:: @ 85DFD3C + .2byte 0x4000 + .2byte 0x8000 + .2byte 0x400 + .2byte 0 + +gUnknown_085DFD44:: @ 85DFD44 + obj_image_anim_frame 0, 5 + obj_image_anim_end + +gUnknown_085DFD4C:: @ 85DFD4C + obj_image_anim_frame 8, 5 + obj_image_anim_end + +gUnknown_085DFD54:: @ 85DFD54 + .4byte gUnknown_085DFD44 + .4byte gUnknown_085DFD4C gUnknown_085DFD5C:: @ 85DFD5C - .incbin "baserom.gba", 0x5dfd5c, 0x44 + spr_template 0, 0, gUnknown_085DFD3C, gUnknown_085DFD54, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_085DFD74:: @ 85DFD74 + .2byte 0x4000 + .2byte 0xC000 + .2byte 0x400 + .2byte 0 + +gUnknown_085DFD7C:: @ 85DFD7C + obj_image_anim_frame 0, 5 + obj_image_anim_end + +gUnknown_085DFD84:: @ 85DFD84 + obj_image_anim_frame 32, 5 + obj_image_anim_end + +gUnknown_085DFD8C:: @ 85DFD8C + obj_image_anim_frame 64, 5 + obj_image_anim_end + +gUnknown_085DFD94:: @ 85DFD94 + .4byte gUnknown_085DFD7C + .4byte gUnknown_085DFD84 + .4byte gUnknown_085DFD8C gUnknown_085DFDA0:: @ 85DFDA0 - .incbin "baserom.gba", 0x5dfda0, 0x18 + spr_template 1, 1, gUnknown_085DFD74, gUnknown_085DFD94, NULL, gDummySpriteAffineAnimTable, sub_8168374 gUnknown_085DFDB8:: @ 85DFDB8 .4byte gUsePokeblockCondition_Pal diff --git a/graphics/battle_transitions/frontier_transition.bin b/graphics/battle_transitions/frontier_transition.bin new file mode 100644 index 0000000000000000000000000000000000000000..7b9d2af284bc62e16d244945b05f653b5fad0a04 GIT binary patch literal 428 zcmbVJNp8YG5S%s!8w|u|UjhvK@`6Z_HTaNwo{%T-1mAMa6Y>-ek@Af^p$>H?Gnh!p zH7aQ|Rn_WlRmUn+sRG17i&Any_sY!eHLtl?k5;yl@=$`0GNeqOC3<)|!{kyyfDo#R z8fvUE2pO<~4CX~tggP2%;&`W|$p-5@MYfkYN{j@43vG0?=}_8iF=33%w$#!^4}HV~ z47C|@z@X0_-4fRGM;PN?$pqdMQ%)F1;|Goka|ZpX&6{Y>3L%+e@nsgA!+f~0ORV10 z6;Df~Zud1d$hP`%%MI5^?eMegu*U(xfqU*;6>Kgpqn}jl-wD5{6`l*~>aK7VfAA0C JcADIt<{L}+yr2L8 literal 0 HcmV?d00001 diff --git a/graphics/battle_transitions/frontier_transition.png b/graphics/battle_transitions/frontier_transition.png new file mode 100755 index 0000000000000000000000000000000000000000..05ea84f2c7920ace73a9b1f627f06bf3a081c978 GIT binary patch literal 448 zcmeAS@N?(olHy`uVBq!ia0vp^8bIv9!VDzKR93M7DT4r?5Z9!mQ~v+|zvb$G&F=rj z)y;4=knxRS%2C59Q<8viis8{I4Bw^zH3=%HJz!v9^!9Xd46*3#y^_m!Sb>8r;a`P| zm3}~VQ?Ibe!yCa4E^jA&J$}jNp{TtT<2Ln&c^%SfcLI6l=Qu80{3cAVOI9_egX5S) zp5R@kZHJo0a>_bu8N4<3UU;wIiKfTs{N$7?WIN4_L8H&HZS2^HF5d<6&}em!@oDUZ_j*tE92Pe+fBM>%5N-n z=B{+z$eL}Topk?v_m#97?;Um;r$e?J;yfQGagqC{*_74|%2wZ;o;Cbw2&>p$96#~t znYgxl&p0Ff!VACbo4?`g=2~mxBI#WBMS|?rlG2Mb^v#xvKCKrq%;&Hdkj(olofR%E zlCst~?SA);ueBC_iHmcDthT?&sI+|gX2zP67JC{_ZaqI;QR7EdVvYK@X|`suRTc|h n*GMl@-%|L0SK{%~pTB=H>Hb^l%AlD7iYo?BS3j3^P6oy|KzrsFN8SV2m2DApm!zKHmaBN*a*!G_vG* z{v*Ij^S1!~sTsi9ED7++RtC@yT`aMg2 zp&xYFOZ}h@j@A$2=so)3(GQP)kmc~`2TJ54^+OUoCiFv6Ovv>^(p<{*L(*)_^g}ZE z-1x`J1J(a|3F!#{Ss7gk?;p&*whDlH{2jpR&YuEsR{(kcAk!3kaRX3&Lk}{ literal 0 HcmV?d00001 diff --git a/graphics/interface/855C604.pal b/graphics/interface/855C604.pal new file mode 100755 index 0000000000..e7d6c330ae --- /dev/null +++ b/graphics/interface/855C604.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +255 180 82 +197 123 0 +255 139 131 +255 49 24 +74 74 74 +213 213 205 +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/interface/855C624.bin b/graphics/interface/855C624.bin new file mode 100644 index 0000000000..6f48b39f69 --- /dev/null +++ b/graphics/interface/855C624.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/graphics/interface/85DFA60.bin b/graphics/interface/85DFA60.bin new file mode 100644 index 0000000000000000000000000000000000000000..b1a4230d4d1af3cce2f1fffff40e784e08feb58c GIT binary patch literal 32 ccmZQzD5&eP{Qtkay1aUKy@1#CBnA`!0KaVrV*mgE literal 0 HcmV?d00001 diff --git a/graphics/interface/85DFA80.png b/graphics/interface/85DFA80.png new file mode 100755 index 0000000000000000000000000000000000000000..c1fde032563a042c380dcf9e1b1054938fe5c8b3 GIT binary patch literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^7C_9w!VDziE-5wuDT4r?5LY1GJm-H>Qt|))|M%Ye z21NJX{cmobvUkf-pcE#Mcd)+<6piecR+!|)w1hnxA;e{W%CwnE-Xyf zJg%3qwmt_qyX=5&6(wx)=svtG05-E%z^{i6>QxDR_5^M4DCvX|O( pC% Date: Sat, 20 Jan 2018 22:58:42 -0500 Subject: [PATCH 59/64] edit instructions and makefile --- INSTALL.md | 2 +- Makefile | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 75adc2ea11..faffb38884 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,4 +1,4 @@ -First, you must put a Pokémon Emerald (US) ROM in the root directory of the repository and name it `baserom.gba`. It should have a SHA1 checksum of `f3ae088181bf583e55daf962a92bb46f4f1d07b7`. Then, follow the OS-specific instructions below. +Follow the OS-specific instructions below. # Linux diff --git a/Makefile b/Makefile index 8a77772709..b9e2fb289e 100644 --- a/Makefile +++ b/Makefile @@ -168,5 +168,3 @@ $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) $(ROM): $(ELF) $(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@ -baserom.gba: ; - $(error baserom.gba is required to build) From 452c0cfd7c1a4f6bfbe67c59ee1eb9b7334bb1be Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Sat, 20 Jan 2018 23:18:26 -0500 Subject: [PATCH 60/64] BEGONE POINTER --- data/pokemon_summary_screen.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/pokemon_summary_screen.s b/data/pokemon_summary_screen.s index 2f5bbeb3d4..85c30bc6f8 100644 --- a/data/pokemon_summary_screen.s +++ b/data/pokemon_summary_screen.s @@ -263,7 +263,7 @@ gSpriteAnimTable_861CF60:: @ 861CF60 .align 2 gUnknown_0861CFBC:: @ 861CFBC - obj_tiles 0x08d971b0, 0x1700, 0x7532 + obj_tiles gMoveTypes_Gfx, 0x1700, 0x7532 .align 2 gUnknown_0861CFC4:: @ 861CFC4 From 4499af0ec3aeea93207e2ccbb8fc72b0c8687dad Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Sat, 20 Jan 2018 23:36:17 -0500 Subject: [PATCH 61/64] got another pointer --- data/script_menu.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/script_menu.s b/data/script_menu.s index d74731f5f8..dbfb056219 100644 --- a/data/script_menu.s +++ b/data/script_menu.s @@ -578,7 +578,7 @@ gUnknown_0858B758:: @ 58B758 gUnknown_0858B760:: @ 858B760 - .4byte 0x0858abd8, 3 + .4byte gUnknown_0858ABD8, 3 .4byte gUnknown_0858B758, 1 .4byte gUnknown_0858ABF0, 3 .4byte gUnknown_0858AC08, 4 From 8ccb8a0af8cba68c4aedf840d9f3034668e28fd1 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sun, 21 Jan 2018 00:44:57 -0500 Subject: [PATCH 62/64] travis --- .travis.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..dda07ebb4d --- /dev/null +++ b/.travis.yml @@ -0,0 +1,28 @@ +language: generic +dist: trusty +sudo: false +env: + global: + - DEVKITARM=$HOME/devkitARM +addons: + apt: + packages: + - gcc-multilib + - linux-libc-dev +cache: + apt: true +install: + - pushd $HOME + - travis_retry wget http://download.sourceforge.net/devkitpro/devkitARM_r46-x86_64-linux.tar.bz2 + - tar xf devkitARM*.tar.bz2 + - travis_retry git clone https://github.com/pret/agbcc.git + - cd agbcc && ./build.sh && ./install.sh $TRAVIS_BUILD_DIR + - popd + +matrix: + include: + - os: linux + env: _="Build" + script: + - ./build_tools.sh + - make -j2 compare From c5b3c4168a4438a48f7a3e1fa9d67f443872f482 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sun, 21 Jan 2018 03:30:22 -0600 Subject: [PATCH 63/64] Remove attempt at guarding specials.inc --- data/specials.inc | 3 --- 1 file changed, 3 deletions(-) diff --git a/data/specials.inc b/data/specials.inc index 0b42fed246..a4e678a140 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -1,5 +1,3 @@ -#ifndef GUARD_SPECIALS_H -#define GUARD_SPECIALS_H .macro def_special ptr .global SPECIAL_\ptr .set SPECIAL_\ptr, __special__ @@ -537,4 +535,3 @@ gSpecials:: @ 81DBA64 def_special sub_813C5A0 def_special sub_8139C10 def_special sub_80B3BC4 -#endif \ No newline at end of file From 5bf86da36672e2e0edaf525800374eb8af221193 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sun, 21 Jan 2018 04:11:43 -0600 Subject: [PATCH 64/64] Fix tool newlines --- build_tools.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build_tools.sh b/build_tools.sh index f4656e2d87..824ed025b8 100755 --- a/build_tools.sh +++ b/build_tools.sh @@ -1,8 +1,8 @@ #!/bin/sh -make -C tools/gbagfx CXX=${1:=g++} -make -C tools/scaninc CXX=${1:=g++} -make -C tools/preproc CXX=${1:=g++} -make -C tools/bin2c CXX=${1:=g++} -make -C tools/rsfont CXX=${1:=g++} -make -C tools/aif2pcm CXX=${1:=g++} -make -C tools/ramscrgen CXX=${1:=g++} +make -C tools/gbagfx CXX=${1:-g++} +make -C tools/scaninc CXX=${1:-g++} +make -C tools/preproc CXX=${1:-g++} +make -C tools/bin2c CXX=${1:-g++} +make -C tools/rsfont CXX=${1:-g++} +make -C tools/aif2pcm CXX=${1:-g++} +make -C tools/ramscrgen CXX=${1:-g++}